From 8f676cf6c34c71daaa900029f9d29f5ac65fcd52 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 10 Feb 2022 12:33:18 -0500 Subject: [PATCH] Some logic stuff --- .../blocks/turrets/afflict/afflict.png | Bin 2172 -> 2164 bytes core/src/mindustry/logic/Senseable.java | 5 ++++- core/src/mindustry/type/Item.java | 15 ++++++++++++++- core/src/mindustry/type/Liquid.java | 15 ++++++++++++++- core/src/mindustry/world/Block.java | 2 +- gradle.properties | 2 +- 6 files changed, 34 insertions(+), 5 deletions(-) diff --git a/core/assets-raw/sprites/blocks/turrets/afflict/afflict.png b/core/assets-raw/sprites/blocks/turrets/afflict/afflict.png index 1ca290067596c0849a7999bac71276d85fdee212..d075c56d0b67a4f2c1917c2fc88077a973d46a6d 100644 GIT binary patch delta 1910 zcmew(@I_#PA*0?zBb9nKUe*IaEYlfmJ>_)U4p?PNHt?_($ep(gcpxzUpE+A|`p3=O zCEu$v5CzjJ^5n{SFO0{iaV z8!sCp0>=AkqU$#uM{U{f) zZ!t@Y`;&pHXJpPaJPD;gHc3Uc-6mNqc|*!;(-R!5dB9 zb)CW2k`+QrMQr5fM@&{{GOpjfn@cg~?cwwF|6FU|zxnj#>+{3S9hwPuV*mbUKAgun zdw#$Fnj9k^whGmh4ZF5H)N3%Ak=gxh+EUg$*_Hja94A8=b}|&We)y`t_n_$ZH*@mu zDHT+6t+1>stL%Cg9<0;3=*w2|-Fr1GO%w0O-t13QiZNnP*>K0FVXgloYgLDu`j4kr zo-uv!tF%3=Y_^Q)fW?ccLZ%HLk4CYiB{OjSyxxEO)$@IE-wbD8+w?hUJAXTS1&_{g z7B$I))w=baa>k9j7}S2|U!2Vm!fJ5x{9<*%6&wuK=6h8?DQ~dLUMsiDpEZBtpANa2 z^1J*2+z0N4a@e0QfA#gsK4#zj_5b6xe|}THDTjHP9Pf_Q2C<)u7e1Suu2vw}p!##p z125sri#bj(Ey!WBv{}<$bJ8eii;Kg`{>_H&Hq1*FU%fJOTC&KeZ0)v5N3Nb)v?gj> zjqXw3$DR!;3_Xt&R=wN!GEU|)m9+|=e?5_O#%C{?Xbf;RlS@;iTVZs9rp{FvGdQRo|+Q%ckvqmvAG;gA@A1yh!cE#N$AkgJpC#r&a13f zw7x0r-zv7Avv-%G;i{uj+I$lY8`ytd?{^RXWcv0&7en(qvlfR9JUfmrJd-+CPH6%| zG=r|Hm(?Zj)%uRN_JzGs*~H+*aGGoF$@K?~xVOCeB*GY0FY@B`U4!yh1*`(|H%Bx2 zPEWS~Kf&66!r|qgFWnx4yg>MZ*N&(-8?<}qo(7fh-r6ku?ysG zpR@cx5la|%YmFCM1l#H=cJHfBf~6C2g!z8pEkBR+uzTsl!{ys zns#~_$J!Y>j8E6B6zZ(s!XH?B@}dc|L$i$HRL%`eUYi{=1CDiavaR*`@aw$l#R-9? zX-7`pEq8IM`oQ^c%!4Y^GWKIP{xGxsT-75EWA>*W9EW1W%CuPw^i6{ zBBY~b%#0hRab#t%@@O~Rc@&tHzRq>>23Ga@jbhDN3pyC26;4*StT=GXL6C7;4UdO@ z&jA}nhu-De`lJ|zRu^qGTEW!vtE*Gq%-g+&gK>Y8h<1xp^-44MmM4>P*6F-`v-svK z=O0IR-u%rJ#aFo8R(Ch^+o!R)pMqDs=kQ__WOV14DA611ywQj6r@()mll%t@f-_i_ z#6RwMQ2)6RfbON9ieTmf?pi!IJ(%KmvNkW(fUWgDEiQn z@_$uU+NxUqvzMHV=lgcGzb#TvR$0C?dL0|Y8kf{hSo3yc&GH2=T_;YN?vlqT zr$4!5r)J2nNzJO${>pq!y>@^9UG=ATR?qACR5f|UZ`Hs{C(dTqu_~o7# zW}Vb8v`P^d=$s_sb_tb~5*@|jO$R6BKJ3WI`f^^$A+2bZxJe3bKL z%;;lYbNztgzKH&6lVpaEu3wi0aOh0)T)D*S=bMcpJYOqMY;EAk%kH~hFJBqcz%{{5 z!6d3ZOltYB{JD$<|5nF|^EajxtofCn!=uC6(A$`OU!uvUV2|3G1%(@g7*zS59EjwZ zP!zp=+SjV{VNP#WzV-Sh_hM7i^4d8yQ}$NhVtQc0bj@W#`RmyaiVw`=oTK!i+2xJv zvZm!6Zxls~H*RIf6zsY5zg^*dcZ%_vyYlmknh#7o;XhHDXIb-svuQ!E9-cK#?zZzU c>G;o3^weJHvqIfG1_lNOPgg&ebxsLQ08s*Pr2qf` delta 1917 zcmew&@JC>RA*0zuBbEANQd|k$f-y{AR4TVfFuh)r%3vgNpwi~KLZfrdulo`@aZ^`$ zWQkwC`+nia<1Ge;P*7N8@!8CQt9B5X-7lmC45u- zZo4q+7&WRGE)BL7I=?~Y-?kI|%V)eRyS?cA0v-YGMN*ffi&WO;-edBr<9?v_AZznl zv0Z6`JuY?K%T+JbGVlu;UYVu9_pa=BxbCN|Ie8QNSyu{M1gS*`FFDD-P=Uc??F^+2 ztkeGpEnkzU5Lzm-M`nKHWHlz^dh0ta0(sjW9=HF$XkU3@?Z3~@?=J4pOpwX@_rEc5 zd&^n<5kjt++3U@s1Bwg)xGRWjP{V3cSSnv1N`ofpr-`|&7>({S4ZI&=^G2?cg3rh7SS86_;VbNpS zpfX=LCNrr@gfWs~%2|co$G=X{k96yr#-VZkan2dR^9-5!rlrfCO0@pD)wNKiaO)Wkb3#HQK4_!2o^FZI-yJAx`&3?Ax7qd)FdI<{1`W%b#xFD#QHgde!p zW$VTXOPy~!;!$LB;2c9h@{*I^RqR~1EH;(xVO-+5KxXCX#wm>ZYHKaJ|0~SDu6F-% zz_U*?FEzCs<2ij)Xa&!NI1`q=kvBw>g^8H~Y@>_eIY+i++^+%zneawY&Nlqp{18 z3Gz&v_!BB;ip#WOjwO#7<)ZQbKPBKi(wEu7$glHqj1)JwU#KcXTRsI8k6 zFnzH~=L`pivn&gE9M=AfI9$JQe*RUPUY!eC!nZzN?m8(HaBh~?M33JBSEtMP8Z&Gw z*PY6_p~-8rW9GaTVPT%AnG0@gZvV2%&^Tz$T?75&>DMlFX|edJ?X0yjd#t?Gx#Li% zh+E+u4%x6mSBAUV2VyG^cQxGZaaiBD@Q4a)`|{t1|E;;f-XPR{S0?CpE$7MGG0p}p zUK8b+^1l1O`!1!Twem!gz_X$wFBF#6KJIw%?Ip*ik57M`nRQ~}jgH>VC#h3H856?i zZctjWFr;|L%mr!6<||Zht60}WNJq<<88=Mh$jV^l(Qdl)C@?F1o!jL3tm^d(e=*!r zI>6@fNlsB~gIRz}gQ`69C2nN{WtJ5muiOe$c1Q|c7seLa5D;(p@o?J94t~W4;S(M) zFT4=9>a3vRPLz|nAt-$T(h-eK<* zM`@|D%%1nz9y{xtcOAL3eyg!=f%SsDH`NpUwHU5Gekic!qpfw&i-ns?3cYV=b}eB4 z8&Z-h9&{wiREQ9=YGP@b`i$qf@Va7rmSA;;C%D z*wfN#?r*;GZCl(^WH(tcN1SGwqk2xvOOjDb#H(gW?NSAC`R~)+s~f6j9_o--#kt`` z%rx~Sx)VeX%(`vm+jPyRuJf|u?1nG5L{5HkI}+e~fTdo}m2u5Z$&Lvtb}C=_CpGzf(-$ z;M%iOUSGe?7Sdo+&$KYmddnq?tM#vWE}Sj>DB!_%eAVA$#|{KB+>qF@tyl2`%kk_( zTvF`Xi~)}v_~y8>Yi=*i{u%TBrdNmU*4UHxWMjiVZ0Voezp30mnqiLDfms}%*3}Bv z@ZB(O3}&gD(6RSK$On-|+a*bQ+r$)fn*wkB7kE-Tv1jY=51Q9GWjeL~i0nL getAllOres(){ return content.blocks().select(b -> b instanceof OreBlock).map(b -> b.itemDrop); diff --git a/core/src/mindustry/type/Liquid.java b/core/src/mindustry/type/Liquid.java index d68af2a30b..dddde8968d 100644 --- a/core/src/mindustry/type/Liquid.java +++ b/core/src/mindustry/type/Liquid.java @@ -10,12 +10,13 @@ import mindustry.entities.*; import mindustry.game.*; import mindustry.gen.*; import mindustry.graphics.*; +import mindustry.logic.*; import mindustry.world.meta.*; import static mindustry.entities.Puddles.*; /** A better name for this class would be "fluid", but it's too late for that. */ -public class Liquid extends UnlockableContent{ +public class Liquid extends UnlockableContent implements Senseable{ //must be static and global so conduits don't conflict - DO NOT INTERACT WITH THESE IN MODS OR I WILL PERSONALLY YELL AT YOU public static final int animationFrames = 50; public static float animationScaleGas = 190f, animationScaleLiquid = 230f; @@ -147,6 +148,18 @@ public class Liquid extends UnlockableContent{ stats.addPercent(Stat.viscosity, viscosity); } + @Override + public double sense(LAccess sensor){ + if(sensor == LAccess.color) return color.toFloatBits(); + return 0; + } + + @Override + public Object senseObject(LAccess sensor){ + if(sensor == LAccess.name) return name; + return noSensed; + } + @Override public String toString(){ return localizedName; diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index 1195767a33..2276995b94 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -1153,7 +1153,7 @@ public class Block extends UnlockableContent implements Senseable{ @Override public double sense(LAccess sensor){ return switch(sensor){ - case color -> Color.toDoubleBits(mapColor.r, mapColor.g, mapColor.b, mapColor.a); + case color -> mapColor.toDoubleBits(); case health, maxHealth -> health; case size -> size * tilesize; case itemCapacity -> itemCapacity; diff --git a/gradle.properties b/gradle.properties index c50f6b3d4d..f3173d6724 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=f95111f269 +archash=df5b4b832c