From 419e3f65e00c1275c682d6ea4a1dc50d2053f07d Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 18 May 2017 18:18:00 -0400
Subject: [PATCH] Fcanon burying me.
---
src/gui/Encyclopedia/encyclopedia.tw | 2 +-
src/uncategorized/autosurgerySettings.tw | 16 +--
src/uncategorized/barracks.tw | 2 +-
src/uncategorized/corporateMarket.tw | 2 +-
src/uncategorized/fondleButt.tw | 28 +++-
src/uncategorized/fsDevelopments.tw | 7 +-
.../industrialDairyAssignmentScene.tw | 2 +-
src/uncategorized/neighborDescription.tw | 58 ++++----
src/uncategorized/neighborInteract.tw | 9 +-
src/uncategorized/neighborsDevelopment.tw | 128 +++++++++---------
src/uncategorized/neighborsFSAdoption.tw | 8 +-
src/uncategorized/newSlaveIntro.tw | 124 ++++++++---------
src/uncategorized/saLongTermEffects.tw | 6 +-
src/uncategorized/saWhore.tw | 2 +-
src/utility/descriptionWidgets.tw | 2 +-
src/utility/slaveCreationWidgets.tw | 2 +-
16 files changed, 211 insertions(+), 187 deletions(-)
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 09198caa169..4424c559584 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -485,7 +485,7 @@ Glory holes and slave brothels have a symbiotic existence, and any Free Cities s
//Twentieth century eugenicists weren't wrong, they just didn't have the tools to be right.//
-- Anonymous
-High quality Free Cities slaves are remarkably healthy. It should be unsurprising that a population of humans selected for beauty, fed perfectly, required to exercise, given modern medical care, and prevented from indulging any non-sexual excess at all, has become quite impressive in this regard. The cultural fallout of this is has been less easy to predict.
+High quality Free Cities slaves are remarkably healthy. It should be unsurprising that a population of humans selected for beauty, fed perfectly, required to exercise, given modern medical care, and prevented from indulging any non-sexual excess at all, has become quite impressive in this regard. The cultural fallout of this has been less easy to predict.
Throughout the early part of the 21st century a wide spectra of movements were taking place that have informed the Free Cities ideology of body purism. The left-wing counterculture health movement has found much open ground in a society that allows its adherents to totally control what goes into the bodies of some of its members. On the opposite side of the spectrum, some long-standing reactionary groups have taken this opportunity to experiment with some of their non-racial theories on purity. Finally, many religious or simply moral fundamentalists who believe in some form of purity code now have a captive population to subject to their whims.
diff --git a/src/uncategorized/autosurgerySettings.tw b/src/uncategorized/autosurgerySettings.tw
index ed758c4ba26..a2add72966d 100644
--- a/src/uncategorized/autosurgerySettings.tw
+++ b/src/uncategorized/autosurgerySettings.tw
@@ -20,7 +20,7 @@ Lactation inducing drugs implants:
<br>
-<<if ($currentRule.surgery.lactation != "no default setting")>>
+<<if ($currentRule.surgery.lactation !== "no default setting")>>
<<link "No default setting">>
<<set $currentRule.surgery.lactation = "no default setting">>
<<RASurgeryChangeLacation>>
@@ -28,7 +28,7 @@ Lactation inducing drugs implants:
<<else>>
No default setting |
<</if>>
-<<if ($currentRule.surgery.lactation != 0)>>
+<<if ($currentRule.surgery.lactation !== 0)>>
<<link "Removed">>
<<set $currentRule.surgery.lactation = 0>>
<<RASurgeryChangeLacation>>
@@ -36,7 +36,7 @@ Lactation inducing drugs implants:
<<else>>
Removed |
<</if>>
-<<if ($currentRule.surgery.lactation != 1)>>
+<<if ($currentRule.surgery.lactation !== 1)>>
<<link "Implanted">>
<<set $currentRule.surgery.lactation = 1>>
<<RASurgeryChangeLacation>>
@@ -60,7 +60,7 @@ Cosmetic surgery:
<br>
-<<if ($currentRule.surgery.cosmetic != 0)>>
+<<if ($currentRule.surgery.cosmetic !== 0)>>
<<link "None">>
<<set $currentRule.surgery.cosmetic = 0>>
<<RASurgeryChangeCosmetic>>
@@ -68,7 +68,7 @@ Cosmetic surgery:
<<else>>
None |
<</if>>
-<<if ($currentRule.surgery.cosmetic != 1)>>
+<<if ($currentRule.surgery.cosmetic !== 1)>>
<<link "Subtle">>
<<set $currentRule.surgery.cosmetic = 1>>
<<RASurgeryChangeCosmetic>>
@@ -76,7 +76,7 @@ Cosmetic surgery:
<<else>>
Subtle |
<</if>>
-<<if ($currentRule.surgery.cosmetic != 2)>>
+<<if ($currentRule.surgery.cosmetic !== 2)>>
<<link "Invasive">>
<<set $currentRule.surgery.cosmetic = 2>>
<<RASurgeryChangeCosmetic>>
@@ -106,7 +106,7 @@ Lip implants:
<br>
-<<if ($currentRule.surgery.lips != "no default setting")>>
+<<if ($currentRule.surgery.lips !== "no default setting")>>
<<link "No default setting">>
<<set $currentRule.surgery.lips = "no default setting">>
<<RASurgeryChangeLips>>
@@ -178,7 +178,7 @@ Buttock implants:
<br>
-<<if ($currentRule.surgery.butt != "no default setting")>>
+<<if ($currentRule.surgery.butt !== "no default setting")>>
<<link "No default setting">>
<<set $currentRule.surgery.butt = "no default setting">>
<<RASurgeryChangeButt>>
diff --git a/src/uncategorized/barracks.tw b/src/uncategorized/barracks.tw
index 1ad1b269c6b..b4915b3daa4 100644
--- a/src/uncategorized/barracks.tw
+++ b/src/uncategorized/barracks.tw
@@ -130,7 +130,7 @@ You head up a deck, to the staff area, and up one more, to look into the living
<br><br>
-<<link "Decomission the barracks and return this sector to manufacturing">>
+<<link "Decommission the barracks and return this sector to manufacturing">>
<<set $barracks = 0>>
<<for _i = 0; _i < $sectors.length; _i++>>
<<if $sectors[_i].type == "Barracks">><<set $sectors[_i].type = "Manufacturing">><<break>><</if>>
diff --git a/src/uncategorized/corporateMarket.tw b/src/uncategorized/corporateMarket.tw
index 6276c0c3b11..feeb4aaf029 100644
--- a/src/uncategorized/corporateMarket.tw
+++ b/src/uncategorized/corporateMarket.tw
@@ -23,7 +23,7 @@ sales<<if $captureUpgradeAge == "old">>woman<<else>>girl<</if>> in a slutty suit
<</if>>
<<if $surgicalUpgradeCosmetics == "applied">>Her face is flawless.<</if>>
<<if ($captureUpgradeRace != "unselected") && ($captureUpgradeRace != "none")>>
- She's $captureUpgradeRace>>, of course<<if $trainingUpgradeAccent == "accents">>, and has a cute accent<</if>>.
+ She's $captureUpgradeRace, of course<<if $trainingUpgradeAccent == "accents">>, and has a cute accent<</if>>.
<</if>>
<<if $drugUpgradeHormones == "XX">>
Her voice is soft and feminine, and she bats her eyes at you.
diff --git a/src/uncategorized/fondleButt.tw b/src/uncategorized/fondleButt.tw
index 067615586b8..86f4e6b76f9 100644
--- a/src/uncategorized/fondleButt.tw
+++ b/src/uncategorized/fondleButt.tw
@@ -424,9 +424,20 @@ You call her over so you can fondle her
<<elseif ($activeSlave.anus == 0)>>
virgin
<</if>> butthole as you trace it with your fingers and thumb. Eventually, you decide to stop and she looks up at you quizzically, unsure about what you will do next.
-<<elseif $activeSlave.devotion < 50>>
+<<elseif ($activeSlave.devotion < 50)>>
<<if ($activeSlave.amp != 1)>>
- You instruct her to present her <<if $seeRace == 1>>$activeSlave.race <</if>>anus. She hesitates but eventually stands in front of you showing her buttocks before presenting her virgin anus to you and turning to face you.
+ You instruct her to present her <<if $seeRace == 1>>$activeSlave.race <</if>>anus. She hesitates but eventually stands in front of you showing her buttocks before presenting her
+ <<if ($activeSlave.anus > 3)>>
+ gaping
+ <<elseif ($activeSlave.anus == 3)>>
+ loose
+ <<elseif ($activeSlave.anus == 2)>>
+ well-used
+ <<elseif ($activeSlave.anus == 1)>>
+ tight
+ <<elseif ($activeSlave.anus == 0)>>
+ virgin
+ <</if>> anus to you and turning to face you.
<<else>>
She's mildy hesitant at the thought of your hands groping her, but as an amputee can do nothing about it.
<</if>>
@@ -458,7 +469,18 @@ You call her over so you can fondle her
You look at her rear while you squeeze her cheeks and rub them with your firm hands. You wander along the outline of her posterior with both your eyes and hands, then look at her butthole as you trace it with your fingers and thumb. Eventually, you decide to stop and she looks up into your eyes longingly, as if she wants more.
<<else>>
<<if ($activeSlave.amp != 1)>>
- You instruct her to present her <<if $seeRace == 1>>$activeSlave.race <</if>>anus. She eagerly stands in front of you showing her buttocks before happily presenting her virgin anus to you, spreading her butt cheeks and turning to face you.
+ You instruct her to present her <<if $seeRace == 1>>$activeSlave.race <</if>>anus. She eagerly stands in front of you showing her buttocks before happily presenting her
+ <<if ($activeSlave.anus > 3)>>
+ gaping
+ <<elseif ($activeSlave.anus == 3)>>
+ loose
+ <<elseif ($activeSlave.anus == 2)>>
+ well-used
+ <<elseif ($activeSlave.anus == 1)>>
+ tight
+ <<elseif ($activeSlave.anus == 0)>>
+ virgin
+ <</if>> anus to you, spreading her butt cheeks and turning to face you.
<<else>>
She devotedly looks at you, awaiting your touch on her body.
<</if>>
diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw
index 3c1bcb3f090..49c6167dbbf 100644
--- a/src/uncategorized/fsDevelopments.tw
+++ b/src/uncategorized/fsDevelopments.tw
@@ -299,14 +299,14 @@
<</if>>
<</if>>
-/* Disabled until completed
<<for _i = 5; _i <= 7; _i++>>
<<if $sectors[_i].type != "Shops">>
<<if $sectors[_i].type != "Brothel">>
<<if $sectors[_i].type != "Club">>
The $sectors[_i].type establishments on the Promenade help develop society.
- <<FSChange $sectors[_i].type.replace(" ","") 4>>
- <<break>>
+ <<set _changed_fs = $sectors[_i].type.replace(" ","")>>
+ <<FSChange _changed_fs 4>>
+ <<continue>>
<</if>>
<</if>>
<</if>>
@@ -461,7 +461,6 @@
//Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
<</if>>
<</if>>
-*/
<br><br>
<<if $PAPublic == 1 && $assistantAppearance != "normal">>
diff --git a/src/uncategorized/industrialDairyAssignmentScene.tw b/src/uncategorized/industrialDairyAssignmentScene.tw
index 6a7e8076bb2..d147939ef31 100644
--- a/src/uncategorized/industrialDairyAssignmentScene.tw
+++ b/src/uncategorized/industrialDairyAssignmentScene.tw
@@ -161,7 +161,7 @@ begging and sobbing, into the machine's embrace.
<<if ($dairyPregSetting > 2) && isFertile($activeSlave)>>
My w-womb c-c-can't take it! I'll b-bur<<s>>t! And m-my c-c-cunt will be ruined from the dildo and birthing!
<<elseif ($dairyPregSetting > 1) && isFertile($activeSlave)>>
- M-my c-c-cunt will be <<if SlaveStatsChecker.checkForLisp($activeSlave)>>th-tho<<else>>s-so<</if>> <<s>>tretched from the dildo and birthing!
+ M-my c-c-cunt will be <<s>>-<<s>>o <<s>>tretched from the dildo and birthing!
<</if>>
I'll d-do anything!"
diff --git a/src/uncategorized/neighborDescription.tw b/src/uncategorized/neighborDescription.tw
index abc9d704a43..9c75025c4f0 100644
--- a/src/uncategorized/neighborDescription.tw
+++ b/src/uncategorized/neighborDescription.tw
@@ -1,6 +1,6 @@
:: Neighbor Description [nobr]
-<br>
+<br><br>
''$arcologies[$i].name'' is located to the $arcologies[$i].direction of your arcology. It is governed by
<<switch $arcologies[$i].government>>
<<case "elected officials">>
@@ -10,11 +10,11 @@
<<case "an oligarchy">>
a small group of leading citizens, making its development very unpredictable.
<<case "your trustees">>
- a small group of leading citizens who are serving as your trustees.
+ a small group of leading citizens who are serving as @@.mediumseagreen;your trustees@@.
<<case "an individual">>
- an individual, making its development vibrant but unpredictable.
+ @@.cyan;an individual@@, making its development vibrant but unpredictable.
<<case "your agent">>
- your agent, who is directing the arcology in your stead.
+ @@.deeppink;your agent@@, who is directing the arcology in your stead.
<<case "a corporation">>
a corporation, making its development steady and unspectacular.
<<default>>
@@ -27,10 +27,10 @@
<</if>>
<<if $arcologies[$i].government != "your trustees">>
<<if $arcologies[$i].government != "your agent">>
-Its leadership has control of approximately <<print Math.trunc(($arcologies[$i].ownership*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>% of the arcology<<if $arcologies[$i].minority > $arcologies[$i].ownership-10>>, a dangerously narrow margin over competition with a <<print Math.trunc(($arcologies[$i].minority*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>% share<</if>>.
+Its leadership has control of approximately @@.orange;<<print Math.trunc(($arcologies[$i].ownership*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>%@@ of the arcology<<if $arcologies[$i].minority > $arcologies[$i].ownership-10>>, a dangerously narrow margin over competition with a @@.tan;<<print Math.trunc(($arcologies[$i].minority*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>%@@ share<</if>>.
<</if>>
<</if>>
-<<if $arcologies[$i].PCminority > 0>>You own $arcologies[$i].PCminority% of this arcology<</if>><<if ($arcologies[$i].government == "your trustees") || ($arcologies[$i].government == "your agent")>><<if $arcologies[$i].minority > $arcologies[$i].PCminority-10>>, a dangerously narrow margin over competition with a <<print Math.trunc(($arcologies[$i].minority*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>% share<</if>>.<</if>>
+<<if $arcologies[$i].PCminority > 0>>You own @@.lime;$arcologies[$i].PCminority%@@ of this arcology<</if>><<if ($arcologies[$i].government == "your trustees") || ($arcologies[$i].government == "your agent")>><<if $arcologies[$i].minority > $arcologies[$i].PCminority-10>>, a dangerously narrow margin over competition with a @.red;<<print Math.trunc(($arcologies[$i].minority*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>%@@ share<</if>><</if>>.
<<set $economicUncertainty -= 2*$assistantPower>>
The arcology has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i].prosperity*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>m,@@
<<if Math.abs($arcologies[$i].prosperity - $averageProsperity) < 5>>
@@ -52,7 +52,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "racial Subjugationism, and is ">>
+ <<set $desc = $desc + "@@.gold;racial Subjugationism@@, and is ">>
<<if $arcologies[$i].FSSubjugationist > 95>>
<<set $desc = $desc + "the home of an advanced project to create a subservient race of ">>
<<set $desc = $desc + $arcologies[$i].FSSubjugationistRace>>
@@ -76,7 +76,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "racial Supremacy, and is ">>
+ <<set $desc = $desc + "@@.gold;racial Supremacy@@, and is ">>
<<if $arcologies[$i].FSSubjugationist > 95>>
<<set $desc = $desc + "a global magnet for ">>
<<set $desc = $desc + $arcologies[$i].FSSupremacistRace>>
@@ -100,7 +100,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "Repopulation, and is ">>
+ <<set $desc = $desc + "@@.gold;Repopulation@@, and is ">>
<<if $arcologies[$i].FSRepopulationFocus > 95>>
<<set $desc = $desc + "notorious for the size and number of pregnancies among its population.">>
<<elseif $arcologies[$i].FSRepopulationFocus > 40>>
@@ -118,7 +118,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "Eugenics, and is ">>
+ <<set $desc = $desc + "@@.gold;Eugenics@@, and is ">>
<<if $arcologies[$i].FSRestart > 95>>
<<set $desc = $desc + "notorious for the number of powerful civilians inhabiting it.">>
<<elseif $arcologies[$i].FSRestart > 40>>
@@ -136,7 +136,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "Gender Radicalism, and is ">>
+ <<set $desc = $desc + "@@.gold;Gender Radicalism@@, and is ">>
<<if $arcologies[$i].FSGenderRadicalist > 95>>
<<set $desc = $desc + "notorious for the openness with which its citizens fuck its slavegirls in the ass until they cum.">>
<<elseif $arcologies[$i].FSGenderRadicalist > 40>>
@@ -154,7 +154,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "Gender Fundamentalism, and is ">>
+ <<set $desc = $desc + "@@.gold;Gender Fundamentalism@@, and is ">>
<<if $arcologies[$i].FSGenderFundamentalist > 95>>
<<set $desc = $desc + "famous for its slave schools, crowded with a future generation of world class slaves.">>
<<elseif $arcologies[$i].FSGenderFundamentalist > 40>>
@@ -172,7 +172,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "Paternalism, and is ">>
+ <<set $desc = $desc + "@@.gold;Paternalism@@, and is ">>
<<if $arcologies[$i].FSPaternalist > 95>>
<<set $desc = $desc + "the home of an educated, enlightened caste of slaves more productive than some arcologies' citizens.">>
<<elseif $arcologies[$i].FSPaternalist > 40>>
@@ -190,7 +190,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "Degradationism, and is ">>
+ <<set $desc = $desc + "@@.gold;Degradationism@@, and is ">>
<<if $arcologies[$i].FSDegradationist > 95>>
<<set $desc = $desc + "renowned and feared by slaves worldwide, as a place of blood and steel from which few ever leave.">>
<<elseif $arcologies[$i].FSDegradationist > 40>>
@@ -208,7 +208,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "Body Purism, and is ">>
+ <<set $desc = $desc + "@@.gold;Body Purism@@, and is ">>
<<if $arcologies[$i].FSBodyPurist > 95>>
<<set $desc = $desc + "a world leader in the drug industry due to its pharmaceutical research breakthroughs.">>
<<elseif $arcologies[$i].FSBodyPurist > 40>>
@@ -226,7 +226,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "Transformation Fetishism, and is ">>
+ <<set $desc = $desc + "@@.gold;Transformation Fetishism@@, and is ">>
<<if $arcologies[$i].FSTransformationFetishist > 95>>
<<set $desc = $desc + "renowned as the source of some of the world's most unbelievable surgical transformations.">>
<<elseif $arcologies[$i].FSTransformationFetishist > 40>>
@@ -244,7 +244,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "Youth Preferentialism, and is ">>
+ <<set $desc = $desc + "@@.gold;Youth Preferentialism@@, and is ">>
<<if $arcologies[$i].FSYouthPreferentialist > 95>>
<<set $desc = $desc + "famous for the intense celebratory attention slaves receive there once reaching their majorities.">>
<<elseif $arcologies[$i].FSYouthPreferentialist > 40>>
@@ -262,7 +262,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "Maturity Preferentialism, and is ">>
+ <<set $desc = $desc + "@@.gold;Maturity Preferentialism@@, and is ">>
<<if $arcologies[$i].FSMaturityPreferentialist > 95>>
<<set $desc = $desc + "world famous among mature slaves, who see it as a paradise in which MILFs are the most valuable girls around.">>
<<elseif $arcologies[$i].FSMaturityPreferentialist > 40>>
@@ -280,7 +280,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "Slimness Enthusiasm, and is ">>
+ <<set $desc = $desc + "@@.gold;Slimness Enthusiasm@@, and is ">>
<<if $arcologies[$i].FSSlimnessEnthusiast > 95>>
<<set $desc = $desc + "very well known for the wonderful variety of nubile bodies that can be seen there.">>
<<elseif $arcologies[$i].FSSlimnessEnthusiast > 40>>
@@ -298,7 +298,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "Asset Expansionism, and is ">>
+ <<set $desc = $desc + "@@.gold;Asset Expansionism@@, and is ">>
<<if $arcologies[$i].FSAssetExpansionist > 95>>
<<set $desc = $desc + "widely considered an interior design masterpiece for its adaptations to slaves with fifty kilos of tits.">>
<<elseif $arcologies[$i].FSAssetExpansionist > 40>>
@@ -316,7 +316,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "Pastoralist, and is ">>
+ <<set $desc = $desc + "@@.gold;Pastoralist@@, and is ">>
<<if $arcologies[$i].FSPastoralist > 95>>
<<set $desc = $desc + "a world-renowned producer of cowgirl dairy products of all kinds.">>
<<elseif $arcologies[$i].FSPastoralist > 40>>
@@ -334,7 +334,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "Physical Idealism, and is ">>
+ <<set $desc = $desc + "@@.gold;Physical Idealism@@, and is ">>
<<if $arcologies[$i].FSPhysicalIdealist > 95>>
<<set $desc = $desc + "a constant standout at international athletic competitions, where both its citizens and slaves do very well.">>
<<elseif $arcologies[$i].FSPhysicalIdealist > 40>>
@@ -352,7 +352,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "Chattel Religionism, and is ">>
+ <<set $desc = $desc + "@@.gold;Chattel Religionism@@, and is ">>
<<if $arcologies[$i].FSChattelReligionist > 95>>
<<set $desc = $desc + "a significant force in the global development of Chattel Religionist dogma.">>
<<elseif $arcologies[$i].FSChattelReligionist > 40>>
@@ -370,7 +370,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "Roman Revivalism, and is ">>
+ <<set $desc = $desc + "@@.gold;Roman Revivalism@@, and is ">>
<<if $arcologies[$i].FSRomanRevivalist > 95>>
<<set $desc = $desc + "hugely famous for its broadcasts of gladiatorial combat, popular even in the old world.">>
<<elseif $arcologies[$i].FSRomanRevivalist > 40>>
@@ -388,7 +388,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "Aztec Revivalism, and is ">>
+ <<set $desc = $desc + "@@.gold;Aztec Revivalism@@, and is ">>
<<if $arcologies[$i].FSAztecRevivalist > 95>>
<<set $desc = $desc + "world famous for its incredible architecture and highly qualified leading caste and military.">>
<<elseif $arcologies[$i].FSAztecRevivalist > 40>>
@@ -406,7 +406,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "Egyptian Revivalism, and is ">>
+ <<set $desc = $desc + "@@.gold;Egyptian Revivalism@@, and is ">>
<<if $arcologies[$i].FSEgyptianRevivalist > 95>>
<<set $desc = $desc + "a world famous tourist destination for the traditional festival in its plaza, which never stops.">>
<<elseif $arcologies[$i].FSEgyptianRevivalist > 40>>
@@ -424,7 +424,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "Edo Revivalism, and is ">>
+ <<set $desc = $desc + "@@.gold;Edo Revivalism@@, and is ">>
<<if $arcologies[$i].FSEdoRevivalist > 95>>
<<set $desc = $desc + "visibly trailing cherry blossoms, blown off its balconies by the wind.">>
<<elseif $arcologies[$i].FSEdoRevivalist > 40>>
@@ -442,7 +442,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "Arabian Revivalism, and is ">>
+ <<set $desc = $desc + "@@.gold;Arabian Revivalism@@, and is ">>
<<if $arcologies[$i].FSArabianRevivalist > 95>>
<<set $desc = $desc + "a famous center of Arabian romanticism, since it has the wisdom not to be historically perfect.">>
<<elseif $arcologies[$i].FSArabianRevivalist > 40>>
@@ -460,7 +460,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "Chinese Revivalism, and is ">>
+ <<set $desc = $desc + "@@.gold;Chinese Revivalism@@, and is ">>
<<if $arcologies[$i].FSChineseRevivalist > 95>>
<<set $desc = $desc + "now confidently mature about its possession of the Mandate of Heaven.">>
<<elseif $arcologies[$i].FSChineseRevivalist > 40>>
diff --git a/src/uncategorized/neighborInteract.tw b/src/uncategorized/neighborInteract.tw
index de018033bef..9cb63f8cf1e 100644
--- a/src/uncategorized/neighborInteract.tw
+++ b/src/uncategorized/neighborInteract.tw
@@ -155,7 +155,6 @@
Your arcology's culture is capable of starting to exert cultural sway over other arcologies. It can project $desc[0].
<</if>>
-<br>
<<for $i = 0; $i < $arcologies.length; $i++>>
<<if $arcologies[$i].direction == $activeArcology.direction>>
<<include "Neighbor Description">>
@@ -190,11 +189,14 @@ A 1% interest in $activeArcology.name is worth ¤$seed and will require a transa
<<if $activeArcology.government == "your trustees">>
<br>
[[Appoint an agent|Agent Select]]
+ <span id="rename"> | <<link "Instruct them to rename the arcology">><<replace #rename>> | <<textbox "$activeArcology.name" $activeArcology.name>> [[Confirm name|Neighbor Interact]]<</replace>><</link>></span>
<<else>>
<br>
<<for $j = 0; $j < $leaders.length; $j++>>
<<if $activeArcology.leaderID == $leaders[$j].ID>>
- Your agent @@.pink;$leaders[$j].slaveName@@ is running this arcology. Her <<if $leaders[$j].intelligence >= 3>>brilliance<<else>>intelligence<</if>> and education are the most important qualities for her.
+ Your agent @@.deeppink;$leaders[$j].slaveName@@ is running this arcology. [[Recall and reenslave her|Agent Retrieve]]
+ <span id="rename"> | <<link "Instruct her to rename the arcology">><<replace #rename>> | <<textbox "$activeArcology.name" $activeArcology.name>> [[Confirm name|Neighbor Interact]]<</replace>><</link>></span>
+ <br>Her <<if $leaders[$j].intelligence >= 3>>brilliance<<else>>intelligence<</if>> and education are the most important qualities for her.
<<if $leaders[$j].actualAge > 35>>
As with the Head Girl position, her age and experience lend her leadership weight.
<</if>>
@@ -208,6 +210,8 @@ A 1% interest in $activeArcology.name is worth ¤$seed and will require a transa
Her sexually dominant fetish helps her fill a leadership role.
<<elseif ($leaders[$j].fetish == "submissive") || ($leaders[$j].fetish == "masochist")>>
Unfortunately, she has an inappropriate fetish for a leader.
+ <<else>>
+ Her sexual fetishes will influence how she leads the arcology.
<</if>>
<</if>>
<<if $leaders[$j].energy > 95>>
@@ -215,7 +219,6 @@ A 1% interest in $activeArcology.name is worth ¤$seed and will require a transa
<</if>>
<</if>>
<</for>>
- [[Recall and reenslave her|Agent Retrieve]]
<</if>>
<<if $activeArcology.FSSubjugationist != "unset">>
<br><<link "Force Abandonment of Racial Subjugation">><<set $activeArcology.FSSubjugationist = "unset">><<goto "Neighbor Interact">><</link>>
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index 1c3b34a7d5c..b3b46155e26 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -15,7 +15,7 @@
<<for $i = 0; $i < $arcologies.length; $i++>>
-<br>
+<br><br>
''$arcologies[$i].name'', your <<if $arcologies[$i].direction == 0>>arcology<<else>>neighbor to the $arcologies[$i].direction<</if>>,
/* PROSPERITY */
@@ -50,7 +50,7 @@
<<if $arcologies[$i].government == "your agent">>
<<for _k = 0; _k < $leaders.length; _k++>>
<<if $leaders[_k].ID == $arcologies[$i].leaderID>>
- is being run by your agent @@.pink;$leaders[_k].slaveName.@@
+ is being run by your agent @@.deeppink;$leaders[_k].slaveName@@.
<<if $leaders[_k].assignment != "be your agent">>
<<assignJob $leaders[_k] "be your agent">>
<</if>>
@@ -58,6 +58,8 @@
The arcology
<</if>>
<</for>>
+<<elseif $arcologies[$i].government == "your trustees">>
+ is being run by @@.mediumseagreen;your trustees@@. The arcology
<</if>>
<<if $arcologies[$i].direction == 0>>
@@ -339,7 +341,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<</if>>
<<if $desc.length == 0>>
<<elseif $desc.length > 2>>
- Its citizens take the opportunity to make radical social changes, 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],
@@ -348,9 +350,9 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<</if>>
<</for>>
<<elseif $desc.length == 2>>
- Its citizens take the opportunity to make social changes, discarding the $desc[0] and $desc[1] favored by the old government.
+ Its citizens take the opportunity to make social changes, @@.cyan;discarding the $desc[0] and $desc[1]@@ favored by the old government.
<<else>>
- Its citizens take the opportunity to make social change and abandon the $desc[0] favored by the old government.
+ Its citizens take the opportunity to make social change and @@.cyan;abandon the $desc[0]@@ favored by the old government.
<</if>>
<<else>>
The arcology is paralyzed by internal dissention over how to respond.
@@ -373,7 +375,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
about as prosperous as the rest of the Free City.
<<else>>
<<if ($arcologies[$i].honeymoon > 0)>>
- far behind the rest of the Free City, making it a good investment and spurring its economic development. It remains in the honeymoon period after its recent change of government, suppressing dissention and further encouraging growth.
+ far behind the rest of the Free City, making it a good investment and spurring its economic development. It remains in the @@.lightgreen;honeymoon period@@ after its recent change of government, suppressing dissention and further encouraging growth.
<<set $arcologies[$i].prosperity += 2>>
<<if ($arcologies[$i].ownership != 0) && ($arcologies[$i].ownership < 40)>>
<<set $arcologies[$i].ownership += 1>>
@@ -422,13 +424,13 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
Its leadership acquires an increased share of its ownership.
<<set $arcologies[$i].ownership += 1>>
<<set $arcologies[$i].prosperity -= 5>>
- This places its government in control of approximately <<print Math.trunc(($arcologies[$i].ownership*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>% of the arcology<<if $arcologies[$i].minority > 0>>, against its most prominent competition, with a <<print Math.trunc(($arcologies[$i].minority*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>% share<</if>>.
+ This places its government in control of approximately @@.orange;<<print Math.trunc(($arcologies[$i].ownership*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>%@@ of the arcology<<if $arcologies[$i].minority > 0>>, against its most prominent competition, with a @@.tan<<print Math.trunc(($arcologies[$i].minority*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>%@@ share<</if>>.
<<elseif _prosperityDiff < random(-50,10)>>
<<if $arcologies[$i].ownership > 0>>
Its leadership sells off some of its ownership to stay afloat.
<<set $arcologies[$i].ownership -= 1>>
<<set $arcologies[$i].prosperity += 5>>
- This leaves its government in control of approximately <<print Math.trunc(($arcologies[$i].ownership*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>% of the arcology<<if $arcologies[$i].minority > 0>>, against its most prominent competition, with a <<print Math.trunc(($arcologies[$i].minority*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>% share<</if>>.
+ This leaves its government in control of approximately @@.orange;<<print Math.trunc(($arcologies[$i].ownership*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>%@@ of the arcology<<if $arcologies[$i].minority > 0>>, against its most prominent competition, with a @@.tan;<<print Math.trunc(($arcologies[$i].minority*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>%@@ share<</if>>.
<</if>>
<</if>>
<<if $arcologies[$i].minority+$arcologies[$i].ownership > 100>>
@@ -473,7 +475,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if $arcologies[$j].direction != 0>>
<<set $arcologies[$j].prosperity -= $arcologies[$j].embargo*2>>
<</if>>
- $arcologies[$i].name targets $arcologies[$j].name for economic warfare.
+ $arcologies[$i].name targets $arcologies[$j].name for @@.red;economic warfare@@.
<</if>>
<</for>>
@@ -562,7 +564,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
''$arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSSupremacist < 0>>
- $arcologies[$i].name has given up on $arcologies[$i].FSSupremacistRace Supremacy.
+ $arcologies[$i].name @@.cyan;has given up@@ on $arcologies[$i].FSSupremacistRace Supremacy.
<<set $arcologies[$i].FSSupremacist = "unset">>
<</if>>
<</if>>
@@ -570,7 +572,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if $captureUpgradeRace != "unselected">>
<<if $captureUpgradeRace != "none">>
<<if $captureUpgradeRace != $arcologies[$i].FSSupremacistRace>>
- It's a good market for your corporation's racially inferior slaves, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's racially inferior slaves, improving sales and helping social progress.
<<set $arcologies[$i].FSSupremacist += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
@@ -631,13 +633,13 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
''$arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSSubjugationist < 0>>
- $arcologies[$i].name has given up on $arcologies[$i].FSSubjugationistRace Subjugationism.
+ $arcologies[$i].name @@.cyan;has given up@@ on $arcologies[$i].FSSubjugationistRace Subjugationism.
<<set $arcologies[$i].FSSubjugationist = "unset">>
<</if>>
<</if>>
<<if $corpIncorporated == 1>>
<<if $captureUpgradeRace == $arcologies[$i].FSSubjugationistRace>>
- It's a good market for your corporation's $arcologies[$i].FSSubjugationistRace slaves, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's $arcologies[$i].FSSubjugationistRace slaves, improving sales and helping social progress.
<<set $arcologies[$i].FSSubjugationist += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
@@ -671,17 +673,17 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
''$arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSRepopulationFocus < 0>>
- $arcologies[$i].name has given up on Repopulationism.
+ $arcologies[$i].name @@.cyan;has given up@@ on Repopulationism.
<<set $arcologies[$i].FSRepopulationFocus = "unset">>
<</if>>
<</if>>
<<if $corpIncorporated == 1>>
<<if $drugUpgradeInjectionTwo == "pastoral">>
- It's a good market for your corporation's milky cows, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's milky cows, improving sales and helping social progress.
<<set $arcologies[$i].FSRepopulationFocus += 1>>
<<set $corpCash += _corpBonus>>
<<elseif $captureUpgradeAge == "young">>
- It's a good market for your corporation's youthful captures, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's youthful captures, improving sales and helping social progress.
<<set $arcologies[$i].FSRepopulationFocus += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
@@ -714,7 +716,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
''$arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSRestart < 0>>
- $arcologies[$i].name has given up on Eugenics.
+ $arcologies[$i].name @@.cyan;has given up@@ on Eugenics.
<<set $arcologies[$i].FSRestart = "unset">>
<</if>>
<</if>>
@@ -724,11 +726,11 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<set $arcologies[$i].FSRestart += 2>>
<<set $corpCash += _corpBonus*2>>
<<elseif $trainingUpgradeSexEd == "highly skilled">>
- It's a good market for your corporation's well trained toys, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's well trained toys, improving sales and helping social progress.
<<set $arcologies[$i].FSRestart += 1>>
<<set $corpCash += _corpBonus>>
<<elseif $entrapmentUpgradeIntelligence == "intelligent">>
- It's a good market for your corporation's smarter captures, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's smarter captures, improving sales and helping social progress.
<<set $arcologies[$i].FSRestart += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
@@ -763,29 +765,29 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
''$arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSGenderRadicalist < 0>>
- $arcologies[$i].name has given up on Gender Radicalism.
+ $arcologies[$i].name @@.cyan;has given up@@ on Gender Radicalism.
<<set $arcologies[$i].FSGenderRadicalist = "unset">>
<</if>>
<</if>>
<<if $corpIncorporated == 1>>
<<if $drugUpgradeHormones != "unselected">>
<<if $drugUpgradeHormones != "none">>
- It's a good market for your corporation's hormonally treated slaves, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's hormonally treated slaves, improving sales and helping social progress.
<<set $arcologies[$i].FSGenderRadicalist += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
<</if>>
<<if $surgicalUpgradeGenitalia == "futanari">>
- It's a good market for your corporation's beautiful futanari, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's beautiful futanari, improving sales and helping social progress.
<<set $arcologies[$i].FSGenderRadicalist += 1>>
<<set $corpCash += _corpBonus>>
<<elseif $surgicalUpgradeGenitalia == "gelded">>
- It's a good market for your corporation's clipped buttsluts, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's clipped buttsluts, improving sales and helping social progress.
<<set $arcologies[$i].FSGenderRadicalist += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
<<if ($captureUpgradeGender == "XY") || ($seeDicks == 100)>>
- It's a good market for your corporation's feminized slaves, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's feminized slaves, improving sales and helping social progress.
<<set $arcologies[$i].FSGenderRadicalist += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
@@ -817,13 +819,13 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
''$arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSGenderFundamentalist < 0>>
- $arcologies[$i].name has given up on Gender Fundamentalism.
+ $arcologies[$i].name @@.cyan;has given up@@ on Gender Fundamentalism.
<<set $arcologies[$i].FSGenderFundamentalist = "unset">>
<</if>>
<</if>>
<<if $corpIncorporated == 1>>
<<if ($captureUpgradeGender == "XX") || ($seeDicks == 0)>>
- It's a good market for your corporation's enslaved females, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's enslaved females, improving sales and helping social progress.
<<set $arcologies[$i].FSGenderFundamentalist += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
@@ -857,18 +859,18 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
''$arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSPaternalist < 0>>
- $arcologies[$i].name has given up on Paternalism.
+ $arcologies[$i].name @@.cyan;has given up@@ on Paternalism.
<<set $arcologies[$i].FSPaternalist = "unset">>
<</if>>
<</if>>
<<if $corpIncorporated == 1>>
<<if $generalUpgradeBreaking == "care">>
- It's a good market for your corporation's well-treated companions, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's well-treated companions, improving sales and helping social progress.
<<set $arcologies[$i].FSPaternalist += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
<<if $surgicalUpgradeCosmetics == "applied">>
- It's a good market for your corporation's meticulously beautified ladies, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's meticulously beautified ladies, improving sales and helping social progress.
<<set $arcologies[$i].FSPaternalist += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
@@ -900,22 +902,22 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
''$arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSDegradationist < 0>>
- $arcologies[$i].name has given up on Degradationism.
+ $arcologies[$i].name @@.cyan;has given up@@ on Degradationism.
<<set $arcologies[$i].FSDegradationist = "unset">>
<</if>>
<</if>>
<<if $corpIncorporated == 1>>
<<if $generalUpgradeBreaking == "brutality">>
- It's a good market for your corporation's thoroughly terrified slaves, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's thoroughly terrified slaves, improving sales and helping social progress.
<<set $arcologies[$i].FSDegradationist += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
<<if $entrapmentUpgradeIntelligence == "stupid">>
- It's a good market for your corporation's idiotic sluts, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's idiotic sluts, improving sales and helping social progress.
<<set $arcologies[$i].FSDegradationist += 1>>
<<set $corpCash += _corpBonus>>
<<elseif $surgicalUpgradeGenitalia == "fucknugget">>
- It's a good market for your corporation's ex-human sex toys, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's ex-human sex toys, improving sales and helping social progress.
<<set $arcologies[$i].FSTransformationFetishist += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
@@ -949,14 +951,14 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
''$arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSBodyPurist < 0>>
- $arcologies[$i].name has given up on Body Purism.
+ $arcologies[$i].name @@.cyan;has given up@@ on Body Purism.
<<set $arcologies[$i].FSBodyPurist = "unset">>
<</if>>
<</if>>
<<if $corpIncorporated == 1>>
<<if ($surgicalUpgradeImplants == "unselected") || ($surgicalUpgradeImplants == "none")>>
<<if $surgicalUpgradeGenitalia != "fucknugget">>
- It's a good market for your corporation's implant-free slaves, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's implant-free slaves, improving sales and helping social progress.
<<set $arcologies[$i].FSBodyPurist += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
@@ -990,13 +992,13 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
''$arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSTransformationFetishist < 0>>
- $arcologies[$i].name has given up on Transformation Fetishism.
+ $arcologies[$i].name @@.cyan;has given up@@ on Transformation Fetishism.
<<set $arcologies[$i].FSTransformationFetishist = "unset">>
<</if>>
<</if>>
<<if $corpIncorporated == 1>>
<<if $surgicalUpgradeImplants == "applied">>
- It's a good market for your corporation's implanted slaves, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's implanted slaves, improving sales and helping social progress.
<<set $arcologies[$i].FSTransformationFetishist += 1>>
<<set $corpCash += _corpBonus>>
<<elseif $surgicalUpgradeImplants == "absurd">>
@@ -1035,13 +1037,13 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<set $arcologies[$i].FSYouthPreferentialistResearch = 1>>
<</if>>
<<elseif $arcologies[$i].FSYouthPreferentialist < 0>>
- $arcologies[$i].name has given up on Youth Preferentialism.
+ $arcologies[$i].name @@.cyan;has given up@@ on Youth Preferentialism.
<<set $arcologies[$i].FSYouthPreferentialist = "unset">>
<</if>>
<</if>>
<<if $corpIncorporated == 1>>
<<if $captureUpgradeAge == "young">>
- It's a good market for your corporation's young slaves, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's young slaves, improving sales and helping social progress.
<<set $arcologies[$i].FSYouthPreferentialist += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
@@ -1073,13 +1075,13 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
''$arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSMaturityPreferentialist < 0>>
- $arcologies[$i].name has given up on Maturity Preferentialism.
+ $arcologies[$i].name @@.cyan;has given up@@ on Maturity Preferentialism.
<<set $arcologies[$i].FSMaturityPreferentialist = "unset">>
<</if>>
<</if>>
<<if $corpIncorporated == 1>>
<<if $captureUpgradeAge == "old">>
- It's a good market for your corporation's enslaved MILFs, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's enslaved MILFs, improving sales and helping social progress.
<<set $arcologies[$i].FSMaturityPreferentialist += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
@@ -1114,7 +1116,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<set $arcologies[$i].FSSlimnessEnthusiastResearch = 1>>
<</if>>
<<elseif $arcologies[$i].FSSlimnessEnthusiast < 0>>
- $arcologies[$i].name has given up on Slimness Enthusiasm.
+ $arcologies[$i].name @@.cyan;has given up@@ on Slimness Enthusiasm.
<<set $arcologies[$i].FSSlimnessEnthusiast = "unset">>
<</if>>
<</if>>
@@ -1124,7 +1126,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if $drugUpgradeInjectionTwo != "supermassive">>
<<if $drugUpgradeInjectionTwo != "pastoral">>
<<if $generalUpgradeWeight == "attractive">>
- It's a good market for your corporation's trim slaves, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's trim slaves, improving sales and helping social progress.
<<set $arcologies[$i].FSSlimnessEnthusiast += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
@@ -1161,7 +1163,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
''$arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSAssetExpansionist < 0>>
- $arcologies[$i].name has given up on Asset Expansionism.
+ $arcologies[$i].name @@.cyan;has given up@@ on Asset Expansionism.
<<set $arcologies[$i].FSAssetExpansionist = "unset">>
<</if>>
<</if>>
@@ -1171,11 +1173,11 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<set $arcologies[$i].FSAssetExpansionist += 2>>
<<set $corpCash += _corpBonus*2>>
<<elseif $drugUpgradeInjectionTwo == "pastoral">>
- It's a good market for your corporation's hugely endowed cows, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's hugely endowed cows, improving sales and helping social progress.
<<set $arcologies[$i].FSAssetExpansionist += 1>>
<<set $corpCash += _corpBonus>>
<<elseif $drugUpgradeInjectionOne == "huge">>
- It's a good market for your corporation's stacked slaves, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's stacked slaves, improving sales and helping social progress.
<<set $arcologies[$i].FSAssetExpansionist += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
@@ -1209,7 +1211,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
''$arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSPastoralist < 0>>
- $arcologies[$i].name has given up on Pastoralism.
+ $arcologies[$i].name @@.cyan;has given up@@ on Pastoralism.
<<set $arcologies[$i].FSPastoralist = "unset">>
<</if>>
<</if>>
@@ -1247,7 +1249,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
''$arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSPhysicalIdealist < 0>>
- $arcologies[$i].name has given up on Physical Idealism.
+ $arcologies[$i].name @@.cyan;has given up@@ on Physical Idealism.
<<set $arcologies[$i].FSPhysicalIdealist = "unset">>
<</if>>
<</if>>
@@ -1257,7 +1259,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<set $arcologies[$i].FSPhysicalIdealist += 2>>
<<set $corpCash += _corpBonus*2>>
<<elseif $generalUpgradeMuscle == "toned">>
- It's a good market for your corporation's toned ladies, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's toned ladies, improving sales and helping social progress.
<<set $arcologies[$i].FSPhysicalIdealist += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
@@ -1288,7 +1290,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
''$arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSChattelReligionist < 0>>
- $arcologies[$i].name has given up on Chattel Religionism.
+ $arcologies[$i].name @@.cyan;has given up@@ on Chattel Religionism.
<<set $arcologies[$i].FSChattelReligionist = "unset">>
<</if>>
<</if>>
@@ -1298,7 +1300,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<set $arcologies[$i].FSChattelReligionist += 2>>
<<set $corpCash += _corpBonus*2>>
<<elseif $trainingUpgradeSexEd == "competence">>
- It's a good market for your corporation's aspiring sexual acolytes, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's aspiring sexual acolytes, improving sales and helping social progress.
<<set $arcologies[$i].FSChattelReligionist += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
@@ -1344,13 +1346,13 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
''$arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSRomanRevivalist < 0>>
- $arcologies[$i].name has given up on Roman Revivalism.
+ $arcologies[$i].name @@.cyan;has given up@@ on Roman Revivalism.
<<set $arcologies[$i].FSRomanRevivalist = "unset">>
<</if>>
<</if>>
<<if $corpIncorporated == 1>>
<<if $trainingUpgradeEducation == "basic">>
- It's a good market for your corporation's properly educated slaves, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's properly educated slaves, improving sales and helping social progress.
<<set $arcologies[$i].FSRomanRevivalist += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
@@ -1394,13 +1396,13 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
''$arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSAztecRevivalist < 0>>
- $arcologies[$i].name has given up on Aztec Revivalism.
+ $arcologies[$i].name @@.cyan;has given up@@ on Aztec Revivalism.
<<set $arcologies[$i].FSAztecRevivalist = "unset">>
<</if>>
<</if>>
<<if $corpIncorporated == 1>>
<<if $trainingUpgradeAccent == "accents">>
- It's a good market for your corporation's lovely mix of slave accents, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's lovely mix of slave accents, improving sales and helping social progress.
<<set $arcologies[$i].FSAztecRevivalist += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
@@ -1444,13 +1446,13 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
''$arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSEgyptianRevivalist < 0>>
- $arcologies[$i].name has given up on Egyptian Revivalism.
+ $arcologies[$i].name @@.cyan;has given up@@ on Egyptian Revivalism.
<<set $arcologies[$i].FSEgyptianRevivalist = "unset">>
<</if>>
<</if>>
<<if $corpIncorporated == 1>>
<<if $trainingUpgradeAccent == "accents">>
- It's a good market for your corporation's lovely mix of slave accents, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's lovely mix of slave accents, improving sales and helping social progress.
<<set $arcologies[$i].FSEgyptianRevivalist += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
@@ -1494,13 +1496,13 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
''$arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSEdoRevivalist < 0>>
- $arcologies[$i].name has given up on Edo Revivalism.
+ $arcologies[$i].name @@.cyan;has given up@@ on Edo Revivalism.
<<set $arcologies[$i].FSEdoRevivalist = "unset">>
<</if>>
<</if>>
<<if $corpIncorporated == 1>>
<<if $trainingUpgradeAccent == "eliminate">>
- It's a good market for your corporation's linguistically perfect slaves, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's linguistically perfect slaves, improving sales and helping social progress.
<<set $arcologies[$i].FSEdoRevivalist += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
@@ -1544,7 +1546,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
''$arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSArabianRevivalist < 0>>
- $arcologies[$i].name has given up on Arabian Revivalism.
+ $arcologies[$i].name @@.cyan;has given up@@ on Arabian Revivalism.
<<set $arcologies[$i].FSArabianRevivalist = "unset">>
<</if>>
<</if>>
@@ -1554,7 +1556,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<set $arcologies[$i].FSArabianRevivalist += 2>>
<<set $corpCash += _corpBonus*2>>
<<elseif $entrapmentUpgradeDevotionOne == "obedience">>
- It's a good market for your corporation's properly broken girls, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's properly broken girls, improving sales and helping social progress.
<<set $arcologies[$i].FSArabianRevivalist += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
@@ -1598,13 +1600,13 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
''$arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSChineseRevivalist < 0>>
- $arcologies[$i].name has given up on Chinese Revivalism.
+ $arcologies[$i].name @@.cyan;has given up@@ on Chinese Revivalism.
<<set $arcologies[$i].FSChineseRevivalist = "unset">>
<</if>>
<</if>>
<<if $corpIncorporated == 1>>
<<if $entrapmentUpgradeIntelligence == "intelligent">>
- It's a good market for your corporation's intelligent head girl prospects, improving sales and helping social progress.
+ It's a @@.lightgreen;good market@@ for your corporation's intelligent head girl prospects, improving sales and helping social progress.
<<set $arcologies[$i].FSChineseRevivalist += 1>>
<<set $corpCash += _corpBonus>>
<</if>>
diff --git a/src/uncategorized/neighborsFSAdoption.tw b/src/uncategorized/neighborsFSAdoption.tw
index 3be2ca8eda7..eb119177d69 100644
--- a/src/uncategorized/neighborsFSAdoption.tw
+++ b/src/uncategorized/neighborsFSAdoption.tw
@@ -1,6 +1,8 @@
:: Neighbors FS Adoption [nobr]
-$arcologies[$i].name is prosperous enough that
+<br><br>
+''$arcologies[$i].name'', your <<if $arcologies[$i].direction == 0>>arcology<<else>>neighbor to the $arcologies[$i].direction<</if>>,
+is prosperous enough that
<<switch $arcologies[$i].government>>
<<case "elected officials">>
its elected officials consider
@@ -11,7 +13,7 @@ $arcologies[$i].name is prosperous enough that
<<case "an individual">>
its owner and its citizens consider
<<case "your agent">>
- your agent and its citizens consider
+ @@.deeppink;your agent@@ and its citizens consider
<<case "a corporation">>
its board of directors considers
<<default>>
@@ -979,7 +981,7 @@ societal development.
<<set $arcologies[$i].FSRomanRevivalist = 5>><<set $adopted = 1>>
<</if>>
<<case 17>>
- <<if ($arcologies[$i].FSAztecRevivalist == "unset") && ($arcologies[$i].FSAztecRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
+ <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSAztecRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
$desc fascinated by ancient Aztec history, leading the arcology to @@.yellow;adopt Aztec Revivalism.@@
<<set $arcologies[$i].FSAztecRevivalist = 5>><<set $adopted = 1>>
<</if>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index d7f43de33ab..fcc2ecc9463 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -5,19 +5,72 @@
<<SlaveTitle $activeSlave>>
<<if $specialSlave == 1>>
-<<for $i = 0; $i < $heroSlaves.length; $i++>>
-<<if $activeSlave.ID == $heroSlaves[$i].ID>>
-<<set $dump = $heroSlaves.pluck($i,$i)>>
-<<set $specialSlave = 0>>
-<<break>>
+ <<for $i = 0; $i < $heroSlaves.length; $i++>>
+ <<if $activeSlave.ID == $heroSlaves[$i].ID>>
+ <<set $dump = $heroSlaves.pluck($i,$i)>>
+ <<set $specialSlave = 0>>
+ <<break>>
+ <</if>>
+ <</for>>
<</if>>
-<</for>>
+
+<br>
+The legalities completed, ''__@@.pink;$activeSlave.slaveName@@__'' <<if ($activeSlave.amp != 1)>>stands before your desk,<<else>>lies helplessly on your desk,<</if>>
+<<if $activeSlave.devotion < -50>>
+ looking you in the eyes with defiance.
+<<elseif $activeSlave.devotion < -20>>
+ looking at you sullenly.
+<<elseif $activeSlave.trust <= 50>>
+ staring at the ground in fear.
+<<elseif $activeSlave.devotion <= 50>>
+ waiting meekly for orders.
+<<elseif $activeSlave.origin == "She submitted to enslavement to escape the hard life of an Old World whore.">>
+ wondering what one of your working girls can expect.
+<<elseif ($activeSlave.origin == "She submitted to enslavement to get access to modern prenatal care.") || ($activeSlave.origin == "She sold herself into slavery out of fear that life on the streets was endangering her pregnancy.")>>
+ hoping you'll give her modern medicine right away.
+<<elseif $activeSlave.origin == "She submitted to enslavement as her only way to obtain surgery to transform her into a woman.">>
+ hoping you'll schedule her reassignment surgery immediately.
+<<elseif $activeSlave.origin == "She submitted to enslavement out of a misguided desire to join a sexually libertine society.">>
+ hoping she's made the right decision, and fantasizing a little, to go by her half-hard dick.
+<<elseif $activeSlave.origin == "She submitted to enslavement for a better chance at survival than she had as a migrant.">>
+ wondering what life as a sex slave will be like.
+<<else>>
+ looking shyly at you and blushing.
<</if>>
<<if $gingering != 0>>
- <<set $activeSlave = $beforeGingering>>
+ <<set _seed = "sale">>
+ <<if $gingeringDetected == 1>>
+ <<if $gingeringDetection == "slaver">>
+ <<set _seed = "sale, as your slaving experience revealed">>
+ <<elseif $gingeringDetection == "mercenary">>
+ <<set _seed = "sale, as the seller admitted in the face of your intimidating reputation">>
+ <<elseif $gingeringDetection == "force">>
+ <<set _seed = "sale, as the seller admitted in the face of your deadly reputation">>
+ <<else>>
+ <<set _seed = "sale, as you suspected">>
+ <</if>>
+ <</if>>
+
+ <<if $gingering == "antidepressant">>
+ Her intake toxicology reveals that she was<<if $gingeringDetected == 1>> indeed<</if>> given antidepressants to make her seem less fearful for _seed. She is much less trusting than she appeared in the market.
+ <<elseif $gingering == "depressant">>
+ Her intake toxicology reveals that she was<<if $gingeringDetected == 1>> indeed<</if>> given a depressant to make her seem less hateful for _seed. She is much less obedient than she appeared in the market.
+ <<elseif $gingering == "stimulant">>
+ Her intake toxicology reveals that she was<<if $gingeringDetected == 1>> indeed<</if>> given a stimulant to make her seem healthier for _seed. She is much less vital than she appeared in the market.
+ <<elseif $gingering == "vasoconstrictor">>
+ Her intake toxicology reveals that she was<<if $gingeringDetected == 1>> indeed<</if>> given a vasoconstrictor to make her cock seem more feminine for _seed. It's larger and more apt to become hard than it appeared in the market.
+ <<elseif $gingering == "vasodilator">>
+ Her intake toxicology reveals that she was<<if $gingeringDetected == 1>> indeed<</if>> given a vasodilator to give her an excessive erection for _seed. Her dick is somewhat smaller than it appeared in the market, and she's not really hard all the time.
+ <<elseif $gingering == "aphrodisiac">>
+ Her intake toxicology reveals that she was<<if $gingeringDetected == 1>> indeed<</if>> given aphrodisiacs to make her horny and attracted to everyone for _seed. Her true sex drive and sexuality remain to be discovered.
+ <<else>>
+ A close inspection of her anus reveals that she was<<if $gingeringDetected == 1>> indeed<</if>> doctored with an irritant to make her present her butt when shown for _seed. She is not an actual anal sex enthusiast.
+ <</if>>
<</if>>
+<<RemoveGingering>> /* retrieve original $activeSlave without gingering effects */
+
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
<<set $activeSlave.oldTrust = $activeSlave.trust>>
@@ -57,30 +110,6 @@
<</if>>
<</if>>
-<br>
-The legalities completed, ''__@@.pink;$activeSlave.slaveName@@__'' <<if ($activeSlave.amp != 1)>>stands before your desk,<<else>>lies helplessly on your desk,<</if>>
-<<if $activeSlave.devotion < -50>>
- looking you in the eyes with defiance.
-<<elseif $activeSlave.devotion < -20>>
- looking at you sullenly.
-<<elseif $activeSlave.trust <= 50>>
- staring at the ground in fear.
-<<elseif $activeSlave.devotion <= 50>>
- waiting meekly for orders.
-<<elseif $activeSlave.origin == "She submitted to enslavement to escape the hard life of an Old World whore.">>
- wondering what one of your working girls can expect.
-<<elseif ($activeSlave.origin == "She submitted to enslavement to get access to modern prenatal care.") || ($activeSlave.origin == "She sold herself into slavery out of fear that life on the streets was endangering her pregnancy.")>>
- hoping you'll give her modern medicine right away.
-<<elseif $activeSlave.origin == "She submitted to enslavement as her only way to obtain surgery to transform her into a woman.">>
- hoping you'll schedule her reassignment surgery immediately.
-<<elseif $activeSlave.origin == "She submitted to enslavement out of a misguided desire to join a sexually libertine society.">>
- hoping she's made the right decision, and fantasizing a little, to go by her half-hard dick.
-<<elseif $activeSlave.origin == "She submitted to enslavement for a better chance at survival than she had as a migrant.">>
- wondering what life as a sex slave will be like.
-<<else>>
- looking shyly at you and blushing.
-<</if>>
-
<<if ($activeSlave.vagina > -1) && ($activeSlave.dick == 0)>>
<<if ($PC.dick == 0) && ($PC.boobs == 1)>>
She looks to you and sees a fellow woman, and is @@.mediumaquamarine;a little less afraid@@ that you will rape and abuse her.
@@ -446,39 +475,6 @@ The legalities completed, ''__@@.pink;$activeSlave.slaveName@@__'' <<if ($active
<<set $activeSlave.devotion += 4>>
<</if>>
-<<if $gingering != 0>>
- <<set _seed = "sale">>
- <<if $gingeringDetected == 1>>
- <<if $gingeringDetection == "slaver">>
- <<set _seed = "sale, as your slaving experience revealed">>
- <<elseif $gingeringDetection == "mercenary">>
- <<set _seed = "sale, as the seller admitted in the face of your intimidating reputation">>
- <<elseif $gingeringDetection == "force">>
- <<set _seed = "sale, as the seller admitted in the face of your deadly reputation">>
- <<else>>
- <<set _seed = "sale, as you suspected">>
- <</if>>
- <</if>>
-
- <<if $gingering == "antidepressant">>
- Her intake toxicology reveals that she was<<if $gingeringDetected == 1>> indeed<</if>> given antidepressants to make her seem less fearful for _seed. She is much less trusting than she appeared in the market.
- <<elseif $gingering == "depressant">>
- Her intake toxicology reveals that she was<<if $gingeringDetected == 1>> indeed<</if>> given a depressant to make her seem less hateful for _seed. She is much less obedient than she appeared in the market.
- <<elseif $gingering == "stimulant">>
- Her intake toxicology reveals that she was<<if $gingeringDetected == 1>> indeed<</if>> given a stimulant to make her seem healthier for _seed. She is much less vital than she appeared in the market.
- <<elseif $gingering == "vasoconstrictor">>
- Her intake toxicology reveals that she was<<if $gingeringDetected == 1>> indeed<</if>> given a vasoconstrictor to make her cock seem more feminine for _seed. It's larger and more apt to become hard than it appeared in the market.
- <<elseif $gingering == "vasodilator">>
- Her intake toxicology reveals that she was<<if $gingeringDetected == 1>> indeed<</if>> given a vasodilator to give her an excessive erection for _seed. Her dick is somewhat smaller than appeared in the market, and she's not really hard all the time.
- <<elseif $gingering == "aphrodisiac">>
- Her intake toxicology reveals that she was<<if $gingeringDetected == 1>> indeed<</if>> given aphrodisiacs to make her horny and attracted to everyone for _seed. Her true sex drive and sexuality remain to be discovered.
- <<else>>
- A close inspection of her anus reveals that she was<<if $gingeringDetected == 1>> indeed<</if>> doctored with an irritant to make her present her butt when shown for _seed. She is not an actual anal sex enthusiast.
- <</if>>
-<</if>>
-
-<<RemoveGingering>> /* retrieve original $activeSlave without gingering effects */
-
<<if $rulesAssistantAuto == 0>>
<br>
<span id="rules">
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 631b82050ae..4bb3f4203db 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -4557,9 +4557,9 @@
<</switch>>
<</if>>
<<if $rep > 10000>>
- The brand is considered a minor enhancement to her beauty since you are very well liked.
+ $possessiveCap brand is considered a minor enhancement to her beauty since you are very well liked.
<<elseif $rep < 5000>>
- The brand is considered a minor blemish on her beauty since you are not well liked.
+ $possessiveCap brand is considered a minor blemish on her beauty since you are not well liked.
<</if>>
<</if>>
<</if>>
@@ -5004,7 +5004,7 @@
<</if>>
<</for>>
<<elseif $anchors.length > 1>>
- $trinkets[1] and $trinkets[0],
+ $anchors[1] and $anchors[0],
<<else>>
<<print $anchors[0]>>,
<</if>>
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index a05ef7cf73f..2cbfa65e5a8 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -501,7 +501,7 @@ Her appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a da
<</if>>
<</for>>
<</if>>
-<</if>> /closes extended family mode */
+<</if>> /*closes extended family mode */
<<if $slaves[$i].relationship > 0>>
<<for $j = 0; $j < $slaves.length; $j++>>
<<if $slaves[$j].ID == $slaves[$i].relationshipTarget>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index f3210c54d14..9c7592cfb97 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -7911,7 +7911,7 @@ $pronounCap has
<<elseif $PhysicalRetirementAgePolicy != 1>>
<<print (365*($retirementAge-$activeSlave.actualAge))+(7*(52-$activeSlave.birthWeek))>>, the number of days of sexual slavery ahead of $possessive.
<<else>>
- <<print (365*($retirementAge-$activeSlave.physicalAge))+(7*(52-$activeSlave.birthWeek))>>, the number of days of sexual slavery ahead of $possessive.
+ <<print (365*($retirementAge-$activeSlave.physicalAge))+(7*(52-$activeSlave.birthWeek))>>, the number of days of sexual slavery ahead of $object.
<</if>>
<</switch>>
<<if ($activeSlave.relationship > 4)>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 217d0c3d371..21ef1666adb 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -2211,7 +2211,7 @@
<<set $activeSlave.balls -= random(0,2)>>
<</if>>
<<if $arcologies[_market].FSGenderRadicalistResearch == 1 && random(1,100) <= 20>>
- This one is has a notably rounded belly for a slave with no vagina.
+ This one has a notably rounded belly for a slave with no vagina.
<<set $activeSlave.ovaries = 0>>
<<set $activeSlave.vagina = -1>>
<<set $activeSlave.mpreg = 1>>
--
GitLab