diff --git a/src/endWeek/death.js b/src/endWeek/events/death.js
similarity index 100%
rename from src/endWeek/death.js
rename to src/endWeek/events/death.js
diff --git a/src/endWeek/expire.js b/src/endWeek/events/expire.js
similarity index 100%
rename from src/endWeek/expire.js
rename to src/endWeek/events/expire.js
diff --git a/src/endWeek/retire.js b/src/endWeek/events/retire.js
similarity index 100%
rename from src/endWeek/retire.js
rename to src/endWeek/events/retire.js
diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw
index c5a0ad8ead0475428b13f2eb0d6de8cf1e099bc3..ecaded26ed661a7f27423d10cb260208936dbde1 100644
--- a/src/uncategorized/pRivalryHostage.tw
+++ b/src/uncategorized/pRivalryHostage.tw
@@ -7,7 +7,9 @@
<<set _slave = GenerateNewSlave("XX", {race: "nonslave", disableDisability: 1})>>
<<set _slave.origin = "You were acquainted with $him before you were an arcology owner; your rival tried to use $him to manipulate you, but you rescued $him.">>
<<set _slave.boobs = 400>>
-<<set _slave.butt = 3>>
+<<if _slave.butt > 3>>
+ <<set _slave.butt = 3>>
+<</if>>
<<set _slave.muscles = 0>>
<<set _slave.behavioralFlaw = "none">>
<<set _slave.sexualFlaw = "none">>
@@ -36,25 +38,49 @@
<<set WombFlush(_slave)>>
-<<switch $PC.career>>
-<<case "wealth">>
+<<if $PC.career == "wealth" || $PC.career == "trust fund" || $PC.career == "rich kid">>
<<set _slave.career = "a party girl">>
- <<if $pedo_mode == 1>>
- <<set _slave.actualAge = random(16,18)>>
- <<else>>
+ <<if $PC.career == "wealth" || $PC.actualAge > 24>>
<<set _slave.actualAge = random(18,24)>>
+ <<elseif $PC.career == "trust fund" || $PC.actualAge > 16>>
+ <<if $PC.actualAge < $minimumSlaveAge>>
+ <<set _slave.actualAge = random($minimumSlaveAge,$PC.actualAge)>>
+ <<else>>
+ <<set _slave.actualAge = Math.max($minimumSlaveAge,random($PC.actualAge-1,$PC.actualAge+1))>>
+ <</if>>
+ <<else>>
+ <<if $PC.actualAge < $minimumSlaveAge>>
+ <<set _slave.actualAge = $minimumSlaveAge>>
+ <<else>>
+ <<set _slave.actualAge = Math.max($minimumSlaveAge,random($PC.actualAge-1,$PC.actualAge))>>
+ <</if>>
<</if>>
<<set _slave.face = 100>>
<<set _slave.intelligence = random(51,95)>>
<<set _slave.intelligenceImplant = 0>>
<<set _slave.skill.oral = 100>>
<<set _slave.skill.entertainment = 100>>
-<<case "escort">>
- <<set _slave.career = "a prostitute">>
- <<if $pedo_mode == 1>>
- <<set _slave.actualAge = random(16,18)>>
- <<else>>
+<<elseif $PC.career == "escort" || $PC.career == "prostitute" || $PC.career == "child prostitute">>
+ <<if $PC.career == "escort" || $PC.actualAge > 24>>
+ <<set _slave.career = "an escort">>
<<set _slave.actualAge = random(18,20)>>
+ <<run App.Medicine.Modification.addScar(_slave, "belly", "c-section")>>
+ <<set _slave.counter.birthsTotal = 1>>
+ <<elseif $PC.career == "prostitute" || $PC.actualAge > 16>>
+ <<set _slave.career = "a prostitute">>
+ <<if $PC.actualAge < $minimumSlaveAge>>
+ <<set _slave.actualAge = random($minimumSlaveAge,$PC.actualAge)>>
+ <<else>>
+ <<set _slave.actualAge = Math.max($minimumSlaveAge,random($PC.actualAge-1,$PC.actualAge+1))>>
+ <</if>>
+ <<else>>
+ <<set _slave.career = "child prostitute">>
+ <<if $PC.actualAge < $minimumSlaveAge>>
+ <<set _slave.actualAge = $minimumSlaveAge>>
+ <<else>>
+ <<set _slave.actualAge = Math.max($minimumSlaveAge,random($PC.actualAge-1,$PC.actualAge))>>
+ <</if>>
+ <<set _slave.custom.tattoo = "$He has $his ID number tattooed on $his left breast.">>
<</if>>
<<set _slave.face = 100>>
<<set _slave.intelligence = random(-15,15)>>
@@ -64,17 +90,32 @@
<<set _slave.skill.anal = 100>>
<<set _slave.skill.vaginal = 100>>
<<set _slave.skill.whoring = 100>>
- <<set _slave.counter.oral = 453>>
- <<set _slave.counter.vaginal = 158>>
- <<set _slave.counter.anal = 76>>
- <<set _slave.counter.mammary = 320>>
- <<run App.Medicine.Modification.addScar(_slave, "belly", "c-section")>>
-<<case "servant">>
+ <<set _slave.counter.oral = random(300,500)>>
+ <<set _slave.counter.vaginal = random(100,300)>>
+ <<set _slave.counter.vaginal = random(50,200)>>
+ <<set _slave.counter.mammary = random(200,400)>>
+<<elseif $PC.career == "servant" || $PC.career == "handmaiden" || $PC.career == "child servant">>
<<set _slave.career = "a maid">>
- <<if $pedo_mode == 1>>
- <<set _slave.actualAge = random(12,18)>>
- <<else>>
+ <<if $PC.career == "servant" || $PC.actualAge > 24>>
<<set _slave.actualAge = random(18,20)>>
+ <<set _slave.counter.birthsTotal = 3>>
+ <<elseif $PC.career == "handmaiden" || $PC.actualAge > 16>>
+ <<if $PC.actualAge < $minimumSlaveAge>>
+ <<set _slave.actualAge = random($minimumSlaveAge,$PC.actualAge)>>
+ <<else>>
+ <<set _slave.actualAge = Math.max($minimumSlaveAge,random($PC.actualAge-1,$PC.actualAge+1))>>
+ <</if>>
+ <<set _slave.counter.birthsTotal = 1>>
+ <<else>>
+ <<set _slave.career = "child servant">>
+ <<if $PC.actualAge < $minimumSlaveAge>>
+ <<set _slave.actualAge = $minimumSlaveAge>>
+ <<else>>
+ <<set _slave.actualAge = Math.max($minimumSlaveAge,random($PC.actualAge-1,$PC.actualAge))>>
+ <</if>>
+ <</if>>
+ <<if $pedo_mode == 1 && _slave.actualAge > 18>>
+ <<set _slave.actualAge = random(12,18)>>
<</if>>
<<set _slave.face = 25>>
<<set _slave.intelligence = random(-50,-16)>>
@@ -84,77 +125,168 @@
<<set _slave.skill.anal = 15>>
<<set _slave.skill.vaginal = 15>>
<<set _slave.skill.whoring = 0>>
- <<set _slave.counter.oral = 57>>
- <<set _slave.counter.vaginal = 65>>
- <<set _slave.counter.anal = 12>>
- <<set _slave.counter.mammary = 1>>
- <<set _slave.counter.birthsTotal = 3>>
-<<case "gang">>
- <<set _slave.career = "a gang member">>
- <<if $pedo_mode == 1>>
- <<set _slave.actualAge = random(16,18)>>
- <<else>>
+ <<set _slave.custom.tattoo = "$He has your Master's brand on $his left breast.">>
+<<elseif $PC.career == "gang" || $PC.career == "hoodlum" || $PC.career == "street urchin">>
+ <<if $PC.career == "gang" || $PC.actualAge > 24>>
<<set _slave.actualAge = random(20,24)>>
+ <<set _slave.custom.tattoo = "$He has your former gang's sign tattooed on $his neck.">>
+ <<set _slave.career = "a gang member">>
+ <<elseif $PC.career == "hoodlum" || $PC.actualAge > 16>>
+ <<if $PC.actualAge < $minimumSlaveAge>>
+ <<set _slave.actualAge = random($minimumSlaveAge,$PC.actualAge)>>
+ <<else>>
+ <<set _slave.actualAge = Math.max($minimumSlaveAge,random($PC.actualAge-1,$PC.actualAge+1))>>
+ <</if>>
+ <<set _slave.custom.tattoo = "$He has the gang's sign that you rolled with tattooed on $his neck.">>
+ <<set _slave.career = "a gang member">>
+ <<else>>
+ <<if $PC.actualAge < $minimumSlaveAge>>
+ <<set _slave.actualAge = $minimumSlaveAge>>
+ <<else>>
+ <<set _slave.actualAge = Math.max($minimumSlaveAge,random($PC.actualAge-1,$PC.actualAge))>>
+ <</if>>
+ <<set _slave.custom.tattoo = "$He has the gang's sign that you associated with tattooed on $his neck.">>
+ <<set _slave.career = "street urchin">>
+ <<set _slave.weight = -80>>
<</if>>
<<set _slave.muscles = 40>>
<<run setHealth(_slave, 100, 0, 0, 0, jsRandom(10, 30))>>
<<set _slave.skill.combat = 1>>
-<<case "BlackHat">>
+<<elseif $PC.career == "BlackHat" || $PC.career == "hacker" || $PC.career == "script kiddy">>
<<set _slave.career = "a shut-in">>
- <<if $pedo_mode == 1>>
- <<set _slave.actualAge = random(13,18)>>
- <<else>>
+ <<if $PC.career == "BlackHat" || $PC.actualAge > 24>>
<<set _slave.actualAge = random(18,21)>>
+ <<set _slave.intelligenceImplant = 30>>
+ <<elseif $PC.career == "hacker" || $PC.actualAge > 16>>
+ <<if $PC.actualAge < $minimumSlaveAge>>
+ <<set _slave.actualAge = random($minimumSlaveAge,$PC.actualAge)>>
+ <<else>>
+ <<set _slave.actualAge = Math.max($minimumSlaveAge,random($PC.actualAge-1,$PC.actualAge+1))>>
+ <</if>>
+ <<set _slave.intelligenceImplant = 15>>
+ <<else>>
+ <<if $PC.actualAge < $minimumSlaveAge>>
+ <<set _slave.actualAge = $minimumSlaveAge>>
+ <<else>>
+ <<set _slave.actualAge = Math.max($minimumSlaveAge,random($PC.actualAge-1,$PC.actualAge))>>
+ <</if>>
+ <<set _slave.intelligenceImplant = 15>>
+ <</if>>
+ <<if $pedo_mode == 1 && _slave.actualAge > 18>>
+ <<set _slave.actualAge = random(13,18)>>
<</if>>
<<set _slave.face = 75>>
<<set _slave.intelligence = 100>>
- <<set _slave.intelligenceImplant = 30>>
-<<case "capitalist">>
- <<set _slave.career = "a manager">>
- <<if $pedo_mode == 1>>
- <<set _slave.actualAge = random(16,18)>>
- <<else>>
+<<elseif $PC.career == "capitalist" || $PC.career == "entrepreneur" || $PC.career == "business kid">>
+ <<if $PC.career == "capitalist" || $PC.actualAge > 24>>
<<set _slave.actualAge = random(18,24)>>
+ <<set _slave.career = "a manager">>
+ <<set _slave.intelligenceImplant = 30>>
+ <<elseif $PC.career == "entrepreneur" || $PC.actualAge > 16>>
+ <<if $PC.actualAge < $minimumSlaveAge>>
+ <<set _slave.actualAge = random($minimumSlaveAge,$PC.actualAge)>>
+ <<else>>
+ <<set _slave.actualAge = Math.max($minimumSlaveAge,random($PC.actualAge-1,$PC.actualAge+1))>>
+ <</if>>
+ <<set _slave.career = "an intern">>
+ <<set _slave.intelligenceImplant = 15>>
+ <<else>>
+ <<if $PC.actualAge < $minimumSlaveAge>>
+ <<set _slave.actualAge = $minimumSlaveAge>>
+ <<else>>
+ <<set _slave.actualAge = Math.max($minimumSlaveAge,random($PC.actualAge-1,$PC.actualAge))>>
+ <</if>>
+ <<set _slave.career = "a student from a private school">>
+ <<set _slave.intelligenceImplant = 15>>
<</if>>
<<set _slave.face = 55>>
<<set _slave.intelligence = 100>>
- <<set _slave.intelligenceImplant = 30>>
-<<case "mercenary">>
- <<set _slave.career = "a soldier">>
- <<if $pedo_mode == 1>>
- <<set _slave.actualAge = random(16,18)>>
- <<else>>
+<<elseif $PC.career == "mercenary" || $PC.career == "recruit" || $PC.career == "child soldier">>
+ <<if $PC.career == "mercenary" || $PC.actualAge > 24>>
<<set _slave.actualAge = random(20,24)>>
+ <<set _slave.career = "a soldier">>
+ <<set _slave.intelligenceImplant = 15>>
+ <<elseif $PC.career == "recruit" || $PC.actualAge > 16>>
+ <<if $PC.actualAge < $minimumSlaveAge>>
+ <<set _slave.actualAge = random($minimumSlaveAge,$PC.actualAge)>>
+ <<else>>
+ <<set _slave.actualAge = Math.max($minimumSlaveAge,random($PC.actualAge-1,$PC.actualAge+1))>>
+ <</if>>
+ <<set _slave.career = "a soldier">>
+ <<set _slave.intelligenceImplant = 15>>
+ <<else>>
+ <<if $PC.actualAge < $minimumSlaveAge>>
+ <<set _slave.actualAge = $minimumSlaveAge>>
+ <<else>>
+ <<set _slave.actualAge = Math.max($minimumSlaveAge,random($PC.actualAge-1,$PC.actualAge))>>
+ <</if>>
+ <<set _slave.career = "a child soldier">>
+ <<set _slave.intelligenceImplant = 0>>
<</if>>
<<set _slave.face = 55>>
<<set _slave.intelligence = 100>>
- <<set _slave.intelligenceImplant = 15>>
-<<case "engineer">>
- <<set _slave.career = "a saleswoman">>
- <<if $pedo_mode == 1>>
- <<set _slave.actualAge = random(16,18)>>
- <<else>>
+<<elseif $PC.career == "engineer" || $PC.career == "construction" || $PC.career == "worksite helper">>
+ <<if $PC.career == "engineer" || $PC.actualAge > 24>>
<<set _slave.actualAge = random(18,24)>>
+ <<set _slave.career = "a saleswoman">>
+ <<set _slave.intelligenceImplant = 30>>
+ <<elseif $PC.career == "construction" || $PC.actualAge > 16>>
+ <<if $PC.actualAge < $minimumSlaveAge>>
+ <<set _slave.actualAge = random($minimumSlaveAge,$PC.actualAge)>>
+ <<else>>
+ <<set _slave.actualAge = Math.max($minimumSlaveAge,random($PC.actualAge-1,$PC.actualAge+1))>>
+ <</if>>
+ <<set _slave.career = "a saleswoman">>
+ <<set _slave.intelligenceImplant = 15>>
+ <<else>>
+ <<if $PC.actualAge < $minimumSlaveAge>>
+ <<set _slave.actualAge = $minimumSlaveAge>>
+ <<else>>
+ <<set _slave.actualAge = Math.max($minimumSlaveAge,random($PC.actualAge-1,$PC.actualAge))>>
+ <</if>>
+ <<set _slave.career = "a child prodigy">>
+ <<set _slave.intelligenceImplant = 0>>
<</if>>
<<set _slave.face = 100>>
<<set _slave.intelligence = 100>>
- <<set _slave.intelligenceImplant = 30>>
-<<case "medicine">>
+<<elseif $PC.career == "medicine" || $PC.career == "medical assistant" || $PC.career == "nurse">>
<<set _slave.career = "a nurse">>
- <<if $pedo_mode == 1>>
- <<set _slave.actualAge = random(16,18)>>
- <<else>>
+ <<if $PC.career == "medicine" || $PC.actualAge > 24>>
<<set _slave.actualAge = random(16,24)>>
+ <<set _slave.intelligenceImplant = 30>>
+ <<elseif $PC.career == "medical assistant" || $PC.actualAge > 16>>
+ <<if $PC.actualAge < $minimumSlaveAge>>
+ <<set _slave.actualAge = random($minimumSlaveAge,$PC.actualAge)>>
+ <<else>>
+ <<set _slave.actualAge = Math.max($minimumSlaveAge,random($PC.actualAge-1,$PC.actualAge+1))>>
+ <</if>>
+ <<set _slave.intelligenceImplant = 30>>
+ <<else>>
+ <<if $PC.actualAge < $minimumSlaveAge>>
+ <<set _slave.actualAge = $minimumSlaveAge>>
+ <<else>>
+ <<set _slave.actualAge = Math.max($minimumSlaveAge,random($PC.actualAge-1,$PC.actualAge))>>
+ <</if>>
+ <<set _slave.intelligenceImplant = 15>>
<</if>>
<<set _slave.face = 55>>
<<set _slave.intelligence = 100>>
- <<set _slave.intelligenceImplant = 30>>
-<<case "slaver">>
+<<elseif $PC.career == "slaver" || $PC.career == "slave overseer" || $PC.career == "slave tender">>
<<set _slave.career = "a prison guard">>
- <<if $pedo_mode == 1>>
- <<set _slave.actualAge = random(16,18)>>
- <<else>>
+ <<if $PC.career == "slaver" || $PC.actualAge > 24>>
<<set _slave.actualAge = random(20,24)>>
+ <<elseif $PC.career == "slave overseer" || $PC.actualAge > 16>>
+ <<if $PC.actualAge < $minimumSlaveAge>>
+ <<set _slave.actualAge = random($minimumSlaveAge,$PC.actualAge)>>
+ <<else>>
+ <<set _slave.actualAge = Math.max($minimumSlaveAge,random($PC.actualAge-1,$PC.actualAge+1))>>
+ <</if>>
+ <<else>>
+ <<if $PC.actualAge < $minimumSlaveAge>>
+ <<set _slave.actualAge = $minimumSlaveAge>>
+ <<else>>
+ <<set _slave.actualAge = Math.max($minimumSlaveAge,random($PC.actualAge-1,$PC.actualAge))>>
+ <</if>>
<</if>>
<<set _slave.face = 55>>
<<set _slave.intelligence = random(51,95)>>
@@ -163,19 +295,31 @@
<<set _slave.fetish = "sadist">>
<<set _slave.fetishStrength = 100>>
<<set _slave.fetishKnown = 1>>
-<<case "celebrity">>
- <<set _slave.career = "a party girl">>
- <<if $pedo_mode == 1>>
- <<set _slave.actualAge = random(16,18)>>
- <<else>>
+<<elseif $PC.career == "celebrity" || $PC.career == "rising star" || $PC.career == "child star">>
+ <<if $PC.career == "celebrity" || $PC.actualAge > 24>>
<<set _slave.actualAge = random(18,24)>>
+ <<set _slave.career = "a party girl">>
+ <<elseif $PC.career == "rising star" || $PC.actualAge > 16>>
+ <<if $PC.actualAge < $minimumSlaveAge>>
+ <<set _slave.actualAge = random($minimumSlaveAge,$PC.actualAge)>>
+ <<else>>
+ <<set _slave.actualAge = Math.max($minimumSlaveAge,random($PC.actualAge-1,$PC.actualAge+1))>>
+ <</if>>
+ <<set _slave.career = "a party girl">>
+ <<else>>
+ <<if $PC.actualAge < $minimumSlaveAge>>
+ <<set _slave.actualAge = $minimumSlaveAge>>
+ <<else>>
+ <<set _slave.actualAge = Math.max($minimumSlaveAge,random($PC.actualAge-1,$PC.actualAge))>>
+ <</if>>
+ <<set _slave.career = "a child actress">>
<</if>>
<<set _slave.face = 100>>
<<set _slave.intelligence = random(51,95)>>
<<set _slave.intelligenceImplant = 0>>
<<set _slave.skill.oral = 100>>
<<set _slave.skill.entertainment = 100>>
-<<case "arcology owner">>
+<<elseif $PC.career == "arcology owner">>
<<set _slave.career = "a leading arcology citizen">>
<<if $pedo_mode == 1>>
<<set _slave.actualAge = random(16,18)>>
@@ -185,13 +329,17 @@
<<set _slave.face = 100, _slave.faceImplant = 15>>
<<set _slave.intelligence = 100, _slave.intelligenceImplant = 30>>
<<set _slave.skill.whoring = 100, _slave.skill.entertainment = 100>>
-<</switch>>
+<</if>>
<<set _slave.trust = 0>>
<<set _slave.devotion = 0>>
+<<if $pedo_mode == 1 && _slave.actualAge > 18>>
+ <<set _slave.actualAge = random(16,18)>>
+<</if>>
<<set _slave.visualAge = _slave.actualAge>>
<<set _slave.physicalAge = _slave.actualAge>>
<<set _slave.ovaryAge = _slave.actualAge>>
+<<set _slave.pubertyXX = 1>>
<<run resyncSlaveHight(_slave)>>
<<switch $rivalryFS>>
@@ -238,42 +386,57 @@
</span>
<<if $rivalGender == 2>>
- <<set _heR = "he">>
+ <<set _heR = "he", _HeR = "He", _hisR = "his">>
<<else>>
- <<set _heR = "she">>
+ <<set _heR = "she", _HeR = "She", _hisR = "her">>
<</if>>
<<setNonlocalPronouns $seeDicks>>
<<run App.Utils.setLocalPronouns(_slave)>>
<<setPlayerPronouns>>
+<<set _closer = 0>>
Only a few days into your inter-arcology war, you receive a video message from your rival. Once $assistant.name is satisfied that the file is clean, you clear your office and pull it up. To your surprise, there are two faces on your desk, not one. One of them is your rival, and after a moment, you remember who the other is. You recognize $him from your
-<<switch $PC.career>>
-<<case "wealth">>
- time as a wealthy _womanP of leisure. $He was a pretty little party $girl who ran in those circles. You were never particularly close,
-<<case "escort">>
+<<if $PC.career == "wealth" || $PC.career == "trust fund" || $PC.career == "rich kid">>
+ <<if $PC.career == "wealth" || $PC.career == "trust fund" || $PC.actualAge > 16>>
+ time as a wealthy _womanP of leisure. $He was a pretty little party $girl who ran in those circles. You were never particularly close,
+ <<elseif $PC.career == "rich kid">>
+ time as a child with way too much money on hand. $He was a pretty little party $girl,
+ <<if _slave.actualAge >= $PC.actualAge+6>>
+ only a handful of years your senior, that showed you what it meant to really let loose.
+ <<else>>
+ around your age, that you spent a lot of time with.
+ <</if>>
+ You can't say that you've kept in touch,
+ <<set _closer = 1>>
+ <</if>>
+<<elseif $PC.career == "escort">>
time as a _womanP of sexual promiscuity. $He was a pretty little slut who ran in the same sex circles. You were never particularly close,
-<<case "servant">>
+<<elseif $PC.career == "servant">>
time as a _womanP of servitude. $He was a <<if $PC.title == 1>>maid<<else>>fellow maid<</if>> under your late Master. <<if $PC.title == 0>>You may have delivered several of $his children, but you<<else>>You<</if>> were never particularly close,
-<<case "gang">>
+<<elseif $PC.career == "gang">>
time as a gang leader. $He was one of your best, yet you never got close enough,
-<<case "BlackHat">>
+<<elseif $PC.career == "BlackHat">>
time as a hacker for hire. $He supported you on jobs, even sent some choice pictures of $himself, but you were never really close,
-<<case "capitalist">>
+<<elseif $PC.career == "capitalist">>
career in venture capital. $He was a rising manager, young, attractive, and bright. You never worked particularly closely with $him,
-<<case "mercenary">>
+<<elseif $PC.career == "mercenary">>
career as a mercenary. $He was in logistical support, and was clever and pretty, but without the essential hardness. You were never that close,
-<<case "engineer">>
+<<elseif $PC.career == "engineer">>
career as an arcology engineer. $He was a glorified sales<<= $woman>>, with the gorgeous looks and extreme intelligence necessary to sell entire arcologies. You were never close,
-<<case "medicine">>
+<<elseif $PC.career == "medicine">>
career in medicine. $He was a surgical nurse, one of the best. $He was smart, pretty, and $he had sure hands. You were never that close,
-<<case "slaver">>
+<<elseif $PC.career == "slaver">>
career as a slaver. $He was a guard in one of the slave receiving pens, and a notorious one, at that. Nobody was quite as eager to break in new slaves as $he was. You were never that close,
-<<case "celebrity">>
+<<elseif $PC.career == "celebrity">>
time as a minor celebrity. $He was a pretty little groupie who flitted from entourage to entourage. You were never particularly close,
-<<case "arcology owner">>
+<<elseif $PC.career == "arcology owner">>
time owning another arcology. $He was a prominent citizen who supported your government. You were never particularly close,
-<</switch>>
-but you do remember $him, and your rival knows it. This is obviously the best _heR could come up with to provoke an emotional reaction.
+<</if>>
+<<if _closer != 1>>
+ but you do remember $him, and your rival knows it. This is obviously the best _heR could come up with to provoke an emotional reaction.
+<<else>>
+ but you were close to $him, and your rival knows it. _HeR clearly did _hisR research when coming up with a way to provoke an emotional reaction.
+<</if>>
<br><br>
"Hello, <<= PlayerName()>>," your rival sneers. "Sorry to pull you away from
diff --git a/src/uncategorized/seIndependenceDay.tw b/src/uncategorized/seIndependenceDay.tw
index ec66b6d5eb63aa375371ed84c33b1179089c3752..18d0c489ba19ff614e4088adc45397e1d6c16da8 100644
--- a/src/uncategorized/seIndependenceDay.tw
+++ b/src/uncategorized/seIndependenceDay.tw
@@ -136,28 +136,66 @@ In the Free Cities, Independence Day falls on the day when the Free City achieve
<</if>>
<br><br>
Of course, you do not neglect the opportunity to improve your own position.
- <<if $PC.career == "wealth">>
+ <<if $PC.career == "wealth" || $PC.career == "trust fund" || ($PC.career == "rich kid" && $PC.actualAge >= 18)>>
You recall your own wealthy background, cleverly drawing parallels between yourself and your richest citizens.
- <<elseif $PC.career == "capitalist">>
- You briefly remind your listeners of your background as a successful capitalist.
- <<elseif $PC.career == "mercenary">>
+ <<elseif $PC.career == "rich kid">>
+ You flaunt your wealth a bit too much for someone your age, aggravating your would-be peers.
+ <<elseif $PC.career == "capitalist" || $PC.career == "entrepreneur">>
+ You briefly remind your listeners of your background as a successful <<= $PC.career>>.
+ <<elseif $PC.career == "business kid">>
+ <<if $PC.actualAge >= 18>>
+ You briefly remind your listeners of how you started as nothing more than a child with some investment money, and to look at what you turned that money into.
+ <<else>>
+ You share a brief outlook into your investment portfolio, but it is as young as you are, so it's mostly unimpressive.
+ <</if>>
+ <<elseif $PC.career == "mercenary" || $PC.career == "recruit" || ($PC.career == "child soldier" && $PC.actualAge >= 18)>>
You share an impressive anecdote from your background as a mercenary; the moral of the story is that you know how to keep your head.
- <<elseif $PC.career == "slaver">>
+ <<elseif $PC.career == "child soldier">>
+ You share an impressive anecdote from your limited time as a mercenary; the moral of the story being that you know how to keep your head. From the murmers, you can tell they suspect the enemy may have hesitated due to your age.
+ <<elseif $PC.career == "slaver" || $PC.career == "slave overseer">>
You share a cruelly amusing anecdote from your background as a slaver; the moral of the story is that you're not one to spare the lash when it's necessary.
+ <<elseif $PC.career == "slave tender">>
+ <<if $PC.actualAge >= 18>>
+ You share a cruelly amusing anecdote from your background working the slave pens; the moral of the story is that you recognize when a slave needs the lash.
+ <<else>>
+ You share some cruelly amusing anecdotes from your time in the slave pens demonstrating you know what it takes to break a willful slave. From the murmers, you can tell you should have made it more clear that you were on the slaver's side of the cage, not the slave's.
+ <</if>>
<<elseif $PC.career == "engineer">>
You reference your background as an arcology engineer, cleverly making it obvious that you know this huge building down to its very bones.
+ <<elseif $PC.career == "construction" || ($PC.career == "worksite helper" && $PC.actualAge >= 18)>>
+ You reference your background in custruction, making it abundantly clear that you know what it takes to construct a building like $arcologies[0].name and, more importantly, how to keep it in working condition.
+ <<elseif $PC.career == "worksite helper">>
+ You reference your background in custruction, and that you've witnessed what it takes to build something like $arcologies[0].name. Of course, plenty of people have watched a building being built, so what you're saying isn't at all impressive.
<<elseif $PC.career == "medicine">>
You share an impressive anecdote from your background as a surgeon; the moral of the story is that you can be trusted with a delicate operation.
- <<elseif $PC.career == "gang">>
+ <<elseif $PC.career == "medical assistant" || ($PC.career == "nurse" && $PC.actualAge >= 18)>>
+ You share an impressive anecdote from your background in medicine; the moral of the story is that you are far more capable than you appear.
+ <<elseif $PC.career == "nurse">>
+ You share some of the more impressive acts of care you've performed as a nurse; the moral of the story is that your heart is in the right place. From the murmers, it would seem the crowd favors strength over mercy.
+ <<elseif $PC.career == "gang" || $PC.career == "hoodlum" || ($PC.career == "street urchin" && $PC.actualAge >= 18)>>
You share a bloody anecdote about the fate of one of your former gang members. The moral of the story is that you have to know your limits.
- <<elseif $PC.career == "escort">>
- You share a rather sordid anecdote from your background as an escort; the moral of the story is that you can go very far when you know the right people, or things about said people.
- <<elseif $PC.career == "servant">>
- You share a rather some of the highlights of your late Master's life; the moral of the story is that you've seen how to lead from someone who was a leader... It didn't help your standing much.
- <<elseif $PC.career == "celebrity">>
+ <<elseif $PC.career == "street urchin">>
+ You share a depressing anecdote about how far some of the other street kids had to go to eek out even a meager living; the moral of the story is that you've been hardened by a tough life. Though you left out the parts about what you yourself had to go through, you can tell the crowd knows to some extent.
+ <<elseif $PC.career == "escort" || $PC.career == "prostitute" || ($PC.career == "child prostitute" && $PC.actualAge >= 18)>>
+ You share a rather sordid anecdote from your background as a<<if $PC.career == "escort">>n escort<<else>> prostitute<</if>>; the moral of the story is that you can go very far when you know the right people, or things about said people.
+ <<elseif $PC.career == "child prostitute">>
+ <<if $PC.actualAge <= $minimumSlaveAge>>
+ You start to share a rather sordid anecdote from your time selling your body in a brothel, but cut it short when it becomes apparent that the crowd is appalled at the thought of someone as young as you being forced to do such things.
+ <<else>>
+ You share a rather sordid anecdote from your time selling your body in a brothel; the moral of the story is knowing the right peoples' dirty little secrets can get you quite far in life. From the murmers, it would appear the crowd is a little uncomfortable with someone as young as you being sa well-travled as you are.
+ <</if>>
+ <<elseif $PC.career == "servant" || $PC.career == "handmaiden" || ($PC.career == "child servant" && $PC.actualAge >= 18)>>
+ You share some of the highlights of your late Master's life; the moral of the story is that you've seen how to lead from someone who was a leader... It didn't help your standing much.
+ <<elseif $PC.career == "child servant">>
+ You share some personal stories of your time with your late Master. While the crowd may find them adorable, they really do more harm than good to your standing as a leader.
+ <<elseif $PC.career == "celebrity" || $PC.career == "rising star" || ($PC.career == "child star" && $PC.actualAge >= 18)>>
You share a hilarious anecdote from your background as a celebrity, one which the old world tabloids never did learn about, until now.
- <<elseif $PC.career == "BlackHat">>
+ <<elseif $PC.career == "child star">>
+ You share some anecdotes from your background as a celebrity, but from the muttering, you can tell the crowd questions if your running the arcology is not just some publicity stunt.
+ <<elseif $PC.career == "BlackHat" || $PC.career == "hacker" || ($PC.career == "script kiddy" && $PC.actualAge >= 18)>>
You share a series of juicy details of some old world politicians, driving home just how much you know.
+ <<elseif $PC.career == "script kiddy">>
+ You share a series of juicy details of some rather prominent old world individuals, but from the muttering, you can tell the crowd is wondering if you're serious about running the arcology or if this is just another game to you.
<<else>>
You cast yourself as one of the leading citizens of the Free Cities, from the beginning.
<</if>>
@@ -366,7 +404,7 @@ In the Free Cities, Independence Day falls on the day when the Free City achieve
<</if>>
<</if>>
You conclude by briefly recounting the story of the founding of the Free City, the building of the arcology, and what is publicly known of your accession to ownership, before a ringing close that reminds your citizens that they have the freedom to decide where their stories in the Free Cities go from there. Your speech is @@.green;very well received.@@
- <<if $PC.career == "servant">>
+ <<if (["rich kid", "business kid", "child soldier", "slave tender", "worksite helper", "child star", "script kiddy", "nurse", "child prostitute", "child servant", "street urchin"].includes($PC.career) && $PC.actualAge < 18) || $PC.career == "handmaiden" || $PC.career == "servant">>
<<run repX(500, "event")>>
<<else>>
<<run repX(1000, "event")>>