Fixed timer tick rate, removed some obnoxious logger messages.

UQdeco2800 · Nov 4, 2021 · d875c81 · d875c81
1 parent 3dffcf3
commit d875c81
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/source/core/src/main/com/deco2800/game/entities/EntityService.java b/source/core/src/main/com/deco2800/game/entities/EntityService.java
@@ -53,7 +53,7 @@ public void update() {
   }
 
   public void scheduleEntityForRemoval(Entity entity) {
-    logger.info("Scheduling entity {} for removal", entity);
+    logger.debug("Scheduling entity {} for removal", entity);
     entitiesScheduledForRemoval.add(entity);
   }
 

diff --git a/source/core/src/main/com/deco2800/game/entities/components/npc/MumActions.java b/source/core/src/main/com/deco2800/game/entities/components/npc/MumActions.java
@@ -77,6 +77,7 @@ private void walkThroughDoor() {
         GridPoint2 targetPos = ServiceLocator.getHome().getFloor().getMumTargetPos();
         dest = ServiceLocator.getHome().getFloor().getTerrain().tileToWorldPosition(targetPos);
         movementComponent.setTarget(dest);
+        movementComponent.setMaxSpeed(new Vector2(3f, 3f));
         movementComponent.setMoving(true);
     }
 

diff --git a/source/core/src/main/com/deco2800/game/entities/components/object/BookActions.java b/source/core/src/main/com/deco2800/game/entities/components/object/BookActions.java
@@ -27,7 +27,7 @@ public void onInteraction(Entity target) {
             logger.debug("PLAYER interacted with Book");
             startTime = ServiceLocator.getTimeSource().getTime();
             hasInteracted = true;
-            entity.getEvents().trigger(UPDATE_ANIMATION, "dust1");
+            //entity.getEvents().trigger(UPDATE_ANIMATION, "dust1");
         }
     }
 

diff --git a/source/core/src/main/com/deco2800/game/entities/components/object/TrashActions.java b/source/core/src/main/com/deco2800/game/entities/components/object/TrashActions.java
@@ -27,7 +27,7 @@ public void onInteraction(Entity target) {
             logger.debug("PLAYER interacted with Trash");
             startTime = ServiceLocator.getTimeSource().getTime();
             hasInteracted = true;
-            entity.getEvents().trigger(UPDATE_ANIMATION, "dust1");
+            //entity.getEvents().trigger(UPDATE_ANIMATION, "dust1");
         }
     }
 

diff --git a/source/core/src/main/com/deco2800/game/physics/components/PhysicsMovementComponent.java b/source/core/src/main/com/deco2800/game/physics/components/PhysicsMovementComponent.java
@@ -14,7 +14,7 @@
  */
 public class PhysicsMovementComponent extends Component implements MovementController {
     private static final Logger logger = LoggerFactory.getLogger(PhysicsMovementComponent.class);
-    private static final Vector2 maxSpeed = new Vector2(3f, 3f);
+    private Vector2 maxSpeed = new Vector2(1f, 1f);
 
     private PhysicsComponent physicsComponent;
     private Vector2 targetPosition;
@@ -45,6 +45,10 @@ public void update() {
         }
     }
 
+    public void setMaxSpeed(Vector2 maxSpeed) {
+        this.maxSpeed = maxSpeed;
+    }
+
     /**
      * Enable/disable movement for the controller. Disabling will immediately set velocity to 0.
      *

diff --git a/source/core/src/main/com/deco2800/game/screens/game/TimerWidget.java b/source/core/src/main/com/deco2800/game/screens/game/TimerWidget.java
@@ -16,7 +16,7 @@ public class TimerWidget extends RetroactiveWidget {
     private static final String TIMER_BACKGROUND = "images/ui/elements/Textbox_256.png";
     private static final int TIMER_START = 2300;
     private static final int TIMER_END = 200;
-    private static final long TIMER_TICK_RATE = 30L;
+    private static final long TIMER_TICK_RATE = 500L;
     private long lastTime = 0L;
     private Label timerLabel;
     private TimerStatus timerStatus = TimerStatus.NORMAL;