diff --git a/Changelog.txt b/Changelog.txt index 95aa0077e1dc0dce2dedbfbcade50c709b077a5b..29a509b70acd93334028e80d9eabe10d1d14d662 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,5 +1,16 @@ Pregmod +0.10.7.1-3.6.x + + 7/30/2020 + + 0 + -revised mobility tracking + -overhauled inbreeding effects + -farmyard development progressed + -continued code cleanup + -fixes + 0.10.7.1-3.5.x 7/06/2020 diff --git a/src/002-config/fc-version.js b/src/002-config/fc-version.js index c708b0e83f7310be88e2450530cc6a2eca0b2123..bd6f349e40c4ddc1a2af0c1b1e0b4628bc4827cc 100644 --- a/src/002-config/fc-version.js +++ b/src/002-config/fc-version.js @@ -1,6 +1,6 @@ App.Version = { base: "0.10.7.1", // The vanilla version the mod is based off of, this should never be changed. - pmod: "3.5.4", + pmod: "3.6.0", commitHash: null, - release: 1077 + release: 1078 }; diff --git a/src/Mods/DinnerParty/dinnerPartyPreparations.tw b/src/Mods/DinnerParty/dinnerPartyPreparations.tw index 21d00fcdb1547c57eb1901b7fb4329c5080ad9df..33faa2cdb6eaf260ddce23e59e7be448951ff2a4 100644 --- a/src/Mods/DinnerParty/dinnerPartyPreparations.tw +++ b/src/Mods/DinnerParty/dinnerPartyPreparations.tw @@ -33,9 +33,9 @@ __Select Your Meat:__ s => assignmentVisible(s) && s.fuckdoll === 0, App.UI.SlaveList.SlaveInteract.stdInteract, null, - (s, i) => { + (s) => { const p = getPronouns(s); return App.UI.DOM.passageLink(`Make ${p.him} the main course`, "Dinner Party Execution", - () => { App.Utils.setActiveSlaveByIndex(i); }) + () => { $activeSlave = s; }) } )>> diff --git a/src/Mods/SecExp/attackHandler.tw b/src/Mods/SecExp/attackHandler.tw index b51aaa35b909dc3f420c89fff4bfe78e4f0995b5..ecd96fb5a4740bc6e05d56f083c14a5bbdef427c 100644 --- a/src/Mods/SecExp/attackHandler.tw +++ b/src/Mods/SecExp/attackHandler.tw @@ -427,8 +427,7 @@ /* 60% chance of getting combat skill if not already have it */ <<if _S.HeadGirl.skill.combat == 0 && random(1,100) <= 60>> <<set $gainedCombat = 1>> - <<set _i = $slaveIndices[$HeadGirlID]>> - <<set $slaves[_i].skill.combat = 1>> + <<set _S.HeadGirl.skill.combat = 1>> <</if>> <<elseif $leadingTroops == "citizen">> <<if $arcologies[0].FSDegradationist == "unset" && $arcologies[0].FSPaternalist == "unset">> diff --git a/src/Mods/SecExp/attackReport.tw b/src/Mods/SecExp/attackReport.tw index 6e6c204e5a142f74f1c98e38d199fc9b99c7e52b..9d7c3568b09decad3164b39edbca55cb929c4b90 100644 --- a/src/Mods/SecExp/attackReport.tw +++ b/src/Mods/SecExp/attackReport.tw @@ -949,7 +949,7 @@ <</if>> <<if $leaderWounded == 1>> Unfortunately, @@.red;$he sustained major injuries.@@ - <<set _woundType = App.SecExp.inflictBattleWound(_S.Bodyguard))>> + <<set _woundType = App.SecExp.inflictBattleWound(_S.Bodyguard)>> <<if _woundType == "voice">> A stray bullet hit $his neck. While $he fortunately avoided fatal hemorrhaging, $his vocal cords were irreparably damaged. <<elseif _woundType == "eyes">> @@ -1107,14 +1107,13 @@ <<set _found = 1>> <<if $slaveVictories[_i].victories >= 10>> <<if _S.HeadGirl.prestige < 3>> - <<set _j = $slaveIndices[$HeadGirlID]>> - <<set $slaves[_j].prestige++>> - <<if $slaves[_j].prestige == 1>> - <<set $slaves[_j].prestigeDesc = "$He is well known for being a great commander.">> - <<elseif $slaves[_j].prestige == 2>> - <<set $slaves[_j].prestigeDesc = "$He is famous for being an incredible commander.">> - <<elseif $slaves[_j].prestige == 3>> - <<set $slaves[_j].prestigeDesc = "$He is known as a legendary commander all over the world.">> + <<set _S.HeadGirl.prestige++>> + <<if _S.HeadGirl.prestige == 1>> + <<set _S.HeadGirl.prestigeDesc = "$He is well known for being a great commander.">> + <<elseif _S.HeadGirl.prestige == 2>> + <<set _S.HeadGirl.prestigeDesc = "$He is famous for being an incredible commander.">> + <<elseif _S.HeadGirl.prestige == 3>> + <<set _S.HeadGirl.prestigeDesc = "$He is known as a legendary commander all over the world.">> <</if>> <<set $slaveVictories[_i].victories = 0>> $He brought your army to victory so many times that $his @@.green;prestige has increased.@@ diff --git a/src/Mods/SecExp/rebellionReport.tw b/src/Mods/SecExp/rebellionReport.tw index 19542a95f2988e7fd7b260578712f5b1ef933c82..a32f7242c41b313ada87e19aea5f4efd40e981ad 100644 --- a/src/Mods/SecExp/rebellionReport.tw +++ b/src/Mods/SecExp/rebellionReport.tw @@ -864,7 +864,7 @@ <<set _woundChance *= random(2,4)>> <<if random(1,100) <= _woundChance>> Your Concubine was unfortunately caught in the crossfire and - <<set _woundType = App.SecExp.inflictBattleWound(_S.Concubine))>> + <<set _woundType = App.SecExp.inflictBattleWound(_S.Concubine)>> <<if _woundType == "voice">> a splinter pierced $his throat, severing $his vocal cords. <<elseif _woundType == "eyes">> diff --git a/src/endWeek/slaveAssignmentReport.js b/src/endWeek/slaveAssignmentReport.js index 4ff9b0c3e5b20f8ed8f1d239b2f18ff82e850414..be509a1599939f2a9f5ba3499f8aa3480754a85d 100644 --- a/src/endWeek/slaveAssignmentReport.js +++ b/src/endWeek/slaveAssignmentReport.js @@ -169,7 +169,7 @@ App.EndWeek.slaveAssignmentReport = function() { if (V.HeadGirlID !== 0) { V.HGEnergy++; const slave = slaveStateById(V.HeadGirlID); - if (V.personalAttention === PersonalAttention.SUPPORTHG) { + if (V.personalAttention === PersonalAttention.SUPPORTHG && V.PC.health.shortDamage < 30) { V.HGEnergy++; if (slave.trust > 95) { V.HGEnergy++; diff --git a/src/facilities/nursery/widgets/utils/nurseryUtils.js b/src/facilities/nursery/widgets/utils/nurseryUtils.js index 3e636c107c5a2f9f544c1e061fefb529bc4db0f9..ec19f95653090d18e7e08ddd8554e8fc9cf570ac 100644 --- a/src/facilities/nursery/widgets/utils/nurseryUtils.js +++ b/src/facilities/nursery/widgets/utils/nurseryUtils.js @@ -543,7 +543,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) { r += `After some careful consideration, ${mother.slaveName} decides on "${child.slaveName}" for ${his2} daughter. ${He2} hopes you'll find it fitting ${his} station. <</replace>> <</link>>`; - } else if (mother.ID === V.HeadgirlID) { + } else if (mother.ID === V.HeadGirlID) { r += `<br> <<link "Permit your Head Girl to name ${his2} daughter">> <<replace "#naming">>`; @@ -592,7 +592,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) { r += `After some careful consideration, ${father.slaveName} decides on "${child.slaveName}" for ${his2} daughter. ${He2} hopes you'll find it fitting ${his} station. <</replace>> <</link>>`; - } else if (father.ID === V.HeadgirlID) { + } else if (father.ID === V.HeadGirlID) { r += `<br> <<link "Permit your Head Girl to name ${his2} daughter">> <<replace "#naming">>`; diff --git a/src/interaction/main/mainLinks.js b/src/interaction/main/mainLinks.js index 44ea3bca163ebed56cef9ef3faad8001125541a6..ce44b3ac496300112e1c0b63539ab92a10ed9ffe 100644 --- a/src/interaction/main/mainLinks.js +++ b/src/interaction/main/mainLinks.js @@ -90,7 +90,7 @@ App.UI.View.mainLinks = function() { if (V.useSlaveSummaryOverviewTab === 0) { let div = document.createElement("div"); - if (typeof V.slaveIndices[V.HeadGirlID] !== 'undefined') { + if (S.HeadGirl) { div.append(App.UI.DOM.makeElement("span", SlaveFullName(S.HeadGirl), "slave-name"), " is serving as your Head Girl"); if (V.arcologies[0].FSEgyptianRevivalistLaw === 1) { div.append(` and Consort`); @@ -174,13 +174,13 @@ App.UI.View.mainLinks = function() { if (V.adjustProstheticsCompleted > 0) { for (let j = 0; j < V.adjustProsthetics.length; j++) { - if (getSlave(V.adjustProsthetics[j].slaveID) !== undefined) { - const i = V.slaveIndices[V.adjustProsthetics[j].slaveID]; + const slave = getSlave(V.adjustProsthetics[j].slaveID); + if (slave) { if (V.adjustProsthetics[j].workLeft <= 0) { const div = document.createElement("div"); div.classList.add("yellow"); div.append(`The lab has completed ${addA(setup.prosthetics[V.adjustProsthetics[j].id].name)} for `, - App.UI.DOM.makeElement("span", App.UI.DOM.link(SlaveFullName(V.slaves[i]), () => { V.activeSlave = V.slaves[i]; }, [], "Slave Interact"), "clear-formatting"), + App.UI.DOM.makeElement("span", App.UI.DOM.link(SlaveFullName(slave), () => { V.activeSlave = slave; }, [], "Slave Interact"), "clear-formatting"), " which is ready to be attached."); fragment.append(div); } diff --git a/src/js/ibcJS.js b/src/js/ibcJS.js index d1e916f4d49a9fa50ca9343b1ad5b359142887a7..de19d72413076b5f715970621b77c7b3d442d2ba 100644 --- a/src/js/ibcJS.js +++ b/src/js/ibcJS.js @@ -470,7 +470,7 @@ globalThis.ibc = (() => { } // Use a string of the form "parent;parent" to store the cache value; since kinship is - // commutative, the minumum parent ID will be first + // commutative, the minimum parent ID will be first let kinship_str = Math.min(f.mother, f.father) + ';' + Math.max(f.mother, f.father); if (!kinship_cache.has(kinship_str)) kinship_cache.set(kinship_str, kinship(nodes[f.mother], nodes[f.father])); diff --git a/src/js/utilsFC.js b/src/js/utilsFC.js index 6953e0af1df7cfa84488f7827ed525c0dfe3c0dd..0bc9f329be11401e12c5ed7beaa12352e011f581 100644 --- a/src/js/utilsFC.js +++ b/src/js/utilsFC.js @@ -2689,25 +2689,6 @@ globalThis.nippleColorLevel = function(color) { return nippleColor[color]; }; -/** - * Expression for SugarCube for referencing a slave by index - * @param {number} i slave array index or -1 for activeSlave - * @returns {string} - */ -App.Utils.slaveRefString = function(i) { - return i >= 0 ? `$slaves[${i}]` : '$activeSlave'; -}; - -/** - * Sets active slave to the slave with the given index. Does nothing if index < 0 - * @param {number} index - */ -App.Utils.setActiveSlaveByIndex = function(index) { - if (index >= 0) { - V.activeSlave = V.slaves[index]; - } -}; - /** * Sets temporary variables named by the scheme, described below, to pronouns for the given slave * @param {App.Entity.SlaveState} slave diff --git a/src/npc/interaction/FFuckdollAnal.tw b/src/npc/interaction/FFuckdollAnal.tw index 1eb3cb0e90e5b3ea82476f72778db26eb3ba835b..f06e4b2967a93750080b6ca1010a5b9432065c86 100644 --- a/src/npc/interaction/FFuckdollAnal.tw +++ b/src/npc/interaction/FFuckdollAnal.tw @@ -49,7 +49,3 @@ You climax<<if $PC.dick != 0>>, filling $his rectum with your cum,<</if>> and re In any case, <span class="virginity loss">$his rear hole has been broken in.</span> <<set getSlave($AS).anus = 1>> <</if>> - -<<if passage() != "Slave Interact">> - <<set $slaves[$slaveIndices[getSlave($AS).ID]] = getSlave($AS)>> -<</if>> diff --git a/src/npc/interaction/FFuckdollImpreg.tw b/src/npc/interaction/FFuckdollImpreg.tw index 00db19147b0c1e2f4c0499b841734303eb08a34f..64745f102e46e0307816f23f91b67e7c5ea3f4eb 100644 --- a/src/npc/interaction/FFuckdollImpreg.tw +++ b/src/npc/interaction/FFuckdollImpreg.tw @@ -85,7 +85,3 @@ You repeat this ritual throughout the week, ensuring that $he will be an @@.preg <<set $failedElite += 5>> <</if>> <</if>> - -<<if passage() != "Slave Interact">> - <<set $slaves[$slaveIndices[getSlave($AS).ID]] = getSlave($AS)>> -<</if>> diff --git a/src/npc/interaction/FFuckdollOral.tw b/src/npc/interaction/FFuckdollOral.tw index 66cfc24ef2f8af2be2b5bad756442374a1c96503..b1f425c1a1d9b5460e91463d98e228b4221164ba 100644 --- a/src/npc/interaction/FFuckdollOral.tw +++ b/src/npc/interaction/FFuckdollOral.tw @@ -30,7 +30,3 @@ You climax, <<if $PC.dick != 0>>blowing your load down $his throat<<else>>giving <<else>>$He swallows repeatedly as $he returns to $his resting posture. <</if>> <</if>> - -<<if passage() != "Slave Interact">> - <<set $slaves[$slaveIndices[getSlave($AS).ID]] = getSlave($AS)>> -<</if>> diff --git a/src/npc/interaction/FFuckdollVaginal.tw b/src/npc/interaction/FFuckdollVaginal.tw index 77f62d82afb749e73e274e237ad5f739ea22fd88..1daa848d979a5be77c22338365168c94d9d015b6 100644 --- a/src/npc/interaction/FFuckdollVaginal.tw +++ b/src/npc/interaction/FFuckdollVaginal.tw @@ -49,7 +49,3 @@ You climax<<if $PC.dick != 0>>, your cum shooting forward to splash against $his In any case, @@.lime;$his front hole has been broken in.@@ <<set getSlave($AS).vagina = 1>> <</if>> - -<<if passage() != "Slave Interact">> - <<set $slaves[$slaveIndices[getSlave($AS).ID]] = getSlave($AS)>> -<</if>> diff --git a/src/npc/interaction/fAnus.tw b/src/npc/interaction/fAnus.tw index a22547fa64668fd0f90be640855620a0e6a11314..90ee11ac4bfe327ee7b4335cf80f9f6120219a55 100644 --- a/src/npc/interaction/fAnus.tw +++ b/src/npc/interaction/fAnus.tw @@ -246,7 +246,3 @@ You call $him over so you can <</if>> <</if>> <</if>> - -<<if passage() != "Slave Interact">> - <<set $slaves[$slaveIndices[getSlave($AS).ID]] = getSlave($AS)>> -<</if>> diff --git a/src/npc/interaction/fAssistedSex.tw b/src/npc/interaction/fAssistedSex.tw index e809d033e2bd48e1ddba47c53d8687f8c09ebb98..8efdc030ed43b3d44494d8ca081e23bf30bf5d42 100644 --- a/src/npc/interaction/fAssistedSex.tw +++ b/src/npc/interaction/fAssistedSex.tw @@ -96,10 +96,3 @@ $he draws toward you, half-floating on a river of silent, groping hands. When $h <<set getSlave($AS).counter.oral++, $oralTotal++>> <</if>> Once you are satisfied, you send $him away to clean $himself up before returning to $his duties. - -<<if passage() != "Slave Interact">> - <<set _fv = $slaveIndices[getSlave($AS).ID]>> - <<if def _fv>> - <<set $slaves[_fv] = getSlave($AS)>> - <</if>> -<</if>> diff --git a/src/npc/interaction/fBeg.tw b/src/npc/interaction/fBeg.tw index a1f94f2c2159a3d0613fdecb2d92607a40a3f36f..0cd9fdb571883ce84ba28826b8367be5b0e5740c 100644 --- a/src/npc/interaction/fBeg.tw +++ b/src/npc/interaction/fBeg.tw @@ -438,10 +438,3 @@ You give $him permission to speak, and tell $him that $he may beg $his <<= Writt <<set getSlave($AS).fetish = "submissive", getSlave($AS).fetishKnown = 1>> <</if>> <</if>> - -<<if passage() != "Slave Interact">> - <<set _fl = $slaveIndices[getSlave($AS).ID]>> - <<if def _fl>> - <<set $slaves[_fl] = getSlave($AS)>> - <</if>> -<</if>> \ No newline at end of file diff --git a/src/npc/interaction/fBellyFuck.tw b/src/npc/interaction/fBellyFuck.tw index ee82cebde746b0d9c6ae5bd3f89368e2a2f26f67..3ad1ee54278a0639eae4d5bbcb38efce5d229b71 100644 --- a/src/npc/interaction/fBellyFuck.tw +++ b/src/npc/interaction/fBellyFuck.tw @@ -89,10 +89,3 @@ and then spread $his cheeks for easier access to $his <<if canDoVaginal(getSlave <<else>> that you've left $him thoroughly exhausted. <</if>> - -<<if passage() != "Slave Interact">> - <<set _fv = $slaveIndices[getSlave($AS).ID]>> - <<if def _fv>> - <<set $slaves[_fv] = getSlave($AS)>> - <</if>> -<</if>> diff --git a/src/npc/interaction/fBoobs.tw b/src/npc/interaction/fBoobs.tw index 037516b5a9676580d68035ba2ae809abbf06bd03..90e91f2a8a0e17ef2b88d386da4af5d307445237 100644 --- a/src/npc/interaction/fBoobs.tw +++ b/src/npc/interaction/fBoobs.tw @@ -240,7 +240,3 @@ tits. $He hurries off to wash $his <<if getSlave($AS).boobs > 1500>>acre of cleavage<<elseif getSlave($AS).boobs > 500>>generous cleavage<<else>>chest<</if>> so that you will be unguarded for as little time as possible. <</switch>> <</if>> - -<<if passage() !== "Slave Interact">> - <<set $slaves[$slaveIndices[getSlave($AS).ID]] = getSlave($AS)>> -<</if>> diff --git a/src/npc/interaction/fButt.tw b/src/npc/interaction/fButt.tw index 72ca222ef02c34e6c63a3402733d4f910597d74f..7d3402ad6850bcc55f5a87d0ac18cd192b5ce949 100644 --- a/src/npc/interaction/fButt.tw +++ b/src/npc/interaction/fButt.tw @@ -244,7 +244,3 @@ You call $him over so you can <</if>> <</if>> - -<<if passage() !== "Slave Interact">> - <<set $slaves[$slaveIndices[getSlave($AS).ID]] = getSlave($AS)>> -<</if>> diff --git a/src/npc/interaction/fDance.tw b/src/npc/interaction/fDance.tw index c094f11af1bbb3bbb48cbfaa09177aa447dd7aa7..d53bee364747b24278f9409f1bae1bc4a4c012dc 100644 --- a/src/npc/interaction/fDance.tw +++ b/src/npc/interaction/fDance.tw @@ -1638,10 +1638,3 @@ Once the last piece of clothing has hit the floor you let your little slut dance <<set getSlave($AS).fetish = "humiliation", getSlave($AS).fetishKnown = 1>> <</if>> <</if>> - -<<if passage() != "Slave Interact">> - <<set _fl = $slaveIndices[getSlave($AS).ID]>> - <<if def _fl>> - <<set $slaves[_fl] = getSlave($AS)>> - <</if>> -<</if>> diff --git a/src/npc/interaction/fDick.tw b/src/npc/interaction/fDick.tw index 9842daff7b691e7d6523f7fa8e84ce4c7a4bc716..0ff958866d2a08e57586a7b2fc5b55d50eed98c1 100644 --- a/src/npc/interaction/fDick.tw +++ b/src/npc/interaction/fDick.tw @@ -266,7 +266,3 @@ Rumors spread that you @@.red;enjoy taking it from slaves.@@ <<set $PC.degeneracy += 2>> <</if>> - -<<if passage() !== "Slave Interact">> - <<set $slaves[$slaveIndices[getSlave($AS).ID]] = getSlave($AS)>> -<</if>> diff --git a/src/npc/interaction/fLips.tw b/src/npc/interaction/fLips.tw index 907be5732da144be1909ffafda156ff03ed55164..36b55dd9eccfcbc5309c290e897845254a008023 100644 --- a/src/npc/interaction/fLips.tw +++ b/src/npc/interaction/fLips.tw @@ -219,10 +219,3 @@ You tell <<= getSlave($AS).slaveName>> to <<set getSlave($AS).fetish = "cumslut", getSlave($AS).fetishKnown = 1>> <</if>> <</if>> - -<<if passage() != "Slave Interact">> - <<set _fl = $slaveIndices[getSlave($AS).ID]>> - <<if def _fl>> - <<set $slaves[_fl] = getSlave($AS)>> - <</if>> -<</if>> diff --git a/src/npc/interaction/fMaternitySwing.tw b/src/npc/interaction/fMaternitySwing.tw index 2d3a9eeceab5640382ebcc2629c42e9517755bf2..dedbfd384339d305c2a455e97ee1c74fe48fa72f 100644 --- a/src/npc/interaction/fMaternitySwing.tw +++ b/src/npc/interaction/fMaternitySwing.tw @@ -52,10 +52,3 @@ The sight of $his swollen body wobbling in mid-air as you pound away at $him nev and the sight of $his ugly tears rolling down $his face to hit the ground far below is one hell of a bonus. <</if>> Once finished, you release $him from $his restraints and have $him carried away to clean $himself up before returning to $his duties. - -<<if passage() != "Slave Interact">> - <<set _fv = $slaveIndices[getSlave($AS).ID]>> - <<if def _fv>> - <<set $slaves[_fv] = getSlave($AS)>> - <</if>> -<</if>> diff --git a/src/npc/interaction/fPoolSex.tw b/src/npc/interaction/fPoolSex.tw index baf3d3a14ea16aba4189841c7d195e5eaf565151..600d22adf2dc7bf9378dc69eba7cb3281f07c961 100644 --- a/src/npc/interaction/fPoolSex.tw +++ b/src/npc/interaction/fPoolSex.tw @@ -169,10 +169,3 @@ You order $him to meet you in the spa for some quality time in the penthouse's r <</if>> <</if>> After you've finished with $him, you escort $him to the spa's attached showers so that the two of you can enjoy a bit more time together as you clean off, then allow $him to return to $his duties as you return to your own. - -<<if passage() != "Slave Interact">> - <<set _fv = $slaveIndices[getSlave($AS).ID]>> - <<if def _fv>> - <<set $slaves[_fv] = getSlave($AS)>> - <</if>> -<</if>> diff --git a/src/npc/interaction/fVagina.tw b/src/npc/interaction/fVagina.tw index 7386318b2a323f9095eb7e68e84905a71d2f051d..57efafa30855d587107b8499081e471e5b6a5f2b 100644 --- a/src/npc/interaction/fVagina.tw +++ b/src/npc/interaction/fVagina.tw @@ -553,10 +553,3 @@ You call $him over so you can <</switch>> <</if>> <</if>> - -<<if passage() != "Slave Interact">> - <<set _fv = $slaveIndices[getSlave($AS).ID]>> - <<if def _fv>> - <<set $slaves[_fv] = getSlave($AS)>> - <</if>> -<</if>> diff --git a/src/pregmod/FCTV/seFCTVshows.tw b/src/pregmod/FCTV/seFCTVshows.tw index 82341bb4ee36fac8a1c8d06ad0880f25b352fa12..2cbb9bdb45d8cba086cf8fc06f28cb911d275e87 100644 --- a/src/pregmod/FCTV/seFCTVshows.tw +++ b/src/pregmod/FCTV/seFCTVshows.tw @@ -1335,12 +1335,11 @@ You've never had a more hope-filled orgasm. <<elseif $PC.vagina >= 1>> Stunned and soaking wet, you hurry to - <<if _S.Concubine != 0 && canPenetrate(_S.Concubine) && canImpreg($PC, _S.Concubine) && ($policies.sexualOpeness == 1 || _S.Concubine.toyHole == "dick")>> + <<if _S.Concubine && canPenetrate(_S.Concubine) && canImpreg($PC, _S.Concubine) && ($policies.sexualOpeness == 1 || _S.Concubine.toyHole == "dick")>> <<setLocalPronouns _S.Concubine>> get _S.Concubine.slaveName nice and hard before recreating the entire ending with $him. You've never had a more hope-filled orgasm. <<= knockMeUp($PC, 10, 0, $ConcubineID, 1)>> - <<set _fctvs = $slaveIndices[$ConcubineID]>> - <<set $slaves[_fctvs].counter.penetrative++, $penetrativeTotal++>> + <<set _S.Concubine.counter.penetrative++, $penetrativeTotal++>> <<elseif $policies.sexualOpeness == 1>> find your favorite cock to get a creampie from. You've never had a more lust-filled orgasm. <<else>> diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw index 42b0e6d0c6cf4a32504938834e8d485835fd77fb..1d01c2d3f5acab66cce3dace6548ef7b78a8fec3 100644 --- a/src/pregmod/sePlayerBirth.tw +++ b/src/pregmod/sePlayerBirth.tw @@ -198,7 +198,7 @@ You arrange yourself to give birth, relaxing until your body urges you to begin <<if !canWalk(_S.Concubine)>> <<if tooBigBreasts(_S.Concubine)>> You don't know how _he2 managed to get you here when _his2 breasts prevent _him2 from walking<<if $PC.pregType >= 8>>, especially with how heavy your pregnancy was<</if>>, but you give the pair a gentle caress as thanks. - <<elseif tooBigBelly(_S.Concubine)e)>> + <<elseif tooBigBelly(_S.Concubine)>> You don't know how _he2 managed to get you here when _he2's so gravid _he2 can't walk<<if $PC.pregType >= 8>>, especially with how heavy your pregnancy was<</if>>, but you give the taut dome a gentle caress as thanks. <<elseif tooBigDick(_S.Concubine)>> You don't know how _he2 managed to get you here when _his2 dick prevents _him2 from walking<<if $PC.pregType >= 8>>, especially with how heavy your pregnancy was<</if>>, but you give the serpent a gentle caress as thanks. diff --git a/src/pregmod/widgets/pregmodBirthWidgets.tw b/src/pregmod/widgets/pregmodBirthWidgets.tw index 846f3dbfb7b546818ab1460271c6d72507ab5830..f0e412c573a94a5ac2712721c96944e6b9bbb8c3 100644 --- a/src/pregmod/widgets/pregmodBirthWidgets.tw +++ b/src/pregmod/widgets/pregmodBirthWidgets.tw @@ -1515,7 +1515,7 @@ <<if $masterSuiteUpgradeLuxury == 1>> While awaiting your return on the big bed in the master suite, $slaves[$i].slaveName's body begins to birth another of $his brood. $He struggles to shift into a more comfortable position before giving up. <<ClothingBirth>> - Resting in your bed, $he draws $his child to $his breast and resumes waiting for you. <<if _S.Concubine>_S. furiously orders $his child<<if $slaves[$i].pregType > 1>>ren<</if>> removed, and $him forcefully ejected from the bed so it can be cleaned before your return.<</if>> + Resting in your bed, $he draws $his child to $his breast and resumes waiting for you. <<if _S.Concubine>>_S.Concubine furiously orders $his child<<if $slaves[$i].pregType > 1>>ren<</if>> removed, and $him forcefully ejected from the bed so it can be cleaned before your return.<</if>> <<elseif $masterSuiteUpgradeLuxury == 2>> While being the bottom of the master suite's fuckpit, $slaves[$i].slaveName's body begins to birth another of $his brood. While $he doesn't stop having sex, the fucktoys using $him do and attempt to drag $him from the pit to give birth. Instinctively $he begins to push out $his baby, indifferent to who may be watching $his naked crotch. The fucktoys give up their efforts to haul $his bloated form out of the pit and allow $him to settle at the bottom. Without a second thought about $his child, $he attempts to coax the other slaves back into an orgy. <<else>> diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 2238562ec72028bd3736a1efc1885272d32c08ec..c4cc1d1cf3531dfd330204f2022a08f8658edc37 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -8546,7 +8546,7 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h _S.HeadGirl.slaveName understands the situation immediately. _He2 gets _himself2 and $activeSlave.slaveName dressed for a nice, non-sexual 'date' in $clubName, and leads $him out by the hand with a wink over _his2 shoulder to you. Your Head Girl understands just what kind of break from sexual servitude $activeSlave.slaveName really needs. They enjoy a nice meal, take a stroll and talk as friends, and get some inconsequential but relaxing beauty treatments together. They both @@.hotpink;enjoy the relaxation,@@ and $activeSlave.slaveName @@.green;feels much better@@ after the rest, too. <<set $activeSlave.devotion += 4>> <<run cashX(forceNeg(500), "event", $activeSlave), improveCondition($activeSlave, 10)>> - <<set $slaves[$slaveIndices[$HeadGirlID]].devotion += 4>> + <<set _S.HeadGirl.devotion += 4>> <</replace>> <</link>> //This option will cost <<print cashFormat(500)>>// <</if>> @@ -16512,7 +16512,7 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h <<if canImpreg($activeSlave, _S.HeadGirl)>> <<= knockMeUp($activeSlave, 5, 1, $HeadGirlID, 1)>> <</if>> - <<set $slaves[$slaveIndices[$HeadGirlID]].devotion += 4>> + <<set _S.HeadGirl.devotion += 4>> <<EventFetish $activeSlave "buttslut">> <<EventFetish $activeSlave "submissive">> <</replace>> diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw index cd8bac89f8f2d4ccd5a3b0eabc0793d2b168bdb6..3cab94acf980b8dba0b273221258e8b5f4410b17 100644 --- a/src/uncategorized/brothelReport.tw +++ b/src/uncategorized/brothelReport.tw @@ -183,7 +183,7 @@ /* 000-250-006 */ <<if $seeImages && $seeReportImages>> <div class="imageRef tinyImg"> - <<= SlaveArt(_S.Madam 0, 0)>> + <<= SlaveArt(_S.Madam, 0, 0)>> </div> <</if>> /* 000-250-006 */ diff --git a/src/uncategorized/fullReport.tw b/src/uncategorized/fullReport.tw index f409b5fa69d4a2d6e0ef27ad4377c17843f38493..c04175c99395c3c419f24b4fb9f3dba13f195255 100644 --- a/src/uncategorized/fullReport.tw +++ b/src/uncategorized/fullReport.tw @@ -83,7 +83,7 @@ <br> <</if>> -<<if Array.isArray($personalAttention) && $personalAttention.findIndex(function(s) { return s.ID == $slaves[$i].ID; }) != -1>> +<<if $PC.health.shortDamage < 30 && Array.isArray($personalAttention) && $personalAttention.findIndex(function(s) { return s.ID == $slaves[$i].ID; }) != -1>> <<set $activeSlave = $slaves[$i]>> <<include "PT Workaround">> <br> diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw index e6fe51ccbb1c5280597b942aeca12639e55af432..f12436ead030151aad747a046ef20a3a5c542e36 100644 --- a/src/uncategorized/masterSuiteReport.tw +++ b/src/uncategorized/masterSuiteReport.tw @@ -165,7 +165,7 @@ <<if $masterSuiteDecoration != "standard">> <<set _slave.devotion++>> <</if>> - <<run repX(Beauty_S. * 5 + (_S.Concubine.skill.vaginal || 0) + (_S.Concubine.skill.anal || 0) + (_S.Concubine.skill.oral || 0) + (_S.Concubine.skill.whoring || 0) + (_S.Concubine.skill.entertainment || 0), "concubine", _S.Concubine)>> + <<run repX(Beauty(_S.Concubine) * 5 + (_S.Concubine.skill.vaginal || 0) + (_S.Concubine.skill.anal || 0) + (_S.Concubine.skill.oral || 0) + (_S.Concubine.skill.whoring || 0) + (_S.Concubine.skill.entertainment || 0), "concubine", _S.Concubine)>> <<else>> /* not Concubine */ <span class='slave-name'><<= SlaveFullName(_slave)>></span> <<if _slave.choosesOwnAssignment == 2>> diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw index bf4d33b4cdd91ed004da9e3a0c382da6a0402b6e..7bd43749694133292e3a651c4f35fe9421b7f3a6 100644 --- a/src/uncategorized/persBusiness.tw +++ b/src/uncategorized/persBusiness.tw @@ -29,16 +29,14 @@ <</if>> <</if>> <<if $PC.health.shortDamage >= 30>> - <<if $PC.health.shortDamage >= 30>> - <<run endWeekHealthDamage($PC)>> - The injuries received in the recent battle prevents you from engaging in tiring endeavors. - <<if $PC.health.shortDamage >= 51>> - Your trusted physician believes it will still take a few weeks to fully recover. - <<elseif $PC.health.shortDamage >= 39>> - You are starting to feel better. It's very likely you will be back to full working order within the next week. - <<else>> - You have finally recovered from your injuries. - <</if>> + <<run endWeekHealthDamage($PC)>> + The injuries received in the recent battle prevents you from engaging in tiring endeavors. + <<if $PC.health.shortDamage >= 51>> + Your trusted physician believes it will still take a few weeks to fully recover. + <<elseif $PC.health.shortDamage >= 39>> + You are starting to feel better. It's very likely you will be back to full working order within the next week. + <<else>> + You have finally recovered from your injuries. <</if>> <<elseif ($personalAttention == "whoring")>> <<set _income = random(2000,4500)>> diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw index 33f53a37d92b3a49be1077d4edf869851e0d7ad9..d1cf38f98c837ee720ec6cb7add277580afafe66 100644 --- a/src/uncategorized/randomNonindividualEvent.tw +++ b/src/uncategorized/randomNonindividualEvent.tw @@ -336,7 +336,7 @@ /* Position Events */ - <<if ($HeadGirlID != 0)>> + <<if _S.HeadGirl>> <<if (_S.Concubine)>> <<if $fuckSlaves > 1>> @@ -406,7 +406,7 @@ <</if>> - <<if ($MilkmaidID != 0) && (_L.dairy >= 5) && (_S.Milkmaid.health.condition >= 70)>> + <<if _S.Milkmaid && (_L.dairy >= 5) && (_S.Milkmaid.health.condition >= 70)>> <<if (_S.Milkmaid.muscles > 5)>> <<set $PESSevent.push("tired milkmaid")>> <</if>> @@ -419,7 +419,7 @@ <<set $PETSevent.push("stewardess beating")>> <</if>> - <<if ($MadamID != 0) && (_L.brothel >= 5) && (_S.Madam.actualAge >= 35 || $AgePenalty == 0) && (_S.Madam.skill.whoring >= 100)>> + <<if _S.Madam && (_L.brothel >= 5) && (_S.Madam.actualAge >= 35 || $AgePenalty == 0) && (_S.Madam.skill.whoring >= 100)>> <<set $PESSevent.push("madam strategy")>> <</if>> @@ -543,10 +543,10 @@ <<if ($cash > 20000)>> <<set $recruit.push("school sale")>> <</if>> - <<if (_S.HeadGirl.devotion > 50) && (_S.HeadGirl.skill.entertainment >= 100)>> + <<if _S.HeadGirl && (_S.HeadGirl.devotion > 50) && (_S.HeadGirl.skill.entertainment >= 100)>> <<set $recruit.push("female recruit")>> <</if>> - <<if (_S.HeadGirl.devotion > 50) && (_S.HeadGirl.skill.whoring >= 100)>> + <<if _S.HeadGirl && (_S.HeadGirl.devotion > 50) && (_S.HeadGirl.skill.whoring >= 100)>> <<set $recruit.push("whore recruit")>> <</if>> <<if $PC.skill.hacking >= 50 && (random(0,100) < $PC.skill.hacking) || $cheatMode>> @@ -601,11 +601,11 @@ <<if ($cash > 20000)>> <<set $recruit.push("school trap")>> <</if>> - <<if (_S.HeadGirl.devotion > 50) && (_S.HeadGirl.dick > 0)>> + <<if _S.HeadGirl && (_S.HeadGirl.devotion > 50) && (_S.HeadGirl.dick > 0)>> <<set $recruit.push("male recruit")>> <</if>> <<if $seeDicks != 100>> - <<if (_S.HeadGirl.devotion > 50)>> + <<if (_S.HeadGirl && _S.HeadGirl.devotion > 50)>> <<set $RecETSevent.push("mismatched pair")>> <</if>> <<if ($rep/400) > (random(1,100) || $cheatMode)>> diff --git a/src/uncategorized/reHGReplacement.tw b/src/uncategorized/reHGReplacement.tw index 82110986a5f2f82cbe5f47f234abf93f99ca980c..dc36a1781077a82e0318506c935b86a4ad520550 100644 --- a/src/uncategorized/reHGReplacement.tw +++ b/src/uncategorized/reHGReplacement.tw @@ -61,8 +61,7 @@ When _S.HeadGirl.slaveName leaves, $he clears $his throat nervously. $He gathers _S.HeadGirl.slaveName hops off the couch, gets down in front of _his2 victim, and shoves $his legs apart. $activeSlave.slaveName scrunches up $his face, expecting something agonizing to happen to $his <<if $activeSlave.dick == 0>>pussy, but _S.HeadGirl.slaveName shocks $him by starting to hungrily eat $him out.<<else>>cock, but _S.HeadGirl.slaveName shocks $him by giving $him a lush blowjob.<</if>> $activeSlave.slaveName clearly expects a trap, but _S.HeadGirl.slaveName's attentions slowly distract $him. When $he's on the very verge of orgasm, your Head Girl suddenly stops and <<if $activeSlave.dick == 0>>pinches the $girl's pussylips,<<else>>tugs the $girl's cock downward by its head,<</if>> not painfully, but hard enough to communicate threat. $activeSlave.slaveName, shocked out of $his pleasure, looks down at _him2. _S.HeadGirl.slaveName <<say>>s menacingly, "Bitch, if you orga<<s>>m, I'm going to fucking de<<s>>troy you." Then _he2 goes back to giving $activeSlave.slaveName oral. $activeSlave.slaveName begins to cry, realizing how comprehensively fucked $he is. <br><br> Eventually, $he climaxes. _S.HeadGirl.slaveName has a talented tongue. _S.HeadGirl.slaveName does not begrudge the slave $his pleasure, <<if $activeSlave.dick == 0>>tonguing $his clit all the way through $his orgasm.<<else>>industriously sucking $his cock until _he2's swallowed every last drop of cum.<</if>> _He2 stands up and seizes $activeSlave.slaveName by the ear, <<say>>ing, "And now, <<s>>lut, you are fucked." $activeSlave.slaveName's weeping stopped during $his climax, but now $he starts to @@.gold;sob with terror,@@ and $he cries harder as your Head Girl hauls $him out of your office by $his ear. _S.HeadGirl.slaveName @@.mediumaquamarine;waves cheerfully@@ to you as _he2 leaves with _his2 victim. - <<set $i = $slaveIndices[$HeadGirlID]>> - <<set $slaves[$i].trust += 4, $slaves[$i].counter.oral += 1>> + <<set _S.HeadGirl.trust += 4, _S.HeadGirl.counter.oral += 1>> <<set $oralTotal += 1>> <<set $activeSlave.trust -= 4, $activeSlave.counter.oral += 1>> <<set $oralTotal += 1>> diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw index 3d590bf4b88f8f2f7bde774a3315ca760ecead2d..a3d528b4c977e4ce92fa78df0d82933dea28db11 100644 --- a/src/uncategorized/reNickname.tw +++ b/src/uncategorized/reNickname.tw @@ -119,7 +119,7 @@ <<if ($activeSlave.ID == $MatronID)>> <<set _qualifiedNicknames.push("Matron")>> <</if>> -<<if ($activeSlave.ID == _S.Madam.ID)>> +<<if ($activeSlave.ID == $MadamID)>> <<set _qualifiedNicknames.push("Madam")>> <</if>> <<if ($activeSlave.ID == $djID)>> diff --git a/src/uncategorized/reShowerPunishment.tw b/src/uncategorized/reShowerPunishment.tw index cadb97b772dc691e1f189f38835e9666ebdd1786..8dfbfbc377f6ae0797762800a66340e2ab3f6be8 100644 --- a/src/uncategorized/reShowerPunishment.tw +++ b/src/uncategorized/reShowerPunishment.tw @@ -63,9 +63,8 @@ $activeSlave.slaveName is being very thorough. When you first appeared, $he was $activeSlave.slaveName stays in the shower to clean $himself, so _S.HeadGirl.slaveName exits to see you watching the denouement. _He2 @@.hotpink;smiles,@@ murmuring a greeting, and hurries over to give you a peck on the cheek, leaning in as best _he2 can to keep _his2 moist body away from your suit. "Thi<<s>> i<<s>> the life, <<Master>>," _he2 whispers. <<set $activeSlave.counter.oral += 1>> <<set $oralTotal += 1>> - <<set $i = $slaveIndices[$HeadGirlID]>> - <<set $slaves[$i].devotion += 4>> - <<set $slaves[$i].counter.penetrative += 1>> + <<set _S.HeadGirl.devotion += 4>> + <<set _S.HeadGirl.counter.penetrative += 1>> <<set $penetrativeTotal += 1>> <</replace>> <</link>> @@ -85,8 +84,7 @@ $activeSlave.slaveName is being very thorough. When you first appeared, $he was <<set $activeSlave.counter.oral += 1>> <<set $oralTotal += 1>> <<set $activeSlave.trust += 4>> - <<set $i = $slaveIndices[$HeadGirlID]>> - <<set $slaves[$i].counter.penetrative += 1>> + <<set _S.HeadGirl.counter.penetrative += 1>> <<set $penetrativeTotal += 1>> <</replace>> <</link>> @@ -107,8 +105,7 @@ $activeSlave.slaveName is being very thorough. When you first appeared, $he was <<set $activeSlave.counter.oral += 1>> <<set $oralTotal += 1>> <<set $activeSlave.devotion += 4>> - <<set $i = $slaveIndices[$HeadGirlID]>> - <<set $slaves[$i].counter.oral += 1>> + <<set _S.HeadGirl.counter.oral += 1>> <<set $oralTotal += 1>> <</replace>> <</link>> diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw index 05ab346274d78453202ebdd0c55a8acfac15f202..db67b0c96e46d3355a15493502617ba4b33cfc37 100644 --- a/src/uncategorized/saRelationships.tw +++ b/src/uncategorized/saRelationships.tw @@ -75,7 +75,7 @@ <<set _SlaveJ = $slaves[_j]>> <<setLocalPronouns _SlaveJ 2>> <<if (_SlaveJ.ID != _SlaveI.ID) && (_SlaveJ.relationship == 0) && (_SlaveI.rivalryTarget != _SlaveJ.ID) && (_SlaveJ.assignment != "stay confined") && (_SlaveJ.fetish != "mindbroken")>> - <<if (_SlaveJ.ID == _S.Madam.ID) && (_SlaveI.assignment == "work in the brothel")>> + <<if (_SlaveJ.ID == $MadamID) && (_SlaveI.assignment == "work in the brothel")>> <<if _SlaveJ.rules.relationship != "restrictive">> _SlaveI.slaveName manages to ingratiate $himself with the Madam, _SlaveJ.slaveName. The two slaves have @@.lightgreen;struck up a friendship.@@ <<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>> diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw index 05c23cf87e30733463bdd003b1f8ecf2ec25c4b7..ddd3a99f7f5172639120351544d0466c60207a69 100644 --- a/src/utility/birthWidgets.tw +++ b/src/utility/birthWidgets.tw @@ -861,18 +861,18 @@ <<if _birthScene > 50>> While giving a slave oral service, $slaves[$i].slaveName's water breaks. $He disregards this development and continues working. <<ClothingBirth>> - The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. Instead, $he draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> until <<if _S.Stewardess>>_S.Stewardess.slaveName<<elseif _S.HeadGirl != 0>>_S.HeadGirl.slaveName<<else>>$assistant.name<</if>>shouts at $him to move $his useless ass. + The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. Instead, $he draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> until <<if _S.Stewardess>>_S.Stewardess.slaveName<<elseif _S.HeadGirl>>_S.HeadGirl.slaveName<<else>>$assistant.name<</if>>shouts at $him to move $his useless ass. <<else>> While scrubbing the penthouse floor, $slaves[$i].slaveName's water breaks. $He turns to clean this new spill, disregarding what it means. <<ClothingBirth>> - Instead of cleaning the fresh mess $he made, $he draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> until <<if _S.Stewardess>>_S.Stewardess.slaveName<<elseif _S.HeadGirl != 0>>_S.HeadGirl.slaveName<<else>>$assistant.name<</if>>shouts at $him to move $his useless ass. + Instead of cleaning the fresh mess $he made, $he draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> until <<if _S.Stewardess>>_S.Stewardess.slaveName<<elseif _S.HeadGirl>>_S.HeadGirl.slaveName<<else>>$assistant.name<</if>>shouts at $him to move $his useless ass. <</if>> <<else>> <<if _birthScene > 50>> While giving a slave oral service, $slaves[$i].slaveName's water breaks. $He desperately tries to pull away but they grab $his head and force $him back to their crotch. <<set $humiliation = 1>> <<ClothingBirth>> - The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. $He hurriedly tries to mop up the mess and collect $his child<<if $slaves[$i].pregType > 1>>ren<</if>> before <<if _S.Stewardess>>_S.Stewardess.slaveName<<elseif _S.HeadGirl != 0>>_S.HeadGirl.slaveName<<else>>$assistant.name<</if>> shouts at $him. + The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. $He hurriedly tries to mop up the mess and collect $his child<<if $slaves[$i].pregType > 1>>ren<</if>> before <<if _S.Stewardess>>_S.Stewardess.slaveName<<elseif _S.HeadGirl>>_S.HeadGirl.slaveName<<else>>$assistant.name<</if>> shouts at $him. <<else>> While scrubbing the penthouse floor, $slaves[$i].slaveName's water breaks. $He panics at the thought of not cleaning up $his spill but $his worsening contractions force $him to find a secluded place to give birth. <<ClothingBirth>>