Added new events display

Regorh · Dec 14, 2023 · 88688fd · 88688fd
1 parent 50c5cf1
commit 88688fd
Show file tree

Hide file tree

Showing 3 changed files with 167 additions and 85 deletions.
diff --git a/app/src/main/java/stock/ControllerInterface.java b/app/src/main/java/stock/ControllerInterface.java
@@ -33,5 +33,7 @@ public interface ControllerInterface {
     public ArrayList<Integer> userstockamount();
     public Float get_stock_price(String name);
 
+    public String get_event_description();
 
+    public void currentDebt(float debt);
 }
diff --git a/app/src/main/java/stock/controller/GameController.java b/app/src/main/java/stock/controller/GameController.java
@@ -25,6 +25,8 @@ public class GameController implements ControllerInterface {
     Market market;
     EventRoller roller;
     int day;
+    String userEvent;
+    String gameEvent;
 
 
     public GameController() {
@@ -76,6 +78,8 @@ public boolean sell(String ticker, float price, int amount) {
     public void nextday() {
         ArrayList<String> currentEvents = roller.roll_out();
         System.out.println("Turn events: " + currentEvents); // TODO debugging
+        this.userEvent = currentEvents.get(1);
+        this.gameEvent = currentEvents.get(0);
         gm.next_day(currentEvents.get(0));
         user.process_event(currentEvents.get(1));
         game.update();
@@ -137,5 +141,14 @@ public ArrayList<Float> marketstockprices() {
     public Float get_stock_price(String name){
         return gm.get_market_price(name);
     }
+
+    public String get_event_description(){
+        return "User: \n" + roller.get_description_for(userEvent) + "\n\n" + "Market:  \n" +  
+        roller.get_description_for(gameEvent);
+    }
+
+    public void currentDebt(float debt){
+        user.setcurrentDebt(debt);
+    }
 }