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

Fixes the damage modifier not working sometimes (#8124)

Browse Source 
Co-authored-by: Garen7 <Garen7@users.noreply.github.com>
This commit is contained in:
Garen7
2023-01-07 10:30:49 -06:00
committed by GitHub
parent b57cde7148
commit c20d7f2b4f
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/entities/Lightning.java
View File

@@ -43,7 +43,7 @@ public class Lightning{
bhit = false; bhit = false;
for(int i = 0; i < length / 2; i++){ for(int i = 0; i < length / 2; i++){
hitCreate.create(null, team, x, y, rotation, damage, 1f, 1f, hitter); hitCreate.create(null, team, x, y, rotation, damage * (hitter == null ? 1f : hitter.damageMultiplier()), 1f, 1f, hitter);
lines.add(new Vec2(x + Mathf.range(3f), y + Mathf.range(3f))); lines.add(new Vec2(x + Mathf.range(3f), y + Mathf.range(3f)));
if(lines.size > 1){ if(lines.size > 1){

4
core/src/mindustry/entities/abilities/EnergyFieldAbility.java
View File

@@ -141,9 +141,9 @@ public class EnergyFieldAbility extends Ability{
}else{ }else{
anyNearby = true; anyNearby = true;
if(other instanceof Building b){ if(other instanceof Building b){
b.damage(unit.team, damage); b.damage(unit.team, damage * state.rules.unitDamage(unit.team));
}else{ }else{
other.damage(damage); other.damage(damage * state.rules.unitDamage(unit.team));
} }
if(other instanceof Statusc s){ if(other instanceof Statusc s){
s.apply(status, statusDuration); s.apply(status, statusDuration);

2
core/src/mindustry/entities/comp/CrawlComp.java
View File

@@ -88,7 +88,7 @@ abstract class CrawlComp implements Posc, Rotc, Hitboxc, Unitc{
//TODO area damage to units //TODO area damage to units
if(t.build != null && t.build.team != team){ if(t.build != null && t.build.team != team){
t.build.damage(team, type.crushDamage * Time.delta); t.build.damage(team, type.crushDamage * Time.delta * state.rules.unitDamage(team));
} }
if(Mathf.chanceDelta(0.025)){ if(Mathf.chanceDelta(0.025)){

2
core/src/mindustry/entities/comp/LegsComp.java
View File

@@ -192,7 +192,7 @@ abstract class LegsComp implements Posc, Rotc, Hitboxc, Flyingc, Unitc{
} }
if(type.legSplashDamage > 0){ if(type.legSplashDamage > 0){
Damage.damage(team, l.base.x, l.base.y, type.legSplashRange, type.legSplashDamage, false, true); Damage.damage(team, l.base.x, l.base.y, type.legSplashRange, type.legSplashDamage * state.rules.unitDamage(team), false, true);
} }
} }

2
core/src/mindustry/entities/comp/TankComp.java
View File

@@ -66,7 +66,7 @@ abstract class TankComp implements Posc, Flyingc, Hitboxc, Unitc, ElevationMovec
//damage radius is 1 tile smaller to prevent it from just touching walls as it passes //damage radius is 1 tile smaller to prevent it from just touching walls as it passes
&& Math.max(Math.abs(dx), Math.abs(dy)) <= r - 1){ && Math.max(Math.abs(dx), Math.abs(dy)) <= r - 1){
t.build.damage(team, type.crushDamage * Time.delta * t.block().crushDamageMultiplier); t.build.damage(team, type.crushDamage * Time.delta * t.block().crushDamageMultiplier * state.rules.unitDamage(team));
} }
} }
} }

2
core/src/mindustry/entities/comp/UnitComp.java
View File

@@ -618,7 +618,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
//if this unit crash landed (was flying), damage stuff in a radius //if this unit crash landed (was flying), damage stuff in a radius
if(type.flying && !spawnedByCore && type.createWreck){ if(type.flying && !spawnedByCore && type.createWreck){
Damage.damage(team, x, y, Mathf.pow(hitSize, 0.94f) * 1.25f, Mathf.pow(hitSize, 0.75f) * type.crashDamageMultiplier * 5f, true, false, true); Damage.damage(team, x, y, Mathf.pow(hitSize, 0.94f) * 1.25f, Mathf.pow(hitSize, 0.75f) * type.crashDamageMultiplier * 5f * state.rules.unitDamage(team), true, false, true);
} }
if(!headless && type.createScorch){ if(!headless && type.createScorch){