From 93b1aae62adc66e518ec2a7321bdf616027dce7e Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Sat, 26 Aug 2017 02:17:11 -0400 Subject: [PATCH] fixes and vanilla --- src/js/economyJS.tw | 18 +- src/npc/fFeelings.tw | 8 +- src/pregmod/widgets/slaveSummaryWidgets.tw | 16 +- src/uncategorized/buySlaves.tw | 14 +- src/uncategorized/costs.tw | 12 +- src/uncategorized/costsReport.tw | 23 +- src/uncategorized/longSlaveDescription.tw | 8 +- src/uncategorized/main.tw | 59 +- src/uncategorized/randomIndividualEvent.tw | 2 +- src/uncategorized/randomNonindividualEvent.tw | 47 +- ...EgyptianRevivalistAcquisitionWorkaround.tw | 3 +- src/uncategorized/reRelativeRecruiter.tw | 29 +- src/uncategorized/saDrugs.tw | 590 +++++++++--------- src/uncategorized/saLongTermEffects.tw | 21 +- src/uncategorized/saRelationships.tw | 2 +- src/uncategorized/saWhore.tw | 2 +- src/uncategorized/slaveInteract.tw | 20 + src/utility/descriptionWidgets.tw | 5 +- src/utility/raWidgets.tw | 2 +- 19 files changed, 492 insertions(+), 389 deletions(-) diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw index a3de8ab7e3d..aaeccb3f104 100644 --- a/src/js/economyJS.tw +++ b/src/js/economyJS.tw @@ -401,14 +401,24 @@ window.getSlaveCost = function(s) { } // Drugs - if(s.drugs === 'anti-aging cream') { + switch(s.drugs) { + case 'anti-aging cream': cost += drugsCost * 10; - } else if(s.drugs === 'female hormone injections' || s.drugs === 'male hormone injections') { + break; + case 'female hormone injections': case 'male hormone injections': case 'intensive breast injections': + case 'intensive butt injections': case 'intensive penis enhancement': case 'intensive testicle enhancement': + case 'intensive lip injections': case 'hyper breast injections': case 'hyper butt injections': + case 'hyper penis enhancement': case 'hyper testicle enhancement': case 'hyper lip injections': cost += drugsCost * 5; - } else if(s.drugs === 'sag-B-gone') { + break; + case 'sag-B-gone': cost += drugsCost * .1; - } else if(s.drugs != 'no drugs') { + break; + case 'no drugs': case 'none': + break; + default: cost += drugsCost * 2; + break; } if(s.curatives > 0 && s.assignmentVisible === 1) { cost += drugsCost * s.curatives; diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw index 886ba4877fd..905f6072c2d 100644 --- a/src/npc/fFeelings.tw +++ b/src/npc/fFeelings.tw @@ -552,7 +552,7 @@ My favorite part of my body i<<s>> <</if>> <<switch $activeSlave.drugs>> -<<case "penis enhancement">> +<<case "intensive penis enhancement">> <<if ($activeSlave.dick > 0)>> <<if ($activeSlave.balls == 0)>> I can feel my dick growing, <<Master>>, but it'<<s>> <<s>>till <<s>>o <<s>>oft. I gue<<ss>> it'll just flop around more when I get buttfucked. @@ -616,7 +616,7 @@ My favorite part of my body i<<s>> I can almo<<s>>t feel my clit growing, <<Master>>. It'<<s>> kind of painful. <</if>> <</if>> -<<case "testicle enhancement">> +<<case "intensive testicle enhancement">> My ball<<s>> feel incredibly full, <<Master>>. They're really uncomfortable. <<if ($activeSlave.fetishKnown == 1) && (($activeSlave.fetish == "dom") || ($activeSlave.fetish == "sadist")) && ($activeSlave.fetishStrength > 60)>> But I can't wait to for<<c>>e a bitch to take the whole load. @@ -634,7 +634,7 @@ My favorite part of my body i<<s>> <<else>> I really need to cum. After I fini<<s>>h, would you plea<<s>>e, plea<<s>>e buttfuck me? I can barely <<s>>tand it. <</if>> -<<case "breast injections">> +<<case "intensive breast injections">> <<if ($activeSlave.fetishKnown == 1) && (($activeSlave.fetish == "boobs") || ($activeSlave.energy > 95))>> I can almo<<s>>t feel my boobs <<s>>welling, <<Master>>. Thank you for injecting them with hormone<<s>>, and plea<<s>>e, never <<s>>top. <<else>> @@ -650,7 +650,7 @@ My favorite part of my body i<<s>> <<else>> I can feel my boob<<s>> <<s>>welling, <<Master>>. It'<<s>> kind of painful. <</if>> -<<case "butt injections">> +<<case "intensive butt injections">> <<if ($activeSlave.fetishKnown == 1) && (($activeSlave.fetish == "buttslut") || ($activeSlave.energy > 95))>> I can almo<<s>>t feel my butt growing, <<Master>>. I can't wait to feel a dick <<s>>liding up in between my buttock<<s>>. <<else>> diff --git a/src/pregmod/widgets/slaveSummaryWidgets.tw b/src/pregmod/widgets/slaveSummaryWidgets.tw index 7bdca8a0f3d..67a2d5a55a5 100644 --- a/src/pregmod/widgets/slaveSummaryWidgets.tw +++ b/src/pregmod/widgets/slaveSummaryWidgets.tw @@ -336,12 +336,16 @@ Release rules: _Slave.releaseRules. <<switch _Slave.drugs>> <<case "breast injections">> ''Dr:Boobs+'' - <<case "hyper breast injections">> + <<case "intense breast injections">> ''Dr:Boobs++'' + <<case "hyper breast injections">> + ''Dr:Boobs+++'' <<case "butt injections">> ''Dr:Butt+'' - <<case "hyper butt injections">> + <<case "intense butt injections">> ''Dr:Butt++'' + <<case "hyper butt injections">> + ''Dr:Butt+++'' <<case "lip injections">> ''Dr:Lip+'' <<case "fertility drugs">> @@ -350,12 +354,16 @@ Release rules: _Slave.releaseRules. ''Dr:Fert++'' <<case "penis enhancement">> ''Dr:Dick+'' - <<case "hyper penis enhancement">> + <<case "intense penis enhancement">> ''Dr:Dick++'' + <<case "hyper penis enhancement">> + ''Dr:Dick+++'' <<case "testicle enhancement">> ''Dr:Balls+'' - <<case "hyper testicle enhancement">> + <<case "intense testicle enhancement">> ''Dr:Balls++'' + <<case "hyper testicle enhancement">> + ''Dr:Balls+++'' <<case "psychosuppressants">> ''Dr:Psych'' <<case "steroids">> diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw index 155a8a71613..6a1abfd883f 100644 --- a/src/uncategorized/buySlaves.tw +++ b/src/uncategorized/buySlaves.tw @@ -245,15 +245,19 @@ The market price of menials is ¤_menialPrice. [[(all)|Buy Slaves][$cash+=$helots*(_menialPrice),$menialDemandFactor-=$helots*(_menialPrice),$helots = 0]] <<if $arcologies[0].FSPaternalist == "unset">> <<if $arcadeUpgradeFuckdolls == 1>> - <br> [[Convert to Fuckdoll|Buy Slaves][$helots-=1,$fuckdolls+=1,$cash-=1000]] + <<set _fconvertCost = 1000>> + <<if _menialPrice >= 1100>> + <<set _fconvertCost = (_menialPrice+100)>> + <</if>> + <br> [[Convert to Fuckdoll|Buy Slaves][$helots-=1,$fuckdolls+=1,$cash-=(_fconvertCost)]] <<if $helots >= 10>> - [[(x10)|Buy Slaves][$helots-=10,$fuckdolls+=10,$cash-=10000]] + [[(x10)|Buy Slaves][$helots-=10,$fuckdolls+=10,$cash-=10*(_fconvertCost)]] <<if $helots >= 100>> - [[(x100)|Buy Slaves][$helots-=100,$fuckdolls+=100,$cash-=100000]] + [[(x100)|Buy Slaves][$helots-=100,$fuckdolls+=100,$cash-=100*(_fconvertCost)]] <</if>> <</if>> - [[(all)|Buy Slaves][$fuckdolls+=$helots,$cash-=1000*$helots,$helots=0]] - //Costs ¤1000// + [[(all)|Buy Slaves][$fuckdolls+=$helots,$cash-=(_fconvertCost)*($helots),$helots=0]] + //Costs ¤_fconvertCost// <</if>> <<if $dairyFeedersUpgrade > 0>> <br> [[Convert to Bioreactor|Buy Slaves][$helots-=1,$menialBioreactors+=1,$cash-=500]] diff --git a/src/uncategorized/costs.tw b/src/uncategorized/costs.tw index ad204ef467a..f220f84dee0 100644 --- a/src/uncategorized/costs.tw +++ b/src/uncategorized/costs.tw @@ -39,9 +39,9 @@ <</if>> <<if $peacekeepers != 0>> -<<if $peacekeepers.undermining != 0>> - <<set $costs += $peacekeepers.undermining>> -<</if>> + <<if $peacekeepers.undermining != 0>> + <<set $costs += $peacekeepers.undermining>> + <</if>> <</if>> <<if $mercenaries > 0>> @@ -271,7 +271,11 @@ <<elseif ($slaves[$i].drugs == "sag-B-gone")>> <<set $costs += ($drugsCost/10)>> <<elseif ($slaves[$i].drugs != "no drugs")>> - <<set $costs += ($drugsCost*2)>> + <<if $slaves[$i].drugs == "intensive breast injections" || $slaves[$i].drugs == "intensive butt injections" || $slaves[$i].drugs == "intensive penis enhancement" || $slaves[$i].drugs == "intensive testicle enhancement">> + <<set $costs += $drugsCost*5>> + <<else>> + <<set $costs += $drugsCost*2>> + <</if>> <</if>> <<if $slaves[$i].curatives == 1 && $slaves[$i].assignmentVisible != 1>> <<elseif $slaves[$i].curatives > 0>> diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw index 17cc97ee037..f7b00e39484 100644 --- a/src/uncategorized/costsReport.tw +++ b/src/uncategorized/costsReport.tw @@ -38,9 +38,9 @@ <</if>> <<if $peacekeepers != 0>> -<<if $peacekeepers.undermining != 0>> - ¤$peacekeepers.undermining to undermine political support for the nearby old world peacekeeping mission. -<</if>> + <<if $peacekeepers.undermining != 0>> + ¤$peacekeepers.undermining to undermine political support for the nearby old world peacekeeping mission. + <</if>> <</if>> <<if $mercenaries > 0>> @@ -379,19 +379,24 @@ <<set $individualCosts += (25+($drugsCost*2))>> <</switch>> <</if>> - <<if ($slaves[$i].drugs == "anti-aging cream")>> + <<switch $slaves[$i].drugs>> + <<case "anti-aging cream">> <br> Anti-aging creams: ¤<<print ($drugsCost*10)>> <<set $individualCosts += ($drugsCost*10)>> - <<elseif ($slaves[$i].drugs == "female hormone injections") || ($slaves[$i].drugs == "male hormone injections")>> + <<case "female hormone injections" "male hormone injections">> <br> Hormonal injections: ¤<<print ($drugsCost*5)>> - <<set $individualCosts += ($drugsCost*3)>> - <<elseif ($slaves[$i].drugs == "sag-B-gone")>> + <<set $individualCosts += ($drugsCost*5)>> + <<case "intensive breast injections" "intensive butt injections" "intensive penis enhancement" "intensive testicle enhancement" "intensive lip injections" "hyper breast injections" "hyper butt injections" "hyper penis enhancement" "hyper testicle enhancement" "hyper lip injections">> + <br> Intensive drugs: ¤<<print $drugsCost*5>> + <<set $individualCosts += $drugsCost*5>> + <<case "sag-B-gone">> <br> Questionable infomercial creams: ¤<<print ($drugsCost/10)>> <<set $individualCosts += ($drugsCost/10)>> - <<elseif ($slaves[$i].drugs != "no drugs")>> + <<case "no drugs" "none">> + <<default>> <br> Standard drugs: ¤<<print ($drugsCost*2)>> <<set $individualCosts += ($drugsCost*2)>> - <</if>> + <</switch>> <<if $slaves[$i].curatives == 1 && $slaves[$i].assignmentVisible != 1>> <<elseif $slaves[$i].curatives > 0>> <br> Health drugs: ¤<<print $drugsCost+($slaves[$i].curatives*$drugsCost)>> diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw index bc1237ef307..0bc29a0653c 100644 --- a/src/uncategorized/longSlaveDescription.tw +++ b/src/uncategorized/longSlaveDescription.tw @@ -1873,17 +1873,17 @@ Her scars make her look like she's in the right place. <<if isFertile($activeSlave) && $activeSlave.preg == 0>> She smells of sexual fluids and her breasts are slightly swollen. The fertility drugs have her ready to be impregnated. <</if>> - <<case "breast injections">> + <<case "intensive breast injections">> <<if ($activeSlave.amp != 1)>>She massages her tits uncomfortably<<else>>She squirms under the unfamiliar weight on her chest<</if>>. The A-HGH must be having an effect, painfully stretching her breasts as the mammary and adipose tissue underneath grows explosively. <<case "hyper breast injections">> <<if ($activeSlave.amp != 1)>>She massages her tits uncomfortably<<else>>She squirms under the unfamiliar weight on her chest<</if>>. The HA-HGH must be having an effect, painfully stretching her breasts as the mammary and adipose tissue underneath grows explosively. - <<case "butt injections">> + <<case "intensive butt injections">> <<if ($activeSlave.amp != 1)>>She massages her butt uncomfortably<<else>>She squirms against the unfamiliar weight on her backside<</if>>. The A-HGH must be having an effect, painfully stretching her buttocks as the muscular and adipose tissue underneath grows explosively. <<case "hyper butt injections">> <<if ($activeSlave.amp != 1)>>She massages her butt uncomfortably<<else>>She squirms against the unfamiliar weight on her backside<</if>>. The HA-HGH must be having an effect, painfully stretching her buttocks as the muscular and adipose tissue underneath grows explosively. - <<case "penis enhancement">> + <<case "intensive penis enhancement">> <<if ($activeSlave.amp != 1)>>She massages her <<if ($activeSlave.dick > 0)>>dick<<else>>clit<</if>> uncomfortably<<else>>She squirms against the unfamiliar weight in her <<if ($activeSlave.dick > 0)>>dick<<else>>clit<</if>><</if>>. The A-HGH must be having an effect, painfully lengthening and thickening her <<if ($activeSlave.dick > 0)>>dick<<else>>clit<</if>>. - <<case "testicle enhancement">> + <<case "intensive testicle enhancement">> <<if ($activeSlave.amp != 1)>>She massages her balls uncomfortably<<else>>She squirms in response to the pressure in her balls<</if>> as a bead of cum forms on tip of her dick. The A-HGH must be having an effect, painfully expanding her testicles. <<case "hyper penis enhancement">> <<if ($activeSlave.amp != 1)>>She massages her <<if ($activeSlave.dick > 0)>>dick<<else>>clit<</if>> uncomfortably<<else>>She squirms against the unfamiliar weight in her <<if ($activeSlave.dick > 0)>>dick<<else>>clit<</if>><</if>>. The HA-HGH must be having an effect, painfully lengthening and thickening her <<if ($activeSlave.dick > 0)>>dick<<else>>clit<</if>>. diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw index 8c8b219f974..805c5bc0bca 100644 --- a/src/uncategorized/main.tw +++ b/src/uncategorized/main.tw @@ -109,7 +109,41 @@ <<if $useTabs == 0>> +//<<OptionsSortAsAppearsOnMain>>// <<include "Slave Summary">> + + <<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>> + <<if $positionMainLinks <= 0>> + <br><<MainLinks>> + <</if>> + + <<if (_BG > -1) && ($slaves[_BG].assignment == "guard you")>> + <<set $i = _BG>> + <<set _GO = "idiot ball">> + <<include "Use Guard">> + <br> <<print "[[Use her mouth|FLips][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">> + | <<print "[[Play with her tits|FBoobs][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">> + <<if canDoVaginal($slaves[_BG])>> + | <<print "[[Fuck her|FVagina][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">> + <<if canDoAnal($slaves[_BG])>> + | <<print "[[Use her holes|FButt][$activeSlave = $slaves["+_BG+"],$nextButton = _j, $nextLink = _k, $returnTo = _l]]">> + <</if>> + <</if>> + /*check*/ + <<if canAchieveErection($slaves[_BG])>> + | <<print "[[Ride her|FDick][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">> + <</if>> + <<if canDoAnal($slaves[_BG])>> + | <<print "[[Fuck her ass|FAnus][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">> + <</if>> + | <<print "[[Abuse her|Gameover][$gameover = _GO]]">> + <</if>> + + <<set $activeSlave = Array.random($slaves)>> + <<if $activeSlave && ($activeSlave.assignment != "please you") && ($activeSlave.assignment != "guard you")>> + <br><<include "Walk Past">> + <</if>> + <<else>> <<CreateSimpleTabs>> <body> @@ -392,31 +426,6 @@ </body> <</if>> -<<if $useTabs == 0>> -<<if (_BG > -1) && ($slaves[_BG].assignment == "guard you")>> - <<set $i = _BG>> - <<include "Use Guard">> - <br> <<print "[[Use her mouth|FLips][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">> - | <<print "[[Play with her tits|FBoobs][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">> - <<if canDoVaginal($slaves[_BG])>> - | <<print "[[Fuck her|FVagina][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">> - <<if canDoAnal($slaves[_BG])>> - | <<print "[[Use her holes|FButt][$activeSlave = $slaves["+_BG+"],$nextButton = _j, $nextLink = _k, $returnTo = _l]]">> - <</if>> - <</if>> - <<if canDoAnal($slaves[_BG])>> - | <<print "[[Fuck her ass|FAnus][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">> - <</if>> - | <<print "[[Abuse her|FAbuse][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">> -<</if>> -<</if>> - -<<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>> -<<if $positionMainLinks <= 0>> - <br><<MainLinks>> -<</if>> - - <<else>> __''MAIN MENU''__ //[[Summary Options]]// diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw index cabcd24cc77..998f004c70c 100644 --- a/src/uncategorized/randomIndividualEvent.tw +++ b/src/uncategorized/randomIndividualEvent.tw @@ -777,7 +777,7 @@ <</if>> <</if>> -<<if $eventSlave.drugs == "breast injections">> +<<if $eventSlave.drugs == "intensive breast injections" || $eventSlave.drugs == "hyper breast injections">> <<if $eventSlave.boobs <= 8000>> <<if $eventSlave.boobs > 2000>> <<if $eventSlave.devotion <= 50>> diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw index 897ee29874a..5c970e75e79 100644 --- a/src/uncategorized/randomNonindividualEvent.tw +++ b/src/uncategorized/randomNonindividualEvent.tw @@ -120,37 +120,47 @@ <<else>> /* $familyTesting == 1 */ -<<set $devMother = $slaves.find(function(s) { return s.daughters > 0 && s.devotion > 50 && s.anus != 0 && canWalk(s); })>> -<<if (def $devMother)>> +<<set _relatedSlaves = $slaves.filter(function(s) { return s.daughters > 0 || s.sisters > 0; })>> + +<<set _devMothers = _relatedSlaves.filter(function(s) { return s.daughters > 0 && s.devotion > 50 && s.anus != 0 && canWalk(s); })>> +<<for _devMothers.length > 0>> + <<set $devMother = _devMothers.pluck()>> <<set $devDaughter = randomDaughter($devMother)>> <<if (def $devDaughter) && ($devDaughter.devotion > 50) && ($devDaughter.anus != 0) && canWalk($devDaughter)>> <<set $events.push("RE devoted mother daughter")>> + <<break>> <</if>> -<</if>> +<</for>> -<<set $mother = $slaves.find(function(s) { return s.daughters > 0 && s.devotion < 10 && s.anus != 0 && canWalk(s); })>> -<<if (def $mother)>> +<<set _resMothers = _relatedSlaves.filter(function(s) { return s.daughters > 0 && s.devotion < 10 && s.anus != 0 && canWalk(s); })>> +<<for _resMothers.length > 0>> + <<set $mother = _resMothers.pluck()>> <<set $daughter = randomDaughter($mother)>> <<if (def $daughter) && ($daughter.devotion < 10) && ($daughter.anus != 0) && canWalk($daughter)>> <<set $events.push("RE resistant mother daughter")>> + <<break>> <</if>> -<</if>> +<</for>> -<<set $youngerSister = $slaves.find(function(s) { return s.sisters > 0 && canPenetrate(s); })>> -<<if (def $youngerSister)>> +<<set _youngerSisters = _relatedSlaves.filter(function(s) { return s.sisters > 0 && canPenetrate(s); })>> +<<for _youngerSisters.length > 0>> + <<set $youngerSister = _youngerSisters.pluck()>> <<set $olderSister = randomSister($youngerSister)>> <<if (def $olderSister) && ($olderSister.anus == 0) && $youngerSister.devotion > ($olderSister.devotion+20)>> <<set $events.push("RE sibling revenge")>> + <<break>> <</if>> -<</if>> +<</for>> -<<set $alphaTwin = $slaves.find(function(s) { return s.sisters > 0 && s.anus > 0 && s.devotion > 50 && canWalk(s); })>> -<<if (def $alphaTwin)>> +<<set _twins = _relatedSlaves.filter(function(s) { return s.sisters > 0 && s.anus > 0 && s.devotion > 50 && canWalk(s); })>> +<<for _twins.length > 0>> + <<set $alphaTwin = _twins.pluck()>> <<set $betaTwin = randomTwinSister($alphaTwin)>> <<if (def $betaTwin) && ($betaTwin.anus > 0) && ($betaTwin.devotion > 50) && canWalk($betaTwin)>> <<set $events.push("RE devoted twins")>> + <<break>> <</if>> -<</if>> +<</for>> <</if>> /* closes extended family mode */ @@ -599,17 +609,20 @@ <<if $familyTesting == 1>> -<<set $i = $slaves.findIndex(function(s) { return s.fuckdoll == 0 && s.canRecruit == 1 && s.devotion > 50 && canWalk(s); })>> -<<if $i != -1>> - <<if random(1,100) > 90+(totalRelatives($slaves[$i])*2)>> +<<set _recruiterSlaves = $slaves.filter(function(s) { return s.fuckdoll == 0 && s.canRecruit == 1 && s.devotion > 50 && canWalk(s); })>> +<<for _recruiterSlaves.length > 0>> + <<set $recruiterSlave = _recruiterSlaves.pluck()>> + <<if random(1,100) > 90+(totalRelatives($recruiterSlave)*2)>> <<set $j = $genePool.findIndex(function(o) { return o.ID == $slaves[$i].ID; })>> <<if $j != -1>> <<set $events.push("RE relative recruiter")>> - <<else>> /* no matching slave object in the genePool array */ + <<break>> + <<else>> /* no matching slave object in the slavesOriginal array */ + <<set $i = $slaves.findIndex(function(o) { return o.ID == $recruiterSlave.ID; })>> <<set $slaves[$i].canRecruit = 0>> <</if>> <</if>> -<</if>> +<</for>> <<else>> /* extended family mode == 0 */ diff --git a/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw b/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw index b06b76909ac..d97b2b9f648 100644 --- a/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw +++ b/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw @@ -8,8 +8,9 @@ They arrive hand-in-hand and don't let go of each other until the end of the ens <<set _secondSlave = clone($activeSlave)>> <<NationalityToName _secondSlave>> +<<if $activeSlave.slaveSurname>><<set _secondSlave.slaveSurname = $activeSlave.slaveSurname>><</if>> +<<set _secondSlave.birthSurname = $activeSlave.birthSurname>> -<<set _secondSlave.slaveName = $activeSlave.birthName>> <<set _secondSlave.ID = $activeSlave.ID + 1000>> <<set _secondSlave.devotion += random (-1, 1)>> <<set _secondSlave.trust += random (-1, 1)>> diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw index 0f5723dca73..17b44ddd3be 100644 --- a/src/uncategorized/reRelativeRecruiter.tw +++ b/src/uncategorized/reRelativeRecruiter.tw @@ -4,15 +4,6 @@ <<if $familyTesting == 1>> -<<if ndef $newRelativeRecruitID>> - <<set $newRelativeRecruitID = 1100000>> -<</if>> - -<<set $eventSlave = $slaves.find(function(s) { return s.canRecruit == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) && (random(1,100) > (totalRelatives(s)*20)); })>> -<<if (ndef $eventSlave)>> /* due to randomization, we might have to stop here */ - <<goto "RIE Eligibility Check">> -<<else>> - /* 000-250-006 */ <<if $seeImages == 1>> <<if $imageChoice == 1>> @@ -23,7 +14,12 @@ <</if>> /* 000-250-006 */ +<<if ndef $newRelativeRecruitID>> + <<set $newRelativeRecruitID = 1100000>> +<</if>> + <<Enunciate $eventSlave>> +<<set $eventSlave = $slaves.find(function(s) { return s.ID == $recruiterSlave.ID; })>> <<set $activeSlave = clone($genePool.find(function(o) { return o && o.ID == $eventSlave.ID; }))>> <<set _recruitedType = []>> @@ -131,21 +127,21 @@ $eventSlave.slaveName requests an interview with you. She's a devoted slave, and you grant it, and are happy you did when you see the troubled expression on her face. She explains<<if !canTalk($eventSlave)>> with desperate gestures<</if>> that <<switch _relationType>> <<case "daughter">> - she had a daughter, who was sent to the slave orphanages, but now she's heard a rumor through other slaves that her daughter will go up for sale soon. + she had a daughter, who was sent to the slave orphanages. She's heard a rumor through other slaves that her daughter will go up for sale soon. <<case "son">> - she had a son, who was sent to the slave orphanages, but now she's heard a rumor through other slaves that her son will go up for sale soon. + she had a son, who was sent to the slave orphanages. She's heard a rumor through other slaves that her son will go up for sale soon. <<case "mother">> - her mother might be getting sold soon. She has been a slave for some time, but now she's heard a rumor through other slaves that her mother will go up for sale soon. + her mother might be getting sold soon. She has been a slave for some time. She's heard a rumor through other slaves that her mother will go up for sale soon. <<case "father">> - her father might be getting sold soon. She has been a slave for some time, but now she's heard a rumor through other slaves that her father will go up for sale soon. + her father might be getting sold soon. She has been a slave for some time. She's heard a rumor through other slaves that her father will go up for sale soon. <<case "older sister">> her older sister is being sold. She was likely to be enslaved the last $eventSlave.slaveName knew of her, and now she's heard a rumor through other slaves that her big sister is going to be sold to a new owner. <<case "older brother">> - her older brother is being sold. He was likely to be enslaved the last $eventSlave.slaveName knew of him, and now she's heard a rumor through other slaves that her big brother is going to be sold to a new owner. + her older brother is being sold. He was likely to be enslaved the last $eventSlave.slaveName knew of him. She's heard a rumor through other slaves that her big brother is going to be sold to a new owner. <<case "younger sister">> her younger sister is being sold. She was likely to be enslaved the last $eventSlave.slaveName knew of her, and now she's heard a rumor through other slaves that her little sister is going to be sold to a new owner. <<case "younger brother">> - her younger brother is being sold. He was likely to be enslaved the last $eventSlave.slaveName knew of him, and now she's heard a rumor through other slaves that her little brother is going to be sold to a new owner. + her younger brother is being sold. He was likely to be enslaved the last $eventSlave.slaveName knew of him. She's heard a rumor through other slaves that her little brother is going to be sold to a new owner. <<default>> she has a twin sister, who was still free the last $eventSlave.slaveName knew of her. She's heard a rumor through other slaves that her twin has finally been enslaved, and will soon go up for sale. <</switch>> @@ -734,7 +730,6 @@ You look up the _relationType. She costs ¤$slaveCost, a bargain, but you won't <</if>> /* _recruitedType.length */ -<</if>> /* eventSlave is valid */ <<else>> /* vanilla */ @@ -761,7 +756,7 @@ $eventSlave.slaveName requests an interview with you. She's a devoted slave, and <<case "mother">> she had a daughter, who was sent to the slave orphanages. Today will be the daughter's 18th birthday, which means she'll go up for sale. <<case "daughter">> - her mother has been enslaved. She was free the last $eventSlave.slaveName knew of her, but now she's heard a rumor through other slaves that her mother will go up for sale soon. + her mother has been enslaved. She was free the last $eventSlave.slaveName knew of her. She's heard a rumor through other slaves that her mother will go up for sale soon. <<case "older sister">> her older sister is being sold. She was likely to be enslaved the last $eventSlave.slaveName knew of her, and now she's heard a rumor through other slaves that her big sister is going to be sold to a new owner. <<case "young sister">> diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw index 8537ef3dac4..61cdfaac95c 100644 --- a/src/uncategorized/saDrugs.tw +++ b/src/uncategorized/saDrugs.tw @@ -1,5 +1,9 @@ :: SA drugs [nobr] +<<if $slaves[$i].drugs == "intensive breast injections" || $slaves[$i].drugs == "intensive butt injections" || $slaves[$i].drugs == "intensive penis enhancement" || $slaves[$i].drugs == "intensive testicle enhancement">> + <<set _intensive = 1>> +<</if>> + <<switch $slaves[$i].drugs>> <<case "hormone enhancers">> @@ -29,179 +33,179 @@ <</if>> <</if>> <<case "hyper breast injections">> - <<set $slaves[$i].chem += 2>> - <<set $seed = 0>> - $pronounCap receives @@.lime;direct injections of <<if ($injectionUpgrade != 0)>> advanced<</if>> hyper growth hormones, right into $possessive breasts;@@ - <<if ($slaves[$i].diet is "fattening")>> - all the food $pronoun's required to consume fuels growth, and - <<set $seed += 250>> - <<elseif ($slaves[$i].diet is "restricted")>> - $possessive restricted diet means $possessive body has few resources to grow on, and - <<set $seed -= 50>> - <<elseif ($slaves[$i].weight > 130)>> - the enormous diet $pronoun eats to maintain $possessive hugely fat body helps support growth, and - <<set $seed += 200>> - <<elseif ($slaves[$i].weight > 30)>> - the generous diet $pronoun eats to maintain $possessive fat body helps support growth, and - <<set $seed += 125>> - <<elseif ($slaves[$i].weight <= -30)>> - the diet $pronoun is required to maintain to keep slim impedes growth, and - <<set $seed -= 25>> - <<elseif ($slaves[$i].health > -20)>> - $possessive health supports growth reasonably well, and - <<else>> - $possessive poor health does not support steady growth, and - <<set $seed -= 25>> - <</if>> - $possessive - <<if ($slaves[$i].boobs < 800)>> - small chest tends to grow rapidly. - <<set $seed += 1000>> - <<set $seed += $injectionUpgrade>> - <<if ($slaves[$i].boobShape != "saggy") && ($slaves[$i].breastMesh != 1)>> - <<if random(1,10) < 5>> - As $possessive boobs rapidly grow, they become saggy under their own rapid weight gain. - <<set $slaves[$i].boobShape = "saggy">> - <</if>> - <</if>> - <<elseif ($slaves[$i].boobs < 2000)>> - modest tits tend to grow fast. - <<set $seed += 750>> - <<set $seed += $injectionUpgrade>> - <<if ($slaves[$i].boobShape != "saggy") && ($slaves[$i].breastMesh != 1)>> - <<if random(1,10) < 5>> - As $possessive boobs rapidly grow, they become saggy under their own rapid weight gain. - <<set $slaves[$i].boobShape = "saggy">> - <</if>> - <</if>> - <<elseif ($slaves[$i].boobs < 5000)>> - heavy boobs tend to grow modestly. - <<set $seed += 500>> - <<set $seed += $injectionUpgrade*0.5>> - <<if ($slaves[$i].boobShape != "saggy") && ($slaves[$i].breastMesh != 1)>> - <<if random(1,10) == 1>> - As they grow, they @@.lime;begin to sag@@ under their own monstrous weight, $possessive mass of breastflesh directing $possessive nipples downward. - <<set $slaves[$i].boobShape = "saggy">> - <</if>> - <</if>> - <<elseif ($slaves[$i].boobs < 10000)>> - huge boobs tend to grow slowly. - <<set $seed += 250>> - <<set $seed += $injectionUpgrade*0.5>> - <<if ($slaves[$i].boobShape != "saggy") && ($slaves[$i].breastMesh != 1)>> - <<if random(1,10) == 1>> - As they grow, they @@.lime;begin to sag@@ under their own monstrous weight, $possessive mass of breastflesh directing $possessive nipples downward. - <<set $slaves[$i].boobShape = "saggy">> - <</if>> - <</if>> - <<else>> - monstrous udders are just the right size to experience the explosive growth the drugs promise. - <<set $seed += 2500>> - <<set $seed += $injectionUpgrade*0.5>> - <<if ($slaves[$i].boobShape != "normal") && ($slaves[$i].breastMesh != 1)>> - <<if random(1,10) == 1>> - $possessiveCap @@.lime;breasts lose their unique shape@@ as they adapt to their monstrous, unnatural size. There's simply nowhere else for her mass of boob to go, and its expansion fills her breasts out and points her nipples forward. - <<set $slaves[$i].boobShape = "normal">> - <</if>> - <</if>> - <</if>> - <<if $seed > 25>> - <<set $slaves[$i].boobs += $seed>> - <<else>> - <<set $slaves[$i].boobs += 25>> - <</if>> - <<if random(1,100) > 30+($slaves[$i].areolae*10)>> - The increase in breast size @@.lime;stretches and broadens $possessive areolae.@@ - <<set $slaves[$i].areolae += 1>> - <</if>> - <<if (random(1,100) > 70) and ($slaves[$i].nipples != "inverted")>> - <<if ($slaves[$i].nipples is "tiny") or ($slaves[$i].nipples is "cute") or ($slaves[$i].nipples is "puffy") or ($slaves[$i].nipples is "huge")>> - The explosive increase in breast flesh also @@.lime;completely swallows $possessive nipples.@@ - <<set $slaves[$i].nipples to "inverted">> - <</if>> - <</if>> - -<<case "breast injections">> - <<set $seed = 0>> - $pronounCap receives @@.lime;direct injections of <<if ($injectionUpgrade != 0)>> advanced<</if>> growth hormones, right into $possessive breasts;@@ + <<set $slaves[$i].chem += 2>> + <<set _growth = (1+$injectionUpgrade)*3>> + $pronounCap receives @@.lime;direct injections of <<if ($injectionUpgrade != 0)>> advanced<</if>> hyper growth hormones, right into $possessive breasts;@@ <<if ($slaves[$i].diet == "fattening")>> - all the food $pronoun's required to consume fuels growth, <<if ($slaves[$i].boobs < 2000)>>and<<else>>but<</if>> - <<set $seed += 2>> + all the food $pronoun's required to consume fuels growth, <<if $slaves[$i].health > -20>>and<<else>>but<</if>> + <<set _growth += 6>> <<elseif ($slaves[$i].diet == "restricted")>> - $possessive restricted diet means $possessive body has few resources to grow on, <<if ($slaves[$i].boobs < 2000)>>but<<else>>and<</if>> - <<set $seed -= 2>> + $possessive restricted diet means $possessive body has few resources to grow on, <<if $slaves[$i].health > -20>>but<<else>>and<</if>> + <<set _growth -= 1>> <<elseif ($slaves[$i].weight > 130)>> - the enormous diet $pronoun eats to maintain $possessive hugely fat body helps support growth, and - <<set $seed += 2>> + the enormous diet $pronoun eats to maintain $possessive hugely fat body helps support growth, <<if $slaves[$i].health > -20>>but<<else>>and<</if>> + <<set _growth += 4>> <<elseif ($slaves[$i].weight > 30)>> - the generous diet $pronoun eats to maintain $possessive fat body helps support growth, <<if ($slaves[$i].boobs < 2000)>>and<<else>>but<</if>> - <<set $seed += 1>> + the generous diet $pronoun eats to maintain $possessive fat body helps support growth, <<if $slaves[$i].health > -20>>and<<else>>but<</if>> + <<set _growth += 2>> <<elseif ($slaves[$i].weight <= -30)>> - the diet $pronoun is required to maintain to keep slim impedes growth, <<if ($slaves[$i].boobs < 2000)>>but<<else>>and<</if>> - <<set $seed -= 1>> + the diet $pronoun is required to maintain to keep slim impedes growth, <<if $slaves[$i].health > -20>>but<<else>>and<</if>> + <<set _growth-->> + <</if>> + <<if $slaves[$i].health > 80>> + $possessive perfect health supports growth extremely well, <<if $slaves[$i].boobs < 5000 || $slaves[$i].boobs >= 10000>>and<<else>>but<</if>> + <<set _growth += 6>> <<elseif ($slaves[$i].health > -20)>> - $possessive health supports growth reasonably well, <<if ($slaves[$i].boobs < 2000)>>and<<else>>but<</if>> + $possessive health supports growth, <<if $slaves[$i].boobs < 2000>>and<<else>>but<</if>> <<else>> - $possessive poor health does not support steady growth, <<if ($slaves[$i].boobs < 2000)>>but<<else>>and<</if>> - <<set $seed -= 1>> + $possessive poor health does not support steady growth, but + <<set _growth-->> <</if>> $possessive <<if ($slaves[$i].boobs < 800)>> - modest chest tends to grow quickly. - <<set $seed += 4>> - <<set $seed += $injectionUpgrade*2>> - <<if ($slaves[$i].boobShape != "torpedo-shaped") && ($slaves[$i].boobShape != "wide-set") && ($slaves[$i].breastMesh != 1)>> - <<if random(1,10) == 1>> - <<if $slaves[$i].shoulders < 0>> - As $possessive boobs grow, they take on a torpedo shape within the frame of $possessive narrow shoulders, projecting a long way from $possessive chest and swinging delightfully when $pronoun's naked. - <<set $slaves[$i].boobShape = "torpedo-shaped">> - <<else>> - As $possessive boobs grow, they become widely set across the broadness of $possessive chest, spreading sideways even when $pronoun's not lying on $possessive back. - <<set $slaves[$i].boobShape = "wide-set">> - <</if>> + small chest tends to grow rapidly. + <<set _growth += 10>> + <<if ($slaves[$i].boobShape != "saggy") && ($slaves[$i].breastMesh != 1)>> + <<if random(1,10) < 5>> + As $possessive boobs rapidly grow, they become saggy under their own rapid weight gain. + <<set $slaves[$i].boobShape = "saggy">> + <</if>> <</if>> - <</if>> <<elseif ($slaves[$i].boobs < 2000)>> - big tits tend to grow readily. - <<set $seed += 3>> - <<set $seed += $injectionUpgrade*2>> - <<if ($slaves[$i].boobShape == "saggy") || ($slaves[$i].boobShape == "downward-facing")>> - <<if random(1,10) == 1>> - As they grow, they lose their sag, with the expanding tissue lifting $possessive nipples up to point forward. - <<set $slaves[$i].boobShape = "normal">> + modest tits tend to grow fast. + <<set _growth += 8>> + <<if ($slaves[$i].boobShape != "saggy") && ($slaves[$i].breastMesh != 1)>> + <<if random(1,10) < 5>> + As $possessive boobs rapidly grow, they become saggy under their own rapid weight gain. + <<set $slaves[$i].boobShape = "saggy">> + <</if>> <</if>> - <</if>> <<elseif ($slaves[$i].boobs < 5000)>> - heavy boobs tend to grow slowly. - <<set $seed += 2>> - <<set $seed += $injectionUpgrade>> - <<if ($slaves[$i].boobShape != "saggy") && ($slaves[$i].breastMesh != 1)>> - <<if random(1,10) == 1>> - As they grow, they @@.lime;begin to sag@@ under their own monstrous weight, $possessive mass of breastflesh directing $possessive nipples downward. - <<set $slaves[$i].boobShape = "saggy">> + heavy boobs tend to grow modestly. + <<set _growth += 6>> + <<if ($slaves[$i].boobShape != "saggy") && ($slaves[$i].breastMesh != 1)>> + <<if random(1,10) == 1>> + As they grow, they @@.lime;begin to sag@@ under their own monstrous weight, $possessive mass of breastflesh directing $possessive nipples downward. + <<set $slaves[$i].boobShape = "saggy">> + <</if>> + <</if>> + <<elseif ($slaves[$i].boobs < 10000)>> + huge boobs tend to grow slowly. + <<set _growth += 4>> + <<if ($slaves[$i].boobShape != "saggy") && ($slaves[$i].breastMesh != 1)>> + <<if random(1,10) == 1>> + As they grow, they @@.lime;begin to sag@@ under their own monstrous weight, $possessive mass of breastflesh directing $possessive nipples downward. + <<set $slaves[$i].boobShape = "saggy">> + <</if>> <</if>> - <</if>> <<else>> - monstrous udders tend to grow very slowly. - <<set $seed += 1>> - <<set $seed += $injectionUpgrade>> - <<if ($slaves[$i].boobShape != "normal") && ($slaves[$i].breastMesh != 1)>> - <<if random(1,10) == 1>> - $possessiveCap @@.lime;breasts lose their unique shape@@ as they adapt to their monstrous, unnatural size. There's simply nowhere else for $possessive mass of boob to go, and its expansion fills $possessive breasts out and points $possessive nipples forward. - <<set $slaves[$i].boobShape = "normal">> + monstrous udders are just the right size to experience the explosive growth the drugs promise. + <<set _growth += 10>> + <<if ($slaves[$i].boobShape != "normal") && ($slaves[$i].breastMesh != 1)>> + <<if random(1,10) == 1>> + $possessiveCap @@.lime;breasts lose their unique shape@@ as they adapt to their monstrous, unnatural size. There's simply nowhere else for her mass of boob to go, and its expansion fills her breasts out and points her nipples forward. + <<set $slaves[$i].boobShape = "normal">> + <</if>> <</if>> <</if>> + <<set _growth = 25*Math.trunc(_growth*0.8)>> + <<set $slaves[$i].boobs += Math.clamp(_growth, 25, 5000)>> + <<if random(1,100) > 30+($slaves[$i].areolae*10)>> + The increase in breast size @@.lime;stretches and broadens $possessive areolae.@@ + <<set $slaves[$i].areolae += 1>> + <</if>> + <<if (random(1,100) > 70) && ($slaves[$i].nipples != "inverted")>> + <<if ($slaves[$i].nipples == "tiny") || ($slaves[$i].nipples == "cute") || ($slaves[$i].nipples == "puffy") || ($slaves[$i].nipples == "huge")>> + The explosive increase in breast flesh also @@.lime;completely swallows $possessive nipples.@@ + <<set $slaves[$i].nipples = "inverted">> + <</if>> + <</if>> + +<<case "breast injections" "intensive breast injections">> + <<set _growth = 1+$injectionUpgrade>> + $pronounCap receives @@.lime; + <<if _intensive>> + massive + <<set _growth*=2>> + <</if>> + injections of <<if ($injectionUpgrade != 0)>>advanced<</if>> growth hormones, right into $possessive breasts;@@ + <<if ($slaves[$i].diet == "fattening")>> + all the food $pronoun's required to consume fuels growth, <<if $slaves[$i].health > -20>>and<<else>>but<</if>> + <<set _growth += 2>> + <<elseif ($slaves[$i].diet == "restricted")>> + $possessive restricted diet means $possessive body has few resources to grow on, <<if $slaves[$i].health > -20>>but<<else>>and<</if>> + <<set _growth -= 2>> + <<elseif ($slaves[$i].weight > 130)>> + the enormous diet $pronoun eats to maintain $possessive hugely fat body helps support growth, <<if $slaves[$i].health > -20>>and<<else>>but<</if>> + <<set _growth++>> + <<elseif ($slaves[$i].weight > 30)>> + the generous diet $pronoun eats to maintain $possessive fat body helps support growth, <<if $slaves[$i].health > -20>>and<<else>>but<</if>> + <<set _growth++>> + <<elseif ($slaves[$i].weight <= -30)>> + the diet $pronoun is required to maintain to keep slim impedes growth, <<if $slaves[$i].health > -20>>but<<else>>and<</if>> + <<set _growth-->> <</if>> - <<if $seed <= 1>> - <<set $slaves[$i].boobs += 25>> + <<if $slaves[$i].health > 80>> + $possessive perfect health supports growth extremely well, <<if $slaves[$i].boobs < 2000>>and<<else>>but<</if>> + <<set _growth++>> + <<elseif ($slaves[$i].health > -20)>> + $possessive health supports growth, <<if $slaves[$i].boobs < 2000>>and<<else>>but<</if>> <<else>> - <<set $slaves[$i].boobs += 25*Math.trunc($seed*0.8)>> + $possessive poor health does not support steady growth, <<if $slaves[$i].boobs < 2000>>but<<else>>and<</if>> + <<set _growth-->> <</if>> - <<if random(1,100) > 70+($slaves[$i].areolae*10)>> - The increase in breast size @@.lime;stretches and broadens $possessive areolae.@@ - <<set $slaves[$i].areolae += 1>> + $possessive + <<if ($slaves[$i].boobs < 800)>> + modest chest tends to grow quickly. + <<set _growth += 3>> + <<if ($slaves[$i].boobShape != "torpedo-shaped") && ($slaves[$i].boobShape != "wide-set") && ($slaves[$i].breastMesh != 1)>> + <<if random(1,10) == 1>> + <<if $slaves[$i].shoulders < 0>> + @@.lime;As $possessive boobs grow, they take on a torpedo shape within the frame of $possessive narrow shoulders,@@ projecting a long way from $possessive chest and swinging delightfully when $pronoun's naked. + <<set $slaves[$i].boobShape = "torpedo-shaped">> + <<else>> + @@.lime;As $possessive boobs grow, they become widely set across the broadness of $possessive chest,@@ spreading sideways even when $pronoun's not lying on $possessive back. + <<set $slaves[$i].boobShape = "wide-set">> + <</if>> + <</if>> + <</if>> + <<elseif ($slaves[$i].boobs < 2000)>> + big tits tend to grow readily. + <<set _growth += 2>> + <<if ($slaves[$i].boobShape == "saggy") || ($slaves[$i].boobShape == "downward-facing") && ($slaves[$i].breastMesh != 1)>> + <<if random(1,10) == 1>> + @@.lime;As they grow, they lose their sag,@@ with the expanding tissue lifting $possessive nipples up to point forward. + <<set $slaves[$i].boobShape = "normal">> + <</if>> + <</if>> + <<elseif ($slaves[$i].boobs < 5000)>> + heavy boobs tend to grow slowly. + <<set _growth++>> + <<if ($slaves[$i].boobShape != "saggy") && ($slaves[$i].breastMesh != 1)>> + <<if random(1,10) == 1>> + @@.lime;As they grow, they begin to sag@@ under their own monstrous weight, $possessive mass of breastflesh directing $possessive nipples downward. + <<set $slaves[$i].boobShape = "saggy">> + <</if>> + <</if>> + <<else>> + monstrous udders tend to grow very slowly. + <<if ($slaves[$i].boobShape != "normal") && ($slaves[$i].breastMesh != 1)>> + <<if random(1,10) == 1>> + @@.lime;$possessiveCap breasts lose their unique shape@@ as they adapt to their monstrous, unnatural size. There's simply nowhere else for $possessive mass of boob to go, and its expansion fills $possessive breasts out and points $possessive nipples forward. + <<set $slaves[$i].boobShape = "normal">> + <</if>> + <</if>> + <</if>> + <<set _growth = 25*Math.trunc(_growth*0.8)>> + <<set $slaves[$i].boobs += Math.clamp(_growth, 25, 200)>> + <<if $slaves[$i].areolae < 3>> + <<if _growth > $slaves[$i].areolae*25>> + The increase in breast size @@.lime;stretches and broadens $possessive areolae.@@ + <<set $slaves[$i].areolae += 1>> <</if>> - <<if (random(1,100) > 70) && ($slaves[$i].nipples != "huge")>> + <</if>> + <<if $slaves[$i].nipples != "huge">> + <<if random(1,200) > _growth>> <<if ($slaves[$i].nipples == "tiny")>> The hormones also @@.lime;cause nipple growth.@@ <<set $slaves[$i].nipples = "cute">> @@ -226,105 +230,117 @@ <<set $slaves[$i].nipples = "inverted">> <</if>> <</if>> + <</if>> -<<case "butt injections">> - <<set $seed = 0>> - $pronounCap receives @@.lime;direct injections of <<if ($injectionUpgrade != 0)>> advanced<</if>> growth hormones, right into $possessive buttocks;@@ +<<case "butt injections" "intensive butt injections">> + <<set _growth = 1+$injectionUpgrade>> + $pronounCap receives @@.lime; + <<if _intensive>> + massive + <<set _growth*=2>> + <</if>> + injections of <<if ($injectionUpgrade != 0)>>advanced<</if>> growth hormones, right into $possessive buttocks;@@ <<if ($slaves[$i].diet == "fattening")>> - all the food $pronoun's required to consume fuels growth, <<if ($slaves[$i].butt < 6)>>and<<else>>but<</if>> - <<set $seed += 0.2>> + all the food $pronoun's required to consume fuels growth, <<if $slaves[$i].health > -20>>and<<else>>but<</if>> + <<set _growth += 2>> <<elseif ($slaves[$i].diet == "restricted")>> - $possessive restricted diet means $possessive body has few resources to grow on, <<if ($slaves[$i].butt < 6)>>but<<else>>and<</if>> - <<set $seed -= 0.2>> + $possessive restricted diet means $possessive body has few resources to grow on, <<if $slaves[$i].health > -20>>but<<else>>and<</if>> + <<set _growth -= 2>> <<elseif ($slaves[$i].weight > 130)>> - the enormous diet $pronoun eats to maintain $possessive hugely fat body helps support growth, <<if ($slaves[$i].butt < 6)>>and<<else>>but<</if>> - <<set $seed += 0.2>> + the generous diet $pronoun eats to maintain $possessive fat body helps support growth, <<if $slaves[$i].health > -20>>and<<else>>but<</if>> + <<set _growth += 3>> <<elseif ($slaves[$i].weight > 30)>> - the generous diet $pronoun eats to maintain $possessive fat body helps support growth, <<if ($slaves[$i].butt < 6)>>and<<else>>but<</if>> - <<set $seed += 0.1>> + the generous diet $pronoun eats to maintain $possessive fat body helps support growth, <<if $slaves[$i].health > -20>>and<<else>>but<</if>> + <<set _growth++>> <<elseif ($slaves[$i].weight <= -30)>> - the diet $pronoun is required to maintain to keep slim impedes growth, <<if ($slaves[$i].butt < 6)>>but<<else>>and<</if>> - <<set $seed -= 0.1>> + the diet $pronoun is required to maintain to keep slim impedes growth, <<if $slaves[$i].health > -20>>but<<else>>and<</if>> + <<set _growth-->> + <</if>> + <<if $slaves[$i].health > 80>> + $possessive perfect health supports growth extremely well, <<if $slaves[$i].butt < 6>>and<<else>>but<</if>> + <<set _growth++>> <<elseif ($slaves[$i].health > -20)>> - $possessive health supports growth reasonably well, <<if ($slaves[$i].butt < 6)>>and<<else>>but<</if>> + $possessive health supports growth, <<if $slaves[$i].butt < 6>>and<<else>>but<</if>> <<else>> - $possessive poor health does not support steady growth, <<if ($slaves[$i].butt < 6)>>but<<else>>and<</if>> - <<set $seed -= 0.1>> + $possessive poor health does not support steady growth, <<if $slaves[$i].butt < 6>>but<<else>>and<</if>> + <<set _growth-->> <</if>> $possessive - <<if ($slaves[$i].butt < 2)>> - modest rear tends to grow quickly. - <<set $seed += 0.8>> - <<set $seed += $injectionUpgrade*0.6>> - <<elseif ($slaves[$i].butt < 4)>> - big behind tends to grow readily. - <<set $seed += 0.4>> - <<set $seed += $injectionUpgrade*0.4>> - <<elseif ($slaves[$i].butt < 6)>> - massive butt tend to grow slowly. - <<set $seed += 0.4>> - <<set $seed += $injectionUpgrade*0.2>> + <<if $slaves[$i].butt < 2>> + modest rear tends to grow quickly. + <<elseif $slaves[$i].butt < 4>> + big behind tends to grow readily. + <<set _growth += 2>> + <<elseif $slaves[$i].butt < 6>> + massive ass tend to grow slowly. + <<set _growth++>> <<else>> - monstrous cheeks tend to grow very slowly. - <<set $seed += 0.2>> - <<set $seed += $injectionUpgrade*0.2>> - <</if>> - <<if $seed > 0.2>> - <<set $slaves[$i].butt += $seed>> + monstrous cheeks tend to grow very slowly. + <</if>> + <<set _growth*=0.2>> + <<set $slaves[$i].butt += Math.clamp(_growth,0.2,1)>> + <<if _intensive>> + <<if $slaves[$i].anus > 1>> + The reckless drug therapy has the side effect of rejeuvenating her sphincter muscles, @@.lime;tightening up $possessive <<if $slaves[$i].anus > 4>>gaping<<elseif $slaves[$i].anus > 3>>loose<<else>>relaxed<</if>> anus.@@ + <<set $slaves[$i].anus-->> + <</if>> <<else>> - <<set $slaves[$i].butt += 0.2>> + <<if $slaves[$i].anus > 2>> + The drugs nearby rejeuvenate her sphincter muscles, @@.lime;tightening up $possessive <<if $slaves[$i].anus > 4>>gaping<<else>>loose<</if>> anus.@@ + <<set $slaves[$i].anus-->> + <</if>> <</if>> <<case "hyper butt injections">> <<set $slaves[$i].chem += 2>> - <<set $seed = 0>> + <<set _growth = .5>> $pronounCap receives @@.lime;direct injections of <<if ($injectionUpgrade != 0)>> advanced<</if>> hyper growth hormones, right into $possessive buttocks;@@ - <<if ($slaves[$i].diet is "fattening")>> - all the food $pronoun's required to consume fuels growth, <<if ($slaves[$i].butt < 10)>>and<<else>>but<</if>> - <<set $seed += 0.2>> - <<elseif ($slaves[$i].diet is "restricted")>> - $possessive restricted diet means $possessive body has few resources to grow on, <<if ($slaves[$i].butt < 10)>>but<<else>>and<</if>> - <<set $seed -= 0.2>> + <<if ($slaves[$i].diet == "fattening")>> + all the food $pronoun's required to consume fuels growth, <<if $slaves[$i].health > -20>>and<<else>>but<</if>> + <<set _growth += 0.2>> + <<elseif ($slaves[$i].diet == "restricted")>> + $possessive restricted diet means $possessive body has few resources to grow on, <<if $slaves[$i].health > -20>>and<<else>>but<</if>> + <<set _growth -= 0.2>> <<elseif ($slaves[$i].weight > 130)>> - the enormous diet $pronoun eats to maintain $possessive hugely fat body helps support growth, <<if ($slaves[$i].butt < 6)>>and<<else>>but<</if>> - <<set $seed += 0.2>> + the enormous diet $pronoun eats to maintain $possessive hugely fat body helps support growth, <<if $slaves[$i].health > -20>>and<<else>>but<</if>> + <<set _growth += 0.2>> <<elseif ($slaves[$i].weight > 30)>> - the generous diet $pronoun eats to maintain $possessive fat body helps support growth, <<if ($slaves[$i].butt < 6)>>and<<else>>but<</if>> - <<set $seed += 0.1>> + the generous diet $pronoun eats to maintain $possessive fat body helps support growth, <<if $slaves[$i].health > -20>>and<<else>>but<</if>> + <<set _growth += 0.1>> <<elseif ($slaves[$i].weight <= -30)>> - the diet $pronoun is required to maintain to keep slim impedes growth, <<if ($slaves[$i].butt < 10)>>but<<else>>and<</if>> - <<set $seed -= 0.1>> + the diet $pronoun is required to maintain to keep slim impedes growth, <<if $slaves[$i].health > -20>>and<<else>>but<</if>> + <<set _growth -= 0.1>> + <</if>> + <<if $slaves[$i].health > 80>> + $possessive perfect health supports growth extremely well, <<if $slaves[$i].butt < 10>>and<<else>>but<</if>> + <<set _growth += .5>> <<elseif ($slaves[$i].health > -20)>> - $possessive health supports growth reasonably well, <<if ($slaves[$i].butt < 10)>>and<<else>>but<</if>> + $possessive health supports growth reasonably well, <<if ($slaves[$i].butt < 10)>>and<<else>>but<</if>> <<else>> - $possessive poor health does not support steady growth, <<if ($slaves[$i].butt < 10)>>but<<else>>and<</if>> - <<set $seed -= 0.1>> + $possessive poor health does not support steady growth, <<if ($slaves[$i].butt < 10)>>but<<else>>and<</if>> + <<set _growth -= 0.1>> <</if>> $possessive <<if ($slaves[$i].butt < 6)>> - modest rear tends to grow quickly. - <<set $seed += 1.0>> - <<set $seed += $injectionUpgrade*0.6>> + modest rear tends to grow quickly. + <<set _growth += 1>> <<elseif ($slaves[$i].butt < 8)>> - gigantic behind tends to grow readily. - <<set $seed += 0.8>> - <<set $seed += $injectionUpgrade*0.4>> + gigantic behind tends to grow readily. + <<set _growth += .8>> <<elseif ($slaves[$i].butt < 10)>> - titanic jiggly butt tends to grow steadily. - <<set $seed += 0.6>> - <<set $seed += $injectionUpgrade*0.2>> + titanic jiggly butt tends to grow steadily. + <<set _growth += .6>> <<else>> - inhuman cheeks tend to grow slowly. - <<set $seed += 0.4>> - <<set $seed += $injectionUpgrade*0.2>> + inhuman cheeks tend to grow slowly. + <<set _growth += .4>> <</if>> - <<if $seed > 0.2>> - <<set $slaves[$i].butt += $seed>> + <<if _growth > 1>> + <<set $slaves[$i].butt += _growth>> <<else>> - <<set $slaves[$i].butt += 0.2>> + <<set $slaves[$i].butt += 1>> <</if>> <<if $slaves[$i].butt >= 20>> - <<set $slaves[$i].butt = 20>> + <<set $slaves[$i].butt = 20>> <</if>> <<case "lip injections">> @@ -341,52 +357,57 @@ <<case "male hormone injections">> <<if $slaves[$i].pubertyXY == 1>> - $pronounCap has potent sperm. @@.yellow;$possessiveCap drug regimen has been ended.@@ - <<set $slaves[$i].drugs = "no drugs">> + $pronounCap has potent sperm. @@.yellow;$possessiveCap drug regimen has been ended.@@ + <<set $slaves[$i].drugs = "no drugs">> <<else>> - The intense hormonal injections leave $possessive @@.red;sickened and weak@@ as $possessive body struggles to adapt to the overwhelming chemicals flooding $possessive system. - <<set $slaves[$i].chem += 20>> - <<set $slaves[$i].health -= 10>> - <<if $slaves[$i].energy > 5>> - <<set $slaves[$i].energy -= 5>> - <</if>> + The intense hormonal injections leave $possessive @@.red;sickened and weak@@ as $possessive body struggles to adapt to the overwhelming chemicals flooding $possessive system. + <<set $slaves[$i].chem += 20>> + <<set $slaves[$i].health -= 10>> + <<if $slaves[$i].energy > 5>> + <<set $slaves[$i].energy -= 5>> + <</if>> <</if>> <<case "female hormone injections">> <<if $slaves[$i].pubertyXX == 1>> - $pronounCap has begun ovulating. @@.yellow;$possessiveCap drug regimen has been ended.@@ - <<set $slaves[$i].drugs = "no drugs">> + $pronounCap has begun ovulating. @@.yellow;$possessiveCap drug regimen has been ended.@@ + <<set $slaves[$i].drugs = "no drugs">> <<else>> - The intense hormonal injections leave $possessive @@.red;sickened and weak@@ as $possessive body struggles to adapt to the overwhelming chemicals flooding $possessive system. - <<set $slaves[$i].chem += 20>> - <<set $slaves[$i].health -= 10>> - <<if $slaves[$i].energy > 5>> - <<set $slaves[$i].energy -= 5>> - <</if>> + The intense hormonal injections leave $possessive @@.red;sickened and weak@@ as $possessive body struggles to adapt to the overwhelming chemicals flooding $possessive system. + <<set $slaves[$i].chem += 20>> + <<set $slaves[$i].health -= 10>> + <<if $slaves[$i].energy > 5>> + <<set $slaves[$i].energy -= 5>> + <</if>> <</if>> -<<case "penis enhancement">> +<<case "penis enhancement" "intensive penis enhancement">> + <<set _growth = 60+($injectionUpgrade*20)>> + <<if _intensive>><<set _growth += 20>><</if>> <<if ($slaves[$i].dick > 0)>> - <<if (random(1,100) > (40-($injectionUpgrade*10)+($slaves[$i].dick*5))) && ($slaves[$i].dick < 10)>> - @@.lime;$possessiveCap cock grows painfully,@@ becoming both longer and girthier. - <<set $slaves[$i].dick += 1>> - <<elseif ($slaves[$i].balls == 1) && ($slaves[$i].scrotum > 0) && (random(1,100) > (90-($injectionUpgrade*10)))>> - As a side effect of the dick enhancement drugs, @@.lime;$possessive balls drop.@@ - <<set $slaves[$i].balls += 1>> + <<if (random(1,100) > _growth-($slaves[$i].dick*5)>> + @@.lime;$possessiveCap cock grows painfully,@@ becoming both longer and girthier. + <<set $slaves[$i].dick++>> <<else>> - Despite being dosed with a spectrum of powerful growth promoters, $possessive dick does not grow. + Despite being dosed with a spectrum of powerful growth promoters, $possessive dick does not grow. + <</if>> + <<if $slaves[$i].balls == 1>> + <<if $slaves[$i].scrotum > 0>> + As a side effect of the dick enhancement drugs, @@.lime;$possessive balls drop.@@ + <<set $slaves[$i].balls += 1>> + <</if>> <</if>> <<if $slaves[$i].dick == 6>> <<if $slaves[$i].balls > 0>> - @@.yellow;$possessiveCap dick is at the limit of what $possessive cardiovascular system could conceivably bring erect.@@ Further penis enhancement may limit $possessive ability to get hard. + @@.yellow;$possessiveCap dick is at the limit of what $possessive cardiovascular system could conceivably bring erect.@@ Further penis enhancement may limit $possessive ability to get hard. <</if>> <</if>> <<else>> - <<if (random(1,100) > (40-($injectionUpgrade*10)+($slaves[$i].clit*5))) && ($slaves[$i].clit < 5)>> - @@.lime;$possessiveCap clit grows painfully,@@ becoming both longer and girthier. - <<set $slaves[$i].clit += 1>> + <<if (random(1,100) > _growth-($slaves[$i].clit*10)>> + @@.lime;$possessiveCap clit grows painfully,@@ becoming both longer and girthier. + <<set $slaves[$i].clit++>> <<else>> - Despite being dosed with a spectrum of powerful growth promoters, $possessive clit does not grow. + Despite being dosed with a spectrum of powerful growth promoters, $possessive clit does not grow. <</if>> <</if>> @@ -413,15 +434,20 @@ <</if>> <</if>> -<<case "testicle enhancement">> - <<if (random(1,100) > (40-($injectionUpgrade*10)+($slaves[$i].balls*5))) && ($slaves[$i].balls < 6)>> - @@.lime;$possessiveCap balls swell painfully.@@ - <<set $slaves[$i].balls += 1>> - <<elseif ($slaves[$i].dick > 0 && $slaves[$i].dick < 2) && (random(1,100) > (90-($injectionUpgrade*10)))>> - As a side effect of the testicle enhancement drugs, @@.lime;$possessive micropenis grows,@@ becoming merely tiny. - <<set $slaves[$i].dick += 1>> +<<case "testicle enhancement" "intensive testicle enhancement">> + <<set _growth = 60+($injectionUpgrade*20)>> + <<if _intensive>><<set _growth += 20>><</if>> + <<if (random(1,100) > _growth-($slaves[$i].balls*5)>> + @@.lime;$possessiveCap balls swell painfully.@@ + <<set $slaves[$i].balls++>> <<else>> - Despite being filled with testicle enhancers and painfully swollen with resultant cum overproduction, $possessive balls do not grow. + Despite being filled with testicle enhancers and painfully swollen with resultant cum overproduction, $possessive balls do not grow. + <</if>> + <<if $slaves[$i].dick == 1>> + <<if $slaves[$i].scrotum > 0>> + As a side effect of the testicle enhancement drugs, @@.lime;$possessive micropenis grows,@@ becoming merely tiny. + <<set $slaves[$i].dick++>> + <</if>> <</if>> <<case "hyper testicle enhancement">> @@ -851,11 +877,17 @@ <<if $arcologies[0].FSBodyPuristLaw == 0>> <<if $healthyDrugsUpgrade == 0>> <<set $slaves[$i].chem += 1.5>> + <<if _intensive>><<set $slaves[$i].chem += 1>><</if>> <</if>> <</if>> <</if>> <<set $slaves[$i].chem = Math.clamp($slaves[$i].chem-0.5, 0, 1000)>> +<<if _intensive>> + Such reckless doping is dangerous and @@.red;unhealthy.@@ + <<set $slaves[$i].health -= random(3,5)>> +<</if>> + <<if $slaves[$i].curatives < 2 && $slaves[$i].inflationType != "curative" && $slaves[$i].assignment != "get treatment in the clinic">> <<if $slaves[$i].health < -50>> It's difficult being so ill, and $pronoun @@.mediumorchid;resents you@@ for not treating $possessive. @@ -941,49 +973,45 @@ /* DRUG EXPIRY */ <<switch $slaves[$i].drugs>> -<<case "breast injections">> +<<case "breast injections" "intensive breast injections">> <<if ($slaves[$i].boobs >= 25000)>> - $possessiveCap udders are now so huge that further A-HGH treatment will not increase their size. @@.yellow;$possessiveCap drug regimen has been ended.@@ - <<set $slaves[$i].drugs = "no drugs">> + $possessiveCap udders are now so huge that further A-HGH treatment will not increase their size. @@.yellow;$possessiveCap drug regimen has been ended.@@ + <<set $slaves[$i].boobs = Math.clamp($slaves[$i].butt,0,25000), $slaves[$i].drugs = "no drugs">> <</if>> -<<case "butt injections">> - <<if ($slaves[$i].butt >= 9)>> - $possessiveCap ass is now so huge that further A-HGH treatment will not increase its size. @@.yellow;$possessiveCap drug regimen has been ended.@@ - <<set $slaves[$i].drugs = "no drugs">> +<<case "butt injections" "intensive butt injections">> + <<if ($slaves[$i].butt >= 10)>> + $possessiveCap ass is now so huge that further A-HGH treatment will not increase its size. @@.yellow;$possessiveCap drug regimen has been ended.@@ + <<set $slaves[$i].butt = Math.clamp($slaves[$i].butt,0,10), $slaves[$i].drugs = "no drugs">> <</if>> <<case "hyper butt injections")>> <<if $slaves[$i].butt >= 20>> - $possessiveCap ass is now so freakishly monstrous that further HA-HGH treatment will not increase its size. @@.yellow;$possessiveCap drug regimen has been ended.@@ - <<set $slaves[$i].drugs = "no drugs">> + $possessiveCap ass is now so freakishly monstrous that further HA-HGH treatment will not increase its size. @@.yellow;$possessiveCap drug regimen has been ended.@@ + <<set $slaves[$i].drugs = "no drugs">> <</if>> <<case "hyper breast injections">> - <<if ($slaves[$i].boobs >= 25000)>> - $possessiveCap udders are now so huge that further HA-HGH treatment will not increase their size. @@.yellow;$possessiveCap drug regimen has been ended.@@ - <<set $slaves[$i].drugs = "no drugs">> - <</if>> + <<if ($slaves[$i].boobs >= 25000)>> + $possessiveCap udders are now so huge that further HA-HGH treatment will not increase their size. @@.yellow;$possessiveCap drug regimen has been ended.@@ + <<set $slaves[$i].drugs = "no drugs">> + <</if>> <<case "lip injections">> <<if ($slaves[$i].lips > 95) || (($slaves[$i].lips > 85) && ($seeExtreme != 1))>> $possessiveCap lips are now so huge that further A-HGH treatment will not increase their size. @@.yellow;$possessiveCap drug regimen has been ended.@@ <<set $slaves[$i].drugs = "no drugs">> <</if>> -<<case "penis enhancement">> - <<if $slaves[$i].dick > 0>> - <<if ($slaves[$i].dick >= 10)>> +<<case "penis enhancement" "intensive penis enhancement">> + <<if ($slaves[$i].dick >= 10)>> $possessiveCap cock is now so huge that further drug enhancement will not increase its size. @@.yellow;$possessiveCap drug regimen has been ended.@@ - <<set $slaves[$i].drugs = "no drugs">> - <</if>> - <<else>> - <<if ($slaves[$i].clit >= 5)>> + <<set $slaves[$i].dick = Math.clamp($slaves[$i].dick,0,10), $slaves[$i].drugs = "no drugs">> + <<elseif $slaves[$i].clit >= 5 && $slaves[$i].dick = 0>> $possessiveCap clit is now so huge that further drug enhancement will not increase its size. @@.yellow;$possessiveCap drug regimen has been ended.@@ - <<set $slaves[$i].drugs = "no drugs">> - <</if>> + <<set $slaves[$i].clit = Math.clamp($slaves[$i].dick,0,5), $slaves[$i].drugs = "no drugs">> <</if>> -<<case "testicle enhancement">> +<<case "testicle enhancement" "intensive testicle enhancement">> <<if ($slaves[$i].balls >= 6)>> - $possessiveCap balls are now so huge that further drug enhancement will not increase their size. However, leaving $possessive on them will still stimulate cum production. + $possessiveCap balls are now so huge that further drug enhancement will not increase their size. However, leaving $possessive on them will still stimulate cum production. <<elseif ($slaves[$i].balls >= 2) && ($slaves[$i].scrotum == 0)>> - $possessiveCap balls are now functionally sized, and cannot sustainably grow larger hidden within $possessive abdomen. @@.yellow;$possessiveCap drug regimen has been ended.@@ - <<set $slaves[$i].drugs = "no drugs">> + $possessiveCap balls are now functionally sized, and cannot sustainably grow larger hidden within $possessive abdomen. @@.yellow;$possessiveCap drug regimen has been ended.@@ + <<set $slaves[$i].balls = Math.clamp($slaves[$i].balls,0,2), $slaves[$i].drugs = "no drugs">> <</if>> <<case "psychosuppressants">> <<if ($slaves[$i].intelligence <= -2)>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index 2c3b1851c36..3fa96f95328 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -1996,11 +1996,16 @@ <<set _para = 1>> <<elseif $slaves[$i].health < 0>> Her paraphilia is ameliorated by her poor health; she knows she can't take expansion right now. + <<elseif $slaves[$i].drugs == "intensive breast injections">> + Her paraphilia makes her feel @@.mediumaquamarine;fulfilled to be a sex slave@@ if it means breast expansion like this. + <<set $slaves[$i].trust += 2>> + <<set _para = 1>> <<elseif $slaves[$i].drugs == "breast injections">> Her paraphilia makes breast injections very satisfying for her. <<set _para = 1>> <<elseif $slaves[$i].drugs == "hyper breast injections">> - Her paraphilia makes hyper breast injections extremely satisfying for her. + Her paraphilia makes her feel @@.mediumaquamarine;fulfilled to be a sex slave@@ if it means breast expansion like this. + <<set $slaves[$i].trust += 2>> <<set _para = 1>> <<else>> She feels her breasts are shrinking horribly, leaving the growth addict @@.mediumorchid;depressed and anxious.@@ @@ -2620,9 +2625,9 @@ <</if>> <</if>> -<<if ($slaves[$i].drugs == "testicle enhancement") || ($slaves[$i].drugs == "hyper testicle enhancement")>> -<<if ($slaves[$i].balls > 0)>> <<if ($slaves[$i].releaseRules == "permissive")>> +<<if ($slaves[$i].balls > 0)>> +<<if $slaves[$i].drugs == "testicle enhancement" || $slaves[$i].drugs == "intensive testicle enhancement" || ($slaves[$i].drugs == "hyper testicle enhancement")>> <<if ($slaves[$i].fetishStrength <= 95)>> <<if $fetishChangeChance > random(0,100)>> <<if $slaves[$i].fetish != "cumslut">> @@ -2783,7 +2788,7 @@ <</if>> <<case "boobs">> <<if $slaves[$i].sexualFlaw != "breast growth">> - <<if $slaves[$i].drugs == "breast injections">> + <<if $slaves[$i].drugs == "breast injections" || $slaves[$i].drugs == "intensive breast injections">> She loves her tits, and feeling them respond to drug injections starts to hold more fascination for her than mere sex. @@.yellow;Her sexual identity is now dominated by her swelling boobs.@@ <<set $slaves[$i].sexualFlaw = "breast growth">> <<set $slaves[$i].fetishStrength = 100>> @@ -5684,7 +5689,7 @@ <<if $slaves[$i].physicalAge >= 18>> <<if ($slaves[$i].boobs > 9000+($slaves[$i].muscles*100))>> <<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2) || $arcologies[0].FSAssetExpansionistResearch == 0>> - <<if ($slaves[$i].drugs != "breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>> + <<if ($slaves[$i].drugs != "breast injections" && $slaves[$i].drugs != "intensive breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>> <<if ($slaves[$i].boobs > 9000+($slaves[$i].muscles*100))>> Her breasts are larger than her body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@ <<set $slaves[$i].boobs = Math.clamp($slaves[$i].boobs-25, 9000+($slaves[$i].muscles*100), 25000)>> @@ -5723,7 +5728,7 @@ <<elseif $slaves[$i].physicalAge <= 3>> <<if ($slaves[$i].boobs > 5100+($slaves[$i].muscles*10))>> <<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2) or $arcologies[0].FSAssetExpansionistResearch == 0>> - <<if ($slaves[$i].drugs != "breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>> + <<if ($slaves[$i].drugs != "breast injections" && $slaves[$i].drugs != "intensive breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>> <<if ($slaves[$i].boobs > 5100+($slaves[$i].muscles*10))>> Her breasts are larger than her body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@ <<set $slaves[$i].boobs = Math.clamp($slaves[$i].boobs-25, 5100+($slaves[$i].muscles*10), 25000)>> @@ -5761,7 +5766,7 @@ <<elseif $slaves[$i].physicalAge <= 12>> <<if ($slaves[$i].boobs > 7000+($slaves[$i].muscles*20))>> <<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2)>> - <<if ($slaves[$i].drugs != "breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>> + <<if ($slaves[$i].drugs != "breast injections" && $slaves[$i].drugs != "intensive breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>> <<if ($slaves[$i].boobs > 7000+($slaves[$i].muscles*20))>> Her breasts are larger than her body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@ <<set $slaves[$i].boobs = Math.clamp($slaves[$i].boobs-25, 7000+($slaves[$i].muscles*20), 25000)>> @@ -5800,7 +5805,7 @@ <<else>> <<if ($slaves[$i].boobs > 9000+($slaves[$i].muscles*50))>> <<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2)>> - <<if ($slaves[$i].drugs != "breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>> + <<if ($slaves[$i].drugs != "breast injections" && $slaves[$i].drugs != "intensive breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>> <<if ($slaves[$i].boobs > 9000+($slaves[$i].muscles*50))>> Her breasts are larger than her body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@ <<set $slaves[$i].boobs = Math.clamp($slaves[$i].boobs-25, 9000+($slaves[$i].muscles*50), 25000)>> diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw index b1daa78f1db..c6344326e8f 100644 --- a/src/uncategorized/saRelationships.tw +++ b/src/uncategorized/saRelationships.tw @@ -233,7 +233,7 @@ <<elseif _SlaveI.relationship < 0>> /% Relationship with the PC %/ <<if _SlaveI.relationship == -1>> - <<if (_SlaveI.assignment == "serve the public") || (_SlaveI.assignment == "serve in the club") || (_SlaveI.assignment == "whore") || (_SlaveI.assignment == "work in the brothel")>> + <<if ["whore", "serve the public", "work in the brothel", "serve in the club", "be the DJ"].includes(_SlaveI.assignment)>> Her endless stream of lovers maintains and satisfies her emotional reliance on sex. <<elseif (_SlaveI.assignment == "serve in the master suite") && ($masterSuiteUpgradeLuxury == 2)>> Forming a part of the pile of copulating bodies in $masterSuiteName satisfies her voracious sexual appetite. diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw index f0f1b754f8d..2dbb2e5b511 100644 --- a/src/uncategorized/saWhore.tw +++ b/src/uncategorized/saWhore.tw @@ -475,7 +475,7 @@ Her appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a da <<set _children = $slaves.filter(function(s) { return ($slaves[$i].ID == s.father || $slaves[$i].ID == s.mother || s.ID == $slaves[$i].father || s.ID == $slaves[$i].mother || areSisters($slaves[$i], s) > 0) && s.assignment == "whore"; })>> <<if _children.length > 2>> Since her relatives, - <<for _sw = 0; _sw < _children.length; $j++>> + <<for _sw = 0; _sw < _children.length; _sw++>> <<if _sw < _children.length-1>> _children[_sw].slaveName, <<else>> diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index cae53d13cf3..f1e646e0418 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -806,6 +806,26 @@ <br>Drugs: <span id="drugs"><strong>$activeSlave.drugs</strong></span>. <<link "None">><<set $activeSlave.drugs = "no drugs">><<replace "#drugs">><strong>$activeSlave.drugs</strong><</replace>><</link>> <<if $activeSlave.indentureRestrictions < 2>> +<<if $activeSlave.drugs == "intensive breast injections" || $activeSlave.drugs == "intensive butt injections" || $activeSlave.drugs == "intensive penis enhancement" || $activeSlave.drugs == "intensive testicle enhancement">> + <<link "Moderate">> + <<switch $activeSlave.drugs>> + <<case "intensive breast injections">> + <<set $activeSlave.drugs = "breast injections">> + <<case "intensive butt injections">> + <<set $activeSlave.drugs = "butt injections">> + <<case "intensive penis enhancement">> + <<set $activeSlave.drugs = "penis enhancement">> + <<case "intensive testicle enhancement">> + <<set $activeSlave.drugs = "testicle enhancement">> + <</switch>> + <<replace "#drugs">><strong>$activeSlave.drugs</strong><</replace>> + <</link>> +<<elseif $activeSlave.drugs == "breast injections" || $activeSlave.drugs == "butt injections" || $activeSlave.drugs == "penis enhancement" || $activeSlave.drugs == "testicle enhancement">> + <<link "Intensify">> + <<set $activeSlave.drugs = $activeSlave.drugs += "intensive ">> + <<replace "#drugs">><strong>$activeSlave.drugs</strong><</replace>> + <</link>> +<</if>> <<if ($activeSlave.intelligence > -2)>> | <<link "Psychosuppressants">><<set $activeSlave.drugs = "psychosuppressants">><<replace "#drugs">><strong>$activeSlave.drugs</strong><</replace>><</link>> <<else>> diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw index e80eb4b2566..45880733dd3 100644 --- a/src/utility/descriptionWidgets.tw +++ b/src/utility/descriptionWidgets.tw @@ -22,6 +22,8 @@ <<if $lowercaseDonkey == 1>> +<span id="managePA"><strong><<link "Change plans">><<goto "Personal Attention Select">><</link>></strong></span> @@.cyan;[A]@@ + <<if $useTabs == 0>> <br> <<if _HG > -1>> @@ -49,10 +51,9 @@ <<set $showOneSlave = "guard you">> <<else>> You have @@.red;not@@ selected a Bodyguard. <span id="manageBG"><strong><<link "Select one">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@ - <</if>> + <</if>> <</if>> <</if>> -<span id="managePA"><strong><<link "Change plans">><<goto "Personal Attention Select">><</link>></strong></span> @@.cyan;[A]@@ <<else>> diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw index acdae7c64c1..7f54ae3022b 100644 --- a/src/utility/raWidgets.tw +++ b/src/utility/raWidgets.tw @@ -3867,7 +3867,7 @@ check if a rule attribute, any one, is defined and otherwise skip everything. <</if>> /* Asset Growth */ - <<set _tempAssetGrowthDrugs = ["breast injections", "breast redistributors", "butt injections", "butt redistributors", "lip injections", "lip atrophiers","penis enhancement", "penis atrophiers", "testicle enhancement", "testicle atrophiers", "hyper breast injections", "hyper butt injections", "hyper penis enhancement", "hyper testicle enhancement"]>> + <<set _tempAssetGrowthDrugs = ["breast injections", "intense breast injections", "breast redistributors", "butt injections", "instense butt injections", "butt redistributors", "lip injections", "lip atrophiers", "penis enhancement", "intense penis enhancement", "penis atrophiers", "testicle enhancement", "intense testicle enhancement", "testicle atrophiers", "hyper breast injections", "hyper butt injections", "hyper penis enhancement", "hyper testicle enhancement"]>> <<for _g = 0; _g < 1; _g++>> /* Growth drugs. Single loop broken when we find a drug to apply, or that a currently active drug is working on an unsatisfied growth target. Please advise if cleaner or more efficient code is possible. */ <<if $args[0].drugs == "super fertility drugs" || $args[0].drugs == "fertility drugs">> <br>$args[0].slaveName is on $args[0].drugs and will not be considered for drug enhancement until that regime is complete. -- GitLab