From df8a92af638a21a5fdb4010be87eaa08af5eed3e Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 10 Jun 2018 22:41:43 -0400
Subject: [PATCH] more fixes
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 5 +
devNotes/twine JS | 4 +-
src/SecExp/attackReport.tw | 2 +-
src/gui/Encyclopedia/encyclopedia.tw | 4 +
src/js/clothingSelectionJS.tw | 4 +-
src/pregmod/fFeet.tw | 17 ++-
src/pregmod/fillUpButt.tw | 6 +-
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/longSlaveDescription.tw | 54 ++++---
src/uncategorized/neighborsDevelopment.tw | 4 +-
src/uncategorized/persBusiness.tw | 2 +-
src/uncategorized/saLongTermEffects.tw | 4 +-
src/uncategorized/saRivalries.tw | 148 +++++++++++--------
src/uncategorized/saServeThePublic.tw | 8 +-
src/uncategorized/saWhore.tw | 8 +-
15 files changed, 149 insertions(+), 123 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 4404048c6ea..03254a8da03 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,11 @@
0.10.7.1-0.3.x
+6/11/2018
+
+ 16
+ -more various fixes and corrections
+
6/10/2018
15
diff --git a/devNotes/twine JS b/devNotes/twine JS
index af9af78e777..79d3ed5f47c 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -8053,7 +8053,7 @@ window.todaysCollar = function(slave) {
if(slave.fetish == "masochist") {
neck.push({text: "dons a tight steel collar around her neck,", collar: "tight steel"});
neck.push({text: "dons a painful leather collar,", collar: "uncomfortable leather"});
- neck.push({text: "dons a painfully tight neck corset,", collar: "satin choker"});
+ neck.push({text: "dons a painfully tight neck corset,", collar: "neck corset"});
} else if(slave.fetish == "pregnancy" && (canGetPregnant(slave) || slave.pregKnown == 1)) {
neck.push({text: "dons a digital display that tells everything about her womb,", collar: "preg biometrics"});
} else if(slave.fetish == "boobs" && slave.boobs >= 1000) {
@@ -8090,7 +8090,7 @@ window.todaysCorset = function(slave) {
if(slave.weight > 130) {
belly.push({text: "struggles to fit a fake pregnant belly around her gut before giving up and hoping she can pass as fecund,", bellyAccessory: "none"});
} else {
- belly.push({text: "straps on a fake pregnant belly to fit in with all the other pregnant girls,", bellyAccessory: jsEither(["a small empathy belly", "a medium empathy belly", "a large empathy belly", "a huge empathy belly"])});
+ belly.push({text: "straps on a fake pregnant belly to fit in with all the other pregnant girls,", bellyAccessory: jsEither(["a small empathy belly", "a medium empathy belly", "a large empathy belly"])});
}
} else if(slave.belly < 1500 && slave.fetish == "pregnancy" && isItemAccessible("a small empathy belly") && slave.sexualFlaw != "breeder" && slave.weight <= 130) {
if(slave.fetishStrength <= 30) {
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index ba2e5635cb3..ad55400bf99 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -820,7 +820,7 @@
<<if $auto == 1>>$assistantName<<else>>You<</if>> let your personal assistant lead the troops.
<<if $deployingMercs == 1 || $deployingMilitia == 1 || $deployingSlaves == 1>>
<<if _oldRep < 10000 && _oldAuth < 10000>>
- No soldier trusts a computer to be their commander, no algorithm can substitute experience <<if $assistantPower == 0>>and as expected<<else>>, however <</if>>
+ No soldier trusts a computer to be their commander, no algorithm can substitute experience<<if $assistantPower == 0>>and as expected<<else>>, however, <</if>>
<<else>>
No soldier trusts a computer to be their commander, but they trust you enough to not question your decision<<if $assistantPower == 0>>, however<<else>>, <</if>>
<</if>>
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 7559fa4b2f6..6384b944ecb 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2814,6 +2814,9 @@ LORE: INTERVIEWS
<br>
**Our guarantee does not cover slaveowners who underestimate their slaves' potency and wind up pregnant.
+<<case "Artificial Insemination">>
+ A simple surgical procedure involving the injection of harvested sperm into a fertile womb. Useful for assuring the conception of a child of the desired union, impregnation without sexual intercourse, circumventing physical and mental quirks in copulation, or just finding the perfect Virgin Mary for the holidays.
+
<<case "The Black Market">>
<h4>The Black Market</h4>
You may be the ruler of your arcology, but you don't exist in a vacuum. You can do all kinds of thing and get lots of things that regular citizens can't. So the Black Market, is a chance for less prominent citizens to do or get stuff like an arcology leader might experience. But for a ruler like yourself, it's a chance to avoid the severe scruitiny you're subject to on a regular basis, and to get a hold of bleeding edge or illegal research and technologies. The market itself is always moving from place to place, but if you're reputable enough, you can find it when you need it.
@@ -3207,6 +3210,7 @@ Error: bad title.
| <<link "Pregnancy Generator">><<set $encyclopedia = "Pregnancy Generator">><<goto "Encyclopedia">><</link>>
| <<link "Childbirth and C-Secs">><<set $encyclopedia = "Childbirth and C-Secs">><<goto "Encyclopedia">><</link>>
| <<link "Gestation Drugs and Labor Suppressants">><<set $encyclopedia = "Gestation Drugs and Labor Suppressants">><<goto "Encyclopedia">><</link>>
+ | <<link "Artificial Insemination">><<set $encyclopedia = "Artificial Insemination">><<goto "Encyclopedia">><</link>>
| <<link "Enemas and Force-Feeding">><<set $encyclopedia = "Enemas and Force-Feeding">><<goto "Encyclopedia">><</link>>
| <<link "Belly Implants">><<set $encyclopedia = "Belly Implants">><<goto "Encyclopedia">><</link>>
| <<link "Cervix Micropump Filter">><<set $encyclopedia = "Cervix Micropump Filter">><<goto "Encyclopedia">><</link>>
diff --git a/src/js/clothingSelectionJS.tw b/src/js/clothingSelectionJS.tw
index 9f2a63f73f2..f125c4342eb 100644
--- a/src/js/clothingSelectionJS.tw
+++ b/src/js/clothingSelectionJS.tw
@@ -662,7 +662,7 @@ window.todaysCollar = function(slave) {
if(slave.fetish == "masochist") {
neck.push({text: "dons a tight steel collar around her neck,", collar: "tight steel"});
neck.push({text: "dons a painful leather collar,", collar: "uncomfortable leather"});
- neck.push({text: "dons a painfully tight neck corset,", collar: "satin choker"});
+ neck.push({text: "dons a painfully tight neck corset,", collar: "neck corset"});
} else if(slave.fetish == "pregnancy" && (canGetPregnant(slave) || slave.pregKnown == 1)) {
neck.push({text: "dons a digital display that tells everything about her womb,", collar: "preg biometrics"});
} else if(slave.fetish == "boobs" && slave.boobs >= 1000) {
@@ -699,7 +699,7 @@ window.todaysCorset = function(slave) {
if(slave.weight > 130) {
belly.push({text: "struggles to fit a fake pregnant belly around her gut before giving up and hoping she can pass as fecund,", bellyAccessory: "none"});
} else {
- belly.push({text: "straps on a fake pregnant belly to fit in with all the other pregnant girls,", bellyAccessory: jsEither(["a small empathy belly", "a medium empathy belly", "a large empathy belly", "a huge empathy belly"])});
+ belly.push({text: "straps on a fake pregnant belly to fit in with all the other pregnant girls,", bellyAccessory: jsEither(["a small empathy belly", "a medium empathy belly", "a large empathy belly"])});
}
} else if(slave.belly < 1500 && slave.fetish == "pregnancy" && isItemAccessible("a small empathy belly") && slave.sexualFlaw != "breeder" && slave.weight <= 130) {
if(slave.fetishStrength <= 30) {
diff --git a/src/pregmod/fFeet.tw b/src/pregmod/fFeet.tw
index 04233bbca07..489e3b8b2a3 100644
--- a/src/pregmod/fFeet.tw
+++ b/src/pregmod/fFeet.tw
@@ -449,31 +449,32 @@ You call $activeSlave.slaveName to your office, telling $his to use $his feet to
You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>, and $he does $his best to catch your semen on $his legs.
<<else>>
<<if $activeSlave.fetish == "cumslut" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
- When you eventually cum, $activeSlave.slaveName giggles in lustful joy as your hot cum coats $his _skin feet
+ When you eventually cum, $activeSlave.slaveName giggles in lustful joy as your hot cum coats $his _skin
<<if $PC.balls >= 1>>
- and quickly slides from your desk to kneel in front of your pulsating cock.
+ feet and quickly slides from your desk to kneel in front of your pulsating cock.
<<if $PC.balls >= 2>>
Your massive load quickly covers $his face as $he moans and twitches in pleasure, semen dripping down $his
- <<if $activeSlave.boobs < 299>>
+ <<if $activeSlave.boobs < 300>>
flat chest
<<elseif $activeSlave.boobs < 499>>
small chest
<<else>>
_boobs breasts
<</if>>
- and _belly belly onto $his thighs
+ and _belly belly onto $his thighs.
<<else>>
Your large load coats $his face in sticky semen, some dripping onto $his
<<if $activeSlave.boobs < 299>>
- flat chest
+ flat chest.
<<elseif $activeSlave.boobs < 499>>
- small chest
+ small chest.
<<else>>
- _boobs breasts
+ _boobs breasts.
<</if>>
<</if>>
+ <<else>>
+ feet.
<</if>>
- .
<<elseif $activeSlave.fetish == "humiliation" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>, and $he whimpers as even $his feet used as a sex object.
<<elseif $activeSlave.fetish == "submissive" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>>
diff --git a/src/pregmod/fillUpButt.tw b/src/pregmod/fillUpButt.tw
index bec7fd50e02..caea3166e10 100644
--- a/src/pregmod/fillUpButt.tw
+++ b/src/pregmod/fillUpButt.tw
@@ -327,12 +327,12 @@ You look at $his rear while you squeeze $his cheeks and rub them with your firm
<<if _pregDiscovery == 0>>
<<set $activeSlave.inflation += 1>>
<<if $activeSlave.inflation == 3>>
- <<if canWalk($activeSlave)>>$he gingerly leaves your office, massaging $his bloated guts as $he goes<<else>>$his belly wobbles heavily as $he is helped from your office<</if>>. Being filled so full @@.red;surely had negative effects@@ on $his health.
+ <<if canWalk($activeSlave)>>$He gingerly leaves your office, massaging $his bloated guts as $he goes<<else>>$His belly wobbles heavily as $he is helped from your office<</if>>. Being filled so full @@.red;surely had negative effects@@ on $his health.
<<set $activeSlave.health -= 10>>
<<elseif $activeSlave.inflation == 2>>
- <<if canWalk($activeSlave)>>$he gingerly leaves your office, massaging $his full guts as $he goes<<else>>$his belly wobbles heavily as $he is helped from your office<</if>>.
+ <<if canWalk($activeSlave)>>$He gingerly leaves your office, massaging $his full guts as $he goes<<else>>$His belly wobbles heavily as $he is helped from your office<</if>>.
<<elseif $activeSlave.inflation == 1>>
- <<if canWalk($activeSlave)>>$he gingerly leaves your office, massaging $his distended belly as $he goes<<else>>$his belly wobbles as $he is helped from your office<</if>>.
+ <<if canWalk($activeSlave)>>$He gingerly leaves your office, massaging $his distended belly as $he goes<<else>>$His belly wobbles as $he is helped from your office<</if>>.
<</if>>
<<SetBellySize $activeSlave>>
<</if>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 671181532de..c40ca170d96 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -14163,7 +14163,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
<br> <<link "in public">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You bring her out onto the club and secure her upright with a set of vibrators attached to all of her erogenous zones. There's a lot of them, and they're extremely powerful; when you test the setup, she wriggles with the intensity of the stimulation, and is about to climax when you shut it down. Without telling her, you slave the vibrators to a program originally designed for VIP security details. It uses the cameras scattered through the area to detect when passersby are looking at her. The more eyes on her, the stronger the vibrations.
+ You bring her out <<if $club > 0>>to $clubName<<else>>onto the street<</if>> and secure her upright with a set of vibrators attached to all of her erogenous zones. There's a lot of them, and they're extremely powerful; when you test the setup, she wriggles with the intensity of the stimulation, and is about to climax when you shut it down. Without telling her, you slave the vibrators to a program originally designed for VIP security details. It uses the cameras scattered through the area to detect when passersby are looking at her. The more eyes on her, the stronger the vibrations.
<<if ($activeSlave.fetish == "humiliation") && ($activeSlave.fetishKnown == 1)>>
<<set $activeSlave.fetishStrength += 4>>
@@.lightcoral;Her enjoyment of humiliation has increased.@@
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index c1d1b8388c5..1220bac2e2e 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1945,35 +1945,33 @@ $His scars make $him look like $he's in the right place.
<</if>>
<<if $activeSlave.fuckdoll == 0>>
-<<if $activeSlave.markings == "birthmark" && $activeSlave.prestige == 0>>
- $He has a large, liver-colored birthmark, detracting from $his beauty.
-<</if>>
-<<if ($activeSlave.skin == "tanned")>>
- <<if ($activeSlave.releaseRules != "restrictive" && $activeSlave.releaseRules != "masturbation")>>
- <<if ($activeSlave.fetishStrength > 60)>>
- <<if ($activeSlave.fetishKnown == 1)>>
- $His tan is slightly uneven, since $he enjoys
- <<if ($activeSlave.fetish == "buttslut")>>
- letting other tanned slaves share a tanning bed with $him so they can sodomize $him while $he tans.
- <<elseif ($activeSlave.fetish == "cumslut")>>
- letting other tanned slaves share a tanning bed with $him so they get oral from $him while $he tans.
- <<elseif ($activeSlave.fetish == "sadist")>>
- forcing inferior slaves into the tanning beds with $him so $he can sodomize them while $he tans.
- <<elseif ($activeSlave.fetish == "dom")>>
- bringing other slaves into the tanning beds with $him so $he can fuck them while $he tans.
- <<elseif ($activeSlave.fetish == "masochist") || ($activeSlave.fetish == "submissive")>>
- letting other slaves into the tanning beds with $him so they can fuck $him while $he tans.
- <<elseif ($activeSlave.fetish == "boobs")>>
- bringing other slaves into the tanning beds with $him so $he can tittyfuck them while $he tans.
- <<elseif ($activeSlave.fetish == "pregnancy") && (random(0,99) < $seeDicks)>>
- letting slaves with dicks into the tanning beds with $him so they can cum inside $him while $he tans.
- <<else>>
- bringing other slaves into the tanning beds with $him to have sex while $he tans.
- <</if>>
- <</if>>
+ <<if $activeSlave.markings == "birthmark" && $activeSlave.prestige == 0>>
+ $He has a large, liver-colored birthmark, detracting from $his beauty.
+ <</if>>
+ <<if ($activeSlave.skin == "tanned") && ($activeSlave.origSkin != "tanned")>>
+ <<if ($activeSlave.releaseRules != "restrictive" && $activeSlave.releaseRules != "masturbation")>>
+ <<if ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
+ $His tan is slightly uneven, since $he enjoys
+ <<if ($activeSlave.fetish == "buttslut")>>
+ letting other tanned slaves share a tanning bed with $him so they can sodomize $him while $he tans.
+ <<elseif ($activeSlave.fetish == "cumslut")>>
+ letting other tanned slaves share a tanning bed with $him so they get oral from $him while $he tans.
+ <<elseif ($activeSlave.fetish == "sadist")>>
+ forcing inferior slaves into the tanning beds with $him so $he can sodomize them while $he tans.
+ <<elseif ($activeSlave.fetish == "dom")>>
+ bringing other slaves into the tanning beds with $him so $he can fuck them while $he tans.
+ <<elseif ($activeSlave.fetish == "masochist") || ($activeSlave.fetish == "submissive")>>
+ letting other slaves into the tanning beds with $him so they can fuck $him while $he tans.
+ <<elseif ($activeSlave.fetish == "boobs")>>
+ bringing other slaves into the tanning beds with $him so $he can tittyfuck them while $he tans.
+ <<elseif ($activeSlave.fetish == "pregnancy") && (random(0,99) < $seeDicks)>>
+ letting slaves with dicks into the tanning beds with $him so they can cum inside $him while $he tans.
+ <<else>>
+ bringing other slaves into the tanning beds with $him to have sex while $he tans.
+ <</if>>
+ <</if>>
+ <</if>>
<</if>>
- <</if>>
-<</if>>
<</if>>
<<if ($showClothing == 1) && ($saleDescription == 0)>>
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index 34b270a7827..aed7671e7bb 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -377,12 +377,12 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<</if>>
<<if $desc.length == 0>>
<<elseif $desc.length > 2>>
- Its citizens take the opportunity to make radical social changes, @@.cyan;purging the $desc[0]@@,
+ Its citizens take the opportunity to make radical social changes, @@.cyan;purging the $desc[0],
<<for _k = 1; _k < $desc.length; _k++>>
<<if _k < $desc.length-1>>
$desc[_k],
<<else>>
- and $desc[_k] favored by the old government.
+ and $desc[_k]@@ favored by the old government.
<</if>>
<</for>>
<<elseif $desc.length == 2>>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index b3184b1c110..419b16aa379 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -615,7 +615,7 @@
<</if>>
This week your services to the highest bidder earned you @@.yellowgreen;<<print cashFormat(_windfall)>>.@@
<<if random(0,100) >= _Catchtchance>>
- however, since the source of the attack was traced back to your arcology your
+ However, since the source of the attack was traced back to your arcology, your
<<if $secExp == 1>> <<set _X = 1>>
@@.red;authority@@, <<set $authority -= random(100,500)>> @@.red;crime rate@@ <<set $crime += random(10,25)>> and
<</if>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 8bd86f5f248..2d72bb663b5 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -648,10 +648,10 @@
<<elseif ($slaves[$i].fetish == "pregnancy") && ($slaves[$i].devotion > 50)>>
She carries her fake belly @@.hotpink;with pride@@, eager for the day you give her one of her own.
<<set $slaves[$i].devotion += 1>>
- <<elseif ($slaves[$i].fetish == "pregnancy") && ($slaves[$i].pregKnown == 0) && ($slaves[$i].vagina > -1)>>
+ <<elseif ($slaves[$i].fetish == "pregnancy") && ($slaves[$i].pregKnown == 0) && ($slaves[$i].ovaries ==1 || $slaves[$i].mpreg == 1)>>
The fake belly she wears @@.mediumorchid;reminds her@@ that she isn't pregnant with a child.
<<set $slaves[$i].devotion -= 1>>
- <<elseif ($slaves[$i].vagina == 0) && $arcologies[0].FSRepopulationFocus == "unset">>
+ <<elseif ($slaves[$i].vagina == 0) && isFertile($slaves[$i]) && $arcologies[0].FSRepopulationFocus == "unset" && $slaves[$i].devotion <= 20>>
The fake belly she wears @@.gold;worries@@ her that you will soon put a real baby in her.
<<set $slaves[$i].trust -= 1>>
<</if>>
diff --git a/src/uncategorized/saRivalries.tw b/src/uncategorized/saRivalries.tw
index 1e644b55941..b4883a260d1 100644
--- a/src/uncategorized/saRivalries.tw
+++ b/src/uncategorized/saRivalries.tw
@@ -17,6 +17,11 @@
<<if $slaves[_j].ID != $slaves[$i].relationshipTarget>>
<<if $slaves[_j].devotion < random(20,100)>>
<<if $slaves[_j].trust > random(-100,-20)>>
+ <<if $slaves[_j].origBodyOwnerID == $slaves[$i].ID && $slaves[_j].devotion > 0 && $slaves[$i].devotion < -30>>
+ $slaves[$i].slaveName loathes that <<SlaveFullName $slaves[_j]>> is using //her// body to benefit you and makes it abundantly clear every chance she gets. @@.lightsalmon;They start to dislike each other.@@
+ <<set $slaves[_j].rivalry = 1, $slaves[$i].rivalry = 1, $slaves[_j].rivalryTarget = $slaves[$i].ID, $slaves[$i].rivalryTarget = $slaves[_j].ID>>
+ <<break>>
+ <</if>>
<<if $slaves[$i].behavioralFlaw != "none">>
<<switch $slaves[$i].behavioralFlaw>>
<<case "arrogant">>
@@ -143,83 +148,91 @@
<<set $slaves[_j].rivalry = 0,$slaves[_j].rivalryTarget = 0, $slaves[$i].rivalry = 0, $slaves[$i].rivalryTarget = 0>>
<<else>>
<<if $slaves[$i].need>>
- <<if $universalRulesConsent == 0>>
- <<if $slaves[$i].releaseRules != "restrictive" && $slaves[$i].releaseRules != "masturbation">>
- <<if $slaves[_j].releaseRules != "restrictive">>
- <<if $slaves[$i].fetishKnown>>
- <<if $slaves[$i].fetish == "sadist">>
- $slaves[$i].slaveName is horny and sadistic, so she rapes her rival <<SlaveFullName $slaves[_j]>> every chance she gets; this @@.hotpink;thrills@@ $slaves[$i].slaveName, but $slaves[_j].slaveName is @@.golden;frightened@@ that you let it happen.
- <<set $slaves[$i].need = 0, $slaves[$i].devotion += 3, $slaves[_j].trust -= 3, $slaves[$i].penetrativeCount += 5, $slaves[_j].oralCount += 5>>
- <<if $slaves[$i].rivalry < 3>>
- Of course, this @@.lightsalmon;worsens their rivalry.@@
- <<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1>>
- <</if>>
- <<elseif $slaves[$i].fetish == "dom">>
- $slaves[$i].slaveName is horny and dominant, so she forces her rival <<SlaveFullName $slaves[_j]>> to submit to her whenever she can; this @@.hotpink;thoroughly satisfies@@ $slaves[$i].slaveName, but $slaves[_j].slaveName is @@.golden;angered@@ that you let it happen.
- <<set $slaves[$i].need = 0, $slaves[$i].devotion += 3, $slaves[_j].devotion -= 3, $slaves[$i].penetrativeCount += 5, $slaves[_j].oralCount += 5>>
- <<if $slaves[$i].rivalry < 3>>
- Of course, this @@.lightsalmon;worsens their rivalry.@@
- <<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1>>
+ <<if $universalRulesConsent == 0>>
+ <<if $slaves[$i].releaseRules != "restrictive" && $slaves[$i].releaseRules != "masturbation">>
+ <<if $slaves[_j].releaseRules != "restrictive">>
+ <<if $slaves[$i].fetishKnown>>
+ <<if $slaves[$i].fetish == "sadist">>
+ $slaves[$i].slaveName is horny and sadistic, so she rapes her rival <<SlaveFullName $slaves[_j]>> every chance she gets; this @@.hotpink;thrills@@ $slaves[$i].slaveName, but $slaves[_j].slaveName is @@.golden;frightened@@ that you let it happen.
+ <<set $slaves[$i].need = 0, $slaves[$i].devotion += 3, $slaves[_j].trust -= 3, $slaves[$i].penetrativeCount += 5, $slaves[_j].oralCount += 5>>
+ <<if $slaves[$i].rivalry < 3>>
+ Of course, this @@.lightsalmon;worsens their rivalry.@@
+ <<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1, _worsenedRivalry = 1>>
+ <</if>>
+ <<elseif $slaves[$i].fetish == "dom">>
+ $slaves[$i].slaveName is horny and dominant, so she forces her rival <<SlaveFullName $slaves[_j]>> to submit to her whenever she can; this @@.hotpink;thoroughly satisfies@@ $slaves[$i].slaveName, but $slaves[_j].slaveName is @@.golden;angered@@ that you let it happen.
+ <<set $slaves[$i].need = 0, $slaves[$i].devotion += 3, $slaves[_j].devotion -= 3, $slaves[$i].penetrativeCount += 5, $slaves[_j].oralCount += 5>>
+ <<if $slaves[$i].rivalry < 3>>
+ Of course, this @@.lightsalmon;worsens their rivalry.@@
+ <<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1, _worsenedRivalry = 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
<</if>>
<</if>>
<</if>>
- <</if>>
- <</if>>
- <</if>>
- <</if>>
- <<set _roll = random(0,100)>>
- <<if _roll > 50>>
- <<if $slaves[_j].fetish == $slaves[$i].fetish>>
- <<if $slaves[_j].fetishKnown>>
- <<if $slaves[$i].fetishKnown>>
- $slaves[$i].slaveName and <<SlaveFullName $slaves[_j]>> share sexual interests, and in the sexual atmosphere of the arcology, it's @@.lightgreen;difficult for them to keep up their dislike@@ of one another with the mutual attraction.
- <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
- <</if>>
- <</if>>
- <</if>>
- <<if $slaves[_j].ID == $slaves[$i].relationshipTarget>>
- <<if $slaves[$i].relationship > 3>>
- <<set $slaves[_j].rivalry = 0, $slaves[_j].rivalryTarget = 0>>
- <<set $slaves[$i].rivalry = 0, $slaves[$i].rivalryTarget = 0>>
- <</if>>
- <</if>>
- <<if _roll > 80 && $slaves[$i].rivalry > 0>>
- <<if $slaves[_j].trust < -20>>
- <<if $slaves[$i].trust < -20>>
- Since both $slaves[$i].slaveName and <<SlaveFullName $slaves[_j]>> are terrified of you, they work together to @@.lightgreen;get over their feud,@@ since it brings punishment on both of them.
+ <<set _roll = random(0,100)>>
+ <<if _worsenedRivalry != 1>>
+ <<if _roll > 50>>
+ <<if $slaves[_j].fetish == $slaves[$i].fetish>>
+ <<if $slaves[_j].fetishKnown>>
+ <<if $slaves[$i].fetishKnown>>
+ $slaves[$i].slaveName and <<SlaveFullName $slaves[_j]>> share sexual interests, and in the sexual atmosphere of the arcology, it's @@.lightgreen;difficult for them to keep up their dislike@@ of one another with the mutual attraction.
<<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
<</if>>
<</if>>
- <<if $slaves[_j].devotion > 50>>
- <<if $slaves[$i].devotion > 50>>
- Since both $slaves[$i].slaveName and <<SlaveFullName $slaves[_j]>> are devoted to you, they work together to @@.lightgreen;get over their feud,@@ since it gets in the way of their duties.
- <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
<</if>>
+ <<if $slaves[_j].ID == $slaves[$i].relationshipTarget>>
+ <<if $slaves[$i].relationship > 3>>
+ <<set $slaves[_j].rivalry = 0, $slaves[_j].rivalryTarget = 0>>
+ <<set $slaves[$i].rivalry = 0, $slaves[$i].rivalryTarget = 0>>
<</if>>
- <<if _roll > 90 && $slaves[$i].rivalry > 0>>
- <<if $slaves[$i].energy > 95>>
- $slaves[$i].slaveName lusts after <<SlaveFullName $slaves[_j]>>, and does everything she can to @@.lightgreen;patch up their differences.@@
- <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
- <</if>>
- <<if $slaves[$i].attrXX > 85>>
- <<if ($slaves[_j].vagina > -1) || ($slaves[_j].faceShape != "masculine")>>
- $slaves[$i].slaveName lusts after <<SlaveFullName $slaves[_j]>>, and does everything she can to @@.lightgreen;patch up their differences.@@
- <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
- <</if>>
- <</if>>
- <<if $slaves[$i].attrXY > 85>>
- <<if ($slaves[_j].balls > 0) || ($slaves[_j].faceShape == "masculine")>>
- $slaves[$i].slaveName lusts after <<SlaveFullName $slaves[_j]>>, and does everything she can to @@.lightgreen;patch up their differences.@@
+ <</if>>
+ <<if _roll > 80 && $slaves[$i].rivalry > 0>>
+ <<if $slaves[_j].trust < -20>>
+ <<if $slaves[$i].trust < -20>>
+ Since both $slaves[$i].slaveName and <<SlaveFullName $slaves[_j]>> are terrified of you, they work together to @@.lightgreen;get over their feud,@@ since it brings punishment on both of them.
<<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
<</if>>
<</if>>
- <<if $slaves[_j].assignment != $slaves[$i].assignment>>
- <<if $slaves[$i].subTarget != $slaves[_j].ID>>
- <<if $slaves[_j].subTarget != $slaves[$i].ID>>
- With time apart $slaves[$i].slaveName and <<SlaveFullName $slaves[_j]>> @@.lightgreen;dislike each other less.@@
+ <<if $slaves[_j].devotion > 50>>
+ <<if $slaves[$i].devotion > 50>>
+ Since both $slaves[$i].slaveName and <<SlaveFullName $slaves[_j]>> are devoted to you, they work together to @@.lightgreen;get over their feud,@@ since it gets in the way of their duties.
<<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
<</if>>
<</if>>
+ <<if _roll > 90 && $slaves[$i].rivalry > 0>>
+ <<if $slaves[$i].energy > 95>>
+ $slaves[$i].slaveName lusts after <<SlaveFullName $slaves[_j]>>, and does everything she can to @@.lightgreen;patch up their differences.@@
+ <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1, _lustyFix = 1>>
+ <</if>>
+ <<if _lustyFix != 1>>
+ <<if $slaves[$i].attrXX > 85>>
+ <<if ($slaves[_j].vagina > -1) || ($slaves[_j].faceShape != "masculine")>>
+ $slaves[$i].slaveName lusts after <<SlaveFullName $slaves[_j]>>, and does everything she can to @@.lightgreen;patch up their differences.@@
+ <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1, _lustyFix = 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<if _lustyFix != 1>>
+ <<if $slaves[$i].attrXY > 85>>
+ <<if ($slaves[_j].balls > 0) || ($slaves[_j].faceShape == "masculine")>>
+ $slaves[$i].slaveName lusts after <<SlaveFullName $slaves[_j]>>, and does everything she can to @@.lightgreen;patch up their differences.@@
+ <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1, _lustyFix = 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<if _lustyFix != 1>>
+ <<if $slaves[_j].assignment != $slaves[$i].assignment>>
+ <<if $slaves[$i].subTarget != $slaves[_j].ID>>
+ <<if $slaves[_j].subTarget != $slaves[$i].ID>>
+ With time apart $slaves[$i].slaveName and <<SlaveFullName $slaves[_j]>> @@.lightgreen;dislike each other less.@@
+ <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
<</if>>
<</if>>
<</if>>
@@ -248,8 +261,13 @@
<</if>>
<</if>>
<</if>>
- <<if _roll > $slaves[$i].devotion-$slaves[$i].trust+10>>
- <<if $slaves[$i].rivalry < 3>>
+ <<if $slaves[_j].origBodyOwnerID == $slaves[$i].ID>>
+ <<if $slaves[$i].rivalry < 3>>
+ $slaves[$i].slaveName @@.lightsalmon;refuses to accept <<SlaveFullName $slaves[_j]>>'s control of her former body,@@ worsening their rivalry.
+ <<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1>>
+ <</if>>
+ <<elseif _roll > $slaves[$i].devotion-$slaves[$i].trust+10>>
+ <<if $slaves[$i].rivalry < 3>>
$slaves[$i].slaveName @@.lightsalmon;bickers with <<SlaveFullName $slaves[_j]>>@@ whenever she can, worsening their rivalry.
<<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1>>
<</if>>
diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw
index 9d5cf6d5755..fafaa94185f 100644
--- a/src/uncategorized/saServeThePublic.tw
+++ b/src/uncategorized/saServeThePublic.tw
@@ -211,7 +211,7 @@ the public.
<</if>>
<<set $beauty = Math.trunc($beauty*$beautyMultiplier)>>
-Her appearance attracted $beauty members of the public (<<print Math.trunc($beauty/7)>> a day)<<if $beauty > 160>>, so many that <<if canDoVaginal($slaves[$i]) && canDoAnal($slaves[$i])>>each of her holes were<<elseif canDoVaginal($slaves[$i]) || canDoAnal($slaves[$i])>>each of her available holes were<<else>>her mouth and anywhere else a dick could fit were<</if>> often filled by more than one cock<<elseif $beauty > 140>>, so many that she spent much of her time getting gangbanged<<elseif $beauty > 120>>, so many that citizens often spitroasted the slut<<elseif $beauty > 100>>, so many that she frequently had sex with multiple citizens at once<<elseif $beauty > 70>>, so many that she occasionally had sex with multiple citizens at once<</if>>. Most of them
+Her appearance attracted $beauty members of the public (<<print Math.trunc($beauty/7)>> a day)<<if $beauty > 160>>, so many that <<if canDoVaginal($slaves[$i]) && canDoAnal($slaves[$i])>>each of her holes were<<elseif canDoVaginal($slaves[$i]) || canDoAnal($slaves[$i])>>each of her available holes were<<else>>her mouth and anywhere else a dick could fit were<</if>> often filled by more than one cock<<elseif $beauty > 140>>, so many that she spent much of her time getting gangbanged<<elseif $beauty > 120>>, so many that citizens often <<if canDoAnal($slaves[$i]) || canDoVaginal($slaves[$i])>>spitroasted<<else>>double-teamed<</if>> the slut<<elseif $beauty > 100>>, so many that she frequently had sex with multiple citizens at once<<elseif $beauty > 70>>, so many that she occasionally had sex with multiple citizens at once<</if>>. Most of them
<<if $FResult > 15>>
were putty in her hands.
<<elseif $FResult > 10>>
@@ -766,11 +766,11 @@ Her appearance attracted $beauty members of the public (<<print Math.trunc($beau
<<if $slaves[$i].bellyPreg >= 1500 || setup.fakeBellies.includes($bellyAccessory) || $slaves[$i].bellyImplant >= 1500>>
<<if $arcologies[0].FSRepopulationFocus != "unset">>
- In the new culture of $arcologies[0].name, her pregnancy gets her lots of attention.
+ In the new culture of $arcologies[0].name, her<<if setup.fakeBellies.includes($bellyAccessory) || $slaves[$i].bellyImplant >= 1500>> apparent<</if>> pregnancy gets her lots of attention.
<<elseif $arcologies[0].FSRestart != "unset">>
- In the new culture of $arcologies[0].name, her pregnancy is a massive turn off to citizens.
+ In the new culture of $arcologies[0].name, her<<if setup.fakeBellies.includes($bellyAccessory) || $slaves[$i].bellyImplant >= 1500>> apparent<</if>> pregnancy is a massive turn off to citizens.
<<elseif $arcologies[0].FSGenderFundamentalist != "unset">>
- The new respect for slave fertility ensures that she gets just as much love as slaves without pregnant bellies.
+ The new respect for slave fertility ensures that she gets just as much love as slaves without pregnant bellies<<if setup.fakeBellies.includes($bellyAccessory) || $slaves[$i].bellyImplant >= 1500>> even if her bump isn't real<</if>>.
<<else>>
Many citizens avoid visibly pregnant slaves.
<</if>>
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index 816ea7159ad..22a276c3e94 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -204,7 +204,7 @@ her body.
<</if>>
<<set $beauty = Math.trunc($beauty*$beautyMultiplier)>>
-Her appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a day)<<if $beauty > 160>>, so many that <<if canDoVaginal($slaves[$i]) && canDoAnal($slaves[$i])>>each of her holes were<<elseif canDoVaginal($slaves[$i]) || canDoAnal($slaves[$i])>>each of her available holes were<<else>>her mouth and anywhere else a cock could fit were<</if>> often filled by more than one cock<<elseif $beauty > 140>>, so many that she spent much of her time getting gangbanged<<elseif $beauty > 120>>, so many that customers often spitroasted the slut<<elseif $beauty > 100>>, so many that she frequently had sex with multiple customers at once<<elseif $beauty > 70>>, so many that she occasionally had sex with multiple customers at once<</if>>. They paid <<print cashFormat($FResult)>> on average.
+Her appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a day)<<if $beauty > 160>>, so many that <<if canDoVaginal($slaves[$i]) && canDoAnal($slaves[$i])>>each of her holes were<<elseif canDoVaginal($slaves[$i]) || canDoAnal($slaves[$i])>>each of her available holes were<<else>>her mouth and anywhere else a cock could fit were<</if>> often filled by more than one cock<<elseif $beauty > 140>>, so many that she spent much of her time getting gangbanged<<elseif $beauty > 120>>, so many that customers often <<if canDoAnal($slaves[$i]) || canDoVaginal($slaves[$i])>>spitroasted<<else>>double-teamed<</if>> the slut<<elseif $beauty > 100>>, so many that she frequently had sex with multiple customers at once<<elseif $beauty > 70>>, so many that she occasionally had sex with multiple customers at once<</if>>. They paid <<print cashFormat($FResult)>> on average.
<<set _incomeStats.customers = $beauty>>
<<if $seeAge == 1>>
@@ -771,11 +771,11 @@ Her appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a da
<<if $slaves[$i].bellyPreg >= 1500 || setup.fakeBellies.includes($bellyAccessory) || $slaves[$i].bellyImplant >= 1500>>
<<if $arcologies[0].FSRepopulationFocus != "unset">>
- In the new culture of $arcologies[0].name, her pregnancy makes her a profitable whore.
+ In the new culture of $arcologies[0].name, her pregnancy makes her a profitable whore<<if setup.fakeBellies.includes($bellyAccessory) || $slaves[$i].bellyImplant >= 1500>>, even if it's not real<</if>>.
<<elseif $arcologies[0].FSRestart != "unset">>
- In the new culture of $arcologies[0].name, her pregnancy is a massive turn off to potential customers.
+ In the new culture of $arcologies[0].name, her<<if setup.fakeBellies.includes($bellyAccessory) || $slaves[$i].bellyImplant >= 1500>> apparent<</if>> pregnancy is a massive turn off to potential customers.
<<elseif $arcologies[0].FSGenderFundamentalist != "unset">>
- The new respect for traditional gender roles has given many citizens a taste for pregnant whores.
+ The new respect for traditional gender roles has given many citizens a taste for pregnant whores<<if setup.fakeBellies.includes($bellyAccessory) || $slaves[$i].bellyImplant >= 1500>>, even if they only look pregnant<</if>>.
<<else>>
Many customers avoid visibly pregnant whores.
<</if>>
--
GitLab