diff --git a/src/uncategorized/pCitizensAndCivilians.tw b/src/uncategorized/pCitizensAndCivilians.tw
index f0d9b3a5e1861b7c48f1321ebfee025dba438670..29371f0145ae896bd6d3533b08a1e34d62d2324d 100644
--- a/src/uncategorized/pCitizensAndCivilians.tw
+++ b/src/uncategorized/pCitizensAndCivilians.tw
@@ -1,6 +1,6 @@
:: P citizens and civilians
-<<set $nextButton = " ", $nextLink = "Random Nonindividual Event", $nextButton = "Continue">>
+<<set $nextButton = " ", $nextLink = "Random Nonindividual Event">>
<<nobr>>
@@ -63,7 +63,7 @@
<<set $mercenaries = 5>>
<<set $mercenariesTitle = "Knights">>
<</replace>>
-<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<<if $arcologies[0].FSRomanRevivalist >= 10>>
<<link "They shall be my Evocati">>
<<replace "#result">>
@@ -74,7 +74,7 @@
<<set $mercenaries = 5>>
<<set $mercenariesTitle = "Evocati">>
<</replace>>
-<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>
<<if $arcologies[0].FSEgyptianRevivalist >= 10>>
<<link "They shall be my Medjay">>
@@ -86,7 +86,7 @@
<<set $mercenaries = 5>>
<<set $mercenariesTitle = "Medjay">>
<</replace>>
-<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>
<<if $arcologies[0].FSEdoRevivalist >= 10>>
<<link "Naturally, they shall be the Samurai">>
@@ -98,7 +98,7 @@
<<set $mercenaries = 5>>
<<set $mercenariesTitle = "Samurai">>
<</replace>>
-<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>
<<if $arcologies[0].FSArabianRevivalist >= 10>>
<<link "They shall be my Janissaries">>
@@ -110,7 +110,7 @@
<<set $mercenaries = 5>>
<<set $mercenariesTitle = "Janissaries">>
<</replace>>
-<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>
<<if $arcologies[0].FSChattelReligionist >= 10>>
<<link "They shall be the Knights Templar">>
@@ -122,7 +122,7 @@
<<set $mercenaries = 5>>
<<set $mercenariesTitle = "Knights Templar">>
<</replace>>
-<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>
<<if $arcologies[0].FSDegradationist >= 10>>
<<link "They shall be my Immortals">>
@@ -134,7 +134,7 @@
<<set $mercenaries = 5>>
<<set $mercenariesTitle = "Immortals">>
<</replace>>
-<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>
<<if $arcologies[0].FSAssetExpansionist >= 10>>
<</if>>
@@ -158,7 +158,7 @@
<<set $mercenaries = 5>>
<<set $mercenariesTitle = "Asgardians">>
<</replace>>
-<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>
<<if $arcologies[0].FSSupremacist >= 10>>
<<link "They shall be the Knights of the Blood">>
@@ -170,7 +170,7 @@
<<set $mercenaries = 5>>
<<set $mercenariesTitle = "Knights of the Blood">>
<</replace>>
-<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>
<<if $arcologies[0].FSSubjugationist >= 10>>
<</if>>
@@ -184,7 +184,7 @@
<<set $mercenaries = 5>>
<<set $mercenariesTitle = "Wardens">>
<</replace>>
-<</link>> <<if $PC.warfare >= 100 || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>> <<if $PC.warfare >= 100 || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>
<<if $arcologies[0].FSBodyPurist >= 10>>
<</if>>
@@ -200,6 +200,6 @@
<<set $mercenaries = 5>>
<<set $mercenariesTitle = "Rangers">>
<</replace>>
-<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>
</span>
diff --git a/src/uncategorized/rulesSlaveDeselectWorkaround.tw b/src/uncategorized/rulesSlaveDeselectWorkaround.tw
index bb617032382cbcb55b36a34d927a5f6221ae51f8..0af802d7a8896702d76fedf4f520068aa88871aa 100644
--- a/src/uncategorized/rulesSlaveDeselectWorkaround.tw
+++ b/src/uncategorized/rulesSlaveDeselectWorkaround.tw
@@ -1,10 +1,12 @@
:: Rules Slave Deselect Workaround
<<nobr>>
-<<set $nextButton = "Continue">>
-<<set $nextLink = "Rules Slave Select">>
- <<if ruleSlaveSelected($activeSlave, $currentRule)>>
- <<set $dump = $currentRule.selectedSlaves.pluck($activeSlave.ID)>>
- <</if>>
- <<goto "Rules Slave Select">>
+<<set $nextButton = "Continue", $nextLink = "Rules Slave Select">>
+
+<<if ruleSlaveSelected($activeSlave, $currentRule)>>
+ <<set $currentRule.selectedSlaves.delete($activeSlave.ID)>>
+<</if>>
+
+<<goto "Rules Slave Select">>
<</nobr>>
+
diff --git a/src/uncategorized/rulesSlaveExclude.tw b/src/uncategorized/rulesSlaveExclude.tw
index 85f05221e4010ff903154479891687da5f33e7ab..5c6e5a4f5226d8b86da1dae715c467f39fe0be98 100644
--- a/src/uncategorized/rulesSlaveExclude.tw
+++ b/src/uncategorized/rulesSlaveExclude.tw
@@ -3,20 +3,20 @@
<<nobr>>
<<set $nextButton = "Continue", $nextLink = "Rules Assistant">>
-<<if ($currentRule.selectedSlaves.length < 1) && ($currentRule.excludedSlaves.length < 1)>>
- No slaves are excluded from Rule $r.
- <br><br>
+<<if ndef $currentRule.excludedSlaves>>
+ <<set $currentRule.excludedSlaves to []>>
+<</if>>
+
+<<if ($currentRule.excludedSlaves.length < 1)>>
<<set $Flag = 0>>
- Exclude selected slaves from Rule $r:
+ Select slaves to exclude from Rule $r:
<<include "Slave Summary">>
<<else>>
- Slaves excluded from Rule $r:
+ Slaves currently excluded from Rule $r: [[Clear list|Rules Slave Exclude][$currentRule.excludedSlaves = []]]
<<set $Flag = 1>>
<<include "Slave Summary">>
<br><br>
- [[Do not exclude any slaves|Rules Slave Exclude][$currentRule.excludedSlaves = []]]
- <br><br>
- Exclude selected slaves from Rule $r:
+ Select more slaves to exclude from Rule $r:
<<set $Flag = 0>>
<<include "Slave Summary">>
<</if>>
diff --git a/src/uncategorized/rulesSlaveExcludeWorkaround.tw b/src/uncategorized/rulesSlaveExcludeWorkaround.tw
index 0993b53e80d9d8a3987b74cd1ac0df323788a726..6d62166fa42bfc49002b902a8a81db000f59e5fc 100644
--- a/src/uncategorized/rulesSlaveExcludeWorkaround.tw
+++ b/src/uncategorized/rulesSlaveExcludeWorkaround.tw
@@ -1,13 +1,15 @@
:: Rules Slave Exclude Workaround
<<nobr>>
-<<set $nextButton = "Continue">>
-<<set $nextLink = "Rules Slave Exclude">>
- <<if !ruleSlaveExcluded($activeSlave, $currentRule)>>
- <<set $currentRule.excludedSlaves.push($activeSlave.ID)>>
- <<if ruleSlaveSelected($activeSlave, $currentRule)>>
- <<set $dump = $currentRule.selectedSlaves.pluck($activeSlave.ID)>>
- <</if>>
+<<set $nextButton = "Continue", $nextLink = "Rules Slave Exclude">>
+
+<<if !ruleSlaveExcluded($activeSlave, $currentRule)>>
+ <<set $currentRule.excludedSlaves.push($activeSlave.ID)>>
+ <<if ruleSlaveSelected($activeSlave, $currentRule)>>
+ <<set $currentRule.selectedSlaves.delete($activeSlave.ID)>>
<</if>>
- <<goto "Rules Slave Exclude">>
+<</if>>
+
+<<goto "Rules Slave Exclude">>
<</nobr>>
+
diff --git a/src/uncategorized/rulesSlaveNoExcludeWorkaround.tw b/src/uncategorized/rulesSlaveNoExcludeWorkaround.tw
index 486e590e8c800e41b4425da4d5a52cddf9024f6c..cd7238218d00017546cd9dd1342288c69b22dace 100644
--- a/src/uncategorized/rulesSlaveNoExcludeWorkaround.tw
+++ b/src/uncategorized/rulesSlaveNoExcludeWorkaround.tw
@@ -1,10 +1,12 @@
:: Rules Slave NoExclude Workaround
<<nobr>>
-<<set $nextButton = "Continue">>
-<<set $nextLink = "Rules Slave Exclude">>
- <<if ruleSlaveExcluded($activeSlave, $currentRule)>>
- <<set $dump = $currentRule.excludedSlaves.pluck($activeSlave.ID)>>
- <</if>>
- <<goto "Rules Slave Exclude">>
+<<set $nextButton = "Continue", $nextLink = "Rules Slave Exclude">>
+
+<<if ruleSlaveExcluded($activeSlave, $currentRule)>>
+ <<set $currentRule.excludedSlaves.delete($activeSlave.ID)>>
+<</if>>
+
+<<goto "Rules Slave Exclude">>
<</nobr>>
+
diff --git a/src/uncategorized/rulesSlaveSelect.tw b/src/uncategorized/rulesSlaveSelect.tw
index 1f9a21022d209180d40aa8f1108ee99b69299ce6..2c7a4cf70ab7319230d34ea7a1b6def0917606c3 100644
--- a/src/uncategorized/rulesSlaveSelect.tw
+++ b/src/uncategorized/rulesSlaveSelect.tw
@@ -3,26 +3,20 @@
<<nobr>>
<<set $nextButton = "Continue", $nextLink = "Rules Assistant">>
-<<if $currentRule.selectedSlaves.length < 1 && $currentRule.excludedSlaves.length < 1>>
- Rule $r is currently applied to all slaves.
- <br><br>
- <<set $Flag = 0>>
- Apply Rule $r to selected slaves only:
- <<include "Slave Summary">>
-<<elseif $currentRule.selectedSlaves.length < 1 && $currentRule.excludedSlaves.length > 0>>
- Rule $r is currently applied to all slaves except excluded slaves.
- <br><br>
+<<if ndef $currentRule.selectedSlaves>>
+ <<set $currentRule.selectedSlaves to []>>
+<</if>>
+
+<<if ($currentRule.selectedSlaves.length < 1)>>
<<set $Flag = 0>>
- Apply rule $r to selected slaves only:
+ Choose specific slaves to limit Rule $r:
<<include "Slave Summary">>
<<else>>
- Rule $r is currently applied to:
+ Rule $r currently limited to specific slaves: [[Clear list|Rules Slave Select][$currentRule.selectedSlaves = []]]
<<set $Flag = 1>>
<<include "Slave Summary">>
<br><br>
- [[Apply to all slaves|Rules Slave Select][$currentRule.selectedSlaves = []]]
- <br><br>
- Apply rule $r to selected slaves only:
+ Choose more specific slaves:
<<set $Flag = 0>>
<<include "Slave Summary">>
<</if>>
diff --git a/src/uncategorized/rulesSlaveSelectWorkaround.tw b/src/uncategorized/rulesSlaveSelectWorkaround.tw
index 2d87fa7001ab19365a7d01ddd38104a6f886c01f..e8ed3ce8c5a822bcc64299a43d128c8e43b837da 100644
--- a/src/uncategorized/rulesSlaveSelectWorkaround.tw
+++ b/src/uncategorized/rulesSlaveSelectWorkaround.tw
@@ -1,13 +1,15 @@
:: Rules Slave Select Workaround
<<nobr>>
-<<set $nextButton = "Continue">>
-<<set $nextLink = "Rules Slave Select">>
- <<if !ruleSlaveSelected($activeSlave, $currentRule)>>
- <<set $currentRule.selectedSlaves.push($activeSlave.ID)>>
- <<if ruleSlaveExcluded($activeSlave, $currentRule)>>
- <<set $dump = $currentRule.excludedSlaves.pluck($activeSlave.ID)>>
- <</if>>
+<<set $nextButton = "Continue", $nextLink = "Rules Slave Select">>
+
+<<if !ruleSlaveSelected($activeSlave, $currentRule)>>
+ <<set $currentRule.selectedSlaves.push($activeSlave.ID)>>
+ <<if ruleSlaveExcluded($activeSlave, $currentRule)>>
+ <<set $currentRule.excludedSlaves.delete($activeSlave.ID)>>
<</if>>
- <<goto "Rules Slave Select">>
+<</if>>
+
+<<goto "Rules Slave Select">>
<</nobr>>
+
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 0c7865c0bf980aacaa2469ac87748c43b6860bb5..d5f996e9bb9e9a20dd1ffce4c0d7445cd77059e2 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -918,34 +918,32 @@ __Hormones__: <strong><span id="hormones">
<<if $activeSlave.fuckdoll > 0>>
//Rules have little meaning for living sex toys//
<<else>>
- <<if $activeSlave.assignmentVisible == 1>>
- <<set $dormitoryPopulation = 0, $roomsPopulation = 0>>
- <<for $i = 0; $i < _SL; $i++>>
- <<if $slaves[$i].assignmentVisible == 1>>
- <<if $slaves[$i].livingRules == "luxurious">>
- <<if $slaves[$i].relationship >= 4>>
- <<set $roomsPopulation += 0.5>>
- <<else>>
- <<set $roomsPopulation++>>
- <</if>>
+ <<set $dormitoryPopulation = 0, $roomsPopulation = 0>>
+ <<for $i = 0; $i < _SL; $i++>>
+ <<if $slaves[$i].assignmentVisible == 1>>
+ <<if $slaves[$i].livingRules == "luxurious">>
+ <<if $slaves[$i].relationship >= 4>>
+ <<set $roomsPopulation += 0.5>>
<<else>>
- <<set $dormitoryPopulation++>>
+ <<set $roomsPopulation++>>
<</if>>
+ <<else>>
+ <<set $dormitoryPopulation++>>
<</if>>
- <</for>>
- __Living Standard__: ''<span id="livingRules">$activeSlave.livingRules</span>.''
- <<if $activeSlave.livingRules == "spare">>
- <<link "Normal">><<set $activeSlave.livingRules = "normal">><<replace "#livingRules">>$activeSlave.livingRules<</replace>><</link>> |
- <<if $roomsPopulation <= $rooms-0.5>><<link "Luxurious">><<set $activeSlave.livingRules = "luxurious">><<replace "#livingRules">>$activeSlave.livingRules<</replace>><</link>><<else>>//No luxurious rooms available//<</if>>
- <<elseif $activeSlave.livingRules == "normal">>
- <<link "Spare">><<set $activeSlave.livingRules = "spare">><<replace "#livingRules">>$activeSlave.livingRules<</replace>><</link>> |
- <<if $roomsPopulation <= $rooms-0.5>><<link "Luxurious">><<set $activeSlave.livingRules = "luxurious">><<replace "#livingRules">>$activeSlave.livingRules<</replace>><</link>><<else>>//No luxurious rooms available//<</if>>
- <<else>>
- <<link "Spare">><<set $activeSlave.livingRules = "spare">><<replace "#livingRules">>$activeSlave.livingRules<</replace>><</link>> |
- <<link "Normal">><<set $activeSlave.livingRules = "normal">><<replace "#livingRules">>$activeSlave.livingRules<</replace>><</link>>
<</if>>
-
- <</if>> /* Living Standard */
+ <</for>>
+ __Living Standard__: ''<span id="livingRules">$activeSlave.livingRules</span>.''
+ <<if $activeSlave.livingRules == "spare">>
+ <<link "Normal">><<set $activeSlave.livingRules = "normal">><<replace "#livingRules">>$activeSlave.livingRules<</replace>><</link>> |
+ <<if $roomsPopulation <= $rooms-0.5>><<link "Luxurious">><<set $activeSlave.livingRules = "luxurious">><<replace "#livingRules">>$activeSlave.livingRules<</replace>><</link>><<else>>//No luxurious rooms available//<</if>>
+ <<elseif $activeSlave.livingRules == "normal">>
+ <<link "Spare">><<set $activeSlave.livingRules = "spare">><<replace "#livingRules">>$activeSlave.livingRules<</replace>><</link>> |
+ <<if $roomsPopulation <= $rooms-0.5>><<link "Luxurious">><<set $activeSlave.livingRules = "luxurious">><<replace "#livingRules">>$activeSlave.livingRules<</replace>><</link>><<else>>//No luxurious rooms available//<</if>>
+ <<else>>
+ <<link "Spare">><<set $activeSlave.livingRules = "spare">><<replace "#livingRules">>$activeSlave.livingRules<</replace>><</link>> |
+ <<link "Normal">><<set $activeSlave.livingRules = "normal">><<replace "#livingRules">>$activeSlave.livingRules<</replace>><</link>>
+ <</if>>
+
<<if $activeSlave.voice != 0>>
__Speech Rules__: ''<span id="speechRules">$activeSlave.speechRules</span>.''
<<if $activeSlave.speechRules == "restrictive">>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 91d6e639ca80fd323e5e5bcc847d7095cf955ab7..6351a34b905f0aaf779b42ace6d1cdacafebb42b 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -589,7 +589,7 @@ will
<<elseif (_Slave.assignment == "stay confined") && ((_Slave.devotion > 20) || ((_Slave.trust < -20) && (_Slave.devotion >= -20)) || ((_Slave.trust < -50) && (_Slave.devotion >= -50)))>>
''__@@.lawngreen;stay confined.@@__''<<if _Slave.sentence > 0>> (_Slave.sentence weeks)<</if>>
<<else>>
- <<if _Slave.choosesOwnAssignment == 1>>choose her own assignment for next week<<else>>_Slave.assignment<<if _Slave.sentence > 0>> (_Slave.sentence weeks)<</if>><</if>>.
+ <<if _Slave.choosesOwnAssignment == 1>>choose her own assignment<<else>>_Slave.assignment<<if _Slave.sentence > 0>> (_Slave.sentence weeks)<</if>><</if>>.
<</if>>
<<if ($displayAssignments == 1) && (_Pass == "Main") && (_Slave.ID != $HeadGirl.ID) && (_Slave.ID != $Recruiter.ID) && (_Slave.ID != $Bodyguard.ID)>>
diff --git a/src/utility/assignWidgets.tw b/src/utility/assignWidgets.tw
index 03ba668c4a24118a1cd688a4a88af361c0781daa..488e55ead134ec73f0ee4af2a9d7e77269ef0db9 100644
--- a/src/utility/assignWidgets.tw
+++ b/src/utility/assignWidgets.tw
@@ -68,9 +68,8 @@
<</for>>
<</if>>
- <<set $slaves[_wi] = $args[0], $i = _wi>> /* save changes to slave array, and set $i in case we call "SA chooses own clothes" next, since it uses $slaves[$i] */
+ <<set $slaves[_wi] = $args[0]>> /* save changes to slave array */
- <<if $slaves[_wi].choosesOwnClothes == 1>><<silently>><<include "SA chooses own clothes">><</silently>><<set $args[0] = $slaves[_wi]>><</if>> /* update clothes, then update $args[0] */
<</if>> /* not Pit or Coursing Association */
<</widget>>
diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw
index d9987b4a9b71e5bfd0a538d6f95136622d7f54d5..337f37805a5efe4309e2f72410df4f5ece525b9e 100644
--- a/src/utility/raWidgets.tw
+++ b/src/utility/raWidgets.tw
@@ -379,7 +379,7 @@
<</if>>
|
<<if !_milked>>
- <<link "Milking">>
+ <<link "Milked">>
<<set $currentRule.assignment.push("get milked")>>
<<set $currentRule.excludeAssignment = []>>
<<set $currentRule.setAssignment = "none">>
@@ -656,7 +656,7 @@
<</if>>
|
<<if !_milked>>
- <<link "Milking">>
+ <<link "Milked">>
<<set $currentRule.assignment = []>>
<<set $currentRule.excludeAssignment.push("get milked")>>
<<set $currentRule.setAssignment = "none">>
@@ -1472,22 +1472,6 @@
''Classes''
<</if>>
|
-<<if ($currentRule.setAssignment != "get milked")>>
- <<link "Milking">>
- <<set $currentRule.assignment.delete("get milked")>>
- <<set $currentRule.setAssignment = "get milked">>
- <<set $currentRule.assignFacility = "none">>
- <<set $currentRule.facilityRemove = false>>
- <<RAChangeApplyAssignment>>
- <<RAChangeSetAssignment>>
- <<RAChangeAssignFacility>>
- <<RAChangeSave>>
- <<RAChangeApply>>
- <</link>>
-<<else>>
- ''Milking''
-<</if>>
-|
<<if ($currentRule.setAssignment != "work a glory hole")>>
<<link "Gloryhole">>
<<set $currentRule.assignment.delete("work a glory hole")>>
@@ -1505,7 +1489,7 @@
<</if>>
|
<<if ($currentRule.setAssignment != "choose her own job")>>
- <<link "Let her choose herself">>
+ <<link "Let her choose">>
<<set $currentRule.setAssignment = "choose her own job">>
<<set $currentRule.assignFacility = "none">>
<<set $currentRule.facilityRemove = false>>
@@ -1515,7 +1499,7 @@
<<RAChangeApply>>
<</link>>
<<else>>
- ''Let her choose herself''
+ ''Let her choose''
<</if>>
<</replace>>
<</widget>>
@@ -1529,7 +1513,7 @@
<<if ($HGSuite > 0) || ($brothel > 0) || ($club > 0) || ($arcade > 0) || ($dairy > 0) || ($servantsQuarters > 0) || ($masterSuite > 0) || ($schoolroom > 0) || ($spa > 0) || ($clinic > 0) || ($cellblock > 0)>>
<br>
<<if ($currentRule.assignFacility != "none")>>
- Automatically assign slaves to facility:
+ Automatically assigning slaves to facility (when possible):
<<link "None">>
<<set $currentRule.assignFacility = "none">>
<<set $currentRule.facilityRemove = false>>
@@ -1804,57 +1788,57 @@ Automatically remove from facility when rule no longer applies (only if it was a
<</link>>
<</if>>
<br>
-Assignment on removal: $currentRule.removalAssignment |
+Assignment on removal: $currentRule.removalAssignment
<<if ($currentRule.removalAssignment != "rest")>>
- <<link Rest>>
+ | <<link "Rest">>
<<set $currentRule.removalAssignment = "rest">>
<<RAChangeAssignFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
- <</link>> |
+ <</link>>
<</if>>
<<if ($currentRule.removalAssignment != "please you")>>
- <<link "Please you">>
+ | <<link "Fucktoy">>
<<set $currentRule.removalAssignment = "please you">>
<<RAChangeAssignFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
- <</link>> |
+ <</link>>
<</if>>
-<<if ($currentRule.removalAssignment != "whore")>>
- <<link Whore>>
- <<set $currentRule.removalAssignment = "whore">>
+<<if ($currentRule.removalAssignment != "be a servant")>>
+ | <<link "House Servant">>
+ <<set $currentRule.removalAssignment = "be a servant">>
<<RAChangeAssignFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
- <</link>> |
+ <</link>>
<</if>>
-<<if ($currentRule.removalAssignment != "serve the public")>>
- <<link "Public servant">>
- <<set $currentRule.removalAssignment = "serve the public">>
+<<if ($currentRule.removalAssignment != "stay confined")>>
+ | <<link "Confined">>
+ <<set $currentRule.removalAssignment = "stay confined">>
<<RAChangeAssignFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
- <</link>> |
+ <</link>>
<</if>>
-<<if ($currentRule.removalAssignment != "get milked")>>
- <<link "Get milked">>
- <<set $currentRule.removalAssignment = "get milked">>
+<<if ($currentRule.removalAssignment != "whore")>>
+ | <<link "Whore">>
+ <<set $currentRule.removalAssignment = "whore">>
<<RAChangeAssignFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
- <</link>> |
+ <</link>>
<</if>>
-<<if ($currentRule.removalAssignment != "stay confined")>>
- <<link "Stay confined">>
- <<set $currentRule.removalAssignment = "stay confined">>
+<<if ($currentRule.removalAssignment != "serve the public")>>
+ | <<link "Public Servant">>
+ <<set $currentRule.removalAssignment = "serve the public">>
<<RAChangeAssignFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
- <</link>> |
+ <</link>>
<</if>>
<<if ($currentRule.removalAssignment != "work a glory hole")>>
- <<link "Glory hole">>
+ | <<link "Gloryhole">>
<<set $currentRule.removalAssignment = "work a glory hole">>
<<RAChangeAssignFacility>>
<<RAChangeSave>>
@@ -3407,7 +3391,7 @@ Your brand design is ''$brandDesign.''
<<if $args[0].fuckdoll == 0>>
-<<if (_combinedRule.clothes !== "no default setting")>>
+<<if (def _combinedRule.clothes) && (_combinedRule.clothes !== "no default setting")>>
<<if (_combinedRule.clothes == "choosing her own clothes")>>
<<if ($args[0].choosesOwnClothes == 0)>>
<<set $args[0].clothes = "choosing her own clothes">>
@@ -3421,7 +3405,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
-<<if (_combinedRule.collar !== "no default setting")>>
+<<if (def _combinedRule.collar) && (_combinedRule.collar !== "no default setting")>>
<<if ($args[0].collar !== _combinedRule.collar)>>
<<set $args[0].collar = _combinedRule.collar>>
<<if ($args[0].collar == "none")>>
@@ -3432,7 +3416,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
-<<if (_combinedRule.eyewear !== "no default setting")>>
+<<if (def _combinedRule.eyewear) && (_combinedRule.eyewear !== "no default setting")>>
<<switch _combinedRule.eyewear>>
<<case "correct with glasses">>
<<if $args[0].eyes <= -1>>
@@ -3514,7 +3498,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<<if $args[0].vagina == 0>>
-<<if _combinedRule.virginAccessory !== "no default setting">>
+<<if (def _combinedRule.virginAccessory) && (_combinedRule.virginAccessory !== "no default setting")>>
<<if $args[0].vaginalAccessory !== _combinedRule.virginAccessory>>
<<set $args[0].vaginalAccessory = _combinedRule.virginAccessory>>
<<if $args[0].vaginalAccessory == "huge dildo">>
@@ -3533,7 +3517,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
<<elseif ($args[0].vagina > 0) && ($args[0].anus == 0)>>
-<<if _combinedRule.aVirginAccessory !== "no default setting">>
+<<if (def _combinedRule.aVirginAccessory) && (_combinedRule.aVirginAccessory !== "no default setting")>>
<<if $args[0].vaginalAccessory !== _combinedRule.aVirginAccessory>>
<<set $args[0].vaginalAccessory = _combinedRule.aVirginAccessory>>
<<if $args[0].vaginalAccessory == "huge dildo">>
@@ -3552,7 +3536,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
<<elseif $args[0].vagina > 0>>
-<<if _combinedRule.vaginalAccessory !== "no default setting">>
+<<if (def _combinedRule.vaginalAccessory) && (_combinedRule.vaginalAccessory !== "no default setting")>>
<<if $args[0].vaginalAccessory !== _combinedRule.vaginalAccessory>>
<<set $args[0].vaginalAccessory = _combinedRule.vaginalAccessory>>
<<if $args[0].vaginalAccessory == "huge dildo">>
@@ -3574,7 +3558,7 @@ Your brand design is ''$brandDesign.''
<<if ($args[0].dick > 0)>>
<<if $args[0].anus == 0>>
-<<if (_combinedRule.aVirginDickAccessory !== "no default setting")>>
+<<if (def _combinedRule.aVirginDickAccessory) && (_combinedRule.aVirginDickAccessory !== "no default setting")>>
<<if ($args[0].dickAccessory !== _combinedRule.aVirginDickAccessory)>>
<<set $args[0].dickAccessory = _combinedRule.aVirginDickAccessory>>
<<if $args[0].dickAccessory == "none">>
@@ -3585,7 +3569,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
<<else>>
-<<if (_combinedRule.dickAccessory !== "no default setting")>>
+<<if (def _combinedRule.dickAccessory) && (_combinedRule.dickAccessory !== "no default setting")>>
<<if ($args[0].dickAccessory !== _combinedRule.dickAccessory)>>
<<set $args[0].dickAccessory = _combinedRule.dickAccessory>>
<<if $args[0].dickAccessory == "none">>
@@ -3600,7 +3584,7 @@ Your brand design is ''$brandDesign.''
<<if ($args[0].vaginalAccessory !== "anal chastity") && ($args[0].vaginalAccessory !== "combined chastity") && ($args[0].dickAccessory !== "anal chastity") && ($args[0].dickAccessory !== "combined chastity")>>
<<if $args[0].anus == 0>>
-<<if (_combinedRule.aVirginButtplug !== "no default setting")>>
+<<if (def _combinedRule.aVirginButtplug) && (_combinedRule.aVirginButtplug !== "no default setting")>>
<<if ($args[0].buttplug !== _combinedRule.aVirginButtplug)>>
<<set $args[0].buttplug = _combinedRule.aVirginButtplug>>
<<if ($args[0].buttplug == "huge plug")>>
@@ -3619,7 +3603,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
<<else>>
-<<if (_combinedRule.buttplug !== "no default setting")>>
+<<if (def _combinedRule.buttplug) && (_combinedRule.buttplug !== "no default setting")>>
<<if ($args[0].buttplug !== _combinedRule.buttplug)>>
<<set $args[0].buttplug = _combinedRule.buttplug>>
<<if ($args[0].buttplug == "huge plug")>>
@@ -3640,7 +3624,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
-<<if (_combinedRule.shoes !== "no default setting")>>
+<<if (def _combinedRule.shoes) && (_combinedRule.shoes !== "no default setting")>>
<<if ($args[0].shoes !== _combinedRule.shoes)>>
<<if ($args[0].amp != 1)>>
<<set $args[0].shoes = _combinedRule.shoes>>
@@ -3649,14 +3633,14 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
-<<if (_combinedRule.bellyAccessory !== "no default setting")>>
+<<if (def _combinedRule.bellyAccessory) && (_combinedRule.bellyAccessory !== "no default setting")>>
<<if ($args[0].bellyAccessory !== _combinedRule.bellyAccessory)>>
<<if visibleBelly($args[0]) && $fakeBellies.contains(_combinedRule.bellyAccessory)>>
<br>$args[0].slaveName's natural belly is too big to properly wear an empathy belly.
<<else>>
<<set $args[0].bellyAccessory = _combinedRule.bellyAccessory>>
<<if $args[0].bellyAccessory == "none">>
- <br>$args[0].slaveName has been instructed not to wear a chest accessory.
+ <br>$args[0].slaveName has been instructed not to wear a torso accessory.
<<else>>
<br>$args[0].slaveName has been given a $args[0].bellyAccessory to wear.
<</if>>
@@ -3666,7 +3650,7 @@ Your brand design is ''$brandDesign.''
<</if>> /* CLOSES FUCKDOLL CHECK */
-<<if (_combinedRule.growth !== "no default setting")>>
+<<if (def _combinedRule.growth) && (_combinedRule.growth !== "no default setting")>>
<<if ($args[0].indentureRestrictions < 2)>>
<<if (_combinedRule.growth == "girlish")>>
<<if ($args[0].butt < 2)>>
@@ -3747,7 +3731,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
-<<if (_combinedRule.curatives != "no default setting")>>
+<<if (def _combinedRule.curatives) && (_combinedRule.curatives != "no default setting")>>
<<if $args[0].curatives != _combinedRule.curatives>>
<<if _combinedRule.curatives == 2>>
<<if $args[0].health > 100>>
@@ -3764,7 +3748,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
-<<if (_combinedRule.aphrodisiacs != "no default setting")>>
+<<if (def _combinedRule.aphrodisiacs) && (_combinedRule.aphrodisiacs != "no default setting")>>
<<if $args[0].aphrodisiacs != _combinedRule.aphrodisiacs>>
<br>$args[0].slaveName has been <<if _combinedRule.aphrodisiacs > 0>>put on the proper<<else>>taken off<</if>> aphrodisiacs.
<<set $args[0].aphrodisiacs = _combinedRule.aphrodisiacs>>
@@ -3773,7 +3757,7 @@ Your brand design is ''$brandDesign.''
<<if ($args[0].dick > 0)>>
<<if ($args[0].balls == 0)>>
-<<if (_combinedRule.gelding !== "no default setting")>>
+<<if (def _combinedRule.gelding) && (_combinedRule.gelding !== "no default setting")>>
<<if ($args[0].hormones !== _combinedRule.gelding)>>
<<set $args[0].hormones = _combinedRule.gelding>>
<<if $args[0].indentureRestrictions >= 2>>
@@ -3783,7 +3767,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
<<elseif ($args[0].balls > 0)>>
-<<if (_combinedRule.XY !== "no default setting")>>
+<<if (def _combinedRule.XY) && (_combinedRule.XY !== "no default setting")>>
<<if ($args[0].hormones !== _combinedRule.XY)>>
<<if ($args[0].assignment != "recruit girls")>>
<<if ($args[0].assignment != "be the Wardeness")>>
@@ -3805,7 +3789,7 @@ Your brand design is ''$brandDesign.''
<<if ($args[0].vagina > -1)>>
<<if ($args[0].dick == 0)>>
-<<if (_combinedRule.XX !== "no default setting")>>
+<<if (def _combinedRule.XX) && (_combinedRule.XX !== "no default setting")>>
<<if ($args[0].hormones !== _combinedRule.XX)>>
<<set $args[0].hormones = _combinedRule.XX>>
<<if $args[0].indentureRestrictions >= 2>>
@@ -3816,7 +3800,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
<<if canGetPregnant($args[0])>>
-<<if (_combinedRule.preg !== "no default setting")>>
+<<if (def _combinedRule.preg) && (_combinedRule.preg !== "no default setting")>>
<<if (_combinedRule.preg == -1)>>
<<if $args[0].preg !== -1>>
<br>$args[0].slaveName is a fertile female, so she has been put on the appropriate contraceptive regime.
@@ -3868,7 +3852,7 @@ Your brand design is ''$brandDesign.''
<<if $args[0].fuckdoll == 0>>
-<<if (_combinedRule.livingRules !== "no default setting")>>
+<<if (def _combinedRule.livingRules) && (_combinedRule.livingRules !== "no default setting")>>
<<if ($args[0].fetish == "mindbroken")>>
<<if ($args[0].livingRules !== "spare")>>
<<set $args[0].livingRules = "spare">>
@@ -3891,7 +3875,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
-<<if (_combinedRule.speechRules !== "no default setting")>>
+<<if (def _combinedRule.speechRules) && (_combinedRule.speechRules !== "no default setting")>>
<<if ($args[0].fetish == "mindbroken")>>
<<if ($args[0].speechRules !== "restrictive")>>
<<set $args[0].speechRules = "restrictive">>
@@ -3904,7 +3888,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<<if ($args[0].fetish !== "mindbroken")>>
- <<if (_combinedRule.relationshipRules !== "no default setting")>>
+ <<if (def _combinedRule.relationshipRules) && (_combinedRule.relationshipRules !== "no default setting")>>
<<if ($args[0].relationshipRules !== _combinedRule.relationshipRules )>>
<<set $args[0].relationshipRules = _combinedRule.relationshipRules >>
<br>$args[0].slaveName's relationship rules have been set to _combinedRule.relationshipRules.
@@ -3912,7 +3896,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
-<<if (_combinedRule.releaseRules !== "no default setting")>>
+<<if (def _combinedRule.releaseRules) && (_combinedRule.releaseRules !== "no default setting")>>
<<if (_combinedRule.releaseRules == "restrictive")>>
<<SexualRelease $args[0]>>
<<else>>
@@ -3927,14 +3911,14 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
-<<if (_combinedRule.standardPunishment !== "no default setting")>>
+<<if (def _combinedRule.standardPunishment) && (_combinedRule.standardPunishment !== "no default setting")>>
<<if ($args[0].standardPunishment !== _combinedRule.standardPunishment)>>
<<set $args[0].standardPunishment = _combinedRule.standardPunishment >>
<br>$args[0].slaveName's typical punishment has been updated to _combinedRule.standardPunishment.
<</if>>
<</if>>
-<<if (_combinedRule.standardReward !== "no default setting")>>
+<<if (def _combinedRule.standardReward) && (_combinedRule.standardReward !== "no default setting")>>
<<if ($args[0].standardReward !== _combinedRule.standardReward)>>
<<set $args[0].standardReward = _combinedRule.standardReward >>
<br>$args[0].slaveName's typical reward has been updated to _combinedRule.standardReward.
@@ -3943,7 +3927,7 @@ Your brand design is ''$brandDesign.''
<</if>> /* CLOSES FUCKDOLL CHECK */
-<<if (_combinedRule.diet !== "no default setting")>>
+<<if (def _combinedRule.diet) && (_combinedRule.diet !== "no default setting")>>
<<if ($args[0].boobs >= 1600) && ($args[0].muscles <= 5) && ($args[0].amp != 1) && ((_combinedRule.muscles == "no default setting") || (_combinedRule.muscles == 0))>>
<<if ($args[0].diet !== "muscle building")>>
<<set $args[0].diet = "muscle building">>
@@ -3977,7 +3961,7 @@ Your brand design is ''$brandDesign.''
<<set $args[0].drugs = "none">>
<br>$args[0].slaveName is too skinny so she will no longer be given weight loss pills.
<</if>>
- <<elseif (_combinedRule.muscles !== "no default setting") && ($args[0].amp != 1)>>
+ <<elseif (def _combinedRule.muscles) && (_combinedRule.muscles !== "no default setting") && ($args[0].amp != 1)>>
<<if ($args[0].muscles >= _combinedRule.muscles+5)>>
<<if ($args[0].diet !== "slimming")>>
<<set $args[0].diet = "slimming">>
@@ -4019,7 +4003,7 @@ Your brand design is ''$brandDesign.''
<<set $args[0].drugs = "none">>
<br>$args[0].slaveName is too skinny so she will no longer be given weight loss pills.
<</if>>
- <<elseif (_combinedRule.muscles !== "no default setting") && ($args[0].amp != 1)>>
+ <<elseif (def _combinedRule.muscles) && (_combinedRule.muscles !== "no default setting") && ($args[0].amp != 1)>>
<<if ($args[0].muscles >= _combinedRule.muscles+5)>>
<<if ($args[0].diet !== "slimming")>>
<<set $args[0].diet = "slimming">>
@@ -4069,7 +4053,7 @@ Your brand design is ''$brandDesign.''
<<set $args[0].drugs = "none">>
<br>$args[0].slaveName is too skinny so she will no longer be given weight loss pills.
<</if>>
- <<elseif (_combinedRule.muscles !== "no default setting") && ($args[0].amp != 1)>>
+ <<elseif (def _combinedRule.muscles) && (_combinedRule.muscles !== "no default setting") && ($args[0].amp != 1)>>
<<if ($args[0].muscles >= _combinedRule.muscles+5)>>
<<if ($args[0].diet !== "slimming")>>
<<set $args[0].diet = "slimming">>
@@ -4119,7 +4103,7 @@ Your brand design is ''$brandDesign.''
<<set $args[0].drugs = "none">>
<br>$args[0].slaveName is too skinny so she will no longer be given weight loss pills.
<</if>>
- <<elseif (_combinedRule.muscles !== "no default setting") && ($args[0].amp != 1)>>
+ <<elseif (def _combinedRule.muscles) && (_combinedRule.muscles !== "no default setting") && ($args[0].amp != 1)>>
<<if ($args[0].muscles >= _combinedRule.muscles+5)>>
<<if ($args[0].diet !== "slimming")>>
<<set $args[0].diet = "slimming">>
@@ -4169,7 +4153,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
-<<if (_combinedRule.dietCum !== "no default setting")>>
+<<if (def _combinedRule.dietCum) && (_combinedRule.dietCum !== "no default setting")>>
<<if $args[0].dietCum != _combinedRule.dietCum>>
<<set $args[0].dietCum = _combinedRule.dietCum>>
<<if $args[0].dietCum == 2>>
@@ -4183,7 +4167,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
-<<if (_combinedRule.dietMilk !== "no default setting")>>
+<<if (def _combinedRule.dietMilk) && (_combinedRule.dietMilk !== "no default setting")>>
<<if $args[0].dietMilk != _combinedRule.dietMilk>>
<<set $args[0].dietMilk = _combinedRule.dietMilk>>
<<if $args[0].dietMilk == 2>>
@@ -4197,7 +4181,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
-<<if (_combinedRule.teeth !== "no default setting")>>
+<<if (def _combinedRule.teeth) && (_combinedRule.teeth !== "no default setting")>>
<<if (_combinedRule.teeth == "universal")>>
<<if ($args[0].teeth == "crooked")>>
<<set $args[0].teeth = "straightening braces">>
@@ -4228,7 +4212,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
-<<if (_combinedRule.eyeColor !== "no default setting")>>
+<<if (def _combinedRule.eyeColor) && (_combinedRule.eyeColor !== "no default setting")>>
<<if ($args[0].eyeColor !== _combinedRule.eyeColor)>>
<<set $args[0].eyeColor = _combinedRule.eyeColor>>
<<set $cash -= $modCost>>
@@ -4236,7 +4220,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
-<<if (_combinedRule.makeup !== "no default setting")>>
+<<if (def _combinedRule.makeup) && (_combinedRule.makeup !== "no default setting")>>
<<if ($args[0].makeup !== _combinedRule.makeup)>>
<<set $args[0].makeup = _combinedRule.makeup>>
<<set $cash -= $modCost>>
@@ -4245,7 +4229,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<<if ($args[0].amp != 1)>>
-<<if (_combinedRule.nails !== "no default setting")>>
+<<if (def _combinedRule.nails) && (_combinedRule.nails !== "no default setting")>>
<<if ($args[0].nails !== _combinedRule.nails)>>
<<set $args[0].nails = _combinedRule.nails>>
<<set $cash -= $modCost>>
@@ -4254,7 +4238,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
-<<if (_combinedRule.hColor !== "no default setting")>>
+<<if (def _combinedRule.hColor) && (_combinedRule.hColor !== "no default setting")>>
<<if ($args[0].hColor !== _combinedRule.hColor)>>
<<set $args[0].hColor = _combinedRule.hColor>>
<<set $cash -= $modCost>>
@@ -4262,7 +4246,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
-<<if (_combinedRule.hStyle !== "no default setting")>>
+<<if (def _combinedRule.hStyle) && (_combinedRule.hStyle !== "no default setting")>>
<<if ($args[0].hStyle !== _combinedRule.hStyle)>>
<<set $args[0].hStyle = _combinedRule.hStyle>>
<<set $cash -= $modCost>>
@@ -4275,7 +4259,7 @@ Your brand design is ''$brandDesign.''
<</if>>
<</if>>
-<<if (_combinedRule.hLength !== "no default setting")>>
+<<if (def _combinedRule.hLength) && (_combinedRule.hLength !== "no default setting")>>
<<if ($args[0].hLength !== _combinedRule.hLength)>>
<<if ($args[0].hLength > _combinedRule.hLength)>>
<<set $cash -= $modCost>>
@@ -4289,7 +4273,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.pubicHColor !== "no default setting")>>
+<<if (def _combinedRule.pubicHColor) && (_combinedRule.pubicHColor !== "no default setting")>>
<<if ($args[0].pubicHColor !== _combinedRule.pubicHColor)>>
<<set $args[0].pubicHColor = _combinedRule.pubicHColor>>
<<set $cash -= $modCost>>
@@ -4297,7 +4281,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.pubicHStyle !== "no default setting")>>
+<<if (def _combinedRule.pubicHStyle) && (_combinedRule.pubicHStyle !== "no default setting")>>
<<if ($args[0].pubicHStyle !== _combinedRule.pubicHStyle)>>
<<set $args[0].pubicHStyle = _combinedRule.pubicHStyle>>
<<set $cash -= $modCost>>
@@ -4305,7 +4289,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.underArmHColor !== "no default setting")>>
+<<if (def _combinedRule.underArmHColor) && (_combinedRule.underArmHColor !== "no default setting")>>
<<if ($args[0].underArmHColor !== _combinedRule.underArmHColor)>>
<<set $args[0].underArmHColor = _combinedRule.underArmHColor>>
<<set $cash -= $modCost>>
@@ -4313,7 +4297,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.underArmHStyle !== "no default setting")>>
+<<if (def _combinedRule.underArmHStyle) && (_combinedRule.underArmHStyle !== "no default setting")>>
<<if ($args[0].underArmHStyle !== _combinedRule.underArmHStyle)>>
<<set $args[0].underArmHStyle = _combinedRule.underArmHStyle>>
<<set $cash -= $modCost>>
@@ -4321,7 +4305,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.nipplesPiercing !== "no default setting")>>
+<<if (def _combinedRule.nipplesPiercing) && (_combinedRule.nipplesPiercing !== "no default setting")>>
<<if ($args[0].nipplesPiercing !== _combinedRule.nipplesPiercing)>>
<<if (_combinedRule.nipplesPiercing == 0)>>
<<set $args[0].nipplesPiercing = 0>>
@@ -4334,7 +4318,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.areolaePiercing !== "no default setting")>>
+<<if (def _combinedRule.areolaePiercing) && (_combinedRule.areolaePiercing !== "no default setting")>>
<<if ($args[0].areolaePiercing !== _combinedRule.areolaePiercing)>>
<<if (_combinedRule.areolaePiercing == 0)>>
<<set $args[0].areolaePiercing = 0>>
@@ -4347,7 +4331,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.clitPiercing !== "no default setting")>>
+<<if (def _combinedRule.clitPiercing) && (_combinedRule.clitPiercing !== "no default setting")>>
<<if ($args[0].clitPiercing !== _combinedRule.clitPiercing)>>
<<if (_combinedRule.clitPiercing == 0)>>
<<set $args[0].clitPiercing = 0>>
@@ -4375,7 +4359,7 @@ is now _combinedRule.hLength cm long.
<<if ($args[0].clitPiercing == 3)>>
<<set _used = 0>>
- <<if (_combinedRule.clitSetting !== "no default setting")>>
+ <<if (def _combinedRule.clitSetting) && (_combinedRule.clitSetting !== "no default setting")>>
<<if $args[0].clitSetting !== _combinedRule.clitSetting>>
<<set $args[0].clitSetting = _combinedRule.clitSetting, _used = 1>>
<br>$args[0].slaveName's smart piercing has been set to $args[0].clitSetting.
@@ -4384,7 +4368,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
<<if _used == 0>>
- <<if _combinedRule.clitSettingXY !== "no default setting">>
+ <<if (def _combinedRule.clitSettingXY) && (_combinedRule.clitSettingXY !== "no default setting")>>
<<if $args[0].attrXY < _combinedRule.clitSettingXY && $args[0].clitSetting !== "men">>
<<set $args[0].clitSetting = "men", _used = 1>>
<br>$args[0].slaveName's smart piercing has been set to encourage attraction to men.
@@ -4395,7 +4379,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
<<if _used == 0>>
- <<if _combinedRule.clitSettingXX !== "no default setting">>
+ <<if (def _combinedRule.clitSettingXX) && (_combinedRule.clitSettingXX !== "no default setting")>>
<<if $args[0].attrXX < _combinedRule.clitSettingXX && $args[0].clitSetting !== "women">>
<<set $args[0].clitSetting = "women", _used = 1>>
<br>$args[0].slaveName's smart piercing has been set to encourage attraction to women.
@@ -4406,7 +4390,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
<<if _used == 0>>
- <<if _combinedRule.clitSettingEnergy !== "no default setting">>
+ <<if (def _combinedRule.clitSettingEnergy) && (_combinedRule.clitSettingEnergy !== "no default setting")>>
<<if $args[0].energy < _combinedRule.clitSettingEnergy && $args[0].clitSetting !== "all">>
<<set $args[0].clitSetting = "all", _used = 1>>
<br>$args[0].slaveName's smart piercing has been set to enhance libido.
@@ -4419,7 +4403,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<<if ($args[0].vagina != -1)>>
-<<if (_combinedRule.vaginaPiercing !== "no default setting")>>
+<<if (def _combinedRule.vaginaPiercing) && (_combinedRule.vaginaPiercing !== "no default setting")>>
<<if ($args[0].vaginaPiercing !== _combinedRule.vaginaPiercing)>>
<<if (_combinedRule.vaginaPiercing == 0)>>
<<set $args[0].vaginaPiercing = 0>>
@@ -4434,7 +4418,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<<if ($args[0].dick > 0)>>
-<<if (_combinedRule.dickPiercing !== "no default setting")>>
+<<if (def _combinedRule.dickPiercing) && (_combinedRule.dickPiercing !== "no default setting")>>
<<if ($args[0].dickPiercing !== _combinedRule.dickPiercing)>>
<<if (_combinedRule.dickPiercing == 0)>>
<<set $args[0].dickPiercing = 0>>
@@ -4448,7 +4432,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.anusPiercing !== "no default setting")>>
+<<if (def _combinedRule.anusPiercing) && (_combinedRule.anusPiercing !== "no default setting")>>
<<if ($args[0].anusPiercing !== _combinedRule.anusPiercing)>>
<<if (_combinedRule.anusPiercing == 0)>>
<<set $args[0].anusPiercing = 0>>
@@ -4461,7 +4445,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.lipsPiercing !== "no default setting")>>
+<<if (def _combinedRule.lipsPiercing) && (_combinedRule.lipsPiercing !== "no default setting")>>
<<if ($args[0].lipsPiercing !== _combinedRule.lipsPiercing)>>
<<if (_combinedRule.lipsPiercing == 0)>>
<<set $args[0].lipsPiercing = 0>>
@@ -4474,7 +4458,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.tonguePiercing !== "no default setting")>>
+<<if (def _combinedRule.tonguePiercing) && (_combinedRule.tonguePiercing !== "no default setting")>>
<<if ($args[0].tonguePiercing !== _combinedRule.tonguePiercing)>>
<<if (_combinedRule.tonguePiercing == 0)>>
<<set $args[0].tonguePiercing = 0>>
@@ -4487,7 +4471,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.earPiercing !== "no default setting")>>
+<<if (def _combinedRule.earPiercing) && (_combinedRule.earPiercing !== "no default setting")>>
<<if ($args[0].earPiercing !== _combinedRule.earPiercing)>>
<<if (_combinedRule.earPiercing == 0)>>
<<set $args[0].earPiercing = 0>>
@@ -4500,7 +4484,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.nosePiercing !== "no default setting")>>
+<<if (def _combinedRule.nosePiercing) && (_combinedRule.nosePiercing !== "no default setting")>>
<<if ($args[0].nosePiercing !== _combinedRule.nosePiercing)>>
<<if (_combinedRule.nosePiercing == 0)>>
<<set $args[0].nosePiercing = 0>>
@@ -4513,7 +4497,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.eyebrowPiercing !== "no default setting")>>
+<<if (def _combinedRule.eyebrowPiercing) && (_combinedRule.eyebrowPiercing !== "no default setting")>>
<<if ($args[0].eyebrowPiercing !== _combinedRule.eyebrowPiercing)>>
<<if (_combinedRule.eyebrowPiercing == 0)>>
<<set $args[0].eyebrowPiercing = 0>>
@@ -4526,7 +4510,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.navelPiercing !== "no default setting")>>
+<<if (def _combinedRule.navelPiercing) && (_combinedRule.navelPiercing !== "no default setting")>>
<<if ($args[0].navelPiercing !== _combinedRule.navelPiercing)>>
<<if (_combinedRule.navelPiercing == 0)>>
<<set $args[0].navelPiercing = 0>>
@@ -4539,7 +4523,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.corsetPiercing !== "no default setting")>>
+<<if (def _combinedRule.corsetPiercing) && (_combinedRule.corsetPiercing !== "no default setting")>>
<<if ($args[0].corsetPiercing !== _combinedRule.corsetPiercing)>>
<<if (_combinedRule.corsetPiercing == 0)>>
<<set $args[0].corsetPiercing = 0>>
@@ -4552,7 +4536,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.boobsTat !== "no default setting")>>
+<<if (def _combinedRule.boobsTat) && (_combinedRule.boobsTat !== "no default setting")>>
<<if ($args[0].boobsTat !== _combinedRule.boobsTat)>>
<<set $args[0].boobsTat = _combinedRule.boobsTat>>
<<set $cash -= $modCost>>
@@ -4560,7 +4544,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.buttTat !== "no default setting")>>
+<<if (def _combinedRule.buttTat) && (_combinedRule.buttTat !== "no default setting")>>
<<if ($args[0].buttTat !== _combinedRule.buttTat)>>
<<set $args[0].buttTat = _combinedRule.buttTat>>
<<set $cash -= $modCost>>
@@ -4568,7 +4552,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.vaginaTat !== "no default setting")>>
+<<if (def _combinedRule.vaginaTat) && (_combinedRule.vaginaTat !== "no default setting")>>
<<if ($args[0].vaginaTat !== _combinedRule.vaginaTat)>>
<<set $args[0].vaginaTat = _combinedRule.vaginaTat>>
<<set $cash -= $modCost>>
@@ -4577,7 +4561,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<<if ($args[0].dick > 0)>>
-<<if (_combinedRule.dickTat !== "no default setting")>>
+<<if (def _combinedRule.dickTat) && (_combinedRule.dickTat !== "no default setting")>>
<<if ($args[0].dickTat !== _combinedRule.dickTat)>>
<<set $args[0].dickTat = _combinedRule.dickTat>>
<<set $cash -= $modCost>>
@@ -4586,7 +4570,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.lipsTat !== "no default setting")>>
+<<if (def _combinedRule.lipsTat) && (_combinedRule.lipsTat !== "no default setting")>>
<<if ($args[0].lipsTat !== _combinedRule.lipsTat)>>
<<set $args[0].lipsTat = _combinedRule.lipsTat>>
<<set $cash -= $modCost>>
@@ -4594,7 +4578,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.anusTat !== "no default setting")>>
+<<if (def _combinedRule.anusTat) && (_combinedRule.anusTat !== "no default setting")>>
<<if ($args[0].anusTat !== _combinedRule.anusTat)>>
<<set $args[0].anusTat = _combinedRule.anusTat>>
<<set $cash -= $modCost>>
@@ -4602,7 +4586,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.shouldersTat !== "no default setting")>>
+<<if (def _combinedRule.shouldersTat) && (_combinedRule.shouldersTat !== "no default setting")>>
<<if ($args[0].shouldersTat !== _combinedRule.shouldersTat)>>
<<set $args[0].shouldersTat = _combinedRule.shouldersTat>>
<<set $cash -= $modCost>>
@@ -4610,7 +4594,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.armsTat !== "no default setting")>>
+<<if (def _combinedRule.armsTat) && (_combinedRule.armsTat !== "no default setting")>>
<<if ($args[0].armsTat !== _combinedRule.armsTat)>>
<<set $args[0].armsTat = _combinedRule.armsTat>>
<<set $cash -= $modCost>>
@@ -4618,7 +4602,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.legsTat !== "no default setting")>>
+<<if (def _combinedRule.legsTat) && (_combinedRule.legsTat !== "no default setting")>>
<<if ($args[0].legsTat !== _combinedRule.legsTat)>>
<<set $args[0].legsTat = _combinedRule.legsTat>>
<<set $cash -= $modCost>>
@@ -4626,7 +4610,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.stampTat !== "no default setting")>>
+<<if (def _combinedRule.stampTat) && (_combinedRule.stampTat !== "no default setting")>>
<<if ($args[0].stampTat !== _combinedRule.stampTat)>>
<<set $args[0].stampTat = _combinedRule.stampTat>>
<<set $cash -= $modCost>>
@@ -4634,7 +4618,7 @@ is now _combinedRule.hLength cm long.
<</if>>
<</if>>
-<<if (_combinedRule.pornFameSpending !== "no default setting")>>
+<<if (def _combinedRule.pornFameSpending) && (_combinedRule.pornFameSpending !== "no default setting")>>
<<if ($args[0].devotion > 95)>>
<<if ($args[0].trust > 95)>>
<<if ($args[0].prestige < 3)>>