Merge branch 'Team-1-Mobs-Enhancement-variations' of https://github.c…

…om/UQcsse3200/2023-studio-3 into Team-1-Mobs-Enhancement-variations
UQcsse3200 · Oct 11, 2023 · ba147fa · ba147fa
2 parents d1a27f4 + 6039562
commit ba147fa
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 234 deletions.
diff --git a/source/core/assets/configs/Boss.json b/source/core/assets/configs/Boss.json
@@ -1,7 +1,5 @@
 {
   "mobBoss": {
-    "health": 100,
-    "baseAttack": 25,
-    "spookyFactor": 7
+    "baseAttack": 0
   }
 }
diff --git a/source/core/src/main/com/csse3200/game/areas/ForestGameArea.java b/source/core/src/main/com/csse3200/game/areas/ForestGameArea.java
@@ -2,25 +2,11 @@
 
 import com.badlogic.gdx.math.GridPoint2;
 import com.badlogic.gdx.math.Vector2;
-import com.csse3200.game.areas.terrain.TerrainFactory;
-import com.csse3200.game.areas.terrain.TerrainFactory.TerrainType;
 import com.csse3200.game.entities.Entity;
 import com.csse3200.game.entities.factories.*;
-import com.csse3200.game.physics.PhysicsLayer;
 import com.badlogic.gdx.audio.Music;
-import com.badlogic.gdx.math.GridPoint2;
-import com.badlogic.gdx.math.Vector2;
 
-import com.csse3200.game.areas.terrain.TerrainComponent;
-import com.csse3200.game.components.ProjectileEffects;
-import com.csse3200.game.areas.terrain.TerrainFactory;
-import com.csse3200.game.areas.terrain.TerrainFactory.TerrainType;
 import com.csse3200.game.components.ProjectileEffects;
-import com.csse3200.game.entities.Entity;
-import com.csse3200.game.entities.factories.*;
-
-import com.csse3200.game.physics.PhysicsLayer;
-import com.csse3200.game.screens.AssetLoader;
 
 import com.csse3200.game.utils.math.RandomUtils;
 import com.csse3200.game.services.ResourceService;
@@ -29,14 +15,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import java.security.SecureRandom;
-import java.util.Random;
 import java.util.Timer;
 
-import static com.csse3200.game.entities.factories.NPCFactory.createGhost;
 import static com.csse3200.game.screens.AssetLoader.loadAllAssets;
-import java.util.ArrayList;
-
-import java.util.TimerTask;
 
 /** Forest area for the demo game with trees, a player, and some enemies. */
 public class ForestGameArea extends GameArea {
@@ -46,10 +27,6 @@ public class ForestGameArea extends GameArea {
   private static final int NUM_GRUNTS = 5;
   private static final int NUM_BOSS = 4;
 
-
-  private static final int NUM_MOBBOSS2=3;
-  private static final int NUM_MOBBOSS1=1;
-
   private SecureRandom rand = new SecureRandom();
 
   private int wave = 0;
@@ -239,12 +216,6 @@ public class ForestGameArea extends GameArea {
   private Entity player;
   private Entity waves;
 
-  // Variables to be used with spawn projectile methods. This is the variable
-  // that should occupy the direction param.
-  private static final int towardsMobs = 100;
-  private Entity mobBoss2;
-  private Entity mobBoss1;
-
   /**
    * Initialise this ForestGameArea to use the provided TerrainFactory.
    *

diff --git a/source/core/src/main/com/csse3200/game/components/npc/Boss1AnimationController.java b/source/core/src/main/com/csse3200/game/components/npc/Boss1AnimationController.java
diff --git a/source/core/src/main/com/csse3200/game/components/npc/Boss2AnimationController.java b/source/core/src/main/com/csse3200/game/components/npc/Boss2AnimationController.java
diff --git a/source/core/src/main/com/csse3200/game/entities/configs/MobBossConfigs.java b/source/core/src/main/com/csse3200/game/entities/configs/MobBossConfigs.java
@@ -4,7 +4,5 @@
  * Defines the properties stored in ghost king config files to be loaded by the NPC Factory.
  */
 public class MobBossConfigs extends BaseEntityConfig {
-  public int spookyFactor = 0;
-  public int health = 1;
   public int baseAttack = 0;
 }