Time alteration groundwork

Author: MidwayMarshall

core/src/com/mygdx/game/battlewindow/ContinuousGameFrame.java

@@ -47,9 +47,13 @@ public class ContinuousGameFrame extends ApplicationAdapter implements InputProc
     private float scaledX;
     private float scaledY;
     private float delta;
+    private float shiftedDelta;
+    private static float temporalModifier = 1f;
 
     public Bridge bridge;
 
+    private final Array<Timer> timers = new Array<Timer>();
+
     public ContinuousGameFrame(Bridge bridge) {
         instance = this;
         this.bridge = bridge;
@@ -111,9 +115,10 @@ protected void call() {
     @Override
     public void render() {
         delta = Gdx.graphics.getDeltaTime();
+        shiftedDelta = delta * temporalModifier;
         elapsedTime += delta;
 
-        //beginTime = System.currentTimeMillis();
+        updateTimers();
 
         switch (STATUS_CURRENT) {
             case STATUS_INIT: {
@@ -221,8 +226,8 @@ private void draw() {
     }
 
     private void act() {
-        HUDs[me].act(delta);
-        HUDs[opp].act(delta);
+        HUDs[me].act(shiftedDelta);
+        HUDs[opp].act(shiftedDelta);
 
         if (drawMe)  actPokemon(me);
         if (drawOpp) actPokemon(opp);
@@ -312,7 +317,7 @@ private void drawPokemon(byte player) {
 
     private void actPokemon(byte player) {
         if (sprites[player] != null) {
-            sprites[player].act(delta);
+            sprites[player].act(shiftedDelta);
         }
     }
 
@@ -387,6 +392,24 @@ private String StringFormat(Integer i) {
         return string;
     }
 
+    public void addTimer(Timer timer) {
+        synchronized(timers) {
+            timers.add(timer);
+        }
+    }
+
+    public void removeTimer(Timer timer) {
+        synchronized (timers) {
+            timers.removeValue(timer, true);
+        }
+    }
+
+    private void updateTimers() {
+        for (Timer timer : timers) {
+            timer.act(shiftedDelta);
+        }
+    }
+
     public void drawRect(Rectangle rect) {
         objectDebugger.rect(rect.getX(), rect.getY(), rect.getWidth(), rect.getHeight());
     }

core/src/com/mygdx/game/battlewindow/Event.java

@@ -1,22 +1,22 @@
 package com.mygdx.game.battlewindow;
 
-import com.badlogic.gdx.utils.Timer;
-
 public abstract class Event {
     public EventListener listener;
 
-    public void run(ContinuousGameFrame frame) {
+    public void run(final ContinuousGameFrame frame) {
         launch(frame);
 
         if (duration() == 0) {
             finish();
         } else if (duration() > 0) {
-            Timer.instance().scheduleTask(new Timer.Task() {
+            Timer timer = new Timer(duration() / 1000f) {
                 @Override
                 public void run() {
+                    frame.removeTimer(this);
                     finish();
                 }
-            }, duration()/1000f);
+            };
+            frame.addTimer(timer);
         } else {
             //Duration of -1, undetermined duration, subclass needs to call finish()
         }

core/src/com/mygdx/game/battlewindow/Timer.java

@@ -0,0 +1,22 @@
+package com.mygdx.game.battlewindow;
+
+public abstract class Timer {
+    float remaining;
+
+    public Timer(float duration) {
+        this.remaining = duration;
+    }
+
+    public void act(float delta) {
+        remaining = remaining - delta;
+        if (isCompleted()) {
+            run();
+        }
+    }
+
+    public boolean isCompleted() {
+        return remaining <= 0;
+    }
+
+    public abstract void run();
+}

desktop/src/com/mygdx/game/desktop/DesktopLauncher.java

@@ -58,27 +58,29 @@ public void unpause() {
 
 		@Override
 		public void finished() {
-
+			int randomNum = random.nextInt(37);
+			addEvent(new Events.BackgroundChange(randomNum));
+			Poke me = new Poke((byte) (random.nextInt(95) + 5), "Test", (short) random.nextInt(600), (byte) random.nextInt(3), (byte) (random.nextInt(80) + 20), random.nextInt(7));
+			//mebattle = new Poke((byte) 100, "test", (short) 4, (byte)1,(byte) 100,(short) 0,(short) 100,(short) 100);
+			Poke opp = new Poke((byte) (random.nextInt(100) + 5), "Test", (short) 49, (byte) random.nextInt(3), (byte) (random.nextInt(80) + 20), random.nextInt(7));
+			addEvent(new Events.SpriteChange(me, this.me, true));
+			addEvent(new Events.SpriteChange(opp, this.opp, false));
+			//service.offer(new Events.HUDChangeBattling(mebattle));
+			addEvent(new Events.HUDChange(me, this.me));
+			addEvent(new Events.HUDChange(opp, this.opp));
+//			addEvent(new Events.SendOut(this.opp, me));
+//			addEvent(new Events.SendOut(this.me, opp));
+//			addEvent(new Events.SendOut(this.opp, opp));
+//			addEvent(new Events.SendOut(this.me, me));
 		}
 
 		Random random = new Random();
 		@Override
 		public TaskService setGame(ContinuousGameFrame game) {
 			this.game = game;
 			TaskService service = new DesktopService();
-			int randomNum = random.nextInt(37);
-			service.offer(new Events.BackgroundChange(randomNum));
-			Poke me = new Poke((byte) (random.nextInt(95) + 5), "Test", (short) random.nextInt(600), (byte) random.nextInt(3), (byte) (random.nextInt(80) + 20), random.nextInt(7));
-			//mebattle = new Poke((byte) 100, "test", (short) 4, (byte)1,(byte) 100,(short) 0,(short) 100,(short) 100);
-			Poke opp = new Poke((byte) (random.nextInt(100) + 5), "Test", (short) 49, (byte) random.nextInt(3), (byte) (random.nextInt(80) + 20), random.nextInt(7));
-			service.offer(new Events.SpriteChange(me, this.me, true));
-			service.offer(new Events.SpriteChange(opp, this.opp, false));
-			//service.offer(new Events.HUDChangeBattling(mebattle));
-			service.offer(new Events.HUDChange(me, this.me));
-			service.offer(new Events.HUDChange(opp, this.opp));
 			return service;
 		}
-		Poke mebattle;
 
 		@Override
 		public void alert(String message) {

html/src/com/mygdx/game/client/HtmlLauncher.java

@@ -63,7 +63,7 @@ public TaskService setGame(ContinuousGameFrame game) {
             } catch (Exception e) {
                 Window.alert("can't find battle");
             }
-            return new TaskService2();
+            return new HtmlService();
         }
 
         @Override

html/src/com/mygdx/game/client/TaskService2.java renamed to html/src/com/mygdx/game/client/HtmlService.java

@@ -5,11 +5,11 @@
 
 import java.util.LinkedList;
 
-public class TaskService2 implements TaskService {
+public class HtmlService implements TaskService {
     private LinkedList<Event> tasks;
     private boolean busy;
 
-    public TaskService2() {
+    public HtmlService() {
         this.tasks = new LinkedList<Event>();
     }