From fb7852fb9e5b4677a1edf5f63a95581b47ae9210 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Thu, 2 Jul 2020 09:26:49 -0400
Subject: [PATCH] move clamps to needed new locations
---
js/003-data/policiesData.js | 12 ++++++++++++
src/interaction/policies/policies.tw | 29 ----------------------------
2 files changed, 12 insertions(+), 29 deletions(-)
diff --git a/js/003-data/policiesData.js b/js/003-data/policiesData.js
index 80645c08d60..e929eb9ebd7 100644
--- a/js/003-data/policiesData.js
+++ b/js/003-data/policiesData.js
@@ -692,6 +692,7 @@ App.Data.Policies.Selection = {
App.UI.DOM.makeTextBox(
V.customRetirementAge,
v => {
+ Math.clamp(v, 20, 120);
V.customRetirementAge = v;
V.retirementAge = v;
policy("RetirementPolicies");
@@ -720,6 +721,7 @@ App.Data.Policies.Selection = {
App.UI.DOM.makeTextBox(
V.customRetirementAge,
v => {
+ Math.clamp(v, 20, 120);
V.customRetirementAge = v;
V.retirementAge = v;
policy("RetirementPolicies");
@@ -789,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");
},
@@ -820,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
@@ -849,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");
},
@@ -879,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");
},
@@ -909,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");
},
@@ -955,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 a71510c29a0..6f69991e784 100644
--- a/src/interaction/policies/policies.tw
+++ b/src/interaction/policies/policies.tw
@@ -16,35 +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.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">
--
GitLab