Changed the astronaut NPC completely

UQcsse3200 · Oct 19, 2023 · ef46696 · ef46696
1 parent 5381eb8
commit ef46696
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 38 deletions.
diff --git a/source/core/assets/images/npc/Astronaut.atlas b/source/core/assets/images/npc/Astronaut.atlas
@@ -115,3 +115,10 @@ Astro_Right
   orig: 32, 32
   offset: 0, 0
   index: -1
+Astro_Stand
+  rotate: false
+  xy: 256, 0
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
diff --git a/source/core/assets/levels/cryoheim/main_area/entities/astronaut.json b/source/core/assets/levels/cryoheim/main_area/entities/astronaut.json
@@ -3,7 +3,7 @@
   "entities": [
     {
       "class": "com.csse3200.game.entities.configs.AstronautConfig",
-      "spritePath": "images/npc/astronaut_npc.atlas",
+      "spritePath": "images/npc/Astronaut.atlas",
       "position" : {
         "x": 15,
         "y": 38

diff --git a/source/core/assets/levels/cryoheim/main_area/main.json b/source/core/assets/levels/cryoheim/main_area/main.json
@@ -26,6 +26,7 @@
       "map/heatzone.png",
       "particle-effects/explosion/particle.png",
       "images/npc/astronaut_npc.png",
+      "images/npc/Astronaut.png",
       "images/space_navigation_planet_2.png","images/upgradetree/sword.png"
     ],
     "textureAtlasPaths": [
@@ -35,6 +36,7 @@
       "images/boss_enemy.atlas",
       "images/botanist.atlas",
       "images/weapons/wrench.atlas",
+      "images/npc/Astronaut.atlas",
       "images/npc/astronaut_npc.atlas",
       "images/botanist.atlas"
     ],

diff --git a/source/core/assets/levels/flora_haven/main_area/entities/astro.json b/source/core/assets/levels/flora_haven/main_area/entities/astro.json
@@ -3,7 +3,7 @@
   "entities": [
     {
       "class": "com.csse3200.game.entities.configs.AstronautConfig",
-      "spritePath": "images/npc/astronaut_npc.atlas",
+      "spritePath": "images/npc/Astronaut.atlas",
       "position" : {
         "x": 13,
         "y": 40

diff --git a/source/core/src/main/com/csse3200/game/components/npc/AstronautAnimationController.java b/source/core/src/main/com/csse3200/game/components/npc/AstronautAnimationController.java
@@ -28,7 +28,7 @@ public void create() {
         animator = entity.getComponent(AnimationRenderComponent.class);
 
         // Start with the default animation.
-        animator.startAnimation("row-1-column-1");
+        animator.startAnimation("Astro_Stand");
     }
 
     @Override
@@ -48,25 +48,11 @@ public void update() {
 
             // Switch between animations.
             switch (animator.getCurrentAnimation()) {
-                case "row-1-column-1" -> animator.startAnimation("row-1-column-2");
-                case "row-1-column-2" -> animator.startAnimation("row-1-column-3");
-                case "row-1-column-3" -> animator.startAnimation("row-1-column-4");
-                case "row-1-column-4" -> animator.startAnimation("row-2-column-1");
-                case "row-2-column-1" -> animator.startAnimation("row-2-column-2");
-                case "row-2-column-2" -> animator.startAnimation("row-2-column-3");
-                case "row-2-column-3" -> animator.startAnimation("row-2-column-4");
-                case "row-2-column-4" -> animator.startAnimation("row-3-column-1");
-                case "row-3-column-1" -> animator.startAnimation("row-3-column-2");
-                case "row-3-column-2" -> animator.startAnimation("row-3-column-3");
-                case "row-3-column-3" -> animator.startAnimation("row-3-column-4");
-                case "row-3-column-4" -> animator.startAnimation("row-4-column-1");
-                case "row-4-column-1" -> animator.startAnimation("row-4-column-2");
-                case "row-4-column-2" -> animator.startAnimation("row-4-column-3");
-                case "row-4-column-3" -> animator.startAnimation("row-4-column-4");
-                case "row-4-column-4" -> animator.startAnimation("row-1-column-1");
+                case "Astro_Left" -> animator.startAnimation("Astro_Left");
+                case "Astro_Right" -> animator.startAnimation("Astro_Right");
                 default ->
                     // Default to the bottom animation if not in any specific state.
-                        animator.startAnimation("row-1-column-1");
+                        animator.startAnimation("Astro_Stand");
             }
         }
     }

diff --git a/source/core/src/main/com/csse3200/game/entities/factories/NPCFactory.java b/source/core/src/main/com/csse3200/game/entities/factories/NPCFactory.java
@@ -235,23 +235,10 @@ public static Entity createAstronaut(AstronautConfig astronautConfig) {
     AnimationRenderComponent animator =
             new AnimationRenderComponent(
                     ServiceLocator.getResourceService().getAsset(astronautConfig.spritePath, TextureAtlas.class));
-    animator.addAnimation("row-1-column-1", 0.01f, Animation.PlayMode.LOOP);
-    animator.addAnimation("row-1-column-2", 0.01f, Animation.PlayMode.LOOP);
-    animator.addAnimation("row-1-column-3", 0.01f, Animation.PlayMode.LOOP);
-    animator.addAnimation("row-1-column-4", 0.01f, Animation.PlayMode.LOOP);
-    animator.addAnimation("row-2-column-1", 0.01f, Animation.PlayMode.LOOP);
-    animator.addAnimation("row-2-column-2", 0.01f, Animation.PlayMode.LOOP);
-    animator.addAnimation("row-2-column-3", 0.01f, Animation.PlayMode.LOOP);
-    animator.addAnimation("row-2-column-4", 0.01f, Animation.PlayMode.LOOP);
-    animator.addAnimation("row-3-column-1", 0.01f, Animation.PlayMode.LOOP);
-    animator.addAnimation("row-3-column-2", 0.01f, Animation.PlayMode.LOOP);
-    animator.addAnimation("row-3-column-3", 0.01f, Animation.PlayMode.LOOP);
-    animator.addAnimation("row-3-column-4", 0.01f, Animation.PlayMode.LOOP);
-    animator.addAnimation("row-4-column-1", 0.01f, Animation.PlayMode.LOOP);
-    animator.addAnimation("row-4-column-2", 0.01f, Animation.PlayMode.LOOP);
-    animator.addAnimation("row-4-column-3", 0.01f, Animation.PlayMode.LOOP);
-    animator.addAnimation("row-4-column-4", 0.01f, Animation.PlayMode.LOOP);
-
+    animator.addAnimation("Astro_Stand", 1f, Animation.PlayMode.NORMAL);
+    animator.addAnimation("Astro_Down", 1f, Animation.PlayMode.LOOP);
+    animator.addAnimation("Astro_Left", 1f, Animation.PlayMode.LOOP);
+    animator.addAnimation("Astro_Right", 1f, Animation.PlayMode.LOOP);
 
     Entity astronaut =
             new Entity()

diff --git a/source/core/src/test/com/csse3200/game/components/npc/AstronautAnimationControllerTest.java b/source/core/src/test/com/csse3200/game/components/npc/AstronautAnimationControllerTest.java
@@ -32,7 +32,8 @@ class AstronautAnimationControllerTest {
     void setUp() {
         MockitoAnnotations.openMocks(this);
 
-        when(assetManager.get("images/npc/astronaut_npc.atlas")).thenReturn(atlas);
+//        when(assetManager.get("images/npc/astronaut_npc.atlas")).thenReturn(atlas);
+        when(assetManager.get("images/npc/Astronaut.atlas")).thenReturn(atlas);
 
         controller = new AstronautAnimationController();