Remove toggle for effort values and embed as 0 in maxTotalEV

1 files changed, 5 insertions, 15 deletions

diff --git a/sigmod/Rules.cpp b/sigmod/Rules.cpp
index 78680653..a079c9d7 100644
--- a/sigmod/Rules.cpp
+++ b/sigmod/Rules.cpp
@@ -52,7 +52,6 @@ Rules::Rules(const Game* parent) :
         m_maxTotalWeight(0),
         m_specialSplit(false),
         m_specialDVSplit(false),
-        m_effortValuesAllowed(false),
         m_maxTotalEV(0),
         m_maxEVPerStat(0)
 {
@@ -90,10 +89,8 @@ void Rules::validate()
     else
         TEST(maxMoney);
     TEST(maxTotalWeight);
-    if (m_effortValuesAllowed)
-    {
-        TEST(maxEVPerStat);
-    }
+    TEST(maxTotalEV);
+    TEST(maxEVPerStat);
     TEST_END();
 }
 
@@ -118,7 +115,6 @@ void Rules::load(const QDomElement& xml)
     LOAD(maxTotalWeight);
     LOAD(specialSplit);
     LOAD(specialDVSplit);
-    LOAD(effortValuesAllowed);
     LOAD(maxTotalEV);
     LOAD(maxEVPerStat);
 }
@@ -145,7 +141,6 @@ QDomElement Rules::save() const
     SAVE(maxTotalWeight);
     SAVE(specialSplit);
     SAVE(specialDVSplit);
-    SAVE(effortValuesAllowed);
     SAVE(maxTotalEV);
     SAVE(maxEVPerStat);
     return xml;
@@ -169,7 +164,6 @@ SETTER(Rules, int, MaxMoney, maxMoney)
 SETTER(Rules, int, MaxTotalWeight, maxTotalWeight)
 SETTER(Rules, bool, SpecialSplit, specialSplit)
 SETTER(Rules, bool, SpecialDVSplit, specialDVSplit)
-SETTER(Rules, bool, EffortValuesAllowed, effortValuesAllowed)
 SETTER(Rules, int, MaxTotalEV, maxTotalEV)
 SETTER(Rules, int, MaxEVPerStat, maxEVPerStat)
 
@@ -191,7 +185,6 @@ GETTER(Rules, int, maxMoney)
 GETTER(Rules, int, maxTotalWeight)
 GETTER(Rules, bool, specialSplit)
 GETTER(Rules, bool, specialDVSplit)
-GETTER(Rules, bool, effortValuesAllowed)
 GETTER(Rules, int, maxTotalEV)
 GETTER(Rules, int, maxEVPerStat)
 
@@ -228,14 +221,12 @@ CHECK_BEGIN(Rules, bool, specialDVSplit)
         return false;
     }
 CHECK_END()
-CHECK(Rules, bool, effortValuesAllowed)
 CHECK_BEGIN(Rules, int, maxTotalEV)
-    if (m_effortValuesAllowed)
-        TBOUNDS(maxTotalEV, 0, INT_MAX);
+    TBOUNDS(maxTotalEV, 0, INT_MAX);
 CHECK_END()
 CHECK_BEGIN(Rules, int, maxEVPerStat)
-    if (m_effortValuesAllowed && m_maxTotalEV)
-        TBOUNDS(maxEVPerStat, 0, m_maxTotalEV);
+    if (m_maxTotalEV)
+        TBOUNDS(maxEVPerStat, 1, m_maxTotalEV);
 CHECK_END()
 
 Rules& Rules::operator=(const Rules& rhs)
@@ -260,7 +251,6 @@ Rules& Rules::operator=(const Rules& rhs)
     COPY(maxTotalWeight);
     COPY(specialSplit);
     COPY(specialDVSplit);
-    COPY(effortValuesAllowed);
     COPY(maxTotalEV);
     COPY(maxEVPerStat);
     return *this;