Rolled back some stuff because I merged poorly

UQcsse3200 · Oct 16, 2023 · 289adff · 289adff
1 parent 60f051d
commit 289adff
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/source/core/src/main/com/csse3200/game/components/npc/SplitMoblings.java b/source/core/src/main/com/csse3200/game/components/npc/SplitMoblings.java
@@ -167,7 +167,8 @@ public void spawnAdditionalMob(float positionX, float positionY,
 
     ServiceLocator.getEntityService().register(entityType);
 
-    ServiceLocator.getWaveService().setEnemyCount(ServiceLocator.getWaveService().getEnemyCount() + 1);
+    // ServiceLocator.getWaveService().setEnemyCount(ServiceLocator.getWaveService().getEnemyCount() + 1);
+    //ServiceLocator.getWaveService().setEnemyCount(ServiceLocator.getWaveService().getEnemyCount() + 1);
   }
 
   /**

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
@@ -71,6 +71,31 @@ public static Entity createGhost() {
     return ghost;
   }
 
+  /**
+   * Creates a ghost king entity.
+   * 
+   * @return entity
+   */
+  public static Entity createGhostKing() {
+    Entity ghostKing = createMeleeBaseNPC();
+    GhostKingConfig config = configs.ghostKing;
+
+    AnimationRenderComponent animator =
+        new AnimationRenderComponent(
+            ServiceLocator.getResourceService()
+                .getAsset("images/ghostKing.atlas", TextureAtlas.class));
+    animator.addAnimation("float", 0.2f, Animation.PlayMode.LOOP);
+    animator.addAnimation("angry_float", 0.2f, Animation.PlayMode.LOOP);
+
+    ghostKing
+        .addComponent(new CombatStatsComponent(config.health, config.baseAttack))
+        .addComponent(animator)
+        .addComponent(new GhostAnimationController());
+
+    ghostKing.getComponent(AnimationRenderComponent.class).scaleEntity();
+    return ghostKing;
+  }
+
   /**
    * Creates a fire worm entity.
    *

diff --git a/source/core/src/main/com/csse3200/game/entities/factories/WaveFactory.java b/source/core/src/main/com/csse3200/game/entities/factories/WaveFactory.java
@@ -67,11 +67,6 @@ public class WaveFactory {
       )), new ArrayList<>(Arrays.asList("FireWorm", "SplittingRocky", "Necromancer"
       )), new ArrayList<>(Arrays.asList("SplittingRocky", "DeflectFireWizard", "FireWorm"
       )), new ArrayList<>(Arrays.asList("DeflectFireWizard", "SplittingRocky", "Necromancer", "DodgingDragon", "FireWorm"
-      )), new ArrayList<>(Arrays.asList("DeflectFireWizard","SplittingRocky", "Necromancer"
-      )), new ArrayList<>(Arrays.asList("DodgingDragon", "DeflectFireWizard", "SplittingRocky", "Necromancer"
-      )), new ArrayList<>(Arrays.asList("FireWorm", "DeflectWizard", "DodgingDragon"
-      )), new ArrayList<>(Arrays.asList("FireWorm", "DeflectWizard", "Necromancer"
-      )), new ArrayList<>(Arrays.asList("Necromancer", "DeflectFireWizard", "SplittingRocky", "DodgingDragon", "FireWorm"
       ))
   ));
 

diff --git a/source/core/src/test/com/csse3200/game/components/SplitMoblingsTest.java b/source/core/src/test/com/csse3200/game/components/SplitMoblingsTest.java
@@ -66,7 +66,7 @@ public void setUp() {
     resourceService.loadTextureAtlases(atlas);
     resourceService.loadAll();
 
-    WaveService waveService = mock(WaveService.class);
+    WaveService waveService = new WaveService();
     ServiceLocator.registerWaveService(waveService);
 
     baseMob = createSplitMob(BASE_AMOUNT);