From 9a777f3ce5a32cb3820d125b57f7845577e9c12b Mon Sep 17 00:00:00 2001 From: rMuchan Date: Thu, 17 Dec 2020 23:09:28 +0800 Subject: [PATCH 1/3] fix health calculation in background sectors (#4011) --- core/src/mindustry/maps/SectorDamage.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/maps/SectorDamage.java b/core/src/mindustry/maps/SectorDamage.java index e685a22275..682aff16e3 100644 --- a/core/src/mindustry/maps/SectorDamage.java +++ b/core/src/mindustry/maps/SectorDamage.java @@ -260,8 +260,8 @@ public class SectorDamage{ if(tile.build != null && tile.team() == state.rules.defaultTeam && counted.add(tile.pos())){ //health is divided by block size, because multiblocks are counted multiple times. - sumHealth += tile.build.health / tile.block().size; - totalPathBuild += 1f / tile.block().size; + sumHealth += tile.build.health / (tile.block().size * tile.block().size); + totalPathBuild += 1f / (tile.block().size * tile.block().size); } } } @@ -409,7 +409,7 @@ public class SectorDamage{ if(wx >= 0 && wy >= 0 && wx < world.width() && wy < world.height() && Mathf.within(dx, dy, radius)){ Tile other = world.rawTile(wx, wy); if(!(other.block() instanceof CoreBlock)){ - s += other.team() == state.rules.defaultTeam ? other.build.health / other.block().size : 0f; + s += other.team() == state.rules.defaultTeam ? other.build.health / (other.block().size * other.block().size) : 0f; } } } From cfd67bb1fce23892f7e58c4be298124788488f3b Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Thu, 17 Dec 2020 16:15:58 +0100 Subject: [PATCH 2/3] Fix sprite packing typo (#4016) --- desktop/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/build.gradle b/desktop/build.gradle index 4520715f44..81459ed156 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -51,7 +51,7 @@ task dist(type: Jar, dependsOn: configurations.runtimeClasspath){ } if(!project.ext.hasSprites()){ - println "Scheduling sprite packi." + println "Scheduling sprite packing." run.dependsOn ":tools:pack" dist.dependsOn ":tools:pack" } From c58289dd47753bade17fa4c7f87e4d7a9fc56d22 Mon Sep 17 00:00:00 2001 From: Charlotte Vixen Date: Thu, 17 Dec 2020 15:20:29 +0000 Subject: [PATCH 3/3] added conduit color indications (#4015) --- .../blocks/liquid/plated-conduit-top-3.png | Bin 415 -> 369 bytes .../blocks/liquid/pulse-conduit-top-3.png | Bin 365 -> 560 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-3.png index f1c3d4fa2267c6e3eaa90884efe97ca3a1e8a180..25ade8b128994b4c6f95f070ec58cc3b10215b42 100644 GIT binary patch delta 330 zcmbQw{E=ybK|Q0kr;B4qMC;q>wtR;Scv|Ci{4RS3EbMCRoUEY6rl!W`clbzvVu;?s z(nA+iJ9Ca_awa{&h!g@I^c*^SYOjp_j`rEa&B-^*f<^JI1C}j!OOUT^&lJCkD z`3L+9n6BJwIDAef>u!Jkq`mI@!V~{@@b0PF{P2B?$n+k^9~LfI^=H^@KB}JFs>VEPhfe+f zrs-OrdafN>a`UvD>Y97msoQw6td8=i>^Z2c$dd28WsW?X&Bu6$o!rd2M}>o!xt`g6 z^XgvF*={^xviff}{d=YkTTB*CV`sg(MOi9eE#`2`%_b>B7Zp1bX5F9CKco$K7i5Px ztHkY9)7bGW%I$IDp{<2SIxp~C=}=x%aoxeYa8ZTux{nHqMQ0Z=-8x+8x#XBTchoG0 zoey~`)G|&9?%};yl=ozRloR)cmMylr;+g)U9kVtZ5&qPp>UT!>g3lI(>so0Cj2+9Z hnB?21NX33&#W>YFoN?7OQF< z)2nRQ$DH(9!swI2n>&XNGz6_IPP^isux?jeyHM8eoX1P1{#Y_u=+Ecc@_jP<4B~Z! z70%3?|3SOt{qGC*=Dy5wS4wN^>MG_;{PR24yN0{_Pr;l|cTQT?Uy+%!_yP~p&x{DA zF2yIMvFsNge7NY+a(12R^fzBwJq}4IhlIK&P0&@guL-(;@~-s8>0&>hn6WjSa%~9= z)lfUu;40G>thDGr+ngE;j-Q-0qK4syQ(}~Mq;wmmSyrFx(OAmjV87H*+woCy&-3Z) zUUw*4vTsRI>{->OqSoxrP`_l#KNY9nSuTv~N-ItD1f%w-E%MNGw6D6bDhrDPy7@A zgn{8{+I6)%6V_a-WIw!6)tR^R&J3=HL|;xsB}SkcCy)1vS>pK*#n(;4|tUUlZg z_xAB3P8>%5ntS)&|2yaQC)4Q2W`#f8%b2+@XtDpO^kF)|<4|vq^w5LD=)0ARz}jkC zj*YqE(|p-hU79XXHpz$~YK}bPh0F%Vjt|_KOlO=F_Hrj2J$9s(qhV!x1A~wHyu$vv z+=hgTmz4)ztn}=#%J4l9S9^L6(~OJjxdm$7bZi&rGiIFsonGg1&*^Jm@fYUquoEw5 z`ZKkh{^36@d5Yqyf(eIxn369Dd&KZ|rRa9t^JqJBIKV3F9?OE@LPMcOPl?m9pXZn^ wj_5N}lT0d0ZaQ=Q<}BTfmVd8*`@>iG+imWP=b!#DFfcH9y85}Sb4q9e0G_Xtx&QzG