From 18ed317aaa90f56d14557d8f2496b74edb106727 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 29 Jun 2018 18:56:07 -0400
Subject: [PATCH] fixes and physical idealist law tweaks
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 4 ++++
devNotes/twine JS.txt | 1 +
src/js/summaryWidgets.tw | 1 +
src/uncategorized/lawCompliance.tw | 13 ++++++++++---
src/uncategorized/policies.tw | 4 ++--
src/utility/miscWidgets.tw | 6 +-----
6 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 231a6de2d2f..8afb2b4ddc2 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,6 +4,10 @@
6/29/2018
+ 8
+ -fixes
+ -physical idealist SMR now better suits your muscle perference
+
7
-more fixes to the RA
-other fixes and typos
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 9e886bf749f..ca4f1ce34cc 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -6778,6 +6778,7 @@ window.Enunciate = function Enunciate(slave) {
window.SlaveStatClamp = function SlaveStatClamp(slave) {
slave.energy = Math.clamp(slave.energy, 0, 100);
+ const V = State.variables;
if (slave.devotion > 100) {
if (slave.trust < -95)
diff --git a/src/js/summaryWidgets.tw b/src/js/summaryWidgets.tw
index 41cc8e8d699..369cd3b6932 100644
--- a/src/js/summaryWidgets.tw
+++ b/src/js/summaryWidgets.tw
@@ -2,6 +2,7 @@
window.SlaveStatClamp = function SlaveStatClamp(slave) {
slave.energy = Math.clamp(slave.energy, 0, 100);
+ const V = State.variables;
if (slave.devotion > 100) {
if (slave.trust < -95)
diff --git a/src/uncategorized/lawCompliance.tw b/src/uncategorized/lawCompliance.tw
index 87010a84462..cae29ea3be1 100644
--- a/src/uncategorized/lawCompliance.tw
+++ b/src/uncategorized/lawCompliance.tw
@@ -41,10 +41,17 @@
She has been on powerful growth hormones for a long time, and has experienced growth in several areas as a result.
<</if>>
<<if $arcologies[0].FSPhysicalIdealistSMR == 1>>
- <<set $activeSlave.muscles = random(50,100)>>
- <<set $activeSlave.weight = random(-20,0)>>
+ Much of her time before sale was spent
+ <<if $arcologies[0].FSPhysicalIdealistLaw == 1>>
+ <<set $activeSlave.muscles = random(20,50)>>
+ doing cardio,
+ <<else>>
+ <<set $activeSlave.muscles = random(50,100)>>
+ lifting weights,
+ <</if>>
+ and her health has been raised to an almost unnatural level.
<<set $activeSlave.health = random(50,90)>>
- Much of her time before sale was spent lifting weights, and her health has been raised to an almost unnatural level.
+ <<set $activeSlave.weight = random(-20,0)>>
<<elseif $arcologies[0].FSHedonisticDecadenceSMR == 1>>
<<set $activeSlave.muscles = random(-80,0)>>
<<set $activeSlave.weight = random(50,200)>>
diff --git a/src/uncategorized/policies.tw b/src/uncategorized/policies.tw
index d49ab91886a..0828b87042d 100644
--- a/src/uncategorized/policies.tw
+++ b/src/uncategorized/policies.tw
@@ -582,7 +582,7 @@
<</if>>
<<if $arcologies[0].FSPhysicalIdealistSMR == 1>>
- <br>''Lifting SMR:'' in order to be sold in the arcology, slaves must be bulked.
+ <br>''Lifting SMR:'' in order to be sold in the arcology, slaves must be <<if $arcologies[0].FSPhysicalIdealistLaw == 1>>toned<<else>>bulked<</if>>.
[[Repeal|Policies][$arcologies[0].FSPhysicalIdealistSMR = 0, $minimumSlaveCost -= 500]]
<</if>>
@@ -1442,7 +1442,7 @@
<<if $arcologies[0].FSPhysicalIdealist >= 40>>
<<if $arcologies[0].FSPhysicalIdealistSMR == 0>>
- <br>''@@.lime;Lifting SMR:@@'' in order to be sold in the arcology, slaves will have to be bulked.
+ <br>''@@.lime;Lifting SMR:@@'' in order to be sold in the arcology, slaves will have to be <<if $arcologies[0].FSPhysicalIdealistLaw == 1>>toned<<else>>bulked<</if>>.
[[Implement|Policies][$arcologies[0].FSPhysicalIdealistSMR = 1, $cash -=5000, $rep -= 1000, $minimumSlaveCost += 500]]
<br> //Will help advance Physical Idealism//
<</if>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index da06ddc97d5..e6c0ba29d31 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -2004,11 +2004,7 @@
<</widget>>
<<widget "Master">><<if def $args[0]>><<Enunciate $args[0]>><<elseif ndef $titleEnunciate>><<Enunciate $activeSlave>><</if>>$titleEnunciate<</widget>>
-
-<<widget "WrittenMaster">>
- <<= WrittenMaster($args[0]) >>
-<</widget>>
-
+<<widget "WrittenMaster">><<= WrittenMaster($args[0]) >><</widget>>
<<widget "say">><<if def $args[0] && $sayEnunciate != "lisp">>$args[0]<<else>>$sayEnunciate<</if>><</widget>>
<<widget "s">>$sEnunciate<</widget>>
<<widget "S">>$SEnunciate<</widget>>
--
GitLab