Diverse Klassen angepasst.

CollisionHandler spam deaktiviert bis wir ein Spielende implementiert
haben bei Treffer durch Gegner.
GameLoopD Tick hinzugefügt für StatusPanel
HardwareResetTimers modifier manipulation des statuspanels implementiert
This commit is contained in:
toksikk
2014-11-21 15:00:13 +01:00
parent caeec9dcce
commit 2b8f5c9acd
3 changed files with 4 additions and 3 deletions
@@ -92,7 +92,7 @@ public class CollisionHandler {
public static void tick() { public static void tick() {
for (int i=1; i<movingObjects.size();i++) { for (int i=1; i<movingObjects.size();i++) {
if (movingObjects.get(0).getGridLocation().x== movingObjects.get(i).getGridLocation().x && movingObjects.get(0).getGridLocation().y == movingObjects.get(i).getGridLocation().y) { if (movingObjects.get(0).getGridLocation().x== movingObjects.get(i).getGridLocation().x && movingObjects.get(0).getGridLocation().y == movingObjects.get(i).getGridLocation().y) {
Logger.write("COLLISION WITH ENEMY"); // Logger.write("COLLISION WITH ENEMY");
} }
} }
} }
@@ -270,6 +270,7 @@ public class GameLoopD extends JFrame implements Runnable {
opponent05.tick(); opponent05.tick();
opponent06.tick(); opponent06.tick();
CollisionHandler.tick(); CollisionHandler.tick();
StatusPanelAdder.tick();
} }
} }
// alles was animiert wird hier rein (paints) // alles was animiert wird hier rein (paints)
@@ -26,7 +26,7 @@ public class HardwareResetTimers {
if (HardwareResetTickstamps.get(i).equals(tickCount)) { if (HardwareResetTickstamps.get(i).equals(tickCount)) {
Logger.write("Hardware "+i+" reset"); Logger.write("Hardware "+i+" reset");
HardewareManipulate.resetHardware(i); HardewareManipulate.resetHardware(i);
//StatusPanelAdder.reduceMod(); StatusPanelAdder.reduceMod();
} }
} }
} }
@@ -41,6 +41,6 @@ public class HardwareResetTimers {
resetTimestamp = resetTimestamp % tickRoundMax; resetTimestamp = resetTimestamp % tickRoundMax;
} }
HardwareResetTickstamps.put(c, resetTimestamp); HardwareResetTickstamps.put(c, resetTimestamp);
//StatusPanelAdder.raiseMod(); StatusPanelAdder.raiseMod();
} }
} }