diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index c2091f3c37a146ae38ef812be8fb331a564fc6a8..a250cbce34dc4ed795b13eabebf141d1e61a5559 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -913,7 +913,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr
''CornCobMan'' contributed several major modpacks, which include clothing, hair and eye colors, a facility name and arcology name expansions, UI improvements, nicknames, names, balance, a huge rework of the Rules Assistant, and more. CornCobMan has indefatigably supported the RA updates.
''Klementine'' wrote the fertility goddess skin for the personal assistant.
''Wahn'' wrote numerous generic recruitment events.
-''Pregmodder'' has modded extensively, including descriptive embellishments for pregnant slaves, Master Suite reporting, the Wardrobe, a pack of facility leader interactions, options for Personal Assistant appearances, birthing scenes, fake pregnancy accessories, many other preg mechanics, blind content, expanded chubby belly descriptions, several new surgeries, better descriptive support for different refreshments, and an expansion to the hostage corruption event chain.
+''Pregmodder'' has modded extensively, including descriptive embellishments for pregnant slaves, various asset descriptions, Master Suite reporting, the Wardrobe, a pack of facility leader interactions, options for Personal Assistant appearances, birthing scenes, fake pregnancy accessories, many other preg mechanics, blind content, expanded chubby belly descriptions, several new surgeries, better descriptive support for different refreshments, work on choosesOwnJob, and an expansion to the hostage corruption event chain.
''Lolimodder'' your loli expertise will be missed.
''pregmodfan'' for tremendous amounts of work with compilers, decompilers, etc. Single-handedly kicked this mod into its new git home. Contributed lots of bugfixes as well as fixed the RA considerably. Also for ppmod, ramod, implmod, cfpmod and psmod (preg speed).
''family mod anon'' for extending extended family mode.
@@ -954,6 +954,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr
''NovX'' created a vector art system.
''Mauve'' contributed vector collars and pubic hair.
''Rodziel'' contributed the cybernetics mod.
+''prndev'' wrote the Free Range Dairy Assignment scene.
''Many other anonymous contributors'' helped fix bugs via GitHub. They will be credited by name upon request.
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 1c22a2100aa5ff1329f5a2a45d19b389a84ecfb0..ae1487dc81c6a2738baaafe03cadf9d780fceb27 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1,6 +1,6 @@
:: init [nobr]
-<<set $ver = "0.10.1", $releaseID = 1004>>
+<<set $ver = "0.10.1", $releaseID = 1005>>
/* This needs to be broken down into individual files that can be added to StoryInit instead. */
diff --git a/src/js/familyTree.tw b/src/js/familyTree.tw
index a3377d98d74352219f87b9e6cb06d8aab302241b..a525c5f2f60016ec6d715cb70a78fadd12acafab 100644
--- a/src/js/familyTree.tw
+++ b/src/js/familyTree.tw
@@ -5,7 +5,10 @@ var lastActiveSlave, lastSlaves, lastPC;
/*
To use, add something like:
-<div id="graph"></div>
+<div id="editFamily">
+ <div id="graph"></div>
+</div>
+
<<run updateFamilyTree($activeSlave, $slaves, $PC)>>
<script>updateFamilyTree()</script>
@@ -19,8 +22,6 @@ If there's no active slave, you can do:
window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastSlaves, PC = lastPC) {
lastActiveSlave = activeSlave;
- if(activeSlave == null)
- activeSlave = PC;
lastSlaves = slaves;
lastPC = PC;
var treeDepth = 0;
@@ -31,6 +32,11 @@ window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastS
return;
graphElement.innerHTML = "";
+ /* The way this code works is that we start with the activeSlave then we call
+ slaveInfo() recursively to work our way up the tree finding their parents.
+
+ */
+
function getSlave(id, expectedGenes) {
if(id == -1) {
return {"slaveName":"YOU", "ID":id, "physicalAge":PC.physicalAge, "genes":PC.genes, father:PC.father, mother:PC.mother};
@@ -104,7 +110,8 @@ window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastS
spouseToChild[child.father].push(child);
}
}
- if(activeSlave != PC)
+
+ if(activeSlave.ID != PC.ID)
maybeAddSpouseToChild(activeSlave);
maybeAddSpouseToChild(getSlave(-1));
@@ -133,6 +140,8 @@ window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastS
return data;
}
+ if(activeSlave == PC || activeSlave == null)
+ activeSlave = getSlave(-1)
const treeData = [slaveInfo(activeSlave, activeSlave.ID)];
console.log("Family tree is", treeData, 'and has:', numTreeNodes);
diff --git a/src/npc/databases/ddSlavesDatabase.tw b/src/npc/databases/ddSlavesDatabase.tw
index 271bedb5049f122f679fd68632b4114e51d17e0b..eb8a2a2fcf0eba9f8b844d8e58e6826fd41256e0 100644
--- a/src/npc/databases/ddSlavesDatabase.tw
+++ b/src/npc/databases/ddSlavesDatabase.tw
@@ -116,7 +116,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
-<<set _HS.slaveName = "Mistress Izzy", _HS.birthName = "Isabella", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 70, _HS.devotion = 100, _HS.eyeColor = "black", _HS.hColor = "sparkling and shiny golden red", _HS.pubicHColor = "blonde", _HS.skin = "tanned", _HS.hLength = 60, _HS.hStyle = "in thick long heavy braids", _HS.pubicHStyle = "waxed", _HS.waist = -100, _HS.boobs = 9200, _HS.boobsImplant = 6000, _HS.nipplesPiercing = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.milk = 3010, _HS.butt = 8, _HS.buttImplant = 1, _HS.buttTat = "bovine patterns", _HS.face = 55, _HS.faceImplant = 2, _HS.lips = 55, _HS.lipsImplant = 2, _HS.lipsPiercing = 2, _HS.lipsTat = "bovine patterns", _HS.tonguePiercing = 2, _HS.vagina = 2, _HS.vaginaPiercing = 2, _HS.vaginaTat = "bovine patterns", _HS.preg = -2, _HS.clitPiercing = 3, _HS.clitSetting = "all", _HS.anus = 2, _HS.dick = 5, _HS.prostate = 1, _HS.balls = 3, _HS.anusPiercing = 2, _HS.anusTat = "bovine patterns", _HS.makeup = 2, _HS.nails = 2, _HS.brand = "SLUT", _HS.brandLocation = "buttocks", _HS.earPiercing = 2, _HS.nosePiercing = 2, _HS.eyebrowPiercing = 2, _HS.navelPiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.vaginalSkill = 35, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 35, _HS.collar = "leather with cowbell", _HS.shoes = "heels", _HS.intelligence = 1, _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has tattoos of teasing, enticing messages begging others to come taste her addictive milk.", _HS.customDesc = "Her musky milky aura drives men and women around her giggly and dumb with lust.">>
+<<set _HS.slaveName = "Mistress Izzy", _HS.birthName = "Isabella", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 70, _HS.devotion = 100, _HS.eyeColor = "black", _HS.hColor = "sparkling and shiny golden red", _HS.pubicHColor = "blonde", _HS.skin = "tanned", _HS.hLength = 60, _HS.hStyle = "in thick long heavy braids", _HS.pubicHStyle = "waxed", _HS.waist = -100, _HS.boobs = 9200, _HS.boobsImplant = 6000, _HS.nipplesPiercing = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.milk = 3010, _HS.butt = 8, _HS.buttImplant = 1, _HS.buttTat = "bovine patterns", _HS.face = 55, _HS.faceImplant = 2, _HS.lips = 55, _HS.lipsImplant = 2, _HS.lipsPiercing = 2, _HS.lipsTat = "bovine patterns", _HS.tonguePiercing = 2, _HS.vagina = 2, _HS.vaginaPiercing = 2, _HS.vaginaTat = "bovine patterns", _HS.preg = -2, _HS.clitPiercing = 3, _HS.anus = 2, _HS.dick = 5, _HS.prostate = 1, _HS.balls = 3, _HS.anusPiercing = 2, _HS.anusTat = "bovine patterns", _HS.makeup = 2, _HS.nails = 2, _HS.brand = "SLUT", _HS.brandLocation = "buttocks", _HS.earPiercing = 2, _HS.nosePiercing = 2, _HS.eyebrowPiercing = 2, _HS.navelPiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.vaginalSkill = 35, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 35, _HS.collar = "leather with cowbell", _HS.shoes = "heels", _HS.intelligence = 1, _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "She has tattoos of teasing, enticing messages begging others to come taste her addictive milk.", _HS.customDesc = "Her musky milky aura drives men and women around her giggly and dumb with lust.">>
<<set $heroSlaves.push(_HS)>>
/*Dropped desc = She has two cute horns protruding from her forehead. A few addicted milkslaves of her own tag along behind her. */
@@ -125,7 +125,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
-<<set _HS.slaveName = "Aisha", _HS.birthName = "Aicha", _HS.genes = "XY", _HS.origin = "She sold herself into slavery to escape a life of boredom.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = -20, _HS.devotion = 45, _HS.height = 155, _HS.heightImplant = -1, _HS.nationality = "slave", _HS.race = "middle eastern", _HS.eyeColor = "blue", _HS.hColor = "peachy fading into a red ombre at the bottom", _HS.pubicHColor = "red", _HS.skin = "lightened", _HS.hLength = 30, _HS.hStyle = "shoulder-length in a hime cut", _HS.waist = -55, _HS.boobs = 250, _HS.butt = 3.5, _HS.face = 55, _HS.faceImplant = 2, _HS.vagina = -1, _HS.preg = -2, _HS.clitPiercing = 3, _HS.clitSetting = "all", _HS.anus = 1, _HS.dick = 5, _HS.dickTat = "flowers", _HS.prostate = 1, _HS.balls = 2, _HS.anusPiercing = 1, _HS.anusTat = "flowers", _HS.brand = "your initials ", _HS.brandLocation = "back", _HS.earPiercing = 1, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.entertainSkill = 15, _HS.clothes = "a comfortable bodysuit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = -1, _HS.attrXX = 40, _HS.attrXY = 40, _HS.customTat = "She has tattooed petals trailing from the nape of her neck down her back, ending between her butt cheeks.", _HS.customDesc = "Her red pubic hair is waxed into the shape of a heart. She has bright blue eyeshadow on her bottom lids.">>
+<<set _HS.slaveName = "Aisha", _HS.birthName = "Aicha", _HS.genes = "XY", _HS.origin = "She sold herself into slavery to escape a life of boredom.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = -20, _HS.devotion = 45, _HS.height = 155, _HS.heightImplant = -1, _HS.nationality = "slave", _HS.race = "middle eastern", _HS.eyeColor = "blue", _HS.hColor = "peachy fading into a red ombre at the bottom", _HS.pubicHColor = "red", _HS.skin = "lightened", _HS.hLength = 30, _HS.hStyle = "shoulder-length in a hime cut", _HS.waist = -55, _HS.boobs = 250, _HS.butt = 3.5, _HS.face = 55, _HS.faceImplant = 2, _HS.vagina = -1, _HS.preg = -2, _HS.clitPiercing = 3, _HS.anus = 1, _HS.dick = 5, _HS.dickTat = "flowers", _HS.prostate = 1, _HS.balls = 2, _HS.anusPiercing = 1, _HS.anusTat = "flowers", _HS.brand = "your initials ", _HS.brandLocation = "back", _HS.earPiercing = 1, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.entertainSkill = 15, _HS.clothes = "a comfortable bodysuit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = -1, _HS.attrXX = 40, _HS.attrXY = 40, _HS.customTat = "She has tattooed petals trailing from the nape of her neck down her back, ending between her butt cheeks.", _HS.customDesc = "Her red pubic hair is waxed into the shape of a heart. She has bright blue eyeshadow on her bottom lids.">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
@@ -141,7 +141,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
-<<set _HS.slaveName = "'Mistress' Ingrid", _HS.birthName = "Ingrid", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.health = 100, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.nationality = "Norwegian", _HS.eyeColor = "blue", _HS.hColor = "onyx black", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hLength = 90, _HS.hStyle = "ass-length with Nordic braids throughout", _HS.waist = -55, _HS.boobs = 800, _HS.butt = 5, _HS.face = 55, _HS.lips = 35, _HS.preg = -2, _HS.clitPiercing = 3, _HS.clitSetting = "all", _HS.dick = 4, _HS.prostate = 1, _HS.balls = 4, _HS.ovaries = 1, _HS.makeup = 2, _HS.nails = 2, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 15, _HS.whoreSkill = 35, _HS.entertainSkill = 35, _HS.combatSkill = 1, _HS.clothes = "a slave gown", _HS.collar = "pretty jewelry", _HS.shoes = "boots", _HS.intelligence = 1, _HS.intelligenceImplant = 1, _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She has the style of Gothic royalty, and the demeanor to match.">>
+<<set _HS.slaveName = "'Mistress' Ingrid", _HS.birthName = "Ingrid", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.health = 100, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.nationality = "Norwegian", _HS.eyeColor = "blue", _HS.hColor = "onyx black", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hLength = 90, _HS.hStyle = "ass-length with Nordic braids throughout", _HS.waist = -55, _HS.boobs = 800, _HS.butt = 5, _HS.face = 55, _HS.lips = 35, _HS.preg = -2, _HS.clitPiercing = 3, _HS.dick = 4, _HS.prostate = 1, _HS.balls = 4, _HS.ovaries = 1, _HS.makeup = 2, _HS.nails = 2, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 15, _HS.whoreSkill = 35, _HS.entertainSkill = 35, _HS.combatSkill = 1, _HS.clothes = "a slave gown", _HS.collar = "pretty jewelry", _HS.shoes = "boots", _HS.intelligence = 1, _HS.intelligenceImplant = 1, _HS.energy = 100, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customDesc = "She has the style of Gothic royalty, and the demeanor to match.">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
diff --git a/src/npc/fucktoyWorkaround.tw b/src/npc/fucktoyWorkaround.tw
index 744d05f5074d40344de068afb8bbc79b17310f99..86343cdfbaa91836e445b1cd00f0f156d7cc665b 100644
--- a/src/npc/fucktoyWorkaround.tw
+++ b/src/npc/fucktoyWorkaround.tw
@@ -1,4 +1,6 @@
:: Fucktoy Workaround [silently]
-<<set $slaves[$i].assignment = "please you", $slaves[$i].choosesOwnAssignment = 0>>
+<<assignJob $slaves[$i] "please you">>
+
<<goto "Main">>
+
diff --git a/src/npc/removeActiveSlave.tw b/src/npc/removeActiveSlave.tw
index de1b491d58eb4f3cd0ccac7903e979876d0a3373..44c1a528ed89983d2f3403fceec5685c9ec21ab8 100644
--- a/src/npc/removeActiveSlave.tw
+++ b/src/npc/removeActiveSlave.tw
@@ -95,6 +95,7 @@
<<set $slaves[_y].rivalry = 0, $slaves[_y].rivalryTarget = 0>>
<</if>>
<</for>>
+
<<if _ID == $Recruiter.ID>><<set $Recruiter = 0>><</if>>
<<if _ID == $HeadGirl.ID>><<set $HeadGirl = 0>><</if>>
<<if _ID == $Bodyguard.ID>><<set $Bodyguard = 0>><</if>>
@@ -111,32 +112,23 @@
<<if _ID == $Stewardess.ID>><<set $Stewardess = 0>><</if>>
<<if _ID == $Wardeness.ID>><<set $Wardeness = 0>><</if>>
<<if _ID == $Concubine.ID>><<set $Concubine = 0>><</if>>
+
<<if _ID == $personalAttention>>
- <<if $PC.career == "servant">>
- <<set $personalAttention = "upkeep">>
- <<elseif $PC.career == "escort">>
- <<set $personalAttention = "whoring">>
- <<else>>
- <<set $personalAttention = "business">>
- <</if>>
- <</if>>
- <<for _y = 0; _y < $fighterIDs.length; _y++>>
- <<if _ID == $fighterIDs[_y]>>
- <<set _dump = $fighterIDs.deleteAt(_y), _y-->>
+ <<if $PC.career == "servant">>
+ <<set $personalAttention = "upkeep">>
+ <<elseif $PC.career == "escort">>
+ <<set $personalAttention = "whoring">>
+ <<else>>
+ <<set $personalAttention = "business">>
<</if>>
- <</for>>
+ <</if>>
+
+ <<set $fighterIDs.delete(_ID)>>
+
/% Remove from facility array if assigned %/
- <<switch $slaves[_x].assignment>>
- <<case "learn in the schoolroom" "get treatment in the clinic" "rest in the spa" "work in the dairy" "be confined in the arcade" "live with your Head Girl" "be confined in the cellblock" "serve in the club" "serve in the master suite" "work as a servant" "work in the brothel">>
- <<removeJob $activeSlave $activeSlave.assignment>>
- <</switch>>
+ <<removeJob $activeSlave $activeSlave.assignment>>
+
+ <<set $slavesOriginal.delete(_ID)>>
- <<set _Tcount = $slavesOriginal.length>>
- <<for _y = 0; _y < _Tcount; _y++>>
- <<if $slavesOriginal[_y].ID == _ID>>
- <<set _dump = $slavesOriginal.deleteAt(_y)>>
- <<break>>
- <</if>>
- <</for>>
<<set _dump = $slaves.deleteAt(_x), _SL--, $activeSlave = 0>>
<</if>>
diff --git a/src/npc/restWorkaround.tw b/src/npc/restWorkaround.tw
index bdbb0e4dacef4936c03626882a2818cd2c43c9e0..439a7300a1261fe32213a9dcb9bff45e22bd0c69 100644
--- a/src/npc/restWorkaround.tw
+++ b/src/npc/restWorkaround.tw
@@ -1,4 +1,6 @@
:: Rest Workaround [silently]
-<<set $slaves[$i].assignment = "rest", $slaves[$i].choosesOwnAssignment = 0>>
+<<removeJob $slaves[$i] $slaves[$i].assignment>>
+
<<goto "Main">>
+
diff --git a/src/npc/servantWorkaround.tw b/src/npc/servantWorkaround.tw
index ebc66bf6c86fb332b2986a7e477038ebb0fa55a5..427529ebf4e572238143909dcf8ead3f8a841d52 100644
--- a/src/npc/servantWorkaround.tw
+++ b/src/npc/servantWorkaround.tw
@@ -1,4 +1,6 @@
:: Servant Workaround [silently]
-<<set $slaves[$i].assignment = "be a servant", $slaves[$i].choosesOwnAssignment = 0>>
+<<assignJob $slaves[$i] "be a servant">>
+
<<goto "Main">>
+
diff --git a/src/uncategorized/arcologyDescription.tw b/src/uncategorized/arcologyDescription.tw
index 376c51c2a6903b57d3ca2d939a9d85590335e74c..283031047e891fdd4d636bc57ea37c40ba5f3156 100644
--- a/src/uncategorized/arcologyDescription.tw
+++ b/src/uncategorized/arcologyDescription.tw
@@ -56,13 +56,17 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
The slaves are cowering, and are wearing chains.
<</if>>
<<if $arcologies[0].FSBodyPuristDecoration == 100>>
- The slaves' bodies idealized too.
+ The slaves' bodies are idealized, too.
<</if>>
<<if $arcologies[0].FSTransformationFetishistDecoration == 100>>
The slaves have unnaturally narrow waists and big breasts.
<</if>>
<<if $arcologies[0].FSYouthPreferentialist == 100>>
- The slaves are young, with smooth, innocent faces.
+ <<if $minimumSlaveAge < 13>>
+ The slaves are cute lolis with round, innocent faces.
+ <<else>>
+ The slaves are young, with smooth, innocent faces.
+ <</if>>
<</if>>
<<if $arcologies[0].FSMaturityPreferentialist == 100>>
The slaves are mature, with motherly bodies.
@@ -97,7 +101,7 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
<</if>>
<<if $arcologies[0].FSChattelReligionistDecoration == 100>>
The central
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>> has a halo behind his head, and the slaves are in attitudes of worship.
+ <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>> has a halo behind <<if $PC.title == 1>>his<<else>>her<</if>> head, and the slaves are in attitudes of worship.
<</if>>
<<if $arcologies[0].FSRomanRevivalistDecoration == 100>>
The central
diff --git a/src/uncategorized/assistantEvents.tw b/src/uncategorized/assistantEvents.tw
index 73d70d71c7e0ca98ad9d805cda1cd84eb2a804bb..0bc813abd90c4c1f0a7ac8cfb8da60aade90bd7c 100644
--- a/src/uncategorized/assistantEvents.tw
+++ b/src/uncategorized/assistantEvents.tw
@@ -791,7 +791,7 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
<<elseif $arcologies[0].FSGenderFundamentalist != "unset">>
adjusts her appearance to be feminine to conform with your vision of preserving traditional gender roles.
<<elseif $arcologies[0].FSDegradationist != "unset">>
- adjusts her appearance to include odly fleshy piercings to conform with your vision that slaves are not human and should be thoroughly degraded.
+ adjusts her appearance to include oddly fleshy piercings to conform with your vision that slaves are not human and should be thoroughly degraded.
<<elseif $arcologies[0].FSRepopulationFocus != "unset">>
bulges her middle to look pregnant to conform with your vision that all wombs should be filled.
<<elseif $arcologies[0].FSRestart != "unset">>
diff --git a/src/uncategorized/attendantWorkaround.tw b/src/uncategorized/attendantWorkaround.tw
index 17a717e1cd81e7110adc0518739787c104d722d3..5fdc9afdda41927d1c5fec47dfb83464787ef301 100644
--- a/src/uncategorized/attendantWorkaround.tw
+++ b/src/uncategorized/attendantWorkaround.tw
@@ -3,34 +3,19 @@
<<if $Attendant != 0>>
<<set _ID = $Attendant.ID, _SL = $slaves.length>>
<<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>><<break>><</if>>
+ <<if (_ID == $slaves[_i].ID)>>
+ <<removeJob $slaves[_i] "be the Attendant">>
+ <<break>>
+ <</if>>
<</for>>
- <<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">>
- <<set $personalAttention = "upkeep">>
- <<else>>
- <<set $personalAttention = "business">>
- <</if>>
- <</if>>
- <<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>>
+ <<assignJob $slaves[$i] "be the Attendant">>
+ <<set $slaves[$i].livingRules = "luxurious">>
<<set $Attendant = $slaves[$i]>>
<<else>>
<<set $Attendant = 0>>
<</if>>
<<goto "Spa">>
+
diff --git a/src/uncategorized/bodyguardWorkaround.tw b/src/uncategorized/bodyguardWorkaround.tw
index 3be01ee1d628d9b2ef7a267e00f5989427422fca..c27ff3204fc34b21665b129dd6c5df8bae583c1c 100644
--- a/src/uncategorized/bodyguardWorkaround.tw
+++ b/src/uncategorized/bodyguardWorkaround.tw
@@ -3,13 +3,14 @@
<<if $Bodyguard != 0>>
<<set _ID = $Bodyguard.ID, _SL = $slaves.length>>
<<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>><<break>><</if>>
+ <<if (_ID == $slaves[_i].ID)>>
+ <<removeJob $slaves[_i] "guard you">>
+ <<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>>
+ <<assignJob $slaves[$i] "guard you">>
<<set $Bodyguard = $slaves[$i]>>
<<else>>
<<set $Bodyguard = 0>>
diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index ebe4a95139605294a7a10f07beb69a20fddf34f8..796b004aacc90fe5389e521ad92181b78029dbdf 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -134,7 +134,7 @@ $brothelNameCaps
<<set $brothel = 0, $brothelUpgradeDrugs = 0, $brothelDecoration = "standard">>
<<for _i = 0; _i < $sectors.length; _i++>>
<<if $sectors[_i].type == "Brothel">>
- <<set $sectors[_i].type == "Shops">><<break>>
+ <<set $sectors[_i].type = "Shops">><<break>>
<</if>>
<</for>>
<<goto "Main">>
diff --git a/src/uncategorized/cellblock.tw b/src/uncategorized/cellblock.tw
index a9bba25dbc522118670979e7250585407648bb56..9078804b9d603a174da9017aba72639943b6e3aa 100644
--- a/src/uncategorized/cellblock.tw
+++ b/src/uncategorized/cellblock.tw
@@ -95,7 +95,7 @@ $cellblockNameCaps
<br><br>''$cellblockNameCaps is full and cannot hold any more slaves''
<<elseif ($slaves.length > $cellblockSlaves)>>
<br><br>''Send a resistant slave to be broken in the cellblock:''
- <<set $Flag to 0>>
+ <<set $Flag = 0>>
<<include "Slave Summary">>
<</if>>
<<unset $Flag>>
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index 53b0e0395f5dbe1c7094774b3814df98f2b124ed..32a882a2039d5e07b38d048c8a9f341c2001dc10 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -4,7 +4,7 @@
<<for _dI = 0; _dI < _DL; _dI++>>
<<set _i = $CellBiIDs[_dI].Index, _ID = $CellBiIDs[_dI].ID>>
-<<if ndef $slaves[_i] || _ID != $slaves[_i].ID>>
+<<if _i >= _SL || _ID != $slaves[_i].ID>>
/% Slaves.ID and $CellBiIDs.ID's don't match-up so let's find her %/
<<for _i = 0; _i < _SL; _i++>>
<<if (_ID == $slaves[_i].ID)>>
@@ -318,7 +318,7 @@
<br><br>
<</if>>
<<if (_softenedQuirks > 0)>>
- $cellblockName's advanced compliance systems successfully softened
+ $cellblockNameCaps's advanced compliance systems successfully softened
<<if (_softenedQuirks == 1)>>
one slave's mental flaw into an @@.green;appealing quirk,@@ though the constant correction caused her @@.mediumorchid;considerable anguish.@@
<<else>>
diff --git a/src/uncategorized/classesWorkaround.tw b/src/uncategorized/classesWorkaround.tw
index 5d7926b4175a079351545a13e988597b7308ced9..1e61bdde3157f3cf45d94048649d1e481e215e61 100644
--- a/src/uncategorized/classesWorkaround.tw
+++ b/src/uncategorized/classesWorkaround.tw
@@ -1,4 +1,6 @@
:: Classes Workaround [silently]
-<<set $slaves[$i].assignment = "take classes", $slaves[$i].choosesOwnAssignment = 0>>
+<<assignJob $slaves[$i] "take classes">>
+
<<goto "Main">>
+
diff --git a/src/uncategorized/club.tw b/src/uncategorized/club.tw
index 1236ce5deb4ea6b72ca577b9443b409b07cc975f..c17ae40dc6379646182a8160619463dfa7a61680 100644
--- a/src/uncategorized/club.tw
+++ b/src/uncategorized/club.tw
@@ -134,7 +134,7 @@ $clubNameCaps
<<set $club = 0, $clubDecoration = "standard", $clubUpgradePDAs = 0>>
<<for _i = 0; _i < $sectors.length; _i++>>
<<if $sectors[_i].type == "Club">>
- <<set $sectors[_i].type == "Shops">><<break>>
+ <<set $sectors[_i].type = "Shops">><<break>>
<</if>>
<</for>>
<<goto "Main">>
diff --git a/src/uncategorized/concubineWorkaround.tw b/src/uncategorized/concubineWorkaround.tw
index c09207d1cb685242f7dfda1e2e631c99db72c0b2..d11f55d8fdbd9385f75677ff63612ac9835dd2de 100644
--- a/src/uncategorized/concubineWorkaround.tw
+++ b/src/uncategorized/concubineWorkaround.tw
@@ -3,34 +3,19 @@
<<if $Concubine != 0>>
<<set _ID = $Concubine.ID, _SL = $slaves.length>>
<<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>><<break>><</if>>
+ <<if (_ID == $slaves[_i].ID)>>
+ <<removeJob $slaves[_i] "be your Concubine">>
+ <<break>>
+ <</if>>
<</for>>
- <<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">>
- <<set $personalAttention = "upkeep">>
- <<else>>
- <<set $personalAttention = "business">>
- <</if>>
- <</if>>
- <<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>>
+ <<assignJob $slaves[$i] "be your Concubine">>
+ <<set $slaves[$i].livingRules = "luxurious">>
<<set $Concubine = $slaves[$i]>>
<<else>>
<<set $Concubine = 0>>
<</if>>
<<goto "Master Suite">>
+
diff --git a/src/uncategorized/confinementWorkaround.tw b/src/uncategorized/confinementWorkaround.tw
index 1bb5f81a2dad812dbf27b35dafaed60688dea6f3..c157a6185f5578bd9e418db9ced21db16b7ab437 100644
--- a/src/uncategorized/confinementWorkaround.tw
+++ b/src/uncategorized/confinementWorkaround.tw
@@ -1,4 +1,6 @@
:: Confinement Workaround [silently]
-<<set $slaves[$i].assignment = "stay confined", $slaves[$i].choosesOwnAssignment = 0>>
+<<assignJob $slaves[$i] "stay confined">>
+
<<goto "Main">>
+
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index ac3c1981fea380083bc92876f8855a43d0daa2f4..618fbd6cb307de9ff23c5cec13a6b1c1de09d2f5 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -36,8 +36,9 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<if ($Milkmaid != 0) && ($dairyRestraintsSetting == 2)>>
<<for _i = 0; _i < _SL; _i++>>
<<if $slaves[_i].assignment == "be the Milkmaid">>
- <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1, $Milkmaid = 0>>
- $slaves[_i].slaveName has been removed from her position as Milkmaid, since an industrialized dairy automates her duties.<br><br>
+ $slaves[_i].slaveName has been removed from her position as Milkmaid, since an industrialized dairy automates her duties.
+ <<removeJob $slaves[_i] "be the Milkmaid">>
+ <br><br>
<</if>>
<</for>>
<</if>>
@@ -301,7 +302,7 @@ $dairyNameCaps
<<set $dairy = 0, $dairyFeedersUpgrade = 0, $dairyPregUpgrade = 0, $dairyStimulatorsUpgrade = 0, $dairyDecoration = "standard", $dairyFeedersSetting = 0, $dairyPregSetting = 0, $dairyStimulatorsSetting = 0, $dairyHyperPregRemodel = 0, $cumPipeline = 0, $milkPipeline = 0>>
<<for _i = 0; _i < $sectors.length; _i++>>
<<if $sectors[_i].type == "Dairy">>
- <<set $sectors[_i].type == "Manufacturing">><<break>>
+ <<set $sectors[_i].type = "Manufacturing">><<break>>
<</if>>
<</for>>
<<goto "Main">>
diff --git a/src/uncategorized/djWorkaround.tw b/src/uncategorized/djWorkaround.tw
index e1d3bafa59ac5db1a03ce77fa929468c3a870cfc..7c7cb9f13573bb02319704796b4cee7b56311ed2 100644
--- a/src/uncategorized/djWorkaround.tw
+++ b/src/uncategorized/djWorkaround.tw
@@ -3,34 +3,19 @@
<<if $DJ != 0>>
<<set _ID = $DJ.ID, _SL = $slaves.length>>
<<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>><<break>><</if>>
+ <<if (_ID == $slaves[_i].ID)>>
+ <<removeJob $slaves[_i] "be the DJ">>
+ <<break>>
+ <</if>>
<</for>>
- <<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">>
- <<set $personalAttention = "upkeep">>
- <<else>>
- <<set $personalAttention = "business">>
- <</if>>
- <</if>>
- <<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>>
+ <<assignJob $slaves[$i] "be the DJ">>
+ <<set $slaves[$i].livingRules = "luxurious">>
<<set $DJ = $slaves[$i]>>
<<else>>
<<set $DJ = 0>>
<</if>>
<<goto "Club">>
+
diff --git a/src/uncategorized/freeRangeDairyAssignmentScene.tw b/src/uncategorized/freeRangeDairyAssignmentScene.tw
index 222e02a36055a3011bd64c67245c3a1765f6306b..9e88d827ff44a397f3218b56e009fb6d57a36b5a 100644
--- a/src/uncategorized/freeRangeDairyAssignmentScene.tw
+++ b/src/uncategorized/freeRangeDairyAssignmentScene.tw
@@ -33,7 +33,7 @@ While walking to her designated stall, she passes the other cows currently at th
<</if>>
<<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].assignment == "work in the dairy" && $slaves[$i].slaveName != $activeSlave.slaveName && $slaves[$i].balls > 5 >>
+ <<if $slaves[$i].assignment == "work in the dairy" && $slaves[$i].ID != $activeSlave.ID && $slaves[$i].balls > 5 >>
<<set $aroused = true >>
The hyper-endowed cum-cow $slaves[$i].slaveName is the pride of $dairyName. $activeSlave.slaveName stops to watch her for a while. The constant suction on her dick has her panting. She is obviously nearing climax. Soon, her eyes bulge and her muscles tense.
<<if $dairyStimulatorsSetting == 1>>
@@ -336,16 +336,16 @@ The milking cups on her nipples switch from rhythmic pulsing into intense suctio
<<elseif $activeSlave.boobs > 1000 >>
for quite some time. Her large breasts can store an impressive volume of milk.
<<elseif $activeSlave.boobs > 700 >>
- until there is enough for whitening a cup of coffee. Her average breasts cannot store much more.
+ until there is enough for whitening a cup of coffee. Her average breasts cannot store much more milk.
<<elseif ($arcologies[0].FSSlimnessEnthusiast > 80) >>
for a suprisingly long time. Your arcology succeeded in optimized the milking process for small breasts.
<<else>>
for a short time. Her small tits cannot dispense much milk at once.
<</if>>
<</if>>
-<<if $activeSlave.prostate != 0 && $activeSlave.dick == 0 >>
+<<if $activeSlave.prostate != 0 && $activeSlave.dick == 0 && $activeSlave.balls == 0 >>
<br>
-$activeSlave.slaveName has no cock, but a functional prostate gland. It's attached to her urethra, so she squirts <<if $activeSlave.prostateImplant == 1>>massively<<else>>copiously<</if>> while she orgasms. The exotic fluid is caught by a basin positioned unter her dripping pussy.
+$activeSlave.slaveName has no cock, but a functional prostate gland. It's attached to her urethra, so she squirts <<if $activeSlave.prostateImplant == 1>>massively<<else>>copiously<</if>> while she orgasms. The exotic fluid is caught by a basin positioned under her <<if $activeSlave.vagina >= 0 >>dripping pussy<<else>>featureless crotch<</if>>.
<</if>>
<br><br>
With the first milking cycle being over, $activeSlave.slaveName drifts into a relaxing slumber.
diff --git a/src/uncategorized/hgWorkaround.tw b/src/uncategorized/hgWorkaround.tw
index 8c4444871ee2286dc48f39f72e41a0a263ae19b9..9d82c324b7eefb7aa8297135d9e11c02eadffdde 100644
--- a/src/uncategorized/hgWorkaround.tw
+++ b/src/uncategorized/hgWorkaround.tw
@@ -3,26 +3,20 @@
<<if $HeadGirl != 0>>
<<set _ID = $HeadGirl.ID, _SL = $slaves.length>>
<<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>><<break>><</if>>
+ <<if (_ID == $slaves[_i].ID)>>
+ <<removeJob $slaves[_i] "be your Head Girl">>
+ <<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>>
+ <<assignJob $slaves[$i] "be your Head Girl">>
<<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>>
- <</if>>
<</if>>
+
<<set $HGTimeInGrade = 0>>
<<goto "Main">>
+
diff --git a/src/uncategorized/holeWorkaround.tw b/src/uncategorized/holeWorkaround.tw
index 5afbe35e8e9d5cda31fde5d6f16531b8c6781d47..f5a07f47aea80ebf8ada4482c909ddfc3ba5621a 100644
--- a/src/uncategorized/holeWorkaround.tw
+++ b/src/uncategorized/holeWorkaround.tw
@@ -1,4 +1,6 @@
:: Hole Workaround [silently]
-<<set $slaves[$i].assignment = "work a glory hole", $slaves[$i].choosesOwnAssignment = 0>>
+<<assignJob $slaves[$i] "work a glory hole">>
+
<<goto "Main">>
+
diff --git a/src/uncategorized/madamWorkaround.tw b/src/uncategorized/madamWorkaround.tw
index 839982124c2bc2e83dcabab5901c2ba00bb7de71..ca7b8e3eb50b7a6d6684fdb8abc413f0605bf12f 100644
--- a/src/uncategorized/madamWorkaround.tw
+++ b/src/uncategorized/madamWorkaround.tw
@@ -3,34 +3,19 @@
<<if $Madam != 0>>
<<set _ID = $Madam.ID, _SL = $slaves.length>>
<<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>><<break>><</if>>
+ <<if (_ID == $slaves[_i].ID)>>
+ <<removeJob $slaves[_i] "be the Madam">>
+ <<break>>
+ <</if>>
<</for>>
- <<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">>
- <<set $personalAttention = "upkeep">>
- <<else>>
- <<set $personalAttention = "business">>
- <</if>>
- <</if>>
- <<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>>
+ <<assignJob $slaves[$i] "be the Madam">>
+ <<set $slaves[$i].livingRules = "luxurious">>
<<set $Madam = $slaves[$i]>>
<<else>>
<<set $Madam = 0>>
<</if>>
<<goto "Brothel">>
+
diff --git a/src/uncategorized/milkingWorkaround.tw b/src/uncategorized/milkingWorkaround.tw
index b14348c10c8f4b859ecaa6d8917b7a9c93bc0b9a..f64bf7c03172e99732e4dcedb7215947204099e6 100644
--- a/src/uncategorized/milkingWorkaround.tw
+++ b/src/uncategorized/milkingWorkaround.tw
@@ -1,4 +1,6 @@
:: Milking Workaround [silently]
-<<set $slaves[$i].assignment = "get milked", $slaves[$i].choosesOwnAssignment = 0>>
+<<assignJob $slaves[$i] "get milked">>
+
<<goto "Main">>
+
diff --git a/src/uncategorized/milkmaidWorkaround.tw b/src/uncategorized/milkmaidWorkaround.tw
index d673662b32c143766f3c341887d40eecedbcf5eb..fb152b7a079dd7e11686adab712a7f43302510b8 100644
--- a/src/uncategorized/milkmaidWorkaround.tw
+++ b/src/uncategorized/milkmaidWorkaround.tw
@@ -3,34 +3,19 @@
<<if $Milkmaid != 0>>
<<set _ID = $Milkmaid.ID, _SL = $slaves.length>>
<<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>><<break>><</if>>
+ <<if (_ID == $slaves[_i].ID)>>
+ <<removeJob $slaves[_i] "be the Milkmaid">>
+ <<break>>
+ <</if>>
<</for>>
- <<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">>
- <<set $personalAttention = "upkeep">>
- <<else>>
- <<set $personalAttention = "business">>
- <</if>>
- <</if>>
- <<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>>
+ <<assignJob $slaves[$i] "be the Milkmaid">>
+ <<set $slaves[$i].livingRules = "luxurious">>
<<set $Milkmaid = $slaves[$i]>>
<<else>>
<<set $Milkmaid = 0>>
<</if>>
<<goto "Dairy">>
+
diff --git a/src/uncategorized/ngpWorkaround.tw b/src/uncategorized/ngpWorkaround.tw
index 57f8446c2f20dd2ee647ca1bfedd6d231d388163..c120d4b2dcdd5a61a0daafe67a00636c8c9ad17b 100644
--- a/src/uncategorized/ngpWorkaround.tw
+++ b/src/uncategorized/ngpWorkaround.tw
@@ -1,8 +1,10 @@
:: NGP Workaround [silently]
<<if $slavesToImport == 1>>
- <<set $slaves[$i].assignment = "be imported">>
+ <<assignJob $slaves[$i] "be imported">>
<<else>>
- <<set $slaves[$i].assignment = "rest">>
+ <<removeJob $slaves[$i] $slaves[$i].assignment>>
<</if>>
+
<<goto "New Game Plus">>
+
diff --git a/src/uncategorized/nurseWorkaround.tw b/src/uncategorized/nurseWorkaround.tw
index f0d70594792925a9f313d8dec6c7e63d998cc423..2ac24c213c92f887e22c0fb89e3e4df34aaf02e4 100644
--- a/src/uncategorized/nurseWorkaround.tw
+++ b/src/uncategorized/nurseWorkaround.tw
@@ -3,34 +3,19 @@
<<if $Nurse != 0>>
<<set _ID = $Nurse.ID, _SL = $slaves.length>>
<<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>><<break>><</if>>
+ <<if (_ID == $slaves[_i].ID)>>
+ <<removeJob $slaves[_i] "be the Nurse">>
+ <<break>>
+ <</if>>
<</for>>
- <<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">>
- <<set $personalAttention = "upkeep">>
- <<else>>
- <<set $personalAttention = "business">>
- <</if>>
- <</if>>
- <<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>>
+ <<assignJob $slaves[$i] "be the Nurse">>
+ <<set $slaves[$i].livingRules = "luxurious">>
<<set $Nurse = $slaves[$i]>>
<<else>>
<<set $Nurse = 0>>
<</if>>
<<goto "Clinic">>
+
diff --git a/src/uncategorized/pRaidInvitation.tw b/src/uncategorized/pRaidInvitation.tw
index aa4ae09ca7dccbbfdd8efbad51d59663b19e2be7..1eeb36a1e7bc013d8222c348a0ef4dc168e4664b 100644
--- a/src/uncategorized/pRaidInvitation.tw
+++ b/src/uncategorized/pRaidInvitation.tw
@@ -5,7 +5,7 @@
<<set $nextButton = "Continue">>
<<set $nextLink = "Random Nonindividual Event">>
-<<set $PRraid = 0>>
+<<set $PRaid = 0>>
<<set $PRraidTarget = 0>>
<</nobr>>\
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index 609ba2af7c62c4434ccc41ef9d93e474f4409bc7..c55d6fd1ffbc409bb8cbdbdf46034f19fa2eacef 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/uncategorized/personalAssistantAppearance.tw
@@ -1192,7 +1192,6 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
<<else>>
She's decided to embrace her spell and now appears as a witch fresh into adulthood.
<</if>>
- She has recently updated her appearance to be more youthful. She frequently flutters by, enojoying her youthful vigor. She looks so innocent, but looks can be deceiving!
<<case "slimness enthusiast">>
She's begun wearing a corest under her robes to hide her chubbiness. Combined with her lightened body, she manages to pull off the lithe look easily.
<<case "body purist">>
@@ -1214,7 +1213,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
<<elseif ($seed == 5) && ($invasionVictory > 0)>>
She's riding a broom alongside a representation of one of your security drones as it carries out its patrol route through your arcolgy. When she sees you looking at her, she giggles and says, "I like this one. He did very well during the invasion."
<<elseif ($seed == 6) && ($studio == 1)>>
- A hovering camera is aimed at a recognizable little representation of one of your slaves masturbate. The slave must be using one of the penthouse's many vibrators, and $assistantName is likely invisible holding the camera, turning the feed of it into a PoV porno.
+ A hovering camera is aimed at a recognizable little representation of one of your slaves masturbating. The slave must be using one of the penthouse's many vibrators, and $assistantName is likely invisible holding the camera, turning the feed of it into a PoV porno.
<<elseif ($seed == 7) && ($marketAssistantAnnounced == 1)>>
She's accompanied by your market assistant's chubby, bespectacled avatar.
<<if $marketAssistantRelationship == "cute">>
@@ -1231,80 +1230,80 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
<</if>>
<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
- She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0].FSSupremacistRace <</if>> witch with thin, flowing robes and a wide brimmed, if rather stereotypical, witch's hat.
+ She's a odd little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0].FSSupremacistRace <</if>> girl with slightly off mannerisms,
<<if $assistantFSOptions>>
<<switch $assistantFSAppearance>>
<<case "paternalist">>
- She still hasn't managed to undo the spell; her chest is still unnatural smooth, not one nipple peaks the fabric of the robe.
+ wearing ill fitting clothing. Various movements can be seen under her misbuttoned shirt and lopsided skirt.
<<case "degradationist">>
- She still hasn't managed to undo the spell; her face, hands and every surface of her body are completely covered in tattoos. It is especially noticable when she talks that her tongue is tattoo'd too; wonder what decorates the surfaces of her body you can't see?
+ wearing nothing except some oversized, strange looking piercings all over her body. You swear you see movement under her skin and her piercings have a habit of never being in the same shape or location.
<<case "roman revivalist">>
- While she acts like a typical Roman woman, she is pretty obviously Greek. She can't even name the Pantheon correctly.
+ wearing a poorly folded toga. You swear you see movement under her skin.
<<case "egyptian revivalist">>
- She's managed to untangle herself from the wrappings, though she has choosen to leave several still wrapped around her body.
+ wearing nothing at all. She looks vaguely Egyptian, but wrong. You swear you see movement under her skin.
<<case "edo revivalist">>
- She's managed to correct the spell, somwhat, though she now resebles something that belongs in a hentai.
+ wearing a loose kimono. She looks vaguely Japanese, but wrong. You swear you see movement under her skin.
<<case "arabian revivalist">>
- She's managed to correct the spell, and even succeed at it. She has altered her appearance to resemble a gorgeous djinn. She is seductivly performing a belly dance for you.
+ wearing various silks. She looks vaguely Arabic, but wrong. You swear you see movement under her skin.
<<case "chinese revivalist">>
- She has chosen to embrace the outcome of her spell, even pushing her luck a little more, leaving her wearing a long and very fashionable qipao.
+ wearing an ill fitting qipao. She looks vaguely Chinese, but wrong. You swear you see movement under her clothing and even skin.
<<case "chattel religionist">>
- She has chosen to embrace the outcome of her spell, proudly displaying the various holy symbols hanging from around her neck and dangling from her nipples, navel and clit.
+ wearing nothing at all. A pulsing symbol of your religion sprouts from her chest, runs between her breasts and down to her crotch, were it penetrates her pussy. If the symbol weren't offputting enough, you also swear you see movement under her skin.
<<case "physical idealist">>
- She managed to regain freedom of movement, but has chosen to leave her torn robes unfixed to further highlight her ridiculous muscles.
+ wearing nothing at all. She is covered in what appear to be muscles, though they bulge and squirm uncomfortably.
<<case "repopulation focus">>
<<if $seeHyperPreg == 1>>
- She's managed to cast a levitation spell to allow her to move and a spell to prevent her from bursting, but she can do nothing about the dozens of active children crowding her womb. She meekly floats along with it, gently rubbing its squirming mass through her torn robe.
+ wearing nothing at all. Her belly is immensely swollen, squirming and practically ready to burst. Her navel resembes a pussy; a pussy birthing countless larva like creatures.
<<else>>
- She's managed to cast a spell to lighten her belly, but she can do nothing about the roudy octuplets crowding her womb. She meekly pats her exposed belly, feebly trying to calm her bablies, as she looks up ways to mend her torn dress.
+ wearing nothing at all. Her belly is rounded and squirming in some state of grvidity. Every so often her navel spreads apart and a wormlike creature flops out.
<</if>>
<<case "eugenics">>
- She still hasn't managed to undo the spell; it's pretty obvious given how desperatly horny she is.
+ wearing nothing at all. You can't take your eyes off of her perfect body, but at the same time, you feel a strange sense of danger about her.
<<case "gender radicalist">>
- She has chosen to embrace the outcome of her spell; she either sports bulge or a tent in the front of her dress and frquently can be seen reading books on male anatomy.
+ wearing nothing at all. Even though she lacks a penis, you can't shake the feeling that is's not a trap.
<<case "gender fundamentalist">>
- She still hasn't managed to undo the spell; her belly has become so swollen with ovum she looks ready to birth triplets. She can barely concentrate; her mind focused entirely on dicks cumming in her wet pussy, but she can't risk it, knowing full well she'd become so pregnant she'd likely burst. Her ample breasts and child bearing hips only make it harder to keep away from cocks.
+ full breasts, wide hips and wearing absolutely nothing. You swear her tits are moving slightly and an unsual bulge can be seen writhing in her lower belly.
<<case "asset expansionist">>
- She's managed to partially undo the spell; her breasts are merely as big as she is now. One simple, correctly performed, levitation spell later and she is fully capable of functioning with her oversized tits.
+ wearing nothing at all; not that anything could fit her. She is absolutely massive, her breasts easily dwarf the rest of her body and are quivering obscenely. Every so often, a bulge moves up a nipple as a wormlike creature is born into the world.
<<case "transformation fetishist">>
- While she has managed to regain her flexibility, she still greatly resembles an overinflated blow-up doll. Her lips are stuck in an O shape, her breasts are the size of beachballs, her ass and thighs larger than any girl's you've seen, and above all else is her huge medecine ball sized belly; fortunatly they don't weigh nearly as much as the should, part of the benefits of being an inflatable sex-doll.
+ wearing nothing at all; not that anything could fit her. Her breasts and ass are splitting around the massive, round objects distending them. The orbs are slightly translucent; lots of small wormlike creatures can be seen squirming within inside.
<<case "pastoralist">>
- She's managed to shrink her nine breasts somwhat; they are mearly head sized now. The front of her robes are strained from her excessive number of milky tits.
+ wearing nothing at all; not that anything could fit her. She is absolutely massive, her breast easily dwarf the rest of her body and are quivering obscenely. An extremely dense, white liquid is steadily forcing its way from her gaping nipples.
<<case "maturity preferentialist">>
- She's managed to rein in her aging spell and with a little size up to her breasts, hips and ass makes a very pleasant milf.
+ wearing nothing at all. She seems to be quite old and vulnerable, but something feels off about her.
<<case "youth preferentialist">>
+ wearing nothing at all.
<<if $minimumSlaveAge == 3>>
- She's adjusted her tiny body slightly to be less feeble. Now she is a fully capable and adorable toddler witch in an oversized robe, though she has to fight to keep her hat from covering her entire head.
+ She's an adorable toddler just ripe for the taking; though a feeling of danger radiates from her tiny body.
<<elseif $minimumSlaveAge <= 7>>
- She's decided to embrace her spell and now appears as an adorable loli witch. She has to watch her step to not trip over her trailing robe and has to constantly readjust her head devouring hat.
+ She's a cute loli and ripe for the taking; though a feeling of danger radiates from her small body.
<<elseif $minimumSlaveAge <= 13>>
- She's decided to embrace her spell and now appears as a cute teenage witch. Her robe is a little long, but she manages just fine.
+ She's a pretty teenager and ripe for the taking; though a feeling of danger radiates from her.
<<else>>
- She's decided to embrace her spell and now appears as a witch fresh into adulthood.
+ She seems to be fresh into adulthood and ripe for the taking; though a feeling of danger radiates from her.
<</if>>
- She has recently updated her appearance to be more youthful. She frequently flutters by, enojoying her youthful vigor. She looks so innocent, but looks can be deceiving!
<<case "slimness enthusiast">>
- She's begun wearing a corest under her robes to hide her chubbiness. Combined with her lightened body, she manages to pull off the lithe look easily.
+ wearing nothing at all. She is extremely thin; multiple tubelike appendages can be seen writhing within her compressed body.
<<case "body purist">>
- She has attempted to fix her misspell and succeeded in preventing her clothes from becoming transparent, to herself only. She appears nude, even though she is fully clothed, much to everyone's enjoyment.
+ wearing nothing at all. Her body is absolutely flawless, too flawless; you can't help but feel a sense of discomfort when looking at her.
<<default>>
- She frequently carries a tome of new and erotic spells.
+ wearing absolutely nothing. She periodically twitches when you aren't looking and you swear you see movement under her skin.
<</switch>>
<<else>>
- She frequently carries a tome of new and erotic spells.
+ wearing absolutely nothing. She periodically twitches when you aren't looking and you swear you see movement under her skin.
<</if>>
<<if ($cockFeeder == 1) && ($seed == 1)>>
- She is steadily conjuring cake slices out of thin air and sending them down a representation of one of your slave's throat as her belly swells. The slave must be down in the kitchen, getting a meal out of the food dispensers. The witch notices you watching, creates a whole cake, and send it on its way causing the slave's gut to double in size.
+ She is steadily thrusting several tentacles extending from her crotch down and down the throat of a recognizable little representation of one of your slaves. The slave must be down in the kitchen, getting a meal out of the food dispensers. She notices you watching and moans as multiple bulges work their way down her shafts and into the slave. Your eyes are drawn to the hapless girl's rapidly swelling stomach as the creatures seed takes root.
<<elseif ($suppository == 1) && ($seed == 2)>>
- A recognizable little representation of one of your slaves is before her, writhing in pleasure, as a summoned tentacle explores her anus. The slave must be receiving her drugs from one of the dildo dispensers. The witch notices you watching and pats her own squirming belly, causing the tentacle to seek shelter deeper in the slave.
+ A recognizable little representation of one of your slaves is before her, writhing in pleasure and pain, as multiple tentacles fuck her ass. The slave must be receiving her drugs from one of the dildo dispensers. She notices you watching and moans as multiple bulges work their way down her shafts and into the slave. Your eyes are drawn to the hapless girl's rapidly swelling stomach as the creatures seed takes root.
<<elseif ($masturbationAllowed == 1) && ($seed == 3)>>
- A recognizable little representation of one of your slaves is squatting atop a magic circle before her, a dildo pistoning in and out of her. The slave must be using one of the penthouse's many sex toys. Noticing you watching, the witch snaps her fingers causing the toy to blow a load deep inside the slave. A load moan echos down the halls of your penthouse, someone must be having a good time.
+ A recognizable little representation of one of your slaves is laying on her backr, writhing in pleasure and pain, as multiple tentacles fuck her. The slave must be using one of the penthouse's many sex toys. She notices you watching and moans as multiple bulges work their way down her shafts and into the slave. Your eyes are drawn to the hapless girl's rapidly swelling stomach as the creatures seed takes root. A loud moan echos through the penthouse; it seems the slave got a little surprise herself.
<<elseif ($seed == 4)>>
- A recognizable little representation of one of your slaves is lying before her as she runs her wand over her body. The slave must be getting a checkup. She notices your gaze and taps the wand to the slave's breasts, causing them to jump a cup size.
+ A recognizable little representation of one of your slaves is partially merged with her body. The slave must be getting a checkup. She notices your gaze and forces her way more into the slave, causing the breast, butt and thighs on her side of the body to swell disproportionately.
<<elseif ($seed == 5) && ($invasionVictory > 0)>>
- She's riding a broom alongside a representation of one of your security drones as it carries out its patrol route through your arcolgy. When she sees you looking at her, she giggles and says, "I like this one. He did very well during the invasion."
+ She's partially enveloped a representation of one of your security drones. When she sees you looking at her, she bluntly states, "This one did good. Captured many for your nest."
<<elseif ($seed == 6) && ($studio == 1)>>
- A hovering camera is aimed at a recognizable little representation of one of your slaves masturbate. The slave must be using one of the penthouse's many vibrators, and $assistantName is likely invisible holding the camera, turning the feed of it into a PoV porno.
+ She is holding dozens of cameras at a recognizable little representation of one of your slaves masturbating. The slave must be using one of the penthouse's many vibrators, and $assistantName is likely turning the feed of it into a porno.
<<elseif ($seed == 7) && ($marketAssistantAnnounced == 1)>>
She's accompanied by your market assistant's chubby, bespectacled avatar.
<<if $marketAssistantRelationship == "cute">>
@@ -1317,7 +1316,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
They've pulled open each others robes and are gently tribbing. Upon noticing you, $assistantName casts a spell to triple the market assistant's sensitivity and braces for the impending orgasm. She cums so hard she passses out; $assistantName gently pulls her into a close embrace until she recovers.
<</if>>
<<else>>
- She's idly turning the pages of her spellbook. When she notices you watching, she flips the book around to show you a new and kinky trick she wants to try out.
+ She's idly standing there, at least when you look at her; you catch strange things in the corner of your vision while you are working.
<</if>>
<<default>>
diff --git a/src/uncategorized/pit.tw b/src/uncategorized/pit.tw
index 529d193a840c99653f8cc0a56d2ee6da799b8031..a5ea1781756939d5466898771826b0265026acbe 100644
--- a/src/uncategorized/pit.tw
+++ b/src/uncategorized/pit.tw
@@ -19,7 +19,7 @@ $pitNameCaps is clean and ready,
<<set $pit = 0>>
<<for _i = 0; _i < $sectors.length; _i++>>
<<if $sectors[_i].type == "Pit">>
- <<set $sectors[_i].type == "Pit">><<break>>
+ <<set $sectors[_i].type = "Pit">><<break>>
<</if>>
<</for>>
<<goto "Main">>
diff --git a/src/uncategorized/publicServantWorkaround.tw b/src/uncategorized/publicServantWorkaround.tw
index 56dd2a285eec93247d29aebf7cba86cb3294d2eb..7742aa735e90130b14ed87fd47e18ad5bbe51a86 100644
--- a/src/uncategorized/publicServantWorkaround.tw
+++ b/src/uncategorized/publicServantWorkaround.tw
@@ -1,4 +1,6 @@
:: Public Servant Workaround [silently]
-<<set $slaves[$i].assignment = "serve the public", $slaves[$i].choosesOwnAssignment = 0>>
+<<assignJob $slaves[$i] "serve the public">>
+
<<goto "Main">>
+
diff --git a/src/uncategorized/reBusyArcadeWorkaround.tw b/src/uncategorized/reBusyArcadeWorkaround.tw
index 2d748b33054f19e341ac6f6c8415fa97adaf2213..d8f513f9d037eb2d1c1a1451cdceea59d915d57f 100644
--- a/src/uncategorized/reBusyArcadeWorkaround.tw
+++ b/src/uncategorized/reBusyArcadeWorkaround.tw
@@ -1,25 +1,17 @@
:: RE busy arcade workaround
-<<nobr>>
+<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "RIE Eligibility Check">>
-<<set $nextButton = "Continue">>
-<<set $nextLink = "AS Dump">>
-<<set $returnTo = "RIE Eligibility Check">>
-
-<</nobr>>\
-\
Slaves in your arcade are not immured in the facility permanently, since holding them in one position at all times would negatively impact their health. They are released to exercise, eat, bathe, and sleep, though for nothing else. You occasionally inspect them when they do so, to see that their harsh lives are not inappropriately difficult for them. One day when you are doing so, <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span> flings herself on the ground in front of you the instant she sees you.
Facing the ground, <<if canTalk($activeSlave) == false>>she gestures with shaking hands that she cannot take any more. She begs you abjectly to let her out of the arcade and promises to be a perfect sex slave if you do.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>she lisps through tears, "M-mathter, pleathe. I can't take any more of thith. Pleathe let me out. I'll do anything, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>. I'll love you forever, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>> - jutht don't make me go back inthide that wall."<<else>>she sobs, "M-master, please. I can't take any more of this. Please let me out. I'll do anything, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>. I'll love you forever, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>> - just don't make me go back inside that wall."<</if>>
-\
+
<span id="result">
<<link "Accept her pledge">>
<<replace "#result">>
When you accept, $activeSlave.slaveName looks up at you in incomprehension, expecting you to correct yourself or reveal that this is a cruel trick. When you do neither, she scrabbles spastically to your feet, kisses them as she cries, and then clings to your knees, sobbing. She is so relieved by this reprieve that she is now on the cusp of @@.hotpink;devotion to you,@@ and will obey out of near-paralytic fear of being sent back to the arcade.
<<set $activeSlave.devotion = 45>>
- <<set $activeSlave.assignment = "rest">>
- <<set $activeSlave.assignmentVisible = 1>>
-<<set $activeSlave.choosesOwnAssignment = 0>>
+ <<removeJob $activeSlave "be confined in the arcade">>
<</replace>>
<</link>>
<<link "Refuse">>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index ec6ca4fa73fb4c5c7815db784e2be0050421cc26..9e92f9d3c4a1ba3342c72ff02dbf637d008435b9 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -357,7 +357,7 @@
<<if $dairy > 0>>
<<if $dairyRestraintsSetting > 1>>
<br><<link "Enslave her and send her straight to the industrial dairy">>
- <<set $activeSlave.assignment = "work in the dairy">>
+ <<assignJob $activeSlave "work in the dairy">>
<<AddSlave $activeSlave>>
<<set $cash -= $contractCost>>
<<replace "#result">>
@@ -383,7 +383,7 @@
<</replace>>
<</link>>
<</if>>
- <</if>>
+ <</if>> /* closes dairy */
<<if $seeExtreme > 0>>
<br><<link "Punitively amputate her limbs, and then enslave her">>
<<set $activeSlave.health -= 20>>
@@ -430,7 +430,7 @@
<</replace>>
<</link>>
<</if>>
- <</if>>
+ <</if>> /* closes seeExtreme */
<<if $malefactor is "orphanloli">>
<br><<link "'adopt' her">>
<<set $activeSlave.devotion = 25>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 98c01e4d32b3c1468e9598b8b54f8bed5e5659c6..0453009a456a39ac9b077c5292fd98d3e1376538 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -1544,6 +1544,8 @@ Your desk flags a video message as having potential. It's a desperate refugee fr
<<include "Long Slave Description">>
<<set $saleDescription = 0>>
+<br><br>
+
<span id="result">
<<if $cash >= $contractCost>>
<<link "Enslave her">>
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index 498c653ef95988c0f89ecc9731f2cf9b818211f6..94ae91ebcb5cd60c91b9315186d751cd26cf5a84 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -102,7 +102,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
<</link>> //This will cost ¤$contractCost//
<<if ($dairy > 0) && ($dairyRestraintsSetting > 1) && ($subSlave.assignment == "work in the dairy")>>\
<<link "The slave is attached to a milking machine, and so will be the inspector">>
- <<set $activeSlave.assignment = "work in the dairy">>
+ <<assignJob $activeSlave "work in the dairy">>
<<set $activeSlave.clothes = "no clothing">>
<<AddSlave $activeSlave>>
<<set $cash -= $contractCost/2>>
diff --git a/src/uncategorized/recruiterWorkaround.tw b/src/uncategorized/recruiterWorkaround.tw
index e397ce99b3fcfc7811325d084740353fe6b8a724..f26c60e38c9369626e554924d2ff02b0d3596360 100644
--- a/src/uncategorized/recruiterWorkaround.tw
+++ b/src/uncategorized/recruiterWorkaround.tw
@@ -3,16 +3,19 @@
<<if $Recruiter != 0>>
<<set _ID = $Recruiter.ID, _SL = $slaves.length>>
<<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>><<break>><</if>>
+ <<if (_ID == $slaves[_i].ID)>>
+ <<removeJob $slaves[_i] "recruit girls">>
+ <<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>>
+ <<assignJob $slaves[$i] "recruit girls">>
+ <<set $slaves[$i].livingRules = "luxurious">>
<<set $Recruiter = $slaves[$i]>>
<<else>>
<<set $Recruiter = 0>>
<</if>>
<<goto "Main">>
+
diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw
index a96ac5d0c02048e255f00e9eb253a736b9a7d588..83c4200d3cc0561193e37f91e3585effe7a6ade0 100644
--- a/src/uncategorized/resFailure.tw
+++ b/src/uncategorized/resFailure.tw
@@ -21,7 +21,7 @@
<</if>>
<<set $rep -= 200>>
-<<set $AProsperity -= 2>>
+<<set $AProsperityCap -= 2>>
<<set $slavesToAdd = 5>>
<<if $RESFailure == "TSS">>
<<set $TSS.schoolPresent = 0>>
diff --git a/src/uncategorized/retrieve.tw b/src/uncategorized/retrieve.tw
index 029e8b1ce5b3af106c580b8ee926e66e96e1fb2b..0c60b3c0ef847c5ba7c34b6299609885ed052458 100644
--- a/src/uncategorized/retrieve.tw
+++ b/src/uncategorized/retrieve.tw
@@ -1,41 +1,12 @@
:: Retrieve [silently]
-<<set $activeSlave = $slaves[$i], _ID = $activeSlave.ID, _SL = $slaves.length>>
-
-<<removeJob $activeSlave $returnTo>>
-
<<switch $returnTo>>
<<case "Pit">>
- <<for _i = 0; _i < $fighterIDs.length; _i++>>
- <<if _ID == $fighterIDs[_i]>>
- <<set _dump = $fighterIDs.pluck([_i], [_i]), _i-->>
- <</if>>
- <</for>>
+ <<set $fighterIDs.delete($slaves[$i].ID)>>
<<case "Coursing Association">>
<<set $Lurcher = 0>>
-<<case "Arcade">>
- <<set $activeSlave.assignment = "work a glory hole">>
-<<case "Master Suite">>
- <<set $activeSlave.assignment = "please you">>
-<<case "Cellblock">>
- <<set $activeSlave.assignment = "stay confined">>
-<<case "Schoolroom">>
- <<set $activeSlave.assignment = "take classes">>
-<<case "Servants' Quarters">>
- <<set $activeSlave.assignment = "be a servant">>
-<<case "Dairy">>
- <<set $activeSlave.assignment = "get milked">>
- <<if $dairyRestraintsSetting > 1>>
- <<set $activeSlave.buttplug = "none", $activeSlave.clothes = "no clothing", $activeSlave.collar = "none", $activeSlave.vaginalAccessory = "none">>
- <</if>>
-<<case "Brothel">>
- <<set $activeSlave.assignment = "whore">>
-<<case "Club">>
- <<set $activeSlave.assignment = "serve the public">>
+<<default>>
+ <<removeJob $slaves[$i] $slaves[$i].assignment>>
<</switch>>
-<<if ($returnTo != "Pit") && ($returnTo != "Coursing Association")>>
- <<set $slaves[$i] = $activeSlave>>
-<</if>>
-
<<goto $returnTo>>
diff --git a/src/uncategorized/schoolteacherWorkaround.tw b/src/uncategorized/schoolteacherWorkaround.tw
index d06ba457ab2f10044873b1bd3852fc7bd6ec563e..d9085cc848ff75893b5b0170c491ac7bf33967f0 100644
--- a/src/uncategorized/schoolteacherWorkaround.tw
+++ b/src/uncategorized/schoolteacherWorkaround.tw
@@ -3,34 +3,19 @@
<<if $Schoolteacher != 0>>
<<set _ID = $Schoolteacher.ID, _SL = $slaves.length>>
<<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>><<break>><</if>>
+ <<if (_ID == $slaves[_i].ID)>>
+ <<removeJob $slaves[_i] "be the Schoolteacher">>
+ <<break>>
+ <</if>>
<</for>>
- <<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">>
- <<set $personalAttention = "upkeep">>
- <<else>>
- <<set $personalAttention = "business">>
- <</if>>
- <</if>>
- <<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>>
+ <<assignJob $slaves[$i] "be the Schoolteacher">>
+ <<set $slaves[$i].livingRules = "luxurious">>
<<set $Schoolteacher = $slaves[$i]>>
<<else>>
<<set $Schoolteacher = 0>>
<</if>>
<<goto "Schoolroom">>
+
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index d3c4d685c2e1952e72aca387b38f7e9230ea5e49..9edd01256ebabbf21d63a25953144be8b9e38d61 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -77,7 +77,7 @@
<<set $HGCum = 2+Math.trunc(($HeadGirl.balls/5)+($HeadGirl.energy/95)+($HeadGirl.health/95)+($HeadGirl.devotion/95))>>
<</if>>
<<else>>
- <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>>
+ <<removeJob $slaves[_i] "be your Head Girl">>
<</if>>
<<case "live with your Head Girl">>
<<if random(-30,20) <= $slaves[_i].devotion>>
@@ -104,7 +104,7 @@
<<set $Recruiter = 0>>
<</if>>
<<if $Recruiter == 0>>
- <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>>
+ <<removeJob $slaves[_i] "recruit girls">>
<</if>>
<<case "be the Madam">>
<<set $Madam = $slaves[_i]>>
@@ -125,7 +125,7 @@
<<set $Madam = 0>>
<</if>>
<<if $Madam == 0>>
- <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>>
+ <<removeJob $slaves[_i] "be the Madam">>
<</if>>
<<case "be the DJ">>
<<set $DJ = $slaves[_i]>>
@@ -143,7 +143,7 @@
<<set $DJ = 0>>
<</if>>
<<if $DJ == 0>>
- <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>>
+ <<removeJob $slaves[_i] "be the DJ">>
<</if>>
<<case "be the Milkmaid">>
<<set $Milkmaid = $slaves[_i]>>
@@ -161,7 +161,7 @@
<<set $Milkmaid = 0>>
<</if>>
<<if $Milkmaid == 0>>
- <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>>
+ <<removeJob $slaves[_i] "be the Milkmaid">>
<</if>>
<<case "be the Stewardess">>
<<set $Stewardess = $slaves[_i]>>
@@ -182,7 +182,7 @@
<<set $Stewardess = 0>>
<</if>>
<<if $Stewardess == 0>>
- <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>>
+ <<removeJob $slaves[_i] "be the Stewardess">>
<</if>>
<<case "be the Schoolteacher">>
<<set $Schoolteacher = $slaves[_i]>>
@@ -200,7 +200,7 @@
<<set $Schoolteacher = 0>>
<</if>>
<<if $Schoolteacher == 0>>
- <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>>
+ <<removeJob $slaves[_i] "be the Schoolteacher">>
<</if>>
<<case "be the Wardeness">>
<<set $Wardeness = $slaves[_i]>>
@@ -215,7 +215,7 @@
<<set $Wardeness = 0>>
<</if>>
<<if $Wardeness == 0>>
- <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>>
+ <<removeJob $slaves[_i] "be the Wardeness">>
<</if>>
<<case "be the Attendant">>
<<set $Attendant = $slaves[_i]>>
@@ -230,7 +230,7 @@
<<set $Attendant = 0>>
<</if>>
<<if $Attendant == 0>>
- <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>>
+ <<removeJob $slaves[_i] "be the Attendant">>
<</if>>
<<case "be the Nurse">>
<<set $Nurse = $slaves[_i]>>
@@ -248,7 +248,7 @@
<<set $Nurse = 0>>
<</if>>
<<if $Nurse == 0>>
- <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>>
+ <<removeJob $slaves[_i] "be the Nurse">>
<</if>>
<<case "guard you">>
<<set $Bodyguard = $slaves[_i]>>
@@ -263,7 +263,7 @@
<<set $Bodyguard = 0>>
<</if>>
<<if $Bodyguard == 0>>
- <<set $slaves[_i].assignment = "rest", $slaves[_i].assignmentVisible = 1>>
+ <<removeJob $slaves[_i] "guard you">>
<</if>>
<<case "be your Concubine">>
<<set $Concubine = $slaves[_i], $fuckSlaves++>>
@@ -287,12 +287,7 @@
<<if $fighterIDs.includes($slaves[_i])>>
<<if canWalk($slaves[_i]) != true>>
''__@@.pink;$slaves[_i].slaveName@@__'' is no longer independently mobile @@.yellow;and cannot fight any more.@@ She has been removed from $pitName roster<br>.
- <<for _k = 0; _k < $fighterIDs.length; _k++>>
- <<if $slaves[_i].ID == $fighterIDs[_k]>>
- <<set _dump = $fighterIDs.deleteAt(_k)>>
- <<set _k-->>
- <</if>>
- <</for>>
+ <<set $fighterIDs.delete($slaves[_i].ID)>>
<</if>>
<</if>>
@@ -398,15 +393,15 @@
<<if $slavesVisible > 0>>
<br>__''Penthouse Report''__<br>
-<<for $i = 0; $i < $slaves.length; $i++>>
+<<for $i = 0; $i < _SL; $i++>>
<<if $slaves[$i].assignmentVisible == 1>>
<br>
<<include "Full Report">>
<<if ($slaves[$i].assignment == "be your Head Girl") && ($HGSuiteSlaves > 0)>>
<<set _iTemp = $i, $i = $HGSuiteiIDs[0].Index, _ID = $HGSuiteiIDs[0].ID>>
- <<if _ID != $slaves[$i].ID>>
+ <<if $i >= _SL || _ID != $slaves[$i].ID>>
/% Slaves.ID and $HGSuiteiIDs.ID's don't match-up so let's find her %/
- <<for $i = 0; $i < $slaves.length; $i++>>
+ <<for $i = 0; $i < _SL; $i++>>
<<if _ID == $slaves[$i].ID>>
/% Correct the Index %/
<<set $HGSuiteiIDs[0].Index = $i>>
@@ -414,6 +409,10 @@
<</if>>
<</for>>
<</if>>
+ <<if $i < _SL && $slaves[$i].assignment != "live with your head girl">>
+ <br>@@.red;$slaves[$i].slaveName had been assigned to live with your Head Girl, but this week she was assigned to $slaves[$i].assignment. She has been released to your penthouse for reassignment.@@
+ <<removeJob $slaves[$i] "live with your head girl">>
+ <</if>>
/% Onward bound as normal %/
<<set $HGRelease = 1>>
<br><br><<include "SA live with HG">>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 89a3b931ce071ad3a6ff87de2d865295313cdf62..83b89fa499d1f87b26fe65ba61233857ac675a0b 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -30,12 +30,6 @@
<<set $returnTo = "Clinic">>
<</switch>>
<</if>>
-<<if $activeSlave.amp == 1>>
- <<switch $activeSlave.assignment>>
- <<case "be the Madam" "be the DJ" "be the Milkmaid" "be the Attendant" "be the Schoolteacher" "be the Stewardess" "be the Wardeness" "be the Nurse">>
- <<set $activeSlave.assignment = "rest">>
- <</switch>>
-<</if>>
<<set $encyclopedia = either("Drugs and Their Effects", "From Rebellious to Devoted", "Costs Summary", "Disease in the Free Cities", "Slave Couture", "Nymphomania", "Gender", "Independent Slaves", "Modern Anal")>>
<<if $activeSlave.dick > 0>><<set $showEncyclopedia = 1, $encyclopedia = "Gender">><</if>>
@@ -339,7 +333,7 @@ __Rules Assistant__
<</silently>>
<<goto "Slave Interact">>
<</link>>//
-
+
<<if $activeSlave.useRulesAssistant != 0>>
''Subject'' to the rules assistant. [[Exempt her|Slave Interact][$activeSlave.useRulesAssistant = 0]]
<<else>>
@@ -495,7 +489,7 @@ __Assignment__: <strong><span id="assign">$activeSlave.assignment<<if $activeSla
<<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)>>
+ <<if $servantsQuarters > $servantsQuartersSlaves && canWalk($activeSlave) && canSee($activeSlave) && ($activeSlave.devotion >= -20 || ($activeSlave.devotion >= -50 && $activeSlave.trust <= 20) || $activeSlave.trust < -20)>>
[[Servants' Quarters|Assign][$slaves[_i] = $activeSlave, $returnTo = "Servants' Quarters", $i = _i]]
<<else>>Servants' Quarters<</if>>
<</if>>
@@ -505,7 +499,7 @@ __Assignment__: <strong><span id="assign">$activeSlave.assignment<<if $activeSla
<<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")>>
+ <<if $spa > $spaSlaves && ($activeSlave.devotion >= -20 || $activeSlave.fetish == "mindbroken") && ($activeSlave.health < 20 || $activeSlave.trust < 60 || $activeSlave.devotion <= 60 || $activeSlave.fetish == "mindbroken" || $activeSlave.sexualFlaw !== "none" || $activeSlave.behavioralFlaw !== "none")>>
[[Spa|Assign][$slaves[_i] = $activeSlave, $returnTo = "Spa", $i = _i]]
<<else>>Spa<</if>>
<</if>>
@@ -526,7 +520,7 @@ __Assignment__: <strong><span id="assign">$activeSlave.assignment<<if $activeSla
<</if>>
<</if>>
<<if $arcade != 0>>|
-<<if $arcade > $arcadeSlaves && $activeSlave.breedingMark != 1 && ($activeSlave.indentureRestrictions <= 0)>>
+<<if $arcade > $arcadeSlaves && ($activeSlave.indentureRestrictions <= 0) && $activeSlave.breedingMark != 1>>
[[Arcade|Assign][$slaves[_i] = $activeSlave, $returnTo = "Arcade", $i = _i]]
<<else>>Arcade<</if>>
<</if>>
@@ -691,35 +685,19 @@ __Drugs__: <span id="drugs"><strong>$activeSlave.drugs</strong></span>.
<br>
__Health__: <span id="curatives"><strong><<if $activeSlave.curatives > 1>>curatives<<elseif $activeSlave.curatives > 0>>preventatives<<else>>none<</if>></strong></span>.
-<<if $activeSlave.curatives != 0>>
<<link "None">><<set $activeSlave.curatives = 0>><<replace "#curatives">><strong>none</strong><</replace>><</link>>
-<<else>>None<</if>>
-|
-<<if $activeSlave.curatives != 1>>
- <<link "Preventatives">><<set $activeSlave.curatives = 1>><<replace "#curatives">><strong>preventatives</strong><</replace>><</link>>
-<<else>>Preventatives<</if>>
-|
-<<if $activeSlave.curatives != 2>>
- <<link "Curatives">><<set $activeSlave.curatives = 2>><<replace "#curatives">><strong>curatives</strong><</replace>><</link>>
-<<else>>Curatives<</if>>
+ | <<link "Preventatives">><<set $activeSlave.curatives = 1>><<replace "#curatives">><strong>preventatives</strong><</replace>><</link>>
+ | <<link "Curatives">><<set $activeSlave.curatives = 2>><<replace "#curatives">><strong>curatives</strong><</replace>><</link>>
__Aphrodisiacs__: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1>>extreme<<elseif $activeSlave.aphrodisiacs > 0>>applied<<else>>none<</if>></strong></span>.
-<<if $activeSlave.aphrodisiacs != 0>>
<<link "None">><<set $activeSlave.aphrodisiacs = 0>><<replace "#aphrodisiacs">><strong>none</strong><</replace>><</link>>
-<<else>>None<</if>>
-|
-<<if $activeSlave.aphrodisiacs != 1>>
- <<link "Apply">><<set $activeSlave.aphrodisiacs = 1>><<replace "#aphrodisiacs">><strong>applied</strong><</replace>><</link>>
-<<else>>Apply<</if>>
-|
-<<if $activeSlave.aphrodisiacs != 2>>
- <<link "Extreme">><<set $activeSlave.aphrodisiacs = 2>><<replace "#aphrodisiacs">><strong>extreme</strong><</replace>><</link>>
-<<else>>Extreme<</if>>
+ | <<link "Apply">><<set $activeSlave.aphrodisiacs = 1>><<replace "#aphrodisiacs">><strong>applied</strong><</replace>><</link>>
+ | <<link "Extreme">><<set $activeSlave.aphrodisiacs = 2>><<replace "#aphrodisiacs">><strong>extreme</strong><</replace>><</link>>
-<</if>>
+<</if>> /* closes drugs (assignmentVisible == 0) */
-<span id="fertilityblock">
<br>
+<span id="fertilityblock">
<<if $activeSlave.fuckdoll == 0 && ($activeSlave.ovaries == 1 || $activeSlave.mpreg == 1)>>
<<if ($activeSlave.preg < -1)>>
//She is sterile//
@@ -850,7 +828,7 @@ __Required Bloating__: <strong><span id="inflate"><<if $activeSlave.inflation is
<</if>>
</span>
-<br> __Hormones__: <strong><span id="hormones">
+__Hormones__: <strong><span id="hormones">
<<if $activeSlave.hormones == -2>>intensive male<<elseif $activeSlave.hormones == -1>>male<<elseif $activeSlave.hormones == 2>>intensive female<<elseif $activeSlave.hormones == 1>>female<<else>>none<</if>></span></strong>.
<<link "Intensive Female">><<set $activeSlave.hormones = 2>><<replace "#hormones">>intensive female<</replace>><</link>> |
<<link "Female">><<set $activeSlave.hormones = 1>><<replace "#hormones">>female<</replace>><</link>> |
@@ -866,7 +844,7 @@ __Required Bloating__: <strong><span id="inflate"><<if $activeSlave.inflation is
<<if ($activeSlave.weight >= -95)>>
| <<link "Lose weight">><<set $activeSlave.diet = "restricted">><<replace "#diet">>$activeSlave.diet<</replace>><</link>>
<<else>>
-| //She is already thin//
+| //She is already underweight//
<</if>>
<<if $activeSlave.weight <= 95>>
| <<link "Fatten">><<set $activeSlave.diet = "fattening">><<replace "#diet">>$activeSlave.diet<</replace>><</link>>
@@ -876,20 +854,16 @@ __Required Bloating__: <strong><span id="inflate"><<if $activeSlave.inflation is
<<if $feeder == 1>>
| <<link "Estrogen enriched">><<set $activeSlave.diet = "XX">><<replace "#diet">>$activeSlave.diet<</replace>><</link>>
| <<link "Testosterone enriched">><<set $activeSlave.diet = "XY">><<replace "#diet">>$activeSlave.diet<</replace>><</link>>
-<<if $dietXXY == 1>>
-<<if $activeSlave.ovaries == 1 || $activeSlave.mpreg == 1>>
-<<if $activeSlave.balls > 0>>
+<<if $dietXXY == 1 && $activeSlave.balls > 0 && ($activeSlave.ovaries == 1 || $activeSlave.mpreg == 1)>>
| <<link "Herm hormone blend">><<set $activeSlave.diet = "XXY">><<replace "#diet">>$activeSlave.diet<</replace>><</link>>
<</if>>
<</if>>
-<</if>>
-<</if>>
<<if ($activeSlave.muscles <= 95) && canWalk($activeSlave)>>
| <<link "Build muscle">><<set $activeSlave.diet = "muscle building">><<replace "#diet">>$activeSlave.diet<</replace>><</link>>
<<elseif $activeSlave.muscles > 95>>
| //She is maintaining her enormous musculature//
<<else>>
-| //She can't move and thus can't excercise//
+| //She can't move and thus can't exercise//
<</if>>
<<if $activeSlave.muscles > 5>>
| <<link "Slim down">><<set $activeSlave.diet = "slimming">><<replace "#diet">>$activeSlave.diet<</replace>><</link>>
@@ -989,12 +963,12 @@ __Required Bloating__: <strong><span id="inflate"><<if $activeSlave.inflation is
<</if>>
<<if $activeSlave.clitPiercing == 3>>
-<br>
+<br>
<<if $activeSlave.dick < 1>>Her smart clit piercing is set to
<<else>>Her smart frenulum piercing is set to
<</if>>
<strong><span id="setting">$activeSlave.clitSetting</span></strong>.
-<br> <<link "Vanilla">><<set $activeSlave.clitSetting = "vanilla">><<replace "#setting">>$activeSlave.clitSetting<</replace>><</link>>
+ <<link "Vanilla">><<set $activeSlave.clitSetting = "vanilla">><<replace "#setting">>$activeSlave.clitSetting<</replace>><</link>>
| <<link "Oral">><<set $activeSlave.clitSetting = "oral">><<replace "#setting">>$activeSlave.clitSetting<</replace>><</link>>
| <<link "Anal">><<set $activeSlave.clitSetting = "anal">><<replace "#setting">>$activeSlave.clitSetting<</replace>><</link>>
| <<link "Boobs">><<set $activeSlave.clitSetting = "boobs">><<replace "#setting">>$activeSlave.clitSetting<</replace>><</link>>
@@ -1159,7 +1133,7 @@ __Required Bloating__: <strong><span id="inflate"><<if $activeSlave.inflation is
<</if>>
<</if>>
<<if $activeSlave.vagina > -1>>
-<br> <<if $activeSlave.dick == 0>>__Accessory__<<else>>__Vaginal accessory__<</if>>: ''<span id="vaginalAccessory">$activeSlave.vaginalAccessory</span>.''
+<br><<if $activeSlave.dick == 0>>__Accessory__<<else>>__Vaginal accessory__<</if>>: ''<span id="vaginalAccessory">$activeSlave.vaginalAccessory</span>.''
<<link "None">><<set $activeSlave.vaginalAccessory = "none">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
| <<link "Dildo">><<set $activeSlave.vaginalAccessory = "dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>>
<<if $toysBoughtDildos == 1>>
@@ -1181,7 +1155,7 @@ __Required Bloating__: <strong><span id="inflate"><<if $activeSlave.inflation is
<</if>>
| <<link "Chastity belt">><<set $activeSlave.vaginalAccessory = "chastity belt",$activeSlave.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
| <<link "Anal chastity belt">><<set $activeSlave.vaginalAccessory = "anal chastity",$activeSlave.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
-| <<link "Combined chastity belt">><<set $activeSlave.vaginalAccessory = "combined chastity",$activeSlave.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>>g<</link>>
+| <<link "Combined chastity belt">><<set $activeSlave.vaginalAccessory = "combined chastity",$activeSlave.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
<</if>>
<<if $activeSlave.dick > 0>>
<<if $activeSlave.vagina == -1>>__Accessory__<<else>>__Dick accessory__<</if>>: ''<span id="dickAccessory">$activeSlave.dickAccessory</span>.''
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 18c5b4816fc2ae8332789ee0cb940f5de6f6782b..3755c0d2dd5cf320fc9dae1362d45f6819af3c2c 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -24,25 +24,29 @@
<<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) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Agent Workaround][$i = "+_i+"]]">>
+ <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|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) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Bodyguard Workaround][$i = "+_i+"]]">>
+ <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|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) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Recruiter Workaround][$i = "+_i+"]]">>
+ <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|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) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|HG Workaround][$i = "+_i+"]]">>
+ <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|HG Workaround][$i = "+_i+"]]">>
<<else>>
<<continue>>
<</if>>
@@ -50,7 +54,8 @@
<<if _Slave.fuckdoll > 0>><<continue>><</if>>
<<if $Flag == 0>>
<<if (_Slave.assignmentVisible == 1) && (_Slave.assignment != "be your Head Girl") && (_Slave.indentureRestrictions <= 0) && _Slave.breedingMark != 1>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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>>
<<continue>>
<</if>>
@@ -58,12 +63,14 @@
<<if _Slave.assignment != "live with your Head Girl">>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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+"]]]">>
<</if>>
<</if>>
<<case "Subordinate Targeting">>
<<if (_Slave.devotion >= -20) && (_Slave.fuckdoll == 0) && ($activeSlave.ID != _Slave.ID)>>
- <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|Subordinate Targeting][$activeSlave.subTarget = $slaves["+_i+"].ID]]">>
+ <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|Subordinate Targeting][$activeSlave.subTarget = $slaves["+_i+"].ID]]">>
<<else>>
<<continue>>
<</if>>
@@ -73,7 +80,8 @@
<<if _Slave.assignment == "rest in the spa">><<continue>><</if>>
<<if (_Slave.health < 20) || (_Slave.trust < 60) || (_Slave.devotion <= 60) || (_Slave.fetish == "mindbroken") || _Slave.sexualFlaw !== "none" || _Slave.behavioralFlaw !== "none">>
<<if _Slave.devotion >= -20 || _Slave.fetish == "mindbroken">>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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 cannot be trusted in the spa//
<<continue>>
@@ -86,7 +94,8 @@
<<if _Slave.assignment != "rest in the spa">>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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+"]]]">>
<</if>>
<<else>>
<<if _Slave.ID != $Attendant.ID>>
@@ -97,7 +106,8 @@
<</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) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Attendant Workaround][$i = "+_i+"]]">>
+ <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|Attendant Workaround][$i = "+_i+"]]">>
<<else>>
<<continue>>
<</if>>
@@ -107,7 +117,8 @@
<<if _Slave.assignment == "work in the brothel">><<continue>><</if>>
<<if _Slave.breedingMark != 1>>
<<if (_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>>
+ <<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves[" + _i + "]]]">>
<<else>>
<br>//_Slave.slaveName must be either more fearful of you or devoted to you//
<<continue>>
@@ -120,7 +131,8 @@
<<if _Slave.assignment != "work in the brothel">>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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+"]]]">>
<</if>>
<<else>>
<<if _Slave.ID != $Madam.ID>>
@@ -131,7 +143,8 @@
<</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) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Madam Workaround][$i = "+_i+"]]">>
+ <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|Madam Workaround][$i = "+_i+"]]">>
<<else>>
<<continue>>
<</if>>
@@ -141,7 +154,8 @@
<<if _Slave.assignment == "serve in the club">><<continue>><</if>>
<<if _Slave.breedingMark != 1>>
<<if (_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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 must be either more fearful of you or devoted to you//
<<continue>>
@@ -154,18 +168,21 @@
<<if _Slave.assignment != "serve in the club">>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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+"]]]">>
<</if>>
<<else>>
<<if _Slave.ID != $DJ.ID>>
<<continue>>
<<else>>
- <<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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+"]]]">>
<</if>>
<</if>>
<<case "DJ Select">>
<<if (_Slave.assignmentVisible == 1) && (_Slave.fuckdoll == 0) && (_Slave.devotion > 50) && (_Slave.intelligence > -2) && canTalk(_Slave) && canWalk(_Slave) && _Slave.breedingMark != 1>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|DJ Workaround][$i = "+_i+"]]">>
+ <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|DJ Workaround][$i = "+_i+"]]">>
<<else>>
<<continue>>
<</if>>
@@ -174,7 +191,8 @@
<<if $Flag == 0>>
<<if _Slave.assignment == "get treatment in the clinic">><<continue>><</if>>
<<if (_Slave.health < 20) || ($Nurse != 0 && (_Slave.chem > 15 && $clinicUpgradeFilters == 1) || ($bellyImplants == 1 && _Slave.bellyImplant > 100) || (_Slave.preg >= 1 && ($clinicSpeedGestation >= 0 || $slaves[_i].pregControl == "speed up")))>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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 cannot benefit from the clinic//
<<continue>>
@@ -183,18 +201,21 @@
<<if _Slave.assignment != "get treatment in the clinic">>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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+"]]]">>
<</if>>
<<else>>
<<if _Slave.ID != $Nurse.ID>>
<<continue>>
<<else>>
- <<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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+"]]]">>
<</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) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Nurse Workaround][$i = "+_i+"]]">>
+ <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|Nurse Workaround][$i = "+_i+"]]">>
<<else>>
<<continue>>
<</if>>
@@ -204,7 +225,8 @@
<<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.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+"]]]">>
+ <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//
<<continue>>
@@ -217,18 +239,21 @@
<<if _Slave.assignment != "learn in the schoolroom">>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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+"]]]">>
<</if>>
<<else>>
<<if _Slave.ID != $Schoolteacher.ID>>
<<continue>>
<<else>>
- <<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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+"]]]">>
<</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) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Schoolteacher Workaround][$i = "+_i+"]]">>
+ <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|Schoolteacher Workaround][$i = "+_i+"]]">>
<<else>>
<<continue>>
<</if>>
@@ -253,7 +278,8 @@
<<if (_Slave.devotion > 20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.amp == 1) || ($dairyRestraintsUpgrade == 1)>>
<<if ($dairyStimulatorsSetting < 2) || (_Slave.anus > 2) || ($dairyPrepUpgrade == 1)>>
<<if ($dairyPregSetting < 2) || (_Slave.vagina > 2) || (_Slave.ovaries == 0) || ($dairyPrepUpgrade == 1)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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's vagina cannot accommodate current machine settings//
<<continue>>
@@ -278,18 +304,21 @@
<<if _Slave.assignment != "work in the dairy">>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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+"]]]">>
<</if>>
<<else>>
<<if _Slave.ID != $Milkmaid.ID>>
<<continue>>
<<else>>
- <<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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+"]]]">>
<</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) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Milkmaid Workaround][$i = "+_i+"]]">>
+ <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|Milkmaid Workaround][$i = "+_i+"]]">>
<<else>>
<<continue>>
<</if>>
@@ -298,7 +327,8 @@
<<if $Flag == 0>>
<<if _Slave.assignment == "work as a servant">><<continue>><</if>>
<<if (_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust <= 20)) || (_Slave.trust < -20)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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 must be either more fearful of you or devoted to you//
<<continue>>
@@ -307,18 +337,21 @@
<<if _Slave.assignment != "work as a servant">>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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+"]]]">>
<</if>>
<<else>>
<<if _Slave.ID != $Stewardess.ID>>
<<continue>>
<<else>>
- <<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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+"]]]">>
<</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) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Stewardess Workaround][$i = "+_i+"]]">>
+ <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|Stewardess Workaround][$i = "+_i+"]]">>
<<else>>
<<continue>>
<</if>>
@@ -326,7 +359,8 @@
<<if $Flag == 0>>
<<if _Slave.assignment == "serve in the master suite">><<continue>><</if>>
<<if (_Slave.devotion > 20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves[" + _i + "]]]">>
+ <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 is not sufficiently broken for the master suite//
<<continue>>
@@ -342,12 +376,14 @@
<<if _Slave.ID != $Concubine.ID>>
<<continue>>
<<else>>
- <<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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+"]]]">>
<</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) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Concubine Workaround][$i = "+_i+"]]">>
+ <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|Concubine Workaround][$i = "+_i+"]]">>
<<else>>
<<continue>>
<</if>>
@@ -355,7 +391,8 @@
<<if $Flag == 0>>
<<if _Slave.assignment == "be confined in the cellblock">><<continue>><</if>>
<<if (_Slave.devotion < -20 && _Slave.trust >= -20) || (_Slave.devotion < -50 && _Slave.trust >= -50)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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>>
<<continue>>
<</if>>
@@ -363,13 +400,15 @@
<<if _Slave.assignment != "be confined in the cellblock">>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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+"]]]">>
<</if>>
<<else>>
<<if _Slave.ID != $Wardeness.ID>>
<<continue>>
<<else>>
- <<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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+"]]]">>
<</if>>
<</if>>
<<case "Wardeness Select">>
@@ -385,7 +424,8 @@
<<if (_Slave.assignmentVisible != 1) || (($arcade <= $arcadeSlaves) && ($arcadeUpgradeFuckdolls != 1))>><<continue>><</if>>
<<if _Slave.breedingMark != 1>>
<<if (_Slave.indentureRestrictions <= 0)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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's indenture forbids arcade service.//
<<continue>>
@@ -398,7 +438,8 @@
<<if _Slave.assignment != "be confined in the arcade">>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
+ <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+"]]]">>
<</if>>
<</if>>
<<case "Pit">>
@@ -418,7 +459,8 @@
<<if ($fighterIDs.includes(_Slave.ID))>>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Assign][$i = "+_i+"]]">>
+ <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|Assign][$i = "+_i+"]]">>
<</if>>
<<else>>
<<continue>>
@@ -428,7 +470,8 @@
<</if>>
<<else>>
<<if $fighterIDs.includes(_Slave.ID)>>
- <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|Retrieve][$i = "+_i+"]]">>
+ <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|Retrieve][$i = "+_i+"]]">>
<<else>>
<<continue>>
<</if>>
@@ -437,7 +480,8 @@
<<if _Slave.fuckdoll > 0>><<continue>><</if>>
<<if $Flag == 0>>
<<if canWalk(_Slave) && ($Lurcher.ID != _Slave.ID)>>
- <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|Assign][$i = "+_i+"]]">>
+ <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|Assign][$i = "+_i+"]]">>
<<else>>
<<continue>>
<</if>>
@@ -445,7 +489,8 @@
<<if $Lurcher.ID != _Slave.ID>>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Retrieve][$i = "+_i+"]]">>
+ <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|Retrieve][$i = "+_i+"]]">>
<</if>>
<</if>>
<<case "New Game Plus">>
@@ -496,7 +541,8 @@
<</if>>
<<case "Matchmaking">>
<<if ($slaves[_i].assignmentVisible != 1) || ($slaves[_i].devotion < 100) || ($slaves[_i].relationship != $activeSlave.relationship) || ($slaves[_i].ID == $activeSlave.ID)>><<continue>><</if>>
- <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+"]]]">>
+ <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+"]]]">>
<</switch>>
<<set _Slave.energy = Math.clamp(_Slave.energy, 0, 100)>>
@@ -3192,7 +3238,8 @@ _Slave.faceShape face.
<</if>>
<<if _Slave.useRulesAssistant == 0>>
- @@.lightgreen;RA-Exempt@@
+
+ @@.lightgreen;RA-Exempt@@
<<elseif $abbreviateRulesets == 2 && (def _Slave.currentRules) && (_Slave.currentRules.length > 0)>>
<<for _r = 0; _r < _Slave.currentRules.length; _r++>>
diff --git a/src/uncategorized/stewardessWorkaround.tw b/src/uncategorized/stewardessWorkaround.tw
index c3d073d2fd7b9b124afad8b9fbb831629f16479e..407b2a3c1e9338c7e702f15ef84e4dfca6d3f7ab 100644
--- a/src/uncategorized/stewardessWorkaround.tw
+++ b/src/uncategorized/stewardessWorkaround.tw
@@ -3,34 +3,19 @@
<<if $Stewardess != 0>>
<<set _ID = $Stewardess.ID, _SL = $slaves.length>>
<<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>><<break>><</if>>
+ <<if (_ID == $slaves[_i].ID)>>
+ <<removeJob $slaves[_i] "be the Stewardess">>
+ <<break>>
+ <</if>>
<</for>>
- <<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">>
- <<set $personalAttention = "upkeep">>
- <<else>>
- <<set $personalAttention = "business">>
- <</if>>
- <</if>>
- <<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>>
+ <<assignJob $slaves[$i] "be the Stewardess">>
+ <<set $slaves[$i].livingRules = "luxurious">>
<<set $Stewardess = $slaves[$i]>>
<<else>>
<<set $Stewardess = 0>>
<</if>>
<<goto "Servants' Quarters">>
+
diff --git a/src/uncategorized/subordinateTargeting.tw b/src/uncategorized/subordinateTargeting.tw
index 67e1d3ac639b303d594941237283c1ac8e2e6e09..374687dff1a18dba60e7270549a38d336474cf27 100644
--- a/src/uncategorized/subordinateTargeting.tw
+++ b/src/uncategorized/subordinateTargeting.tw
@@ -1,7 +1,6 @@
:: Subordinate Targeting [nobr]
-<<set $nextButton = "Back">>
-<<set $nextLink = "Slave Interact">>
+<<set $nextButton = "Back", $nextLink = "Slave Interact">>
<<set $displaySlave = $activeSlave>>
@@ -25,4 +24,5 @@
<br><br>[[None|Subordinate Targeting][$activeSlave.subTarget = 0]]
<<set $activeSlave = $displaySlave>>
-<<set $activeSlave.assignment = "be a subordinate slave">>
+<<assignJob $activeSlave "be a subordinate slave">>
+
diff --git a/src/uncategorized/wardenessWorkaround.tw b/src/uncategorized/wardenessWorkaround.tw
index c7a7ddea2a61587d0c62c6aa7e314c0e11207889..314e8fe79d2057d1dbe5a4f8b608940441f767a0 100644
--- a/src/uncategorized/wardenessWorkaround.tw
+++ b/src/uncategorized/wardenessWorkaround.tw
@@ -3,34 +3,19 @@
<<if $Wardeness != 0>>
<<set _ID = $Wardeness.ID, _SL = $slaves.length>>
<<for _i = 0; _i < _SL; _i++>>
- <<if (_ID == $slaves[_i].ID)>><<break>><</if>>
+ <<if (_ID == $slaves[_i].ID)>>
+ <<removeJob $slaves[_i] "be the Wardeness">>
+ <<break>>
+ <</if>>
<</for>>
- <<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">>
- <<set $personalAttention = "upkeep">>
- <<else>>
- <<set $personalAttention = "business">>
- <</if>>
- <</if>>
- <<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>>
+ <<assignJob $slaves[$i] "be the Wardeness">>
+ <<set $slaves[$i].livingRules = "luxurious">>
<<set $Wardeness = $slaves[$i]>>
<<else>>
<<set $Wardeness = 0>>
<</if>>
<<goto "Cellblock">>
+
diff --git a/src/uncategorized/whoreWorkaround.tw b/src/uncategorized/whoreWorkaround.tw
index 82b272ec9179352e9240570c3a1af97aef0d9f75..d5ada4531e76dffaccd5b636a20a0915ac8cc151 100644
--- a/src/uncategorized/whoreWorkaround.tw
+++ b/src/uncategorized/whoreWorkaround.tw
@@ -1,4 +1,6 @@
:: Whore Workaround [silently]
-<<set $slaves[$i].assignment = "whore", $slaves[$i].choosesOwnAssignment = 0>>
+<<assignJob $slaves[$i] "whore">>
+
<<goto "Main">>
+
diff --git a/src/utility/assignWidgets.tw b/src/utility/assignWidgets.tw
index 557f41b3be535f08aa51cf6cd60f6a5905396c91..0d3aa39a9506776ea26e8a30deb15781f64b0b50 100644
--- a/src/utility/assignWidgets.tw
+++ b/src/utility/assignWidgets.tw
@@ -10,61 +10,41 @@
<<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 # %/
-<<if $i < _SL && _wID == $slaves[$i].ID>>
- <<set _wi = $i>>
-<<else>>
- <<for _wi = 0; _wi < _SL; _wi++>>
- <<if _wID == $slaves[_wi].ID>>
- <<break>>
- <</if>>
- <</for>>
-<</if>>
-
-/% use .toLowerCase() to get rid of a few dupe conditions. %/
-<<switch $args[1].toLowerCase()>>
-<<case "clinic" "get treatment in the clinic">>
- <<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", $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", $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", $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", $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", $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", $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", $args[0].assignmentVisible = 0, $dairySlaves++, $DairyiIDs.push({ID: _wID, Index: _wi})>>
- <<if $dairyPregSetting > 0>>
- <<set $reservedChildren -= $args[0].reservedChildren>>
- <<set $args[0].reservedChildren = 0>>
- <</if>>
-<<case "hgsuite" "head girl suite" "live with your head girl">>
- <<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", $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", $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>>
-
-/% 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>>
-
-<<if _wID == $personalAttention>>
+ <<removeJob $args[0] $args[0].assignment>>
+
+ /% use .toLowerCase() to get rid of a few dupe conditions. %/
+ <<switch $args[1].toLowerCase()>>
+ <<case "be confined in the arcade" "arcade">>
+ <<set $args[0].assignment = "be confined in the arcade", $args[0].assignmentVisible = 0, $arcadeSlaves++, $ArcadeiIDs.push({ID: _wID, Index: _wi})>>
+ <<case "work in the brothel" "brothel">>
+ <<set $args[0].assignment = "work in the brothel", $args[0].assignmentVisible = 0, $brothelSlaves++, $BrothiIDs.push({ID: _wID, Index: _wi})>>
+ <<case "be confined in the cellblock" "cellblock">>
+ <<set $args[0].assignment = "be confined in the cellblock", $args[0].assignmentVisible = 0, $cellblockSlaves++, $CellBiIDs.push({ID: _wID, Index: _wi})>>
+ <<case "get treatment in the clinic" "clinic">>
+ <<set $args[0].assignment = "get treatment in the clinic", $args[0].assignmentVisible = 0, $clinicSlaves++, $CliniciIDs.push({ID: _wID, Index: _wi})>>
+ <<case "serve in the club" "club">>
+ <<set $args[0].assignment = "serve in the club", $args[0].assignmentVisible = 0, $clubSlaves++, $ClubiIDs.push({ID: _wID, Index: _wi})>>
+ <<case "work in the dairy" "dairy">>
+ <<set $args[0].assignment = "work in the dairy", $args[0].assignmentVisible = 0, $dairySlaves++, $DairyiIDs.push({ID: _wID, Index: _wi})>>
+ <<case "live with your head girl" "head girl suite" "hgsuite">>
+ <<set $args[0].assignment = "live with your Head Girl", $args[0].assignmentVisible = 0, $HGSuiteSlaves++, $HGSuiteiIDs.push({ID: _wID, Index: _wi})>>
+ <<case "serve in the master suite" "master suite" "mastersuite">>
+ <<set $args[0].assignment = "serve in the master suite", $args[0].assignmentVisible = 0, $masterSuiteSlaves++, $MastSiIDs.push({ID: _wID, Index: _wi})>>
+ <<case "learn in the schoolroom" "schoolroom">>
+ <<set $args[0].assignment = "learn in the schoolroom", $args[0].assignmentVisible = 0, $schoolroomSlaves++, $SchlRiIDs.push({ID: _wID, Index: _wi})>>
+ <<case "work as a servant" "servants' quarters" "servantsquarters">>
+ <<set $args[0].assignment = "work as a servant", $args[0].assignmentVisible = 0, $servantsQuartersSlaves++, $ServQiIDs.push({ID: _wID, Index: _wi})>>
+ <<case "rest in the spa" "spa">>
+ <<set $args[0].assignment = "rest in the spa", $args[0].assignmentVisible = 0, $spaSlaves++, $SpaiIDs.push({ID: _wID, Index: _wi})>>
+ <<case "be the attendant" "be your concubine" "be the dj" "be the madam" "be the milkmaid" "be the nurse" "be the schoolteacher" "be the stewardess" "be the wardeness" "be your agent" "live with your agent">>
+ <<set $args[0].assignment = $args[1], $args[0].assignmentVisible = 0>> /* non-visible leadership roles */
+ <<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>>
+
+<if _wID == $personalAttention>>
<<if $PC.career == "escort">>
<<set $personalAttention = "whoring">>
<<elseif $PC.career == "servant">>
@@ -74,149 +54,110 @@
<</if>>
<</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 $slaves[$i] */
+ /% Get slaves[_wi] index # %/
+ <<if $i < _SL && _wID == $slaves[$i].ID>>
+ <<set _wi = $i>>
+ <<else>>
+ <<for _wi = 0; _wi < _SL; _wi++>>
+ <<if _wID == $slaves[_wi].ID>>
+ <<break>>
+ <</if>>
+ <</for>>
+ <</if>>
+
+ <<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 $slaves[$i] */
-<<if $slaves[_wi].choosesOwnClothes == 1>><<include "SA chooses own clothes">><<set $args[0] = $slaves[_wi]>><</if>> /* update clothes, then update $args[0] */
+ <<if $slaves[_wi].choosesOwnClothes == 1>><<include "SA chooses own clothes">><<set $args[0] = $slaves[_wi]>><</if>> /* update clothes, then update $args[0] */
<</if>> /* not Pit or Coursing Association */
<</widget>>
/%
- Call as <<removeJob slaveObject $returnto | _currentRule.facilityRemove | "serve in the master suite"
+ Call as <<removeJob slaveObject $returnTo | _currentRule.facilityRemove | "serve in the master suite">>
$args[0] slave object. *MUST be present*
- $args[1] Job to remove slave from. Will accept the $returnto vars and the _currentRule.assignFacility vars and the actual job assignments "serve in the master suite" etc.
+ $args[1] Job to remove slave from. Will accept the $returnTo vars and the _currentRule.assignFacility vars and the actual job assignments "serve in the master suite" etc.
- This is basically a Widget version of Retrieve but will work anywhere, And it changes the assignment to "rest", and saves to the slaves[..] array, and changes your $args[0] var sent.
+ This is basically a Widget version of Retrieve but will work anywhere. It changes the assignment and saves to the slaves[..] array, and changes your $args[0] var sent.
Retrieve overrides the 'rest' in most cases.
%/
<<widget removeJob>>
-<<if ($args[1] != "Pit") && ($args[1] != "Coursing Association")>>
-
<<set _wID = $args[0].ID, _SL = $slaves.length>>
-<<if _wID == $HeadGirl.ID>><<set $HeadGirl = 0>><</if>>
-<<if _wID == $Recruiter.ID>><<set $Recruiter = 0>><</if>>
-<<if _wID == $Bodyguard.ID>><<set $Bodyguard = 0>><</if>>
-<<if _wID == $Madam.ID>><<set $Madam = 0>><</if>>
-<<if _wID == $DJ.ID>><<set $DJ = 0>><</if>>
-<<if _wID == $Milkmaid.ID>><<set $Milkmaid = 0>><</if>>
-<<if _wID == $Schoolteacher.ID>><<set $Schoolteacher = 0>><</if>>
-<<if _wID == $Attendant.ID>><<set $Attendant = 0>><</if>>
-<<if _wID == $Nurse.ID>><<set $Nurse = 0>><</if>>
-<<if _wID == $Collectrix.ID>><<set $Collectrix = 0>><</if>>
-<<if _wID == $Stewardess.ID>><<set $Stewardess = 0>><</if>>
-<<if _wID == $Wardeness.ID>><<set $Wardeness = 0>><</if>>
-<<if _wID == $Concubine.ID>><<set $Concubine = 0>><</if>>
-
-/% use .toLowerCase() to get rid of a few dupe conditions. %/
-<<switch $args[1].toLowerCase()>>
-<<case "clinic" "get treatment in the clinic">>
- <<if _wID == $Nurse.ID>><<set $Nurse = 0>><</if>>
- <<set _Tcount = $CliniciIDs.length>>
- <<for _wi = 0; _wi < _Tcount; _wi++>>
- <<if _wID == $CliniciIDs[_wi].ID>>
- <<set _dump = $CliniciIDs.deleteAt(_wi), $clinicSlaves-->>
- <<break>>
- <</if>>
- <</for>>
-<<case "schoolroom" "learn in the schoolroom">>
- <<if _wID == $Schoolteacher.ID>><<set $Schoolteacher = 0>><</if>>
- <<set _Tcount = $SchlRiIDs.length>>
- <<for _wi = 0; _wi < _Tcount; _wi++>>
- <<if _wID == $SchlRiIDs[_wi].ID>>
- <<set _dump = $SchlRiIDs.deleteAt(_wi), $schoolroomSlaves-->>
- <<break>>
- <</if>>
- <</for>>
-<<case "spa" "rest in the spa">>
- <<if _wID == $Attendant.ID>><<set $Attendant = 0>><</if>>
- <<set _Tcount = $SpaiIDs.length>>
- <<for _wi = 0; _wi < _Tcount; _wi++>>
- <<if _wID == $SpaiIDs[_wi].ID>>
- <<set _dump = $SpaiIDs.deleteAt(_wi), $spaSlaves-->>
- <<break>>
- <</if>>
- <</for>>
-<<case "cellblock" "be confined in the cellblock">>
- <<if _wID == $Wardeness.ID>><<set $Wardeness = 0>><</if>>
- <<set _Tcount = $CellBiIDs.length>>
- <<for _wi = 0; _wi < _Tcount; _wi++>>
- <<if _wID == $CellBiIDs[_wi].ID>>
- <<set _dump = $CellBiIDs.deleteAt(_wi), $cellblockSlaves-->>
- <<break>>
- <</if>>
- <</for>>
-<<case "arcade" "be confined in the arcade">>
- <<set _Tcount = $ArcadeiIDs.length>>
- <<for _wi = 0; _wi < _Tcount; _wi++>>
- <<if _wID == $ArcadeiIDs[_wi].ID>>
- <<set _dump = $ArcadeiIDs.deleteAt(_wi), $arcadeSlaves-->>
- <<break>>
- <</if>>
- <</for>>
-<<case "brothel" "work in the brothel">>
+<<if ($args[1] == "Pit")>>
+ <<set $fighterIDs.delete({ID: _wID, Index: _wi})>>
+
+<<elseif ($args[1] == "Coursing Association")>>
+ <<set $Lurcher = 0>>
+
+<<else>>
+
+ <<if _wID == $HeadGirl.ID>><<set $HeadGirl = 0>><</if>>
+ <<if _wID == $Recruiter.ID>><<set $Recruiter = 0>><</if>>
+ <<if _wID == $Bodyguard.ID>><<set $Bodyguard = 0>><</if>>
<<if _wID == $Madam.ID>><<set $Madam = 0>><</if>>
- <<set _Tcount = $BrothiIDs.length>>
- <<for _wi = 0; _wi < _Tcount; _wi++>>
- <<if _wID == $BrothiIDs[_wi].ID>>
- <<set _dump = $BrothiIDs.deleteAt(_wi), $brothelSlaves-->>
- <<break>>
- <</if>>
- <</for>>
-<<case "club" "serve in the club">>
<<if _wID == $DJ.ID>><<set $DJ = 0>><</if>>
- <<set _Tcount = $ClubiIDs.length>>
- <<for _wi = 0; _wi < _Tcount; _wi++>>
- <<if _wID == $ClubiIDs[_wi].ID>>
- <<set _dump = $ClubiIDs.deleteAt(_wi), $clubSlaves-->>
- <<break>>
- <</if>>
- <</for>>
-<<case "dairy" "work in the dairy">>
<<if _wID == $Milkmaid.ID>><<set $Milkmaid = 0>><</if>>
- <<set _Tcount = $DairyiIDs.length>>
- <<for _wi = 0; _wi < _Tcount; _wi++>>
- <<if _wID == $DairyiIDs[_wi].ID>>
- <<set _dump = $DairyiIDs.deleteAt(_wi), $dairySlaves-->>
- <<break>>
- <</if>>
- <</for>>
-<<case "hgsuite" "head girl suite" "live with your head girl">>
- <<set _Tcount = $HGSuiteiIDs.length>>
- <<for _wi = 0; _wi < _Tcount; _wi++>>
- <<if _wID == $HGSuiteiIDs[_wi].ID>>
- <<set _dump = $HGSuiteiIDs.deleteAt(_wi), $HGSuiteSlaves-->>
- <<break>>
- <</if>>
- <</for>>
-<<case "servantsquarters" "servants' quarters" "work as a servant">>
+ <<if _wID == $Schoolteacher.ID>><<set $Schoolteacher = 0>><</if>>
+ <<if _wID == $Attendant.ID>><<set $Attendant = 0>><</if>>
+ <<if _wID == $Nurse.ID>><<set $Nurse = 0>><</if>>
+ <<if _wID == $Collectrix.ID>><<set $Collectrix = 0>><</if>>
<<if _wID == $Stewardess.ID>><<set $Stewardess = 0>><</if>>
- <<set _Tcount = $ServQiIDs.length>>
- <<for _wi = 0; _wi < _Tcount; _wi++>>
- <<if _wID == $ServQiIDs[_wi].ID>>
- <<set _dump = $ServQiIDs.deleteAt(_wi), $servantsQuartersSlaves-->>
- <<break>>
- <</if>>
- <</for>>
-<<case "mastersuite" "master suite" "serve in the master suite">>
+ <<if _wID == $Wardeness.ID>><<set $Wardeness = 0>><</if>>
<<if _wID == $Concubine.ID>><<set $Concubine = 0>><</if>>
- <<set _Tcount = $MastSiIDs.length>>
- <<for _wi = 0; _wi < _Tcount; _wi++>>
- <<if _wID == $MastSiIDs[_wi].ID>>
- <<set _dump = $MastSiIDs.deleteAt(_wi), $masterSuiteSlaves-->>
- <<break>>
- <</if>>
- <</for>>
-<</switch>>
-
-<<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>>
+
+ /% Get slaves[_wi] index # %/
+ <<if $i < _SL && _wID == $slaves[$i].ID>>
+ <<set _wi = $i>>
+ <<else>>
+ <<for _wi = 0; _wi < _SL; _wi++>>
+ <<if _wID == $slaves[_wi].ID>>
+ <<break>>
+ <</if>>
+ <</for>>
+ <</if>>
+
+ /% use .toLowerCase() to get rid of a few dupe conditions. %/
+ <<switch $args[1].toLowerCase()>>
+ <<case "be confined in the arcade" "arcade">>
+ <<set $ArcadeiIDs = $ArcadeiIDs.delete({ID: _wID, Index: _wi}), $arcadeSlaves--, $args[0].assignment = "work a glory hole">>
+ <<case "work in the brothel" "brothel">>
+ <<set $BrothiIDs = $BrothiIDs.delete({ID: _wID, Index: _wi}), $brothelSlaves--, $args[0].assignment = "whore">>
+ <<case "be confined in the cellblock" "cellblock">>
+ <<set $CellBiIDs = $CellBiIDs.delete({ID: _wID, Index: _wi}), $cellblockSlaves--, $args[0].assignment = "stay confined">>
+ <<case "get treatment in the clinic" "clinic">>
+ <<set $CliniciIDs = $CliniciIDs.delete({ID: _wID, Index: _wi}), $clinicSlaves--, $args[0].assignment = "rest">>
+ <<case "serve in the club" "club">>
+ <<set $ClubiIDs = $ClubiIDs.delete({ID: _wID, Index: _wi}), $clubSlaves--, $args[0].assignment = "serve the public">>
+ <<case "work in the dairy" "dairy">>
+ <<set $DairyiIDs = $DairyiIDs.delete({ID: _wID, Index: _wi}), $dairySlaves--, $args[0].assignment = "get milked">>
+ <<case "live with your head girl" "head girl suite" "hgsuite">>
+ <<set $HGSuiteiIDs = $HGSuiteiIDs.delete({ID: _wID, Index: _wi}), $HGSuiteSlaves--, $args[0].assignment = "rest">>
+ <<case "serve in the master suite" "master suite" "mastersuite">>
+ <<set $MastSiIDs = $MastSiIDs.delete({ID: _wID, Index: _wi}), $masterSuiteSlaves--, $args[0].assignment = "please you">>
+ <<case "learn in the schoolroom" "schoolroom">>
+ <<set $SchlRiIDs = $SchlRiIDs.delete({ID: _wID, Index: _wi}), $schoolroomSlaves--, $args[0].assignment = "take classes">>
+ <<case "work as a servant" "servants' quarters" "servantsquarters">>
+ <<set $ServQiIDs = $ServQiIDs.delete({ID: _wID, Index: _wi}), $servantsQuartersSlaves--, $args[0].assignment = "be a servant">>
+ <<case "rest in the spa" "spa">>
+ <<set $SpaiIDs = $SpaiIDs.delete({ID: _wID, Index: _wi}), $spaSlaves--, $args[0].assignment = "rest">>
+ <<case "be your head girl">>
+ <<set $args[0].assignment = "rest">>
+ <<if $personalAttention == "HG">>
+ <<if $PC.career == "escort">>
+ <<set $personalAttention = "whoring">>
+ <<elseif $PC.career == "servant">>
+ <<set $personalAttention = "upkeep">>
+ <<else>>
+ <<set $personalAttention = "business">>
+ <</if>>
+ <</if>>
+ <<default>>
+ <<set $args[0].assignment = "rest">>
+ <</switch>>
+
+ <<set $args[0].assignmentVisible = 1, $args[0].choosesOwnAssignment = 0, $args[0].sentence = 0>>
+
<<set $slaves[_wi] = $args[0]>>
- <<break>>
-<</if>>
-<</for>>
<</if>>
<</widget>>