diff --git a/src/npc/agent/agentRetrieve.tw b/src/npc/agent/agentRetrieve.tw index d92c4ff6d276b80b0f5293d26a495937290d28d6..d4945f78b69d924807a60e2fe8ad166ce2fb4eb3 100644 --- a/src/npc/agent/agentRetrieve.tw +++ b/src/npc/agent/agentRetrieve.tw @@ -1,48 +1,34 @@ -:: Agent Retrieve [nobr] +:: Agent Retrieve [silently] -<<silently>> - -<<for $i = 0; $i < $slaves.length; $i++>> -<<if $slaves[$i].ID == $activeArcology.leaderID>> - <<for $j = 0; $j < $slaves.length; $j++>> - <<if $slaves[$j].assignment == "live with your agent">> - <<if $slaves[$j].ID == $slaves[$i].relationshipTarget>> +<<set _SL = $slaves.length, _ID = $activeArcology.leaderID, _LL = $leaders.length>> +<<for _i = 0; _i < _SL; _i++>> +<<if $slaves[_i].ID == _ID>> +<<if $slaves[_i].relationshipTarget > 0>> + <<for _j = 0; _j < _SL; _j++>> + <<if $slaves[_j].ID == $slaves[_i].relationshipTarget && $slaves[_j].assignment == "live with your agent">> <<if $slaves[$j].preg > 35>> - <<set $slaves[$j].birthsTotal += $slaves[$j].pregType>> - <<set $slaves[$j].preg = 0>> - <<set $slaves[$j].pregSource = 0>> - <<set $slaves[$j].pregType = 0>> + <<set $slaves[$j].birthsTotal += $slaves[$j].pregType, set $slaves[$j].preg = 0, set $slaves[$j].pregSource = 0, set $slaves[$j].pregType = 0>> <</if>> - <<set $slaves[$j].assignment = "rest">> - <<set $slaves[$j].assignmentVisible = 1>> - <<set $slaves[$j].sentence = 0>> + <<set $slaves[_j].assignment = "rest", $slaves[_j].assignmentVisible = 1, $slaves[_j].sentence = 0>> <<break>> <</if>> - <</if>> <</for>> <<if $slaves[$i].preg > 35>> - <<set $slaves[$i].birthsTotal += $slaves[$i].pregType>> - <<set $slaves[$i].preg = 0>> - <<set $slaves[$i].pregSource = 0>> - <<set $slaves[$i].pregType = 0>> + <<set $slaves[$i].birthsTotal += $slaves[$i].pregType, set $slaves[$i].preg = 0, set $slaves[$i].pregSource = 0, set $slaves[$i].pregType = 0>> <</if>> - <<set $slaves[$i].assignment = "rest">> - <<set $slaves[$i].assignmentVisible = 1>> - <<set $slaves[$i].sentence = 0>> - <<break>> +<</if>> +<<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1, $slaves[_i].sentence = 0>> +<<break>> <</if>> <</for>> -<<for _i to 0;_i < $leaders.length;_i++>> -<<if $activeArcology.leaderID == $leaders[_i].ID>> - <<set $dump to $leaders.pluck([_i], [_i])>> +<<set $activeArcology.leaderID = 0, $activeArcology.government = "your trustees">> + +<<for _i = 0;_i < _LL;_i++>> +<<if _ID == $leaders[_i].ID>> + <<set _dump = $leaders.deleteAt(_i)>> <<break>> <</if>> <</for>> -<<set $activeArcology.leaderID = 0>> -<<set $activeArcology.government = "your trustees">> - <<goto "Neighbor Interact">> - -<</silently>> diff --git a/src/npc/agent/agentSelect.tw b/src/npc/agent/agentSelect.tw index 5c4c7ae46a2df2f43d115549d05bfe81a23a1dfa..85b4792f88b08ab34bf35add786ec5ce2fee4991 100644 --- a/src/npc/agent/agentSelect.tw +++ b/src/npc/agent/agentSelect.tw @@ -1,7 +1,5 @@ -:: Agent Select +:: Agent Select [nobr] -<<set $nextButton = "Back">> -<<set $nextLink = "Neighbor Interact">> -<<set $showEncyclopedia = 1>><<set $encyclopedia = "Agents">> +<<set $nextButton = "Back", $nextLink = "Neighbor Interact", $showEncyclopedia = 1, $encyclopedia = "Agents">> ''Appoint an Agent from your devoted slaves:'' <<include "Slave Summary">> diff --git a/src/npc/agent/agentWorkaround.tw b/src/npc/agent/agentWorkaround.tw index 18432c46f783171634e6fcef0f0023b2b54a8bc3..444d6df53c27d38b90eba274832dd90e3557026f 100644 --- a/src/npc/agent/agentWorkaround.tw +++ b/src/npc/agent/agentWorkaround.tw @@ -1,52 +1,41 @@ :: Agent Workaround [nobr] -<<set $nextButton = "Continue">> -<<set $nextLink = "AS Dump">> -<<set $returnTo = "Neighbor Interact">> +<<set $nextButton = "Continue", $nextLink = "Neighbor Interact", _SL = $slaves.length, _ID = $slaves[$i].ID>> -<<set $activeSlave.assignment = "be your agent">> -<<set $activeSlave.assignmentVisible = 0>> -<<set $activeSlave.sentence = 0>> +<<set $slaves[$i].assignment = "be your agent", $slaves[$i].assignmentVisible = 0, $slaves[$i].choosesOwnAssignment = 0, $slaves[$i].sentence = 0>> <<if $activeSlave.reservedChildren > 0>> <<set $reservedChildren -= $activeSlave.reservedChildren>> <<set $activeSlave.reservedChildren = 0>> <</if>> -<<if $activeSlave.relationship <= 3>> -<<if $activeSlave.relationship > 0>> - <<for _i = 0;_i < $slaves.length;_i++>> - <<if $activeSlave.relationshipTarget == $slaves[_i].ID>> - <<set $slaves[_i].relationship = 0>> - <<set $slaves[_i].relationshipTarget = 0>> +<<if $slaves[$i].relationship > 0 && $slaves[$i].relationship < 4>> + <<for _i = 0;_i < _SL;_i++>> + <<if _ID == $slaves[_i].relationshipTarget>> + <<set $slaves[_i].relationship = 0, $slaves[_i].relationshipTarget = 0>> + <<break>> <</if>> <</for>> - <<set $activeSlave.relationship = 0>> - <<set $activeSlave.relationshipTarget = 0>> -<</if>> + <<set $slaves[$i].relationship = 0, $slaves[$i].relationshipTarget = 0>> <</if>> -<<if $activeSlave.rivalry > 0>> +<<if $slaves[$i].rivalry > 0>> <<for _i = 0;_i < $slaves.length;_i++>> - <<if $activeSlave.rivalryTarget == $slaves[_i].ID>> - <<set $slaves[_i].rivalry = 0>> - <<set $slaves[_i].rivalryTarget = 0>> + <<if _ID == $slaves[_i].rivalryTarget>> + <<set $slaves[_i].rivalry = 0, $slaves[_i].rivalryTarget = 0>> + <<break>> <</if>> <</for>> - <<set $activeSlave.rivalry = 0>> - <<set $activeSlave.rivalryTarget = 0>> + <<set $slaves[$i].rivalry = 0, $slaves[$i].rivalryTarget = 0>> <</if>> -<<set $leaders.push($activeSlave)>> - -<<set $activeArcology.leaderID = $activeSlave.ID>> -<<set $activeArcology.government = "your agent">> +<<set $leaders.push($slaves[$i]), $activeArcology.leaderID = _ID, $activeArcology.government = "your agent">> -<<SlaveTitle $activeSlave>> +<<SlaveTitle $slaves[$i]>> -You order $activeSlave.slaveName to come into your office for orders. The devoted $desc has no prior warning that this is anything unusual, and from the <<if $activeSlave.energy > 95>>horny glint<<else>>glow of sexual availability<</if>> in her $activeSlave.eyeColor eyes as she <<if canWalk($activeSlave)>>enters<<else>>is helped in<</if>>, she <<if $activeSlave.energy > 95>>seems to be hoping<<else>>wouldn't mind hearing<</if>> that you've called her in for a quick fuck. In fact, the matter at hand is about as far as it could possibly be from that, on the spectrum of interactions between <<if $PC.title != 0>>master<<else>>mistress<</if>> and slave. +You order $slaves[$i].slaveName to come into your office for orders. The devoted $desc has no prior warning that this is anything unusual, and from the <<if $slaves[$i].energy > 95>>horny glint<<else>>glow of sexual availability<</if>> in her $slaves[$i].eyeColor eyes as she <<if canWalk($slaves[$i])>>enters<<else>>is helped in<</if>>, she <<if $slaves[$i].energy > 95>>seems to be hoping<<else>>wouldn't mind hearing<</if>> that you've called her in for a quick fuck. In fact, the matter at hand is about as far as it could possibly be from that, on the spectrum of interactions between <<if $PC.title != 0>>master<<else>>mistress<</if>> and slave. <br><br>You offer her, without preamble, agency on your behalf in $activeArcology.name. As a woman of intelligence, she knows the basics of such an arrangement, but she's stunned into silence by the offer, so you outline it briefly. Having a slave lead an arcology would be too much, even for the most open minded of Free Cities societies. So, she would be freed, albeit subject to a set of private, restrictive contracts that would allow you to recall her if you wish, and require her to follow your directions, if you give her any. But other than that, she would be the effective leader of an entire arcology. It's an unusual arrangement, but one that's becoming more common as multiple arcologies come under united control. <br><br>She's intelligent and confident of her place within society as a valued slave, and knows that with your resources behind her, this is likely something she's capable of succeeding at. Nevertheless, her feelings are obviously mixed. It will be a challenge, -<<switch $activeSlave.fetish>> +<<switch $slaves[$i].fetish>> <<case "submissive">> especially for a sexual submissive like her. <<case "cumslut">> @@ -71,7 +60,7 @@ You order $activeSlave.slaveName to come into your office for orders. The devote It will mean that she'll see much less of you, something such a devoted slave may struggle with. Oppressed by the confusion and strength of her feelings, she begins to cry. <br><br>"Thank you, -<<if SlaveStatsChecker.checkForLisp($activeSlave)>> +<<if SlaveStatsChecker.checkForLisp($slaves[$i])>> <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>," she gasps out. "I'll do my betht." <<else>> <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>," she gasps out. "I'll do my best." diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index ca9ce8b04777c90d111c83e3152c44ab7b67fc1b..a13474d4560428ffecd063e663ad00024c9e2fdd 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -191,7 +191,7 @@ One night, you see <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. Your <<if $Concubine != 0>>concubine<<elseif $HeadGirl != 0>>Head Girl<<else>>personal assistant<</if>> manages a schedule for them, constantly changing it up to keep the girls from getting predictable. <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span> has just come on shift. <br><br> -You're at your desk as she arrives; her predecessor passes her on the way out. $activeSlave.slaveName pauses for a moment in the doorway, and then decides to give you a show. She spreads her legs until her <<if $activeSlave.shoes == "heels">>heels click against<<elseif $activeSlave.shoes == "extreme heels">>ridiculous heels click against<<elseif $activeSlave.shoes == "flats">>flats come up against<<else>>bare feet come up against<</if>> the doorframe to either side of her. She reaches out to press her palms against the doorframe to either side of her body, and runs them slowly up the frame, gradually stretching out her <<if $activeSlave.height >= 170>>tall<<elseif $activeSlave.height < 160>>short<</if>> <<if $activeSlave.weight > 10>>plush<<elseif $activeSlave.weight < -10>>thin<<else>>trim<</if>> <<if $activeSlave.preg > 30>>heavily pregnant <<elseif $activeSlave.preg > 20>>pregnant <<elseif $activeSlave.preg > 10>>slightly pregnant <</if>> form. She's good at this, so you let her continue; <<if $activeSlave.clothes != "none">>her clothes rapidly form a pile at her feet<<else>>she's already naked<</if>>. She begins to buck and bend, making sure to show you that she's <<if ($activeSlave.dick > 0) && ((($activeSlave.balls == 0) || ($activeSlave.hormones > 0)))>>limp and submissive for her <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>master<<else>>mistress<</if>><<elseif $activeSlave.dick > 0>>rock hard at the prospect of getting fucked by her<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>master<<else>>mistress<</if>><<elseif $activeSlave.clit > 0>>so horny for her <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>master<<else>>mistress<</if>> she's got a stiffly prominent clit<<elseif $activeSlave.labia > 1>>so horny for her <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>master<<else>>mistress<</if>> her dangling petals are swollen and moist<<elseif $activeSlave.vagina == -1>>ready for her <<Master>><<else>>wet for her <<Master>>. +You're at your desk as she arrives; her predecessor passes her on the way out. $activeSlave.slaveName pauses for a moment in the doorway, and then decides to give you a show. She spreads her legs until her <<if $activeSlave.shoes == "heels">>heels click against<<elseif $activeSlave.shoes == "extreme heels">>ridiculous heels click against<<elseif $activeSlave.shoes == "flats">>flats come up against<<else>>bare feet come up against<</if>> the doorframe to either side of her. She reaches out to press her palms against the doorframe to either side of her body, and runs them slowly up the frame, gradually stretching out her <<if $activeSlave.height >= 170>>tall<<elseif $activeSlave.height < 160>>short<</if>> <<if $activeSlave.weight > 10>>plush<<elseif $activeSlave.weight < -10>>thin<<else>>trim<</if>> <<if $activeSlave.preg > 30>>heavily pregnant <<elseif $activeSlave.preg > 20>>pregnant <<elseif $activeSlave.preg > 10>>slightly pregnant <</if>> form. She's good at this, so you let her continue; <<if $activeSlave.clothes != "none">>her clothes rapidly form a pile at her feet<<else>>she's already naked<</if>>. She begins to buck and bend, making sure to show you that she's <<if ($activeSlave.dick > 0) && ((($activeSlave.balls == 0) || ($activeSlave.hormones > 0)))>>limp and submissive for her <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>master<<else>>mistress<</if>><<elseif $activeSlave.dick > 0>>rock hard at the prospect of getting fucked by her<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>master<<else>>mistress<</if>><<elseif $activeSlave.clit > 0>>so horny for her <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>master<<else>>mistress<</if>> she's got a stiffly prominent clit<<elseif $activeSlave.labia > 1>>so horny for her <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>master<<else>>mistress<</if>> her dangling petals are swollen and moist<<elseif $activeSlave.vagina == -1>>ready for her <<Master>><<else>>wet for her <<Master>><</if>>. <br><br> Finally, she pulls herself over to one side of the doorframe, clasping it like a lover.<<if $activeSlave.preg > 20>> After leaning forward to accommodate her gravid body.<</if>> <<if ($activeSlave.boobs > 2000)>>She nestles it between her enormous tits, forcing them apart,<<elseif ($activeSlave.boobs > 800)>>She presses her big breasts against it lasciviously, letting them pop around it one by one,<<else>>She rubs her chest against it, up and down,<</if>> and licks her <<if ($activeSlave.lips > 70)>>ridiculous lips<<elseif ($activeSlave.lips > 40)>>lewd lips<<else>>lips<</if>> until they're so wet they leave a strand of saliva between her mouth and the frame. She then gives up all pretense<<if $activeSlave.preg > 20>>, shifts her bulk back,<</if>> and begins to openly grind herself against the doorframe, her <<if ($activeSlave.dick > 0) && ((($activeSlave.balls == 0) || ($activeSlave.hormones > 0)))>>limp dick dribbling precum down it.<<elseif $activeSlave.dick > 0>>erection leaving precum all along it.<<elseif $activeSlave.vagina == -1>>buttocks parting against it as she rubs her asspussy against the hard doorframe.<<else>>pussy leaving moisture as she humps it.<</if>> She's certainly taking the colloquial term //fucked by the arcology// literally. <br><br> @@ -1277,12 +1277,36 @@ Working in your office early in the morning, you can hear the low, human hum of Her massive, $activeSlave.boobShape udders jiggle alluringly as she walks, and her $activeSlave.nipples nipples sway from side to side distractingly. <</if>> Your eyes move down her body, noting -<<if $activeSlave.preg > 30>> +<<if hyperPregBellyTwo($activeSlave)>> + her monstrously bulging belly<<if $activeSlave.pregSource == -1>>, practically bursting with your children,<</if>> and how she struggles to walk with it while keeping all the kicking from throwing her off balance. +<<elseif hyperBellyTwo($activeSlave)>> + her monstrous belly and how the struggles to walk with it without bumping things. +<<elseif hyperPregBellyOne($activeSlave)>> + her immense belly<<if $activeSlave.pregSource == -1>>, completely filled with your children,<</if>> and the slight movement within with each struggled step she takes. +<<elseif hyperBellyOne($activeSlave)>> + her immense belly and the vastly altered gait she steps with to handle it. +<<elseif hugeBellyPreg($activeSlave)>> her full-term pregnant belly<<if $activeSlave.pregSource == -1>>, rounded with your child,<<else>>, which<</if>> adds a distinct awkwardness to her gait. -<<elseif $activeSlave.preg > 20>> +<<elseif $activeSlave.inflation > 2>> + her straining <<print $activeSlave.inflationType>>-filled belly and how she struggles to walk normally with it. +<<elseif hugeBelly($activeSlave)>> + her full-term pregnancy-looking belly and how it adds a distinct awkwardness to her gait. +<<elseif bigBellyPreg($activeSlave)>> her hugely pregnant belly<<if $activeSlave.pregSource == -1>>, rounded with your child,<<else>>, which<</if>> adds a certain unavoidable awkwardness to her gait. +<<elseif $activeSlave.inflation == 2>> + her <<print $activeSlave.inflationType>>-filled belly and the delightful jiggle that runs through it with each step. +<<elseif bigBelly($activeSlave)>> + her hugely rounded belly and the certain unavoidable awkwardness in her gait it causes. +<<elseif $activeSlave.weight >= 95>> + her big fat belly and how it sways and jiggles with each step. <<elseif $activeSlave.preg > 10>> her pregnant belly<<if $activeSlave.pregSource == -1>>, swollen with your child,<<else>>, which<</if>> isn't truly huge yet, but clearly advertises her status as a breeding $desc. +<<elseif $activeSlave.inflation == 1>> + the slight bloat to her belly caused by the litres of $activeSlave.inflation type held inside her. +<<elseif $activeSlave.bellyImplant > 2000>> + her slightly rounded belly, not truly noticible, but enough to advertise her as a breeding $desc, even though it's fake. +<<elseif $activeSlave.hips == 1>> + her extremely wide hips and the cartoonish sway to them as she walks. <<elseif $activeSlave.muscles > 30>> her rippling abs, which work visibly as she walks, flexing and straining powerfully underneath her $activeSlave.skin skin. <<elseif $activeSlave.waist < -95>> @@ -1324,7 +1348,7 @@ Coming to a stop, she <<if $activeSlave.height > 190>>bends the long, long way d <<if canTalk($activeSlave) == false>> She mouths 'I love you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>,' holding her hands out in front of you both to say it in sign language at the same time. <<else>> - "I love you, <<if SlaveStatsChecker.checkForLisp($activeSlave)>><<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>><<else>><<Master>>," she whispers. + "I love you, <<if SlaveStatsChecker.checkForLisp($activeSlave)>><<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>><<else>><<Master>><</if>>," she whispers. <</if>> <<case "bad dream">> @@ -5729,7 +5753,7 @@ You tell her kindly that you understand, and that she'll be trained to address t <<replace "#name">>$activeSlave.slaveName<</replace>> <<replace "#result">> You enter, eliciting an embarrassed - "Um, hi <<if SlaveStatsChecker.checkForLisp($activeSlave)>><<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>><<else>><<Master>>" from $activeSlave.slaveName and a cheery wave from $assistantName. At this stage of your morning ablutions, you're conveniently naked, so you leap up onto the desktop and kneel upright, legs splayed. (Naturally, the desk is reinforced and sealed for exactly this reason.) You point meaningfully at your + "Um, hi <<if SlaveStatsChecker.checkForLisp($activeSlave)>><<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>><<else>>Master<</if>>" from $activeSlave.slaveName and a cheery wave from $assistantName. At this stage of your morning ablutions, you're conveniently naked, so you leap up onto the desktop and kneel upright, legs splayed. (Naturally, the desk is reinforced and sealed for exactly this reason.) You point meaningfully at your <<if $PC.dick == 1>> stiff prick <<if $PC.vagina == 1>>and flushed pussy<</if>>, and the obedient slave <<if $activeSlave.preg > 20>>hefts herself<<else>>clambers<</if>> up to suck you off<<if $PC.vagina == 1>> and eat you out<</if>>. When you're close, you surprise her by pulling your cock out of her mouth and blowing your load onto the glass. <<else>> @@ -5771,7 +5795,7 @@ You tell her kindly that you understand, and that she'll be trained to address t <<replace "#name">>$activeSlave.slaveName<</replace>> <<replace "#result">> You enter, eliciting an embarrassed - "Um, hi <<if SlaveStatsChecker.checkForLisp($activeSlave)>><<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>><<else>><<Master>>" from $activeSlave.slaveName, and ask $assistantName if she'd like to DP the slave with you. + "Um, hi <<if SlaveStatsChecker.checkForLisp($activeSlave)>><<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>><<else>>Master<</if>>" from $activeSlave.slaveName, and ask $assistantName if she'd like to DP the slave with you. <<if $assistantAppearance == "monstergirl">> "Oh yes," she purrs threateningly over the slave's moan of apprehension, and her avatar begins to stroke its dicks meaningfully. <<elseif $assistantAppearance == "shemale">> @@ -5782,7 +5806,7 @@ You tell her kindly that you understand, and that she'll be trained to address t "Oh yes," she purrs sadistically over the slave's moan of apprehension, and her avatar quickly dons a big strap-on. <<elseif ($assistantAppearance == "fairy") || ($assistantAppearance == "pregnant fairy")>> "Oh yeah!" she shouts over the slave's moan of apprehension, and her avatar quickly conjures up a magic floating dick. - <<elseif $assistantAppearance == "goddess">> + <<elseif $assistantAppearance == "goddess" || $assistantAppearance == "hypergoddess">> "That would be lovely," she says radiantly over the slave's moan of apprehension, and her avatar acquires a phallus of light. <<else>> "Fuck yeah!" she cheers over the slave's moan of apprehension, and her avatar quickly dons a big strap-on. diff --git a/src/uncategorized/attendantSelect.tw b/src/uncategorized/attendantSelect.tw index a85181917ad19576d750e945595751f369aa8704..a0fd7685876bdaedc308ff6758b55063f09c01b4 100644 --- a/src/uncategorized/attendantSelect.tw +++ b/src/uncategorized/attendantSelect.tw @@ -1,25 +1,14 @@ -:: Attendant Select +:: Attendant Select [nobr] -<<nobr>> -<<set $nextButton = "Back">> -<<set $nextLink = "Spa">> -<<set $showEncyclopedia = 0>> +<<set $nextButton = "Back", $nextLink = "Spa", $showEncyclopedia = 1, $encyclopedia = "Attendant">> -<<for _i = 0;_i < $slaves.length;_i++>> -<<if $Attendant.ID == $slaves[_i].ID>> - ''__@@color:pink;$slaves[_i].slaveName@@__'' is serving as your Attendant. - <br><br>She will help pamper and counsel your slaves. - <<set $slaves[_i].assignment = "be the Attendant">> - <<set $slaves[_i].assignmentVisible = 0>> - <<break>> -<</if>> -<</for>> -<<if ($Attendant == 0)>> +<<if ($Attendant != 0)>> + ''__@@color:pink;$Attendant.slaveName@@__'' is serving as your Attendant.<br><br>She will help pamper and counsel your slaves. +<<else>> You have not selected an Attendant. <</if>> <br><br>''Appoint an Attendant from your devoted slaves:'' <<include "Slave Summary">> -<br><br>[[None|Attendant Workaround][$Attendant = 0]] -<</nobr>> +<br><br>[[None|Attendant Workaround][$i = -1]] diff --git a/src/uncategorized/attendantWorkaround.tw b/src/uncategorized/attendantWorkaround.tw index 9cce4a0268b9b6c0af0e092253b66ee6baf6a8ba..17a717e1cd81e7110adc0518739787c104d722d3 100644 --- a/src/uncategorized/attendantWorkaround.tw +++ b/src/uncategorized/attendantWorkaround.tw @@ -1,17 +1,23 @@ -:: Attendant Workaround +:: Attendant Workaround [silently] - - <<for $i = 0; $i < $slaves.length; $i++>> - <<if ($slaves[$i].assignment == "be the Attendant") && ($slaves[$i].ID != $Attendant.ID)>> - <<set $slaves[$i].assignment = "rest">> - <<set $slaves[$i].assignmentVisible = 1>> - <<break>> - <</if>> +<<if $Attendant != 0>> + <<set _ID = $Attendant.ID, _SL = $slaves.length>> + <<for _i = 0; _i < _SL; _i++>> + <<if (_ID == $slaves[_i].ID)>><<break>><</if>> <</for>> - - <<for $i = 0; $i < $slaves.length; $i++>> - <<if $Attendant.ID == $slaves[$i].ID>> - <<if $slaves[$i].ID == $personalAttention>> + <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>> +<</if>> +<<if $i > -1>> + <<if $slaves[$i].ID == $HeadGirl.ID>> + <<set $HeadGirl = 0>> + <</if>> + <<if $slaves[$i].ID == $Recruiter.ID>> + <<set $Recruiter = 0>> + <</if>> + <<if $slaves[$i].ID == $Bodyguard.ID>> + <<set $Bodyguard = 0>> + <</if>> + <<if $slaves[$i].ID == $personalAttention>> <<if $PC.career == "escort">> <<set $personalAttention = "whoring">> <<elseif $PC.career == "servant">> @@ -19,23 +25,12 @@ <<else>> <<set $personalAttention = "business">> <</if>> - <</if>> - <<set $slaves[$i].assignment = "be the Attendant">> - <<if $slaves[$i].choosesOwnClothes == 1>><<include "SA chooses own clothes">><</if>> - <<set $slaves[$i].assignmentVisible = 0>> - <<set $slaves[$i].sentence = 0>> - <<set $slaves[$i].livingRules = "luxurious">> - <<if $slaves[$i].ID == $HeadGirl.ID>> - <<set $HeadGirl = 0>> - <</if>> - <<if $slaves[$i].ID == $Recruiter.ID>> - <<set $Recruiter = 0>> - <</if>> - <<if $slaves[$i].ID == $Bodyguard.ID>> - <<set $Bodyguard = 0>> - <</if>> - <<break>> <</if>> - <</for>> + <<set $slaves[$i].assignment = "be the Attendant", $slaves[$i].assignmentVisible = 0, $slaves[$i].choosesOwnAssignment = 0, $slaves[$i].sentence = 0, $slaves[$i].livingRules = "luxurious">> + <<if $slaves[$i].choosesOwnClothes == 1>><<include "SA chooses own clothes">><</if>> + <<set $Attendant = $slaves[$i]>> +<<else>> + <<set $Attendant = 0>> +<</if>> <<goto "Spa">> diff --git a/src/uncategorized/bgSelect.tw b/src/uncategorized/bgSelect.tw index f1f008c0ac54e13004c8a5a74c54db7e15f66e96..42d2408ec753593890c1742a678cb62fee7c1524 100644 --- a/src/uncategorized/bgSelect.tw +++ b/src/uncategorized/bgSelect.tw @@ -1,25 +1,14 @@ -:: BG Select +:: BG Select [nobr] -<<nobr>> -<<set $nextButton = "Back to Main">> -<<set $nextLink = "Main">> -<<set $showEncyclopedia = 1>><<set $encyclopedia = "Slave Bodyguards">> +<<set $nextButton = "Back to Main", $nextLink = "Main", $showEncyclopedia = 1, $encyclopedia = "Bodyguard">> -<<for _i = 0;_i < $slaves.length;_i++>> -<<if $Bodyguard.ID == $slaves[_i].ID>> - ''__@@color:pink;$slaves[_i].slaveName@@__'' is serving as your bodyguard. - <br><br>She will remain close to you at all times and guard your person. - <<set $slaves[_i].assignment = "guard you">> - <<set $slaves[_i].assignmentVisible = 1>> - <<break>> -<</if>> -<</for>> -<<if ($Bodyguard == 0)>> +<<if ($Bodyguard != 0)>> + ''__@@color:pink;$Bodyguard.slaveName@@__'' is serving as your bodyguard.<br><br>She will remain close to you at all times and guard your person. +<<else>> You have not selected a bodyguard. <</if>> <br><br>''Appoint a bodyguard from your devoted slaves:'' <<include "Slave Summary">> -<br>[[None|Bodyguard Workaround][$Bodyguard = 0]] -<</nobr>> +<br><br>[[None|Bodyguard Workaround][$i = -1]] diff --git a/src/uncategorized/bodyguardWorkaround.tw b/src/uncategorized/bodyguardWorkaround.tw index b39273bf2cf590affa9ecdc7c52239df9d8d70cb..3be01ee1d628d9b2ef7a267e00f5989427422fca 100644 --- a/src/uncategorized/bodyguardWorkaround.tw +++ b/src/uncategorized/bodyguardWorkaround.tw @@ -1,24 +1,18 @@ -:: Bodyguard Workaround +:: Bodyguard Workaround [silently] - - <<for $i = 0; $i < $slaves.length; $i++>> - <<if ($slaves[$i].assignment == "guard you") && ($slaves[$i].ID != $Bodyguard.ID)>> - <<set $slaves[$i].assignment = "rest">> - <<set $slaves[$i].assignmentVisible = 1>> - <<break>> - <</if>> - <</for>> - - <<for $i = 0; $i < $slaves.length; $i++>> - <<if $Bodyguard.ID == $slaves[$i].ID>> - <<set $slaves[$i].assignment = "guard you">> - <<set $slaves[$i].assignmentVisible = 1>> - <<set $slaves[$i].choosesOwnAssignment = 0>> - <<set $slaves[$i].sentence = 0>> - <<break>> - <</if>> +<<if $Bodyguard != 0>> + <<set _ID = $Bodyguard.ID, _SL = $slaves.length>> + <<for _i = 0; _i < _SL; _i++>> + <<if (_ID == $slaves[_i].ID)>><<break>><</if>> <</for>> - - + <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>> +<</if>> +<<if $i > -1>> + <<set $slaves[$i].assignment = "guard you", $slaves[$i].assignmentVisible = 1, $slaves[$i].choosesOwnAssignment = 0, $slaves[$i].sentence = 0>> + <<if $slaves[$i].choosesOwnClothes == 1>><<include "SA chooses own clothes">><</if>> + <<set $Bodyguard = $slaves[$i]>> +<<else>> + <<set $Bodyguard = 0>> +<</if>> <<goto "Main">> diff --git a/src/uncategorized/concubineSelect.tw b/src/uncategorized/concubineSelect.tw index 03b366f139561edff41202fd3ee64028aadac574..60204407487876c9de6482c4f5fda79241620b22 100644 --- a/src/uncategorized/concubineSelect.tw +++ b/src/uncategorized/concubineSelect.tw @@ -1,25 +1,14 @@ -:: Concubine Select +:: Concubine Select [nobr] -<<nobr>> -<<set $nextButton = "Back">> -<<set $nextLink = "Master Suite">> -<<set $showEncyclopedia = 0>> +<<set $nextButton = "Back", $nextLink = "Master Suite", $showEncyclopedia = 1, $encyclopedia = "Concubine">> -<<for _i = 0; _i < $slaves.length; _i++>> -<<if $Concubine.ID == $slaves[_i].ID>> - ''__@@color:pink;$slaves[_i].slaveName@@__'' is serving as your Concubine. - <<set $slaves[_i].assignment = "be your Concubine">> - <<set $slaves[_i].assignmentVisible = 0>> - <br><br>She will take the lead in seeing to your pleasure. - <<break>> -<</if>> -<</for>> -<<if ($Concubine == 0)>> +<<if ($Concubine != 0)>> + ''__@@color:pink;$Concubine.slaveName@@__'' is serving as your Concubine.<br><br>She will take the lead in seeing to your pleasure. +<<else>> You have not selected a Concubine. <</if>> <br><br>''Appoint a Concubine from your devoted slaves:'' <<include "Slave Summary">> -<br><br>[[None|Concubine Workaround][$Concubine = 0]] -<</nobr>> +<br><br>[[None|Concubine Workaround][$i = -1]] diff --git a/src/uncategorized/concubineWorkaround.tw b/src/uncategorized/concubineWorkaround.tw index 8f708094b2eb2796c87360cfde85efafbb5774b4..c09207d1cb685242f7dfda1e2e631c99db72c0b2 100644 --- a/src/uncategorized/concubineWorkaround.tw +++ b/src/uncategorized/concubineWorkaround.tw @@ -1,22 +1,23 @@ -:: Concubine Workaround +:: Concubine Workaround [silently] - - <<for $i = 0; $i < $slaves.length; $i++>> - <<if ($slaves[$i].assignment == "be your Concubine") && ($slaves[$i].ID != $Concubine.ID)>> - <<set $slaves[$i].assignment = "rest">> - <<set $slaves[$i].assignmentVisible = 1>> - <<break>> - <</if>> +<<if $Concubine != 0>> + <<set _ID = $Concubine.ID, _SL = $slaves.length>> + <<for _i = 0; _i < _SL; _i++>> + <<if (_ID == $slaves[_i].ID)>><<break>><</if>> <</for>> - - <<for $i = 0; $i < $slaves.length; $i++>> - <<if $Concubine.ID == $slaves[$i].ID>> - <<set $slaves[$i].assignment = "be your Concubine">> - <<if $slaves[$i].choosesOwnClothes == 1>><<include "SA chooses own clothes">><</if>> - <<set $slaves[$i].assignmentVisible = 0>> - <<set $slaves[$i].sentence = 0>> - <<set $slaves[$i].livingRules = "luxurious">> - <<if $slaves[$i].ID == $personalAttention>> + <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>> +<</if>> +<<if $i > -1>> + <<if $slaves[$i].ID == $HeadGirl.ID>> + <<set $HeadGirl = 0>> + <</if>> + <<if $slaves[$i].ID == $Recruiter.ID>> + <<set $Recruiter = 0>> + <</if>> + <<if $slaves[$i].ID == $Bodyguard.ID>> + <<set $Bodyguard = 0>> + <</if>> + <<if $slaves[$i].ID == $personalAttention>> <<if $PC.career == "escort">> <<set $personalAttention = "whoring">> <<elseif $PC.career == "servant">> @@ -24,18 +25,12 @@ <<else>> <<set $personalAttention = "business">> <</if>> - <</if>> - <<if $slaves[$i].ID == $HeadGirl.ID>> - <<set $HeadGirl = 0>> - <</if>> - <<if $slaves[$i].ID == $Recruiter.ID>> - <<set $Recruiter = 0>> - <</if>> - <<if $slaves[$i].ID == $Bodyguard.ID>> - <<set $Bodyguard = 0>> - <</if>> - <<break>> <</if>> - <</for>> + <<set $slaves[$i].assignment = "be your Concubine", $slaves[$i].assignmentVisible = 0, $slaves[$i].choosesOwnAssignment = 0, $slaves[$i].sentence = 0, $slaves[$i].livingRules = "luxurious">> + <<if $slaves[$i].choosesOwnClothes == 1>><<include "SA chooses own clothes">><</if>> + <<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 2a96190a47312aa94066c7188a351ca27a2f32f1..72dfb7bf3bf14eeb80fd298455c80b6441148e0a 100644 --- a/src/uncategorized/dairy.tw +++ b/src/uncategorized/dairy.tw @@ -414,8 +414,8 @@ $dairyNameCaps <</if>> <</if>> -<br> <<if $arcologies[0].FSSlimnessEnthusiast > 80>> + <br> <<if $dairySlimMaintainUpgrade == 1>> Thanks to advances precipitated by the arcology's commitment to the fashion of slimmer slaves, $dairyName has been updated with optimized milkers for small breasts, and a customized drug regimen to extract maximum output while maintaining small breast sizes. <<if $dairySlimMaintain == 1>> @@ -427,6 +427,7 @@ $dairyNameCaps Dairy cows' breasts will expand normally as a result of the milking process. [[Optimize the milking process to preserve small breast sizes|Dairy][$cash -= _Tmult2, $dairySlimMaintainUpgrade = 1, $dairySlimMaintain = 1]] //Costs ¤_Tmult2// <</if>> <<elseif $arcologies[0].FSSlimnessEnthusiast > 20>> + <br> <<if $dairySlimMaintainUpgrade == 1>> Thanks to advances precipitated by the arcology's commitment to the fashion of slimmer slaves, $dairyName has been re-engineered so that its milking process can now prevent the unwanted breast expansion of fashionably slim slaves. <<if $dairySlimMaintain == 1>> diff --git a/src/uncategorized/djSelect.tw b/src/uncategorized/djSelect.tw index 00088ce5ff11dca015702bfc82240621ccf7b3ab..c1c5530471986eadcf7baa870a599f7f7ce52dd0 100644 --- a/src/uncategorized/djSelect.tw +++ b/src/uncategorized/djSelect.tw @@ -1,25 +1,14 @@ -:: DJ Select +:: DJ Select [nobr] -<<nobr>> -<<set $nextButton = "Back">> -<<set $nextLink = "Club">> -<<set $showEncyclopedia = 1>><<set $encyclopedia = "DJs">> +<<set $nextButton = "Back", $nextLink = "Club", $showEncyclopedia = 1>><<set $encyclopedia = "DJ">> -<<for _i = 0; _i < $slaves.length; _i++>> -<<if $DJ.ID == $slaves[_i].ID>> - ''__@@color:pink;$slaves[_i].slaveName@@__'' is serving as your DJ. - <<set $slaves[_i].assignment = "be the DJ">> - <<set $slaves[_i].assignmentVisible = 0>> - <br><br>She will headline entertainment in $clubName. - <<break>> -<</if>> -<</for>> -<<if ($DJ == 0)>> +<<if ($DJ != 0)>> + ''__@@color:pink;$DJ.slaveName@@__'' is serving as your DJ.<br><br>She will headline entertainment in $clubName. +<<else>> You have not selected a DJ. <</if>> <br><br>''Appoint a DJ from your devoted slaves:'' <<include "Slave Summary">> -<br><br>[[None|DJ Workaround][$DJ = 0]] -<</nobr>> +<br><br>[[None|DJ Workaround][$i = -1]] diff --git a/src/uncategorized/djWorkaround.tw b/src/uncategorized/djWorkaround.tw index 66f15f0560d8aab5e9a78f260f36163f97b4e697..e1d3bafa59ac5db1a03ce77fa929468c3a870cfc 100644 --- a/src/uncategorized/djWorkaround.tw +++ b/src/uncategorized/djWorkaround.tw @@ -1,17 +1,23 @@ -:: DJ Workaround +:: DJ Workaround [silently] - - <<for $i = 0; $i < $slaves.length; $i++>> - <<if ($slaves[$i].assignment == "be the DJ") && ($slaves[$i].ID != $DJ.ID)>> - <<set $slaves[$i].assignment = "rest">> - <<set $slaves[$i].assignmentVisible = 1>> - <<break>> - <</if>> +<<if $DJ != 0>> + <<set _ID = $DJ.ID, _SL = $slaves.length>> + <<for _i = 0; _i < _SL; _i++>> + <<if (_ID == $slaves[_i].ID)>><<break>><</if>> <</for>> - - <<for $i = 0; $i < $slaves.length; $i++>> - <<if $DJ.ID == $slaves[$i].ID>> - <<if $slaves[$i].ID == $personalAttention>> + <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>> +<</if>> +<<if $i > -1>> + <<if $slaves[$i].ID == $HeadGirl.ID>> + <<set $HeadGirl = 0>> + <</if>> + <<if $slaves[$i].ID == $Recruiter.ID>> + <<set $Recruiter = 0>> + <</if>> + <<if $slaves[$i].ID == $Bodyguard.ID>> + <<set $Bodyguard = 0>> + <</if>> + <<if $slaves[$i].ID == $personalAttention>> <<if $PC.career == "escort">> <<set $personalAttention = "whoring">> <<elseif $PC.career == "servant">> @@ -19,25 +25,12 @@ <<else>> <<set $personalAttention = "business">> <</if>> - <</if>> - <<set $slaves[$i].assignment = "be the DJ">> - <<if $slaves[$i].choosesOwnClothes == 1>><<include "SA chooses own clothes">><</if>> - <<set $slaves[$i].assignmentVisible = 0>> - <<set $slaves[$i].sentence = 0>> - <<set $slaves[$i].livingRules = "luxurious">> - <<if $slaves[$i].ID == $HeadGirl.ID>> - <<set $HeadGirl = 0>> - <</if>> - <<if $slaves[$i].ID == $Recruiter.ID>> - <<set $Recruiter = 0>> - <</if>> - <<if $slaves[$i].ID == $Bodyguard.ID>> - <<set $Bodyguard = 0>> - <</if>> - <<break>> <</if>> - <</for>> - - + <<set $slaves[$i].assignment = "be the DJ", $slaves[$i].assignmentVisible = 0, $slaves[$i].choosesOwnAssignment = 0, $slaves[$i].sentence = 0, $slaves[$i].livingRules = "luxurious">> + <<if $slaves[$i].choosesOwnClothes == 1>><<include "SA chooses own clothes">><</if>> + <<set $DJ = $slaves[$i]>> +<<else>> + <<set $DJ = 0>> +<</if>> <<goto "Club">> diff --git a/src/uncategorized/hgSelect.tw b/src/uncategorized/hgSelect.tw index b8b8cb88756823354db5ffc54aec47dd230d764a..0e73387229c3a2c22e11561bb42bd8dd46fc6d95 100644 --- a/src/uncategorized/hgSelect.tw +++ b/src/uncategorized/hgSelect.tw @@ -1,19 +1,15 @@ -:: HG Select +:: HG Select [nobr] -<<nobr>> -<<set $nextButton = "Back to Main">> -<<set $nextLink = "Main">> -<<set $showEncyclopedia = 1>><<set $encyclopedia = "The Head Girl">> +<<set $nextButton = "Back to Main", $nextLink = "Main", $showEncyclopedia = 1, $encyclopedia = "Head Girl">> -<<for _i = 0;_i < $slaves.length;_i++>> -<<if $HeadGirl.ID == $slaves[_i].ID>> - ''__@@color:pink;$slaves[_i].slaveName@@__'' is serving as your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort; it is her role to serve and comfort you at your side, in addition to performing normal head girl duties<</if>>. - <<set $slaves[_i].assignment = "be your Head Girl">> - <<set $slaves[_i].assignmentVisible = 1>> - <<break>> -<</if>> -<</for>> -<<if ($HeadGirl == 0)>> +<<if ($HeadGirl != 0)>> + <<set _ID = $HeadGirl.ID, _SL = $slaves.length>> + <<for _i = 0; _i < _SL; _i++>> + <<if _ID == $slaves[_i].ID>><<break>><</if>> + <</for>> + <<set $HeadGirl = $slaves[_i]>> + ''__@@color:pink;$HeadGirl.slaveName@@__'' is serving as your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort; it is her role to serve and comfort you at your side, in addition to performing normal head girl duties<</if>>. +<<else>> You have not selected a head girl. <</if>> @@ -75,10 +71,9 @@ <<if $HeadGirl != 0>> <<if $universalRulesImpregnation == "HG">> - <br><br> - It's your Head Girl's responsibility to impregnate fertile slaves. + <br><br>It's your Head Girl's responsibility to impregnate fertile slaves. <<set $HGCum = 2+Math.trunc(($HeadGirl.balls/4)+($HeadGirl.energy/95)+($HeadGirl.health/95))>> - <<if canAchieveErection($HeadGirl) && $HeadGirl.pubertyXY == 1>> + <<if canPenetrate($HeadGirl) && $HeadGirl.pubertyXY == 1>> To maximize the chances of impregnation, she will fuck fertile pussies frequently during the week. $HeadGirl.slaveName can service $HGCum slaves this way. <<if $HeadGirl.devotion > 95>>She loves you so much she'll fuck them until she's sore.<<else>>If she were more devoted to you, she might be able to drive herself to get hard and service one more.<</if>> <<if $HeadGirl.balls >= 120>>Her unreal balls produce nearly an endless supply of semen; her ability to impregnate is almost limitless .<<elseif $HeadGirl.balls >= 80>>Her inhuman balls produce so much semen she can easily impregnate twenty girls in one sitting.<<elseif $HeadGirl.balls >= 50>>Her giant balls produce so much semen she can easily impregnate twelve girls in one sitting.<<elseif $HeadGirl.balls >= 25>>Her oversized balls produce so much semen she can cum repeatedly in a single session.<<elseif $HeadGirl.balls >= 5>>Her big balls produce so much semen she can cum more before she's drained.<<else>>Bigger balls would let her cum more before she's drained.<</if>> @@ -89,10 +84,8 @@ <</if>> [[Rescind her impregnation responsibility|HG Select][$universalRulesImpregnation = "none"]] | [[See to it yourself|HG Select][$universalRulesImpregnation = "PC"]] <<else>> - <<if canAchieveErection($HeadGirl) && $HeadGirl.pubertyXY == 1>> - <br><br> - Your Head Girl is capable of impregnating slaves, but it's not part of her responsibilities. - [[Assign her to impregnate|HG Select][$universalRulesImpregnation = "HG"]] + <<if canPenetrate($HeadGirl) && $HeadGirl.pubertyXY == 1>> + <br><br>Your Head Girl is capable of impregnating slaves, but it's not part of her responsibilities. [[Assign her to impregnate|HG Select][$universalRulesImpregnation = "HG"]] <</if>> <</if>> <</if>> @@ -100,5 +93,4 @@ <br><br>''Appoint a head girl from among your devoted slaves:'' <<include "Slave Summary">> -<br>[[None|HG Workaround][$HeadGirl = 0]] -<</nobr>> +<br><br>[[None|HG Workaround][$i = -1]] diff --git a/src/uncategorized/hgWorkaround.tw b/src/uncategorized/hgWorkaround.tw index 25af587de9028f4515fe9af3d17ca48162425536..8c4444871ee2286dc48f39f72e41a0a263ae19b9 100644 --- a/src/uncategorized/hgWorkaround.tw +++ b/src/uncategorized/hgWorkaround.tw @@ -1,36 +1,28 @@ -:: HG Workaround +:: HG Workaround [silently] -<<if ($HeadGirl == 0)>> - <<for $i = 0; $i < $slaves.length; $i++>> - <<if ($slaves[$i].assignment == "be your Head Girl")>> - <<set $slaves[$i].assignment = "rest">> - <<set $slaves[$i].assignmentVisible = 1>> - <<break>> - <</if>> +<<if $HeadGirl != 0>> + <<set _ID = $HeadGirl.ID, _SL = $slaves.length>> + <<for _i = 0; _i < _SL; _i++>> + <<if (_ID == $slaves[_i].ID)>><<break>><</if>> <</for>> + <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>> +<</if>> +<<if $i > -1>> + <<set $slaves[$i].assignment = "be your Head Girl", $slaves[$i].assignmentVisible = 1, $slaves[$i].choosesOwnAssignment = 0, $slaves[$i].sentence = 0>> + <<if $slaves[$i].choosesOwnClothes == 1>><<include "SA chooses own clothes">><</if>> + <<set $HeadGirl = $slaves[$i]>> +<<else>> + <<set $HeadGirl = 0>> <<if $personalAttention == "HG">> <<if $PC.career == "escort">> - <<set $personalAttention = "whoring">> - <<elseif $PC.career == "servant">> - <<set $personalAttention = "upkeep">> - <<else>> - <<set $personalAttention = "business">> - <</if>> + <<set $personalAttention = "whoring">> + <<elseif $PC.career == "servant">> + <<set $personalAttention = "upkeep">> + <<else>> + <<set $personalAttention = "business">> + <</if>> <</if>> -<<else>> - <<for $i = 0; $i < $slaves.length; $i++>> - <<if $HeadGirl.ID == $slaves[$i].ID>> - <<set $slaves[$i].assignment = "be your Head Girl">> - <<set $slaves[$i].assignmentVisible = 1>> - <<set $slaves[$i].choosesOwnAssignment = 0>> - <<set $slaves[$i].sentence = 0>> - <<elseif ($slaves[$i].assignment == "be your Head Girl")>> - <<set $slaves[$i].assignment = "rest">> - <<set $slaves[$i].assignmentVisible = 1>> - <</if>> - <</for>> <</if>> - <<set $HGTimeInGrade = 0>> <<goto "Main">> diff --git a/src/uncategorized/madamSelect.tw b/src/uncategorized/madamSelect.tw index 5b6ea9db3b2d77d48122189f43a5f2443a2ad507..e2c6c8b3981e46874ca4996a1a3c5e6838443381 100644 --- a/src/uncategorized/madamSelect.tw +++ b/src/uncategorized/madamSelect.tw @@ -1,25 +1,14 @@ -:: Madam Select +:: Madam Select [nobr] -<<nobr>> -<<set $nextButton = "Back">> -<<set $nextLink = "Brothel">> -<<set $showEncyclopedia = 1>><<set $encyclopedia = "Madams">> +<<set $nextButton = "Back", $nextLink = "Brothel", $showEncyclopedia = 1, $encyclopedia = "Madam">> -<<for _i = 0;_i < $slaves.length;_i++>> -<<if $Madam.ID == $slaves[_i].ID>> - ''__@@color:pink;$slaves[_i].slaveName@@__'' is serving as your Madam. - <<set $slaves[_i].assignment = "be the Madam">> - <<set $slaves[_i].assignmentVisible = 0>> - <br><br>She will manage the brothel. - <<break>> -<</if>> -<</for>> -<<if ($Madam == 0)>> +<<if ($Madam != 0)>> + ''__@@color:pink;$Madam.slaveName@@__'' is serving as your Madam.<br><br>She will manage the brothel. +<<else>> You have not selected a Madam. <</if>> <br><br>''Appoint a Madam from your devoted slaves:'' <<include "Slave Summary">> -<br><br>[[None|Madam Workaround][$Madam = 0]] -<</nobr>> +<br><br>[[None|Madam Workaround][$i = -1]] diff --git a/src/uncategorized/madamWorkaround.tw b/src/uncategorized/madamWorkaround.tw index 61d0980fa83fb7593ddd4aeb5200b991ff3ba60b..839982124c2bc2e83dcabab5901c2ba00bb7de71 100644 --- a/src/uncategorized/madamWorkaround.tw +++ b/src/uncategorized/madamWorkaround.tw @@ -1,17 +1,23 @@ -:: Madam Workaround +:: Madam Workaround [silently] - - <<for $i = 0; $i < $slaves.length; $i++>> - <<if ($slaves[$i].assignment == "be the Madam") && ($slaves[$i].ID != $Madam.ID)>> - <<set $slaves[$i].assignment = "rest">> - <<set $slaves[$i].assignmentVisible = 1>> - <<break>> - <</if>> +<<if $Madam != 0>> + <<set _ID = $Madam.ID, _SL = $slaves.length>> + <<for _i = 0; _i < _SL; _i++>> + <<if (_ID == $slaves[_i].ID)>><<break>><</if>> <</for>> - - <<for $i = 0; $i < $slaves.length; $i++>> - <<if $Madam.ID == $slaves[$i].ID>> - <<if $slaves[$i].ID == $personalAttention>> + <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>> +<</if>> +<<if $i > -1>> + <<if $slaves[$i].ID == $HeadGirl.ID>> + <<set $HeadGirl = 0>> + <</if>> + <<if $slaves[$i].ID == $Recruiter.ID>> + <<set $Recruiter = 0>> + <</if>> + <<if $slaves[$i].ID == $Bodyguard.ID>> + <<set $Bodyguard = 0>> + <</if>> + <<if $slaves[$i].ID == $personalAttention>> <<if $PC.career == "escort">> <<set $personalAttention = "whoring">> <<elseif $PC.career == "servant">> @@ -19,23 +25,12 @@ <<else>> <<set $personalAttention = "business">> <</if>> - <</if>> - <<set $slaves[$i].assignment = "be the Madam">> - <<if $slaves[$i].choosesOwnClothes == 1>><<include "SA chooses own clothes">><</if>> - <<set $slaves[$i].assignmentVisible = 0>> - <<set $slaves[$i].sentence = 0>> - <<set $slaves[$i].livingRules = "luxurious">> - <<if $slaves[$i].ID == $HeadGirl.ID>> - <<set $HeadGirl = 0>> - <</if>> - <<if $slaves[$i].ID == $Recruiter.ID>> - <<set $Recruiter = 0>> - <</if>> - <<if $slaves[$i].ID == $Bodyguard.ID>> - <<set $Bodyguard = 0>> - <</if>> - <<break>> <</if>> - <</for>> + <<set $slaves[$i].assignment = "be the Madam", $slaves[$i].assignmentVisible = 0, $slaves[$i].choosesOwnAssignment = 0, $slaves[$i].sentence = 0, $slaves[$i].livingRules = "luxurious">> + <<if $slaves[$i].choosesOwnClothes == 1>><<include "SA chooses own clothes">><</if>> + <<set $Madam = $slaves[$i]>> +<<else>> + <<set $Madam = 0>> +<</if>> <<goto "Brothel">> diff --git a/src/uncategorized/milkmaidSelect.tw b/src/uncategorized/milkmaidSelect.tw index fcf8975454dc799bd57a7b770fde4f0b60f253bc..a119517015e404077648bb6a601c3f96285b104e 100644 --- a/src/uncategorized/milkmaidSelect.tw +++ b/src/uncategorized/milkmaidSelect.tw @@ -1,25 +1,14 @@ -:: Milkmaid Select +:: Milkmaid Select [nobr] -<<nobr>> -<<set $nextButton = "Back">> -<<set $nextLink = "Dairy">> -<<set $showEncyclopedia = 1>><<set $encyclopedia = "Milkmaids">> +<<set $nextButton = "Back", $nextLink = "Dairy", $showEncyclopedia = 1, $encyclopedia = "Milkmaid">> -<<for _i = 0; _i < $slaves.length; _i++>> -<<if $Milkmaid.ID == $slaves[_i].ID>> - ''__@@color:pink;$slaves[_i].slaveName@@__'' is serving as your Milkmaid. - <<set $slaves[_i].assignment = "be the Milkmaid">> - <<set $slaves[_i].assignmentVisible = 0>> - <br><br>She will look after your livestock, helping them give milk<<if $seeDicks > 0>> and semen<</if>>. - <<break>> -<</if>> -<</for>> -<<if ($Milkmaid == 0)>> +<<if ($Milkmaid != 0)>> + ''__@@color:pink;$Milkmaid.slaveName@@__'' is serving as your Milkmaid.<br><br>She will look after your livestock, helping them give milk<<if $seeDicks > 0>> and semen<</if>>. +<<else>> You have not selected a Milkmaid. <</if>> <br><br>''Appoint a Milkmaid from your obedient slaves:'' <<include "Slave Summary">> -<br><br>[[None|Milkmaid Workaround][$Milkmaid = 0]] -<</nobr>> +<br><br>[[None|Milkmaid Workaround][$i = -1]] diff --git a/src/uncategorized/milkmaidWorkaround.tw b/src/uncategorized/milkmaidWorkaround.tw index 3da6be86ae5bce38e9454f6775132facd76829f4..d673662b32c143766f3c341887d40eecedbcf5eb 100644 --- a/src/uncategorized/milkmaidWorkaround.tw +++ b/src/uncategorized/milkmaidWorkaround.tw @@ -1,17 +1,23 @@ -:: Milkmaid Workaround [nobr] +:: Milkmaid Workaround [silently] - - <<for $i = 0; $i < $slaves.length; $i++>> - <<if ($slaves[$i].assignment == "be the Milkmaid") && ($slaves[$i].ID != $Milkmaid.ID)>> - <<set $slaves[$i].assignment = "rest">> - <<set $slaves[$i].assignmentVisible = 1>> - <<break>> - <</if>> +<<if $Milkmaid != 0>> + <<set _ID = $Milkmaid.ID, _SL = $slaves.length>> + <<for _i = 0; _i < _SL; _i++>> + <<if (_ID == $slaves[_i].ID)>><<break>><</if>> <</for>> - - <<for $i = 0; $i < $slaves.length; $i++>> - <<if $Milkmaid.ID == $slaves[$i].ID>> - <<if $slaves[$i].ID == $personalAttention>> + <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>> +<</if>> +<<if $i > -1>> + <<if $slaves[$i].ID == $HeadGirl.ID>> + <<set $HeadGirl = 0>> + <</if>> + <<if $slaves[$i].ID == $Recruiter.ID>> + <<set $Recruiter = 0>> + <</if>> + <<if $slaves[$i].ID == $Bodyguard.ID>> + <<set $Bodyguard = 0>> + <</if>> + <<if $slaves[$i].ID == $personalAttention>> <<if $PC.career == "escort">> <<set $personalAttention = "whoring">> <<elseif $PC.career == "servant">> @@ -19,25 +25,12 @@ <<else>> <<set $personalAttention = "business">> <</if>> - <</if>> - <<set $slaves[$i].assignment = "be the Milkmaid">> - <<if $slaves[$i].choosesOwnClothes == 1>><<include "SA chooses own clothes">><</if>> - <<set $slaves[$i].assignmentVisible = 0>> - <<set $slaves[$i].sentence = 0>> - <<set $slaves[$i].livingRules = "luxurious">> - <<if $slaves[$i].ID == $HeadGirl.ID>> - <<set $HeadGirl = 0>> - <</if>> - <<if $slaves[$i].ID == $Recruiter.ID>> - <<set $Recruiter = 0>> - <</if>> - <<if $slaves[$i].ID == $Bodyguard.ID>> - <<set $Bodyguard = 0>> - <</if>> - <<break>> <</if>> - <</for>> - - + <<set $slaves[$i].assignment = "be the Milkmaid", $slaves[$i].assignmentVisible = 0, $slaves[$i].choosesOwnAssignment = 0, $slaves[$i].sentence = 0, $slaves[$i].livingRules = "luxurious">> + <<if $slaves[$i].choosesOwnClothes == 1>><<include "SA chooses own clothes">><</if>> + <<set $Milkmaid = $slaves[$i]>> +<<else>> + <<set $Milkmaid = 0>> +<</if>> <<goto "Dairy">> diff --git a/src/uncategorized/newGamePlus.tw b/src/uncategorized/newGamePlus.tw index 63cedb8ca39709cde3a57cf90220229f647ef8b0..a930da6475e3c70b744ab0d2b758995b1d052ee5 100644 --- a/src/uncategorized/newGamePlus.tw +++ b/src/uncategorized/newGamePlus.tw @@ -1,5 +1,5 @@ :: New Game Plus [nobr] - + <<set $ui = "start", $slavesToImport = 0>> <<if ndef $slavesToImportMax>> @@ -10,6 +10,8 @@ <<silently>><<include "Backwards Compatibility">><</silently>> <</if>> +You have decided to start over. You'll be able to take a few things with you: a few slaves, a small fraction of your current reserves of money, and possibly even your experience as an arcology owner, which will give you a very powerful career background. Many of your other customizations and settings will be carried over as the defaults for your new game, but can be revised freely. +<br><br> You have the funds to bring $slavesToImportMax slaves with you (or your equivalent) to a new arcology. <<if $cash >= 50000+($slavesToImportMax*10000)>> It will cost <<print 50000+($slavesToImportMax*10000)>>¤ to insure another slave's safe transfer. @@ -53,10 +55,9 @@ Select up to $slavesToImportMax slaves to be imported into a new game and then [ <br><br> <<if $slavesToImport >= $slavesToImportMax>> //Maximum number of slaves for import selected.// -<<else>> +<<elseif ($slaves.length > $slavesToImport)>> ''These slaves are available to be imported into the new game:'' <<set $Flag = 0>> <<include "Slave Summary">> <</if>> - <<unset $Flag>> diff --git a/src/uncategorized/ngpWorkaround.tw b/src/uncategorized/ngpWorkaround.tw index 418562153f75122b8a463ce3f900f71a7abb12e4..57f8446c2f20dd2ee647ca1bfedd6d231d388163 100644 --- a/src/uncategorized/ngpWorkaround.tw +++ b/src/uncategorized/ngpWorkaround.tw @@ -1,21 +1,8 @@ -:: NGP Workaround +:: NGP Workaround [silently] <<if $slavesToImport == 1>> - <<set $activeSlave.assignment = "be imported">> - <<for $i = 0; $i < $slaves.length; $i++>> - <<if $activeSlave.ID == $slaves[$i].ID>> - <<set $slaves[$i] = $activeSlave>> - <<break>> - <</if>> - <</for>> - <<goto "New Game Plus">> + <<set $slaves[$i].assignment = "be imported">> <<else>> - <<set $activeSlave.assignment = "rest">> - <<for $i = 0; $i < $slaves.length; $i++>> - <<if $activeSlave.ID == $slaves[$i].ID>> - <<set $slaves[$i] = $activeSlave>> - <<break>> - <</if>> - <</for>> - <<goto "New Game Plus">> + <<set $slaves[$i].assignment = "rest">> <</if>> +<<goto "New Game Plus">> diff --git a/src/uncategorized/nurseSelect.tw b/src/uncategorized/nurseSelect.tw index af197fd770cb1d834852d8e5d7577e65c218f5b8..6c557ebd1be049f2a20c25e3729f663d89b57d65 100644 --- a/src/uncategorized/nurseSelect.tw +++ b/src/uncategorized/nurseSelect.tw @@ -1,25 +1,14 @@ -:: Nurse Select +:: Nurse Select [nobr] -<<nobr>> -<<set $nextButton = "Back">> -<<set $nextLink = "Clinic">> -<<set $showEncyclopedia = 0>> +<<set $nextButton = "Back", $nextLink = "Clinic", $showEncyclopedia = 1, $encyclopedia = "Nurse">> -<<for _i = 0; _i < $slaves.length; _i++>> -<<if $Nurse.ID == $slaves[_i].ID>> - ''__@@color:pink;$slaves[_i].slaveName@@__'' is serving as your Nurse. - <<set $slaves[_i].assignment = "be the Nurse">> - <<set $slaves[_i].assignmentVisible = 0>> - <br><br>She will help heal and care for your slaves. - <<break>> -<</if>> -<</for>> -<<if ($Nurse == 0)>> +<<if ($Nurse != 0)>> + ''__@@color:pink;$Nurse.slaveName@@__'' is serving as your Nurse.<br><br>She will help heal your slaves. +<<else>> You have not selected an Nurse. <</if>> <br><br>''Appoint a Nurse from your devoted slaves:'' <<include "Slave Summary">> -<br><br>[[None|Nurse Workaround][$Nurse = 0]] -<</nobr>> +<br><br>[[None|Nurse Workaround][$i = -1]] diff --git a/src/uncategorized/nurseWorkaround.tw b/src/uncategorized/nurseWorkaround.tw index 826abcee0afa5eaca14fd4c5b13b7b8691c76241..f0d70594792925a9f313d8dec6c7e63d998cc423 100644 --- a/src/uncategorized/nurseWorkaround.tw +++ b/src/uncategorized/nurseWorkaround.tw @@ -1,17 +1,23 @@ -:: Nurse Workaround +:: Nurse Workaround [silently] - - <<for $i = 0; $i < $slaves.length; $i++>> - <<if ($slaves[$i].assignment == "be the Nurse") && ($slaves[$i].ID != $Nurse.ID)>> - <<set $slaves[$i].assignment = "rest">> - <<set $slaves[$i].assignmentVisible = 1>> - <<break>> - <</if>> +<<if $Nurse != 0>> + <<set _ID = $Nurse.ID, _SL = $slaves.length>> + <<for _i = 0; _i < _SL; _i++>> + <<if (_ID == $slaves[_i].ID)>><<break>><</if>> <</for>> - - <<for $i = 0; $i < $slaves.length; $i++>> - <<if $Nurse.ID == $slaves[$i].ID>> - <<if $slaves[$i].ID == $personalAttention>> + <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>> +<</if>> +<<if $i > -1>> + <<if $slaves[$i].ID == $HeadGirl.ID>> + <<set $HeadGirl = 0>> + <</if>> + <<if $slaves[$i].ID == $Recruiter.ID>> + <<set $Recruiter = 0>> + <</if>> + <<if $slaves[$i].ID == $Bodyguard.ID>> + <<set $Bodyguard = 0>> + <</if>> + <<if $slaves[$i].ID == $personalAttention>> <<if $PC.career == "escort">> <<set $personalAttention = "whoring">> <<elseif $PC.career == "servant">> @@ -19,23 +25,12 @@ <<else>> <<set $personalAttention = "business">> <</if>> - <</if>> - <<set $slaves[$i].assignment = "be the Nurse">> - <<if $slaves[$i].choosesOwnClothes == 1>><<include "SA chooses own clothes">><</if>> - <<set $slaves[$i].assignmentVisible = 0>> - <<set $slaves[$i].sentence = 0>> - <<set $slaves[$i].livingRules = "luxurious">> - <<if $slaves[$i].ID == $HeadGirl.ID>> - <<set $HeadGirl = 0>> - <</if>> - <<if $slaves[$i].ID == $Recruiter.ID>> - <<set $Recruiter = 0>> - <</if>> - <<if $slaves[$i].ID == $Bodyguard.ID>> - <<set $Bodyguard = 0>> - <</if>> - <<break>> <</if>> - <</for>> + <<set $slaves[$i].assignment = "be the Nurse", $slaves[$i].assignmentVisible = 0, $slaves[$i].choosesOwnAssignment = 0, $slaves[$i].sentence = 0, $slaves[$i].livingRules = "luxurious">> + <<if $slaves[$i].choosesOwnClothes == 1>><<include "SA chooses own clothes">><</if>> + <<set $Nurse = $slaves[$i]>> +<<else>> + <<set $Nurse = 0>> +<</if>> <<goto "Clinic">> diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw index 428cc32f3b9f2a698d258c588cf03a970f82ef95..c0a5f18f1673c13d819f6e18f65576fdb8ab749b 100644 --- a/src/uncategorized/personalAttentionSelect.tw +++ b/src/uncategorized/personalAttentionSelect.tw @@ -1,7 +1,6 @@ :: Personal Attention Select [nobr] -<<set $nextButton = "Back to Main">> -<<set $nextLink = "Main">> +<<set $nextButton = "Back to Main", $nextLink = "Main">> <<if $PC.career == "escort">> [[Focus on "connecting"|Main][$personalAttention = "whoring", $personalAttentionChanged = 1]] @@ -88,40 +87,37 @@ You have not selected a slave for your personal attention. <<else>> -Your training will seek to <span id="training"><strong><<print $trainingRegimen>></strong></span>.<span id="cost"></span> - -<br> - -Change training objective: +Your training will seek to <span id="training"><strong>$trainingRegimen</strong></span>.<span id="cost"></span> +<br>Change training objective: <br> <<if ($activeSlave.devotion <= 20) && ($activeSlave.trust > -20)>> - <<link "Break her will">><<set $nextLink = "break her will">><<set $trainingRegimen = "break her will">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> - | <<link "Use enhanced breaking techniques">><<set $nextLink = "break her will">><<set $trainingRegimen = "harshly break her will">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> + <<link "Break her will">><<set $nextLink = "break her will">><<set $trainingRegimen = "break her will">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> + | <<link "Use enhanced breaking techniques">><<set $nextLink = "break her will">><<set $trainingRegimen = "harshly break her will">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <<else>> - <<link "Build her devotion">><<set $nextLink = "build her devotion">><<set $trainingRegimen = "build her devotion">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> + <<link "Build her devotion">><<set $nextLink = "build her devotion">><<set $trainingRegimen = "build her devotion">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> <br> <<if $activeSlave.fetishKnown == 0>> - <<link "Explore her sexuality">><<set $nextLink = "explore her sexuality">><<set $trainingRegimen = "explore her sexuality">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> + <<link "Explore her sexuality">><<set $nextLink = "explore her sexuality">><<set $trainingRegimen = "explore her sexuality">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <<else>> //You already understand her sexuality// <</if>> <<if ($activeSlave.behavioralFlaw != "none")>> <br> - <<link "Remove her behavioral flaw">><<set $nextLink = "fix her behavioral flaw">><<set $trainingRegimen = "fix her behavioral flaw">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> + <<link "Remove her behavioral flaw">><<set $nextLink = "fix her behavioral flaw">><<set $trainingRegimen = "fix her behavioral flaw">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <<if ($activeSlave.devotion < -20)>> | //She must be broken before her flaws can be softened// <<else>> - | <<link "Soften her behavioral flaw">><<set $nextLink = "soften her behavioral flaw">><<set $trainingRegimen = "soften her behavioral flaw">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> + | <<link "Soften her behavioral flaw">><<set $nextLink = "soften her behavioral flaw">><<set $trainingRegimen = "soften her behavioral flaw">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> <</if>> <<if ($activeSlave.sexualFlaw != "none")>> <br> - <<link "Remove her sexual flaw">><<set $nextLink = "fix her sexual flaw">><<set $trainingRegimen = "fix her sexual flaw">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> + <<link "Remove her sexual flaw">><<set $nextLink = "fix her sexual flaw">><<set $trainingRegimen = "fix her sexual flaw">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <<if ($activeSlave.devotion < -20)>> <<if ($activeSlave.behavioralFlaw == "none")>> | //She must be broken before her flaws can be softened// @@ -129,7 +125,7 @@ Change training objective: <<elseif ["cum addict", "anal addict", "attention whore", "breast growth", "abusive", "malicious", "self hating", "neglectful", "breeder"].includes($activeSlave.sexualFlaw)>> | //Paraphilias cannot be softened// <<else>> - | <<link "Soften her sexual flaw">><<set $nextLink = "soften her sexual flaw">><<set $trainingRegimen = "soften her sexual flaw">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> + | <<link "Soften her sexual flaw">><<set $nextLink = "soften her sexual flaw">><<set $trainingRegimen = "soften her sexual flaw">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> <</if>> @@ -145,155 +141,100 @@ Change training objective: <<elseif ($activeSlave.devotion <= 20) && ($activeSlave.trust > -20)>> //She's too disobedient to learn sex skills// <<else>> - <<link "Teach her">><<set $nextLink = "learn skills">><<set $trainingRegimen = "learn skills">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> + <<link "Teach her">><<set $nextLink = "learn skills">><<set $trainingRegimen = "learn skills">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> <br> -<<link "Care for her">><<set $nextLink = "look after her">><<set $trainingRegimen = "look after her">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> +<<link "Care for her">><<set $nextLink = "look after her">><<set $trainingRegimen = "look after her">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <br> Induce a flaw: -<<if $activeSlave.behavioralQuirk != "confident">> -<<if $activeSlave.behavioralFlaw != "arrogant">> - <<link "Arrogance">><<set $trainingRegimen = "induce arrogance">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> -<</if>> -<</if>> -<<if $activeSlave.behavioralQuirk != "cutting">> -<<if $activeSlave.behavioralFlaw != "bitchy">> - | <<link "Bitchiness">><<set $trainingRegimen = "induce bitchiness">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> -<</if>> -<</if>> -<<if $activeSlave.behavioralQuirk != "funny">> -<<if $activeSlave.behavioralFlaw != "odd">> - | <<link "Odd behavior">><<set $trainingRegimen = "induce odd behavior">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> -<</if>> -<</if>> -<<if $activeSlave.behavioralQuirk != "adores women">> -<<if $activeSlave.behavioralFlaw != "hates men">> - | <<link "Hatred of men">><<set $trainingRegimen = "induce hatred of men">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> -<</if>> -<</if>> -<<if $activeSlave.behavioralQuirk != "adores men">> -<<if $activeSlave.behavioralFlaw != "hates women">> - | <<link "Hatred of women">><<set $trainingRegimen = "induce hatred of women">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> -<</if>> -<</if>> -<<if $activeSlave.behavioralQuirk != "fitness">> -<<if $activeSlave.behavioralFlaw != "gluttonous">> - | <<link "Gluttony">><<set $trainingRegimen = "induce gluttony">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> -<</if>> -<</if>> -<<if $activeSlave.behavioralQuirk != "insecure">> -<<if $activeSlave.behavioralFlaw != "anorexic">> - | <<link "Anorexia">><<set $trainingRegimen = "induce anorexia">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> -<</if>> +<<if $activeSlave.behavioralQuirk != "confident" && $activeSlave.behavioralFlaw != "arrogant">> + <<link "Arrogance">><<set $trainingRegimen = "induce arrogance">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> -<<if $activeSlave.behavioralQuirk != "sinful">> -<<if $activeSlave.behavioralFlaw != "devout">> - | <<link "Religious devotion">><<set $trainingRegimen = "induce religious devotion">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> +<<if $activeSlave.behavioralQuirk != "cutting" && $activeSlave.behavioralFlaw != "bitchy">> + | <<link "Bitchiness">><<set $trainingRegimen = "induce bitchiness">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> +<<if $activeSlave.behavioralQuirk != "funny" && $activeSlave.behavioralFlaw != "odd">> + | <<link "Odd behavior">><<set $trainingRegimen = "induce odd behavior">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> -<<if $activeSlave.behavioralQuirk != "advocate">> -<<if $activeSlave.behavioralFlaw != "liberated">> - | <<link "Liberation">><<set $trainingRegimen = "induce liberation">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> +<<if $activeSlave.behavioralQuirk != "adores women" && $activeSlave.behavioralFlaw != "hates men">> + | <<link "Hatred of men">><<set $trainingRegimen = "induce hatred of men">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> +<<if $activeSlave.behavioralQuirk != "adores men" && $activeSlave.behavioralFlaw != "hates women">> + | <<link "Hatred of women">><<set $trainingRegimen = "induce hatred of women">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> -<<if $activeSlave.sexualQuirk != "gagfuck queen">> -<<if $activeSlave.sexualFlaw != "hates oral">> - | <<link "Hatred of oral">><<set $trainingRegimen = "induce hatred of oral">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> +<<if $activeSlave.behavioralQuirk != "fitness" && $activeSlave.behavioralFlaw != "gluttonous">> + | <<link "Gluttony">><<set $trainingRegimen = "induce gluttony">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> +<<if $activeSlave.behavioralQuirk != "insecure" && $activeSlave.behavioralFlaw != "anorexic">> + | <<link "Anorexia">><<set $trainingRegimen = "induce anorexia">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> -<<if $activeSlave.sexualQuirk != "confipainal queendent">> -<<if $activeSlave.sexualFlaw != "hates anal">> - | <<link "Hatred of anal">><<set $trainingRegimen = "induce hatred of anal">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> +<<if $activeSlave.behavioralQuirk != "sinful" && $activeSlave.behavioralFlaw != "devout">> + | <<link "Religious devotion">><<set $trainingRegimen = "induce religious devotion">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> +<<if $activeSlave.behavioralQuirk != "advocate" && $activeSlave.behavioralFlaw != "liberated">> + | <<link "Liberation">><<set $trainingRegimen = "induce liberation">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> -<<if $activeSlave.sexualQuirk != "strugglefuck queen">> -<<if $activeSlave.sexualFlaw != "hates penetration">> - | <<link "Hatred of penetration">><<set $trainingRegimen = "induce hatred of penetration">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> +<<if $activeSlave.sexualQuirk != "gagfuck queen" && $activeSlave.sexualFlaw != "hates oral">> + | <<link "Hatred of oral">><<set $trainingRegimen = "induce hatred of oral">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> +<<if $activeSlave.sexualQuirk != "confipainal queendent" && $activeSlave.sexualFlaw != "hates anal">> + | <<link "Hatred of anal">><<set $trainingRegimen = "induce hatred of anal">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> -<<if $activeSlave.sexualQuirk != "tease">> -<<if $activeSlave.sexualFlaw != "shamefast">> - | <<link "Shame">><<set $trainingRegimen = "induce shame">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> +<<if $activeSlave.sexualQuirk != "strugglefuck queen" && $activeSlave.sexualFlaw != "hates penetration">> + | <<link "Hatred of penetration">><<set $trainingRegimen = "induce hatred of penetration">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> +<<if $activeSlave.sexualQuirk != "tease" && $activeSlave.sexualFlaw != "shamefast">> + | <<link "Shame">><<set $trainingRegimen = "induce shame">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> -<<if $activeSlave.sexualQuirk != "romantic">> -<<if $activeSlave.sexualFlaw != "idealistic">> - | <<link "Sexual idealism">><<set $trainingRegimen = "induce sexual idealism">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> +<<if $activeSlave.sexualQuirk != "romantic" && $activeSlave.sexualFlaw != "idealistic">> + | <<link "Sexual idealism">><<set $trainingRegimen = "induce sexual idealism">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> +<<if $activeSlave.sexualQuirk != "perverted" && $activeSlave.sexualFlaw != "repressed">> + | <<link "Sexual repression">><<set $trainingRegimen = "induce sexual repression">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> -<<if $activeSlave.sexualQuirk != "perverted">> -<<if $activeSlave.sexualFlaw != "repressed">> - | <<link "Sexual repression">><<set $trainingRegimen = "induce sexual repression">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> +<<if $activeSlave.sexualQuirk != "caring" && $activeSlave.sexualFlaw != "apathetic">> + | <<link "Sexual apathy">><<set $trainingRegimen = "induce sexual apathy">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> +<<if $activeSlave.sexualQuirk != "unflinching" && $activeSlave.sexualFlaw != "crude">> + | <<link "Crudity">><<set $trainingRegimen = "induce crudity">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> -<<if $activeSlave.sexualQuirk != "caring">> -<<if $activeSlave.sexualFlaw != "apathetic">> - | <<link "Sexual apathy">><<set $trainingRegimen = "induce sexual apathy">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> -<</if>> -<</if>> -<<if $activeSlave.sexualQuirk != "unflinching">> -<<if $activeSlave.sexualFlaw != "crude">> - | <<link "Crudity">><<set $trainingRegimen = "induce crudity">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> -<</if>> -<</if>> -<<if $activeSlave.sexualQuirk != "size queen">> -<<if $activeSlave.sexualFlaw != "judgemental">> - | <<link "Judgment">><<set $trainingRegimen = "induce judgement">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> -<</if>> +<<if $activeSlave.sexualQuirk != "size queen" && $activeSlave.sexualFlaw != "judgemental">> + | <<link "Judgment">><<set $trainingRegimen = "induce judgement">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> <<if $activeSlave.fetishStrength > 95>> -<<if $activeSlave.fetish == "cumslut">> -<<if $activeSlave.sexualFlaw != "cum addict">> - | <<link "Cum addiction">><<set $trainingRegimen = "induce cum addiction">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> -<</if>> -<</if>> -<<if $activeSlave.fetish == "buttslut">> -<<if $activeSlave.sexualFlaw != "anal addict">> - | <<link "Anal addiction">><<set $trainingRegimen = "induce anal addiction">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> -<</if>> +<<if $activeSlave.fetish == "cumslut" && $activeSlave.sexualFlaw != "cum addict">> + | <<link "Cum addiction">><<set $trainingRegimen = "induce cum addiction">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> -<<if $activeSlave.fetish == "humiliation">> -<<if $activeSlave.sexualFlaw != "attention whore">> - | <<link "Attention whoring">><<set $trainingRegimen = "induce attention whoring">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> +<<if $activeSlave.fetish == "buttslut" && $activeSlave.sexualFlaw != "anal addict">> + | <<link "Anal addiction">><<set $trainingRegimen = "induce anal addiction">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> +<<if $activeSlave.fetish == "humiliation" && $activeSlave.sexualFlaw != "attention whore">> + | <<link "Attention whoring">><<set $trainingRegimen = "induce attention whoring">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> -<<if $activeSlave.fetish == "boobs">> -<<if $activeSlave.sexualFlaw != "breast growth">> - | <<link "Breast growth obsession">><<set $trainingRegimen = "induce breast growth obsession">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> +<<if $activeSlave.fetish == "boobs" && $activeSlave.sexualFlaw != "breast growth">> + | <<link "Breast growth obsession">><<set $trainingRegimen = "induce breast growth obsession">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> +<<if $activeSlave.fetish == "dom" && $activeSlave.sexualFlaw != "abusive">> + | <<link "Abusiveness">><<set $trainingRegimen = "induce abusiveness">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> -<<if $activeSlave.fetish == "dom">> -<<if $activeSlave.sexualFlaw != "abusive">> - | <<link "Abusiveness">><<set $trainingRegimen = "induce abusiveness">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> +<<if $activeSlave.fetish == "sadist" && $activeSlave.sexualFlaw != "malicious">> + | <<link "Maliciousness">><<set $trainingRegimen = "induce maliciousness">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> +<<if $activeSlave.fetish == "masochist" && $activeSlave.sexualFlaw != "self hatred">> + | <<link "Self hatred">><<set $trainingRegimen = "induce self hatred">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> -<<if $activeSlave.fetish == "sadist">> -<<if $activeSlave.sexualFlaw != "malicious">> - | <<link "Maliciousness">><<set $trainingRegimen = "induce maliciousness">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> -<</if>> -<</if>> -<<if $activeSlave.fetish == "masochist">> -<<if $activeSlave.sexualFlaw != "self hatred">> - | <<link "Self hatred">><<set $trainingRegimen = "induce self hatred">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> -<</if>> -<</if>> -<<if $activeSlave.fetish == "submissive">> -<<if $activeSlave.sexualFlaw != "neglectful">> - | <<link "Sexual self neglect">><<set $trainingRegimen = "induce sexual self neglect">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> -<</if>> -<</if>> -<<if $activeSlave.fetish == "pregnancy">> -<<if $activeSlave.sexualFlaw != "breeder">> - | <<link "Breeding obsession">><<set $trainingRegimen = "induce breeding obsession">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</link>> +<<if $activeSlave.fetish == "submissive" && $activeSlave.sexualFlaw != "neglectful">> + | <<link "Sexual self neglect">><<set $trainingRegimen = "induce sexual self neglect">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> +<<if $activeSlave.fetish == "pregnancy" && $activeSlave.sexualFlaw != "breeder">> + | <<link "Breeding obsession">><<set $trainingRegimen = "induce breeding obsession">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>> <</if>> <<else>> | //Paraphilias can only be induced from a strong fetish// <</if>> -<br> -//Inducing flaws is difficult and bad for slaves' obedience.// +<br> //Inducing flaws is difficult and bad for slaves' obedience.// <</if>> /* CLOSES NO SLAVE SELECTED */ diff --git a/src/uncategorized/recruiterSelect.tw b/src/uncategorized/recruiterSelect.tw index 1d6cd03d5fe548b77b5de8fbd96dbea295b00567..7a6e906ee9c5ad8ad24f203c469c59a2defbc3aa 100644 --- a/src/uncategorized/recruiterSelect.tw +++ b/src/uncategorized/recruiterSelect.tw @@ -1,18 +1,10 @@ -:: Recruiter Select - -<<nobr>> -<<set $nextButton = "Back to Main">> -<<set $nextLink = "Main">> - -<<for _i = 0;_i < $slaves.length;_i++>> -<<if $Recruiter.ID == $slaves[_i].ID>> - ''__@@color:pink;$slaves[_i].slaveName@@__'' is recruiting girls. - <<set $slaves[_i].assignment = "recruit girls">> - <<set $slaves[_i].assignmentVisible = 1>> - <<break>> -<</if>> -<</for>> -<<if ($Recruiter == 0)>> +:: Recruiter Select [nobr] + +<<set $nextButton = "Back to Main", $nextLink = "Main", $showEncyclopedia = 1, $encyclopedia = "Recruiter">> + +<<if ($Recruiter != 0)>> + ''__@@color:pink;$Recruiter.slaveName@@__'' is recruiting girls. +<<else>> You do not have a recruiter working at present. <</if>> @@ -54,5 +46,4 @@ <br><br>''Appoint a recruiter from among your devoted slaves:'' <<include "Slave Summary">> -<br>[[None|Recruiter Workaround][$Recruiter = 0]] -<</nobr>> +<br>[[None|Recruiter Workaround][$i = -1]] diff --git a/src/uncategorized/recruiterWorkaround.tw b/src/uncategorized/recruiterWorkaround.tw index 48724ec0e1efa89d28f4c2d0f05d145147ced7b4..e397ce99b3fcfc7811325d084740353fe6b8a724 100644 --- a/src/uncategorized/recruiterWorkaround.tw +++ b/src/uncategorized/recruiterWorkaround.tw @@ -1,21 +1,18 @@ -:: Recruiter Workaround +:: Recruiter Workaround [silently] - - <<for $i = 0; $i < $slaves.length; $i++>> - <<if ($slaves[$i].assignment == "recruit girls") && ($slaves[$i].ID != $Recruiter.ID)>> - <<set $slaves[$i].assignment = "rest">> - <<set $slaves[$i].assignmentVisible = 1>> - <<break>> - <</if>> - <</for>> - - <<for $i = 0; $i < $slaves.length; $i++>> - <<if $Recruiter.ID == $slaves[$i].ID>> - <<set $slaves[$i].assignment = "recruit girls">> - <<set $slaves[$i].assignmentVisible = 1>> - <<set $slaves[$i].choosesOwnAssignment = 0>> - <<break>> - <</if>> +<<if $Recruiter != 0>> + <<set _ID = $Recruiter.ID, _SL = $slaves.length>> + <<for _i = 0; _i < _SL; _i++>> + <<if (_ID == $slaves[_i].ID)>><<break>><</if>> <</for>> + <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>> +<</if>> +<<if $i > -1>> + <<set $slaves[$i].assignment = "recruit girls", $slaves[$i].assignmentVisible = 1, $slaves[$i].choosesOwnAssignment = 0, $slaves[$i].sentence = 0>> + <<if $slaves[$i].choosesOwnClothes == 1>><<include "SA chooses own clothes">><</if>> + <<set $Recruiter = $slaves[$i]>> +<<else>> + <<set $Recruiter = 0>> +<</if>> <<goto "Main">> diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index 0fd17476b34202c9467c678635c1ab58f4d5e944..e457be0ba2ae83c66b8779b0118b6fa419ff2fcc 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -493,6 +493,7 @@ $pronounCap has <</if>> <</if>> +<</if $activeSlave.vagina > -1>> <br> $pronounCap has <<if $activeSlave.vagina == 0>> @@ -527,6 +528,7 @@ $pronounCap has [[Remove pussy|Surgery Degradation][$activeSlave.vagina = -1,$activeSlave.ovaries = 0,$activeSlave.preg = -2,$activeSlave.pregSource = 0,$activeSlave.vaginalSkill = 0,$cash -= $surgeryCost,$activeSlave.health -= 20,$surgeryType = "vaginaRemoval"]] <<if $activeSlave.ovaries == 1>>//This will remove $possessive ovaries as well//<</if>> <</if>> <</if>> +<,/if>> <br> $pronounCap has diff --git a/src/uncategorized/schoolteacherSelect.tw b/src/uncategorized/schoolteacherSelect.tw index 8aa6cc82af5ab50c7d372fb71f5786ce378ab43c..1423b34380d5294473179bfaf30ae05d717422c6 100644 --- a/src/uncategorized/schoolteacherSelect.tw +++ b/src/uncategorized/schoolteacherSelect.tw @@ -1,25 +1,14 @@ -:: Schoolteacher Select +:: Schoolteacher Select [nobr] -<<nobr>> -<<set $nextButton = "Back">> -<<set $nextLink = "Schoolroom">> -<<set $showEncyclopedia = 0>> +<<set $nextButton = "Back", $nextLink = "Schoolroom", $showEncyclopedia = 1, $encyclopedia = "Schoolteacher">> -<<for _i = 0; _i < $slaves.length; _i++>> -<<if $Schoolteacher.ID == $slaves[_i].ID>> - ''__@@color:pink;$slaves[_i].slaveName@@__'' is serving as your Schoolteacher. - <<set $slaves[_i].assignment = "be the Schoolteacher">> - <<set $slaves[_i].assignmentVisible = 0>> - <br><br>She will help teach your slaves. - <<break>> -<</if>> -<</for>> -<<if ($Schoolteacher == 0)>> +<<if ($Schoolteacher != 0)>> + ''__@@color:pink;$Schoolteacher.slaveName@@__'' is serving as your Schoolteacher.<br><br>She will help teach your slaves. +<<else>> You have not selected a Schoolteacher. <</if>> <br><br>''Appoint a Schoolteacher from your devoted slaves:'' <<include "Slave Summary">> -<br><br>[[None|Schoolteacher Workaround][$Schoolteacher = 0]] -<</nobr>> +<br><br>[[None|Schoolteacher Workaround][$i = -1]] diff --git a/src/uncategorized/schoolteacherWorkaround.tw b/src/uncategorized/schoolteacherWorkaround.tw index 9b1f046c7d58452d3041ff3e4a562d6a7f443a74..d06ba457ab2f10044873b1bd3852fc7bd6ec563e 100644 --- a/src/uncategorized/schoolteacherWorkaround.tw +++ b/src/uncategorized/schoolteacherWorkaround.tw @@ -1,17 +1,23 @@ -:: Schoolteacher Workaround +:: Schoolteacher Workaround [silently] - - <<for $i = 0; $i < $slaves.length; $i++>> - <<if ($slaves[$i].assignment == "be the Schoolteacher") && ($slaves[$i].ID != $Schoolteacher.ID)>> - <<set $slaves[$i].assignment = "rest">> - <<set $slaves[$i].assignmentVisible = 1>> - <<break>> - <</if>> +<<if $Schoolteacher != 0>> + <<set _ID = $Schoolteacher.ID, _SL = $slaves.length>> + <<for _i = 0; _i < _SL; _i++>> + <<if (_ID == $slaves[_i].ID)>><<break>><</if>> <</for>> - - <<for $i = 0; $i < $slaves.length; $i++>> - <<if $Schoolteacher.ID == $slaves[$i].ID>> - <<if $slaves[$i].ID == $personalAttention>> + <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>> +<</if>> +<<if $i > -1>> + <<if $slaves[$i].ID == $HeadGirl.ID>> + <<set $HeadGirl = 0>> + <</if>> + <<if $slaves[$i].ID == $Recruiter.ID>> + <<set $Recruiter = 0>> + <</if>> + <<if $slaves[$i].ID == $Bodyguard.ID>> + <<set $Bodyguard = 0>> + <</if>> + <<if $slaves[$i].ID == $personalAttention>> <<if $PC.career == "escort">> <<set $personalAttention = "whoring">> <<elseif $PC.career == "servant">> @@ -19,23 +25,12 @@ <<else>> <<set $personalAttention = "business">> <</if>> - <</if>> - <<set $slaves[$i].assignment = "be the Schoolteacher">> - <<if $slaves[$i].choosesOwnClothes == 1>><<include "SA chooses own clothes">><</if>> - <<set $slaves[$i].assignmentVisible = 0>> - <<set $slaves[$i].sentence = 0>> - <<set $slaves[$i].livingRules = "luxurious">> - <<if $slaves[$i].ID == $HeadGirl.ID>> - <<set $HeadGirl = 0>> - <</if>> - <<if $slaves[$i].ID == $Recruiter.ID>> - <<set $Recruiter = 0>> - <</if>> - <<if $slaves[$i].ID == $Bodyguard.ID>> - <<set $Bodyguard = 0>> - <</if>> - <<break>> <</if>> - <</for>> + <<set $slaves[$i].assignment = "be the Schoolteacher", $slaves[$i].assignmentVisible = 0, $slaves[$i].choosesOwnAssignment = 0, $slaves[$i].sentence = 0, $slaves[$i].livingRules = "luxurious">> + <<if $slaves[$i].choosesOwnClothes == 1>><<include "SA chooses own clothes">><</if>> + <<set $Schoolteacher = $slaves[$i]>> +<<else>> + <<set $Schoolteacher = 0>> +<</if>> <<goto "Schoolroom">> diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw index 337cb689b0f5a43d215425c7e2a52e92a92905b0..c590170cc1fe6db853ec69a5de73c94412e0ac7e 100644 --- a/src/uncategorized/slaveSummary.tw +++ b/src/uncategorized/slaveSummary.tw @@ -24,25 +24,25 @@ <<print "[[_Slave.slaveName|Personal Attention Select][$personalAttention = $slaves["+_i+"].ID, $activeSlave = $slaves["+_i+"], $personalAttentionChanged = 1]]">> <<case "Agent Select">> <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.assignment != "guard you") && (_Slave.assignment != "recruit girls") && (_Slave.assignment != "be your Head Girl") && (_Slave.devotion >= 20) && (_Slave.intelligence > 0) && (_Slave.intelligenceImplant > 0) && canWalk(_Slave) && canSee(_Slave) && canTalk(_Slave) && _Slave.pregType < 50 && _Slave.breedingMark != 1>> - <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Agent Workaround][$activeSlave = $slaves["+_i+"]]]">> + <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Agent Workaround][$i = "+_i+"]]">> <<else>> <<continue>> <</if>> <<case "BG Select">> <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 50) && (_Slave.assignment != "guard you") && (_Slave.assignment != "recruit girls") && (_Slave.assignment != "be your Head Girl") && canWalk(_Slave) && canSee(_Slave) && _Slave.breedingMark != 1>> - <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Bodyguard Workaround][$Bodyguard = $slaves["+_i+"]]]">> + <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Bodyguard Workaround][$i = "+_i+"]]">> <<else>> <<continue>> <</if>> <<case "Recruiter Select">> <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 50) && (_Slave.assignment != "guard you") && (_Slave.assignment != "recruit girls") && (_Slave.assignment != "be your Head Girl") && canWalk(_Slave) && canSee(_Slave) && canTalk(_Slave)>> - <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Recruiter Workaround][$Recruiter = $slaves["+_i+"]]]">> + <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Recruiter Workaround][$i = "+_i+"]]">> <<else>> <<continue>> <</if>> <<case "HG Select">> <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 50) && (_Slave.assignment != "guard you") && (_Slave.assignment != "recruit girls") && (_Slave.assignment != "be your Head Girl") && canWalk(_Slave) && canSee(_Slave) && canTalk(_Slave)>> - <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|HG Workaround][$HeadGirl = $slaves["+_i+"]]]">> + <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|HG Workaround][$i = "+_i+"]]">> <<else>> <<continue>> <</if>> @@ -92,12 +92,12 @@ <<if _Slave.ID != $Attendant.ID>> <<continue>> <<else>> - <<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">> + <<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">> <</if>> <</if>> <<case "Attendant Select">> <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 50) && canWalk(_Slave)>> - <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Attendant Workaround][$Attendant = $slaves["+_i+"]]]">> + <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Attendant Workaround][$i = "+_i+"]]">> <<else>> <<continue>> <</if>> @@ -126,12 +126,12 @@ <<if _Slave.ID != $Madam.ID>> <<continue>> <<else>> - <<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">> + <<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">> <</if>> <</if>> <<case "Madam Select">> <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 50) && (_Slave.intelligence > -2) && canWalk(_Slave) && canSee(_Slave) && _Slave.breedingMark != 1>> - <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Madam Workaround][$Madam = $slaves["+_i+"]]]">> + <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Madam Workaround][$i = "+_i+"]]">> <<else>> <<continue>> <</if>> @@ -160,12 +160,12 @@ <<if _Slave.ID != $DJ.ID>> <<continue>> <<else>> - <<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">> + <<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">> <</if>> <</if>> <<case "DJ Select">> <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 50) && (_Slave.intelligence > -2) && canWalk(_Slave) && _Slave.breedingMark != 1>> - <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|DJ Workaround][$DJ = $slaves["+_i+"]]]">> + <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|DJ Workaround][$i = "+_i+"]]">> <<else>> <<continue>> <</if>> @@ -189,12 +189,12 @@ <<if _Slave.ID != $Nurse.ID>> <<continue>> <<else>> - <<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">> + <<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">> <</if>> <</if>> <<case "Nurse Select">> <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 50) && canWalk(_Slave) && canSee(_Slave)>> - <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Nurse Workaround][$Nurse = $slaves["+_i+"]]]">> + <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Nurse Workaround][$i = "+_i+"]]">> <<else>> <<continue>> <</if>> @@ -223,12 +223,12 @@ <<if _Slave.ID != $Schoolteacher.ID>> <<continue>> <<else>> - <<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">> + <<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">> <</if>> <</if>> <<case "Schoolteacher Select">> <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 50) && canTalk(_Slave) && canWalk(_Slave) && canSee(_Slave)>> - <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Schoolteacher Workaround][$Schoolteacher = $slaves["+_i+"]]]">> + <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Schoolteacher Workaround][$i = "+_i+"]]">> <<else>> <<continue>> <</if>> @@ -284,12 +284,12 @@ <<if _Slave.ID != $Milkmaid.ID>> <<continue>> <<else>> - <<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">> + <<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">> <</if>> <</if>> <<case "Milkmaid Select">> <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 20) && canWalk(_Slave) && canSee(_Slave)>> - <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Milkmaid Workaround][$Milkmaid = $slaves["+_i+"]]]">> + <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Milkmaid Workaround][$i = "+_i+"]]">> <<else>> <<continue>> <</if>> @@ -313,12 +313,12 @@ <<if _Slave.ID != $Stewardess.ID>> <<continue>> <<else>> - <<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">> + <<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">> <</if>> <</if>> <<case "Stewardess Select">> <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 50) && (_Slave.intelligence > -2) && canWalk(_Slave) && canSee(_Slave)>> - <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Stewardess Workaround][$Stewardess = $slaves["+_i+"]]]">> + <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Stewardess Workaround][$i = "+_i+"]]">> <<else>> <<continue>> <</if>> @@ -342,12 +342,12 @@ <<if _Slave.ID != $Concubine.ID>> <<continue>> <<else>> - <<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">> + <<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">> <</if>> <</if>> <<case "Concubine Select">> <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 50) && _Slave.amp != 1>> - <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Concubine Workaround][$Concubine = $slaves["+_i+"]]]">> + <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Concubine Workaround][$i = "+_i+"]]">> <<else>> <<continue>> <</if>> @@ -368,13 +368,13 @@ <<if _Slave.ID != $Wardeness.ID>> <<continue>> <<else>> - <<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">> + <<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">> <</if>> <</if>> <<case "Wardeness Select">> <<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 50) && canWalk(_Slave) & canSee(_Slave)>> <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>> - <<print "[[_Slave.slaveName|Wardeness Workaround][$Wardeness = $slaves["+_i+"]]]">> + <<print "[[_Slave.slaveName|Wardeness Workaround][$i = "+_i+"]]">> <<else>> <<continue>> <</if>> @@ -3358,11 +3358,11 @@ _Slave.faceShape face. <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>@@color:lime;Has an applicable career experience.@@ <</if>> <<case "New Game Plus">> -<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>> + <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>> <<if $Flag == 0>> - <<print "[[Add to import list|NGP Workaround][$slavesToImport = 1, $activeSlave = $slaves[" + _i + "]]]">> + <<print "[[Add to import list|NGP Workaround][$slavesToImport = 1, $i = "+_i+"]]">> <<else>> - <<print "[[Remove from import list|NGP Workaround][$slavesToImport = 0, $activeSlave = $slaves[" + _i + "]]]">> + <<print "[[Remove from import list|NGP Workaround][$slavesToImport = 0, $i = "+_i+"]]">> <<set $slavesToImport += 1>> <</if>> <<case "Matchmaking">> diff --git a/src/uncategorized/stewardessSelect.tw b/src/uncategorized/stewardessSelect.tw index 2a1ec6349b2b788dfa12ea3a2c00a413d7caed80..3fe13c73cf6f298f3d77f0f69c86a557353879bb 100644 --- a/src/uncategorized/stewardessSelect.tw +++ b/src/uncategorized/stewardessSelect.tw @@ -1,25 +1,14 @@ -:: Stewardess Select +:: Stewardess Select [nobr] -<<nobr>> -<<set $nextButton = "Back">> -<<set $nextLink = "Servants' Quarters">> -<<set $showEncyclopedia = 1>><<set $encyclopedia = "Stewardesses">> +<<set $nextButton = "Back", $nextLink = "Servants' Quarters", $showEncyclopedia = 1, $encyclopedia = "Stewardesses">> -<<for _i = 0; _i < $slaves.length; _i++>> -<<if $Stewardess.ID == $slaves[_i].ID>> - ''__@@color:pink;$slaves[_i].slaveName@@__'' is serving as your Stewardess. - <<set $slaves[_i].assignment = "be the Stewardess">> - <<set $slaves[_i].assignmentVisible = 0>> - <br><br>She will manage the Servants' Quarters. - <<break>> -<</if>> -<</for>> -<<if ($Stewardess == 0)>> +<<if ($Stewardess != 0)>> + ''__@@color:pink;$slaves[_i].slaveName@@__'' is serving as your Stewardess.<br><br>She will manage the Servants' Quarters. +<<else>> You have not selected a Stewardess. <</if>> <br><br>''Appoint a Stewardess from your devoted slaves:'' <<include "Slave Summary">> -<br><br>[[None|Stewardess Workaround][$Stewardess = 0]] -<</nobr>> +<br><br>[[None|Stewardess Workaround][$i = -1]] diff --git a/src/uncategorized/stewardessWorkaround.tw b/src/uncategorized/stewardessWorkaround.tw index c12d7d9bd5545ae43c26f64a5ef4ff064ec4d7d5..c3d073d2fd7b9b124afad8b9fbb831629f16479e 100644 --- a/src/uncategorized/stewardessWorkaround.tw +++ b/src/uncategorized/stewardessWorkaround.tw @@ -1,17 +1,23 @@ -:: Stewardess Workaround +:: Stewardess Workaround [silently] - - <<for $i = 0; $i < $slaves.length; $i++>> - <<if ($slaves[$i].assignment == "be the Stewardess") && ($slaves[$i].ID != $Stewardess.ID)>> - <<set $slaves[$i].assignment = "rest">> - <<set $slaves[$i].assignmentVisible = 1>> - <<break>> - <</if>> +<<if $Stewardess != 0>> + <<set _ID = $Stewardess.ID, _SL = $slaves.length>> + <<for _i = 0; _i < _SL; _i++>> + <<if (_ID == $slaves[_i].ID)>><<break>><</if>> <</for>> - - <<for $i = 0; $i < $slaves.length; $i++>> - <<if $Stewardess.ID == $slaves[$i].ID>> - <<if $slaves[$i].ID == $personalAttention>> + <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>> +<</if>> +<<if $i > -1>> + <<if $slaves[$i].ID == $HeadGirl.ID>> + <<set $HeadGirl = 0>> + <</if>> + <<if $slaves[$i].ID == $Recruiter.ID>> + <<set $Recruiter = 0>> + <</if>> + <<if $slaves[$i].ID == $Bodyguard.ID>> + <<set $Bodyguard = 0>> + <</if>> + <<if $slaves[$i].ID == $personalAttention>> <<if $PC.career == "escort">> <<set $personalAttention = "whoring">> <<elseif $PC.career == "servant">> @@ -19,25 +25,12 @@ <<else>> <<set $personalAttention = "business">> <</if>> - <</if>> - <<set $slaves[$i].assignment = "be the Stewardess">> - <<if $slaves[$i].choosesOwnClothes == 1>><<include "SA chooses own clothes">><</if>> - <<set $slaves[$i].assignmentVisible = 0>> - <<set $slaves[$i].livingRules = "luxurious">> - <<set $slaves[$i].sentence = 0>> - <<if $slaves[$i].ID == $HeadGirl.ID>> - <<set $HeadGirl = 0>> - <</if>> - <<if $slaves[$i].ID == $Recruiter.ID>> - <<set $Recruiter = 0>> - <</if>> - <<if $slaves[$i].ID == $Bodyguard.ID>> - <<set $Bodyguard = 0>> - <</if>> - <<break>> <</if>> - <</for>> - - + <<set $slaves[$i].assignment = "be the Stewardess", $slaves[$i].assignmentVisible = 0, $slaves[$i].choosesOwnAssignment = 0, $slaves[$i].sentence = 0, $slaves[$i].livingRules = "luxurious">> + <<if $slaves[$i].choosesOwnClothes == 1>><<include "SA chooses own clothes">><</if>> + <<set $Stewardess = $slaves[$i]>> +<<else>> + <<set $Stewardess = 0>> +<</if>> <<goto "Servants' Quarters">> diff --git a/src/uncategorized/wardenessSelect.tw b/src/uncategorized/wardenessSelect.tw index e75bde90d4f91d6b2eb3570f897715f62a4a68b6..d38b0900f5c5f29c3e51c70e60ddf196ae4161ec 100644 --- a/src/uncategorized/wardenessSelect.tw +++ b/src/uncategorized/wardenessSelect.tw @@ -1,25 +1,14 @@ -:: Wardeness Select +:: Wardeness Select [nobr] -<<nobr>> -<<set $nextButton = "Back">> -<<set $nextLink = "Cellblock">> -<<set $showEncyclopedia = 0>> +<<set $nextButton = "Back", $nextLink = "Cellblock", $showEncyclopedia = 1, $encyclopedia = "Wardeness">> -<<for _i = 0; _i < $slaves.length; _i++>> -<<if $Wardeness.ID == $slaves[_i].ID>> - ''__@@color:pink;$slaves[_i].slaveName@@__'' is serving as your Wardeness. - <<set $slaves[_i].assignment = "be the Wardeness">> - <<set $slaves[_i].assignmentVisible = 0>> - <br><br>She will help break your prisoners. - <<break>> -<</if>> -<</for>> -<<if ($Wardeness == 0)>> +<<if ($Wardeness != 0)>> + ''__@@color:pink;$slaves[_i].slaveName@@__'' is serving as your Wardeness.<br><br>She will help break your prisoners. +<<else>> You have not selected a Wardeness. <</if>> <br><br>''Appoint a Wardeness from your devoted slaves:'' <<include "Slave Summary">> -<br><br>[[None|Wardeness Workaround][$Wardeness = 0]] -<</nobr>> +<br><br>[[None|Wardeness Workaround][$i = -1]] diff --git a/src/uncategorized/wardenessWorkaround.tw b/src/uncategorized/wardenessWorkaround.tw index 1822d332b57ab4e5502caafe750da5d43f3f63d1..c7a7ddea2a61587d0c62c6aa7e314c0e11207889 100644 --- a/src/uncategorized/wardenessWorkaround.tw +++ b/src/uncategorized/wardenessWorkaround.tw @@ -1,17 +1,23 @@ -:: Wardeness Workaround +:: Wardeness Workaround [silently] - - <<for $i = 0; $i < $slaves.length; $i++>> - <<if ($slaves[$i].assignment == "be the Wardeness") && ($slaves[$i].ID != $Wardeness.ID)>> - <<set $slaves[$i].assignment = "rest">> - <<set $slaves[$i].assignmentVisible = 1>> - <<break>> - <</if>> +<<if $Wardeness != 0>> + <<set _ID = $Wardeness.ID, _SL = $slaves.length>> + <<for _i = 0; _i < _SL; _i++>> + <<if (_ID == $slaves[_i].ID)>><<break>><</if>> <</for>> - - <<for $i = 0; $i < $slaves.length; $i++>> - <<if $Wardeness.ID == $slaves[$i].ID>> - <<if $slaves[$i].ID == $personalAttention>> + <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>> +<</if>> +<<if $i > -1>> + <<if $slaves[$i].ID == $HeadGirl.ID>> + <<set $HeadGirl = 0>> + <</if>> + <<if $slaves[$i].ID == $Recruiter.ID>> + <<set $Recruiter = 0>> + <</if>> + <<if $slaves[$i].ID == $Bodyguard.ID>> + <<set $Bodyguard = 0>> + <</if>> + <<if $slaves[$i].ID == $personalAttention>> <<if $PC.career == "escort">> <<set $personalAttention = "whoring">> <<elseif $PC.career == "servant">> @@ -19,24 +25,12 @@ <<else>> <<set $personalAttention = "business">> <</if>> - <</if>> - <<set $slaves[$i].assignment = "be the Wardeness">> - <<if $slaves[$i].choosesOwnClothes == 1>><<include "SA chooses own clothes">><</if>> - <<set $slaves[$i].assignmentVisible = 0>> - <<set $slaves[$i].sentence = 0>> - <<set $slaves[$i].livingRules = "luxurious">> - <<if $slaves[$i].ID == $HeadGirl.ID>> - <<set $HeadGirl = 0>> - <</if>> - <<if $slaves[$i].ID == $Recruiter.ID>> - <<set $Recruiter = 0>> - <</if>> - <<if $slaves[$i].ID == $Bodyguard.ID>> - <<set $Bodyguard = 0>> - <</if>> - <<break>> <</if>> - <</for>> - + <<set $slaves[$i].assignment = "be the Wardeness", $slaves[$i].assignmentVisible = 0, $slaves[$i].choosesOwnAssignment = 0, $slaves[$i].sentence = 0, $slaves[$i].livingRules = "luxurious">> + <<if $slaves[$i].choosesOwnClothes == 1>><<include "SA chooses own clothes">><</if>> + <<set $Wardeness = $slaves[$i]>> +<<else>> + <<set $Wardeness = 0>> +<</if>> <<goto "Cellblock">> diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw index 0c3444f97a31abf94fd7c9761117bee9b031603a..7c05ed9f067f794db02ea54df45ea48ed86d863f 100644 --- a/src/utility/assayWidgets.tw +++ b/src/utility/assayWidgets.tw @@ -1137,22 +1137,24 @@ <<elseif $args[0].dick > 0 && $args[0].balls == 0 && $args[0].vagina == -1 && $args[0].ovaries == 0>> <<set $desc = "eunuch">> <<elseif $args[0].dick > 0 && $args[0].balls > 0 && $args[0].vagina > -1 && $args[0].ovaries == 1 && $args[0].voice < 2 && $args[0].boobs < 300 && ($args[0].faceType == "masculine" || $args[0].faceType == "androgynous")>> - <<set $desc = "cunt boy">> + <<set $desc = "cuntboy">> <<elseif $args[0].dick > 0 && $args[0].balls > 0 && $args[0].vagina == -1 && $args[0].ovaries == 0>> <<if $args[0].face > -1 && $args[0].hips > -1 && $args[0].shoulders < 1 && $args[0].faceType != "masculine">> <<set $desc = "trap">> <<elseif $args[0].boobs > 800>> - <<set $desc = "titty boy">> + <<set $desc = "tittyboy">> <<elseif $args[0].dick == 1 && $args[0].balls == 1>> <<set $desc = "sissy">> + <<elseif $args[0].dick > 1 && $args[0].balls > 1 && $args[0].height < 165 && $args[0].muscles < 5 && $args[0].visualAge < 19 && $args[0].faceType != "masculine">> + <<set $desc = "twink">> <<elseif $args[0].dick > 1 && $args[0].balls > 1 && $args[0].height < 160 && $args[0].muscles < 5 && $args[0].visualAge < 19>> - <<set $desc = "boy toy">> + <<set $desc = "boytoy">> <<elseif $args[0].muscles > 95 && $args[0].height >= 185>> <<set $desc = "titan">> <<elseif $args[0].muscles > 30>> - <<set $desc = "muscle boy">> + <<set $desc = "muscleboy">> <<else>> - <<set $desc = "slave boy">> + <<set $desc = "slaveboy">> <</if>> <<elseif $args[0].dick == 0 && $args[0].balls == 0 && $args[0].vagina > -1 && $args[0].ovaries == 1>> <<if $args[0].weight > 10 && $args[0].boobs > 800 && $args[0].birthsTotal > 0 && $args[0].physicalAge > 59>> @@ -1166,14 +1168,14 @@ <<elseif $args[0].muscles > 95 && $args[0].height >= 185>> <<set $desc = "amazon">> <<elseif $args[0].muscles > 30>> - <<set $desc = "muscle girl">> + <<set $desc = "musclegirl">> <<else>> - <<set $desc = "slave girl">> + <<set $desc = "slavegirl">> <</if>> <<elseif $args[0].dick == 0 && $args[0].balls == 0 && $args[0].vagina == -1>> <<set $desc = "neuter">> <<elseif $args[0].dick == 0 && $args[0].vagina == -1>> - <<set $desc = "ball slave">> + <<set $desc = "ballslave">> <<else>> <<set $desc = "slave">> <</if>> @@ -1547,7 +1549,7 @@ <</if>> <</if>> <</if>> - <<if $args[0].dick > 5 && $args[0].balls > 5 a&&nd $args[0].boobs > 5000>> + <<if $args[0].dick > 5 && $args[0].balls > 5 && $args[0].boobs > 5000>> <<set $desc = "hyper " + $desc>> <</if>> <<else>> diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw index 52edda62f04d4da72a9e55dc8e3247f2212da09d..27592366d8f540835c0fdfd98a60646fe0856bd7 100644 --- a/src/utility/raWidgets.tw +++ b/src/utility/raWidgets.tw @@ -2966,7 +2966,7 @@ Your brand design is ''$brandDesign.'' <</widget>> /% - Call as <<RARemoveRule>> + Call as <<RARemoveRule SlaveObject>> %/ <<widget "RARemoveRule">> <<for _s = 0; _s < $args[0].currentRules.length; _s++>> @@ -4555,7 +4555,7 @@ consequences. <<if (def _currentRule.excludedSlaves) && (_currentRule.excludedSlaves.length > 0)>> <<if ruleSlaveExcluded($args[0], _currentRule)>> <<if ruleApplied($args[0], _currentRule.ID)>> - <<RARemoveRule>> + <<RARemoveRule $args[0]>> <</if>> <<continue>> <</if>> @@ -4564,7 +4564,7 @@ consequences. <<if (def _currentRule.selectedSlaves) && (_currentRule.selectedSlaves.length > 0)>> <<if !ruleSlaveSelected($args[0], _currentRule)>> <<if ruleApplied($args[0], _currentRule.ID)>> - <<RARemoveRule>> + <<RARemoveRule $args[0]>> <</if>> <<continue>> <</if>> @@ -4573,7 +4573,7 @@ consequences. <<if (def _currentRule.facility) && (_currentRule.facility.length > 0)>> <<if !ruleAppliedToSlaveFacility(_currentRule, $args[0])>> <<if ruleApplied($args[0], _currentRule.ID)>> - <<RARemoveRule>> + <<RARemoveRule $args[0]>> <</if>> <<continue>> <</if>> @@ -4582,7 +4582,7 @@ consequences. <<if (def _currentRule.excludeFacility) && (_currentRule.excludeFacility.length > 0)>> <<if ruleExcludeSlaveFacility(_currentRule, $args[0])>> <<if ruleApplied($args[0], _currentRule.ID)>> - <<RARemoveRule>> + <<RARemoveRule $args[0]>> <</if>> <<continue>> <</if>> @@ -4591,7 +4591,7 @@ consequences. <<if (def _currentRule.assignment) && (_currentRule.assignment.length > 0)>> <<if !ruleAssignment(_currentRule.assignment, $args[0].assignment)>> <<if ruleApplied($args[0], _currentRule.ID)>> - <<RARemoveRule>> + <<RARemoveRule $args[0]>> <</if>> <<continue>> <</if>> @@ -4599,7 +4599,7 @@ consequences. <<if (def _currentRule.excludeAssignment) && (_currentRule.excludeAssignment.length > 0)>> <<if ruleAssignment(_currentRule.excludeAssignment, $args[0].assignment)>> <<if ruleApplied($args[0], _currentRule.ID)>> - <<RARemoveRule>> + <<RARemoveRule $args[0]>> <</if>> <<continue>> <</if>> @@ -4615,7 +4615,7 @@ consequences. <</if>> <<else>> <<if ruleApplied($args[0], _currentRule.ID)>> - <<RARemoveRule>> + <<RARemoveRule $args[0]>> <</if>> <</if>> <<case "always">> @@ -4625,7 +4625,7 @@ consequences. <</if>> <<case "none">> <<if ruleApplied($args[0], _currentRule.ID)>> - <<RARemoveRule>> + <<RARemoveRule $args[0]>> <</if>> <<case "devotion">> <<if checkThresholds($args[0].devotion, _currentRule)>> @@ -4635,7 +4635,7 @@ consequences. <</if>> <<else>> <<if ruleApplied($args[0], _currentRule.ID)>> - <<RARemoveRule>> + <<RARemoveRule $args[0]>> <</if>> <</if>> <<case "trust">> @@ -4646,7 +4646,7 @@ consequences. <</if>> <<else>> <<if ruleApplied($args[0], _currentRule.ID)>> - <<RARemoveRule>> + <<RARemoveRule $args[0]>> <</if>> <</if>> <<case "health">> @@ -4658,7 +4658,7 @@ consequences. <</if>> <<else>> <<if ruleApplied($args[0], _currentRule.ID)>> - <<RARemoveRule>> + <<RARemoveRule $args[0]>> <</if>> <</if>> <<elseif $args[0].health <= 90>> @@ -4669,12 +4669,12 @@ consequences. <</if>> <<else>> <<if ruleApplied($args[0], _currentRule.ID)>> - <<RARemoveRule>> + <<RARemoveRule $args[0]>> <</if>> <</if>> <<else>> <<if ruleApplied($args[0], _currentRule.ID)>> - <<RARemoveRule>> + <<RARemoveRule $args[0]>> <</if>> <</if>> <<case "sex drive">> @@ -4685,7 +4685,7 @@ consequences. <</if>> <<else>> <<if ruleApplied($args[0], _currentRule.ID)>> - <<RARemoveRule>> + <<RARemoveRule $args[0]>> <</if>> <</if>> <<case "age">> @@ -4696,7 +4696,7 @@ consequences. <</if>> <<else>> <<if ruleApplied($args[0], _currentRule.ID)>> - <<RARemoveRule>> + <<RARemoveRule $args[0]>> <</if>> <</if>> <<case "weight">> @@ -4707,7 +4707,7 @@ consequences. <</if>> <<else>> <<if ruleApplied($args[0], _currentRule.ID)>> - <<RARemoveRule>> + <<RARemoveRule $args[0]>> <</if>> <</if>> <<case "lactation">>