From 260a723090bcb69b36dcd7035bf3f750a24a8b27 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Mon, 17 Dec 2018 19:46:02 -0600
Subject: [PATCH] A+An Fixes
---
devNotes/inducedNCS.txt | 2 +-
devNotes/twine JS.txt | 14 ++++--
player variables documentation - Pregmod.txt | 2 +-
slave variables documentation - Pregmod.txt | 3 +-
src/SpecialForce/Upgrades.tw | 16 +++----
src/art/vector/Head.tw | 8 ++--
src/events/gameover.tw | 4 +-
src/events/intro/introSummary.tw | 2 +-
src/js/storyJS.tw | 4 ++
src/js/walkPastJS.tw | 6 +--
src/npc/databases/dSlavesDatabase.tw | 2 +-
src/pregmod/csec.tw | 2 +-
src/pregmod/editGenetics.tw | 2 +-
src/pregmod/managePersonalAffairs.tw | 10 ++--
src/pregmod/newChildIntro.tw | 4 +-
src/pregmod/seFCTVshows.tw | 20 ++++----
src/pregmod/widgets/pregmodBirthWidgets.tw | 4 +-
src/pregmod/widgets/pregmodWidgets.tw | 2 +-
src/pregmod/widgets/seBirthWidgets.tw | 2 +-
src/uncategorized/RETS.tw | 2 +-
src/uncategorized/newSlaveIntro.tw | 4 +-
src/uncategorized/reRecruit.tw | 2 +-
src/uncategorized/saGuardsYou.tw | 2 +-
src/uncategorized/saRules.tw | 2 +-
src/uncategorized/salon.tw | 50 ++++++++++----------
src/uncategorized/schoolroom.tw | 2 +-
src/uncategorized/seCoursing.tw | 6 +--
src/uncategorized/seIndependenceDay.tw | 2 +-
src/uncategorized/slaveInteract.tw | 2 +-
src/utility/birthWidgets.tw | 2 +-
30 files changed, 97 insertions(+), 88 deletions(-)
diff --git a/devNotes/inducedNCS.txt b/devNotes/inducedNCS.txt
index fb081be3fb7..15bd5c41445 100644
--- a/devNotes/inducedNCS.txt
+++ b/devNotes/inducedNCS.txt
@@ -43,7 +43,7 @@ Updated sa Long Term Effects.
that will be dealt with further down the line. Take the _youthDifference divide by four and add .25
to evenly break into 0 below 9, and 10 at 45, round to int to get the _youtheningLevel. Subtract
_youtheningLevel from 11 to find out the _youtheningRequirement
-
+
Every week, slaves that appear older than 8 year old lolis or shotas will have their NCSyouthening
incremented. Then this youthening is tested against the _youtheningRequirement, if at or better,
the NCS youthens the slave, and resets the NCSyouthening.
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 5eb0ca58ae4..e872f538fe3 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -266,6 +266,10 @@ window.canGetPregnant = function(slave) {
window.canBreed = function(slave1, slave2) {
if (!slave1 || !slave2) {
return null;
+ } else if (slave1.eggType == "sterile") {
+ return false;
+ } else if (slave2.ballType == "sterile") {
+ return false;
} else if (slave1.eggType == slave2.ballType) {
return true;
} else {
@@ -34806,7 +34810,7 @@ window.Count = function() {
if (V.SF.Facility.Toggle > 0) {
T.Base += T.SFF, T.max += T.SFFU;
}
-
+
if (V.terrain !== "oceanic") { T.LBU += T.GRU, T.LB += S.GiantRobot, T.Base += T.G, T.max += T.GU;
T.max += T.LBU, T.Base += T.LB;}
if (V.terrain === "oceanic" || V.terrain === "marine") {
@@ -34865,7 +34869,7 @@ window.Armoury = function() {
window.Drugs = function() {
const V = State.variables, S = V.SF.Squad;
var amphet = ``, phen = ``, steroid = ``, downer = ``, concen = ``, stimpack = ``, stabilizer = ``;
-
+
if (S.Drugs >= 1) amphet = `Amphetamines have been added to the cocktail at a low dosage to act as a stimulant, physical performance enhancer, cognition control enhancer. Some side-effects exist.`;
if (S.Drugs >= 2) phen = `Phencyclidine has been added to the cocktail at a low dosage as a dissociative psychotropic for soldiers in battle to introduce feelings of detachment, strength and invincibility, and aggression. Some side-effects reduce the tolerable dosage before soldiers go on uncontrollable violent outbreaks.`;
if (S.Drugs >= 3) steroid = `Testosterone is being produced for soldiers in training as a natural muscle growth stimulant and to invoke aggression.`;
@@ -35124,7 +35128,7 @@ window.HAT = function() {
window.Interactions = function() {
const V = State.variables, C = V.SF.Colonel, T = State.temporary;
var choice = ``, time = ``;
-
+
if (V.SF.Gift > 0){
if (V.choice == 1){
choice = `$SF.Caps is turning over spare capital in tribute this week. `;
@@ -35149,7 +35153,7 @@ window.Interactions = function() {
}}}
if (C.Talk + C.Fun > 0) time = `The Colonel is busy for the rest of the week, so the Lieutenant Colonel will assist you.`;
-
+
return `${time} <br>${choice}`;
};
@@ -35260,7 +35264,7 @@ window.SFBC = function() {
delete V.securityForceSubmarine;
delete V.securityForceHeavyAmphibiousTransport;
}
-
+
if (V.SF == undefined) {
if (V.securityForceEventSeen < 1) { V.securityForceActive = -1 } else { V.securityForceActive = 2 };
V.SF = {Toggle:V.SFMODToggle, Active:V.securityForceActive}; Init();
diff --git a/player variables documentation - Pregmod.txt b/player variables documentation - Pregmod.txt
index 6940565edbc..f0bb6410e8c 100644
--- a/player variables documentation - Pregmod.txt
+++ b/player variables documentation - Pregmod.txt
@@ -378,7 +378,7 @@ how many designer babies you've produced
slavesFathered:
-how many babies you are the father of
+how many slave babies you are the father of
slavesKnockedUp:
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index e8e2437b88d..491448d581e 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -3178,6 +3178,7 @@ eggType:
What species of ovum she produces.
"human"
+"sterile"
"dog"
"pig"
"horse"
@@ -3399,7 +3400,7 @@ accepts int
default cap is 200
skillE:
-Her skill as a entertainer.
+Her skill as an entertainer.
accepts int
default cap is 200
diff --git a/src/SpecialForce/Upgrades.tw b/src/SpecialForce/Upgrades.tw
index 9f9858fade6..82cc6a4307a 100644
--- a/src/SpecialForce/Upgrades.tw
+++ b/src/SpecialForce/Upgrades.tw
@@ -12,21 +12,21 @@
<<if $SF.Squad.Firebase < 5||_T1 && $SF.Squad.Firebase < _FU>>
-
+
<<set _cF = Math.ceil(100000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.Firebase/100)))>>
-
+
<<if $cash >= _cF>>
-
+
<<link "Upgrade Firebase">> <<set $SF.Upgrade = 1, $SF.Squad.Firebase++, $cash -= _cF>><<goto "Firebase">><</link>>
-
+
<<else>>//Cannot afford to upgrade the Firebase.//<</if>>
-
+
//Costs @@.yellowgreen;<<print cashFormat(_cF)>>@@ //
-
+
<<elseif $SF.Squad.Firebase == _FU>>//The Firebase has been fully upgraded.//
-
+
<<else>>//More upgrades are required to unlock the next tier.//
-
+
<</if>> <span style="float:right;"> <<print progress($SF.Squad.Firebase)>> </span><br>
diff --git a/src/art/vector/Head.tw b/src/art/vector/Head.tw
index 8590c0faa6b..bbdb8dfea9a 100644
--- a/src/art/vector/Head.tw
+++ b/src/art/vector/Head.tw
@@ -32,7 +32,7 @@
<<if $seeFaces > 0>>
<<if _artSlave.clothes != "restrictive latex">>
<<switch _artSlave.race>>
- <<case "white" "southern european">>
+ <<case "southern european" "white">>
<<if _artSlave.faceShape == "normal">>
<<include Art_Vector_Eyes_TypeB>>
<<include Art_Vector_Mouth_TypeA>>
@@ -148,7 +148,7 @@
<<include Art_Vector_Eyebrow_TypeC_Bushy>>
<</if>>
<</if>>
- <<case "asian" "pacific islander" "malay">>
+ <<case "asian" "malay" "pacific islander">>
<<if _artSlave.faceShape == "normal">>
<<include Art_Vector_Eyes_TypeA>>
<<include Art_Vector_Mouth_TypeC>>
@@ -264,7 +264,7 @@
<<include Art_Vector_Eyebrow_TypeA_Bushy>>
<</if>>
<</if>>
- <<case "latina" "amerindian">>
+ <<case "amerindian" "latina">>
<<if _artSlave.faceShape == "normal">>
<<include Art_Vector_Eyes_TypeB>>
<<include Art_Vector_Mouth_TypeE>>
@@ -1108,7 +1108,7 @@
/* ADDONS */
-<<if _artSlave.fuckdoll == 0 >> /* fuckdolly cannot be decorated */
+<<if _artSlave.fuckdoll == 0 >> /* fuckdolls cannot be decorated */
<<if _artSlave.collar == "dildo gag">>
<<include Art_Vector_Dildo_Gag>>
<</if>>
diff --git a/src/events/gameover.tw b/src/events/gameover.tw
index 84beb93e441..2af91afcddb 100644
--- a/src/events/gameover.tw
+++ b/src/events/gameover.tw
@@ -62,7 +62,7 @@
As the mercenaries break the battle lines and enter the arcology all hell breaks loose. The sectors are pillaged one by one, systematically and thoroughly. When they break in the penthouse they quickly capture and send you to their employers as proof of their success.
Your personal story may continue, but that part of it worthy of retelling has now ended.
<</if>>
-
+
<br><br>
''GAME OVER''
<<elseif $gameover == "Rebellion defeat">>
@@ -74,7 +74,7 @@
As the furious horde of citizens invades your penthouse you are left a few precious seconds to decide your fate. You embrace for the last time your faithful revolver and just as the rebels break through your doors you squeeze the trigger.
The end of your story has come and your arcology is now in the hands of whoever will take control of the vermin that dared rise up this day.
<</if>>
-
+
<br><br>
''GAME OVER''
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 96956b0af4a..3295e62a64f 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -679,7 +679,7 @@ __''Player Character''__
<br>Your eyes are <<textbox "$PC.eyeColor" $PC.eyeColor "Intro Summary">>
and hair is <<textbox "$PC.hColor" $PC.hColor "Intro Summary">>.
-
+
<br>Your face is ''$PC.faceShape''.
[[Normal|Intro Summary][$PC.faceShape = "normal"]] |
[[Androgynous|Intro Summary][$PC.faceShape = "androgynous"]] |
diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index 8705bc8e030..2829314704a 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -264,6 +264,10 @@ window.canGetPregnant = function(slave) {
window.canBreed = function(slave1, slave2) {
if (!slave1 || !slave2) {
return null;
+ } else if (slave1.eggType == "sterile") {
+ return false;
+ } else if (slave2.ballType == "sterile") {
+ return false;
} else if (slave1.eggType == slave2.ballType) {
return true;
} else {
diff --git a/src/js/walkPastJS.tw b/src/js/walkPastJS.tw
index dbd4905311d..05f749b3523 100644
--- a/src/js/walkPastJS.tw
+++ b/src/js/walkPastJS.tw
@@ -11,7 +11,7 @@ window.primeSlave = function(activeSlave, seed) {
const He = capFirstChar(he), His = capFirstChar(his);
let _target = "";
let t = "";
- let race = (V.seeRace ? activeSlave.race : "");
+ let race = (V.seeRace ? activeSlave.race : "");
if (V.partner !== "relationship" || activeSlave.relationship == 1 || activeSlave.relationship == 2 || activeSlave.releaseRules == "restrictive") {
t += `${activeSlave.slaveName} `;
@@ -34,7 +34,7 @@ window.rivalSlave = function(activeSlave, seed) {
if (_partnerSlave != undefined) { /* potential problem point */
let race2 = (V.seeRace ? _partnerSlave.race : "");
-
+
t += " Meanwhile, ";
if (activeSlave.rivalry >= 3) {
t += `${_partnerSlave.slaveName}, whom ${he} hates, `;
@@ -62,7 +62,7 @@ window.walkPasts = function(slave, _seed) {
const He = capFirstChar(he), His = capFirstChar(his);
let _target = "";
let t = "";
- let race = (V.seeRace ? slave.race : "");
+ let race = (V.seeRace ? slave.race : "");
switch (slave.assignment) {
case "be your agent":
diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw
index 4dbe9f74d82..ef9fe8d10cc 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -485,7 +485,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
-<<set _HS.slaveName = "Zhao Li", _HS.birthName = "Zhao Li", _HS.origin = "She was caught and enslaved while working undercover.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 35, _HS.physicalAge = 35, _HS.visualAge = 35, _HS.ovaryAge = 35, _HS.health = 100, _HS.devotion = 100, _HS.muscles = 100, _HS.height = 175, _HS.race = "asian", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hStyle = "long, but tied into Chinese buns.", _HS.pubicHStyle = "in a strip", _HS.boobs = 755, _HS.butt = 4, _HS.face = 15, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clit = 1, _HS.clitPiercing = 3, _HS.clitSetting = "all", _HS.anus = 2, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.entertainSkill = 15, _HS.combatSkill = 1, _HS.clothes = "a comfortable bodysuit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = 100, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishStrength = 100, _HS.fetishKnown = 1, _HS.customDesc = "She was a once skilled police investigator. Even at her age, her long, enticing legs are proof that she still retains her natural strength and beauty.", _HS.career = "a police detective">>
+<<set _HS.slaveName = "Zhao Li", _HS.birthName = "Zhao Li", _HS.origin = "She was caught and enslaved while working undercover.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 35, _HS.physicalAge = 35, _HS.visualAge = 35, _HS.ovaryAge = 35, _HS.health = 100, _HS.devotion = 100, _HS.muscles = 100, _HS.height = 175, _HS.race = "asian", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hStyle = "long, but tied into Chinese buns.", _HS.pubicHStyle = "in a strip", _HS.boobs = 755, _HS.butt = 4, _HS.face = 15, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.clit = 1, _HS.clitPiercing = 3, _HS.clitSetting = "all", _HS.anus = 2, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.entertainSkill = 15, _HS.combatSkill = 1, _HS.clothes = "a comfortable bodysuit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = 100, _HS.intelligenceImplant = 30, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishStrength = 100, _HS.fetishKnown = 1, _HS.customDesc = "She was once a skilled police investigator. Even at her age, her long, enticing legs are proof that she still retains her natural strength and beauty.", _HS.career = "a police detective">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw
index 9d1b8d9eca0..3bfb2073727 100644
--- a/src/pregmod/csec.tw
+++ b/src/pregmod/csec.tw
@@ -277,7 +277,7 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a
<</replace>>
<<set $nextButton = "Back">><<UpdateNextButton>> /* unlock Continue button */
<</link>>
- //Will cost a onetime <<print cashFormat(50)>>//
+ //Will cost a one-time <<print cashFormat(50)>>//
<</if>>
<br><<link '...sent to a citizen school.'>>
<<replace #_disposition>>
diff --git a/src/pregmod/editGenetics.tw b/src/pregmod/editGenetics.tw
index ae63450e7ad..381fcd0db3a 100644
--- a/src/pregmod/editGenetics.tw
+++ b/src/pregmod/editGenetics.tw
@@ -35,7 +35,7 @@
</tr>
<tr>
<th>Nationality</th><td colspan="2" class="editor string-editor" data-param="nationality"><%- s.nationality %></td>
- <th>Ethnicity</th><td colspan="2" class="editor choice-editor" data-param="origRace" data-choices="amerindian, asian, black, indo-aryan, latina, middle eastern, pacific islander, semitic, southern european, white, mixed race"><%- s.origRace %></td>
+ <th>Ethnicity</th><td colspan="2" class="editor choice-editor" data-param="origRace" data-choices="amerindian, asian, black, indo-aryan, latina, malay, middle eastern, mixed race, pacific islander, semitic, southern european, white"><%- s.origRace %></td>
<th>Career</th><td><i><%- s.career ? s.career : '' %></i></td>
</tr>
<tr>
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index df0e3a73b1e..d48be24d95a 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -8,7 +8,7 @@
<</if>>
You pause for a moment from your busy day to day life to return to <<if $masterSuite != 0>>$masterSuiteName<<else>>your room<</if>> to consider some things about yourself.
-<br>You take yourself in a full length mirror. You are <<if $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan" || $activeSlave.race == "amerindian">>an<<else>>a<</if>> $PC.race <<if $PC.dick == 1 && $PC.vagina == 1>>futanari<<elseif $PC.dick == 1>>man<<else>>woman<</if>> with<<if $PC.markings == "freckles">> freckled<<elseif $PC.markings == "heavily freckled">> heavily freckled<</if>> <<print $PC.skin>> skin, $PC.hColor hair, $PC.eyeColor eyes and a perfect $PC.faceShape face.
+<br>You take yourself in a full length mirror. You are <<if $activeSlave.race == "amerindian" || $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan">>an<<else>>a<</if>> $PC.race <<if $PC.dick == 1 && $PC.vagina == 1>>futanari<<elseif $PC.dick == 1>>man<<else>>woman<</if>> with<<if $PC.markings == "freckles">> freckled<<elseif $PC.markings == "heavily freckled">> heavily freckled<</if>> <<print $PC.skin>> skin, $PC.hColor hair, $PC.eyeColor eyes and a perfect $PC.faceShape face.
<<if $PC.actualAge >= 65>>
You're @@.orange;$PC.actualAge@@ and definitely feeling it.<<if $PC.visualAge > $PC.actualAge>> You've taken measures to @@.lime;look an older $PC.visualAge,@@ though perhaps it might be time to undo it.<<elseif $PC.visualAge < $PC.actualAge>> You've taken measures to @@.lime;look a younger $PC.visualAge,@@ now if only your body agreed with your looks.<</if>>
<<elseif $PC.actualAge >= 50>>
@@ -93,17 +93,17 @@ Around back;
<<if $PC.origHColor != "dark blue">>| [[Blue-Violet|Manage Personal Affairs][$PC.hColor = "dark blue"]]<</if>>
<<if $PC.origHColor != "dark brown">>| [[Dark Brown|Manage Personal Affairs][$PC.hColor = "dark brown"]]<</if>>
<<if $PC.origHColor != "dark orchid">>| [[Blue-Violet|Manage Personal Affairs][$PC.hColor = "dark orchid"]]<</if>>
- <<if $PC.origHColor != "ginger">>| [[Ginger|Manage Personal Affairs][$PC.hColor = "ginger"]]<</if>>
+ <<if $PC.origHColor != "ginger">>| [[Ginger|Manage Personal Affairs][$PC.hColor = "ginger"]]<</if>>
<<if $PC.origHColor != "golden">>| [[Golden|Manage Personal Affairs][$PC.hColor = "golden"]]<</if>>
- <<if $PC.origHColor != "green">>| [[Green|Manage Personal Affairs][$PC.hColor = "green"]]<</if>>
- <<if $PC.origHColor != "green-yellow">>| [[Blue-Violet|Manage Personal Affairs][$PC.hColor = "green-yellow"]]<</if>>
+ <<if $PC.origHColor != "green">>| [[Green|Manage Personal Affairs][$PC.hColor = "green"]]<</if>>
+ <<if $PC.origHColor != "green-yellow">>| [[Blue-Violet|Manage Personal Affairs][$PC.hColor = "green-yellow"]]<</if>>
<<if $PC.origHColor != "grey">>| [[Grey|Manage Personal Affairs][$PC.hColor = "grey"]]<</if>>
<<if $PC.origHColor != "hazel">>| [[Hazel|Manage Personal Affairs][$PC.hColor = "hazel"]]<</if>>
<<if $PC.origHColor != "jet black">>| [[Black|Manage Personal Affairs][$PC.hColor = "jet black"]]<</if>>
<<if $PC.origHColor != "pink">>| [[Pink|Manage Personal Affairs][$PC.hColor = "pink"]]<</if>>
<<if $PC.origHColor != "platinum blonde">>| [[Platinum Blonde|Manage Personal Affairs][$PC.hColor = "platinum blonde"]]<</if>>
<<if $PC.origHColor != "purple">>| [[Blue-Violet|Manage Personal Affairs][$PC.hColor = "purple"]]<</if>>
- <<if $PC.origHColor != "red">>| [[Red|Manage Personal Affairs][$PC.hColor = "red"]]<</if>>
+ <<if $PC.origHColor != "red">>| [[Red|Manage Personal Affairs][$PC.hColor = "red"]]<</if>>
<<if $PC.origHColor != "sea green">>| [[Blue-Violet|Manage Personal Affairs][$PC.hColor = "sea green"]]<</if>>
<<if $PC.origHColor != "silver">>| [[Silver|Manage Personal Affairs][$PC.hColor = "silver"]]<</if>>
<<if $PC.origHColor != "strawberry-blonde">>| [[Strawberry-blonde|Manage Personal Affairs][$PC.hColor = "strawberry-blonde"]]<</if>>
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index 4508bb28cd1..2f1351cdd26 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -648,10 +648,10 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
<<replace "#result">>
You drag $him to the body modification studio and strap $him down with $his $brandTarget clear and defenseless. $He doesn't understand what's on, becoming even more confused as disinfectant is applied to $his $brandTarget. $He can't see the approaching brand, but eventually $he feels the radiated heat on $his skin and manages to get one inarticulate, wordless noise of terror out before the dreadful sizzling noise and the sweet smell of burning flesh. If $he trusted you at all before, @@.mediumorchid;$he doesn't now,@@ and $he's got the @@.gold;agonizing@@ @@.red;injury@@ to remind $him should $he start to forget.
<<if ($arcologies[0].FSSubjugationistRace == $activeSlave.race) && ($arcologies[0].FSSubjugationist > 0)>>
- Society @@.green;approves@@ of your purchase and branding of a inferior $activeSlave.race person; this advances the idea that $activeSlave.race people ought to be enslaved.
+ Society @@.green;approves@@ of your purchase and branding of an inferior $activeSlave.race person; this advances the idea that $activeSlave.race people ought to be enslaved.
<<= FSChange("Subjugationist", 2)>>
<<elseif ($arcologies[0].FSSupremacistRace == $activeSlave.race) && ($arcologies[0].FSSupremacist > 0)>>
- Society @@.red;disapproves@@ of your purchase and branding of a $activeSlave.race person; this reduces support for the idea that $activeSlave.race people are superior.
+ Society @@.red;disapproves@@ of your purchase and branding of <<if $activeSlave.race == "amerindian" || $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan">>an<<else>>a<</if>> $activeSlave.race person; this reduces support for the idea that $activeSlave.race people are superior.
<<= FSChange("Supremacist", -2)>>
<</if>>
<</replace>>
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index 52deeb5b19d..8cf8e0adb37 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -151,12 +151,12 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<<set $activeSlave.attrXX = random(60,90)>>
<<set $activeSlave.attrKnown = 1>>
<<set $activeSlave.fetishKnown = 1>>
- <<set $activeSlave.fetish = either("pregnancy", "pregnancy", "pregnancy", "humiliation", "cumslut", "cumslut", "submissive")>>
+ <<set $activeSlave.fetish = either("cumslut", "cumslut", "humiliation", "pregnancy", "pregnancy", "pregnancy", "submissive")>>
<<set $activeSlave.fetishStrength = random(70,100)>>
<<set $activeSlave.sexualFlaw = "none">>
<<set $activeSlave.behavioralFlaw = "none">>
- <<set $activeSlave.behavioralQuirk = either("none", "none", "advocate", "funny", "insecure")>>
- <<set $activeSlave.sexualQuirk = either("none", "romantic", "caring")>>
+ <<set $activeSlave.behavioralQuirk = either("advocate", "funny", "insecure", "none", "none")>>
+ <<set $activeSlave.sexualQuirk = either("caring", "none", "romantic")>>
<<set $activeSlave.entertainSkill = random(50,80)>>
<<set $activeSlave.oralSkill = random(20,60)>>
<<set $activeSlave.analSkill = 0>>
@@ -217,14 +217,14 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<<set $activeSlave.sexualFlaw = "breeder">>
<<set $activeSlave.behavioralFlaw = "none">>
<<set $activeSlave.behavioralQuirk = "none">>
- <<set $activeSlave.sexualQuirk = either("romantic", "caring", "caring")>>
+ <<set $activeSlave.sexualQuirk = either("caring", "caring", "romantic")>>
<<set $activeSlave.chem = 0>>
<<set $activeSlave.health = 75>>
<<set $activeSlave.intelligence = random(-15,80)>>
<<set $activeSlave.intelligenceImplant = 15>>
<<set $activeSlave.origin = "You purchased her from FCTV's Home Slave Shopping stream channel.">>
<<set $activeSlave.career = setup.youngCareers.random()>>
- <<if $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan" || $activeSlave.race == "amerindian">>an<<else>>a<</if>> $activeSlave.race breeder, young and healthy with an advanced <<if $seeHyperPreg == 0>><i>@@.pink;super pregnancy.@@</i><<else>>@@.pink;hyper pregnancy.@@<</if>> $activeSlave.slaveName is really into making babies, and has even had her hips surgically widened to help her carry a large brood. Our tests here at HSS show that she's pregnant with $activeSlave.pregType babies!"
+ <<if $activeSlave.race == "amerindian" || $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan">>an<<else>>a<</if>> $activeSlave.race breeder, young and healthy with an advanced <<if $seeHyperPreg == 0>><i>@@.pink;super pregnancy.@@</i><<else>>@@.pink;hyper pregnancy.@@<</if>> $activeSlave.slaveName is really into making babies, and has even had her hips surgically widened to help her carry a large brood. Our tests here at HSS show that she's pregnant with $activeSlave.pregType babies!"
<<elseif $randShow == 5>> /* MILF */
<<set $activeSlaveOneTimeMinAge = 36>>
<<set $activeSlaveOneTimeMaxAge = 40>>
@@ -248,7 +248,7 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<<set $activeSlave.attrXX = random(40,85)>>
<<set $activeSlave.attrKnown = 1>>
<<set $activeSlave.fetishKnown = 1>>
- <<set $activeSlave.fetish = either("pregnancy", "pregnancy", "humiliation", "buttslut", "buttslut", "cumslut", "cumslut", "submissive")>>
+ <<set $activeSlave.fetish = either("buttslut", "buttslut", "cumslut", "cumslut", "humiliation", "pregnancy", "pregnancy", "submissive")>>
<<set $activeSlave.fetishStrength = random(70,100)>>
<<set $activeSlave.sexualFlaw = "none">>
<<set $activeSlave.behavioralFlaw = "none">>
@@ -268,7 +268,7 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<<set $activeSlave.birthsTotal = random(1,3)>>
<<set $activeSlave.career = setup.youngCareers.random()>>
<<set $activeSlave.origin = "You purchased her from FCTV's Home Slave Shopping stream channel.">>
- <<if $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan" || $activeSlave.race == "amerindian">>an<<else>>a<</if>> $activeSlave.race @@.pink;MILF.@@ She's no longer young, but still quite attractive. She has been a slave for many years now, and has been trained well. She also has a good array of skills that you can put to use. She has huge tits and a huge ass to play with, but she'd also make good stock for a breeding program."
+ <<if $activeSlave.race == "amerindian" || $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan">>an<<else>>a<</if>> $activeSlave.race @@.pink;MILF.@@ She's no longer young, but still quite attractive. She has been a slave for many years now, and has been trained well. She also has a good array of skills that you can put to use. She has huge tits and a huge ass to play with, but she'd also make good stock for a breeding program."
<<elseif $randShow == 6>> /* discount young hottie */
<<set $activeSlaveOneTimeMaxAge = 25>>
<<set $oneTimeDisableDisability = 1>>
@@ -294,7 +294,7 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<<set $activeSlave.oralSkill = 15>>
<<set $activeSlave.analSkill = 15>>
<<set $activeSlave.whoreSkill = 15>>
- <<set $activeSlave.sexualFlaw = either("hates oral", "hates anal", "hates penetration", "idealistic")>>
+ <<set $activeSlave.sexualFlaw = either("hates anal", "hates oral", "hates penetration", "idealistic")>>
<<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy", "hates men")>>
<<set $activeSlave.energy = 10>>
<<set $activeSlave.fetish = "none">>
@@ -355,7 +355,7 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<<set $activeSlave.devotion = random(50,80)>>
<<set $activeSlave.trust = random(50,80)>>
<<set $activeSlave.origin = "You purchased her from FCTV's Home Slave Shopping stream channel.">>
- <<if $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan" || $activeSlave.race == "amerindian">>an<<else>>a<</if>> $activeSlave.race cum cow. Just take a look at that pair of @@.pink;massive balls.@@ This slave also has a prostate stimulating hormone implant to ramp up her cum production even further. She's a perfect fit for your dairy, or even your own kitchen creamery!"
+ <<if $activeSlave.race == "amerindian" || $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan">>an<<else>>a<</if>> $activeSlave.race cum cow. Just take a look at that pair of @@.pink;massive balls.@@ This slave also has a prostate stimulating hormone implant to ramp up her cum production even further. She's a perfect fit for your dairy, or even your own kitchen creamery!"
<br><br>The woman helping to display the slaves shows her hand to the camera; it's coated in a sticky layer of precum from handling the cum cow's equipment.
<</if>>
<<slaveCost $activeSlave>>
@@ -767,7 +767,7 @@ The offered price is <<print cashFormat($slaveCost)>>.
<<elseif $showTwelve == 8>>
The random function has brought up another episode of that drama series for you.
<br><br>Cathy's ire had faded somewhat by the time they made it home. A soft chime rang out as they walked in the door, followed shortly by a faint voice calling out, "Welcome home," from further in the house. The trio put the groceries on the kitchen island and began to put them away. The background murmur of a TV and the faint roar of a hair dryer were coming from the next room. Scott was about to walk into the room, but he paused and looked at the plushie in his hand. He turned and pressed it into June's hands, giving her a meaningful look. She looked at the doll for a moment before returning his look with a smile. Message received. He gave her a quick nod before walking through the door.
- <br><br>At first glance, the living room didn't look too dissimilar from something of an old-world home decorating magazine. The furniture was well made and comfortable, but was noticeably designed with more robust figures in mind. Books and magazines laid scattered across a number of coffee and end tables. An old copy of Milkers Monthly was opened to a video of a cowslave demonstrating the use of a of cleavage vibrator. The shelves on the far wall held a number of statues, their brass figures bearing immobilizing breasts. And on the end was a 1st place ribbon from a school milking competition.
+ <br><br>At first glance, the living room didn't look too dissimilar from something of an old-world home decorating magazine. The furniture was well made and comfortable, but was noticeably designed with more robust figures in mind. Books and magazines laid scattered across a number of coffee and end tables. An old copy of Milkers Monthly was opened to a video of a cowslave demonstrating the use of a cleavage vibrator. The shelves on the far wall held a number of statues, their brass figures bearing immobilizing breasts. And on the end was a 1st place ribbon from a school milking competition.
<br><br>Annie sat on the couch with a towel around her shoulders, only wearing her exosuit. She relaxed as Sadie went over her vast cleavage with a hair dryer and a towel, letting out noises of contentment as she luxuriated in Sadie's ministrations. Sarah was cuddled up to her mother, her hair still damp from the shower. Scott sat down on the couch and pulled Sarah onto his lap before moving closer to his wife. Sarah just made herself comfortable while Annie leaned over to give him a kiss. "Everything go alright?" He patted his wife's breast reassuringly. "There was a little bump or two, but it went alright. I'll tell you about it later."
<br><br>Sarah turned around to face her father. "Did you get it?" she asked expectantly. He tilted his head in faux confusion, "Get what?" She frowned at him and said in an annoyed tone, "Daddy." A plushie peeked over from behind the couch for a moment before dipping back down. Sarah focused on the spot the plushie had just inhabited with laser intensity before turning to give him an accusing look. Scott did his best to look confused. "What is it sweetheart?"
<br><br>The plushie popped back up and began to move along the back of the couch in a parody of walking. The doll stopped at Scott's shoulder and prodded it with a tiny hand. "Oh, hi Tabby. What brings you here?" The plushie moved closer to his ear. "You're here to keep Sarah company? That's very sweet of you." Sarah let out a piteous whine, "Daddy." Scott appeared to be too enthralled with his diminutive conversation partner to hear her. "What's that? You're also here to make sure she eats her greens, clean her toys, and does her homework?" He gave Sarah a dubious glance and turned to whisper to the plushie, sotto voce, "I think that's bit of a tall order." Sarah pouted at her father, but grudging said, "Okay"
diff --git a/src/pregmod/widgets/pregmodBirthWidgets.tw b/src/pregmod/widgets/pregmodBirthWidgets.tw
index 935c24e38d2..7559a959aed 100644
--- a/src/pregmod/widgets/pregmodBirthWidgets.tw
+++ b/src/pregmod/widgets/pregmodBirthWidgets.tw
@@ -940,7 +940,7 @@
<<case "be the DJ">>
<<if (random(1,20) > $suddenBirth)>>
- $He heads to a private room in the back of the club accompanied by a influential patron. $He settles $himself onto his lap and begins working on <<if $slaves[$i].birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, basking in his attention. Placing $his child outside the room, $he returns to pleasure $his tease.
+ $He heads to a private room in the back of the club accompanied by an influential patron. $He settles $himself onto his lap and begins working on <<if $slaves[$i].birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, basking in his attention. Placing $his child outside the room, $he returns to pleasure $his tease.
<<else>>
While DJing $clubName, $slaves[$i].slaveName's water breaks. $He can't stop $his setlist without drawing attention, so $he tries $his best to ride out the contractions. As soon as the opportunity arises, $he attempts to sneak off stage. However, a number of fans block $his progress keeping $him on stage. Before long the contractions are too much to bear and $he drops to the ground.
<<set $humiliation = 1>>
@@ -960,7 +960,7 @@
<<case "be the Madam">>
<<if (random(1,20) > $suddenBirth)>>
- $He heads to a private room in the back of the club accompanied by a influential patron. $He settles $himself onto his lap and begins working on birthing <<if $slaves[$i].birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, basking in his attention as he strips $him. Placing $his child outside the room, $he returns to get more intimate with $his catch.
+ $He heads to a private room in the back of the club accompanied by an influential patron. $He settles $himself onto his lap and begins working on birthing <<if $slaves[$i].birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, basking in his attention as he strips $him. Placing $his child outside the room, $he returns to get more intimate with $his catch.
<<else>>
While managing $brothelName, $slaves[$i].slaveName's water breaks. Knowing $he lacks the time to leave, $he sets up a sign reading "Birthshow <<print cashFormat(100)>> a viewer" and takes a seat.
<<set $humiliation = 1>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 73fd353e12c..14a9853e518 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -862,7 +862,7 @@ $activeSlave.slaveName is up for review:
<<case "Chinese">>
and, in keeping with $his heritage, a Norinco QBZ-95-1 bullpup assault rifle
<<case "Colombian">>
- and, in keeping with $his heritage, a Indumil ACE 22 assault rifle
+ and, in keeping with $his heritage, an Indumil ACE 22 assault rifle
<<case "Croatian">>
and, in keeping with $his heritage, an HS Produkt VHS-2 bullpup assault rifle
<<case "Cuban">>
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index 7853318dfda..dead0f04ad0 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -970,7 +970,7 @@ All in all,
<<set $breederOrphanageTotal += _count, $slaveOrphanageTotal -= _count>>
<</replace>>
<</link>>
- //Will cost a onetime <<print cashFormat(50)>>// |
+ //Will cost a one-time <<print cashFormat(50)>>// |
<</if>>
<<link 'Send them to a citizen school'>>
<<replace `"#" + $dispositionId`>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 13cd1b47d1f..9936b9e9262 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -2104,7 +2104,7 @@ $he adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of
<<else>>
$activeSlave.slaveName clears $his throat uncomfortably, not really sure what to do, and obviously reluctant to grab $subSlave.slaveName and rape $him. $subSlave.slaveName resolves $his dilemma for $him, and <<if _vaginal>>gets down on the ground, spreading _his2 legs<<if $subSlave.belly >= 5000>> to either side of _his2 <<if $subSlave.bellyPreg >= 3000>>_belly pregnancy<<else>>_belly rounded belly<</if>><</if>> and offering _his2 pussy<<else>>gets down on _his2 knees, arching _his2 back and presenting _his2 asspussy<</if>> without resistance. Relieved, $activeSlave.slaveName gets <<if _vaginal>>on top of _him2<<else>>behind _him2<</if>> and starts to fuck.
<</if>>
- "Thank<<s>>, <<Master>>," pants $activeSlave.slaveName as $he humps away. "I'm @@.mediumaquamarine;looking forward@@ to being able to do thi<<s>> whenever I want." $subSlave.slaveName gasps, from <<if _vaginal>>down under $activeSlave.slaveName<<else>>where $activeSlave.slaveName has _his2 face ground against the floor<</if>>. Apparently, _he2 hadn't realized that this wasn't a onetime thing, and is @@.gold;none too pleased@@ by having to give $activeSlave.slaveName _his2 <<if _vaginal>>pussy<<else>>ass<</if>> whenever $he wants it.
+ "Thank<<s>>, <<Master>>," pants $activeSlave.slaveName as $he humps away. "I'm @@.mediumaquamarine;looking forward@@ to being able to do thi<<s>> whenever I want." $subSlave.slaveName gasps, from <<if _vaginal>>down under $activeSlave.slaveName<<else>>where $activeSlave.slaveName has _his2 face ground against the floor<</if>>. Apparently, _he2 hadn't realized that this wasn't a one-time thing, and is @@.gold;none too pleased@@ by having to give $activeSlave.slaveName _his2 <<if _vaginal>>pussy<<else>>ass<</if>> whenever $he wants it.
<<set $activeSlave.trust += 3, $activeSlave.penetrativeCount++, $penetrativeTotal++>>
<<if _vaginal>>
<<set $subSlave.trust -= 3, $subSlave.vaginalCount++, $vaginalTotal++>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 49855a5ddbb..0dda9a4896a 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -1002,10 +1002,10 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<replace "#introResult">>
You drag $him to the body modification studio and strap $him down with $his $brandTarget clear and defenseless. $He doesn't understand what's coming for a while, even as disinfectant is applied to $his $brandTarget. $He can't see the approaching brand, but eventually $he feels the radiated heat on $his skin and manages to get one inarticulate, wordless noise of terror out before the dreadful sizzling noise and the sweet smell of burning flesh. If $he didn't know $he was a slave before, @@.mediumorchid;$he does now,@@ and $he's got the @@.gold;agonizing@@ @@.red;injury@@ to prove it.
<<if ($arcologies[0].FSSubjugationistRace == $activeSlave.race) && ($arcologies[0].FSSubjugationist > 0)>>
- Society @@.green;approves@@ of your purchase and branding of a inferior $activeSlave.race person; this advances the idea that $activeSlave.race people ought to be enslaved.
+ Society @@.green;approves@@ of your purchase and branding of an inferior $activeSlave.race person; this advances the idea that $activeSlave.race people ought to be enslaved.
<<= FSChange("Subjugationist", 2)>>
<<elseif ($arcologies[0].FSSupremacistRace == $activeSlave.race) && ($arcologies[0].FSSupremacist > 0)>>
- Society @@.red;disapproves@@ of your purchase and branding of a $activeSlave.race person; this reduces support for the idea that $activeSlave.race people are superior.
+ Society @@.red;disapproves@@ of your purchase and branding of <<if $activeSlave.race == "amerindian" || $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan">>an<<else>>a<</if>> $activeSlave.race person; this reduces support for the idea that $activeSlave.race people are superior.
<<= FSChange("Supremacist", -2)>>
<</if>>
<</replace>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 47dbd057877..a02c78dd671 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -2232,7 +2232,7 @@ After the fighting died down, they found a woman inside the compound, harshly us
A report about a successful operation by your mercenaries waits at your desk when you come in the office this morning. Turns out they tracked a brutal gang that was waylaying travelers near the Free City and stormed their hideout last night. All of the criminals were killed in the process, preventing proper punishments or more... creative uses for them. From the videos of the raid and the fanatic way the men fought to the last man, it seems that this was unavoidable, so you send a quick note of approval to their commander.
<br><br>
-After the fighting died down, your men found a woman inside the compound, harshly used and seemingly the center of many gang-bangs there. A scan of $his biometric data revealed that $he is in fact a slave that ran away about two months ago - into a much worse situation after being caught by the gang, as it turns out. Countless dicks have stretched $his pussy and ass wide,<<if $activeSlave.physicalAge >= $activeSlave.pubertyAge>> $he is pregnant with some dead criminal bastard's offspring and<</if>> they've decorated $him with numerous piercings. As you notify the owner that her property has been retrieved, the woman is distraught at the state of her merchandise, grumbling that a once quite valuable girl is now worth almost nothing. Seems she's unwilling to invest her time and money in caring for the slave. With a sigh, the slave-mistress whips out her smart-phone and starts to set up a selling offer in one of the popular slave trading apps.
+After the fighting died down, your men found a woman inside the compound, harshly used and seemingly the center of many gang-bangs there. A scan of $his biometric data revealed that $he is in fact a slave that ran away about two months ago - into a much worse situation after being caught by the gang, as it turns out. Countless dicks have stretched $his pussy and ass wide,<<if $activeSlave.physicalAge >= $activeSlave.pubertyAge>> $he is pregnant with some dead criminal bastard's offspring and<</if>> they've decorated $him with numerous piercings. As you notify the owner that her property has been retrieved, the woman is distraught at the state of her merchandise, grumbling that a once quite valuable $girl is now worth almost nothing. Seems she's unwilling to invest her time and money in caring for the slave. With a sigh, the slave-mistress whips out her smart-phone and starts to set up a selling offer in one of the popular slave trading apps.
<br><br>
//The young woman has been used and abused quite a bit, making $him deathly terrified about what might happen to $him next. $He has partially resigned to be nothing but a fuckhole. You can get $him cheap from the owner, it'll be just <<print cashFormat(1000)>>.//
diff --git a/src/uncategorized/saGuardsYou.tw b/src/uncategorized/saGuardsYou.tw
index 96f0314ca8b..cf1fd75a450 100644
--- a/src/uncategorized/saGuardsYou.tw
+++ b/src/uncategorized/saGuardsYou.tw
@@ -158,7 +158,7 @@ $His constant presence is
<<if $deadliness > 6>>
extremely intimidating, @@.green;adding much to your reputation.@@
<<if $slaves[$i].career == "an arcology owner">>
- You've made a onetime rival arcology owner into a deadly and loyal protector, a feat of slaveownership that's @@.green;internationally famous.@@
+ You've made a one-time rival arcology owner into a deadly and loyal protector, a feat of slaveownership that's @@.green;internationally famous.@@
<<set $repGain += $deadliness*10>>
<</if>>
<<elseif $deadliness > 3>>
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 1d76d4429cf..218c7abd07e 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -148,7 +148,7 @@
<<set $slaves[$i].lactationDuration = 2, $slaves[$i].boobs -= $slaves[$i].boobsMilk, $slaves[$i].boobsMilk = 0>>
<</if>>
<</if>>
-
+
$He does $his best for you, so $he frequently deserves a reward and never needs to be punished.
<<set _punishments = 0>>
<<set _rewards = 3>>
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index 3e6d4095789..7fc2de4a680 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -97,7 +97,7 @@
<br>
Iris:
- [[Amber|Salon][$artificialEyeColor = "amber"]]
+ [[Amber|Salon][$artificialEyeColor = "amber"]]
| [[Black|Salon][$artificialEyeColor = "black"]]
| [[Blue|Salon][$artificialEyeColor = "blue"]]
| [[Brown|Salon][$artificialEyeColor = "brown"]]
@@ -128,7 +128,7 @@
| [[Teary|Salon][$artificialEyeShape = "teary"]]
| [[Vacant|Salon][$artificialEyeShape = "vacant"]]
| [[Wide-Eyed|Salon][$artificialEyeShape = "wide-eyed"]]
-
+
<br>
Sclera:
[[White|Salon][$artificialEyeFill = "white"]]
@@ -231,33 +231,33 @@
| [[Black|Salon][$primaryHairColor = "black"]]
| [[Blazing Red|Salon][$primaryHairColor = "blazing red"]]
| [[Blonde|Salon][$primaryHairColor = "blonde"]]
- | [[Blue-Violet|Salon][$primaryHairColor = "blue-violet"]]
+ | [[Blue-Violet|Salon][$primaryHairColor = "blue-violet"]]
| [[Blue|Salon][$primaryHairColor = "blue"]]
| [[Brown|Salon][$primaryHairColor = "brown"]]
| [[Burgundy|Salon][$primaryHairColor = "burgundy"]]
| [[Chestnut|Salon][$primaryHairColor = "chestnut"]]
| [[Chocolate|Salon][$primaryHairColor = "chocolate brown"]]
| [[Copper|Salon][$primaryHairColor = "copper"]]
- | [[Dark Blue|Salon][$primaryHairColor = "dark blue"]]
+ | [[Dark Blue|Salon][$primaryHairColor = "dark blue"]]
| [[Dark Brown|Salon][$primaryHairColor = "dark brown"]]
- | [[Dark Orchid|Salon][$primaryHairColor = "dark orchid"]]
- | [[Deep Red|Salon][$primaryHairColor = "deep red"]]
- | [[Ginger|Salon][$primaryHairColor = "ginger"]]
+ | [[Dark Orchid|Salon][$primaryHairColor = "dark orchid"]]
+ | [[Deep Red|Salon][$primaryHairColor = "deep red"]]
+ | [[Ginger|Salon][$primaryHairColor = "ginger"]]
| [[Golden|Salon][$primaryHairColor = "golden"]]
- | [[Green-yellow|Salon][$primaryHairColor = "green-yellow"]]
+ | [[Green-yellow|Salon][$primaryHairColor = "green-yellow"]]
| [[Green|Salon][$primaryHairColor = "green"]]
| [[Grey|Salon][$primaryHairColor = "grey"]]
| [[Hazel|Salon][$primaryHairColor = "hazel"]]
| [[Jet Black|Salon][$primaryHairColor = "jet black"]]
| [[Neon Blue|Salon][$primaryHairColor = "neon blue"]]
| [[Neon Green|Salon][$primaryHairColor = "neon green"]]
- | [[Neon Pink|Salon][$primaryHairColor = "neon pink"]]
- | [[Pink|Salon][$primaryHairColor = "pink"]]
+ | [[Neon Pink|Salon][$primaryHairColor = "neon pink"]]
+ | [[Pink|Salon][$primaryHairColor = "pink"]]
| [[Platinum Blonde|Salon][$primaryHairColor = "platinum blonde"]]
- | [[Purple|Salon][$primaryHairColor = "purple"]]
+ | [[Purple|Salon][$primaryHairColor = "purple"]]
| [[Red|Salon][$primaryHairColor = "red"]]
| [[Sea Green|Salon][$primaryHairColor = "sea green"]]
- | [[Silver|Salon][$primaryHairColor = "silver"]]
+ | [[Silver|Salon][$primaryHairColor = "silver"]]
| [[Strawberry-Blonde|Salon][$primaryHairColor = "strawberry-blonde"]]
| [[White|Salon][$primaryHairColor = "white"]]
<br>
@@ -284,7 +284,7 @@
<br>
<<if $activeSlave.hLength > 1>>
Style $his hair:
- [[Afro|Salon][$activeSlave.hStyle = "afro",$cash -= $modCost]]
+ [[Afro|Salon][$activeSlave.hStyle = "afro",$cash -= $modCost]]
| [[Braided|Salon][$activeSlave.hStyle = "braided",$cash -= $modCost]]
| [[Cornrows|Salon][$activeSlave.hStyle = "cornrows",$cash -= $modCost]]
| [[Curled|Salon][$activeSlave.hStyle = "curled",$cash -= $modCost]]
@@ -359,33 +359,33 @@
| [[Black|Salon][$primaryHairColor = "black"]]
| [[Blazing Red|Salon][$primaryHairColor = "blazing red"]]
| [[Blonde|Salon][$primaryHairColor = "blonde"]]
- | [[Blue-Violet|Salon][$primaryHairColor = "blue-violet"]]
+ | [[Blue-Violet|Salon][$primaryHairColor = "blue-violet"]]
| [[Blue|Salon][$primaryHairColor = "blue"]]
| [[Brown|Salon][$primaryHairColor = "brown"]]
| [[Burgundy|Salon][$primaryHairColor = "burgundy"]]
| [[Chestnut|Salon][$primaryHairColor = "chestnut"]]
| [[Chocolate|Salon][$primaryHairColor = "chocolate brown"]]
| [[Copper|Salon][$primaryHairColor = "copper"]]
- | [[Dark Blue|Salon][$primaryHairColor = "dark blue"]]
+ | [[Dark Blue|Salon][$primaryHairColor = "dark blue"]]
| [[Dark Brown|Salon][$primaryHairColor = "dark brown"]]
- | [[Dark Orchid|Salon][$primaryHairColor = "dark orchid"]]
- | [[Deep Red|Salon][$primaryHairColor = "deep red"]]
- | [[Ginger|Salon][$primaryHairColor = "ginger"]]
+ | [[Dark Orchid|Salon][$primaryHairColor = "dark orchid"]]
+ | [[Deep Red|Salon][$primaryHairColor = "deep red"]]
+ | [[Ginger|Salon][$primaryHairColor = "ginger"]]
| [[Golden|Salon][$primaryHairColor = "golden"]]
- | [[Green-yellow|Salon][$primaryHairColor = "green-yellow"]]
+ | [[Green-yellow|Salon][$primaryHairColor = "green-yellow"]]
| [[Green|Salon][$primaryHairColor = "green"]]
| [[Grey|Salon][$primaryHairColor = "grey"]]
| [[Hazel|Salon][$primaryHairColor = "hazel"]]
| [[Jet Black|Salon][$primaryHairColor = "jet black"]]
| [[Neon Blue|Salon][$primaryHairColor = "neon blue"]]
| [[Neon Green|Salon][$primaryHairColor = "neon green"]]
- | [[Neon Pink|Salon][$primaryHairColor = "neon pink"]]
- | [[Pink|Salon][$primaryHairColor = "pink"]]
+ | [[Neon Pink|Salon][$primaryHairColor = "neon pink"]]
+ | [[Pink|Salon][$primaryHairColor = "pink"]]
| [[Platinum Blonde|Salon][$primaryHairColor = "platinum blonde"]]
- | [[Purple|Salon][$primaryHairColor = "purple"]]
+ | [[Purple|Salon][$primaryHairColor = "purple"]]
| [[Red|Salon][$primaryHairColor = "red"]]
| [[Sea Green|Salon][$primaryHairColor = "sea green"]]
- | [[Silver|Salon][$primaryHairColor = "silver"]]
+ | [[Silver|Salon][$primaryHairColor = "silver"]]
| [[Strawberry-Blonde|Salon][$primaryHairColor = "strawberry-blonde"]]
| [[White|Salon][$primaryHairColor = "white"]]
<br>
@@ -434,7 +434,7 @@
<<else>>
Give $him a wig:
<</if>>
- [[Afro|Salon][$activeSlave.hStyle = "afro",$cash -= $modCost]]
+ [[Afro|Salon][$activeSlave.hStyle = "afro",$cash -= $modCost]]
| [[Braided|Salon][$activeSlave.hStyle = "braided",$cash -= $modCost]]
| [[Cornrows|Salon][$activeSlave.hStyle = "cornrows",$cash -= $modCost]]
| [[Curled|Salon][$activeSlave.hStyle = "curled",$cash -= $modCost]]
@@ -642,7 +642,7 @@ Dye or paint:
| [[Thick|Salon][$activeSlave.eyebrowFullness = "thick",$cash -= $modCost]]
| [[Tapered|Salon][$activeSlave.eyebrowFullness = "tapered",$cash -= $modCost]]
| [[Threaded|Salon][$activeSlave.eyebrowFullness = "threaded",$cash -= $modCost]]
- | [[Thin|Salon][$activeSlave.eyebrowFullness = "thin",$cash -= $modCost]]
+ | [[Thin|Salon][$activeSlave.eyebrowFullness = "thin",$cash -= $modCost]]
| [[Pencil-Thin|Salon][$activeSlave.eyebrowFullness = "pencil-thin",$cash -= $modCost]]
<<else>>
<br><br>$His eyebrows are completely hairless.
diff --git a/src/uncategorized/schoolroom.tw b/src/uncategorized/schoolroom.tw
index 1d3de43a188..cca4728b0f1 100644
--- a/src/uncategorized/schoolroom.tw
+++ b/src/uncategorized/schoolroom.tw
@@ -25,7 +25,7 @@ $schoolroomNameCaps is well-equipped, with wallscreens to display lessons. These
<<case "Degradationist">>
displaying a rote recitation of a slave's proper acceptance of her subhuman status.
<<case "Repopulation Focus">>
- reviewing a number a of sexual positions to accommodate a heavily pregnant girl.
+ reviewing a number of sexual positions to accommodate a heavily pregnant girl.
<<case "Eugenics">>
reviewing ways to better your owner's standing intermixed with exaggerated pregnancy horror stories focused on slave pregnancy.
<<case "Asset Expansionist">>
diff --git a/src/uncategorized/seCoursing.tw b/src/uncategorized/seCoursing.tw
index 03019b37969..73bf0203eda 100644
--- a/src/uncategorized/seCoursing.tw
+++ b/src/uncategorized/seCoursing.tw
@@ -169,7 +169,7 @@ The rules have been explained to the hares: they're to be freed if they can reac
<<if $origin == "virgin">>
is an appealingly young $activeSlave.race $girl, and has V symbols drawn over _his2 cunt and on _his2 lower back, in the interests of fairness. _He2's a @@.pink;double virgin.@@<<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is fastened around _his2 neck.<</if>>
<<elseif $origin == "heavily pregnant">>
- is <<if $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan" || $activeSlave.race == "amerindian">>an<<else>>a<</if>> $activeSlave.race $girl, young and healthy but @@.pink;heavily pregnant.@@ _He2's probably been selected to be a hare as a joke, or because someone hates _him2. <<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is attached to _his2 popped navel.<</if>>
+ is <<if $activeSlave.race == "amerindian" || $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan">>an<<else>>a<</if>> $activeSlave.race $girl, young and healthy but @@.pink;heavily pregnant.@@ _He2's probably been selected to be a hare as a joke, or because someone hates _him2. <<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is attached to _his2 popped navel.<</if>>
<<elseif $origin == "housewife">>
is <<if $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan" || $activeSlave.race == "amerindian">>an<<else>>a<</if>> $activeSlave.race $woman, no longer young, but attractive enough in a fake sort of way. _He2 has obviously been crying, and has probably been recently enslaved from a comfortable life, like that of a @@.pink;housewife or a trophy wife.@@<<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is fastened around _his2 neck.<</if>>
<<elseif $origin == "disobedient young">>
@@ -177,9 +177,9 @@ The rules have been explained to the hares: they're to be freed if they can reac
<<elseif $origin == "disobedient young dickgirl">>
is a strong young $activeSlave.race $girl with who retains _his2 cock and balls, and looks determined. Perhaps _he2's a @@.pink;resistant dickgirl@@ who's been difficult to turn into a good $girl.<<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is fastened around _his2 cock.<</if>>
<<elseif $origin == "huge balled">>
- is <<if $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan" || $activeSlave.race == "amerindian">>an<<else>>a<</if>> $activeSlave.race slave whose distinguishing characteristic is a dangling scrotum and a pair of @@.pink;huge balls.@@ This impediment bumps against _his2 thighs as _he2's made ready.<<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is fastened around _his2 hefty testicles.<</if>>
+ is <<if $activeSlave.race == "amerindian" || $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan">>an<<else>>a<</if>> $activeSlave.race slave whose distinguishing characteristic is a dangling scrotum and a pair of @@.pink;huge balls.@@ This impediment bumps against _his2 thighs as _he2's made ready.<<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is fastened around _his2 hefty testicles.<</if>>
<<elseif $origin == "feminized">>
- is <<if $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan" || $activeSlave.race == "amerindian">>an<<else>>a<</if>> $activeSlave.race bitch with a tiny dick who has been @@.pink;heavily feminized,@@ yet seems terrified and very new to slavery. _His2 fake tits and girly behavior must be from _his2 life before _he2 was a slave.<<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is fastened around _his2 neck.<</if>>
+ is <<if $activeSlave.race == "amerindian" || $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan">>an<<else>>a<</if>> $activeSlave.race bitch with a tiny dick who has been @@.pink;heavily feminized,@@ yet seems terrified and very new to slavery. _His2 fake tits and girly behavior must be from _his2 life before _he2 was a slave.<<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is fastened around _his2 neck.<</if>>
<</if>>
<<set $activeSlave.origin = "Your lurcher " + $Lurcher.slaveName + " caught her coursing; she was a " + $origin + " hare.">>
diff --git a/src/uncategorized/seIndependenceDay.tw b/src/uncategorized/seIndependenceDay.tw
index 5e358e0b91f..189eebc20c1 100644
--- a/src/uncategorized/seIndependenceDay.tw
+++ b/src/uncategorized/seIndependenceDay.tw
@@ -403,5 +403,5 @@ In the Free Cities, Independence Day falls on the day when the Free City achieve
<<set $rep += 250>>
<</if>>
/*Maybe a random chance attack by the Daughter's of Liberty if they haven't been already defeated or if they have by a cell that managed to survive. The size of the attack could depend the time since their last encounter. The amount of damage inflicted would depend primarily on if the hacker's support was acquired, $bodyguard's combat skill, the player's combat skill, SF upgrades and finally some RNG. If a low amount of damage is inflicted then there will be a low hit to rep and some criminals can be acquired or dealt with in the usual manner. Higher amounts of damage leads to higher hits to rep and a chance that fewer attackers will survive. Without a bodyguard there is a chance that PC may die or be held hostage with a chance of being killed if the rescue attempt is botched. */
- /* I was thinking providing a option (potentially #result3) of giving a speech with it being a duplicate of the above speech just for completeness sake however it would be redundant except for a line or two about the outcome of attack if it fired (i.e listing the number of dead/captured attackers (potentially #result4) and dead soldiers with a couple of potential options (potentially #result5) ;to erect a statute or such acknowledge them and if one is already present to add them on to it, to provide support for their families. Also the amount of monetary damage, did $bodyguard die or just get wounded and if so how severely. Finally a closing message with how the PC wishes to react to it (potentially #result6); e.g. be vigilant, it's a one off, act of war, we will not give into terrorist attacks, etc. */
+ /* I was thinking providing an option (potentially #result3) of giving a speech with it being a duplicate of the above speech just for completeness sake however it would be redundant except for a line or two about the outcome of attack if it fired (i.e listing the number of dead/captured attackers (potentially #result4) and dead soldiers with a couple of potential options (potentially #result5) ;to erect a statute or such acknowledge them and if one is already present to add them on to it, to provide support for their families. Also the amount of monetary damage, did $bodyguard die or just get wounded and if so how severely. Finally a closing message with how the PC wishes to react to it (potentially #result6); e.g. be vigilant, it's a one off, act of war, we will not give into terrorist attacks, etc. */
<</replace>> <</link>> </span> <</if>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 81c155c869a..00fd1e6c7fe 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1610,7 +1610,7 @@ Hormones: <strong><span id="hormones">
<</if>>
<<link "Only with you">><<set $activeSlave.releaseRules = "restrictive">><<replace "#releaseRules">>$activeSlave.releaseRules<</replace>><</link>> |
<<link "Have $him remain chaste">><<set $activeSlave.releaseRules = "chastity">><<replace "#releaseRules">>$activeSlave.releaseRules<</replace>><</link>>
-
+
<<if setup.facilityHeads.includes($activeSlave.assignment)>>
<<if $activeSlave.lactation != 2>>
<br>Lactation maintenance for facility heads: ''<span id="releaseRules">$activeSlave.lactationRules</span>.''
diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw
index 7c55e67cbbf..47f72c52728 100644
--- a/src/utility/birthWidgets.tw
+++ b/src/utility/birthWidgets.tw
@@ -326,7 +326,7 @@
//This needs a description//
<<case "be the Madam">>
- $He heads to a private room in the back of the club accompanied by a influential patron. $He settles $himself onto his lap and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, basking in his attention as he strips $him. Placing $his child<<if $slaves[$i].pregType > 1>>ren<</if>> outside the room, $he returns to get more intimate with $his catch.
+ $He heads to a private room in the back of the club accompanied by an influential patron. $He settles $himself onto his lap and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, basking in his attention as he strips $him. Placing $his child<<if $slaves[$i].pregType > 1>>ren<</if>> outside the room, $he returns to get more intimate with $his catch.
<<case "be the Stewardess">>
$He strips and settles $himself into $his favorite chair, while calling several servants to $his aid. $He begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>> into the arms of $his waiting charges. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and $he reclines while $his servants clean and dress $him. Once $he has had enough, $he orders them back to work on the penthouse.
--
GitLab