Merge pull request #220 from tzw0/FarmLogic

fix feedback and organised showmenulist
AY1920S1-CS2113T-F14-2 · Oct 31, 2019 · 1b07529 · 1b07529
2 parents a403c7c + 2b1dde2
commit 1b07529
Show file tree

Hide file tree

Showing 23 changed files with 117 additions and 88 deletions.
diff --git a/src/main/java/commands/CommandChangeTask.java b/src/main/java/commands/CommandChangeTask.java
@@ -1,12 +1,14 @@
 package commands;
 
+import exceptions.FarmioFatalException;
 import farmio.Farmio;
 import farmio.Storage;
 
 public abstract class CommandChangeTask extends Command {
 
-    protected void saveTask(Farmio farmio) {
+    protected void saveTaskandResetScreen(Farmio farmio) throws FarmioFatalException {
         Storage storage = farmio.getStorage();
         storage.storeFarmer(farmio.getFarmer());
+        farmio.getSimulation().simulate(farmio.getLevel().getPath(), farmio.getLevel().getNarratives().size() - 1);
     }
 }
diff --git a/src/main/java/commands/CommandCheckObjectives.java b/src/main/java/commands/CommandCheckObjectives.java
@@ -18,7 +18,7 @@ public void execute(Farmio farmio) throws FarmioFatalException {
         Level.ObjectiveResult answer = farmio.getLevel().checkAnswer(farmio);
         //farmio.getUi().typeWriter(farmio.getLevel().getFeedback(farmio), false); // feedbacks
 
-        List<String> feedback = farmio.getLevel().getFeedback(farmio);
+        List<String> feedback = farmio.getLevel().getFeedback(farmio, answer);
         for (String i : feedback) {
             farmio.getUi().typeWriter(i,false);
         }

diff --git a/src/main/java/commands/CommandMenu.java b/src/main/java/commands/CommandMenu.java
diff --git a/src/main/java/commands/CommandShowList.java b/src/main/java/commands/CommandShowList.java
@@ -20,60 +20,7 @@ public CommandShowList(String listPath) {
     public void execute(Farmio farmio) throws FarmioFatalException {
         Ui ui = farmio.getUi();
         double level = farmio.getFarmer().getLevel();
-
-        if(filePath.equals("ActionList")) {
-            if(level == 1.1) {
-                farmio.getSimulation().simulate(filePath, 11,false);
-            }
-            if(level == 1.2) {
-                farmio.getSimulation().simulate(filePath, 12,false);
-            }
-            if(level == 1.3) {
-                farmio.getSimulation().simulate(filePath, 13,false);
-            }
-            if(level == 1.4) {
-                farmio.getSimulation().simulate(filePath, 14,false);
-            }
-            if(level == 1.5) {
-                farmio.getSimulation().simulate(filePath, 15,false);
-            }
-            if(level == 1.6) {
-                farmio.getSimulation().simulate(filePath, 15,false);
-            }
-        }
-
-        if(filePath.equals("ConditionList")) {
-            if(level == 1.1) {
-                farmio.getSimulation().simulate(filePath, 11,false);
-            }
-            if(level == 1.2) {
-                farmio.getSimulation().simulate(filePath, 11,false);
-            }
-            if(level == 1.3) {
-                farmio.getSimulation().simulate(filePath, 11,false);
-            }
-            if(level == 1.4) {
-                farmio.getSimulation().simulate(filePath, 14,false);
-            }
-            if(level == 1.5) {
-                farmio.getSimulation().simulate(filePath, 16,false);
-            }
-            if(level == 1.6) {
-                farmio.getSimulation().simulate(filePath, 16,false);
-            }
-        }
-
-        if(filePath.equals("MarketList")) {
-            if(level < 1.5) {
-                farmio.getSimulation().simulate(filePath, 4,false);
-            } else if(level < 2) {
-                farmio.getSimulation().simulate(filePath, 1, false);
-            } else if(level < 3) {
-                farmio.getSimulation().simulate(filePath, 2,false);
-            } else if(level < 4) {
-                farmio.getSimulation().simulate(filePath, 3,false);
-            }
-        }
+        farmio.getSimulation().simulate(filePath, (int)(level * 10),false);
 
         ui.show("Press [Enter] to go back to game");
     }

diff --git a/src/main/java/commands/CommandTaskCreate.java b/src/main/java/commands/CommandTaskCreate.java
@@ -27,8 +27,7 @@ public void execute(Farmio farmio) throws FarmioException, FarmioFatalException
         Storage storage = farmio.getStorage();
         Farmer farmer = farmio.getFarmer();
         farmer.getTasks().addTask(task);
-        farmio.getSimulation().simulate(farmio.getLevel().getPath(), farmio.getLevel().getNarratives().size() - 1);
+        super.saveTaskandResetScreen(farmio);
         ui.showInfo("Task [" + task.toString() + "] added! \nYou now have " + farmer.getTasks().size() + " tasks!");
-        super.saveTask(farmio);
     }
 }
diff --git a/src/main/java/commands/CommandTaskDelete.java b/src/main/java/commands/CommandTaskDelete.java
@@ -24,9 +24,8 @@ public void execute(Farmio farmio) throws FarmioException, FarmioFatalException
         }
         try {
             String taskToString = farmio.getFarmer().getTasks().removeTask(taskID);
-            farmio.getSimulation().simulate();
+            super.saveTaskandResetScreen(farmio);
             farmio.getUi().showInfo("You have deleted task: " + taskToString);
-            super.saveTask(farmio);
         } catch (Exception e) {
             throw new FarmioException("Error deleting task!");
         }

diff --git a/src/main/java/commands/CommandTaskDeleteAll.java b/src/main/java/commands/CommandTaskDeleteAll.java
@@ -13,8 +13,7 @@ public class CommandTaskDeleteAll extends CommandChangeTask {
     @Override
     public void execute(Farmio farmio) throws FarmioFatalException {
         farmio.getFarmer().getTasks().clear();
-        farmio.getSimulation().simulate();
+        super.saveTaskandResetScreen(farmio);
         farmio.getUi().showInfo("You have deleted all tasks!");
-        super.saveTask(farmio);
     }
 }
diff --git a/src/main/java/commands/CommandTaskEdit.java b/src/main/java/commands/CommandTaskEdit.java
@@ -31,10 +31,8 @@ public void execute(Farmio farmio) throws FarmioException, FarmioFatalException
             throw new FarmioException("Invalid Task ID!");
         }
         farmer.getTasks().editTask(taskID, task);
-        farmio.getSimulation().simulate(farmio.getLevel().getPath(),
-                farmio.getLevel().getNarratives().size() - 1);
+        super.saveTaskandResetScreen(farmio);
         Ui ui = farmio.getUi();
         ui.showInfo("Successfully edited task!");
-        super.saveTask(farmio);
     }
 }
diff --git a/src/main/java/commands/CommandTaskInsert.java b/src/main/java/commands/CommandTaskInsert.java
@@ -24,8 +24,7 @@ public CommandTaskInsert(int taskID, Task task) {
     @Override
     public void execute(Farmio farmio) throws FarmioException, FarmioFatalException {
         farmio.getFarmer().getTasks().insertTask(taskID, task);
-        farmio.getSimulation().simulate();
+        super.saveTaskandResetScreen(farmio);
         farmio.getUi().showInfo("You have added a new task: " + task.toString() + " at position " + taskID);
-        super.saveTask(farmio);
     }
 }
diff --git a/src/main/java/farmio/Level.java b/src/main/java/farmio/Level.java
@@ -295,9 +295,8 @@ public List<String> getSuccessfulFeedback() {
      * @return
      */
 
-    public List<String> getFeedback(Farmio farmio) {
+    public List<String> getFeedback(Farmio farmio, ObjectiveResult currentLevelState) {
         Farmer farmer = farmio.getFarmer();
-        ObjectiveResult currentLevelState = farmio.getLevel().getLevelState();
 
         List<String> output = new ArrayList<String>();
         if (currentLevelState == ObjectiveResult.DONE) {

diff --git a/src/main/resources/asciiArt/ActionList/frame16.txt b/src/main/resources/asciiArt/ActionList/frame16.txt
@@ -0,0 +1,5 @@
+Transport             Market            WheatFarm
+______________________________________________________
+  gotoMarket       | buySeeds       | plantSeeds
+  gotoWheatFarm    | sellGrain      | harvestWheat
+___________________|________________|_________________
diff --git a/src/main/resources/asciiArt/ActionList/frame21.txt b/src/main/resources/asciiArt/ActionList/frame21.txt
@@ -0,0 +1,5 @@
+Transport             Market            WheatFarm
+______________________________________________________
+  gotoMarket       | buySeeds       | plantSeeds
+  gotoWheatFarm    | sellGrain      | harvestWheat
+___________________|________________|_________________
diff --git a/src/main/resources/asciiArt/ConditionList/frame12.txt b/src/main/resources/asciiArt/ConditionList/frame12.txt
@@ -0,0 +1,9 @@
+         GOLD                     BOOLEAN
+______________________________________________________
+ greaterThanOrEquals | 
+ greaterThan         |          
+ lessThan            |          
+ lessThanOrEquals    |
+_____________________|________________________________
+
+Eg: [If gold greaterThanOrEquals 10 do buySeeds]
diff --git a/src/main/resources/asciiArt/ConditionList/frame13.txt b/src/main/resources/asciiArt/ConditionList/frame13.txt
@@ -0,0 +1,9 @@
+         GOLD                     BOOLEAN
+______________________________________________________
+ greaterThanOrEquals | 
+ greaterThan         |          
+ lessThan            |          
+ lessThanOrEquals    |
+_____________________|________________________________
+
+Eg: [If gold greaterThanOrEquals 10 do buySeeds]
diff --git a/src/main/resources/asciiArt/ConditionList/frame15.txt b/src/main/resources/asciiArt/ConditionList/frame15.txt
@@ -0,0 +1,10 @@
+         GOLD                     BOOLEAN
+______________________________________________________
+ greaterThanOrEquals |            hasSeeds
+ greaterThan         |            hasWheat
+ lessThan            |            hasGrain
+ lessThanOrEquals    |
+_____________________|________________________________
+
+Eg: [If gold greaterThanOrEquals 10 do buySeeds]
+
diff --git a/src/main/resources/asciiArt/ConditionList/frame21.txt b/src/main/resources/asciiArt/ConditionList/frame21.txt
@@ -0,0 +1,10 @@
+         GOLD                     BOOLEAN
+______________________________________________________
+ greaterThanOrEquals |            hasSeeds
+ greaterThan         |            hasWheat
+ lessThan            |            hasGrain
+ lessThanOrEquals    |
+_____________________|________________________________
+
+Eg: [If gold greaterThanOrEquals 10 do buySeeds]
+
diff --git a/src/main/resources/asciiArt/MarketList/frame11.txt b/src/main/resources/asciiArt/MarketList/frame11.txt
@@ -0,0 +1,7 @@
+   .______________________________________________.
+   |               Market Rates                   |
+   |----------------------------------------------|
+   |      Item        |  Selling or Buying Price  |
+   |------------------|---------------------------|
+   |      Seeds       |         10 gold           |
+   |__________________|___________________________|
diff --git a/src/main/resources/asciiArt/MarketList/frame12.txt b/src/main/resources/asciiArt/MarketList/frame12.txt
@@ -0,0 +1,7 @@
+   .______________________________________________.
+   |               Market Rates                   |
+   |----------------------------------------------|
+   |      Item        |  Selling or Buying Price  |
+   |------------------|---------------------------|
+   |      Seeds       |         10 gold           |
+   |__________________|___________________________|
diff --git a/src/main/resources/asciiArt/MarketList/frame13.txt b/src/main/resources/asciiArt/MarketList/frame13.txt
@@ -0,0 +1,7 @@
+   .______________________________________________.
+   |               Market Rates                   |
+   |----------------------------------------------|
+   |      Item        |  Selling or Buying Price  |
+   |------------------|---------------------------|
+   |      Seeds       |         10 gold           |
+   |__________________|___________________________|
diff --git a/src/main/resources/asciiArt/MarketList/frame14.txt b/src/main/resources/asciiArt/MarketList/frame14.txt
@@ -0,0 +1,7 @@
+   .______________________________________________.
+   |               Market Rates                   |
+   |----------------------------------------------|
+   |      Item        |  Selling or Buying Price  |
+   |------------------|---------------------------|
+   |      Seeds       |         10 gold           |
+   |__________________|___________________________|
diff --git a/src/main/resources/asciiArt/MarketList/frame15.txt b/src/main/resources/asciiArt/MarketList/frame15.txt
@@ -0,0 +1,10 @@
+   .______________________________________________.
+   |               Market Rates                   |
+   |----------------------------------------------|
+   |      Item        |  Selling or Buying Price  |
+   |------------------|---------------------------|
+   |      Seeds       |         10 gold           |
+   |      Grain       |         15 gold           |
+   |__________________|___________________________|
+
+
diff --git a/src/main/resources/asciiArt/MarketList/frame16.txt b/src/main/resources/asciiArt/MarketList/frame16.txt
@@ -0,0 +1,10 @@
+   .______________________________________________.
+   |               Market Rates                   |
+   |----------------------------------------------|
+   |      Item        |  Selling or Buying Price  |
+   |------------------|---------------------------|
+   |      Seeds       |         10 gold           |
+   |      Grain       |         15 gold           |
+   |__________________|___________________________|
+
+
diff --git a/src/main/resources/asciiArt/MarketList/frame21.txt b/src/main/resources/asciiArt/MarketList/frame21.txt
@@ -0,0 +1,10 @@
+   .______________________________________________.
+   |               Market Rates                   |
+   |----------------------------------------------|
+   |      Item        |  Selling or Buying Price  |
+   |------------------|---------------------------|
+   |      Seeds       |         10 gold           |
+   |      Grain       |         15 gold           |
+   |      Chicken     |         25 gold           |
+   |      Eggs        |         10  gold          |
+   |__________________|___________________________|