Merge branch 'Team-1-Mobs-Enhancement-variations'

UQcsse3200 · Oct 16, 2023 · 454cb59 · 454cb59
2 parents 5d41139 + 9e25ea4
commit 454cb59
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 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
@@ -1,7 +1,7 @@
 package com.csse3200.game.components.npc;
 
 import com.csse3200.game.components.Component;
-import com.csse3200.game.components.tasks.mobtask.MobType;
+import com.csse3200.game.components.tasks.MobTask.MobType;
 import com.csse3200.game.entities.Entity;
 import com.csse3200.game.entities.factories.NPCFactory;
 import com.csse3200.game.services.ServiceLocator;

diff --git a/source/core/src/main/com/csse3200/game/components/tasks/MobDodgeTask.java b/source/core/src/main/com/csse3200/game/components/tasks/MobDodgeTask.java
@@ -1,7 +1,7 @@
 package com.csse3200.game.components.tasks;
 
-import com.csse3200.game.components.tasks.mobtask.MobTask;
-import com.csse3200.game.components.tasks.mobtask.MobType;
+import com.csse3200.game.components.tasks.MobTask.MobTask;
+import com.csse3200.game.components.tasks.MobTask.MobType;
 import com.csse3200.game.services.GameTime;
 import com.csse3200.game.services.ServiceLocator;
 

diff --git a/source/core/src/main/com/csse3200/game/components/tasks/MobTask/MobTask.java b/source/core/src/main/com/csse3200/game/components/tasks/MobTask/MobTask.java
@@ -1,4 +1,4 @@
-package com.csse3200.game.components.tasks.mobtask;
+package com.csse3200.game.components.tasks.MobTask;
 
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.utils.Timer;

diff --git a/source/core/src/main/com/csse3200/game/components/tasks/MobTask/MobType.java b/source/core/src/main/com/csse3200/game/components/tasks/MobTask/MobType.java
@@ -1,4 +1,4 @@
-package com.csse3200.game.components.tasks.mobtask;
+package com.csse3200.game.components.tasks.MobTask;
 
 public enum MobType {
     SKELETON(true),

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
@@ -12,8 +12,8 @@
 import com.csse3200.game.components.tasks.MobMeleeAttackTask;
 import com.csse3200.game.components.tasks.MobRangedAttackTask;
 import com.csse3200.game.components.tasks.MobWanderTask;
-import com.csse3200.game.components.tasks.mobtask.MobTask;
-import com.csse3200.game.components.tasks.mobtask.MobType;
+import com.csse3200.game.components.tasks.MobTask.MobTask;
+import com.csse3200.game.components.tasks.MobTask.MobType;
 import com.csse3200.game.entities.Entity;
 import com.csse3200.game.entities.Melee;
 import com.csse3200.game.entities.PredefinedWeapons;

diff --git a/source/core/src/test/com/csse3200/game/components/DodgingComponentTest.java b/source/core/src/test/com/csse3200/game/components/DodgingComponentTest.java
@@ -14,8 +14,8 @@
 import com.csse3200.game.components.npc.DodgingComponent;
 import com.csse3200.game.components.tasks.MobDodgeTask;
 import com.csse3200.game.components.tasks.MobWanderTask;
-import com.csse3200.game.components.tasks.mobtask.MobTask;
-import com.csse3200.game.components.tasks.mobtask.MobType;
+import com.csse3200.game.components.tasks.MobTask.MobTask;
+import com.csse3200.game.components.tasks.MobTask.MobType;
 import com.csse3200.game.entities.Entity;
 import com.csse3200.game.entities.EntityService;
 import com.csse3200.game.entities.factories.NPCFactory;

diff --git a/source/core/src/test/com/csse3200/game/components/SplitMoblingsTest.java b/source/core/src/test/com/csse3200/game/components/SplitMoblingsTest.java
@@ -19,7 +19,7 @@
 
 import com.badlogic.gdx.math.Vector2;
 import com.csse3200.game.components.npc.SplitMoblings;
-import com.csse3200.game.components.tasks.mobtask.MobType;
+import com.csse3200.game.components.tasks.MobTask.MobType;
 import com.csse3200.game.entities.Entity;
 import com.csse3200.game.entities.EntityService;
 import com.csse3200.game.entities.factories.NPCFactory;