From b8ef56fad1833391c2f38f800652d38e93408fd8 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 27 Apr 2017 21:49:52 -0400
Subject: [PATCH] Lots. Just lots. Vanillla changes, fcanon's changes, etc.
---
src/interaction/researchLab.tw | 2 +-
src/npc/agent/agentCompany.tw | 5 +-
src/npc/agent/agentRetrieve.tw | 4 +-
src/npc/agent/agentWorkaround.tw | 3 +-
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/clinic.tw | 3 +
src/uncategorized/clinicReport.tw | 2 +-
src/uncategorized/dairyReport.tw | 2 +-
src/uncategorized/masterSuiteReport.tw | 2 +-
src/uncategorized/nextWeek.tw | 2 +-
.../personalAssistantAppearance.tw | 26 +--
src/uncategorized/randomIndividualEvent.tw | 2 +-
src/uncategorized/remoteSurgery.tw | 155 ++++++++++--------
src/uncategorized/saChoosesOwnJob.tw | 87 +++++-----
src/uncategorized/saTakeClasses.tw | 2 +-
src/uncategorized/slaveInteract.tw | 99 +++++------
src/uncategorized/slaveSummary.tw | 4 +-
src/uncategorized/surgeryDegradation.tw | 13 +-
src/utility/assignWidgets.tw | 42 +++--
src/utility/descriptionWidgets.tw | 12 +-
src/utility/miscWidgets.tw | 36 ++++
src/utility/raWidgets.tw | 2 +-
22 files changed, 286 insertions(+), 221 deletions(-)
diff --git a/src/interaction/researchLab.tw b/src/interaction/researchLab.tw
index 26d19a1568c..88706444d7f 100644
--- a/src/interaction/researchLab.tw
+++ b/src/interaction/researchLab.tw
@@ -8,7 +8,7 @@
//You switch one of the screens in your office to the feed from research facility.//<br><br>
- <br>[[Decomission facility|Manage Arcology][$researchLab.built to "false",$researchLab.hired to 0,$helots += $researchLab.menials,$researchLab.menials to 0,$researchLab.research to "none",$researchLab.manufacture to "none",$researchLab.productionTime to 0]] //Warning! This will cancel all projects, remove all staff and shut down this facility.//
+ <br>[[Decommission facility|Manage Arcology][$researchLab.built to "false",$researchLab.hired to 0,$helots += $researchLab.menials,$researchLab.menials to 0,$researchLab.research to "none",$researchLab.manufacture to "none",$researchLab.productionTime to 0]] //Warning! This will cancel all projects, remove all staff and shut down this facility.//
<br><br>[[Purchase cybernetics|Research Lab][$temp to 1]]
<br><br>
diff --git a/src/npc/agent/agentCompany.tw b/src/npc/agent/agentCompany.tw
index 69a1c72cc7b..17c199ffc94 100644
--- a/src/npc/agent/agentCompany.tw
+++ b/src/npc/agent/agentCompany.tw
@@ -4,9 +4,8 @@
<<set $nextLink = "AS Dump">>
<<set $returnTo = "Main">>
-<<set $activeSlave.assignment = "live with your agent">>
-<<set $activeSlave.assignmentVisible = 0>>
-<<set $activeSlave.sentence = 0>>
+<assignJob $activeSlave "live with your agent">>
+
<<if $activeSlave.rivalry > 0>>
<<for _i = 0;_i < $slaves.length;_i++>>
<<if $activeSlave.rivalryTarget == $slaves[_i].ID>>
diff --git a/src/npc/agent/agentRetrieve.tw b/src/npc/agent/agentRetrieve.tw
index d4945f78b69..80449dafbdc 100644
--- a/src/npc/agent/agentRetrieve.tw
+++ b/src/npc/agent/agentRetrieve.tw
@@ -9,7 +9,7 @@
<<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>>
<</if>>
- <<set $slaves[_j].assignment = "rest", $slaves[_j].assignmentVisible = 1, $slaves[_j].sentence = 0>>
+ <<removeJob $slaves[_j] $slaves[_j].assignment>>
<<break>>
<</if>>
<</for>>
@@ -17,7 +17,7 @@
<<set $slaves[$i].birthsTotal += $slaves[$i].pregType, set $slaves[$i].preg = 0, set $slaves[$i].pregSource = 0, set $slaves[$i].pregType = 0>>
<</if>>
<</if>>
-<<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1, $slaves[_i].sentence = 0>>
+<<removeJob $slaves[_i] $slaves[_i].assignment>>
<<break>>
<</if>>
<</for>>
diff --git a/src/npc/agent/agentWorkaround.tw b/src/npc/agent/agentWorkaround.tw
index 444d6df53c2..9a990edf7b3 100644
--- a/src/npc/agent/agentWorkaround.tw
+++ b/src/npc/agent/agentWorkaround.tw
@@ -2,7 +2,8 @@
<<set $nextButton = "Continue", $nextLink = "Neighbor Interact", _SL = $slaves.length, _ID = $slaves[$i].ID>>
-<<set $slaves[$i].assignment = "be your agent", $slaves[$i].assignmentVisible = 0, $slaves[$i].choosesOwnAssignment = 0, $slaves[$i].sentence = 0>>
+<<assignJob $slaves[$i] "be your agent">>
+
<<if $activeSlave.reservedChildren > 0>>
<<set $reservedChildren -= $activeSlave.reservedChildren>>
<<set $activeSlave.reservedChildren = 0>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index f6877fbe781..9c4048ae780 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -2984,7 +2984,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
<<replace "#result">>
You order $activeSlave.slaveName confined until further notice. $activeSlave.slaveName is @@.hotpink;a little crushed@@ by her failure to escape. However, every single one of your other slaves not already obedient to you is slightly @@.mediumaquamarine;encouraged in her trust that you won't hurt her@@ by this moderate punishment of an escape attempt.
<<set $activeSlave.devotion += 4>>
- <<set $activeSlave.assignment = "stay confined">>
+ <<assignJob $activeSlave "stay confined">>
<<for $i = 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].devotion <= 20>>
<<set $slaves[$i].trust += 4>>
diff --git a/src/uncategorized/clinic.tw b/src/uncategorized/clinic.tw
index a43bbbd78bb..064415abb05 100644
--- a/src/uncategorized/clinic.tw
+++ b/src/uncategorized/clinic.tw
@@ -86,6 +86,9 @@ $clinicNameCaps
<<set _Tmult3 = Math.trunc(150000*$upgradeMultiplierArcology)>>
The entire floor beneath $clinicName is occupied by a huge filtration plant that constantly cycles out the patients' blood to remove impurities. [[Increase the effectiveness of the impurity purging|Clinic][$cash -= _Tmult3, $clinicUpgradePurge to 1]] //Costs ¤_Tmult3 and may cause health problems in slaves//
<</if>>
+ <<if $Nurse == 0>>
+ <br>However, without a nurse in attendance, the blood treatment equipment remains idle.
+ <</if>>
<<else>>
<<set _Tmult2 = Math.trunc(50000*$upgradeMultiplierArcology)>>
It includes standard dialysis equipment. [[Install advanced blood treatment equipment to help address drug side effects|Clinic][$cash -= _Tmult2, $clinicUpgradeFilters = 1]] //Costs ¤_Tmult2//
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index e890e0ece1b..625cf5f7ca5 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -294,7 +294,7 @@
<<if ($slaves[_i].health <= 40)>>
<<set _stay += 1>>
<</if>>
- <<if ($slaves[_i].chem >= 20) && ($clinicUpgradeFilters == 1)>>
+ <<if ($Nurse != 0) && ($slaves[_i].chem >= 20) && ($clinicUpgradeFilters == 1)>>
<<set _stay += 1>>
<</if>>
<<if (($clinicSpeedGestation >= 0) && ($slaves[_i].preg >= 1) && $Nurse != 0) || ($Nurse != 0 && $slaves[_i].pregControl == "speed up")>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index bb46d82190d..ca38d8c12a5 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -699,7 +699,7 @@
<<if _careerForgotten > 1>>
_careerForgotten cows forgot the details of their past professional lives; all they can remember now is this.
<<elseif _careerForgotten > 0>>
- One cow forgot forgot the details of her past professional life; all she can remember now is this.
+ One cow forgot the details of her past professional life; all she can remember now is this.
<</if>>
<<if _vaginasStretched > 1>>
_vaginasStretched cows' vaginas were broken in for machine use, and are unlikely to be any use for anything other than receiving cum and medication, and giving birth.
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 7d5640c34b4..44285fff164 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -4,7 +4,7 @@
<<for _dI = 0; _dI < _DL; _dI++>>
<<set _i = $MastSiIDs[_dI].Index, _ID = $MastSiIDs[_dI].ID>>
- <<if ndef $slaves[_i] || _ID != $slaves[_i].ID>
+ <<if ndef $slaves[_i] || _ID != $slaves[_i].ID>>
/% Slaves.ID and $MastSiIDs.ID's don't match-up so let's find her %/
<<for _i = 0; _i < _SL; _i++>>
<<if _ID == $slaves[_i].ID>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 30c36d423a7..fe599721f30 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -45,7 +45,7 @@
<<if $slaves[_i].sentence > 1>>
<<set $slaves[_i].sentence -= 1>>
<<elseif $slaves[_i].sentence == 1>>
- <<set $slaves[_i].sentence = 0, $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>>
+ <<removeJob $slaves[_i] $slaves[_i].assignment>>
<</if>>
<<if $slaves[_i].weekAcquired == 0>>
<<set $slaves[_i].weekAcquired = $week>>
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index c11419bd45d..7c31e2a2185 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/uncategorized/personalAssistantAppearance.tw
@@ -994,31 +994,31 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
<<case "degradationist">>
She is wearing black lipstick along with her usual white linen dress with a short skirt. Occasionally you get a glance up that skirt; a dark black thong greets you.
<<case "roman revivalist">>
- She is wearing a fine stola appropriate for a respectable Roman lady, with her hair up in a complicated style.
+ She is wearing a cute little toga. Occasionally you get a glance up it; a cute little pussy says hello.
<<case "egyptian revivalist">>
- She is wearing a simple white linen dress, kohl eyeshadow, sandals, and a serene expression.
+ She is wearing a simple white linen dress, kohl eyeshadow, and a serene expression. Her dress hangs low enough to block your view, unfortunately.
<<case "edo revivalist">>
- She is wearing a fine kimono with slits for her wings, getae, tabi, and an expression of perfect serenity.
+ She is wearing a cute little kimono with slits for her wings. Occasionally you get a glance up it; a lovely pair of panites say hello.
<<case "arabian revivalist">>
- She is wearing a tailored suit, a silk headscarf, and aviator sunglasses, making her look ridiculous.
+ She a fine dress, a silk headscarf, aviator sunglasses, and an overly conservative posture. No seeing up her dress for you!
<<case "chinese revivalist">>
- She is wearing a conservative silk qipao with special slits for her wings. Her hair is pulled back into a bun and secured by a couple of chopsticks.
+ She is wearing a conservative silk qipao with special slits for her wings. Her hair is pulled back into a bun and secured by a couple of chopsticks. It you try really hard, you can get a peek of her panties as she flutters by.
<<case "chattel religionist">>
- She has adjusted her outfit to consist of nothing but the symbol of your new religion carefully tailored to cover her nipples and crotch. She wears another around her neck and a blush on her cheeks.
+ She has adjusted her outfit to consist of nothing but the symbol of your new religion carefully tailored to cover her nipples and crotch. Another dangles from her neck. Her attire leaves little to the imagination.
<<case "physical idealist">>
- She has swapped out her usual linen dress for one that shows off her toned arms, legs and abs.
+ She has chosen to ditch her usual linen dress for nothing but her undies in order to show off her muscles.
<<case "repopulation focus">>
- Her simple white linen dress is parted by her full term pregnancy; likely a lost soul being given a new chance.
+ She has chosen to ditch her usual linen dress for just her panties. She struggles to fly with her heavy pregnancy and milk laden breasts.
<<case "eugenics">>
- She has swapped out her usual linen dress for a fabulous one to match her perfect appearance. She proudly wears the symbol of high society on her arm and, judging by the slight curve to her middle, is growing a child just as beautiful as her.
+ She wears simple white linen dress with a short skirt that frequently lets you catch glimpses of her chastity belt.
<<case "gender radicalist">>
- She wears simple white linen dress and has recently changed her appearance to make herself quite androgynous.
+ She wears simple white linen dress with a short skirt that frequently lets you catch glimpses of her panties. She has become rather boyish lately and you swear that there is a slight bulge in her panties.
<<case "gender fundamentalist">>
- She wears simple white linen dress that struggles to cover both her full breasts and child-bearing hips.
+ She wears simple white linen dress that struggles to cover both her full breasts and child-bearing hips. Her short skirt frequently rides you to give you a lovely view of her panties.
<<case "asset expansionist">>
- She has recently given up on trying to cover her arm-filling breasts, resorting to just wearing a skirt; a skirt that strains against her enormous rear. She certainly won't be flying anyway.
+ She has recently taken to wearing nothing put her panties, having given up on fitting into her dress. She struggles to fly with her massive tits weighing her down and she commonly has to pause to pull her underwear out of her buttcrack.
<<case "transformation fetishist">>
- She wears simple white linen dress that struggles to contain her big, perky, obviously fake breasts.
+ She wears simple white linen dress that struggles to cover both her big fake breasts and ass. Her short skirt feebly rests atop her panty devouring rear, giving you a lovely view.
<<case "pastoralist">>
She wears simple white linen dress that struggles to cover her full breasts. She frequently tries to hide her nipples; her milk having rendered her dress transparent.
<<case "maturity preferentialist">>
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index e7a03e79884..da5f111f611 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -742,7 +742,7 @@
<<if $eventSlave.fetish == "sadist">>
<<if $eventSlave.fetishStrength > 20>>
-<<if $eventSlave.arcade != 0>>
+<<if $arcade != 0>>
<<if $eventSlave.trust > -20>>
<<if $eventSlave.devotion > 50>>
<<set $RESSTRevent.push("arcade sadist")>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index a90ccdd87eb..26d274b4819 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -8,6 +8,10 @@
$activeSlave.slaveName is lying strapped down on the table in your <<if $surgeryUpgrade == 1>>heavily upgraded and customized remote surgery.<<else>>remote surgery.<</if>> The surgical equipment reads <<if $activeSlave.health < -20>>@@.red;SLAVE UNHEALTHY, SURGERY NOT RECOMMENDED.@@<<elseif $activeSlave.health <= 20>>@@.yellow;SLAVE HEALTHY, SURGERY SAFE.@@<<else>>@@.green;SLAVE HEALTHY, SURGERY ENCOURAGED.@@<</if>><<if $PC.medicine >= 100>> The remote surgery mechanisms that allow a surgeon to be brought in by telepresence are inactive, and the autosurgery is ready for your control inputs. Surgery on your slaves is a challenge and a pleasure you wouldn't dream of sharing.<</if>>
<br><br>
+<<if $activeSlave.indentureRestrictions >= 1>>
+ @@.yellow;This slave is subject to a restrictive indenture which forbids many invasive surgeries.@@
+ <br><br>
+<</if>>
$possessiveCap
<<if $activeSlave.boobs < 300>><<print either("androgynous", "flat")>> chest is barely there.
@@ -1661,11 +1665,11 @@ The prosthesis facility has constructed $possessive prosthetic limbs.
<<if $activeSlave.indentureRestrictions < 1>>
<<if $activeSlave.origEye != "implant">>
<<if ($activeSlave.eyes > -2)>>
- [[Blind|Surgery Degradation][$activeSlave.eyes = -2,$activeSlave.eyeColor = "dulled " + $activeSlave.origEye,$activeSlave.eyeColor = $activeSlave.origEye,$activeSlave.assignment = "rest",$activeSlave.assignmentVisible = 1,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "blind"]]
+ [[Blind|Surgery Degradation][$activeSlave.eyes = -2,$activeSlave.eyeColor = "dulled " + $activeSlave.origEye,$activeSlave.eyeColor = $activeSlave.origEye,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "blind"]]
<</if>>
/*<<if ($activeSlave.eyes != -3)>>
<<if ($activeSlave.eyes >= -2)>> | <</if>>
- [[Remove eyes|Surgery Degradation][$activeSlave.eyeColor = "empty",$activeSlave.origEye = "none",$activeSlave.assignment = "rest",$activeSlave.assignmentVisible = 1,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "remove eyes"]]
+ [[Remove eyes|Surgery Degradation][$activeSlave.eyeColor = "empty",$activeSlave.origEye = "none",$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "remove eyes"]]
<<if ($activeSlave.eyes != -2)>>//This will greatly restrict $possessive//<</if>>
<</if>>*/
<</if>>
@@ -1812,72 +1816,81 @@ The prosthesis facility has constructed $possessive prosthetic limbs.
<</if>>
<</if>>
-<br>
-
-<<if ($activeSlave.shoulders < -1)>>
-$pronounCap has very narrow shoulders.
-<<elseif ($activeSlave.shoulders < 0)>>
-$pronounCap has narrow shoulders.
-<<elseif ($activeSlave.shoulders < 1)>>
-$pronounCap has average shoulders.
-<<elseif ($activeSlave.shoulders < 2)>>
-$pronounCap has broad shoulders.
-<<elseif ($activeSlave.shoulders == 2)>>
-$pronounCap has very broad shoulders.
-<</if>>
-<<if ($activeSlave.shouldersImplant == 0)>>
- They have not been altered.
-<<elseif ($activeSlave.shouldersImplant != 0)>>
- They have been surgically altered.
-<</if>>
-<<if ($activeSlave.shouldersImplant == 0)>>
- <<if $activeSlave.indentureRestrictions < 1>>
- [[Restructure shoulders more broadly|Surgery Degradation][$activeSlave.shouldersImplant = 1,$activeSlave.shoulders += 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "shoulders"]] | [[Restructure shoulders more narrowly|Surgery Degradation][$activeSlave.shouldersImplant = -1,$activeSlave.shoulders -= 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "shoulders"]]
+<<if $activeSlave.indentureRestrictions < 1>>
+ <br>
+ <<if ($activeSlave.shoulders < -1)>>
+ $pronounCap has very narrow shoulders.
+ <<elseif ($activeSlave.shoulders < 0)>>
+ $pronounCap has narrow shoulders.
+ <<elseif ($activeSlave.shoulders < 1)>>
+ $pronounCap has average shoulders.
+ <<elseif ($activeSlave.shoulders < 2)>>
+ $pronounCap has broad shoulders.
+ <<elseif ($activeSlave.shoulders == 2)>>
+ $pronounCap has very broad shoulders.
+ <</if>>
+ <<if ($activeSlave.shouldersImplant == 0)>>
+ $pronounCap has a natural shoulder structure.
+ <<elseif ($activeSlave.shouldersImplant > 0)>>
+ $possessiveCap shoulders been restructured to broaden them.
+ <<elseif ($activeSlave.shouldersImplant < 0)>>
+ $possessiveCap shoulders been restructured to narrow them.
+ <</if>>
+ <<if $activeSlave.shouldersImplant == 0>>
+ <<if $activeSlave.shoulders < 3>>
+ <<if $activeSlave.shoulders > -3>>
+ <<if $activeSlave.indentureRestrictions < 1>>
+ [[Restructure shoulders more broadly|Surgery Degradation][$activeSlave.shouldersImplant = 1,$activeSlave.shoulders += 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "shoulders"]] | [[Restructure shoulders more narrowly|Surgery Degradation][$activeSlave.shouldersImplant = -1,$activeSlave.shoulders -= 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "shoulders"]]
+ <</if>>
+ <<elseif ($activeSlave.shoulders < 2) && ($activeSlave.shoulders > -2) && ($surgeryUpgrade == 1)>>
+ <<if $activeSlave.indentureRestrictions < 1>>
+ [[Advanced shoulder broadening surgery|Surgery Degradation][$activeSlave.shouldersImplant = 1,$activeSlave.shoulders += 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "shoulders"]] | [[Advanced shoulder narrowing surgery|Surgery Degradation][$activeSlave.shouldersImplant = -1,$activeSlave.shoulders -= 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "shoulders"]]
+ <</if>>
+ <<elseif ($activeSlave.shoulders < 2) && ($surgeryUpgrade == 1)>>
+ <<if $activeSlave.indentureRestrictions < 1>>
+ [[Advanced shoulder broadening surgery|Surgery Degradation][$activeSlave.shouldersImplant = 1,$activeSlave.shoulders += 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "shoulders"]]
+ <</if>>
+ <<elseif ($activeSlave.shoulders > -2) && ($surgeryUpgrade == 1)>>
+ <<if $activeSlave.indentureRestrictions < 1>>
+ [[Advanced shoulder narrowing surgery|Surgery Degradation][$activeSlave.shouldersImplant = -1,$activeSlave.shoulders -= 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "shoulders"]]
+ <</if>>
<</if>>
-<<elseif ($activeSlave.shoulders < 2) && ($activeSlave.shoulders > -2) && ($surgeryUpgrade == 1)>>
- <<if $activeSlave.indentureRestrictions < 1>>
- [[Advanced shoulder broadening surgery|Surgery Degradation][$activeSlave.shouldersImplant = 1,$activeSlave.shoulders += 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "shoulders"]] | [[Advanced shoulder narrowing surgery|Surgery Degradation][$activeSlave.shouldersImplant = -1,$activeSlave.shoulders -= 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "shoulders"]]
<</if>>
-<<elseif ($activeSlave.shoulders < 2) && ($surgeryUpgrade == 1)>>
- <<if $activeSlave.indentureRestrictions < 1>>
- [[Advanced shoulder broadening surgery|Surgery Degradation][$activeSlave.shouldersImplant = 1,$activeSlave.shoulders += 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "shoulders"]]
<</if>>
-<<elseif ($activeSlave.shoulders > -2) && ($surgeryUpgrade == 1)>>
- <<if $activeSlave.indentureRestrictions < 1>>
- [[Advanced shoulder narrowing surgery|Surgery Degradation][$activeSlave.shouldersImplant = -1,$activeSlave.shoulders -= 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "shoulders"]]
+ <br>
+ <<if ($activeSlave.hips < -1)>>
+ $pronounCap has very narrow hips.
+ <<elseif ($activeSlave.hips < 0)>>
+ $pronounCap has narrow hips.
+ <<elseif ($activeSlave.hips < 1)>>
+ $pronounCap has average hips.
+ <<elseif ($activeSlave.hips < 2)>>
+ $pronounCap has broad hips.
+ <<elseif ($activeSlave.hips < 3)>>
+ $pronounCap has very broad hips.
+ <<elseif ($activeSlave.hips == 3)>>
+ $pronounCap has doorway-jamming hips.
+ <</if>>
+ <<if ($activeSlave.hipsImplant == 0)>>
+ They have not been altered.
+ <<elseif ($activeSlave.hipsImplant > 0)>>
+ $possessiveCap pelvis has been broadened.
+ <<elseif ($activeSlave.hipsImplant < 0)>>
+ $possessiveCap pelvis has been narrowed.
+ <</if>>
+ <<if ($activeSlave.hipsImplant == 0)>>
+ <<if $activeSlave.hips < 4>>
+ <<if $activeSlave.hips > -3>>
+ [[Broaden pelvis|Surgery Degradation][$activeSlave.hipsImplant = 1,$activeSlave.hips += 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "hips"]] | [[Narrow pelvis|Surgery Degradation][$activeSlave.hipsImplant = -1,$activeSlave.hips -= 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "hips"]]
+ <<elseif ($activeSlave.hips < 2) && ($activeSlave.hips > -2) && ($surgeryUpgrade == 1)>>
+ [[Advanced pelvis broadening|Surgery Degradation][$activeSlave.hipsImplant = 1,$activeSlave.hips += 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "hips"]] | [[Advanced pelvis narrowing|Surgery Degradation][$activeSlave.hipsImplant = -1,$activeSlave.hips -= 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "hips"]]
+ <<elseif ($activeSlave.hips < 3) && ($surgeryUpgrade == 1)>>
+ [[Advanced pelvis broadening|Surgery Degradation][$activeSlave.hipsImplant = 1,$activeSlave.hips += 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "hips"]]
+ <<elseif ($activeSlave.hips > -2) && ($surgeryUpgrade == 1)>>
+ [[Advanced pelvis narrowing|Surgery Degradation][$activeSlave.hipsImplant = -1,$activeSlave.hips -= 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "hips"]]
+ <</if>>
+ <</if>>
<</if>>
-<</if>>
-
-<br>
-
-<<if ($activeSlave.hips < -1)>>
-$pronounCap has very narrow hips.
-<<elseif ($activeSlave.hips < 0)>>
-$pronounCap has narrow hips.
-<<elseif ($activeSlave.hips < 1)>>
-$pronounCap has average hips.
-<<elseif ($activeSlave.hips < 2)>>
-$pronounCap has broad hips.
-<<elseif ($activeSlave.hips < 3)>>
-$pronounCap has very broad hips.
-<<elseif ($activeSlave.hips == 3)>>
-$pronounCap has doorway-jamming hips.
-<</if>>
-<<if ($activeSlave.hipsImplant == 0)>>
- They have not been altered.
-<<elseif ($activeSlave.hipsImplant != 0)>>
- They have been surgically altered.
-<</if>>
-<<if $activeSlave.indentureRestrictions < 1>>
-<<if ($activeSlave.hipsImplant == 0)>>
- [[Broaden pelvis|Surgery Degradation][$activeSlave.hipsImplant = 1,$activeSlave.hips += 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "hips"]] | [[Narrow pelvis|Surgery Degradation][$activeSlave.hipsImplant = -1,$activeSlave.hips -= 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "hips"]]
-<<elseif ($activeSlave.hips < 2) && ($activeSlave.hips > -2) && ($surgeryUpgrade == 1)>>
- [[Advanced pelvis broadening|Surgery Degradation][$activeSlave.hipsImplant = 1,$activeSlave.hips += 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "hips"]] | [[Advanced pelvis narrowing|Surgery Degradation][$activeSlave.hipsImplant = -1,$activeSlave.hips -= 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "hips"]]
-<<elseif ($activeSlave.hips < 3) && ($surgeryUpgrade == 1)>>
- [[Advanced pelvis broadening|Surgery Degradation][$activeSlave.hipsImplant = 1,$activeSlave.hips += 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "hips"]]
-<<elseif ($activeSlave.hips > -2) && ($surgeryUpgrade == 1)>>
- [[Advanced pelvis narrowing|Surgery Degradation][$activeSlave.hipsImplant = -1,$activeSlave.hips -= 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "hips"]]
-<</if>>
<</if>>
<br>
@@ -1907,29 +1920,29 @@ $pronounCap has doorway-jamming hips.
<<if $cyberMod == 0>>
<<if $activeSlave.amp == 0>>
<<if ($activeSlave.indentureRestrictions < 1) && ($seeExtreme == 1)>>
- [[Remove arms and legs|Surgery Degradation][$activeSlave.amp = 1,$activeSlave.heels = 0,$activeSlave.heightImplant = 0,$activeSlave.legsTat = 0,$activeSlave.armsTat = 0,$activeSlave.assignment = "rest",$activeSlave.assignmentVisible = 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$activeSlave.nails = 0,$surgeryType = "amp"]] //This will greatly restrict $possessive//
+ [[Remove arms and legs|Surgery Degradation][$activeSlave.amp = 1,$activeSlave.heels = 0,$activeSlave.heightImplant = 0,$activeSlave.legsTat = 0,$activeSlave.armsTat = 0,$cash -= $surgeryCost, $activeSlave.health -= 40,$activeSlave.nails = 0,$surgeryType = "amp"]] //This will greatly restrict $possessive//
<</if>>
<<elseif $activeSlave.amp != 1>>
<<if ($activeSlave.indentureRestrictions < 1) && ($seeExtreme == 1)>>
- [[Detach artificial limbs|Surgery Degradation][$activeSlave.amp = 1,$activeSlave.heels = 0,$activeSlave.heightImplant = 0,$activeSlave.assignment = "rest",$activeSlave.assignmentVisible = 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$activeSlave.nails = 0,$surgeryType = "removeLimbs"]] //This will greatly restrict $possessive//
+ [[Detach artificial limbs|Surgery Degradation][$activeSlave.amp = 1,$activeSlave.heels = 0,$activeSlave.heightImplant = 0,$cash -= $surgeryCost, $activeSlave.health -= 40,$activeSlave.nails = 0,$surgeryType = "removeLimbs"]] //This will greatly restrict $possessive//
<</if>>
<</if>>
<<else>>
<<if $activeSlave.amp == 0>>
<<if ($activeSlave.indentureRestrictions < 1) && ($seeExtreme == 1) && (($stockpile.basicPLimbInterface + $stockpile.advPLimbInterface) == 0)>>
- [[Remove arms and legs|Surgery Degradation][$activeSlave.amp = 1,$activeSlave.heels = 0,$activeSlave.heightImplant = 0,$activeSlave.legsTat = 0,$activeSlave.armsTat = 0,$activeSlave.assignment = "rest",$activeSlave.assignmentVisible = 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$activeSlave.nails = 0,$surgeryType = "amp"]] //This will greatly restrict $possessive//
+ [[Remove arms and legs|Surgery Degradation][$activeSlave.amp = 1,$activeSlave.heels = 0,$activeSlave.heightImplant = 0,$activeSlave.legsTat = 0,$activeSlave.armsTat = 0,$cash -= $surgeryCost, $activeSlave.health -= 40,$activeSlave.nails = 0,$surgeryType = "amp"]] //This will greatly restrict $possessive//
<<elseif ($activeSlave.indentureRestrictions < 1) && ($seeExtreme == 1)>>
- [[Remove arms and legs|Surgery Degradation][$activeSlave.amp = 1,$activeSlave.heels = 0,$activeSlave.heightImplant = 0,$activeSlave.legsTat = 0,$activeSlave.armsTat = 0,$activeSlave.assignment = "rest",$activeSlave.assignmentVisible = 1,$cash -= $surgeryCost, $activeSlave.health -= 40,$activeSlave.nails = 0,$surgeryType = "amp1"]] //This will greatly restrict $possessive//
+ [[Remove arms and legs|Surgery Degradation][$activeSlave.amp = 1,$activeSlave.heels = 0,$activeSlave.heightImplant = 0,$activeSlave.legsTat = 0,$activeSlave.armsTat = 0,$cash -= $surgeryCost, $activeSlave.health -= 40,$activeSlave.nails = 0,$surgeryType = "amp1"]] //This will greatly restrict $possessive//
<</if>>
<<elseif ($activeSlave.amp == 1) && ($activeSlave.PLimb == 0)>>
<<if ($stockpile.basicPLimbInterface > 0)>> |
- [[Install basic prosthetic interface|Surgery Degradation][$activeSlave.PLimb = 1,$stockpile.basicPLimbInterface -= 1,$activeSlave.assignment = "rest",$activeSlave.assignmentVisible = 1,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "PLimb interface1"]]
+ [[Install basic prosthetic interface|Surgery Degradation][$activeSlave.PLimb = 1,$stockpile.basicPLimbInterface -= 1,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "PLimb interface1"]]
<</if>>
<<if $stockpile.advPLimbInterface > 0>> |
- [[Install advanced prosthetic interface|Surgery Degradation][$activeSlave.PLimb = 2,$stockpile.advPLimbInterface -= 1,$activeSlave.assignment = "rest",$activeSlave.assignmentVisible = 1,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "PLimb interface2"]]
+ [[Install advanced prosthetic interface|Surgery Degradation][$activeSlave.PLimb = 2,$stockpile.advPLimbInterface -= 1,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "PLimb interface2"]]
<</if>>
<<elseif $activeSlave.amp == 1 && $activeSlave.PLimb == 1 && $stockpile.advPLimbInterface > 0>> |
- [[Upgrade = advanced prosthetic interface|Surgery Degradation][$activeSlave.PLimb = 2,$stockpile.advPLimbInterface -= 1,$activeSlave.assignment = "rest",$activeSlave.assignmentVisible = 1,$cash -= $surgeryCost, $activeSlave.health -= 5,$surgeryType = "PLimb interface3"]]
+ [[Upgrade = advanced prosthetic interface|Surgery Degradation][$activeSlave.PLimb = 2,$stockpile.advPLimbInterface -= 1,$cash -= $surgeryCost, $activeSlave.health -= 5,$surgeryType = "PLimb interface3"]]
<</if>>
<</if>>
diff --git a/src/uncategorized/saChoosesOwnJob.tw b/src/uncategorized/saChoosesOwnJob.tw
index b5c330e8cf5..9a0d1eb5a25 100644
--- a/src/uncategorized/saChoosesOwnJob.tw
+++ b/src/uncategorized/saChoosesOwnJob.tw
@@ -7,7 +7,8 @@
<<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
chooses to rest, taking advantage of your permission to choose her own assignment to @@.mediumorchid;remain indolent.@@
- <<set $slaves[$i].assignment = "rest", $slaves[$i].assignmentVisible = 1, $slaves[$i].devotion -= 5>>
+ <<removeJob $slaves[$i] $slaves[$i].assignment>>
+ <<set $slaves[$i].devotion -= 5>>
<<elseif ($slaves[$i].health < 20)>>
<<if $clinic > $clinicSlaves && $universalRulesAssignsSelfFacility == 1>>
@@ -15,7 +16,7 @@
<<assignJob $slaves[$i] "get treatment in the clinic">>
<<else>>
is unhealthy, so she chooses to rest.
- <<set $slaves[$i].assignment = "rest", $slaves[$i].assignmentVisible = 1>>
+ <<removeJob $slaves[$i] $slaves[$i].assignment>>
<</if>>
<<elseif (($slaves[$i].devotion < 45) || ($slaves[$i].trust < 45)) && (($slaves[$i].sexualFlaw != "none") || ($slaves[$i].behavioralFlaw != "none")) && ($Attendant != 0) && $universalRulesAssignsSelfFacility == 1>>
@@ -28,7 +29,7 @@
<<assignJob $slaves[$i] "learn in the schoolroom">>
<<else>>
is uneducated, so she sits herself down to learn.
- <<set $slaves[$i].assignment = "take classes", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "take classes">>
<</if>>
<<elseif ($slaves[$i].devotion <= 50) && canWalk($slaves[$i]) && canSee($slaves[$i])>>
@@ -37,7 +38,7 @@
<<assignJob $slaves[$i] "work as a servant">>
<<else>>
is obedient but not devoted, so she chooses to work as a servant since it's the least sexually demanding job available.
- <<set $slaves[$i].assignment = "be a servant", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "be a servant">>
<</if>>
<<elseif ($slaves[$i].relationship == -1)>>
@@ -49,7 +50,7 @@
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
on the streets.
- <<set $slaves[$i].assignment = "whore", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "whore">>
<</if>>
<<else>>
so she eagerly decides to slut around
@@ -58,7 +59,7 @@
<<assignJob $slaves[$i] "serve in the club">>
<<else>>
on the streets.
- <<set $slaves[$i].assignment = "serve the public", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "serve the public">>
<</if>>
<</if>>
@@ -71,7 +72,7 @@
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
on the streets.
- <<set $slaves[$i].assignment = "whore", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "whore">>
<</if>>
<<elseif ($slaves[$i].behavioralQuirk == "advocate")>>
and an advocate for slavery, so she chooses to burnish your reputation by slutting it up
@@ -80,7 +81,7 @@
<<assignJob $slaves[$i] "serve in the club">>
<<else>>
on the streets.
- <<set $slaves[$i].assignment = "serve the public", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "serve the public">>
<</if>>
<<elseif ($slaves[$i].energy > 60)>>
and she thinks of little but sex with you,
@@ -89,7 +90,7 @@
<<assignJob $slaves[$i] "serve in the master suite">>
<<else>>
so she cheerfully designates herself one of your fucktoys.
- <<set $slaves[$i].assignment = "please you", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "please you">>
<</if>>
<<elseif canSee($slaves[$i]) && canWalk($slaves[$i])>>
so she chooses to work
@@ -98,7 +99,7 @@
<<assignJob $slaves[$i] "work as a servant">>
<<else>>
as a servant
- <<set $slaves[$i].assignment = "be a servant", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "be a servant">>
<</if>>
to make your penthouse as clean and homelike as possible.
<<else>>
@@ -108,7 +109,7 @@
<<assignJob $slaves[$i] "serve in the master suite">>
<<else>>
so she cheerfully designates herself one of your fucktoys to be close to you.
- <<set $slaves[$i].assignment = "please you", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "please you">>
<</if>>
<</if>>
@@ -121,7 +122,7 @@
<<assignJob $slaves[$i] "serve in the master suite">>
<<else>>
so she cheerfully designates herself one of your fucktoys.
- <<set $slaves[$i].assignment = "please you", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "please you">>
<</if>>
<<elseif canSee($slaves[$i]) && canWalk($slaves[$i])>>
so she chooses to work
@@ -130,7 +131,7 @@
<<assignJob $slaves[$i] "work as a servant">>
<<else>>
as a servant
- <<set $slaves[$i].assignment = "be a servant", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "be a servant">>
<</if>>
to make your penthouse as clean and homelike as possible.
<<else>>
@@ -140,7 +141,7 @@
<<assignJob $slaves[$i] "serve in the master suite">>
<<else>>
so she cheerfully designates herself one of your fucktoys to be close to you.
- <<set $slaves[$i].assignment = "please you", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "please you">>
<</if>>
<</if>>
@@ -151,7 +152,7 @@
<<assignJob $slaves[$i] "work as a servant">>
<<else>>
thinks she belongs at the bottom of the penthouse hierarchy, so she decides she should be a servant.
- <<set $slaves[$i].assignment = "be a servant", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "be a servant">>
<</if>>
<<elseif ($slaves[$i].fetish == "dom") || ($slaves[$i].fetish == "sadist")>>
<<if $club > $clubSlaves && $universalRulesAssignsSelfFacility == 1>>
@@ -159,7 +160,7 @@
<<assignJob $slaves[$i] "serve in the club">>
<<else>>
is self-confident, so she decides to work as a public servant.
- <<set $slaves[$i].assignment = "serve the public", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "serve the public">>
<</if>>
<<elseif ($slaves[$i].fetish == "masochist")>>
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
@@ -167,7 +168,7 @@
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
enjoys abuse, so she decides to become a whore.
- <<set $slaves[$i].assignment = "whore", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "whore">>
<</if>>
<<elseif ($slaves[$i].fetish == "cumslut")>>
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
@@ -175,7 +176,7 @@
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
decides to become a whore, mostly to suck cock.
- <<set $slaves[$i].assignment = "whore", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "whore">>
<</if>>
<<elseif ($slaves[$i].fetish == "humiliation")>>
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
@@ -183,7 +184,7 @@
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
chooses to whore, since it's even more embarrassing to be a whore than to be a public servant.
- <<set $slaves[$i].assignment = "whore", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "whore">>
<</if>>
<<elseif ($slaves[$i].fetish == "buttslut")>>
<<if ($slaves[$i].balls > 0)>>
@@ -192,7 +193,7 @@
<<assignJob $slaves[$i] "work in the dairy">>
<<else>>
chooses to get milked, since all she'll be expected to do is make cum by orgasming to buttsex.
- <<set $slaves[$i].assignment = "get milked", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "get milked">>
<</if>>
<<else>>
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
@@ -200,7 +201,7 @@
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
chooses to whore, since whores get buttfucked more than anyone else.
- <<set $slaves[$i].assignment = "whore", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "whore">>
<</if>>
<</if>>
<<elseif ($slaves[$i].fetish == "pregnancy")>>
@@ -210,7 +211,7 @@
<<assignJob $slaves[$i] "work in the dairy">>
<<else>>
decides to get milked, since she's already lactating.
- <<set $slaves[$i].assignment = "get milked" , $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "get milked" >>
<</if>>
<<elseif isFertile($slaves[$i]) && ($PC.dick == 1)>>
<<if $masterSuite > $masterSuiteSlaves && $universalRulesAssignsSelfFacility == 1>>
@@ -218,7 +219,7 @@
<<assignJob $slaves[$i] "serve in the master suite">>
<<else>>
chooses to be your fucktoy, in the hope you'll get her pregnant.
- <<set $slaves[$i].assignment = "please you", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "please you">>
<</if>>
<<elseif isFertile($slaves[$i]) && $dairy > $dairySlaves && $dairyPregSetting > 0 && $universalRulesAssignsSelfFacility == 1>>
<<if $dairyPregSetting > 1>>
@@ -236,7 +237,7 @@
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
heads to the streets to lavish in the attention given to pregnant prostitutes.
- <<set $slaves[$i].assignment = "whore", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "whore">>
<</if>>
<<else>>
<<if $club > $clubSlaves && $universalRulesAssignsSelfFacility == 1>>
@@ -244,7 +245,7 @@
<<assignJob $slaves[$i] "serve in the club">>
<<else>>
heads to the streets to contribute to the number of visiblt pregnant woman around.
- <<set $slaves[$i].assignment = "serve the public", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "serve the public">>
<</if>>
<</if>>
<<elseif $masterSuite > $masterSuiteSlaves && $universalRulesAssignsSelfFacility == 1>>
@@ -252,7 +253,7 @@
<<assignJob $slaves[$i] "serve in the master suite">>
<<else>>
chooses to be your fucktoy to share the intimacy of her pregnant body with you.
- <<set $slaves[$i].assignment = "please you", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "serve in the master suite">>
<</if>>
<<else>>
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
@@ -260,7 +261,7 @@
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
can't indulge her fetish by getting pregnant herself, so she glumly decides to be a whore.
- <<set $slaves[$i].assignment = "whore", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "whore">>
<</if>>
<</if>>
<<elseif ($slaves[$i].fetish == "boobs")>>
@@ -270,7 +271,7 @@
<<assignJob $slaves[$i] "work in the dairy">>
<<else>>
decides to get milked, since she loves getting off to it.
- <<set $slaves[$i].assignment = "get milked", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "get milked">>
<</if>>
<<else>>
<<if $club > $clubSlaves && $universalRulesAssignsSelfFacility == 1>>
@@ -278,7 +279,7 @@
<<assignJob $slaves[$i] "serve in the club">>
<<else>>
decides to work as a public servant so she can show off her bare breasts.
- <<set $slaves[$i].assignment = "serve the public", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "serve the public">>
<</if>>
<</if>>
<<elseif ($slaves[$i].attrXX > 85)>>
@@ -287,7 +288,7 @@
<<assignJob $slaves[$i] "serve in the club">>
<<else>>
decides to work as a public servant so she can hit on hot girls.
- <<set $slaves[$i].assignment = "serve the public", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "serve the public">>
<</if>>
<<elseif ($slaves[$i].attrXY > 85)>>
<<if $club > $clubSlaves && $universalRulesAssignsSelfFacility == 1>>
@@ -295,7 +296,7 @@
<<assignJob $slaves[$i] "serve in the club">>
<<else>>
decides to work as a public servant so she can hit on cute boys.
- <<set $slaves[$i].assignment = "serve the public", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "serve the public">>
<</if>>
<<elseif ($slaves[$i].energy > 95)>>
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
@@ -303,7 +304,7 @@
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
decides to help those of your girls who mind taking dick all day by working as a whore.
- <<set $slaves[$i].assignment = "whore", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "whore">>
<</if>>
<<elseif ($arcologies[0].FSChattelReligionist > 0)>>
@@ -312,7 +313,7 @@
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
is a pure and faithful slave, so she sells her body as a holy prostitute.
- <<set $slaves[$i].assignment = "whore", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "whore">>
<</if>>
<<elseif ($arcologies[0].FSEgyptianRevivalist > 0)>>
<<if $masterSuite > $masterSuiteSlaves && $universalRulesAssignsSelfFacility == 1>>
@@ -320,7 +321,7 @@
<<assignJob $slaves[$i] "serve in the master suite">>
<<else>>
is a devoted slave, so she immediately joins your harem.
- <<set $slaves[$i].assignment = "please you", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "please you">>
<</if>>
<<elseif ($arcologies[0].FSRomanRevivalist > 0)>>
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
@@ -328,7 +329,7 @@
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
is a devoted slave, so she decides she can best serve the state by raising money for the treasury, by selling her body as a prostitute.
- <<set $slaves[$i].assignment = "whore", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "whore">>
<</if>>
<<elseif ($arcologies[0].FSPaternalist > 0)>>
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
@@ -336,7 +337,7 @@
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
decides to be a whore, a respectable position for a slave in this enlightened arcology.
- <<set $slaves[$i].assignment = "whore", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "whore">>
<</if>>
<<elseif ($arcologies[0].FSPastoralist > 0)>>
<<if ($slaves[$i].lactation > 0)>>
@@ -345,7 +346,7 @@
<<assignJob $slaves[$i] "work in the dairy">>
<<else>>
hurries to join your herd of cows.
- <<set $slaves[$i].assignment = "get milked", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "get milked">>
<</if>>
<<else>>
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
@@ -353,7 +354,7 @@
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
decides to prostitute herself to help raise money to get more girls lactating properly.
- <<set $slaves[$i].assignment = "whore", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "whore">>
<</if>>
<</if>>
<<else>>
@@ -363,7 +364,7 @@
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
decides to whore, since she thinks herself a better whore than a public slut.
- <<set $slaves[$i].assignment = "whore", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "whore">>
<</if>>
<<elseif ($slaves[$i].entertainSkill >= $slaves[$i].whoreSkill)>>
<<if $club > $clubSlaves && $universalRulesAssignsSelfFacility == 1>>
@@ -371,7 +372,7 @@
<<assignJob $slaves[$i] "serve in the club">>
<<else>>
decides to serve the public, since she thinks herself a better public slut than a whore.
- <<set $slaves[$i].assignment = "serve the public", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "serve the public">>
<</if>>
<<else>>
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
@@ -379,7 +380,7 @@
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
decides to prostitute herself to help you upgrade $arcologies[0].name and improve everyone's life.
- <<set $slaves[$i].assignment = "whore", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "whore">>
<</if>>
<</if>>
<</if>>
@@ -389,9 +390,9 @@
<<assignJob $slaves[$i] "serve in the club">>
<<elseif canWalk($slaves[$i]) && canSee($slaves[$i])>>
decides to tidy up the penthouse a little while she thinks.
- <<set $slaves[$i].assignment = "be a servant", $slaves[$i].assignmentVisible = 1>>
+ <<assignJob $slaves[$i] "be a servant">>
<<else>>
stays in bed, unable to come up with anything.
- <<set $slaves[$i].assignment = "rest", $slaves[$i].assignmentVisible = 1>>
+ <<removeJob $slaves[$i] $slaves[$i].assignment>>
<</if>>
<</if>>
diff --git a/src/uncategorized/saTakeClasses.tw b/src/uncategorized/saTakeClasses.tw
index bfa43954f68..8bbd47ef9f8 100644
--- a/src/uncategorized/saTakeClasses.tw
+++ b/src/uncategorized/saTakeClasses.tw
@@ -189,7 +189,7 @@ takes courses in slavery<<if $schoolroomUpgradeSkills + $schoolroomUpgradeRemedi
<<if ($slaves[$i].analSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].analSkill > 10))>>
<<if ($slaves[$i].vaginalSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].vaginalSkill > 10)) || ($slaves[$i].vagina < 0)>>
She can learn little from further classes, so @@.yellow;her assignment has defaulted to rest.@@
- <<set $slaves[$i].assignment = "rest", $slaves[$i].assignmentVisible = 1>>
+ <<removeJob $slaves[$i] $slaves[$i].assignment>>
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 09b99a44cda..157179a6817 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -355,6 +355,33 @@ __Rules Assistant__
/* END hotswap prosthetics */
<</if>>/* CyberMod Toggle */
<br>
+
+<span id="fucktoypref">
+ <<if ($activeSlave.assignment == "please you") || ($activeSlave.assignment == "serve in the master suite") || ($activeSlave.assignment == "be your Concubine")>>
+ __Fucktoy use preference__: <strong><span id="hole">$activeSlave.toyHole</span></strong>.
+ <<link "Mouth">><<set $activeSlave.toyHole = "mouth">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>
+ | <<link "Tits">><<set $activeSlave.toyHole = "boobs">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>
+ <<if ($activeSlave.vagina > 0) && canDoVaginal($activeSlave)>>
+ | <<link "Pussy">><<set $activeSlave.toyHole = "pussy">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>
+ <<elseif ($activeSlave.vagina == 0)>>
+ | //Take her virginity before giving her pussy special attention//
+ <</if>>
+ <<if ($activeSlave.anus > 0) && canDoAnal($activeSlave)>>
+ | <<link "Ass">><<set $activeSlave.toyHole = "ass">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>
+ <<else>>
+ | //Take her anal virginity before giving her ass special attention//
+ <</if>>
+ /*check*/
+ <<if ($activeSlave.dick > 0) && canPenetrate($activeSlave)>>
+ | <<link "Dick">><<set $activeSlave.toyHole = "dick">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>
+ <</if>>
+ | <<link "No Preference">><<set $activeSlave.toyHole = "all her holes">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>
+
+ <br>
+
+ <</if>>
+</span>
+
<<switch $activeSlave.assignment>>
<<case "recover from surgery">>
//She is recovering from surgery this week//
@@ -390,65 +417,45 @@ __Rules Assistant__
//She is assigned to $activeSlave.assignment; bring her out of the facility to reassign her//
<<else>>
-__Assignment__: <strong><span id="assign">$activeSlave.assignment</span>.</strong>
-<<link "Rest">><<set $activeSlave.assignment = "rest", $activeSlave.assignmentVisible = 1, $activeSlave.sentence = 0, $activeSlave.choosesOwnAssignment = 0>><<replace "#assign">>$activeSlave.assignment<</replace>><</link>>
-| <<link "Fucktoy">><<set $activeSlave.assignment = "please you", $activeSlave.assignmentVisible = 1, $activeSlave.sentence = 0, $activeSlave.choosesOwnAssignment = 0>><<replace "#assign">>$activeSlave.assignment<</replace>><</link>>
+__Assignment__: <strong><span id="assign">$activeSlave.assignment<<if $activeSlave.sentence>> ($activeSlave.sentence weeks)<</if>></span>.</strong>
+ <<link "Rest">><<removeJob $activeSlave $activeSlave.assignment>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ | <<link "Fucktoy">><<assignJob $activeSlave "please you">><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<<if $activeSlave.fuckdoll == 0>>
<<if (($activeSlave.devotion >= -20) || (($activeSlave.trust < -20) && ($activeSlave.devotion >= -50)) || ($activeSlave.trust < -50)) && canWalk($activeSlave)>>
- | <<link "Subordinate slave">><<set $activeSlave.assignment = "be a subordinate slave", $activeSlave.assignmentVisible = 1, $activeSlave.sentence = 0, $activeSlave.choosesOwnAssignment = 0>><<goto "Subordinate Targeting">><</link>>
+ | <<link "Subordinate slave">><<assignJob $activeSlave "be a subordinate slave">><<goto "Subordinate Targeting">><</link>>
<<if ($activeSlave.eyes != -2)>>
- | <<link "Servant">><<set $activeSlave.assignment = "be a servant", $activeSlave.assignmentVisible = 1, $activeSlave.sentence = 0, $activeSlave.choosesOwnAssignment = 0>><<replace "#assign">>$activeSlave.assignment<</replace>><</link>>
+ | <<link "Servant">><<assignJob $activeSlave "be a servant">><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<<else>>
- /*| //Blind slaves cannot be servants// */
+ /*| //Blind slaves cannot be servants// */
<</if>>
<</if>>
<<if ($activeSlave.devotion >= -20) || (($activeSlave.devotion >= -50) && ($activeSlave.trust < -20)) || ($activeSlave.trust < -50)>>
<<if ($activeSlave.intelligenceImplant < 1) || ($activeSlave.accent+$schoolroomUpgradeLanguage > 2) || ($activeSlave.oralSkill <= 30) || ($activeSlave.whoreSkill <= 30) || ($activeSlave.entertainSkill <= 30) || ($activeSlave.analSkill < 30) || (($activeSlave.vaginalSkill < 30) && ($activeSlave.vagina >= 0))>>
- | __<<link "Take slave classes">><<set $activeSlave.assignment = "take classes", $activeSlave.assignmentVisible = 1, $activeSlave.sentence = 0, $activeSlave.choosesOwnAssignment = 0>><<replace "#assign">>$activeSlave.assignment<</replace>><</link>>__
+ | __<<link "Take slave classes">> <<assignJob $activeSlave "take classes">><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>__
<<else>>
| Take slave classes
<</if>>
<<else>>
/*| //Too resistant to take classes// */
<</if>>
-| <<link "Confine her">><<set $activeSlave.assignment = "stay confined", $activeSlave.assignmentVisible = 1, $activeSlave.sentence = 0, $activeSlave.choosesOwnAssignment = 0>><<replace "#assign">>$activeSlave.assignment<</replace>><</link>>
+ | <<link "Confine her">><<assignJob $activeSlave "stay confined">><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<<if $activeSlave.breedingMark != 1>>
-| <<link "Whore">><<set $activeSlave.assignment = "whore", $activeSlave.assignmentVisible = 1, $activeSlave.sentence = 0, $activeSlave.choosesOwnAssignment = 0>><<replace "#assign">>$activeSlave.assignment<</replace>><</link>>
-| <<link "Public servant">><<set $activeSlave.assignment = "serve the public", $activeSlave.sentence = 0, $activeSlave.choosesOwnAssignment = 0>><<replace "#assign">>$activeSlave.assignment<</replace>><</link>>
+ | <<link "Whore">><<assignJob $activeSlave "whore">><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ | <<link "Public servant">><<assignJob $activeSlave "serve the public">><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<</if>>
<</if>>/* CLOSES FUCKDOLL CHECK */
<<if ($activeSlave.indentureRestrictions <= 0) && $activeSlave.breedingMark != 1>>
-| <<link "Glory hole">><<set $activeSlave.assignment = "work a glory hole", $activeSlave.assignmentVisible = 1, $activeSlave.sentence = 0, $activeSlave.choosesOwnAssignment = 0>><<replace "#assign">>$activeSlave.assignment<</replace>><</link>>
+ | <<link "Glory hole">><<assignJob $activeSlave "work a glory hole">><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<</if>>
<<if $activeSlave.fuckdoll == 0>>
<<if ($activeSlave.lactation > 0) || ($activeSlave.balls > 0 && $activeSlave.ballType == "human")>>
-| <<link "Get milked">><<set $activeSlave.assignment = "get milked", $activeSlave.assignmentVisible = 1, $activeSlave.sentence = 0, $activeSlave.choosesOwnAssignment = 0>><<replace "#assign">>$activeSlave.assignment<</replace>><</link>>
+ | <<link "Get milked">><<assignJob $activeSlave "get milked">><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<<else>>
-/*| //Not lactating// */
-<</if>>
-<<if ($activeSlave.sentence == 0)>>
-| [[Assign her to her current task for a month|Slave Interact][$activeSlave.sentence = 4]]
-| <<link "Let her choose her own assignment">><<set $activeSlave.assignment = "choose her own job", $activeSlave.assignmentVisible = 1, $activeSlave.sentence = 0, $activeSlave.choosesOwnAssignment = 1>><<replace "#assign">>$activeSlave.assignment<</replace>><</link>>
+ /*| //Not lactating// */
<</if>>
+ | <<link "Let her choose her own assignment">><<assignJob $activeSlave "choose her own job">><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ | <<link "Assign her to her current task for another month">><<set $activeSlave.sentence += 4>><<replace "#assign">>$activeSlave.assignment ($activeSlave.sentence weeks)<</replace>><</link>>
<</if>>/* CLOSES FUCKDOLL CHECK */
-<<if ($activeSlave.assignment == "please you")>>
-__Fucktoy use preference__: <strong><span id="hole">$activeSlave.toyHole</span></strong>.
-<<link "Mouth">><<set $activeSlave.toyHole = "mouth">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>
-| <<link "Tits">><<set $activeSlave.toyHole = "boobs">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>
-<<if ($activeSlave.vagina > 0) && canDoVaginal($activeSlave)>>
-| <<link "Pussy">><<set $activeSlave.toyHole = "pussy">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>
-<<elseif ($activeSlave.vagina == 0)>>| //Take her virginity before giving her pussy special attention//
-<</if>>
-<<if ($activeSlave.anus > 0) && canDoAnal($activeSlave)>>
-| <<link "Ass">><<set $activeSlave.toyHole = "ass">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>
-<<else>>| //Take her anal virginity before giving her ass special attention//
-<</if>>
-/*check*/
-<<if ($activeSlave.dick > 0) && canPenetrate($activeSlave)>>
-| <<link "Dick">><<set $activeSlave.toyHole = "dick">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>
-<</if>>
-| <<link "No Preference">><<set $activeSlave.toyHole = "all her holes">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>
-<</if>>
<<if $activeSlave.fuckdoll == 0>>
<<if $brothel+$club+$dairy+$servantsQuarters+$masterSuite+$spa+$clinic+$schoolroom+$cellblock+$arcade > 0>>
@@ -460,55 +467,55 @@ __Fucktoy use preference__: <strong><span id="hole">$activeSlave.toyHole</span><
<br>__Transfer to__:
<<if $brothel != 0>>
<<if $brothel > $brothelSlaves && ($activeSlave.devotion > 50) || (($activeSlave.devotion >= -50) && ($activeSlave.trust < -20)) || ($activeSlave.trust < -50) || ($activeSlave.trust > 50) && $activeSlave.breedingMark != 1>>
- [[Brothel|Assign][$returnTo = "Brothel", $i = _i]]
+ [[Brothel|Assign][$slaves[_i] = $activeSlave, $returnTo = "Brothel", $i = _i]]
<<else>>Brothel<</if>>
<</if>>
<<if $club != 0>>|
<<if $club > $clubSlaves && ($activeSlave.devotion > 50) || (($activeSlave.devotion >= -50) && ($activeSlave.trust < -20)) || ($activeSlave.trust < -50) || ($activeSlave.trust > 50) && $activeSlave.breedingMark != 1>>
- [[Club|Assign][$returnTo = "Club", $i = _i]]
+ [[Club|Assign][$slaves[_i] = $activeSlave, $returnTo = "Club", $i = _i]]
<<else>>Club<</if>>
<</if>>
<<if $dairy != 0>>|
<<if $dairy > $dairySlaves && (($activeSlave.indentureRestrictions > 0) && ($dairyRestraintsSetting > 1)) || (($activeSlave.indentureRestrictions > 1) && ($dairyRestraintsSetting > 0)) || ($activeSlave.breedingMark == 1 && $dairyRestriantsSettings > 0) || (($dairyPregSetting > 0) && (($activeSlave.bellyImplant != 0) || ($activeSlave.pregType >= 50)))>>
Dairy
<<elseif (($activeSlave.lactation > 0) || ($activeSlave.balls > 0)) || (($dairyFeedersUpgrade == 1) && ($dairyFeedersSetting > 0) && ($dairySlimMaintainUpgrade == 0))>>
- [[Dairy|Assign][$returnTo = "Dairy", $i = _i]]
+ [[Dairy|Assign][$slaves[_i] = $activeSlave, $returnTo = "Dairy", $i = _i]]
<<else>>Dairy<</if>>
<</if>>
<<if $servantsQuarters != 0>>|
<<if $servantsQuarters > $servantsQuartersSlaves && canWalk($activeSlave) && canSee($activeSlave) && ($activeSlave.devotion >= -20) || (($activeSlave.devotion >= -50) && ($activeSlave.trust <= 20)) || ($activeSlave.trust < -20)>>
- [[Servants' Quarters|Assign][$returnTo = "Servants' Quarters", $i = _i]]
+ [[Servants' Quarters|Assign][$slaves[_i] = $activeSlave, $returnTo = "Servants' Quarters", $i = _i]]
<<else>>Servants' Quarters<</if>>
<</if>>
<<if $masterSuite != 0>>|
<<if $masterSuite > $masterSuiteSlaves && ($activeSlave.devotion > 20) || (($activeSlave.devotion >= -50) && ($activeSlave.trust < -20)) || ($activeSlave.trust < -50)>>
- [[Master Suite|Assign][$returnTo = "Master Suite", $i = _i]]
+ [[Master Suite|Assign][$slaves[_i] = $activeSlave, $returnTo = "Master Suite", $i = _i]]
<<else>>Master Suite<</if>>
<</if>>
<<if $spa != 0>>|
<<if $spa > $spaSlaves && ($activeSlave.health < 20) || ($activeSlave.trust < 60) || ($activeSlave.devotion <= 60) || ($activeSlave.fetish == "mindbroken") || ($activeSlave.sexualFlaw !== "none") || ($activeSlave.behavioralFlaw !== "none")>>
- [[Spa|Assign][$returnTo = "Spa", $i = _i]]
+ [[Spa|Assign][$slaves[_i] = $activeSlave, $returnTo = "Spa", $i = _i]]
<<else>>Spa<</if>>
<</if>>
<<if $clinic != 0>>|
<<if $clinic > $clinicSlaves && ($activeSlave.health < 20) || (($activeSlave.chem > 15) && ($clinicUpgradeFilters == 1)) || (($activeSlave.bellyImplant > 100) && ($bellyImplants == 1)) || $activeSlave.preg > 1>>
- [[Clinic|Assign][$returnTo = "Clinic", $i = _i]]
+ [[Clinic|Assign][$slaves[_i] = $activeSlave, $returnTo = "Clinic", $i = _i]]
<<else>>Clinic<</if>>
<</if>>
<<if $schoolroom != 0>>|
- <<if $schoolroom > $schoolroomSlaves && (($activeSlave.devotion >= -20) || (($activeSlave.devotion >= -50) && ($activeSlave.trust < -20)) || ($activeSlave.trust < -50)) && (($activeSlave.intelligenceImplant < 1) || ($activeSlave.accent+$schoolroomUpgradeLanguage > 2) || ($activeSlave.oralSkill <= 30) || ($activeSlave.whoreSkill <= 30) || ($activeSlave.entertainSkill <= 30) || ($activeSlave.analSkill < 30) || (($activeSlave.vaginalSkill < 30) && ($activeSlave.vagina >= 0)))>>
- [[Schoolroom|Assign][$returnTo = "Schoolroom", $i = _i]]
+ <<if $schoolroom > $schoolroomSlaves && (($activeSlave.devotion >= -20) || (($activeSlave.devotion >= -50) && ($activeSlave.trust < -20)) || ($activeSlave.trust < -50)) && (($activeSlave.intelligenceImplant < 1) || ($activeSlave.voice != 0 && $activeSlave.accent+$schoolroomUpgradeLanguage > 2) || ($activeSlave.oralSkill <= 10+$schoolroomUpgradeSkills*20) || ($activeSlave.whoreSkill <= 10+$schoolroomUpgradeSkills*20) || ($activeSlave.entertainSkill <= 10+$schoolroomUpgradeSkills*20) || ($activeSlave.analSkill < 10+$schoolroomUpgradeSkills*20) || (($activeSlave.vagina >= 0) && ($activeSlave.vaginalSkill < 10+$schoolroomUpgradeSkills*20)))>>
+ [[Schoolroom|Assign][$slaves[_i] = $activeSlave, $returnTo = "Schoolroom", $i = _i]]
<<else>>Schoolroom<</if>>
<</if>>
<<if $cellblock != 0>>|
<<if $cellblock > $cellblockSlaves && (($activeSlave.devotion < -20) && ($activeSlave.trust >= -20)) || (($activeSlave.devotion < -50) && ($activeSlave.trust >= -50))>>
- [[Cellblock|Assign][$returnTo = "Cellblock", $i = _i]]
+ [[Cellblock|Assign][$slaves[_i] = $activeSlave, $returnTo = "Cellblock", $i = _i]]
<<else>>Cellblock<</if>>
<</if>>
<</if>>
<<if $arcade != 0>>|
<<if $arcade > $arcadeSlaves && $activeSlave.breedingMark != 1 && ($activeSlave.indentureRestrictions <= 0)>>
- [[Arcade|Assign][$returnTo = "Arcade", $i = _i]]
+ [[Arcade|Assign][$slaves[_i] = $activeSlave, $returnTo = "Arcade", $i = _i]]
<<else>>Arcade<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index ee42cd41a05..df180de1c33 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -203,7 +203,7 @@
<<if $Flag == 0>>
<<if _Slave.assignment == "learn in the schoolroom">><<continue>><</if>>
<<if (_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50)>>
- <<if (_Slave.intelligenceImplant < 1) || (_Slave.accent+$schoolroomUpgradeLanguage > 2) || (_Slave.oralSkill <= 30) || (_Slave.whoreSkill <= 30) || (_Slave.entertainSkill <= 30) || (_Slave.analSkill < 30) || ((_Slave.vaginalSkill < 30) && (_Slave.vagina >= 0))>>
+ <<if (_Slave.intelligenceImplant < 1) || (_Slave.voice != 0 && _Slave.accent+$schoolroomUpgradeLanguage > 2) || (_Slave.oralSkill <= 10+$schoolroomUpgradeSkills*20) || (_Slave.whoreSkill <= 10+$schoolroomUpgradeSkills*20) || (_Slave.entertainSkill <= 10+$schoolroomUpgradeSkills*20) || (_Slave.analSkill < 10+$schoolroomUpgradeSkills*20) || ((_Slave.vagina >= 0) && (_Slave.vaginalSkill < 10+$schoolroomUpgradeSkills*20))>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
<<else>>
<br>//_Slave.slaveName already has a basic education//
@@ -538,7 +538,7 @@ will
<<elseif (_Slave.assignment == "stay confined") && ((_Slave.devotion > 20) || ((_Slave.trust < -20) && (_Slave.devotion >= -20)) || ((_Slave.trust < -50) && (_Slave.devotion >= -50)))>>
''__@@.lawngreen;stay confined.@@__''
<<else>>
- _Slave.assignment<<if _Slave.sentence > 0>> (_Slave.sentence)<</if>>.
+ _Slave.assignment<<if _Slave.sentence > 0>> (_Slave.sentence weeks)<</if>>.
<</if>>
<<if ($displayAssignments == 1) && (_Pass == "Main") && (_Slave.ID != $HeadGirl.ID) && (_Slave.ID != $Recruiter.ID) && (_Slave.ID != $Bodyguard.ID)>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 38f297011cf..687bbc6bca0 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -58,13 +58,12 @@ As the remote surgery's long recovery cycle completes,
<<set _dump = $fighterIDs.deleteAt(_y), _y-->>
<</if>>
<</for>>
- /% Remove from facility array if assigned, except Arcade, MasterSuite, and Cellblock %/
+ /% Remove from facility array if assigned, except Arcade, MasterSuite, and Cellblock - also do not move agents or agent companions %/
<<switch $activeSlave.assignment>>
- <<case "learn in the schoolroom" "get treatment in the clinic" "rest in the spa" "work in the dairy" "live with your Head Girl" "serve in the club" "work as a servant" "work in the brothel">>
- <<removeJob $activeSlave $activeSlave.assignment>>
- <<case "be confined in the arcade" "be confined in the cellblock" "serve in the master suite">>
+ <<case "be confined in the arcade" "be confined in the cellblock" "serve in the master suite" "be your agent" "live with your agent">>
+ /* no assignment change */
<<default>>
- <<set $activeSlave.choosesOwnAssignment = 0, $activeSlave.assignment = "rest", $activeSlave.assignmentVisible = 1>>
+ <<removeJob $activeSlave $activeSlave.assignment>>
<</switch>>
As the remote surgery's long recovery cycle completes,
<<if $surgeryType == "fuckdoll">>
@@ -524,9 +523,7 @@ As the remote surgery's long recovery cycle completes,
She notices almost immediately that the soreness that used to tell her she needed to be milked has gone. She bounces her breasts idly; it looks like she doesn't know what to think about having her lactation dry up. As with all surgery @@.red;her health has been slightly affected.@@
<<if $activeSlave.assignment == "get milked">>
@@.yellow;Her assignment has defaulted to resting.@@
- <<set $activeSlave.assignment = "rest">>
- <<set $activeSlave.assignmentVisible = 1>>
- <<set $activeSlave.choosesOwnAssignment = 0>>
+ <<removeJob $activeSlave $activeSlave.assignment>>
<</if>>
<<case "ejaculation">>
diff --git a/src/utility/assignWidgets.tw b/src/utility/assignWidgets.tw
index 80a356ec57d..4b45a4555e1 100644
--- a/src/utility/assignWidgets.tw
+++ b/src/utility/assignWidgets.tw
@@ -9,7 +9,9 @@
%/
<<widget assignJob>>
<<if ($args[1] != "Pit") && ($args[1] != "Coursing Association")>>
+
<<removeJob $args[0] $args[0].assignment>>
+
<<set _wID = $args[0].ID, _SL = $slaves.length>>
/% Get slaves[_wi] index # %/
@@ -26,31 +28,35 @@
/% use .toLowerCase() to get rid of a few dupe conditions. %/
<<switch $args[1].toLowerCase()>>
<<case "clinic" "get treatment in the clinic">>
- <<set $args[0].assignment = "get treatment in the clinic", $clinicSlaves++, $CliniciIDs.push({ID: _wID, Index: _wi})>>
+ <<set $args[0].assignment = "get treatment in the clinic", $args[0].assignmentVisible = 0, $clinicSlaves++, $CliniciIDs.push({ID: _wID, Index: _wi})>>
<<case "schoolroom" "learn in the schoolroom">>
- <<set $args[0].assignment = "learn in the schoolroom", $schoolroomSlaves++, $SchlRiIDs.push({ID: _wID, Index: _wi})>>
+ <<set $args[0].assignment = "learn in the schoolroom", $args[0].assignmentVisible = 0, $schoolroomSlaves++, $SchlRiIDs.push({ID: _wID, Index: _wi})>>
<<case "spa" "rest in the spa">>
- <<set $args[0].assignment = "rest in the spa", $spaSlaves++, $SpaiIDs.push({ID: _wID, Index: _wi})>>
+ <<set $args[0].assignment = "rest in the spa", $args[0].assignmentVisible = 0, $spaSlaves++, $SpaiIDs.push({ID: _wID, Index: _wi})>>
<<case "cellblock" "be confined in the cellblock">>
- <<set $args[0].assignment = "be confined in the cellblock", $cellblockSlaves++, $CellBiIDs.push({ID: _wID, Index: _wi})>>
+ <<set $args[0].assignment = "be confined in the cellblock", $args[0].assignmentVisible = 0, $cellblockSlaves++, $CellBiIDs.push({ID: _wID, Index: _wi})>>
<<case "arcade" "be confined in the arcade">>
- <<set $args[0].assignment = "be confined in the arcade", $arcadeSlaves++, $ArcadeiIDs.push({ID: _wID, Index: _wi})>>
+ <<set $args[0].assignment = "be confined in the arcade", $args[0].assignmentVisible = 0, $arcadeSlaves++, $ArcadeiIDs.push({ID: _wID, Index: _wi})>>
<<case "brothel" "work in the brothel">>
- <<set $args[0].assignment = "work in the brothel", $brothelSlaves++, $BrothiIDs.push({ID: _wID, Index: _wi})>>
+ <<set $args[0].assignment = "work in the brothel", $args[0].assignmentVisible = 0, $brothelSlaves++, $BrothiIDs.push({ID: _wID, Index: _wi})>>
<<case "club" "serve in the club">>
- <<set $args[0].assignment = "serve in the club", $clubSlaves++, $ClubiIDs.push({ID: _wID, Index: _wi})>>
+ <<set $args[0].assignment = "serve in the club", $args[0].assignmentVisible = 0, $clubSlaves++, $ClubiIDs.push({ID: _wID, Index: _wi})>>
<<case "dairy" "work in the dairy">>
- <<set $args[0].assignment = "work in the dairy", $dairySlaves++, $DairyiIDs.push({ID: _wID, Index: _wi})>>
+ <<set $args[0].assignment = "work in the dairy", $args[0].assignmentVisible = 0, $dairySlaves++, $DairyiIDs.push({ID: _wID, Index: _wi})>>
<<case "hgsuite" "head girl suite" "live with your head girl">>
- <<set $args[0].assignment = "live with your Head Girl", $HGSuiteSlaves++, $HGSuiteiIDs.push({ID: _wID, Index: _wi})>>
+ <<set $args[0].assignment = "live with your Head Girl", $args[0].assignmentVisible = 0, $HGSuiteSlaves++, $HGSuiteiIDs.push({ID: _wID, Index: _wi})>>
<<case "servantsquarters" "servants' quarters" "work as a servant">>
- <<set $args[0].assignment = "work as a servant", $servantsQuartersSlaves++, $ServQiIDs.push({ID: _wID, Index: _wi})>>
+ <<set $args[0].assignment = "work as a servant", $args[0].assignmentVisible = 0, $servantsQuartersSlaves++, $ServQiIDs.push({ID: _wID, Index: _wi})>>
<<case "mastersuite" "master suite" "serve in the master suite">>
- <<set $args[0].assignment = "serve in the master suite", $masterSuiteSlaves++, $MastSiIDs.push({ID: _wID, Index: _wi})>>
+ <<set $args[0].assignment = "serve in the master suite", $args[0].assignmentVisible = 0, $masterSuiteSlaves++, $MastSiIDs.push({ID: _wID, Index: _wi})>>
+<<case "be your agent" "live with your agent">>
+ <<set $args[0].assignment = $args[1], $args[0].assignmentVisible = 0>> /* removeJob already set choosesOwnAssignment = 0 */
+<<case "choose her own job">>
+ <<set $args[0].assignment = $args[1], $args[0].choosesOwnAssignment = 1>> /* removeJob already set assignmentVisible = 1 */
+<<default>>
+ <<set $args[0].assignment = $args[1]>> /* removeJob already set assignmentVisible = 1 and choosesOwnAssignment = 0 */
<</switch>>
-<<set $args[0].assignmentVisible = 0, $args[0].choosesOwnAssignment = 0>>
-
/% Stop creating Starving/overweight deaths?, Endless drug supply etc. %/
<<set $args[0].diet = "healthy", $args[0].drugs = "no drugs", $args[0].curatives = 0, $args[0].hormones = 0, $args[0].aphrodisiacs = 0>>
@@ -64,8 +70,10 @@
<</if>>
<</if>>
-<<set $slaves[_wi] = $args[0], $i = _wi>>
-<<if $slaves[_wi].choosesOwnClothes == 1>><<include "SA chooses own clothes">><<set $args[0] = $slaves[_wi]>><</if>>
+<<set $slaves[_wi] = $args[0], $i = _wi>> /* save changes to slave array, and set $i in case we call "SA chooses own clothes" next, since it uses $slave[$i] */
+
+<<if $slaves[_wi].choosesOwnClothes == 1>><<include "SA chooses own clothes">><<set $args[0] = $slaves[_wi]>><</if>> /* update clothes, then update $args[0] */
+
<</if>>
<</widget>>
@@ -173,12 +181,14 @@
<</for>>
<</switch>>
-<<set $args[0].assignmentVisible = 1, $args[0].assignment = "rest", $args[0].choosesOwnAssignment = 0>>
+<<set $args[0].assignmentVisible = 1, $args[0].assignment = "rest", $args[0].choosesOwnAssignment = 0, $args[0].sentence = 0>>
+
<<for _wi = 0; _wi < _SL; _wi++>>
<<if _wID == $slaves[_wi].ID>>
<<set $slaves[_wi] = $args[0]>>
<<break>>
<</if>>
<</for>>
+
<</if>>
<</widget>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 66646c2d0ca..6e88f5f8f55 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -3100,14 +3100,10 @@ $pronounCap's got a
pussy is partially obscured by a covering of sheer gauze.
<</if>>
<<default>>
- <<if ($activeSlave.dick > 0) && ($activeSlave.vagina != -1)>>
- $activeSlave.slaveName's hermaphroditic genitalia are bare and available.
- <<elseif ($activeSlave.dick == 0)>>
- $activeSlave.slaveName's pussy is bare.
+ <<if $activeSlave.vagina > -1>>
+ $activeSlave.slaveName's <<if $activeSlave.dick > 0>>hermaphroditic genitalia<<else>>pussy<</if>> bare and available.
<<elseif ($activeSlave.dickAccessory == "chastity") || ($activeSlave.dickAccessory == "combined chastity") || ($activeSlave.dickAccessory == "anal chastity")>>
- <<elseif $activeSlave.vagina == -1 && $activeSlave.dick == 0 && $activeSlave.balls == 0>>
- $activeSlave.slaveName's featureless groin is quite bare.
- <<else>>
+ <<elseif $activeSlave.dick > 0>>
$activeSlave.slaveName's
<<switch $activeSlave.dick>>
<<case 10>>
@@ -3133,6 +3129,8 @@ $pronounCap's got a
<<default>>
hypertrophied cock hangs naked.
<</switch>>
+ <<else>>
+ $activeSlave.slaveName's <<if $activeSlave.balls > 0>>lonely balls are<<else>>featureless groin is<</if>> bare and vulnerable.
<</if>>
<</switch>>
<</if>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index ceb81cfd371..9ca21bce60d 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -1752,3 +1752,39 @@ This experience
<</switch>>
<</widget>>
+
+
+/%
+ Call as <<SlaveInteractFucktoy>>
+%/
+<<widget "SlaveInteractFucktoy">>
+
+<<replace #fucktoypref>>
+ <<if ($activeSlave.assignment == "please you") || ($activeSlave.assignment == "serve in the master suite") || ($activeSlave.assignment == "be your Concubine")>>
+ __Fucktoy use preference__: <strong><span id="hole">$activeSlave.toyHole</span></strong>.
+ <<link "Mouth">><<set $activeSlave.toyHole = "mouth">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>
+ | <<link "Tits">><<set $activeSlave.toyHole = "boobs">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>
+ <<if ($activeSlave.vagina > 0) && canDoVaginal($activeSlave)>>
+ | <<link "Pussy">><<set $activeSlave.toyHole = "pussy">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>
+ <<elseif ($activeSlave.vagina == 0)>>
+ | //Take her virginity before giving her pussy special attention//
+ <</if>>
+ <<if ($activeSlave.anus > 0) && canDoAnal($activeSlave)>>
+ | <<link "Ass">><<set $activeSlave.toyHole = "ass">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>
+ <<else>>
+ | //Take her anal virginity before giving her ass special attention//
+ <</if>>
+ /*check*/
+ <<if ($activeSlave.dick > 0) && canPenetrate($activeSlave)>>
+ | <<link "Dick">><<set $activeSlave.toyHole = "dick">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>
+ <</if>>
+ | <<link "No Preference">><<set $activeSlave.toyHole = "all her holes">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>
+
+ <br>
+
+ <</if>>
+<</replace>>
+
+<</widget>>
+
+
diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw
index 39e6c0d6bd4..eea8344e5d9 100644
--- a/src/utility/raWidgets.tw
+++ b/src/utility/raWidgets.tw
@@ -4563,7 +4563,7 @@ consequences.
<</if>>
<<case "schoolroom">>
<<if ($schoolroom > $schoolroomSlaves) && ($args[0].devotion >= -20) || (($args[0].devotion >= -50) && ($args[0].trust < -20)) || ($args[0].trust < -50)>>
- <<if ($args[0].intelligenceImplant < 1) || ($args[0].accent+$schoolroomUpgradeLanguage > 2) || ($args[0].oralSkill <= 10) || ($args[0].whoreSkill <= 10) || ($args[0].entertainSkill <= 10) || ($args[0].analSkill < 1) || (($args[0].vaginalSkill < 1) && ($args[0].vagina > 0))>>
+ <<if ($args[0].intelligenceImplant < 1) || ($args[0].voice != 0 && $args[0].accent+$schoolroomUpgradeLanguage > 2) || ($args[0].oralSkill <= 10+$schoolroomUpgradeSkills*20) || ($args[0].whoreSkill <= 10+$schoolroomUpgradeSkills*20) || ($args[0].entertainSkill <= 10+$schoolroomUpgradeSkills*20) || ($args[0].analSkill < 10+$schoolroomUpgradeSkills*20) || (($args[0].vagina >= 0) && ($args[0].vaginalSkill < 10+$schoolroomUpgradeSkills*20))>>
<<if ($args[0].assignment != "learn in the schoolroom")>>
<br>$args[0].slaveName has automatically been assigned to $args[0].assignment.
<<if ($personalAttention == $args[0].ID)>>
--
GitLab