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

Fixed invalid ranges for some weapons

Browse Source
This commit is contained in:
Anuken
2023-05-05 23:40:05 -04:00
parent 43922edac8
commit 0bed338141
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/type/UnitType.java
+4 -2
View File
@@ -711,11 +711,13 @@ public class UnitType extends UnlockableContent{
//assume slight range margin //assume slight range margin
float margin = 4f; float margin = 4f;
boolean skipWeapons = !weapons.contains(w -> !w.useAttackRange);
//set up default range //set up default range
if(range < 0){ if(range < 0){
range = Float.MAX_VALUE; range = Float.MAX_VALUE;
for(Weapon weapon : weapons){ for(Weapon weapon : weapons){
if(!weapon.useAttackRange) continue; if(!weapon.useAttackRange && skipWeapons) continue;
range = Math.min(range, weapon.range() - margin); range = Math.min(range, weapon.range() - margin);
maxRange = Math.max(maxRange, weapon.range() - margin); maxRange = Math.max(maxRange, weapon.range() - margin);
@@ -726,7 +728,7 @@ public class UnitType extends UnlockableContent{
maxRange = Math.max(0f, range); maxRange = Math.max(0f, range);
for(Weapon weapon : weapons){ for(Weapon weapon : weapons){
if(!weapon.useAttackRange) continue; if(!weapon.useAttackRange && skipWeapons) continue;
maxRange = Math.max(maxRange, weapon.range() - margin); maxRange = Math.max(maxRange, weapon.range() - margin);
} }