diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 231a6de2d2f3743547f3c3477f065b4c16f05cc1..8afb2b4ddc2f6d3f83b3483631facdbfaad998d6 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 9e886bf749f5d5d7e65d44af98129bc03c81bb96..ca4f1ce34cc3bc287fb002a1da9919851661d9c9 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 41cc8e8d6993557b00a4459a8e9e00d44773ed36..369cd3b6932d3da81708ac1cfee362320499e603 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 87010a844626525c98e0850c9ae426fae75e3ca6..cae29ea3be13b3bfc9f678de8f8dcc4aa2645395 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 d49ab91886a694075056228afee8100523518ac0..0828b87042d0e6f00fe54aa87c74560148c38c50 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 da06ddc97d5a2e2a25dd5904a0d60f72db0264b4..e6c0ba29d3136f3b54bc697db0a05490965faf8b 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>>