From f70a59c604629e923528d00d739aeec2baf7afe0 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 12 Apr 2025 23:39:20 -0400 Subject: [PATCH] Fixed #10639 --- .../sprites/ui/sectors/sector-groundZero.png | Bin 672 -> 640 bytes core/src/mindustry/entities/Damage.java | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/assets-raw/sprites/ui/sectors/sector-groundZero.png b/core/assets-raw/sprites/ui/sectors/sector-groundZero.png index a755beb71017f02e92e76fee0611c2cf0dc5280b..caab01dad9d8d37d070a1f12e3386fe28e953780 100644 GIT binary patch delta 615 zcmZ3$+Q2$NrQY4s#WAFU@$M{NzrzkZt#jW*d{gN7JcaqvX9d1PlTs&6=xLkOWBYCM z@srU@vmRHzKmBJ%Xt>vv3=^{J*C5gx+bnwk7sq-(RpvndIrTS z4QXf3w+Wd2IMHS<>~!M5w7Yd;EI$^^Tb#$n@}fcVxs8<2nuxT?_025|nkI`6J3AJL z&%Ak0Nnr<9$cwjo1T+GT{xBHY) z+T2rX0_STn-1Ju!ZsJg|w$bKps^W}z!aI>sk%wVbsB8Vt$`B5QEiXMd3K#;@7Qb>j zpL+7i>#thZs&?PqW$I?0da_qxEQK_PP@0o-C+i=!>Q}62jsKj_)aq`7}=b@ThHmW zsqF-Zza+y60X1!#RK^930W%+Z-eTdbkV?rgu}MAGkP&(4awJ2<;meW?6^AZgWUM$m znT;W70>{Fdm1z#993J+sR0CLN$w_Val+YT{$H@=5p~&txu1uRFiA(<=vH7EUg?m z`KDS%;=JPdUwsT16H?_wIURWq+_KT)YT|16S`y>U-54y-xj^*DZJY30zaoqiWOceL zr!2GkCUjuI%`=OaeBI0N;;-Q(mVU9&`_uM6XLwcH5OOJ)!PV3)X6v7g_t-P)r!YF4 zm;Y(EV3$ay8N;b~afW*#v3%al2QJ%q-Q^6LG^@jaUy#8eLG6@{3u6Og@Wf}0w^$B- zFzL9kqOxNSNaKGa?Wt#xFYs@57H5u5JI5FMQ`R_XNSMHM#Sc+?y|azHGzR z&(!$o;#=l#e2u~OH#y#lGHuTbQ{Q3Eq5O4I^uxUl5^Fz;$7;mPI=$#&1_J{FgQu&X K%Q~k7#wGyd=_Y0X diff --git a/core/src/mindustry/entities/Damage.java b/core/src/mindustry/entities/Damage.java index 2640814df3..2648e37b86 100644 --- a/core/src/mindustry/entities/Damage.java +++ b/core/src/mindustry/entities/Damage.java @@ -518,7 +518,7 @@ public class Damage{ } //TODO better velocity displacement float dst = vec.set(unit.x - x, unit.y - y).len(); - unit.vel.add(vec.setLength((1f - dst / radius) * 2f / unit.mass())); + unit.vel.add(vec.setLength((radius > 0f ? 1f - dst / radius : 1f) * 2f / unit.mass())); if(complete && damage >= 9999999f && unit.isPlayer()){ Events.fire(Trigger.exclusionDeath); @@ -640,7 +640,7 @@ public class Damage{ private static float calculateDamage(float dist, float radius, float damage){ float falloff = 0.4f; - float scaled = Mathf.lerp(1f - dist / radius, 1f, falloff); + float scaled = radius <= 0.00001f ? 1f : Mathf.lerp(1f - dist / radius, 1f, falloff); return damage * scaled; }