mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-09 20:29:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed shields not blocking blast compound explosions

Browse Source
This commit is contained in:
Anuken 2024-09-15 19:21:24 -04:00
parent 9911e602a0
commit 8ede0fa6f4
7 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/content/UnitTypes.java
View File

@ -1042,7 +1042,7 @@ public class UnitTypes{
status = StatusEffects.blasted;
statusDuration = 60f;
damage = splashDamage * 0.75f;
damage = splashDamage * 0.7f;
}};
}});
}};
@ -1447,7 +1447,7 @@ public class UnitTypes{
healPercent = 15f;
splashDamage = 220f;
splashDamageRadius = 80f;
damage = splashDamage * 0.75f;
damage = splashDamage * 0.7f;
}};
}});
}};

14
core/src/mindustry/entities/Damage.java
View File

@ -16,6 +16,8 @@ import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.type.*;
import mindustry.world.*;
import mindustry.world.blocks.*;
import mindustry.world.meta.*;
import static mindustry.Vars.*;
@ -101,9 +103,13 @@ public class Damage{
float damagePerWave = explosiveness / 2f;
for(int i = 0; i < waves; i++){
var shields = ignoreTeam == null ? null : indexer.getEnemy(ignoreTeam, BlockFlag.shield);
int f = i;
Time.run(i * 2f, () -> {
damage(ignoreTeam, x, y, Mathf.clamp(radius + explosiveness, 0, 50f) * ((f + 1f) / waves), damagePerWave, false);
if(shields == null || shields.isEmpty() || !shields.contains(b -> b instanceof ExplosionShield s && s.absorbExplosion(x, y, damagePerWave))){
damage(ignoreTeam, x, y, Mathf.clamp(radius + explosiveness, 0, 50f) * ((f + 1f) / waves), damagePerWave, false);
}
Fx.blockExplosionSmoke.at(x + Mathf.range(radius), y + Mathf.range(radius));
});
}
@ -166,7 +172,7 @@ public class Damage{
public static float findPierceLength(Bullet b, int pierceCap, float length){
return findPierceLength(b, pierceCap, b.type.laserAbsorb, length);
}
public static float findPierceLength(Bullet b, int pierceCap, boolean laser, float length){
vec.trnsExact(b.rotation(), length);
rect.setPosition(b.x, b.y).setSize(vec.x, vec.y).normalize().grow(3f);
@ -358,7 +364,7 @@ public class Damage{
*/
public static Healthc linecast(Bullet hitter, float x, float y, float angle, float length){
vec.trns(angle, length);
tmpBuilding = null;
if(hitter.type.collidesGround){
@ -644,7 +650,7 @@ public class Damage{
this.target = target;
return this;
}
@Override
public void reset(){
target = null;

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

@ -717,7 +717,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
if(type.flying && !spawnedByCore && type.createWreck && state.rules.unitCrashDamage(team) > 0){
var shields = indexer.getEnemy(team, BlockFlag.shield);
float crashDamage = Mathf.pow(hitSize, 0.75f) * type.crashDamageMultiplier * 5f * state.rules.unitCrashDamage(team);
if(shields.isEmpty() || !shields.contains(b -> b instanceof UnitWreckShield s && s.absorbWreck(self(), crashDamage))){
if(shields.isEmpty() || !shields.contains(b -> b instanceof ExplosionShield s && s.absorbExplosion(x, y, crashDamage))){
Damage.damage(team, x, y, Mathf.pow(hitSize, 0.94f) * 1.25f, crashDamage, true, false, true);
}
}

3
core/src/mindustry/game/CampaignRules.java
View File

@ -17,10 +17,11 @@ public class CampaignRules{
rules.showSpawns = showSpawns;
rules.randomWaveAI = randomWaveAI;
if(planet.showRtsAIRule && rules.attackMode){
boolean swapped = rules.teams.get(rules.waveTeam).rtsAi != rtsAI;
rules.teams.get(rules.waveTeam).rtsAi = rtsAI;
rules.teams.get(rules.waveTeam).rtsMinWeight = 1.2f * difficulty.enemyHealthMultiplier;
if(Vars.state.isGame()){
if(swapped && Vars.state.isGame()){
Groups.unit.each(u -> {
if(u.team == rules.waveTeam && !u.isPlayer()){
u.resetController();

7
core/src/mindustry/world/blocks/ExplosionShield.java Normal file
View File

@ -0,0 +1,7 @@
package mindustry.world.blocks;
//TODO: horrible API design, but I'm not sure of a better way to do this right now. please don't use this class
public interface ExplosionShield{
/** @return whether the shield was able to absorb the explosion; this should apply damage to the shield if true is returned. */
boolean absorbExplosion(float x, float y, float damage);
}

9
core/src/mindustry/world/blocks/UnitWreckShield.java
View File

@ -1,9 +0,0 @@
package mindustry.world.blocks;
import mindustry.gen.*;
//TODO: horrible API design, but I'm not sure of a better way to do this right now. please don't use this class
public interface UnitWreckShield{
/** @return whether the shield was able to absorb the unit wreck; this should apply damage to the shield if true is returned. */
boolean absorbWreck(Unit unit, float damage);
}

10
core/src/mindustry/world/blocks/defense/ForceProjector.java
View File

@ -40,7 +40,7 @@ public class ForceProjector extends Block{
public float cooldownBrokenBase = 0.35f;
public float coolantConsumption = 0.1f;
public boolean consumeCoolant = true;
public float crashDamageMultiplier = 2.5f;
public float crashDamageMultiplier = 2f;
public Effect absorbEffect = Fx.absorb;
public Effect shieldBreakEffect = Fx.shieldBreak;
public @Load("@-top") TextureRegion topRegion;
@ -123,7 +123,7 @@ public class ForceProjector extends Block{
Draw.color();
}
public class ForceBuild extends Building implements Ranged, UnitWreckShield{
public class ForceBuild extends Building implements Ranged, ExplosionShield{
public boolean broken = true;
public float buildup, radscl, hit, warmup, phaseHeat;
@ -218,10 +218,10 @@ public class ForceProjector extends Block{
}
@Override
public boolean absorbWreck(Unit unit, float damage){
boolean absorb = !broken && Intersector.isInRegularPolygon(sides, x, y, realRadius(), shieldRotation, unit.x, unit.y);
public boolean absorbExplosion(float ex, float ey, float damage){
boolean absorb = !broken && Intersector.isInRegularPolygon(sides, x, y, realRadius(), shieldRotation, ex, ey);
if(absorb){
absorbEffect.at(unit);
absorbEffect.at(ex, ey);
hit = 1f;
buildup += damage * crashDamageMultiplier;
}