From 5d86390e28e05abe9cebdd4dcf5d7122674fd14b Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 11 Aug 2021 10:31:36 -0400 Subject: [PATCH] Turret heat cleanup --- .../sprites/blocks/turrets/arc-heat.png | Bin 144 -> 262 bytes .../sprites/blocks/turrets/fuse-heat.png | Bin 0 -> 833 bytes .../sprites/blocks/turrets/hail-heat.png | Bin 148 -> 226 bytes .../sprites/blocks/turrets/lancer-heat.png | Bin 214 -> 363 bytes .../sprites/blocks/turrets/meltdown-heat.png | Bin 889 -> 1604 bytes .../sprites/blocks/turrets/ripple-heat.png | Bin 333 -> 795 bytes .../sprites/blocks/turrets/salvo-heat.png | Bin 278 -> 517 bytes .../sprites/blocks/turrets/scorch-heat.png | Bin 233 -> 329 bytes .../sprites/blocks/turrets/spectre-heat.png | Bin 0 -> 1328 bytes .../world/blocks/campaign/LaunchPad.java | 2 +- 10 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 core/assets-raw/sprites/blocks/turrets/fuse-heat.png create mode 100644 core/assets-raw/sprites/blocks/turrets/spectre-heat.png diff --git a/core/assets-raw/sprites/blocks/turrets/arc-heat.png b/core/assets-raw/sprites/blocks/turrets/arc-heat.png index de36f57ce41c81f1279d0881cd38592446b2487d..5b981cd6bb95c51f86f9cf970acfe156c049c1e5 100644 GIT binary patch delta 234 zcmV=-IAQgrnTmU5RO3_k0;{h7MbGaXRvz+NC-4;r;P(D3jN3E`%LLT&);sBJ1i(_H?hOF|@EG9<0eFJF k5St=--Q#R3l}i1OUcW?9kK9W7H2?qr07*qoM6N<$f_(jAZ2$lO delta 115 zcmZo;n!q?gB`4g|#WAGfR&s&_>*5Bc5As}WXOc<`jATB{XIRkA{OZHQK=vLE_8Sim zFXofD$Hx$*;Ljsx(4F~g0%Iw|&S}AC1s$A!Of=kjwcn~i#r=ZUUk#u+2`S7BV*j-F T_wVt{U;qM7S3j3^P6VEXOp;uumf z=j|;2Y-vN0BkA77uT7UOSw64p{ojA{7fheSvu}rP31?|D=T^m3{@cx8cdgQS`+tGp zT=^Mm=7;;A?)jpk%h)2|^k;p@PI(2_+uQ8#q&_~rdR3MEg?H5gy9(dlTlc->^+&Dm z%tt;PVV~1r{PVWi2~Xy^jGPOf%_z9qc9BJkIp${uTmBq>Va>qEg@y?&2El2L@Avws z1xQSA77!EOBt1dkk?N@np?+*Ywt<7jtrD}ZBe)5(UtzguQB^h_)$|l}FT(?R3V1h$Wz>Me^u`|YcOvkq^Q~!SZ=G|)R z36q)HTq}6kV_4qaHnUq?{WKx>MWR^(|AXf5wjw6q)@j(B`MFagQP;7J^ZEPx!R#vn zYO2|x zxcQLBk5kLt#kXxn8e(0Q%ywK z&LNM%;AYFBBkZSa*cnpVSE^n(&#<68{R;Q*7wlYy3^VeaI3F>yN+$3~26laLD`aEH x6!sF9*SNy);8u&!QE?{@MPNcCnmBk?euF&w{$KZfCj;{YgQu&X%Q~loCIH?7YrFse literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/turrets/hail-heat.png b/core/assets-raw/sprites/blocks/turrets/hail-heat.png index daad1ac9364adbbda4111797aa2512c2da02ad52..ef3805e18e123a952c383abfedf98d90e8034751 100644 GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}b39!fLn2z= zPO|1ZWFX*@E+FpdJO8)KDN79tcA@27bNjM=W+_N&yJV}kG*wRG_TFuMUjD!ziECzF zyY}-c{XWd{>4UD&QKtEavQ_?Kdx*6MGlO!)a_Z8gx~1XE^%prn0YwBJ4k@)$f_{an^LB{Ts5kw`Q{ diff --git a/core/assets-raw/sprites/blocks/turrets/lancer-heat.png b/core/assets-raw/sprites/blocks/turrets/lancer-heat.png index 1327410b66f763cb2c0366f9b344567f8528d5dc..d1494ebefbe9e4ca5c7d8a2c486775509cbde565 100644 GIT binary patch delta 336 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 delta 250 zcmZo=nZ`6hrT(s`i(^Q|t+y8r@*Y;;aZCJ`D3SN(px(?C-4|D_n!v<(SaIs7&-0$l zuKn;_M)2al7sXPON9NUMP(+wFI7#hS51opBP+zMy0NSn{@AhDqB z#XAiK73M?}PgVt8rzz5=4BU%uhO(|u+-1$haM3}+H-xdHTi|K28}EUpjIvP1td4hm zOb!MDZo(l9hm>4)1~P9@m=zn^Ahl@sVulC2Ef*`6U*Jzzopr0C_-YC;$Ke diff --git a/core/assets-raw/sprites/blocks/turrets/scorch-heat.png b/core/assets-raw/sprites/blocks/turrets/scorch-heat.png index 84863ae266b6673adbfe762e6430d156450d929a..ede4fe6657753aced3ca28552dcb14e874941a1e 100644 GIT binary patch delta 302 zcmV+}0nz^H0m%Z8B!2;OQb$4nuFf3k00034NklA&F zmDmGG|9C5R3XH}%8(|7!8L$4{n*`<_umB>>k+I4hLoeapv1|`$Vy_wuWEX%3LK~|p zNAOBOBJ*f3fO-Wq(Upu(#U4QhQZ`nlV+a7PwVSh~Af~a1Ja+*|Ane2ia|(cgsG0-Z zMf4L50ICOoyeAKs^X~$PAXxKm01KkWd}s&&zF3t|>`r{My#N3J07*qoM6N<$g5@57 Axc~qF delta 205 zcmV;;05bo{0_g#eB!93;L_t(|+U=Lk4Zt7>MqQDS9E1^^(e}^-H3|a$G>s(Rjrg8T zsu;qlQ;Nztr#n$dngyn5!fE~?P=VJ(nmtx1-4zNFT#&A1fl~=og0Z%iS3nXe`}6_| z31q-_xKe|E<8N(?$@KA}|bI2uLEYzR@=# zFd{G&&ImL!YarPN|Aat~#EQ9auK*{pays5CP>P%f%PCJ?zb>6&S1SWw00000NkvXX Hu0mjf7B^Lh diff --git a/core/assets-raw/sprites/blocks/turrets/spectre-heat.png b/core/assets-raw/sprites/blocks/turrets/spectre-heat.png new file mode 100644 index 0000000000000000000000000000000000000000..2054d874486e88364d25d2cde04a7976667fdd1f GIT binary patch literal 1328 zcmbVM>sQhT0R2gzVyVShE-Rlwm|~hvo3)V0ruaU-(A*KI)DlsH1g2BOYN;*r5h}~l z&NM{KKitCbP=9l?-DUs)nBxNc zA~rqmD@~0z^#z*LziCFa2!AXf9NPN<0Kf{I-|;ABwQ6!O4es^LukVJpZ^vRmP;cdf zJI8|3*ksH<4@w>zr;#dJNgPP?4iqTj4LHOlB))$7EuEvHhTIO7`KM$yOeS{z zQp}Qg!hqQ;R5HW9QfHVE)!*3HYul+akxz|Xmu~or<9?Ku!R1qxu2Mpu|7Pf_&R~hN z6xGK97Q$@xM#^|@?ATdpne7wwtz@*(Q(bq^6V64#1+^01$bX+8ri?L02atJnl;zJ3 zaVc(IC*oi6jw;`K$MqFN1_0*|moTQ~JUCO5+mbs|tLiHDG}nGE=t^fCVb2CNlmlg- zLf0wwI|~|4)Y94H9hWJ1yxkP9UHx!z5$Apzkgd-cR~jlVj^^ZUOAwQm(u-XqHlNKW}wd*V0&!R5RWEn{MWSUH__>-bt9J(I2}9fJ;L|k z2!2IcPwF||3p_zB-$${uf!FqOdL(A<9zpk#K6*2+oGy$^iS=(1+&xz#5P*|l_GgF@ zICrapn0QQJlWK(SiePiWuOyaA`Z7AEJ+br9i>|g*#)X9;z2if0E?z!mKraa}G~T(sK7;V^g`2RGxv* zq}N6bMu0wT*?mi+*Q~r`(4^<18L8&B#YfhC-tCDFZ=Dz#na>nZtmGN}OU3S!~E3=PaDbPQGnfVM)zZN5lm4k2*io-1KqP`)kb#(>X&W+BzY z=Q;Y|bc~BtOdifhlwNAz!Pg{PtU$v(O6*R*5onTy(JW~7sr_V=4BkA0XW(<4nh`zX zOX4HYilyOGxch6}5EL&OR{cC8VKEMw_nj~F4sE&q+Y%rm2lj(*HpmTbRQD0igo;cy d|LcEY)L`=3d&9wOsy5?mA9pg;PlzSv{|8UCZy^8x literal 0 HcmV?d00001 diff --git a/core/src/mindustry/world/blocks/campaign/LaunchPad.java b/core/src/mindustry/world/blocks/campaign/LaunchPad.java index 8f10c7b5b9..12bcb762b3 100644 --- a/core/src/mindustry/world/blocks/campaign/LaunchPad.java +++ b/core/src/mindustry/world/blocks/campaign/LaunchPad.java @@ -141,7 +141,7 @@ public class LaunchPad extends Block{ public void display(Table table){ super.display(table); - if(!state.isCampaign() || net.client()) return; + if(!state.isCampaign() || net.client() || team != player.team()) return; table.row(); table.label(() -> {