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

Possible ShieldArcAbility tunneling fix

Browse Source
This commit is contained in:
Anuken
2024-09-10 13:16:34 -04:00
parent e56fd3a0d7
commit 4fc48fabb5
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/editor/WaveGraph.java
View File

@@ -291,6 +291,8 @@ public class WaveGraph extends Table{
maxHealth = Math.max(maxHealth, healthsum); maxHealth = Math.max(maxHealth, healthsum);
} }
used.orderedItems().sort();
ObjectSet<UnitType> usedCopy = new ObjectSet<>(used); ObjectSet<UnitType> usedCopy = new ObjectSet<>(used);
colors.clear(); colors.clear();

10
core/src/mindustry/entities/abilities/ShieldArcAbility.java
View File

@@ -20,9 +20,9 @@ public class ShieldArcAbility extends Ability{
private static Vec2 paramPos = new Vec2(); private static Vec2 paramPos = new Vec2();
private static final Cons<Bullet> shieldConsumer = b -> { private static final Cons<Bullet> shieldConsumer = b -> {
if(b.team != paramUnit.team && b.type.absorbable && paramField.data > 0 && if(b.team != paramUnit.team && b.type.absorbable && paramField.data > 0 &&
!b.within(paramPos, paramField.radius - paramField.width/2f) && !(b.within(paramPos, paramField.radius - paramField.width/2f) && paramPos.within(b.x - b.deltaX, b.y - b.deltaY, paramField.radius - paramField.width/2f)) &&
Tmp.v1.set(b).add(b.vel).within(paramPos, paramField.radius + paramField.width/2f) && (Tmp.v1.set(b).add(b.deltaX, b.deltaY).within(paramPos, paramField.radius + paramField.width/2f) || b.within(paramPos, paramField.radius + paramField.width/2f)) &&
Angles.within(paramPos.angleTo(b), paramUnit.rotation + paramField.angleOffset, paramField.angle / 2f)){ (Angles.within(paramPos.angleTo(b), paramUnit.rotation + paramField.angleOffset, paramField.angle / 2f) || Angles.within(paramPos.angleTo(b.x + b.deltaX, b.y + b.deltaY), paramUnit.rotation + paramField.angleOffset, paramField.angle / 2f))){
b.absorb(); b.absorb();
Fx.absorb.at(b); Fx.absorb.at(b);
@@ -60,7 +60,7 @@ public class ShieldArcAbility extends Ability{
public boolean drawArc = true; public boolean drawArc = true;
/** If not null, will be drawn on top. */ /** If not null, will be drawn on top. */
public @Nullable String region; public @Nullable String region;
/** Color override of the shield. Uses unit shield colour by default. */ /** Color override of the shield. Uses unit shield colour by default. */
public @Nullable Color color; public @Nullable Color color;
/** If true, sprite position will be influenced by x/y. */ /** If true, sprite position will be influenced by x/y. */
public boolean offsetRegion = false; public boolean offsetRegion = false;
@@ -80,7 +80,7 @@ public class ShieldArcAbility extends Ability{
@Override @Override
public void update(Unit unit){ public void update(Unit unit){
if(data < max){ if(data < max){
data += Time.delta * regen; data += Time.delta * regen;
} }