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

Make PayloadAmmoTurret accept units (#7320)

Browse Source
This commit is contained in:
MEEPofFaith
2022-08-11 08:38:45 -04:00
committed by GitHub
parent 91650646c6
commit 3f96799c2e
2 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/world/meta/StatValues.java
+9 -5
View File
@@ -308,10 +308,14 @@ public class StatValues{
}
public static <T extends UnlockableContent> StatValue ammo(ObjectMap<T, BulletType> map){
return ammo(map, 0);
return ammo(map, 0, false);
}
public static <T extends UnlockableContent> StatValue ammo(ObjectMap<T, BulletType> map, int indent){
public static <T extends UnlockableContent> StatValue ammo(ObjectMap<T, BulletType> map, boolean showUnit){
return ammo(map, 0, showUnit);
}
public static <T extends UnlockableContent> StatValue ammo(ObjectMap<T, BulletType> map, int indent, boolean showUnit){
return table -> {
table.row();
@@ -320,12 +324,12 @@ public class StatValues{
orderedKeys.sort();
for(T t : orderedKeys){
boolean compact = t instanceof UnitType || indent > 0;
boolean compact = t instanceof UnitType && !showUnit || indent > 0;
BulletType type = map.get(t);
if(type.spawnUnit != null && type.spawnUnit.weapons.size > 0){
ammo(ObjectMap.of(t, type.spawnUnit.weapons.first().bullet), indent).display(table);
ammo(ObjectMap.of(t, type.spawnUnit.weapons.first().bullet), indent, false).display(table);
return;
}
@@ -406,7 +410,7 @@ public class StatValues{
sep(bt, Core.bundle.format("bullet.frags", type.fragBullets));
bt.row();
ammo(ObjectMap.of(t, type.fragBullet), indent + 1).display(bt);
ammo(ObjectMap.of(t, type.fragBullet), indent + 1, false).display(bt);
}
}).padTop(compact ? 0 : -9).padLeft(indent * 8).left().get().background(compact ? null : Tex.underline);