diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 992242a437..d9f62b640a 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -3930,7 +3930,7 @@ public class Blocks{ Items.titanium, new ShrapnelBulletType(){{ length = brange + 64f; rangeChange = 64f; - damage = 60f; + damage = 66f; ammoMultiplier = 2f; width = 17f; reloadMultiplier = 1.3f; diff --git a/core/src/mindustry/content/StatusEffects.java b/core/src/mindustry/content/StatusEffects.java index 31b270a312..7e9466f2d6 100644 --- a/core/src/mindustry/content/StatusEffects.java +++ b/core/src/mindustry/content/StatusEffects.java @@ -28,7 +28,7 @@ public class StatusEffects{ affinity(tarred, (unit, result, time) -> { unit.damagePierce(transitionDamage); Fx.burning.at(unit.x + Mathf.range(unit.bounds() / 2f), unit.y + Mathf.range(unit.bounds() / 2f)); - result.set(tarred, Math.min(time + result.time, 300f)); + result.set(burning, Math.min(time + result.time, 300f)); }); }); }}; @@ -110,7 +110,7 @@ public class StatusEffects{ affinity(tarred, (unit, result, time) -> { unit.damagePierce(8f); Fx.burning.at(unit.x + Mathf.range(unit.bounds() / 2f), unit.y + Mathf.range(unit.bounds() / 2f)); - result.set(tarred, Math.min(time + result.time, 200f)); + result.set(melting, Math.min(time + result.time, 200f)); }); }); }}; @@ -144,8 +144,8 @@ public class StatusEffects{ effect = Fx.oily; init(() -> { - affinity(melting, (unit, result, time) -> result.set(tarred, result.time + time)); - affinity(burning, (unit, result, time) -> result.set(tarred, result.time + time)); + affinity(melting, (unit, result, time) -> result.set(melting, result.time + time)); + affinity(burning, (unit, result, time) -> result.set(burning, result.time + time)); }); }}; diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index f428db758c..10a03885ab 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -1395,7 +1395,7 @@ public class UnitTypes{ abilities.add(new RepairFieldAbility(5f, 112f, 50f) {{ - sameTypeHealMult = 0.5f; + sameTypeHealMult = 0.25f; }}); weapons.add(new Weapon("poly-weapon"){{