Options: remove mustValidate and canCancel

7 files changed, 13 insertions, 39 deletions

diff --git a/core/src/ch/asynk/rustanddust/game/Config.java b/core/src/ch/asynk/rustanddust/game/Config.java
index cd5c0f4..56fa662 100644
--- a/core/src/ch/asynk/rustanddust/game/Config.java
+++ b/core/src/ch/asynk/rustanddust/game/Config.java
@@ -54,8 +54,6 @@ public class Config
     public boolean showMoves;
     public boolean showTargets;
     public boolean showMoveAssists;
-    public boolean canCancel;
-    public boolean mustValidate;
     public boolean showEnemyPossibilities;
     public boolean debug;
     public Battle battle;
@@ -69,8 +67,6 @@ public class Config
         this.showMoves = true;
         this.showTargets = true;
         this.showMoveAssists = true;
-        this.canCancel = false;
-        this.mustValidate = false;
         this.showEnemyPossibilities = false;
         this.graphics = Graphics.MINE;
         this.battle = null;
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateBreak.java b/core/src/ch/asynk/rustanddust/game/states/StateBreak.java
index 575903c..bab504d 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateBreak.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateBreak.java
@@ -63,13 +63,8 @@ public class StateBreak extends StateCommon
 
             if (o == Orientation.KEEP) return;
 
-            if (cfg.mustValidate) {
-                map.hexDirectionsHide(to);
-                ctrl.hud.actionButtons.show(Buttons.DONE.b);
-            } else {
-                doRotation(o);
-                ctrl.setState(StateType.ANIMATION);
-            }
+            doRotation(o);
+            ctrl.setState(StateType.ANIMATION);
         }
     }
 
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateEngage.java b/core/src/ch/asynk/rustanddust/game/states/StateEngage.java
index 065f468..0d342ad 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateEngage.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateEngage.java
@@ -11,7 +11,6 @@ public class StateEngage extends StateCommon
     public void enter(StateType prevState)
     {
         map.unitsTargetClear();
-        ctrl.hud.actionButtons.show(cfg.canCancel ? Buttons.ABORT.b : 0);
 
         // activeUnit is the target
         if (prevState == StateType.SELECT) {
@@ -89,7 +88,6 @@ public class StateEngage extends StateCommon
             activeUnit.showTarget();
             map.collectAssists(selectedUnit, activeUnit, ctrl.battle.getPlayer().units);
             map.unitsAssistShow();
-            ctrl.hud.actionButtons.show((cfg.mustValidate ? Buttons.DONE.b : 0) | (cfg.canCancel ? Buttons.ABORT.b : 0));
         }
         else if (unit == activeUnit) {
             ctrl.setState(StateType.DONE);
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateMove.java b/core/src/ch/asynk/rustanddust/game/states/StateMove.java
index 7955037..559fc70 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateMove.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateMove.java
@@ -12,7 +12,7 @@ public class StateMove extends StateCommon
     {
         ctrl.hud.actionButtons.show(
                 ((map.unitsActivatedSize() > 0) ? Buttons.DONE.b : 0)
-                | (cfg.canCancel ? Buttons.ABORT.b : 0));
+                );
 
         if (prevState == StateType.WITHDRAW) {
             if (map.pathsSize() == 1)
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateReinforcement.java b/core/src/ch/asynk/rustanddust/game/states/StateReinforcement.java
index 00ae3e1..419373e 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateReinforcement.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateReinforcement.java
@@ -66,7 +66,6 @@ public class StateReinforcement extends StateCommon
             entryZone.enable(Hex.AREA, false);
         entryZone = ctrl.battle.getEntryZone(activeUnit);
         entryZone.enable(Hex.AREA, true);
-        ctrl.hud.actionButtons.show(((cfg.canCancel) ? Buttons.ABORT.b : 0));
     }
 
     private void unitEnter(Unit unit)
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateRotate.java b/core/src/ch/asynk/rustanddust/game/states/StateRotate.java
index 8203725..8385570 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateRotate.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateRotate.java
@@ -13,8 +13,6 @@ public class StateRotate extends StateCommon
     @Override
     public void enter(StateType prevState)
     {
-        ctrl.hud.actionButtons.show((cfg.canCancel && (map.unitsMoveableSize() > 1))? Buttons.ABORT.b : 0);
-
         if (activeUnit == null)
             activeUnit = selectedUnit;
         if (to == null)
@@ -97,13 +95,7 @@ public class StateRotate extends StateCommon
 
         map.pathsSetOrientation(o);
         rotationSet = true;
-
-        if (cfg.mustValidate) {
-            map.hexDirectionsHide(to);
-            ctrl.hud.actionButtons.show(Buttons.DONE.b | ((cfg.canCancel) ? Buttons.ABORT.b : 0));
-        } else {
-            execute();
-            ctrl.setState(StateType.ANIMATION);
-        }
+        execute();
+        ctrl.setState(StateType.ANIMATION);
     }
 }
diff --git a/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java b/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java
index 5f4ff6e..e2b3b1e 100644
--- a/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java
+++ b/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java
@@ -26,8 +26,6 @@ public class OptionsMenu extends Patch
 
     private String [] checkStrings = {
         "Debug",
-        "Must Validate",
-        "Can Cancel",
         "Show Enemy Possibilities",
         "Show Moves Assists",
         "Show Targets",
@@ -76,12 +74,10 @@ public class OptionsMenu extends Patch
 
     private void getValues()
     {
-        checkValues[6] = game.config.showMoves;
-        checkValues[5] = game.config.showTargets;
-        checkValues[4] = game.config.showMoveAssists;
-        checkValues[3] = game.config.showEnemyPossibilities;
-        checkValues[2] = game.config.canCancel;
-        checkValues[1] = game.config.mustValidate;
+        checkValues[4] = game.config.showMoves;
+        checkValues[3] = game.config.showTargets;
+        checkValues[2] = game.config.showMoveAssists;
+        checkValues[1] = game.config.showEnemyPossibilities;
         checkValues[0] = game.config.debug;
         fxVolumeIdx = (int) (game.config.fxVolume * 10);
         fxVolumeValue.write(fxStrings[fxVolumeIdx], fxVolumeValue.getX(), fxVolumeValue.getY());
@@ -89,12 +85,10 @@ public class OptionsMenu extends Patch
 
     private boolean apply()
     {
-        game.config.showMoves = checkValues[6];
-        game.config.showTargets = checkValues[5];
-        game.config.showMoveAssists = checkValues[4];
-        game.config.showEnemyPossibilities = checkValues[3];
-        game.config.canCancel = checkValues[2];
-        game.config.mustValidate = checkValues[1];
+        game.config.showMoves = checkValues[4];
+        game.config.showTargets = checkValues[3];
+        game.config.showMoveAssists = checkValues[2];
+        game.config.showEnemyPossibilities = checkValues[1];
         game.config.debug = checkValues[0];
         game.config.fxVolume = (fxVolumeIdx / 10.0f);
         return true;