diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js index b75f8ca517275d3557cc4a6a0ba66265ff9853e2..519d89dcf05d3a44d3c12aa1fec41ccfd820b27c 100644 --- a/src/js/slaveCostJS.js +++ b/src/js/slaveCostJS.js @@ -2148,9 +2148,9 @@ window.slaveCostBeauty = (function() { } else { if (slave.preg < -1) { multiplier -= 0.1; - } else if (V.activeSlave.bellyPreg >= 300000) { + } else if (slave.bellyPreg >= 300000) { multiplier -= 1.5; - } else if (V.activeSlave.bellyPreg >= 120000) { + } else if (slave.bellyPreg >= 120000) { multiplier -= 0.5; } else if (slave.bellyPreg >= 500 || slave.pregKnown === 1) { multiplier -= 0.1; diff --git a/src/uncategorized/saDevotion.tw b/src/uncategorized/saDevotion.tw index 5d0863bddf47c4adc09c0d28b27aea2b0939960c..b7a17bdba75385f2a0421d4538ea9d77549ddc90 100644 --- a/src/uncategorized/saDevotion.tw +++ b/src/uncategorized/saDevotion.tw @@ -666,7 +666,7 @@ <<if ($slaves[$i].tankBaby > 0)>> <<if ($slaves[$i].devotion <= 95)>> - The tank's imprinting systems left a @@.hotpink;deep, subconscious <<if $activeSlave.tankBaby == 2>>need<<else>>desire<</if>>@@ to serve $his owner. + The tank's imprinting systems left a @@.hotpink;deep, subconscious <<if $slaves[$i].tankBaby == 2>>need<<else>>desire<</if>>@@ to serve $his owner. <</if>> <</if>> @@ -914,14 +914,14 @@ <<else>> /* IS FUCKDOLL */ -$He is confined in a suit that limits $his perception of the outside world to tonal commands from the suit itself and things that are inserted into $his mouth<<if $activeSlave.vagina > -1>>, vagina,<</if>> and anus. +$He is confined in a suit that limits $his perception of the outside world to tonal commands from the suit itself and things that are inserted into $his mouth<<if $slaves[$i].vagina > -1>>, vagina,<</if>> and anus. <<if $slaves[$i].sexualFlaw == "self hating">> $His self hatred @@.gold;cannot eliminate the growing fear@@ engendered by $his remaining spark of self-preservation. <<set $slaves[$i].trust -= 5>> <<elseif $slaves[$i].trust > 50>> $He still hopes you'll let $him out of $his suit so $he can be your good slave again, but @@.gold;fear and doubt creep in@@ by the minute. And there are a lot of them. <<else>> - With little to do but <<if $activeSlave.fuckdoll <= 60>>wonder if $he's about to be used<<else>>desperately hope $he'll be used soon<</if>>, $he dwells on the @@.gold;horrible fear@@ that this dark existence will be perpetual. + With little to do but <<if $slaves[$i].fuckdoll <= 60>>wonder if $he's about to be used<<else>>desperately hope $he'll be used soon<</if>>, $he dwells on the @@.gold;horrible fear@@ that this dark existence will be perpetual. <</if>> <<set $slaves[$i].trust -= 10>> <<if $slaves[$i].sexualFlaw == "self hating">> diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw index a2f61e1a4bba3e68735e4b11c719456ca87ebe10..ec5bbe5822979a063fb40fe4fc98cac664ab3d24 100644 --- a/src/uncategorized/saDrugs.tw +++ b/src/uncategorized/saDrugs.tw @@ -1224,16 +1224,16 @@ <<case "labor suppressors">> <<set $slaves[$i].chem += 2>> - <<if WombBirthReady($slaves[$i], $activeSlave.pregData.normalBirth*1.5) > 0>> + <<if WombBirthReady($slaves[$i], $slaves[$i].pregData.normalBirth*1.5) > 0>> <<run healthDamage($slaves[$i], 20)>> <<set $slaves[$i].labor = 1>> <<set $slaves[$i].induce = 1>> <<set $birthee = 1>> $He has been ready to give birth for some time now. Suppressing birth for so long @@.red;greatly affects $his health.@@ $He may @@.red;have trouble@@ giving birth to $his oversized child<<if $slaves[$i].pregType > 1>>ren<</if>>. $He seems to be in distress, $his body is @@.red;forcing $his child<<if $slaves[$i].pregType > 1>>ren<</if>> out!@@ - <<elseif WombBirthReady($slaves[$i], $activeSlave.pregData.normalBirth*1.25) > 0>> + <<elseif WombBirthReady($slaves[$i], $slaves[$i].pregData.normalBirth*1.25) > 0>> <<run healthDamage($slaves[$i], 20)>> $He has been ready to give birth for some time now. Suppressing birth for so long @@.red;greatly affects $his health.@@ $He may @@.red;have trouble@@ giving birth to $his oversized child<<if $slaves[$i].pregType > 1>>ren<</if>>. - <<elseif WombBirthReady($slaves[$i], $activeSlave.pregData.normalBirth) > 0>> + <<elseif WombBirthReady($slaves[$i], $slaves[$i].pregData.normalBirth) > 0>> <<run healthDamage($slaves[$i], 10)>> Labor suppressing agents @@.red;negatively affect $his health.@@ <</if>> @@ -1515,7 +1515,7 @@ <<set $slaves[$i].drugs = "no drugs">> <</if>> <<case "psychostimulants">> - <<if !canImproveIntelligence($activeSlave)>> + <<if !canImproveIntelligence($slaves[$i])>> $His intelligence has been improved as much as a drink possibly can. @@.yellow;$His drug regimen has been ended.@@ <<set $slaves[$i].drugs = "no drugs">> <</if>> diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw index fa3a60ea4a96ae9b8bbc9477da56879c2110881e..0edcff741a8013c83bdb3133a97127261a540aab 100644 --- a/src/uncategorized/saPleaseYou.tw +++ b/src/uncategorized/saPleaseYou.tw @@ -143,7 +143,7 @@ serves you this week. <<set _vaginalUse = random(3,7)>> on occasion. <</if>> - When you're not using $him, $he <<if !hasAnyLegs($activeSlave)>>rests<<else>>stands<</if>> nearby, waiting silently for your order to present $his pussy. + When you're not using $him, $he <<if !hasAnyLegs($slaves[$i])>>rests<<else>>stands<</if>> nearby, waiting silently for your order to present $his pussy. <<if $PC.dick != 0>> <<if canImpreg($slaves[$i], $PC)>> <<= knockMeUp($slaves[$i], _vaginalUse, 0, -1, 1)>> @@ -269,7 +269,7 @@ serves you this week. <<set _analUse = random(3,7)>> on occasion. <</if>> - When you're not using $him, $he <<if !hasAnyLegs($activeSlave)>>rests<<else>>stands<</if>> nearby, waiting silently for your order to present $his asshole. + When you're not using $him, $he <<if !hasAnyLegs($slaves[$i])>>rests<<else>>stands<</if>> nearby, waiting silently for your order to present $his asshole. <<if $PC.dick != 0>> <<if canImpreg($slaves[$i], $PC)>> <<= knockMeUp($slaves[$i], _analUse, 1, -1, 1)>> @@ -410,7 +410,7 @@ serves you this week. <<set _oralUse = random(3,7)>> on occasion. <</if>> - When you're not using it, it <<if !hasAnyLegs($activeSlave)>>rests<<else>>stands<</if>> nearby, waiting silently for your order to open its mouth. + When you're not using it, it <<if !hasAnyLegs($slaves[$i])>>rests<<else>>stands<</if>> nearby, waiting silently for your order to open its mouth. <<set $slaves[$i].counter.oral += _oralUse, $oralTotal += _oralUse>> <</if>> @@ -585,7 +585,7 @@ serves you this week. <<set _mammaryUse = random(3,7)>> on occasion. <</if>> - When you're not using $him, $he <<if !hasAnyLegs($activeSlave)>>rests<<else>>stands<</if>> nearby, waiting silently for your order to present $his chest. + When you're not using $him, $he <<if !hasAnyLegs($slaves[$i])>>rests<<else>>stands<</if>> nearby, waiting silently for your order to present $his chest. <<set $slaves[$i].counter.mammary += _mammaryUse, $mammaryTotal += _mammaryUse>> <</if>> @@ -864,7 +864,7 @@ serves you this week. <<else>> <<if $slaves[$i].fuckdoll > 0>> - You keep $him with you all week, using $him as your personal sex toy. When you're not using $him, $he <<if !hasAnyLegs($activeSlave)>>rests<<else>>stands<</if>> nearby, waiting silently. + You keep $him with you all week, using $him as your personal sex toy. When you're not using $him, $he <<if !hasAnyLegs($slaves[$i])>>rests<<else>>stands<</if>> nearby, waiting silently. <<set $slaves[$i].trust += 4>> <<elseif ($slaves[$i].anus == 0) && ($slaves[$i].vagina == 0)>> diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw index b1f5f33024f02e735cb51521a642cc8cb42d19f4..2f806b327d12d3b9d0e3d6b28f0e87d1e9b1e4de 100644 --- a/src/uncategorized/saRecruitGirls.tw +++ b/src/uncategorized/saRecruitGirls.tw @@ -388,7 +388,7 @@ $He does $his best to convince them that being your slave promises a better life. <</if>> <<elseif $recruiterTarget == "dissolute sissies">> - <<if ($Recruiter.dick > 1) && canAchieveErection($Recruiter) && !($activeSlave.chastityPenis)>> + <<if ($Recruiter.dick > 1) && canAchieveErection($Recruiter) && !($Recruiter.chastityPenis)>> $He giggles and shows off $his erection, making it easy to convince them that your slaves with dicks enjoy a sexually satisfying life. <<set $recruiterProgress += 1>> <<else>> @@ -961,7 +961,7 @@ <</if>> <<elseif $arcologies[0].FSTransformationFetishist != "unset">> <<if $slaves[$i].boobsImplant > 0 && $slaves[$i].buttImplant > 0 && $slaves[$i].lipsImplant > 0>> - <<if $slaves[$i].waist < -95 || $slaves[$i].teeth == "pointy" || !hasAllNaturalLimbs($activeSlave) || ($slaves[$i].vagina > -1 && $slaves[$i].dick > 6)>> + <<if $slaves[$i].waist < -95 || $slaves[$i].teeth == "pointy" || !hasAllNaturalLimbs($slaves[$i]) || ($slaves[$i].vagina > -1 && $slaves[$i].dick > 6)>> A series of cleverly staged publicity events at various businesses in the arcology subtly focuses on $his better-than-natural physiology in each one. <<elseif $seeExtreme == 1>> $His augmented body certainly has its appeals, yet as you look over this week's publicity recap you begin to wonder if $he could be still more extremely //transformed//. diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw index 9c2e955729b656a9198236e405e0aeee83579945..10ea88cd74da45308ad35eec969395b8aaa019c2 100644 --- a/src/uncategorized/saRules.tw +++ b/src/uncategorized/saRules.tw @@ -179,7 +179,7 @@ <<if $spa != 0>> usually spends in $spaName<<if $Attendant != 0>>, enjoying $Attendant.slaveName's care<</if>>. <<else>> - usually spends relaxing in $his room<<if $BrothiIDs.length > 1>> with a whore <<if hasBothLegs($activeSlave)>>between $his legs<<else>>at $his crotch<</if>><</if>>. + usually spends relaxing in $his room<<if $BrothiIDs.length > 1>> with a whore <<if hasBothLegs($slaves[$i])>>between $his legs<<else>>at $his crotch<</if>><</if>>. <</if>> <<if $slaves[$i].relationship > 0>> <<set $subSlave = getSlave($slaves[$i].relationshipTarget)>> @@ -406,7 +406,7 @@ <<case "Chattel Religionist">> The open, yet comfortable, conditions of $brothelName's slave quarters are quite refreshing after a day of public sex, even if $he has to share it with all the other whores. <<default>> - $He likes $his little room in $brothelName, even if <<if canSmell($activeSlave)>>it smells of sex<<else>>it's filled with the heat of sex<</if>> after fucking in it all day. + $He likes $his little room in $brothelName, even if <<if canSmell($slaves[$i])>>it smells of sex<<else>>it's filled with the heat of sex<</if>> after fucking in it all day. <</switch>> <</if>> @@ -914,7 +914,7 @@ <<if ($slaves[$i].devotion <= 20)>> $He shares a room with <<if $ClubiIDs.length > 4>>some of <</if>>the other sluts, preventing $him from becoming too complacent. It doesn't help that during business hours $he has to take citizens in $his own bed. <<else>> - $He likes $his personal space in $clubName, even if <<if canSmell($activeSlave)>>it smells of<<else>>it's filled with the heat from<</if>> sex and citizens. + $He likes $his personal space in $clubName, even if <<if canSmell($slaves[$i])>>it smells of<<else>>it's filled with the heat from<</if>> sex and citizens. <</if>> <<if ($universalRulesConsent == 0)>> @@ -2172,7 +2172,7 @@ The steam of the bathhouse lingers even in $his personal room and @@.hotpink;renders $him even more submissive.@@ <<set $slaves[$i].devotion += 1>> <<case "Chattel Religionist">> - $He likes $his personal space in $spaName, even if <<if canSmell($activeSlave)>>it smells of<<else>>it's filled with the heat from<</if>> sex and steam. + $He likes $his personal space in $spaName, even if <<if canSmell($slaves[$i])>>it smells of<<else>>it's filled with the heat from<</if>> sex and steam. <<case "Degradationist">> <<if ($slaves[$i].trust > 40)>> The invasive living conditions of $spaName @@.gold;remind $him not to get too comfortable@@ with $his life. diff --git a/src/utility/saRulesWidgets.tw b/src/utility/saRulesWidgets.tw index 9b46f5a999e9acdee547906337d8c7681ef8263d..01f6603e354894237c202a0b8063b7723bc7de56 100644 --- a/src/utility/saRulesWidgets.tw +++ b/src/utility/saRulesWidgets.tw @@ -278,13 +278,13 @@ and usually pretends to dominate $himself. <<elseif ($slaves[$i].fetish == "pregnancy")>> <<if $slaves[$i].belly > 1500>> - <<set _belly = bellyAdjective($activeSlave)>> + <<set _belly = bellyAdjective($slaves[$i])>> always rubs and teases $his _belly belly while doing so. <<elseif isItemAccessible("a small empathy belly")>> frequently straps on a fake belly to enhance $his fun. <<else>> frequently pretends to be - <<if $activeSlave.balls > 0>> + <<if $slaves[$i].balls > 0>> getting a girl pregnant. <<else>> getting knocked up.