diff --git a/js/003-data/policiesData.js b/js/003-data/policiesData.js index ffa62aeff21076fe5d0fe59669b22581028a779c..e929eb9ebd7322f3c69e04fa9c615dcea9cc6b4f 100644 --- a/js/003-data/policiesData.js +++ b/js/003-data/policiesData.js @@ -692,7 +692,9 @@ App.Data.Policies.Selection = { App.UI.DOM.makeTextBox( V.customRetirementAge, v => { + Math.clamp(v, 20, 120); V.customRetirementAge = v; + V.retirementAge = v; policy("RetirementPolicies"); }, true @@ -703,8 +705,8 @@ App.Data.Policies.Selection = { return el; }, get activatedText() { return `you have set your arcology's standard retirement age for sex slaves at ${V.retirementAge}.`; }, - onRepeal: function() { V.retirementAge = 45; } - + onRepeal: function() { V.retirementAge = 45; }, + note: "Set age before implementing" } ], "policies.retirement.physicalAgePolicy": [ @@ -719,7 +721,9 @@ App.Data.Policies.Selection = { App.UI.DOM.makeTextBox( V.customRetirementAge, v => { + Math.clamp(v, 20, 120); V.customRetirementAge = v; + V.retirementAge = v; policy("RetirementPolicies"); }, true @@ -730,7 +734,8 @@ App.Data.Policies.Selection = { return el; }, get activatedText() { return `you have set your arcology's standard retirement age for sex slaves at ${V.retirementAge}.`; }, - onRepeal: function() { V.retirementAge = 45; } + onRepeal: function() { V.retirementAge = 45; }, + note: "Set age before implementing" } ], "policies.retirement.fate": [ @@ -786,6 +791,7 @@ App.Data.Policies.Selection = { App.UI.DOM.makeTextBox( V.policies.retirement.sex, v => { + Math.clamp(v, 1, 10000000); V.policies.retirement.sex = v; policy("RetirementPolicies"); }, @@ -817,6 +823,7 @@ App.Data.Policies.Selection = { V.policies.retirement.milk, v => { V.policies.retirement.milk = v; + Math.clamp(v, 1, 100000000); policy("RetirementPolicies"); }, true @@ -846,6 +853,7 @@ App.Data.Policies.Selection = { App.UI.DOM.makeTextBox( V.policies.retirement.cum, v => { + Math.clamp(v, 1, 1000000000); V.policies.retirement.cum = v; policy("RetirementPolicies"); }, @@ -876,6 +884,7 @@ App.Data.Policies.Selection = { App.UI.DOM.makeTextBox( V.policies.retirement.births, v => { + Math.clamp(v, 1, 1000000); V.policies.retirement.births = v; policy("RetirementPolicies"); }, @@ -906,6 +915,7 @@ App.Data.Policies.Selection = { App.UI.DOM.makeTextBox( V.policies.retirement.kills, v => { + Math.clamp(v, 1, 1000000); V.policies.retirement.kills = v; policy("RetirementPolicies"); }, @@ -952,7 +962,12 @@ App.Data.Policies.Selection = { App.UI.DOM.makeTextBox( V.customMenialRetirementAge, v => { + Math.clamp(v, 20, 120); V.customMenialRetirementAge = v; + V.customRetirementAge = Math.clamp(V.customRetirementAge, 20, V.customMenialRetirementAge); + if (V.customMenialRetirementAge < 45) { + V.retirementAge = V.customMenialRetirementAge; + } policy("MenialRetirementPolicies"); }, true diff --git a/src/interaction/policies/policies.tw b/src/interaction/policies/policies.tw index 77b51ac3a3cadeee0acbfe9e99cfbfdf00731a37..6f69991e78460f1d07d1cc6ef925e41eeabaf409 100644 --- a/src/interaction/policies/policies.tw +++ b/src/interaction/policies/policies.tw @@ -16,37 +16,6 @@ <<set $nextLink = "Main">> <</if>> <<set $encyclopedia = "Future Societies">> -<<set $rep = Math.clamp($rep, 0, 20000)>> - -<<set $customMenialRetirementAge = Math.clamp($customMenialRetirementAge, 20, 120)>> -<<if $policies.retirement.menial2Citizen == 1>> - <<set $customRetirementAge = Math.clamp($customRetirementAge, 20, $customMenialRetirementAge)>> - <<if $customMenialRetirementAge < 45>> - <<set $retirementAge = $customMenialRetirementAge>> - <</if>> -<<else>> - <<set $customRetirementAge = Math.clamp($customRetirementAge, 20, 120)>> -<</if>> -<<if $policies.retirement.customAgePolicy == 1>> <<set $retirementAge = $customRetirementAge>> <</if>> -<<if $policies.retirement.physicalAgePolicy == 1>> <<set $retirementAge = $customRetirementAge>> <</if>> - -<<if $policies.retirement.sex > 0>> - <<set $policies.retirement.sex = Math.clamp($policies.retirement.sex, 1, 10000000)>> -<</if>> -<<if $policies.retirement.milk > 0>> - <<set $policies.retirement.milk = Math.clamp($policies.retirement.milk, 1, 100000000)>> -<</if>> -<<if $policies.retirement.cum > 0>> - <<set $policies.retirement.cum = Math.clamp($policies.retirement.cum, 1, 1000000000)>> -<</if>> -<<if $policies.retirement.births > 0>> - <<set $policies.retirement.births = Math.clamp($policies.retirement.births, 1, 1000000)>> -<</if>> -<<if $policies.retirement.kills > 0>> - <<set $policies.retirement.kills = Math.clamp($policies.retirement.kills, 1, 1000000)>> -<</if>> -<<if $HeadGirl>> <<setLocalPronouns $HeadGirl>> <</if>> - <<run App.UI.tabbar.handlePreSelectedTab($tabChoice.policies)>> <p class="scene-intro">