diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index a00ee3a1ed..b616d762ed 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -3666,9 +3666,6 @@ public class Blocks{ scaledHealth = 160; rotateSpeed = 12; - status = StatusEffects.invincible; - statusChance = 0.01f; - consumePower(3.3f); }}; @@ -3686,7 +3683,6 @@ public class Blocks{ despawnEffect = Fx.blastExplosion; status = StatusEffects.blasted; - statusChance = 0.000001f; hitColor = backColor = trailColor = Pal.blastAmmoBack; frontColor = Pal.blastAmmoFront; @@ -3704,7 +3700,6 @@ public class Blocks{ ammoMultiplier = 5f; hitEffect = Fx.blastExplosion; status = StatusEffects.burning; - statusChance = 0.234f; }}, Items.surgeAlloy, new MissileBulletType(3.7f, 18){{ width = 8f; @@ -3718,9 +3713,6 @@ public class Blocks{ lightningDamage = 10; lightning = 2; lightningLength = 10; - status = StatusEffects.freezing; - lightningStatusChance = 0.2f; - statusChance = 0.8f; hitColor = backColor = trailColor = Pal.surgeAmmoBack; frontColor = Pal.surgeAmmoFront; diff --git a/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java b/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java index 53c147fefe..7afb3d2764 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java @@ -60,7 +60,7 @@ public class TractorBeamTurret extends BaseTurret{ stats.add(Stat.targetsAir, targetAir); stats.add(Stat.targetsGround, targetGround); if(damage > 0) stats.add(Stat.damage, damage * 60f, StatUnit.perSecond); - if(status != StatusEffects.none && Mathf.chance(statusChance)){ + if(status != StatusEffects.none && statusChance > 0f){ stats.add(Stat.status, StatValues.statusText(status, statusDuration, statusChance)); } } diff --git a/core/src/mindustry/world/meta/Stat.java b/core/src/mindustry/world/meta/Stat.java index 3e05a30308..c9e0a0bd8d 100644 --- a/core/src/mindustry/world/meta/Stat.java +++ b/core/src/mindustry/world/meta/Stat.java @@ -76,7 +76,6 @@ public class Stat implements Comparable{ weapons = new Stat("weapons", StatCat.function), bullet = new Stat("bullet", StatCat.function), - status = new Stat("status", StatCat.function), speedIncrease = new Stat("speedIncrease", StatCat.function), repairTime = new Stat("repairTime", StatCat.function), @@ -91,6 +90,7 @@ public class Stat implements Comparable{ targetsAir = new Stat("targetsAir", StatCat.function), targetsGround = new Stat("targetsGround", StatCat.function), damage = new Stat("damage", StatCat.function), + status = new Stat("status", StatCat.function), frequency = new Stat("frequency", StatCat.function), ammo = new Stat("ammo", StatCat.function), ammoCapacity = new Stat("ammoCapacity", StatCat.function),