Merge branch 'main' into 118-play-game-menu

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Main.java

@@ -11,6 +11,7 @@
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewManager;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.creategame.CreateGameController;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.creategame.CreateGameView;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.ingame.InGameController;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ingame.InGameView;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.mainmenu.MainMenuController;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.mainmenu.MainMenuView;
@@ -21,20 +22,25 @@
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Objects;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.WidgetEnum;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.financialsummary.SummaryController;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.financialsummary.SummaryView;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.dashboard.DashBoardController;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.dashboard.DashBoardView;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.market.MarketController;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.market.MarketView;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.*;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.games.ClickerGame;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.games.FindStockGame;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.games.TimeInputsGame;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.stats.StatsController;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.stats.StatsView;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.topbar.TopBarController;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.topbar.TopBarView;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.transactions.TransactionsController;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.transactions.TransactionsView;
 import javafx.application.Application;
-import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.layout.Pane;
 import javafx.scene.text.Font;
@@ -74,7 +80,7 @@ public void start(final Stage stage) throws Exception {
     ViewManager viewManager = new ViewManager(stage, eventManager);
 
     List<Stock> stocksInFile;
-    FileParser parser1 = new FileParser("/dummydata.txt");
+    FileParser parser1 = new FileParser("/sp500.csv");
 
     FileConverter converter1 = new FileConverter();
     stocksInFile = converter1.getStocksFromStrings(parser1.readFile());
@@ -136,37 +142,4 @@ public void start(final Stage stage) throws Exception {
         eventManager,
         player,
         exchange,
-        stocksInFile);
-
-    // In-game (Change "topBarView" to "topBarView2" if no summary section).
-    // Dashboard er default center-view.
-    InGameView inGameView = new InGameView(topBarView, dashBoardView.getRootPane());
-
-    // Transaction history page
-    TransactionsView transactionsView = new TransactionsView();
-    TransactionsController transactionsController = new TransactionsController(
-            transactionsView,
-            eventManager,
-            player.getTransactionArchive());
-
-    // Wire top bar buttons til å bytte mellom dashboard / stats / market /
-    // transactions. Stats-knappen tar deg til stats-siden.
-    topBarController.setMarketIntegration(
-        inGameView::changeCenterView,
-        dashBoardView.getRootPane(),
-        marketView.getRootPane(),
-        statsView.getRootPane(),
-        transactionsView.getRootPane(),
-        transactionsController::refresh);
-
-    // Register all views
-    viewManager.addView(mainMenuView);
-    viewManager.addView(playGameView);
-    viewManager.addView(createGameView);
-    viewManager.addView(settingsView);
-    viewManager.addView(inGameView);
-    viewManager.setScene(mainMenuView);
-
-    stage.show();
-  }
-}
+        stocksIn

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java

@@ -208,7 +208,9 @@ public Transaction sell(final Share share, final Player player)
    *
    * @throws IllegalArgumentException if any parameter is null, or if player does not have enough shares.
    * */
-  public List<Transaction> sell(BigDecimal amount, final String stockSymbol, final Player player)
+  public List<Transaction> sell(BigDecimal amount,
+                                final String stockSymbol,
+                                final Player player)
           throws IllegalArgumentException {
     if (amount == null || player == null || !Validator.NOT_EMPTY.isValid(stockSymbol)) {
       throw new IllegalArgumentException("Invalid sell!");
@@ -253,7 +255,8 @@ public void advance() {
     for (Stock stock : stockMap.values()) {
       BigDecimal currentPrice = stock.getSalesPrice();
 
-      double change = (random.nextDouble() * 0.10) - 0.05;
+      double change = ((random.nextDouble() * 0.10) - 0.05) + stock.getFortune();
+      stock.setFortune(0);
       BigDecimal factor = BigDecimal.valueOf(1 + change);
 
       BigDecimal newPrice = currentPrice.multiply(factor);

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Stock.java

@@ -26,6 +26,14 @@ public final class Stock {
    * */
   private final List<BigDecimal> prices = new ArrayList<>();
 
+  /**
+   * Value indicating this stocks fortune.
+   *
+   * <p>Higher fortune yields a higher
+   * increase when stock market changes price.</p>
+   * */
+  private double fortune;
+
   /**
    * Creates a new {@code Stock} with an initial sales price.
    *
@@ -42,10 +50,29 @@ public Stock(final String symbol,
     } else {
       this.symbol = symbol;
       this.company = company;
+      this.fortune = 0;
       prices.add(salesPrice);
     }
   }
 
+  /**
+   * Setter method for fortune.
+   *
+   * @param newFortune the new value to set this stocks' fortune.
+   * */
+  public void setFortune(final double newFortune) {
+    fortune = newFortune;
+  }
+
+  /**
+   * Getter method for fortune.
+   *
+   * @return fortune.
+   * */
+  public double getFortune() {
+    return fortune;
+  }
+
   /**
    * Returns the stock symbol.
    *

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/service/event/EventType.java

@@ -22,7 +22,35 @@ public enum EventType implements EventChannel {
    * @see edu.ntnu.idi.idatt2003.g40.mappe.view.ViewManager
    *
    */
-  SCENE_CHANGE;
+  SCENE_CHANGE,
+
+  /**
+   * Event type representing events that causes the center view in the
+   * current {@link edu.ntnu.idi.idatt2003.g40.mappe.view.ingame.InGameView}
+   * object to change.
+   *
+   * <p>Primarily handled by the active
+   * {@link edu.ntnu.idi.idatt2003.g40.mappe.view.ingame.InGameController}
+   * object.</p>
+   *
+   * @see edu.ntnu.idi.idatt2003.g40.mappe.view.ingame.InGameController
+   *
+   */
+  CHANGE_INGAME_CENTER,
+
+  /**
+   * Event type representing events that change the center view to
+   * {@link edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.MiniGamesView},
+   * and selects a given stock for the minigames.
+   *
+   * <p>Primarily handled by the active
+   * {@link edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.MiniGamesController}
+   * object.</p>
+   *
+   * @see edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.dashboard.DashBoardController
+   *
+   */
+  SELECT_STOCK_FOR_MINIGAME;
 
   /**
    * {@inheritDoc}

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewController.java

@@ -82,6 +82,17 @@ protected void changeScene(final ViewEnum viewName) {
     invoke(eventData, eventManager);
   }
 
+  /**
+   * Overloaded invoke method to reduce parameters, by using
+   * internal reference to event manager.
+   *
+   * @param <T> the type of data to send.
+   * @param data the data to send.
+   * */
+  protected <T> void invoke(final EventData<T> data) {
+    invoke(data, eventManager);
+  }
+
   @Override
   public final <T> void invoke(final EventData<T> data,
                                final EventManager eventManager) {

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ingame/InGameController.java

@@ -1,21 +1,43 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.view.ingame;
 
+import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventData;
 import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventManager;
+import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventSubscriber;
+import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventType;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewController;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.WidgetEnum;
+import javafx.scene.Node;
+import java.util.EnumMap;
 
-public class InGameController extends ViewController<InGameView> {
+public final class InGameController extends ViewController<InGameView>
+        implements EventSubscriber {
+
+  private final EnumMap<WidgetEnum, Node> widgetMap = new EnumMap<>(WidgetEnum.class);
 
   /**
    * {@inheritDoc}.
    */
-  protected InGameController(final InGameView viewElement,
+  public InGameController(final InGameView viewElement,
                              final EventManager eventManager)
           throws IllegalArgumentException {
     super(viewElement, eventManager);
+    eventManager.addSubscriber(this, EventType.CHANGE_INGAME_CENTER);
+  }
+
+  public void addwidget(final WidgetEnum widgetEnum, final Node widgetRoot) {
+    widgetMap.put(widgetEnum, widgetRoot);
   }
 
   @Override
   protected void initInteractions() {
 
   }
+
+  @Override
+  public <T> void handleEvent(final EventData<T> data) {
+    if (!(data.data() instanceof WidgetEnum) || !widgetMap.containsKey(data.data())) {
+      throw new IllegalArgumentException("Invalid event thrown!");
+    }
+    getViewElement().changeCenterView(widgetMap.get(data.data()));
+  }
 }

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ingame/InGameView.java

@@ -1,23 +1,12 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.view.ingame;
 
-import edu.ntnu.idi.idatt2003.g40.mappe.model.Stock;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewElement;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewEnum;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.topbar.TopBarView;
-import javafx.geometry.Pos;
 import javafx.scene.Node;
-import javafx.scene.chart.LineChart;
-import javafx.scene.chart.NumberAxis;
-import javafx.scene.chart.XYChart;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.control.Separator;
-import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
 
-import java.util.ArrayList;
-
 public class InGameView extends ViewElement<VBox, InGameActions> {
 
   private final TopBarView topBarView;

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/WidgetEnum.java

@@ -0,0 +1,39 @@
+package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets;
+
+/**
+ * Enum used to define the various widgets for the application.
+ *
+ * <p>Primarily handled by the {@link edu.ntnu.idi.idatt2003.g40.mappe.view.ingame.InGameController}
+ * for changing the active section of the game.</p>
+ * */
+public enum WidgetEnum {
+  /**
+   * {@link edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.dashboard.DashBoardView}.
+   * */
+  DASHBOARD,
+
+  /**
+   * {@link edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.market.MarketView}.
+   * */
+  MARKET,
+
+  /**
+   * {@link edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.MiniGamesView}.
+   * */
+  MINIGAMES_OVERVIEW,
+
+  /**
+   * {@link edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.GameEngineView}.
+   * */
+  MINIGAMES_ENGINE,
+
+  /**
+   * {@link edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.stats.StatsView}.
+   * */
+  STATS,
+
+  /**
+   * {@link edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.transactions.TransactionsView}.
+   * */
+  TRANSACTIONS
+}

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardActions.java

@@ -32,5 +32,10 @@ public enum DashBoardActions {
   /**
    * Increasing quantity of shares to buy/sell by five.
    * */
-  INCREASE_5;
+  INCREASE_5,
+
+  /**
+   * Selecting viewed stock to boost by playing minigames.
+   * */
+  MINIGAME;
 }

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java

@@ -2,9 +2,12 @@
 
 import edu.ntnu.idi.idatt2003.g40.mappe.engine.Exchange;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.*;
+import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventData;
 import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventManager;
+import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventType;
 import edu.ntnu.idi.idatt2003.g40.mappe.utils.Validator;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewController;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.WidgetEnum;
 import javafx.scene.control.Button;
 import javafx.scene.control.TextFormatter;
 import java.math.BigDecimal;
@@ -180,6 +183,11 @@ protected void initInteractions() {
                       .add(new BigDecimal("5")).toString());
     });
 
+    getViewElement().setOnAction(DashBoardActions.MINIGAME, () -> {
+      invoke(new EventData<>(EventType.SELECT_STOCK_FOR_MINIGAME, getViewElement().getCurrentStock()));
+      invoke(new EventData<>(EventType.CHANGE_INGAME_CENTER, WidgetEnum.MINIGAMES_OVERVIEW));
+    });
+
     exchange.weekProperty().addListener((observable,o,n) -> {
       getViewElement().updateGraph(selectedTimeRange);
       populateStockList(selectedFilter);

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java

@@ -173,6 +173,11 @@ public final class DashBoardView extends ViewElement<HBox, DashBoardActions> {
    * */
   private Button sellSharesBtn;
 
+  /**
+   * Button to boost this stock.
+   * */
+  private Button boostStockBtn;
+
   /**
    * The selected stock symbol label.
    * */
@@ -268,7 +273,13 @@ protected void initLayout() {
     stockFullNameLabel = new Label();
     ownedQuantityLabel = new Label();
 
-    stockIdentity.getChildren().addAll(selectedStockLabel, stockFullNameLabel, ownedQuantityLabel);
+    boostStockBtn = new Button("Boost");
+    stockIdentity.getChildren().addAll(
+            selectedStockLabel,
+            stockFullNameLabel,
+            ownedQuantityLabel,
+            boostStockBtn
+    );
 
     priceStats = new VBox();
     selectedStockPriceLabel = new Label();
@@ -334,6 +345,7 @@ protected void initLayout() {
     registerButton(DashBoardActions.DECREASE_1, m1QtyBtn);
     registerButton(DashBoardActions.INCREASE_1, p1QtyBtn);
     registerButton(DashBoardActions.INCREASE_5, p5QtyBtn);
+    registerButton(DashBoardActions.MINIGAME, boostStockBtn);
   }
 
   private ColumnConstraints makeCol(final float w) {
@@ -349,6 +361,7 @@ protected void initStyling() {
     completeSideBar.getStyleClass().add("dashboard-complete-sidebar");
     sidebar.getStyleClass().add("dashboard-sidebar-content");
     selectedStockLabel.getStyleClass().add("dashboard-selected-stock-pill");
+    boostStockBtn.getStyleClass().add("dashboard-selected-stock-pill");
     selectedStockPriceLabel.getStyleClass().add("dashboard-selected-stock-pill");
     shareQuantityInputField.getStyleClass().add("dashboard-qtyTextField");
     chart.getStyleClass().add("dashboard-chart");