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

unitHealthMultiplier re-implemented

Browse Source
This commit is contained in:
Anuken
2023-05-03 18:38:50 -04:00
parent c4e1719c0c
commit 43922edac8
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/entities/comp/ShieldComp.java
View File

@@ -1,6 +1,7 @@
package mindustry.entities.comp;
import arc.util.*;
import mindustry.*;
import mindustry.annotations.Annotations.*;
import mindustry.content.*;
import mindustry.entities.*;
@@ -26,7 +27,7 @@ abstract class ShieldComp implements Healthc, Posc{
@Override
public void damage(float amount){
//apply armor and scaling effects
rawDamage(Damage.applyArmor(amount, armor) / healthMultiplier);
rawDamage(Damage.applyArmor(amount, armor) / healthMultiplier / Vars.state.rules.unitHealth(team));
}
@Replace
@@ -34,7 +35,7 @@ abstract class ShieldComp implements Healthc, Posc{
public void damagePierce(float amount, boolean withEffect){
float pre = hitTime;
rawDamage(amount / healthMultiplier);
rawDamage(amount / healthMultiplier / Vars.state.rules.unitHealth(team));
if(!withEffect){
hitTime = pre;