From e98993affa92b36234a54623d68e9abdb7664198 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 30 Aug 2017 19:13:55 -0400
Subject: [PATCH] fixes and RA stuff
---
src/js/storyJS.tw | 16 +-
src/uncategorized/rulesAssistant.tw | 965 +++++++++++--------------
src/uncategorized/saLongTermEffects.tw | 2 +-
src/utility/raWidgets.tw | 387 +++++-----
4 files changed, 613 insertions(+), 757 deletions(-)
diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index b5c0af7b383..98710611fd3 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -75,31 +75,31 @@ Mousetrap.bind("p", function () {
});
Mousetrap.bind("left", function () {
$("#prevSlave a.macro-link").trigger("click");
- $("#prevRule a.macro-link").trigger("click");
+ $("#prevRule a").trigger("click");
});
Mousetrap.bind("q", function () {
$("#prevSlave a.macro-link").trigger("click");
- $("#prevRule a.macro-link").trigger("click");
+ $("#prevRule a").trigger("click");
});
Mousetrap.bind("shift+left", function () {
- $("#firstRule a.macro-link").trigger("click");
+ $("#firstRule a").trigger("click");
});
Mousetrap.bind("shift+q", function () {
- $("#firstRule a.macro-link").trigger("click");
+ $("#firstRule a").trigger("click");
});
Mousetrap.bind("right", function () {
$("#nextSlave a.macro-link").trigger("click");
- $("#nextRule a.macro-link").trigger("click");
+ $("#nextRule a").trigger("click");
});
Mousetrap.bind("shift+right", function () {
- $("#lastRule a.macro-link").trigger("click");
+ $("#lastRule a").trigger("click");
});
Mousetrap.bind("e", function () {
$("#nextSlave a.macro-link").trigger("click");
- $("#nextRule a.macro-link").trigger("click");
+ $("#nextRule a").trigger("click");
});
Mousetrap.bind("shift+e", function () {
- $("#lastRule a.macro-link").trigger("click");
+ $("#lastRule a").trigger("click");
});
Mousetrap.bind("f", function () {
$("#walkpast a.macro-link").trigger("click");
diff --git a/src/uncategorized/rulesAssistant.tw b/src/uncategorized/rulesAssistant.tw
index 6cbaf0ba4ab..2af8c3c3710 100644
--- a/src/uncategorized/rulesAssistant.tw
+++ b/src/uncategorized/rulesAssistant.tw
@@ -8,10 +8,10 @@
<<if _length > 0>>
<<if ndef $currentRule || $currentRule == null>> <<set $currentRule = $defaultRules[0]>> <</if>>
+ <<if ndef $currentRule.selectedSlaves>> <<set $currentRule.selectedSlaves = []>> <</if>>
+ <<if ndef $currentRule.excludedSlaves>> <<set $currentRule.excludedSlaves = []>> <</if>>
<<if ndef $currentRule.assignment>> <<set $currentRule.assignment = []>> <</if>>
<<if ndef $currentRule.excludeAssignment>> <<set $currentRule.excludeAssignment = []>> <</if>>
- <<if ndef $currentRule.excludedSlaves>> <<set $currentRule.excludedSlaves = []>> <</if>>
- <<if ndef $currentRule.selectedSlaves>> <<set $currentRule.selectedSlaves = []>> <</if>>
<<if ndef $currentRule.facility>> <<set $currentRule.facility = []>> <</if>>
<<if ndef $currentRule.excludeFacility>> <<set $currentRule.excludeFacility = []>> <</if>>
<<if ndef $currentRule.drug>> <<set $currentRule.drug = "no default setting">> <</if>>
@@ -36,22 +36,14 @@
<center>
<<if $r > 1>>
- @@.cyan;[Shift+â†,Shift+Q] @@<span id="firstRule">
- <strong>
- <<link "First">>
- <<set $currentRule = $defaultRules[0]>>
- <<goto "Rules Assistant">>
- <</link>>
- </strong>
+ @@.cyan;[Shift+â†,Shift+Q] @@
+ <span id="firstRule">
+ ''[[First|Rules Assistant][$currentRule = $defaultRules[0]]]''
</span>
- |
- @@.cyan;[â†,Q] @@<span id="prevRule">
- <strong>
- <<link "Prev">>
- <<set $currentRule = $defaultRules[$r-2]>>
- <<goto "Rules Assistant">>
- <</link>>
- </strong>
+ |
+ @@.cyan;[â†,Q] @@
+ <span id="prevRule">
+ ''[[Prev|Rules Assistant][$currentRule = $defaultRules[$r-2]]]''
</span>
<<else>>
[Shift+â†,Shift+Q] First | [â†,Q] Prev
@@ -61,49 +53,32 @@
<<if $r < _length>>
<span id="nextRule">
- <strong>
- <<link "Next">>
- <<set $currentRule = $defaultRules[$r]>>
- <<goto "Rules Assistant">>
- <</link>>
- </strong>
- </span>@@.cyan; [E,→]@@ |
- <<else>>
- Next [E,→] |
- <</if>>
-
- <<if $r < _length>>
+ ''[[Next|Rules Assistant][$currentRule = $defaultRules[$r]]]''
+ </span>@@.cyan; [E,→]@@
+ |
<span id="lastRule">
- <strong>
- <<link "Last">>
- <<set $currentRule = $defaultRules[_length-1]>>
- <<goto "Rules Assistant">>
- <</link>>
- </strong>
+ ''[[Last|Rules Assistant][$currentRule = $defaultRules[_length-1]]]''
</span>@@.cyan; [Shift+E,Shift+→]@@
<<else>>
- Last [Shift+E,Shift+→]
+ Next [E,→] | Last [Shift+E,Shift+→]
<</if>>
</center>
<center>
<<if $r > 1>>
- <<print $defaultRules[$r-2].name+"   <-   ">>
+ <<= $defaultRules[$r-2].name>>   <-   
<<else>>
- <<print "     ">>
+      
<</if>>
<span id="rulename">
- <<if ndef $currentRule.name>>
- <<set $currentRule.name = "Rule " + $r>>
- <</if>>
- @@.yellow;$currentRule.name@@
+ @@.yellow;$currentRule.name@@
</span>
<<if $r < _length>>
- <<print "   ->   "+$defaultRules[$r].name>>
+    ->   <<= $defaultRules[$r].name>>
<<else>>
- <<print "     ">>
+      
<</if>>
</center>
@@ -120,13 +95,13 @@
Lower Priority
<</if>>
</span>
- |
+ |
<<link "Rename">>
<<replace "#rulename">>
<<textbox "$currentRule.name" $currentRule.name "Rules Assistant">>
<</replace>>
<</link>>
- |
+ |
<span id="ruleUp">
<<if $r < _length>>
<<link "Higher Priority">>
@@ -159,7 +134,7 @@ __Rule $r Automatic Activation__
<<if isSimpleCondition($currentRule.condition, ["devotion", "trust", "health", "energy", "weight", "actualAge", "physicalAge", "visualAge", "muscles", "lactation", "preg", "pregType", "bellyImplant"])>>
<<timed 50ms>>
- <<RAChangeActivation>>
+ <<RAChangeActivation>>
<</timed>>
<br>
@@ -306,33 +281,31 @@ __Rule $r Automatic Activation__
<br><br>
-<span id = "applyassignment">
-</span>
+<span id="applyassignment"></span>
<<timed 50ms>>
-<<RAChangeApplyAssignment>>
+ <<RAChangeApplyAssignment>>
<</timed>>
-<span id = "excludeassignment">
-</span>
+<br>
+<span id="excludeassignment"></span>
<<timed 50ms>>
-<<RAChangeExcludeAssignment>>
+ <<RAChangeExcludeAssignment>>
<</timed>>
-<span id = "applyfacility">
-</span>
+<span id="applyfacility"></span>
<<timed 50ms>>
-<<RAChangeApplyFacility>>
+ <<RAChangeApplyFacility>>
<</timed>>
-<span id = "excludefacility">
-</span>
+<span id="excludefacility"></span>
<<timed 50ms>>
-<<RAChangeExcludeFacility>>
+ <<RAChangeExcludeFacility>>
<</timed>>
+<br><br>
<span id="specialslaves"></span>
<<timed 50ms>>
-<<RASpecialSlaves>>
+ <<RASpecialSlaves>>
<</timed>>
@@ -362,16 +335,14 @@ __Rule $r Automatic Activation__
[[Change specific slaves|Rules Slave Select]] | [[Don't limit to specific slaves|Rules Assistant][$currentRule.selectedSlaves = [], $currentRule.excludedSlaves = []]]
<</if>>
-<span id = "setassignment">
-</span>
+<span id="setassignment"></span>
<<timed 50ms>>
-<<RAChangeSetAssignment>>
+ <<RAChangeSetAssignment>>
<</timed>>
-<span id = "assignfacility">
-</span>
+<span id="assignfacility"></span>
<<timed 50ms>>
-<<RAChangeAssignFacility>>
+ <<RAChangeAssignFacility>>
<</timed>>
<br><br>
@@ -379,14 +350,14 @@ __Rule $r Automatic Activation__
__Rule $r Default Appearance:__
<br>
Clothes:
-<span id = "clothes">
+<span id="clothes">
<<if ($currentRule.clothes == "choosing her own clothes")>>
''slave's choice.''
<<else>>
''$currentRule.clothes.''
<</if>>
</span>
-|
+|
<<link "Select her own outfit">>
<<set $currentRule.clothes = "choosing her own clothes">>
<<RAChangeClothes>>
@@ -394,7 +365,7 @@ Clothes:
<</link>>
<br>
-//Nice://
+//Nice://
<<link "No default clothes setting">>
<<set $currentRule.clothes = "no default setting">>
<<RAChangeClothes>>
@@ -552,120 +523,132 @@ Clothes:
<</link>>
|
<<if ($arcologies[0].FSPhysicalIdealist != "unset") || ($cheatMode == 1) || ($clothesBoughtOil == 1)>>
- //FS//
-<<link "Body oil">>
- <<set $currentRule.clothes = "body oil">>
- <<RAChangeClothes>>
- <<RARuleModified>>
-<</link>> |
+ //FS//
+ <<link "Body oil">>
+ <<set $currentRule.clothes = "body oil">>
+ <<RAChangeClothes>>
+ <<RARuleModified>>
+ <</link>>
+ |
<</if>>
<<if ($arcologies[0].FSGenderFundamentalist != "unset") || ($cheatMode == 1) || ($clothesBoughtBunny == 1)>>
- //FS//
-<<link "Bunny outfit">>
- <<set $currentRule.clothes = "a bunny outfit">>
- <<RAChangeClothes>>
- <<RARuleModified>>
-<</link>> |
+ //FS//
+ <<link "Bunny outfit">>
+ <<set $currentRule.clothes = "a bunny outfit">>
+ <<RAChangeClothes>>
+ <<RARuleModified>>
+ <</link>>
+ |
<</if>>
<<if ($arcologies[0].FSDegradationist != "unset") || ($cheatMode == 1) || ($clothesBoughtChains == 1)>>
- //FS//
-<<link "Chains">>
- <<set $currentRule.clothes = "chains">>
- <<RAChangeClothes>>
- <<RARuleModified>>
-<</link>> |
+ //FS//
+ <<link "Chains">>
+ <<set $currentRule.clothes = "chains">>
+ <<RAChangeClothes>>
+ <<RARuleModified>>
+ <</link>>
+ |
<</if>>
<<if ($arcologies[0].FSChattelReligionist != "unset") || ($cheatMode == 1) || ($clothesBoughtHabit == 1)>>
- //FS//
-<<link "Chattel habit">>
- <<set $currentRule.clothes = "a chattel habit">>
- <<RAChangeClothes>>
- <<RARuleModified>>
-<</link>> |
+ //FS//
+ <<link "Chattel habit">>
+ <<set $currentRule.clothes = "a chattel habit">>
+ <<RAChangeClothes>>
+ <<RARuleModified>>
+ <</link>>
+ |
<</if>>
<<if ($arcologies[0].FSPaternalist != "unset") || ($cheatMode == 1) || ($clothesBoughtConservative == 1)>>
- //FS//
-<<link "Conservative clothing">>
- <<set $currentRule.clothes = "conservative clothing">>
- <<RAChangeClothes>>
- <<RARuleModified>>
-<</link>> |
+ //FS//
+ <<link "Conservative clothing">>
+ <<set $currentRule.clothes = "conservative clothing">>
+ <<RAChangeClothes>>
+ <<RARuleModified>>
+ <</link>>
+ |
<</if>>
<<if ($arcologies[0].FSArabianRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtHarem == 1)>>
- //FS//
-<<link "Harem gauze">>
- <<set $currentRule.clothes = "harem gauze">>
- <<RAChangeClothes>>
- <<RARuleModified>>
-<</link>> |
+ //FS//
+ <<link "Harem gauze">>
+ <<set $currentRule.clothes = "harem gauze">>
+ <<RAChangeClothes>>
+ <<RARuleModified>>
+ <</link>>
+ |
<</if>>
<<if ($arcologies[0].FSAztecRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtHuipil == 1)>>
- //FS//
-<<link "Huipil">>
- <<set $currentRule.clothes = "a huipil", $currentRule.choosesOwnClothes = 0>>
- <<RAChangeClothes>>
- <<RARuleModified>>
-<</link>> |
+ //FS//
+ <<link "Huipil">>
+ <<set $currentRule.clothes = "a huipil", $currentRule.choosesOwnClothes = 0>>
+ <<RAChangeClothes>>
+ <<RARuleModified>>
+ <</link>>
+ |
<</if>>
<<if ($arcologies[0].FSEdoRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtKimono == 1)>>
- //FS//
-<<link "Kimono">>
- <<set $currentRule.clothes = "a kimono">>
- <<RAChangeClothes>>
- <<RARuleModified>>
-<</link>> |
+ //FS//
+ <<link "Kimono">>
+ <<set $currentRule.clothes = "a kimono">>
+ <<RAChangeClothes>>
+ <<RARuleModified>>
+ <</link>>
+ |
<</if>>
<<if ($arcologies[0].FSRepopulationFocus != "unset") || ($cheatMode == 1) || ($clothesBoughtMaternityDress == 1)>>
- //FS//
-<<link "Maternity dress">>
- <<set $currentRule.clothes = "a maternity dress">>
- <<RAChangeClothes>>
- <<RARuleModified>>
-<</link>> |
+ //FS//
+ <<link "Maternity dress">>
+ <<set $currentRule.clothes = "a maternity dress">>
+ <<RAChangeClothes>>
+ <<RARuleModified>>
+ <</link>>
+ |
<</if>>
<<if ($arcologies[0].FSRepopulationFocus != "unset") || ($cheatMode == 1) || ($clothesBoughtMaternityLingerie == 1)>>
- //FS//
-<<link "Maternity lingerie">>
- <<set $currentRule.clothes = "attractive lingerie for a pregnant woman">>
- <<RAChangeClothes>>
- <<RARuleModified>>
-<</link>> |
+ //FS//
+ <<link "Maternity lingerie">>
+ <<set $currentRule.clothes = "attractive lingerie for a pregnant woman">>
+ <<RAChangeClothes>>
+ <<RARuleModified>>
+ <</link>>
+ |
<</if>>
<<if ($arcologies[0].FSChineseRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtQipao == 1)>>
- //FS//
-<<link "Slutty qipao">>
- <<set $currentRule.clothes = "a slutty qipao">>
- <<RAChangeClothes>>
- <<RARuleModified>>
-<</link>> |
-<</if>>
+ //FS//
+ <<link "Slutty qipao">>
+ <<set $currentRule.clothes = "a slutty qipao">>
+ <<RAChangeClothes>>
+ <<RARuleModified>>
+ <</link>>
+ |
<<if ($arcologies[0].FSHedonisticDecadence != "unset") || ($cheatMode == 1) || ($clothesBoughtLazyClothes == 1)>>
- //FS//
-<<link "Stretch pants and a crop-top">>
- <<set $currentRule.clothes = "stretch pants and a crop-top">>
- <<RAChangeClothes>>
- <<RARuleModified>>
-<</link>> |
+ //FS//
+ <<link "Stretch pants and a crop-top">>
+ <<set $currentRule.clothes = "stretch pants and a crop-top">>
+ <<RAChangeClothes>>
+ <<RARuleModified>>
+ <</link>>
+ |
<</if>>
<<if ($arcologies[0].FSRomanRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtToga == 1)>>
- //FS//
-<<link "Toga">>
- <<set $currentRule.clothes = "a toga">>
- <<RAChangeClothes>>
- <<RARuleModified>>
-<</link>> |
+ //FS//
+ <<link "Toga">>
+ <<set $currentRule.clothes = "a toga">>
+ <<RAChangeClothes>>
+ <<RARuleModified>>
+ <</link>>
+ |
<</if>>
<<if ($arcologies[0].FSPastoralist != "unset") || ($cheatMode == 1) || ($clothesBoughtWestern == 1)>>
- //FS//
-<<link "Western clothing">>
- <<set $currentRule.clothes = "Western clothing">>
- <<RAChangeClothes>>
- <<RARuleModified>>
-<</link>>
+ //FS//
+ <<link "Western clothing">>
+ <<set $currentRule.clothes = "Western clothing">>
+ <<RAChangeClothes>>
+ <<RARuleModified>>
+ <</link>>
<</if>>
<br>
-//Harsh://
+//Harsh://
<<link "Nude">>
<<set $currentRule.clothes = "no clothing">>
<<RAChangeClothes>>
@@ -698,9 +681,7 @@ Clothes:
<br>
-<span id = "collar">
-Collar: ''$currentRule.collar.''
-</span>
+Collar: <span id="collar">''$currentRule.collar.''</span>
<<link "No default collar setting">>
<<set $currentRule.collar = "no default setting">>
<<RAChangeCollar>>
@@ -714,7 +695,7 @@ Collar: ''$currentRule.collar.''
<</link>>
<br>
-//Nice://
+//Nice://
<<link "Stylish leather">>
<<set $currentRule.collar = "stylish leather">>
<<RAChangeCollar>>
@@ -788,9 +769,7 @@ Collar: ''$currentRule.collar.''
<br>
-<span id = "shoes">
-Shoes: ''$currentRule.shoes.''
-</span>
+Shoes: <span id="shoes">''$currentRule.shoes.''</span>
<<for _i = 0; _i < setup.shoes.length; _i++>>
<<if _i != 0>>
@@ -806,9 +785,7 @@ Shoes: ''$currentRule.shoes.''
<</for>>
<br>
-<span id = "baccessory">
-Torso accessory: ''$currentRule.bellyAccessory.''
-</span>
+Corsetage: <span id="baccessory">''$currentRule.bellyAccessory.''</span>
<<for _i = 0; _i < setup.bellyAccessories.length; _i++>>
<<if _i == 0>>
@@ -831,9 +808,7 @@ Torso accessory: ''$currentRule.bellyAccessory.''
<</for>>
<br>
-<span id = "vaccessory">
-Vaginal accessories for virgins: ''$currentRule.virginAccessory.''
-</span>
+Vaginal accessories for virgins: <span id = "vaccessory">''$currentRule.virginAccessory.''</span>
<br>
<<for _i =0; _i < setup.vaginalAccessories.length; _i++>>
@@ -853,9 +828,7 @@ Vaginal accessories for virgins: ''$currentRule.virginAccessory.''
<</for>>
<br>
-<span id = "avaccessory">
-Vaginal accessories for anal virgins: ''$currentRule.aVirginAccessory.''
-</span>
+Vaginal accessories for anal virgins: <span id="avaccessory">''$currentRule.aVirginAccessory.''</span>
<br>
<<for _i = 0; _i < setup.vaginalAccessories.length; _i++>>
@@ -875,9 +848,7 @@ Vaginal accessories for anal virgins: ''$currentRule.aVirginAccessory.''
<</for>>
<br>
-<span id = "voaccessory">
-Vaginal accessories for other slaves: ''$currentRule.vaginalAccessory.''
-</span>
+Vaginal accessories for other slaves: <span id="voaccessory">''$currentRule.vaginalAccessory.''</span>
<br>
<<for _i = 0; _i < setup.vaginalAccessories.length; _i++>>
@@ -896,11 +867,10 @@ Vaginal accessories for other slaves: ''$currentRule.vaginalAccessory.''
<</if>>
<</for>>
+
<<if $seeDicks != 0 || $makeDicks != 0>>
<br>
-<span id = "avdaccessory">
-Dick accessories for anal virgins: ''$currentRule.aVirginDickAccessory.''
-</span>
+Dick accessories for anal virgins: <span id="avdaccessory">''$currentRule.aVirginDickAccessory.''</span>
<<for _i = 0; _i < setup.dickAccessories.length; _i++>>
<<if _i != 0>>
@@ -916,10 +886,7 @@ Dick accessories for anal virgins: ''$currentRule.aVirginDickAccessory.''
<</for>>
<br>
-
-<span id = "daccessory">
-Dick accessories for other slaves: ''$currentRule.dickAccessory.''
-</span>
+Dick accessories for other slaves: <span id="daccessory">''$currentRule.dickAccessory.''</span>
<<for _i = 0; _i < setup.dickAccessories.length; _i++>>
<<if _i != 0>>
@@ -935,11 +902,9 @@ Dick accessories for other slaves: ''$currentRule.dickAccessory.''
<</for>>
<</if>>
-<br>
-<span id = "avbuaccessory">
-Buttplugs for anal virgins: ''$currentRule.aVirginButtplug.''
-</span>
+<br>
+Buttplugs for anal virgins: <span id="avbuaccessory">''$currentRule.aVirginButtplug.''</span>
<<for _i = 0; _i < setup.buttplugs.length; _i++>>
<<if _i != 0>>
@@ -956,11 +921,9 @@ Buttplugs for anal virgins: ''$currentRule.aVirginButtplug.''
//Will permanently gape assholes//
<</if>>
<</for>>
-<br>
-<span id = "buaccessory">
-Buttplugs for other slaves: ''$currentRule.buttplug.''
-</span>
+<br>
+Buttplugs for other slaves: <span id="buaccessory">''$currentRule.buttplug.''</span>
<<for _i = 0; _i < setup.buttplugs.length; _i++>>
<<if _i != 0>>
@@ -988,14 +951,14 @@ __Rule $r Physical Regimen:__
<br>
Growth hormone regimes for healthy slaves:
-<span id = "growth"></span>
+<span id="growth"></span>
-<<link "No default setting" "Rules Assistant">><<set $currentRule.growth = {boobs: "no default setting", butt: "no default setting", lips: "no default setting", dick: "no default setting", balls: "no default setting"}>><</link>> |
-<<link "Girlish figure" "Rules Assistant">><<set $currentRule.growth = {boobs: 350, butt: 2, lips: 25, dick: 0, balls: 0}>><</link>> |
+<<link "No default setting" "Rules Assistant">> <<set $currentRule.growth = {boobs: "no default setting", butt: "no default setting", lips: "no default setting", dick: "no default setting", balls: "no default setting"}>><</link>> |
+<<link "Girlish figure" "Rules Assistant">> <<set $currentRule.growth = {boobs: 350, butt: 2, lips: 25, dick: 0, balls: 0}>><</link>> |
<<link "Stacked figure" "Rules Assistant">> <<set $currentRule.growth = {boobs: 1000, butt: 4, lips: 25, dick: 4, balls: 4}>><</link>> |
<<link "Huge but functional" "Rules Assistant">><<set $currentRule.growth = {boobs: 9000, butt: 10, lips: 45, dick: 6, balls: 6}>><</link>> |
-<<link "Unlimited" "Rules Assistant">><<set $currentRule.growth = {boobs: 24000, butt: 10, lips: 100, dick: 10, balls: 6}>><</link>> |
-<<link "None" "Rules Assistant">><<set $currentRule.growth = {boobs: 0, butt: 0, lips: 0, dick: 0, balls: 0}>><</link>>
+<<link "Unlimited" "Rules Assistant">> <<set $currentRule.growth = {boobs: 24000, butt: 10, lips: 100, dick: 10, balls: 6}>><</link>> |
+<<link "None" "Rules Assistant">> <<set $currentRule.growth = {boobs: 0, butt: 0, lips: 0, dick: 0, balls: 0}>><</link>>
<br>
//Breasts://
@@ -1054,7 +1017,6 @@ Drug regimes will be
<br>
Health drugs:
-
<span id = "curatives">
<<if $currentRule.curatives == "no default setting">>
''no default setting.''
@@ -1095,9 +1057,8 @@ Health drugs:
<br>
-<span id = "aphrodisiacs">
Aphrodisiacs:
-
+<span id = "aphrodisiacs">
<<if $currentRule.aphrodisiacs == "no default setting">>
''no default setting.''
<<elseif $currentRule.aphrodisiacs > 0>>
@@ -1145,9 +1106,8 @@ Aphrodisiacs:
<br>
-<span id = "preg">
Contraceptives for fertile slaves:
-
+<span id = "preg">
<<if $currentRule.preg == 0>>
''fertile.''
<<elseif $currentRule.preg == 1>>
@@ -1221,9 +1181,8 @@ Birth stimulators <<rbutton "$currentRule.pregSpeed" "stimulate">>
<br>
<</if>>
-<span id = "xxhormones">
Hormones for female slaves:
-
+<span id = "xxhormones">
<<if $currentRule.XX == 0>>
''no hormones.''
<<elseif $currentRule.XX == 1>>
@@ -1277,9 +1236,8 @@ Hormones for female slaves:
<br>
-<span id = "xyhormones">
Hormones for shemales:
-
+<span id = "xyhormones">
<<if $currentRule.XY == 0>>
''no hormones.''
<<elseif $currentRule.XY == 1>>
@@ -1333,9 +1291,8 @@ Hormones for shemales:
<br>
-<span id = "geldhormones">
Hormones for geldings:
-
+<span id = "geldhormones">
<<if $currentRule.gelding == 0>>
''no hormones.''
<<elseif $currentRule.gelding == 1>>
@@ -1415,12 +1372,10 @@ Other drugs: // Will be overriden by hormones and other drugs where applicable./
<</capture>>
<</for>>
-
<br>
-<span id = "diet">
Slave diets:
-
+<span id = "diet">
<<if $currentRule.diet == "XX">>
''designed to keep slaves feminine.''
<<elseif $currentRule.diet == "XY">>
@@ -1528,9 +1483,8 @@ Diet support for growth drugs:
<br>
-<span id = "dietBase">
Diet base:
-
+<span id = "dietBase">
<<if ($currentRule.dietCum == 2)>>
''slaves' diets are heavily based on cum.''
<<elseif (($currentRule.dietCum == 1) && ($currentRule.dietMilk == 0))>>
@@ -1550,57 +1504,56 @@ Diet base:
<<link "no default setting">>
<<set $currentRule.dietCum = "no default setting">>
- <<RAChangeDiet>>
+ <<RAChangeDietBase>>
<<RARuleModified>>
<</link>>
|
<<link "Normal Diet">>
<<set $currentRule.dietCum = 0>>
<<set $currentRule.dietMilk = 0>>
- <<RAChangeDiet>>
+ <<RAChangeDietBase>>
<<RARuleModified>>
<</link>>
|
<<link "Cum Added">>
<<set $currentRule.dietCum = 1>>
<<set $currentRule.dietMilk = 0>>
- <<RAChangeDiet>>
+ <<RAChangeDietBase>>
<<RARuleModified>>
<</link>>
|
<<link "Milk Added">>
<<set $currentRule.dietCum = 0>>
<<set $currentRule.dietMilk = 1>>
- <<RAChangeDiet>>
+ <<RAChangeDietBase>>
<<RARuleModified>>
<</link>>
|
<<link "Cum & Milk Added">>
<<set $currentRule.dietCum = 1>>
<<set $currentRule.dietMilk = 1>>
- <<RAChangeDiet>>
+ <<RAChangeDietBase>>
<<RARuleModified>>
<</link>>
|
<<link "Cum-Based">>
<<set $currentRule.dietCum = 2>>
<<set $currentRule.dietMilk = 0>>
- <<RAChangeDiet>>
+ <<RAChangeDietBase>>
<<RARuleModified>>
<</link>>
|
<<link "Milk Based">>
<<set $currentRule.dietCum = 0>>
<<set $currentRule.dietMilk = 2>>
- <<RAChangeDiet>>
+ <<RAChangeDietBase>>
<<RARuleModified>>
<</link>>
<br>
-<span id = "muscles">
Muscles:
-
+<span id = "muscles">
<<if $currentRule.muscles > 95>>
''massive.''
<<elseif $currentRule.muscles > 30>>
@@ -1646,9 +1599,8 @@ Muscles:
<br>
-<span id = "braces">
Braces:
-
+<span id = "braces">
<<if $currentRule.teeth == "straighten">>
''straighten'' teeth, then remove.
<<elseif $currentRule.teeth == "universal">>
@@ -1686,9 +1638,8 @@ Braces:
<br>
-<span id = "assistantimplants">
Assistant-applied implants:
-
+<span id = "assistantimplants">
<<if $currentRule.autoSurgery == 1>>
''ACTIVE, STAND CLEAR.''
<<link "Off">>
@@ -1711,9 +1662,7 @@ Assistant-applied implants:
__Rule $r Behavior Rules:__
<br>
-<span id = "living">
-Living standard: ''$currentRule.livingRules.''
-</span>
+Living standard: <span id="living">''$currentRule.livingRules.''</span>
<<link "No default setting">>
<<set $currentRule.livingRules = "no default setting">>
@@ -1741,13 +1690,7 @@ Living standard: ''$currentRule.livingRules.''
<br>
-<<if ndef $currentRule.standardPunishment>>
-<<set $currentRule.standardPunishment = "no default setting">>
-<</if>>
-
-<span id = "punish">
-Typical punishment: ''$currentRule.standardPunishment.''
-</span>
+Typical punishment: <span id="punish">''$currentRule.standardPunishment.''</span>
<<link "No default setting">>
<<set $currentRule.standardPunishment = "no default setting">>
@@ -1781,13 +1724,7 @@ Typical punishment: ''$currentRule.standardPunishment.''
<br>
-<<if ndef $currentRule.standardReward>>
-<<set $currentRule.standardReward = "no default setting">>
-<</if>>
-
-<span id = "reward">
-Typical reward: ''$currentRule.standardReward.''
-</span>
+Typical reward: <span id="reward">''$currentRule.standardReward.''</span>
<<link "No default setting">>
<<set $currentRule.standardReward = "no default setting">>
@@ -1821,9 +1758,7 @@ Typical reward: ''$currentRule.standardReward.''
<br>
-<span id = "mast">
-Release rules: ''$currentRule.releaseRules.''
-</span>
+Release rules: <span id="mast">''$currentRule.releaseRules.''</span>
<<link "No default setting">>
<<set $currentRule.releaseRules = "no default setting">>
@@ -1851,7 +1786,7 @@ Release rules: ''$currentRule.releaseRules.''
<br>
-Smart piercing fetish target: <span id = "spf">''$currentRule.clitSetting.''</span>
+Smart piercing fetish target: <span id="spf">''$currentRule.clitSetting.''</span>
<br>
<<link "No default setting">>
@@ -2039,9 +1974,7 @@ Smart piercing sex drive target: <span id = "spe"><<RAInitSPE>></span>
<br>
-<span id = "speech">
-Speech rules: ''$currentRule.speechRules.''
-</span>
+Speech rules: <span id="speech">''$currentRule.speechRules.''</span>
<<link "No default setting">>
<<set $currentRule.speechRules = "no default setting">>
@@ -2069,9 +2002,7 @@ Speech rules: ''$currentRule.speechRules.''
<br>
-<span id = "relation">
-Relationship rules: ''$currentRule.relationshipRules.''
-</span>
+Relationship rules: <span id="relation">''$currentRule.relationshipRules.''</span>
<<link "No default setting">>
<<set $currentRule.relationshipRules = "no default setting">>
@@ -2099,16 +2030,11 @@ Relationship rules: ''$currentRule.relationshipRules.''
<<if $studio == 1>>
<br>
-<span id = "pornfame">
+<span id="pornfame">
<<if $currentRule.pornFameSpending == -1>>
- Release of feeds showing excellent slaves' sex lives: ''off.''
-<<link "Enable">>
- <<set $currentRule.pornFameSpending = 0>>
- <<RAChangeFameSpending>>
- <<RARuleModified>>
-<</link>>
+ Release of feeds showing excellent slaves' sex lives: ''off.''
<<else>>
- Weekly porn publicity subsidy: ''¤$currentRule.pornFameSpending.''
+ Weekly porn publicity subsidy: ''¤$currentRule.pornFameSpending.''
<</if>>
</span>
@@ -2118,6 +2044,12 @@ Relationship rules: ''$currentRule.relationshipRules.''
<<RARuleModified>>
<</link>>
|
+<<link "No broadcasting">>
+ <<set $currentRule.pornFameSpending = -1>>
+ <<RAChangeFameSpending>>
+ <<RARuleModified>>
+<</link>>
+|
<<link "No subsidy">>
<<set $currentRule.pornFameSpending = 0>>
<<RAChangeFameSpending>>
@@ -2153,278 +2085,261 @@ Relationship rules: ''$currentRule.relationshipRules.''
<<RAChangeFameSpending>>
<<RARuleModified>>
<</link>>
-|
-<<link "No broadcasting">>
- <<set $currentRule.pornFameSpending = -1>>
- <<RAChangeFameSpending>>
- <<RARuleModified>>
-<</link>>
<</if>>
-<span id="saveresult">
-</span>
+<br><br>
+
+<span id="saveresult"></span>
<<timed 50ms>>
-<<set _text = "Save rule " + $r>>
<<RAChangeSave>>
<</timed>>
-<<if ($currentRule.ID == 1) || ($currentRule.ID == 2) || ( $currentRule.ID == 3)>>
- |
+<<if ($currentRule.ID == 1) || ($currentRule.ID == 2) || ($currentRule.ID == 3)>>
+|
<<link "Reset this rule to use FC Dev's preferred options">>
- <<replace "#saveresult">>
- //Rule reset.//
- <<for _t = 0; _t < _length; _t++>>
-
- <<if $currentRule.ID == $defaultRules[_t].ID>>
- <<if ($currentRule.ID == 1)>>
-
- <<set $currentRule.name = "Obedient Slaves">>
- <<set $currentRule.condition = {id: ">", first: {id: "(name)", name: "devotion"}, second: {id: "(number)", value: 20}}>>
- <<set $currentRule.clothes = "slutty jewelry">>
- <<set $currentRule.collar = "pretty jewelry">>
- <<set $currentRule.shoes = "heels">>
- <<set $currentRule.vaginalAccessory = "none">>
- <<set $currentRule.virginAccessory = "chastity belt">>
- <<set $currentRule.aVirginAccessory = "anal chastity">>
- <<set $currentRule.dickAccessory = "none">>
- <<set $currentRule.aVirginDickAccessory = "anal chastity">>
- <<set $currentRule.bellyAccessory = "no default setting">>
- <<set $currentRule.aVirginButtplug = "none">>
- <<set $currentRule.buttplug = "none">>
- <<set $currentRule.eyes = "no default setting">>
- <<set $currentRule.makeup = 1>>
- <<set $currentRule.nails = 1>>
- <<set $currentRule.hColor = "no default setting">>
- <<set $currentRule.hStyle = "neat">>
- <<set $currentRule.pubicHColor = "no default setting">>
- <<set $currentRule.pubicHStyle = "waxed">>
- <<set $currentRule.underArmHColor = "no default setting">>
- <<set $currentRule.underArmHStyle = "waxed">>
- <<set $currentRule.drug = "no default setting">>
- <<set $currentRule.earPiercing = 1>>
- <<set $currentRule.nosePiercing = 0>>
- <<set $currentRule.eyebrowPiercing = 0>>
- <<set $currentRule.navelPiercing = 1>>
- <<set $currentRule.nipplesPiercing = 0>>
- <<set $currentRule.lipsPiercing = 0>>
- <<set $currentRule.tonguePiercing = 0>>
- <<set $currentRule.clitPiercing = 3>>
- <<set $currentRule.vaginaPiercing = 1>>
- <<set $currentRule.dickPiercing = 1>>
- <<set $currentRule.anusPiercing = 1>>
- <<set $currentRule.anusTat = "bleached">>
- <<set $currentRule.curatives = "no default setting">>
- <<set $currentRule.preg = -1>>
- <<set $currentRule.XX = 2>>
- <<set $currentRule.XY = 2>>
- <<set $currentRule.gelding = 2>>
- <<set $currentRule.diet = 30>>
- <<set $currentRule.dietGrowthSupport = 1>>
- <<set $currentRule.muscles = 20>>
- <<set $currentRule.releaseRules = "restrictive">>
- <<set $currentRule.standardPunishment = "confinement">>
- <<set $currentRule.standardReward = "relaxation">>
- <<set $currentRule.clitSetting = "anal", $currentRule.clitSettingXY = 100, $currentRule.clitSettingXX = 100, $currentRule.clitSettingEnergy = 100>>
- <<set $currentRule.speechRules = "permissive">>
- <<set $currentRule.relationshipRules = "permissive">>
- <<set $currentRule.livingRules = "luxurious">>
- <<set $currentRule.growth = {boobs: 9000, butt: 10, lips: 45, dick: 6, balls: 6}>>
- <<set $currentRule.autoBrand = 1>>
- <<set $currentRule.assignment = []>>
- <<set $currentRule.excludeAssignment = []>>
- <<set $currentRule.setAssignment = "no default setting">>
- <<set $currentRule.facility = []>>
- <<set $currentRule.excludeFacility = []>>
- <<set $currentRule.excludeSpecialSlaves = true>>
- <<set $currentRule.facilityRemove = false>>
- <<set $currentRule.removalAssignment = "rest">>
- <<set $currentRule.selectedSlaves = []>>
- <<set $currentRule.excludedSlaves = []>>
- <<set $currentRule.teeth = "straighten">>
- <<set $currentRule.autosurgery = 1>>
- <<set $currentRule.surgery.lactation = "no default setting">>
- <<set $currentRule.surgery.prostate = "no default setting">>
- <<set $currentRule.surgery.cosmetic = 1>>
- <<set $currentRule.surgery.accent = 0>>
- <<set $currentRule.surgery.shoulders = 0>>
- <<set $currentRule.surgery.shouldersImplant = 0>>
- <<set $currentRule.surgery.boobs = 0>>
- <<set $currentRule.surgery.hips = 0>>
- <<set $currentRule.surgery.hipsImplant = 0>>
- <<set $currentRule.surgery.butt = 0>>
- <<set $currentRule.surgery.faceShape = "normal">>
- <<set $currentRule.surgery.lips = 0>>
- <<set $currentRule.surgery.holes = 0>>
- <<set $defaultRules[_t] = $currentRule>>
-
- <<elseif ($currentRule.ID == 2)>>
- <<set $currentRule.name = "Disobedient Slaves">>
- <<set $currentRule.condition = {id: "<=", first: {id: "(name)", name: "devotion"}, second: {id: "(number)", value: 20}}>>
- <<set $currentRule.clothes = "uncomfortable straps">>
- <<set $currentRule.collar = "uncomfortable leather">>
- <<set $currentRule.shoes = "heels">>
- <<set $currentRule.vaginalAccessory = "no default setting">>
- <<set $currentRule.virginAccessory = "no default setting">>
- <<set $currentRule.aVirginAccessory = "no default setting">>
- <<set $currentRule.dickAccessory = "no default setting">>
- <<set $currentRule.aVirginDickAccessory = "no default setting">>
- <<set $currentRule.bellyAccessory = "no default setting">>
- <<set $currentRule.aVirginButtplug = "no default setting">>
- <<set $currentRule.buttplug = "no default setting">>
- <<set $currentRule.eyes = "no default setting">>
- <<set $currentRule.makeup = 1>> <<set $currentRule.nails = 1>>
- <<set $currentRule.hColor = "no default setting">>
- <<set $currentRule.hStyle = "neat">>
- <<set $currentRule.pubicHColor = "no default setting">>
- <<set $currentRule.pubicHStyle = "waxed">>
- <<set $currentRule.underArmHColor = "no default setting">>
- <<set $currentRule.underArmHStyle = "waxed">>
- <<set $currentRule.drug = "no default setting">>
- <<set $currentRule.earPiercing = 0>>
- <<set $currentRule.nosePiercing = 0>>
- <<set $currentRule.eyebrowPiercing = 0>>
- <<set $currentRule.navelPiercing = 0>>
- <<set $currentRule.nipplesPiercing = 0>>
- <<set $currentRule.lipsPiercing = 0>>
- <<set $currentRule.tonguePiercing = 0>>
- <<set $currentRule.clitPiercing = 3>>
- <<set $currentRule.vaginaPiercing = 0>>
- <<set $currentRule.dickPiercing = 0>>
- <<set $currentRule.anusPiercing = 0>>
- <<set $currentRule.anusTat = "no default setting">>
- <<set $currentRule.curatives = "no default setting">>
- <<set $currentRule.preg = -1>>
- <<set $currentRule.XX = 2>>
- <<set $currentRule.XY = 2>>
- <<set $currentRule.gelding = 2>>
- <<set $currentRule.diet = 30>>
- <<set $currentRule.dietGrowthSupport = 1>>
- <<set $currentRule.muscles = 20>>
- <<set $currentRule.releaseRules = "restrictive">>
- <<set $currentRule.standardPunishment = "whipping">>
- <<set $currentRule.standardReward = "orgasm">>
- <<set $currentRule.clitSetting = "anal", $currentRule.clitSettingXY = 100, $currentRule.clitSettingXX = 100, $currentRule.clitSettingEnergy = 100>>
- <<set $currentRule.speechRules = "restrictive">>
- <<set $currentRule.relationshipRules = "restrictive">>
- <<set $currentRule.livingRules = "spare">>
- <<set $currentRule.autoSurgery = 0>>
- <<set $currentRule.growth = {boobs: 9000, butt: 10, lips: 45, dick: 6, balls: 6}>>
- <<set $currentRule.autoBrand = 1>>
- <<set $currentRule.assignment = []>>
- <<set $currentRule.excludeAssignment = []>>
- <<set $currentRule.setAssignment = "no default setting">>
- <<set $currentRule.facility = []>>
- <<set $currentRule.excludeFacility = []>>
- <<set $currentRule.excludeSpecialSlaves = true>>
- <<set $currentRule.facilityRemove = false>>
- <<set $currentRule.removalAssignment = "rest">>
- <<set $currentRule.selectedSlaves = []>>
- <<set $currentRule.excludedSlaves = []>>
- <<set $currentRule.surgery.lactation = "no default setting">>
- <<set $currentRule.surgery.prostate = "no default setting">>
- <<set $currentRule.surgery.cosmetic = 0>>
- <<set $currentRule.surgery.accent = 0>>
- <<set $currentRule.surgery.shoulders = 0>>
- <<set $currentRule.surgery.shouldersImplant = 0>>
- <<set $currentRule.surgery.boobs = "no default setting">>
- <<set $currentRule.surgery.hips = 0>>
- <<set $currentRule.surgery.hipsImplant = 0>>
- <<set $currentRule.surgery.butt = "no default setting">>
- <<set $currentRule.surgery.faceShape = "no default setting">>
- <<set $currentRule.surgery.lips = "no default setting">>
- <<set $currentRule.surgery.holes = 0>>
- <<set $defaultRules[_t] = $currentRule>>
-
- <<elseif ($currentRule.ID == 3)>>
- <<set $currentRule.name = "Unhealthy Slaves">>
- <<set $currentRule.condition = {id: "<", first: {id: "(name)", name: "health"}, second: {id: "(number)", value: -2}}>>
- <<set $currentRule.clothes = "no default setting">>
- <<set $currentRule.collar = "no default setting">>
- <<set $currentRule.shoes = "no default setting">>
- <<set $currentRule.vaginalAccessory = "no default setting">>
- <<set $currentRule.virginAccessory = "no default setting">>
- <<set $currentRule.aVirginAccessory = "no default setting">>
- <<set $currentRule.dickAccessory = "no default setting">>
- <<set $currentRule.aVirginDickAccessory = "no default setting">>
- <<set $currentRule.bellyAccessory = "no default setting">>
- <<set $currentRule.aVirginButtplug = "no default setting">>
- <<set $currentRule.buttplug = "no default setting">>
- <<set $currentRule.eyes = "no default setting">>
- <<set $currentRule.makeup = "no default setting">>
- <<set $currentRule.nails = "no default setting">>
- <<set $currentRule.hColor = "no default setting">>
- <<set $currentRule.hStyle = "no default setting">>
- <<set $currentRule.pubicHColor = "no default setting">>
- <<set $currentRule.pubicHStyle = "no default setting">>
- <<set $currentRule.underArmHColor = "no default setting">>
- <<set $currentRule.underArmHStyle = "no default setting">>
- <<set $currentRule.drug = "no default setting">>
- <<set $currentRule.earPiercing = "no default setting">>
- <<set $currentRule.nosePiercing = "no default setting">>
- <<set $currentRule.eyebrowPiercing = "no default setting">>
- <<set $currentRule.navelPiercing = "no default setting">>
- <<set $currentRule.nipplesPiercing = "no default setting">>
- <<set $currentRule.lipsPiercing = "no default setting">>
- <<set $currentRule.tonguePiercing = "no default setting">>
- <<set $currentRule.clitPiercing = "no default setting">>
- <<set $currentRule.vaginaPiercing = "no default setting">>
- <<set $currentRule.dickPiercing = "no default setting">>
- <<set $currentRule.anusPiercing = "no default setting">>
- <<set $currentRule.anusTat = "no default setting">>
- <<set $currentRule.curatives = "applied">>
- <<set $currentRule.preg = "no default setting">>
- <<set $currentRule.XX = "no default setting">>
- <<set $currentRule.XY = "no default setting">>
- <<set $currentRule.gelding = "no default setting">>
- <<set $currentRule.diet = "no default setting">>
- <<set $currentRule.muscles = "no default setting">>
- <<set $currentRule.releaseRules = "no default setting">>
- <<set $currentRule.standardPunishment = "no default setting">>
- <<set $currentRule.standardReward = "no default setting">>
- <<set $currentRule.clitSetting = "no default setting", $currentRule.clitSettingXY = "no default setting", $currentRule.clitSettingXX = "no default setting", $currentRule.clitSettingEnergy = "no default setting">>
- <<set $currentRule.speechRules = "no default setting">>
- <<set $currentRule.relationshipRules = "no default setting">>
- <<set $currentRule.livingRules = "no default setting">>
- <<set $currentRule.growth = {boobs: 9000, butt: 10, lips: 45, dick: 6, balls: 6}>>
- <<set $currentRule.autoBrand = "no default setting">>
- <<set $currentRule.assignment = []>>
- <<set $currentRule.excludeAssignment = []>>
- <<set $currentRule.setAssignment = "no default setting">>
- <<set $currentRule.facility = []>>
- <<set $currentRule.excludeFacility = []>>
- <<set $currentRule.excludeSpecialSlaves = true>>
- <<set $currentRule.facilityRemove = false>>
- <<set $currentRule.removalAssignment = "rest">>
- <<set $currentRule.selectedSlaves = []>>
- <<set $currentRule.excludedSlaves = []>>
- <<set $currentRule.surgery.lactation = "no default setting">>
- <<set $currentRule.surgery.prostate = "no default setting">>
- <<set $currentRule.surgery.cosmetic = 0>>
- <<set $currentRule.surgery.accent = 0>>
- <<set $currentRule.surgery.shoulders = 0>>
- <<set $currentRule.surgery.shouldersImplant = 0>>
- <<set $currentRule.surgery.boobs = "no default setting">>
- <<set $currentRule.surgery.hips = 0>>
- <<set $currentRule.surgery.hipsImplant = 0>>
- <<set $currentRule.surgery.butt = "no default setting">>
- <<set $currentRule.surgery.faceShape = "no default setting">>
- <<set $currentRule.surgery.lips = "no default setting">>
- <<set $currentRule.surgery.holes = 0>>
- <<set $defaultRules[_t] = $currentRule>>
- <</if>>
- <<goto "Rules Assistant">>
- <</if>>
- <</for>>
- <</replace>>
+
+ <<if ($currentRule.ID == 1)>>
+ <<set $currentRule.name = "Obedient Slaves">>
+ <<set $currentRule.condition = {id: ">", first: {id: "(name)", name: "devotion"}, second: {id: "(number)", value: 20}}>>
+ <<set $currentRule.clothes = "slutty jewelry">>
+ <<set $currentRule.collar = "pretty jewelry">>
+ <<set $currentRule.shoes = "heels">>
+ <<set $currentRule.vaginalAccessory = "none">>
+ <<set $currentRule.virginAccessory = "chastity belt">>
+ <<set $currentRule.aVirginAccessory = "anal chastity">>
+ <<set $currentRule.dickAccessory = "none">>
+ <<set $currentRule.aVirginDickAccessory = "anal chastity">>
+ <<set $currentRule.bellyAccessory = "no default setting">>
+ <<set $currentRule.aVirginButtplug = "none">>
+ <<set $currentRule.buttplug = "none">>
+ <<set $currentRule.eyes = "no default setting">>
+ <<set $currentRule.makeup = 1>>
+ <<set $currentRule.nails = 1>>
+ <<set $currentRule.hColor = "no default setting">>
+ <<set $currentRule.hStyle = "neat">>
+ <<set $currentRule.pubicHColor = "no default setting">>
+ <<set $currentRule.pubicHStyle = "waxed">>
+ <<set $currentRule.underArmHColor = "no default setting">>
+ <<set $currentRule.underArmHStyle = "waxed">>
+ <<set $currentRule.drug = "no default setting">>
+ <<set $currentRule.earPiercing = 1>>
+ <<set $currentRule.nosePiercing = 0>>
+ <<set $currentRule.eyebrowPiercing = 0>>
+ <<set $currentRule.navelPiercing = 1>>
+ <<set $currentRule.nipplesPiercing = 0>>
+ <<set $currentRule.lipsPiercing = 0>>
+ <<set $currentRule.tonguePiercing = 0>>
+ <<set $currentRule.clitPiercing = 3>>
+ <<set $currentRule.vaginaPiercing = 1>>
+ <<set $currentRule.dickPiercing = 1>>
+ <<set $currentRule.anusPiercing = 1>>
+ <<set $currentRule.anusTat = "bleached">>
+ <<set $currentRule.curatives = "no default setting">>
+ <<set $currentRule.preg = -1>>
+ <<set $currentRule.XX = 2>>
+ <<set $currentRule.XY = 2>>
+ <<set $currentRule.gelding = 2>>
+ <<set $currentRule.diet = 30>>
+ <<set $currentRule.dietGrowthSupport = 1>>
+ <<set $currentRule.muscles = 20>>
+ <<set $currentRule.releaseRules = "restrictive">>
+ <<set $currentRule.standardPunishment = "confinement">>
+ <<set $currentRule.standardReward = "relaxation">>
+ <<set $currentRule.clitSetting = "anal", $currentRule.clitSettingXY = 100, $currentRule.clitSettingXX = 100, $currentRule.clitSettingEnergy = 100>>
+ <<set $currentRule.speechRules = "permissive">>
+ <<set $currentRule.relationshipRules = "permissive">>
+ <<set $currentRule.livingRules = "luxurious">>
+ <<set $currentRule.growth = {boobs: 9000, butt: 10, lips: 45, dick: 6, balls: 6}>>
+ <<set $currentRule.autoBrand = 1>>
+ <<set $currentRule.assignment = []>>
+ <<set $currentRule.excludeAssignment = []>>
+ <<set $currentRule.setAssignment = "no default setting">>
+ <<set $currentRule.facility = []>>
+ <<set $currentRule.excludeFacility = []>>
+ <<set $currentRule.excludeSpecialSlaves = true>>
+ <<set $currentRule.facilityRemove = false>>
+ <<set $currentRule.removalAssignment = "rest">>
+ <<set $currentRule.selectedSlaves = []>>
+ <<set $currentRule.excludedSlaves = []>>
+ <<set $currentRule.teeth = "straighten">>
+ <<set $currentRule.autosurgery = 1>>
+ <<set $currentRule.surgery.lactation = "no default setting">>
+ <<set $currentRule.surgery.prostate = "no default setting">>
+ <<set $currentRule.surgery.cosmetic = 1>>
+ <<set $currentRule.surgery.accent = 0>>
+ <<set $currentRule.surgery.shoulders = 0>>
+ <<set $currentRule.surgery.shouldersImplant = 0>>
+ <<set $currentRule.surgery.boobs = 0>>
+ <<set $currentRule.surgery.hips = 0>>
+ <<set $currentRule.surgery.hipsImplant = 0>>
+ <<set $currentRule.surgery.butt = 0>>
+ <<set $currentRule.surgery.faceShape = "normal">>
+ <<set $currentRule.surgery.lips = 0>>
+ <<set $currentRule.surgery.holes = 0>>
+
+ <<elseif ($currentRule.ID == 2)>>
+ <<set $currentRule.name = "Disobedient Slaves">>
+ <<set $currentRule.condition = {id: "<=", first: {id: "(name)", name: "devotion"}, second: {id: "(number)", value: 20}}>>
+ <<set $currentRule.clothes = "uncomfortable straps">>
+ <<set $currentRule.collar = "uncomfortable leather">>
+ <<set $currentRule.shoes = "heels">>
+ <<set $currentRule.vaginalAccessory = "no default setting">>
+ <<set $currentRule.virginAccessory = "no default setting">>
+ <<set $currentRule.aVirginAccessory = "no default setting">>
+ <<set $currentRule.dickAccessory = "no default setting">>
+ <<set $currentRule.aVirginDickAccessory = "no default setting">>
+ <<set $currentRule.bellyAccessory = "no default setting">>
+ <<set $currentRule.aVirginButtplug = "no default setting">>
+ <<set $currentRule.buttplug = "no default setting">>
+ <<set $currentRule.eyes = "no default setting">>
+ <<set $currentRule.makeup = 1>> <<set $currentRule.nails = 1>>
+ <<set $currentRule.hColor = "no default setting">>
+ <<set $currentRule.hStyle = "neat">>
+ <<set $currentRule.pubicHColor = "no default setting">>
+ <<set $currentRule.pubicHStyle = "waxed">>
+ <<set $currentRule.underArmHColor = "no default setting">>
+ <<set $currentRule.underArmHStyle = "waxed">>
+ <<set $currentRule.drug = "no default setting">>
+ <<set $currentRule.earPiercing = 0>>
+ <<set $currentRule.nosePiercing = 0>>
+ <<set $currentRule.eyebrowPiercing = 0>>
+ <<set $currentRule.navelPiercing = 0>>
+ <<set $currentRule.nipplesPiercing = 0>>
+ <<set $currentRule.lipsPiercing = 0>>
+ <<set $currentRule.tonguePiercing = 0>>
+ <<set $currentRule.clitPiercing = 3>>
+ <<set $currentRule.vaginaPiercing = 0>>
+ <<set $currentRule.dickPiercing = 0>>
+ <<set $currentRule.anusPiercing = 0>>
+ <<set $currentRule.anusTat = "no default setting">>
+ <<set $currentRule.curatives = "no default setting">>
+ <<set $currentRule.preg = -1>>
+ <<set $currentRule.XX = 2>>
+ <<set $currentRule.XY = 2>>
+ <<set $currentRule.gelding = 2>>
+ <<set $currentRule.diet = 30>>
+ <<set $currentRule.dietGrowthSupport = 1>>
+ <<set $currentRule.muscles = 20>>
+ <<set $currentRule.releaseRules = "restrictive">>
+ <<set $currentRule.standardPunishment = "whipping">>
+ <<set $currentRule.standardReward = "orgasm">>
+ <<set $currentRule.clitSetting = "anal", $currentRule.clitSettingXY = 100, $currentRule.clitSettingXX = 100, $currentRule.clitSettingEnergy = 100>>
+ <<set $currentRule.speechRules = "restrictive">>
+ <<set $currentRule.relationshipRules = "restrictive">>
+ <<set $currentRule.livingRules = "spare">>
+ <<set $currentRule.autoSurgery = 0>>
+ <<set $currentRule.growth = {boobs: 9000, butt: 10, lips: 45, dick: 6, balls: 6}>>
+ <<set $currentRule.autoBrand = 1>>
+ <<set $currentRule.assignment = []>>
+ <<set $currentRule.excludeAssignment = []>>
+ <<set $currentRule.setAssignment = "no default setting">>
+ <<set $currentRule.facility = []>>
+ <<set $currentRule.excludeFacility = []>>
+ <<set $currentRule.excludeSpecialSlaves = true>>
+ <<set $currentRule.facilityRemove = false>>
+ <<set $currentRule.removalAssignment = "rest">>
+ <<set $currentRule.selectedSlaves = []>>
+ <<set $currentRule.excludedSlaves = []>>
+ <<set $currentRule.surgery.lactation = "no default setting">>
+ <<set $currentRule.surgery.prostate = "no default setting">>
+ <<set $currentRule.surgery.cosmetic = 0>>
+ <<set $currentRule.surgery.accent = 0>>
+ <<set $currentRule.surgery.shoulders = 0>>
+ <<set $currentRule.surgery.shouldersImplant = 0>>
+ <<set $currentRule.surgery.boobs = "no default setting">>
+ <<set $currentRule.surgery.hips = 0>>
+ <<set $currentRule.surgery.hipsImplant = 0>>
+ <<set $currentRule.surgery.butt = "no default setting">>
+ <<set $currentRule.surgery.faceShape = "no default setting">>
+ <<set $currentRule.surgery.lips = "no default setting">>
+ <<set $currentRule.surgery.holes = 0>>
+
+ <<elseif ($currentRule.ID == 3)>>
+ <<set $currentRule.name = "Unhealthy Slaves">>
+ <<set $currentRule.condition = {id: "<", first: {id: "(name)", name: "health"}, second: {id: "(number)", value: -2}}>>
+ <<set $currentRule.clothes = "no default setting">>
+ <<set $currentRule.collar = "no default setting">>
+ <<set $currentRule.shoes = "no default setting">>
+ <<set $currentRule.vaginalAccessory = "no default setting">>
+ <<set $currentRule.virginAccessory = "no default setting">>
+ <<set $currentRule.aVirginAccessory = "no default setting">>
+ <<set $currentRule.dickAccessory = "no default setting">>
+ <<set $currentRule.aVirginDickAccessory = "no default setting">>
+ <<set $currentRule.bellyAccessory = "no default setting">>
+ <<set $currentRule.aVirginButtplug = "no default setting">>
+ <<set $currentRule.buttplug = "no default setting">>
+ <<set $currentRule.eyes = "no default setting">>
+ <<set $currentRule.makeup = "no default setting">>
+ <<set $currentRule.nails = "no default setting">>
+ <<set $currentRule.hColor = "no default setting">>
+ <<set $currentRule.hStyle = "no default setting">>
+ <<set $currentRule.pubicHColor = "no default setting">>
+ <<set $currentRule.pubicHStyle = "no default setting">>
+ <<set $currentRule.underArmHColor = "no default setting">>
+ <<set $currentRule.underArmHStyle = "no default setting">>
+ <<set $currentRule.drug = "no default setting">>
+ <<set $currentRule.earPiercing = "no default setting">>
+ <<set $currentRule.nosePiercing = "no default setting">>
+ <<set $currentRule.eyebrowPiercing = "no default setting">>
+ <<set $currentRule.navelPiercing = "no default setting">>
+ <<set $currentRule.nipplesPiercing = "no default setting">>
+ <<set $currentRule.lipsPiercing = "no default setting">>
+ <<set $currentRule.tonguePiercing = "no default setting">>
+ <<set $currentRule.clitPiercing = "no default setting">>
+ <<set $currentRule.vaginaPiercing = "no default setting">>
+ <<set $currentRule.dickPiercing = "no default setting">>
+ <<set $currentRule.anusPiercing = "no default setting">>
+ <<set $currentRule.anusTat = "no default setting">>
+ <<set $currentRule.curatives = "applied">>
+ <<set $currentRule.preg = "no default setting">>
+ <<set $currentRule.XX = "no default setting">>
+ <<set $currentRule.XY = "no default setting">>
+ <<set $currentRule.gelding = "no default setting">>
+ <<set $currentRule.diet = "no default setting">>
+ <<set $currentRule.muscles = "no default setting">>
+ <<set $currentRule.releaseRules = "no default setting">>
+ <<set $currentRule.standardPunishment = "no default setting">>
+ <<set $currentRule.standardReward = "no default setting">>
+ <<set $currentRule.clitSetting = "no default setting", $currentRule.clitSettingXY = "no default setting", $currentRule.clitSettingXX = "no default setting", $currentRule.clitSettingEnergy = "no default setting">>
+ <<set $currentRule.speechRules = "no default setting">>
+ <<set $currentRule.relationshipRules = "no default setting">>
+ <<set $currentRule.livingRules = "no default setting">>
+ <<set $currentRule.growth = {boobs: 9000, butt: 10, lips: 45, dick: 6, balls: 6}>>
+ <<set $currentRule.autoBrand = "no default setting">>
+ <<set $currentRule.assignment = []>>
+ <<set $currentRule.excludeAssignment = []>>
+ <<set $currentRule.setAssignment = "no default setting">>
+ <<set $currentRule.facility = []>>
+ <<set $currentRule.excludeFacility = []>>
+ <<set $currentRule.excludeSpecialSlaves = true>>
+ <<set $currentRule.facilityRemove = false>>
+ <<set $currentRule.removalAssignment = "rest">>
+ <<set $currentRule.selectedSlaves = []>>
+ <<set $currentRule.excludedSlaves = []>>
+ <<set $currentRule.surgery.lactation = "no default setting">>
+ <<set $currentRule.surgery.prostate = "no default setting">>
+ <<set $currentRule.surgery.cosmetic = 0>>
+ <<set $currentRule.surgery.accent = 0>>
+ <<set $currentRule.surgery.shoulders = 0>>
+ <<set $currentRule.surgery.shouldersImplant = 0>>
+ <<set $currentRule.surgery.boobs = "no default setting">>
+ <<set $currentRule.surgery.hips = 0>>
+ <<set $currentRule.surgery.hipsImplant = 0>>
+ <<set $currentRule.surgery.butt = "no default setting">>
+ <<set $currentRule.surgery.faceShape = "no default setting">>
+ <<set $currentRule.surgery.lips = "no default setting">>
+ <<set $currentRule.surgery.holes = 0>>
+ <</if>>
+
+ <<set $defaultRules[$r-1] = $currentRule>>
+ <<goto "Rules Assistant">>
<</link>>
<</if>>
|
-<span id="result">
-<<set _text = "Remove rule " + $r>>
-<<link _text>>
+<<link "Remove rule $r">>
<<set $defaultRules.deleteAt($r-1)>>
<<for $r = $defaultRules.length; $r > 0; $r-->>
<<if def $defaultRules[$r-1]>>
@@ -2434,7 +2349,6 @@ Relationship rules: ''$currentRule.relationshipRules.''
<</for>>
<<goto "Rules Assistant">>
<</link>>
-</span>
<</if>> /* closes if _length > 0 */
@@ -2447,13 +2361,12 @@ Relationship rules: ''$currentRule.relationshipRules.''
<<set _tempRule = {aphrodisiacs: "no default setting", condition: {id: "false"}, releaseRules: "no default setting", clitSetting: "no default setting", clitSettingXY: "no default setting", clitSettingXX: "no default setting", clitSettingEnergy: "no default setting", speechRules: "no default setting", clothes: "no default setting", collar: "no default setting", shoes: "no default setting", virginAccessory: "no default setting", aVirginAccessory: "no default setting", vaginalAccessory: "no default setting", aVirginDickAccessory: "no default setting", dickAccessory: "no default setting", bellyAccessory: "no default setting", aVirginButtplug: "no default setting", buttplug: "no default setting", eyeColor: "no default setting", makeup: "no default setting", nails: "no default setting", hColor: "no default setting", hLength: "no default setting", hStyle: "no default setting", pubicHColor: "no default setting", pubicHStyle: "no default setting", nipplesPiercing: "no default setting", areolaePiercing: "no default setting", clitPiercing: "no default setting", vaginaLube: "no default setting", vaginaPiercing: "no default setting", dickPiercing: "no default setting", anusPiercing: "no default setting", lipsPiercing: "no default setting", tonguePiercing: "no default setting", earPiercing: "no default setting", nosePiercing: "no default setting", eyebrowPiercing: "no default setting", navelPiercing: "no default setting", corsetPiercing: "no default setting", boobsTat: "no default setting", buttTat: "no default setting", vaginaTat: "no default setting", dickTat: "no default setting", lipsTat: "no default setting", anusTat: "no default setting", shouldersTat: "no default setting", armsTat: "no default setting", legsTat: "no default setting", backTat: "no default setting", stampTat: "no default setting", curatives: "no default setting", livingRules: "no default setting", relationshipRules: "no default setting", standardPunishment: "no default setting", standardReward: "no default setting", diet: "no default setting", dietCum: "no default setting", dietMilk: "no default setting", muscles: "no default setting", XY: "no default setting", XX: "no default setting", gelding: "no default setting", preg: "no default setting", growth: {boobs: "no default setting", butt: "no default setting", lips: "no default setting", dick: "no default setting", balls: "no default setting"}, autoSurgery: 0, autoBrand: 0, pornFameSpending: "no default setting", dietGrowthSupport: 0, eyewear: "no default setting", assignment: [], excludeAssignment: [], setAssignment: "no default setting", facility: [], excludeFacility: [], excludeSpecialSlaves: true, facilityRemove: false, removalAssignment: "rest", selectedSlaves: [], excludedSlaves: [], surgery: {lactation: "no default setting", prostate: "no default setting", cosmetic: 0, accent: "no default setting", shoulders: "no default setting", shouldersImplant: "no default setting", boobs: "no default setting", hips: "no default setting", hipsImplant: "no default setting", butt: "no default setting", faceShape: "no default setting", lips: "no default setting", holes: 0}, underArmHColor: "no default setting", underArmHStyle: "no default setting", drug: "no default setting" }>>
/* pick an ID higher than the highest ID of any existing rule */
- <<for _tempRule.ID = 0, _r = 0; _r < _length; _r++>>
+ <<for _tempRule.ID = 1, _r = 0; _r < _length; _r++>>
<<set _tempRule.ID = Math.max(_tempRule.ID, $defaultRules[_r].ID + 1)>>
<</for>>
-
<<set _tempRule.name = "Rule " + (_length+1)>>
- <<set $defaultRules.push(_tempRule)>> /* add the new rule to the end of the list (lowest priority) */
+ <<set $defaultRules.push(_tempRule)>>
<<set $currentRule = $defaultRules[_length]>>
<<goto "Rules Assistant">>
@@ -2462,17 +2375,15 @@ Relationship rules: ''$currentRule.relationshipRules.''
<</if>>
<<if _length > 0>>
- <span id="apply">
- <span id="applied"></span>
- <span id="applyresult"></span>
- </span>
+ <span id="applyresult"></span>
+ <span id="applied"></span>
<<timed 50ms>>
<<RAChangeApply>>
<</timed>>
<br><br>
- [[Export this rule|Export Rule]]
+ [[Export this rule|Export Rule]] |
<</if>>
-| [[Import a rule|Import Rule]]
+[[Import a rule|Import Rule]]
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 5b5fbdd9a86..e7fa1a1e4a9 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -5831,7 +5831,7 @@
<<else>>
She finds pulling them along a burden, but her devotion to you is far stronger than her discomfort.
<</if>>
- <<if ($slaves[$i].boobs > 12000)>>
+ <<elseif ($slaves[$i].boobs > 12000)>>
Her giant breasts are so big they pin her to the floor, taking the weight off her young body.
<<if $slaves[$i].devotion <= 50>>
She finds pulling them along @@.mediumorchid;mildly annoying@@.
diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw
index 5af148507b3..51d6f986e67 100644
--- a/src/utility/raWidgets.tw
+++ b/src/utility/raWidgets.tw
@@ -469,7 +469,6 @@
<</for>>
<<replace #excludeassignment>>
-<br>
<<if _rest || _fucktoy || _servant || _confined || _whore || _public || _milked || _subordinate || _gloryhole || _classes>>
Include all assignments except:
<<link "None">>
@@ -1326,7 +1325,6 @@ Assignment on removal: ''$currentRule.removalAssignment''
%/
<<widget "RASpecialSlaves">>
<<replace #specialslaves>>
-<br><br>
<<if $currentRule.excludeSpecialSlaves>>
Excluding special slaves:
''True'' |
@@ -1365,7 +1363,7 @@ Assignment on removal: ''$currentRule.removalAssignment''
%/
<<widget "RAChangeCollar">>
<<replace #collar>>
-Collar: ''$currentRule.collar.''
+ ''$currentRule.collar.''
<</replace>>
<</widget>>
@@ -1374,7 +1372,7 @@ Collar: ''$currentRule.collar.''
%/
<<widget "RAChangeShoes">>
<<replace #shoes>>
-Shoes: ''$currentRule.shoes.''
+ ''$currentRule.shoes.''
<</replace>>
<</widget>>
@@ -1383,7 +1381,7 @@ Shoes: ''$currentRule.shoes.''
%/
<<widget "RAChangeBelly">>
<<replace #baccessory>>
-Corsetage: ''$currentRule.bellyAccessory.''
+ ''$currentRule.bellyAccessory.''
<</replace>>
<</widget>>
@@ -1394,15 +1392,15 @@ Corsetage: ''$currentRule.bellyAccessory.''
<<widget "RAChangeVAccessory">>
<<if $args[0] == 0>>
<<replace #vaccessory>>
- Vaginal accessories for virgins: ''$currentRule.virginAccessory.''
+ ''$currentRule.virginAccessory.''
<</replace>>
<<elseif $args[0] == 1>>
<<replace #avaccessory>>
- Vaginal accessories for anal virgins: ''$currentRule.aVirginAccessory.''
+ ''$currentRule.aVirginAccessory.''
<</replace>>
<<else>>
<<replace #voaccessory>>
- Vaginal accessories for other slaves: ''$currentRule.vaginalAccessory.''
+ ''$currentRule.vaginalAccessory.''
<</replace>>
<</if>>
<</widget>>
@@ -1414,11 +1412,11 @@ Corsetage: ''$currentRule.bellyAccessory.''
<<widget "RAChangeDAccessory">>
<<if $args[0] == 0>>
<<replace #avdaccessory>>
- Dick accessories for anal virgins: ''$currentRule.aVirginDickAccessory.''
+ ''$currentRule.aVirginDickAccessory.''
<</replace>>
<<else>>
<<replace #daccessory>>
- Dick accessories for other slaves: ''$currentRule.dickAccessory.''
+ ''$currentRule.dickAccessory.''
<</replace>>
<</if>>
<</widget>>
@@ -1430,11 +1428,11 @@ Corsetage: ''$currentRule.bellyAccessory.''
<<widget "RAChangeBAccessory">>
<<if $args[0] == 0>>
<<replace #avbuaccessory>>
- Buttplugs for anal virgins: ''$currentRule.aVirginButtplug.''
+ ''$currentRule.aVirginButtplug.''
<</replace>>
<<else>>
<<replace #buaccessory>>
- Buttplugs for other slaves: ''$currentRule.buttplug.''
+ ''$currentRule.buttplug.''
<</replace>>
<</if>>
<</widget>>
@@ -1458,41 +1456,11 @@ Corsetage: ''$currentRule.bellyAccessory.''
<</replace>>
<</widget>>
-/%
- Call as <<RAChangeGrowth>>
-%/
-<<widget "RAChangeGrowth">>
-<<replace #growth>>
-Growth hormones for healthy slaves:
-
-<<if $currentRule.growth == "girlish">>
- ''up to a girlish figure.''
-<<elseif $currentRule.growth == "stacked">>
- ''up to a stacked figure.''
-<<elseif $currentRule.growth == "functional">>
- ''as large as will allow a normal life.''
-<<elseif $currentRule.growth == "unlimited">>
- ''no limits.''
-<<elseif $currentRule.growth == "advSelect">>
- ''advanced selection for individual body parts.''
-<<elseif $currentRule.growth == "none">>
- ''none.''
-<<else>>
- ''no default setting.''
-<</if>>
-<</replace>>
-<<script>>
- document.getElementById("bodySize").style.display = "none";
-<</script>>
-<</widget>>
-
/%
Call as <<RAChangeAphrodisiacs>>
%/
<<widget "RAChangeAphrodisiacs">>
<<replace #aphrodisiacs>>
-Aphrodisiacs:
-
<<if $currentRule.aphrodisiacs == "no default setting">>
''no default setting.''
<<elseif $currentRule.aphrodisiacs > 0>>
@@ -1514,8 +1482,6 @@ Aphrodisiacs:
%/
<<widget "RAChangePreg">>
<<replace #preg>>
-Contraceptives for fertile slaves: // Will override hormones and drugs if applicable.//
-
<<if $currentRule.preg == 0>>
''fertile.''
<<elseif $currentRule.preg == 1>>
@@ -1539,8 +1505,6 @@ Contraceptives for fertile slaves: // Will override hormones and drugs if applic
%/
<<widget "RAChangeXXHormones">>
<<replace #xxhormones>>
-Hormones for female slaves:
-
<<if $currentRule.XX == 0>>
''no hormones.''
<<elseif $currentRule.XX == 1>>
@@ -1562,8 +1526,6 @@ Hormones for female slaves:
%/
<<widget "RAChangeXYHormones">>
<<replace #xyhormones>>
-Hormones for shemales:
-
<<if $currentRule.XY == 0>>
''no hormones.''
<<elseif $currentRule.XY == 1>>
@@ -1585,8 +1547,6 @@ Hormones for shemales:
%/
<<widget "RAChangeGeldHormones">>
<<replace #geldhormones>>
-Hormones for geldings:
-
<<if $currentRule.gelding == 0>>
''no hormones.''
<<elseif $currentRule.gelding == 1>>
@@ -1620,8 +1580,6 @@ Other drugs: // Will be overriden by hormones and other drugs where applicable./
%/
<<widget "RAChangeDiet">>
<<replace #diet>>
-Slave diets:
-
<<if $currentRule.diet == 30>>
''designed to keep slaves plush.''
<<elseif $currentRule.diet == 0>>
@@ -1642,6 +1600,7 @@ Slave diets:
''no default setting.''
<</if>>
<</replace>>
+
<<replace #dietsupport>>
<<if $currentRule.diet !== "no default setting">>
<br>
@@ -1663,9 +1622,13 @@ Diet support for growth drugs:
<</link>>
<</if>>
<</replace>>
-<<replace #dietBase>>
-Diet Base:
+<</widget>>
+/%
+ % Call as <<RAChangeDietBase>>
+ %/
+<<widget "RAChangeDietBase">>
+<<replace #dietBase>>
<<if $currentRule.dietCum == 2>>
''Cum-Based.''
<<elseif (($currentRule.dietCum == 1) && ($currentRule.dietMilk == 0))>>
@@ -1689,8 +1652,6 @@ Diet Base:
%/
<<widget "RAChangeMuscles">>
<<replace #muscles>>
-Muscles:
-
<<if $currentRule.muscles > 95>>
''massive.''
<<elseif $currentRule.muscles > 30>>
@@ -1710,8 +1671,6 @@ Muscles:
%/
<<widget "RAChangeBraces">>
<<replace #braces>>
-Braces:
-
<<if $currentRule.teeth == "straighten">>
''straighten'' teeth, then remove.
<<elseif $currentRule.teeth == "universal">>
@@ -1729,19 +1688,19 @@ Braces:
%/
<<widget "RAChangeAssistantImplants">>
<<replace #assistantimplants>>
-Assistant-applied implants:
-
<<if $currentRule.autoSurgery == 1>>
''ACTIVE, STAND CLEAR.''
<<link "Off">>
<<set $currentRule.autoSurgery = 0>>
<<RAChangeAssistantImplants>>
+ <<RARuleModified>>
<</link>>
<<else>>
''off.''
<<link "Activate">>
<<set $currentRule.autoSurgery = 1>>
<<RAChangeAssistantImplants>>
+ <<RARuleModified>>
<</link>>
<</if>>
<</replace>>
@@ -1752,7 +1711,7 @@ Assistant-applied implants:
%/
<<widget "RAChangeLiving">>
<<replace #living>>
-Living standard: ''$currentRule.livingRules.''
+ ''$currentRule.livingRules.''
<</replace>>
<</widget>>
@@ -1761,7 +1720,7 @@ Living standard: ''$currentRule.livingRules.''
%/
<<widget "RAChangePunish">>
<<replace #punish>>
-Typical punishment: ''$currentRule.standardPunishment.''
+ ''$currentRule.standardPunishment.''
<</replace>>
<</widget>>
@@ -1770,7 +1729,7 @@ Typical punishment: ''$currentRule.standardPunishment.''
%/
<<widget "RAChangeReward">>
<<replace #reward>>
-Typical reward: ''$currentRule.standardReward.''
+ ''$currentRule.standardReward.''
<</replace>>
<</widget>>
@@ -1779,7 +1738,7 @@ Typical reward: ''$currentRule.standardReward.''
%/
<<widget "RAChangeMast">>
<<replace #mast>>
-Masturbation rules: ''$currentRule.releaseRules.''
+ ''$currentRule.releaseRules.''
<</replace>>
<</widget>>
@@ -1871,7 +1830,7 @@ Masturbation rules: ''$currentRule.releaseRules.''
%/
<<widget "RAChangeSpeech">>
<<replace #speech>>
-Speech rules: ''$currentRule.speechRules.''
+ ''$currentRule.speechRules.''
<</replace>>
<</widget>>
@@ -1880,7 +1839,7 @@ Speech rules: ''$currentRule.speechRules.''
%/
<<widget "RAChangeRelationship">>
<<replace #relation>>
-Relationship rules: ''$currentRule.relationshipRules.''
+ ''$currentRule.relationshipRules.''
<</replace>>
<</widget>>
@@ -1890,43 +1849,39 @@ Relationship rules: ''$currentRule.relationshipRules.''
<<widget "RAChangeFameSpending">>
<<replace #pornfame>>
<<if $currentRule.pornFameSpending == -1>>
- Release of feeds showing excellent slaves' sex lives: ''off.''
-<<link "Enable">>
- <<set $currentRule.pornFameSpending = 0>>
- <<RAChangeFameSpending>>
-<</link>>
+ Release of feeds showing excellent slaves' sex lives: ''off.''
<<else>>
- Weekly porn publicity subsidy for excellent slaves: ''¤$currentRule.pornFameSpending.''
+ Weekly porn publicity subsidy: ''¤$currentRule.pornFameSpending.''
<</if>>
<</replace>>
<</widget>>
/%
- % Call as <<RASaveRule ruleID>>
+ % Call as <<RASaveRule>>
%/
<<widget "RASaveRule">>
<<replace #saveresult>>
- <br><br>
- <<for _t = 0; _t < $defaultRules.length; _t++>>
- <<if ($args[0] == $defaultRules[_t].ID)>>
- <<if (def _customCondition)>>
- <<set _parsedCondition = parseCondition(_customCondition)>>
- <<if (_parsedCondition.error)>>
- //There seems to be something wrong with the condition that you have given me sir,
- <br> <<print printError(_customCondition, _parsedCondition.error)>>
- <br> _parsedCondition.error.message//
- <br>
- <<break>>
- <<else>>
- <<set $currentRule.condition = optimizeExpr(_parsedCondition.expr)>>
- <</if>>
- <</if>>
+<<for _t = 0; _t < $defaultRules.length; _t++>>
+ <<if ($currentRule.ID != $defaultRules[_t].ID)>>
+ <<continue>>
+ <</if>>
- <<set $defaultRules[_t] = $currentRule>>
- //Rule $r saved//
- <<break>>
- <</if>>
- <</for>>
+ <<if (def _customCondition)>>
+ <<set _parsedCondition = parseCondition(_customCondition)>>
+ <<if (_parsedCondition.error)>>
+ //There seems to be something wrong with the condition that you have given me sir,
+ <br> <<print printError(_customCondition, _parsedCondition.error)>>
+ <br> _parsedCondition.error.message//
+ <br>
+ <<break>>
+ <</if>>
+ <<set $currentRule.condition = optimizeExpr(_parsedCondition.expr)>>
+ <</if>>
+
+ <<set $defaultRules[_t] = $currentRule>>
+ //Rule $r saved//
+ <<break>>
+<</for>>
<</replace>>
<</widget>>
@@ -1936,10 +1891,9 @@ Relationship rules: ''$currentRule.relationshipRules.''
%/
<<widget "RAChangeSave">>
<<replace #saveresult>>
- <br><br>
- <<link _text>>
- <<RASaveRule $currentRule.ID>>
- <</link>>
+<<link "Save Rule $r">>
+ <<RASaveRule>>
+<</link>>
<</replace>>
<</widget>>
@@ -1947,28 +1901,27 @@ Relationship rules: ''$currentRule.relationshipRules.''
% Call as <<RAChangeApply>>
%/
<<widget "RAChangeApply">>
-<<replace "#apply">>
- <span id="applyresult">
- <<link "Apply rules">>
- <<RASaveRule $currentRule.ID>>
- <<replace "#applied">>
- <<for _rai = 0; _rai < $slaves.length; _rai++>>
- <<if (!$slaves[_rai].useRulesAssistant)>> /* skip RA-exempt slaves */
- <<continue>>
- <</if>>
-
- <<ClearSummaryCache $slaves[_rai]>>
- <<CheckAutoRulesActivate $slaves[_rai]>> /* does not use or modify $currentRule */
- <<DefaultRules $slaves[_rai]>> /* does not use or modify $currentRule */
- <</for>>
- <</replace>>
-
- <<replace "#applyresult">>
- //Rules applied.//<br>
- <</replace>>
- <</link>>
- </span>
- <span id="applied"></span>
+<<replace #applied>>
+ /% empty %/
+<</replace>>
+
+<<replace #applyresult>>
+<<link "Apply rules">>
+ <<RASaveRule>>
+ <<replace "#applied">>
+ <<for _rai = 0; _rai < $slaves.length; _rai++>>
+ <<if ($slaves[_rai].useRulesAssistant)>>
+ <<set $slaves[_rai].currentSummary = 0>>
+ <<CheckAutoRulesActivate $slaves[_rai]>> /* does not use or modify $currentRule */
+ <<DefaultRules $slaves[_rai]>> /* does not use or modify $currentRule */
+ <</if>>
+ <</for>>
+ <</replace>>
+
+ <<replace "#applyresult">>
+ //Rules applied.//<br>
+ <</replace>>
+<</link>>
<</replace>>
<</widget>>
@@ -2220,17 +2173,17 @@ Underarm hair style: ''$currentRule.underArmHStyle.''
<<widget "RAChangeBranding">>
<<replace #branding>>
<<if $currentRule.autoBrand == 1>>
- ''on.''
- <<link "Deactivate">>
-<<set $currentRule.autoBrand = 0>>
-<<RAChangeBranding>>
-<</link>>
+ ''on.''
+ <<link "Deactivate">>
+ <<set $currentRule.autoBrand = 0>>
+ <<RAChangeBranding>>
+ <</link>>
<<else>>
- ''off.''
- <<link "Activate">>
-<<set $currentRule.autoBrand = 1>>
-<<RAChangeBranding>>
-<</link>>
+ ''off.''
+ <<link "Activate">>
+ <<set $currentRule.autoBrand = 1>>
+ <<RAChangeBranding>>
+ <</link>>
<</if>>
<</replace>>
<</widget>>
@@ -2739,110 +2692,88 @@ Your brand design is ''$brandDesign.''
%/
<<widget "RAFacilityRemove">>
<<if $args[1].facilityRemove>>
- <<switch $args[1].setAssignment>>
- <<case "be confined in the arcade">>
- <<if $args[0].assignment == "be confined in the arcade">>
- <br>$args[0].slaveName has been removed from $arcadeName and has been assigned to $args[1].removalAssignment.
- <<assignJob $args[0] $args[1].removalAssignment>>
- <</if>>
+ <<switch $args[1].setAssignment>>
+ <<case "be confined in the arcade">>
+ <<if $args[0].assignment == "be confined in the arcade">>
+ <br>$args[0].slaveName has been removed from $arcadeName and has been assigned to $args[1].removalAssignment.
+ <<assignJob $args[0] $args[1].removalAssignment>>
+ <</if>>
- <<case "work in the brothel">>
- <<if $args[0].assignment == "work in the brothel">>
- <<if ($Madam == 0) || ($Madam.ID != $args[0].ID)>>
- <br>$args[0].slaveName has been removed from $brothelName and has been assigned to $args[1].removalAssignment.
- <<assignJob $args[0] $args[1].removalAssignment>>
- <</if>>
- <</if>>
+ <<case "work in the brothel">>
+ <<if $args[0].assignment == "work in the brothel">>
+ <br>$args[0].slaveName has been removed from $brothelName and has been assigned to $args[1].removalAssignment.
+ <<assignJob $args[0] $args[1].removalAssignment>>
+ <</if>>
- <<case "serve in the club">>
- <<if $args[0].assignment == "serve in the club">>
- <<if ($DJ == 0) || ($DJ.ID != $args[0].ID)>>
- <br>$args[0].slaveName has been removed from $clubName and has been assigned to $args[1].removalAssignment.
- <<assignJob $args[0] $args[1].removalAssignment>>
- <</if>>
- <</if>>
+ <<case "serve in the club">>
+ <<if $args[0].assignment == "serve in the club">>
+ <br>$args[0].slaveName has been removed from $clubName and has been assigned to $args[1].removalAssignment.
+ <<assignJob $args[0] $args[1].removalAssignment>>
+ <</if>>
- <<case "work in the dairy">>
- <<if $args[0].assignment == "work in the dairy">>
- <<if ($Milkmaid == 0) || ($Milkmaid.ID != $args[0].ID)>>
- <br>$args[0].slaveName has been removed from $dairyName and has been assigned to $args[1].removalAssignment.
- <<assignJob $args[0] $args[1].removalAssignment>>
- <</if>>
- <</if>>
+ <<case "work in the dairy">>
+ <<if $args[0].assignment == "work in the dairy">>
+ <br>$args[0].slaveName has been removed from $dairyName and has been assigned to $args[1].removalAssignment.
+ <<assignJob $args[0] $args[1].removalAssignment>>
+ <</if>>
- <<case "rest in the spa">>
- <<if $args[0].assignment == "rest in the spa">>
- <<if ($Attendant == 0) || ($Attendant.ID != $args[0].ID)>>
- <br>$args[0].slaveName has been removed from $spaName and has been assigned to $args[1].removalAssignment.
- <<assignJob $args[0] $args[1].removalAssignment>>
- <</if>>
- <</if>>
+ <<case "rest in the spa">>
+ <<if $args[0].assignment == "rest in the spa">>
+ <br>$args[0].slaveName has been removed from $spaName and has been assigned to $args[1].removalAssignment.
+ <<assignJob $args[0] $args[1].removalAssignment>>
+ <</if>>
- <<case "get treatment in the clinic">>
- <<if $args[0].assignment == "get treatment in the clinic">>
- <<if ($Nurse == 0) || ($Nurse.ID != $args[0].ID)>>
- <br>$args[0].slaveName has been removed from $clinicName and has been assigned to $args[1].removalAssignment.
- <<assignJob $args[0] $args[1].removalAssignment>>
- <</if>>
- <</if>>
+ <<case "get treatment in the clinic">>
+ <<if $args[0].assignment == "get treatment in the clinic">>
+ <br>$args[0].slaveName has been removed from $clinicName and has been assigned to $args[1].removalAssignment.
+ <<assignJob $args[0] $args[1].removalAssignment>>
+ <</if>>
- <<case "serve in the master suite">>
- <<if $args[0].assignment == "serve in the master suite">>
- <<if ($Concubine == 0) || ($Concubine.ID != $args[0].ID)>>
- <br>$args[0].slaveName has been removed from $masterSuiteName and has been assigned to $args[1].removalAssignment.
- <<assignJob $args[0] $args[1].removalAssignment>>
- <</if>>
- <</if>>
+ <<case "serve in the master suite">>
+ <<if $args[0].assignment == "serve in the master suite">>
+ <br>$args[0].slaveName has been removed from $masterSuiteName and has been assigned to $args[1].removalAssignment.
+ <<assignJob $args[0] $args[1].removalAssignment>>
+ <</if>>
- <<case "live with your Head Girl">>
- <<if $args[0].assignment == "live with your Head Girl">>
- <<if ($HeadGirl == 0) || ($HeadGirl.ID != $args[0].ID)>>
- <br>$args[0].slaveName has been removed from $HGSuiteName and has been assigned to $args[1].removalAssignment.
- <<assignJob $args[0] $args[1].removalAssignment>>
- <</if>>
- <</if>>
+ <<case "live with your Head Girl">>
+ <<if $args[0].assignment == "live with your Head Girl">>
+ <br>$args[0].slaveName has been removed from $HGSuiteName and has been assigned to $args[1].removalAssignment.
+ <<assignJob $args[0] $args[1].removalAssignment>>
+ <</if>>
- <<case "work as a servant">>
- <<if $args[0].assignment == "work as a servant">>
- <<if ($Stewardess == 0) || ($Stewardess.ID != $args[0].ID)>>
- <br>$args[0].slaveName has been removed from $servantsQuartersName and has been assigned to $args[1].removalAssignment.
- <<assignJob $args[0] $args[1].removalAssignment>>
- <</if>>
- <</if>>
+ <<case "work as a servant">>
+ <<if $args[0].assignment == "work as a servant">>
+ <br>$args[0].slaveName has been removed from $servantsQuartersName and has been assigned to $args[1].removalAssignment.
+ <<assignJob $args[0] $args[1].removalAssignment>>
+ <</if>>
- <<case "learn in the schoolroom">>
- <<if $args[0].assignment == "learn in the schoolroom">>
- <<if ($Schoolteacher == 0) || ($Schoolteacher.ID != $args[0].ID)>>
- <br>$args[0].slaveName has been removed from $schoolroomName and has been assigned to $args[1].removalAssignment.
- <<assignJob $args[0] $args[1].removalAssignment>>
- <</if>>
- <</if>>
+ <<case "learn in the schoolroom">>
+ <<if $args[0].assignment == "learn in the schoolroom">>
+ <br>$args[0].slaveName has been removed from $schoolroomName and has been assigned to $args[1].removalAssignment.
+ <<assignJob $args[0] $args[1].removalAssignment>>
+ <</if>>
- <<case "be confined in the cellblock">>
- <<if $args[0].assignment == "be confined in the cellblock">>
- <<if ($Wardeness == 0) || ($Wardeness.ID != $args[0].ID)>>
- <br>$args[0].slaveName has been removed from $cellblockName and has been assigned to $args[1].removalAssignment.
- <<assignJob $args[0] $args[1].removalAssignment>>
- <</if>>
- <</if>>
- <</switch>>
+ <<case "be confined in the cellblock">>
+ <<if $args[0].assignment == "be confined in the cellblock">>
+ <br>$args[0].slaveName has been removed from $cellblockName and has been assigned to $args[1].removalAssignment.
+ <<assignJob $args[0] $args[1].removalAssignment>>
+ <</if>>
+ <</switch>>
<</if>>
<</widget>>
/%
- Call as <<RARemoveRule SlaveObject>>
-%/
+ % Call as <<RARemoveRule SlaveObject RuleObject>>
+ %/
<<widget "RARemoveRule">>
- <<for _s = 0; _s < $args[0].currentRules.length; _s++>>
- <<if _currentRule.ID == $args[0].currentRules[_s]>>
- <<set _dump = $args[0].currentRules.deleteAt(_s)>>
- <br>//@@.tan;Rule _rule (_currentRule.name) no longer applies to $args[0].slaveName, who is assigned to $args[0].assignment.@@//
- <<if $args[0].assignmentVisible == 0>>
- <<RAFacilityRemove $args[0] _currentRule>>
- <</if>>
- <<break>>
- <</if>>
- <</for>>
+<<for _s = 0; _s < $args[0].currentRules.length; _s++>>
+ <<if $args[1].ID == $args[0].currentRules[_s]>>
+ <<set $args[0].currentRules.deleteAt(_s)>>
+ <br>//@@.tan;Rule _rule ($args[1].name) no longer applies to $args[0].slaveName, who is assigned to $args[0].assignment.@@//
+ <<RAFacilityRemove $args[0] $args[1]>>
+ <<break>>
+ <</if>>
+<</for>>
<</widget>>
/%
@@ -3413,7 +3344,14 @@ Your brand design is ''$brandDesign.''
<<set _priorities = _priorities.sort(function(a, b){if(a.weight > b.weight) return -1; if(a.weight < b.weight) return 1; return 0;})>>
<<if $args[0].drugs != _priorities[0].drug>>
<<set $args[0].drugs = _priorities[0].drug>>
- <br>$args[0].slaveName has been put on _priorities[0].drug, since that part of her body is <<print (Math.trunc(_priorities[0].weight*100) % 100)>>%
+ <br>$args[0].slaveName has been put on
+ <<if _combinedRule.growth.intensity && $args[0].drugs != "lip injections" && $args[0].health > 0>>
+ <<set $args[0].drugs = "intensive " + $args[0].drugs>>
+ $args[0].drugs, since she's healthy enough to take them, and
+ <<else>>
+ $args[0].drugs, since
+ <</if>>
+ that part of her body is <<print Math.trunc(_priorities[0].weight*100)>>%
<<if _priorities[0].weight < 1>>below
<<else>>above
<</if>>
@@ -3423,7 +3361,14 @@ Your brand design is ''$brandDesign.''
<<elseif _priorities.length > 0>>
<<if $args[0].drugs != _priorities[0].drug>>
<<set $args[0].drugs = _priorities[0].drug>>
- <br>$args[0].slaveName has been put on _priorities[0].drug, since that is the only part of her body that does not meet the targeted size.
+ <br>$args[0].slaveName has been put on
+ <<if _combinedRule.growth.intensity && $args[0].drugs != "lip injections" && $args[0].health > 0>>
+ <<set $args[0].drugs = "intensive " + $args[0].drugs>>
+ $args[0].drugs, since she's healthy enough to take them, and
+ <<else>>
+ $args[0].drugs, since
+ <</if>>
+ that is the only part of her body that does not meet the targeted size.
<</if>>
<<break>>
<<elseif _tempAssetGrowthDrugs.includes($args[0].drugs)>>
@@ -4545,7 +4490,7 @@ is now _combinedRule.hLength cm long.
<br>//@@.tan;Rule _rule (_currentRule.name) now applies to $args[0].slaveName, who is assigned to $args[0].assignment.@@//
<</if>>
<<elseif ruleApplied($args[0], _currentRule.ID)>> /* rule does not apply now, but did before */
- <<RARemoveRule $args[0]>> /* RARemoveRule prints message and includes Rules Facilities Remove check, so we are done with this rule */
+ <<RARemoveRule $args[0] _currentRule>> /* prints message and calls RAFacilityRemove */
<</if>>
<</for>>
--
GitLab