More concentrated enemy bases

2020-11-22 14:45:43 -05:00
parent bf31a8c06b
commit 455e3188c4
7 changed files with 46 additions and 10 deletions
@@ -46,7 +46,7 @@ public class ItemTurret extends Turret{
            public void build(Building tile, Table table){
                MultiReqImage image = new MultiReqImage();
                content.items().each(i -> filter.get(i) && i.unlockedNow(), item -> image.add(new ReqImage(new ItemImage(item.icon(Cicon.medium)),
-                () -> tile != null && !((ItemTurretBuild)tile).ammo.isEmpty() && ((ItemEntry)((ItemTurretBuild)tile).ammo.peek()).item == item)));
+                () -> tile instanceof ItemTurretBuild it && !it.ammo.isEmpty() && ((ItemEntry)it.ammo.peek()).item == item)));

                table.add(image).size(8 * 4);
            }
@@ -54,7 +54,7 @@ public class ItemTurret extends Turret{
            @Override
            public boolean valid(Building entity){
                //valid when there's any ammo in the turret
-                return !((ItemTurretBuild)entity).ammo.isEmpty();
+                return entity instanceof ItemTurretBuild it && !it.ammo.isEmpty();
            }

            @Override