From 338a8035bbd1bb7d4d68b28127750097c6a1ec3f Mon Sep 17 00:00:00 2001 From: Kevin Date: Mon, 11 Sep 2023 16:28:54 +1000 Subject: [PATCH] Made the turret adding process more dynaic --- .../game/screens/TurretSelectionScreen.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/source/core/src/main/com/csse3200/game/screens/TurretSelectionScreen.java b/source/core/src/main/com/csse3200/game/screens/TurretSelectionScreen.java index 6fa9fb93d..17cd21319 100644 --- a/source/core/src/main/com/csse3200/game/screens/TurretSelectionScreen.java +++ b/source/core/src/main/com/csse3200/game/screens/TurretSelectionScreen.java @@ -61,14 +61,8 @@ public TurretSelectionScreen(GdxGame game) { turretList = new ArrayList<>(); // Add turrets to the list - turretList.add(TowerType.WEAPON); - turretList.add(TowerType.TNT); - turretList.add(TowerType.DROID); - turretList.add(TowerType.WALL); - turretList.add(TowerType.FIRE); - turretList.add(TowerType.STUN); - turretList.add(TowerType.INCOME); - + turretList.addAll(Arrays.asList(TowerType.values())); + // Restrictions can be added to the arrays i.e. map == "Forest" && level == 1 Skin skin = new Skin(Gdx.files.internal("flat-earth/skin/flat-earth-ui.json")); @@ -143,6 +137,10 @@ public void render(float delta) { stage.draw(); } + public List getTurretList() { + return turretList; + } + @Override public void dispose() { stage.dispose();