diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index 1ba18b6f8f..af7b2c8d0d 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -188,7 +188,7 @@ public class ContentParser{ case "delay" -> base.delay(data.getFloat("amount")); case "sustain" -> base.sustain(data.getFloat("offset", 0f), data.getFloat("grow", 0f), data.getFloat("sustain")); case "shorten" -> base.shorten(data.getFloat("amount")); - case "add" -> base.add(data.getFloat("amount")); + case "add" -> data.has("amount") ? base.add(data.getFloat("amount")) : base.add(parser.readValue(PartProgress.class, data.get("other"))); case "blend" -> base.blend(parser.readValue(PartProgress.class, data.get("other")), data.getFloat("amount")); case "mul" -> base.mul(parser.readValue(PartProgress.class, data.get("other"))); case "min" -> base.min(parser.readValue(PartProgress.class, data.get("other"))); diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java index 13de72631f..1918a322c9 100644 --- a/core/src/mindustry/type/Weapon.java +++ b/core/src/mindustry/type/Weapon.java @@ -204,7 +204,7 @@ public class Weapon implements Cloneable{ DrawPart.params.sideMultiplier = flipSprite ? -1 : 1; for(int i = 0; i < parts.size; i++){ - var part = parts.items[i]; + var part = parts.get(i); if(part.under){ part.draw(DrawPart.params); } diff --git a/core/src/mindustry/type/weapons/BuildWeapon.java b/core/src/mindustry/type/weapons/BuildWeapon.java index c24b1ee182..46ac7db195 100644 --- a/core/src/mindustry/type/weapons/BuildWeapon.java +++ b/core/src/mindustry/type/weapons/BuildWeapon.java @@ -1,5 +1,6 @@ package mindustry.type.weapons; +import arc.graphics.g2d.*; import arc.math.*; import mindustry.entities.bullet.*; import mindustry.entities.units.*; @@ -54,6 +55,7 @@ public class BuildWeapon extends Weapon{ if(unit.activelyBuilding()){ float + z = Draw.z(), rotation = unit.rotation - 90, weaponRotation = rotation + (rotate ? mount.rotation : 0), wx = unit.x + Angles.trnsx(rotation, x, y) + Angles.trnsx(weaponRotation, 0, -mount.recoil), @@ -62,6 +64,7 @@ public class BuildWeapon extends Weapon{ py = wy + Angles.trnsy(weaponRotation, this.shootX, this.shootY); unit.drawBuildingBeam(px, py); + Draw.z(z); } } } diff --git a/gradle.properties b/gradle.properties index 4eb061e4af..77d25c8574 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,4 +25,4 @@ org.gradle.caching=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=a02840762b +archash=c4505eb469