From 443d31e4a507963baa25c198721cd6111dd2b576 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 21 Jun 2023 23:54:39 -0400 Subject: [PATCH] Less pierce damage for shocked status --- core/src/mindustry/content/StatusEffects.java | 5 ++++- core/src/mindustry/content/UnitTypes.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/content/StatusEffects.java b/core/src/mindustry/content/StatusEffects.java index a2a2e47816..a5a22a7c9e 100644 --- a/core/src/mindustry/content/StatusEffects.java +++ b/core/src/mindustry/content/StatusEffects.java @@ -71,7 +71,10 @@ public class StatusEffects{ init(() -> { affinity(shocked, (unit, result, time) -> { - unit.damagePierce(transitionDamage); + float pierceFraction = 0.3f; + + unit.damagePierce(transitionDamage * pierceFraction); + unit.damage(transitionDamage * (1f - pierceFraction)); if(unit.team == state.rules.waveTeam){ Events.fire(Trigger.shock); } diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index ec7fba4ffd..04465631fe 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -252,7 +252,7 @@ public class UnitTypes{ }}; reign = new UnitType("reign"){{ - speed = 0.35f; + speed = 0.4f; hitSize = 26f; rotateSpeed = 1.65f; health = 24000;