diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index df14a6ff7f..85f9116f6a 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -715,6 +715,8 @@ public class UnitType extends UnlockableContent{ if(range < 0){ range = Float.MAX_VALUE; for(Weapon weapon : weapons){ + if(!weapon.useAttackRange) continue; + range = Math.min(range, weapon.range() - margin); maxRange = Math.max(maxRange, weapon.range() - margin); } @@ -724,6 +726,8 @@ public class UnitType extends UnlockableContent{ maxRange = Math.max(0f, range); for(Weapon weapon : weapons){ + if(!weapon.useAttackRange) continue; + maxRange = Math.max(maxRange, weapon.range() - margin); } } diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java index 7b9c341fb9..a52b423dba 100644 --- a/core/src/mindustry/type/Weapon.java +++ b/core/src/mindustry/type/Weapon.java @@ -63,6 +63,8 @@ public class Weapon implements Cloneable{ public boolean autoTarget = false; /** whether to perform target trajectory prediction */ public boolean predictTarget = true; + /** if true, this weapon is used for attack range calculations */ + public boolean useAttackRange = true; /** ticks to wait in-between targets */ public float targetInterval = 40f, targetSwitchInterval = 70f; /** rotation speed of weapon when rotation is enabled, in degrees/t*/ diff --git a/core/src/mindustry/type/weapons/PointDefenseWeapon.java b/core/src/mindustry/type/weapons/PointDefenseWeapon.java index d9316eef30..741b5cd29d 100644 --- a/core/src/mindustry/type/weapons/PointDefenseWeapon.java +++ b/core/src/mindustry/type/weapons/PointDefenseWeapon.java @@ -32,6 +32,7 @@ public class PointDefenseWeapon extends Weapon{ controllable = false; rotate = true; useAmmo = false; + useAttackRange = false; } @Override diff --git a/gradle.properties b/gradle.properties index 114f209700..955fe9e087 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=513474758f +archash=712ac8bf54