UQdeco2800 · hugh5 · Sep 22, 2022 · Sep 22, 2022 · Sep 22, 2022 · Sep 22, 2022
diff --git a/assets/wiki/Beach tile/Beach_bottom.png b/assets/wiki/Beach tile/Beach_bottom.png
diff --git a/assets/wiki/Beach tile/Beach_left.png b/assets/wiki/Beach tile/Beach_left.png
diff --git a/assets/wiki/Beach tile/Beach_right.png b/assets/wiki/Beach tile/Beach_right.png
diff --git a/assets/wiki/Beach tile/Beach_top.png b/assets/wiki/Beach tile/Beach_top.png
diff --git a/assets/wiki/Beach tile/Inner_corner_beach_bottom_left.png b/assets/wiki/Beach tile/Inner_corner_beach_bottom_left.png
diff --git a/assets/wiki/Beach tile/Inner_corner_beach_bottom_right.png b/assets/wiki/Beach tile/Inner_corner_beach_bottom_right.png
diff --git a/assets/wiki/Beach tile/Inner_corner_beach_top_left.png b/assets/wiki/Beach tile/Inner_corner_beach_top_left.png
diff --git a/assets/wiki/Beach tile/Inner_corner_beach_top_right.png b/assets/wiki/Beach tile/Inner_corner_beach_top_right.png
diff --git a/assets/wiki/Beach tile/Outer_corner_beach_bottom_left.png b/assets/wiki/Beach tile/Outer_corner_beach_bottom_left.png
diff --git a/assets/wiki/Beach tile/Outer_corner_beach_bottom_right.png b/assets/wiki/Beach tile/Outer_corner_beach_bottom_right.png
diff --git a/assets/wiki/Beach tile/Outer_corner_beach_top_left.png b/assets/wiki/Beach tile/Outer_corner_beach_top_left.png
diff --git a/assets/wiki/Beach tile/Outer_corner_beach_top_right.png b/assets/wiki/Beach tile/Outer_corner_beach_top_right.png
diff --git a/assets/wiki/Grass/grass1.gif b/assets/wiki/Grass/grass1.gif
diff --git a/assets/wiki/Grass/grass1.png b/assets/wiki/Grass/grass1.png
diff --git a/assets/wiki/Grass/grass2.gif b/assets/wiki/Grass/grass2.gif
diff --git a/assets/wiki/Grass/grass2.png b/assets/wiki/Grass/grass2.png
diff --git a/assets/wiki/Waves tile/Corner_waves_bottom_left.png b/assets/wiki/Waves tile/Corner_waves_bottom_left.png
diff --git a/assets/wiki/Waves tile/Corner_waves_bottom_right.png b/assets/wiki/Waves tile/Corner_waves_bottom_right.png
diff --git a/assets/wiki/Waves tile/Corner_waves_top_left.png b/assets/wiki/Waves tile/Corner_waves_top_left.png
diff --git a/assets/wiki/Waves tile/Corner_waves_top_right.png b/assets/wiki/Waves tile/Corner_waves_top_right.png
diff --git a/assets/wiki/Waves tile/Waves_bottom.png b/assets/wiki/Waves tile/Waves_bottom.png
diff --git a/assets/wiki/Waves tile/Waves_left.png b/assets/wiki/Waves tile/Waves_left.png
diff --git a/assets/wiki/Waves tile/Waves_right.png b/assets/wiki/Waves tile/Waves_right.png
diff --git a/assets/wiki/Waves tile/Waves_top.png b/assets/wiki/Waves tile/Waves_top.png
diff --git a/assets/wiki/weather_change/Rain.gif b/assets/wiki/weather_change/Rain.gif
diff --git a/assets/wiki/weather_change/Rain.png b/assets/wiki/weather_change/Rain.png
diff --git a/assets/wiki/weather_change/snow.gif b/assets/wiki/weather_change/snow.gif
diff --git a/assets/wiki/weather_change/snow.png b/assets/wiki/weather_change/snow.png
diff --git a/assets/wiki/weather_change/thunder.gif b/assets/wiki/weather_change/thunder.gif
diff --git a/assets/wiki/weather_change/thunder.png b/assets/wiki/weather_change/thunder.png
diff --git a/source/core/assets/images/Beach tile/Beach_bottom.png b/source/core/assets/images/Beach tile/Beach_bottom.png
diff --git a/source/core/assets/images/Beach tile/Beach_left.png b/source/core/assets/images/Beach tile/Beach_left.png
diff --git a/source/core/assets/images/Beach tile/Beach_right.png b/source/core/assets/images/Beach tile/Beach_right.png
diff --git a/source/core/assets/images/Beach tile/Beach_top.png b/source/core/assets/images/Beach tile/Beach_top.png
diff --git a/source/core/assets/images/Beach tile/Inner_corner_beach_bottom_left.png b/source/core/assets/images/Beach tile/Inner_corner_beach_bottom_left.png
diff --git a/source/core/assets/images/Beach tile/Inner_corner_beach_bottom_right.png b/source/core/assets/images/Beach tile/Inner_corner_beach_bottom_right.png
diff --git a/source/core/assets/images/Beach tile/Inner_corner_beach_top_left.png b/source/core/assets/images/Beach tile/Inner_corner_beach_top_left.png
diff --git a/source/core/assets/images/Beach tile/Inner_corner_beach_top_right.png b/source/core/assets/images/Beach tile/Inner_corner_beach_top_right.png
diff --git a/source/core/assets/images/Beach tile/Outer_corner_beach_bottom_left.png b/source/core/assets/images/Beach tile/Outer_corner_beach_bottom_left.png
diff --git a/source/core/assets/images/Beach tile/Outer_corner_beach_bottom_right.png b/source/core/assets/images/Beach tile/Outer_corner_beach_bottom_right.png
diff --git a/source/core/assets/images/Beach tile/Outer_corner_beach_top_left.png b/source/core/assets/images/Beach tile/Outer_corner_beach_top_left.png
diff --git a/source/core/assets/images/Beach tile/Outer_corner_beach_top_right.png b/source/core/assets/images/Beach tile/Outer_corner_beach_top_right.png
diff --git a/source/core/assets/images/Rain.png b/source/core/assets/images/Rain.png
diff --git a/source/core/assets/images/Sand Grass Tile/corner_sand_grass_1.png b/source/core/assets/images/Sand Grass Tile/corner_sand_grass_1.png
diff --git a/source/core/assets/images/Sand Grass Tile/corner_sand_grass_2.png b/source/core/assets/images/Sand Grass Tile/corner_sand_grass_2.png
diff --git a/source/core/assets/images/Sand Grass Tile/corner_sand_grass_3.png b/source/core/assets/images/Sand Grass Tile/corner_sand_grass_3.png
diff --git a/source/core/assets/images/Sand Grass Tile/corner_sand_grass_4.png b/source/core/assets/images/Sand Grass Tile/corner_sand_grass_4.png
diff --git a/source/core/assets/images/Sand Grass Tile/corner_sand_grass_5.png b/source/core/assets/images/Sand Grass Tile/corner_sand_grass_5.png
diff --git a/source/core/assets/images/Sand Grass Tile/corner_sand_grass_6.png b/source/core/assets/images/Sand Grass Tile/corner_sand_grass_6.png
diff --git a/source/core/assets/images/Sand Grass Tile/corner_sand_grass_7.png b/source/core/assets/images/Sand Grass Tile/corner_sand_grass_7.png
diff --git a/source/core/assets/images/Sand Grass Tile/corner_sand_grass_8.png b/source/core/assets/images/Sand Grass Tile/corner_sand_grass_8.png
diff --git a/source/core/assets/images/Sand Grass Tile/main_sand_grass_1.png b/source/core/assets/images/Sand Grass Tile/main_sand_grass_1.png
diff --git a/source/core/assets/images/Sand Grass Tile/main_sand_grass_2.png b/source/core/assets/images/Sand Grass Tile/main_sand_grass_2.png
diff --git a/source/core/assets/images/Sand Grass Tile/main_sand_grass_3.png b/source/core/assets/images/Sand Grass Tile/main_sand_grass_3.png
diff --git a/source/core/assets/images/Sand Grass Tile/main_sand_grass_4.png b/source/core/assets/images/Sand Grass Tile/main_sand_grass_4.png
diff --git a/source/core/assets/images/Sand Grass Tile/sand_tile.png b/source/core/assets/images/Sand Grass Tile/sand_tile.png
diff --git a/source/core/assets/images/Waves tile/Corner_waves_bottom_left.png b/source/core/assets/images/Waves tile/Corner_waves_bottom_left.png
diff --git a/source/core/assets/images/Waves tile/Corner_waves_bottom_right.png b/source/core/assets/images/Waves tile/Corner_waves_bottom_right.png
diff --git a/source/core/assets/images/Waves tile/Corner_waves_top_left.png b/source/core/assets/images/Waves tile/Corner_waves_top_left.png
diff --git a/source/core/assets/images/Waves tile/Corner_waves_top_right.png b/source/core/assets/images/Waves tile/Corner_waves_top_right.png
diff --git a/source/core/assets/images/Waves tile/Waves_bottom.png b/source/core/assets/images/Waves tile/Waves_bottom.png
diff --git a/source/core/assets/images/Waves tile/Waves_left.png b/source/core/assets/images/Waves tile/Waves_left.png
diff --git a/source/core/assets/images/Waves tile/Waves_right.png b/source/core/assets/images/Waves tile/Waves_right.png
diff --git a/source/core/assets/images/Waves tile/Waves_top.png b/source/core/assets/images/Waves tile/Waves_top.png
diff --git a/source/core/assets/images/Waves tile/wave_1.png b/source/core/assets/images/Waves tile/wave_1.png
diff --git a/source/core/assets/images/Waves tile/wave_2.png b/source/core/assets/images/Waves tile/wave_2.png
diff --git a/source/core/assets/images/Waves tile/wave_3.png b/source/core/assets/images/Waves tile/wave_3.png
diff --git a/source/core/assets/images/Waves tile/wave_4.png b/source/core/assets/images/Waves tile/wave_4.png
diff --git a/source/core/assets/images/Waves tile/wave_5.png b/source/core/assets/images/Waves tile/wave_5.png
diff --git a/source/core/assets/images/Waves tile/wave_6.png b/source/core/assets/images/Waves tile/wave_6.png
diff --git a/source/core/assets/images/Waves tile/wave_7.png b/source/core/assets/images/Waves tile/wave_7.png
diff --git a/source/core/assets/images/barracks_level_1.1.png b/source/core/assets/images/barracks_level_1.1.png
diff --git a/source/core/assets/images/barracks_level_1.1_highlight.png b/source/core/assets/images/barracks_level_1.1_highlight.png
diff --git a/source/core/assets/images/barracks_level_1.2.png b/source/core/assets/images/barracks_level_1.2.png
diff --git a/source/core/assets/images/barracks_level_1.2_highlight.png b/source/core/assets/images/barracks_level_1.2_highlight.png
diff --git a/source/core/assets/images/grass1.png b/source/core/assets/images/grass1.png
diff --git a/source/core/assets/images/grass2.png b/source/core/assets/images/grass2.png
diff --git a/source/core/assets/images/health bar_1.png b/source/core/assets/images/health bar_1.png
diff --git a/source/core/assets/images/health bar_2.png b/source/core/assets/images/health bar_2.png
diff --git a/source/core/assets/images/health bar_3.png b/source/core/assets/images/health bar_3.png
diff --git a/source/core/assets/images/health bar_4.png b/source/core/assets/images/health bar_4.png
diff --git a/source/core/assets/images/health bar_5.png b/source/core/assets/images/health bar_5.png
diff --git a/source/core/assets/images/health bar_6.png b/source/core/assets/images/health bar_6.png
diff --git a/source/core/assets/images/loading bar_1.png b/source/core/assets/images/loading bar_1.png
diff --git a/source/core/assets/images/loading bar_2.png b/source/core/assets/images/loading bar_2.png
diff --git a/source/core/assets/images/loading bar_3.png b/source/core/assets/images/loading bar_3.png
diff --git a/source/core/assets/images/loading bar_4.png b/source/core/assets/images/loading bar_4.png
diff --git a/source/core/assets/images/loading bar_5.png b/source/core/assets/images/loading bar_5.png
diff --git a/source/core/assets/images/snow.png b/source/core/assets/images/snow.png
diff --git a/source/core/assets/images/thunder.png b/source/core/assets/images/thunder.png
diff --git a/source/core/assets/images/weather-filter/Rain.png b/source/core/assets/images/weather-filter/Rain.png
diff --git a/source/core/assets/images/weather-filter/ice-frames.png b/source/core/assets/images/weather-filter/ice-frames.png
diff --git a/source/core/assets/images/weather-filter/rainEffects.png b/source/core/assets/images/weather-filter/rainEffects.png
diff --git a/source/core/assets/images/weather-filter/rain_effect.atlas b/source/core/assets/images/weather-filter/rain_effect.atlas
@@ -0,0 +1,19 @@
+rainEffects.png
+size: 200, 100
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+rain_first
+  rotate: false
+  xy: 0, 0
+  size: 1000, 1000
+  orig: 1000, 1000
+  offset: 0, 0
+  index: 0
+rain_first
+  rotate: false
+  xy: 100, 0
+  size: 1000, 1000
+  orig: 1000, 1000
+  offset: 0, 0
+  index: 1
diff --git a/source/core/assets/images/weather-filter/snow.png b/source/core/assets/images/weather-filter/snow.png
diff --git a/source/core/assets/images/weather-filter/snowfall_1.png b/source/core/assets/images/weather-filter/snowfall_1.png
diff --git a/source/core/assets/images/weather-filter/snowfall_2.png b/source/core/assets/images/weather-filter/snowfall_2.png
diff --git a/source/core/assets/images/weather-filter/snowfall_3.png b/source/core/assets/images/weather-filter/snowfall_3.png
diff --git a/source/core/assets/images/weather-filter/thunder.png b/source/core/assets/images/weather-filter/thunder.png
diff --git a/source/core/src/main/com/deco2800/game/GdxGame.java b/source/core/src/main/com/deco2800/game/GdxGame.java
@@ -4,10 +4,7 @@
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Screen;
 import com.deco2800.game.files.UserSettings;
-import com.deco2800.game.screens.MainGameScreen;
-import com.deco2800.game.screens.MainMenuScreen;
-import com.deco2800.game.screens.StoryScreen;
-import com.deco2800.game.screens.SettingsScreen;
+import com.deco2800.game.screens.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -76,14 +73,18 @@ private Screen newScreen(ScreenType screenType) {
         return new MainGameScreen(this);
       case SETTINGS:
         return new SettingsScreen(this);
+      case TUTORIAL:
+        return new TutorialScreen(this);
+      case LOADING:
+        return new LoadingScreen(this);
 
       default:
         return null;
     }
   }
 
   public enum ScreenType {
-    MAIN_MENU, MAIN_GAME, SETTINGS, GAME_STORY;
+    MAIN_MENU, MAIN_GAME, SETTINGS, GAME_STORY, TUTORIAL, LOADING;
   }
 
   /**

diff --git a/source/core/src/main/com/deco2800/game/areas/AtlantisGameArea.java b/source/core/src/main/com/deco2800/game/areas/AtlantisGameArea.java
@@ -14,13 +14,13 @@
 import com.deco2800.game.areas.MapGenerator.Buildings.Building;
 import com.deco2800.game.areas.MapGenerator.Buildings.BuildingGenerator;
 import com.deco2800.game.areas.MapGenerator.Buildings.CityRow;
-import com.deco2800.game.areas.MapGenerator.pathBuilding.PathGenerator;
 import com.deco2800.game.areas.MapGenerator.Coordinate;
 import com.deco2800.game.areas.MapGenerator.MapGenerator;
 import com.deco2800.game.areas.MapGenerator.ResourceSpecification;
 import com.deco2800.game.areas.terrain.AtlantisTerrainFactory;
 import com.deco2800.game.areas.terrain.MinimapComponent;
 import com.deco2800.game.components.UnitSpawningComponent;
+import com.deco2800.game.areas.terrain.TerrainTile;
 import com.deco2800.game.components.building.BuildingActions;
 import com.deco2800.game.components.building.TextureScaler;
 import com.deco2800.game.components.friendlyunits.GestureDisplay;
@@ -30,8 +30,6 @@
 import com.deco2800.game.components.maingame.DialogueBoxDisplay;
 import com.deco2800.game.components.maingame.Explosion;
 import com.deco2800.game.components.maingame.InfoBoxDisplay;
-import com.deco2800.game.areas.terrain.MinimapComponent;
-import com.deco2800.game.areas.terrain.TerrainTile;
 import com.deco2800.game.entities.Entity;
 import com.deco2800.game.entities.UnitType;
 import com.deco2800.game.entities.factories.BuildingFactory;
@@ -43,23 +41,17 @@
 import com.deco2800.game.entities.factories.*;
 import com.deco2800.game.input.CameraInputComponent;
 import com.deco2800.game.map.MapComponent;
-import com.deco2800.game.rendering.TextureRenderComponent;
-import com.deco2800.game.services.ResourceService;
-import com.deco2800.game.services.ServiceLocator;
-import com.deco2800.game.components.gamearea.GameAreaDisplay;
 import com.deco2800.game.physics.components.ColliderComponent;
 import com.deco2800.game.services.ResourceService;
 import com.deco2800.game.services.ServiceLocator;
 import com.deco2800.game.worker.WorkerBaseFactory;
 import com.deco2800.game.worker.resources.MiningCampFactory;
-import com.deco2800.game.worker.resources.StoneFactory;
 import com.deco2800.game.worker.resources.TreeFactory;
 import com.deco2800.game.worker.type.BuilderFactory;
 import com.deco2800.game.worker.type.ForagerFactory;
 import com.deco2800.game.worker.type.MinerFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.Text;
 
 import java.lang.annotation.Target;
 import java.util.List;
@@ -74,28 +66,32 @@ public class AtlantisGameArea extends GameArea {
     private static final Logger logger = LoggerFactory.getLogger(ForestGameArea.class);
     private static final int NUM_TREES = 5;
     private static final int NUM_STONE = 10;
-    private static final String[] forestTextures = {
+    public static final String[] forestTextures = {
             "test/files/dummyTexture.png",
             "test/files/dummyOcean.png",
             "images/Ocean.png",
             "images/Sand.png",
             "images/Grass.png",
             "images/city_tile.png",
-            "images/box_boy_leaf.png",
-            "images/box_boy.png",
-            "images/Base_Highlight.png",
-            "images/box_boy_highlight.png",
+//            "images/box_boy_leaf.png",
+//            "images/box_boy.png",
+//            "images/Base_Highlight.png",
+//            "images/box_boy_highlight.png",
             "images/tree.png",
             "images/iso_grass_1.png",
-            "images/ghost_king.png",
-            "images/ghost_1.png",
+//            "images/ghost_king.png",
+//            "images/ghost_1.png",
             "images/grass_1.png",
             "images/grass_2.png",
             "images/grass_3.png",
             "images/sea_1.png",
             "images/sea_2.png",
             "images/sea_3.png",
             "images/sea_4.png",
+            "images/Waves tile/wave_1.png",
+            "images/Waves tile/wave_2.png",
+            "images/Waves tile/wave_3.png",
+            "images/Waves tile/wave_4.png",
             "images/hex_grass_1.png",
             "images/hex_grass_2.png",
             "images/hex_grass_3.png",
@@ -110,6 +106,7 @@ public class AtlantisGameArea extends GameArea {
             /* Building assets */
             // TownHall
             "images/base.png",
+            "images/level 1 town hall.png",
             // Barracks
             "images/barracks_level_1.0.png",
             "images/barracks_level_1.0_Highlight.png",
@@ -140,6 +137,7 @@ public class AtlantisGameArea extends GameArea {
             "images/stone_wall_2_.png",
             "images/stone_wall_3.png",
             "images/Base_Highlight",
+            "images/level_1_town_hall_Highlight.png",
             "images/stone.png",
             "images/archer.png",
             "images/swordsman.png",
@@ -160,25 +158,25 @@ public class AtlantisGameArea extends GameArea {
             "images/pathTile.png",
             "images/spellbox-zeus.png",
             "images/spell-btn-unclickable.png",
-            "images/spell-btn.png"
-
+            "images/spell-btn.png",
+            "images/health bar_6.png",
     };
 
     /* TODO: remove unused textures wasting precious resources */
-    private static final String[] uiTextures = {
+    public static final String[] uiTextures = {
             "images/dialogue_box_pattern2_background.png",
             "images/dialogue_box_image_default.png",
             "images/exit-button.PNG",
             "images/dialogue_box_background_Deep_Sea.png"
     };
 
-    private final String[] buildingPlacementTextures = {
+    public static final String[] buildingPlacementTextures = {
             "images/barracks_highlight_red.png",
             "images/barracks_highlight_green.png",
             "images/wooden_wall_green.png",
             "images/wooden_wall_red.png"
     };
-    private static final String[] forestTextureAtlases = {
+    public static final String[] forestTextureAtlases = {
             "images/terrain_iso_grass.atlas", "images/ghost.atlas", "images/ghostKing.atlas",
             "images/forager.atlas", "images/miner.atlas", "images/builder.atlas",
             "images/duration-bar.atlas", "images/archer.atlas", "images/swordsman.atlas",
@@ -188,7 +186,7 @@ public class AtlantisGameArea extends GameArea {
             "images/newwolf.atlas", "images/forager.atlas","images/tree_.atlas",
             "images/spell.atlas", "images/titanshrine.atlas", "images/ship2.atlas"
     };
-    private static final String[] atlantisSounds = {"sounds/Impact4.ogg"};
+    public static final String[] atlantisSounds = {"sounds/Impact4.ogg"};
 
     Music music = Gdx.audio.newMusic(Gdx.files.internal("sounds/in-game-v3.wav"));
 
@@ -220,7 +218,7 @@ public void create() {
         gameAreaEventHandle.addListener("spawnTitan", this::spawnTitan);
         gameAreaEventHandle.addListener("spawnBlueJoker", this::spawnBlueJokers);
 
-        loadAssets();
+//        loadAssets();
         displayUI();
         spawnTerrain();
 
@@ -235,7 +233,7 @@ public void create() {
         spawnMiner();
 
         //playMusic();
-        player = spawnPlayer();
+//        player = spawnPlayer();
         centreCameraOnCity();
 
         // Spawn Buildings in the city
@@ -362,12 +360,9 @@ private void displayUI() {
         spawnEntity(gestureDisplay);
 
         Entity dialogueBox = new Entity();
-        /* FIXME: temporary infobox width value */
-        this.dialogueBoxDisplay = new DialogueBoxDisplay(537f);
-        dialogueBoxDisplay.setDialogue("This is example dialogue text");
-        dialogueBoxDisplay.setTitle("example title");
-        dialogueBox.addComponent(dialogueBoxDisplay);
-        dialogueBox.addComponent(new DialogueBoxActions(dialogueBoxDisplay));
+        this.dialogueBoxDisplay = new DialogueBoxDisplay();
+        dialogueBox.addComponent(this.dialogueBoxDisplay);
+        dialogueBox.addComponent(new DialogueBoxActions(this.dialogueBoxDisplay));
 
         //spawnEntity(dialogueBox);
     }

diff --git a/source/core/src/main/com/deco2800/game/areas/TutorialGameArea.java b/source/core/src/main/com/deco2800/game/areas/TutorialGameArea.java
@@ -0,0 +1,67 @@
+package com.deco2800.game.areas;
+
+import com.deco2800.game.components.maingame.DialogueBoxActions;
+import com.deco2800.game.components.maingame.DialogueBoxDisplay;
+import com.deco2800.game.entities.Entity;
+import com.deco2800.game.services.ResourceService;
+import com.deco2800.game.services.ServiceLocator;
+
+public class TutorialGameArea extends GameArea {
+
+    /** dialogue box */
+    private DialogueBoxDisplay dialogueBoxDisplay;
+
+    /** textures needed to load */
+    private String[] tutorialTextures = {
+            "images/dialogue_box_pattern2_background.png",
+            "images/dialogue_box_image_default.png",
+            "images/exit-button.PNG",
+            "images/dialogue_box_background_Deep_Sea.png"
+    };
+
+    /**
+     * On init load needed textures
+     */
+    private void loadAssets() {
+
+        ResourceService resourceService = ServiceLocator.getResourceService();
+        resourceService.loadTextures(this.tutorialTextures);
+        resourceService.loadAll();
+    }
+
+    /**
+     * On exit clean-up loaded textures
+     */
+    private void unloadAssets() {
+
+        ResourceService resourceService = ServiceLocator.getResourceService();
+        resourceService.unloadAssets(this.tutorialTextures);
+    }
+
+    /**
+     * Create and spawn entities to this area
+     */
+    private void displayUI() {
+
+        Entity dialogueBox = new Entity();
+        this.dialogueBoxDisplay = new DialogueBoxDisplay();
+        dialogueBox.addComponent(this.dialogueBoxDisplay)
+                .addComponent(new DialogueBoxActions(this.dialogueBoxDisplay));
+
+        spawnEntity(dialogueBox);
+    }
+
+    @Override
+    public void create() {
+
+        this.loadAssets();
+        this.displayUI();
+    }
+
+    @Override
+    public void dispose() {
+
+        super.dispose();
+        this.unloadAssets();
+    }
+}
diff --git a/source/core/src/main/com/deco2800/game/areas/terrain/AtlantisTerrainFactory.java b/source/core/src/main/com/deco2800/game/areas/terrain/AtlantisTerrainFactory.java
@@ -132,7 +132,8 @@ private void fillTiles(TiledMapTileLayer layer) {
         oceanFrames.add(new StaticTiledMapTile(textures.get("Sea2")));
         oceanFrames.add(new StaticTiledMapTile(textures.get("Sea3")));
         oceanFrames.add(new StaticTiledMapTile(textures.get("Sea4")));
-        AnimatedTiledMapTile animatedOceanTile = new AnimatedTiledMapTile(1/3f, oceanFrames);
+        AnimatedTiledMapTile animatedOceanTile = new AnimatedTiledMapTile(1f/2f, oceanFrames);
+
 
         //Set id for each tile - used for visualising minimap
         cityTile.setId(0);

diff --git a/source/core/src/main/com/deco2800/game/components/CombatStatsComponent.java b/source/core/src/main/com/deco2800/game/components/CombatStatsComponent.java
@@ -30,8 +30,8 @@ public CombatStatsComponent(int troops, int health, int baseAttack, int baseDefe
 
   public CombatStatsComponent(int troops, int health, int baseAttack, int baseDefence, float landSpeed, int range) {
     setTroops(troops);
-    setHealth(health);
     setMaxHealth(health);
+    setHealth(health);
     setBaseAttack(baseAttack);
     setBaseDefence(baseDefence);
     setLandSpeed(landSpeed);
@@ -142,6 +142,9 @@ public int getMaxHealth() {
   public void setHealth(int health) {
     if (health >= 0) {
       this.health = health;
+      if (health > maxHealth) {
+        this.health = maxHealth;
+      }
     } else {
       this.health = 0;
     }
@@ -151,12 +154,14 @@ public void setHealth(int health) {
   }
 
   /**
-   * Sets the entity's maximum health. Health has a minimum bound of 0.
-   *
-   * @param maxHealth maximum health
+   * Sets the entity's maximum health. Maximum Health must be greater than or equal to 0.
+   * @param maxHealth Maximum health an entity can have
    */
   public void setMaxHealth(int maxHealth) {
     this.maxHealth = maxHealth;
+    if (this.maxHealth < 0) {
+      this.maxHealth = 0;
+    }
   }
 
   /**

diff --git a/source/core/src/main/com/deco2800/game/components/EntityType.java b/source/core/src/main/com/deco2800/game/components/EntityType.java
@@ -0,0 +1,7 @@
+package com.deco2800.game.components;
+
+public enum EntityType {
+    FRIENDLY,
+    ENEMY,
+    BUILDING
+}