Fixed merge conflicts.

source/core/assets/configs/tower.json

@@ -2,51 +2,51 @@
   "income": {
     "health": 10,
     "baseAttack": 0,
-    "cost": 10
+    "cost": 100
   },
   "wall": {
     "health": 300,
     "baseAttack": 0,
-    "cost": 45
+    "cost": 200
   },
   "TNTTower": {
     "health": 10,
     "baseAttack": 5,
-    "cost": 30
+    "cost": 50
   },
   "weapon": {
     "health": 75,
     "baseAttack": 15,
-    "cost": 15
+    "cost": 50
   },
   "DroidTower": {
     "health": 100,
     "baseAttack": 25,
-    "cost": 45
+    "cost": 300
   },
   "fireTower": {
     "health": 100,
     "baseAttack": 25,
-    "cost": 45
+    "cost": 300
   },
   "stunTower": {
     "health": 100,
     "baseAttack": 25,
-    "cost": 45
+    "cost": 500
   },
   "fireworksTower": {
     "health": 125,
     "baseAttack": 45,
-    "cost": 70
+    "cost": 500
   },
   "pierceTower": {
     "health": 125,
     "baseAttack": 45,
-    "cost": 70
+    "cost": 500
   },
   "ricochetTower": {
     "health": 125,
     "baseAttack": 45,
-    "cost": 70
+    "cost": 500
   }
 }

source/core/assets/images/mobs/skeleton.atlas

@@ -69,7 +69,7 @@ skeleton_attack
   index: -1
 skeleton_attack
   rotate: false
-  xy: 514, 2
+  xy: 578, 52
   size: 62, 48
   orig: 62, 48
   offset: 0, 0
@@ -83,7 +83,7 @@ skeleton_attack
   index: -1
 skeleton_attack
   rotate: false
-  xy: 770, 2
+  xy: 834, 52
   size: 62, 48
   orig: 62, 48
   offset: 0, 0
@@ -95,41 +95,6 @@ skeleton_attack
   orig: 62, 48
   offset: 0, 0
   index: -1
-skeleton_death
-  rotate: false
-  xy: 1026, 2
-  size: 62, 48
-  orig: 62, 48
-  offset: 0, 0
-  index: -1
-skeleton_death
-  rotate: false
-  xy: 66, 52
-  size: 62, 48
-  orig: 62, 48
-  offset: 0, 0
-  index: -1
-skeleton_death
-  rotate: false
-  xy: 834, 52
-  size: 62, 48
-  orig: 62, 48
-  offset: 0, 0
-  index: -1
-skeleton_death
-  rotate: false
-  xy: 1154, 55
-  size: 62, 45
-  orig: 62, 45
-  offset: 0, 0
-  index: -1
-skeleton_death
-  rotate: false
-  xy: 578, 2
-  size: 62, 48
-  orig: 62, 48
-  offset: 0, 0
-  index: -1
 skeleton_death
   rotate: false
   xy: 194, 52
@@ -188,7 +153,7 @@ skeleton_walk
   index: -1
 skeleton_walk
   rotate: false
-  xy: 514, 52
+  xy: 514, 2
   size: 62, 48
   orig: 62, 48
   offset: 0, 0
@@ -202,7 +167,7 @@ skeleton_walk
   index: -1
 skeleton_walk
   rotate: false
-  xy: 770, 52
+  xy: 770, 2
   size: 62, 48
   orig: 62, 48
   offset: 0, 0
@@ -237,21 +202,21 @@ skeleton_walk
   index: -1
 skeleton_walk
   rotate: false
-  xy: 578, 52
+  xy: 514, 52
   size: 62, 48
   orig: 62, 48
   offset: 0, 0
   index: -1
 skeleton_walk
   rotate: false
-  xy: 130, 2
+  xy: 66, 52
   size: 62, 48
   orig: 62, 48
   offset: 0, 0
   index: -1
 skeleton_walk
   rotate: false
-  xy: 834, 2
+  xy: 770, 52
   size: 62, 48
   orig: 62, 48
   offset: 0, 0

source/core/src/main/com/csse3200/game/GdxGame.java

@@ -5,6 +5,7 @@
 import com.badlogic.gdx.Screen;
 import com.csse3200.game.files.UserSettings;
 import com.csse3200.game.screens.*;
+import com.csse3200.game.screens.HelpScreen.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -17,7 +18,7 @@
  */
 public class GdxGame extends Game {
   private static final Logger logger = LoggerFactory.getLogger(GdxGame.class);
-
+  public int currentLevel = 0;
   @Override
   public void create() {
     logger.info("Creating game");
@@ -63,30 +64,31 @@ public void dispose() {
    * @return new screen
    */
   private Screen newScreen(ScreenType screenType) {
-    switch (screenType) {
-      case MAIN_MENU:
-        return new MainMenuScreen(this);
-      case MAIN_GAME:
-        return new MainGameScreen(this);
-      case SETTINGS:
-        return new SettingsScreen(this);
-      case STORY_SCREEN:
-        return new StoryScreen(this);
-      case LEVEL_SELECT:
-        return new LevelSelectScreen(this);
-      case LOSING_SCREEN:
-        return new LosingScreen(this);
-      case TURRET_SELECTION:
-        return new TurretSelectionScreen(this);
-      case HELP_SCREEN:
-        return new HelpScreen(this);
-      default:
-        return null;
-    }
+      return switch (screenType) {
+          case Next_Screen -> new NextLevelScreen(this, currentLevel);
+          case Win_Screen -> new WinningScreen(this);
+          case MAIN_MENU -> new MainMenuScreen(this);
+          case MAIN_GAME -> new MainGameScreen(this);
+          case SETTINGS -> new SettingsScreen(this);
+          case STORY_SCREEN -> new StoryScreen(this);
+          case LEVEL_SELECT -> new LevelSelectScreen(this, currentLevel);
+          case LOSING_SCREEN -> new LosingScreen(this);
+          case TURRET_SELECTION -> new TurretSelectionScreen(this);
+          case HELP_SCREEN -> new GameDescriptionHelpScreen(this);
+          case HELP_MOBS_SCREEN -> new MobsDescriptionHelpScreen(this);
+          case HELP_TOWER_SCREEN -> new TowerDescriptionHelpScreen(this);
+          case HELP_BOSS_SCREEN -> new BossDescriptionHelpScreen(this);
+          case LOAD_SCREEN -> new LoadingScreen(this);
+          case HOW_TO_PLAY -> new HowToPlay(this);
+
+          case TUTORIAL_SCREEN-> new Tutorial(this);
+      default-> null;
+      };
   }
 
   public enum ScreenType {
-    MAIN_MENU, MAIN_GAME, SETTINGS, STORY_SCREEN, LEVEL_SELECT, TURRET_SELECTION, LOSING_SCREEN, HELP_SCREEN
+    MAIN_MENU, MAIN_GAME, SETTINGS, STORY_SCREEN, LEVEL_SELECT, TURRET_SELECTION, LOSING_SCREEN, HELP_SCREEN, LOAD_SCREEN,
+    HELP_MOBS_SCREEN, HELP_TOWER_SCREEN, HELP_BOSS_SCREEN, Win_Screen, Next_Screen, HOW_TO_PLAY, TUTORIAL_SCREEN
   }
 
   /**
@@ -95,4 +97,4 @@ public enum ScreenType {
   public void exit() {
     app.exit();
   }
-}
+}

source/core/src/main/com/csse3200/game/ai/tasks/AITaskComponent.java

@@ -1,7 +1,6 @@
 package com.csse3200.game.ai.tasks;
 
 import com.csse3200.game.components.Component;
-import com.csse3200.game.components.ComponentType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -46,8 +45,8 @@ public AITaskComponent addTask(PriorityTask task) {
    */
   public <T extends PriorityTask> T getTask(Class<T> task) {
     for (PriorityTask priorityTask : priorityTasks) {
-      if (priorityTask.getClass() == task) {
-        return (T) priorityTask;
+      if (task.isInstance(priorityTask)) {
+        return task.cast(priorityTask);
       }
     }
     logger.info("Task {} not found", task);
@@ -83,25 +82,17 @@ public void dispose() {
    */
   public void disposeAll() {
     currentTask = null;
-    for (int i = 0; i < priorityTasks.size(); i++) {
-      priorityTasksToBeRestored.add(priorityTasks.get(i));
-    }
-    for (int i = 0; i < priorityTasks.size(); i++) {
-      priorityTasks.remove(i);
-    }
+    priorityTasksToBeRestored.addAll(priorityTasks);
+    priorityTasks.clear();
   }
 
   /**
    * Restores the priorityTasks List. Adds all of the entity's disposed tasks 
    * back into priorityTasks.
    */
   public void restore() {
-    for (int i = 0; i < priorityTasksToBeRestored.size(); i++) {
-      priorityTasks.add(priorityTasksToBeRestored.get(i));
-    }
-    for (int i = 0; i < priorityTasksToBeRestored.size(); i++) {
-      priorityTasksToBeRestored.remove(i);
-    }
+    priorityTasks.addAll(priorityTasksToBeRestored);
+    priorityTasksToBeRestored.clear();
     this.update();
   }