From d6dfd6eb1de2bf52ce03041ccc61743b57e11a51 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 20 Aug 2017 03:13:43 -0400
Subject: [PATCH] Second half of vanilla changes.
---
.../brothel/brothelAssignmentScene.tw | 92 ++---
src/init/setupVars.tw | 27 +-
src/init/storyInit.tw | 175 ++++-----
src/js/bugReport.tw | 2 +-
src/js/storyJS.tw | 12 +
src/uncategorized/BackwardsCompatibility.tw | 36 ++
src/uncategorized/arcade.tw | 14 +-
src/uncategorized/arcadeReport.tw | 18 +-
src/uncategorized/attendantWorkaround.tw | 10 +-
.../bodyModRulesAssistantSettings.tw | 18 +-
src/uncategorized/bodyguardWorkaround.tw | 10 +-
src/uncategorized/brothelReport.tw | 18 +-
src/uncategorized/cellblockReport.tw | 32 +-
src/uncategorized/clinicReport.tw | 18 +-
src/uncategorized/clubReport.tw | 16 +-
src/uncategorized/concubineWorkaround.tw | 10 +-
src/uncategorized/dairy.tw | 38 +-
src/uncategorized/dairyReport.tw | 24 +-
src/uncategorized/djWorkaround.tw | 10 +-
src/uncategorized/fullReport.tw | 4 +-
src/uncategorized/hgApplication.tw | 167 ++++-----
src/uncategorized/hgWorkaround.tw | 10 +-
src/uncategorized/longSlaveDescription.tw | 4 -
src/uncategorized/madamWorkaround.tw | 10 +-
src/uncategorized/main.tw | 332 ++++++++++++++++++
src/uncategorized/masterSuite.tw | 33 +-
src/uncategorized/masterSuiteReport.tw | 22 +-
src/uncategorized/milkmaidWorkaround.tw | 10 +-
src/uncategorized/nurseWorkaround.tw | 10 +-
src/uncategorized/penthouseReport.tw | 25 +-
src/uncategorized/recruiterWorkaround.tw | 10 +-
src/uncategorized/reputation.tw | 6 +-
src/uncategorized/rulesAutosurgery.tw | 4 +-
src/uncategorized/schoolroomReport.tw | 18 +-
src/uncategorized/schoolteacherWorkaround.tw | 10 +-
src/uncategorized/servantsQuartersReport.tw | 20 +-
src/uncategorized/slaveAssignmentsReport.tw | 126 ++++---
src/uncategorized/slaveSummary.tw | 194 +++++-----
src/uncategorized/spaReport.tw | 18 +-
src/uncategorized/stewardessWorkaround.tw | 10 +-
src/uncategorized/wardenessWorkaround.tw | 10 +-
src/utility/assignWidgets.tw | 125 ++-----
src/utility/descriptionWidgets.tw | 40 ++-
src/utility/miscWidgets.tw | 9 +-
44 files changed, 922 insertions(+), 885 deletions(-)
diff --git a/src/facilities/brothel/brothelAssignmentScene.tw b/src/facilities/brothel/brothelAssignmentScene.tw
index 60507bd8912..648105bc149 100644
--- a/src/facilities/brothel/brothelAssignmentScene.tw
+++ b/src/facilities/brothel/brothelAssignmentScene.tw
@@ -1,6 +1,4 @@
-:: Brothel Assignment Scene
-
-<<nobr>>
+:: Brothel Assignment Scene [nobr]
<<set $nextButton to "Continue", $nextLink to $returnTo>>
<<Enunciate $activeSlave>>
@@ -19,41 +17,42 @@ You could direct $assistantName to relay your orders to $activeSlave.slaveName,
<<else>>
rebellious slave <<if $activeSlave.amp != 1>>comes in slowly, having decided that she can always decide to resist once she hears what you want<<else>>comes in as soon as you order another slave to carry her in, since she can't exactly resist this without limbs<</if>>.
<</if>>
-You tell her she's to report to <<if $Madam != 0>>$Madam.slaveName immediately, to serve in the $brothelName<<else>>the $brothelName immediately, to serve there<</if>> until further notice.
+You tell her she's to report to <<if $Madam != 0>>$Madam.slaveName immediately, to serve in $brothelName<<else>>$brothelName immediately, to serve there<</if>> until further notice.
<br><br>
<<if $activeSlave.devotion > 50>>
<<if ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetish != "none")>>
She looks excited. "<<Master>>, I hoped you would <<s>>end me down there <<s>>ometime!
- <<if ($activeSlave.fetish == "submissive")>>
+ <<switch $activeSlave.fetish>>
+ <<case "submissive">>
I mean, I'll have to do whatever the cu<<s>>tomer<<s>> pay for, right?" Her eyes go a little unfocused. "And, they'll hold me down..." She trails off.
- <<elseif ($activeSlave.fetish == "masochist")>>
+ <<case "masochist">>
I mean, it'<<s>> hard being a brothel whore, right? And when I get tired or <<s>>ore, I'll <<s>>till be <<s>>old. Even when it hurt<<s>> me to fuck any more." Her eyes glow with an unhealthy light.
- <<elseif ($activeSlave.fetish == "cumslut")>>
+ <<case "cumslut">>
I mean," she licks her lips unconsciously,
<<if $activeSlave.attrXX > $activeSlave.attrXY>>
"I hear there are <<s>>ome ni<<c>>e ladie<<s>> that go there for lunchtime cunnilingu<<s>>."
<<else>>
"the blowjob<<s>>. Ju<<s>>t, the blowjob<<s>>. That'<<s>> all."
<</if>>
- <<elseif ($activeSlave.fetish == "humiliation")>>
+ <<case "humiliation">>
There'<<s>> a window that fa<<c>>e<<s>> the hallway there, right? <<if $Madam != 0>>Do you think $Madam.slaveName would let me<<else>>Could I<</if>> get fucked there? Where everyone could <<s>>ee me being fucked for money?"
- <<elseif ($activeSlave.fetish == "buttslut")>>
+ <<case "buttslut">>
I mean," and she shifts her weight, her mind obviously on her backdoor,
<<if $activeSlave.attrXX > $activeSlave.attrXY>>
"there have to be ladie<<s>> who want to buttfuck a whore, right? At lea<<s>>t, I really hope there are."
<<else>>
"the other girl<<s>> tell me that whore<<s>> there get fucked up the a<<ss>> all day and all night. <<s>>ounds like fun to me."
<</if>>
- <<elseif ($activeSlave.fetish == "boobs")>>
+ <<case "boobs">>
I mean," and she sticks out her chest a little,
<<if $activeSlave.attrXX > $activeSlave.attrXY>>
"I hear from the other girl<<s>> there'<<s>> thi<<s>> ni<<c>>e lady who goe<<s>> there every morning and pay<<s>> to have a whore <<s>>uck her nipple<<s>> for, like, an hour. I," she licks her lips, "could do that."
<<else>>
"the other girl<<s>> tell me that whore<<s>> there get tittyfucked all the time. <<s>>ound<<s>> like fun to me."
<</if>>
- <<elseif ($activeSlave.fetish == "pregnancy")>>
+ <<case "pregnancy">>
I mean," she says meditatively,
<<if $activeSlave.attrXX > $activeSlave.attrXY>>
"I hear from the other girl<<s>> there'<<s>> thi<<s>> pregnant lady who goe<<s>> there every night and pay<<s>> to have a whore cuddle her. Ju<<s>>t cuddle, all night. That would be kind of hard, ju<<s>>t cuddling, but I could do it."
@@ -66,11 +65,11 @@ You tell her she's to report to <<if $Madam != 0>>$Madam.slaveName immediately,
<<else>>
"I'm can't wait till I can get pregnant. That'd be pretty fucking <<s>>exy."
<</if>>
- <<elseif ($activeSlave.fetish == "dom")>>
+ <<case "dom">>
I heard from the other girl<<s>> that <<s>>ome <<c>>iti<<z>>en<<s>> bring their girl<<s>> there. Ju<<s>>t to make them take it from a whore."
- <<elseif ($activeSlave.fetish == "sadist")>>
+ <<case "sadist">>
I heard from the other girl<<s>> that <<s>>ome <<c>>iti<<z>>en<<s>> bring their girl<<s>> there. Becau<<s>>e nobody know<<s>> how to hurt a bitch like a whore doe<<s>>." She shivers.
- <</if>>
+ <</switch>>
<<else>>
She looks determined. "<<Master>>, I will do my be<<s>>t to be a good whore, and get lot<<s>> of <<c>>iti<<z>>en<<s>> to pay good money for my body."
<</if>>
@@ -79,33 +78,34 @@ You tell her she's to report to <<if $Madam != 0>>$Madam.slaveName immediately,
<<if ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetish != "none")>>
She looks cautiously excited. "<<Master>>,
- <<if ($activeSlave.fetish == "submissive")>>
+ <<switch $activeSlave.fetish>>
+ <<case "submissive">>
I'll have to do whatever the cu<<s>>tomer<<s>> pay for, right?" Her eyes go a little unfocused. "And, they'll hold me down..." She trails off.
- <<elseif ($activeSlave.fetish == "masochist")>>
+ <<case "masochist">>
it'<<s>> hard being a brothel whore, right? And when I get tired or <<s>>ore, I'll <<s>>till be <<s>>old. Even when it hurt<<s>> me to fuck any more." Her eyes glow with an unhealthy light.
- <<elseif ($activeSlave.fetish == "cumslut")>>
+ <<case "cumslut">>
<<if $activeSlave.attrXX > $activeSlave.attrXY>>
"I hear there are <<s>>ome ni<<c>>e ladie<<s>> that go there for lunchtime cunnilingu<<s>>."
<<else>>
"the blowjob<<s>>. Ju<<s>>t, the blowjob<<s>>. That'<<s>> all."
<</if>>
- <<elseif ($activeSlave.fetish == "humiliation")>>
+ <<case "humiliation">>
there'<<s>> a window that fa<<c>>e<<s>> the hallway there, right? <<if $Madam != 0>>Do you think $Madam.slaveName would let me<<else>>Could I<</if>> get fucked there? Where everyone could <<s>>ee me being fucked for money?"
- <<elseif ($activeSlave.fetish == "buttslut")>>
+ <<case "buttslut">>
uh," and she shifts her weight, her mind obviously on her backdoor,
<<if $activeSlave.attrXX > $activeSlave.attrXY>>
"there have to be ladie<<s>> who want to buttfuck a whore, right? At lea<<s>>t, I really hope there are."
<<else>>
"the other girl<<s>> tell me that whore<<s>> there get fucked up the a<<ss>> all day and all night. <<s>>ounds like fun to me."
<</if>>
- <<elseif ($activeSlave.fetish == "boobs")>>
+ <<case "boobs">>
er," and she sticks out her chest a little,
<<if $activeSlave.attrXX > $activeSlave.attrXY>>
"I hear from the other girl<<s>> there'<<s>> thi<<s>> ni<<c>>e lady who goe<<s>> there every morning and pay<<s>> to have a whore <<s>>uck her nipple<<s>> for, like, an hour. I," she licks her lips, "could do that."
<<else>>
"the other girl<<s>> tell me that whore<<s>> there get tittyfucked all the time. <<s>>ound<<s>> like fun to me."
<</if>>
- <<elseif ($activeSlave.fetish == "pregnancy")>>
+ <<case "pregnancy">>
<<if $activeSlave.attrXX > $activeSlave.attrXY>>
I hear from the other girl<<s>> there'<<s>> thi<<s>> pregnant lady who goe<<s>> there every night and pay<<s>> to have a whore cuddle her. Ju<<s>>t cuddle, all night. That would be kind of hard, ju<<s>>t cuddling, but I could do it."
<<elseif $activeSlave.vagina == -1>>
@@ -117,32 +117,33 @@ You tell her she's to report to <<if $Madam != 0>>$Madam.slaveName immediately,
<<else>>
"I'm can't wait till I can get pregnant. That'd be pretty fucking <<s>>exy."
<</if>>
- <<elseif ($activeSlave.fetish == "dom")>>
+ <<case "dom">>
I heard from the other girl<<s>> that <<s>>ome <<c>>iti<<z>>en<<s>> bring their girl<<s>> there. Ju<<s>>t to make them take it from a whore."
- <<elseif ($activeSlave.fetish == "sadist")>>
+ <<case "sadist">>
I heard from the other girl<<s>> that <<s>>ome <<c>>iti<<z>>en<<s>> bring their girl<<s>> there. Becau<<s>>e nobody know<<s>> how to hurt a bitch like a whore doe<<s>>." She shivers.
- <</if>>
+ <</switch>>
<<elseif $activeSlave.sexualFlaw != "none">>
"Ye<<s>>, <<Master>>," she says obediently. She hesitates, looking concerned.
- <<if ($activeSlave.sexualFlaw == "hates oral")>>
+ <<switch $activeSlave.sexualFlaw>>
+ <<case "hates oral">>
"I - I'm going to h-have to <<s>>uck a lot of dick there, aren't I." She swallows nervously. Her lower lip quivers, and she does her best not to cry in front of you.
- <<elseif ($activeSlave.sexualFlaw == "hates anal")>>
+ <<case "hates anal">>
"C-cu<<s>>tomer<<s>> are really going to ream me up the butt hole, aren't they." She <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield her rear as best she can manage without limbs.<<else>>unconsciously reaches around behind herself, not quite shielding her anus with her hands.<</if>> Her lower lip quivers, and she does her best not to cry in front of you.
- <<elseif ($activeSlave.sexualFlaw == "hates penetration")>>
+ <<case "hates penetration">>
"C-cu<<s>>tomer<<s>> are really going to fuck me <<s>>ore, aren't they." She <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield her rear as best she can manage without limbs.<<elseif $activeSlave.vagina > 0>>unconsciously lets her hands fall to her crotch, but catches herself and doesn't quite shield her pussy.<<else>>unconsciously reaches around behind herself, not quite shielding her anus with her hands.<</if>> Her lower lip quivers, and she does her best not to cry in front of you.
- <<elseif ($activeSlave.sexualFlaw == "repressed")>>
+ <<case "repressed">>
"Being a whore i<<s>> a <<s>>in," she <<say>>s quietly, half to herself. "I'm going t-to b-be <<s>>o dirty. I'm going to h-hell." She starts to cry quietly. "<<S>>-<<s>>orry, <<Master>>. I'll do my be<<s>>t."
- <<elseif ($activeSlave.sexualFlaw == "idealistic")>>
+ <<case "idealistic">>
"I'm going to be <<s>>old for <<s>>ex," she <<say>>s quietly, half to herself. "Men are going to pay, and then they're g-going to <<s>>tick their dick<<s>> in me, and then they're going to leave." She starts to cry quietly. "<<S>>-<<s>>orry, <<Master>>. I'll do my be<<s>>t."
- <<elseif ($activeSlave.sexualFlaw == "shamefast")>>
+ <<case "shamefast">>
"I'm going to be meat in a brothel," she <<say>>s quietly, half to herself. "I'm going to <<s>>tand there naked with the other girl<<s>>, and men will pick me and then u<<s>>e my body. Over and over." She starts to cry quietly. "<<S>>-<<s>>orry, <<Master>>. I'll do my be<<s>>t."
- <<elseif ($activeSlave.sexualFlaw == "apathetic")>>
+ <<case "apathetic">>
"I gue<<ss>> I'll lie there," she sighs quietly, half to herself. "A man will pay and then he'll come in to my room where I'm lying on the bed, and he'll <<s>>tick his cock in me and cum and leave. And then the next man will come in." She starts to cry quietly. "<<S>>-<<s>>orry, <<Master>>. I'll do my be<<s>>t."
- <<elseif ($activeSlave.sexualFlaw == "crude")>>
+ <<case "crude">>
"Okay," she <<say>>s, thinking. "My poor cornhole i<<s>> going to be <<s>>uch a <<s>>eminal <<s>>ewer." She looks doubtful. "<<S>>hould I not have <<s>>aid that, <<Master>>?"
- <<elseif ($activeSlave.sexualFlaw == "judgemental")>>
+ <<case "judgemental">>
"Gro<<ss>>," she <<say>>s curtly. "Well, no more hand<<s>>ome boy<<s>> for me, then. Fat pathetic guy<<s>> who patroni<<z>>e whore<<s>>, all the way down. Fuck."
- <</if>>
+ <</switch>>
<<else>>
She tries to be brave. "<<Master>>, I will do my be<<s>>t to be a good whore." Then, half to herself, she adds in a small voice, "I can do thi<<s>>."
<</if>>
@@ -151,25 +152,26 @@ You tell her she's to report to <<if $Madam != 0>>$Madam.slaveName immediately,
<<if $activeSlave.sexualFlaw != "none">>
"Yes, <<Master>>," she says automatically. She's badly frightened, and says in a small voice, half to herself,
- <<if ($activeSlave.sexualFlaw == "hates oral")>>
+ <<switch $activeSlave.sexualFlaw>>
+ <<case "hates oral">>
"I - I'm going to h-have to <<s>>uck a lot of dick, aren't I." She swallows and tries to control herself out of fear, but finally gasps out, "Oh God, I'm <<s>>cared," and bursts into tears.
- <<elseif ($activeSlave.sexualFlaw == "hates anal")>>
+ <<case "hates anal">>
"C-cu<<s>>tomer<<s>> are really going to ream me up the butt hole, aren't they." She <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield her rear as best she can manage without limbs.<<else>>unconsciously reaches around behind herself, not quite shielding her anus with her hands.<</if>> Her lower lip quivers and she tries to control herself out of fear, but finally gasps out, "Oh God, I'm <<s>>cared," and bursts into tears.
- <<elseif ($activeSlave.sexualFlaw == "hates penetration")>>
+ <<case "hates penetration">>
"C-cu<<s>>tomer<<s>> are really going to fuck me <<s>>ore, aren't they." She <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield her rear as best she can manage without limbs.<<elseif $activeSlave.vagina > 0>>unconsciously lets her hands fall to her crotch, but catches herself and doesn't quite shield her pussy.<<else>>unconsciously reaches around behind herself, not quite shielding her anus with her hands.<</if>> Her lower lip quivers, and she tries to control herself out of fear, but finally gasps out, "Oh God, I'm <<s>>cared," and bursts into tears.
- <<elseif ($activeSlave.sexualFlaw == "repressed")>>
+ <<case "repressed">>
"Being a whore i<<s>> a <<s>>in," she <<say>>s quietly, half to herself. "I'm going t-to b-be <<s>>o dirty. I'm going to h-hell." She starts to cry quietly. She tries to get herself back under control, out of fear, but finally wails, "Oh God, I'm <<s>>orry, p-plea<<s>>e forgive me God," and dissolves into sobbing.
- <<elseif ($activeSlave.sexualFlaw == "idealistic")>>
+ <<case "idealistic">>
"I'm going to be <<s>>old for <<s>>ex," she <<say>>s quietly, half to herself. "Men are going to pay, and then they're g-going to <<s>>tick their dick<<s>> in me, and then they're going to leave." She starts to cry openly. "<<S>>-<<s>>orry, <<Master>>. P-plea<<s>>se don't beat me. I'll do it."
- <<elseif ($activeSlave.sexualFlaw == "shamefast")>>
+ <<case "shamefast">>
"I'm going to be meat in a brothel," she <<say>>s quietly, half to herself. "I'm going to <<s>>tand there naked with the other girl<<s>>, and men will pick me and then u<<s>>e my body. Over and over." She starts to cry openly. "<<S>>-<<s>>orry, <<Master>>. P-plea<<s>>se don't beat me. I'll do it."
- <<elseif ($activeSlave.sexualFlaw == "apathetic")>>
+ <<case "apathetic">>
"I gue<<ss>> I'll lie there," she sighs quietly, half to herself. "A man will pay and then he'll come in to my room where I'm lying on the bed, and he'll <<s>>tick his cock in me and cum and leave. And then the next man will come in." She starts to cry quietly. "<<S>>-<<s>>orry, <<Master>>. P-plea<<s>>se don't beat me. I'll let it happen."
- <<elseif ($activeSlave.sexualFlaw == "crude")>>
+ <<case "crude">>
"Okay," she <<say>>s, thinking. "My poor cornhole is going to be <<s>>uch a <<s>>eminal <<s>>ewer." She looks doubtful. "<<S>>hould I not have <<s>>aid that, <<Master>>?"
- <<elseif ($activeSlave.sexualFlaw == "judgemental")>>
+ <<case "judgemental">>
"Gro<<ss>>," she <<say>>s curtly. "Well, no more hand<<s>>ome boy<<s>> for me, then. Fat pathetic guy<<s>> who patroni<<z>>e whore<<s>>, all the way down. Fuck."
- <</if>>
+ <</switch>>
<<else>>
She does her best to control herself and avoid punishment. "<<Master>>, I will." She holds herself together until you dismiss her; as she turns away to go, the tears come fast, and she almost runs into the doorframe on her way out, blind with weeping.
<</if>>
@@ -179,5 +181,3 @@ You tell her she's to report to <<if $Madam != 0>>$Madam.slaveName immediately,
She manages to get "Oh fuck n-" out before the compliance systems activate and she's poleaxed to the ground. Anticipating this, you had <<if $Madam != 0>>$Madam.slaveName <<else>>another, more obedient slave<</if>> standing by to haul her away. It'll take a couple of hundred customers, but being sold in a brothel for rape should knock the resistance out of her.
<</if>> /* CLOSES DEVOTION */
-
-<</nobr>>
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index 9af30f0639f..b0de724fac3 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -58,7 +58,7 @@
/* Nationality-to-race weighted arrays */
<<set setup.raceSelector = {
"American": weightedArray({black: 1, "middle eastern": 1, white: 3, latina: 2, asian: 1, amerindian: 1, "mixed race": 2}),
- "Canadian": weightedArray({white: 8, amerindian: 2, "mixed race": 1}),
+ "Canadian": weightedArray({white: 16, asian: 2, amerindian: 2, "mixed race": 1}),
"Puerto Rican": weightedArray({latina: 9, "mixed race": 1}),
"Cuban": weightedArray({latina: 9, black: 9, "mixed race": 2}),
"Haitian": weightedArray({black: 9, "mixed race": 1}),
@@ -143,10 +143,10 @@
"Italian": weightedArray({"middle eastern": 2, "southern european": 4, white: 4, "mixed race": 1}),
"Greek": weightedArray({"southern european": 9, "mixed race": 1}),
"Spanish": weightedArray({semitic: 3, "southern european": 6, "mixed race": 1}),
- "British": weightedArray({"indo-aryan": 1, white: 9, "mixed race": 1}),
+ "British": weightedArray({"indo-aryan": 1, black: 1, white: 8, "mixed race": 1}),
"Scottish": weightedArray({"middle eastern": 1, "indo-aryan": 1, white: 7, "mixed race": 1}),
- "Australian": weightedArray({white: 4, black: 2, asian: 2, "mixed race": 1}),
- "a New Zealander": weightedArray({white: 8, "pacific islander": 2, "mixed race": 1}),
+ "Australian": weightedArray({white: 14, black: 2, asian: 4, "mixed race": 1}),
+ "a New Zealander": weightedArray({white: 15, asian: 2, "pacific islander": 3, "mixed race": 1}),
/* these need some love, for now they are default */
"Sammarinese": weightedArray({"southern european": 9, "mixed race": 1}),
"Marshallese": weightedArray({"pacific islander": 9, "mixed race": 1}),
@@ -229,7 +229,7 @@
<<set setup.latinaNationalities = ["American", "Argentinian", "Bolivian", "Brazilian", "Chilean", "Colombian", "Cuban", "Guatemalan", "Mexican", "Peruvian", "Puerto Rican", "Uruguayan", "Venezuelan"]>>
-<<set setup.middleeasternNationalities = [ "Afghan", "Algerian", "American", "Djiboutian", "Egyptian", "Emirati", "Ethiopian", "French", "German", "Iraqi", "Israeli", "Italian", "Jordanian", "Lebanese", "Libyan", "Malian", "Moroccan", "Omani", "Saudi", "Sudanese", "Swedish", "Syrian", "Tunisian", "Turkish", "Yemeni"]>>
+<<set setup.middleeasternNationalities = ["Afghan", "Algerian", "American", "Djiboutian", "Egyptian", "Emirati", "Ethiopian", "French", "German", "Iraqi", "Israeli", "Italian", "Jordanian", "Lebanese", "Libyan", "Malian", "Moroccan", "Omani", "Saudi", "Sudanese", "Swedish", "Syrian", "Tunisian", "Turkish", "Yemeni"]>>
<<set setup.blackNationalities = ["American", "Australian", "Bermudian", "Brazilian", "Cameroonian", "Congolese", "Cuban", "Djiboutian", "Egyptian", "Ethiopian", "French", "Gabonese", "German", "Ghanan", "Haitian", "Jamaican", "Kenyan", "Malian", "Moroccan", "Nigerian", "Saudi", "South African", "Sudanese", "Swedish", "Tanzanian", "Ugandan", "Yemeni", "Zambian", "Zimbabwean", "Dominican"]>>
@@ -248,7 +248,6 @@
<<set setup.whiteAmericanSlaveNames = ["Abigail", "Adalyn", "Addison", "Adeline", "Alaina", "Alexandra", "Alicia", "Allison", "Allison", "Alyssa", "Alyssa", "Amanda", "Amber", "Amelia", "Amy", "Andrea", "Angela", "Anna", "Anna", "Annabelle", "April", "Aria", "Arianna", "Ashley", "Aubrey", "Audrey", "Ava", "Avery", "Bailey", "Bethany", "Brandi", "Brandy", "Brittany", "Brittney", "Brooke", "Brooklyn", "Caitlin", "Callie", "Candice", "Caroline", "Carrie", "Cassandra", "Catherine", "Charlotte", "Chelsea", "Chloe", "Christina", "Christine", "Claire", "Courtney", "Crystal", "Cynthia", "Dana", "Danielle", "Diana", "Elena", "Eliana", "Elizabeth", "Elizabeth", "Ella", "Ellie", "Emily", "Emily", "Emma", "Erica", "Erika", "Erin", "Eva", "Evelyn", "Gabriella", "Grace", "Hailey", "Hannah", "Hannah", "Harper", "Heather", "Holly", "Isabella", "Isabelle", "Jacqueline", "Jamie", "Jane", "Jasmine", "Jenna", "Jennifer", "Jessica", "Julia", "Julie", "Kaitlyn", "Karen", "Katherine", "Katherine", "Kathleen", "Kathryn", "Katie", "Kayla", "Kaylee", "Keira", "Kelly", "Kennedy", "Kimberly", "Kristen", "Kristin", "Kristina", "Krystal", "Kylie", "Latoya", "Laura", "Lauren", "Layla", "Leah", "Leah", "Leslie", "Lila", "Liliana", "Lillian", "Lily", "Lindsay", "Lindsey", "Lisa", "Lucy", "Mackenzie", "Madelyn", "Madison", "Makayla", "Margaret", "Maria", "Maria", "Mary", "Maya", "Megan", "Meghan", "Melanie", "Melissa", "Mia", "Michelle", "Mila", "Misty", "Monica", "Natalie", "Natalie", "Natasha", "Nicole", "Nora", "Olivia", "Patricia", "Penelope", "Peyton", "Rachel", "Reagan", "Rebecca", "Riley", "Rose", "Sadie", "Samantha", "Samantha", "Sandra", "Sara", "Sarah", "Sarah", "Savannah", "Scarlett", "Shannon", "Skyler", "Sophia", "Sophie", "Stacey", "Stacy", "Stella", "Stephanie", "Susan", "Tara", "Tiffany", "Valerie", "Vanessa", "Veronica", "Victoria", "Victoria", "Violet", "Whitney", "Zoe"]>>
-
<<set setup.whiteAmericanSlaveSurnames = ["Adams", "Allen", "Anderson", "Anderson", "Bailey", "Baker", "Barnes", "Bell", "Bennett", "Brooks", "Brown", "Burns", "Butler", "Campbell", "Carter", "Clark", "Cole", "Collins", "Cook", "Cooper", "Cox", "Davis", "Edwards", "Ellis", "Evans", "Fisher", "Foster", "Fox", "Gibson", "Graham", "Gray", "Green", "Hall", "Hamilton", "Harris", "Hayes", "Hill", "Howard", "Hughes", "Jackson", "Johnson", "Jones", "Kelly", "Kennedy", "King", "Lee", "Lewis", "Long", "Martin", "McDonald", "Meyer", "Miller", "Mitchell", "Moore", "Morgan", "Morris", "Murphy", "Murray", "Myers", "Nelson", "Olson", "Parker", "Patterson", "Perry", "Peterson", "Phillips", "Powell", "Price", "Reed", "Reynolds", "Richardson", "Roberts", "Robinson", "Rogers", "Ross", "Russell", "Sanders", "Schmidt", "Scott", "Smith", "Snyder", "Stevens", "Stewart", "Stone", "Sullivan", "Taylor", "Thomas", "Thompson", "Turner", "Wagner", "Walker", "Wallace", "Ward", "Watson", "West", "White", "Williams", "Wilson", "Wood", "Wright", "Young"]>>
<<set setup.africanAmericanSlaveNames = ["Aaliyah", "Abigail", "Alyssa", "Angel", "Aniyah", "Arianna", "Ashley", "Ava", "Brianna", "Chelsea", "Chloe", "Destiny", "Fatoumata", "Gabrielle", "Hannah", "Heaven", "Imani", "Isis", "Ivory", "Jada", "Jade", "Jasmine", "Jayla", "Jordan", "Kayla", "Keisha", "Kennedy", "Kiara", "Kimora", "Laila", "Lakeisha", "Lakeshia", "Lakisha", "Lashawna", "Lashonda", "Latanya", "Latasha", "Latoya", "London", "Madison", "Makayla", "Malia", "Marquita", "Michelle", "Natisha", "Nevaeh", "Nikeisha", "Nyla", "Olivia", "Qiana", "Sarah", "Sasha", "Savannah", "Shanice", "Shanika", "Shaniqua", "Sydney", "Talisha", "Taneka", "Tanesha", "Tanika", "Taniqua", "Tanisha", "Taylor", "Tiana", "Trinity", "Victoria"]>>
@@ -610,7 +609,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do
<<set setup.namePoolSelector = {
"American.black": setup.africanAmericanSlaveNames, "American.latina": setup.latinaSlaveNames, "American.asian": setup.asianAmericanSlaveNames,
"American.middle eastern": setup.egyptianSlaveNames, "American": setup.whiteAmericanSlaveNames,
- "Canadian": setup.canadianSlaveNames,
+ "Canadian.Asian": setup.asianAmericanSlaveNames, "Canadian": setup.canadianSlaveNames,
"Mexican": setup.mexicanSlaveNames,
"Dominican": setup.dominicanSlaveNames,
"Puerto Rican": setup.puertoRicanSlaveNames,
@@ -627,7 +626,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do
"Ukrainian": setup.ukrainianSlaveNames,
"Italian": setup.italianSlaveNames,
"Spanish": setup.spanishSlaveNames,
- "British": setup.britishSlaveNames,
+ "British.indo-aryan": setup.indianSlaveNames, "British": setup.britishSlaveNames,
"Scottish": setup.scottishSlaveNames,
"French": setup.frenchSlaveNames,
"German.middle eastern": setup.turkishSlaveNames, "German": setup.germanSlaveNames,
@@ -697,8 +696,8 @@ Then pick _namePool.random(), or display those names as possible choices, or do
"Kazakh": setup.kazakhSlaveNames,
"Pakistani": setup.pakistaniSlaveNames,
"Indian": setup.indianSlaveNames,
- "Australian": setup.australianSlaveNames,
- "a New Zealander": setup.newZealanderSlaveNames,
+ "Australian.asian": setup.asianAmericanSlaveNames, "Australian": setup.australianSlaveNames,
+ "a New Zealander.asian": setup.asianAmericanSlaveNames, "a New Zealander": setup.newZealanderSlaveNames,
"Sammarinese": setup.sammarineseSlaveNames,
"Marshallese": setup.marshalleseSlaveNames,
"Syrian": setup.syrianSlaveNames,
@@ -720,7 +719,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do
<<set setup.surnamePoolSelector = {
"American.black": setup.africanAmericanSlaveSurnames, "American.latina": setup.latinaSlaveSurnames, "American.asian": setup.asianAmericanSlaveSurnames,
"American.middle eastern": setup.egyptianSlaveSurnames, "American": setup.whiteAmericanSlaveSurnames,
- "Canadian": setup.canadianSlaveSurnames,
+ "Canadian.Asian": setup.asianAmericanSlaveSurnames, "Canadian": setup.canadianSlaveSurnames,
"Mexican": setup.mexicanSlaveSurnames,
"Dominican": setup.dominicanSlaveSurnames,
"Puerto Rican": setup.puertoRicanSlaveSurnames,
@@ -737,7 +736,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do
"Ukrainian": setup.ukrainianSlaveSurnames,
"Italian": setup.italianSlaveSurnames,
"Spanish": setup.spanishSlaveSurnames,
- "British": setup.britishSlaveSurnames,
+ "British.indo-aryan": setup.indianSlaveSurnames, "British": setup.britishSlaveSurnames,
"Scottish": setup.scottishSlaveSurnames,
"French": setup.frenchSlaveSurnames,
"German.middle eastern": setup.turkishSlaveSurnames, "German": setup.germanSlaveSurnames,
@@ -807,8 +806,8 @@ Then pick _namePool.random(), or display those names as possible choices, or do
"Kazakh": setup.kazakhSlaveSurnames,
"Pakistani": setup.pakistaniSlaveSurnames,
"Indian": setup.indianSlaveSurnames,
- "Australian": setup.australianSlaveSurnames,
- "a New Zealander": setup.newZealanderSlaveSurnames,
+ "Australian.asian": setup.asianAmericanSlaveSurnames, "Australian": setup.australianSlaveSurnames,
+ "a New Zealander.asian": setup.asianAmericanSlaveSurames, "a New Zealander": setup.newZealanderSlaveSurnames,
"Sammarinese": setup.sammarineseSlaveSurnames,
"Marshallese": setup.marshalleseSlaveSurnames,
"Syrian": setup.syrianSlaveSurnames,
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 966f9e0f008..6089be04224 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -863,37 +863,39 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $ACitizens = 4000>>
<<set $ASlaves = 1000>>
-<<set $sectors = []>>
-<<set $AS = {type: "Penthouse", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Empty", ownership: 0}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Empty", ownership: 0}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Empty", ownership: 0}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Empty", ownership: 0}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Shops", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Shops", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Shops", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Markets", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Markets", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Markets", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Markets", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Markets", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Manufacturing", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Manufacturing", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Manufacturing", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Manufacturing", ownership: 1}>><<set $sectors.push($AS)>>
-<<set $AS = {type: "Manufacturing", ownership: 1}>><<set $sectors.push($AS)>>
+<<set $sectors = [
+ {type: "Penthouse", ownership: 1},
+ {type: "Empty", ownership: 0},
+ {type: "Empty", ownership: 0},
+ {type: "Empty", ownership: 0},
+ {type: "Empty", ownership: 0},
+ {type: "Shops", ownership: 1},
+ {type: "Shops", ownership: 1},
+ {type: "Shops", ownership: 1},
+ {type: "Apartments", ownership: 1},
+ {type: "Apartments", ownership: 1},
+ {type: "Apartments", ownership: 1},
+ {type: "Apartments", ownership: 1},
+ {type: "Apartments", ownership: 1},
+ {type: "Apartments", ownership: 1},
+ {type: "Apartments", ownership: 1},
+ {type: "Apartments", ownership: 1},
+ {type: "Apartments", ownership: 1},
+ {type: "Apartments", ownership: 1},
+ {type: "Apartments", ownership: 1},
+ {type: "Apartments", ownership: 1},
+ {type: "Markets", ownership: 1},
+ {type: "Markets", ownership: 1},
+ {type: "Markets", ownership: 1},
+ {type: "Markets", ownership: 1},
+ {type: "Markets", ownership: 1},
+ {type: "Manufacturing", ownership: 1},
+ {type: "Manufacturing", ownership: 1},
+ {type: "Manufacturing", ownership: 1},
+ {type: "Manufacturing", ownership: 1},
+ {type: "Manufacturing", ownership: 1}
+]>>
+
<<for _i = 0; _i < 12; _i++>>
<<set _j = random(5,28)>>
<<if $sectors[_j].ownership == 1>>
@@ -992,75 +994,48 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $vaginalUseWeight = 5>>
<<set $analUseWeight = 5>>
-<<set $niceWeather = []>>
-<<set $weatherToday = {name: "Sunny", severity: 1}>>
-<<set $niceWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Cloudy", severity: 1}>>
-<<set $niceWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Partly Cloudy", severity: 1}>>
-<<set $niceWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Overcast", severity: 1}>>
-<<set $niceWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Light Wind", severity: 1}>>
-<<set $niceWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Clear and Calm", severity: 1}>>
-<<set $niceWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Light Rain", severity: 1}>>
-<<set $niceWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Heavy Rain", severity: 1}>>
-<<set $niceWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Smoke warning", severity: 1}>>
-<<set $niceWeather.push($weatherToday)>>
-
-<<set $lightWeather = []>>
-<<set $weatherToday = {name: "High Winds", severity: 2}>>
-<<set $lightWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Acid Rain", severity: 2}>>
-<<set $lightWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "T-Storm Warning", severity: 2}>>
-<<set $lightWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Flood Warning", severity: 2}>>
-<<set $lightWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Tornado Warning", severity: 2}>>
-<<set $lightWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Light Sandstorm", severity: 2}>>
-<<set $lightWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "High Heat", severity: 2}>>
-<<set $lightWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Smoky", severity: 2}>>
-<<set $lightWeather.push($weatherToday)>>
-
-<<set $heavyWeather = []>>
-<<set $weatherToday = {name: "Extreme Winds", severity: 3}>>
-<<set $heavyWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Heavy Acid Rain", severity: 3}>>
-<<set $heavyWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Extreme T-storm", severity: 3}>>
-<<set $heavyWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Flooding", severity: 3}>>
-<<set $heavyWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Tornadoes", severity: 3}>>
-<<set $heavyWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Sandstorm", severity: 3}>>
-<<set $heavyWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Extreme Heat", severity: 3}>>
-<<set $heavyWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Dense Smoke", severity: 3}>>
-<<set $heavyWeather.push($weatherToday)>>
-
-<<set $extremeWeather = []>>
-<<set $weatherToday = {name: "Solar Flare", severity: 4}>>
-<<set $extremeWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Ion Storm", severity: 4}>>
-<<set $extremeWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Cataclysmic Rains", severity: 4}>>
-<<set $extremeWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Cat 6 Hurricane", severity: 4}>>
-<<set $extremeWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Abrasive Sandstorm", severity: 4}>>
-<<set $extremeWeather.push($weatherToday)>>
-<<set $weatherToday = {name: "Radiological Warning", severity: 4}>>
-<<set $extremeWeather.push($weatherToday)>>
+<<set $niceWeather = [
+ {name: "Sunny", severity: 1},
+ {name: "Cloudy", severity: 1},
+ {name: "Partly Cloudy", severity: 1},
+ {name: "Overcast", severity: 1},
+ {name: "Light Wind", severity: 1},
+ {name: "Clear and Calm", severity: 1},
+ {name: "Light Rain", severity: 1},
+ {name: "Heavy Rain", severity: 1},
+ {name: "Smoke warning", severity: 1},
+]>>
+
+<<set $lightWeather = [
+ {name: "High Winds", severity: 2},
+ {name: "Acid Rain", severity: 2},
+ {name: "T-Storm Warning", severity: 2},
+ {name: "Flood Warning", severity: 2},
+ {name: "Tornado Warning", severity: 2},
+ {name: "Light Sandstorm", severity: 2},
+ {name: "High Heat", severity: 2},
+ {name: "Smoky", severity: 2},
+]>>
+
+<<set $heavyWeather = [
+ {name: "Extreme Winds", severity: 3},
+ {name: "Heavy Acid Rain", severity: 3},
+ {name: "Extreme T-storm", severity: 3},
+ {name: "Flooding", severity: 3},
+ {name: "Tornadoes", severity: 3},
+ {name: "Sandstorm", severity: 3},
+ {name: "Extreme Heat", severity: 3},
+ {name: "Dense Smoke", severity: 3},
+]>>
+
+<<set $extremeWeather = [
+ {name: "Solar Flare", severity: 4},
+ {name: "Ion Storm", severity: 4},
+ {name: "Cataclysmic Rains", severity: 4},
+ {name: "Cat 6 Hurricane", severity: 4},
+ {name: "Abrasive Sandstorm", severity: 4},
+ {name: "Radiological Warning", severity: 4},
+]>>
<<set $weatherToday = $niceWeather.random()>>
diff --git a/src/js/bugReport.tw b/src/js/bugReport.tw
index 30ce934ce8a..60d34860a38 100644
--- a/src/js/bugReport.tw
+++ b/src/js/bugReport.tw
@@ -1,4 +1,4 @@
:: Bug Report [script]
/*! <<bugreport>> macro for SugarCube 2.x */
-!function(){"use strict";if("undefined"==typeof version||"undefined"==typeof version.title||"SugarCube"!==version.title||"undefined"==typeof version.major||version.major<2)throw new Error("<<bugreport>> macro requires SugarCube 2.0 or greater, aborting load");Macro.add("bugreport",{handler:function(){function serializeVariables(varObj,diffObj,doSort){function renderDiff(diff,orig){for(var keys=Object.keys(diff||{}),render=orig?clone(orig):{},i=0,klen=keys.length;klen>i;i++){var p=keys[i],diffP=diff[p];if(diffP===Util.DiffOp.Delete)delete render[p];else if(Array.isArray(diffP))switch(diffP[0]){case Util.DiffOp.SpliceArray:try{render.splice(diffP[1],1+(diffP[2]-diffP[1]))}catch(e){}break;case Util.DiffOp.Copy:render[p]=clone(diffP[1]);break;case Util.DiffOp.CopyDate:render[p]=new Date(diffP[1])}else{var recurse=renderDiff(diffP,render[p]);0!==Object.keys(recurse).length&&(render[p]=recurse)}}return render}var varList=[],diff=renderDiff(Util.diff(varObj,diffObj));for(var p in diff){var sName="$"+(-1===p.search(/[^\w]/)?p:'"'+p+'"');varList.push(sName+"="+JSON.stringify(diff[p]))}return doSort&&("function"==typeof doSort?varList.sort(doSort):varList.sort()),0!==varList.length?varList.join(", "):""}var srcMatch,passages,varsPre,varsPost,dialog,dataEl,info=null!=this.args[0]&&Story.has(this.args[0])?Story.get(this.args[0]):null,last=State.length-1,source=unescape(window.location);null!==(srcMatch=/\/([^\/]+)$/.exec(source))&&(source=srcMatch[1]),passages=[];for(var i=0;last>=i;i++)passages.push('"'+State.index(i).title+'"');passages=passages.join(", "),varsPre=serializeVariables(State.index(0).variables,State.index(last).variables),varsPost=serializeVariables(State.index(last).variables,State.variables),dialog=UI.setup("Bug Report","bugreport"),dialog.innerHTML=(null!==info?'<div id="bugreport-info"></div>':"")+'<div><b>Bug report:</b> <a id="bugreport-data-select" class="link-internal macro-bugreport">[Select]</a></div><code id="bugreport-data" tabindex="0"></code>'+(/applewebkit|chrome/.test(Browser.userAgent)?"":'<div class="scroll-pad"> </div>'),dataEl=dialog.querySelector("#bugreport-data"),null!==info&&new Wikifier(dialog.querySelector("#bugreport-info"),info.processText()),addAccessibleClickHandler("#bugreport-data-select",function(self){return function(){jQuery(dataEl).focus(),self.selectData(dataEl)}}(this.self)),insertText(dataEl,"[spoiler][code]"),insertElement(dataEl,"br"),insertText(dataEl,"SOURCE: "+source),insertElement(dataEl,"br"),insertElement(dataEl,"br"),insertText(dataEl,"PASSAGES:"),insertElement(dataEl,"br"),insertText(dataEl,passages),insertElement(dataEl,"br"),insertElement(dataEl,"br"),insertText(dataEl,"VARIABLES (PRE-EXECUTION):"),insertElement(dataEl,"br"),varsPre&&(insertText(dataEl,varsPre),insertElement(dataEl,"br")),insertElement(dataEl,"br"),insertText(dataEl,"VARIABLES (POST-EXECUTION):"),insertElement(dataEl,"br"),varsPost&&(insertText(dataEl,varsPost),insertElement(dataEl,"br")),insertText(dataEl,"[/code][/spoiler]"),UI.open()},selectData:function(e){if(window.getSelection){var s=window.getSelection();if(s.setBaseAndExtent)s.setBaseAndExtent(e,0,e,e.innerText.length-1);else{window.opera&&"<br>"===e.innerHTML.substring(e.innerHTML.length-4)&&(e.innerHTML+=" ");var r=document.createRange();r.selectNodeContents(e),s.removeAllRanges(),s.addRange(r)}}else if(document.getSelection){var s=document.getSelection(),r=document.createRange();r.selectNodeContents(e),s.removeAllRanges(),s.addRange(r)}else if(document.selection){var r=document.body.createTextRange();r.moveToElementText(e),r.select()}}})}();
+!function(){"use strict";if("undefined"==typeof version||"undefined"==typeof version.title||"SugarCube"!==version.title||"undefined"==typeof version.major||version.major<2)throw new Error("<<bugreport>> macro requires SugarCube 2.0 or greater, aborting load");Macro.add("bugreport",{handler:function(){function serializeVariables(varObj,diffObj,doSort){function renderDiff(diff,orig){for(var keys=Object.keys(diff||{}),render=orig?clone(orig):{},i=0,klen=keys.length;klen>i;i++){var p=keys[i],diffP=diff[p];if(diffP===Diff.Op.Delete)delete render[p];else if(Array.isArray(diffP))switch(diffP[0]){case Diff.Op.SpliceArray:try{render.splice(diffP[1],1+(diffP[2]-diffP[1]))}catch(e){}break;case Diff.Op.Copy:render[p]=clone(diffP[1]);break;case Diff.Op.CopyDate:render[p]=new Date(diffP[1])}else{var recurse=renderDiff(diffP,render[p]);0!==Object.keys(recurse).length&&(render[p]=recurse)}}return render}var varList=[],diff=renderDiff(Diff.diff(varObj,diffObj));for(var p in diff){var sName="$"+(-1===p.search(/[^\w]/)?p:'"'+p+'"');varList.push(sName+"="+JSON.stringify(diff[p]))}return doSort&&("function"==typeof doSort?varList.sort(doSort):varList.sort()),0!==varList.length?varList.join(", "):""}var srcMatch,passages,varsPre,varsPost,dialog,dataEl,info=null!=this.args[0]&&Story.has(this.args[0])?Story.get(this.args[0]):null,last=State.length-1,source=unescape(window.location);null!==(srcMatch=/\/([^\/]+)$/.exec(source))&&(source=srcMatch[1]),passages=[];for(var i=0;last>=i;i++)passages.push('"'+State.index(i).title+'"');passages=passages.join(", "),varsPre=serializeVariables(State.index(0).variables,State.index(last).variables),varsPost=serializeVariables(State.index(last).variables,State.variables),dialog=UI.setup("Bug Report","bugreport"),dialog.innerHTML=(null!==info?'<div id="bugreport-info"></div>':"")+'<div><b>Bug report:</b> <a id="bugreport-data-select" class="link-internal macro-bugreport">[Select]</a></div><code id="bugreport-data" tabindex="0"></code>'+(/applewebkit|chrome/.test(Browser.userAgent)?"":'<div class="scroll-pad"> </div>'),dataEl=dialog.querySelector("#bugreport-data"),null!==info&&new Wikifier(dialog.querySelector("#bugreport-info"),info.processText()),addAccessibleClickHandler("#bugreport-data-select",function(self){return function(){jQuery(dataEl).focus(),self.selectData(dataEl)}}(this.self)),insertText(dataEl,"[spoiler][code]"),insertElement(dataEl,"br"),insertText(dataEl,"SOURCE: "+source),insertElement(dataEl,"br"),insertElement(dataEl,"br"),insertText(dataEl,"PASSAGES:"),insertElement(dataEl,"br"),insertText(dataEl,passages),insertElement(dataEl,"br"),insertElement(dataEl,"br"),insertText(dataEl,"VARIABLES (PRE-EXECUTION):"),insertElement(dataEl,"br"),varsPre&&(insertText(dataEl,varsPre),insertElement(dataEl,"br")),insertElement(dataEl,"br"),insertText(dataEl,"VARIABLES (POST-EXECUTION):"),insertElement(dataEl,"br"),varsPost&&(insertText(dataEl,varsPost),insertElement(dataEl,"br")),insertText(dataEl,"[/code][/spoiler]"),UI.open()},selectData:function(e){var s,r;if(window.getSelection){s=window.getSelection();if(s.setBaseAndExtent){var l=(e.innerText.length>1)?e.innerText.length-1:1;try{s.setBaseAndExtent(e,0,e,l)}catch(error){r=document.createRange();r.selectNodeContents(e);s.removeAllRanges();s.addRange(r)}}else{if(window.opera&&e.innerHTML.substring(e.innerHTML.length-4)==='<br>'){e.innerHTML=e.innerHTML+' '}var r=document.createRange();r.selectNodeContents(e);s.removeAllRanges();s.addRange(r)}}else if(document.getSelection){s=document.getSelection();r=document.createRange();r.selectNodeContents(e);s.removeAllRanges();s.addRange(r)}else if(document.selection){r=document.body.createTextRange();r.moveToElementText(e);r.select()}}})}();
diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index 6bf6df63fd0..48d050b3d62 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -193,6 +193,18 @@ window.removeFromArray = function(arr, val) {
return null;
};
+window.filterInPlace = function(arr, callback, thisArg) {
+ var j = 0;
+
+ arr.forEach(function(e, i) {
+ if (callback.call(thisArg, e, i, arr))
+ arr[j++] = e;
+ });
+
+ arr.length = j;
+ return arr;
+};
+
if (typeof FertilityAge == "undefined") {
var FertilityAge = {
setAge: function (age) {
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 2e5b0344d04..b2536ff4497 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -941,6 +941,9 @@ Setting missing global variables:
<<if ndef $BrothiIDs>>
<<set $BrothiIDs = []>>
<</if>>
+<<if $BrothiIDs.length > 0 && typeof $BrothiIDs[0] === 'object'>>
+ <<set $BrothiIDs = $BrothiIDs.map(function(a) { return a.ID; })>>
+<</if>>
<<if ndef $brothelName>>
<<set $brothelName = "the Brothel">>
<</if>>
@@ -954,6 +957,9 @@ Setting missing global variables:
<<if ndef $DairyiIDs>>
<<set $DairyiIDs = []>>
<</if>>
+<<if $DairyiIDs.length > 0 && typeof $DairyiIDs[0] === 'object'>>
+ <<set $DairyiIDs = $DairyiIDs.map(function(a) { return a.ID; })>>
+<</if>>
<<if ndef $dairyName>>
<<set $dairyName = "the Dairy">>
<</if>>
@@ -995,6 +1001,9 @@ Setting missing global variables:
<<if ndef $ClubiIDs>>
<<set $ClubiIDs = []>>
<</if>>
+<<if $ClubiIDs.length > 0 && typeof $ClubiIDs[0] === 'object'>>
+ <<set $ClubiIDs = $ClubiIDs.map(function(a) { return a.ID; })>>
+<</if>>
<<if ndef $clubName>>
<<set $clubName = "the Club">>
<</if>>
@@ -1008,6 +1017,9 @@ Setting missing global variables:
<<if ndef $ServQiIDs>>
<<set $ServQiIDs = []>>
<</if>>
+<<if $ServQiIDs.length > 0 && typeof $ServQiIDs[0] === 'object'>>
+ <<set $ServQiIDs = $ServQiIDs.map(function(a) { return a.ID; })>>
+<</if>>
<<if ndef $servantsQuartersName>>
<<set $servantsQuartersName = "the Servants' Quarters">>
<</if>>
@@ -1021,6 +1033,9 @@ Setting missing global variables:
<<if ndef $SchlRiIDs>>
<<set $SchlRiIDs = []>>
<</if>>
+<<if $SchlRiIDs.length > 0 && typeof $SchlRiIDs[0] === 'object'>>
+ <<set $SchlRiIDs = $SchlRiIDs.map(function(a) { return a.ID; })>>
+<</if>>
<<if ndef $schoolroomName>>
<<set $schoolroomName = "the Schoolroom">>
<</if>>
@@ -1040,6 +1055,9 @@ Setting missing global variables:
<<if ndef $SpaiIDs>>
<<set $SpaiIDs = []>>
<</if>>
+<<if $SpaiIDs.length > 0 && typeof $SpaiIDs[0] === 'object'>>
+ <<set $SpaiIDs = $SpaiIDs.map(function(a) { return a.ID; })>>
+<</if>>
<<if ndef $spaName>>
<<set $spaName = "the Spa">>
<</if>>
@@ -1053,6 +1071,9 @@ Setting missing global variables:
<<if ndef $CliniciIDs>>
<<set $CliniciIDs = []>>
<</if>>
+<<if $CliniciIDs.length > 0 && typeof $CliniciIDs[0] === 'object'>>
+ <<set $CliniciIDs = $CliniciIDs.map(function(a) { return a.ID; })>>
+<</if>>
<<if ndef $clinicName>>
<<set $clinicName = "the Clinic">>
<</if>>
@@ -1078,6 +1099,9 @@ Setting missing global variables:
<<if ndef $ArcadeiIDs>>
<<set $ArcadeiIDs = []>>
<</if>>
+<<if $ArcadeiIDs.length > 0 && typeof $ArcadeiIDs[0] === 'object'>>
+ <<set $ArcadeiIDs = $ArcadeiIDs.map(function(a) { return a.ID; })>>
+<</if>>
<<if ndef $arcadeName>>
<<set $arcadeName = "the Arcade">>
<</if>>
@@ -1091,6 +1115,9 @@ Setting missing global variables:
<<if ndef $CellBiIDs>>
<<set $CellBiIDs = []>>
<</if>>
+<<if $CellBiIDs.length > 0 && typeof $CellBiIDs[0] === 'object'>>
+ <<set $CellBiIDs = $CellBiIDs.map(function(a) { return a.ID; })>>
+<</if>>
<<if ndef $cellblockName>>
<<set $cellblockName = "the Cellblock">>
<</if>>
@@ -1104,6 +1131,9 @@ Setting missing global variables:
<<if ndef $MastSiIDs>>
<<set $MastSiIDs = []>>
<</if>>
+<<if $MastSiIDs.length > 0 && typeof $MastSiIDs[0] === 'object'>>
+ <<set $MastSiIDs = $MastSiIDs.map(function(a) { return a.ID; })>>
+<</if>>
<<if ndef $masterSuiteName>>
<<set $masterSuiteName = "the Master Suite">>
<</if>>
@@ -1129,6 +1159,12 @@ Setting missing global variables:
<<set $masterSuiteDecoration = "standard">>
<</if>>
+<<if ndef $HGSuiteiIDs>>
+ <<set $HGSuiteiIDs = []>>
+<</if>>
+<<if $HGSuiteiIDs.length > 0 && typeof $HGSuiteiIDs[0] === 'object'>>
+ <<set $HGSuiteiIDs = $HGSuiteiIDs.map(function(a) { return a.ID; })>>
+<</if>>
<<if ndef $HGSuiteName>>
<<set $HGSuiteName = "the Head Girl Suite">>
<</if>>
diff --git a/src/uncategorized/arcade.tw b/src/uncategorized/arcade.tw
index 5ccbe8c58b0..46dee871c3c 100644
--- a/src/uncategorized/arcade.tw
+++ b/src/uncategorized/arcade.tw
@@ -123,9 +123,9 @@ $arcadeNameCaps
<<elseif ($slaves.length > $arcadeSlaves)>>
<<link "''Confine a slave in $arcadeName''">>
<<replace #ComingGoing>>
- <<resetAssignmentFilter>>
- <<set $Flag to 0>>
- <<include "Slave Summary">>
+ <<resetAssignmentFilter>>
+ <<set $Flag = 0>>
+ <<include "Slave Summary">>
<</replace>>
<</link>>
<</if>>
@@ -133,10 +133,10 @@ $arcadeNameCaps
<<if $arcadeSlaves > 0>>
| <<link "''Bring a slave out of $arcadeName''">>
<<replace #ComingGoing>>
- <<arcadeAssignmentFilter>>
- <<set $Flag = 1>>
- <<include "Slave Summary">>
- <<resetAssignmentFilter>>
+ <<arcadeAssignmentFilter>>
+ <<set $Flag = 1>>
+ <<include "Slave Summary">>
+ <<resetAssignmentFilter>>
<</replace>>
<</link>>
<<else>>
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index 854fbe0a221..996933d9b15 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -1,19 +1,7 @@
:: Arcade Report [nobr]
-<<set _DL = $ArcadeiIDs.length, $arcadeSlaves = _DL, _SL = $slaves.length, _cockmilked = 0, _milked = 0, _milkprofits = 0, _profits = 0, _oldCash = 0, $boobsImplanted = 0, $prostatesImplanted = 0, $vasectomiesUndone = 0>>
-
-<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $ArcadeiIDs[_dI].Index, _ID = $ArcadeiIDs[_dI].ID>>
- <<if $i >= _SL || _ID != $slaves[$i].ID>>
- /% IDs don't match-up so let's find her %/
- <<set $i = $slaves.findIndex(function(s) { return s.ID == _ID; }), $ArcadeiIDs[_dI].Index = $i>>
- <</if>>
- <<if $i == -1 || $slaves[$i].assignment != "be confined in the arcade">>
- <<set $ArcadeiIDs.deleteAt(_dI), _dI--, _DL--, $arcadeSlaves-->>
- <<continue>>
- <</if>>
-<</for>>
<<SlaveSort $ArcadeiIDs>>
+<<set _DL = $ArcadeiIDs.length, $arcadeSlaves = _DL, _SL = $slaves.length, _cockmilked = 0, _milked = 0, _milkprofits = 0, _profits = 0, _oldCash = 0, $boobsImplanted = 0, $prostatesImplanted = 0, $vasectomiesUndone = 0>>
<<if (_DL > 1)>>''There are _DL inmates confined in $arcadeName.''<<else>>''There is one inmate confined in $arcadeName.''<</if>>
<<if ($arcologies[0].FSDegradationist > 20)>>
@@ -32,7 +20,7 @@
<</if>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $ArcadeiIDs[_dI].Index>>
+ <<set $i = $slaveIndices[$ArcadeiIDs[_dI]]>>
/* Perform facility based rule changes */
<<set $slaves[$i].clothes = "no clothing">>
@@ -196,7 +184,7 @@
<<if ($arcadeUpgradeFuckdolls == 1) && (_DL > $arcade)>>
<<set $activeSlave = 0, _Age = -1, _FD = -1, _MB = -1, _Con = -1>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $ArcadeiIDs[_dI].Index>>
+ <<set $i = $slaveIndices[$ArcadeiIDs[_dI]]>>
<<if ($slaves[$i].fetish == "mindbroken")>>
<<if ($slaves[$i].fuckdoll == 0)>>
<<if ($slaves[$i].physicalAge > 35)>>
diff --git a/src/uncategorized/attendantWorkaround.tw b/src/uncategorized/attendantWorkaround.tw
index 5fdc9afdda4..a9e497b65f7 100644
--- a/src/uncategorized/attendantWorkaround.tw
+++ b/src/uncategorized/attendantWorkaround.tw
@@ -1,20 +1,12 @@
:: Attendant Workaround [silently]
<<if $Attendant != 0>>
- <<set _ID = $Attendant.ID, _SL = $slaves.length>>
- <<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>>
- <<removeJob $slaves[_i] "be the Attendant">>
- <<break>>
- <</if>>
- <</for>>
+ <<removeJob $Attendant "be the Attendant">>
<</if>>
<<if $i > -1>>
<<assignJob $slaves[$i] "be the Attendant">>
<<set $slaves[$i].livingRules = "luxurious">>
<<set $Attendant = $slaves[$i]>>
-<<else>>
- <<set $Attendant = 0>>
<</if>>
<<goto "Spa">>
diff --git a/src/uncategorized/bodyModRulesAssistantSettings.tw b/src/uncategorized/bodyModRulesAssistantSettings.tw
index 5f09b4908eb..56cda64a821 100644
--- a/src/uncategorized/bodyModRulesAssistantSettings.tw
+++ b/src/uncategorized/bodyModRulesAssistantSettings.tw
@@ -1486,7 +1486,7 @@ Chest tattoos: ''
|
<<link "Sacrament">>
<<set $currentRule.boobsTat = "sacrament">>
-<<RAChangeChestTattoosTattoos>>
+<<RAChangeChestTattoos>>
<</link>>
|
<<link "Sacrilege">>
@@ -1568,7 +1568,7 @@ Arm tattoos: ''
|
<<link "Sacrament">>
<<set $currentRule.armsTat = "sacrament">>
-<<RAChangeArmTattoosTattoos>>
+<<RAChangeArmTattoos>>
<</link>>
|
<<link "Sacrilege">>
@@ -1650,7 +1650,7 @@ Upper back tattoo: ''
|
<<link "Sacrament">>
<<set $currentRule.backTat = "sacrament">>
-<<RAChangeBackTattoosTattoos>>
+<<RAChangeBackTattoos>>
<</link>>
|
<<link "Sacrilege">>
@@ -1733,7 +1733,7 @@ Lower back tattoo: ''
|
<<link "Sacrament">>
<<set $currentRule.stampTat = "sacrament">>
-<<RAChangeStampTattoosTattoos>>
+<<RAChangeStampTattoos>>
<</link>>
|
<<link "Sacrilege">>
@@ -1815,7 +1815,7 @@ Abdominal tattoo: ''
|
<<link "Sacrament">>
<<set $currentRule.vaginaTat = "sacrament">>
-<<RAChangeVaginaTattoosTattoos>>
+<<RAChangeVaginaTattoos>>
<</link>>
|
<<link "Sacrilege">>
@@ -1892,7 +1892,7 @@ Dick tattoo: ''
|
<<link "Sacrament">>
<<set $currentRule.dickTat = "sacrament">>
-<<RAChangeDickTattoosTattoos>>
+<<RAChangeDickTattoos>>
<</link>>
|
<<link "Sacrilege">>
@@ -1976,7 +1976,7 @@ Buttock tattoos: ''
|
<<link "Sacrament">>
<<set $currentRule.buttTat = "sacrament">>
-<<RAChangeButtTattoosTattoos>>
+<<RAChangeButtTattoos>>
<</link>>
|
<<link "Sacrilege">>
@@ -2053,7 +2053,7 @@ Anal tattoo or bleaching: ''
|
<<link "Sacrament">>
<<set $currentRule.anusTat = "sacrament">>
-<<RAChangeAnusTattoosTattoos>>
+<<RAChangeAnusTattoos>>
<</link>>
|
<<link "Sacrilege">>
@@ -2135,7 +2135,7 @@ Leg tattoos: ''
|
<<link "Sacrament">>
<<set $currentRule.legsTat = "sacrament">>
-<<RAChangeLegTattoosTattoos>>
+<<RAChangeLegTattoos>>
<</link>>
|
<<link "Sacrilege">>
diff --git a/src/uncategorized/bodyguardWorkaround.tw b/src/uncategorized/bodyguardWorkaround.tw
index c27ff3204fc..bcb31008714 100644
--- a/src/uncategorized/bodyguardWorkaround.tw
+++ b/src/uncategorized/bodyguardWorkaround.tw
@@ -1,19 +1,11 @@
:: Bodyguard Workaround [silently]
<<if $Bodyguard != 0>>
- <<set _ID = $Bodyguard.ID, _SL = $slaves.length>>
- <<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>>
- <<removeJob $slaves[_i] "guard you">>
- <<break>>
- <</if>>
- <</for>>
+ <<removeJob $Bodyguard "guard you">>
<</if>>
<<if $i > -1>>
<<assignJob $slaves[$i] "guard you">>
<<set $Bodyguard = $slaves[$i]>>
-<<else>>
- <<set $Bodyguard = 0>>
<</if>>
<<goto "Main">>
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index 53574e6a384..9dfc08c7288 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -3,6 +3,7 @@
<span id="brothelstats">
</span>
+<<SlaveSort $BrothiIDs>>
<<set _DL = $BrothiIDs.length, $brothelSlaves = _DL, _SL = $slaves.length, $implanted = 0, $legendaryWhoreID = 0, $madamCashBonus = 0, $modded = 0, $old = 0, $pure = 0, $slim = 0, $stacked = 0, $unmodded = 0, $XX = 0, $XY = 0, $young = 0, _FLsFetish = 0, _profits = 0>>
<<set $legendaryWombID = 0, $pregYes = 0, $pregNo = 0>>
@@ -10,19 +11,6 @@
<!-- Statistics gathering -->
<<set $facility = $facility || {}, $facility.brothel = initFacilityStatistics($facility.brothel)>>
-<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $BrothiIDs[_dI].Index, _ID = $BrothiIDs[_dI].ID>>
- <<if $i >= _SL || _ID != $slaves[$i].ID>>
- /% IDs don't match-up so let's find her %/
- <<set $i = $slaves.findIndex(function(s) { return s.ID == _ID; }), $BrothiIDs[_dI].Index = $i>>
- <</if>>
- <<if $i == -1 || $slaves[$i].assignment != "work in the brothel">>
- <<set $BrothiIDs.deleteAt(_dI), _dI--, _DL--, $brothelSlaves-->>
- <<continue>>
- <</if>>
-<</for>>
-<<SlaveSort $BrothiIDs>>
-
<<if ($Madam != 0)>>
<<set _FLs = $slaves.findIndex(function(s) { return s.ID == $Madam.ID; })>>
@@ -98,7 +86,7 @@
<<set $madamCashBonus += 0.05>>
<</if>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $BrothiIDs[_dI].Index>>
+ <<set $i = $slaveIndices[$BrothiIDs[_dI]]>>
<<if $Madam.rivalryTarget == $slaves[$i].ID>>
She forces her <<if $Madam.rivalry == 1>>growing rival<<elseif $Madam.rivalry == 2>>rival<<elseif $Madam.rivalry == 3>>bitter rival<</if>>, to service all the men in the brothel.
<<set $slaves[$i].devotion -= 2, $slaves[$i].trust -= 2>>
@@ -264,7 +252,7 @@
<</if>>
<<set _oldCash = $cash>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $BrothiIDs[_dI].Index>>
+ <<set $i = $slaveIndices[$BrothiIDs[_dI]]>>
<<if ($legendaryWombID == 0) && ($slaves[$i].amp != 1) && ($slaves[$i].preg > 30) && ($slaves[$i].pregType < 50) && ($slaves[$i].eggType == "human") && ($slaves[$i].births > 10) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>>
<<set $legendaryWombID = $slaves[$i].ID>>
<</if>>
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index e2a8e493e6e..a6dd731cb2f 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -1,19 +1,7 @@
:: Cellblock Report [nobr]
-<<set _DL = $CellBiIDs.length, $cellblockSlaves = _DL, _SL = $slaves.length, _brokenSlaves = 0, _idleBonus = 0, _softenedQuirks = 0, _trustMalus = 0, _FLsFetish = 0>>
-
-<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $CellBiIDs[_dI].Index, _ID = $CellBiIDs[_dI].ID>>
- <<if $i >= _SL || _ID != $slaves[$i].ID>>
- /% IDs don't match-up so let's find her %/
- <<set $i = $slaves.findIndex(function(s) { return s.ID == _ID; }), $CellBiIDs[_dI].Index = $i>>
- <</if>>
- <<if $i == -1 || $slaves[$i].assignment != "be confined in the cellblock">>
- <<set $CellBiIDs.deleteAt(_dI), _dI--, _DL--, $cellblockSlaves-->>
- <<continue>>
- <</if>>
-<</for>>
<<SlaveSort $CellBiIDs>>
+<<set _DL = $CellBiIDs.length, $cellblockSlaves = _DL, _SL = $slaves.length, _brokenSlaves = 0, _idleBonus = 0, _softenedQuirks = 0, _trustMalus = 0, _FLsFetish = 0>>
<<if $cellblockDecoration != "standard">>
<<set _devBonus = 1>>
@@ -92,7 +80,7 @@
Her devotion to you is so absolute that she sees breaking bitches for your service as a noble calling.
<</if>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $CellBiIDs[_dI].Index>>
+ <<set $i = $slaveIndices[$CellBiIDs[_dI]]>>
<<if $Wardeness.rivalryTarget == $slaves[$i].ID>>
She greatly enjoys breaking her <<if $Wardeness.rivalry == 1>>growing rival<<elseif $Wardeness.rivalry == 2>>rival<<elseif $Wardeness.rivalry == 3>>bitter rival<</if>>, $slaves[$i].slaveName's will.
<<set $slaves[$i].devotion++, $slaves[$i].trust -= 3>>
@@ -108,26 +96,26 @@
<</if>>
<<elseif $familyTesting == 1 && totalRelatives($slaves[$i]) > 0>>
<<if $slaves[$i].mother == $Wardeness.ID || $slaves[$i].father == $Wardeness.ID>>
- She spares no mercy for her daughter, $slaves[$i].slaveName, making sure she understands her place.
+ She shows her daughter $slaves[$i].slaveName no mercy, making sure she understands her place.
<<set $slaves[$i].devotion++, $slaves[$i].trust-->>
<<elseif $slaves[$i].ID == $Wardeness.mother>>
- She spares no mercy for her mother, $slaves[$i].slaveName, making sure she understands her place.
+ She shows her mother $slaves[$i].slaveName no mercy, making sure she understands her place.
<<set $slaves[$i].devotion++, $slaves[$i].trust-->>
<<elseif $slaves[$i].ID == $Wardeness.father>>
- She spares no mercy for her father, $slaves[$i].slaveName, making sure she understands her place.
+ She shows her father $slaves[$i].slaveName no mercy, making sure she understands her place.
<<set $slaves[$i].devotion++, $slaves[$i].trust-->>
<<elseif areSisters($slaves[$i], $Wardeness) == 1>>
- She spares no mercy for her twin sister, $slaves[$i].slaveName, making sure she understands her place.
+ She shows her twin sister $slaves[$i].slaveName no mercy, making sure she understands her place.
<<set $slaves[$i].devotion++, $slaves[$i].trust-->>
<<elseif areSisters($slaves[$i], $Wardeness) == 2>>
- She spares no mercy for her sister, $slaves[$i].slaveName, making sure she understands her place.
+ She shows her sister $slaves[$i].slaveName no mercy, making sure she understands her place.
<<set $slaves[$i].devotion++, $slaves[$i].trust-->>
<<elseif areSisters($slaves[$i], $Wardeness) == 3>>
- She spares no mercy for her half-sister, $slaves[$i].slaveName, making sure she understands her place.
+ She shows her half-sister $slaves[$i].slaveName no mercy, making sure she understands her place.
<<set $slaves[$i].devotion++, $slaves[$i].trust-->>
<</if>>
<<elseif $Wardeness.relationTarget == $slaves[$i].ID && $familyTesting == 0>>
- She spares no mercy for her $slaves[$i].relation, $slaves[$i].slaveName, making sure she understands her place.
+ She shows her $slaves[$i].relation $slaves[$i].slaveName no mercy, making sure she understands her place.
<<set $slaves[$i].devotion++, $slaves[$i].trust-->>
<</if>>
<</for>>
@@ -177,7 +165,7 @@
<</if>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $CellBiIDs[_dI].Index>>
+ <<set $i = $slaveIndices[$CellBiIDs[_dI]]>>
<<if ($slaves[$i].devotion <= 20)>>
<<if ($slaves[$i].trust > -20)>>
<<set $slaves[$i].devotion -= 4, $slaves[$i].trust -= 4>>
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index 4345a0ce2ef..c9026f9a405 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -1,19 +1,7 @@
:: Clinic Report [nobr]
-<<set _DL = $CliniciIDs.length, $clinicSlaves = _DL, _SL = $slaves.length, _healthBonus = 0, _idleBonus = 0, _FLsFetish = 0, _restedSlaves = 0>>
-
-<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $CliniciIDs[_dI].Index, _ID = $CliniciIDs[_dI].ID>>
- <<if $i >= _SL || _ID != $slaves[$i].ID>>
- /% IDs don't match-up so let's find her %/
- <<set $i = $slaves.findIndex(function(s) { return s.ID == _ID; }), $CliniciIDs[_dI].Index = $i>>
- <</if>>
- <<if $i == -1 || $slaves[$i].assignment != "get treatment in the clinic">>
- <<set $CliniciIDs.deleteAt(_dI), _dI--, _DL--, $clinicSlaves-->>
- <<continue>>
- <</if>>
-<</for>>
<<SlaveSort $CliniciIDs>>
+<<set _DL = $CliniciIDs.length, $clinicSlaves = _DL, _SL = $slaves.length, _healthBonus = 0, _idleBonus = 0, _FLsFetish = 0, _restedSlaves = 0>>
<<if $clinicDecoration != "standard">>
<<set _devBonus = 1>>
@@ -81,7 +69,7 @@
<<set _healthBonus++>>
<</if>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $CliniciIDs[_dI].Index>>
+ <<set $i = $slaveIndices[$CliniciIDs[_dI]]>>
<<if $Nurse.rivalryTarget == $slaves[$i].ID>>
She purposefully neglects the needs of her <<if $Nurse.rivalry == 1>>growing rival<<elseif $Nurse.rivalry == 2>>rival<<elseif $Nurse.rivalry == 3>>bitter rival<</if>>, $slaves[$i].slaveName, hindering her recovery and deepening their dislike for each other.
<<set $slaves[$i].devotion--, $slaves[$i].trust--, $slaves[$i].health -= 3>>
@@ -234,7 +222,7 @@
<</if>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $CliniciIDs[_dI].Index>>
+ <<set $i = $slaveIndices[$CliniciIDs[_dI]]>>
<<if $slaves[$i].devotion < 45>>
<<set $slaves[$i].devotion += 4>>
<</if>>
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 011d2110320..584f34c22ae 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -1,21 +1,9 @@
:: Club Report [nobr]
+<<SlaveSort $ClubiIDs>>
<<set _DL = $ClubiIDs.length, $clubSlaves = _DL, _SL = $slaves.length, $clubBonuses = 0, $DJRepBonus = 0, $implanted = 0, $legendaryEntertainerID = 0, $modded = 0, $old = 0, $pure = 0, $slim = 0, $stacked = 0, $unmodded = 0, $XX = 0, $XY = 0, $young = 0, _FLsFetish = 0>>
<<set $legendaryWombID = 0, $pregYes = 0, $pregNo = 0>>
-<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $ClubiIDs[_dI].Index, _ID = $ClubiIDs[_dI].ID>>
- <<if $i >= _SL || _ID != $slaves[$i].ID>>
- /% IDs don't match-up so let's find her %/
- <<set $i = $slaves.findIndex(function(s) { return s.ID == _ID; }), $ClubiIDs[_dI].Index = $i>>
- <</if>>
- <<if $i == -1 || $slaves[$i].assignment != "serve in the club">>
- <<set $ClubiIDs.deleteAt(_dI), _dI--, _DL--, $clubSlaves-->>
- <<continue>>
- <</if>>
-<</for>>
-<<SlaveSort $ClubiIDs>>
-
<<if $DJ != 0>>
<<set _FLs = $slaves.findIndex(function(s) { return s.ID == $DJ.ID; })>>
@@ -159,7 +147,7 @@
<<if (_DL > 0)>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $ClubiIDs[_dI].Index>>
+ <<set $i = $slaveIndices[$ClubiIDs[_dI]]>>
<<if ($legendaryEntertainerID == 0) && ($slaves[$i].prestige == 0) && ($slaves[$i].entertainSkill >= 100) && ($slaves[$i].devotion > 50)>>
<<set $legendaryEntertainerID = $slaves[$i].ID>>
<</if>>
diff --git a/src/uncategorized/concubineWorkaround.tw b/src/uncategorized/concubineWorkaround.tw
index d11f55d8fdb..92d6e9901aa 100644
--- a/src/uncategorized/concubineWorkaround.tw
+++ b/src/uncategorized/concubineWorkaround.tw
@@ -1,20 +1,12 @@
:: Concubine Workaround [silently]
<<if $Concubine != 0>>
- <<set _ID = $Concubine.ID, _SL = $slaves.length>>
- <<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>>
- <<removeJob $slaves[_i] "be your Concubine">>
- <<break>>
- <</if>>
- <</for>>
+ <<removeJob $Concubine "be your Concubine">>
<</if>>
<<if $i > -1>>
<<assignJob $slaves[$i] "be your Concubine">>
<<set $slaves[$i].livingRules = "luxurious">>
<<set $Concubine = $slaves[$i]>>
-<<else>>
- <<set $Concubine = 0>>
<</if>>
<<goto "Master Suite">>
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index b2b8572c228..06e4fb8c984 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -1,26 +1,18 @@
:: Dairy [nobr]
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Dairy", $showEncyclopedia = 1, $encyclopedia = "Dairy", _DL = $DairyiIDs.length, $dairySlaves = _DL, _SL = $slaves.length>>
+<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Dairy", $showEncyclopedia = 1, $encyclopedia = "Dairy", _SL = $slaves.length>>
+
<<silently>>
DairyRestraintsSetting($dairyRestraintsSetting)
<</silently>>
+
+<<SlaveSort $DairyiIDs>>
+<<set _DL = $DairyiIDs.length, $dairySlaves = _DL>>
<<dairyAssignmentFilter>>
<<if $dairyName != "the Dairy">>
<<set $dairyNameCaps = $dairyName.replace("the ", "The ")>>
<</if>>
-<<for _Di = 0; _Di < _DL; _Di++>>
-<<set _i = $DairyiIDs[_Di].Index, _ID = $DairyiIDs[_Di].ID>>
-<<if _i >= _SL || _ID != $slaves[_i].ID>>
- <<for _i = 0; _i < _SL; _i++>>
- <<if _ID == $slaves[_i].ID>>
- <<set $DairyiIDs[_Di].Index = _i>>
- <<break>>
- <</if>>
- <</for>>
-<</if>>
-<</for>>
-
<<if ($dairyRestraintsSetting != 2) || ($dairyRestraintsUpgrade != 1)>>
<<if $dairyStimulatorsSetting == 2>>
<<set $dairyStimulatorsSetting = 1>>
@@ -34,14 +26,10 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<</if>>
<<if ($Milkmaid != 0) && ($dairyRestraintsSetting == 2)>>
-<<for _i = 0; _i < _SL; _i++>>
-<<if $slaves[_i].assignment == "be the Milkmaid">>
- $slaves[_i].slaveName has been removed from her position as Milkmaid, since an industrialized dairy automates her duties.
- <<removeJob $slaves[_i] "be the Milkmaid">>
+ $Milkmaid.slaveName has been removed from her position as Milkmaid, since an industrialized dairy automates her duties.
+ <<removeJob $Milkmaid "be the Milkmaid">>
<br><br>
<</if>>
-<</for>>
-<</if>>
<<if ($dairySlaves > 1)>>
<<if $dairyFeedersSettingChanged == 1>>
@@ -51,7 +39,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<</if>>
<<if $dairyPregSettingChanged == 1>>
<<for _Di = 0; _Di < _DL; _Di++>>
- <<set _i = $DairyiIDs[_Di].Index>>
+ <<set _i = $slaveIndices[$DairyiIDs[_Di]]>>
<<if ($slaves[_i].vagina > -1) && ($slaves[_i].vagina < 3)>>
$slaves[_i].slaveName's milking machine ejects her, since it cannot fit the mandated dildo into her tight cunt.
<<removeJob $slaves[_i] "work in the dairy">>
@@ -84,7 +72,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<</if>>
<<if $dairyStimulatorsSettingChanged == 1>>
<<for _Di = 0; _Di < _DL; _Di++>>
- <<set _i = $DairyiIDs[_Di].Index>>
+ <<set _i = $slaveIndices[$DairyiIDs[_Di]]>>
<<if ($slaves[_i].anus < 3)>>
$slaves[_i].slaveName's milking machine ejects her, since it cannot fit its massive anal dildo up her tight asshole.
<<removeJob $slaves[_i] "work in the dairy">>
@@ -110,7 +98,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<if $dairyRestraintsSettingChanged == 1>>
<<if $dairyRestraintsSetting == 1>>
<<for _Di = 0; _Di < _DL; _Di++>>
- <<set _i = $DairyiIDs[_Di].Index>>
+ <<set _i = $slaveIndices[$DairyiIDs[_Di]]>>
<<if ($slaves[_i].indentureRestrictions >= 2)>>
$slaves[_i].slaveName's milking machine declines to restrain her, since she is encoded as an indentured servant protected from restraint for milking.
<<removeJob $slaves[_i] "work in the dairy">>
@@ -125,7 +113,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<elseif $dairyRestraintsSettingChanged == -1>>
<<if $dairyRestraintsSetting == 1>>
<<for _Di = 0; _Di < _DL; _Di++>>
- <<set _i = $DairyiIDs[_Di].Index>>
+ <<set _i = $slaveIndices[$DairyiIDs[_Di]]>>
<<if ($slaves[_i].indentureRestrictions >= 1)>>
$slaves[_i].slaveName's milking machine declines to restrain her, since she is encoded as an indentured servant protected from being restrained for milking.
<<removeJob $slaves[_i] "work in the dairy">>
@@ -481,7 +469,7 @@ $dairyNameCaps
<<link "''Send a slave to $dairyName''">>
<<replace #ComingGoing>>
<<resetAssignmentFilter>>
- <<set $Flag to 0>>
+ <<set $Flag = 0>>
<<include "Slave Summary">>
<</replace>>
<</link>>
@@ -514,4 +502,4 @@ $dairyNameCaps
<<resetAssignmentFilter>>
</span>
-<br><br>Rename $dairyName: <<textbox "$dairyName" $dairyName "Dairy">> //Use a noun or similar short phrase//
\ No newline at end of file
+<br><br>Rename $dairyName: <<textbox "$dairyName" $dairyName "Dairy">> //Use a noun or similar short phrase//
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index f6f86ff4bd5..e9fcd620ba9 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -1,21 +1,9 @@
:: Dairy Report [nobr]
-<<set _DL = $DairyiIDs.length, $dairySlaves = _DL, _SL = $slaves.length, $bioreactorPerfectedID = 0, $legendaryBallsID = 0, $legendaryCowID = 0, $milkmaidDevotionBonus = 1, $milkmaidHealthBonus = 0, $milkmaidTrustBonus = 1, $milkmaidDevotionThreshold = 45, $milkmaidTrustThreshold = 35, _anusesStretched = 0, _birthers = 0, _births = 0, _cumWeek = 0, _femCumWeek = 0, _FLsFetish = 0, _milkWeek = 0, _balltacular = 0, _boobtacular = 0, _careerForgotten = 0, _chemMinor = 0, _chemSevere = 0, _desterilized = 0, _hatefilled = 0, _horrified = 0, $intelligenceLost = 0, _mindbroken = 0, _profits = 0, _skillsLost = 0, _stupidified = 0, _vaginasStretched = 0>>
-
<<set _MMWorkout = 0>>
-<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $DairyiIDs[_dI].Index, _ID = $DairyiIDs[_dI].ID>>
- <<if $i >= _SL || _ID != $slaves[$i].ID>>
- /% IDs don't match-up so let's find her %/
- <<set $i = $slaves.findIndex(function(s) { return s.ID == _ID; }), $DairyiIDs[_dI].Index = $i>>
- <</if>>
- <<if $i == -1 || $slaves[$i].assignment != "work in the dairy">>
- <<set $DairyiIDs.deleteAt(_dI), _dI--, _DL--, $dairySlaves-->>
- <<continue>>
- <</if>>
-<</for>>
<<SlaveSort $DairyiIDs>>
+<<set _DL = $DairyiIDs.length, $dairySlaves = _DL, _SL = $slaves.length, $bioreactorPerfectedID = 0, $legendaryBallsID = 0, $legendaryCowID = 0, $milkmaidDevotionBonus = 1, $milkmaidHealthBonus = 0, $milkmaidTrustBonus = 1, $milkmaidDevotionThreshold = 45, $milkmaidTrustThreshold = 35, _anusesStretched = 0, _birthers = 0, _births = 0, _cumWeek = 0, _femCumWeek = 0, _FLsFetish = 0, _milkWeek = 0, _balltacular = 0, _boobtacular = 0, _careerForgotten = 0, _chemMinor = 0, _chemSevere = 0, _desterilized = 0, _hatefilled = 0, _horrified = 0, $intelligenceLost = 0, _mindbroken = 0, _profits = 0, _skillsLost = 0, _stupidified = 0, _vaginasStretched = 0>>
<<if ($Milkmaid != 0)>>
<<set _FLs = $slaves.findIndex(function(s) { return s.ID == $Milkmaid.ID; })>>
@@ -61,7 +49,7 @@
<<if (_DL > 0) && ($milkmaidImpregnates == 1) && (canPenetrate($Milkmaid)) && $Milkmaid.pubertyXY == 1>>
<<set _milkmaidImpregnated = 0>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $DairyiIDs[_dI].Index>>
+ <<set $i = $slaveIndices[$DairyiIDs[_dI]]>>
<<if (canImpreg($slaves[$i], $Milkmaid))>>
<<set $slaves[$i].preg = 1, $slaves[$i].pregSource = $Milkmaid.ID, _milkmaidImpregnated++, $slaves[$i].vaginalCount += 10, $vaginalTotal += 10>>
<</if>>
@@ -156,7 +144,7 @@
<</if>>
<<if ($dairyStimulatorsSetting < 2) && ($Milkmaid.dick > 4) && (canPenetrate($Milkmaid))>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $DairyiIDs[_dI].Index>>
+ <<set $i = $slaveIndices[$DairyiIDs[_dI]]>>
<<if ($slaves[$i].balls > 0)>>
She uses her turgid cock to give prostate stimulation to slaves that need help ejaculating.
<<break>>
@@ -165,7 +153,7 @@
<</if>>
<<set $milkmaidDevotionThreshold += (5*$milkmaidDevotionBonus), $milkmaidTrustThreshold += (5*$milkmaidTrustBonus)>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $DairyiIDs[_dI].Index>>
+ <<set $i = $slaveIndices[$DairyiIDs[_dI]]>>
<<if $Milkmaid.rivalryTarget == $slaves[$i].ID>>
She either neglects or harasses her <<if $Milkmaid.rivalry == 1>>growing rival<<elseif $Milkmaid.rivalry == 2>>rival<<elseif $Milkmaid.rivalry == 3>>bitter rival<</if>>, $slaves[$i].slaveName, making sure she is unhappy and uncomfortable.
<<set $slaves[$i].devotion -= 3, $slaves[$i].trust -= 3>>
@@ -270,7 +258,7 @@
<<set _oldCash = $cash>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $DairyiIDs[_dI].Index>>
+ <<set $i = $slaveIndices[$DairyiIDs[_dI]]>>
/* Special attention section */
<<if ($legendaryCowID == 0) && ($slaves[$i].lactation > 0) && (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 6000) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>>
<<set $legendaryCowID = $slaves[$i].ID>>
@@ -813,7 +801,7 @@ Due to one-off costs of hormonal implants to encourage fluid production, your da
<<if ($createBioreactors == 1) && ($bioreactorPerfectedID != 0)>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $DairyiIDs[_dI].Index>>
+ <<set $i = $slaveIndices[$DairyiIDs[_dI]]>>
<<if ($slaves[$i].ID == $bioreactorPerfectedID)>>
<br><br> <<SlaveFullName $slaves[$i]>>'s breasts<<if $slaves[$i].balls > 0>>, balls<</if>><<if $slaves[$i].ovaries == 1>>, belly<</if>>, body, and mind have been completely adapted to synthesize useful products. She has been reclassified as part of the machine she's now permanently attached to. This combination is projected to produce approximately
<<if $slaves[$i].balls > 0>><<print 1000*Math.trunc((3*52*(45-$slaves[$i].physicalAge))/1000)>> liters of cum,<</if>>
diff --git a/src/uncategorized/djWorkaround.tw b/src/uncategorized/djWorkaround.tw
index 7c7cb9f1357..f41e43e0ca1 100644
--- a/src/uncategorized/djWorkaround.tw
+++ b/src/uncategorized/djWorkaround.tw
@@ -1,20 +1,12 @@
:: DJ Workaround [silently]
<<if $DJ != 0>>
- <<set _ID = $DJ.ID, _SL = $slaves.length>>
- <<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>>
- <<removeJob $slaves[_i] "be the DJ">>
- <<break>>
- <</if>>
- <</for>>
+ <<removeJob $DJ "be the DJ">>
<</if>>
<<if $i > -1>>
<<assignJob $slaves[$i] "be the DJ">>
<<set $slaves[$i].livingRules = "luxurious">>
<<set $DJ = $slaves[$i]>>
-<<else>>
- <<set $DJ = 0>>
<</if>>
<<goto "Club">>
diff --git a/src/uncategorized/fullReport.tw b/src/uncategorized/fullReport.tw
index 40963b41ffc..af706f14e21 100644
--- a/src/uncategorized/fullReport.tw
+++ b/src/uncategorized/fullReport.tw
@@ -90,8 +90,8 @@
<</if>>
<<for _i = 0; _i < $HGTrainSlavesIDs.length; _i++>>
- <<if $slaves[$i].ID == $HGTrainSlavesIDs[_i][0]>>
- <<set $activeSlave = $slaves[$i], $HGtraining = $HGTrainSlavesIDs[_i][1]>>
+ <<if $slaves[$i].ID == $HGTrainSlavesIDs[_i].ID>>
+ <<set $activeSlave = $slaves[$i], $HGtraining = $HGTrainSlavesIDs[_i].training>>
<<include "HG Application">>
<br>
<</if>>
diff --git a/src/uncategorized/hgApplication.tw b/src/uncategorized/hgApplication.tw
index c9816f0a51f..f9938df9a37 100644
--- a/src/uncategorized/hgApplication.tw
+++ b/src/uncategorized/hgApplication.tw
@@ -3,43 +3,38 @@
<<if ndef $HGSeverity>>
<<set $HGSeverity = 0>>
<</if>>
-<<set $activeSlave.tired = 1>>
-<<set $HGEnergy -= 1>>
<<set _effectiveness = 15+$HeadGirl.actualAge+($HeadGirl.intelligence*10)-($HeadGirl.accent*5)+($HGSeverity*10)+($activeSlave.intelligence*10)-($activeSlave.accent*5)>>
<<if $AgePenalty == 0>>
<<set _effectiveness += Math.max(0,(30-$HeadGirl.actualAge))>>
<</if>>
-<<if $HeadGirl.sexualFlaw == "abusive">>
-<<if $HGSeverity >= 0>>
+<<if $HeadGirl.sexualFlaw == "abusive" && $HGSeverity >= 0>>
<<set _effectiveness += 10>>
<</if>>
-<</if>>
+<<set $activeSlave.tired = 1>>
''Your head girl __@@.pink;$HeadGirl.slaveName@@__'' notices that ''__@@.pink;$activeSlave.slaveName@@__''
-<<if $HGtraining == "health">>
+<<switch $HGtraining>>
+<<case "health">>
is unwell.
-<<elseif $HGtraining == "obedience">>
+<<case "obedience">>
is disobedient.
-<<elseif $HGtraining == "flaw">>
- has
- <<if ["cum addict", "anal addict", "attention whore", "breast growth", "abusive", "malicious", "self hating", "neglectful", "breeder"].includes($activeSlave.sexualFlaw)>>
- a paraphilia.
- <<else>>
- an unpleasant flaw worth fixing.
- <</if>>
-<<elseif $HGtraining == "soften">>
+<<case "paraphilia">>
+ has a paraphilia.
+<<case "flaw">>
+ has an unpleasant flaw worth fixing.
+<<case "soften">>
has an unpleasant flaw that she can try to soften into a unique quirk.
-<<elseif $HGtraining == "oral skill">>
+<<case "oral skill">>
isn't as orally skilled as she is.
-<<elseif $HGtraining == "anal skill">>
+<<case "anal skill">>
isn't as skilled at taking anal as she is.
-<<elseif $HGtraining == "fuck skill">>
+<<case "fuck skill">>
isn't as skilled at vaginal intercourse as she is.
-<<elseif $HGtraining == "whore skill">>
+<<case "whore skill">>
isn't as skilled at the fine art of sex for money as she is.
-<<elseif $HGtraining == "entertain skill">>
+<<case "entertain skill">>
isn't as skilled at entertainment as she is.
-<</if>>
+<</switch>>
<<if $HGtraining == "health">>
@@ -109,21 +104,21 @@ She helps $activeSlave.slaveName however she can. The tender care has @@.green;i
dutifully.
<</if>>
<<if $activeSlave.vagina == 0>>
- In $activeSlave.slaveName's case, she's careful to limit her sexual abuse to things that won't take the girl's virginity. The slave
- <<elseif $activeSlave.vagina == 0>>
- She's careful to molest $activeSlave.slaveName in ways that don't involve penetrating her virgin ass. The slave
+ In $activeSlave.slaveName's case, she's careful to limit her sexual abuse to things that won't take the girl's virginity. The slave
+ <<elseif $activeSlave.anus == 0>>
+ She's careful to molest $activeSlave.slaveName in ways that don't involve penetrating her virgin ass. The slave
<<else>>
$activeSlave.slaveName
<</if>>
<<if $activeSlave.devotion > 50>>
- accepts the abuse, believing she deserves to be raped.
+ accepts the abuse, believing she deserves to be raped.
<<elseif $activeSlave.devotion >= -20>>
- is @@.gold;frightened@@ by the unceasing abuse.
- <<set $activeSlave.trust -= 1>>
+ is @@.gold;frightened@@ by the unceasing abuse.
+ <<set $activeSlave.trust -= 1>>
<<else>>
- @@.mediumorchid;hates@@ and @@.gold;fears@@ the constant abuse.
- <<set $activeSlave.trust -= 1>>
- <<set $activeSlave.devotion -= 1>>
+ @@.mediumorchid;hates@@ and @@.gold;fears@@ the constant abuse.
+ <<set $activeSlave.trust -= 1>>
+ <<set $activeSlave.devotion -= 1>>
<</if>>
$HeadGirl.slaveName makes sure her victim hates it, every time, and $activeSlave.slaveName can't help but do her very best to avoid this treatment.
<<elseif $HGSeverity == 0>>
@@ -131,28 +126,28 @@ She helps $activeSlave.slaveName however she can. The tender care has @@.green;i
<<if $HeadGirl.sexualFlaw == "abusive">>
and she usually decides in favor of forcing misbehaving slaves to get her off.
<<elseif $HeadGirl.fetish == "sadist">>
- permission the sadist uses for her own gratification.
+ permission the sadist uses for her own gratification.
<<elseif $HeadGirl.fetish == "dom">>
- which the dominant girl uses confidently.
+ which the dominant girl uses confidently.
<<elseif $HeadGirl.energy > 95>>
- which she uses to
- <<if ($HeadGirl.balls > 0)>>
- force her subordinates to keep her balls drained.
- <<else>>
- extract the constant sexual favors her libido demands.
- <</if>>
+ which she uses to
+ <<if ($HeadGirl.balls > 0)>>
+ force her subordinates to keep her balls drained.
+ <<else>>
+ extract the constant sexual favors her libido demands.
+ <</if>>
<<else>>
- and she does her best to be fair.
+ and she does her best to be fair.
<</if>>
$activeSlave.slaveName
<<if $activeSlave.devotion > 50>>
- is @@.mediumaquamarine;grateful@@ that she is punished justly when she makes mistakes.
- <<set $activeSlave.trust += 1>>
+ is @@.mediumaquamarine;grateful@@ that she is punished justly when she makes mistakes.
+ <<set $activeSlave.trust += 1>>
<<elseif $activeSlave.devotion >= -20>>
- does her best to learn quickly and avoid punishment.
+ does her best to learn quickly and avoid punishment.
<<else>>
- is @@.gold;scared@@ by her inability to get away with the smallest disobedience.
- <<set $activeSlave.trust -= 1>>
+ is @@.gold;scared@@ by her inability to get away with the smallest disobedience.
+ <<set $activeSlave.trust -= 1>>
<</if>>
<<else>>
You require her to use respect when punishing; she does her best to motivate, but is unable to use real fear as a tool. $activeSlave.slaveName understands this, and @@.mediumaquamarine;trusts@@ that if she fails, the consequences won't be too awful.
@@ -168,39 +163,37 @@ She helps $activeSlave.slaveName however she can. The tender care has @@.green;i
<<elseif $activeSlave.devotion < -20>>
She keeps $activeSlave.slaveName constantly aware of her slavery, @@.gold;breaking $activeSlave.slaveName's resistance.@@
<<else>>
- She acts as another pair of eyes watching $activeSlave.slaveName and metes out punishments, @@.gold;improving $activeSlave.slaveName's servitude.@@
+ She acts as another pair of eyes watching $activeSlave.slaveName and metes out punishments, @@.gold;improving $activeSlave.slaveName's servitude.@@
+<</if>>
+
+<<elseif $HGtraining == "paraphilia">>
+
+<<set _effectiveness -= $activeSlave.intelligence*15>>
+<<set $activeSlave.training += _effectiveness>>
+ $HeadGirl.slaveName does her best to get $activeSlave.slaveName past it with punishments and rewards,
+<<if $activeSlave.training > 100>>
+ and @@.green;resolves $activeSlave.slaveName's paraphilia.@@
+ <<set $activeSlave.training = 0>>
+ <<set $activeSlave.sexualFlaw = "none">>
+<<else>>
+ and makes partial progress.
<</if>>
<<elseif $HGtraining == "flaw">>
<<set _effectiveness -= $activeSlave.intelligence*15>>
<<set $activeSlave.training += _effectiveness>>
-<<if ["cum addict", "anal addict", "attention whore", "breast growth", "abusive", "malicious", "self hating", "neglectful", "breeder"].includes($activeSlave.sexualFlaw)>>
- $HeadGirl.slaveName does her best to get $activeSlave.slaveName past it with punishments and rewards,
- <<if $activeSlave.training > 100>>
- <<set $activeSlave.training = 0>>
- and @@.green;resolves $activeSlave.slaveName's paraphilia.@@
- <<if $activeSlave.behavioralFlaw != "none">>
+$HeadGirl.slaveName punishes $activeSlave.slaveName whenever she catches her indulging in her bad habits,
+<<if $activeSlave.training > 100>>
+ and @@.green;fixes $activeSlave.slaveName's flaw.@@
+ <<set $activeSlave.training = 0>>
+ <<if $activeSlave.behavioralFlaw != "none">>
<<set $activeSlave.behavioralFlaw = "none">>
- <<elseif $activeSlave.sexualFlaw != "none">>
+ <<elseif $activeSlave.sexualFlaw != "none">>
<<set $activeSlave.sexualFlaw = "none">>
- <</if>>
- <<else>>
- and makes partial progress.
<</if>>
<<else>>
- $HeadGirl.slaveName punishes $activeSlave.slaveName whenever she catches her indulging in her bad habits,
- <<if $activeSlave.training > 100>>
- <<set $activeSlave.training = 0>>
- and @@.green;fixes $activeSlave.slaveName's flaw.@@
- <<if $activeSlave.behavioralFlaw != "none">>
- <<set $activeSlave.behavioralFlaw = "none">>
- <<elseif $activeSlave.sexualFlaw != "none">>
- <<set $activeSlave.sexualFlaw = "none">>
- <</if>>
- <<else>>
and makes partial progress.
- <</if>>
<</if>>
<<elseif $HGtraining == "soften">>
@@ -212,47 +205,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">>
- <<if ($activeSlave.behavioralFlaw == "arrogant")>>
- <<set $activeSlave.behavioralQuirk = "confident">>
- <<elseif ($activeSlave.behavioralFlaw == "bitchy")>>
- <<set $activeSlave.behavioralQuirk = "cutting">>
- <<elseif ($activeSlave.behavioralFlaw == "odd")>>
- <<set $activeSlave.behavioralQuirk = "funny">>
- <<elseif ($activeSlave.behavioralFlaw == "hates men")>>
- <<set $activeSlave.behavioralQuirk = "adores women">>
- <<elseif ($activeSlave.behavioralFlaw == "hates women")>>
- <<set $activeSlave.behavioralQuirk = "adores men">>
- <<elseif ($activeSlave.behavioralFlaw == "gluttonous")>>
- <<set $activeSlave.behavioralQuirk = "fitness">>
- <<elseif ($activeSlave.behavioralFlaw == "anorexic")>>
- <<set $activeSlave.behavioralQuirk = "insecure">>
- <<elseif ($activeSlave.behavioralFlaw == "devout")>>
- <<set $activeSlave.behavioralQuirk = "sinful">>
- <<elseif ($activeSlave.behavioralFlaw == "liberated")>>
- <<set $activeSlave.behavioralQuirk = "advocate">>
- <</if>>
- <<set $activeSlave.behavioralFlaw = "none">>
+ <<SoftenBehavioralFlaw $activeSlave>>
<<elseif $activeSlave.sexualFlaw != "none">>
- <<if ($activeSlave.sexualFlaw == "hates oral")>>
- <<set $activeSlave.sexualQuirk = "gagfuck queen">>
- <<elseif ($activeSlave.sexualFlaw == "hates anal")>>
- <<set $activeSlave.sexualQuirk = "painal queen">>
- <<elseif ($activeSlave.sexualFlaw == "hates penetration")>>
- <<set $activeSlave.sexualQuirk = "strugglefuck queen">>
- <<elseif ($activeSlave.sexualFlaw == "shamefast")>>
- <<set $activeSlave.sexualQuirk = "tease">>
- <<elseif ($activeSlave.sexualFlaw == "idealistic")>>
- <<set $activeSlave.sexualQuirk = "romantic">>
- <<elseif ($activeSlave.sexualFlaw == "repressed")>>
- <<set $activeSlave.sexualQuirk = "perverted">>
- <<elseif ($activeSlave.sexualFlaw == "apathetic")>>
- <<set $activeSlave.sexualQuirk = "caring">>
- <<elseif ($activeSlave.sexualFlaw == "crude")>>
- <<set $activeSlave.sexualQuirk = "unflinching">>
- <<elseif ($activeSlave.sexualFlaw == "judgemental")>>
- <<set $activeSlave.sexualQuirk = "size queen">>
- <</if>>
- <<set $activeSlave.sexualFlaw = "none">>
+ <<SoftenSexualFlaw $activeSlave>>
<</if>>
<<else>>
and makes partial progress.
diff --git a/src/uncategorized/hgWorkaround.tw b/src/uncategorized/hgWorkaround.tw
index 9d82c324b7e..a87de77ce3d 100644
--- a/src/uncategorized/hgWorkaround.tw
+++ b/src/uncategorized/hgWorkaround.tw
@@ -1,19 +1,11 @@
:: HG Workaround [silently]
<<if $HeadGirl != 0>>
- <<set _ID = $HeadGirl.ID, _SL = $slaves.length>>
- <<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>>
- <<removeJob $slaves[_i] "be your Head Girl">>
- <<break>>
- <</if>>
- <</for>>
+ <<removeJob $HeadGirl "be your Head Girl">>
<</if>>
<<if $i > -1>>
<<assignJob $slaves[$i] "be your Head Girl">>
<<set $HeadGirl = $slaves[$i]>>
-<<else>>
- <<set $HeadGirl = 0>>
<</if>>
<<set $HGTimeInGrade = 0>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 47f345b02fd..911bb986aef 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1052,7 +1052,6 @@ when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of its lower
<<if $activeSlave.fuckdoll == 0>>
<<if $showBodyMods == 1>>
- <<if ($activeSlave.brand != 0)>>
<<if ($activeSlave.brandLocation == "neck")
|| ($activeSlave.brandLocation == "left cheek")
|| ($activeSlave.brandLocation == "right cheek")
@@ -1062,7 +1061,6 @@ when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of its lower
|| ($activeSlave.brandLocation == "ears")>>
<<brandDescription>>
<</if>>
- <</if>>
<</if>>
<</if>>
@@ -1592,7 +1590,6 @@ $pronounCap is
<<if $activeSlave.fuckdoll == 0>>
<<if $showBodyMods == 1>>
- <<if ($activeSlave.brand != 0)>>
/* Check it's not a facial brand: */
<<if ($activeSlave.brandLocation == "back")
|| ($activeSlave.brandLocation == "chest")
@@ -1622,7 +1619,6 @@ $pronounCap is
|| ($activeSlave.brandLocation == "feet")>>
<<brandDescription>>
<</if>>
- <</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/madamWorkaround.tw b/src/uncategorized/madamWorkaround.tw
index ca7b8e3eb50..4c3d6432a10 100644
--- a/src/uncategorized/madamWorkaround.tw
+++ b/src/uncategorized/madamWorkaround.tw
@@ -1,20 +1,12 @@
:: Madam Workaround [silently]
<<if $Madam != 0>>
- <<set _ID = $Madam.ID, _SL = $slaves.length>>
- <<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>>
- <<removeJob $slaves[_i] "be the Madam">>
- <<break>>
- <</if>>
- <</for>>
+ <<removeJob $Madam "be the Madam">>
<</if>>
<<if $i > -1>>
<<assignJob $slaves[$i] "be the Madam">>
<<set $slaves[$i].livingRules = "luxurious">>
<<set $Madam = $slaves[$i]>>
-<<else>>
- <<set $Madam = 0>>
<</if>>
<<goto "Brothel">>
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index f8c20f3e395..8c8b219f974 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -89,6 +89,336 @@
<<if $seeFCNN == 1>><center>FCNN: <<print $fcnn.random()>> [[Hide|Main][$seeFCNN = 0]]</center><</if>>
<<if ($seeDesk == 1) && ($seeFCNN == 0)>><br><</if>>
+<<if $lowercaseDonkey == 1>>
+
+<br>
+
+<<if $positionMainLinks >= 0>>
+ <<MainLinks>>
+<</if>>
+<br>
+<<if $rulesAssistantMain != 0>>
+ //<span id="RAButton"><<link "Rules Assistant Options">><<goto "Rules Assistant">><</link>></span>// @@.cyan;[R]@@
+ <<if $rulesAssistantAuto != 1>>
+ | //<<link "Apply Rules Assistant at week end">><<set $rulesAssistantAuto = 1>><<goto "Main">><</link>>//
+ <<else>>
+ | //<<link "Stop applying Rules Assistant at week end">><<set $rulesAssistantAuto = 0>><<goto "Main">><</link>>//
+ <</if>>
+ | //<<link "Re-apply Rules Assistant now (this will only check slaves in the Penthouse)">><<for _i = 0;_i < _SL;_i++>><<if $slaves[_i].assignmentVisible == 1 && $slaves[_i].useRulesAssistant == 1>><<CheckAutoRulesActivate $slaves[_i]>><<DefaultRules $slaves[_i]>><</if>><</for>><<goto "Main">><</link>>//
+<</if>>
+
+
+<<if $useTabs == 0>>
+ <<include "Slave Summary">>
+<<else>>
+ <<CreateSimpleTabs>>
+ <body>
+
+ <div class="tab">
+ <button class="tablinks" onclick="opentab(event, 'overview')" id="defaultButton">Overview</button>
+ <button class="tablinks" onclick="opentab(event, 'Resting')">Resting</button>
+ <button class="tablinks" onclick="opentab(event, 'stay confined')">Confined</button>
+ <button class="tablinks" onclick="opentab(event, 'take classes')">Students</button>
+ <button class="tablinks" onclick="opentab(event, 'please you')">Fucktoys</button>
+ <button class="tablinks" onclick="opentab(event, 'whore')">Whores</button>
+ <button class="tablinks" onclick="opentab(event, 'serve the public')">Public Servants</button>
+ <button class="tablinks" onclick="opentab(event, 'be a servant')">Servants</button>
+ <button class="tablinks" onclick="opentab(event, 'get milked')">Cows</button>
+ <button class="tablinks" onclick="opentab(event, 'work a glory hole')">Gloryhole</button>
+ <button class="tablinks" onclick="opentab(event, 'be a subordinate slave')">Subordinate slaves</button>
+ <button class="tablinks" onclick="opentab(event, 'All')">All</button>
+ </div>
+
+ <div id="overview" class="tabcontent">
+ <div class="content">
+ <<set $slaveAssignmentTab = "overview">>
+ <<if _HG > -1>>
+ ''__@@.pink;<<SlaveFullName $HeadGirl>>@@__'' is <<if ndef $headGirlFocus>>serving as your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>.<<else>>your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort,<</if>> and is focusing on your slaves' $headGirlFocus.<</if>>
+ <span id="manageHG"><strong><<link "Manage Head Girl">><<goto "HG Select">><</link>></strong></span> @@.cyan;[H]@@
+ <<set $showOneSlave = "Head Girl">>
+ <<include "Slave Summary">>
+ <<elseif (_HG == -1) && ($slaves.length > 1)>>
+ You have @@.red;not@@ selected a Head Girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>. <span id="manageHG"><strong><<link "Select one">><<goto "HG Select">><</link>></strong></span> @@.cyan;[H]@@
+ <<elseif (_HG == -1)>>
+ //You do not have enough slaves to keep a Head Girl//
+ <</if>>
+ <br><br>
+ <<if _RC > -1>>
+ ''__@@.pink;<<SlaveFullName $Recruiter>>@@__'' is working to recruit girls.
+ <span id="manageRecruiter"><strong><<link "Manage Recruiter">><<goto "Recruiter Select">><</link>></strong></span> @@.cyan;[U]@@
+ <<set $showOneSlave = "recruit girls">>
+ <<include "Slave Summary">>
+ <<else>>
+ You have @@.red;not@@ selected a Recruiter.
+ <span id="manageRecruiter"><strong><<link "Select one">><<goto "Recruiter Select">><</link>></strong></span> @@.cyan;[U]@@
+ <</if>>
+ <<if ($dojo != 0)>>
+ <br><br>
+ <<if _BG > -1>>
+ ''__@@.pink;<<SlaveFullName $Bodyguard>>@@__'' is serving as your bodyguard. <span id="manageBG"><strong><<link "Manage Bodyguard">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
+ <<set $showOneSlave = "guard you">>
+ <<include "Slave Summary">>
+ <<else>>
+ You have @@.red;not@@ selected a Bodyguard. <span id="manageBG"><strong><<link "Select one">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
+ <</if>>
+
+ /* Start Italic event text */
+ <<if (_BG > -1) && ($slaves[_BG].assignment == "guard you")>>
+ <<set $i = _BG>>
+ <<set _GO = "idiot ball">>
+ <br><<include "Use Guard">>
+ <br> <<print "[[Use her mouth|FLips][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ | <<print "[[Play with her tits|FBoobs][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ <<if canDoVaginal($slaves[_BG])>>
+ | <<print "[[Fuck her|FVagina][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ <<if canDoAnal($slaves[_BG])>>
+ | <<print "[[Use her holes|FButt][$activeSlave = $slaves["+_BG+"],$nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ <</if>>
+ <</if>>
+ /*check*/
+ <<if canAchieveErection($slaves[_BG])>>
+ | <<print "[[Ride her|FDick][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ <</if>>
+ <<if canDoAnal($slaves[_BG])>>
+ | <<print "[[Fuck her ass|FAnus][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ <</if>>
+ | <<print "[[Abuse her|Gameover][$gameover = _GO]]">>
+ <</if>>
+ /* End Italic event text */
+
+ <</if>>
+ </div>
+ </div>
+
+ <div id="Resting" class="tabcontent">
+ <div class="content">
+ <<if $showTipsFromEncy != 0>>
+ //<<encyclopediaEntryRest>>
+ Associated facilities:
+ <<if $spa>>[[Spa]],<<else>>Spa,<</if>>
+ <<if $clinic>>[[Clinic]]<<else>>Clinic<</if>>//
+ <</if>>
+ //<<OptionsSortAsAppearsOnMain>>//
+ <<set $slaveAssignmentTab = "resting">>
+ <<include "Slave Summary">>
+ </div>
+ </div>
+
+ <div id="stay confined" class="tabcontent">
+ <div class="content">
+ <<if $showTipsFromEncy != 0>>
+ //<<encyclopediaEntryConfinement>>
+ Associated facility: <<if $cellblock>>[[Cellblock]]<<else>>Cellblock<</if>>//
+ <</if>>
+ //<<OptionsSortAsAppearsOnMain>>//
+ <<set $slaveAssignmentTab = "stay confined">>
+ <<include "Slave Summary">>
+ </div>
+ </div>
+
+ <div id="take classes" class="tabcontent">
+ <div class="content">
+ <<if $showTipsFromEncy != 0>>
+ //<<encyclopediaEntryAttendingClasses>>
+ Associated facility: <<if $schoolroom>>[[Schoolroom]]<<else>>Schoolroom<</if>>//
+ <</if>>
+ //<<OptionsSortAsAppearsOnMain>>//
+ <<set $slaveAssignmentTab = "take classes">>
+ <<include "Slave Summary">>
+ </div>
+ </div>
+
+ <div id="please you" class="tabcontent">
+ <div class="content">
+ <<if $showTipsFromEncy != 0>>
+ //<<encyclopediaEntryFucktoy>>
+ Associated facility: <<if $masterSuite>>[[Master Suite]]<<else>>Master Suite<</if>> //
+ <</if>>
+ <br>
+ /* Start Italic event text */
+ <<set _j = "Back", _k = "AS Dump", _l = "Main">>
+ <<for $i = 0; $i < _SL; $i++>>
+ <<if ($slaves[$i].assignment == "please you")>>
+ <br><<include "Toychest">> //In the coming week you plan to concentrate on
+ <<if $slaves[$i].fuckdoll == 0>>
+ <<if $slaves[$i].toyHole != "all her holes">>
+ her $slaves[$i].toyHole, but for now://
+ <br> <<print "[[Use her mouth|FLips][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">> | <<print "[[Play with her tits|FBoobs][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ <<if canDoVaginal($slaves[$i])>>
+ | <<print "[[Fuck her|FVagina][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ <<if canDoAnal($slaves[$i])>>
+ | <<print "[[Use her holes|FButt][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ <</if>>
+ <</if>>
+ <<if canDoAnal($slaves[$i])>>
+ | <<print "[[Fuck her ass|FAnus][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ <</if>>
+ /*check*/
+ <<if canAchieveErection($slaves[$i])>>
+ | <<print "[[Ride her|FDick][$activeSlave = $slaves["+$i+"],$nextButton = _j,$nextLink = _k,$returnTo = _l]]">>
+ <</if>>
+ | <<print "[[Abuse her|FAbuse][$activeSlave = $slaves["+$i+"],$nextButton = _j,$nextLink = _k,$returnTo = _l]]">>
+ <<else>>
+ all of her holes equally, but for now://
+ <br> <<print "[[Use her mouth|FLips][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">> | <<print "[[Play with her tits|FBoobs][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ <<if canDoVaginal($slaves[$i])>>
+ | <<print "[[Fuck her|FVagina][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ <<if canDoAnal($slaves[$i])>>
+ | <<print "[[Use her holes|FButt][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ <</if>>
+ <</if>>
+ <<if canDoAnal($slaves[$i])>>
+ | <<print "[[Fuck her ass|FAnus][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ <</if>>
+ /*check*/
+ <<if canAchieveErection($slaves[$i])>>
+ | <<print "[[Ride her|FDick][$activeSlave = $slaves["+$i+"],$nextButton = _j,$nextLink = _k,$returnTo = _l]]">>
+ <</if>>
+ | <<print "[[Abuse her|FAbuse][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ <</if>>
+ <<else>>
+ <<if $slaves[$i].toyHole != "all her holes">>
+ its $slaves[$i].toyHole.
+ <<else>>
+ all of its holes.
+ <</if>>
+ <</if>>
+ <</if>>
+ <</for>>
+ /* End Italic event text */
+ <br>
+ //<<OptionsSortAsAppearsOnMain>>//
+ <<set $slaveAssignmentTab = "please you">>
+ <<include "Slave Summary">>
+ </div>
+ </div>
+
+ <div id="whore" class="tabcontent">
+ <div class="content">
+ <<if $showTipsFromEncy != 0>>
+ //<<encyclopediaEntryWhoring>>
+ Associated facility: <<if $brothel>>[[Brothel]]<<else>>Brothel<</if>>//
+ <</if>>
+ //<<OptionsSortAsAppearsOnMain>>//
+ <<set $slaveAssignmentTab = "whore">>
+ <<include "Slave Summary">>
+ </div>
+ </div>
+
+ <div id="serve the public" class="tabcontent">
+ <div class="content">
+ <<if $showTipsFromEncy != 0>>
+ //<<encyclopediaEntryPublicService>>
+ Associated facility: <<if $club>>[[Club]]<<else>>Club<</if>> //
+ <</if>>
+ //<<OptionsSortAsAppearsOnMain>>//
+ <<set $slaveAssignmentTab = "serve the public">>
+ <<include "Slave Summary">>
+ </div>
+ </div>
+
+ <div id="be a servant" class="tabcontent">
+ <div class="content">
+ <<if $showTipsFromEncy != 0>>
+ //<<encyclopediaEntryServitude>>
+ Associated facility: <<if $servantsQuarters>>[[Servants' Quarters]]<<else>>Servant's Quarters<</if>>//
+ <</if>>
+ //<<OptionsSortAsAppearsOnMain>>//
+ <<set $slaveAssignmentTab = "be a servant">>
+ <<include "Slave Summary">>
+ </div>
+ </div>
+
+ <div id="get milked" class="tabcontent">
+ <div class="content">
+ <<if $showTipsFromEncy != 0>>
+ //<<encyclopediaEntryMilking>> Associated facility: <<if $dairy>>[[Dairy]]<<else>>Dairy<</if>>//
+ <</if>>
+ //<<OptionsSortAsAppearsOnMain>>//
+ <<set $slaveAssignmentTab = "get milked">>
+ <<include "Slave Summary">>
+ </div>
+ </div>
+
+ <div id="work a glory hole" class="tabcontent">
+ <div class="content">
+ <<if $showTipsFromEncy != 0>>
+ //<<encyclopediaEntryGloryHole>>
+ Associated facility: <<if $arcade>>[[Arcade]]<<else>>Arcade<</if>>//
+ <</if>>
+ //<<OptionsSortAsAppearsOnMain>>//
+ <<set $slaveAssignmentTab = "work a glory hole">>
+ <<include "Slave Summary">>
+ </div>
+ </div>
+
+ <div id="be a subordinate slave" class="tabcontent">
+ <div class="content">
+ <<if $showTipsFromEncy != 0>>
+ //<<encyclopediaEntrySexualServitude>>//
+ <</if>>
+ //<<OptionsSortAsAppearsOnMain>>//
+ <<set $slaveAssignmentTab = "be a subordinate slave">>
+ <<include "Slave Summary">>
+ </div>
+ </div>
+
+ <div id="All" class="tabcontent">
+ <div class="content">
+ //<<OptionsSortAsAppearsOnMain>>//
+ <<set $slaveAssignmentTab = "all">>
+ <<include "Slave Summary">>
+ </div>
+ </div>
+
+ <script>
+ function opentab(evt, tabName) {
+ var i, tabcontent, tablinks;
+ tabcontent = document.getElementsByClassName("tabcontent");
+ for (i = 0; i < tabcontent.length; i++) {
+ tabcontent[i].style.display = "none";
+ }
+ tablinks = document.getElementsByClassName("tablinks");
+ for (i = 0; i < tablinks.length; i++) {
+ tablinks[i].className = tablinks[i].className.replace(" active", "");
+ }
+ document.getElementById(tabName).style.display = "block";
+ evt.currentTarget.className += " active";
+ }
+
+ document.getElementById("defaultButton").click();
+ </script>
+
+ </body>
+<</if>>
+
+<<if $useTabs == 0>>
+<<if (_BG > -1) && ($slaves[_BG].assignment == "guard you")>>
+ <<set $i = _BG>>
+ <<include "Use Guard">>
+ <br> <<print "[[Use her mouth|FLips][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ | <<print "[[Play with her tits|FBoobs][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ <<if canDoVaginal($slaves[_BG])>>
+ | <<print "[[Fuck her|FVagina][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ <<if canDoAnal($slaves[_BG])>>
+ | <<print "[[Use her holes|FButt][$activeSlave = $slaves["+_BG+"],$nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ <</if>>
+ <</if>>
+ <<if canDoAnal($slaves[_BG])>>
+ | <<print "[[Fuck her ass|FAnus][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ <</if>>
+ | <<print "[[Abuse her|FAbuse][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+<</if>>
+<</if>>
+
+<<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>>
+<<if $positionMainLinks <= 0>>
+ <br><<MainLinks>>
+<</if>>
+
+
+<<else>>
+
__''MAIN MENU''__ //[[Summary Options]]//
<<if $rulesAssistantMain != 0>>
| //<span id="RAButton"><<link "Rules Assistant Options">><<goto "Rules Assistant">><</link>></span>// @@.cyan;[R]@@
@@ -215,6 +545,8 @@ Filter by assignment: |
| <<print "[[Abuse her|Gameover][$gameover = _GO]]">>
<</if>>
+<</if>> /* closes lowercase_donkey's fuckery */
+
<<set $activeSlave = Array.random($slaves)>>
<<if $activeSlave && ($activeSlave.assignment != "please you") && ($activeSlave.assignment != "guard you")>>
<br><<include "Walk Past">>
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index d08cbec0c91..39b859b38bb 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -1,42 +1,29 @@
:: Master Suite [nobr]
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Master Suite", $showEncyclopedia = 1, $encyclopedia = "Master Suite", _DL = $MastSiIDs.length, $masterSuiteSlaves = _DL, _SL = $slaves.length>>
+<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Master Suite", $showEncyclopedia = 1, $encyclopedia = "Master Suite", _SL = $slaves.length>>
+
+<<SlaveSort $MastSiIDs>>
+<<set _DL = $MastSiIDs.length, $masterSuiteSlaves = _DL>>
<<suiteAssignmentFilter>>
+
<<if $masterSuiteName != "the Master Suite">>
<<set $masterSuiteNameCaps = $masterSuiteName.replace("the ", "The ")>>
<</if>>
<<set $masterSuiteAverageEnergy = 0, _masterSuiteAverageCum = 0, _masterSuiteAverageDick = 0, _masterSuiteAverageDom = 0, _masterSuiteAverageMilk = 0, _masterSuiteAveragePreg = 0, _masterSuiteAverageSadism = 0, _masterSuitePregnantSlaves = 0, _masterSuitePregnantSlavesMultiple = 0>>
-<<if $Concubine != 0>>
-<<for _FLs = 0; _FLs < _SL; _FLs++>>
-<<if $slaves[_FLs].ID == $Concubine.ID>>
-<<if ($slaves[_FLs].preg >= 4)>>
+<<if ($Concubine != 0 && $Concubine.preg >= 4)>>
<<set _masterSuitePregnantSlaves++>>
- <<if $slaves[_FLs].pregType > 1>>
+ <<if $Concubine.pregType > 1>>
<<set _masterSuitePregnantSlavesMultiple++>>
<</if>>
- <<break>>
-<</if>>
-<</if>>
-<</for>>
<</if>>
<<if $masterSuiteSlaves > 0>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set _i = $MastSiIDs[_dI].Index, _ID = $MastSiIDs[_dI].ID>>
- <<if _i >= _SL || _ID != $slaves[_i].ID>>
- /% Slaves.ID and $MastSiIDs.ID's don't match-up so let's find her %/
- <<for _i = 0; _i < _SL; _i++>>
- <<if _ID == $slaves[_i].ID>>
- /% Correct the Index %/
- <<set $MastSiIDs[_dI].Index = _i>>
- <<break>>
- <</if>>
- <</for>>
- <</if>>
- /% Onward bound as normal %/
+ <<set _i = $slaveIndices[$MastSiIDs[_dI]]>>
<<set _Slave = $slaves[_i]>>
+
<<if $masterSuiteUpgradeLuxury == 2>>
<<if canAchieveErection(_Slave)>>
<<set _masterSuiteAverageCum += _Slave.balls, _masterSuiteAverageDick += _Slave.dick>>
@@ -351,7 +338,7 @@ $masterSuiteNameCaps is furnished
<<link "''Send a slave to serve in $masterSuiteName''">>
<<replace #ComingGoing>>
<<resetAssignmentFilter>>
- <<set $Flag to 0>>
+ <<set $Flag = 0>>
<<include "Slave Summary">>
<</replace>>
<</link>>
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 734bd7935ac..eec4895a44d 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -1,32 +1,19 @@
:: Master Suite Report [nobr]
-<<set _DL = $MastSiIDs.length, $masterSuiteSlaves = _DL, _SL = $slaves.length, $legendaryAbolitionistID = 0, $masterSuiteAverageEnergy = 0, _masterSuiteAverageCum = 0, _masterSuiteAverageDick = 0, _masterSuiteAverageDom = 0, _masterSuiteAverageMilk = 0, _masterSuiteAveragePreg = 0, _masterSuiteAverageSadism = 0, _masterSuitePregnantSlaves = 0, _masterSuitePregnantSlavesMultiple = 0>>
-
-<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $MastSiIDs[_dI].Index, _ID = $MastSiIDs[_dI].ID>>
- <<if $i >= _SL || _ID != $slaves[$i].ID>>
- /% IDs don't match-up so let's find her %/
- <<set $i = $slaves.findIndex(function(s) { return s.ID == _ID; }), $MastSiIDs[_dI].Index = $i>>
- <</if>>
- <<if $i == -1 || $slaves[$i].assignment != "serve in the master suite">>
- <<set $MastSiIDs.deleteAt(_dI), _dI--, _DL--, $masterSuiteSlaves-->>
- <<continue>>
- <</if>>
-<</for>>
<<SlaveSort $MastSiIDs>>
-
+<<set _DL = $MastSiIDs.length, $masterSuiteSlaves = _DL, _SL = $slaves.length, $legendaryAbolitionistID = 0, $masterSuiteAverageEnergy = 0, _masterSuiteAverageCum = 0, _masterSuiteAverageDick = 0, _masterSuiteAverageDom = 0, _masterSuiteAverageMilk = 0, _masterSuiteAveragePreg = 0, _masterSuiteAverageSadism = 0, _masterSuitePregnantSlaves = 0, _masterSuitePregnantSlavesMultiple = 0>>
<<if $Concubine != 0>>
<<set _FLs = $slaves.findIndex(function(s) { return s.ID == $Concubine.ID; })>>
<<if _FLs != -1>>
/% Add the Concubine to the $MastSiIDs list at the front of the array, so that she displays first %/
- <<set $MastSiIDs.unshift({ID: $Concubine.ID, Index: _FLs}), _DL++>>
+ <<set $MastSiIDs.unshift($Concubine.ID), _DL++>>
<</if>>
<</if>>
<<if _DL > 0>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $MastSiIDs[_dI].Index>>
+ <<set $i = $slaveIndices[$MastSiIDs[_dI]]>>
<<set $masterSuiteAverageEnergy += $slaves[$i].energy>>
<<if $masterSuiteUpgradeLuxury == 2>>
<<if canAchieveErection($slaves[$i])>>
@@ -109,7 +96,7 @@
<</if>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $MastSiIDs[_dI].Index>>
+ <<set $i = $slaveIndices[$MastSiIDs[_dI]]>>
<br><br>
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
@@ -404,3 +391,4 @@
<<if _DL > 0 || $Concubine != 0>>
<br><br>
<</if>>
+
diff --git a/src/uncategorized/milkmaidWorkaround.tw b/src/uncategorized/milkmaidWorkaround.tw
index fb152b7a079..64a1b6c64cb 100644
--- a/src/uncategorized/milkmaidWorkaround.tw
+++ b/src/uncategorized/milkmaidWorkaround.tw
@@ -1,20 +1,12 @@
:: Milkmaid Workaround [silently]
<<if $Milkmaid != 0>>
- <<set _ID = $Milkmaid.ID, _SL = $slaves.length>>
- <<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>>
- <<removeJob $slaves[_i] "be the Milkmaid">>
- <<break>>
- <</if>>
- <</for>>
+ <<removeJob $Milkmaid "be the Milkmaid">>
<</if>>
<<if $i > -1>>
<<assignJob $slaves[$i] "be the Milkmaid">>
<<set $slaves[$i].livingRules = "luxurious">>
<<set $Milkmaid = $slaves[$i]>>
-<<else>>
- <<set $Milkmaid = 0>>
<</if>>
<<goto "Dairy">>
diff --git a/src/uncategorized/nurseWorkaround.tw b/src/uncategorized/nurseWorkaround.tw
index 2ac24c213c9..846407e35b4 100644
--- a/src/uncategorized/nurseWorkaround.tw
+++ b/src/uncategorized/nurseWorkaround.tw
@@ -1,20 +1,12 @@
:: Nurse Workaround [silently]
<<if $Nurse != 0>>
- <<set _ID = $Nurse.ID, _SL = $slaves.length>>
- <<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>>
- <<removeJob $slaves[_i] "be the Nurse">>
- <<break>>
- <</if>>
- <</for>>
+ <<removeJob $Nurse "be the Nurse">>
<</if>>
<<if $i > -1>>
<<assignJob $slaves[$i] "be the Nurse">>
<<set $slaves[$i].livingRules = "luxurious">>
<<set $Nurse = $slaves[$i]>>
-<<else>>
- <<set $Nurse = 0>>
<</if>>
<<goto "Clinic">>
diff --git a/src/uncategorized/penthouseReport.tw b/src/uncategorized/penthouseReport.tw
index 759e8331364..32baf1bdf51 100644
--- a/src/uncategorized/penthouseReport.tw
+++ b/src/uncategorized/penthouseReport.tw
@@ -1,5 +1,6 @@
:: Penthouse Report [nobr]
+<<SlaveSort $HGSuiteiIDs>>
<<set _SL = $slaves.length>>
<<for $i = 0; $i < _SL; $i++>>
@@ -11,21 +12,15 @@
<</if>>
<<include "Full Report">>
<br><br>
+
<<if ($slaves[$i].assignment == "be your Head Girl") && ($HGSuiteSlaves > 0)>>
- <<set _iTemp = $i, $i = $HGSuiteiIDs[0].Index, _ID = $HGSuiteiIDs[0].ID>>
- <<if $i >= _SL || _ID != $slaves[$i].ID>>
- /% Slaves.ID and $HGSuiteiIDs.ID's don't match-up so let's find her %/
- <<for $i = 0; $i < _SL; $i++>>
- <<if _ID == $slaves[$i].ID>>
- /% Correct the Index %/
- <<set $HGSuiteiIDs[0].Index = $i>>
- <<break>>
- <</if>>
- <</for>>
- <</if>>
- <<if $i < _SL && $slaves[$i].assignment != "live with your Head Girl">>
+ /% We found the Head Girl, now let's find her slave %/
+ <<set _iTemp = $i>>
+ <<set _ID = $HGSuiteiIDs[0], $i = $slaveIndices[_ID]>>
+
+ <<if $slaves[$i].assignment != "live with your Head Girl">>
<br>@@.red;$slaves[$i].slaveName had been assigned to live with your Head Girl, but this week she was assigned to $slaves[$i].assignment. She has been released to your penthouse for reassignment.@@
- <<removeJob $slaves[$i] "live with your head girl">>
+ <<removeJob $slaves[$i] "live with your Head Girl">>
<<else>>
<<set $HGRelease = 1>>
''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__''
@@ -36,11 +31,11 @@
<<include "SA live with HG">>
<br><br>
<</if>>
- /% Onward bound as normal %/
+
<<set $i = _iTemp>>
<</if>>
<br style="clear: both;"></div>
- <</if>> /* closes assignmentVisible == 1 */
+ <</if>>
<</for>>
/* count open spots in facilities after all assignments have been decided for the week */
diff --git a/src/uncategorized/recruiterWorkaround.tw b/src/uncategorized/recruiterWorkaround.tw
index f26c60e38c9..009c781e340 100644
--- a/src/uncategorized/recruiterWorkaround.tw
+++ b/src/uncategorized/recruiterWorkaround.tw
@@ -1,20 +1,12 @@
:: Recruiter Workaround [silently]
<<if $Recruiter != 0>>
- <<set _ID = $Recruiter.ID, _SL = $slaves.length>>
- <<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>>
- <<removeJob $slaves[_i] "recruit girls">>
- <<break>>
- <</if>>
- <</for>>
+ <<removeJob $Recruiter "recruit girls">>
<</if>>
<<if $i > -1>>
<<assignJob $slaves[$i] "recruit girls">>
<<set $slaves[$i].livingRules = "luxurious">>
<<set $Recruiter = $slaves[$i]>>
-<<else>>
- <<set $Recruiter = 0>>
<</if>>
<<goto "Main">>
diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw
index 07e54119cb2..5b6ae59647a 100644
--- a/src/uncategorized/reputation.tw
+++ b/src/uncategorized/reputation.tw
@@ -502,7 +502,8 @@ On formal occasions, you are announced as $PCTitle.
<<FSChange "Paternalist" $citizenOrphanageTotal>>
<<if $privateOrphanageTotal > 0>>
Raising $privateOrphanageTotal of your slaves' children privately is considered even more @@.green;impressive.@@
- <<FSChange "Paternalist" $privateOrphanageTotal*2>>
+ <<set _care = $privateOrphanageTotal*2>>
+ <<FSChange "Paternalist" _care>>
<</if>>
<<elseif $arcologies[0].FSDegradationist != "unset">>
The public @@.red;disapproves@@ of the way you're providing for $citizenOrphanageTotal of your slaves' children to be raised as citizens.
@@ -512,7 +513,8 @@ On formal occasions, you are announced as $PCTitle.
<<elseif $privateOrphanageTotal > 0>>
<<if $arcologies[0].FSPaternalist != "unset">>
Raising $privateOrphanageTotal of your slaves' children privately is considered extremely @@.green;impressive.@@
- <<FSChange "Paternalist" $privateOrphanageTotal*2>>
+ <<set _care = $privateOrphanageTotal*2>>
+ <<FSChange "Paternalist" _care>>
<<elseif $arcologies[0].FSDegradationist != "unset">>
Fortunately your raising slaves' children privately is not publicly known.
<</if>>
diff --git a/src/uncategorized/rulesAutosurgery.tw b/src/uncategorized/rulesAutosurgery.tw
index 77087fa1b7d..043aaf5d458 100644
--- a/src/uncategorized/rulesAutosurgery.tw
+++ b/src/uncategorized/rulesAutosurgery.tw
@@ -100,7 +100,7 @@
<<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].faceImplant <= 15) && ($slaves[$i].face <= 95) && ($thisSurgery.cosmetic != 0)>>
<<set $surgeries.push("a nicer face")>>
- <<if $slaves[$i].faceShape == "masculine">><<set $slaves[$i].faceShape to "androgynous">><</if>>
+ <<if $slaves[$i].faceShape == "masculine">><<set $slaves[$i].faceShape = "androgynous">><</if>>
<<set $slaves[$i].faceImplant += 25-5*Math.trunc($PC.medicine/100)-5*$surgeryUpgrade>>
<<set $slaves[$i].face = Math.clamp($slaves[$i].face+20,-100,100)>>
<<set $cash -= $surgeryCost>>
@@ -169,7 +169,7 @@
<</if>>
<<elseif ($slaves[$i].faceImplant <= 45) && ($slaves[$i].face <= 95) && ($thisSurgery.cosmetic == 2)>>
<<set $surgeries.push("a nicer face")>>
- <<if $slaves[$i].faceShape == "masculine">><<set $slaves[$i].faceShape to "androgynous">><</if>>
+ <<if $slaves[$i].faceShape == "masculine">><<set $slaves[$i].faceShape = "androgynous">><</if>>
<<set $slaves[$i].faceImplant += 25-5*Math.trunc($PC.medicine/100)-5*$surgeryUpgrade>>
<<set $slaves[$i].face = Math.clamp($slaves[$i].face+20,-100,100)>>
<<set $cash -= $surgeryCost>>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index 2b53fc2d4b7..99a47e6c965 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -1,19 +1,7 @@
:: Schoolroom Report [nobr]
-<<set _DL = $SchlRiIDs.length, $schoolroomSlaves = _DL, _SL = $slaves.length, _idleBonus = 0, _FLsFetish = 0>>
-
-<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $SchlRiIDs[_dI].Index, _ID = $SchlRiIDs[_dI].ID>>
- <<if $i >= _SL || _ID != $slaves[$i].ID>>
- /% IDs don't match-up so let's find her %/
- <<set $i = $slaves.findIndex(function(s) { return s.ID == _ID; }), $SchlRiIDs[_dI].Index = $i>>
- <</if>>
- <<if $i == -1 || $slaves[$i].assignment != "learn in the schoolroom">>
- <<set $SchlRiIDs.deleteAt(_dI), _dI--, _DL--, $schoolroomSlaves-->>
- <<continue>>
- <</if>>
-<</for>>
<<SlaveSort $SchlRiIDs>>
+<<set _DL = $SchlRiIDs.length, $schoolroomSlaves = _DL, _SL = $slaves.length, _idleBonus = 0, _FLsFetish = 0>>
<<if $schoolroomDecoration != "standard">>
<<set _devBonus = 1>>
@@ -79,7 +67,7 @@
<<set _idleBonus++>>
<</if>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $SchlRiIDs[_dI].Index>>
+ <<set $i = $slaveIndices[$SchlRiIDs[_dI]]>>
<<if $Schoolteacher.rivalryTarget == $slaves[$i].ID>>
Ever since her <<if $Schoolteacher.rivalry == 1>>growing rival<<elseif $Schoolteacher.rivalry == 2>>rival<<elseif $Schoolteacher.rivalry == 3>>bitter rival<</if>>, was enrolled, she began stalking the classroom carrying a large paddle, much to $slaves[$i].slaveName's terror.
<<set $slaves[$i].devotion -= 4, $slaves[$i].trust -= 4>>
@@ -162,7 +150,7 @@
<<set _restedSlaves = 0>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $SchlRiIDs[_dI].Index>>
+ <<set $i = $slaveIndices[$SchlRiIDs[_dI]]>>
<<set $slaves[$i].devotion += _devBonus>>
<<if ($slaves[$i].health < -80)>>
<<set $slaves[$i].health += 20>>
diff --git a/src/uncategorized/schoolteacherWorkaround.tw b/src/uncategorized/schoolteacherWorkaround.tw
index d9085cc848f..e537c3f0bdc 100644
--- a/src/uncategorized/schoolteacherWorkaround.tw
+++ b/src/uncategorized/schoolteacherWorkaround.tw
@@ -1,20 +1,12 @@
:: Schoolteacher Workaround [silently]
<<if $Schoolteacher != 0>>
- <<set _ID = $Schoolteacher.ID, _SL = $slaves.length>>
- <<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>>
- <<removeJob $slaves[_i] "be the Schoolteacher">>
- <<break>>
- <</if>>
- <</for>>
+ <<removeJob $Schoolteacher "be the Schoolteacher">>
<</if>>
<<if $i > -1>>
<<assignJob $slaves[$i] "be the Schoolteacher">>
<<set $slaves[$i].livingRules = "luxurious">>
<<set $Schoolteacher = $slaves[$i]>>
-<<else>>
- <<set $Schoolteacher = 0>>
<</if>>
<<goto "Schoolroom">>
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index ffe46e4cce7..a2c520764bf 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -1,19 +1,7 @@
:: Servants' Quarters Report [nobr]
-<<set _DL = $ServQiIDs.length, $servantsQuartersSlaves = _DL, _SL = $slaves.length, _FLsFetish = 0, $stewardessBonus = 0>>
-
-<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $ServQiIDs[_dI].Index, _ID = $ServQiIDs[_dI].ID>>
- <<if $i >= _SL || _ID != $slaves[$i].ID>>
- /% IDs don't match-up so let's find her %/
- <<set $i = $slaves.findIndex(function(s) { return s.ID == _ID; }), $ServQiIDs[_dI].Index = $i>>
- <</if>>
- <<if $i == -1 || $slaves[$i].assignment != "work as a servant">>
- <<set $ServQiIDs.deleteAt(_dI), _dI--, _DL--, $servantsQuartersSlaves-->>
- <<continue>>
- <</if>>
-<</for>>
<<SlaveSort $ServQiIDs>>
+<<set _DL = $ServQiIDs.length, $servantsQuartersSlaves = _DL, _SL = $slaves.length, _FLsFetish = 0, $stewardessBonus = 0>>
<<if $servantsQuartersDecoration != "standard">>
<<set _devBonus = 1>>
@@ -57,7 +45,7 @@
<<if ($stewardessImpregnates == 1) && (_DL > 0) && (canPenetrate($Stewardess)) && $Stewardess.pubertyXY == 1>>
<<set _stewardessImpregnated = 0>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $ServQiIDs[_dI].Index>>
+ <<set $i = $slaveIndices[$ServQiIDs[_dI]]>>
<<if (canImpreg($slaves[$i], $Stewardess))>>
<<set $slaves[$i].preg = 1, $slaves[$i].pregSource = $Stewardess.ID, $slaves[$i].vagina = Math.clamp($slaves[$i].vagina,1,10), _stewardessImpregnated++, $slaves[$i].vaginalCount += 10, $vaginalTotal += 10>>
<</if>>
@@ -104,7 +92,7 @@
<<set _BonusToggle = 0>>
<</if>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $ServQiIDs[_dI].Index>>
+ <<set $i = $slaveIndices[$ServQiIDs[_dI]]>>
<<if $Stewardess.rivalryTarget == $slaves[$i].ID>>
She bears down on her <<if $Stewardess.rivalry == 1>>growing rival<<elseif $Stewardess.rivalry == 2>>rival<<elseif $Stewardess.rivalry == 3>>bitter rival<</if>>, $slaves[$i].slaveName, forcing her to work extra hard or suffer punishment.
<<set $slaves[$i].devotion--, $slaves[$i].trust-->>
@@ -225,7 +213,7 @@
<<set $servantMilkersMultiplier = 0.5, _SQMilk = 0, _SQMilkSale = 0>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $ServQiIDs[_dI].Index, $slaves[$i].devotion += _devBonus>>
+ <<set $i = $slaveIndices[$ServQiIDs[_dI]], $slaves[$i].devotion += _devBonus>>
<<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
<<set $slaves[$i].devotion -= 5, $slaves[$i].trust -= 5>>
<<elseif ($slaves[$i].devotion < 2)>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 9697af35902..5d7d76c976c 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -1,9 +1,9 @@
:: Slave Assignments Report [nobr]
-<h1> <<print $arcologies[0].name + " Weekly Slave Report - Week " + $week>></h1>
-
<<set $nextLink = "Economics", $nextButton = "Continue", _SL = $slaves.length>>
+<h1>$arcologies[0].name Weekly Slave Report - Week $week</h1>
+
<<for $i = 0; $i < _SL; $i++>>
/* PATCH, remove after 0.9.10 */
@@ -60,16 +60,15 @@
<</if>>
<<if $HeadGirl != 0>>
<<set $HGEnergy++>>
- <<if $arcologies[0].FSChineseRevivalistLaw == 1>>
- <<set $HGEnergy++>>
- <</if>>
<<if $personalAttention == "HG">>
+ <<set $HGEnergy++>>
<<if $HeadGirl.trust > 95>>
- <<set $HGEnergy += 2>>
- <<else>>
<<set $HGEnergy++>>
<</if>>
<</if>>
+ <<if $arcologies[0].FSChineseRevivalistLaw == 1>>
+ <<set $HGEnergy++>>
+ <</if>>
<<if canAchieveErection($HeadGirl)>>
<<set $HGCum = 2+Math.trunc(($HeadGirl.balls/5)+($HeadGirl.energy/95)+($HeadGirl.health/95)+($HeadGirl.devotion/95))>>
<</if>>
@@ -77,7 +76,7 @@
<<removeJob $slaves[$i] "be your Head Girl">>
<</if>>
<<case "live with your Head Girl">>
- <<if random(-30,20) <= $slaves[$i].devotion>>
+ <<if $slaves[$i].devotion >= random(-30,20)>>
<<set $HGSlaveSuccess++, $HGEnergy++>>
<<else>>
<<set $HGSlaveSuccess-->>
@@ -303,12 +302,9 @@
<</if>>
<</if>>
-<<if $slaves[$i].origin>>
-<<set $toSearch = $slaves[$i].origin>>
-<<if $toSearch.indexOf("Slave Shelter") != -1>>
+<<if $slaves[$i].origin && $slaves[$i].origin.includes("Slave Shelter")>>
<<set $shelterGirlsIDs.push($slaves[$i].ID)>>
<</if>>
-<</if>>
<<if $slaves[$i].bellyPain != 0>>
<<set $slaves[$i].bellyPain = 0>>
@@ -357,62 +353,58 @@
<</if>>
<</for>>
-<<set $HGTrainSlavesIDs = []>>
-<<set _HGPossibleSlaves = $slaves.filter(function(s) { return s.assignmentVisible == 1 && s.fuckdoll == 0 && (s.fetish != "mindbroken") && ($personalAttention != s.ID) && (s.assignment != "guard you") && $HeadGirl.ID != s.ID; })>>
-<<for $i = 0; ($i < _HGPossibleSlaves.length && $HGEnergy > 0); $i++>>
- <<if ($headGirlTrainsHealth != 0) && (_HGPossibleSlaves[$i].health < -20)>>
- <<set $HGTrainSlavesIDs.push([_HGPossibleSlaves[$i].ID, "health"])>>
- <<set _HGPossibleSlaves.deleteAt($i), $i--, $HGEnergy-->>
- <</if>>
-<</for>>
-<<for $i = 0; ($i < _HGPossibleSlaves.length && $HGEnergy > 0); $i++>>
- <<if (["cum addict", "anal addict", "attention whore", "breast growth", "abusive", "malicious", "self hating", "neglectful", "breeder"].includes(_HGPossibleSlaves[$i].sexualFlaw) == true) && ($headGirlTrainsParaphilias == 1)>>
- <<set $HGTrainSlavesIDs.push([_HGPossibleSlaves[$i].ID, "flaw"])>>
- <<set _HGPossibleSlaves.deleteAt($i), $i--, $HGEnergy-->>
- <</if>>
-<</for>>
-<<for $i = 0; ($i < _HGPossibleSlaves.length && $HGEnergy > 0); $i++>>
- <<if (["cum addict", "anal addict", "attention whore", "breast growth", "abusive", "malicious", "self hating", "neglectful", "breeder"].includes(_HGPossibleSlaves[$i].sexualFlaw) == false) && ($headGirlTrainsFlaws == 1) && ((_HGPossibleSlaves[$i].behavioralFlaw != "none") || (_HGPossibleSlaves[$i].sexualFlaw != "none"))>>
- <<set $HGTrainSlavesIDs.push([_HGPossibleSlaves[$i].ID, "flaw"])>>
- <<set _HGPossibleSlaves.deleteAt($i), $i--, $HGEnergy-->>
- <</if>>
-<</for>>
-<<for $i = 0; ($i < _HGPossibleSlaves.length && $HGEnergy > 0); $i++>>
- <<if (["cum addict", "anal addict", "attention whore", "breast growth", "abusive", "malicious", "self hating", "neglectful", "breeder"].includes(_HGPossibleSlaves[$i].sexualFlaw) == false) && ($headGirlTrainsFlaws == 2) && (_HGPossibleSlaves[$i].devotion > 20) && ((_HGPossibleSlaves[$i].behavioralFlaw != "none") || (_HGPossibleSlaves[$i].sexualFlaw != "none"))>>
- <<if (((_HGPossibleSlaves[$i].behavioralFlaw != "none") && (_HGPossibleSlaves[$i].behavioralQuirk == "none")) || ((_HGPossibleSlaves[$i].sexualFlaw != "none") && (_HGPossibleSlaves[$i].sexualQuirk == "none")))>>
- <<set $HGTrainSlavesIDs.push([_HGPossibleSlaves[$i].ID, "soften"])>>
- <<else>>
- <<set $HGTrainSlavesIDs.push([_HGPossibleSlaves[$i].ID, "flaw"])>>
- <</if>>
- <<set _HGPossibleSlaves.deleteAt($i), $i--, $HGEnergy-->>
- <</if>>
-<</for>>
-<<for $i = 0; ($i < _HGPossibleSlaves.length && $HGEnergy > 0); $i++>>
- <<if ($headGirlTrainsObedience != 0) && (_HGPossibleSlaves[$i].devotion <= 20) && (_HGPossibleSlaves[$i].trust > -20)>>
- <<set $HGTrainSlavesIDs.push([_HGPossibleSlaves[$i].ID, "obedience"])>>
- <<set _HGPossibleSlaves.deleteAt($i), $i--, $HGEnergy-->>
- <</if>>
-<</for>>
-<<for $i = 0; ($i < _HGPossibleSlaves.length && $HGEnergy > 0); $i++>>
- <<if ($headGirlTrainsSkills != 0)>>
- <<if (_HGPossibleSlaves[$i].oralSkill < $HeadGirl.oralSkill)>>
- <<set $HGTrainSlavesIDs.push([_HGPossibleSlaves[$i].ID, "oral skill"])>>
- <<set _HGPossibleSlaves.deleteAt($i), $i--, $HGEnergy-->>
- <<elseif (_HGPossibleSlaves[$i].vaginalSkill < $HeadGirl.vaginalSkill) && (_HGPossibleSlaves[$i].vagina > 0) && (canDoVaginal(_HGPossibleSlaves[$i]))>>
- <<set $HGTrainSlavesIDs.push([_HGPossibleSlaves[$i].ID, "fuck skill"])>>
- <<set _HGPossibleSlaves.deleteAt($i), $i--, $HGEnergy-->>
- <<elseif (_HGPossibleSlaves[$i].analSkill < $HeadGirl.analSkill) && (_HGPossibleSlaves[$i].anus > 0) && (canDoAnal(_HGPossibleSlaves[$i]))>>
- <<set $HGTrainSlavesIDs.push([_HGPossibleSlaves[$i].ID, "anal skill"])>>
- <<set _HGPossibleSlaves.deleteAt($i), $i--, $HGEnergy-->>
- <<elseif (_HGPossibleSlaves[$i].whoreSkill < $HeadGirl.whoreSkill)>>
- <<set $HGTrainSlavesIDs.push([_HGPossibleSlaves[$i].ID, "whore skill"])>>
- <<set _HGPossibleSlaves.deleteAt($i), $i--, $HGEnergy-->>
- <<elseif (_HGPossibleSlaves[$i].entertainSkill < $HeadGirl.entertainSkill) && (_HGPossibleSlaves[$i].amp != 1)>>
- <<set $HGTrainSlavesIDs.push([_HGPossibleSlaves[$i].ID, "entertain skill"])>>
- <<set _HGPossibleSlaves.deleteAt($i), $i--, $HGEnergy-->>
- <</if>>
- <</if>>
+<<set _HGPossibleSlaves = [[], [], [], [], [], []]>>
+<<for $i = 0; $i < _SL; $i++>>
+ <<set _Slave = $slaves[$i]>>
+ <<if (_Slave.fuckdoll == 1 || _Slave.fetish == "mindbroken" || _Slave.ID == $personalAttention || _Slave.ID == $Bodyguard.ID || _Slave.ID == $HeadGirl.ID || _Slave.assignmentVisible == 0)>>
+ <<continue>>
+ <</if>>
+
+ <<if ($headGirlTrainsHealth && _Slave.health < -20)>>
+ <<set _HGPossibleSlaves[0].push({ID: _Slave.ID, training: "health"})>>
+ <<continue>>
+ <</if>>
+
+ <<set _hasParaphilia = (["cum addict", "anal addict", "attention whore", "breast growth", "abusive", "malicious", "self hating", "neglectful", "breeder"].includes(_Slave.sexualFlaw))>>
+ <<if ($headGirlTrainsParaphilias && _hasParaphilia)>>
+ <<set _HGPossibleSlaves[1].push({ID: _Slave.ID, training: "paraphilia"})>>
+ <<continue>>
+ <</if>>
+
+ <<if ($headGirlTrainsFlaws == 1 && _Slave.behavioralFlaw != "none" || (_Slave.sexualFlaw != "none" && !_hasParaphilia))>>
+ <<set _HGPossibleSlaves[2].push({ID: _Slave.ID, training: "flaw"})>>
+ <<continue>>
+ <</if>>
+
+ <<if ($headGirlTrainsFlaws == 2 && _Slave.devotion > 20 && _Slave.behavioralFlaw != "none" || (_Slave.sexualFlaw != "none" && !_hasParaphilia))>>
+ <<if ((_Slave.behavioralFlaw != "none" && _Slave.behavioralQuirk == "none") || (_Slave.sexualFlaw != "none" && _Slave.sexualQuirk == "none"))>>
+ <<set _HGPossibleSlaves[3].push({ID: _Slave.ID, training: "soften"})>>
+ <<else>>
+ <<set _HGPossibleSlaves[3].push({ID: _Slave.ID, training: "flaw"})>>
+ <</if>>
+ <<continue>>
+ <</if>>
+
+ <<if ($headGirlTrainsObedience && _Slave.devotion <= 20 && _Slave.trust > -20)>>
+ <<set _HGPossibleSlaves[4].push({ID: _Slave.ID, training: "obedience"})>>
+ <<continue>>
+ <</if>>
+
+ <<if ($headGirlTrainsSkills)>>
+ <<if (_Slave.oralSkill < $HeadGirl.oralSkill)>>
+ <<set _HGPossibleSlaves[5].push({ID: _Slave.ID, training: "oral skill"})>>
+ <<elseif (_Slave.vaginalSkill < $HeadGirl.vaginalSkill) && (_Slave.vagina > 0) && (canDoVaginal(_Slave))>>
+ <<set _HGPossibleSlaves[5].push({ID: _Slave.ID, training: "fuck skill"})>>
+ <<elseif (_Slave.analSkill < $HeadGirl.analSkill) && (_Slave.anus > 0) && (canDoAnal(_Slave))>>
+ <<set _HGPossibleSlaves[5].push({ID: _Slave.ID, training: "anal skill"})>>
+ <<elseif (_Slave.whoreSkill < $HeadGirl.whoreSkill)>>
+ <<set _HGPossibleSlaves[5].push({ID: _Slave.ID, training: "whore skill"})>>
+ <<elseif (_Slave.entertainSkill < $HeadGirl.entertainSkill) && (_Slave.amp != 1)>>
+ <<set _HGPossibleSlaves[5].push({ID: _Slave.ID, training: "entertain skill"})>>
+ <</if>>
+ <</if>>
<</for>>
+<<set $HGTrainSlavesIDs = _HGPossibleSlaves.flatten().slice(0, $HGEnergy)>>
/**
* Accordion
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index d2561dad525..e4376a376f4 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -80,6 +80,10 @@
<<else>>
<<set _slaveName = [_Slave.slaveName, _Slave.slaveSurname || ""].join(" ").trim()>>
<</if>>
+
+
+<<capture _ssi>>
+
<<switch _Pass>>
<<case "Main">>
/*
@@ -129,40 +133,40 @@
<<elseif "guard you" == _Slave.assignment>>''@@.lightcoral;BG@@''
<</if>>
<<if $personalAttention == _Slave.ID>>''@@.lightcoral;PA@@''<</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">> /* lists their names */
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]] /* lists their names */
<<case "Personal Attention Select">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Personal Attention Select][$personalAttention = $slaves["+_ssi+"].ID, $activeSlave = $slaves["+_ssi+"], $personalAttentionChanged = 1]]">>
+ [[_slaveName|Personal Attention Select][$activeSlave = $slaves[_ssi], $personalAttention = $slaves[_ssi].ID, $personalAttentionChanged = 1]]
<<case "Agent Select">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Agent Workaround][$i = "+_ssi+"]]">>
+ [[_slaveName|Agent Workaround][$i = _ssi]]
<<case "BG Select">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Bodyguard Workaround][$i = "+_ssi+"]]">>
+ [[_slaveName|Bodyguard Workaround][$i = _ssi]]
<<case "Recruiter Select">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Recruiter Workaround][$i = "+_ssi+"]]">>
+ [[_slaveName|Recruiter Workaround][$i = _ssi]]
<<case "HG Select">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|HG Workaround][$i = "+_ssi+"]]">>
+ [[_slaveName|HG Workaround][$i = _ssi]]
<<case "Head Girl Suite">>
<<if $Flag == 0>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ "[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi+]]
<</if>>
<<case "Subordinate Targeting">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Subordinate Targeting][$activeSlave.subTarget = $slaves["+_ssi+"].ID]]">>
+ [[_slaveName|Subordinate Targeting][$activeSlave.subTarget = $slaves[_ssi].ID]]
<<case "Spa">>
<<if $Flag == 0>>
<<if (_Slave.health < 20) || (_Slave.trust < 60) || (_Slave.devotion <= 60) || (_Slave.fetish == "mindbroken") || _Slave.sexualFlaw !== "none" || _Slave.behavioralFlaw !== "none">>
<<if _Slave.devotion >= -20 || _Slave.fetish == "mindbroken">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br>//_Slave.slaveName cannot be trusted in the spa//
<<continue>>
@@ -173,19 +177,19 @@
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
- <<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ <<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Attendant Select">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Attendant Workaround][$i = "+_ssi+"]]">>
+ [[_slaveName|Attendant Workaround][$i = _ssi]]
<<case "Brothel">>
<<if $Flag == 0>>
<<if _Slave.breedingMark != 1>>
<<if (_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves[" + _ssi + "]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br>//_Slave.slaveName must be either more fearful of you or devoted to you//
<<continue>>
@@ -196,19 +200,19 @@
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
- <<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ <<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Madam Select">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Madam Workaround][$i = "+_ssi+"]]">>
+ [[_slaveName|Madam Workaround][$i = _ssi]]
<<case "Club">>
<<if $Flag == 0>>
<<if _Slave.breedingMark != 1>>
<<if (_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br>//_Slave.slaveName must be either more fearful of you or devoted to you//
<<continue>>
@@ -219,39 +223,39 @@
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "DJ Select">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|DJ Workaround][$i = "+_ssi+"]]">>
+ [[_slaveName|DJ Workaround][$i = _ssi]]
<<case "Clinic">>
<<if $Flag == 0>>
<<if (_Slave.health < 20) || ($Nurse != 0 && (_Slave.chem > 15 && $clinicUpgradeFilters == 1) || ($bellyImplants == 1 && _Slave.bellyImplant > -1) || (_Slave.preg >= 1 && ($clinicSpeedGestation >= 0 || _Slave.pregControl == "speed up")))>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br>//_Slave.slaveName cannot benefit from the clinic//
<<continue>>
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Nurse Select">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Nurse Workaround][$i = "+_ssi+"]]">>
+ [[_slaveName|Nurse Workaround][$i = _ssi]]
<<case "Schoolroom">>
<<if $Flag == 0>>
<<if (_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50)>>
<<if (_Slave.intelligenceImplant < 1) || (_Slave.voice != 0 && _Slave.accent+$schoolroomUpgradeLanguage > 2) || (_Slave.oralSkill <= 10+$schoolroomUpgradeSkills*20) || (_Slave.whoreSkill <= 10+$schoolroomUpgradeSkills*20) || (_Slave.entertainSkill <= 10+$schoolroomUpgradeSkills*20) || (_Slave.analSkill < 10+$schoolroomUpgradeSkills*20) || ((_Slave.vagina >= 0) && (_Slave.vaginalSkill < 10+$schoolroomUpgradeSkills*20))>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br>//_Slave.slaveName already has a basic education//
<<continue>>
@@ -262,14 +266,14 @@
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Schoolteacher Select">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Schoolteacher Workaround][$i = "+_ssi+"]]">>
+ [[_slaveName|Schoolteacher Workaround][$i = _ssi]]
<<case "Dairy">>
<<if $Flag == 0>>
<<if _Slave.assignment == "work in the dairy">><<continue>><</if>>
@@ -291,7 +295,7 @@
<<if ($dairyStimulatorsSetting < 2) || (_Slave.anus > 2) || ($dairyPrepUpgrade == 1)>>
<<if ($dairyPregSetting < 2) || (_Slave.vagina > 2) || (_Slave.ovaries == 0) || ($dairyPrepUpgrade == 1)>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br>//_Slave.slaveName's vagina cannot accommodate current machine settings//
<<continue>>
@@ -314,72 +318,72 @@
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Milkmaid Select">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Milkmaid Workaround][$i = "+_ssi+"]]">>
+ [[_slaveName|Milkmaid Workaround][$i = _ssi]]
<<case "Servants' Quarters">>
<<if $Flag == 0>>
<<if (_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust <= 20)) || (_Slave.trust < -20)>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br>//_Slave.slaveName must be either more fearful of you or devoted to you//
<<continue>>
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Stewardess Select">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Stewardess Workaround][$i = "+_ssi+"]]">>
+ [[_slaveName|Stewardess Workaround][$i = _ssi]]>
<<case "Master Suite">>
<<if $Flag == 0>>
<<if (_Slave.devotion > 20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50)>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves[" + _ssi + "]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br>//_Slave.slaveName is not sufficiently broken for the master suite//
<<continue>>
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Concubine Select">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Concubine Workaround][$i = "+_ssi+"]]">>
+ [[_slaveName|Concubine Workaround][$i = _ssi]]
<<case "Cellblock">>
<<if _Slave.assignmentVisible != 1>><<continue>><</if>>
<<if $Flag == 0>>
<<if (_Slave.devotion < -20 && _Slave.trust >= -20) || (_Slave.devotion < -50 && _Slave.trust >= -50)>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br>//_Slave.slaveName is sufficiently broken in so that the cellblock would have no effect//
<<continue>>
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Wardeness Select">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Wardeness Workaround][$i = "+_ssi+"]]">>
+ [[_slaveName|Wardeness Workaround][$i = _ssi]]
<<case "Arcade">>
<<if $Flag == 0>>
<<if _Slave.assignment == "be confined in the arcade">><<continue>><</if>>
@@ -387,7 +391,7 @@
<<if _Slave.breedingMark != 1>>
<<if (_Slave.indentureRestrictions <= 0)>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br>//_Slave.slaveName's indenture forbids arcade service.//
<<continue>>
@@ -398,7 +402,7 @@
<</if>>
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Pit">>
<<if $Flag == 0>>
@@ -413,19 +417,19 @@
<<continue>>
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Assign][$i = "+_ssi+"]]">>
+ [[_slaveName|Assign][$i = _ssi]]
<</if>>
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Retrieve][$i = "+_ssi+"]]">>
+ [[_slaveName|Retrieve][$i = _ssi]]
<</if>>
<<case "Coursing Association">>
<<if $Flag == 0>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Assign][$i = "+_ssi+"]]">>
+ [[_slaveName|Assign][$i = _ssi]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Retrieve][$i = "+_ssi+"]]">>
+ [[_slaveName|Retrieve][$i = _ssi]]
<</if>>
<<case "New Game Plus">>
<<if $Flag == 0>>
@@ -436,22 +440,22 @@
<<case "Rules Slave Select">>
<<if $Flag == 0>>
<br>__''
- <<print "[[_slaveName|Rules Slave Select Workaround][$activeSlave = $slaves["+_ssi+"]]]">>''__
+ [[_slaveName|Rules Slave Select Workaround][$activeSlave = $slaves[_ssi]]]''__
<<else>>
<br>__''
- <<print "[[_slaveName|Rules Slave Deselect Workaround][$activeSlave = $slaves["+_ssi+"]]]">>''__
+ [[_slaveName|Rules Slave Deselect Workaround][$activeSlave = $slaves[_ssi]]]''__
<</if>>
<<case "Rules Slave Exclude">>
<<if $Flag == 0>>
<br>__''
- <<print "[[_slaveName|Rules Slave Exclude Workaround][$activeSlave = $slaves["+_ssi+"]]]">>''__
+ [[_slaveName|Rules Slave Exclude Workaround][$activeSlave = $slaves[_ssi]]]''__
<<else>>
<br>__''
- <<print "[[_slaveName|Rules Slave NoExclude Workaround][$activeSlave = $slaves["+_ssi+"]]]">>''__
+ [[_slaveName|Rules Slave NoExclude Workaround][$activeSlave = $slaves+_ssi]]]''__
<</if>>
<<case "Matchmaking">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">>
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</switch>>
<<set _Slave.energy = Math.clamp(_Slave.energy, 0, 100)>>
@@ -498,18 +502,18 @@ will
<<if ($displayAssignments == 1) && (_Pass == "Main") && (_Slave.ID != $HeadGirl.ID) && (_Slave.ID != $Recruiter.ID) && (_Slave.ID != $Bodyguard.ID)>>
<<if _Slave.assignment != "rest">>
- <<print "[[Rest|Rest Workaround][$i = "+_ssi+"]]">>
+ [[Rest|Rest Workaround][$i = _ssi]]
<<else>>
Rest
<</if>>
<<if _Slave.assignment != "please you">>
- | <<print "[[Fucktoy|Fucktoy Workaround][$i = "+_ssi+"]]">>
+ | [[Fucktoy|Fucktoy Workaround][$i = _ssi]]
<<else>>
| Fucktoy
<</if>>
<<if _Slave.indentureRestrictions <= 0 && _Slave.breedingMark != 1>>
<<if _Slave.assignment != "work a glory hole">>
- | <<print "[[Gloryhole|Hole Workaround][$i = "+_ssi+"]]">>
+ | [[Gloryhole|Hole Workaround][$i = _ssi]]
<<else>>
| Hole
<</if>>
@@ -517,37 +521,37 @@ will
<<if _Slave.fuckdoll == 0>> /* NON-FUCKDOLL ASSIGNMENTS */
<<if (_Slave.assignment != "take classes")>>
<<if (_Slave.intelligenceImplant != 1) && ((_Slave.devotion >= -20) || ((_Slave.trust < -20) && (_Slave.devotion >= -50)) || (_Slave.trust < -50)) && (_Slave.fetish != "mindbroken")>>
- | <<print "[[Classes|Classes Workaround][$i = "+_ssi+"]]">>
+ | [[Classes|Classes Workaround][$i = _ssi]]
<</if>>
<<else>>
| Classes
<</if>>
<<if (_Slave.assignment != "be a servant")>>
<<if ((_Slave.devotion >= -20) || ((_Slave.trust < -20) && (_Slave.devotion >= -50)) || (_Slave.trust < -50)) && canWalk(_Slave) && canSee(_Slave)>>
- | <<print "[[House Servant|Servant Workaround][$i = "+_ssi+"]]">>
+ | [[House Servant|Servant Workaround][$i = _ssi]]
<</if>>
<<else>>
| House Servant
<</if>>
<<if (_Slave.assignment != "whore") && _Slave.breedingMark != 1>>
- | <<print "[[Whore|Whore Workaround][$i = "+_ssi+"]]">>
+ | [[Whore|Whore Workaround][$i = _ssi]]
<<else>>
| Whore
<</if>>
<<if (_Slave.assignment != "serve the public") && _Slave.breedingMark != 1>>
- | <<print "[[Public Servant|Public Servant Workaround][$i = "+_ssi+"]]">>
+ | [[Public Servant|Public Servant Workaround][$i = _ssi]]
<<else>>
| Public Servant
<</if>>
<<if (_Slave.lactation > 0) || (_Slave.balls > 0)>>
<<if (_Slave.assignment != "get milked")>>
- | <<print "[[Milked|Milking Workaround][$i = "+_ssi+"]]">>
+ | [[Milked|Milking Workaround][$i = _ssi]]
<<else>>
| Milked
<</if>>
<</if>>
<<if (_Slave.assignment != "stay confined")>>
- | <<print "[[Confinement|Confinement Workaround][$i = "+_ssi+"]]">>
+ | [[Confinement|Confinement Workaround][$i = _ssi]]
<<else>>
| Confinement
<</if>>
@@ -560,6 +564,7 @@ will
<<set $slaves[_ssi] = _Slave>>
+
<<switch _Pass>>
<<case "Main">>
<<continue>>
@@ -570,9 +575,9 @@ will
<<case "Head Girl Suite">>
<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
<<if $Flag == 0>>
- <<print "[[Send her to live with your Head Girl|Assign][$i = "+_ssi+"]]">>
+ [[Send her to live with your Head Girl|Assign][$i = _ssi]]
<<else>>
- <<print "[[Bring her out of the Head Girl's suite|Retrieve][$i = "+_ssi+"]]">>
+ [[Bring her out of the Head Girl's suite|Retrieve][$i = _ssi]]
<<break>>
<</if>>
<<case "Recruiter Select">>
@@ -586,9 +591,9 @@ will
<<case "Spa">>
<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
<<if $Flag == 0>>
- <<print "[[Send her to the Spa|Assign][$i = "+_ssi+"]]">>
+ [[Send her to the Spa|Assign][$i = _ssi]]
<<elseif $Flag == 1>>
- <<print "[[Remove her from the Spa|Retrieve][$i = "+_ssi+"]]">>
+ [[Remove her from the Spa|Retrieve][$i = _ssi]]
<<else>>
[[Change or remove Attendant|Attendant Select]]
<<break>>
@@ -600,9 +605,9 @@ will
<<case "Brothel">>
<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
<<if $Flag == 0>>
- <<print "[[Send her to the Brothel|Assign][$i = "+_ssi+"]]">>
+ [[Send her to the Brothel|Assign][$i = _ssi]]
<<elseif $Flag == 1>>
- <<print "[[Release her from the Brothel|Retrieve][$i = "+_ssi+"]]">>
+ [[Release her from the Brothel|Retrieve][$i = _ssi]]
<<else>>
[[Change or remove Madam|Madam Select]]
<<break>>
@@ -614,9 +619,9 @@ will
<<case "Club">>
<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
<<if $Flag == 0>>
- <<print "[[Send her to the Club|Assign][$i = "+_ssi+"]]">>
+ [[Send her to the Club|Assign][$i = _ssi]]
<<elseif $Flag == 1>>
- <<print "[[Remove her from the Club|Retrieve][$i = "+_ssi+"]]">>
+ [[Remove her from the Club|Retrieve][$i = _ssi]]
<<else>>
[[Change or remove DJ|DJ Select]]
<<break>>
@@ -624,9 +629,9 @@ will
<<case "Arcade">>
<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
<<if $Flag == 0>>
- <<print "[[Confine her in the Arcade|Assign][$i = "+_ssi+"]]">>
+ [[Confine her in the Arcade|Assign][$i = _ssi]]
<<else>>
- <<print "[[Release her from the Arcade|Retrieve][$i = "+_ssi+"]]">>
+ [[Release her from the Arcade|Retrieve][$i = _ssi]]
<</if>>
<<case "DJ Select">>
<<if setup.DJCareers.includes(_Slave.career)>>
@@ -634,13 +639,13 @@ will
<</if>>
<<case "Clinic">>
<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
- <<if $clinicUpgradeScanner == 1>>
- @@.cyan;Estimated DNA error value: <<print Math.ceil(_Slave.chem/10)>>@@
- <</if>>
+ <<if $clinicUpgradeScanner == 1>>
+ @@.cyan;Estimated DNA error value: <<print Math.ceil(_Slave.chem/10)>>@@
+ <</if>>
<<if $Flag == 0>>
- <<print "[[Send her to the Clinic|Assign][$i = "+_ssi+"]]">>
+ [[Send her to the Clinic|Assign][$i = _ssi]]
<<elseif $Flag == 1>>
- <<print "[[Take her out of the Clinic|Retrieve][$i = "+_ssi+"]]">>
+ [[Take her out of the Clinic|Retrieve][$i = _ssi]]
<<else>>
[[Change or remove Nurse|Nurse Select]]
<<break>>
@@ -652,9 +657,9 @@ will
<<case "Schoolroom">>
<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
<<if $Flag == 0>>
- <<print "[[Assign her to the Schoolroom|Assign][$i = "+_ssi+"]]">>
+ [[Assign her to the Schoolroom|Assign][$i = _ssi]]
<<elseif $Flag == 1>>
- <<print "[[Release her from the Schoolroom|Retrieve][$i = "+_ssi+"]]">>
+ [[Release her from the Schoolroom|Retrieve][$i = _ssi]]
<<else>>
[[Change or remove Schoolteacher|Schoolteacher Select]]
<<break>>
@@ -666,9 +671,9 @@ will
<<case "Dairy">>
<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
<<if $Flag == 0>>
- <<print "[[Send her to the Dairy|Assign][$i = "+_ssi+"]]">>
+ [[Send her to the Dairy|Assign][$i = _ssi]]
<<elseif $Flag == 1>>
- <<print "[[Release her from the Dairy|Retrieve][$i = "+_ssi+"]]">>
+ [[Release her from the Dairy|Retrieve][$i = _ssi]]
<<else>>
[[Change or remove Milkmaid|Milkmaid Select]]
<<break>>
@@ -680,9 +685,9 @@ will
<<case "Servants' Quarters">>
<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
<<if $Flag == 0>>
- <<print "[[Assign her to the Servants' Quarters|Assign][$i = "+_ssi+"]]">>
+ [[Assign her to the Servants' Quarters|Assign][$i = _ssi]]
<<elseif $Flag == 1>>
- <<print "[[Release her from the Servants' Quarters|Retrieve][$i = "+_ssi+"]]">>
+ [[Release her from the Servants' Quarters|Retrieve][$i = _ssi]]
<<else>>
[[Change or remove Stewardess|Stewardess Select]]
<<break>>
@@ -694,9 +699,9 @@ will
<<case "Master Suite">>
<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
<<if $Flag == 0>>
- <<print "[[Add her to the Suite|Assign][$i = "+_ssi+"]]">>
+ [[Add her to the Suite|Assign][$i = _ssi]]
<<elseif $Flag == 1>>
- <<print "[[Send her out of the Suite|Retrieve][$i = "+_ssi+"]]">>
+ [[Send her out of the Suite|Retrieve][$i = _ssi]]
<<else>>
[[Change or remove Concubine|Concubine Select]]
<<break>>
@@ -704,9 +709,9 @@ will
<<case "Cellblock">>
<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
<<if $Flag == 0>>
- <<print "[[Confine her in the cellblock|Assign][$i = "+_ssi+"]]">>
+ [[Confine her in the cellblock|Assign][$i = _ssi]]
<<elseif $Flag == 1>>
- <<print "[[Release her from the cellblock|Retrieve][$i = "+_ssi+"]]">>
+ [[Release her from the cellblock|Retrieve][$i = _ssi]]
<<else>>
[[Change or remove Wardeness|Wardeness Select]]
<<break>>
@@ -718,14 +723,17 @@ will
<<case "New Game Plus">>
<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
<<if $Flag == 0>>
- <<print "[[Add to import list|NGP Workaround][$slavesToImport = 1, $i = "+_ssi+"]]">>
+ [[Add to import list|NGP Workaround][$slavesToImport = 1, $i = _ssi]]
<<else>>
- <<print "[[Remove from import list|NGP Workaround][$slavesToImport = 0, $i = "+_ssi+"]]">>
+ [[Remove from import list|NGP Workaround][$slavesToImport = 0, $i = _ssi]]
<<set $slavesToImport += 1>>
<</if>>
<<case "Matchmaking">>
<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
- <<print "[[Match them|Matchmaking][$subSlave = $slaves[" + _ssi + "]]]">>
+ [[Match them|Matchmaking][$subSlave = $slaves[_ssi]]]
<</switch>>
+
+<</capture>>
+
<</for>>
<<set $activeSlave = 0, _Slave = 0>>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 36e74507c1d..fe2a8a2be4b 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -1,19 +1,7 @@
:: Spa Report [nobr]
-<<set _DL = $SpaiIDs.length, $spaSlaves = _DL, _SL = $slaves.length, _bonusToggle = 0, _healthBonus = 0, _idleBonus = 0, _restedSlaves = 0, _trustBonus = 0>>
-
-<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $SpaiIDs[_dI].Index, _ID = $SpaiIDs[_dI].ID>>
- <<if $i >= _SL || _ID != $slaves[$i].ID>>
- /% IDs don't match-up so let's find her %/
- <<set $i = $slaves.findIndex(function(s) { return s.ID == _ID; }), $SpaiIDs[_dI].Index = $i>>
- <</if>>
- <<if $i == -1 || $slaves[$i].assignment != "rest in the spa">>
- <<set $SpaiIDs.deleteAt(_dI), _dI--, _DL--, $spaSlaves-->>
- <<continue>>
- <</if>>
-<</for>>
<<SlaveSort $SpaiIDs>>
+<<set _DL = $SpaiIDs.length, $spaSlaves = _DL, _SL = $slaves.length, _bonusToggle = 0, _healthBonus = 0, _idleBonus = 0, _restedSlaves = 0, _trustBonus = 0>>
<<if $spaDecoration != "standard">>
<<set _devBonus = 1>>
@@ -87,7 +75,7 @@
<</if>>
<<set _attendantUsedCure = 0>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $SpaiIDs[_dI].Index>>
+ <<set $i = $slaveIndices[$SpaiIDs[_dI]]>>
<<if ($slaves[$i].fetish == "mindbroken") && ($slaves[$i].health > 20) && (_attendantUsedCure == 0) && ($spaFix != 2)>>
<<set _attendantUsedCure = 1>>
<<if (random(1,100) > 90-$Attendant.devotion)>>
@@ -302,7 +290,7 @@
<</if>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set $i = $SpaiIDs[_dI].Index>>
+ <<set $i = $slaveIndices[$SpaiIDs[_dI]]>>
<<set $slaves[$i].devotion += _devBonus, $slaves[$i].trust += _trustBonus, $slaves[$i].health += _healthBonus>>
<<if ($slaves[$i].devotion < 60) && ($slaves[$i].trust < 60)>>
<<set $slaves[$i].devotion++, $slaves[$i].trust++>>
diff --git a/src/uncategorized/stewardessWorkaround.tw b/src/uncategorized/stewardessWorkaround.tw
index 407b2a3c1e9..f6b7e4be779 100644
--- a/src/uncategorized/stewardessWorkaround.tw
+++ b/src/uncategorized/stewardessWorkaround.tw
@@ -1,20 +1,12 @@
:: Stewardess Workaround [silently]
<<if $Stewardess != 0>>
- <<set _ID = $Stewardess.ID, _SL = $slaves.length>>
- <<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>>
- <<removeJob $slaves[_i] "be the Stewardess">>
- <<break>>
- <</if>>
- <</for>>
+ <<removeJob $Stewardess "be the Stewardess">>
<</if>>
<<if $i > -1>>
<<assignJob $slaves[$i] "be the Stewardess">>
<<set $slaves[$i].livingRules = "luxurious">>
<<set $Stewardess = $slaves[$i]>>
-<<else>>
- <<set $Stewardess = 0>>
<</if>>
<<goto "Servants' Quarters">>
diff --git a/src/uncategorized/wardenessWorkaround.tw b/src/uncategorized/wardenessWorkaround.tw
index 314e8fe79d2..48169182a61 100644
--- a/src/uncategorized/wardenessWorkaround.tw
+++ b/src/uncategorized/wardenessWorkaround.tw
@@ -1,20 +1,12 @@
:: Wardeness Workaround [silently]
<<if $Wardeness != 0>>
- <<set _ID = $Wardeness.ID, _SL = $slaves.length>>
- <<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>>
- <<removeJob $slaves[_i] "be the Wardeness">>
- <<break>>
- <</if>>
- <</for>>
+ <<removeJob $Wardeness "be the Wardeness">>
<</if>>
<<if $i > -1>>
<<assignJob $slaves[$i] "be the Wardeness">>
<<set $slaves[$i].livingRules = "luxurious">>
<<set $Wardeness = $slaves[$i]>>
-<<else>>
- <<set $Wardeness = 0>>
<</if>>
<<goto "Cellblock">>
diff --git a/src/utility/assignWidgets.tw b/src/utility/assignWidgets.tw
index a9003456670..d3adab985a7 100644
--- a/src/utility/assignWidgets.tw
+++ b/src/utility/assignWidgets.tw
@@ -10,32 +10,32 @@
<<widget assignJob>>
<<if ($args[1] != "Pit") && ($args[1] != "Coursing Association")>>
- <<removeJob $args[0] $args[0].assignment>> /* sets _wID and _SL */
+ <<removeJob $args[0] $args[0].assignment>> /* sets _wID and _wi */
/% use .toLowerCase() to get rid of a few dupe conditions. %/
<<switch $args[1].toLowerCase()>>
<<case "be confined in the arcade" "arcade">>
- <<set $args[0].assignment = "be confined in the arcade", $args[0].assignmentVisible = 0, $arcadeSlaves++, $ArcadeiIDs.push({ID: _wID, Index: _wi})>>
+ <<set $args[0].assignment = "be confined in the arcade", $args[0].assignmentVisible = 0, $arcadeSlaves++, $ArcadeiIDs.push(_wID)>>
<<case "work in the brothel" "brothel">>
- <<set $args[0].assignment = "work in the brothel", $args[0].assignmentVisible = 0, $brothelSlaves++, $BrothiIDs.push({ID: _wID, Index: _wi})>>
+ <<set $args[0].assignment = "work in the brothel", $args[0].assignmentVisible = 0, $brothelSlaves++, $BrothiIDs.push(_wID)>>
<<case "be confined in the cellblock" "cellblock">>
- <<set $args[0].assignment = "be confined in the cellblock", $args[0].assignmentVisible = 0, $cellblockSlaves++, $CellBiIDs.push({ID: _wID, Index: _wi})>>
+ <<set $args[0].assignment = "be confined in the cellblock", $args[0].assignmentVisible = 0, $cellblockSlaves++, $CellBiIDs.push(_wID)>>
<<case "get treatment in the clinic" "clinic">>
- <<set $args[0].assignment = "get treatment in the clinic", $args[0].assignmentVisible = 0, $clinicSlaves++, $CliniciIDs.push({ID: _wID, Index: _wi})>>
+ <<set $args[0].assignment = "get treatment in the clinic", $args[0].assignmentVisible = 0, $clinicSlaves++, $CliniciIDs.push({_wID)>>
<<case "serve in the club" "club">>
- <<set $args[0].assignment = "serve in the club", $args[0].assignmentVisible = 0, $clubSlaves++, $ClubiIDs.push({ID: _wID, Index: _wi})>>
+ <<set $args[0].assignment = "serve in the club", $args[0].assignmentVisible = 0, $clubSlaves++, $ClubiIDs.push(_wID)>>
<<case "work in the dairy" "dairy">>
- <<set $args[0].assignment = "work in the dairy", $args[0].assignmentVisible = 0, $dairySlaves++, $DairyiIDs.push({ID: _wID, Index: _wi})>>
- <<case "live with your head girl" "head girl suite" "hgsuite">>
- <<set $args[0].assignment = "live with your Head Girl", $args[0].assignmentVisible = 0, $HGSuiteSlaves++, $HGSuiteiIDs.push({ID: _wID, Index: _wi})>>
+ <<set $args[0].assignment = "work in the dairy", $args[0].assignmentVisible = 0, $dairySlaves++, $DairyiIDs.push(_wID)>>
+ <<case "live with your head girl" "live with your Head Girl" "head girl suite" "hgsuite">>
+ <<set $args[0].assignment = "live with your Head Girl", $args[0].assignmentVisible = 0, $HGSuiteSlaves++, $HGSuiteiIDs.push(_wID)>>
<<case "serve in the master suite" "master suite" "mastersuite">>
- <<set $args[0].assignment = "serve in the master suite", $args[0].assignmentVisible = 0, $masterSuiteSlaves++, $MastSiIDs.push({ID: _wID, Index: _wi})>>
+ <<set $args[0].assignment = "serve in the master suite", $args[0].assignmentVisible = 0, $masterSuiteSlaves++, $MastSiIDs.push(_wID)>>
<<case "learn in the schoolroom" "schoolroom">>
- <<set $args[0].assignment = "learn in the schoolroom", $args[0].assignmentVisible = 0, $schoolroomSlaves++, $SchlRiIDs.push({ID: _wID, Index: _wi})>>
+ <<set $args[0].assignment = "learn in the schoolroom", $args[0].assignmentVisible = 0, $schoolroomSlaves++, $SchlRiIDs.push(_wID)>>
<<case "work as a servant" "servants' quarters" "servantsquarters">>
- <<set $args[0].assignment = "work as a servant", $args[0].assignmentVisible = 0, $servantsQuartersSlaves++, $ServQiIDs.push({ID: _wID, Index: _wi})>>
+ <<set $args[0].assignment = "work as a servant", $args[0].assignmentVisible = 0, $servantsQuartersSlaves++, $ServQiIDs.push(_wID)>>
<<case "rest in the spa" "spa">>
- <<set $args[0].assignment = "rest in the spa", $args[0].assignmentVisible = 0, $spaSlaves++, $SpaiIDs.push({ID: _wID, Index: _wi})>>
+ <<set $args[0].assignment = "rest in the spa", $args[0].assignmentVisible = 0, $spaSlaves++, $SpaiIDs.push(_wID)>>
<<case "be the attendant" "be your concubine" "be the dj" "be the madam" "be the milkmaid" "be the nurse" "be the schoolteacher" "be the stewardess" "be the wardeness">>
<<set $args[0].assignment = $args[1], $args[0].assignmentVisible = 0>> /* non-visible leadership roles */
<<case "be your agent" "live with your agent">>
@@ -57,18 +57,7 @@
$args[0].slaveName no longer has your personal attention; you plan to focus on $personalAttention.
<</if>>
- /% Get slaves[_wi] index # %/
- <<if $i > 0 && $i < _SL && _wID == $slaves[$i].ID>>
- <<set _wi = $i>>
- <<else>>
- <<for _wi = 0; _wi < _SL; _wi++>>
- <<if _wID == $slaves[_wi].ID>>
- <<break>>
- <</if>>
- <</for>>
- <</if>>
-
- <<if _wi < _SL>>
+ <<if _wi >= 0>>
<<set $slaves[_wi] = $args[0]>> /* save changes to slave array */
<</if>>
@@ -84,7 +73,8 @@
Retrieve overrides the 'rest' in most cases.
%/
<<widget removeJob>>
-<<set _wID = $args[0].ID, _SL = $slaves.length>>
+<<set _wID = $args[0].ID>>
+<<set _wi = $slaves.findIndex(function(s) { return s.ID === _wID; })>>
<<if ($args[1] == "Pit")>>
<<set $fighterIDs.delete(_wID)>>
@@ -108,96 +98,41 @@
<<if $Concubine != 0 && _wID == $Concubine.ID>><<set $Concubine = 0>><</if>>
<<if $Collectrix != 0 && _wID == $Collectrix.ID>><<set $Collectrix = 0>><</if>>
- /% Get slaves[_wi] index # %/
- <<if $i > 0 && $i < _SL && _wID == $slaves[$i].ID>>
- <<set _wi = $i>>
- <<else>>
- <<for _wi = 0; _wi < _SL; _wi++>>
- <<if _wID == $slaves[_wi].ID>>
- <<break>>
- <</if>>
- <</for>>
- <</if>>
-
/% use .toLowerCase() to get rid of a few dupe conditions. %/
<<switch $args[1].toLowerCase()>>
<<case "be confined in the arcade" "arcade">>
<<set $args[0].assignment = "work a glory hole">>
- <<for _awi = 0; _awi < $ArcadeiIDs.length; _awi++>>
- <<if $ArcadeiIDs[_awi].ID == _wID>>
- <<set $ArcadeiIDs.deleteAt(_awi), _awi--, $arcadeSlaves-->>
- <</if>>
- <</for>>
+ <<set $ArcadeiIDs.delete(_wID), $arcadeSlaves-->>
<<case "work in the brothel" "brothel">>
<<set $args[0].assignment = "whore">>
- <<for _awi = 0; _awi < $BrothiIDs.length; _awi++>>
- <<if $BrothiIDs[_awi].ID == _wID>>
- <<set $BrothiIDs.deleteAt(_awi), _awi--, $brothelSlaves-->>
- <</if>>
- <</for>>
+ <<set $BrothiIDs.delete(_wID), $brothelSlaves-->>
<<case "be confined in the cellblock" "cellblock">>
<<set $args[0].assignment = "rest">>
- <<for _awi = 0; _awi < $CellBiIDs.length; _awi++>>
- <<if $CellBiIDs[_awi].ID == _wID>>
- <<set $CellBiIDs.deleteAt(_awi), _awi--, $cellblockSlaves-->>
- <</if>>
- <</for>>
+ <<set $CellBiIDs.delete(_wID), $cellblockSlaves-->>
<<case "get treatment in the clinic" "clinic">>
<<set $args[0].assignment = "rest">>
- <<for _awi = 0; _awi < $CliniciIDs.length; _awi++>>
- <<if $CliniciIDs[_awi].ID == _wID>>
- <<set $CliniciIDs.deleteAt(_awi), _awi--, $clinicSlaves-->>
- <</if>>
- <</for>>
+ <<set $CliniciIDs.delete(_wID), $clinicSlaves-->>
<<case "serve in the club" "club">>
<<set $args[0].assignment = "serve the public">>
- <<for _awi = 0; _awi < $ClubiIDs.length; _awi++>>
- <<if $ClubiIDs[_awi].ID == _wID>>
- <<set $ClubiIDs.deleteAt(_awi), _awi--, $clubSlaves-->>
- <</if>>
- <</for>>
+ <<set $ClubiIDs.delete(_wID), $clubSlaves-->>
<<case "work in the dairy" "dairy">>
<<set $args[0].assignment = "get milked">>
- <<for _awi = 0; _awi < $DairyiIDs.length; _awi++>>
- <<if $DairyiIDs[_awi].ID == _wID>>
- <<set $DairyiIDs.deleteAt(_awi), _awi--, $dairySlaves-->>
- <</if>>
- <</for>>
+ <<set $DairyiIDs.delete(_wID), $dairySlaves-->>
<<case "learn in the schoolroom" "schoolroom">>
<<set $args[0].assignment = "rest">>
- <<for _awi = 0; _awi < $SchlRiIDs.length; _awi++>>
- <<if $SchlRiIDs[_awi].ID == _wID>>
- <<set $SchlRiIDs.deleteAt(_awi), _awi--, $schoolroomSlaves-->>
- <</if>>
- <</for>>
+ <<set $SchlRiIDs.delete(_wID), $schoolroomSlaves-->>
<<case "rest in the spa" "spa">>
<<set $args[0].assignment = "rest">>
- <<for _awi = 0; _awi < $SpaiIDs.length; _awi++>>
- <<if $SpaiIDs[_awi].ID == _wID>>
- <<set $SpaiIDs.deleteAt(_awi), _awi--, $spaSlaves-->>
- <</if>>
- <</for>>
+ <<set $SpaiIDs.delete(_wID), $spaSlaves-->>
<<case "work as a servant" "servants' quarters" "servantsquarters">>
<<set $args[0].assignment = "be a servant">>
- <<for _awi = 0; _awi < $ServQiIDs.length; _awi++>>
- <<if $ServQiIDs[_awi].ID == _wID>>
- <<set $ServQiIDs.deleteAt(_awi), _awi--, $servantsQuartersSlaves-->>
- <</if>>
- <</for>>
+ <<set $ServQiIDs.delete(_wID), $servantsQuartersSlaves-->>
<<case "serve in the master suite" "master suite" "mastersuite">>
<<set $args[0].assignment = "please you">>
- <<for _awi = 0; _awi < $MastSiIDs.length; _awi++>>
- <<if $MastSiIDs[_awi].ID == _wID>>
- <<set $MastSiIDs.deleteAt(_awi), _awi--, $masterSuiteSlaves-->>
- <</if>>
- <</for>>
- <<case "live with your head girl" "head girl suite" "hgsuite">>
+ <<set $MastSiIDs.delete(_wID), $masterSuiteSlaves-->>
+ <<case "live with your head girl" "live with your Head Girl" "head girl suite" "hgsuite">>
<<set $args[0].assignment = "rest">>
- <<for _awi = 0; _awi < $HGSuiteiIDs.length; _awi++>>
- <<if $HGSuiteiIDs[_awi].ID == _wID>>
- <<set $HGSuiteiIDs.deleteAt(_awi), _awi--, $HGSuiteSlaves-->>
- <</if>>
- <</for>>
+ <<set $HGSuiteiIDs.delete(_wID), $HGSuiteSlaves-->>
<<case "be your head girl">>
<<set $args[0].assignment = "rest">>
<<if $HGSuiteEquality == 0 && $personalAttention == "HG">>
@@ -216,9 +151,9 @@
<<set $args[0].assignmentVisible = 1, $args[0].choosesOwnAssignment = 0, $args[0].sentence = 0>>
- <<if _wi < _SL>>
+ <<if _wi >= 0>>
<<set $slaves[_wi] = $args[0]>> /* save changes to slave array */
<</if>>
-<</if>>
+<</if>> /* not Pit or Coursing Association */
<</widget>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 941ce25a02d..d7b889a0f01 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -19,6 +19,43 @@
You plan to train ''__@@.pink;<<SlaveFullName $slaves[_PA]>>@@__'' to $trainingRegimen this week.
<</if>>
<</switch>>
+
+<<if $lowercaseDonkey == 1>>
+
+<<if $useTabs == 0>>
+ <br>
+ <<if _HG > -1>>
+ ''__@@.pink;<<SlaveFullName $HeadGirl>>@@__'' is <<if ndef $headGirlFocus>>serving as your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>.<<else>>your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort,<</if>> and is focusing on your slaves' $headGirlFocus.<</if>>
+ <span id="manageHG"><strong><<link "Manage Head Girl">><<goto "HG Select">><</link>></strong></span> @@.cyan;[H]@@
+ <<set $showOneSlave = "Head Girl">>
+ <<elseif (_HG == -1) && ($slaves.length > 1)>>
+ You have @@.red;not@@ selected a Head Girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>. <span id="manageHG"><strong><<link "Select one">><<goto "HG Select">><</link>></strong></span> @@.cyan;[H]@@
+ <<elseif (_HG == -1)>>
+ //You do not have enough slaves to keep a Head Girl//
+ <</if>>
+ <br>
+ <<if _RC > -1>>
+ ''__@@.pink;<<SlaveFullName $Recruiter>>@@__'' is working to recruit girls.
+ <span id="manageRecruiter"><strong><<link "Manage Recruiter">><<goto "Recruiter Select">><</link>></strong></span> @@.cyan;[U]@@
+ <<set $showOneSlave = "recruit girls">>
+ <<else>>
+ You have @@.red;not@@ selected a Recruiter.
+ <span id="manageRecruiter"><strong><<link "Select one">><<goto "Recruiter Select">><</link>></strong></span> @@.cyan;[U]@@
+ <</if>>
+ <<if ($dojo != 0)>>
+ <br>
+ <<if _BG > -1>>
+ ''__@@.pink;<<SlaveFullName $Bodyguard>>@@__'' is serving as your bodyguard. <span id="manageBG"><strong><<link "Manage Bodyguard">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
+ <<set $showOneSlave = "guard you">>
+ <<else>>
+ You have @@.red;not@@ selected a Bodyguard. <span id="manageBG"><strong><<link "Select one">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
+ <</if>>
+ <</if>>
+ <</if>>
+<span id="managePA"><strong><<link "Change plans">><<goto "Personal Attention Select">><</link>></strong></span> @@.cyan;[A]@@
+
+<<else>>
+
<span id="managePA"><strong><<link "Change plans">><<goto "Personal Attention Select">><</link>></strong></span> @@.cyan;[A]@@
<br>
<<if _HG > -1>>
@@ -46,6 +83,8 @@
<</if>>
<</if>>
+<</if>> /* closes lowercase_donkey's BS */
+
<<if $organsCompleted > 0>>
<<for _dwj = 0; _dwj < $organs.length; _dwj++>>
<<set _validHost = 0>>
@@ -231,4 +270,3 @@
<</if>>
<</widget>>
-
\ No newline at end of file
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 0f96f8b0121..4c41e9ff2de 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -1609,7 +1609,7 @@
<<case "liberated">>
<<set $args[0].behavioralQuirk = "advocate">>
<</switch>>
- <<set $activeSlave.behavioralFlaw = "none">>
+ <<set $args[0].behavioralFlaw = "none">>
<</widget>>
/%
@@ -1696,7 +1696,7 @@ This experience
<</widget>>
/%
-Call as <<SlaveSort [$slaves]>>
+ Call as <<SlaveSort [$slaves]>>
$args[0]: array to sort
%/
<<widget "SlaveSort">>
@@ -1746,7 +1746,10 @@ Call as <<SlaveSort [$slaves]>>
<</if>>
<</switch>>
<<else>>
- <<set $args[0] = $args[0].sort(function(a, b){return a.Index-b.Index})>>
+ <<set $slaveIndices = {}>>
+ <<set $slaves.forEach(function(s, i) { $slaveIndices[s.ID] = i; })>>
+ <<set filterInPlace($args[0], function(s) { return $slaveIndices[s] !== undefined; })>>
+ <<set $args[0].sort(function(a, b) { return $slaveIndices[a] - $slaveIndices[b]; })>>
<</if>>
<</widget>>
--
GitLab