diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index c7f8bd1a09793d9c2b8f0b1d8053bfdf295e98ee..d25e048b01488cbbf1dad6412c3936ea7e5d2ce1 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -1018,6 +1018,72 @@ window.jsConsoleInfo = function(obj)
console.info(obj);
}
+window.SoftenBehavioralFlaw = function SoftenBehavioralFlaw(slave) {
+ switch (slave.behavioralFlaw) {
+ case "arrogant":
+ slave.behavioralQuirk = "confident";
+ break;
+ case "bitchy":
+ slave.behavioralQuirk = "cutting";
+ break;
+ case "odd":
+ slave.behavioralQuirk = "funny";
+ break;
+ case "hates men":
+ slave.behavioralQuirk = "adores women";
+ break;
+ case "hates women":
+ slave.behavioralQuirk = "adores men";
+ break;
+ case "gluttonous":
+ slave.behavioralQuirk = "fitness";
+ break;
+ case "anorexic":
+ slave.behavioralQuirk = "insecure";
+ break;
+ case "devout":
+ slave.behavioralQuirk = "sinful";
+ break;
+ case "liberated":
+ slave.behavioralQuirk = "advocate";
+ break;
+ }
+ slave.behavioralFlaw = "none";
+};
+
+window.SoftenSexualFlaw = function SoftenSexualFlaw(slave) {
+ switch (slave.sexualFlaw) {
+ case "hates oral":
+ slave.sexualQuirk = "gagfuck queen";
+ break;
+ case "hates anal":
+ slave.sexualQuirk = "painal queen";
+ break;
+ case "hates penetration":
+ slave.sexualQuirk = "strugglefuck queen";
+ break;
+ case "shamefast":
+ slave.sexualQuirk = "tease";
+ break;
+ case "idealistic":
+ slave.sexualQuirk = "romantic";
+ break;
+ case "repressed":
+ slave.sexualQuirk = "perverted";
+ break;
+ case "apathetic":
+ slave.sexualQuirk = "caring";
+ break;
+ case "crude":
+ slave.sexualQuirk = "unflinching";
+ break;
+ case "judgemental":
+ slave.sexualQuirk = "size queen";
+ break;
+ }
+ slave.sexualFlaw = "none";
+};
+
/*:: Extended Family Mode JS [script]*/
/* see documentation for details /devNotes/Extended Family Mode Explained.txt */
@@ -3429,6 +3495,131 @@ window.lengthToEitherUnit = function(s) {
return s + "cm";
};
+/* decoration should be passed as "facilityDecoration" in quotes. For example, ValidateFacilityDecoration("brothelDecoration"). The quotes are important, do not pass it as a story variable. */
+window.ValidateFacilityDecoration = function ValidateFacilityDecoration(decoration) {
+ const V = State.variables;
+ switch (V[decoration]) {
+ case "standard":
+ /*nothing to do */
+ break;
+ case "Supremacist":
+ if (!Number.isFinite(V.arcologies[0].FSSupremacist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Subjugationist":
+ if (!Number.isFinite(V.arcologies[0].FSSubjugationist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Gender Radicalist":
+ if (!Number.isFinite(V.arcologies[0].FSGenderRadicalist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Gender Fundamentalist":
+ if (!Number.isFinite(V.arcologies[0].FSGenderFundamentalist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Paternalist":
+ if (!Number.isFinite(V.arcologies[0].FSPaternalist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Body Purist":
+ if (!Number.isFinite(V.arcologies[0].FSBodyPurist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Transformation Fetishist":
+ if (!Number.isFinite(V.arcologies[0].FSTransformationFetishist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Youth Preferentialist":
+ if (!Number.isFinite(V.arcologies[0].FSYouthPreferentialist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Maturity Preferentialist":
+ if (!Number.isFinite(V.arcologies[0].FSMaturityPreferentialist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Slimness Enthusiast":
+ if (!Number.isFinite(V.arcologies[0].FSSlimnessEnthusiast)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Asset Expansionist":
+ if (!Number.isFinite(V.arcologies[0].FSAssetExpansionist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Pastoralist":
+ if (!Number.isFinite(V.arcologies[0].FSPastoralist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Physical Idealist":
+ if (!Number.isFinite(V.arcologies[0].FSPhysicalIdealist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Chattel Religionist":
+ if (!Number.isFinite(V.arcologies[0].FSChattelReligionist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Degradationist":
+ if (!Number.isFinite(V.arcologies[0].FSDegradationist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Roman Revivalist":
+ if (!Number.isFinite(V.arcologies[0].FSRomanRevivalist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Egyptian Revivalist":
+ if (!Number.isFinite(V.arcologies[0].FSEgyptianRevivalist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Edo Revivalist":
+ if (!Number.isFinite(V.arcologies[0].FSEdoRevivalist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Arabian Revivalist":
+ if (!Number.isFinite(V.arcologies[0].FSArabianRevivalist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Chinese Revivalist":
+ if (!Number.isFinite(V.arcologies[0].FSChineseRevivalist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Repopulation Focus":
+ if (!Number.isFinite(V.arcologies[0].FSRepopulationFocus)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Eugenics":
+ if (!Number.isFinite(V.arcologies[0].FSRestart)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Hedonistic":
+ if (!Number.isFinite(V.arcologies[0].FSHedonisticDecadence)) {
+ V[decoration] = "standard";
+ }
+ break;
+ }
+};
+
/*:: Span Macro JS [script]*/
/*
diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index a7d344b83481be92ea20cfc8941ec9fdeb0cb023..220c9c9d2b4881d829054572efeb584ad31b1fae 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -1017,3 +1017,69 @@ window.jsConsoleInfo = function(obj)
{
console.info(obj);
}
+
+window.SoftenBehavioralFlaw = function SoftenBehavioralFlaw(slave) {
+ switch (slave.behavioralFlaw) {
+ case "arrogant":
+ slave.behavioralQuirk = "confident";
+ break;
+ case "bitchy":
+ slave.behavioralQuirk = "cutting";
+ break;
+ case "odd":
+ slave.behavioralQuirk = "funny";
+ break;
+ case "hates men":
+ slave.behavioralQuirk = "adores women";
+ break;
+ case "hates women":
+ slave.behavioralQuirk = "adores men";
+ break;
+ case "gluttonous":
+ slave.behavioralQuirk = "fitness";
+ break;
+ case "anorexic":
+ slave.behavioralQuirk = "insecure";
+ break;
+ case "devout":
+ slave.behavioralQuirk = "sinful";
+ break;
+ case "liberated":
+ slave.behavioralQuirk = "advocate";
+ break;
+ }
+ slave.behavioralFlaw = "none";
+};
+
+window.SoftenSexualFlaw = function SoftenSexualFlaw(slave) {
+ switch (slave.sexualFlaw) {
+ case "hates oral":
+ slave.sexualQuirk = "gagfuck queen";
+ break;
+ case "hates anal":
+ slave.sexualQuirk = "painal queen";
+ break;
+ case "hates penetration":
+ slave.sexualQuirk = "strugglefuck queen";
+ break;
+ case "shamefast":
+ slave.sexualQuirk = "tease";
+ break;
+ case "idealistic":
+ slave.sexualQuirk = "romantic";
+ break;
+ case "repressed":
+ slave.sexualQuirk = "perverted";
+ break;
+ case "apathetic":
+ slave.sexualQuirk = "caring";
+ break;
+ case "crude":
+ slave.sexualQuirk = "unflinching";
+ break;
+ case "judgemental":
+ slave.sexualQuirk = "size queen";
+ break;
+ }
+ slave.sexualFlaw = "none";
+};
diff --git a/src/js/utilJS.tw b/src/js/utilJS.tw
index f3bf1e4d432ce9d29e410ddc90600b94b80f2c50..9d20cdf8bb34655927dc643ed2fd15e3ccde1118 100644
--- a/src/js/utilJS.tw
+++ b/src/js/utilJS.tw
@@ -654,3 +654,128 @@ window.lengthToEitherUnit = function(s) {
return cmToInchString(s);
return s + "cm";
};
+
+/* decoration should be passed as "facilityDecoration" in quotes. For example, ValidateFacilityDecoration("brothelDecoration"). The quotes are important, do not pass it as a story variable. */
+window.ValidateFacilityDecoration = function ValidateFacilityDecoration(decoration) {
+ const V = State.variables;
+ switch (V[decoration]) {
+ case "standard":
+ /*nothing to do */
+ break;
+ case "Supremacist":
+ if (!Number.isFinite(V.arcologies[0].FSSupremacist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Subjugationist":
+ if (!Number.isFinite(V.arcologies[0].FSSubjugationist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Gender Radicalist":
+ if (!Number.isFinite(V.arcologies[0].FSGenderRadicalist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Gender Fundamentalist":
+ if (!Number.isFinite(V.arcologies[0].FSGenderFundamentalist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Paternalist":
+ if (!Number.isFinite(V.arcologies[0].FSPaternalist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Body Purist":
+ if (!Number.isFinite(V.arcologies[0].FSBodyPurist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Transformation Fetishist":
+ if (!Number.isFinite(V.arcologies[0].FSTransformationFetishist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Youth Preferentialist":
+ if (!Number.isFinite(V.arcologies[0].FSYouthPreferentialist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Maturity Preferentialist":
+ if (!Number.isFinite(V.arcologies[0].FSMaturityPreferentialist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Slimness Enthusiast":
+ if (!Number.isFinite(V.arcologies[0].FSSlimnessEnthusiast)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Asset Expansionist":
+ if (!Number.isFinite(V.arcologies[0].FSAssetExpansionist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Pastoralist":
+ if (!Number.isFinite(V.arcologies[0].FSPastoralist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Physical Idealist":
+ if (!Number.isFinite(V.arcologies[0].FSPhysicalIdealist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Chattel Religionist":
+ if (!Number.isFinite(V.arcologies[0].FSChattelReligionist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Degradationist":
+ if (!Number.isFinite(V.arcologies[0].FSDegradationist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Roman Revivalist":
+ if (!Number.isFinite(V.arcologies[0].FSRomanRevivalist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Egyptian Revivalist":
+ if (!Number.isFinite(V.arcologies[0].FSEgyptianRevivalist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Edo Revivalist":
+ if (!Number.isFinite(V.arcologies[0].FSEdoRevivalist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Arabian Revivalist":
+ if (!Number.isFinite(V.arcologies[0].FSArabianRevivalist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Chinese Revivalist":
+ if (!Number.isFinite(V.arcologies[0].FSChineseRevivalist)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Repopulation Focus":
+ if (!Number.isFinite(V.arcologies[0].FSRepopulationFocus)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Eugenics":
+ if (!Number.isFinite(V.arcologies[0].FSRestart)) {
+ V[decoration] = "standard";
+ }
+ break;
+ case "Hedonistic":
+ if (!Number.isFinite(V.arcologies[0].FSHedonisticDecadence)) {
+ V[decoration] = "standard";
+ }
+ break;
+ }
+};
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index 0c04374057e25782ed74e77e61d7a9e4f44e6637..9682abffdf14da3eccd8094a7c9aed373238b028 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -249,7 +249,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.butt += random(1,2)>>
<<set $activeSlave.attrXY = random(70,90), $activeSlave.attrXX = 0>>
<<set $activeSlave.oralSkill = random(35,65), $activeSlave.analSkill = random(35,65), $activeSlave.whoreSkill = random(35,65)>>
- <<SoftenSexualFlaw $activeSlave>>
+ <<run SoftenSexualFlaw($activeSlave)>>
<<set $activeSlave.clothes = "uncomfortable straps", $activeSlave.collar = "stylish leather", $activeSlave.shoes = "heels">>
<<set $activeSlave.assignment = "whore">>
<<case "GenderFundamentalist">>
@@ -369,7 +369,7 @@ The previous owner seems to have left in something of a hurry.
<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
<<set $activeSlave.vaginalSkill = random(15,35)>>
<</if>>
- <<SoftenBehavioralFlaw $activeSlave>>
+ <<run SoftenBehavioralFlaw($activeSlave)>>
<<set $activeSlave.clothes = "a slutty maid outfit", $activeSlave.collar = "pretty jewelry", $activeSlave.shoes = "heels">>
<<set $activeSlave.assignment = "be a servant">>
<<case "YouthPreferentialist">>
@@ -445,7 +445,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.vaginalSkill = random(15,35)>>
<</if>>
<<set $activeSlave.entertainSkill = random(15,35)>>
- <<SoftenSexualFlaw $activeSlave>>
+ <<run SoftenSexualFlaw($activeSlave)>>
<<set $activeSlave.clothes = "slutty jewelry", $activeSlave.collar = "ancient Egyptian", $activeSlave.shoes = "flats">>
<<set $activeSlave.assignment = "please you">>
<<case "EdoRevivalist">>
@@ -484,8 +484,8 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.vaginalSkill = 100>>
<</if>>
<<set $activeSlave.entertainSkill = 100, $activeSlave.whoreSkill = 100>>
- <<SoftenBehavioralFlaw $activeSlave>>
- <<SoftenSexualFlaw $activeSlave>>
+ <<run SoftenBehavioralFlaw($activeSlave)>>
+ <<run SoftenSexualFlaw($activeSlave)>>
<<set $activeSlave.clothes = "a slutty qipao", $activeSlave.collar = "pretty jewelry", $activeSlave.shoes = "heels">>
<<set $activeSlave.assignment = "be your Head Girl", $HeadGirl = $activeSlave>>
<<case "Eugenics">>
@@ -502,7 +502,7 @@ The previous owner seems to have left in something of a hurry.
<</if>>
<<set $activeSlave.entertainSkill = random(15,35)>>
<<set $activeSlave.whoreSkill = 0>>
- <<SoftenSexualFlaw $activeSlave>>
+ <<run SoftenSexualFlaw($activeSlave)>>
<<set $activeSlave.clothes = "a ball gown", $activeSlave.shoes = "flats">>
<<set $activeSlave.assignment = "rest">>
<<case "Repopulationist">>
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index 603ace957a21d685fc60d07bf53e389cb4f2aaf1..ba8f6917192c6d141c322a2a7aa784d35de5a2d6 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -227,10 +227,10 @@
<</switch>>
<<if $cellblockUpgrade == 1>>
<<if ($slaves[$i].behavioralFlaw != "none") && ($slaves[$i].behavioralQuirk == "none")>>
- <<SoftenBehavioralFlaw $slaves[$i]>>
+ <<run SoftenBehavioralFlaw($slaves[$i])>>
<<set $slaves[$i].devotion -= 10, _softenedQuirks++>>
<<elseif ($slaves[$i].sexualFlaw != "none") && ($slaves[$i].sexualQuirk == "none")>>
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<<set $slaves[$i].devotion -= 10, _softenedQuirks++>>
<</if>>
<</if>>
diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw
index 8e6b352842ee99600212677aeaca782271ebc3c5..0746dc9f0d2f99e0f85db6d0437e61e33cf479b4 100644
--- a/src/uncategorized/futureSociety.tw
+++ b/src/uncategorized/futureSociety.tw
@@ -1160,61 +1160,61 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
/* FACILITY REDECORATION */
<<if $brothel > 0>>
-<<ValidateFacilityDecoration "brothelDecoration">>
+<<run ValidateFacilityDecoration("brothelDecoration")>>
<br>$brothelNameCaps is decorated in $brothelDecoration style.
<<SetFacilityDecoration "brothelDecoration">>
<</if>>
<<if $club > 0>>
-<<ValidateFacilityDecoration "clubDecoration">>
+<<run ValidateFacilityDecoration("clubDecoration")>>
<br>$clubNameCaps is decorated in $clubDecoration style.
<<SetFacilityDecoration "clubDecoration">>
<</if>>
<<if $dairy > 0>>
-<<ValidateFacilityDecoration "dairyDecoration">>
+<<run ValidateFacilityDecoration("dairyDecoration")>>
<br>$dairyNameCaps is decorated in $dairyDecoration style.
<<SetFacilityDecoration "dairyDecoration">>
<</if>>
<<if $spa > 0>>
-<<ValidateFacilityDecoration "spaDecoration">>
+<<run ValidateFacilityDecoration("spaDecoration")>>
<br>$spaNameCaps is decorated in $spaDecoration style.
<<SetFacilityDecoration "spaDecoration">>
<</if>>
<<if $clinic > 0>>
-<<ValidateFacilityDecoration "clinicDecoration">>
+<<run ValidateFacilityDecoration("clinicDecoration")>>
<br>$clinicNameCaps is decorated in $clinicDecoration style.
<<SetFacilityDecoration "clinicDecoration">>
<</if>>
<<if $schoolroom > 0>>
-<<ValidateFacilityDecoration "schoolroomDecoration">>
+<<run ValidateFacilityDecoration("schoolroomDecoration")>>
<br>$schoolroomNameCaps is decorated in $schoolroomDecoration style.
<<SetFacilityDecoration "schoolroomDecoration">>
<</if>>
<<if $cellblock > 0>>
-<<ValidateFacilityDecoration "cellblockDecoration">>
+<<run ValidateFacilityDecoration("cellblockDecoration")>>
<br>$cellblockNameCaps is decorated in $cellblockDecoration style.
<<SetFacilityDecoration "cellblockDecoration">>
<</if>>
<<if $servantsQuarters > 0>>
-<<ValidateFacilityDecoration "servantsQuartersDecoration">>
+<<run ValidateFacilityDecoration("servantsQuartersDecoration")>>
<br>$servantsQuartersNameCaps is decorated in $servantsQuartersDecoration style.
<<SetFacilityDecoration "servantsQuartersDecoration">>
<</if>>
<<if $arcade > 0>>
-<<ValidateFacilityDecoration "arcadeDecoration">>
+<<run ValidateFacilityDecoration("arcadeDecoration")>>
<br>$arcadeNameCaps is decorated in $arcadeDecoration style.
<<SetFacilityDecoration "arcadeDecoration">>
<</if>>
<<if $masterSuite > 0>>
-<<ValidateFacilityDecoration "masterSuiteDecoration">>
+<<run ValidateFacilityDecoration("masterSuiteDecoration")>>
<br>$masterSuiteNameCaps is decorated in $masterSuiteDecoration style.
<<SetFacilityDecoration "masterSuiteDecoration">>
<</if>>
diff --git a/src/uncategorized/hgApplication.tw b/src/uncategorized/hgApplication.tw
index b0a26d1ff6f84ff4f4ea3d11a3c028e07661948c..e022eeead2f5fab0307538163c9e60cd04c31727 100644
--- a/src/uncategorized/hgApplication.tw
+++ b/src/uncategorized/hgApplication.tw
@@ -212,9 +212,9 @@ She punishes $activeSlave.slaveName whenever she sees her breaking the rules yet
<<set $activeSlave.training = 0>>
and successfully @@.green;softens $activeSlave.slaveName's flaw.@@
<<if $activeSlave.behavioralFlaw != "none">>
- <<SoftenBehavioralFlaw $activeSlave>>
+ <<run SoftenBehavioralFlaw($activeSlave)>>
<<elseif $activeSlave.sexualFlaw != "none">>
- <<SoftenSexualFlaw $activeSlave>>
+ <<run SoftenSexualFlaw($activeSlave)>>
<</if>>
<<else>>
and makes partial progress.
diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw
index b692718251c23c43613fc9d290b2897ec873eb90..8909f8547842dd5a622298ae9e21978c06d3624d 100644
--- a/src/uncategorized/ptWorkaround.tw
+++ b/src/uncategorized/ptWorkaround.tw
@@ -151,7 +151,7 @@
<<else>>
<<set $activeSlave.training = 0>>
By the end of the week, @@.green;you resolve her flaw into something special.@@ @@.hotpink;Her obedience has increased.@@
- <<SoftenBehavioralFlaw $activeSlave>>
+ <<run SoftenBehavioralFlaw($activeSlave)>>
<<set $activeSlave.devotion += 4>>
<</if>>
<<if $activeSlave.fetishKnown != 1>>
@@ -275,7 +275,7 @@
<<else>>
<<set $activeSlave.training = 0>>
By the end of the week, @@.green;you resolve her flaw into something special.@@ @@.hotpink;Her obedience has increased.@@
- <<SoftenSexualFlaw $activeSlave>>
+ <<run SoftenSexualFlaw($activeSlave)>>
<<set $activeSlave.devotion += 4>>
<</if>>
<<if $activeSlave.fetishKnown != 1>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 6a4a356daedac108b5d126bccba2e6bca473c8a0..26109ed9ed27ffbe5061ca84476bb662044cdf09 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -1698,12 +1698,12 @@
<<if ($slaves[$i].behavioralFlaw == "arrogant")>>
<<if ($slaves[$i].fetish == "submissive")>>
Her need to submit has @@.green;softened her arrogance into confidence.@@
- <<SoftenBehavioralFlaw $slaves[$i]>>
+ <<run SoftenBehavioralFlaw($slaves[$i])>>
<</if>>
<<elseif ($slaves[$i].behavioralFlaw == "bitchy")>>
<<if ($slaves[$i].fetish == "humiliation")>>
Her need to be humiliated has @@.green;softened her bitchiness into a penchant for repartee.@@
- <<SoftenBehavioralFlaw $slaves[$i]>>
+ <<run SoftenBehavioralFlaw($slaves[$i])>>
<</if>>
<<elseif ($slaves[$i].behavioralFlaw == "hates men")>>
<<if ($slaves[$i].fetish == "pregnancy")>>
@@ -1711,13 +1711,13 @@
<<set $slaves[$i].behavioralQuirk = "adores men", $slaves[$i].behavioralFlaw = "none">>
<<elseif ($slaves[$i].fetish == "boobs")>>
She dislikes men and adores boobs, which @@.green;softens her hatred of men into a love of women.@@
- <<SoftenBehavioralFlaw $slaves[$i]>>
+ <<run SoftenBehavioralFlaw($slaves[$i])>>
<<elseif ($slaves[$i].attrXY > 85)>>
She dislikes the company of men but likes their cocks; she learns to @@.green;enjoy the male presence that comes with taking the dick.@@
<<set $slaves[$i].behavioralQuirk = "adores men", $slaves[$i].behavioralFlaw = "none">>
<<elseif ($slaves[$i].energy > 95)>>
She dislikes men and has constant needs; women are the obvious answer, which @@.green;softens her hatred of men into a love of feminine company.@@
- <<SoftenBehavioralFlaw $slaves[$i]>>
+ <<run SoftenBehavioralFlaw($slaves[$i])>>
<</if>>
<<elseif ($slaves[$i].behavioralFlaw == "hates women")>>
<<if ($slaves[$i].fetish == "pregnancy")>>
@@ -1725,23 +1725,23 @@
<<set $slaves[$i].behavioralQuirk = "adores women", $slaves[$i].behavioralFlaw = "none">>
<<elseif ($slaves[$i].fetish == "cumslut")>>
She dislikes women and has a real oral fixation; eating dick is the obvious answer, which @@.green;softens her hatred of women into a love of men.@@
- <<SoftenBehavioralFlaw $slaves[$i]>>
+ <<run SoftenBehavioralFlaw($slaves[$i])>>
<<elseif ($slaves[$i].attrXX > 85)>>
She dislikes the company of women but likes fucking them; she learns to @@.green;enjoy the feminine presence that comes with getting some pussy.@@
<<set $slaves[$i].behavioralQuirk = "adores women", $slaves[$i].behavioralFlaw = "none">>
<<elseif ($slaves[$i].energy > 95)>>
She dislikes women and has constant needs; men are the obvious answer, which @@.green;softens her hatred of women into a love of maleness.@@
- <<SoftenBehavioralFlaw $slaves[$i]>>
+ <<run SoftenBehavioralFlaw($slaves[$i])>>
<</if>>
<<elseif ($slaves[$i].behavioralFlaw == "devout")>>
<<if ($slaves[$i].energy > 95)>>
Her need for constant sex has @@.green;softened her devoutness into an appetite for sacrilege.@@
- <<SoftenBehavioralFlaw $slaves[$i]>>
+ <<run SoftenBehavioralFlaw($slaves[$i])>>
<</if>>
<<elseif ($slaves[$i].behavioralFlaw == "liberated")>>
<<if ($slaves[$i].fetish == "masochist")>>
Her subconscious need to be abused has@@.green;converted her liberated philosophy into an ability to advocate for slavery.@@
- <<SoftenBehavioralFlaw $slaves[$i]>>
+ <<run SoftenBehavioralFlaw($slaves[$i])>>
<</if>>
<</if>>
<</if>>
@@ -1808,86 +1808,86 @@
<<if ($slaves[$i].sexualFlaw == "hates anal")>>
<<if $slaves[$i].anusPiercing>>
The constant stimulation her guiche piercings give her most intimate areas helps her with her anal hangups, @@.green;softening her hatred of anal into an appetite for anal pain.@@ She still struggles if she's fucked in the ass, but she gets off on it anyway.
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<<elseif ($slaves[$i].fetish == "buttslut")>>
Her sexual fascination with things entering her asshole @@.green;softens her hatred of anal into an appetite for anal pain.@@ She still struggles if she's fucked in the ass, but she gets off on it anyway.
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<<elseif ($slaves[$i].energy > 95)>>
As a nymphomaniac she appreciates kinky sex, so she @@.green;softens her hatred of anal into an appetite for anal pain.@@ She still struggles if she's fucked in the ass, but she gets off on it anyway.
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<</if>>
<<elseif ($slaves[$i].sexualFlaw == "hates oral")>>
<<if $slaves[$i].tonguePiercing>>
She can't stop sucking on her tongue piercings, and she gets over her oral hangups, @@.green;softening her hatred of oral into a willingness to be roughly throatfucked.@@ She still gags, but it's a good gagging, now.
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<<elseif ($slaves[$i].fetish == "cumslut")>>
She can't get her beloved cum without choking down dick, so she @@.green;softens her hatred of oral into a willingness to be roughly throatfucked.@@ She still gags, but it's a good gagging, now.
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<<elseif ($slaves[$i].energy > 95)>>
She needs sex so much she often has to encourage her partners orally, so she @@.green;softens her hatred of oral into a willingness to be roughly throatfucked.@@ She still gags, but it's a good gagging, now.
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<</if>>
<<elseif ($slaves[$i].sexualFlaw == "hates penetration")>>
<<if $slaves[$i].vaginaPiercing>>
Her pussy piercings get her used to the idea that it's a fuckhole, not her precious womanhood, @@.green;softening her hatred of penetration into an appetite for abusive sex.@@ She still cries, but she climaxes as she cries.
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<<elseif ($slaves[$i].fetish == "buttslut")>>
Her sexual fascination with anal penetration @@.green;softens her hatred of penetration into an appetite for abusive sex.@@ She still cries, but she climaxes as she cries.
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<<elseif ($slaves[$i].energy > 95)>>
As a nymphomaniac she appreciates kinky sex, so she @@.green;softens her hatred of penetration into an appetite for abusive intercourse.@@ She still cries, but she climaxes as she cries.
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<</if>>
<<elseif ($slaves[$i].sexualFlaw == "apathetic")>>
<<if ($slaves[$i].fetish == "submissive")>>
Her subconscious drive to submit @@.green;softens her sexual apathy into constant care for her partners' wants.@@
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<<elseif ($slaves[$i].energy > 95)>>
She needs sex so badly that she can no longer be apathetic in bed, and @@.green;softens her sexual apathy into care for what keeps her partners aroused.@@
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<</if>>
<<elseif ($slaves[$i].sexualFlaw == "crude")>>
<<if ($slaves[$i].fetish == "buttslut")>>
She needs to avoid making unsexy noises during buttsex to be an appealing enough anal partner to satisfy her backdoor needs, @@.green;softening her crudeness into a willingness to do anything.@@
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<<elseif ($slaves[$i].energy > 95)>>
She needs sex so badly that she can no longer afford to disgust partners, and @@.green;softens her sexual crudeness into a willingness to do anything.@@
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<</if>>
<<elseif ($slaves[$i].sexualFlaw == "judgemental")>>
<<if ($slaves[$i].fetish == "submissive")>>
Her subconscious belief that she's worthless @@.green;softens her judgemental behavior into eagerness to be fucked by the biggest cocks.@@
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<<elseif ($slaves[$i].energy > 95)>>
She needs sex so badly that she can no longer be selective, and @@.green;softens her judgemental behavior into a love of big dicks, though she now loves them all.@@
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<</if>>
<<elseif ($slaves[$i].sexualFlaw == "shamefast")>>
<<if ($slaves[$i].fetish == "humiliation")>>
She decides that hiding won't get her the humiliation she craves, and @@.green;softens her shamefastness into a willingness to tease.@@
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<<elseif ($slaves[$i].energy > 95)>>
She decides that hiding isn't getting her enough sex, and @@.green;softens her shamefastness into a willingness to tease.@@
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<</if>>
<<elseif ($slaves[$i].sexualFlaw == "idealistic")>>
<<if ($slaves[$i].fetish == "submissive")>>
Her appetite for submission has @@.green;softened her innocent ideas about sex into an ability to find romance@@ in the life of a sex slave.
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<<elseif ($slaves[$i].energy > 95)>>
Her appetite for sex has @@.green;softened her innocent ideas about sex into an ability to find something romantic@@ in a constant whirl of intercourse.
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<</if>>
<<elseif ($slaves[$i].sexualFlaw == "repressed")>>
<<if ($slaves[$i].fetish == "buttslut")>>
She grew up being taught that good girls do not take cock up their good girl anuses, but she's just now decided she prefers being a bad girl and has @@.green;softened her repression into arousal at the perversion@@ of dicks up her behind.
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<<elseif ($slaves[$i].fetish == "cumslut")>>
She grew up being taught that good girls do not put their good girl mouths on boys' private parts, but she's just now decided she prefers being a bad girl and has @@.green;softened her repression into arousal at the perverted@@ idea of dicks down her throat.
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<<elseif ($slaves[$i].energy > 95)>>
She grew up being taught that good girls do not happily fuck anything that moves, but she's just now decided she prefers being a bad girl and has @@.green;softened her repression into arousal at the perversion@@ of revelling in sexual addiction.
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<</if>>
<</if>>
<<else>>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index df76fb78f943d7c6349fae450ad9f58f201ec379..c4d91e2d3f41aff9fc9ff3eda77e029b20264e62 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -194,11 +194,11 @@
<</switch>>
<<if ($Attendant.intelligence > 0) && (_attendantUsedCure == 0) && random(1,100) > (100-($Attendant.intelligence*10)-_seed) && ($spaFix == 0)>>
<<if $slaves[$i].behavioralFlaw != "none">>
- <<SoftenBehavioralFlaw $slaves[$i]>>
+ <<run SoftenBehavioralFlaw($slaves[$i])>>
<<set _attendantUsedCure += 1>>
<br> $Attendant.slaveName works carefully with $slaves[$i].slaveName, and successfully @@.green;softens her behavioral flaw@@ into an appealing quirk.
<<elseif $slaves[$i].sexualFlaw != "none">>
- <<SoftenSexualFlaw $slaves[$i]>>
+ <<run SoftenSexualFlaw($slaves[$i])>>
<<set _attendantUsedCure += 1>>
<br> $Attendant.slaveName works carefully with $slaves[$i].slaveName, and successfully @@.green;softens her sexual flaw@@ into an appealing quirk.
<</if>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 59083430724b64d50fc60b79da002ae9e66a66fb..40793215da37d5a8a9cf07f9e1c2ac1707ac42b1 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -1261,62 +1261,6 @@
<<widget "Sh">>$ShEnunciate<</widget>>
<<widget "x">>$xEnunciate<</widget>>
-/%
- Call as <<SoftenBehavioralFlaw>>
- $args[0]: Slave.
-%/
-<<widget "SoftenBehavioralFlaw">>
- <<switch $args[0].behavioralFlaw>>
- <<case "arrogant">>
- <<set $args[0].behavioralQuirk = "confident">>
- <<case "bitchy">>
- <<set $args[0].behavioralQuirk = "cutting">>
- <<case "odd">>
- <<set $args[0].behavioralQuirk = "funny">>
- <<case "hates men">>
- <<set $args[0].behavioralQuirk = "adores women">>
- <<case "hates women">>
- <<set $args[0].behavioralQuirk = "adores men">>
- <<case "gluttonous">>
- <<set $args[0].behavioralQuirk = "fitness">>
- <<case "anorexic">>
- <<set $args[0].behavioralQuirk = "insecure">>
- <<case "devout">>
- <<set $args[0].behavioralQuirk = "sinful">>
- <<case "liberated">>
- <<set $args[0].behavioralQuirk = "advocate">>
- <</switch>>
- <<set $args[0].behavioralFlaw = "none">>
-<</widget>>
-
-/%
- Call as <<SoftenSexualFlaw>>
- $args[0]: Slave.
-%/
-<<widget "SoftenSexualFlaw">>
- <<switch $args[0].sexualFlaw>>
- <<case "hates oral">>
- <<set $args[0].sexualQuirk = "gagfuck queen">>
- <<case "hates anal">>
- <<set $args[0].sexualQuirk = "painal queen">>
- <<case "hates penetration">>
- <<set $args[0].sexualQuirk = "strugglefuck queen">>
- <<case "shamefast">>
- <<set $args[0].sexualQuirk = "tease">>
- <<case "idealistic">>
- <<set $args[0].sexualQuirk = "romantic">>
- <<case "repressed">>
- <<set $args[0].sexualQuirk = "perverted">>
- <<case "apathetic">>
- <<set $args[0].sexualQuirk = "caring">>
- <<case "crude">>
- <<set $args[0].sexualQuirk = "unflinching">>
- <<case "judgemental">>
- <<set $args[0].sexualQuirk = "size queen">>
- <</switch>>
- <<set $args[0].sexualFlaw = "none">>
-<</widget>>
-
/%
Call as <<EventFetish>>
$args[0]: Slave.
@@ -1575,119 +1519,19 @@ This experience
<</capture>>
<</widget>>
-<<widget "ValidateFacilityDecoration">>
-/* Used by following widget, called with <<ValidateFacilityDecoration "var">> where var is for example "spaDecoration" -- quotes are needed to pass var as reference - DO NOT INCLUDE $ PREFIX! */
-<<switch State.variables[$args[0]]>> /* get value of var name that was provided */
-<<case "standard">>
- /* nothing to do */
-<<case "Supremacist">>
- <<if !Number.isFinite($arcologies[0].FSSupremacist)>>
- <<set State.variables[$args[0]] = "standard">>
- <</if>>
-<<case "Subjugationist">>
- <<if !Number.isFinite($arcologies[0].FSSubjugationist)>>
- <<set State.variables[$args[0]] = "standard">>
- <</if>>
-<<case "Gender Radicalist">>
- <<if !Number.isFinite($arcologies[0].FSGenderRadicalist)>>
- <<set State.variables[$args[0]] = "standard">>
- <</if>>
-<<case "Gender Fundamentalist">>
- <<if !Number.isFinite($arcologies[0].FSGenderFundamentalist)>>
- <<set State.variables[$args[0]] = "standard">>
- <</if>>
-<<case "Paternalist">>
- <<if !Number.isFinite($arcologies[0].FSPaternalist)>>
- <<set State.variables[$args[0]] = "standard">>
- <</if>>
-<<case "Body Purist">>
- <<if !Number.isFinite($arcologies[0].FSBodyPurist)>>
- <<set State.variables[$args[0]] = "standard">>
- <</if>>
-<<case "Transformation Fetishist">>
- <<if !Number.isFinite($arcologies[0].FSTransformationFetishist)>>
- <<set State.variables[$args[0]] = "standard">>
- <</if>>
-<<case "Youth Preferentialist">>
- <<if !Number.isFinite($arcologies[0].FSYouthPreferentialist)>>
- <<set State.variables[$args[0]] = "standard">>
- <</if>>
-<<case "Maturity Preferentialist">>
- <<if !Number.isFinite($arcologies[0].FSMaturityPreferentialist)>>
- <<set State.variables[$args[0]] = "standard">>
- <</if>>
-<<case "Slimness Enthusiast">>
- <<if !Number.isFinite($arcologies[0].FSSlimnessEnthusiast)>>
- <<set State.variables[$args[0]] = "standard">>
- <</if>>
-<<case "Asset Expansionist">>
- <<if !Number.isFinite($arcologies[0].FSAssetExpansionist)>>
- <<set State.variables[$args[0]] = "standard">>
- <</if>>
-<<case "Pastoralist">>
- <<if !Number.isFinite($arcologies[0].FSPastoralist)>>
- <<set State.variables[$args[0]] = "standard">>
- <</if>>
-<<case "Physical Idealist">>
- <<if !Number.isFinite($arcologies[0].FSPhysicalIdealist)>>
- <<set State.variables[$args[0]] = "standard">>
- <</if>>
-<<case "Chattel Religionist">>
- <<if !Number.isFinite($arcologies[0].FSChattelReligionist)>>
- <<set State.variables[$args[0]] = "standard">>
- <</if>>
-<<case "Degradationist">>
- <<if !Number.isFinite($arcologies[0].FSDegradationist)>>
- <<set State.variables[$args[0]] = "standard">>
- <</if>>
-<<case "Roman Revivalist">>
- <<if !Number.isFinite($arcologies[0].FSRomanRevivalist)>>
- <<set State.variables[$args[0]] = "standard">>
- <</if>>
-<<case "Egyptian Revivalist">>
- <<if !Number.isFinite($arcologies[0].FSEgyptianRevivalist)>>
- <<set State.variables[$args[0]] = "standard">>
- <</if>>
-<<case "Edo Revivalist">>
- <<if !Number.isFinite($arcologies[0].FSEdoRevivalist)>>
- <<set State.variables[$args[0]] = "standard">>
- <</if>>
-<<case "Arabian Revivalist">>
- <<if !Number.isFinite($arcologies[0].FSArabianRevivalist)>>
- <<set State.variables[$args[0]] = "standard">>
- <</if>>
-<<case "Chinese Revivalist">>
- <<if !Number.isFinite($arcologies[0].FSChineseRevivalist)>>
- <<set State.variables[$args[0]] = "standard">>
- <</if>>
-<<case "Repopulation Focus">>
- <<if !Number.isFinite($arcologies[0].FSRepopulationFocus)>>
- <<set State.variables[$args[0]] = "standard">>
- <</if>>
-<<case "Eugenics">>
- <<if !Number.isFinite($arcologies[0].FSRestart)>>
- <<set State.variables[$args[0]] = "standard">>
- <</if>>
-<<case "Hedonistic">>
- <<if !Number.isFinite($arcologies[0].FSHedonisticDecadence)>>
- <<set State.variables[$args[0]] = "standard">>
- <</if>>
-<</switch>>
-<</widget>>
-
<<widget "ClearFacilityDecorations">>
/* Called when a FS is abandoned or failed out of. */
-<<if $brothel > 0>><<ValidateFacilityDecoration "brothelDecoration">><</if>>
-<<if $club > 0>><<ValidateFacilityDecoration "clubDecoration">><</if>>
-<<if $dairy > 0>><<ValidateFacilityDecoration "dairyDecoration">><</if>>
-<<if $spa > 0>><<ValidateFacilityDecoration "spaDecoration">><</if>>
-<<if $clinic > 0>><<ValidateFacilityDecoration "clinicDecoration">><</if>>
-<<if $schoolroom > 0>><<ValidateFacilityDecoration "schoolroomDecoration">><</if>>
-<<if $cellblock > 0>><<ValidateFacilityDecoration "cellblockDecoration">><</if>>
-<<if $servantsQuarters > 0>><<ValidateFacilityDecoration "servantsQuartersDecoration">><</if>>
-<<if $arcade > 0>><<ValidateFacilityDecoration "arcadeDecoration">><</if>>
-<<if $masterSuite > 0>><<ValidateFacilityDecoration "masterSuiteDecoration">><</if>>
+<<if $brothel > 0>><<run ValidateFacilityDecoration("brothelDecoration")>><</if>>
+<<if $club > 0>><<run ValidateFacilityDecoration("clubDecoration")>><</if>>
+<<if $dairy > 0>><<run ValidateFacilityDecoration("dairyDecoration")>><</if>>
+<<if $spa > 0>><<run ValidateFacilityDecoration("spaDecoration")>><</if>>
+<<if $clinic > 0>><<run ValidateFacilityDecoration("clinicDecoration")>><</if>>
+<<if $schoolroom > 0>><<run ValidateFacilityDecoration("schoolroomDecoration")>><</if>>
+<<if $cellblock > 0>><<run ValidateFacilityDecoration("cellblockDecoration")>><</if>>
+<<if $servantsQuarters > 0>><<run ValidateFacilityDecoration("servantsQuartersDecoration")>><</if>>
+<<if $arcade > 0>><<run ValidateFacilityDecoration("arcadeDecoration")>><</if>>
+<<if $masterSuite > 0>><<run ValidateFacilityDecoration("masterSuiteDecoration")>><</if>>
<</widget>>