diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Main.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Main.java index 35296a9..f8deb83 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Main.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Main.java @@ -151,7 +151,11 @@ public void start(final Stage stage) throws Exception { TimeInputsGame timeInputsGame = new TimeInputsGame(); GameEngineView gameEngineView = new GameEngineView(); - GameEngineController gameEngineController = new GameEngineController(gameEngineView, eventManager); + GameEngineController gameEngineController = new GameEngineController( + gameEngineView, + eventManager, + stocksInFile.getFirst() + ); MiniGamesView miniGamesView = new MiniGamesView(); new MiniGamesController( diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/GameEngineController.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/GameEngineController.java index 6db58dd..3695ad0 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/GameEngineController.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/GameEngineController.java @@ -1,5 +1,6 @@ package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames; +import edu.ntnu.idi.idatt2003.g40.mappe.model.Stock; import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventManager; import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewController; import javafx.animation.KeyFrame; @@ -13,9 +14,12 @@ public final class GameEngineController extends ViewController { private int secondsRemaining = 60; private GameGimmick activeGimmick; private Timeline engineLoop; + private Stock chosenStock; public GameEngineController(final GameEngineView viewElement, - final EventManager eventManager) throws IllegalArgumentException { + final EventManager eventManager, + final Stock chosenStock) throws IllegalArgumentException { + this.chosenStock = chosenStock; super(viewElement, eventManager); engineLoop = new Timeline(new KeyFrame(Duration.millis(16.6), e -> { @@ -53,6 +57,10 @@ public void launchGimmickSession(final GameGimmick gimmick) { engineLoop.play(); } + public void setChosenStock(final Stock newStock) { + chosenStock = newStock; + } + private void refreshMetrics() { int hours = secondsRemaining / 3600; int minutes = (secondsRemaining % 3600) / 60; diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/GameEngineView.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/GameEngineView.java index e18b372..7cfa586 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/GameEngineView.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/GameEngineView.java @@ -6,6 +6,7 @@ import javafx.scene.control.Label; import javafx.scene.layout.BorderPane; import javafx.scene.layout.HBox; +import javafx.scene.layout.VBox; import java.util.function.IntConsumer; @@ -17,30 +18,16 @@ public final class GameEngineView extends ViewElement