Merge pull request #76 from FIUS/bug/fixSingleStep

Fix single step
FIUS · Oct 4, 2019 · 37b5355 · 37b5355
2 parents bed2734 + 5aca7e9
commit 37b5355
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/...ava/de/unistuttgart/informatik/fius/icge/simulation/internal/StandardSimulationClock.java b/...ava/de/unistuttgart/informatik/fius/icge/simulation/internal/StandardSimulationClock.java
@@ -165,13 +165,11 @@ public synchronized void stop() {
     public synchronized void step() {
         if (this.isRunning()) throw new TimerAlreadyRunning();
 
-        new Thread(
-                () -> {
-                    //FIXME this only executes a graphics tick an not neccessariely
-                    // a simulation tick.
-                    StandardSimulationClock.this.tick();
-                }, "single-step"
-        ).start();
+        new Thread(() -> {
+            StandardSimulationClock.this.tickCount = ((StandardSimulationClock.this.tickCount
+                    - (StandardSimulationClock.this.tickCount % 8)) + 7);
+            StandardSimulationClock.this.tick();
+        }, "single-step").start();
     }
 
     /**

diff --git a/...ario/src/main/java/de/unistuttgart/informatik/fius/icge/example/mario/WalkingProgram.java b/...ario/src/main/java/de/unistuttgart/informatik/fius/icge/example/mario/WalkingProgram.java
@@ -9,6 +9,9 @@
  */
 package de.unistuttgart.informatik.fius.icge.example.mario;
 
+import java.util.List;
+
+import de.unistuttgart.informatik.fius.icge.example.mario.entity.Coin;
 import de.unistuttgart.informatik.fius.icge.example.mario.entity.Mario;
 import de.unistuttgart.informatik.fius.icge.example.mario.entity.MarioProgram;
 
@@ -25,6 +28,17 @@ public void run(final Mario mario) {
         while (true) {
             if (mario.canMove()) {
                 mario.move();
+            } else {
+                mario.turnClockWise();
+                mario.turnClockWise();
+                final List<Coin> droppableCoins = mario.getCurrentlyDroppableEntities(Coin.class, false);
+                final List<Coin> collectableCoins = mario.getCurrentlyCollectableEntities(Coin.class, false);
+
+                if (!droppableCoins.isEmpty()) {
+                    mario.drop(droppableCoins.get(0));
+                } else if (!collectableCoins.isEmpty()) {
+                    mario.collect(collectableCoins.get(0));
+                }
             }
         }
     }