From 1eeefd542b9f867834fed8fa616109ef761be97f Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sat, 1 Dec 2018 19:51:13 -0600
Subject: [PATCH] Switch
---
src/init/storyInit.tw | 4 +-
src/npc/takeoverTarget.tw | 2 +-
src/uncategorized/BackwardsCompatibility.tw | 74 ++++++++++-----------
src/uncategorized/genericPlotEvents.tw | 14 ++--
src/uncategorized/saRivalries.tw | 39 +++++------
src/uncategorized/scheduledEvent.tw | 2 +-
src/uncategorized/surgeryDegradation.tw | 6 +-
7 files changed, 71 insertions(+), 70 deletions(-)
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 2f0e726b7ab..551d72e7fad 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1397,8 +1397,8 @@ electrolarynx: 0,
erectileImplant: 0
} >>
-<<set $merchantFSWares = ["GenderRadicalistResearch", "TransformationFetishistResearch", "AssetExpansionistResearch", "SlimnessEnthusiastResearch", "YouthPreferentialistResearch", "HedonisticDecadenceResearch"]>>
-<<set $merchantIllegalWares = ["childhoodFertilityInducedNCS", "UterineRestraintMesh", "RapidCellGrowthFormula", "PGHack"]>>
+<<set $merchantFSWares = ["AssetExpansionistResearch", "GenderRadicalistResearch", "HedonisticDecadenceResearch", "SlimnessEnthusiastResearch", "TransformationFetishistResearch", "YouthPreferentialistResearch"]>>
+<<set $merchantIllegalWares = ["childhoodFertilityInducedNCS", "PGHack", "RapidCellGrowthFormula", "UterineRestraintMesh"]>>
<<set $RapidCellGrowthFormula = 0>>
<<set $UterineRestraintMesh = 0>>
<<set $PGHack = 0>>
diff --git a/src/npc/takeoverTarget.tw b/src/npc/takeoverTarget.tw
index fda7f3a0f10..6ae6b81aeeb 100644
--- a/src/npc/takeoverTarget.tw
+++ b/src/npc/takeoverTarget.tw
@@ -41,7 +41,7 @@ Alternatively, arcologies are being built every day, and their owners' control i
<<if $seeDicks != 0>><<set _arcologyTypes.push("GenderRadicalist")>><</if>>
<<if $seeDicks != 100>><<set _arcologyTypes.push("GenderFundamentalist")>><</if>>
<<if $seeExtreme != 0>><<set _arcologyTypes.push("Degradationist")>><</if>>
-<<set _terrainTypes = ["urban", "urban", "rural", "rural", "rural", "marine", "marine", "oceanic", "ravine"]>>
+<<set _terrainTypes = ["marine", "marine", "oceanic", "ravine", "rural", "rural", "rural", "urban", "urban"]>>
<<set _continents = ["Africa", "Asia", "Asia", "Australia", "Europe", "Europe", "Japan", "North America", "North America", "South America", "the Middle East"]>>
<<set _races = ["amerindian", "asian", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"]>>
<<set _targetArcologies = []>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index ef73107756b..c4906271800 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3246,49 +3246,49 @@ Setting missing slave variables:
<<if (($ver.startsWith("0.6") && !$ver.startsWith("10.6")) || ($ver.startsWith("0.7")) || ($ver.startsWith("0.8")) || ($ver.startsWith("0.9"))) && (!$ver.startsWith("0.9.5")) && (!$ver.startsWith("0.9.6")) && (!$ver.startsWith("0.9.7")) && (!$ver.startsWith("0.9.8")) && (!$ver.startsWith("0.9.9")) && (!$ver.startsWith("0.9.10"))>>
<<if _Slave.oralSkill > 0>>
- <<if _Slave.oralSkill == 3>>
- <<set _Slave.oralSkill = 100>>
- <<elseif _Slave.oralSkill == 2>>
- <<set _Slave.oralSkill = 65>>
- <<else>>
- <<set _Slave.oralSkill = 35>>
- <</if>>
+ <<if _Slave.oralSkill == 3>>
+ <<set _Slave.oralSkill = 100>>
+ <<elseif _Slave.oralSkill == 2>>
+ <<set _Slave.oralSkill = 65>>
+ <<else>>
+ <<set _Slave.oralSkill = 35>>
+ <</if>>
<</if>>
<<if _Slave.vaginalSkill > 0>>
- <<if _Slave.vaginalSkill == 3>>
- <<set _Slave.vaginalSkill = 100>>
- <<elseif _Slave.vaginalSkill == 2>>
- <<set _Slave.vaginalSkill = 65>>
- <<else>>
- <<set _Slave.vaginalSkill = 35>>
- <</if>>
+ <<if _Slave.vaginalSkill == 3>>
+ <<set _Slave.vaginalSkill = 100>>
+ <<elseif _Slave.vaginalSkill == 2>>
+ <<set _Slave.vaginalSkill = 65>>
+ <<else>>
+ <<set _Slave.vaginalSkill = 35>>
+ <</if>>
<</if>>
<<if _Slave.analSkill > 0>>
- <<if _Slave.analSkill == 3>>
- <<set _Slave.analSkill = 100>>
- <<elseif _Slave.analSkill == 2>>
- <<set _Slave.analSkill = 65>>
- <<else>>
- <<set _Slave.analSkill = 35>>
- <</if>>
+ <<if _Slave.analSkill == 3>>
+ <<set _Slave.analSkill = 100>>
+ <<elseif _Slave.analSkill == 2>>
+ <<set _Slave.analSkill = 65>>
+ <<else>>
+ <<set _Slave.analSkill = 35>>
+ <</if>>
<</if>>
<<if _Slave.whoreSkill > 0>>
- <<if _Slave.whoreSkill == 3>>
- <<set _Slave.whoreSkill = 100>>
- <<elseif _Slave.whoreSkill == 2>>
- <<set _Slave.whoreSkill = 65>>
- <<else>>
- <<set _Slave.whoreSkill = 35>>
- <</if>>
+ <<if _Slave.whoreSkill == 3>>
+ <<set _Slave.whoreSkill = 100>>
+ <<elseif _Slave.whoreSkill == 2>>
+ <<set _Slave.whoreSkill = 65>>
+ <<else>>
+ <<set _Slave.whoreSkill = 35>>
+ <</if>>
<</if>>
<<if _Slave.entertainSkill > 0>>
- <<if _Slave.entertainSkill == 3>>
- <<set _Slave.entertainSkill = 100>>
- <<elseif _Slave.entertainSkill == 2>>
- <<set _Slave.entertainSkill = 65>>
- <<else>>
- <<set _Slave.entertainSkill = 35>>
- <</if>>
+ <<if _Slave.entertainSkill == 3>>
+ <<set _Slave.entertainSkill = 100>>
+ <<elseif _Slave.entertainSkill == 2>>
+ <<set _Slave.entertainSkill = 65>>
+ <<else>>
+ <<set _Slave.entertainSkill = 35>>
+ <</if>>
<</if>>
<<if ($ver != "0.9.4")>>
<<set _Slave.aphrodisiacs = 0>>
@@ -3621,8 +3621,8 @@ Done!
/* Sec Exp */
<<if $secExp == 1>>
-<br>
-<<include "SecExpBackwardCompatibility">>
+ <br>
+ <<include "SecExpBackwardCompatibility">>
<</if>>
<<if ndef $masteredXP>>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 8be22148de8..b22c04aa6e8 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -211,7 +211,7 @@ in the capital city.
vulnerable citizens, including the caller. Their bus broke down on the way to the championship game and all those that have left to get help have not returned. Her and her several remaining teammates are running out of options as those looking for easy targets creep ever closer.
<</if>>
<<else>>
- After years of constant rape and abuse, an opening finally arrived for escape when a rival faction raided the decaying church they were stored in, however the situation outside isn't much better. Violent riots are taking place and the mobs are eagerly snatching up what ever loot and women they can get their hands on. She and the remaining women are trapped and in no condition to run; most particularly the youngest of the group who is ripe with child, though she herself and one of the others are also carrying their rapists' babies. They are completely out of options as the looters work their way down the city streets.
+ After years of constant rape and abuse, an opening finally arrived for escape when a rival faction raided the decaying church they were stored in; however, the situation outside isn't much better. Violent riots are taking place and the mobs are eagerly snatching up whatever loot and women they can get their hands on. She and the remaining women are trapped and in no condition to run; in particular the youngest of the group who is ripe with child, though she herself and some of the others are carrying their rapists' babies as well. They are completely out of options as the looters work their way down the city streets.
<</if>>
They beg you to help evacuate them, and promise to pay you once they're out.
@@ -380,7 +380,6 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<</for>>
In any case, you've enslaved a fine group. The expectant mothers vary widely; the only thing they have in common is their gravid bellies. None of them are in really serious condition, either, and they should bear the transition to slave life reasonably well despite their pregnancies.
<<elseif $PAidTarget == "gradeSchool">>
- In any case, you've enslaved a fine group. The girls are all within a similar age range, young, and healthy. Their youth and vigor should make them quite popular.
<<for $i = 0; $i < 4; $i++>>
<<if $minimumSlaveAge <= 7>>
<<set $activeSlaveOneTimeMinAge = 7>>
@@ -405,8 +404,8 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $activeSlave.health = random(-10,10)>>
<<set _newSlaves.push($activeSlave)>>
<</for>>
+ In any case, you've enslaved a fine group. The students are all within a similar age range, young, and healthy. Their youth and vigor should make them quite popular.
<<elseif $PAidTarget == "conversion">>
- In any case, you've enslaved a fine group. Certain religious groups persist in the hilarious delusion that it's possible to alter sexual orientation through prayer. In your experience, hormones, drugs, and compliance training are far more effective.
<<set $activeSlaveOneTimeMinAge = 26>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
@@ -455,8 +454,8 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $activeSlave.sexualFlaw = either("apathetic", "repressed", "shamefast")>>
<<set _newSlaves.push($activeSlave)>>
<</for>>
+ In any case, you've enslaved a fine group. Certain religious groups persist in the hilarious delusion that it's possible to alter sexual orientation through prayer. In your experience, hormones, drugs, and compliance training are far more effective.
<<elseif $PAidTarget == "volleyballTeam">>
- In any case, you've enslaved a fine group. The girls are in fine health, fit and just past their majority, likely the reason any that stepped off the bus were promptly abducted. Their youth and vigor should make them quite popular, as will their experience with handling balls.
<<for $i = 0; $i < 4; $i++>>
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 18>>
@@ -476,6 +475,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $activeSlave.butt = random(1,2)>>
<<set _newSlaves.push($activeSlave)>>
<</for>>
+ In any case, you've enslaved a fine group. The girls are in fine health, fit and just past their majority, likely the reason any that stepped off the bus were promptly abducted. Their youth and vigor should make them quite popular, as will their experience with handling balls.
<<elseif $PAidTarget == "seizedMission">>
In any case, you've enslaved a fine group. The women will clean up nicely and are already accustomed to being raped and abused, so they should bear the transition to slave life reasonably well. The leader is a little older than the rest and clearly has been pregnant several times given the sag to her breasts and the stretch marks coating her swollen belly; it's clear she has a rape baby growing inside her. The next two are younger, but no better off; one is hugely pregnant and the other shows signs of a recent birth. The last, however, is the most eye-catching;
<<if $minimumSlaveAge < 8 && $fertilityAge < 8>>
@@ -683,7 +683,6 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $activeSlave.nipples = either("cute", "puffy")>>
<<set _newSlaves.push($activeSlave)>>
<<else>>
- In any case, you've enslaved a fine group. The women seem to have banded together when they were left to fend for themselves in their suburban neighborhood. They're older than many slaves, but they seem to have had rich husbands; they're conventionally pretty, and have lived soft lives that have left them healthy.
<<for $i = 0; $i < 4; $i++>>
<<set $activeSlaveOneTimeMinAge = 26>>
<<set $activeSlaveOneTimeMaxAge = 42>>
@@ -711,6 +710,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $activeSlave.sexualFlaw = either("apathetic", "hates anal", "hates oral", "idealistic", "shamefast")>>
<<set _newSlaves.push($activeSlave)>>
<</for>>
+ In any case, you've enslaved a fine group. The $women seem to have banded together when they were left to fend for themselves in their suburban neighborhood. They're older than many slaves, but they seem to have had rich husbands; they're conventionally pretty, and have lived soft lives that have left them healthy.
<</if>>
<<case "arcology naming">>
@@ -971,7 +971,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<</link>>
<br><<link "Force surgical repairs and compensation">>
<<replace "#result">>
- The hapless manufacturer eventually goes bankrupt. However, you do manage to force surgical correction of the pregnancies before they do. As additional compensation, they agree to naturally enhance your afflicted slaves' busts knowing full well that most buyers are not interested in slaves that have been knocked up. At the managers expense, your slaves move through a top-flight surgeons care and are pregnancy free and sporting @@.lime;larger breasts@@.
+ The hapless manufacturer eventually goes bankrupt. However, you do manage to force surgical correction of the pregnancies before they do. As additional compensation, they agree to naturally enhance your afflicted slaves' busts knowing full well that most buyers are not interested in slaves that have been knocked up. At the manager's expense, your slaves move through a top-flight surgeons care and are pregnancy free and sporting @@.lime;larger breasts@@.
<<run $slaves.forEach(function(s) {
if (canGetPregnant(s)) {
if (s.drugs == "breast injections") {
@@ -1323,7 +1323,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<slaveCost _newSlaves[_genPlot]>>
<<set $cash += $slaveCost>>
<</for>>
- Prisoners @@.green;sold.@@
+ While it takes some time, you eventually manage to @@.green;sell them all.@@
<</replace>>
<</link>>
<br><<link "Enslave them all">>
diff --git a/src/uncategorized/saRivalries.tw b/src/uncategorized/saRivalries.tw
index f256937b04a..186ab373d77 100644
--- a/src/uncategorized/saRivalries.tw
+++ b/src/uncategorized/saRivalries.tw
@@ -1,6 +1,7 @@
:: SA rivalries [nobr]
<<set _SL = $slaves.length>>
+<<setLocalPronouns $slaves[$i]>>
<<if $slaves[$i].rivalry == 0>>
@@ -17,7 +18,7 @@
<<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.@@
+ $slaves[$i].slaveName loathes that <<= SlaveFullName($slaves[_j])>> is using //$his// body to benefit you and makes it abundantly clear every chance $he 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>>
@@ -25,19 +26,19 @@
<<switch $slaves[$i].behavioralFlaw>>
<<case "arrogant">>
<<if $slaves[_j].intelligence > $slaves[$i].intelligence+$slaves[$i].intelligenceImplant>>
- $slaves[$i].slaveName is an arrogant bitch, and <<= SlaveFullName($slaves[_j])>> is authentically smarter than she is, which of course she cannot stand. @@.lightsalmon;They start to dislike each other.@@
+ $slaves[$i].slaveName is an arrogant bitch, and <<= SlaveFullName($slaves[_j])>> is authentically smarter than $he is, which of course $he cannot stand. @@.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>>
<<case "bitchy">>
<<if $slaves[_j].behavioralFlaw == "odd">>
- $slaves[$i].slaveName is a bit of a bitch, and poor odd <<= SlaveFullName($slaves[_j])>> is a convenient target for her bullying. @@.lightsalmon;They start to dislike each other.@@
+ $slaves[$i].slaveName is a bit of a bitch, and poor odd <<= SlaveFullName($slaves[_j])>> is a convenient target for $his bullying. @@.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>>
<<case "odd">>
<<if $slaves[_j].behavioralFlaw == "bitchy">>
- $slaves[$i].slaveName is rather strange. <<= SlaveFullName($slaves[_j])>>, who is kind of a bitch, frequently bullies her about it. @@.lightsalmon;They start to dislike each other.@@
+ $slaves[$i].slaveName is rather strange. <<= SlaveFullName($slaves[_j])>>, who is kind of a bitch, frequently bullies $him about it. @@.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>>
@@ -46,11 +47,11 @@
<<if $slaves[_j].faceShape == "masculine" || $slaves[_j].faceShape == "androgynous" >>
<<if $slaves[_j].muscles > 10>>
<<if $slaves[_j].vagina > -1>>
- $slaves[$i].slaveName hates men, and poor butch <<= SlaveFullName($slaves[_j])>> really gets to her, despite having a pussy and everything. @@.lightsalmon;They start to dislike each other.@@
+ $slaves[$i].slaveName hates men, and poor butch <<= SlaveFullName($slaves[_j])>> really gets to $him, despite having a pussy and everything. @@.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>>
<<else>>
- $slaves[$i].slaveName hates men, and poor masculine <<= SlaveFullName($slaves[_j])>> really gets to her. @@.lightsalmon;They start to dislike each other.@@
+ $slaves[$i].slaveName hates men, and poor masculine <<= SlaveFullName($slaves[_j])>> really gets to $him. @@.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>>
@@ -62,11 +63,11 @@
<<if $slaves[_j].faceShape != "masculine">>
<<if $slaves[_j].muscles <= 30>>
<<if $slaves[_j].vagina > -1>>
- $slaves[$i].slaveName hates women, and something about the feminine <<= SlaveFullName($slaves[_j])>> really gets to her. @@.lightsalmon;They start to dislike each other.@@
+ $slaves[$i].slaveName hates women, and something about the feminine <<= SlaveFullName($slaves[_j])>> really gets to $him. @@.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>>
<<else>>
- $slaves[$i].slaveName hates women, and something about the girly <<= SlaveFullName($slaves[_j])>> really gets to her, despite poor $slaves[_j].slaveName not being perfectly female at all. @@.lightsalmon;They start to dislike each other.@@
+ $slaves[$i].slaveName hates women, and something about the girly <<= SlaveFullName($slaves[_j])>> really gets to $him, despite poor $slaves[_j].slaveName not being perfectly female at all. @@.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>>
@@ -87,13 +88,13 @@
<</if>>
<<case "devout">>
<<if $slaves[_j].behavioralFlaw == "liberated">>
- $slaves[$i].slaveName, who is devout and might be considered rather conservative if she were free, can't stand <<= SlaveFullName($slaves[_j])>>'s revolting gender liberation. @@.lightsalmon;They start to dislike each other.@@
+ $slaves[$i].slaveName, who is devout and might be considered rather conservative if $he were free, can't stand <<= SlaveFullName($slaves[_j])>>'s revolting gender liberation. @@.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>>
<<case "liberated">>
<<if $slaves[_j].behavioralFlaw == "devout">>
- $slaves[$i].slaveName, who is liberated and might be considered rather liberal if she were free, can't stand <<= SlaveFullName($slaves[_j])>>'s bigoted religious faith. @@.lightsalmon;They start to dislike each other.@@
+ $slaves[$i].slaveName, who is liberated and might be considered rather liberal if $he were free, can't stand <<= SlaveFullName($slaves[_j])>>'s bigoted religious faith. @@.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>>
@@ -142,7 +143,7 @@
$slaves[$i].slaveName is a living sex toy, not a person, it @@.lightsalmon;can't really maintain any meaningful rivalry@@ with <<= SlaveFullName($slaves[_j])>>.
<<set $slaves[_j].rivalry = 0,$slaves[_j].rivalryTarget = 0, $slaves[$i].rivalry = 0, $slaves[$i].rivalryTarget = 0>>
<<elseif $slaves[$i].fetish == "mindbroken">>
- Since $slaves[$i].slaveName is mindbroken, she @@.lightsalmon;can't really maintain any meaningful rivalry@@ with <<= SlaveFullName($slaves[_j])>>.
+ Since $slaves[$i].slaveName is mindbroken, $he @@.lightsalmon;can't really maintain any meaningful rivalry@@ with <<= SlaveFullName($slaves[_j])>>.
<<set $slaves[_j].rivalry = 0,$slaves[_j].rivalryTarget = 0, $slaves[$i].rivalry = 0, $slaves[$i].rivalryTarget = 0>>
<<else>>
<<if $slaves[$i].need>>
@@ -151,14 +152,14 @@
<<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.
+ $slaves[$i].slaveName is horny and sadistic, so $he rapes $his rival <<= SlaveFullName($slaves[_j])>> every chance $he 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.
+ $slaves[$i].slaveName is horny and dominant, so $he forces $his rival <<= SlaveFullName($slaves[_j])>> to submit to $him whenever $he 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.@@
@@ -198,13 +199,13 @@
<</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.@@
+ $slaves[$i].slaveName lusts after <<= SlaveFullName($slaves[_j])>>, and does everything $he can to @@.lightgreen;patch up their differences.@@
<<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1, _lustyFix = 1, _lightenedRivalry = 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.@@
+ $slaves[$i].slaveName lusts after <<= SlaveFullName($slaves[_j])>>, and does everything $he can to @@.lightgreen;patch up their differences.@@
<<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1, _lustyFix = 1, _lightenedRivalry = 1>>
<</if>>
<</if>>
@@ -212,7 +213,7 @@
<<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.@@
+ $slaves[$i].slaveName lusts after <<= SlaveFullName($slaves[_j])>>, and does everything $he can to @@.lightgreen;patch up their differences.@@
<<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1, _lustyFix = 1, _lightenedRivalry = 1>>
<</if>>
<</if>>
@@ -255,16 +256,16 @@
<</if>>
<<if $slaves[_j].origBodyOwnerID == $slaves[$i].ID && _lightenedRivalry != 1>>
<<if $slaves[$i].rivalry < 3>>
- $slaves[$i].slaveName @@.lightsalmon;refuses to accept <<= SlaveFullName($slaves[_j])>>'s control of her former body,@@ worsening their rivalry.
+ $slaves[$i].slaveName @@.lightsalmon;refuses to accept <<= SlaveFullName($slaves[_j])>>'s control of $his former body,@@ worsening their rivalry.
<<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1>>
<</if>>
<<elseif _roll > $slaves[$i].devotion-$slaves[$i].trust+10 && _lightenedRivalry != 1>>
<<if $slaves[$i].rivalry < 3>>
- $slaves[$i].slaveName @@.lightsalmon;bickers with <<= SlaveFullName($slaves[_j])>>@@ whenever she can, worsening their rivalry.
+ $slaves[$i].slaveName @@.lightsalmon;bickers with <<= SlaveFullName($slaves[_j])>>@@ whenever $he can, worsening their rivalry.
<<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1>>
<</if>>
<<elseif _roll < $slaves[$i].devotion-$slaves[$i].trust-10 && $slaves[$i].rivalry > 0 && _worsenedRivalry != 1>>
- $slaves[$i].slaveName does her best to be nice to <<= SlaveFullName($slaves[_j])>>, and manages to @@.lightgreen;de-escalate their little feud.@@
+ $slaves[$i].slaveName does $his best to be nice to <<= SlaveFullName($slaves[_j])>>, and manages to @@.lightgreen;de-escalate their little feud.@@
<<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
<</if>>
<<else>>
diff --git a/src/uncategorized/scheduledEvent.tw b/src/uncategorized/scheduledEvent.tw
index f306c010809..9c6ff30524a 100644
--- a/src/uncategorized/scheduledEvent.tw
+++ b/src/uncategorized/scheduledEvent.tw
@@ -96,7 +96,7 @@
<<set $fcnn.push("...likelihood of containing Influenza-M was downgraded to a lower...")>>
<<set $fcnn.push("...threatened immediate use of chemical weapons should those forces not withdraw...")>>
<<set $fcnn.push("...relief organizations unable to deal with casualties from nuclear exchange between...")>>
- <<set $fcnn.push("...guerilla fighting intensifies in escalating proxy war between 'Paternalist' and 'Degredationist' Free Cities in the region of...")>>
+ <<set $fcnn.push("...guerrilla fighting intensifies in escalating proxy war between 'Paternalist' and 'Degradationist' Free Cities in the region of...")>>
<<set $fcnn.push("...Coming Up- FCNN Special Report about the unprecedented scale of slave insurrections across...")>>
<<set $fcnn.push("...invasive plant growth epidemic contested by persistent droughts in eastern...")>>
<<elseif $week == 90>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index c9c0f369774..186710d9607 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -879,13 +879,13 @@ As the remote surgery's long recovery cycle completes,
<<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>>
When $he exits the room, $he feels that $his face is numb,
<<if $activeSlave.devotion > 50>>
- $he <<if canSee($activeSlave)>>throws a glance at the mirror<<else>>listens closely to your description<</if>>, and seems to be @@.hotpink;in awe@@ of how much $his face has been beautified by a small scar.
+ $he <<if canSee($activeSlave)>>throws a glance at the mirror<<elseif canHear($activeSlave)>>listens closely to your description<<else>>gets the feel of $his facial alteration<</if>>, and seems to be @@.hotpink;in awe@@ of how much $his face has been beautified by a small scar.
<<set $activeSlave.devotion += 5>>
<<elseif $activeSlave.devotion > 20>>
- and when $he <<if canSee($activeSlave)>>looks at the mirror<<else>>listens to your description<</if>>, $he seems @@.hotpink;pleased@@ with $his new exotic scar.
+ and when $he <<if canSee($activeSlave)>>looks at the mirror<<elseif canHear($activeSlave)>>listens to your description<<else>>gets the feel of $his facial alteration<</if>>, $he seems @@.hotpink;pleased@@ with $his new exotic scar.
<<set $activeSlave.devotion += 5>>
<<else>>
- and, <<if canSee($activeSlave)>>looking at $himself in the mirror<<else>>listening to the description of $his new look<</if>>, $he seems @@.hotpink;thankful@@ for the distinguishing scar, but @@.gold;scared@@ that it might only be some way to brand $him.
+ and, <<if canSee($activeSlave)>>looking at $himself in the mirror<<elseif canHear($activeSlave)>>listening to the description of $his new look<<else>>getting the feel of $his facial alteration<</if>>, $he seems @@.hotpink;thankful@@ for the distinguishing scar, but @@.gold;scared@@ that it might only be some way to brand $him.
<<set $activeSlave.devotion += 5>>
<<set $activeSlave.trust -= 5>>
<</if>>
--
GitLab