diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw index b08eb5796f4b6e90ce4f100625b5378b8be5572e..ca06c06262302cc93e22677658466daa69a1ad1b 100644 --- a/src/pregmod/newChildIntro.tw +++ b/src/pregmod/newChildIntro.tw @@ -504,7 +504,7 @@ You slowly strip down, gauging her reactions to your show, until you are fully n <</if>> <<else>> <<if $activeSlave.trust < 50>> - She notices that most of the slaves she sees around your penthouse seem to fear you ($enduringTrust); in turn @@color:gold;she fears you more too.@@ + She notices that most of the slaves she sees around your penthouse seem to fear you (<<print $enduringTrust>>); in turn @@color:gold;she fears you more too.@@ <<set $activeSlave.trust -= 2>> <</if>> <</if>> @@ -515,7 +515,7 @@ You slowly strip down, gauging her reactions to your show, until you are fully n <</if>> <<else>> <<if $activeSlave.devotion < 50>> - She sees that most of the slaves she sees around your penthouse dislike you ($enduringDevotion); in turn @@color:mediumorchid;she dislikes you more too.@@ + She sees that most of the slaves she sees around your penthouse dislike you (<<print $enduringDevotion>>); in turn @@color:mediumorchid;she dislikes you more too.@@ <<set $activeSlave.devotion -= 2>> <</if>> <</if>> diff --git a/src/pregmod/seDeath.tw b/src/pregmod/seDeath.tw index d0a5ca7a71ed88c8eaaf55f102e6af1aaad9b21c..686868d13bafafda2db959a79ba3446dfe46b30f 100644 --- a/src/pregmod/seDeath.tw +++ b/src/pregmod/seDeath.tw @@ -7,21 +7,23 @@ <<DeathOldAge>> <<set $activeSlave = $slaves[$i]>> <<include "Remove activeSlave">> + <br><br><hr style="margin:0"><br> <<elseif $slaves[$i].death == "od">> <<DeathOverdose>> <<set $activeSlave = $slaves[$i]>> <<include "Remove activeSlave">> + <br><br><hr style="margin:0"><br> <<elseif $slaves[$i].death == "health">> <<DeathUnhealthy>> <<set $activeSlave = $slaves[$i]>> <<include "Remove activeSlave">> + <br><br><hr style="margin:0"><br> <<elseif $slaves[$i].death == "burst">> <<DeathPregnancyBurst>> <<set $activeSlave = $slaves[$i]>> <<include "Remove activeSlave">> + <br><br><hr style="margin:0"><br> <</if>> -<br><br><hr style="margin:0"><br> -<</if>> <</for>> diff --git a/src/pregmod/widgets/deathWidgets.tw b/src/pregmod/widgets/deathWidgets.tw new file mode 100644 index 0000000000000000000000000000000000000000..367e87b1c40dac2b2e5ed5f840224ebae04f606a --- /dev/null +++ b/src/pregmod/widgets/deathWidgets.tw @@ -0,0 +1,118 @@ +:: death widgets [widget nobr] + +<<widget "pop">> + +<br> + +As $slaves[$i].slaveName is going about her business with her overfilled $slaves[$i].inflationType belly, she can't help but feel exhausted. Her health has been poor lately and the pressure in her organs is not helping things. She immediately knows something is wrong when an intense pain runs through her middle and her load shifts threateningly. Blood and $slaves[$i].inflationType leak from her rear as her body cavity fills with the contents of her digestive track. The skin of her taut belly reddens as the pressure against it builds. As she takes her last breath, she falls forward, her weight landing upon her straining stomach. With a gush, she ruptures, flooding the area around her with blood, guts and $slaves[$i].inflationType. Word of the late slave and her gruesome fate spread fast, @@color:gold;terrifying@@ your untrusting slaves. +<<for $j = 0; $j < $slaves.length; $j++>> + <<if ($slaves[$j].trust <= 50)>> + <<if ($slaves[$j].inflation >= 0)>> + <<set $slaves[$j].trust -= ((($slaves[$j].inflation)^3)*5)>> + <<else>> + <<set $slaves[$j].trust -= 10>> + <</if>> + <</if>> +<</for>> + +<</widget>> + +<<widget "DeathOldAge">> + <<SlavePronouns $slaves[$i]>> + <<if $slaves[$i].assignment == "be confined in the arcade">> + You are notified by $arcadeName staff that one of the cabinets has broken down and will need to be replaced. It would seem ''@@color:pink;$slaves[$i].slaveName@@'', the fucktoy encased in it, died naturally of old age despite $possessive living conditions. $pronounCap was a good unit; logs show $pronoun was taking dick up until the very end. + <<elseif $slaves[$i].assignment == "work in the dairy" && $dairyRestraints > 1>> + You are notified by $dairyName staff that one of the occupied milkers has ceased producing. Upon inspection, it would seem ''@@color:pink;$slaves[$i].slaveName@@'', the cow restrained in it, died naturally of old age despite $possessive living conditions. $pronounCap was a good cow; $pronoun gave milk up until $possessive death. + <<elseif $slaves[$i].fuckdoll > 0>> + One of your fuckdoll's monitoring systems alerts you that the slave contained within has died. It would seem ''@@color:pink;$slaves[$i].slaveName@@'' has died naturally of old age despite $possessive living conditions. Thankfully the suit notifies its owner of such things; especially with the rumors of earlier models and necrophilia you hear occasionally. + <<else>> + ''@@color:pink;$slaves[$i].slaveName@@'' failed to report in for a routine inspection, something that rarely occurs under your watch. It doesn't take long to track down the wayward slave. + <<set _deathSeed = random(1,100)>> + <<if _deathSeed > 75>> + $pronounCap is found dead in $possessive bed, having died sometime during the previous night. + <<elseif _deathSeed > 50>> + $pronounCap is found dead in a stairwell, having had a heart attack while trying to climb it. + <<elseif _deathSeed > 25>> + $pronounCap is found dead in the showers, having slipped sometime earlier. + <<else>> + <<if $slaves[$i].releaseRules != "restrictive">> + $pronounCap is found dead in the bed of another slave, having died during intercourse. $possessiveCap lover is not taking it well. + <<else>> + $pronounCap is found dead in the cafeteria, having died during breakfast; $pronoun ruined the day for a number of your slaves. + <</if>> + <</if>> + $slaves[$i].slaveName died at the age of $slaves[$i].actualAge; + <<if $slaves[$i].actualAge < 10>> + $pronoun lived a tragically short life. + <<elseif $slaves[$i].actualAge < 20>> + $pronoun died far too young. + <<elseif $slaves[$i].actualAge < 30>> + $pronoun died in what would be a sex slave's prime. + <<elseif $slaves[$i].actualAge < 50>> + $pronoun died in $possessive prime. + <<elseif $slaves[$i].actualAge < 65>> + $pronoun lived a fair life, good or bad. + <<elseif $slaves[$i].actualAge < 90>> + $pronoun lived a long life and experienced much during it. + <<else>> + $pronoun lived a very long life that few get to see. + <</if>> + <</if>> +<</widget>> + +<<widget "DeathOverdose">> + <<SlavePronouns $slaves[$i]>> + <<if $slaves[$i].fuckdoll > 0>> + One of your fuckdoll's monitoring systems alerts you that the slave contained within has died. It would seem ''@@color:pink;$slaves[$i].slaveName@@'' has died of an aphrodisiac overdose. Thankfully the suit notifies its owner of such things; especially with the rumors of earlier models and necrophilia you hear occasionally. It does little to deal with the resulting mess of the orgasm it died during, however. + <<else>> + ''@@color:pink;$slaves[$i].slaveName@@'' failed to report in for a routine inspection, something that rarely occurs under your watch. It doesn't take long to track down the wayward slave. + $pronounCap is found dead in $possessive bed, having died sometime earlier. Judging by the mess and the expression on $possessive face, $pronoun died of a heart attack during a particularly intense orgasm bought about by the massive amount of aphrodisiacs in her system. $slaves[$i].slaveName died at the age of $slaves[$i].actualAge; + <<if $slaves[$i].actualAge < 10>> + $pronoun lived a tragically short life. + <<elseif $slaves[$i].actualAge < 20>> + $pronoun died far too young. + <<elseif $slaves[$i].actualAge < 30>> + $pronoun died in what would be a sex slave's prime. + <<elseif $slaves[$i].actualAge < 50>> + $pronoun died in $possessive prime. + <<elseif $slaves[$i].actualAge < 65>> + $pronoun lived a fair life, good or bad. + <<elseif $slaves[$i].actualAge < 90>> + $pronoun lived a long life and experienced much during it. + <<else>> + $pronoun lived a very long life that few get to see. + <</if>> + <</if>> +<</widget>> + +<<widget "DeathUnhealthy">> + <<SlavePronouns $slaves[$i]>> + <<if $slaves[$i].fuckdoll > 0>> + One of your fuckdoll's monitoring systems alerts you that the slave contained within has died. It would seem ''@@color:pink;$slaves[$i].slaveName@@'' has died of general poor health. Thankfully the suit notifies its owner of such things; especially with the rumors of earlier models and necrophilia you hear occasionally. Clean up is easy enough, however. + <<else>> + ''@@color:pink;$slaves[$i].slaveName@@'' failed to report in for a routine inspection, something that rarely occurs under your watch. It doesn't take long to track down the wayward slave. + $pronounCap is found dead in $possessive bed, having died sometime during the night. $pronounCap has been in very poor health lately, so you knew this was a possibility. $slaves[$i].slaveName died at the age of $slaves[$i].actualAge; + <<if $slaves[$i].actualAge < 10>> + $pronoun lived a tragically short life. + <<elseif $slaves[$i].actualAge < 20>> + $pronoun died far too young. + <<elseif $slaves[$i].actualAge < 30>> + $pronoun died in what would be a sex slave's prime. + <<elseif $slaves[$i].actualAge < 50>> + $pronoun died in $possessive prime. + <<elseif $slaves[$i].actualAge < 65>> + $pronoun lived a fair life, good or bad. + <<elseif $slaves[$i].actualAge < 90>> + $pronoun lived a long life and experienced much during it. + <<else>> + $pronoun lived a very long life that few get to see. + <</if>> + <<if $arcologies[0].FSPaternalist != "unset">> + Allowing a slave to die under your care @@color:red;severely damages@@ your image as a caring slave owner and @@color:red;calls into question@@ your paternalistic resolve. + <<FSChange "Paternalist" -10>> + <</if>> + <</if>> +<</widget>> + +<<widget "DeathPregnancyBurst">> +<</widget>> \ No newline at end of file diff --git a/src/pregmod/widgets/pregmodBirthWidgets.tw b/src/pregmod/widgets/pregmodBirthWidgets.tw index 02c5304b2e4645b340201a3eaf28c08bb43281da..2a54da141203e2ade5f8c981a9eb22580ec3f2a1 100644 --- a/src/pregmod/widgets/pregmodBirthWidgets.tw +++ b/src/pregmod/widgets/pregmodBirthWidgets.tw @@ -646,22 +646,3 @@ <</if>> <</widget>> - - - -<<widget "pop">> - -<br> - -As $slaves[$i].slaveName is going about her business with her overfilled $slaves[$i].inflationType belly, she can't help but feel exhausted. Her health has been poor lately and the pressure in her organs is not helping things. She immediately knows something is wrong when an intense pain runs through her middle and her load shifts threateningly. Blood and $slaves[$i].inflationType leak from her rear as her body cavity fills with the contents of her digestive track. The skin of her taut belly reddens as the pressure against it builds. As she takes her last breath, she falls forward, her weight landing upon her straining stomach. With a gush, she ruptures, flooding the area around her with blood, guts and $slaves[$i].inflationType. Word of the late slave and her gruesome fate spread fast, @@color:gold;terrifying@@ your untrusting slaves. -<<for $j = 0; $j < $slaves.length; $j++>> - <<if ($slaves[$j].trust <= 50)>> - <<if ($slaves[$j].inflation >= 0)>> - <<set $slaves[$j].trust -= ((($slaves[$j].inflation)^3)*5)>> - <<else>> - <<set $slaves[$j].trust -= 10>> - <</if>> - <</if>> -<</for>> - -<</widget>> \ No newline at end of file diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index a13474d4560428ffecd063e663ad00024c9e2fdd..500a0da3185fba4fb778b9c4a2155353df545bad 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -3086,7 +3086,7 @@ You tell her kindly that you understand, and that she'll be trained to address t <<link "Publicly prove the depths of her humiliation to her">> <<replace "#name">>$activeSlave.slaveName<</replace>> <<replace "#result">> - You drag a fearful, embarrassed<<if $activeSlave.preg > 20>>, pregnant<</if>> and totally naked $activeSlave.slaveName out into a public hall. A small knot of passersby gather around grinning, enjoying the sight of her nakedness and anticipating a show. To her surprise, you order her to take a few minutes to recount her life story. She's hesitant at first, but obeys, only realizing as she nears the present day what an abject story of degradation and humiliation her life truly is. She continues shakily, describing in brief her current life, crying a little and trembling with arousal. At a whispered command from you, she concludes <<if canTalk($activeSlave) == false>>in embarrassed gestures, "and now my <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>> is going to fuck my worthless body in public."<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>"an now mah <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>> is gonna fuck mah worthless body ehn public."<<else>>"and now my <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>> is going to fuck my worthless body in public."<</if>> You take her standing there, as she cries with mixed shame and sexual pleasure. <<if ($activeSlave.vagina == -1)>>She <<if ($activeSlave.dick > 0 -1)>>cums even though she's soft<<else>>climaxes even though she's filled<</if>> with the shame, <<if $PC.dick == 0>>her anus clenching around the strap-on you're pumping in and out of it<<else>>adding a sad little dribble to the load dripping out of her asshole<</if>>.<<else>><<if $PC.dick == 0>>You make her clean her pussyjuice off your strap-on with her bitch mouth before you take it off.<<else>>As you pull out of her clenching pussy, cum runs down her quavering thighs.<</if>>.<</if>> @@color:hotpink;She has become more submissive to you,@@ and @@color:green;your reputation has increased.@@ + You drag a fearful, embarrassed<<if $activeSlave.preg > 20>>, pregnant<</if>> and totally naked $activeSlave.slaveName out into a public hall. A small knot of passersby gather around grinning, enjoying the sight of her nakedness and anticipating a show. To her surprise, you order her to take a few minutes to recount her life story. She's hesitant at first, but obeys, only realizing as she nears the present day what an abject story of degradation and humiliation her life truly is. She continues shakily, describing in brief her current life, crying a little and trembling with arousal. At a whispered command from you, she concludes <<if canTalk($activeSlave) == false>>in embarrassed gestures, "and now my <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>> is going to fuck my worthless body in public."<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>"an now mah <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>> is gonna fuck mah worthless body ehn public."<<else>>"and now my <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>> is going to fuck my worthless body in public."<</if>> You take her standing there, as she cries with mixed shame and sexual pleasure. <<if ($activeSlave.vagina == -1)>>She <<if ($activeSlave.dick > 0)>>cums even though she's soft<<else>>climaxes even though she's filled<</if>> with the shame, <<if $PC.dick == 0>>her anus clenching around the strap-on you're pumping in and out of it<<else>>adding a sad little dribble to the load dripping out of her asshole<</if>>.<<else>><<if $PC.dick == 0>>You make her clean her pussyjuice off your strap-on with her bitch mouth before you take it off.<<else>>As you pull out of her clenching pussy, cum runs down her quavering thighs.<</if>>.<</if>> @@color:hotpink;She has become more submissive to you,@@ and @@color:green;your reputation has increased.@@ <<set $activeSlave.devotion += 4>> <<set $rep += 100>> <<if ($activeSlave.vagina > -1)>> @@ -5753,7 +5753,7 @@ You tell her kindly that you understand, and that she'll be trained to address t <<replace "#name">>$activeSlave.slaveName<</replace>> <<replace "#result">> You enter, eliciting an embarrassed - "Um, hi <<if SlaveStatsChecker.checkForLisp($activeSlave)>><<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>><<else>>Master<</if>>" from $activeSlave.slaveName and a cheery wave from $assistantName. At this stage of your morning ablutions, you're conveniently naked, so you leap up onto the desktop and kneel upright, legs splayed. (Naturally, the desk is reinforced and sealed for exactly this reason.) You point meaningfully at your + "Um, hi <<if SlaveStatsChecker.checkForLisp($activeSlave)>><<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>><<else>><<Master>><</if>>" from $activeSlave.slaveName and a cheery wave from $assistantName. At this stage of your morning ablutions, you're conveniently naked, so you leap up onto the desktop and kneel upright, legs splayed. (Naturally, the desk is reinforced and sealed for exactly this reason.) You point meaningfully at your <<if $PC.dick == 1>> stiff prick <<if $PC.vagina == 1>>and flushed pussy<</if>>, and the obedient slave <<if $activeSlave.preg > 20>>hefts herself<<else>>clambers<</if>> up to suck you off<<if $PC.vagina == 1>> and eat you out<</if>>. When you're close, you surprise her by pulling your cock out of her mouth and blowing your load onto the glass. <<else>> @@ -5795,7 +5795,7 @@ You tell her kindly that you understand, and that she'll be trained to address t <<replace "#name">>$activeSlave.slaveName<</replace>> <<replace "#result">> You enter, eliciting an embarrassed - "Um, hi <<if SlaveStatsChecker.checkForLisp($activeSlave)>><<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>><<else>>Master<</if>>" from $activeSlave.slaveName, and ask $assistantName if she'd like to DP the slave with you. + "Um, hi <<if SlaveStatsChecker.checkForLisp($activeSlave)>><<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>><<else>><<Master>><</if>>" from $activeSlave.slaveName, and ask $assistantName if she'd like to DP the slave with you. <<if $assistantAppearance == "monstergirl">> "Oh yes," she purrs threateningly over the slave's moan of apprehension, and her avatar begins to stroke its dicks meaningfully. <<elseif $assistantAppearance == "shemale">> diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw index 09a47d10168f56e5298b33c2f9db9cba3610d0bb..4fb999f1f9acb526f2bc4f76b313d7f0cb0527c7 100644 --- a/src/uncategorized/RETS.tw +++ b/src/uncategorized/RETS.tw @@ -1101,6 +1101,7 @@ Mere moments after you absorb this arresting scene, $RERelationshipSlave.slaveNa <<set $slaves[$i].fetish = "buttslut">> <<set $slaves[$i].fetishKnown = 1>> <<set $slaves[$i].fetishStrength = 65>> + <<break>> <</if>> <</for>> <</replace>> @@ -1116,6 +1117,7 @@ Mere moments after you absorb this arresting scene, $RERelationshipSlave.slaveNa <<set $oralTotal += 1>> <<set $slaves[$i].trust -= 4>> <<set $slaves[$i].devotion += 4>> + <<break>> <</if>> <</for>> <</replace>> @@ -1157,6 +1159,7 @@ Mere moments after you absorb this arresting scene, $RERelationshipSlave.slaveNa <<set $slaves[$i].trust -= 10>> <<set $slaves[$i].devotion -= 5>> <<set $slaves[$i].anus = 1>> + <<break>> <</if>> <</for>> <</replace>> @@ -1200,6 +1203,7 @@ Mere moments after you absorb this arresting scene, $RERelationshipSlave.slaveNa <<if $slaves[$i].ID == $subSlave.ID>> <<set $slaves[$i].trust -= 5>> <<set $slaves[$i].devotion += 5>> + <<break>> <</if>> <</for>> <</replace>> @@ -1213,6 +1217,7 @@ Mere moments after you absorb this arresting scene, $RERelationshipSlave.slaveNa <<for $i to 0; $i < $slaves.length; $i++>> <<if $slaves[$i].ID is $subSlave.ID>> <<set $slaves[$i].trust += 4>> + <<break>> <</if>> <</for>> <</replace>> @@ -1225,6 +1230,7 @@ Mere moments after you absorb this arresting scene, $RERelationshipSlave.slaveNa <<for $i = 0; $i < $slaves.length; $i++>> <<if $slaves[$i].ID == $subSlave.ID>> <<set $slaves[$i].trust -= 5>> + <<break>> <</if>> <</for>> <</replace>> @@ -1322,7 +1328,7 @@ Mere moments after you absorb this arresting scene, $RERelationshipSlave.slaveNa <<SimpleVCheck>> <<set $activeSlave.devotion += 4>> <<for $i = 0; $i < $slaves.length; $i++>> - <<if $RERelationshipSlave.ID != $slaves[$i].ID>> + <<if $RERelationshipSlave.ID == $slaves[$i].ID>> <<set $activeSlave.analCount += 1>> <<set $analTotal += 1>> <<set $activeSlave.penetrativeCount += 1>> @@ -1376,7 +1382,7 @@ Mere moments after you absorb this arresting scene, $RERelationshipSlave.slaveNa <<SimpleVCheck>> <<set $activeSlave.trust += 4>> <<for $i = 0; $i < $slaves.length; $i++>> - <<if $RERelationshipSlave.ID != $slaves[$i].ID>> + <<if $RERelationshipSlave.ID == $slaves[$i].ID>> <<set $activeSlave.oralCount += 1>> <<set $oralTotal += 1>> <<set $activeSlave.penetrativeCount += 1>> diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw index 56d9d461d6ab8dd1d74a6cb1a6a17c6bc941c001..22079b33e943ba6264a91f60498fadd583d54cae 100644 --- a/src/uncategorized/economics.tw +++ b/src/uncategorized/economics.tw @@ -7,14 +7,6 @@ <<set $debtWarned = 0>> <</if>> -<<for $i = 0; $i < $slaves.length; $i++>> -<<if $slaves[$i].health <= -100>> - <<set $activeSlave = $slaves[$i]>> - <<include "Remove activeSlave">> - <<set $i -= 1>> -<</if>> -<</for>> - //FC Markets Report:// <<set $assetAffected = either("general", "slaves", "entrapment", "capture", "training", "surgical", "drugs")>> diff --git a/src/uncategorized/hgApplication.tw b/src/uncategorized/hgApplication.tw index 2445037f75df5f1a63074190c07a83b17bbe4c59..4badf111766c9e6e1f5f253666c7ae6a04591e86 100644 --- a/src/uncategorized/hgApplication.tw +++ b/src/uncategorized/hgApplication.tw @@ -55,7 +55,7 @@ She helps $activeSlave.slaveName however she can. The tender care has @@color:gr <<if $HeadGirl.actualAge > 30>> Her age and experience help her as she works with $activeSlave.slaveName. -<<elseif ($HeadGirl.actualAge < 25) && $AgePenalty > 0>> +<<elseif $HeadGirl.actualAge < 25 && $AgePenalty > 0>> Her youth and inexperience impede her as she works with $activeSlave.slaveName. <</if>> diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw index 1e21339dca8bec91759a8a7e3ebda6cbbd63ab7a..816b113a4a74159a4711f2686acd7a7b7922461d 100644 --- a/src/uncategorized/newSlaveIntro.tw +++ b/src/uncategorized/newSlaveIntro.tw @@ -217,7 +217,7 @@ The legalities completed, ''__@@color:pink;$activeSlave.slaveName@@__'' <<if ($a <</if>> <<else>> <<if $activeSlave.trust < 50>> - She notices that most of the slaves she sees around your penthouse seem to fear you, and starts to @@color:gold;fear you,@@ too ($enduringTrust). + She notices that most of the slaves she sees around your penthouse seem to fear you, and starts to @@color:gold;fear you,@@ too (<<print $enduringTrust>>). <<set $activeSlave.trust -= 2>> <</if>> <</if>> @@ -228,7 +228,7 @@ The legalities completed, ''__@@color:pink;$activeSlave.slaveName@@__'' <<if ($a <</if>> <<else>> <<if $activeSlave.devotion < 50>> - She sees that most of the slaves she sees around your penthouse dislike you, and starts to @@color:mediumorchid;dislike you@@ a little more herself ($enduringDevotion). + She sees that most of the slaves she sees around your penthouse dislike you, and starts to @@color:mediumorchid;dislike you@@ a little more herself (<<print $enduringDevotion>>). <<set $activeSlave.devotion -= 2>> <</if>> <</if>> diff --git a/src/uncategorized/saBeYourHeadGirl.tw b/src/uncategorized/saBeYourHeadGirl.tw index 594f6b755d09b9a83c2f28b41a78d1c6b39353e6..43ad4280ffb93acdf22631fddc9558079383035c 100644 --- a/src/uncategorized/saBeYourHeadGirl.tw +++ b/src/uncategorized/saBeYourHeadGirl.tw @@ -70,19 +70,19 @@ <</if>> <</if>> <<else>> - <<if $slaves[$i].relationshipTarget == $Concubine.ID>> - <<if $slaves[$i].relationTarget == $Concubine.ID>> - Your Concubine is your Consort's $slaves[$i].relation-wife. Truly, $arcologies[0].name looks up to you @@color:green;as children to a father.@@ - <<set $rep += 250>> - <<else>> - Your Consort and your Concubine are wives to each other and to Pharaoh. This is @@color:green;as it should be.@@ - <<set $rep += 100>> - <</if>> - <<elseif $slaves[$i].relationshipTarget == $slaves[$i].relationTarget>> - Your Consort has a $slaves[$i].relation-wife. This is @@color:green;as it should be.@@ - <<set $rep += 100>> + <<if $slaves[$i].relationshipTarget == $Concubine.ID>> + <<if $slaves[$i].relationTarget == $Concubine.ID>> + Your Concubine is your Consort's $slaves[$i].relation-wife. Truly, $arcologies[0].name looks up to you @@color:green;as children to a father.@@ + <<set $rep += 250>> + <<else>> + Your Consort and your Concubine are wives to each other and to Pharaoh. This is @@color:green;as it should be.@@ + <<set $rep += 100>> <</if>> + <<elseif $slaves[$i].relationshipTarget == $slaves[$i].relationTarget>> + Your Consort has a $slaves[$i].relation-wife. This is @@color:green;as it should be.@@ + <<set $rep += 100>> <</if>> + <</if>> /* closes extended family mode */ <</if>> <</if>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index 9ae7edb42998bcce1ae65fe3dc67b2c730191640..62a5f461ccb5583776c85c0b9f6530eb126a79aa 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -6108,24 +6108,26 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr <<set $burstee = 1>> <</if>> -/* <<if $slaves[$i].burst != 1>> - <<if $slaves[$i].health <= -100>> + <<if $slaves[$i].health <= -90>> <<set _deathSeed = ($slaves[$i].health-$slaves[$i].physicalAge-($slaves[$i].chem*2)-($slaves[$i].addict*2))>> <<if $slaves[$i].weight < -50 || $slaves[$i].weight >= 95>> <<set _deathSeed -= 100>> <</if>> - <<if ($slaves[$i].aphrodisiacs > 0 || $slaves[$i].inflationType == "aphrodisiac")>> - <<set _deathSeed -= 100>> + <<if $slaves[$i].aphrodisiacs > 0>> + <<set _deathSeed -= (75*$slaves[$i].aphrodisiacs)>> <</if>> - <<if ($slaves[$i].curatives == 1>> + <<if $slaves[$i].inflationType == "aphrodisiac">> + <<set _deathSeed -= (100*$slaves[$i].inflation)>> + <</if>> + <<if $slaves[$i].curatives == 1>> <<set _deathSeed += 200>> <</if>> - <<if random(1,1000) > (600+_deathSeed)>> + <<if random(1,1000) > (800+_deathSeed)>> <<set $slaves[$i].death = "health">> <<set $slaveDeath = 1>> <</if>> - <<if $slaves[$i].health <= -100 && ($slaves[$i].aphrodisiacs > 0 || $slaves[$i].inflationType == "aphrodisiac")>> + <<if ($slaves[$i].aphrodisiacs > 0 || $slaves[$i].inflationType == "aphrodisiac") && random(1,1000) > (600+_deathSeed)>> <<set $slaves[$i].death = "OD">> <<set $slaveDeath = 1>> <</if>> @@ -6138,7 +6140,6 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr <</if>> <</if>> <</if>> -*/ <<if ($slaves[$i].hStyle != "shaved" && $slaves[$i].bald != 1)>> <<if ($slaves[$i].hLength < 150)>> diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw index 0d09348b8a158e5bd4b0d241234f23b740672a2c..bba03a1a722b80d80f7ae06f29a3975ad132322d 100644 --- a/src/uncategorized/saRelationships.tw +++ b/src/uncategorized/saRelationships.tw @@ -646,7 +646,7 @@ maintains a close friendship with _SlaveJ.slaveName. <<if _SlaveI.sexualQuirk == "romantic">> Her romantic bent drives her to search for a regular sexual partner. - <<set $seed = 10>> + <<set _seed = 10>> <</if>> <<if (_SlaveI.devotion + _SlaveI.trust > 95) && (random(1, 2) == 1)>> _SlaveI.slaveName is totally devoted to you, and implicitly trusts both you and her place as a slave. Since her relationship with _SlaveJ.slaveName has not yet turned sexual, and diff --git a/src/uncategorized/saRivalries.tw b/src/uncategorized/saRivalries.tw index 5e0f6549e56d413713282c3e65bf0805baba731f..45d94cc472b4ba3e648d67dff3df7ea86270c9d2 100644 --- a/src/uncategorized/saRivalries.tw +++ b/src/uncategorized/saRivalries.tw @@ -70,16 +70,16 @@ $slaves[$i].slaveName and _SlaveJ.slaveName's @@color:lightgreen;feud dissipates a little.@@ <<set _SlaveJ.rivalry -= 1, $slaves[$i].rivalry -= 1>> <</if>> -<<elseif $familyTesting == 1 && totalRelatives($slaves[$i]) > 0 && (random(1,100) > 80)>> - $slaves[$i].slaveName and_SlaveJ.slaveName @@color:lightsalmon;pursue their family rivalry.@@ +<<elseif $familyTesting == 1 && ($slaves[$i].mother == _SlaveJ.ID || $slaves[$i].father == _SlaveJ.ID || _SlaveJ.mother == $slaves[$i].ID || SlaveJ.father == $slaves[$i].ID || areSisters($slaves[$i], _SlaveJ)) && (random(1,100) > 80)>> + $slaves[$i].slaveName and _SlaveJ.slaveName @@color:lightsalmon;pursue their family rivalry.@@ <<set _SlaveJ.rivalry -= 1, $slaves[$i].rivalry -= 1>> -<<elseif ($slaves[$i].relation != 0) && ($slaves[$i].relationTarget is $slaves[$i].rivalryTarget) && (random(1,100) > 80)>> +<<elseif ($slaves[$i].relation != 0) && ($slaves[$i].relationTarget == $slaves[$i].rivalryTarget) && (random(1,100) > 80)>> $slaves[$i].slaveName and _SlaveJ.slaveName @@color:lightsalmon;pursue their family rivalry.@@ <<set _SlaveJ.rivalry += 1, $slaves[$i].rivalry += 1>> -<<elseif $familyTesting == 1 && totalRelatives($slaves[$i]) > 0 && (random(1,100) > 80)>> +<<elseif $familyTesting == 1 && ($slaves[$i].mother == _SlaveJ.ID || $slaves[$i].father == _SlaveJ.ID || _SlaveJ.mother == $slaves[$i].ID || SlaveJ.father == $slaves[$i].ID || areSisters($slaves[$i], _SlaveJ)) > 0 && (random(1,100) > 80)>> $slaves[$i].slaveName and _SlaveJ.slaveName @@color:lightgreen;patch up their family relationship.@@ <<set _SlaveJ.rivalry -= 1, $slaves[$i].rivalry -= 1>> -<<elseif ($slaves[$i].relation != 0) && ($slaves[$i].relationTarget is $slaves[$i].rivalryTarget) && (random(1,100) > 80)>> +<<elseif ($slaves[$i].relation != 0) && ($slaves[$i].relationTarget == $slaves[$i].rivalryTarget) && (random(1,100) > 80)>> $slaves[$i].slaveName and _SlaveJ.slaveName @@color:lightgreen;patch up their family relationship.@@ <<set _SlaveJ.rivalry -= 1, $slaves[$i].rivalry -= 1>> <<elseif ($slaves[$i].energy > 95) && (random(1,100) > 60)>>