Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

display StatusDuration to one decimal place (#10908)

Browse Source
This commit is contained in:
KochiyaUenehaaa
2025-06-08 22:26:28 +08:00
committed by GitHub
parent a18c5d148d
commit f21429f3f1
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/content/Blocks.java
View File

@@ -3437,7 +3437,6 @@ public class Blocks{
hitEffect = Fx.hitLancer; hitEffect = Fx.hitLancer;
despawnEffect = Fx.none; despawnEffect = Fx.none;
status = StatusEffects.shocked; status = StatusEffects.shocked;
statusDuration = 10f;
hittable = false; hittable = false;
lightColor = Color.white; lightColor = Color.white;
collidesAir = false; collidesAir = false;
@@ -3489,7 +3488,6 @@ public class Blocks{
despawnEffect = Fx.blastExplosion; despawnEffect = Fx.blastExplosion;
status = StatusEffects.blasted; status = StatusEffects.blasted;
statusDuration = 60f;
hitColor = backColor = trailColor = Pal.blastAmmoBack; hitColor = backColor = trailColor = Pal.blastAmmoBack;
frontColor = Pal.blastAmmoFront; frontColor = Pal.blastAmmoFront;
@@ -3915,7 +3913,6 @@ public class Blocks{
collidesGround = true; collidesGround = true;
status = StatusEffects.blasted; status = StatusEffects.blasted;
statusDuration = 60f;
backColor = hitColor = trailColor = Pal.blastAmmoBack; backColor = hitColor = trailColor = Pal.blastAmmoBack;
frontColor = Pal.blastAmmoFront; frontColor = Pal.blastAmmoFront;
@@ -5455,7 +5452,6 @@ public class Blocks{
hitEffect = Fx.hitLancer; hitEffect = Fx.hitLancer;
despawnEffect = Fx.none; despawnEffect = Fx.none;
status = StatusEffects.shocked; status = StatusEffects.shocked;
statusDuration = 10f;
hittable = false; hittable = false;
lightColor = Color.white; lightColor = Color.white;
buildingDamageMultiplier = 0.25f; buildingDamageMultiplier = 0.25f;

2
core/src/mindustry/world/meta/StatValues.java
View File

@@ -710,7 +710,7 @@ public class StatValues{
if(type.status != StatusEffects.none){ if(type.status != StatusEffects.none){
sep(bt, (type.status.hasEmoji() ? type.status.emoji() : "") + "[stat]" + type.status.localizedName + (type.status.reactive ? "" : "[lightgray] ~ [stat]" + sep(bt, (type.status.hasEmoji() ? type.status.emoji() : "") + "[stat]" + type.status.localizedName + (type.status.reactive ? "" : "[lightgray] ~ [stat]" +
((int)(type.statusDuration / 60f)) + "[lightgray] " + Core.bundle.get("unit.seconds"))).with(c -> withTooltip(c, type.status)); Strings.autoFixed(type.statusDuration / 60f, 1) + "[lightgray] " + Core.bundle.get("unit.seconds"))).with(c -> withTooltip(c, type.status));
} }
if(!type.targetMissiles){ if(!type.targetMissiles){