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

UQcsse3200 · Oct 16, 2023 · 37a9ba2 · 37a9ba2
2 parents 7ac0367 + fd7c9ce
commit 37a9ba2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/source/core/src/main/com/csse3200/game/components/tasks/FireTowerCombatTask.java b/source/core/src/main/com/csse3200/game/components/tasks/FireTowerCombatTask.java
@@ -67,7 +67,7 @@ public FireTowerCombatTask(int priority, float maxRange) {
     public void start()  {
         super.start();
         // get the tower coordinates
-        this.towerPosition = owner.getEntity().getCenterPosition();
+        this.towerPosition = owner.getEntity().getCenterPosition().sub(0.125f,0.125f);
         this.maxRangePosition.set(towerPosition.x  + maxRange, towerPosition.y);
         owner.getEntity().getEvents().addListener("addFireRate",this::changeFireRateInterval);
         //default to idle state

diff --git a/source/core/src/main/com/csse3200/game/components/tasks/PierceTowerCombatTask.java b/source/core/src/main/com/csse3200/game/components/tasks/PierceTowerCombatTask.java
@@ -63,7 +63,7 @@ public PierceTowerCombatTask(int priority, float maxRange) {
     public void start() {
         super.start();
         // Get the tower coordinates
-        this.towerPosition = owner.getEntity().getCenterPosition();
+        this.towerPosition = owner.getEntity().getCenterPosition().sub(0.25f, 0.25f);
         this.maxRangePosition.set(towerPosition.x + maxRange, towerPosition.y);
         // Set the default state to IDLE state
         owner.getEntity().getEvents().trigger(IDLE);

diff --git a/source/core/src/main/com/csse3200/game/components/tasks/RicochetTowerCombatTask.java b/source/core/src/main/com/csse3200/game/components/tasks/RicochetTowerCombatTask.java
@@ -65,7 +65,7 @@ public RicochetTowerCombatTask(int priority, float maxRange) {
     public void start() {
         super.start();
         // Get the tower coordinates
-        this.towerPosition = owner.getEntity().getCenterPosition();
+        this.towerPosition = owner.getEntity().getCenterPosition().sub(0.25f, 0.25f);
         this.maxRangePosition.set(towerPosition.x + maxRange, towerPosition.y);
         // Set the default state to IDLE state
         owner.getEntity().getEvents().trigger(IDLE);

diff --git a/source/core/src/main/com/csse3200/game/components/tasks/StunTowerCombatTask.java b/source/core/src/main/com/csse3200/game/components/tasks/StunTowerCombatTask.java
@@ -67,7 +67,7 @@ public StunTowerCombatTask(int priority, float maxRange) {
     public void start() {
         super.start();
         //get the tower coordinates
-        this.towerPosition = owner.getEntity().getCenterPosition();
+        this.towerPosition = owner.getEntity().getCenterPosition().sub(0.25f, 0.25f);
         this.maxRangePosition.set(towerPosition.x + maxRange, towerPosition.y);
         owner.getEntity().getEvents().addListener("addFireRate",this::changeFireRateInterval);
         //set the default state to IDLE state