Pulled changes from Ahmad's branch.

UQcsse3200 · Sep 5, 2023 · 81f1d2f · 81f1d2f
1 parent 25ade84
commit 81f1d2f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 30 deletions.
diff --git a/source/core/src/main/com/csse3200/game/components/tasks/EngineerCombatTask.java b/source/core/src/main/com/csse3200/game/components/tasks/EngineerCombatTask.java
@@ -6,7 +6,7 @@
 import com.csse3200.game.entities.Entity;
 import com.csse3200.game.entities.factories.ProjectileFactory;
 import com.csse3200.game.physics.PhysicsEngine;
-import com.csse3200.game.physics.PhysicsLayer;git pu
+import com.csse3200.game.physics.PhysicsLayer;
 import com.csse3200.game.physics.raycast.RaycastHit;
 import com.csse3200.game.services.GameTime;
 import com.csse3200.game.services.ServiceLocator;

diff --git a/source/core/src/main/com/csse3200/game/entities/factories/EngineerFactory.java b/source/core/src/main/com/csse3200/game/entities/factories/EngineerFactory.java
@@ -1,35 +1,10 @@
 package com.csse3200.game.entities.factories;
 
-<<<<<<< HEAD
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.graphics.g2d.Animation;
-import com.badlogic.gdx.graphics.g2d.TextureAtlas;
-import com.badlogic.gdx.physics.box2d.BodyDef.BodyType;
-import com.csse3200.game.ai.tasks.AITaskComponent;
-import com.csse3200.game.components.CombatStatsComponent;
-import com.csse3200.game.entities.Entity;
-import com.csse3200.game.physics.PhysicsLayer;
-import com.csse3200.game.physics.components.ColliderComponent;
-import com.csse3200.game.physics.components.HitboxComponent;
-import com.csse3200.game.physics.components.PhysicsComponent;
-import com.csse3200.game.files.FileLoader;
-import com.csse3200.game.rendering.AnimationRenderComponent;
-import com.csse3200.game.rendering.TextureRenderComponent;
-import com.csse3200.game.services.ServiceLocator;
-import com.csse3200.game.entities.configs.EngineerConfig;
-import com.csse3200.game.components.tasks.EngineerCombatTask;
-
-public class EngineerFactory {
-    private static final EngineerConfig config =
-            FileLoader.readClass(EngineerConfig.class, "configs/Engineer.json");
-}
-=======
 import com.badlogic.gdx.graphics.g2d.Animation;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
 import com.badlogic.gdx.math.Vector2;
 import com.csse3200.game.ai.tasks.AITaskComponent;
+import com.csse3200.game.components.tasks.EngineerCombatTask;
 import com.csse3200.game.components.CombatStatsComponent;
 import com.csse3200.game.components.TouchAttackComponent;
 import com.csse3200.game.components.npc.GhostAnimationController;
@@ -127,6 +102,3 @@ private EngineerFactory() {
     throw new IllegalStateException("Instantiating static util class");
   }
 }
-
-
->>>>>>> 6cc7e0e3fcbd5fc0cb4374cd894b93a42b8dabaa