diff --git a/src/interaction/prostheticConfig.tw b/src/interaction/prostheticConfig.tw index 8a68dbe21a99b923a830f662d4882e026c8c74ad..dc84c4ea06d63de195ca06c57a653ff27a52fd64 100644 --- a/src/interaction/prostheticConfig.tw +++ b/src/interaction/prostheticConfig.tw @@ -1,7 +1,5 @@ :: Prosthetics Configuration [nobr] -<<set $AS = $activeSlave.ID>> - <<switch $prostheticsConfig>> <<case "main">> diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js index a61defd6c8809250f84faa8c577a346724fd9557..6918a7b1766e54ea59565d5fd1a13af7a360bd03 100644 --- a/src/interaction/slaveInteract.js +++ b/src/interaction/slaveInteract.js @@ -33,6 +33,7 @@ App.UI.SlaveInteract.placeInLine = function(slave) { App.UI.SlaveInteract.modify = function(slave) { const {he, his} = getPronouns(slave); let el = new DocumentFragment(); + V.AS = slave.ID; const isAgent = [Job.AGENT, Job.AGENTPARTNER].includes(slave.assignment); @@ -48,9 +49,9 @@ App.UI.SlaveInteract.modify = function(slave) { * @param {string} caption * @param {string} passage * @param {string} note - * @param {function ():void} handler + * @param {function ():void} [handler] */ - function makeRoomLink(c, caption, passage, note, handler) { + function makeRoomLink(c, caption, passage, note, handler = () => {}) { const res = document.createElement('div'); c.appendChild(res); res.appendChild(App.UI.DOM.link(caption, handler, [], passage)); @@ -58,31 +59,21 @@ App.UI.SlaveInteract.modify = function(slave) { return res; } - makeRoomLink(el, "Auto salon", "Salon", ' Modify hair (color, length, style), nails, and even skin color.', - () => { - V.activeSlave = slave; - } - ); + makeRoomLink(el, "Auto salon", "Salon", ' Modify hair (color, length, style), nails, and even skin color.'); makeRoomLink(el, "Body mod studio", "Body Modification", ' Mark your slave with piercings, tattoos, brands or even scars.', () => { - V.activeSlave = slave; V.degradation = 0; V.tattooChoice = undefined; }, ); - makeRoomLink(el, "Remote surgery", "Remote Surgery", ` Surgically modify your slave with state of the art plastic surgery and more. Alter ${his} senses, skeletal structure, organs, and even more.`, - () => { - V.activeSlave = slave; - } - ); + makeRoomLink(el, "Remote surgery", "Remote Surgery", ` Surgically modify your slave with state of the art plastic surgery and more. Alter ${his} senses, skeletal structure, organs, and even more.`); // Prosthetics if (V.prostheticsUpgrade > 0) { makeRoomLink(el, "Configure cybernetics", "Prosthetics Configuration", ` Configure prosthetics, if ${he} has been surgically implanted with interfaces that support it.`, () => { - V.activeSlave = slave; V.prostheticsConfig = "main"; } ); @@ -90,11 +81,7 @@ App.UI.SlaveInteract.modify = function(slave) { // Analyze Pregnancy if (V.pregnancyMonitoringUpgrade > 0) { - makeRoomLink(el, "Internal scan", "Analyze Pregnancy", ` Full scan of abdomen and reproductive organs.`, - () => { - V.activeSlave = slave; - } - ); + makeRoomLink(el, "Internal scan", "Analyze Pregnancy", ` Full scan of abdomen and reproductive organs.`); } return el; diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw index 16a1a15edee1e4e20ca6505440258e16a6da6984..693fe9e435f673376325e797916a9e897c32b2bc 100644 --- a/src/pregmod/analyzePregnancy.tw +++ b/src/pregmod/analyzePregnancy.tw @@ -6,28 +6,28 @@ <<set $storedLink = "Slave Interact">> <</if>> <<set $nextButton = "Continue", $nextLink = $storedLink>> -<<run App.Utils.setLocalPronouns(getSlave($activeSlave.ID))>> +<<run App.Utils.setLocalPronouns(getSlave($AS))>> -<<set _WL = getSlave($activeSlave.ID).womb.length, _incubatorReservations = WombReserveCount(getSlave($activeSlave.ID), "incubator"), _nurseryReservations = WombReserveCount(getSlave($activeSlave.ID), "nursery"), _freeTanks = $incubator - $incubatorSlaves, _freeCribs = $nursery - $cribs.length>> +<<set _WL = getSlave($AS).womb.length, _incubatorReservations = WombReserveCount(getSlave($AS), "incubator"), _nurseryReservations = WombReserveCount(getSlave($AS), "nursery"), _freeTanks = $incubator - $incubatorSlaves, _freeCribs = $nursery - $cribs.length>> <p class="scene-intro"> - <<= getSlave($activeSlave.ID).slaveName>> is <<if getSlave($activeSlave.ID).devotion < 20>>restrained<<else>>comfortably reclined<</if>> with $his stomach prepped for examination. $He shudders slightly at the cold touch of the sensor against $his skin. + <<= getSlave($AS).slaveName>> is <<if getSlave($AS).devotion < 20>>restrained<<else>>comfortably reclined<</if>> with $his stomach prepped for examination. $He shudders slightly at the cold touch of the sensor against $his skin. </p> -<<= App.Desc.pregnancy($activeSlave)>> +<<= App.Desc.pregnancy(getSlave($AS))>> <p> <h2>Overall statistics</h2> <div class="indent"> - <<set _cc = Math.round(getSlave($activeSlave.ID).bellyPreg)>> - <<set _safeCC = Math.round(getSlave($activeSlave.ID).pregAdaptation*2000)>> + <<set _cc = Math.round(getSlave($AS).bellyPreg)>> + <<set _safeCC = Math.round(getSlave($AS).pregAdaptation*2000)>> <<if $geneticMappingUpgrade > 0>> <div> - Estimated physical degree of pregnancy adaptation: <<print num(Math.round(getSlave($activeSlave.ID).pregAdaptation))>> + Estimated physical degree of pregnancy adaptation: <<print num(Math.round(getSlave($AS).pregAdaptation))>> </div> <div> Estimated safe - <<if getSlave($activeSlave.ID).ovaries == 1 || getSlave($activeSlave.ID).mpreg == 1>> + <<if getSlave($AS).ovaries == 1 || getSlave($AS).mpreg == 1>> womb <<else>> abdominal @@ -36,11 +36,11 @@ </div> <</if>> <div> - Current fetal count: <<= getSlave($activeSlave.ID).womb.length>> + Current fetal count: <<= getSlave($AS).womb.length>> </div> <div> Estimated - <<if getSlave($activeSlave.ID).ovaries == 1 || getSlave($activeSlave.ID).mpreg == 1>> + <<if getSlave($AS).ovaries == 1 || getSlave($AS).mpreg == 1>> womb <<else>> abdominal @@ -50,11 +50,11 @@ </div> </p> -<<if getSlave($activeSlave.ID).womb.length > 0>> +<<if getSlave($AS).womb.length > 0>> <p> <h2>Furthest developed pregnancy</h2> <div class="indent"> - Fetal development week: <<= Math.trunc(getSlave($activeSlave.ID).preg * 1000) / 1000>> + Fetal development week: <<= Math.trunc(getSlave($AS).preg * 1000) / 1000>> </div> </p> @@ -64,14 +64,14 @@ <<if $incubator > 0>> <<if _incubatorReservations > 0>> <<link "Remove all of $his children from $incubatorName" "Analyze Pregnancy">> - <<run WombChangeReserveType(getSlave($activeSlave.ID), "incubator", "")>> + <<run WombChangeReserveType(getSlave($AS), "incubator", "")>> <<set $reservedChildren -= _incubatorReservations>> <</link>> | <</if>> <<if _incubatorReservations < _WL && ($reservedChildren + _WL - _incubatorReservations <= _freeTanks)>> <<link "Keep all of $his children in $incubatorName" "Analyze Pregnancy">> - <<run WombChangeReserveType(getSlave($activeSlave.ID), "nursery", "incubator")>> - <<run WombChangeReserveType(getSlave($activeSlave.ID), "", "incubator")>> + <<run WombChangeReserveType(getSlave($AS), "nursery", "incubator")>> + <<run WombChangeReserveType(getSlave($AS), "", "incubator")>> <<set $reservedChildrenNursery -= _nurseryReservations>> <<set $reservedChildren += _WL - _incubatorReservations>> <</link>> @@ -85,14 +85,14 @@ <<if $nursery > 0>> <<if _nurseryReservations > 0>> <<link "Remove all of $his children from $nurseryName" "Analyze Pregnancy">> - <<run WombChangeReserveType(getSlave($activeSlave.ID), "nursery", "")>> + <<run WombChangeReserveType(getSlave($AS), "nursery", "")>> <<set $reservedChildrenNursery -= _nurseryReservations>> <</link>> | <</if>> <<if _nurseryReservations < _WL && ($reservedChildrenNursery + _WL - _nurseryReservations <= _freeCribs)>> <<link "Keep all of $his children in $nurseryName" "Analyze Pregnancy">> - <<run WombChangeReserveType(getSlave($activeSlave.ID), "incubator", "nursery")>> - <<run WombChangeReserveType(getSlave($activeSlave.ID), "", "nursery")>> + <<run WombChangeReserveType(getSlave($AS), "incubator", "nursery")>> + <<run WombChangeReserveType(getSlave($AS), "", "nursery")>> <<set $reservedChildren -= _incubatorReservations>> <<set $reservedChildrenNursery += _WL - _nurseryReservations>> <</link>> @@ -110,223 +110,223 @@ <hr style="margin:0"> <p> <<capture _ap>> - <<if getSlave($activeSlave.ID).womb[_ap].age >=2 >> + <<if getSlave($AS).womb[_ap].age >=2 >> <div class="indent"> - Ova: <<= getSlave($activeSlave.ID).womb[_ap].genetics.name>> + Ova: <<= getSlave($AS).womb[_ap].genetics.name>> </div> <div class="indent"> - Age: <<= Math.trunc(getSlave($activeSlave.ID).womb[_ap].age * 1000) / 1000>> + Age: <<= Math.trunc(getSlave($AS).womb[_ap].age * 1000) / 1000>> </div> <<if $geneticMappingUpgrade >= 1>> <div class="indent"> - Gender: <<= getSlave($activeSlave.ID).womb[_ap].genetics.gender>> + Gender: <<= getSlave($AS).womb[_ap].genetics.gender>> </div> <div class="indent"> - Father ID: <<= getSlave($activeSlave.ID).womb[_ap].genetics.father>> + Father ID: <<= getSlave($AS).womb[_ap].genetics.father>> </div> <div class="indent"> Father Name: - <<if ndef getSlave($activeSlave.ID).womb[_ap].genetics.fatherName>> + <<if ndef getSlave($AS).womb[_ap].genetics.fatherName>> name not registered <<else>> - <<= getSlave($activeSlave.ID).womb[_ap].genetics.fatherName>> + <<= getSlave($AS).womb[_ap].genetics.fatherName>> <</if>> </div> <div class="indent"> - Mother ID: <<= getSlave($activeSlave.ID).womb[_ap].genetics.mother>> + Mother ID: <<= getSlave($AS).womb[_ap].genetics.mother>> </div> <div class="indent"> Mother Name: - <<if ndef getSlave($activeSlave.ID).womb[_ap].genetics.motherName>> + <<if ndef getSlave($AS).womb[_ap].genetics.motherName>> name not registered <<else>> - <<= getSlave($activeSlave.ID).womb[_ap].genetics.motherName>> + <<= getSlave($AS).womb[_ap].genetics.motherName>> <</if>> </div> <div class="indent"> - Nationality: <<= getSlave($activeSlave.ID).womb[_ap].genetics.nationality>> + Nationality: <<= getSlave($AS).womb[_ap].genetics.nationality>> </div> <div class="indent"> - Race: <<= capFirstChar(getSlave($activeSlave.ID).womb[_ap].genetics.race)>> + Race: <<= capFirstChar(getSlave($AS).womb[_ap].genetics.race)>> </div> <div class="indent"> - Skin tone: <<= capFirstChar(getSlave($activeSlave.ID).womb[_ap].genetics.skin)>> + Skin tone: <<= capFirstChar(getSlave($AS).womb[_ap].genetics.skin)>> </div> <div class="indent"> - Intelligence index: <<= getSlave($activeSlave.ID).womb[_ap].genetics.intelligence>> out of 100 + Intelligence index: <<= getSlave($AS).womb[_ap].genetics.intelligence>> out of 100 </div> <div class="indent"> - Face index: <<= getSlave($activeSlave.ID).womb[_ap].genetics.face>> out of 100 + Face index: <<= getSlave($AS).womb[_ap].genetics.face>> out of 100 </div> <div class="indent"> - Eye Color: <<= capFirstChar(getSlave($activeSlave.ID).womb[_ap].genetics.eyeColor)>> + Eye Color: <<= capFirstChar(getSlave($AS).womb[_ap].genetics.eyeColor)>> </div> <div class="indent"> - Hair Color: <<= capFirstChar(getSlave($activeSlave.ID).womb[_ap].genetics.hColor)>> + Hair Color: <<= capFirstChar(getSlave($AS).womb[_ap].genetics.hColor)>> </div> <div class="indent"> - <<if getSlave($activeSlave.ID).womb[_ap].genetics.underArmHStyle == "hairless" && getSlave($activeSlave.ID).womb[_ap].genetics.pubicHStyle == "hairless">> + <<if getSlave($AS).womb[_ap].genetics.underArmHStyle == "hairless" && getSlave($AS).womb[_ap].genetics.pubicHStyle == "hairless">> Body hair: None - <<elseif getSlave($activeSlave.ID).womb[_ap].genetics.underArmHStyle == "hairless">> + <<elseif getSlave($AS).womb[_ap].genetics.underArmHStyle == "hairless">> Body hair: Lacks underarm hair - <<elseif getSlave($activeSlave.ID).womb[_ap].genetics.pubicHStyle == "hairless">> + <<elseif getSlave($AS).womb[_ap].genetics.pubicHStyle == "hairless">> Body hair: Lacks pubic hair <</if>> </div> - <<if getSlave($activeSlave.ID).womb[_ap].genetics.markings == "freckles" || getSlave($activeSlave.ID).womb[_ap].genetics.markings == "heavily freckled">> + <<if getSlave($AS).womb[_ap].genetics.markings == "freckles" || getSlave($AS).womb[_ap].genetics.markings == "heavily freckled">> <div class="indent"> - Markings: <<= capFirstChar(getSlave($activeSlave.ID).womb[_ap].genetics.markings)>> + Markings: <<= capFirstChar(getSlave($AS).womb[_ap].genetics.markings)>> </div> <</if>> <div class="indent"> Detected abnormalities: - <<if getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.albinism == 2>> + <<if getSlave($AS).womb[_ap].genetics.geneticQuirks.albinism == 2>> @@.green;alb@@ - <<elseif getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.albinism == 1 && $geneticMappingUpgrade >= 2>> + <<elseif getSlave($AS).womb[_ap].genetics.geneticQuirks.albinism == 1 && $geneticMappingUpgrade >= 2>> @@.yellow;alb@@ <</if>> - <<if getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.gigantism == 2>> + <<if getSlave($AS).womb[_ap].genetics.geneticQuirks.gigantism == 2>> @@.red;gnt@@ - <<elseif getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.gigantism == 1 && $geneticMappingUpgrade >= 2>> + <<elseif getSlave($AS).womb[_ap].genetics.geneticQuirks.gigantism == 1 && $geneticMappingUpgrade >= 2>> @@.yellow;gnt@@ <</if>> - <<if getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.dwarfism == 2>> + <<if getSlave($AS).womb[_ap].genetics.geneticQuirks.dwarfism == 2>> @@.red;dwrf@@ - <<elseif getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.dwarfism == 1 && $geneticMappingUpgrade >= 2>> + <<elseif getSlave($AS).womb[_ap].genetics.geneticQuirks.dwarfism == 1 && $geneticMappingUpgrade >= 2>> @@.yellow;dwrf@@ <</if>> - <<if getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.heterochromia == 2>> + <<if getSlave($AS).womb[_ap].genetics.geneticQuirks.heterochromia == 2>> @@.green;hetchrom@@ - <<elseif getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.heterochromia == 1 && $geneticMappingUpgrade >= 2>> + <<elseif getSlave($AS).womb[_ap].genetics.geneticQuirks.heterochromia == 1 && $geneticMappingUpgrade >= 2>> @@.yellow;hetchrom@@ <</if>> - <<if getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.androgyny == 2>> + <<if getSlave($AS).womb[_ap].genetics.geneticQuirks.androgyny == 2>> @@.red;andr@@ - <<elseif getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.androgyny == 1 && $geneticMappingUpgrade >= 2>> + <<elseif getSlave($AS).womb[_ap].genetics.geneticQuirks.androgyny == 1 && $geneticMappingUpgrade >= 2>> @@.yellow;andr@@ <</if>> - <<if getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.pFace == 2>> + <<if getSlave($AS).womb[_ap].genetics.geneticQuirks.pFace == 2>> @@.green;pfce@@ - <<elseif getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.pFace == 1 && $geneticMappingUpgrade >= 2>> + <<elseif getSlave($AS).womb[_ap].genetics.geneticQuirks.pFace == 1 && $geneticMappingUpgrade >= 2>> @@.yellow;pfce@@ <</if>> - <<if getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.uFace == 2>> + <<if getSlave($AS).womb[_ap].genetics.geneticQuirks.uFace == 2>> @@.red;ufce@@ - <<elseif getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.uFace == 1 && $geneticMappingUpgrade >= 2>> + <<elseif getSlave($AS).womb[_ap].genetics.geneticQuirks.uFace == 1 && $geneticMappingUpgrade >= 2>> @@.yellow;ufce@@ <</if>> - <<if getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.fertility == 2>> + <<if getSlave($AS).womb[_ap].genetics.geneticQuirks.fertility == 2>> @@.green;fert@@ - <<elseif getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.fertility == 1 && $geneticMappingUpgrade >= 2>> + <<elseif getSlave($AS).womb[_ap].genetics.geneticQuirks.fertility == 1 && $geneticMappingUpgrade >= 2>> @@.yellow;fert@@ <</if>> - <<if getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.hyperFertility == 2>> + <<if getSlave($AS).womb[_ap].genetics.geneticQuirks.hyperFertility == 2>> @@.green;hfert@@ - <<elseif getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.hyperFertility == 1 && $geneticMappingUpgrade >= 2>> + <<elseif getSlave($AS).womb[_ap].genetics.geneticQuirks.hyperFertility == 1 && $geneticMappingUpgrade >= 2>> @@.yellow;hfert@@ <</if>> - <<if getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.superfetation == 2>> + <<if getSlave($AS).womb[_ap].genetics.geneticQuirks.superfetation == 2>> @@.green;supfet@@ - <<elseif getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.superfetation == 1 && $geneticMappingUpgrade >= 2>> + <<elseif getSlave($AS).womb[_ap].genetics.geneticQuirks.superfetation == 1 && $geneticMappingUpgrade >= 2>> @@.yellow;supfet@@ <</if>> - <<if getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.uterineHypersensitivity == 2>> + <<if getSlave($AS).womb[_ap].genetics.geneticQuirks.uterineHypersensitivity == 2>> @@.green;uthyp@@ - <<elseif getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.uterineHypersensitivity == 1 && $geneticMappingUpgrade >= 2>> + <<elseif getSlave($AS).womb[_ap].genetics.geneticQuirks.uterineHypersensitivity == 1 && $geneticMappingUpgrade >= 2>> @@.yellow;uthyp@@ <</if>> - <<if getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.macromastia >= 2>> + <<if getSlave($AS).womb[_ap].genetics.geneticQuirks.macromastia >= 2>> @@.red;mmast@@ - <<elseif getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.macromastia == 1 && $geneticMappingUpgrade >= 2>> + <<elseif getSlave($AS).womb[_ap].genetics.geneticQuirks.macromastia == 1 && $geneticMappingUpgrade >= 2>> @@.yellow;mast@@ <</if>> - <<if getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.gigantomastia >= 2>> + <<if getSlave($AS).womb[_ap].genetics.geneticQuirks.gigantomastia >= 2>> @@.red;gmast@@ - <<elseif getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.gigantomastia == 1 && $geneticMappingUpgrade >= 2>> + <<elseif getSlave($AS).womb[_ap].genetics.geneticQuirks.gigantomastia == 1 && $geneticMappingUpgrade >= 2>> @@.yellow;gmast@@ <</if>> - <<if getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.wellHung == 2>> + <<if getSlave($AS).womb[_ap].genetics.geneticQuirks.wellHung == 2>> @@.green;bigd@@ - <<elseif getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.wellHung == 1 && $geneticMappingUpgrade >= 2>> + <<elseif getSlave($AS).womb[_ap].genetics.geneticQuirks.wellHung == 1 && $geneticMappingUpgrade >= 2>> @@.yellow;bigd@@ <</if>> - <<if getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.rearLipedema == 2>> + <<if getSlave($AS).womb[_ap].genetics.geneticQuirks.rearLipedema == 2>> @@.red;lipe@@ - <<elseif getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.rearLipedema == 1 && $geneticMappingUpgrade >= 2>> + <<elseif getSlave($AS).womb[_ap].genetics.geneticQuirks.rearLipedema == 1 && $geneticMappingUpgrade >= 2>> @@.yellow;lipe@@ <</if>> - <<if getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.wGain == 2>> + <<if getSlave($AS).womb[_ap].genetics.geneticQuirks.wGain == 2>> @@.red;lepti+@@ - <<elseif getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.wGain == 1 && $geneticMappingUpgrade >= 2>> + <<elseif getSlave($AS).womb[_ap].genetics.geneticQuirks.wGain == 1 && $geneticMappingUpgrade >= 2>> @@.yellow;lepti+@@ <</if>> - <<if getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.wLoss == 2>> + <<if getSlave($AS).womb[_ap].genetics.geneticQuirks.wLoss == 2>> @@.red;lepti-@@ - <<elseif getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.wLoss == 1 && $geneticMappingUpgrade >= 2>> + <<elseif getSlave($AS).womb[_ap].genetics.geneticQuirks.wLoss == 1 && $geneticMappingUpgrade >= 2>> @@.yellow;lepti-@@ <</if>> - <<if getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.mGain == 2>> + <<if getSlave($AS).womb[_ap].genetics.geneticQuirks.mGain == 2>> @@.red;myot+@@ - <<elseif getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.mGain == 1 && $geneticMappingUpgrade >= 2>> + <<elseif getSlave($AS).womb[_ap].genetics.geneticQuirks.mGain == 1 && $geneticMappingUpgrade >= 2>> @@.yellow;myot+@@ <</if>> - <<if getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.mLoss == 2>> + <<if getSlave($AS).womb[_ap].genetics.geneticQuirks.mLoss == 2>> @@.red;myot-@@ - <<elseif getSlave($activeSlave.ID).womb[_ap].genetics.geneticQuirks.mLoss == 1 && $geneticMappingUpgrade >= 2>> + <<elseif getSlave($AS).womb[_ap].genetics.geneticQuirks.mLoss == 1 && $geneticMappingUpgrade >= 2>> @@.yellow;myot-@@ <</if>> </div> <<else>> - <<if getSlave($activeSlave.ID).womb[_ap].age > 13>> + <<if getSlave($AS).womb[_ap].age > 13>> <div class="indent"> - Gender: <<= getSlave($activeSlave.ID).womb[_ap].genetics.gender>> + Gender: <<= getSlave($AS).womb[_ap].genetics.gender>> </div> <</if>> - <<if getSlave($activeSlave.ID).womb[_ap].age > 5>> + <<if getSlave($AS).womb[_ap].age > 5>> <div class="indent"> - Father ID: <<= getSlave($activeSlave.ID).womb[_ap].genetics.father>> + Father ID: <<= getSlave($AS).womb[_ap].genetics.father>> </div> <div class="indent"> - Father Name: <<= getSlave($activeSlave.ID).womb[_ap].genetics.fatherName>> + Father Name: <<= getSlave($AS).womb[_ap].genetics.fatherName>> </div> <div class="indent"> - Mother ID: <<= getSlave($activeSlave.ID).womb[_ap].genetics.mother>> + Mother ID: <<= getSlave($AS).womb[_ap].genetics.mother>> </div> <div class="indent"> - Mother Name: <<= getSlave($activeSlave.ID).womb[_ap].genetics.motherName>> + Mother Name: <<= getSlave($AS).womb[_ap].genetics.motherName>> </div> <</if>> <</if>> <<if $incubator > 0 || $nursery > 0>> <div class="indent"> - Reserved: <<= getSlave($activeSlave.ID).womb[_ap].reserve>> + Reserved: <<= getSlave($AS).womb[_ap].reserve>> </div> <</if>> <div class="indent"> - Rename: <<textbox "_tempName" _tempName >> [[Apply | Analyze Pregnancy][getSlave($activeSlave.ID).womb[_ap].genetics.name = _tempName]] + Rename: <<textbox "_tempName" _tempName >> [[Apply | Analyze Pregnancy][getSlave($AS).womb[_ap].genetics.name = _tempName]] </div> - <<if getSlave($activeSlave.ID).womb[_ap].age < 4 && ($arcologies[0].FSRestart == "unset" || $eugenicsFullControl == 1 || getSlave($activeSlave.ID).breedingMark == 0 || $propOutcome == 0 || (getSlave($activeSlave.ID).womb[_ap].fatherID != -1 && getSlave($activeSlave.ID).womb[_ap].fatherID != -6))>> + <<if getSlave($AS).womb[_ap].age < 4 && ($arcologies[0].FSRestart == "unset" || $eugenicsFullControl == 1 || getSlave($AS).breedingMark == 0 || $propOutcome == 0 || (getSlave($AS).womb[_ap].fatherID != -1 && getSlave($AS).womb[_ap].fatherID != -6))>> <div class="indent"> - <<link "Terminate ovum" "Analyze Pregnancy">><<run WombRemoveFetus(getSlave($activeSlave.ID), _ap)>><<if getSlave($activeSlave.ID).preg == 0>><<set getSlave($activeSlave.ID).pregWeek = -1>><</if>><</link>> + <<link "Terminate ovum" "Analyze Pregnancy">><<run WombRemoveFetus(getSlave($AS), _ap)>><<if getSlave($AS).preg == 0>><<set getSlave($AS).pregWeek = -1>><</if>><</link>> <<if $surgeryUpgrade == 1>> - | [[Transplant ovum|Ova Transplant Workaround][$donatrix = getSlave($activeSlave.ID), $wombIndex = _ap, $nextLink = "Analyze Pregnancy"]] + | [[Transplant ovum|Ova Transplant Workaround][$donatrix = getSlave($AS), $wombIndex = _ap, $nextLink = "Analyze Pregnancy"]] <</if>> </div> <</if>> <<if $incubator > 0>> <div class="indent"> - <<if getSlave($activeSlave.ID).womb[_ap].reserve === "incubator">> + <<if getSlave($AS).womb[_ap].reserve === "incubator">> <<link "Don't keep this child in $incubatorName" "Analyze Pregnancy">> - <<set getSlave($activeSlave.ID).womb[_ap].reserve = "">> + <<set getSlave($AS).womb[_ap].reserve = "">> <<set $reservedChildren-->> <</link>> <<elseif _freeTanks - $reservedChildren > 0>> <<link "Keep this child in $incubatorName" "Analyze Pregnancy">> - <<if getSlave($activeSlave.ID).womb[_ap].reserve === "nursery">> + <<if getSlave($AS).womb[_ap].reserve === "nursery">> <<set $reservedChildrenNursery-->> <</if>> - <<set getSlave($activeSlave.ID).womb[_ap].reserve = "incubator">> + <<set getSlave($AS).womb[_ap].reserve = "incubator">> <<set $reservedChildren++>> <</link>> <<else>> @@ -336,17 +336,17 @@ <</if>> <<if $nursery > 0>> <div class="indent"> - <<if getSlave($activeSlave.ID).womb[_ap].reserve === "nursery">> + <<if getSlave($AS).womb[_ap].reserve === "nursery">> <<link "Don't keep this child in $nurseryName" "Analyze Pregnancy">> - <<set getSlave($activeSlave.ID).womb[_ap].reserve = "">> + <<set getSlave($AS).womb[_ap].reserve = "">> <<set $reservedChildrenNursery-->> <</link>> <<elseif _freeCribs - $reservedChildrenNursery > 0>> <<link "Keep this child in $nurseryName" "Analyze Pregnancy">> - <<if getSlave($activeSlave.ID).womb[_ap].reserve === "incubator">> + <<if getSlave($AS).womb[_ap].reserve === "incubator">> <<set $reservedChildren-->> <</if>> - <<set getSlave($activeSlave.ID).womb[_ap].reserve = "nursery">> + <<set getSlave($AS).womb[_ap].reserve = "nursery">> <<set $reservedChildrenNursery++>> <</link>> <<else>> @@ -362,9 +362,9 @@ Age: too early for scan. </div> <div class="indent"> - <<link "Terminate ovum" "Analyze Pregnancy">><<run WombRemoveFetus(getSlave($activeSlave.ID), _ap)>><<if getSlave($activeSlave.ID).preg == 0>><<set getSlave($activeSlave.ID).pregWeek = -1>><</if>><</link>> + <<link "Terminate ovum" "Analyze Pregnancy">><<run WombRemoveFetus(getSlave($AS), _ap)>><<if getSlave($AS).preg == 0>><<set getSlave($AS).pregWeek = -1>><</if>><</link>> <<if $surgeryUpgrade == 1>> - | [[Transplant ovum|Ova Transplant Workaround][$donatrix = getSlave($activeSlave.ID), $wombIndex = _ap, $nextLink = "Analyze Pregnancy"]] + | [[Transplant ovum|Ova Transplant Workaround][$donatrix = getSlave($AS), $wombIndex = _ap, $nextLink = "Analyze Pregnancy"]] <</if>> </div> <</if>> @@ -372,16 +372,16 @@ </p> <</for>> </p> -<<elseif getSlave($activeSlave.ID).preg == -3>> /*special states*/ +<<elseif getSlave($AS).preg == -3>> /*special states*/ Failure to locate any ova. Subject is infertile. -<<elseif getSlave($activeSlave.ID).pregWeek < 0>> /*special states*/ +<<elseif getSlave($AS).pregWeek < 0>> /*special states*/ Subject is in the postpartem period. -<<elseif getSlave($activeSlave.ID).ovaryAge >= 47 >> +<<elseif getSlave($AS).ovaryAge >= 47 >> $His infertility is due to menopausal ovaries. -<<elseif getSlave($activeSlave.ID).ovaries === 0 && getSlave($activeSlave.ID).mpreg === 0>> +<<elseif getSlave($AS).ovaries === 0 && getSlave($AS).mpreg === 0>> $His infertility is due to missing ovaries. -<<elseif getSlave($activeSlave.ID).preg == -2>> /*special states*/ +<<elseif getSlave($AS).preg == -2>> /*special states*/ $His infertility is due to sterilization; $his ovaries could still work. -<<elseif getSlave($activeSlave.ID).preg == -1>> /*special states*/ +<<elseif getSlave($AS).preg == -1>> /*special states*/ Contraceptive agents detected in subject. <</if>> diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw index 4635f08762285bbf4fd2df7fc8a7c4675af87b91..5cfb1adedfca915ff626ee7dccf7c079b47bddbf 100644 --- a/src/uncategorized/bodyModification.tw +++ b/src/uncategorized/bodyModification.tw @@ -1,7 +1,6 @@ :: Body Modification [nobr jump-from-safe] <<set $nextButton = "Confirm changes", $nextLink = "Slave Interact">> -<<set $AS = $activeSlave.ID>> <<run App.Utils.setLocalPronouns(getSlave($AS))>> <<run Enunciate(getSlave($AS))>> diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index 27c311d0f3d86170e9e9e654c76bf6687db34ab5..9ac7709b946e758484da457335fe2e2fea8a29bb 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -8,7 +8,6 @@ <<set $nextButton = "Confirm changes", $nextLink = "Slave Interact">> -<<set $AS = $activeSlave.ID>> <<run App.Utils.setLocalPronouns(getSlave($AS))>> <<run updateHealth(getSlave($AS))>> diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw index 8fade6d11b58ccc74f46962690d630131f950f57..40e4e8d6b826fff50902559e31453a202499bee5 100644 --- a/src/uncategorized/salon.tw +++ b/src/uncategorized/salon.tw @@ -1,7 +1,6 @@ :: Salon [nobr jump-from-safe] <<set $nextButton = "Confirm changes", $nextLink = "Slave Interact", $encyclopedia = "The Auto Salon">> -<<set $AS = $activeSlave.ID>> <<run App.Utils.setLocalPronouns(getSlave($AS))>> <<if $showInches == 2>>