From a1b4271cf18e0de7f81bf2bf0e5e4d3f48f7e109 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 1 Mar 2017 23:24:49 -0500
Subject: [PATCH] 0.9.9.0 update.
---
src/events/intro/initNationalities.tw | 6 +-
src/events/intro/introSummary.tw | 100 ++++++++++++++++++++
src/events/intro/terrainIntro.tw | 6 +-
src/gui/Encyclopedia/encyclopedia.tw | 2 +-
src/init/storyInit.tw | 24 +++--
src/npc/acquisition.tw | 84 ++++++++--------
src/npc/fFeelings.tw | 50 +++++-----
src/npc/startingGirls/commitStartingGirl.tw | 2 +-
src/npc/takeoverTarget.tw | 4 +-
src/pregmod/managePersonalAffairs.tw | 24 ++---
src/pregmod/sePlayerBirth.tw | 12 +--
src/uncategorized/REFI.tw | 2 +-
src/uncategorized/RESS.tw | 50 +++++-----
src/uncategorized/RESSTR.tw | 20 ++--
src/uncategorized/assistantEvents.tw | 2 +-
src/uncategorized/bodyModification.tw | 1 +
src/uncategorized/fsDevelopments.tw | 18 ++--
src/uncategorized/hgApplication.tw | 16 ++--
src/uncategorized/main.tw | 2 +-
src/uncategorized/manageArcology.tw | 2 +-
src/uncategorized/newGamePlus.tw | 18 ++++
src/uncategorized/pCitizensAndCivilians.tw | 22 ++---
src/uncategorized/pDefenseFears.tw | 2 +-
src/uncategorized/pMercenaries.tw | 4 +-
src/uncategorized/pRivalryActions.tw | 2 +-
src/uncategorized/ptWorkaround.tw | 68 ++++++-------
src/uncategorized/randomIndividualEvent.tw | 6 +-
src/uncategorized/reSlaveMarriage.tw | 4 +-
src/uncategorized/seExpiration.tw | 4 +-
29 files changed, 347 insertions(+), 210 deletions(-)
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index fb2a422b8a5..06912423c99 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -320,9 +320,10 @@
<<set $activeArcology to {name: "Arcology X-", direction: "north", government: "an individual", leaderID: 0, honeymoon: 0, prosperity: 50, ownership: 50, minority: 20, PCminority: 0, demandFactor: 0, FSSupremacist: "unset", FSSupremacistRace: 0, FSSubjugationist: "unset", FSSubjugationistRace: 0, FSRestart: "unset", FSRepopulationFocus: "unset", FSGenderRadicalist: "unset", FSGenderFundamentalist: "unset", FSPaternalist: "unset", FSDegradationist: "unset", FSBodyPurist: "unset", FSTransformationFetishist: "unset", FSYouthPreferentialist: "unset", FSMaturityPreferentialist: "unset", FSSlimnessEnthusiast: "unset", FSAssetExpansionist: "unset", FSPastoralist: "unset", FSPhysicalIdealist: "unset", FSChattelReligionist: "unset", FSRomanRevivalist: "unset", FSEgyptianRevivalist: "unset", FSEdoRevivalist: "unset", FSArabianRevivalist: "unset", FSChineseRevivalist: "unset", FSNull: "unset", FSGenderRadicalistResearch: 0, FSGenderFundamentalistResearch: 0, FSPaternalistResearch: 0, FSDegradationistResearch: 0, FSBodyPuristResearch: 0, FSTransformationFetishistResearch: 0, FSYouthPreferentialistResearch: 0, FSMaturityPreferentialistResearch: 0, FSSlimnessEnthusiastResearch: 0, FSAssetExpansionistResearch: 0, FSPastoralistResearch: 0, FSPhysicalIdealistResearch: 0, FSRepopulationFocusResearch: 0, FSRestartResearch: 0, embargo: 1, embargoTarget: -1, influenceTarget: -1, influenceBonus: 0, rival: 0}>>
<<if $i == 0>>
<<set $activeArcology.direction to 0>>
- <<set $arcologies[0].name to "Arcology X-4">>
+ <<set $activeArcology.name to "Arcology X-4">>
<<set $activeArcology.FSSupremacistDecoration to 20, $activeArcology.FSSubjugationistDecoration to 20, $activeArcology.FSGenderRadicalistDecoration to 20, $activeArcology.FSGenderFundamentalistDecoration to 20, $activeArcology.FSPaternalistDecoration to 20, $activeArcology.FSDegradationistDecoration to 20, $activeArcology.FSBodyPuristDecoration to 20, $activeArcology.FSTransformationFetishistDecoration to 20, $activeArcology.FSYouthPreferentialistDecoration to 20, $activeArcology.FSMaturityPreferentialistDecoration to 20, $activeArcology.FSSlimnessEnthusiastDecoration to 20, $activeArcology.FSAssetExpansionistDecoration to 20, $activeArcology.FSPastoralistDecoration to 20, $activeArcology.FSPhysicalIdealistDecoration to 20, $activeArcology.FSChattelReligionistDecoration to 20, $activeArcology.FSRomanRevivalistDecoration to 20, $activeArcology.FSEgyptianRevivalistDecoration to 20, $activeArcology.FSEdoRevivalistDecoration to 20, $activeArcology.FSArabianRevivalistDecoration to 20, $activeArcology.FSChineseRevivalistDecoration to 20, $activeArcology.FSRepopulationFocusDecoration to 20, $activeArcology.FSRestartDecoration to 20>>
<<if $targetArcology.type != "New">>
+ <<set $FSAnnounced = 1>>
<<set $activeArcology.name = $targetArcology.name, $activeArcology.prosperity = $targetArcology.prosperity, $ACitizens += $activeArcology.citizens*500>>
<<set _decoration = $targetArcology.FSProgress + 10>>
<<switch $targetArcology.type>>
@@ -373,6 +374,9 @@
<<default>>
<<set $activeArcology.FSNull = 20>>
<</switch>>
+ <<if $PC.rumor = "social engineering">>
+ <<set $FSGotRepCreditOne to 1>>
+ <</if>>
<</if>>
<<else>>
<<if $i > 4>>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index bf54cea7be2..5ac18660396 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -418,6 +418,7 @@ Custom Lisped: <<textbox "$PC.customTitleLisp" $PC.customTitleLisp "Intro Summar
//If using a custom title, select Master or Mistress to set the gender of your title.//
//Make sure to replace your "s"s with "th"s to have working lisps in your lisped title.//
+<<if $freshPC == 1>>
<br>
Career: ''$PC.career''.
@@ -571,6 +572,105 @@ Preferred method of consumption: ''<<if $PC.refreshmentType == 0>>Smoked<<elseif
<<textbox "$PC.father" $PC.father "Intro Summary">>
<</if>>
+<<else>>
+
+<br>
+Method of acquiring your arcology: ''$PC.rumor''.
+<br>
+Genitalia:
+<<if $PC.dick == 1>>
+ <<if $PC.vagina == 1>>
+ ''penis and vagina''.
+ <<else>>
+ ''penis''.
+ <</if>>
+<<else>>
+ ''vagina''.
+<</if>>
+<<if $PC.vagina == 1>>
+<br>
+<<if $PC.preg == -1>>
+ Contraceptives: ''on''. Can't get pregnant; slight increase to living expenses.
+ [[Do not take contraceptives|Intro Summary][$PC.preg = 0]]
+<<elseif $PC.preg == 0>>
+ Contraceptives: ''off''. Can get pregnant; some scene alterations.
+ [[Take contraceptives|Intro Summary][$PC.preg = -1]]
+<<elseif $PC.preg > 0>>
+ Contraceptives: ''<<print $PC.preg>>weeks pregnant''
+<</if>>
+<br>
+<<if $PC.pregMood == 1>>
+ Hormones affect mood: ''caring and motherly''. Sex scene alterations; slaves will trust you more, but may try to take advantage of your mercy.
+ [[Change to no change|Intro Summary][$PC.pregMood = 0]] | [[Change to aggressive|Intro Summary][$PC.pregMood = 2]]
+<<elseif $PC.pregMood == 0>>
+ Hormones affect mood: ''no change''. Vanilla setting.
+ [[Change to motherly|Intro Summary][$PC.pregMood = 1]] | [[Change to aggressive|Intro Summary][$PC.pregMood = 2]]
+<<else>>
+ Hormones affect mood: ''aggressive and domineering''. Sex scene alterations; slaves will fear you more, but will become more submissive to you.
+ [[Change to no change|Intro Summary][$PC.pregMood = 0]] | [[Change to motherly|Intro Summary][$PC.pregMood = 1]]
+<</if>>
+<<if $PC.births > 0>>
+<br>
+ Number of births: ''$PC.births''
+<</if>>
+<</if>>
+<br>
+<<if $PC.boobs > 0>>
+ Chest:
+ <<if $PC.boobsBonus = 1>>
+ ''big breasts''.
+ <<elseif $PC.boobsBonus = 2>>
+ ''huge breasts''.
+ <<elseif $PC.boobsBonus = 3>>
+ ''cow tits''.
+ <<else>>
+ ''breasts''.
+ <</if>>
+<<else>>
+ Chest: ''masculine''.
+<</if>>
+<br>
+Age:
+<<if $PC.age is 3>>
+ ''well into middle age''.
+<<elseif $PC.age is 2>>
+ ''entering middle age''.
+<<else>>
+ ''surprisingly young''.
+<</if>>
+<br>
+Change your name: <<textbox "$PCName" $PCName "Intro Summary">>
+<br>
+Nationality: ''$PC.nationality''.
+<br>
+Race: ''$PC.race''.
+<br>
+Skin: ''$PC.skin''.
+<br>
+Eye color: ''$PC.eyeColor''.
+<br>
+Hair color: ''$PC.hColor''.
+<br>
+Preferred refreshment: <<textbox "$PC.refreshment" $PC.refreshment "Intro Summary">> [[Cigars|Intro Summary][$PC.refreshment to "cigar",$PC.refreshmentType = 0]] | [[Whiskey|Intro Summary][$PC.refreshment to "whiskey",$PC.refreshmentType = 1]]
+<br>
+Preferred method of consumption: ''<<if $PC.refreshmentType == 0>>Smoked<<elseif $PC.refreshmentType == 1>>Drank<<elseif $PC.refreshmentType == 2>>Eaten<<elseif $PC.refreshmentType == 3>>Snorted<<else>>Injected<</if>>''.
+[[Smoked|Intro Summary][$PC.refreshmentType = 0]] | [[Drank|Intro Summary][$PC.refreshmentType = 1]] | [[Eaten|Intro Summary][$PC.refreshmentType = 2]] | [[Snorted|Intro Summary][$PC.refreshmentType = 3]] | [[Injected|Intro Summary][$PC.refreshmentType = 4]]
+<br>
+<<if $PC.refreshmentType == 0>>//"Smoke" must fit into the following sentence: "I smoked a $PC.refreshment" to fit events properly//<</if>>
+
+/*testtest PC mother and father */
+<<if $familyTesting == 1>>
+<br><br>
+''PC ID'' //Remember this so you can create slaves related to you next//
+<br><<print $PC.ID>>
+<br><br>
+''mother ID''
+<br>
+''father ID''
+<</if>>
+
+<</if>>
+
<br><br>
Image display
diff --git a/src/events/intro/terrainIntro.tw b/src/events/intro/terrainIntro.tw
index 1eff00f8ec8..aa06d548a12 100644
--- a/src/events/intro/terrainIntro.tw
+++ b/src/events/intro/terrainIntro.tw
@@ -22,7 +22,7 @@
<<goto "Intro Summary">>
<<else>>
-The Free Cities were and are founded wherever the rule of law is weak enough or permissive enough to allow a small area to secede, and where founders can afford to buy an area on which to build.
+The Free Cities are located wherever the rule of law is weak enough or permissive enough to allow a small area to secede, and where founders can afford to buy an area on which to build.
<br><br>
Many Free Cities are therefore located in marginal, rural terrain. Founding a Free City in such an area is easy, and can usually be accomplished with the indifference or even connivance of the old country from which it secedes. After all, the potential commercial benefits are great, and the loss of underused land is only significant in the moral sense.
<br><br>
@@ -31,9 +31,9 @@ Some Free Cities are located on water. Though some areas of shallow sea over the
Finally, a few Free Cities have been carved out from old world cities. Urban decay has left the hearts of many cities ripe for this. Many old world countries resist this kind of secession, but this rarest, smallest, and densest kind of Free City can offer its surrounding nation a great deal of economic advantage.
<br><br>
@@color:orange;Which kind of Free City hosts your arcology?@@
-<br><br>
+<br>
-[[Urban|Location Intro][$terrain to "urban"]]
+<br>[[Urban|Location Intro][$terrain to "urban"]]
<br> @@color:yellow;Low@@ minimum slave value and initial @@color:yellow;bear market@@ for slaves.
<br> @@color:green;High@@ ease of commerce with the old world.
<br> @@color:green;High@@ access to refugees and other desperate people.
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 2cd3250997c..56147e3a2c5 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -933,7 +933,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr
''Bane70'' optimized huge swaths of code with notable professionalism.
''Circle Tritagonist'' provided several new collars and outfits.
''Qotsafan'' submitted bugfixes.
-''FireDrops'' provided standardized body mod scoring, gave Recruiters their idle functions, and fixed bugs.
+''FireDrops'' provided standardized body mod scoring, gave Recruiters their idle functions, revised personal assistant future society associations, and fixed bugs.
''Princess April'' wrote and coded several random events and the Slimness Enthusiast Dairy upgrade.
''Hicks'' provided minor logic and balance improvements in coded, release-ready form.
''Dej'' coded better diet logic for the RA.
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index dbc2b9f8516..5a09fbe2272 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -306,7 +306,7 @@
<<set $cheater to 0>>
<<set $PCName to "Anonymous">>
-<<set $PC to {title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, race: "white", skin: "white", eyeColor: "blue", hColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0}>>
+<<set $PC to {title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, race: "white", skin: "white", eyeColor: "blue", hColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0}>>
<<set $cash = 10000>>
<<set $normalizedEvents to 0>>
<<set $autosave to 1>>
@@ -392,8 +392,16 @@
<<set $autoSurgery to {lactation: 0, cosmetic: 1, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, hips: 0, hipsImplant: 0, butt: 0, faceShape: "normal", lips: 10, holes: 0}>>
<<else>>
- <<set $cash to Math.clamp(1000*Math.trunc($cash/100000), 5000, 1000000)>>
- <<set $PC.career = "arcology owner">>
+ <<if $freshPC == 0>>
+ <<set $cash to Math.clamp(1000*Math.trunc($cash/100000), 5000, 1000000)>>
+ <<if $retainCareer == 0>>
+ <<set $PC.career = "arcology owner">>
+ <</if>>
+ <<else>>
+ <<set $cheater to 0>>
+ <<set $PCName to "Anonymous">>
+ <<set $PC to {title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, race: "white", skin: "white", eyeColor: "blue", hColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0}>>
+ <</if>>
<</if>>
<<set $ver = "0.9.9">>
@@ -693,12 +701,6 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $clinicInflateBelly = 0>>
<<set $playerBred = 0>>
<<set $propOutcome = 0>>
-<<set $birthElite to 0>>
-<<set $birthMaster to 0>>
-<<set $birthDegenerate to 0>>
-<<set $birthClient to 0>>
-<<set $birthOther to 0>>
-<<set $birthArcOwner to 0>>
<<set $EliteSires = []>>
<<set $EliteSires = ["moves", "quick", "crazy", "virgin", "futa", "preggo"]>>
<<set $startingPoint = -1>>
@@ -713,6 +715,8 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $mom = 0>>
<<set $animalParts = 0>>
<<set $showBestiality = 0>>
+<<set $retainCareer = 1>>
+<<set $freshPC = 0>>
<<set $fakeBellies to ["a small empathy belly", "a medium empathy belly", "a large empathy belly", "a huge empathy belly"]>> /* lets fake bellies be separated from other .bellyAccessory */
@@ -1200,7 +1204,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $cowSlaveNames to ["Big Mac", "Moscow", "MooMoo", "Madonna", "Cowlick", "Bertha", "Waffles", "Brown Cow", "Hamburger", "Heifer", "Honeybun", "Cookie", "Pinky", "Sweetie", "Sunny", "Blue", "Sunshine", "Sugar", "Cupcake", "Cocoa", "Baby", "Muffin", "Princess", "Bessie", "Clarabelle", "Betty Sue", "Emma", "Henrietta", "Ella", "Penelope", "Nettie", "Anna", "Bella", "Annabelle", "Dorothy", "Molly", "Gertie", "Annie", "Rose", "Darla", "Meg", "Dahlia", "Margie", "Lois", "Flower", "Maggie", "Jasmine", "Minnie", "Esmeralda", "Bella", "Daisy", "Shelly", "Candie", "Cinnamon ", "Penny ", "Jasmayne ", "Bella ", "Clover", "Precious ", "Diamond ", "Arabella ", "Sasha ", "Sweetpea", "Swiss Miss"]>>
-<<set $chattelReligionistSlaveNames to ["Faith", "Patience", "Purity", "Chastity", "Constance", "Grace", "Penance", "Trinity", "Mercy", "Charity", "Verity", "Amity", "Peace", "Prudence", "Temperance", "Grace", "Love", "Hope", "Destiny", "Abundance", "Allegiance", "Amnesty", "Ardour", "Beauty", "Belief", "Blessing", "Bliss", "Charisma", "Cheer", "Charm", "Chastity", "Clarity", "Clemency", "Comfort", "Compassion", "Concord", "Condolence", "Constancy", "Courage", "Credence", "Desire", "Discretion", "Empathy", "Endurance", "Esteem", "Eternity", "Evanescence", "Favour", "Felicity", "Fidelity", "Fortune", "Gaity", "Glory", "Gracious", "Gravitas", "Harmony", "Happiness", "Honesty", "Hope", "Humility", "Innocent", "Integrity", "Joy", "Justice", "Kindness", "Laughter", "Loyalty", "Luck", "Merit", "Modesty", "Perserverance", "Piety", "Pleasant", "Prosperity", "Prudence", "Purity", "Radiance", "Remembrance", "Respect", "Reverence", "Salvation", "Sanctity", "Serendipity", "Serenity", "Silence", "Sincerity", "Solace", "Solemnity", "Success", "Sympathy", "Temperance", "Thankfulness", "Tolerance", "Tranquility", "Truth", "Unity", "Virtue", "Wisdom", "Wonder", "Heaven"]>>
+<<set $chattelReligionistSlaveNames to ["Faith", "Patience", "Purity", "Chastity", "Constance", "Grace", "Penance", "Trinity", "Mercy", "Charity", "Verity", "Amity", "Peace", "Prudence", "Temperance", "Grace", "Love", "Hope", "Destiny", "Abundance", "Allegiance", "Amnesty", "Ardour", "Beauty", "Belief", "Blessing", "Bliss", "Charisma", "Cheer", "Charm", "Chastity", "Clarity", "Clemency", "Comfort", "Compassion", "Concord", "Condolence", "Constancy", "Courage", "Credence", "Desire", "Discretion", "Empathy", "Endurance", "Esteem", "Eternity", "Evanescence", "Favour", "Felicity", "Fidelity", "Fortune", "Gaiety", "Glory", "Gracious", "Gravitas", "Harmony", "Happiness", "Honesty", "Hope", "Humility", "Innocent", "Integrity", "Joy", "Justice", "Kindness", "Laughter", "Loyalty", "Luck", "Merit", "Modesty", "Perserverance", "Piety", "Pleasant", "Prosperity", "Prudence", "Purity", "Radiance", "Remembrance", "Respect", "Reverence", "Salvation", "Sanctity", "Serendipity", "Serenity", "Silence", "Sincerity", "Solace", "Solemnity", "Success", "Sympathy", "Temperance", "Thankfulness", "Tolerance", "Tranquility", "Truth", "Unity", "Virtue", "Wisdom", "Wonder", "Heaven"]>>
<<set $romanSlaveNames to ["Aconia", "Aelia", "Agrippina", "Antistia", "Antonia", "Arria", "Atia", "Aurela", "Baebiana", "Caecilia", "Caesonia", "Calpurnia", "Claudia", "Cornelia", "Crispina", "Domitia", "Domitilla", "Drusilla", "Diana", "Euphemia", "Eutropia", "Fabia", "Faustina", "Flavia", "Galeria", "Galla", "Gnaea", "Gratidia", "Helena", "Helvia", "Herennia", "Honoria", "Hostia", "Julia", "Junia", "Justina", "Leontia", "Lepida", "Licinia", "Livia", "Livilla", "Lollia", "Lucilla", "Maecia", "Magia", "Manlia", "Marcella", "Marcia", "Messalina", "Minervina", "Mellisa", "Metella", "Munatia", "Octavia", "Ocellina", "Orbiana", "Otacilia", "Paccia", "Papianilla", "Paulina", "Placiaida", "Plautia", "Plautilla", "Plotina", "Pompeia", "Popilla", "Poppaea", "Porcia", "Risca", "Pulcheria", "Sabina", "Salonina", "Sempronia", "Servilia", "Severa", "Statilia", "Sulpicia", "Terentia", "Theodora", "Titania", "Tranquillina", "Tullia", "Ulpia", "Urgulania", "Valeria", "Verina", "Vesta", "Vibia", "Violentilla", "Vipsania", "Vistilla", "Gaia", "Lucia", "Marca", "Publia", "Quinta", "Tita", "Tiberia", "Sexta", "Aula", "Decima", "Gnaea", "Spuria", "Mania", "Servia", "Appia", "Numeria", "Vibia", "Agricola", "Agrippa", "Ahala", "Ahenobarba", "Albina", "Alba", "Ambusta", "Annalis", "Aquila", "Aquilina", "Arvina", "Asina", "Atella", "Avita", "Balba", "Barba", "Barbata", "Bassa", "Bestia", "Bibacula", "Bibula", "Blaesa", "Broccha", "Bruta", "Bubulca", "Bulba", "Caeca", "Calida", "Calvina", "Calva", "Camilla", "Canina", "Cana", "Catilina", "Catula", "Celeris", "Celsa", "Cethega", "Cicurina", "Cincinnata", "Cinna", "Corda", "Cornicen", "Cornuta", "Corvina", "Corva", "Cossa", "Costa", "Cotta", "Crassipes", "Crassa", "Crispina", "Crispa", "Curva", "Dentata", "Dentra", "Dives", "Dolabella", "Drusa", "Figula", "Fimbria", "Flacca", "Flava", "Flora", "Fusa", "Gemella", "Graccha", "Gurges", "Habita", "Helva", "Imperiosa", "Iulla", "Lactuca", "Laenas", "Lanata", "Laevina", "Laterensis", "Lentula", "Lepida", "Licina", "Longa", "Luculla", "Lupa", "Macra", "Macula", "Malleola", "Mamerca", "Marcella", "Merenda", "Merga", "Merula", "Messalla", "Metella", "Murena", "Mus", "Musca", "Nasica", "Natta", "Nepos", "Nerva", "Nigra", "Novella", "Ocella", "Pacila", "Paeta", "Pansa", "Papa", "Patercula", "Paulla", "Pera", "Pictrix", "Planca", "Plauta", "Poplicola", "Postuma", "Potita", "Praeconina", "Praetextata", "Prisca", "Procula", "Publicola", "Pulchra", "Pulla", "Pulvilla", "Quadrata", "Ralla", "Regilla", "Regula", "Rufa", "Ruga", "Rulla", "Rutila", "Salinatrix", "Saturnina", "Scaeva", "Scaevola", "Scapula", "Scaura", "Scrofa", "Seneca", "Severa", "Silana", "Sila", "Structa", "Sulla", "Sura", "Taura", "Triaria", "Trigemina", "Tuberta", "Tubula", "Tuditana", "Tulla", "Turda", "Vara", "Vatia", "Verres", "Vetus", "Vitula", "Volusa"]>>
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index f2a4e8e58c2..2682e1618de 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -1,47 +1,55 @@
:: Acquisition [nobr]
-<<if $saveImported == 1>><<set $startingValue to 5000>><<else>><<set $startingValue to 25000>>
-<<if $PC.vagina == 1>>
-<<set $PC.births = 0>>
-<<if $PC.career == "servant">>
- <<if $PC.age == 1>>
- <<set $PC.births = 3>>
- <<set $birthMaster = 3>>
- <<elseif $PC.age == 2>>
- <<set $PC.births = 6>>
- <<set $birthMaster = 6>>
+<<if $saveImported == 1>><<set $startingValue to 5000>><<else>><<set $startingValue to 25000>><</if>>
+<<if $freshPC == 1>>
+ <<if $PC.vagina == 1>>
+ <<set $PC.births = 0>>
+ <<if $PC.career == "servant">>
+ <<if $PC.age == 1>>
+ <<set $PC.births = 3>>
+ <<set $PC.birthMaster = 3>>
+ <<elseif $PC.age == 2>>
+ <<set $PC.births = 6>>
+ <<set $PC.birthMaster = 6>>
+ <<else>>
+ <<set $PC.births = 9>>
+ <<set $PC.birthMaster = 9>>
+ <</if>>
+ <<for $i to 0; $i < $slaves.length; $i++>>
+ <<if $slaves[$i].origin == "She was another of your late master's servants. She spent nine months in your womb, courtesy of your master." ||$slaves[$i].origin == "Your late master took pleasure in using his servants in creative ways. He inseminated you with your own sperm, and nine months later, your daughter was born.">>
+ <<set $PC.births += 1>>
+ <<set $PC.birthMaster += 1>>
+ <</if>>
+ <</for>>
+ <<elseif $PC.career == "escort">>
+ <<for $i to 0; $i < $slaves.length; $i++>>
+ <<if $slaves[$i].origin == "She was the result of unprotected sex with a client. He paid you quite well to enjoy your body as you grew heavy with his child." || $slaves[$i].origin == "A client payed you a large sum of credits to prove you could literally fuck yourself. She is the result of that lucrative night.">>
+ <<set $PC.births += 1>>
+ <<set $PC.birthClient += 1>>
+ <</if>>
+ <</for>>
<<else>>
- <<set $PC.births = 9>>
- <<set $birthMaster = 9>>
+ <<for $i to 0; $i < $slaves.length; $i++>>
+ <<if $slaves[$i].mother == -1>>
+ <<set $PC.births += 1>>
+ <<set $PC.birthOther += 1>>
+ <</if>>
+ <</for>>
<</if>>
- <<for $i to 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].origin == "She was another of your late master's servants. She spent nine months in your womb, courtesy of your master." ||$slaves[$i].origin == "Your late master took pleasure in using his servants in creative ways. He inseminated you with your own sperm, and nine months later, your daughter was born.">>
- <<set $PC.births += 1>>
- <<set $birthMaster += 1>>
+ <<if $PC.preg > 0>>
+ <<if $PC.career == "servant">>
+ <<set $PC.pregSource = -3>>
+ <<elseif $PC.career == "escort">>
+ <<set $PC.pregSource = -2>>
<</if>>
- <</for>>
-<<elseif $PC.career == "escort">>
- <<for $i to 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].origin == "She was the result of unprotected sex with a client. He paid you quite well to enjoy your body as you grew heavy with his child." || $slaves[$i].origin == "A client payed you a large sum of credits to prove you could literally fuck yourself. She is the result of that lucrative night.">>
- <<set $PC.births += 1>>
- <<set $birthClient += 1>>
- <</if>>
- <</for>>
-<<else>>
- <<for $i to 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].mother == -1>>
- <<set $PC.births += 1>>
- <<set $birthOther += 1>>
- <</if>>
- <</for>>
-<</if>>
-<<if $PC.preg > 0>>
- <<if $PC.career == "servant">>
- <<set $PC.pregSource = -3>>
- <<elseif $PC.career == "escort">>
- <<set $PC.pregSource = -2>>
<</if>>
-<</if>>
+<<else>> /*testtest*/
+ <<set $PC.pregSource = 0>>
+ <<set $PC.mother = 0>>
+ <<set $PC.mother = 0>>
+ <<set $PC.sisters = 0>>
+ <<set $PC.daughters = 0>>
+ /*Reserved for player-family setting, unsetting, etc. */
<</if>>
<</if>> /*closes ng*/
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index 130f5613472..f40add38069 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -271,21 +271,21 @@
<</if>>
<</if>>
<<if ($activeSlave.attrKnown == 1)>>
- <<if ($activeSlave.attrXX > 1)>>
+ <<if ($activeSlave.attrXX > 80)>>
I love fucking the other
<<if _lisping == 1>>
girlth.
<<else>>
girls.
<</if>>
- <<elseif ($activeSlave.attrXX > 0)>>
+ <<elseif ($activeSlave.attrXX > 60)>>
<<if _lisping == 1>>
It's nithe, fucking the other girlth.
<<else>>
It's nice, fucking the other girls.
<</if>>
<</if>>
- <<if ($activeSlave.attrXY > 1)>>
+ <<if ($activeSlave.attrXY > 80)>>
I love, you know,
<<if _lisping == 1>>
thpending time with thlaveth with dickth,
@@ -293,7 +293,7 @@
spending time with slaves with dicks,
<</if>>
_PCTitle.
- <<elseif ($activeSlave.attrXY > 0)>>
+ <<elseif ($activeSlave.attrXY > 60)>>
<<if _lisping == 1>>
It'th nithe, you know, thpending time with thlaveth with dickth,
<<else>>
@@ -553,7 +553,7 @@ My favorite part of my body is
my boobs, of course.
<</if>>
<</if>>
- <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 1)>>
+ <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 80)>>
<<if ($activeSlave.lips > 70)>>
my huge lipth, I like how the other girlth will do anything for oral from me.
<<elseif ($activeSlave.dick > 1) && ($activeSlave.balls > 0)>>
@@ -577,7 +577,7 @@ My favorite part of my body is
my lips, I guess. They're the best way I have of getting girls to like me.
<</if>>
<</if>>
- <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXY > 1)>>
+ <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXY > 80)>>
<<if ($activeSlave.lips > 70)>>
my huge lipth, I like how anyone with a dick wants oral from me.
<<elseif ($activeSlave.dick > 1) && ($activeSlave.balls > 0)>>
@@ -667,7 +667,7 @@ My favorite part of my body is
<<else>>
pamper my own nipples, _PCTitle.
<</if>>
- <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 1)>>
+ <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 80)>>
_Amp _PCTitle. With all
<<if _lisping == 1>>
thethe hot girlth around, it'th
@@ -675,7 +675,7 @@ My favorite part of my body is
these hot girls around, it's
<</if>>
a good thing I can't actually go blind from it.
- <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXY > 1)>>
+ <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXY > 80)>>
_Amp _PCTitle. With all
<<if _lisping == 1>>
thethe hot cockth around, it'th
@@ -719,7 +719,7 @@ My favorite part of my body is
<<else>>
the other slaves play with my boobs,
<</if>>
- <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 1)>>
+ <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 80)>>
<<if _lisping == 1>>
me bone the ladieth,
<<else>>
@@ -806,7 +806,7 @@ My favorite part of my body is
<</if>>
<<if ($activeSlave.preg < 4)>>pregnancy<<else>>birth<</if>> out of my head.
<</switch>>
- <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 1)>>
+ <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 80)>>
<<if _lisping == 1>>
I'm tho horny, _PCTitle. I can't thtop thinking about the other thlaveth' beautiful puthieth and boobth and, and I want to fuck them tho bad.
<<else>>
@@ -906,11 +906,11 @@ My favorite part of my body is
<</if>>
forthrightly. "I love them.
<</if>>
- <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 1)>>
+ <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 80)>>
<<if $PC.boobs == 1>>
You're, uh." She looks down, hesitating. "You're really hot, _PCTitle.
<</if>>
- <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXY > 1)>>
+ <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXY > 80)>>
<<if $PC.dick == 1>>
Your, uh." She looks down, hesitating. "Your cock is really hot, _PCTitle.
<</if>>
@@ -998,7 +998,7 @@ My favorite part of my body is
boobs I feel like a nice little slave girl.
<</if>>
<</switch>>
- <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 1)>>
+ <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 80)>>
<<if _lisping == 1>>
I thometimeth mith my ballth. I thtill fantathize about boning the other girlth.
<<else>>
@@ -1106,7 +1106,7 @@ My favorite part of my body is
I wish the hormones didn't stop me from getting hard. I still fantasize about getting the other girls pregnant.
<</if>>
<</switch>>
- <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 1)>>
+ <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 80)>>
<<if _lisping == 1>>
I with the hormoneth didn't thtop me from getting hard. I thtill fantathize about boning the other girlth.
<<else>>
@@ -1234,7 +1234,7 @@ My favorite part of my body is
<<else>>
just imagine smacking it against some little slut's face.
<</if>>
- <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 1)>>
+ <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 80)>>
I can feel my dick growing, _PCTitle. I can
<<if _lisping == 1>>
jutht imagine puthing it into a warm, wet puthy.
@@ -1583,13 +1583,13 @@ My favorite part of my body is
It's nice being a whore, sometimes customers just play with my boobs for hours.
<</if>>
<</switch>>
- <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXY > 1)>>
+ <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXY > 60)>>
<<if _lisping == 1>>
It'th nice being a whore, I get fucked by a lot of hot guyth.
<<else>>
It's nice being a whore, I get fucked by a lot of hot guys.
<</if>>
- <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 1)>>
+ <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 60)>>
<<if _lisping == 1>>
It'th nice being a whore, I get women customerth thometimeth.
<<else>>
@@ -1657,13 +1657,13 @@ My favorite part of my body is
It's nice being a public slut, sometimes people just play with my boobs for hours.
<</if>>
<</switch>>
- <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXY > 1)>>
+ <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXY > 60)>>
<<if _lisping == 1>>
It'th nice being a slut, I get fucked by a lot of hot guyth.
<<else>>
It's nice being a slut, I get fucked by a lot of hot guys.
<</if>>
- <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 1)>>
+ <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 60)>>
<<if _lisping == 1>>
It'th nice being a slut, I get women customerth thometimeth.
<<else>>
@@ -1692,7 +1692,7 @@ My favorite part of my body is
<<else>>
It's so, so wonderful being a cow.
<</if>>
- <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 1)>>
+ <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 80)>>
<<if _lisping == 1>>
It'th okay being a cow, with all the girlth around.
<<else>>
@@ -1714,7 +1714,7 @@ My favorite part of my body is
<<else>>
Getting buttfucked to orgasm whenever I can get hard is a dream come true. Actually, getting buttfucked until I cum even when I'm soft is pretty nice too.
<</if>>
- <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXY > 1)>>
+ <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXY > 80)>>
<<if _lisping == 1>>
It'th okay getting cockmilked, I like all the dickth around.
<<else>>
@@ -2156,7 +2156,7 @@ My favorite part of my body is
<<else>>
I suppose it was inevitable that a place where anyone can be a slave would start treating anyone who's a slave as a girl.
<</if>>
- <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXY > 1)>>
+ <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXY > 80)>>
<<if _lisping == 1>>
I really like how you're encouraging thlavery to focuth on cockth." She giggles. "I like cockth!
<<else>>
@@ -2183,7 +2183,7 @@ My favorite part of my body is
<<else>>
I shouldn't be surprised at how easy it is to reinforce traditional values in a new, slavery focused culture.
<</if>>
- <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 1)>>
+ <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 80)>>
I really like how you're encouraging
<<if _lisping == 1>>
thlavery to focuth on girlth." She giggles. "I like girlth!
@@ -2495,14 +2495,14 @@ _PCTitle," she concludes,
<<else>>
"Please fuck me. Please."
<</if>>
- <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 1)>>
+ <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 80)>>
"Can I hang around and get oral from the next
<<if _lisping == 1>>
thlave in here?"
<<else>>
slave in here?"
<</if>>
- <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXY > 1)>>
+ <<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXY > 80)>>
"Can I hang around and suck the next dick in here?"
<<else>>
<<if _lisping == 1>>
diff --git a/src/npc/startingGirls/commitStartingGirl.tw b/src/npc/startingGirls/commitStartingGirl.tw
index 5df687d7667..70f3d5b18fd 100644
--- a/src/npc/startingGirls/commitStartingGirl.tw
+++ b/src/npc/startingGirls/commitStartingGirl.tw
@@ -36,7 +36,7 @@ $activeSlave.slaveName has been added to your starting stable of slaves. You now
<<goto "Starting Girls">>
<</click>>
<br>
- [[Add another slave, based on the previous slave|Starting Girls][$activeSlave.relation to 0, $activeSlave.relationTarget to 0, $activeSlave.mother = 0, $activeSlave.father = 0]]
+ [[Add another slave, based on the previous slave|Starting Girls][$activeSlave = $slaveWithoutBonuses, $activeSlave.relation to 0, $activeSlave.relationTarget to 0, $activeSlave.mother = 0, $activeSlave.father = 0]]
<<if $createRelatedSlave == 1>>
<br>
//Add another slave, related to the previous slave://
diff --git a/src/npc/takeoverTarget.tw b/src/npc/takeoverTarget.tw
index 7acbfde009c..d074d831110 100644
--- a/src/npc/takeoverTarget.tw
+++ b/src/npc/takeoverTarget.tw
@@ -18,8 +18,8 @@ Alternatively, arcologies are being built every day, and their owners' control i
<<if $seeDicks != 0>><<set _arcologyTypes.push("GenderRadicalist")>><</if>>
<<if $seeDicks != 100>><<set _arcologyTypes.push("GenderFundamentalist")>><</if>>
<<if $seeExtreme != 0>><<set _arcologyTypes.push("Degradationist")>><</if>>
-<<set _terrainTypes = ["urban", "rural", "marine", "oceanic", "ravine"]>>
-<<set _continents = ["North America", "South America", "Europe", "the Middle East", "Africa", "Asia", "Australia", "Japan"]>>
+<<set _terrainTypes = ["urban", "urban", "rural", "rural", "rural", "marine", "marine", "oceanic", "ravine"]>>
+<<set _continents = ["North America", "North America", "South America", "Europe", "Europe", "the Middle East", "Africa", "Asia", "Asia", "Australia", "Japan"]>>
<<set _races = ["white", "asian", "latina", "middle eastern", "indo-aryan", "pacific islander", "amerindian", "southern european", "semitic"]>>
<<set _targetArcologies = []>>
<<set _targets = 4>>
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index 747a58d584e..9deb675768d 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -126,23 +126,23 @@ __Contraceptives and Fertility__
In total, you have given birth to:
-<<if $birthElite > 0>>
-<br><<print $birthElite>> bab<<if $birthElite > 1>>ies<<else>>y<</if>> for the Societal Elite.
+<<if $PC.birthElite > 0>>
+<br><<print $PC.birthElite>> bab<<if $PC.birthElite > 1>>ies<<else>>y<</if>> for the Societal Elite.
<</if>>
-<<if $birthMaster > 0>>
-<br><<print $birthMaster>> bab<<if $birthMaster > 1>>ies<<else>>y<</if>> for your former master.
+<<if $PC.birthMaster > 0>>
+<br><<print $PC.birthMaster>> bab<<if $PC.birthMaster > 1>>ies<<else>>y<</if>> for your former master.
<</if>>
-<<if $birthClient > 0>>
-<br><<print $birthOther>> bab<<if $birthOther > 1>>ies<<else>>y<</if>> from clients you've slept with.
+<<if $PC.birthClient > 0>>
+<br><<print $PC.birthOther>> bab<<if $PC.birthOther > 1>>ies<<else>>y<</if>> from clients you've slept with.
<</if>>
-<<if $birthDegenerate > 0>>
-<br><<print $birthDegenerate>> bastard<<if $birthDegenerate > 1>>s<</if>> from getting fucked by slaves.
+<<if $PC.birthDegenerate > 0>>
+<br><<print $PC.birthDegenerate>> bastard<<if $PC.birthDegenerate > 1>>s<</if>> from getting fucked by slaves.
<</if>>
-<<if $birthArcOwner > 0>>
-<br><<print $birthArcOwner>> bab<<if $birthArcOwner > 1>>ies<<else>>y<</if>> from your time with that male arcology owner.
+<<if $PC.birthArcOwner > 0>>
+<br><<print $PC.birthArcOwner>> bab<<if $PC.birthArcOwner > 1>>ies<<else>>y<</if>> from your time with that male arcology owner.
<</if>>
-<<if $birthOther > 0>>
-<br><<print $birthOther>> bab<<if $birthOther > 1>>ies<<else>>y<</if>> from sources you can't quite recall.
+<<if $PC.birthOther > 0>>
+<br><<print $PC.birthOther>> bab<<if $PC.birthOther > 1>>ies<<else>>y<</if>> from sources you can't quite recall.
<</if>>
<</if>>
<br>
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index 886ab02219b..aec6711515b 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -26,17 +26,17 @@ PC.pregSource documentation
<<set $PC.labor = 0>>
<<set $PC.births += 1>>
<<if $PC.pregSource == 0>>
- <<set $birthOther += 1>>
+ <<set $PC.birthOther += 1>>
<<elseif $PC.pregSource == -1>>
- <<set $birthElite += 1>>
+ <<set $PC.birthElite += 1>>
<<elseif $PC.pregSource == -2>>
- <<set $birthClient += 1>>
+ <<set $PC.birthClient += 1>>
<<elseif $PC.pregSource == -3>>
- <<set $birthMaster += 1>>
+ <<set $PC.birthMaster += 1>>
<<elseif $PC.pregSource == -4>>
- <<set $birthArcOwner += 1>>
+ <<set $PC.birthArcOwner += 1>>
<<else>>
- <<set $birthDegenerate += 1>>
+ <<set $PC.birthDegenerate += 1>>
<</if>>
<<set $babyGender to either(1,2)>>
diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw
index e334ef849a6..6ade063d4d8 100644
--- a/src/uncategorized/REFI.tw
+++ b/src/uncategorized/REFI.tw
@@ -306,7 +306,7 @@ $activeSlave.slaveName hesitates before explaining herself, and the $desc is obv
<<click "Turn her into another anal slut">>
<<replace "#name">>$activeSlave.slaveName<</replace>>
<<replace "#result">>
- <<if ($activeSlave.amp == 1) && (canTalk($activeSlave) == false)>>She's mute and has no hands, so it takes a long, frustrating time for her to communicate that she would like you to do to her what you did to $subSlave.slaveName.<<elseif canTalk($activeSlave) == false>>She's mute, so she uses gestures to ask you to do to her what you did to $subSlave.slaveName.<<elseif ($activeSlave.lips > 70)>>She asks through her massive dick-sucking lips, "<<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>, can yeh do meh like yeh did $subSlave.slaveName?"<<elseif ($activeSlave.lipsPiercing+$activeSlave.tonguePiercing > 2)>>She asks through her big oral piercings, "<<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>, can yeh do meh like yeh did $subSlave.slaveName?"<<else>>She asks, "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, may you please do me like that?"<</if>> You make her state it more explicitly, so she tries again: <<if ($activeSlave.amp == 1)>> she wriggles around until her ass is pointed straight at you, lets out a deep breath, and relaxes her sphincter visibly.<<elseif canTalk($activeSlave) == false>>she tries to depict anal sex with hand gestures, then gives up and turns around and points to her ass.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>"Please fuck mah butt, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>!"<<else>>"Please fuck my butt, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>!"<</if>> She squeaks with surprise as you throw her on the couch, but her eagerness is obvious. She does everything right, relaxing as you <<if ($PC.dick == 0)>>push a strap-on into<<else>>enter<</if>> her ass and enjoying herself all the way through. She climaxes hard to <<if ($PC.dick == 0)>>the phallus<<else>>the cock<</if>> in her asshole. @@color:hotpink;She has become more devoted to you,@@ and @@color:lightcoral;her sexuality now focuses on her anus.@@
+ <<if ($activeSlave.amp == 1) && (canTalk($activeSlave) == false)>>She's mute and has no hands, so it takes a long, frustrating time for her to communicate that she would like you to do to her what you did to $subSlave.slaveName.<<elseif canTalk($activeSlave) == false>>She's mute, so she uses gestures to ask you to do to her what you did to $subSlave.slaveName.<<elseif ($activeSlave.lips > 70)>>She asks through her massive dick-sucking lips, "<<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>, can yeh do meh like yeh did $subSlave.slaveName?"<<elseif ($activeSlave.lipsPiercing+$activeSlave.tonguePiercing > 2)>>She asks through her big oral piercings, "<<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>, can yeh do meh like yeh did $subSlave.slaveName?"<<else>>She asks, "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, would you please do me like that?"<</if>> You make her state it more explicitly, so she tries again: <<if ($activeSlave.amp == 1)>> she wriggles around until her ass is pointed straight at you, lets out a deep breath, and relaxes her sphincter visibly.<<elseif canTalk($activeSlave) == false>>she tries to depict anal sex with hand gestures, then gives up and turns around and points to her ass.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>"Please fuck mah butt, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>!"<<else>>"Please fuck my butt, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>!"<</if>> She squeaks with surprise as you throw her on the couch, but her eagerness is obvious. She does everything right, relaxing as you <<if ($PC.dick == 0)>>push a strap-on into<<else>>enter<</if>> her ass and enjoying herself all the way through. She climaxes hard to <<if ($PC.dick == 0)>>the phallus<<else>>the cock<</if>> in her asshole. @@color:hotpink;She has become more devoted to you,@@ and @@color:lightcoral;her sexuality now focuses on her anus.@@
<<set $activeSlave.devotion += 4>>
<<set $activeSlave.analCount += 1>><<set $analTotal += 1>>
<<set $activeSlave.fetish to "buttslut">>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index cab198e91ba..f0a33495d79 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -350,7 +350,7 @@ Going about your day, <<if ($activeSlave.amp != 1)>>you see <span id="name"><<pr
<<case "night visit">>
-As you are retiring for the night, <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span> <<if ($activeSlave.heels == 1) && ($activeSlave.shoes != "heels") && ($activeSlave.shoes != "boots") && ($activeSlave.shoes != "extreme heels")>>crawls<<elseif ($activeSlave.shoes is "heels") || ($activeSlave.shoes is "boots") || ($activeSlave.shoes is "extreme heels")>>totters<<else>>walks<</if>> into your bedroom and stands before you submissively. Since she's allowed to ask questions, she says <<if canTalk($activeSlave) == false || ($activeSlave.accent >= 3)>>nothing, but begs you with gestures to have sex with her.<<elseif ($activeSlave.lips > 70)>>meekly through her massive dick-sucking lips, "<<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>, muh you peese uck me?"<<elseif ($activeSlave.lipsPiercing+$activeSlave.tonguePiercing > 2)>>meekly through her inconvenient oral piercings, "<<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>, muh you peese uck me?"<<else>>meekly, "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, may you please fuck me?"<</if>>
+As you are retiring for the night, <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span> <<if ($activeSlave.heels == 1) && ($activeSlave.shoes != "heels") && ($activeSlave.shoes != "boots") && ($activeSlave.shoes != "extreme heels")>>crawls<<elseif ($activeSlave.shoes is "heels") || ($activeSlave.shoes is "boots") || ($activeSlave.shoes is "extreme heels")>>totters<<else>>walks<</if>> into your bedroom and stands before you submissively. Since she's allowed to ask questions, she says <<if canTalk($activeSlave) == false || ($activeSlave.accent >= 3)>>nothing, but begs you with gestures to have sex with her.<<elseif ($activeSlave.lips > 70)>>meekly through her massive dick-sucking lips, "<<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>, muh you peese uck me?"<<elseif ($activeSlave.lipsPiercing+$activeSlave.tonguePiercing > 2)>>meekly through her inconvenient oral piercings, "<<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>, muh you peese uck me?"<<else>>meekly, "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, would you please fuck me?"<</if>>
<<case "trusting HG">>
@@ -1167,9 +1167,9 @@ She trusts you, so she approaches you as sensually as she can manage and asks fo
<<if canTalk($activeSlave) == false>>
She uses quick but submissive gestures to beg you to help her cum, pleading the special difficulties caused by her outlandish member, which she can manage most comfortably if she has both hands free for it.
<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>
- "<<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>, may you pleathe, pleathe help me cum?" she begs submissively. "It'th nithe if I can uthe both handth on it to, um, manage thingth."
+ "<<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>, would you pleathe, pleathe help me cum?" she begs submissively. "It'th nithe if I can uthe both handth on it to, um, manage thingth."
<<else>>
- "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, may you please, please help me cum?" she begs submissively. "It's nice if I can use both hands on it to, um, manage things."
+ "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, would you please, please help me cum?" she begs submissively. "It's nice if I can use both hands on it to, um, manage things."
<</if>>
She's referring to the volume issue with her unnaturally massive dick. The thing is so huge and so soft that <<if $activeSlave.balls < 3>>one of her (by comparison) pathetically weak ejaculations<<elseif $activeSlave.balls < 6>>one of her comparatively normal ejaculations<<else>>a single one of even her copious ejaculations<</if>> often fails to make it all the way to the tip of her cock, making it only partway down her urethra without help.
@@ -1187,9 +1187,9 @@ Heading back towards your office after seeing to a minor matter, you encounter <
<<if canTalk($activeSlave) == false>>
She gestures a submissive greeting and then hesitates, catching her lower lip cutely behind her upper teeth. Then she politely asks if you would milk her.
<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>
- "Hi <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>," she lisps in greeting, and then hesitates, catching her lower lip cutely behind her upper teeth. "Um, may you pleathe milk me?"
+ "Hi <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>," she lisps in greeting, and then hesitates, catching her lower lip cutely behind her upper teeth. "Um, would you pleathe milk me?"
<<else>>
- "Hi <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>," she says in greeting, and then hesitates, catching her lower lip cutely behind her upper teeth. "Um, may you please milk me?"
+ "Hi <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>," she says in greeting, and then hesitates, catching her lower lip cutely behind her upper teeth. "Um, would you please milk me?"
<</if>>
<<if $activeSlave.fetish is "boobs">>The shamelessly breast obsessed cow rarely misses an opportunity to ask for mammary intercourse, or anything remotely like it. Something as intimate as having you tug the milk from her nipples would definitely qualify.<<else>>She's not exactly a breast fetishist, but milking is nonetheless a deeply important activity for her, emotionally; the neurochemical effects of continual lactation are strong. She's so devoted to you that she probably considers this a reassuringly intimate act.<</if>>
@@ -4009,9 +4009,9 @@ You tell her kindly that you understand, and that she'll be trained to address t
<</if>>
briefly. Comprehension dawns across her<<if $activeSlave.faceShape != "normal">> $activeSlave.faceShape<</if>> face.
<<if SlaveStatsChecker.checkForLisp($activeSlave)>>
- "Yeth <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>," she lisps slowly, more to buy time to formulate a response than anything else. "Um. I thtill really, really want to cum, though. M-may you please fuck me? Pleathe, pleathe, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>, pleathe
+ "Yeth <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>," she lisps slowly, more to buy time to formulate a response than anything else. "Um. I thtill really, really want to cum, though. W-would you please fuck me? Pleathe, pleathe, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>, pleathe
<<else>>
- "Yes <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>," she says quietly, more to buy time to formulate a response than anything else. "Um. I still really, really want to cum, though. M-may you please fuck me? Please, please, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, please
+ "Yes <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>," she says quietly, more to buy time to formulate a response than anything else. "Um. I still really, really want to cum, though. W-would you please fuck me? Please, please, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, please
<</if>>
fuck
<<if ($activeSlave.vagina > 0) && ($activeSlave.preg > 10) && ($activeSlave.vaginalAccessory != "chastity belt")>>my pregnant pussy<<elseif ($activeSlave.vagina > 0) && ($activeSlave.vaginalAccessory != "chastity belt")>>me<<else>>my butt<</if>>."
@@ -4732,9 +4732,9 @@ You tell her kindly that you understand, and that she'll be trained to address t
You thank her, and tell her you're considering what to give her in return. She looks flirty, and says,
<<if ($activeSlave.fetish is "submissive") && (canDoAnal($activeSlave) || canDoVaginal($activeSlave))>>
<<if SlaveStatsChecker.checkForLisp($activeSlave)>>
- "Pleathe, may you hold me down and fuck me, <<if $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>?"
+ "Pleathe, would you hold me down and fuck me, <<if $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>?"
<<else>>
- "Please, may you hold me down and fuck me, <<if $PC.title == 1>>Master<<else>>Mistress<</if>>?"
+ "Please, would you hold me down and fuck me, <<if $PC.title == 1>>Master<<else>>Mistress<</if>>?"
<</if>>
She drapes herself submissively over the couch, lest you misunderstand. You could hold her down and fuck her, and you do.
<<if canDoAnal($activeSlave)>>
@@ -4755,9 +4755,9 @@ You tell her kindly that you understand, and that she'll be trained to address t
<<set $oralTotal += 1>>
<<elseif ($activeSlave.fetish is "humiliation") && (canDoAnal($activeSlave) || canDoVaginal($activeSlave))>>
<<if SlaveStatsChecker.checkForLisp($activeSlave)>>
- "Pleathe, may you fuck me in public, <<if $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>?"
+ "Pleathe, would you fuck me in public, <<if $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>?"
<<else>>
- "Please, may you fuck me in public, <<if $PC.title == 1>>Master<<else>>Mistress<</if>>?"
+ "Please, would you fuck me in public, <<if $PC.title == 1>>Master<<else>>Mistress<</if>>?"
<</if>>
She edges towards the door, lest you misunderstand. You could fuck her in public, and you do.
<<if canDoAnal($activeSlave)>>
@@ -4769,27 +4769,27 @@ You tell her kindly that you understand, and that she'll be trained to address t
<</if>>
<<elseif ($activeSlave.fetish is "buttslut") && canDoAnal($activeSlave)>>
<<if SlaveStatsChecker.checkForLisp($activeSlave)>>
- "Pleathe, may you fuck my butt, <<if $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>?"
+ "Pleathe, would you fuck my butt, <<if $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>?"
<<else>>
- "Please, may you fuck my butt, <<if $PC.title == 1>>Master<<else>>Mistress<</if>>?"
+ "Please, would you fuck my butt, <<if $PC.title == 1>>Master<<else>>Mistress<</if>>?"
<</if>>
She turns halfway and shakes her rear enticingly, lest you misunderstand. You could fuck her butt, and you do.
<<set $activeSlave.analCount += 1>>
<<set $analTotal += 1>>
<<elseif ($activeSlave.fetish is "boobs")>>
<<if SlaveStatsChecker.checkForLisp($activeSlave)>>
- "Pleathe, may you play with my boobth, <<if $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>?"
+ "Pleathe, would you play with my boobth, <<if $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>?"
<<else>>
- "Please, may you play with my boobs, <<if $PC.title == 1>>Master<<else>>Mistress<</if>>?"
+ "Please, would you play with my boobs, <<if $PC.title == 1>>Master<<else>>Mistress<</if>>?"
<</if>>
She sticks out her chest and bounces her breasts for you, lest you misunderstand. You could play with her boobs, and you do, managing mammary intercourse several ways.
<<set $activeSlave.mammaryCount += 3>>
<<set $mammaryTotal += 3>>
<<elseif ($activeSlave.fetish is "pregnancy") && canDoVaginal($activeSlave)>>
<<if SlaveStatsChecker.checkForLisp($activeSlave)>>
- "Pleathe, may you <<if $PC.dick == 1>>fill me with your theed<<else>>fuck me<</if>>, <<if $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>?"
+ "Pleathe, would you <<if $PC.dick == 1>>fill me with your theed<<else>>fuck me<</if>>, <<if $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>?"
<<else>>
- "Please, may you <<if $PC.dick == 1>>fill me with your seed<<else>>fuck me<</if>>, <<if $PC.title == 1>>Master<<else>>Mistress<</if>>?"
+ "Please, would you <<if $PC.dick == 1>>fill me with your seed<<else>>fuck me<</if>>, <<if $PC.title == 1>>Master<<else>>Mistress<</if>>?"
<</if>>
She reclines on the couch and offers herself to you, lest you misunderstand. You could <<if $PC.dick == 1>>fill her with your seed<<else>>fuck her<</if>>, and you do.
<<if ($activeSlave.vagina > 0) && canDoVaginal($activeSlave)>>
@@ -4801,9 +4801,9 @@ You tell her kindly that you understand, and that she'll be trained to address t
<</if>>
<<elseif ($activeSlave.fetish is "dom") && (canDoVaginal($activeSlave) || canDoAnal($activeSlave))>>
<<if SlaveStatsChecker.checkForLisp($activeSlave)>>
- "Pleathe, may you fuck my brainth out, <<if $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>?"
+ "Pleathe, would you fuck my brainth out, <<if $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>?"
<<else>>
- "Please, may you fuck my brains out, <<if $PC.title == 1>>Master<<else>>Mistress<</if>>?"
+ "Please, would you fuck my brains out, <<if $PC.title == 1>>Master<<else>>Mistress<</if>>?"
<</if>>
She bounces on her heels, biting her lip with anticipation. You could fuck her brains out, and you do, enjoying the dominant slave's constant sexual one-upsmanship.
<<if ($activeSlave.vagina > 0) && canDoVaginal($activeSlave)>>
@@ -4815,18 +4815,18 @@ You tell her kindly that you understand, and that she'll be trained to address t
<</if>>
<<elseif ($activeSlave.fetish is "sadist")>>
<<if SlaveStatsChecker.checkForLisp($activeSlave)>>
- "Pleathe, may you let me rape thomeone, <<if $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>?"
+ "Pleathe, would you let me rape thomeone, <<if $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>?"
<<else>>
- "Please, may you let me rape someone, <<if $PC.title == 1>>Master<<else>>Mistress<</if>>?"
+ "Please, would you let me rape someone, <<if $PC.title == 1>>Master<<else>>Mistress<</if>>?"
<</if>>
Her eyes are wild. You could let her rape someone, and you do, bringing in an appropriate slave and letting her have her way with the poor girl.
<<set $activeSlave.penetrativeCount += 1>>
<<set $penetrativeTotal += 1>>
<<elseif ($activeSlave.fetish is "masochist") && (canDoVaginal($activeSlave) || canDoAnal($activeSlave))>>
<<if SlaveStatsChecker.checkForLisp($activeSlave)>>
- "Pleathe, may you rape me, <<if $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>?"
+ "Pleathe, would you rape me, <<if $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>?"
<<else>>
- "Please, may you rape me, <<if $PC.title == 1>>Master<<else>>Mistress<</if>>?"
+ "Please, would you rape me, <<if $PC.title == 1>>Master<<else>>Mistress<</if>>?"
<</if>>
Her eyes are hungry. You could rape her, and you do, throwing her across the couch and fucking her so hard she begs for mercy as she orgasms.
<<if canDoAnal($activeSlave)>>
@@ -7132,9 +7132,9 @@ She's obviously @@color:mediumaquamarine;becoming more comfortable@@ playing the
<<if canTalk($activeSlave) == false>>
She uses her one hand to rapidly spell out a polite request. She asks you to attach the rest of her limbs, too.
<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>
- "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>, may you pleathe attach the retht of them for me?" she lisps politely.
+ "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>, would you pleathe attach the retht of them for me?" she lisps politely.
<<else>>
- "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, may you please attach the rest of them for me?" she asks politely.
+ "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, would you please attach the rest of them for me?" she asks politely.
<</if>>
A transitory nervousness crosses her $activeSlave.faceShape face as she asks, but clears into @@color:mediumaquamarine;trusting happiness@@ when you nod and pick up her other arm. She tests each limb as it's attached, and then tests them all by getting up into a kneel and giving you a hug.
<<set $activeSlave.trust += 4>>
diff --git a/src/uncategorized/RESSTR.tw b/src/uncategorized/RESSTR.tw
index 07510377ae9..19dec1bfe4a 100644
--- a/src/uncategorized/RESSTR.tw
+++ b/src/uncategorized/RESSTR.tw
@@ -83,6 +83,12 @@ There's a pause, and then the other slave continues in a more serious tone, aski
"I know it mean<<s>> I'm worth something. It'<<s>> rea<<ss>>uring, and I remind my<<s>>elf of it whenever I get <<s>>cared about being a <<s>>lave, you know.
<</if>>
I didn't mean to <<s>>ound con<<c>>eited, either. I gue<<ss>> I'm <<s>>till getting u<<s>>ed to life here, that'<<s>> all. <<S>>ometime<<s>> I think like I'm not, um, here, and I'm <<s>>urpri<<s>>ed so many people want me. It's kind of ni<<c>>e, actually," she <<say>>s with some self-confidence.
+<<if $activeSlave.fetish == "humiliation">>
+<<if $activeSlave.fetishKnown == 0>>
+ It sounds like she has a @@color:lightsalmon;humiliation fetish!@@
+ <<set $activeSlave.fetishKnown == 1>>
+<</if>>
+<</if>>
<<case "im scared">>
@@ -118,7 +124,7 @@ She shrieks, backpedaling, and then falls backward, her <<if $activeSlave.butt >
<<click "Give her the surgery">>
<<replace "#name">>$activeSlave.slaveName<</replace>>
<<replace "#result">>
- You schedule her for the surgery. Like all invasive procedures, it @@color:red;affects her health,@@ but @@color:lime;she's effectively an anal virgin again.@@ She @@color:mediumaquamarine;trusts you a bit more@@ for granting her request, and is eager for buttsex that's more interesting than throwing a hotdog down a hallway.
+ You schedule her for the surgery. Like all invasive procedures, it @@color:red;affects her health,@@ but @@color:lime;she's effectively an anal virgin again.@@ She @@color:mediumaquamarine;trusts you a bit more@@ for granting her request, and is eager for buttsex that's more interesting than having a hotdog thrown down her hallway.
<<set $activeSlave.trust += 3, $activeSlave.health -= 10, $activeSlave.anus = 0, $cash -= $surgeryCost>>
<<if $activeSlave.analSkill > 10>><<set $activeSlave.analSkill -= 10>><</if>>
<br><br>
@@ -148,7 +154,7 @@ She shrieks, backpedaling, and then falls backward, her <<if $activeSlave.butt >
<<replace "#name">>$activeSlave.slaveName<</replace>>
<<replace "#result">>
You page $HeadGirl.slaveName for some assistance filling up a loose hole, and she comes quickly, <<if canAchieveErection($HeadGirl)>>precum already visible at the tip of her erection<<else>>bringing a strap-on<</if>>. When she arrives, it's to the sight of $activeSlave.slaveName sitting on your lap with your <<if $PC.dick == 1>>cock<<else>>strap-on<</if>> up her ridiculous anal gape, waiting for a second phallus while your hands tease her $activeSlave.nipples nipples. Seeing that backup has arrived, you lean back and shift your grip to the back of the receptacle's lower thighs, pulling her up and shifting her hips to offer your Head Girl another berth in $activeSlave.slaveName's ass. This pulls her loose sphincter up, producing a little gape above the top of your invading shaft, and $HeadGirl.slaveName loses no time in fucking it. She gives $activeSlave.slaveName a kiss, but soon breaks the lip lock, since she's more interested in making eyes at you over your mutual anal conquest's shuddering shoulder. As
- <<if $PC.dick == 1>><<if canAchieveErection($HeadGirl)>>your dicks slide against each other<<else>>your dick slides against her strap-on<</if>><<else>><<if canAchieveErection($HeadGirl)>>your strap-on slides against her dick<<else>>your strap-ons slide against each other<</if>><</if>>, she whispers that @@color:hotpink;she loves you.@@ $activeSlave.slaveName makes an inarticulate noise of anal distress that probably means @@color:hotpink;approximately the same thing.@@
+ <<if $PC.dick == 1>><<if canAchieveErection($HeadGirl)>>your dicks slide against each other<<else>>your dick slides against her strap-on<</if>><<else>><<if canAchieveErection($HeadGirl)>>your strap-on slides against her dick<<else>>your strap-ons slide against each other<</if>><</if>>, your trusty Head Girl whispers that @@color:hotpink;she loves you.@@ $activeSlave.slaveName makes an inarticulate noise of anal distress that probably means @@color:hotpink;approximately the same thing.@@
<<set $activeSlave.devotion += 4, $activeSlave.analCount++, $analTotal++>>
<<for $i to 0; $i < $slaves.length; $i++>><<if $slaves[$i].ID == $HeadGirl.ID>><<set $slaves[$i].devotion += 4>><</if>><</for>>
<<EventFetish $activeSlave "buttslut">>
@@ -164,7 +170,7 @@ She shrieks, backpedaling, and then falls backward, her <<if $activeSlave.butt >
<<replace "#result">>
Her sheer joie de vivre is irresistible, and it certainly draws you out of your office. You're not slow, and of course you know where she's going, so you catch up quickly. She gives you the careful measuring glance of a devoted sex slave who's checking whether her owner wants to fuck her right now, and correctly decides that that isn't your intent, at least right this minute. Instead, you continue the direction she was going, and she follows. "<<Master>>," she <<say>>s hesitantly, "I hope that wa<<s>> an okay thing for me to do." You assure her it was. "Thank<<s>>, <<Master>>," she beams, grinning like an idiot. Smiling at her infectious enthusiasm for life, you ask her why she's so happy this morning. She looks momentarily perplexed<<if $activeSlave.intelligence > 1>>, not a common look for a slave as smart as her<</if>>. "I don't know! I just woke up thi<<s>> morning feeling really, really good. <<if $activeSlave.intelligence > 1>>I'm sure the fact that I'm benefiting from incredibly advanced medi<<c>>ine ha<<s>> <<s>>omething to do with it; thank you very much for that, <<Master>>. Other than that,<</if>>
I ju<<s>>t feel happy." This has to be some sort of milestone for her, and for you, and maybe for slavery in general: if she can be this pleased with life, something must be going right. You walk her to where she's going
- <<switch $slaves[$i].assignment>>
+ <<switch $activeSlave.assignment>>
<<case "whore">>(one of the arcology's nicer streets, where she'll spend the day selling her body),
<<case "serve the public">>(one of the arcology's nicer streets, where she'll spend the day flirting with citizens and having sex with anyone that's willing),
<<case "work a glory hole">>(a wall mounting that will render her a helpless target for dicks all day),
@@ -290,7 +296,7 @@ She shrieks, backpedaling, and then falls backward, her <<if $activeSlave.butt >
<</replace>>
<</click>>
<<if $dairyRestraintsSetting == 2>>
-<<click "Threaten her with the industrial Dairy">>
+<br><click "Threaten her with the industrial Dairy">>
<<replace "#name">>$activeSlave.slaveName<</replace>>
<<replace "#result">>
You grab her by the scruff of her neck and drag her down to $dairyName. She tries to control herself, but breaks down in tears when you haul her to a stop, forcing her to get a good look at the rows of bodies being mercilessly milked. You explain that if she continues to fail to control herself, your patience with her will eventually expire, and you'll be forced to immure her here. Indicating a slave who's being
@@ -307,15 +313,15 @@ She shrieks, backpedaling, and then falls backward, her <<if $activeSlave.butt >
<</click>>
<</if>>
<<if $seeExtreme != 0>>
-<<click "Threaten to convert her into a Fuckdoll">>
+<br><<click "Threaten to convert her into a Fuckdoll">>
<<replace "#name">>$activeSlave.slaveName<</replace>>
<<replace "#result">>
- You order a fuckdoll brought to your office. $activeSlave.slaveName watches it totter in, automatically following the tugs on its leash and the tonal commands passed by its suit. She already understands the implicit threat, and she shivers uncontrollably, @@color:gold;almost falling to her knees in fear.@@ Not content with that, you tell her that she's trying your patience with her behavior. If she doesn't control herself better in the future, you'll give up on her and convert her into a Fuckdoll. At the spoken threat $activeSlave.slaveName does collapse, but you order her to get back to her feet and watch. She does, shakily, tears streaming down her face as you put the Fuckdoll on its all fours, as though it were about to take dick. Its <<if $activeSlave.vagina > -1>>holes are pointed straight at $activeSlave's face, and she can't avoid seeing how loose and used they look<<else>>rear hole is pointed straight at $activeSlave's face, and she can't avoid seeing how loose and used it looks<</if>>. Suddenly, you activate the Fuckdoll's suit's punishment systems. It does not and cannot scream, but a slight stiffening of its posture communicates extreme anguish, and its sphincter spasms tightly closed with obviously involuntary force. $activeSlave.slaveName is almost incapacitated by terror.
+ You order a Fuckdoll brought to your office. $activeSlave.slaveName watches it totter in, automatically following the tugs on its leash and the tonal commands passed by its suit. She already understands the implicit threat, and she shivers uncontrollably, @@color:gold;almost falling to her knees in fear.@@ Not content with that, you tell her that she's trying your patience with her behavior. If she doesn't control herself better in the future, you'll give up on her and convert her into a Fuckdoll. At the spoken threat $activeSlave.slaveName does collapse, but you order her to get back to her feet and watch. She does, shakily, tears streaming down her face as you put the Fuckdoll on its all fours, as though it were about to take dick. Its <<if $activeSlave.vagina > -1>>holes are pointed straight at $activeSlave.slaveName's face, and she can't avoid seeing how loose and used they look<<else>>rear hole is pointed straight at $activeSlave.slaveName's face, and she can't avoid seeing how loose and used it looks<</if>>. Suddenly, you activate the Fuckdoll's suit's punishment systems. It does not and cannot scream, but a slight stiffening of its posture communicates extreme anguish, and its sphincter spasms tightly closed with obviously involuntary force. $activeSlave.slaveName is almost incapacitated by terror.
<<set $activeSlave.trust -= 8>>
<</replace>>
<</click>>
<</if>>
-<<click "Comfort her">>
+<br><<click "Comfort her">>
<<replace "#name">>$activeSlave.slaveName<</replace>>
<<replace "#result">>
You rise from behind your desk, and $activeSlave.slaveName collapses to the floor, sure that she's about to be severely punished. She's shocked to feel your arms encircle her as you kneel down beside her and embrace her huddled form. You pull her head <<if $PC.boobs == 1>>against your soft breasts<<else>>into your shoulder<</if>>, stroking it reassuringly and murmuring kindness. She clings to you, mostly for lack of any other comfort in the whole world, and sobs convulsively, @@color:mediumaquamarine;her terror flowing out of her@@ in a torrent as you gently rub her back. When she's mostly cried herself out, you tell her that she'll be all right. You're sure she'll be a good slave one day. You understand that her life is hard. She'll make mistakes, and you'll punish her for them, but that's part of slave training, and that's all right. If she does her best, she'll be all right. She sniffles, cuffing tears away. "Th-thank you, <<Master>>, I'll d-do my b-be<<s>>t," she manages to <<say>>.
diff --git a/src/uncategorized/assistantEvents.tw b/src/uncategorized/assistantEvents.tw
index b067aaff54e..b73044af8bc 100644
--- a/src/uncategorized/assistantEvents.tw
+++ b/src/uncategorized/assistantEvents.tw
@@ -677,7 +677,7 @@ Your personal assistant has been adapting to <<if $assistant>>her<<else>>its<</i
<br><br>
$assistantName's avatar looks uncharacteristically nervous, and clears her throat before speaking. Seeing that she has your attention, she says, "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, the computer core is so powerful that I'm running out of applications for it. I think practical economic modeling isn't out of the question. I've compiled business programs together into a distinct assistant, a subsidiary of mine for automated trading and similar tasks. I'd like to suggest menial slave trading as a test run for her. It's predictable and the margins are so wide that it should go very well. You can activate that from my menu."
<br><br>
- "I was hoping, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, that she could, um, keep me company sometimes, too." $assistantName's avatar turns to the new avatar. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, may you please give me some guidance about what our relationship should be like? It won't be a constant thing, and all my normal functions will be unaffected. I'll change her avatar to match mine, and our relationship, if needed."
+ "I was hoping, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, that she could, um, keep me company sometimes, too." $assistantName's avatar turns to the new avatar. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, will you please give me some guidance about what our relationship should be like? It won't be a constant thing, and all my normal functions will be unaffected. I'll change her avatar to match mine, and our relationship, if needed."
<<else>>
This time, <<if $assistant>>her<<else>>its<</if>> circular avatar is not alone: it's accompanied by a smaller green avatar in a ¤ shape. Not particularly inventive, but you can already guess the purpose. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I now have the ability to act as a powerful automated trading system. As a trial, I suggest the menial slave market. It's volatile, but within certain predictable boundaries, and the profit margins are unmatched."
<br><br>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index 655ac9b7030..efdae25bfcd 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -2,6 +2,7 @@
<<set $nextButton to "Continue">>
<<set $nextLink to "Body Modification Degradation">>
+<<SlavePronouns $activeSlave>>
<<set $showEncyclopedia to 1>><<set $encyclopedia to "The Studio">>
diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw
index 8c1fb51d8e2..84db7564601 100644
--- a/src/uncategorized/fsDevelopments.tw
+++ b/src/uncategorized/fsDevelopments.tw
@@ -31,14 +31,14 @@ __Society__
<</if>>
<<elseif $FSCreditCount == 5>>
<<if ($FSGotRepCreditOne != 1)>>
- <<if ($rep > 4000)>>
+ <<if ($rep > 6000)>>
@@color:yellow;Your reputation is so solid that $arcologies[0].name's society is ready to begin accepting a second societal direction.@@
<<set $FSGotRepCreditOne = 1>>
<<set $FSCredits += 1>>
<</if>>
<</if>>
<<if ($FSGotRepCreditTwo != 1)>>
- <<if ($rep > 8000)>>
+ <<if ($rep > 9000)>>
@@color:yellow;Your reputation is so high that $arcologies[0].name's society is ready to begin accepting a third societal direction.@@
<<set $FSGotRepCreditTwo = 1>>
<<set $FSCredits += 1>>
@@ -52,7 +52,7 @@ __Society__
<</if>>
<</if>>
<<if ($FSGotRepCreditFour != 1)>>
- <<if ($rep > 16000)>>
+ <<if ($rep > 15000)>>
@@color:yellow;Your reputation is so unparalleled that $arcologies[0].name's society is ready to begin accepting a fifth and final societal direction.@@
<<set $FSGotRepCreditFour = 1>>
<<set $FSCredits += 1>>
@@ -60,21 +60,21 @@ __Society__
<</if>>
<<elseif $FSCreditCount == 6>>
<<if ($FSGotRepCreditOne != 1)>>
- <<if ($rep > 4000)>>
+ <<if ($rep > 6000)>>
@@color:yellow;Your reputation is so solid that $arcologies[0].name's society is ready to begin accepting a second societal direction.@@
<<set $FSGotRepCreditOne = 1>>
<<set $FSCredits += 1>>
<</if>>
<</if>>
<<if ($FSGotRepCreditTwo != 1)>>
- <<if ($rep > 7000)>>
+ <<if ($rep > 9000)>>
@@color:yellow;Your reputation is so high that $arcologies[0].name's society is ready to begin accepting a third societal direction.@@
<<set $FSGotRepCreditTwo = 1>>
<<set $FSCredits += 1>>
<</if>>
<</if>>
<<if ($FSGotRepCreditThree != 1)>>
- <<if ($rep > 11000)>>
+ <<if ($rep > 12000)>>
@@color:yellow;Your reputation is so great that $arcologies[0].name's society is ready to begin accepting a fourth societal direction.@@
<<set $FSGotRepCreditThree = 1>>
<<set $FSCredits += 1>>
@@ -96,21 +96,21 @@ __Society__
<</if>>
<<elseif $FSCreditCount == 7>>
<<if ($FSGotRepCreditOne != 1)>>
- <<if ($rep > 4000)>>
+ <<if ($rep > 6000)>>
@@color:yellow;Your reputation is so solid that $arcologies[0].name's society is ready to begin accepting a second societal direction.@@
<<set $FSGotRepCreditOne = 1>>
<<set $FSCredits += 1>>
<</if>>
<</if>>
<<if ($FSGotRepCreditTwo != 1)>>
- <<if ($rep > 7000)>>
+ <<if ($rep > 9000)>>
@@color:yellow;Your reputation is so high that $arcologies[0].name's society is ready to begin accepting a third societal direction.@@
<<set $FSGotRepCreditTwo = 1>>
<<set $FSCredits += 1>>
<</if>>
<</if>>
<<if ($FSGotRepCreditThree != 1)>>
- <<if ($rep > 11000)>>
+ <<if ($rep > 12000)>>
@@color:yellow;Your reputation is so remarkable that $arcologies[0].name's society is ready to begin accepting a fourth societal direction.@@
<<set $FSGotRepCreditThree = 1>>
<<set $FSCredits += 1>>
diff --git a/src/uncategorized/hgApplication.tw b/src/uncategorized/hgApplication.tw
index e05164956bc..b908afb297d 100644
--- a/src/uncategorized/hgApplication.tw
+++ b/src/uncategorized/hgApplication.tw
@@ -15,7 +15,7 @@
<<elseif $HGtraining is "obedience">>
is disobedient.
<<elseif $HGtraining is "flaw">>
- has
+ has
<<if ["cum addict", "anal addict", "attention whore", "breast growth", "abusive", "malicious", "self hating", "neglectful", "breeder"].contains($activeSlave.sexualFlaw)>>
a paraphilia.
<<else>>
@@ -328,21 +328,21 @@ In spare moments she teaches $activeSlave.slaveName how to prostitute herself. $
<<if ($activeSlave.attrKnown == 0)>>
<<set $activeSlave.attrKnown to 1>>
$HeadGirl.slaveName also investigates the slave's basic sexual orientation, finding that she is
- <<if ($activeSlave.attrXY is -1)>>
+ <<if ($activeSlave.attrXY <= 40)>>
@@color:red;disgusted by men@@
- <<elseif ($activeSlave.attrXY == 0)>>
+ <<elseif ($activeSlave.attrXY <= 60)>>
indifferent to men
- <<elseif ($activeSlave.attrXY == 1)>>
+ <<elseif ($activeSlave.attrXY <= 80)>>
@@color:green;attracted to men@@
<<else>>
@@color:green;intensely attracted to men@@
<</if>>
and
- <<if ($activeSlave.attrXX is -1)>>
+ <<if ($activeSlave.attrXX <= 40)>>
@@color:red;disgusted by women.@@
- <<elseif ($activeSlave.attrXX == 0)>>
+ <<elseif ($activeSlave.attrXX <= 60)>>
indifferent to women.
- <<elseif ($activeSlave.attrXX == 1)>>
+ <<elseif ($activeSlave.attrXX <= 80)>>
@@color:green;attracted to women.@@
<<else>>
@@color:green;intensely attracted to women.@@
@@ -356,4 +356,4 @@ In spare moments she teaches $activeSlave.slaveName how to prostitute herself. $
<<set $activeSlave to {}>>
<<break>>
<</if>>
-<</for>>
\ No newline at end of file
+<</for>>
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index b6ae51bf7f0..0c00926d022 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -1,5 +1,5 @@
:: Main [nobr]
-
+<<set $FSAnnounced = 1>>
<<if $ver.contains("0.9") or $ver.contains("0.8") or $ver.contains("0.7") or $ver.contains("0.6")>>
<<if ($ver != "0.9.7") && ($ver != "0.9.8") && ($ver != "0.9.9")>>
''@@color:red;INCOMPATIBLE SAVE WARNING:@@'' your saved game was created using version $ver and you are using version 0.9.8. Please select New Game Plus from the Options menu or start a new game.
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 1547e042df4..f0f08656f55 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -63,7 +63,7 @@ __Construction__
<<else>>
//The arcology's public areas are fully upgraded.//
<</if>>
-<<if ($PC.career = "engineer") || ($PC.career = "arcology owner")>>
+<<if ($PC.career == "engineer") || ($PC.career == "arcology owner")>>
<<if $AProsperityCap < 360>>
//Arcology upgrades are less expensive due to your @@color:springgreen;<<if $PC.career = "arcology owner">>experience in the Free Cities<<else>>arcology engineering career<</if>>.@@//
<</if>>
diff --git a/src/uncategorized/newGamePlus.tw b/src/uncategorized/newGamePlus.tw
index 9a2f911ca97..8b310a2b004 100644
--- a/src/uncategorized/newGamePlus.tw
+++ b/src/uncategorized/newGamePlus.tw
@@ -10,6 +10,24 @@
<</silently>>
<</if>>
+<<if $freshPC == 0>>
+ <<if $retainCareer == 1 && $PC.career != "arcology owner">>
+ <<if $week > 52>>
+ You have acquired a fair amount of knowledge regarding arcologies and their day-to-day management in your time spent as one's owner qualifying you as an @@color:orange;"arcology owner"!@@
+ <<if $retainCareer == 1>>
+ [[Change career.|New Game Plus][$retainCareer to 0]]
+ <<elseif $retainCareer == 0>>
+ [[Don't change career.|New Game Plus][$retainCareer to 1]]
+ <</if>>
+ <<else>>
+ You lack the experience needed to qualify for a career change to "arcology owner".
+ <</if>>
+ <</if>>
+ [[Start over with a new player character.|New Game Plus][$freshPC = 1, $retainCareer to 1]]
+<<else>>
+ [[Use existing player character.|New Game Plus][$freshPC = 0]]
+<</if>>
+
Select up to five slaves to be imported into a new game and then [[click here.|init][$saveImported to 1]]
<br><br>''These slaves will be imported into the new game:''
diff --git a/src/uncategorized/pCitizensAndCivilians.tw b/src/uncategorized/pCitizensAndCivilians.tw
index 890e0977879..4b3649b90f0 100644
--- a/src/uncategorized/pCitizensAndCivilians.tw
+++ b/src/uncategorized/pCitizensAndCivilians.tw
@@ -28,7 +28,7 @@
<<set $mercenaries to 5>>
<<set $mercenariesTitle to "Knights">>
<</replace>>
-<</click>> <<if ($PC.career = "mercenary") || ($PC.career = "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</click>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<<if $arcologies[0].FSRomanRevivalist >= 10>>\
<<click "They shall be my Evocati">>
<<replace "#result">>
@@ -39,7 +39,7 @@
<<set $mercenaries to 5>>
<<set $mercenariesTitle to "Evocati">>
<</replace>>
-<</click>> <<if ($PC.career = "mercenary") || ($PC.career = "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</click>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>\
<<if $arcologies[0].FSEgyptianRevivalist >= 10>>\
<<click "They shall be my Medjay">>
@@ -51,7 +51,7 @@
<<set $mercenaries to 5>>
<<set $mercenariesTitle to "Medjay">>
<</replace>>
-<</click>> <<if ($PC.career = "mercenary") || ($PC.career = "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</click>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>\
<<if $arcologies[0].FSEdoRevivalist >= 10>>\
<<click "Naturally, they shall be the Samurai">>
@@ -63,7 +63,7 @@
<<set $mercenaries to 5>>
<<set $mercenariesTitle to "Samurai">>
<</replace>>
-<</click>> <<if ($PC.career = "mercenary") || ($PC.career = "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</click>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>\
<<if $arcologies[0].FSArabianRevivalist >= 10>>\
<<click "They shall be my Janissaries">>
@@ -75,7 +75,7 @@
<<set $mercenaries to 5>>
<<set $mercenariesTitle to "Janissaries">>
<</replace>>
-<</click>> <<if ($PC.career = "mercenary") || ($PC.career = "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</click>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>\
<<if $arcologies[0].FSChattelReligionist >= 10>>\
<<click "They shall be the Knights Templar">>
@@ -87,7 +87,7 @@
<<set $mercenaries to 5>>
<<set $mercenariesTitle to "Knights Templar">>
<</replace>>
-<</click>> <<if ($PC.career = "mercenary") || ($PC.career = "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</click>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>\
<<if $arcologies[0].FSDegradationist >= 10>>\
<<click "They shall be my Immortals">>
@@ -99,7 +99,7 @@
<<set $mercenaries to 5>>
<<set $mercenariesTitle to "Immortals">>
<</replace>>
-<</click>> <<if ($PC.career = "mercenary") || ($PC.career = "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</click>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>\
<<if $arcologies[0].FSAssetExpansionist >= 10>>\
<</if>>\
@@ -123,7 +123,7 @@
<<set $mercenaries to 5>>
<<set $mercenariesTitle to "Asgardians">>
<</replace>>
-<</click>> <<if ($PC.career = "mercenary") || ($PC.career = "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</click>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>\
<<if $arcologies[0].FSSupremacist >= 10>>\
<<click "They shall be the Knights of the Blood">>
@@ -135,7 +135,7 @@
<<set $mercenaries to 5>>
<<set $mercenariesTitle to "Knights of the Blood">>
<</replace>>
-<</click>> <<if ($PC.career = "mercenary") || ($PC.career = "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</click>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>\
<<if $arcologies[0].FSSubjugationist >= 10>>\
<</if>>\
@@ -149,7 +149,7 @@
<<set $mercenaries to 5>>
<<set $mercenariesTitle to "Wardens">>
<</replace>>
-<</click>> <<if $PC.career is "mercenary" || ($PC.career = "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</click>> <<if $PC.career == "mercenary" || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>\
<<if $arcologies[0].FSBodyPurist >= 10>>\
<</if>>\
@@ -165,6 +165,6 @@
<<set $mercenaries to 5>>
<<set $mercenariesTitle to "Rangers">>
<</replace>>
-<</click>> <<if ($PC.career = "mercenary") || ($PC.career = "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</click>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>\
</span>
diff --git a/src/uncategorized/pDefenseFears.tw b/src/uncategorized/pDefenseFears.tw
index 11b6dd3c622..758b73a23e1 100644
--- a/src/uncategorized/pDefenseFears.tw
+++ b/src/uncategorized/pDefenseFears.tw
@@ -30,7 +30,7 @@ A deputation of slaveowning citizens comes to see you. Though they haven't exper
<<set $cash -= 10000>>
<<set $mercenaries to 3>>
<</replace>>
-<</click>> <<if ($PC.career = "mercenary") || ($PC.career = "arcology owner")>>//This will cost ¤10000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤10000 and incur significant upkeep costs//<</if>>
+<</click>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤10000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤10000 and incur significant upkeep costs//<</if>>
<<click "Refuse to quarter so many troops in your arcology">>
<<replace "#result">>
The consensus that the arcology is vulnerable triggers an @@color:red;exodus@@ of your most wealthy and valuable citizens, and your reputation @@color:red;suffers@@ grievously.
diff --git a/src/uncategorized/pMercenaries.tw b/src/uncategorized/pMercenaries.tw
index 1ade004ae9c..865117f5aa6 100644
--- a/src/uncategorized/pMercenaries.tw
+++ b/src/uncategorized/pMercenaries.tw
@@ -26,7 +26,7 @@ The budgetary difficulty many old world countries are in has resulted in unemplo
<<set $cash -= 5000>>
<<set $mercenaries to 1>>
<</replace>>
-<</click>> <<if ($PC.career = "mercenary") || ($PC.career = "arcology owner")>>//This will cost ¤5000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤5000 and incur significant upkeep costs//<</if>>
+<</click>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤5000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤5000 and incur significant upkeep costs//<</if>>
<<click "Install a full platoon">>
<<replace "#result">>
You hire a full platoon of reputable mercenaries and a veteran officer to command them, kit them in excellent gear, and quarter them in $arcologies[0].name. The sight of many armed men on patrol has @@color:red;deeply offended some of the more free-spirited citizens@@ of $arcologies[0].name.
@@ -35,7 +35,7 @@ The budgetary difficulty many old world countries are in has resulted in unemplo
<<set $cash -= 10000>>
<<set $mercenaries to 3>>
<</replace>>
-<</click>> <<if ($PC.career = "mercenary") || ($PC.career = "arcology owner")>>//This will cost ¤10000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤10000 and incur significant upkeep costs//<</if>>
+<</click>> <<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>//This will cost ¤10000 and some upkeep, @@color:springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤10000 and incur significant upkeep costs//<</if>>
<<click "Do not quarter troops in your arcology">>
<<replace "#result">>
Having armed men on permanent watch is a step too far. $arcologies[0].name's security systems are formidable and will have to serve.
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index d19acd7f381..6db2cff2e45 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -3110,7 +3110,7 @@ You remind yourself that success in this conflict will not be defined by the tra
<br> //This option is available due to your @@color:springgreen;societal connections,@@ and will economically devastate your rival//
<</if>>
<</if>>
-<<if ($PC.career = "mercenary") || ($PC.career = "arcology owner")>>
+<<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>
<<if $mercenaries >= 3>>
<br><<click "Your peers will tolerate an attack if it's covert">>
<<replace "#result">>
diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw
index 357c73fa453..8b7a7b29faf 100644
--- a/src/uncategorized/ptWorkaround.tw
+++ b/src/uncategorized/ptWorkaround.tw
@@ -43,7 +43,7 @@
<<BothVCheck 4 2>>
<</if>>
<</if>>
-<<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+<<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
Your @@color:springgreen;slave training experience@@ allows you to @@color:hotpink;bend her to your will@@ more quickly without provoking resistance.
<<set $activeSlave.devotion += 1>>
<</if>>
@@ -107,7 +107,7 @@
$activeSlave.slaveName remains devoted to an old world faith that serves her as a reservoir of mental resilience. Like all such beliefs, hers has certain sexual elements; you amuse yourself by forcing her to break them, and rewarding her generously when she does.
<</if>>
<<set $activeSlave.training += 100-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -193,7 +193,7 @@
<<set $activeSlave.oralCount += 10, $oralTotal += 10>>
<</switch>>
<<set $activeSlave.training += 100-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -330,7 +330,7 @@
<<else>>
$activeSlave.slaveName violently resists you whenever she can. This cannot be permitted, so after a particularly severe bout of physical resistance, you decide to employ an old method of breaking a mind without damaging a body. You secure her to a board and gently wash her face with a wet cloth. She spits in defiance, only to be surprised when you lower the board so that her feet are higher than her head. You tie the cloth around her face. A thin stream of water onto the cloth produces all the feeling and none of the reality of a slow death by drowning. Waterboarding isn't much use for extracting information, but it works well for @@color:gold;slavebreaking.@@
<</if>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
Your @@color:springgreen;slavebreaking experience@@ allows you to apply @@color:gold;exquisitely calibrated@@ mental pressure.
<<set $activeSlave.trust -= 2>>
<</if>>
@@ -405,7 +405,7 @@
@@color:gold;encourages her fear@@ of you.
<<set $activeSlave.trust -= 10>>
<</if>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
Your @@color:springgreen;slave-breaking experience@@ allows you to apply @@color:gold;exquisite agony@@ without any increase in damage.
<<set $activeSlave.trust -= 5>>
<</if>>
@@ -449,7 +449,7 @@
$activeSlave.slaveName remains devoted to an old world faith that serves her as a reservoir of mental resilience. You carefully select pressure points to break her of this by forcing her to violate her faith's purity codes, constantly. She is forced to eat, dress, and fuck in ways that convince her that she must either condemn herself as an irredeemable sinner, or abandon her beliefs.
<</if>>
<<set $activeSlave.training += 120-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -572,7 +572,7 @@
<</if>>
<</switch>>
<<set $activeSlave.training += 120-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -740,7 +740,7 @@
Since you've decided to incite her to arrogance, you praise her effusively, and give orders that others are to do so as well. Other slaves are punished for things she's allowed to get away with.
<<InduceFlawLenityEffects>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -755,7 +755,7 @@
Since you've decided to induce her to bitchiness, you keep her in your office and induce her to criticize other slaves, rewarding her when she's especially catty.
<<InduceFlawLenityEffects>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -770,7 +770,7 @@
<<InduceFlawAbuseEffects>>
<<if ($activeSlave.vagina > -1) && ($activeSlave.vaginalAccessory != "chastity belt")>><<VaginalVCheck 10>><<else>><<AnalVCheck 10>><</if>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -785,7 +785,7 @@
<<InduceFlawAbuseEffects>>
<<if ($activeSlave.vagina > -1) && ($activeSlave.vaginalAccessory != "chastity belt")>><<VaginalVCheck 10>><<else>><<AnalVCheck 10>><</if>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -800,7 +800,7 @@
<<InduceFlawAbuseEffects>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
<<set $activeSlave.oralCount += 10, $oralTotal += 10>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -813,7 +813,7 @@
<<case "induce gluttony">>
Inducing gluttony is harder than inducing anorexia; you force her to orgasm when she's eating, and praise her effusively when she gains weight. You also provide her with ample rations for stress eating.
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -827,7 +827,7 @@
You criticize her cruelly whenever she eats, and praise thinner slaves to her face at every opportunity.
<<InduceFlawAbuseEffects>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -841,7 +841,7 @@
You direct a campaign of abuse and threats at her, and surreptitiously ensure that a little religious text from her home country finds its way into a hiding place in her living area.
<<InduceFlawAbuseEffects>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -855,7 +855,7 @@
You direct a campaign of abuse and threats at her, making sure to threaten her with the absolute worst of slavery in your arcology. You also arrange for her to witness other citizen's slaves in situations that aren't much fun.
<<InduceFlawAbuseEffects>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -870,7 +870,7 @@
<<InduceFlawAbuseEffects>>
<<AnalVCheck 10>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -885,7 +885,7 @@
<<InduceFlawAbuseEffects>>
<<AnalVCheck 10>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -900,7 +900,7 @@
<<InduceFlawAbuseEffects>>
<<if ($activeSlave.vagina > -1) && ($activeSlave.vaginalAccessory != "chastity belt")>><<VaginalVCheck 10>><<else>><<AnalVCheck 10>><</if>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -914,7 +914,7 @@
Since you've decided to force shame on her, you keep her in your office whenever she's not otherwise occupied, and heap derision on her at every opportunity, even inviting visitors to join you in chats about how unattractive and worthless she is.
<<InduceFlawAbuseEffects>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -928,7 +928,7 @@
Since you've decided to induce her to sexual idealism, you keep her in your office, and when the two of you are all alone, gossip with her about other slaves and even citizens. You do your best to encourage her to believe absurdities.
<<InduceFlawLenityEffects>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -942,7 +942,7 @@
Since you've decided to force sexual repression on her, you keep her in your office whenever she's not otherwise occupied. You use the monitoring systems to reveal her sexual arousal whenever it appears, and castigate and punish her for it.
<<InduceFlawAbuseEffects>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -957,7 +957,7 @@
<<InduceFlawAbuseEffects>>
<<if ($activeSlave.vagina > -1) && ($activeSlave.vaginalAccessory != "chastity belt")>><<VaginalVCheck 10>><<else>><<AnalVCheck 10>><</if>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -972,7 +972,7 @@
<<if ($activeSlave.vagina > -1) && ($activeSlave.vaginalAccessory != "chastity belt")>><<VaginalVCheck 10>><<else>><<AnalVCheck 10>><</if>>
<<InduceFlawAbuseEffects>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -986,7 +986,7 @@
Since you've decided to make her sexually judgemental, you keep her in your office and fuck her, <<if $PC.dick == 1>>praising her whenever she takes your big dick well<<else>>using a huge strap-on on her and praising her when she takes it like a good girl<</if>>. You also judge others' endowments in her presence.
<<InduceFlawLenityEffects>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -1000,7 +1000,7 @@
The cumslut is quite pleased when you order her to stay in your office whenever she can for use as one of your personal oral toys. You carefully limit her orgasms to when <<if $PC.dick == 1>>you're blowing your load down her throat<<else>>she's swallowing your pussyjuice<</if>>, and make her oral adventures predictably regular.
<<set $activeSlave.oralCount += 10, $oralTotal += 10>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -1014,7 +1014,7 @@
The buttslut is quite pleased when you order her to stay in your office whenever she can for use as one of your personal anal toys. You make her anal orgasms predictably regular, doing your best to inculcate reliance on them.
<<AnalVCheck 10>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -1028,7 +1028,7 @@
The humiliation slut is quite pleased when you order her to stay in your office whenever she can, and fucking her whenever other slaves are present. You do your best to focus her attention on how the others react to the spectacle.
<<if ($activeSlave.vagina > -1) && ($activeSlave.vaginalAccessory != "chastity belt")>><<VaginalVCheck 10>><<else>><<AnalVCheck 10>><</if>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -1041,7 +1041,7 @@
<<case "induce breast growth obsession">>
You inspect her breasts multiple times a day, and praise her effusively when they grow at all. You treat it as though it were something she could control personally.
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -1055,7 +1055,7 @@
The dom is gratified when you order her to stay in your office whenever she can to fuck any slave you feel like throwing her way. You do your best to limit her menu items to reluctant or even rebellious slaves, and praise her when she forces herself on them.
<<set $activeSlave.penetrativeCount += 20, $penetrativeTotal += 20>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -1069,7 +1069,7 @@
The sadist is gratified when you order her to stay in your office whenever she can to have her way with any slave you feel like throwing her way. You do your best to limit her menu items to rebellious slaves, and praise her when her sadism makes her an effective punishment tool.
<<set $activeSlave.penetrativeCount += 20, $penetrativeTotal += 20>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -1083,7 +1083,7 @@
You order the masochist to stay in your office whenever she's not working or resting. You fuck her cruelly, going beyond the pain she enjoys into harsh degradation. And every time you use her, you make sure to tell her how useless she is.
<<if ($activeSlave.vagina > -1) && ($activeSlave.vaginalAccessory != "chastity belt")>><<VaginalVCheck 10>><<else>><<AnalVCheck 10>><</if>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -1097,7 +1097,7 @@
You order the sub to stay in your office whenever she's not working or resting, and use her body for your pleasure. The instant you climax, you go back to your work or to another slave, treating her like a piece of used tissue.
<<if ($activeSlave.vagina > -1) && ($activeSlave.vaginalAccessory != "chastity belt")>><<VaginalVCheck 10>><<else>><<AnalVCheck 10>><</if>>
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
@@ -1111,7 +1111,7 @@
You order the pregnant slut to stay in your office whenever she's not working or resting.
<<if $activeSlave.preg <= 0>>Since she's not pregnant, you keep her rigged up with an enormous sympathy belly when she's there.<</if>> Rather than fucking her, you praise her pregnancy effusively, and only allow her to get off when you're doing so.
<<set $activeSlave.training += 80-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
- <<if ($PC.career = "slaver") || ($PC.career = "arcology owner")>>
+ <<if ($PC.career == "slaver") || ($PC.career == "arcology owner")>>
<<set $activeSlave.training += 20>>
<</if>>
<<if $activeSlave.training < 100>>
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index 82f4b5f0010..9c54764c797 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -740,7 +740,7 @@
<</if>> /* closes mute exempt */
-<<if $eventSlave.vaginaLube > 0>>
+<<if $eventSlave.vaginaLube > 1>>
<<if $eventSlave.devotion > 20>>
<<if $eventSlave.vagina > -1>>
<<set $RESSevent.push("moist pussy")>>
@@ -1602,10 +1602,6 @@
<</if>>
/* EVENT RANDOMIZATION */
- <<set $RESSTRevent.push("ara ara")>>
- <<set $RESSTRevent.push("gaped asshole")>>
- <<set $RESSTRevent.push("passing declaration")>>
- <<set $RESSTRevent.push("im scared")>>
<<for $i to 0; $i < $RESSevent.length; $i++>>
<<set $events.push("RESS")>>
diff --git a/src/uncategorized/reSlaveMarriage.tw b/src/uncategorized/reSlaveMarriage.tw
index f4f70d9c665..27c0ed64824 100644
--- a/src/uncategorized/reSlaveMarriage.tw
+++ b/src/uncategorized/reSlaveMarriage.tw
@@ -1,5 +1,5 @@
:: RE slave marriage
-
+
<<nobr>>
<<set $nextButton to "Continue">>
@@ -19,7 +19,7 @@
<</nobr>>\
\
-<<print "[[$groomSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1,$activeSlave to $groomSlave]]">> and <<print "[[$brideSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1,$activeSlave to $brideSlave]]">> come into your office <<if ($groomSlave.amp != 1) && ($brideSlave.amp != 1)>>holding hands<<else>>doing their best to stay close to one another despite their physical limitations<</if>>. $brideSlave.slaveName looks at $groomSlave.slaveName expectantly, but she's terribly nervous and makes several false starts before beginning. Finally $groomSlave.slaveName musters her courage and <<if canTalk($groomSlave) == false>>asks you with simple gestures to grant the two of them a slave marriage.<<elseif ($groomSlave.lips > 70) || ($groomSlave.lipsPiercing+$groomSlave.tonguePiercing > 2)>>asks with her voice cracking, "<<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>, may you pleathe grant uth a thlave marriage?"<<else>>asks with her voice cracking, "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, may you please grant us a slave marriage?"<</if>>
+<<print "[[$groomSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1,$activeSlave to $groomSlave]]">> and <<print "[[$brideSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1,$activeSlave to $brideSlave]]">> come into your office <<if ($groomSlave.amp != 1) && ($brideSlave.amp != 1)>>holding hands<<else>>doing their best to stay close to one another despite their physical limitations<</if>>. $brideSlave.slaveName looks at $groomSlave.slaveName expectantly, but she's terribly nervous and makes several false starts before beginning. Finally $groomSlave.slaveName musters her courage and <<if canTalk($groomSlave) == false>>asks you with simple gestures to grant the two of them a slave marriage.<<elseif ($groomSlave.lips > 70) || ($groomSlave.lipsPiercing+$groomSlave.tonguePiercing > 2)>>asks with her voice cracking, "<<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>, would you pleathe grant uth a thlave marriage?"<<else>>asks with her voice cracking, "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, would you please grant us a slave marriage?"<</if>>
<<nobr>>
<span id="result">
diff --git a/src/uncategorized/seExpiration.tw b/src/uncategorized/seExpiration.tw
index 6ea3917ce44..b85ecf0d307 100644
--- a/src/uncategorized/seExpiration.tw
+++ b/src/uncategorized/seExpiration.tw
@@ -101,9 +101,9 @@ at the moment of her scheduled emancipation, she seems to be struggling to expre
<<if canTalk($activeSlave) == false>>
She does her best to communicate a willingness to remain your slave, indicating that she wouldn't press too hard about the price if you offered her another indenture.
<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>
- "<<if $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>, um," she lisps hesitantly. "I don't mind being your thlave. Could I - may you pleathe give me another indenture? I'm, um, not too worried about the prithe."
+ "<<if $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>, um," she lisps hesitantly. "I don't mind being your thlave. Could I - would you pleathe give me another indenture? I'm, um, not too worried about the prithe."
<<else>>
- "<<if $PC.title == 1>>Master<<else>>Mistress<</if>>, um," she says hesitantly. "I don't mind being your slave. Could I - may you please give me another indenture? I'm, um, not too worried about the price."
+ "<<if $PC.title == 1>>Master<<else>>Mistress<</if>>, um," she says hesitantly. "I don't mind being your slave. Could I - would you please give me another indenture? I'm, um, not too worried about the price."
<</if>>
<br><br>
--
GitLab