diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 469c6f6090ab9ac46c599b8c72d7414dcd4906a9..6cda42f0d56144b0b7aa2acc7f982d4d5f7ea8fe 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -987,7 +987,7 @@ Setting missing global variables: <<if ndef $researchLab>> <<set $researchLab = {}>> - <<set $researchLab.built = 0>> + <<set $researchLab.built = "false">> <</if>> <<if ndef $TSS>> diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw index 66a72ec871bfc21f9d84eb09f290e56254524ee1..1357572d65029d88dfbcb3452cda620789257f6f 100644 --- a/src/uncategorized/buildingWidgets.tw +++ b/src/uncategorized/buildingWidgets.tw @@ -102,7 +102,7 @@ Yes, I am aware this is horrible. If anyone can figure out how to get widgets to <td></td> <td id="Penthouse" colspan="4"> <<link "Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>> - <<if $masterSuite||$servantsQuarters||$spa||$clinic||$schoolroom||$cellblock||$incubator||$HGSuite>> + <<if $masterSuite||$servantsQuarters||$spa||$clinic||$schoolroom||$cellblock||$incubator||$researchLab.built||$HGSuite>> <br> <<if $masterSuite>>[[Suite|Master Suite]] ($masterSuiteSlaves/$masterSuite<<if $Concubine>>, C<</if>>)<</if>> <<if $servantsQuarters>>[[Quarters|Servants' Quarters]] ($servantsQuartersSlaves/$servantsQuarters<<if $Stewardess>>, L<</if>>)<</if>> @@ -111,6 +111,7 @@ Yes, I am aware this is horrible. If anyone can figure out how to get widgets to <<if $schoolroom>>[[Schoolroom]] ($schoolroomSlaves/$schoolroom<<if $Schoolteacher>>, L<</if>>)<</if>> <<if $cellblock>>[[Cellblock]] ($cellblockSlaves/$cellblock<<if $Wardeness>>, L<</if>>)<</if>> <<if $incubator>>[[Incubator]] (<<if $incubator-$incubatorSlaves == 0>>No empty tanks<<elseif $incubator-$incubatorSlaves == 1>>1 empty tank<<else>><<print $incubator-$incubatorSlaves>> empty tanks<</if>>)<</if>> + <<if $researchLab.built == "true">>[[Research Lab][$temp = 0]]<</if>> <<if $HGSuite>>[[HG Suite|Head Girl Suite]] ($HGSuiteSlaves)<</if>> <</if>> </td> diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw index 6722c2d6dcb3714a78533ae72991a69989f37dd7..5f69ef0fece84587c29bf59fe5b7c49f57bb3791 100644 --- a/src/uncategorized/saLiveWithHG.tw +++ b/src/uncategorized/saLiveWithHG.tw @@ -299,7 +299,7 @@ <</if>> <<if ($slaves[$i].devotion > 50)>> -<<if (($slaves[$i].fetishStrength <= 95) || ($slaves[$i].fetishKnown == 0)) && ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetishStrength > 60) && ($slaves[$i].fetish != $HeadGirl.fetish)>> +<<if (($slaves[$i].fetishStrength <= 95) || ($slaves[$i].fetishKnown == 0)) && ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetishStrength > 60) && ($slaves[$i].fetish != $HeadGirl.fetish) && ($slaves[$i].fetish != "mindbroken")>> <<if ($HeadGirl.fetish == "submissive")>> $slaves[$i].slaveName slowly gets used to $HeadGirl.slaveName's need to be sexually dominated, and begins to @@.pink;enjoy being a top@@ within the confines of the suite. <<set $slaves[$i].fetish = "dom", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>> @@ -665,7 +665,7 @@ <<set $slaves[$i].devotion -= 20, $slaves[$i].trust -= 20, $slaves[$i].health -= 20, $slaves[$i].balls = 0>> <</if>> <</if>> - <<if ($slaves[$i].devotion < -90)>> + <<if ($slaves[$i].devotion < -90) && ($slaves[$i].fetish != "mindbroken")>> $HeadGirl.slaveName tires of $slaves[$i].slaveName's protests that $HeadGirl.slaveName is a monster for hurting her this way and her complaints that she deserves better. $HeadGirl.slaveName decides that it'll be just as much fun and a lot less trouble to mistreat $slaves[$i].slaveName once she's mindbroken, and sends her in for @@.red;chemical lobotomization.@@ <<set $slaves[$i].health -= 20, $slaves[$i].fetish = "mindbroken">> <</if>>