diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index fce6dcb87088b415d82816f346ee1134580f73c2..da9735b39f122bbdb8cdea55a5805b3606ead407 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -2018,6 +2018,7 @@ window.getBaseBoobs = function(slave) {
/*:: SetBellySize [script]*/
window.SetBellySize = function SetBellySize(slave) {
+
let _implantSize;
WombNormalizePreg(slave); /*now with support for legacy code that advance pregnancy by setting .preg++ */
@@ -11600,7 +11601,7 @@ window.generateChild = function(mother, ova, destination) {
/*:: wombJS [script]*/
/*
-This is womb processor/simulator script. It takes care about calculation of belly sizes based on individual fetus sizes, with full support of broodmothers implant random turning on and off possibility. Also this can be expanded to store more parents data in each individual fetus in future.
+This is a womb processor/simulator script. It takes care of calculation of belly sizes based on individual fetus sizes, with full support of broodmothers implant random turning on and off possibility. Also this can be expanded to store more parents data in each individual fetus in future.
Design limitations:
- Mother can't gestate children with different speeds at same time. All speed changes apply to all fetuses.
- Sizes of individual fetuses updated only on call of WombGetVolume - not every time as called WombProgress. This is for better overall code speed.
@@ -21811,6 +21812,7 @@ window.PartnerVCheck = function PartnerVCheck(analTimes, bothTimes) {
let He = capFirstChar(he),
His = capFirstChar(his);
let r = ``;
+
if (V.partner < 0 || V.partner >= V.slaves.length) {
r += `@@.red;PartnerVCheck called with invalid partner '$partner' from passage ${passage()}.@@`;
} else if (canDoVaginal(partner)) {
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 925d2be308dd28977f2b65d2dcc9f4681513b2ef..c5deef2ab95b99d365f6ad56fc26f0fddca1043c 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -2680,28 +2680,28 @@ is fetish known to player
behavioralFlaw:
"none"
-"arrogant" - clings to her dignity, thinks slavery is beneath her
-"bitchy" - can't keep her opinions to herself
-"odd" - says and does odd things
-"hates men" - hates men
-"hates women" - hates women
-"gluttonous" - likes eating, gains weight
-"anorexic" - dislikes eating and being forced to eat, loses weight
-"devout" - resistance through religious faith
-"liberated" - believes slavery is wrong
+"arrogant" - clings to her dignity, thinks slavery is beneath her
+"bitchy" - can't keep her opinions to herself
+"odd" - says and does odd things
+"hates men" - hates men
+"hates women" - hates women
+"gluttonous" - likes eating, gains weight
+"anorexic" - dislikes eating and being forced to eat, loses weight
+"devout" - resistance through religious faith
+"liberated" - believes slavery is wrong
behavioralQuirk:
"none"
-"confident" - believes she has value as a slave
-"cutting" - often has as witty or cunning remark ready, knows when to say it
-"funny" - is funny
-"fitness" - loves working out
-"adores women" - likes spending time with women
-"adores men" - likes spending time with men
-"insecure" - defines herself on the thoughts of others
-"sinful" - breaks cultural norms
-"advocate" - advocates slavery
+"confident" - believes she has value as a slave
+"cutting" - often has as witty or cunning remark ready, knows when to say it
+"funny" - is funny
+"fitness" - loves working out
+"adores women" - likes spending time with women
+"adores men" - likes spending time with men
+"insecure" - defines herself on the thoughts of others
+"sinful" - breaks cultural norms
+"advocate" - advocates slavery
sexualFlaw:
@@ -3478,19 +3478,19 @@ To test if your slave is functioning, start up a normal game, swap to cheat mode
@@.hotpink; - devotion gain
@@.mediumorchid; - devotion loss
@@.mediumaquamarine; - trust gain
-@@.gold; - trust loss
-@@.coral; - notable change and fetish loss
-@@.lightcoral; - fetish strength gain, fetish acquisition and fetish discovery
-@@.lime; - growth/improvement to a body part (reversed in some cases)
-@@.orange; - shrinking/degradation of a body part (reversed in some cases)
-@@.lightsalmon; - rivalry
-@@.lightgreen; - relationship
+@@.gold; - trust loss
+@@.coral; - notable change and fetish loss
+@@.lightcoral; - fetish strength gain, fetish acquisition and fetish discovery
+@@.lime; - growth/improvement to a body part (reversed in some cases)
+@@.orange; - shrinking/degradation of a body part (reversed in some cases)
+@@.lightsalmon; - rivalry
+@@.lightgreen; - relationship
wombJS.tw subsystem:
-This is womb processor/simulator script. It's take care about calculation of belly sizes based on individual fetus sizes,
-with full support of broodmothers implant random turning on and off possibility. Also this can be expanded to store more parents' data in each individual fetus in future. Should be initialized for all slaves not female only. Currently it's not affect pregnancy mechanic in game directly - it's addon for better sizes calculation, and optional mechanics for future usage.
+This is a womb processor/simulator script. It takes care of calculation of belly sizes based on individual fetus sizes, with full support of broodmothers implant random turning on and off possibility. Also this can be expanded to store more parents data in each individual fetus in future.
+Should be initialized for all slaves not female only. Currently it's not affect pregnancy mechanic in game directly - it's addon for better sizes calculation, and optional mechanics for future usage.
Design limitations:
- Mother can't gestate children with different speeds at same time. All speed changes apply to all fetuses.
- Sizes of individual fetuses updated only on call of WombGetVolume - not every time as called WombProgress. This is for better overall code speed.
diff --git a/src/SecExp/attackGenerator.tw b/src/SecExp/attackGenerator.tw
index 4a0a2fefabf01d6a63126d7a05f9f10165465347..be593a973cacd16d11330ea703ef6e0744e125a4 100644
--- a/src/SecExp/attackGenerator.tw
+++ b/src/SecExp/attackGenerator.tw
@@ -115,15 +115,15 @@
/* terrain */
<<if $terrain == "urban">>
- <<set $battleTerrain = either("outskirts","urban","wasteland")>>
+ <<set $battleTerrain = either("outskirts", "urban", "wasteland")>>
<<elseif $terrain == "rural">>
- <<set $battleTerrain = either("hills","outskirts","rural","wasteland")>>
+ <<set $battleTerrain = either("hills", "outskirts", "rural", "wasteland")>>
<<elseif $terrain == "ravine">>
- <<set $battleTerrain = either("mountains","outskirts","hills","wasteland")>>
+ <<set $battleTerrain = either("hills", "mountains", "outskirts", "wasteland")>>
<<elseif $terrain == "marine">>
- <<set $battleTerrain = either("coast","outskirts","hills","wasteland")>>
+ <<set $battleTerrain = either("coast", "hills", "outskirts", "wasteland")>>
<<elseif $terrain == "oceanic">>
- <<set $battleTerrain = either("coast","outskirts","hills","wasteland")>>
+ <<set $battleTerrain = either("coast", "hills", "outskirts", "wasteland")>>
<<else>>
<<set $battleTerrain = "error">>
<</if>>
diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw
index a196d0af7409b655ce67ed41b341e7bb471a599b..caa087a5ee233979a716bd0774d81b6a04065482 100644
--- a/src/SecExp/attackHandler.tw
+++ b/src/SecExp/attackHandler.tw
@@ -61,33 +61,33 @@
<<else>>
-/*Init*/
-<<if $majorBattle == 0>>
- <<set _turns = $maxTurns>>
-<</if>>
-<<set _turn = 0>>
-<<set _attack = 0>>
-<<set _defense = 0>>
-<<set _morale = 0>>
-<<set _hp = 0>>
-<<set _baseHp = 0>>
-<<set _enemyAttack = 0>>
-<<set _enemyDefense = 0>>
-<<set _enemyMorale = 0>>
-<<set _enemyHp = 0>>
-<<set _enemyBaseHp = 0>>
-<<set _woundChance = 5>> /* leader has a base chance of 5% to get wounded */
-<<set _tacChance = 0.5>> /* by default tactics have a 50% chance of succeeding */
-<<set _atkMod = 1>>
-<<set _defMod = 1>>
-<<set _militiaMod = 1>>
-<<set _slaveMod = 1>>
-<<set _mercMod = 1>>
-<<set _enemyMod = 1>>
-<<set _SFMod = 1>>
-<<set _expBonus = 0>>
-<<set _loyaltyBonus = 0>>
-<<set _armyMod = 0>>
+ /*Init*/
+ <<if $majorBattle == 0>>
+ <<set _turns = $maxTurns>>
+ <</if>>
+ <<set _turn = 0>>
+ <<set _attack = 0>>
+ <<set _defense = 0>>
+ <<set _morale = 0>>
+ <<set _hp = 0>>
+ <<set _baseHp = 0>>
+ <<set _enemyAttack = 0>>
+ <<set _enemyDefense = 0>>
+ <<set _enemyMorale = 0>>
+ <<set _enemyHp = 0>>
+ <<set _enemyBaseHp = 0>>
+ <<set _woundChance = 5>> /* leader has a base chance of 5% to get wounded */
+ <<set _tacChance = 0.5>> /* by default tactics have a 50% chance of succeeding */
+ <<set _atkMod = 1>>
+ <<set _defMod = 1>>
+ <<set _militiaMod = 1>>
+ <<set _slaveMod = 1>>
+ <<set _mercMod = 1>>
+ <<set _enemyMod = 1>>
+ <<set _SFMod = 1>>
+ <<set _expBonus = 0>>
+ <<set _loyaltyBonus = 0>>
+ <<set _armyMod = 0>>
/* major battle */
<<if $majorBattle == 1>>
@@ -344,8 +344,15 @@
<<elseif $woundType >= 4>>
<<if $slaves[_i].health >= -60>>
<<set $slaves[_i].health -= 30>>
- <<else>>
- <<set $slaves[_i].health = -90>>
+ <<elseif $woundType == 3>>
+ <<set $slaves[_i].amp = 1>>
+ <<set $slaves[_i].health = -80>>
+ <<elseif $woundType >= 4>>
+ <<if $slaves[_i].health >= -60>>
+ <<set $slaves[_i].health -= 30>>
+ <<else>>
+ <<set $slaves[_i].health = -90>>
+ <</if>>
<</if>>
<</if>>
<</if>>
@@ -472,780 +479,785 @@
<<elseif $woundType >= 4>>
<<if $slaves[_i].health >= -60>>
<<set $slaves[_i].health -= 30>>
- <<else>>
- <<set $slaves[_i].health = -90>>
+ <<elseif $woundType == 3>>
+ <<set $slaves[_i].amp = 1>>
+ <<set $slaves[_i].health = -80>>
+ <<elseif $woundType >= 4>>
+ <<if $slaves[_i].health >= -60>>
+ <<set $slaves[_i].health -= 30>>
+ <<else>>
+ <<set $slaves[_i].health = -90>>
+ <</if>>
<</if>>
<</if>>
- <</if>>
- /* 60% chance of getting combat skill if not already have it */
- <<if $HeadGirl.combatSkill == 0 && random(1,100) <= 60>>
- <<set $gainedCombat = 1>>
- <<set _i = $slaveIndices[$HeadGirl.ID]>>
- <<set $slaves[_i].combatSkill = 1>>
- <</if>>
-<<elseif $leadingTroops == "citizen">>
- <<if $arcologies[0].FSDegradationist == "unset" && $arcologies[0].FSPaternalist == "unset">>
- <<set _militiaMod += 0.15>>
- <<set _slaveMod -= 0.15>>
- <<elseif $arcologies[0].FSPaternalist != "unset">>
- <<set _militiaMod += 0.15>>
- <<set _slaveMod += 0.10>>
- <<elseif $arcologies[0].FSDegradationist != "unset">>
- <<set _militiaMod += 0.15>>
- <<set _slaveMod -= 0.35>>
- <</if>>
- <<if $arcologies[0].FSRomanRevivalist != "unset">>
+ /* 60% chance of getting combat skill if not already have it */
+ <<if $HeadGirl.combatSkill == 0 && random(1,100) <= 60>>
+ <<set $gainedCombat = 1>>
+ <<set _i = $slaveIndices[$HeadGirl.ID]>>
+ <<set $slaves[_i].combatSkill = 1>>
+ <</if>>
+ <<elseif $leadingTroops == "citizen">>
+ <<if $arcologies[0].FSDegradationist == "unset" && $arcologies[0].FSPaternalist == "unset">>
+ <<set _militiaMod += 0.15>>
+ <<set _slaveMod -= 0.15>>
+ <<elseif $arcologies[0].FSPaternalist != "unset">>
+ <<set _militiaMod += 0.15>>
+ <<set _slaveMod += 0.10>>
+ <<elseif $arcologies[0].FSDegradationist != "unset">>
+ <<set _militiaMod += 0.15>>
+ <<set _slaveMod -= 0.35>>
+ <</if>>
+ <<if $arcologies[0].FSRomanRevivalist != "unset">>
+ <<set _mercMod += 0.10>>
+ <<set _SFMod += 0.10>>
+ <<else>>
+ <<set _mercMod -= 0.10>>
+ <<set _SFMod -= 0.10>>
+ <</if>>
+ <<set _atkMod += either(-1,1) * random(10) * 0.1>>
+ <<set _defMod += either(-1,1) * random(10) * 0.1>>
+ <<set _tacChance += either(-1,1) * random(20) * 0.1>>
+ <<elseif $leadingTroops == "mercenary">>
<<set _mercMod += 0.10>>
<<set _SFMod += 0.10>>
- <<else>>
- <<set _mercMod -= 0.10>>
- <<set _SFMod -= 0.10>>
- <</if>>
- <<set _atkMod += either(-1,1) * random(10) * 0.1>>
- <<set _defMod += either(-1,1) * random(10) * 0.1>>
- <<set _tacChance += either(-1,1) * random(20) * 0.1>>
-<<elseif $leadingTroops == "mercenary">>
- <<set _mercMod += 0.10>>
- <<set _SFMod += 0.10>>
- <<if $arcologies[0].FSRomanRevivalist != "unset">>
- <<set _militiaMod += 0.10>>
- <<else>>
- <<set _militiaMod -= 0.10>>
- <</if>>
- <<if $arcologies[0].FSDegradationist != "unset">>
- <<set _slaveMod -= 0.35>>
- <</if>>
- <<set _atkMod += random(15) * 0.1>>
- <<set _defMod += random(15) * 0.1>>
- <<set _tacChance += random(30) * 0.1>>
-<<elseif $leadingTroops == "colonel">>
- <<set _mercMod += 0.10>>
- <<set _SFMod += 0.15>>
- <<if $arcologies[0].FSRomanRevivalist != "unset">>
- <<set _militiaMod += 0.10>>
- <<else>>
- <<set _militiaMod -= 0.10>>
- <</if>>
- <<if $arcologies[0].FSDegradationist != "unset">>
- <<set _slaveMod -= 0.35>>
- <</if>>
- <<set _atkMod += random(30) * 0.1>>
- <<set _defMod += random(30) * 0.1>>
- <<set _tacChance += random(40) * 0.1>>
-<</if>>
-/* Terrain and Tactics */
-<<if $battleTerrain == "urban">>
- <<if $chosenTactic == "Bait and Bleed">>
- <<set _atkMod += 0.15>>
- <<set _defMod += 0.10>>
- <<set _tacChance += 0.25>>
- <<elseif $chosenTactic == "Guerrilla">>
- <<set _atkMod += 0.10>>
- <<set _defMod += 0.15>>
- <<set _tacChance += 0.25>>
- <<elseif $chosenTactic == "Choke Points">>
- <<set _atkMod += 0.10>>
- <<set _defMod += 0.15>>
- <<set _tacChance += 0.25>>
- <<elseif $chosenTactic == "Interior Lines">>
- <<set _atkMod += 0.05>>
- <<set _defMod += 0.10>>
- <<set _tacChance += 0.15>>
- <<elseif $chosenTactic == "Pincer Maneuver">>
- <<set _atkMod -= 0.05>>
- <<set _defMod -= 0.10>>
- <<set _tacChance -= 0.15>>
- <<elseif $chosenTactic == "Defense In Depth">>
- <<set _atkMod -= 0.05>>
- <<set _defMod -= 0.05>>
- <<set _tacChance -= 0.10>>
- <<elseif $chosenTactic == "Blitzkrieg">>
- <<set _atkMod -= 0.15>>
- <<set _defMod -= 0.10>>
- <<set _tacChance -= 0.25>>
- <<elseif $chosenTactic == "Human Wave">>
- <<set _atkMod -= 0.15>>
- <<set _defMod -= 0.15>>
- <<set _tacChance -= 0.30>>
- <</if>>
-<<elseif $battleTerrain == "rural">>
- <<if $chosenTactic == "Bait and Bleed">>
- <<set _atkMod -= 0.05>>
- <<set _defMod -= 0.10>>
- <<set _tacChance -= 0.15>>
- <<elseif $chosenTactic == "Guerrilla">>
- <<set _atkMod -= 0.10>>
- <<set _defMod -= 0.10>>
- <<set _tacChance -= 0.20>>
- <<elseif $chosenTactic == "Choke Points">>
- <<set _atkMod -= 0.10>>
- <<set _defMod -= 0.15>>
- <<set _tacChance -= 0.25>>
- <<elseif $chosenTactic == "Interior Lines">>
- <<set _atkMod += 0.10>>
- <<set _defMod += 0.15>>
- <<set _tacChance += 0.25>>
- <<elseif $chosenTactic == "Pincer Maneuver">>
- <<set _atkMod += 0.15>>
- <<set _defMod += 0.10>>
- <<set _tacChance += 0.25>>
- <<elseif $chosenTactic == "Defense In Depth">>
- <<set _atkMod += 0.15>>
- <<set _defMod += 0.15>>
- <<set _tacChance += 0.30>>
- <<elseif $chosenTactic == "Blitzkrieg">>
- <<set _atkMod += 0.15>>
- <<set _defMod += 0.10>>
- <<set _tacChance += 0.25>>
- <<elseif $chosenTactic == "Human Wave">>
- <<set _atkMod += 0.20>>
- <<set _defMod += 0.05>>
- <<set _tacChance += 0.25>>
+ <<if $arcologies[0].FSRomanRevivalist != "unset">>
+ <<set _militiaMod += 0.10>>
+ <<else>>
+ <<set _militiaMod -= 0.10>>
+ <</if>>
+ <<if $arcologies[0].FSDegradationist != "unset">>
+ <<set _slaveMod -= 0.35>>
+ <</if>>
+ <<set _atkMod += random(15) * 0.1>>
+ <<set _defMod += random(15) * 0.1>>
+ <<set _tacChance += random(30) * 0.1>>
+ <<elseif $leadingTroops == "colonel">>
+ <<set _mercMod += 0.10>>
+ <<set _SFMod += 0.15>>
+ <<if $arcologies[0].FSRomanRevivalist != "unset">>
+ <<set _militiaMod += 0.10>>
+ <<else>>
+ <<set _militiaMod -= 0.10>>
+ <</if>>
+ <<if $arcologies[0].FSDegradationist != "unset">>
+ <<set _slaveMod -= 0.35>>
+ <</if>>
+ <<set _atkMod += random(30) * 0.1>>
+ <<set _defMod += random(30) * 0.1>>
+ <<set _tacChance += random(40) * 0.1>>
+ <</if>>
+ /* Terrain and Tactics */
+ <<if $battleTerrain == "urban">>
+ <<if $chosenTactic == "Bait and Bleed">>
+ <<set _atkMod += 0.15>>
+ <<set _defMod += 0.10>>
+ <<set _tacChance += 0.25>>
+ <<elseif $chosenTactic == "Guerrilla">>
+ <<set _atkMod += 0.10>>
+ <<set _defMod += 0.15>>
+ <<set _tacChance += 0.25>>
+ <<elseif $chosenTactic == "Choke Points">>
+ <<set _atkMod += 0.10>>
+ <<set _defMod += 0.15>>
+ <<set _tacChance += 0.25>>
+ <<elseif $chosenTactic == "Interior Lines">>
+ <<set _atkMod += 0.05>>
+ <<set _defMod += 0.10>>
+ <<set _tacChance += 0.15>>
+ <<elseif $chosenTactic == "Pincer Maneuver">>
+ <<set _atkMod -= 0.05>>
+ <<set _defMod -= 0.10>>
+ <<set _tacChance -= 0.15>>
+ <<elseif $chosenTactic == "Defense In Depth">>
+ <<set _atkMod -= 0.05>>
+ <<set _defMod -= 0.05>>
+ <<set _tacChance -= 0.10>>
+ <<elseif $chosenTactic == "Blitzkrieg">>
+ <<set _atkMod -= 0.15>>
+ <<set _defMod -= 0.10>>
+ <<set _tacChance -= 0.25>>
+ <<elseif $chosenTactic == "Human Wave">>
+ <<set _atkMod -= 0.15>>
+ <<set _defMod -= 0.15>>
+ <<set _tacChance -= 0.30>>
+ <</if>>
+ <<elseif $battleTerrain == "rural">>
+ <<if $chosenTactic == "Bait and Bleed">>
+ <<set _atkMod -= 0.05>>
+ <<set _defMod -= 0.10>>
+ <<set _tacChance -= 0.15>>
+ <<elseif $chosenTactic == "Guerrilla">>
+ <<set _atkMod -= 0.10>>
+ <<set _defMod -= 0.10>>
+ <<set _tacChance -= 0.20>>
+ <<elseif $chosenTactic == "Choke Points">>
+ <<set _atkMod -= 0.10>>
+ <<set _defMod -= 0.15>>
+ <<set _tacChance -= 0.25>>
+ <<elseif $chosenTactic == "Interior Lines">>
+ <<set _atkMod += 0.10>>
+ <<set _defMod += 0.15>>
+ <<set _tacChance += 0.25>>
+ <<elseif $chosenTactic == "Pincer Maneuver">>
+ <<set _atkMod += 0.15>>
+ <<set _defMod += 0.10>>
+ <<set _tacChance += 0.25>>
+ <<elseif $chosenTactic == "Defense In Depth">>
+ <<set _atkMod += 0.15>>
+ <<set _defMod += 0.15>>
+ <<set _tacChance += 0.30>>
+ <<elseif $chosenTactic == "Blitzkrieg">>
+ <<set _atkMod += 0.15>>
+ <<set _defMod += 0.10>>
+ <<set _tacChance += 0.25>>
+ <<elseif $chosenTactic == "Human Wave">>
+ <<set _atkMod += 0.20>>
+ <<set _defMod += 0.05>>
+ <<set _tacChance += 0.25>>
+ <</if>>
+ <<elseif $battleTerrain == "hills">>
+ <<if $chosenTactic == "Bait and Bleed">>
+ <<set _atkMod += 0.05>>
+ <<set _defMod += 0.05>>
+ <<set _tacChance += 0.10>>
+ <<elseif $chosenTactic == "Guerrilla">>
+ <<set _atkMod += 0.05>>
+ <<set _defMod += 0.10>>
+ <<set _tacChance += 0.15>>
+ <<elseif $chosenTactic == "Choke Points">>
+ <<set _atkMod += 0.10>>
+ <<set _defMod += 0.10>>
+ <<set _tacChance += 0.20>>
+ <<elseif $chosenTactic == "Interior Lines">>
+ <<set _atkMod -= 0.05>>
+ <<set _defMod -= 0.05>>
+ <<set _tacChance -= 0.10>>
+ <<elseif $chosenTactic == "Pincer Maneuver">>
+ <<set _atkMod += 0.10>>
+ <<set _defMod += 0.05>>
+ <<set _tacChance += 0.15>>
+ <<elseif $chosenTactic == "Defense In Depth">>
+ <<set _atkMod -= 0.10>>
+ <<set _defMod -= 0.05>>
+ <<set _tacChance -= 0.15>>
+ <<elseif $chosenTactic == "Blitzkrieg">>
+ <<set _atkMod -= 0.10>>
+ <<set _defMod -= 0.15>>
+ <<set _tacChance += 0.25>>
+ <<elseif $chosenTactic == "Human Wave">>
+ <<set _atkMod -= 0.15>>
+ <<set _defMod -= 0.15>>
+ <<set _tacChance -= 0.30>>
+ <</if>>
+ <<elseif $battleTerrain == "coast">>
+ <<if $chosenTactic == "Bait and Bleed">>
+ <<set _atkMod -= 0.05>>
+ <<set _defMod -= 0.05>>
+ <<set _tacChance -= 0.10>>
+ <<elseif $chosenTactic == "Guerrilla">>
+ <<set _atkMod += 0.05>>
+ <<set _defMod += 0.05>>
+ <<set _tacChance += 0.10>>
+ <<elseif $chosenTactic == "Choke Points">>
+ <<set _atkMod += 0.05>>
+ <<set _defMod += 0.15>>
+ <<set _tacChance += 0.15>>
+ <<elseif $chosenTactic == "Interior Lines">>
+ <<set _atkMod += 0.10>>
+ <<set _defMod += 0.10>>
+ <<set _tacChance += 0.20>>
+ <<elseif $chosenTactic == "Pincer Maneuver">>
+ <<set _atkMod -= 0.10>>
+ <<set _defMod -= 0.10>>
+ <<set _tacChance -= 0.20>>
+ <<elseif $chosenTactic == "Defense In Depth">>
+ <<set _atkMod += 0.10>>
+ <<set _defMod += 0.10>>
+ <<set _tacChance += 0.20>>
+ <<elseif $chosenTactic == "Blitzkrieg">>
+ <<set _atkMod -= 0.05>>
+ <<set _defMod -= 0.05>>
+ <<set _tacChance -= 0.10>>
+ <<elseif $chosenTactic == "Human Wave">>
+ <<set _atkMod += 0.05>>
+ <<set _defMod -= 0.05>>
+ <</if>>
+ <<elseif $battleTerrain == "outskirts">>
+ <<if $chosenTactic == "Bait and Bleed">>
+ <<set _atkMod -= 0.10>>
+ <<set _defMod -= 0.15>>
+ <<set _tacChance -= 0.25>>
+ <<elseif $chosenTactic == "Guerrilla">>
+ <<set _atkMod -= 0.10>>
+ <<set _defMod -= 0.05>>
+ <<set _tacChance -= 0.15>>
+ <<elseif $chosenTactic == "Choke Points">>
+ <<set _atkMod += 0.10>>
+ <<set _defMod += 0.15>>
+ <<set _tacChance += 0.25>>
+ <<elseif $chosenTactic == "Interior Lines">>
+ <<set _atkMod += 0.15>>
+ <<set _defMod += 0.10>>
+ <<set _tacChance += 0.25>>
+ <<elseif $chosenTactic == "Pincer Maneuver">>
+ <<set _atkMod += 0.05>>
+ <<set _defMod += 0.10>>
+ <<set _tacChance += 0.15>>
+ <<elseif $chosenTactic == "Defense In Depth">>
+ <<set _atkMod += 0.10>>
+ <<set _defMod += 0.15>>
+ <<set _tacChance += 0.25>>
+ <<elseif $chosenTactic == "Blitzkrieg">>
+ <<set _atkMod += 0.10>>
+ <<set _defMod -= 0.05>>
+ <<set _tacChance += 0.05>>
+ <<elseif $chosenTactic == "Human Wave">>
+ <<set _atkMod += 0.10>>
+ <<set _defMod -= 0.10>>
+ <</if>>
+ <<elseif $battleTerrain == "mountains">>
+ <<if $chosenTactic == "Bait and Bleed">>
+ <<set _atkMod += 0.10>>
+ <<set _defMod += 0.15>>
+ <<set _tacChance += 0.25>>
+ <<elseif $chosenTactic == "Guerrilla">>
+ <<set _atkMod += 0.10>>
+ <<set _defMod += 0.15>>
+ <<set _tacChance += 0.25>>
+ <<elseif $chosenTactic == "Choke Points">>
+ <<set _atkMod += 0.05>>
+ <<set _defMod += 0.20>>
+ <<set _tacChance += 0.25>>
+ <<elseif $chosenTactic == "Interior Lines">>
+ <<set _atkMod += 0.10>>
+ <<set _defMod += 0.10>>
+ <<set _tacChance += 0.20>>
+ <<elseif $chosenTactic == "Pincer Maneuver">>
+ <<set _atkMod += 0.10>>
+ <<set _defMod -= 0.05>>
+ <<set _tacChance += 0.05>>
+ <<elseif $chosenTactic == "Defense In Depth">>
+ <<set _atkMod += 0.10>>
+ <<set _defMod += 0.10>>
+ <<set _tacChance += 0.20>>
+ <<elseif $chosenTactic == "Blitzkrieg">>
+ <<set _atkMod -= 0.10>>
+ <<set _defMod -= 0.10>>
+ <<set _tacChance -= 0.20>>
+ <<elseif $chosenTactic == "Human Wave">>
+ <<set _atkMod -= 0.10>>
+ <<set _defMod -= 0.10>>
+ <<set _tacChance -= 0.20>>
+ <</if>>
+ <<elseif $battleTerrain == "wasteland">>
+ <<if $chosenTactic == "Bait and Bleed">>
+ <<set _atkMod += 0.05>>
+ <<set _defMod += 0.05>>
+ <<set _tacChance += 0.10>>
+ <<elseif $chosenTactic == "Guerrilla">>
+ <<set _atkMod += 0.10>>
+ <<set _defMod += 0.05>>
+ <<set _tacChance += 0.15>>
+ <<elseif $chosenTactic == "Choke Points">>
+ <<set _atkMod -= 0.10>>
+ <<set _defMod += 0.05>>
+ <<set _tacChance -= 0.05>>
+ <<elseif $chosenTactic == "Interior Lines">>
+ <<set _atkMod += 0.10>>
+ <<set _defMod += 0.15>>
+ <<set _tacChance += 0.25>>
+ <<elseif $chosenTactic == "Pincer Maneuver">>
+ <<set _atkMod += 0.15>>
+ <<set _defMod += 0.10>>
+ <<set _tacChance += 0.25>>
+ <<elseif $chosenTactic == "Defense In Depth">>
+ <<set _atkMod += 0.05>>
+ <<set _defMod += 0.10>>
+ <<set _tacChance += 0.15>>
+ <<elseif $chosenTactic == "Blitzkrieg">>
+ <<set _atkMod += 0.15>>
+ <<set _defMod += 0.15>>
+ <<set _tacChance += 0.30>>
+ <<elseif $chosenTactic == "Human Wave">>
+ <<set _atkMod += 0.20>>
+ <<set _defMod += 0.05>>
+ <<set _tacChance += 0.25>>
+ <</if>>
<</if>>
-<<elseif $battleTerrain == "hills">>
+
<<if $chosenTactic == "Bait and Bleed">>
- <<set _atkMod += 0.05>>
- <<set _defMod += 0.05>>
- <<set _tacChance += 0.10>>
+ <<if $attackType == "raiders">>
+ <<set _tacChance -= 0.10>>
+ <<elseif $attackType == "free city">>
+ <<set _tacChance += 0.10>>
+ <<elseif $attackType == "old world">>
+ <<set _tacChance += 0.25>>
+ <<elseif $attackType == "freedom fighters">>
+ <<set _tacChance -= 0.15>>
+ <</if>>
<<elseif $chosenTactic == "Guerrilla">>
- <<set _atkMod += 0.05>>
- <<set _defMod += 0.10>>
- <<set _tacChance += 0.15>>
+ <<if $attackType == "raiders">>
+ <<set _tacChance -= 0.20>>
+ <<elseif $attackType == "free city">>
+ <<set _tacChance += 0.15>>
+ <<elseif $attackType == "old world">>
+ <<set _tacChance += 0.25>>
+ <<elseif $attackType == "freedom fighters">>
+ <<set _tacChance -= 0.25>>
+ <</if>>
<<elseif $chosenTactic == "Choke Points">>
- <<set _atkMod += 0.10>>
- <<set _defMod += 0.10>>
- <<set _tacChance += 0.20>>
+ <<if $attackType == "raiders">>
+ <<set _tacChance += 0.25>>
+ <<elseif $attackType == "free city">>
+ <<set _tacChance -= 0.05>>
+ <<elseif $attackType == "old world">>
+ <<set _tacChance -= 0.10>>
+ <<elseif $attackType == "freedom fighters">>
+ <<set _tacChance += 0.05>>
+ <</if>>
<<elseif $chosenTactic == "Interior Lines">>
- <<set _atkMod -= 0.05>>
- <<set _defMod -= 0.05>>
- <<set _tacChance -= 0.10>>
+ <<if $attackType == "raiders">>
+ <<set _tacChance -= 0.15>>
+ <<elseif $attackType == "free city">>
+ <<set _tacChance += 0.15>>
+ <<elseif $attackType == "old world">>
+ <<set _tacChance += 0.20>>
+ <<elseif $attackType == "freedom fighters">>
+ <<set _tacChance -= 0.10>>
+ <</if>>
<<elseif $chosenTactic == "Pincer Maneuver">>
- <<set _atkMod += 0.10>>
- <<set _defMod += 0.05>>
- <<set _tacChance += 0.15>>
+ <<if $attackType == "raiders">>
+ <<set _tacChance += 0.15>>
+ <<elseif $attackType == "free city">>
+ <<set _tacChance += 0.10>>
+ <<elseif $attackType == "old world">>
+ <<set _tacChance -= 0.10>>
+ <<elseif $attackType == "freedom fighters">>
+ <<set _tacChance += 0.15>>
+ <</if>>
<<elseif $chosenTactic == "Defense In Depth">>
- <<set _atkMod -= 0.10>>
- <<set _defMod -= 0.05>>
- <<set _tacChance -= 0.15>>
+ <<if $attackType == "raiders">>
+ <<set _tacChance -= 0.20>>
+ <<elseif $attackType == "free city">>
+ <<set _tacChance += 0.10>>
+ <<elseif $attackType == "old world">>
+ <<set _tacChance += 0.20>>
+ <<elseif $attackType == "freedom fighters">>
+ <<set _tacChance -= 0.05>>
+ <</if>>
<<elseif $chosenTactic == "Blitzkrieg">>
- <<set _atkMod -= 0.10>>
- <<set _defMod -= 0.15>>
- <<set _tacChance += 0.25>>
+ <<if $attackType == "raiders">>
+ <<set _tacChance += 0.10>>
+ <<elseif $attackType == "free city">>
+ <<set _tacChance -= 0.20>>
+ <<elseif $attackType == "old world">>
+ <<set _tacChance += 0.25>>
+ <<elseif $attackType == "freedom fighters">>
+ <<set _tacChance -= 0.10>>
+ <</if>>
<<elseif $chosenTactic == "Human Wave">>
- <<set _atkMod -= 0.15>>
- <<set _defMod -= 0.15>>
- <<set _tacChance -= 0.30>>
+ <<if $attackType == "raiders">>
+ <<set _tacChance -= 0.10>>
+ <<elseif $attackType == "free city">>
+ <<set _tacChance += 0.10>>
+ <<elseif $attackType == "old world">>
+ <<set _tacChance -= 0.15>>
+ <<elseif $attackType == "freedom fighters">>
+ <<set _tacChance += 0.10>>
+ <</if>>
<</if>>
-<<elseif $battleTerrain == "coast">>
- <<if $chosenTactic == "Bait and Bleed">>
- <<set _atkMod -= 0.05>>
- <<set _defMod -= 0.05>>
- <<set _tacChance -= 0.10>>
- <<elseif $chosenTactic == "Guerrilla">>
- <<set _atkMod += 0.05>>
- <<set _defMod += 0.05>>
- <<set _tacChance += 0.10>>
- <<elseif $chosenTactic == "Choke Points">>
- <<set _atkMod += 0.05>>
- <<set _defMod += 0.15>>
- <<set _tacChance += 0.15>>
- <<elseif $chosenTactic == "Interior Lines">>
+
+ /* Calculates if tactics are successful */
+ /* minimum chance is 10% */
+ <<if _tacChance <= 0>>
+ <<set _tacChance = 0.1>>
+ <</if>>
+ <<if random(1,100) <= _tacChance * 100>>
+ <<set _enemyMod -= 0.30>>
+ <<set _militiaMod += 0.20>>
+ <<set _slaveMod += 0.20>>
+ <<set _mercMod += 0.20>>
<<set _atkMod += 0.10>>
<<set _defMod += 0.10>>
- <<set _tacChance += 0.20>>
- <<elseif $chosenTactic == "Pincer Maneuver">>
+ <<set $tacticsSuccessful = 1>>
+ <<else>>
+ <<set _enemyMod += 0.20>>
+ <<set _militiaMod -= 0.20>>
+ <<set _slaveMod -= 0.20>>
+ <<set _mercMod -= 0.20>>
<<set _atkMod -= 0.10>>
<<set _defMod -= 0.10>>
- <<set _tacChance -= 0.20>>
- <<elseif $chosenTactic == "Defense In Depth">>
- <<set _atkMod += 0.10>>
- <<set _defMod += 0.10>>
- <<set _tacChance += 0.20>>
- <<elseif $chosenTactic == "Blitzkrieg">>
- <<set _atkMod -= 0.05>>
- <<set _defMod -= 0.05>>
- <<set _tacChance -= 0.10>>
- <<elseif $chosenTactic == "Human Wave">>
- <<set _atkMod += 0.05>>
- <<set _defMod -= 0.05>>
+ <<set $tacticsSuccessful = 0>>
<</if>>
-<<elseif $battleTerrain == "outskirts">>
- <<if $chosenTactic == "Bait and Bleed">>
- <<set _atkMod -= 0.10>>
- <<set _defMod -= 0.15>>
- <<set _tacChance -= 0.25>>
- <<elseif $chosenTactic == "Guerrilla">>
- <<set _atkMod -= 0.10>>
- <<set _defMod -= 0.05>>
- <<set _tacChance -= 0.15>>
- <<elseif $chosenTactic == "Choke Points">>
- <<set _atkMod += 0.10>>
- <<set _defMod += 0.15>>
- <<set _tacChance += 0.25>>
- <<elseif $chosenTactic == "Interior Lines">>
- <<set _atkMod += 0.15>>
- <<set _defMod += 0.10>>
- <<set _tacChance += 0.25>>
- <<elseif $chosenTactic == "Pincer Maneuver">>
- <<set _atkMod += 0.05>>
- <<set _defMod += 0.10>>
- <<set _tacChance += 0.15>>
- <<elseif $chosenTactic == "Defense In Depth">>
- <<set _atkMod += 0.10>>
- <<set _defMod += 0.15>>
- <<set _tacChance += 0.25>>
- <<elseif $chosenTactic == "Blitzkrieg">>
- <<set _atkMod += 0.10>>
- <<set _defMod -= 0.05>>
- <<set _tacChance += 0.05>>
- <<elseif $chosenTactic == "Human Wave">>
- <<set _atkMod += 0.10>>
- <<set _defMod -= 0.10>>
+
+ /* enemy morale mods */
+ <<if $week < 30>>
+ <<set _enemyMod += 0.15>>
+ <<elseif $week < 60>>
+ <<set _enemyMod += 0.30>>
+ <<elseif $week < 90>>
+ <<set _enemyMod += 0.45>>
+ <<elseif $week < 120>>
+ <<set _enemyMod += 0.60>>
+ <<else>>
+ <<set _enemyMod += 0.75>>
<</if>>
-<<elseif $battleTerrain == "mountains">>
- <<if $chosenTactic == "Bait and Bleed">>
- <<set _atkMod += 0.10>>
- <<set _defMod += 0.15>>
- <<set _tacChance += 0.25>>
- <<elseif $chosenTactic == "Guerrilla">>
- <<set _atkMod += 0.10>>
- <<set _defMod += 0.15>>
- <<set _tacChance += 0.25>>
- <<elseif $chosenTactic == "Choke Points">>
- <<set _atkMod += 0.05>>
- <<set _defMod += 0.20>>
- <<set _tacChance += 0.25>>
- <<elseif $chosenTactic == "Interior Lines">>
- <<set _atkMod += 0.10>>
- <<set _defMod += 0.10>>
- <<set _tacChance += 0.20>>
- <<elseif $chosenTactic == "Pincer Maneuver">>
- <<set _atkMod += 0.10>>
- <<set _defMod -= 0.05>>
- <<set _tacChance += 0.05>>
- <<elseif $chosenTactic == "Defense In Depth">>
- <<set _atkMod += 0.10>>
- <<set _defMod += 0.10>>
- <<set _tacChance += 0.20>>
- <<elseif $chosenTactic == "Blitzkrieg">>
- <<set _atkMod -= 0.10>>
- <<set _defMod -= 0.10>>
- <<set _tacChance -= 0.20>>
- <<elseif $chosenTactic == "Human Wave">>
- <<set _atkMod -= 0.10>>
- <<set _defMod -= 0.10>>
- <<set _tacChance -= 0.20>>
+
+ /* calculates PC army stats */
+ <<if $secBots.isDeployed == 1>>
+ <<set _attack += ($secBotsBaseAttack + $secBotsBaseAttack * $secBots.equip * $equipMod) * _atkMod>>
+ <<set _defense += ($secBotsBaseDefense + $secBotsBaseDefense * $secBots.equip * $equipMod) * _defMod>>
+ <<set _hp += $secBotsBaseHp * $secBots.troops>>
+ <</if>>
+ <<for _i = 0; _i < $militiaUnits.length; _i++>>
+ <<if $militiaUnits[_i].isDeployed == 1>>
+ <<if $militiaUnits[_i].training <= 10>>
+ <<set _expBonus = 0>>
+ <<elseif $militiaUnits[_i].training <= 33>>
+ <<set _expBonus = 0.10>>
+ <<elseif $militiaUnits[_i].training <= 66>>
+ <<set _expBonus = 0.25>>
+ <<else>>
+ <<set _expBonus = 0.50>>
+ <</if>>
+ <<if $militiaUnits[_i].loyalty <= 10>>
+ <<set _loyaltyBonus = 0>>
+ <<elseif $militiaUnits[_i].loyalty <= 33>>
+ <<set _loyaltyBonus = 0.10>>
+ <<elseif $militiaUnits[_i].loyalty <= 66>>
+ <<set _loyaltyBonus = 0.20>>
+ <<else>>
+ <<set _loyaltyBonus = 0.30>>
+ <</if>>
+ <<set _attack += ($militiaBaseAttack + $militiaBaseAttack * $militiaUnits[_i].equip * $equipMod + $militiaBaseAttack * _expBonus + $militiaBaseAttack * _loyaltyBonus + $militiaBaseAttack * $militiaUnits[_i].SF * 0.20 + $militiaUnits[_i].cyber) * _atkMod>>
+ <<set _defense += ($militiaBaseDefense + $militiaBaseDefense * $militiaUnits[_i].equip * $equipMod + $militiaBaseDefense * _expBonus + $militiaBaseDefense * _loyaltyBonus + $militiaBaseDefense * $militiaUnits[_i].SF * 0.20 + $militiaUnits[_i].cyber) * _defMod>>
+ <<set _hp += ($militiaBaseHp + $militiaUnits[_i].cyber + $militiaBaseHp * $militiaUnits[_i].medics * 0.25) * $militiaUnits[_i].troops>>
+ <</if>>
+ <</for>>
+ <<for _i = 0; _i < $slaveUnits.length; _i++>>
+ <<if $slaveUnits[_i].isDeployed == 1>>
+ <<if $slaveUnits[_i].training <= 33>>
+ <<set _expBonus = 0>>
+ <<elseif $slaveUnits[_i].training <= 66>>
+ <<set _expBonus = 0.25>>
+ <<else>>
+ <<set _expBonus = 0.50>>
+ <</if>>
+ <<if $slaveUnits[_i].loyalty <= 10>>
+ <<set _loyaltyBonus = 0>>
+ <<elseif $slaveUnits[_i].loyalty <= 33>>
+ <<set _loyaltyBonus = 0.10>>
+ <<elseif $slaveUnits[_i].loyalty <= 66>>
+ <<set _loyaltyBonus = 0.20>>
+ <<else>>
+ <<set _loyaltyBonus = 0.30>>
+ <</if>>
+ <<set _attack += ($slaveBaseAttack + $slaveBaseAttack * $slaveUnits[_i].equip * $equipMod + $slaveBaseAttack * _expBonus + $slaveBaseAttack * _loyaltyBonus + $slaveBaseAttack * $slaveUnits[_i].SF * 0.20 + $slaveUnits[_i].cyber) * _atkMod>>
+ <<set _defense += ($slaveBaseDefense + $slaveBaseDefense * $slaveUnits[_i].equip * $equipMod + $slaveBaseDefense * _expBonus + $slaveBaseDefense * _loyaltyBonus + $slaveBaseDefense * $slaveUnits[_i].SF * 0.20 + $slaveUnits[_i].cyber) * _defMod>>
+ <<set _hp += ($slaveBaseHp + $slaveUnits[_i].cyber + $slaveBaseHp * $slaveUnits[_i].medics * 0.25) * $slaveUnits[_i].troops>>
+ <</if>>
+ <</for>>
+ <<for _i = 0; _i < $mercUnits.length; _i++>>
+ <<if $mercUnits[_i].isDeployed == 1>>
+ <<if $mercUnits[_i].training <= 33>>
+ <<set _expBonus = 0>>
+ <<elseif $mercUnits[_i].training <= 66>>
+ <<set _expBonus = 0.25>>
+ <<else>>
+ <<set _expBonus = 0.50>>
+ <</if>>
+ <<if $mercUnits[_i].loyalty <= 10>>
+ <<set _loyaltyBonus = 0>>
+ <<elseif $mercUnits[_i].loyalty <= 33>>
+ <<set _loyaltyBonus = 0.10>>
+ <<elseif $mercUnits[_i].loyalty <= 66>>
+ <<set _loyaltyBonus = 0.20>>
+ <<else>>
+ <<set _loyaltyBonus = 0.30>>
+ <</if>>
+ <<set _attack += ($mercBaseAttack + $mercBaseAttack * $mercUnits[_i].equip * $equipMod + $mercBaseAttack * _expBonus + $mercBaseAttack * _loyaltyBonus + $mercBaseAttack * $mercUnits[_i].SF * 0.20 + $mercUnits[_i].cyber) * _atkMod>>
+ <<set _defense += ($mercBaseDefense + $mercBaseDefense * $mercUnits[_i].equip * $equipMod + $mercBaseDefense * _expBonus + $mercBaseDefense * _loyaltyBonus + $mercBaseDefense * $mercUnits[_i].SF * 0.20 + $mercUnits[_i].cyber) * _defMod>>
+ <<set _hp += ($mercBaseHp + $mercUnits[_i].cyber + $mercBaseHp * $mercUnits[_i].medics * 0.25) * $mercUnits[_i].troops>>
+ <</if>>
+ <</for>>
+
+ <<if $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
+ <<set $SFatk = 0>>
+ <<set $SFdef = 0>>
+ <<set $SFhp = 0>>
+ <<calcSFStatistics>>
+ <<set _attack += $SFatk>>
+ <<set _defense += $SFdef>>
+ <<set _hp += $SFhp>>
<</if>>
-<<elseif $battleTerrain == "wasteland">>
- <<if $chosenTactic == "Bait and Bleed">>
- <<set _atkMod += 0.05>>
- <<set _defMod += 0.05>>
- <<set _tacChance += 0.10>>
- <<elseif $chosenTactic == "Guerrilla">>
- <<set _atkMod += 0.10>>
- <<set _defMod += 0.05>>
- <<set _tacChance += 0.15>>
- <<elseif $chosenTactic == "Choke Points">>
- <<set _atkMod -= 0.10>>
- <<set _defMod += 0.05>>
- <<set _tacChance -= 0.05>>
- <<elseif $chosenTactic == "Interior Lines">>
- <<set _atkMod += 0.10>>
- <<set _defMod += 0.15>>
- <<set _tacChance += 0.25>>
- <<elseif $chosenTactic == "Pincer Maneuver">>
- <<set _atkMod += 0.15>>
- <<set _defMod += 0.10>>
- <<set _tacChance += 0.25>>
- <<elseif $chosenTactic == "Defense In Depth">>
- <<set _atkMod += 0.05>>
- <<set _defMod += 0.10>>
- <<set _tacChance += 0.15>>
- <<elseif $chosenTactic == "Blitzkrieg">>
- <<set _atkMod += 0.15>>
- <<set _defMod += 0.15>>
- <<set _tacChance += 0.30>>
- <<elseif $chosenTactic == "Human Wave">>
- <<set _atkMod += 0.20>>
- <<set _defMod += 0.05>>
- <<set _tacChance += 0.25>>
+
+ /* morale and baseHp calculation */
+ /* minimum modifier is -50%, maximum is +50% */
+ <<if _militiaMod < 0.5>>
+ <<set _militiaMod = 0.5>>
+ <<elseif _militiaMod > 1.5>>
+ <<set _militiaMod = 1.5>>
+ <</if>>
+ <<if _slaveMod < 0.5>>
+ <<set _slaveMod = 0.5>>
+ <<elseif _slaveMod > 1.5>>
+ <<set _slaveMod = 1.5>>
+ <</if>>
+ <<if _mercMod < 0.5>>
+ <<set _mercMod = 0.5>>
+ <<elseif _mercMod > 1.5>>
+ <<set _mercMod = 1.5>>
+ <</if>>
+ <<if _SFMod < 0.5>>
+ <<set _SFMod = 0.5>>
+ <<elseif _SFMod > 1.5>>
+ <<set _SFMod = 1.5>>
<</if>>
-<</if>>
-<<if $chosenTactic == "Bait and Bleed">>
- <<if $attackType == "raiders">>
- <<set _tacChance -= 0.10>>
- <<elseif $attackType == "free city">>
- <<set _tacChance += 0.10>>
- <<elseif $attackType == "old world">>
- <<set _tacChance += 0.25>>
- <<elseif $attackType == "freedom fighters">>
- <<set _tacChance -= 0.15>>
+ <<set $troopCount = 0>>
+ <<calcTroopCount>>
+ <<set _moraleTroopMod = Math.clamp($troopCount / 100,1,5)>>
+
+ <<set _morale = ($secBotsMorale * $deployingBots + $militiaBaseMorale * _militiaMod * $deployingMilitia + $slaveBaseMorale * _slaveMod * $deployingSlaves + $mercBaseMorale * _mercMod * $deployingMercs + $SFBaseMorale * $SFIntervention * _SFMod) / ($deployingBots + $deployingMilitia +$deployingSlaves + $deployingMercs + $SFIntervention)>>
+ <<set _morale = _morale + _morale * $secBarracksUpgrades.luxury * 0.05>> /* barracks bonus */
+ <<set _morale *= _moraleTroopMod>>
+ <<set _baseHp = ($secBotsBaseHp * $deployingBots + $militiaBaseHp * $deployingMilitia + $slaveBaseHp * $deployingSlaves + $mercBaseHp * $deployingMercs + $SFBaseHp * $SFIntervention) / ($deployingBots + $deployingMilitia +$deployingSlaves + $deployingMercs + $SFIntervention)>>
+
+ /* calculates enemy army stats */
+ <<if $week <= 30>>
+ <<set _armyMod = $attackTroops / 80>>
+ <<elseif $week <= 60>>
+ <<set _armyMod = $attackTroops / 75>>
+ <<elseif $week <= 90>>
+ <<set _armyMod = $attackTroops / 70>>
+ <<elseif $week <= 120>>
+ <<set _armyMod = $attackTroops / 65>>
+ <<else>>
+ <<set _armyMod = $attackTroops / 60>>
<</if>>
-<<elseif $chosenTactic == "Guerrilla">>
- <<if $attackType == "raiders">>
- <<set _tacChance -= 0.20>>
- <<elseif $attackType == "free city">>
- <<set _tacChance += 0.15>>
- <<elseif $attackType == "old world">>
- <<set _tacChance += 0.25>>
- <<elseif $attackType == "freedom fighters">>
- <<set _tacChance -= 0.25>>
+ <<set _armyMod = Math.trunc(_armyMod)>>
+ <<if $majorBattle == 1>>
+ <<set _armyMod *= 2>>
<</if>>
-<<elseif $chosenTactic == "Choke Points">>
- <<if $attackType == "raiders">>
- <<set _tacChance += 0.25>>
- <<elseif $attackType == "free city">>
- <<set _tacChance -= 0.05>>
- <<elseif $attackType == "old world">>
- <<set _tacChance -= 0.10>>
- <<elseif $attackType == "freedom fighters">>
- <<set _tacChance += 0.05>>
+ <<if _armyMod <= 0>>
+ <<set _armyMod = 1>>
<</if>>
-<<elseif $chosenTactic == "Interior Lines">>
+
+ <<set _enemyMoraleTroopMod = Math.clamp($attackTroops / 100,1,5)>>
+
<<if $attackType == "raiders">>
- <<set _tacChance -= 0.15>>
+ <<set _enemyAttack = ($raBaseAttack + $weapManu * $sellTo.raiders + $raBaseAttack * $attackEquip * $equipMod) * _armyMod>>
+ <<set _enemyDefense = ($raBaseDefense + $weapManu * $sellTo.raiders + $raBaseDefense * $attackEquip * $equipMod) * _armyMod>>
+ <<set _enemyMorale = $raBaseMorale * _enemyMod * _enemyMoraleTroopMod>>
+ <<set _enemyHp = $raBaseHp * $attackTroops>>
+ <<set _enemyBaseHp = $raBaseHp>>
<<elseif $attackType == "free city">>
- <<set _tacChance += 0.15>>
+ <<set _enemyAttack = ($fcBaseAttack + $weapManu * $sellTo.FC + $fcBaseAttack * $attackEquip * $equipMod) * _armyMod>>
+ <<set _enemyDefense = ($fcBaseDefense + $weapManu * $sellTo.FC + $fcBaseDefense * $attackEquip * $equipMod) * _armyMod>>
+ <<set _enemyMorale = $fcBaseMorale * _enemyMod * _enemyMoraleTroopMod>>
+ <<set _enemyHp = $fcBaseHp * $attackTroops>>
+ <<set _enemyBaseHp = $fcBaseHp>>
<<elseif $attackType == "old world">>
- <<set _tacChance += 0.20>>
+ <<set _enemyAttack = ($owBaseAttack + $weapManu * $sellTo.oldWorld + $owBaseAttack * $attackEquip * $equipMod) * _armyMod>>
+ <<set _enemyDefense = ($owBaseDefense + $weapManu * $sellTo.oldWorld + $owBaseDefense * $attackEquip * $equipMod) * _armyMod>>
+ <<set _enemyMorale = $owBaseMorale * _enemyMod * _enemyMoraleTroopMod>>
+ <<set _enemyHp = $owBaseHp * $attackTroops>>
+ <<set _enemyBaseHp = $owBaseHp>>
<<elseif $attackType == "freedom fighters">>
- <<set _tacChance -= 0.10>>
+ <<set _enemyAttack = ($ffBaseAttack + $weapManu * $sellTo.oldWorld + $ffBaseAttack * $attackEquip * $equipMod) * _armyMod>>
+ <<set _enemyDefense = ($ffBaseDefense + $weapManu * $sellTo.oldWorld + $ffBaseDefense * $attackEquip * $equipMod) * _armyMod>>
+ <<set _enemyMorale = $ffBaseMorale * _enemyMod * _enemyMoraleTroopMod>>
+ <<set _enemyHp = $ffBaseHp * $attackTroops>>
+ <<set _enemyBaseHp = $ffBaseHp>>
<</if>>
-<<elseif $chosenTactic == "Pincer Maneuver">>
- <<if $attackType == "raiders">>
- <<set _tacChance += 0.15>>
- <<elseif $attackType == "free city">>
- <<set _tacChance += 0.10>>
- <<elseif $attackType == "old world">>
- <<set _tacChance -= 0.10>>
- <<elseif $attackType == "freedom fighters">>
- <<set _tacChance += 0.15>>
+
+ /* difficulty */
+ <<set _enemyAttack *= $difficulty>>
+ <<set _enemyDefense *= $difficulty>>
+ <<set _enemyMorale *= $difficulty>>
+ <<set _enemyHp *= $difficulty>>
+ <<set _enemyBaseHp *= $difficulty>>
+
+ <<if isNaN(_attack)>>
+ <br>@@.red;Error: attack value reported NaN@@
<</if>>
-<<elseif $chosenTactic == "Defense In Depth">>
- <<if $attackType == "raiders">>
- <<set _tacChance -= 0.20>>
- <<elseif $attackType == "free city">>
- <<set _tacChance += 0.10>>
- <<elseif $attackType == "old world">>
- <<set _tacChance += 0.20>>
- <<elseif $attackType == "freedom fighters">>
- <<set _tacChance -= 0.05>>
+ <<if isNaN(_defense)>>
+ <br>@@.red;Error: defense value reported NaN@@
<</if>>
-<<elseif $chosenTactic == "Blitzkrieg">>
- <<if $attackType == "raiders">>
- <<set _tacChance += 0.10>>
- <<elseif $attackType == "free city">>
- <<set _tacChance -= 0.20>>
- <<elseif $attackType == "old world">>
- <<set _tacChance += 0.25>>
- <<elseif $attackType == "freedom fighters">>
- <<set _tacChance -= 0.10>>
+ <<if isNaN(_hp)>>
+ <br>@@.red;Error: hp value reported NaN@@
<</if>>
-<<elseif $chosenTactic == "Human Wave">>
- <<if $attackType == "raiders">>
- <<set _tacChance -= 0.10>>
- <<elseif $attackType == "free city">>
- <<set _tacChance += 0.10>>
- <<elseif $attackType == "old world">>
- <<set _tacChance -= 0.15>>
- <<elseif $attackType == "freedom fighters">>
- <<set _tacChance += 0.10>>
+ <<if isNaN(_morale)>>
+ <br>@@.red;Error: morale value reported NaN@@
<</if>>
-<</if>>
-
-/* Calculates if tactics are successful */
-/* minimum chance is 10% */
-<<if _tacChance <= 0>>
- <<set _tacChance = 0.1>>
-<</if>>
-<<if random(1,100) <= _tacChance * 100>>
- <<set _enemyMod -= 0.30>>
- <<set _militiaMod += 0.20>>
- <<set _slaveMod += 0.20>>
- <<set _mercMod += 0.20>>
- <<set _atkMod += 0.10>>
- <<set _defMod += 0.10>>
- <<set $tacticsSuccessful = 1>>
-<<else>>
- <<set _enemyMod += 0.20>>
- <<set _militiaMod -= 0.20>>
- <<set _slaveMod -= 0.20>>
- <<set _mercMod -= 0.20>>
- <<set _atkMod -= 0.10>>
- <<set _defMod -= 0.10>>
- <<set $tacticsSuccessful = 0>>
-<</if>>
-
-/* enemy morale mods */
-<<if $week < 30>>
- <<set _enemyMod += 0.15>>
-<<elseif $week < 60>>
- <<set _enemyMod += 0.30>>
-<<elseif $week < 90>>
- <<set _enemyMod += 0.45>>
-<<elseif $week < 120>>
- <<set _enemyMod += 0.60>>
-<<else>>
- <<set _enemyMod += 0.75>>
-<</if>>
-
-/* calculates PC army stats */
-<<if $secBots.isDeployed == 1>>
- <<set _attack += ($secBotsBaseAttack + $secBotsBaseAttack * $secBots.equip * $equipMod) * _atkMod>>
- <<set _defense += ($secBotsBaseDefense + $secBotsBaseDefense * $secBots.equip * $equipMod) * _defMod>>
- <<set _hp += $secBotsBaseHp * $secBots.troops>>
-<</if>>
-<<for _i = 0; _i < $militiaUnits.length; _i++>>
- <<if $militiaUnits[_i].isDeployed == 1>>
- <<if $militiaUnits[_i].training <= 10>>
- <<set _expBonus = 0>>
- <<elseif $militiaUnits[_i].training <= 33>>
- <<set _expBonus = 0.10>>
- <<elseif $militiaUnits[_i].training <= 66>>
- <<set _expBonus = 0.25>>
- <<else>>
- <<set _expBonus = 0.50>>
- <</if>>
- <<if $militiaUnits[_i].loyalty <= 10>>
- <<set _loyaltyBonus = 0>>
- <<elseif $militiaUnits[_i].loyalty <= 33>>
- <<set _loyaltyBonus = 0.10>>
- <<elseif $militiaUnits[_i].loyalty <= 66>>
- <<set _loyaltyBonus = 0.20>>
- <<else>>
- <<set _loyaltyBonus = 0.30>>
- <</if>>
- <<set _attack += ($militiaBaseAttack + $militiaBaseAttack * $militiaUnits[_i].equip * $equipMod + $militiaBaseAttack * _expBonus + $militiaBaseAttack * _loyaltyBonus + $militiaBaseAttack * $militiaUnits[_i].SF * 0.20 + $militiaUnits[_i].cyber) * _atkMod>>
- <<set _defense += ($militiaBaseDefense + $militiaBaseDefense * $militiaUnits[_i].equip * $equipMod + $militiaBaseDefense * _expBonus + $militiaBaseDefense * _loyaltyBonus + $militiaBaseDefense * $militiaUnits[_i].SF * 0.20 + $militiaUnits[_i].cyber) * _defMod>>
- <<set _hp += ($militiaBaseHp + $militiaUnits[_i].cyber + $militiaBaseHp * $militiaUnits[_i].medics * 0.25) * $militiaUnits[_i].troops>>
+ <<if isNaN(_enemyAttack)>>
+ <br>@@.red;Error: enemy attack value reported NaN@@
<</if>>
-<</for>>
-<<for _i = 0; _i < $slaveUnits.length; _i++>>
- <<if $slaveUnits[_i].isDeployed == 1>>
- <<if $slaveUnits[_i].training <= 33>>
- <<set _expBonus = 0>>
- <<elseif $slaveUnits[_i].training <= 66>>
- <<set _expBonus = 0.25>>
- <<else>>
- <<set _expBonus = 0.50>>
- <</if>>
- <<if $slaveUnits[_i].loyalty <= 10>>
- <<set _loyaltyBonus = 0>>
- <<elseif $slaveUnits[_i].loyalty <= 33>>
- <<set _loyaltyBonus = 0.10>>
- <<elseif $slaveUnits[_i].loyalty <= 66>>
- <<set _loyaltyBonus = 0.20>>
- <<else>>
- <<set _loyaltyBonus = 0.30>>
- <</if>>
- <<set _attack += ($slaveBaseAttack + $slaveBaseAttack * $slaveUnits[_i].equip * $equipMod + $slaveBaseAttack * _expBonus + $slaveBaseAttack * _loyaltyBonus + $slaveBaseAttack * $slaveUnits[_i].SF * 0.20 + $slaveUnits[_i].cyber) * _atkMod>>
- <<set _defense += ($slaveBaseDefense + $slaveBaseDefense * $slaveUnits[_i].equip * $equipMod + $slaveBaseDefense * _expBonus + $slaveBaseDefense * _loyaltyBonus + $slaveBaseDefense * $slaveUnits[_i].SF * 0.20 + $slaveUnits[_i].cyber) * _defMod>>
- <<set _hp += ($slaveBaseHp + $slaveUnits[_i].cyber + $slaveBaseHp * $slaveUnits[_i].medics * 0.25) * $slaveUnits[_i].troops>>
+ <<if isNaN(_enemyDefense)>>
+ <br>@@.red;Error: enemy defense value reported NaN@@
<</if>>
-<</for>>
-<<for _i = 0; _i < $mercUnits.length; _i++>>
- <<if $mercUnits[_i].isDeployed == 1>>
- <<if $mercUnits[_i].training <= 33>>
- <<set _expBonus = 0>>
- <<elseif $mercUnits[_i].training <= 66>>
- <<set _expBonus = 0.25>>
- <<else>>
- <<set _expBonus = 0.50>>
- <</if>>
- <<if $mercUnits[_i].loyalty <= 10>>
- <<set _loyaltyBonus = 0>>
- <<elseif $mercUnits[_i].loyalty <= 33>>
- <<set _loyaltyBonus = 0.10>>
- <<elseif $mercUnits[_i].loyalty <= 66>>
- <<set _loyaltyBonus = 0.20>>
- <<else>>
- <<set _loyaltyBonus = 0.30>>
- <</if>>
- <<set _attack += ($mercBaseAttack + $mercBaseAttack * $mercUnits[_i].equip * $equipMod + $mercBaseAttack * _expBonus + $mercBaseAttack * _loyaltyBonus + $mercBaseAttack * $mercUnits[_i].SF * 0.20 + $mercUnits[_i].cyber) * _atkMod>>
- <<set _defense += ($mercBaseDefense + $mercBaseDefense * $mercUnits[_i].equip * $equipMod + $mercBaseDefense * _expBonus + $mercBaseDefense * _loyaltyBonus + $mercBaseDefense * $mercUnits[_i].SF * 0.20 + $mercUnits[_i].cyber) * _defMod>>
- <<set _hp += ($mercBaseHp + $mercUnits[_i].cyber + $mercBaseHp * $mercUnits[_i].medics * 0.25) * $mercUnits[_i].troops>>
+ <<if isNaN(_enemyHp)>>
+ <br>@@.red;Error: enemy hp value reported NaN@@
+ <</if>>
+ <<if isNaN(_enemyMorale)>>
+ <br>@@.red;Error: enemy morale value reported NaN@@
<</if>>
-<</for>>
-
-<<if $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
- <<set $SFatk = 0>>
- <<set $SFdef = 0>>
- <<set $SFhp = 0>>
- <<calcSFStatistics>>
- <<set _attack += $SFatk>>
- <<set _defense += $SFdef>>
- <<set _hp += $SFhp>>
-<</if>>
-
-/* morale and baseHp calculation */
-/* minimum modifier is -50%, maximum is +50% */
-<<if _militiaMod < 0.5>>
- <<set _militiaMod = 0.5>>
-<<elseif _militiaMod > 1.5>>
- <<set _militiaMod = 1.5>>
-<</if>>
-<<if _slaveMod < 0.5>>
- <<set _slaveMod = 0.5>>
-<<elseif _slaveMod > 1.5>>
- <<set _slaveMod = 1.5>>
-<</if>>
-<<if _mercMod < 0.5>>
- <<set _mercMod = 0.5>>
-<<elseif _mercMod > 1.5>>
- <<set _mercMod = 1.5>>
-<</if>>
-<<if _SFMod < 0.5>>
- <<set _SFMod = 0.5>>
-<<elseif _SFMod > 1.5>>
- <<set _SFMod = 1.5>>
-<</if>>
-
-<<set $troopCount = 0>>
-<<calcTroopCount>>
-<<set _moraleTroopMod = Math.clamp($troopCount / 100,1,5)>>
-
-<<set _morale = ($secBotsMorale * $deployingBots + $militiaBaseMorale * _militiaMod * $deployingMilitia + $slaveBaseMorale * _slaveMod * $deployingSlaves + $mercBaseMorale * _mercMod * $deployingMercs + $SFBaseMorale * $SFIntervention * _SFMod) / ($deployingBots + $deployingMilitia +$deployingSlaves + $deployingMercs + $SFIntervention)>>
-<<set _morale = _morale + _morale * $secBarracksUpgrades.luxury * 0.05>> /* barracks bonus */
-<<set _morale *= _moraleTroopMod>>
-<<set _baseHp = ($secBotsBaseHp * $deployingBots + $militiaBaseHp * $deployingMilitia + $slaveBaseHp * $deployingSlaves + $mercBaseHp * $deployingMercs + $SFBaseHp * $SFIntervention) / ($deployingBots + $deployingMilitia +$deployingSlaves + $deployingMercs + $SFIntervention)>>
-
-/* calculates enemy army stats */
-<<if $week <= 30>>
- <<set _armyMod = $attackTroops / 80>>
-<<elseif $week <= 60>>
- <<set _armyMod = $attackTroops / 75>>
-<<elseif $week <= 90>>
- <<set _armyMod = $attackTroops / 70>>
-<<elseif $week <= 120>>
- <<set _armyMod = $attackTroops / 65>>
-<<else>>
- <<set _armyMod = $attackTroops / 60>>
-<</if>>
-<<set _armyMod = Math.trunc(_armyMod)>>
-<<if $majorBattle == 1>>
- <<set _armyMod *= 2>>
-<</if>>
-<<if _armyMod <= 0>>
- <<set _armyMod = 1>>
-<</if>>
-
-<<set _enemyMoraleTroopMod = Math.clamp($attackTroops / 100,1,5)>>
-
-<<if $attackType == "raiders">>
- <<set _enemyAttack = ($raBaseAttack + $weapManu * $sellTo.raiders + $raBaseAttack * $attackEquip * $equipMod) * _armyMod>>
- <<set _enemyDefense = ($raBaseDefense + $weapManu * $sellTo.raiders + $raBaseDefense * $attackEquip * $equipMod) * _armyMod>>
- <<set _enemyMorale = $raBaseMorale * _enemyMod * _enemyMoraleTroopMod>>
- <<set _enemyHp = $raBaseHp * $attackTroops>>
- <<set _enemyBaseHp = $raBaseHp>>
-<<elseif $attackType == "free city">>
- <<set _enemyAttack = ($fcBaseAttack + $weapManu * $sellTo.FC + $fcBaseAttack * $attackEquip * $equipMod) * _armyMod>>
- <<set _enemyDefense = ($fcBaseDefense + $weapManu * $sellTo.FC + $fcBaseDefense * $attackEquip * $equipMod) * _armyMod>>
- <<set _enemyMorale = $fcBaseMorale * _enemyMod * _enemyMoraleTroopMod>>
- <<set _enemyHp = $fcBaseHp * $attackTroops>>
- <<set _enemyBaseHp = $fcBaseHp>>
-<<elseif $attackType == "old world">>
- <<set _enemyAttack = ($owBaseAttack + $weapManu * $sellTo.oldWorld + $owBaseAttack * $attackEquip * $equipMod) * _armyMod>>
- <<set _enemyDefense = ($owBaseDefense + $weapManu * $sellTo.oldWorld + $owBaseDefense * $attackEquip * $equipMod) * _armyMod>>
- <<set _enemyMorale = $owBaseMorale * _enemyMod * _enemyMoraleTroopMod>>
- <<set _enemyHp = $owBaseHp * $attackTroops>>
- <<set _enemyBaseHp = $owBaseHp>>
-<<elseif $attackType == "freedom fighters">>
- <<set _enemyAttack = ($ffBaseAttack + $weapManu * $sellTo.oldWorld + $ffBaseAttack * $attackEquip * $equipMod) * _armyMod>>
- <<set _enemyDefense = ($ffBaseDefense + $weapManu * $sellTo.oldWorld + $ffBaseDefense * $attackEquip * $equipMod) * _armyMod>>
- <<set _enemyMorale = $ffBaseMorale * _enemyMod * _enemyMoraleTroopMod>>
- <<set _enemyHp = $ffBaseHp * $attackTroops>>
- <<set _enemyBaseHp = $ffBaseHp>>
-<</if>>
-
-/* difficulty */
-<<set _enemyAttack *= $difficulty>>
-<<set _enemyDefense *= $difficulty>>
-<<set _enemyMorale *= $difficulty>>
-<<set _enemyHp *= $difficulty>>
-<<set _enemyBaseHp *= $difficulty>>
-
-<<if isNaN(_attack)>>
- <br>@@.red;Error: attack value reported NaN@@
-<</if>>
-<<if isNaN(_defense)>>
- <br>@@.red;Error: defense value reported NaN@@
-<</if>>
-<<if isNaN(_hp)>>
- <br>@@.red;Error: hp value reported NaN@@
-<</if>>
-<<if isNaN(_morale)>>
- <br>@@.red;Error: morale value reported NaN@@
-<</if>>
-<<if isNaN(_enemyAttack)>>
- <br>@@.red;Error: enemy attack value reported NaN@@
-<</if>>
-<<if isNaN(_enemyDefense)>>
- <br>@@.red;Error: enemy defense value reported NaN@@
-<</if>>
-<<if isNaN(_enemyHp)>>
- <br>@@.red;Error: enemy hp value reported NaN@@
-<</if>>
-<<if isNaN(_enemyMorale)>>
- <br>@@.red;Error: enemy morale value reported NaN@@
-<</if>>
-
-<<if $showBattleStatistics == 1>>
-<<set _atkMod -= 1, _defMod -= 1, _militiaMod -= 1, _mercMod -= 1, _slaveMod -= 1, _SFMod -= 1, _enemyMod -= 1, _moraleTroopMod -= 1, _enemyMoraleTroopMod -= 1, _difficulty = $difficulty -1>>
-<<set _atkMod = Math.round(_atkMod * 100)>>
-<<set _defMod = Math.round(_defMod * 100)>>
-<<set _militiaMod = Math.round(_militiaMod * 100)>>
-<<set _mercMod = Math.round(_mercMod * 100)>>
-<<set _slaveMod = Math.round(_slaveMod * 100)>>
-<<set _SFMod = Math.round(_SFMod * 100)>>
-<<set _enemyMod = Math.round(_enemyMod * 100)>>
-<<set _barracksBonus = $secBarracksUpgrades.luxury * 5>>
-<<set _moraleTroopMod = Math.round(_moraleTroopMod * 100)>>
-<<set _enemyMoraleTroopMod = Math.round(_enemyMoraleTroopMod * 100)>>
-<<set _difficulty *= 100>>
-
-__Difficulty__:
-<br>
-<<if $difficulty == 0.5>>
- Very easy
-<<elseif $difficulty == 0.75>>
- Easy
-<<elseif $difficulty == 1>>
- Normal
-<<elseif $difficulty == 1.25>>
- Hard
-<<else>>
- Very hard
-<</if>>
-<br>
-<br>
-__Army__:
-<br>troops: <<print commaNum(Math.round($troopCount))>>
-<br>attack: <<print commaNum(Math.round(_attack))>>
-<br>defense: <<print commaNum(Math.round(_defense))>>
-<br>hp: <<print commaNum(Math.round(_hp))>>
-<br>morale: <<print commaNum(Math.round(_morale))>>
-<br>attack modifier: <<if _atkMod > 0>>+<</if>>_atkMod%
-<br>defense modifier: <<if _defMod > 0>>+<</if>>_defMod%
-<br>average base HP: <<print commaNum(Math.round(_baseHp))>>
-<br>militia morale modifier: <<if _militiaMod > 0>>+<</if>>_militiaMod%
-<br>slaves morale modifier: <<if _slaveMod > 0>>+<</if>>_slaveMod%
-<br>mercenaries morale modifier: <<if _mercMod > 0>>+<</if>>_mercMod%
-<<if $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
-<br>special force morale modifier: <<if _SFMod > 0>>+<</if>>_SFMod%
-<</if>>
-<<if $secBarracksUpgrades.luxury >= 1>>
-<br>Barracks bonus morale modifier: +<<print _barracksBonus>>%
-<</if>>
-<<if _moraleTroopMod>>
- <br>morale increase due to troop numbers: +<<print _moraleTroopMod>>%
-<</if>>
-<br>
-<br>
-__Tactics__:
-<br>tactic chance of success: <<print commaNum(Math.round(_tacChance * 100))>>%
-<br>was tactic chosen successful?: <<if $tacticsSuccessful == 1>> yes <<else>> no<</if>>
-<br>
-<br>
-__Enemy__:
-<br>enemy troops: <<print commaNum(Math.round($attackTroops))>>
-<br>enemy attack: <<print commaNum(Math.round(_enemyAttack))>>
-<br>enemy defense: <<print commaNum(Math.round(_enemyDefense))>>
-<br>enemy Hp: <<print commaNum(Math.round(_enemyHp))>>
-<br>enemy morale: <<print commaNum(Math.round(_enemyMorale))>>
-<br>enemy base Hp: <<print commaNum(Math.round(_enemyBaseHp))>>
-<br>enemy morale modifier: <<if _enemyMod > 0>>+<</if>>_enemyMod%
-<<if _enemyMoraleTroopMod > 0>>
- <br>enemy morale increase due to troop numbers: +<<print _enemyMoraleTroopMod>>%
-<</if>>
-<br>Difficulty modifier: <<if _difficulty > 0>>+<</if>><<print _difficulty>>%
-<</if>>
+ <<if $showBattleStatistics == 1>>
+ <<set _atkMod -= 1, _defMod -= 1, _militiaMod -= 1, _mercMod -= 1, _slaveMod -= 1, _SFMod -= 1, _enemyMod -= 1, _moraleTroopMod -= 1, _enemyMoraleTroopMod -= 1, _difficulty = $difficulty -1>>
+ <<set _atkMod = Math.round(_atkMod * 100)>>
+ <<set _defMod = Math.round(_defMod * 100)>>
+ <<set _militiaMod = Math.round(_militiaMod * 100)>>
+ <<set _mercMod = Math.round(_mercMod * 100)>>
+ <<set _slaveMod = Math.round(_slaveMod * 100)>>
+ <<set _SFMod = Math.round(_SFMod * 100)>>
+ <<set _enemyMod = Math.round(_enemyMod * 100)>>
+ <<set _barracksBonus = $secBarracksUpgrades.luxury * 5>>
+ <<set _moraleTroopMod = Math.round(_moraleTroopMod * 100)>>
+ <<set _enemyMoraleTroopMod = Math.round(_enemyMoraleTroopMod * 100)>>
+ <<set _difficulty *= 100>>
-/* simulates the combat by pitting attk against def */
-<<for _i = 0; _i < _turns; _i++>>
- <br><br>
- <<if $showBattleStatistics == 1>> turn: <<print _i + 1>><</if>>
- /* player army attacks */
- <<set _damage = Math.clamp(_attack - _enemyDefense,_attack * 0.1,_attack)>>
+ __Difficulty__:
<br>
- <<if $showBattleStatistics == 1>> player damage: <<print commaNum(Math.round(_damage))>><</if>>
- <<set _enemyHp -= _damage>>
+ <<if $difficulty == 0.5>>
+ Very easy
+ <<elseif $difficulty == 0.75>>
+ Easy
+ <<elseif $difficulty == 1>>
+ Normal
+ <<elseif $difficulty == 1.25>>
+ Hard
+ <<else>>
+ Very hard
+ <</if>>
<br>
- <<if $showBattleStatistics == 1>> remaining enemy Hp: <<print commaNum(Math.round(_enemyHp))>><</if>>
- <<set $enemyLosses += _damage / _enemyBaseHp>>
- <<set _moraleDamage = Math.clamp(_damage / 2 + _damage / _enemyBaseHp,0,_damage*1.5)>>
- <<set _enemyMorale -= _moraleDamage>>
<br>
- <<if $showBattleStatistics == 1>> remaining enemy morale: <<print commaNum(Math.round(_enemyMorale))>><</if>>
- <<if _enemyHp <= 0 || _enemyMorale <= 0>>
- <br>
- <<if $showBattleStatistics == 1>> <br>Victory!<</if>>
- <<set $battleResult = 3>>
- <<set $battleTurns = _i>>
- <<break>>
- <</if>>
-
- /* attacker army attacks */
- <<set _damage = _enemyAttack - _defense>>
- <<if _damage < _enemyAttack * 0.1>>
- <<set _damage = _enemyAttack * 0.1>>
+ __Army__:
+ <br>troops: <<print commaNum(Math.round($troopCount))>>
+ <br>attack: <<print commaNum(Math.round(_attack))>>
+ <br>defense: <<print commaNum(Math.round(_defense))>>
+ <br>hp: <<print commaNum(Math.round(_hp))>>
+ <br>morale: <<print commaNum(Math.round(_morale))>>
+ <br>attack modifier: <<if _atkMod > 0>>+<</if>>_atkMod%
+ <br>defense modifier: <<if _defMod > 0>>+<</if>>_defMod%
+ <br>average base HP: <<print commaNum(Math.round(_baseHp))>>
+ <br>militia morale modifier: <<if _militiaMod > 0>>+<</if>>_militiaMod%
+ <br>slaves morale modifier: <<if _slaveMod > 0>>+<</if>>_slaveMod%
+ <br>mercenaries morale modifier: <<if _mercMod > 0>>+<</if>>_mercMod%
+ <<if $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
+ <br>special force morale modifier: <<if _SFMod > 0>>+<</if>>_SFMod%
+ <</if>>
+ <<if $secBarracksUpgrades.luxury >= 1>>
+ <br>Barracks bonus morale modifier: +<<print _barracksBonus>>%
+ <</if>>
+ <<if _moraleTroopMod>>
+ <br>morale increase due to troop numbers: +<<print _moraleTroopMod>>%
<</if>>
<br>
- <<if $showBattleStatistics == 1>> enemy damage: <<print commaNum(Math.round(_damage))>><</if>>
- <<set _hp -= _damage>>
<br>
- <<if $showBattleStatistics == 1>> remaining hp: <<print commaNum(Math.round(_hp))>><</if>>
- <<set $losses += _damage / _baseHp>>
- <<set _moraleDamage = Math.clamp(_damage / 2 + _damage / _baseHp,0,_damage*1.5)>>
- <<set _morale -= _moraleDamage>>
+ __Tactics__:
+ <br>tactic chance of success: <<print commaNum(Math.round(_tacChance * 100))>>%
+ <br>was tactic chosen successful?: <<if $tacticsSuccessful == 1>> yes <<else>> no<</if>>
<br>
- <<if $showBattleStatistics == 1>> remaining morale: <<print Math.round(_morale)>><</if>>
- <<if _hp <= 0 || _morale <= 0>>
- <br>
- <<if $showBattleStatistics == 1>> <br>Defeat!<</if>>
- <<set $battleResult = -3>>
- <<set $battleTurns = _i>>
- <<break>>
- <</if>>
-<</for>>
-<<if $battleResult != 3 && $battleResult != -3>>
<br>
- <<if _morale > _enemyMorale>>
- <<if $showBattleStatistics == 1>> <br>Partial victory!<</if>>
- <<set $battleResult = 2>>
- <<elseif _morale < _enemyMorale>>
- <<if $showBattleStatistics == 1>> <br>Partial defeat!<</if>>
- <<set $battleResult = -2>>
+ __Enemy__:
+ <br>enemy troops: <<print commaNum(Math.round($attackTroops))>>
+ <br>enemy attack: <<print commaNum(Math.round(_enemyAttack))>>
+ <br>enemy defense: <<print commaNum(Math.round(_enemyDefense))>>
+ <br>enemy Hp: <<print commaNum(Math.round(_enemyHp))>>
+ <br>enemy morale: <<print commaNum(Math.round(_enemyMorale))>>
+ <br>enemy base Hp: <<print commaNum(Math.round(_enemyBaseHp))>>
+ <br>enemy morale modifier: <<if _enemyMod > 0>>+<</if>>_enemyMod%
+ <<if _enemyMoraleTroopMod > 0>>
+ <br>enemy morale increase due to troop numbers: +<<print _enemyMoraleTroopMod>>%
+ <</if>>
+ <br>Difficulty modifier: <<if _difficulty > 0>>+<</if>><<print _difficulty>>%
<</if>>
-<</if>>
-<<if $showBattleStatistics == 1>>
- <br>
- <br>Losses: <<print commaNum(Math.trunc($losses))>>
- <br>Enemy losses: <<print commaNum(Math.trunc($enemyLosses))>>
-<</if>>
+ /* simulates the combat by pitting attk against def */
+ <<for _i = 0; _i < _turns; _i++>>
+ <br><br>
+ <<if $showBattleStatistics == 1>> turn: <<print _i + 1>><</if>>
+ /* player army attacks */
+ <<set _damage = Math.clamp(_attack - _enemyDefense,_attack * 0.1,_attack)>>
+ <br>
+ <<if $showBattleStatistics == 1>> player damage: <<print commaNum(Math.round(_damage))>><</if>>
+ <<set _enemyHp -= _damage>>
+ <br>
+ <<if $showBattleStatistics == 1>> remaining enemy Hp: <<print commaNum(Math.round(_enemyHp))>><</if>>
+ <<set $enemyLosses += _damage / _enemyBaseHp>>
+ <<set _moraleDamage = Math.clamp(_damage / 2 + _damage / _enemyBaseHp,0,_damage*1.5)>>
+ <<set _enemyMorale -= _moraleDamage>>
+ <br>
+ <<if $showBattleStatistics == 1>> remaining enemy morale: <<print commaNum(Math.round(_enemyMorale))>><</if>>
+ <<if _enemyHp <= 0 || _enemyMorale <= 0>>
+ <br>
+ <<if $showBattleStatistics == 1>> <br>Victory!<</if>>
+ <<set $battleResult = 3>>
+ <<set $battleTurns = _i>>
+ <<break>>
+ <</if>>
-<<if $battleResult > 3 || $battleResult < -3>>
- <br><br>@@.red;Error: failed to determine battle result@@
-<</if>>
+ /* attacker army attacks */
+ <<set _damage = _enemyAttack - _defense>>
+ <<if _damage < _enemyAttack * 0.1>>
+ <<set _damage = _enemyAttack * 0.1>>
+ <</if>>
+ <br>
+ <<if $showBattleStatistics == 1>> enemy damage: <<print commaNum(Math.round(_damage))>><</if>>
+ <<set _hp -= _damage>>
+ <br>
+ <<if $showBattleStatistics == 1>> remaining hp: <<print commaNum(Math.round(_hp))>><</if>>
+ <<set $losses += _damage / _baseHp>>
+ <<set _moraleDamage = Math.clamp(_damage / 2 + _damage / _baseHp,0,_damage*1.5)>>
+ <<set _morale -= _moraleDamage>>
+ <br>
+ <<if $showBattleStatistics == 1>> remaining morale: <<print Math.round(_morale)>><</if>>
+ <<if _hp <= 0 || _morale <= 0>>
+ <br>
+ <<if $showBattleStatistics == 1>> <br>Defeat!<</if>>
+ <<set $battleResult = -3>>
+ <<set $battleTurns = _i>>
+ <<break>>
+ <</if>>
+ <</for>>
+ <<if $battleResult != 3 && $battleResult != -3>>
+ <br>
+ <<if _morale > _enemyMorale>>
+ <<if $showBattleStatistics == 1>> <br>Partial victory!<</if>>
+ <<set $battleResult = 2>>
+ <<elseif _morale < _enemyMorale>>
+ <<if $showBattleStatistics == 1>> <br>Partial defeat!<</if>>
+ <<set $battleResult = -2>>
+ <</if>>
+ <</if>>
-<<if $showBattleStatistics == 1 && $majorBattle == 1 && $majorBattleGameOver == 1 && $battleResult == -3>>
- <br><br>
- <<link "Proceed">>
+ <<if $showBattleStatistics == 1>>
+ <br>
+ <br>Losses: <<print commaNum(Math.trunc($losses))>>
+ <br>Enemy losses: <<print commaNum(Math.trunc($enemyLosses))>>
+ <</if>>
+
+ <<if $battleResult > 3 || $battleResult < -3>>
+ <br><br>@@.red;Error: failed to determine battle result@@
+ <</if>>
+
+ <<if $showBattleStatistics == 1 && $majorBattle == 1 && $majorBattleGameOver == 1 && $battleResult == -3>>
+ <br><br>
+ <<link "Proceed">>
+ <<set $gameover = "major battle defeat">>
+ <<goto "Gameover">>
+ <</link>>
+ <<elseif $majorBattle == 1 && $majorBattleGameOver == 1 && $battleResult == -3>>
<<set $gameover = "major battle defeat">>
<<goto "Gameover">>
- <</link>>
-<<elseif $majorBattle == 1 && $majorBattleGameOver == 1 && $battleResult == -3>>
- <<set $gameover = "major battle defeat">>
- <<goto "Gameover">>
-<<elseif $showBattleStatistics == 1>>
- <br><br>
- <<link "Proceed">>
+ <<elseif $showBattleStatistics == 1>>
+ <br><br>
+ <<link "Proceed">>
+ <<goto "attackReport">>
+ <</link>>
+ <<else>>
<<goto "attackReport">>
- <</link>>
-<<else>>
- <<goto "attackReport">>
-<</if>>
+ <</if>>
<</if>> /* closes check for bribery */
\ No newline at end of file
diff --git a/src/SecExp/rebellionEvents.tw b/src/SecExp/rebellionEvents.tw
index 2b30ff5f1c26ba36d4501d711031a551f3f81c77..eb77eb6b76d0c2589299b163f6c3227798918e00 100644
--- a/src/SecExp/rebellionEvents.tw
+++ b/src/SecExp/rebellionEvents.tw
@@ -32,7 +32,7 @@
<<elseif _rand == 3>>
This week a citizen was caught giving refuge to an escaped slave. He was not able to pay for the value of the stolen goods, so he was processed as the case required and the slave returned to their rightful master. Many questions however remain without answers.
<<elseif _rand == 4>>
- This week a member of a well known anti-slavery group was caught trying to infiltrate the arcology. During the capture attempt shots were fired and several guards were injured, and in the end the fugitive unfortunately managed to escape. Reports indicate several slaves helped the criminal, some going as far as using themselves as shields against the bullets of the security drones.
+ This week a member of a well known anti-slavery group was caught trying to infiltrate the arcology. During the capture attempt shots were fired and several guards were injured, and in the end the fugitive unfortunately managed to escape. Reports indicate several slaves helped the criminal, some going as far as using themselves as shields against the bullets of the security drones.
<<elseif _rand == 5>>
This week a slave was caught attempting to sabotage a machine in one of the factories. _HeU explained _hisU action as "trying to defend _himselfU from a dangerous machine". Reports confirmed that the apparatus is indeed quite deadly, having killed several slaves since it was installed, but the expert way _heU handled the sabotage leaves open the possibility of a deliberate plan or even external help.
<<else>>
@@ -43,9 +43,9 @@
/* med tension slave rebellion events */
<<set _rand = random(0,5)>>
<<if _rand == 0>>
- This week some strange reports came in: it seems some assemblies of slaves were observed several nights in a row. The slaves were traced and their masters notified, but many suspect there may be something deeper than a few slaves congregating in the night.
+ This week some strange reports came in: it seems some assemblies of slaves were observed several nights in a row. The slaves were traced and their masters notified, but many suspect there may be something deeper than a few slaves congregating in the night.
<<elseif _rand == 1>>
- This week an underground railroad was discovered. The rebels did not go down without a fight, but in the end <<if $mercenaries >= 1>>your mercenaries<<else>>your security drones<</if>> managed to destroy the old tunnels they were using to ship out slaves out of the arcology.
+ This week an underground railroad was discovered. The rebels did not go down without a fight, but in the end <<if $mercenaries >= 1>>your mercenaries<<else>>your security drones<</if>> managed to destroy the old tunnels they were using to ship out slaves out of the arcology.
<<elseif _rand == 2>>
This week a famous citizen was assaulted and brutally murdered by his slaves. The ones responsible were apprehended and dealt with easily enough, but the mere fact something like this could have happened is concerning. Those slaves had to be aware of their certain doom.
<<elseif _rand == 3>>
@@ -82,7 +82,7 @@
<<elseif _rand == 4>>
This week a citizen refused to be evicted from his house. After some negotiations the man was forcibly removed from the property by your security forces. Unfortunately the forced entry caused some damage to the building.
<<elseif _rand == 5>>
- This week a citizen refused to be enslaved as his contract established. With an impressive display of his rhetoric capabilities he managed to gather a small crowd agreeing with his position. The impromptu assembly was promptly disrupted by the drones.
+ This week a citizen refused to be enslaved as his contract established. With an impressive display of his rhetoric capabilities he managed to gather a small crowd agreeing with his position. The impromptu assembly was promptly disrupted by the drones.
<<else>>
This week a security drone was found disabled and stripped of important electronic components. It seems the act was not dictated by greed, as the most precious parts of the drone were left on the machine, but rather to cover up something that the drone saw.
<</if>>
@@ -96,7 +96,7 @@
<<elseif _rand == 2>>
This week the security department registered the formation of several assemblies of citizens, whose purpose seems to be political in nature. For now no further steps were taken, but it's a worrying sign of further political opposition within the arcology.
<<elseif _rand == 3>>
- This week there was a protest against one of the wealthiest citizen of the arcology. Many criticize his near monopoly. Supporters of the citizen met the protesters on the streets and it was just thanks to the intervention of the security drones that violence was avoided.
+ This week there was a protest against one of the wealthiest citizen of the arcology. Many criticize his near monopoly. Supporters of the citizen met the protesters on the streets and it was just thanks to the intervention of the security drones that violence was avoided.
<<elseif _rand == 4>>
This week several cameras were sabotaged and in many cases damaged beyond repair. A group of anonymous citizens claims to be responsible; their motivation is apparently the excessive surveillance in the arcology and their attack a response to the breach of their privacy.
<<else>>
diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw
index c39aa26fd17b8b3426bb0120c16375186412c0f9..bb9a18a01e782b80889f8e07caac2dac2c1f6f76 100644
--- a/src/cheats/mod_EditSlaveCheat.tw
+++ b/src/cheats/mod_EditSlaveCheat.tw
@@ -1353,7 +1353,7 @@ Paraphilias:
<<radiobutton "$tempSlave.sexualQuirk" "unflinching">> Unflinching
<<radiobutton "$tempSlave.sexualQuirk" "size queen">> Size Queen
<<if $tempSlave.sexualQuirk != "none">>
- <<if !["cum addict", "anal addict", "attention whore", "breast growth", "abusive", "malicious", "self hating", "neglectful", "breeder"].includes($tempSlave.sexualFlaw)>>
+ <<if !["abusive", "anal addict", "attention whore", "breast growth", "breeder", "cum addict", "malicious", "neglectful", "self hating"].includes($tempSlave.sexualFlaw)>>
<<set $tempSlave.sexualFlaw = "none">>
<</if>>
<</if>>
diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index 076f558440fcb7d3fd2ffc7085e12179897cb05b..5191828c8e6caa4c9a2c11bfe539811a8c6b88e2 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -788,7 +788,7 @@ $he's
<<if $activeChild.fuckdoll == 0>>
<<if $showBodyMods == 1>>
- <<if ["neck", "left cheek", "right cheek", "cheeks", "left ears", "right ears", "ears"].includes($activeChild.brandLocation)>>
+ <<if ["cheeks", "ears", "left cheek", "left ears", "neck", "right cheek", "right ears"].includes($activeChild.brandLocation)>>
<<brandDescription>>
<</if>>
<</if>>
@@ -1272,7 +1272,7 @@ $He is
<<if $activeChild.fuckdoll == 0>>
<<if $showBodyMods == 1>>
/* Check it's not a facial brand: */
- <<if ["back", "lower back", "chest", "right shoulder", "left shoulder", "shoulders", "right upper arm", "left upper arm", "upper arms", "right lower arm", "left lower arm", "lower arms", "right wrist", "left wrist", "wrists", "right hand", "left hand", "hands", "left ankle", "right ankle", "ankles", "right calf", "left calf", "calves", "right foot", "left foot", "feet"].includes($activeChild.brandLocation)>>
+ <<if ["ankles", "back", "calves", "chest", "feet", "hands", "left ankle", "left calf", "left foot", "left hand", "left lower arm", "left shoulder", "left upper arm", "left wrist", "lower arms", "lower back", "right ankle", "right calf", "right foot", "right hand", "right lower arm", "right shoulder", "right upper arm", "right wrist", "shoulders", "upper arms", "wrists"].includes($activeChild.brandLocation)>>
<<brandDescription>>
<</if>>
<</if>>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 317dd630dbbead9a4016ab24ea6117ab659489b7..ca383f27dc1c0d35c229342f2ee44ea788a9bcfd 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -189,7 +189,6 @@ You should have received a copy of the GNU General Public License along with thi
<<set $saveImported = 0>>
<</if>>
-
<<if $saveImported == 0>> /* new game (not NG+) */
<<initPC>>
@@ -334,7 +333,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $minimumSlaveAge = 18>>
<<set $fertilityAge = 13>>
<<silently>>
- FertilityAge($fertilityAge)
+ FertilityAge($fertilityAge)
<</silently>>
<<set $potencyAge = 13>>
<<set $AgePenalty = 1>>
@@ -467,7 +466,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $dairyRestraintsUpgrade = 0>>
<<set $dairyRestraintsSetting = 0>>
<<silently>>
-DairyRestraintsSetting($dairyRestraintsSetting)
+ DairyRestraintsSetting($dairyRestraintsSetting)
<</silently>>
<<set $dairySlimMaintainUpgrade = 0>>
<<set $dairySlimMaintain = 0>>
@@ -857,7 +856,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $clinicInflateBelly = 0>>
<<set $playerBred = 0>>
<<set $propOutcome = 0>>
-<<set $EliteSires = ["moves", "quick", "crazy", "virgin", "futa", "preggo"]>>
+<<set $EliteSires = ["crazy", "futa", "moves", "preggo", "quick", "virgin"]>>
<<set $startingPoint = -1>>
<<set $PhysicalRetirementAgePolicy = 0>>
<<set $raped = -1>>
@@ -957,8 +956,8 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $marketAssistantLimit = 0>>
<<set $marketAssistantAggressiveness = 0>>
-<<set $justiceEvents = ["slave deal", "slave training", "majority deal", "indenture deal", "virginity deal", "breeding deal"]>> /* not in setupVars because we remove events from this array as they occur */
-<<set $prisonCircuit = ["low tier criminals", "gangs and smugglers", "white collar", "military prison"]>>
+<<set $justiceEvents = ["breeding deal", "indenture deal", "majority deal", "slave deal", "slave training", "virginity deal"]>> /* not in setupVars because we remove events from this array as they occur */
+<<set $prisonCircuit = ["gangs and smugglers", "low tier criminals", "military prison", "white collar"]>>
<<set $prisonCircuitIndex = random(0,$prisonCircuit.length-1)>>
<<set $fixedNationality = 0>>
@@ -1428,8 +1427,8 @@ electrolarynx: 0,
erectileImplant: 0
} >>
-<<set $merchantFSWares = ["GenderRadicalistResearch", "TransformationFetishistResearch", "AssetExpansionistResearch", "SlimnessEnthusiastResearch", "YouthPreferentialistResearch", "HedonisticDecadenceResearch"]>>
-<<set $merchantIllegalWares = ["childhoodFertilityInducedNCS", "UterineRestraintMesh", "RapidCellGrowthFormula", "PGHack", "sympatheticOvaries", "asexualReproduction"]>> /* , "AnimalOrgans"*/
+<<set $merchantFSWares = ["AssetExpansionistResearch", "GenderRadicalistResearch", "HedonisticDecadenceResearch", "SlimnessEnthusiastResearch", "TransformationFetishistResearch", "YouthPreferentialistResearch"]>>
+<<set $merchantIllegalWares = ["asexualReproduction", "childhoodFertilityInducedNCS", "PGHack", "RapidCellGrowthFormula", "sympatheticOvaries", "UterineRestraintMesh"]>> /* , "AnimalOrgans"*/
<<set $RapidCellGrowthFormula = 0>>
<<set $UterineRestraintMesh = 0>>
<<set $PGHack = 0>>
diff --git a/src/js/SetBellySize.tw b/src/js/SetBellySize.tw
index 15a0399dcacaae6da27f39e11ad1c34a8cf10929..603d70c5185b74e75297658902eb8b897f460ba1 100644
--- a/src/js/SetBellySize.tw
+++ b/src/js/SetBellySize.tw
@@ -1,8 +1,9 @@
:: SetBellySize [script]
window.SetBellySize = function SetBellySize(slave) {
+
let _implantSize;
- WombNormalizePreg(slave); /*now with support for legacy code that advance pregnancy by setting .preg++ */
+ WombNormalizePreg(slave); /* now with support for legacy code that advances pregnancy by setting .preg++ */
if (slave.bellyImplant > 0)
_implantSize = slave.bellyImplant;
diff --git a/src/js/accordianJS.tw b/src/js/accordianJS.tw
index 836311ecda63ed257613a4904e955466fcc2a5b0..67555db48225164444e9bc22487ce6b434b0b4d5 100644
--- a/src/js/accordianJS.tw
+++ b/src/js/accordianJS.tw
@@ -8,13 +8,13 @@
* with other scripts, since anything poking the DOM here will be done last
*
* Dev Note: The accordion mod should be able to turn *anything* into an accordion. This iteration
- * is configured tightly for the end of week report runs, but it shouldn't be that hard to adapt for
+ * is configured tightly for the end of week report runs, but it shouldn't be that hard to adapt for
* other uses, like character bios. For now, I'll see what other extra-long passages of cosmetic text
* might benefit.
*
* 000-250-006 03092017
*/
-
+
postdisplay["doAccordionSet"] = function (content) {
if (variables().useAccordion == 1) {
Array.prototype.slice.call(document.querySelectorAll('.macro-include'))
diff --git a/src/js/extendedFamilyModeJS.tw b/src/js/extendedFamilyModeJS.tw
index fc1579a6d1a61a4e7ea1331f2e60968480ae8c1d..442370b0363b89c79d3efffa1aca433ece258029 100644
--- a/src/js/extendedFamilyModeJS.tw
+++ b/src/js/extendedFamilyModeJS.tw
@@ -100,7 +100,7 @@ window.areSisters = function(c1, c2) {
var sib = 4;
if(sameMom(c1, c2)) {
sib -= 1;
- }
+ }
if(sameDad(c1, c2)) {
sib -=1;
}
@@ -136,8 +136,8 @@ window.totalRelatives = function(slave) {
return relatives
};
-window.mutualChildren = function(slave1, slave2, slaves) {
- return slaves.filter(function(s) { return s.ID != slave1.ID && s.ID != slave2.ID && s.mother > 0 && s.father > 0 && ((s.mother == slave1.ID && s.father == slave2.ID) || (s.mother == slave2.ID && s.father == slave1.ID)); }).length;
+window.mutualChildren = function(slave1, slave2, slaves) {
+ return slaves.filter(function(s) { return s.ID != slave1.ID && s.ID != slave2.ID && s.mother > 0 && s.father > 0 && ((s.mother == slave1.ID && s.father == slave2.ID) || (s.mother == slave2.ID && s.father == slave1.ID)); }).length;
}
window.isSlaveAvailable = function(slave) {
diff --git a/src/js/familyTree.tw b/src/js/familyTree.tw
index b0e366fc86bbe2af405ffacfc4d1877e78e8fba0..6cf960120fba00c4f96f0ced269cc202c6f26aa9 100644
--- a/src/js/familyTree.tw
+++ b/src/js/familyTree.tw
@@ -464,7 +464,7 @@ window.buildFamilyTree = function(slaves = State.variables.slaves, filterID) {
return family_graph;
};
-/*Old version. To use, do something like:
+/*Old version. To use, do something like:
<div id="editFamily">
<div id="graph"></div>
</div>
diff --git a/src/js/hTagMacroJS.tw b/src/js/hTagMacroJS.tw
index d33e0f20e8ee26ed9d4e72a8df50050af3fccc8b..25a3d459fef6ba3a6b1ae957d84331baa34301e0 100644
--- a/src/js/hTagMacroJS.tw
+++ b/src/js/hTagMacroJS.tw
@@ -3,9 +3,9 @@
/*
* <<htag>> macro
* A simple macro which allows to create wrapping html elements with dynamic IDs.
- * idea blatantly robbed from the spanMacroJS.tw but expanded to a more generic
+ * idea blatantly robbed from the spanMacroJS.tw but expanded to a more generic
* case, allowing <div>, <button> or whatever you want. elements, default is for
- * the div though. In addition, you can pass an object in as the first argument
+ * the div though. In addition, you can pass an object in as the first argument
* instead of an id, and each of the object's attributes will become attributes
* of the generate tag.
*
diff --git a/src/js/rbuttonJS.tw b/src/js/rbuttonJS.tw
index 960db5bdd345e89c87bb9c1a034f68499b5be914..1c842ff6b94513bd663953000c14123b9a54a39a 100644
--- a/src/js/rbuttonJS.tw
+++ b/src/js/rbuttonJS.tw
@@ -1,10 +1,10 @@
:: rbuttonJS [script]
/* This is modified radiobutton macro, for automatic checked state setup*/
-/* Usage (be sure to use quotes around parameters):
+/* Usage (be sure to use quotes around parameters):
<<rbutton "$variable" "value">>
Or:
- <<rbutton "$variable" "value" "HTML_element_ID" "Text to replace with, inside html element with ID from previous parameter. <br> HTML tags allowed.">>
+ <<rbutton "$variable" "value" "HTML_element_ID" "Text to replace with, inside html element with ID from previous parameter. <br> HTML tags allowed.">>
Group of radiobutton will be created based on variable name. Checked state will be set up if variable contain value matched with second parameter. Full form of macro call can be used to display extended description of selected value.
*/
diff --git a/src/js/sexActsJS.tw b/src/js/sexActsJS.tw
index b9945e79ff36144319d0837eddefc50810d36c8e..420660a76b21f960d69b057f38e468d45ad35bd8 100644
--- a/src/js/sexActsJS.tw
+++ b/src/js/sexActsJS.tw
@@ -298,6 +298,7 @@ window.PartnerVCheck = function PartnerVCheck(analTimes, bothTimes) {
let He = capFirstChar(he),
His = capFirstChar(his);
let r = ``;
+
if (V.partner < 0 || V.partner >= V.slaves.length) {
r += `@@.red;PartnerVCheck called with invalid partner '$partner' from passage ${passage()}.@@`;
} else if (canDoVaginal(partner)) {
diff --git a/src/js/wombJS.tw b/src/js/wombJS.tw
index 09caebe357c56e339915b76e90df5336563f7ef6..b8a1d2a22f4f32bc5823300d91a124e6fb6f500a 100644
--- a/src/js/wombJS.tw
+++ b/src/js/wombJS.tw
@@ -1,7 +1,7 @@
:: wombJS [script]
/*
-This is womb processor/simulator script. It takes care about calculation of belly sizes based on individual fetus sizes, with full support of broodmothers implant random turning on and off possibility. Also this can be expanded to store more parents data in each individual fetus in future.
+This is a womb processor/simulator script. It takes care of calculation of belly sizes based on individual fetus sizes, with full support of broodmothers implant random turning on and off possibility. Also this can be expanded to store more parents data in each individual fetus in future.
Design limitations:
- Mother can't gestate children with different speeds at same time. All speed changes apply to all fetuses.
- Sizes of individual fetuses updated only on call of WombGetVolume - not every time as called WombProgress. This is for better overall code speed.
diff --git a/src/npc/descriptions/fLips.tw b/src/npc/descriptions/fLips.tw
index b6ecbe4ecac3c85d86641a6d46bd6d79a397ac1e..770bd46dabb20884dc5c82791c8ccd34d0a0ab27 100644
--- a/src/npc/descriptions/fLips.tw
+++ b/src/npc/descriptions/fLips.tw
@@ -27,7 +27,7 @@ You tell $activeSlave.slaveName to
$He's delighted at the prospect of $his favorite activity.
<</if>>
-<<switch $activeSlave.collar>>
+<<switch $activeSlave.collar>>
<<case "dildo gag">>
<<if ($activeSlave.amp != 1)>>
$He removes the dildo from $his throat, leaving the ring gag in place.
diff --git a/src/npc/descriptions/fVagina.tw b/src/npc/descriptions/fVagina.tw
index 4cd2c8a5d423db31c0177da9fd8dc9572811e6e3..f14456b9ef59833825b8dc6b098711e22dc0ef45 100644
--- a/src/npc/descriptions/fVagina.tw
+++ b/src/npc/descriptions/fVagina.tw
@@ -191,7 +191,7 @@ You call $him over so you can
<<if $activeSlave.dickAccessory == "chastity" || $activeSlave.dickAccessory == "combined chastity">>
$His dick chastity keeps $his useless bitchclit out of the way.
<<elseif !canAchieveErection($activeSlave)>>
- As you use $him as a helpless cock jacket, $his
+ As you use $him as a helpless cock jacket, $his
<<if $activeSlave.dick < 7>>
flaccid dick flops around, ignored.
<<else>>
diff --git a/src/npc/fKiss.tw b/src/npc/fKiss.tw
index 0f22dd7ff0e9f886fa34922ba09d9d68b2279728..04e4eb0a99a875762c126a89e51963a32eaff7fc 100644
--- a/src/npc/fKiss.tw
+++ b/src/npc/fKiss.tw
@@ -3,7 +3,7 @@
<<setPlayerPronouns>>
You tell $activeSlave.slaveName to
-<<switch $activeSlave.collar>>
+<<switch $activeSlave.collar>>
<<case "dildo gag">>
<<if ($activeSlave.amp != 1)>>
remove $his dildo gag and approach you.
@@ -40,9 +40,15 @@ You tell $activeSlave.slaveName to
<<elseif ($activeSlave.relationship == -2)>>
$He hurriedly complies, happy to be near the object of $his longing. Once $he's close, you take a moment to gaze deeply
<<if canSee($activeSlave)>>
+<<<<<<< HEAD
into $his $activeSlave.eyeColor eyes. $He finds the intense look from the _womanP $he loves overwhelming, and $his eyes flick downward after a moment.
<<else>>
upon $his face. $He senses the intense look from the _womanP $he loves and finds it overwhelming, and after a moment glances away.
+=======
+ into $his $activeSlave.eyeColor eyes. $He finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he loves overwhelming, and $his eyes flick downward after a moment.
+ <<else>>
+ upon $his face. $He senses the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he loves and finds it overwhelming, and after a moment glances away.
+>>>>>>> 79ad62ff4ecf42ba2aeaf35e1877f339623376b6
<</if>>
$He blushes furiously.
<<elseif ($activeSlave.relationship == -3)>>
diff --git a/src/npc/rgASDump.tw b/src/npc/rgASDump.tw
index db756d9a91da6ed9e98b2dd04fe60517e92e5847..6d06a2f25fca2fd488aa77fb0c90ff36c9580be9 100644
--- a/src/npc/rgASDump.tw
+++ b/src/npc/rgASDump.tw
@@ -23,17 +23,17 @@
<<else>>
<<if ($activeSlave.relation == 0)>>
-<<if random(1,100) <= 5>>
- <<set $activeSlave.recruiter = "twin">>
-<<elseif ($activeSlave.actualAge > 32) && (random(1,100) <= 41)>>
- <<set $activeSlave.recruiter = "mother">>
-<<elseif ($activeSlave.actualAge < 24) && (random(1,100) <= 40)>>
- <<set $activeSlave.recruiter = "daughter">>
-<<elseif ($activeSlave.actualAge < 43) && (random(1,100) <= 20)>>
- <<set $activeSlave.recruiter = "older sister">>
-<<elseif ($activeSlave.actualAge < 25) && ($activeSlave.actualAge > 18) && (random(1,100) <= 20)>>
- <<set $activeSlave.recruiter = "young sister">>
-<</if>>
+ <<if random(1,100) <= 5>>
+ <<set $activeSlave.recruiter = "twin">>
+ <<elseif ($activeSlave.actualAge > 32) && (random(1,100) <= 41)>>
+ <<set $activeSlave.recruiter = "mother">>
+ <<elseif ($activeSlave.actualAge < 24) && (random(1,100) <= 40)>>
+ <<set $activeSlave.recruiter = "daughter">>
+ <<elseif ($activeSlave.actualAge < 43) && (random(1,100) <= 20)>>
+ <<set $activeSlave.recruiter = "older sister">>
+ <<elseif ($activeSlave.actualAge < 25) && ($activeSlave.actualAge > 18) && (random(1,100) <= 20)>>
+ <<set $activeSlave.recruiter = "young sister">>
+ <</if>>
<</if>>
<</if>>
diff --git a/src/npc/takeoverTarget.tw b/src/npc/takeoverTarget.tw
index fcff0c6b51e629deedd57468aeb29ceeef1faeb1..0a3e42fe8c4c73e7bf3e02c811049672f9c133a4 100644
--- a/src/npc/takeoverTarget.tw
+++ b/src/npc/takeoverTarget.tw
@@ -2,7 +2,7 @@
<<set $ui = "start", $showBodyMods = 1>>
-Before you deploy the
+Before you deploy the
<<if $PC.rumor == "wealth">>
financial reserves that
<<elseif $PC.rumor == "diligence">>
diff --git a/src/npc/uploadSlave.tw b/src/npc/uploadSlave.tw
index 3033bda1981ec4f41f34d0970302db7046cd4d86..d5372f3c0f6440e2b90f381f28f55204c4b8b125 100644
--- a/src/npc/uploadSlave.tw
+++ b/src/npc/uploadSlave.tw
@@ -111,7 +111,7 @@ preg: $activeSlave.preg,
pregSource: 0,
pregType: $activeSlave.pregType,
broodmother: $activeSlave.broodmother,
-broodmotherFetuses: $activeSlave.broodmotherFetuses,
+broodmotherFetuses: $activeSlave.broodmotherFetuses,
broodmotherOnHold: $activeSlave.broodmotherOnHold,
broodmotherCountDown: $activeSlave.broodmotherCountDown,
labor: $activeSlave.labor,
diff --git a/src/player/actions/fCaress.tw b/src/player/actions/fCaress.tw
index 52fcbb5f0d29f2e13b554dcab3df67d710a19a5f..8784358f215a52db8218f02ca37d9b98b6e2a33b 100644
--- a/src/player/actions/fCaress.tw
+++ b/src/player/actions/fCaress.tw
@@ -58,7 +58,7 @@ You delicately lift $his head and touch your fingertips to $his chin, tenderly b
<<if ($activeSlave.lipsPiercing+$activeSlave.tonguePiercing > 2)>>
You touch each of $his facial piercings, one by one, feeling the hard metal contrast with $his pliant flesh.
<</if>>
-Then, you gently tilt $his <<if $activeSlave.face > 95>>overwhelmingly stunning<<elseif $activeSlave.face > 10>>alluring<<elseif $activeSlave.face >= -10>>appealing<<elseif $activeSlave.face >= -40>>plain<<else>>rough<</if>> head back and lightly touch $his
+Then, you gently tilt $his <<if $activeSlave.face > 95>>overwhelmingly stunning<<elseif $activeSlave.face > 10>>alluring<<elseif $activeSlave.face >= -10>>appealing<<elseif $activeSlave.face >= -40>>plain<<else>>rough<</if>> head back and lightly touch $his
<<if $activeSlave.lips > 95>>facepussy
<<else>>
<<if $activeSlave.lips > 70>>pillowlike
diff --git a/src/player/actions/fEmbrace.tw b/src/player/actions/fEmbrace.tw
index 4ea7fe6987a7c1968071e9281659276f7627f1d1..a5db403073cd69b50d1a6610fec2db9c0dab4e0e 100644
--- a/src/player/actions/fEmbrace.tw
+++ b/src/player/actions/fEmbrace.tw
@@ -65,7 +65,7 @@ You walk around $him and put your hands around $his abdomen,<<if ($activeSlave.a
<<elseif ($activeSlave.relationship == -2)>>
In the warmth of your embrace, $he turns towards you, $his passionate $activeSlave.eyeColor eyes staring intently at your face. $He leans closer to you and kisses you as you hold $him. $His heart beats faster and then gradually slows as $he grows accustomed to your body against $hers. Eventually, $he relaxes totally and $his eyes gradually close, melting in your arms. When you finally stop and relax your embrace, $his eyes remain closed and $his mouth still in a rapturous shape for a moment before $he slowly opens $his eyes and smiles at you with a blissful look on $his face. <<if ($activeSlave.amp != 1)>> $His hand reaches to your arms and $he strokes them longingly.<</if>> <<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$He slowly opens them and does $his best to communicate love with $his $activeSlave.eyeColor eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>"I love you, <<Master>>," $he lisps dreamily.<<else>>"I love you, <<Master>>," $he says dreamily.<</if>> $He looks at you, almost begging you with $his eyes that $he wants much more than a mere embrace.
<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "dom") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
- In your soft, warm embrace, $he tries hard to stop $himself from losing $himself in your arms.
+ In your soft, warm embrace, $he tries hard to stop $himself from losing $himself in your arms.
<<if ($activeSlave.amp != 1)>> $He starts to embrace you in $his arms as well. When you gently squeeze $him in your arms, $he breathes more heavily and starts to lovingly squeeze you as well, $his tendency towards sexual dominance encouraging $him to compete with you in embraces against each other.
<<else>> When you gently squeeze $him in your arms, $he breathes more heavily before relaxing against you.
<</if>>
diff --git a/src/player/actions/fondleBoobs.tw b/src/player/actions/fondleBoobs.tw
index de0687452b9a1b9a37c846e0c1e43b22d9752637..200ad148f4fce4869c78e46b8513aa5edd24679f 100644
--- a/src/player/actions/fondleBoobs.tw
+++ b/src/player/actions/fondleBoobs.tw
@@ -371,7 +371,7 @@ You call $him over so you can fondle $his
<<if $activeSlave.nipples != "fuckable">>
playing with $his<<if ($activeSlave.lactation > 0)>> milky<</if>> $activeSlave.nipples nipples so that they become hard in between your fingers and thumbs. You squeeze the tips of $his nipples with your thumbs and fingers and tweak them in your fingertips, then you dab $his nipples with your thumbs, flicking them in different directions. When you firmly pull $his nipples<<if ($activeSlave.lactation > 0)>> milk streams out of them and<</if>> $he lets out a gasp.
<<else>>
- playing with $his<<if ($activeSlave.lactation > 0)>> milky<</if>> $activeSlave.nipples nipples so that they become sodden with fluid around your fingers. You plunge the depths of $his nipple cunts and vigorously work the unusual orifice. When you finally withdraw from $his nipples<<if ($activeSlave.lactation > 0)>>, a stream of pentup milk flows out after you and<<else>>,<</if>> $he lets out a gasp.
+ playing with $his<<if ($activeSlave.lactation > 0)>> milky<</if>> $activeSlave.nipples nipples so that they become sodden with fluid around your fingers. You plunge the depths of $his nipple cunts and vigorously work the unusual orifice. When you finally withdraw from $his nipples<<if ($activeSlave.lactation > 0)>>, a stream of pent-up milk flows out after you and<<else>>,<</if>> $he lets out a gasp.
<</if>>
$His body softens as <<if canSee($activeSlave)>>$his $activeSlave.eyeColor eyes dart up to your face, before visibly catching $himself with a reminder<<else>>$he remembers<</if>> that $he's a slave and you're $his owner. When you finally stop, $he shivers but says nothing, uneasy at what you are going to do next.
<<elseif ($activeSlave.trust < -50)>>
diff --git a/src/pregmod/basenationalitiesControls.tw b/src/pregmod/basenationalitiesControls.tw
index 88ce174724c52911c02da2a8aa65845b201267eb..c2bc54130fed19119db266f9ae0180c4e457bcf7 100644
--- a/src/pregmod/basenationalitiesControls.tw
+++ b/src/pregmod/basenationalitiesControls.tw
@@ -34,7 +34,7 @@ Adjust slave populations:
<br style="clear:both" /><hr style="margin:0">
/* Filter controls */
-Filter by Race:
+Filter by Race:
<<for _i = 0; _i < setup.filterRaces.length; _i++>>
<<set _race = setup.filterRaces[_i]>>
<<if $baseControlsFilter == _race.toLowerCase().replace(/[ -]/g, '')>>
@@ -113,7 +113,7 @@ Filter by Region:
return races[_race.toLowerCase()] * 2 > hashSum(races); })>>
<<if _racialNationalities.length > 0>>
<<= "<div style='float: left; width: 13em; padding: 0 5px;' title='"
- + (_racialNationalities.length > 0 ? _racialNationalities.join(", ") : "(none)")
+ + (_racialNationalities.length > 0 ? _racialNationalities.join(", ") : "(none)")
+"'>_race @@.plusButton; <<link '+'>>
<<run setup.baseNationalities.filter(function(n) {
var races = setup.raceSelector[n] || setup.raceSelector[''];
@@ -135,7 +135,7 @@ Filter by Region:
<div style="float: left;">
<<set _nation = _keys[_i]>>
<<print "
- _nation
+ _nation
@@.plusButton;<<link '+'>>
<<set hashPush($nationalities, _keys[" + _i + "])>>
<<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
diff --git a/src/pregmod/beastFuck.tw b/src/pregmod/beastFuck.tw
index acc29050280266b13e29db14c9eef2b59a241fb4..60d9157a74631b64bdb12452efe4d0a50aa5c311 100644
--- a/src/pregmod/beastFuck.tw
+++ b/src/pregmod/beastFuck.tw
@@ -167,7 +167,7 @@ before calling in the _animal.species. The _animal.species slowly saunters up to
The hound wastes no time in beginning to hammer away at $his <<if canDoVaginal($activeSlave)>>cunt<<else>>asshole<</if>>, causing $activeSlave.slaveName to moan uncontrollably as its thick, veiny member probes the depths of $his <<if (canDoVaginal($activeSlave))>>pussy<<else>>asshole<</if>>.
A few short minutes later, $he gives a loud groan <<if ($activeSlave.fetish == "masochist") || ($activeSlave.fetish == "humiliation") || $activeSlave.sexualQuirk == "perverted" || $activeSlave.behavioralQuirk == "sinful">>and shakes in orgasm <</if>>as the dog's knot begins to swell and its penis begins to erupt a thick stream of jizz into $him.
- After almost a minute, the dog has finally finished cumming and its knot is sufficiently small enough that the dog is able to pull its cock out, causing a stream of cum to slide out of $his <<if ($activeSlave.vagina <= 2)>>@@.lime;now-gaping <<if (canDoVaginal($activeSlave))>>pussy<<else>>asshole<</if>>@@<<else>>
+ After almost a minute, the dog has finally finished cumming and its knot is sufficiently small enough that the dog is able to pull its cock out, causing a stream of cum to slide out of $his <<if ($activeSlave.vagina <= 2)>>@@.lime;now-gaping <<if (canDoVaginal($activeSlave))>>pussy<<else>>asshole<</if>>@@<<else>>
<<if canDoVaginal($activeSlave)>>
<<if $activeSlave.vagina == 3>>
loose
@@ -199,7 +199,7 @@ before calling in the _animal.species. The _animal.species slowly saunters up to
<<elseif (_animal.species == "horse")>>
The horse stands over $him as another slave lines its massive phallus up with $activeSlave.slaveName's <<if canDoVaginal($activeSlave)>><<if ($activeSlave.fetish == "masochistic") || ($activeSlave.fetish == "humiliation") || ($activeSlave.sexualQuirk == "perverted") || ($activeSlave.behavioralQuirk == "sinful")>>wet <</if>>pussy<<else>>ass<</if>>.
- With a slight thrust, it enters $him and begins to fuck $him. $activeSlave.slaveName can't help but give a loud groan as the huge cock <<if ($activeSlave.vagina <= 2)>>@@.lime;stretches@@<<else>>@@.lime;enters@@<</if>> @@.lime;$his@@
+ With a slight thrust, it enters $him and begins to fuck $him. $activeSlave.slaveName can't help but give a loud groan as the huge cock <<if ($activeSlave.vagina <= 2)>>@@.lime;stretches@@<<else>>@@.lime;enters@@<</if>> @@.lime;$his@@
<<if canDoVaginal($activeSlave)>>
<<if $activeSlave.vagina == 0>>
@@.lime;virgin@@
@@ -296,7 +296,7 @@ before calling in the _animal.species. The _animal.species slowly saunters up to
<</if>>
The stallion begins to thrust faster and faster, causing $activeSlave.slaveName to moan and groan in pain as the <<if canDoVaginal($activeSlave)>> tip rams $his cervix<<else>> huge horsecock fills $him completely<</if>>. Before too long, the horse's movements begin to slow, and you can see its large testicles contract slightly as it begins to fill $activeSlave.slaveName's <<if (canDoVaginal($activeSlave))>>pussy<<else>>asshole<</if>> to the brim with thick horse semen.
- After what seems like an impossibly long time, the horse's dick finally begins to soften and it finally pulls out. You have a servant lead the horse away, with a fresh apple as a treat for its good performance.
+ After what seems like an impossibly long time, the horse's dick finally begins to soften and it finally pulls out. You have a servant lead the horse away, with a fresh apple as a treat for its good performance.
<<if (canDoVaginal($activeSlave)) && ($activeSlave.vagina < 4)>>
<<set $activeSlave.vagina = 4>>
diff --git a/src/pregmod/beastFucked.tw b/src/pregmod/beastFucked.tw
index 880d0a713e749b66758fd376abcf76a7a8f6f19e..f4269e11cc9bedfa07cca2a030d0028482318fa8 100644
--- a/src/pregmod/beastFucked.tw
+++ b/src/pregmod/beastFucked.tw
@@ -30,7 +30,7 @@
<<set _orifice = "mouth">>
<</if>>
-<<set _fetishDescriptor = 0>> /*initializes variable*/
+<<set _fetishDescriptor = 0>> /*initializes variable*/
<<if $activeSlave.fetish == "masochist">>
<<set _fetishDescriptor = "painful", _activeQuirk = 1>>
<<elseif $activeSlave.fetish == "humiliation">>
diff --git a/src/pregmod/birthStorm.tw b/src/pregmod/birthStorm.tw
index 051cb7cbc3ec58664a95ddb049183cf9bcae261c..d9d1fec6175adcb3bc4d0ae3de463da5b76e2fec 100644
--- a/src/pregmod/birthStorm.tw
+++ b/src/pregmod/birthStorm.tw
@@ -9,9 +9,9 @@ The remote surgery allows the removal of the pregnancy generator through convent
<<if $activeSlave.broodmother == 2>>
$activeSlave.slaveName's obscenely swollen belly begins to shudder and writhe moments after being injected with the drug as all $his waters break. $He spreads $his <<if $activeSlave.amp != 1>>legs to either side of $his spasming bulk as wide as $he can<<else>>stumps as wide as $he can<</if>> with a loud moan. $His vaginal lips part as the first of $his brood is born, followed by another, and another. After hours of constant
<<elseif $activeSlave.broodmother == 1>>
- $activeSlave.slaveName's massive belly shudders and shrinks as all $his waters simultaneously break. $He spreads $his <<if $activeSlave.amp != 1>>legs<<else>>stumps<</if>> wide with a loud moan. $His vaginal lips part as the first of $his brood is born, followed not long after by another. After an hour of constant
+ $activeSlave.slaveName's massive belly shudders and shrinks as all $his waters simultaneously break. $He spreads $his <<if $activeSlave.amp != 1>>legs<<else>>stumps<</if>> wide with a loud moan. $His vaginal lips part as the first of $his brood is born, followed not long after by another. After an hour of constant
<<else>>
- $activeSlave.slaveName's massive belly shudders and shrinks as all $his waters simultaneously break. $He spreads $his <<if $activeSlave.amp != 1>>legs<<else>>stumps<</if>> wide with a loud moan. $His vaginal lips part as $his birthing begins. After an hour of intensive
+ $activeSlave.slaveName's massive belly shudders and shrinks as all $his waters simultaneously break. $He spreads $his <<if $activeSlave.amp != 1>>legs<<else>>stumps<</if>> wide with a loud moan. $His vaginal lips part as $his birthing begins. After an hour of intensive
<</if>>
<<if $activeSlave.fetish == "mindbroken">>
birthing, $he shows little interest in the changes to $his body. @@.red;The ordeal of intensive birthing has had a massive effect on $his health as well as completely destroying $his vagina.@@
diff --git a/src/pregmod/criminalMarkets.tw b/src/pregmod/criminalMarkets.tw
index f08448ff9811c47879eb78265406fe1a0695a9a8..ab81e868f44b7a288fb360c1813d65db05a1003d 100644
--- a/src/pregmod/criminalMarkets.tw
+++ b/src/pregmod/criminalMarkets.tw
@@ -7,7 +7,7 @@
<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $returnTo = "Main", $newSlaveIndex = 0>>
<</if>>
-You board the transport to
+You board the transport to
<<switch $weeklyMarket>>
<<case "low tier criminals">> /* mixed prisoners */
@@ -25,7 +25,7 @@ You board the transport to
<<case "white collar">> /* mixed prisoners */
- what looks more like an oversized vacation home rather than something one goes to for committing crimes. You enter the premises into a small chamber with a booth to the side and are immediately met with, "Ah! We've been waiting for you. Please go in. We'll call someone to guide you immediately."
+ what looks more like an oversized vacation home rather than something one goes to for committing crimes. You enter the premises into a small chamber with a booth to the side and are immediately met with, "Ah! We've been waiting for you. Please go in. We'll call someone to guide you immediately."
<br><br>
You nod at the prompt and enter further into the luxurious building to find a formally dressed guide and what appears to be the holding area of the prison. The cells, if you can call them that, are large and cozy, each with their own computer and television. The air is also conditioned for their comfort and Old World classical music is playing to provide further ambiance. Walking through, you see the prisoners themselves, lazing about in their beds, sitting at their computers or just talking to each other. If there was ever a prison you'd rather end up in, this would be it.
<br><br>
diff --git a/src/pregmod/eliteTakeOver.tw b/src/pregmod/eliteTakeOver.tw
index 85ac245802478ed6a40bd0aa57aab0e71d77fc33..5ce16f0d014e405dba8a625651ea65e4d849ef76 100644
--- a/src/pregmod/eliteTakeOver.tw
+++ b/src/pregmod/eliteTakeOver.tw
@@ -41,7 +41,7 @@ You look up from your desk as the locked door to your office unseals, and a doze
''GAME OVER''
<</if>>
<<elseif $PC.pregSource != -6>>
- The leader reaches into his jacket and extracts a syringe, you recognize it as a powerful drug used in lobotomies, and places it to your left. From his hip he pulls a revolver, six-chambered, and loads five bullets, spins the chamber, and places it to your right.
+ The leader reaches into his jacket and extracts a syringe, you recognize it as a powerful drug used in lobotomies, and places it to your left. From his hip he pulls a revolver, six-chambered, and loads five bullets, spins the chamber, and places it to your right.
<br>
"You are no longer worthy of being a part of our society. You know you can't be allowed to spread any information. But we are not merciless; one of our members has taken an interest in having you as her pet. You may choose to lose your mind, and service her until she tires of you, or gamble for your life and serve her anyway. Now decide."
<</if>>
@@ -49,7 +49,7 @@ You look up from your desk as the locked door to your office unseals, and a doze
<br>
<<if _pregSurrender == 0>>
<<set $finalChoice = "final stand">>
- The choice is simple - you will not be a slave.
+ The choice is simple - you will not be a slave.
<br>
You decide to <span id="fate">make a final stand.</span>
<br>
diff --git a/src/pregmod/fSlaveSlaveVag.tw b/src/pregmod/fSlaveSlaveVag.tw
index ed8824ba05c3b3c44acea358e041839a73c1ecaa..a2da70af1f7963f607c336fc6d17fccc9091294e 100644
--- a/src/pregmod/fSlaveSlaveVag.tw
+++ b/src/pregmod/fSlaveSlaveVag.tw
@@ -1,5 +1,4 @@
:: FSlaveSlaveVag [nobr]
-
<<set $nextButton = "Back", $nextLink = "Slave Interact">>
diff --git a/src/pregmod/huskSlave.tw b/src/pregmod/huskSlave.tw
index f7b69e8c667d7e4f2e3447af31f63f21c1097fa6..2e3d5be59a9d41c9d023b74f4723b4fec696c080 100644
--- a/src/pregmod/huskSlave.tw
+++ b/src/pregmod/huskSlave.tw
@@ -1,4 +1,4 @@
-:: Husk Slave [nobr]
+:: Husk Slave [nobr]
<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Kidnapped Slaves">>
<<if ($huskSlave.dick == 0) && ($huskSlave.vagina == -1)>><<set $huskSlave.vagina = 0>><</if>>
diff --git a/src/pregmod/huskSlaveSwapWorkaround.tw b/src/pregmod/huskSlaveSwapWorkaround.tw
index 477f154efecf8c0be9e8f9f415c6277db0fde83b..2bb0b94411c9c3b9d7feee7a2007b36349e992b5 100644
--- a/src/pregmod/huskSlaveSwapWorkaround.tw
+++ b/src/pregmod/huskSlaveSwapWorkaround.tw
@@ -1,5 +1,5 @@
:: husk Slave Swap Workaround [nobr]
-
+
<<set $nextButton = "Abort Operation", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event">>
"This operation is neither simple nor is it perfected. There are extreme health risks involved and no guarantee of success. Strap a slave into your remote surgery to consent to the operation. Indentured servants<<if ($incubator > 0) || ($nurseryBabies)>> and slaves with reserved children<</if>> not eligible."
diff --git a/src/pregmod/pAssociatesPublicSlut.tw b/src/pregmod/pAssociatesPublicSlut.tw
index 4fa5ed644b42865ce803f0cf07e9be3394425e6f..e3efac167e892357c8cccf205114042305dba0bd 100644
--- a/src/pregmod/pAssociatesPublicSlut.tw
+++ b/src/pregmod/pAssociatesPublicSlut.tw
@@ -32,11 +32,11 @@ You take a detour down one of the minor byways that feed into the Promenade prop
<<link "Give <<if _num < $seeDicks>>him his<<else>>her the<</if>> first taste of slave life">>
<<replace "#result">>
<<if _num < $seeDicks>>
- Taking a slave's anal virginity is hardly novel for you, yet somehow it never stops being fun. You grab the bottle of lubricant your associate has left out for use and begin to generously lubricate his asshole <<if $PC.dick == 0>>. You also reach for one of the brand new strap-ons she has left out for ladies who wish to avail of her slut, tearing it eagerly from its box.<<else>>.<</if>> He begins to moan as you gently probe his anus with the tip of <<if $PC.dick == 0>>the strap on<<else>>your cock<</if>>. Slowly, you get a little deeper with every third or fourth thrust of your hips. You grab on to his petite, feminine waist as you work, occasionally using one hand to hold him roughly by the hair, neck or shoulder, or to smack his butt. Your business associate makes no attempt to hide her obvious arousal at the sight of <<if $PC.dick == 0>>the formidable dildo<<else>>your formidable cock<</if>> pounding some obedience into her slave, and flirts shamelessly with you as you work. <<if $PC.dick == 0>>The slave climaxes, and while you don't quite join him, watching him squirm helplessly underneath you as you used his ass has left you intensely aroused.<<else>>The slaves tight anal muscles massage your cock as he orgasms, bringing you to climax as well.<</if>> Your associate's face is flushed after the spectacle, though considering the disappointing size of her new slaves penis its hardly surprising that she's so thirsty for male attention. She offers to "serve you some refreshments" back at her apartment, an offer you happily take her up on. As you depart with her, a mass of curious socialites converge on the helpless sissy, eager to try his asshole out, since being fucked by the owner of the arcology has instantly, albeit temporarily, made him very fashionable.
+ Taking a slave's anal virginity is hardly novel for you, yet somehow it never stops being fun. You grab the bottle of lubricant your associate has left out for use and begin to generously lubricate his asshole <<if $PC.dick == 0>>. You also reach for one of the brand new strap-ons she has left out for ladies who wish to avail of her slut, tearing it eagerly from its box.<<else>>.<</if>> He begins to moan as you gently probe his anus with the tip of <<if $PC.dick == 0>>the strap on<<else>>your cock<</if>>. Slowly, you get a little deeper with every third or fourth thrust of your hips. You grab on to his petite, feminine waist as you work, occasionally using one hand to hold him roughly by the hair, neck or shoulder, or to smack his butt. Your business associate makes no attempt to hide her obvious arousal at the sight of <<if $PC.dick == 0>>the formidable dildo<<else>>your formidable cock<</if>> pounding some obedience into her slave, and flirts shamelessly with you as you work. <<if $PC.dick == 0>>The slave climaxes, and while you don't quite join him, watching him squirm helplessly underneath you as you used his ass has left you intensely aroused.<<else>>The slaves tight anal muscles massage your cock as he orgasms, bringing you to climax as well.<</if>> Your associate's face is flushed after the spectacle, though considering the disappointing size of her new slaves penis its hardly surprising that she's so thirsty for male attention. She offers to "serve you some refreshments" back at her apartment, an offer you happily take her up on. As you depart with her, a mass of curious socialites converge on the helpless sissy, eager to try his asshole out, since being fucked by the owner of the arcology has instantly, albeit temporarily, made him very fashionable.
<<else>>
- Taking a slave's virginity is hardly novel for you, yet somehow it never stops being fun. You consider the bottle of lubricant your associate has left out for use and then decide it's unnecessary, since the slutty bitch is already quite wet. <<if $PC.dick == 0>>You do however reach for one of the brand new strap-ons he has left out for ladies who wish to avail of his slut, tearing it eagerly from its box.<</if>> She begins to moan as you gently probe her pussy with the tip of <<if $PC.dick == 0>>the strap on<<else>>your cock<</if>>. Slowly, you get a little deeper with every third or fourth thrust of your hips. You grab on to her petite, feminine waist as you work, occasionally using one hand to hold her roughly by the hair, neck or shoulder, or to smack her butt. Your business associate can't keep the smug smile off his face as he watches you pound some obedience into his slave. You know nothing puts a bitch in her place harder than discovering the secret rapture of being fucked just the way she didn't even know she likes it, and focus on exploiting her apparent humiliation fetish.<<if $PC.dick == 0>> She climaxes indecently hard from your expert, hard, but just tender enough loving.<<else>> Her tight pussy brings you to climax after a hard fucking and the sensation of being filled with your semen is enough to bring about her orgasm as well.<</if>> Your associate is extremely impressed with your performance and eager to ask for some slave-breaking tips. You're more than happy to offer a little advice, considering he's new to the game, and the two of you walk off together to find somewhere where you can get refreshments as you discuss. As you depart, a mass of curious socialites converge on the helpless slut, eager to try her holes out, since being fucked by the owner of the arcology has instantly, albeit temporarily, made her very fashionable.
+ Taking a slave's virginity is hardly novel for you, yet somehow it never stops being fun. You consider the bottle of lubricant your associate has left out for use and then decide it's unnecessary, since the slutty bitch is already quite wet. <<if $PC.dick == 0>>You do however reach for one of the brand new strap-ons he has left out for ladies who wish to avail of his slut, tearing it eagerly from its box.<</if>> She begins to moan as you gently probe her pussy with the tip of <<if $PC.dick == 0>>the strap on<<else>>your cock<</if>>. Slowly, you get a little deeper with every third or fourth thrust of your hips. You grab on to her petite, feminine waist as you work, occasionally using one hand to hold her roughly by the hair, neck or shoulder, or to smack her butt. Your business associate can't keep the smug smile off his face as he watches you pound some obedience into his slave. You know nothing puts a bitch in her place harder than discovering the secret rapture of being fucked just the way she didn't even know she likes it, and focus on exploiting her apparent humiliation fetish.<<if $PC.dick == 0>> She climaxes indecently hard from your expert, hard, but just tender enough loving.<<else>> Her tight pussy brings you to climax after a hard fucking and the sensation of being filled with your semen is enough to bring about her orgasm as well.<</if>> Your associate is extremely impressed with your performance and eager to ask for some slave-breaking tips. You're more than happy to offer a little advice, considering he's new to the game, and the two of you walk off together to find somewhere where you can get refreshments as you discuss. As you depart, a mass of curious socialites converge on the helpless slut, eager to try her holes out, since being fucked by the owner of the arcology has instantly, albeit temporarily, made her very fashionable.
<</if>>
- Your citizens @@.green;appreciated@@ the vigorous show you put on, and the fact that you are @@.green;not too snobby@@ to enjoy the simple pleasure of availing of a public whore once in a while.
+ Your citizens @@.green;appreciated@@ the vigorous show you put on, and the fact that you are @@.green;not too snobby@@ to enjoy the simple pleasure of availing of a public whore once in a while.
<<set $rep += 100>>
<</replace>>
<</link>>
diff --git a/src/pregmod/pInsemination.tw b/src/pregmod/pInsemination.tw
index bf6ea7c1ebccf6176de68e5677ce89dd659b6456..95bf0f2f28a317cf2f2d9df107dd2cfefe49889f 100644
--- a/src/pregmod/pInsemination.tw
+++ b/src/pregmod/pInsemination.tw
@@ -1,5 +1,5 @@
-:: P insemination [nobr]
-
+:: P insemination [nobr]
+
<<set $nextButton = "Continue", $returnTo = "Scheduled Event">>
<<if ndef $movesCount>>
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index 064778ecc8ef3d9ea6a852a7477e0d26de83a038..f78e379fdc8ed1caff169a45a02367c2879188bf 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -1,5 +1,5 @@
-:: P raped [nobr]
-
+:: P raped [nobr]
+
<<set $raped = 1, $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">>
While returning from a meeting with a prospective investor, an unfortunate wrong turn has led you into a rather seedy area of your arcology. You feel distinctly uncomfortable for some reason.
diff --git a/src/pregmod/pcAppearanceIntro.tw b/src/pregmod/pcAppearanceIntro.tw
index 190f52ec366f3ce1fe374805568a2650e9f493f5..d4c1b459bc67dbee0950b0da333684496680d81e 100644
--- a/src/pregmod/pcAppearanceIntro.tw
+++ b/src/pregmod/pcAppearanceIntro.tw
@@ -1,5 +1,5 @@
-:: PC Appearance Intro [nobr]
-
+:: PC Appearance Intro [nobr]
+
Race and appearance are largely irrelevant in the free cities; there are only the free and the enslaved.
<br>//Appearance only, no effect on gameplay (unless you make a big deal out of it).//
diff --git a/src/pregmod/pcPregIntro.tw b/src/pregmod/pcPregIntro.tw
index f94e020ddfd7258f967088b5b18f1d64feee6e35..be653e9605f79ac86889947da081a646d2477736 100644
--- a/src/pregmod/pcPregIntro.tw
+++ b/src/pregmod/pcPregIntro.tw
@@ -1,5 +1,5 @@
-:: PC Preg Intro [nobr]
-
+:: PC Preg Intro [nobr]
+
You have a working female reproductive system, and thus, a menstrual cycle. Women already face hardships as slaveowners and arcology owners, and being pregnant, coupled with a strong societal aversion to the dominant being penetrated, leads most pregnant owners to find themselves in dire situations. As an added precaution, since nothing stops an owner from hooking up with another owner, contraceptives are common amongst free women.
<br><br>
@@.orange;What's your stance on taking contraceptives?@@
diff --git a/src/pregmod/physicalDevelopment.tw b/src/pregmod/physicalDevelopment.tw
index cb94c3c44a9dc9fcbd18b677fb17176c8fc3c938..65c3d7e85e8f39e5e2f27a6d2edaa07a921dd1aa 100644
--- a/src/pregmod/physicalDevelopment.tw
+++ b/src/pregmod/physicalDevelopment.tw
@@ -1,4 +1,4 @@
-:: Physical Development [nobr widget]
+:: Physical Development [nobr widget]
<<widget "PhysicalDevelopment">>
@@ -1364,7 +1364,7 @@
<</if>>
<</switch>>
-<<elseif $args[0].genes == "XY">>
+<<elseif $args[0].genes == "XY">>
<<switch $args[0].physicalAge>>
<<case 3>>
diff --git a/src/pregmod/reLegendaryWomb.tw b/src/pregmod/reLegendaryWomb.tw
index 66dd28c5a28f7075d92f881367d698fee1ac245c..fbec834c156e5a0655c22c5011b65da21c8c8131 100644
--- a/src/pregmod/reLegendaryWomb.tw
+++ b/src/pregmod/reLegendaryWomb.tw
@@ -1,5 +1,5 @@
:: RE legendary womb [nobr]
-
+
<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "RIE Eligibility Check", $activeSlave = ($legendaryFacility == 1) ? getSlave($legendaryWombID) : $eventSlave>>
<<if (ndef $activeSlave)>> /* not found - reset variable and stop event */
diff --git a/src/pregmod/rePregInventor.tw b/src/pregmod/rePregInventor.tw
index 1949cf35eaae64ad1608b366be6301d05af48a2f..2cd597a080b915cdaa5920fbf66ccc4b1c47a5fe 100644
--- a/src/pregmod/rePregInventor.tw
+++ b/src/pregmod/rePregInventor.tw
@@ -349,7 +349,7 @@
<<if $FCTVreceiver == 1>>
<br><<link "Organize a televised demonstration of $his skills.">>
<<replace "#result2">>
- You are so impressed by $his ideas that you arrange to have $him demonstrate $his discoveries on a prominent FCTV talkshow. It will take some time, and you'll have to insure that $he's at least reasonably well known before the show's executives will agree to allow $him on-air, but you're certain that $activeSlave.slaveName's name will soon be on the lips of pregnancy-loving slaveowners and Free Cities citizens around the world. In the meantime, you implement her ideas around the arcology. $He is @@.hotpink;thrilled@@ to have pleased you so much that you would @@.mediumaquamarine;put such faith in $his ideas.@@
+ You are so impressed by $his ideas that you arrange to have $him demonstrate $his discoveries on a prominent FCTV talkshow. It will take some time, and you'll have to insure that $he's at least reasonably well known before the show's executives will agree to allow $him on-air, but you're certain that $activeSlave.slaveName's name will soon be on the lips of pregnancy-loving slaveowners and Free Cities citizens around the world. In the meantime, you implement $his ideas around the arcology. $He is @@.hotpink;thrilled@@ to have pleased you so much that you would @@.mediumaquamarine;put such faith in $his ideas.@@
<<set $cash -= 10000>>
<<set $pregInventor = 2>>
<<set $pregInventions = 1>>
@@ -538,7 +538,7 @@
<<if $FCTVreceiver == 1>>
<br><<link "Organize a televised demonstration of $his skills.">>
<<replace "#result2">>
- You are so impressed by $his ideas that you arrange to have $him demonstrate $his discoveries on a prominent FCTV talkshow. It will take some time, and you'll have to insure that $he's at least reasonably well known before the show's executives will agree to allow $him on-air, but you're certain that $activeSlave.slaveName's name will soon be on the lips of pregnancy-loving slaveowners and Free Cities citizens around the world. In the meantime, you implement her ideas around the arcology. $He is @@.hotpink;thrilled@@ to have pleased you so much that you would @@.mediumaquamarine;put such faith in $his ideas.@@
+ You are so impressed by $his ideas that you arrange to have $him demonstrate $his discoveries on a prominent FCTV talkshow. It will take some time, and you'll have to insure that $he's at least reasonably well known before the show's executives will agree to allow $him on-air, but you're certain that $activeSlave.slaveName's name will soon be on the lips of pregnancy-loving slaveowners and Free Cities citizens around the world. In the meantime, you implement $his ideas around the arcology. $He is @@.hotpink;thrilled@@ to have pleased you so much that you would @@.mediumaquamarine;put such faith in $his ideas.@@
<<set $cash -= 10000>>
<<set $pregInventor = 2>>
<<set $pregInventions = 1>>
@@ -757,7 +757,7 @@
<<if $FCTVreceiver == 1>>
<br><<link "Organize a televised demonstration of $his skills.">>
<<replace "#result2">>
- You are so impressed by $his ideas that you arrange to have $him demonstrate $his discoveries on a prominent FCTV talkshow. It will take some time, and you'll have to insure that $he's at least reasonably well known before the show's executives will agree to allow $him on-air, but you're certain that $activeSlave.slaveName's name will soon be on the lips of pregnancy-loving slaveowners and Free Cities citizens around the world. In the meantime, you implement her ideas around the arcology. $He is @@.hotpink;thrilled@@ to have pleased you so much that you would @@.mediumaquamarine;put such faith in $his ideas.@@
+ You are so impressed by $his ideas that you arrange to have $him demonstrate $his discoveries on a prominent FCTV talkshow. It will take some time, and you'll have to insure that $he's at least reasonably well known before the show's executives will agree to allow $him on-air, but you're certain that $activeSlave.slaveName's name will soon be on the lips of pregnancy-loving slaveowners and Free Cities citizens around the world. In the meantime, you implement $his ideas around the arcology. $He is @@.hotpink;thrilled@@ to have pleased you so much that you would @@.mediumaquamarine;put such faith in $his ideas.@@
<<set $cash -= 10000>>
<<set $pregInventor = 2>>
<<set $pregInventions = 1>>
@@ -819,7 +819,7 @@
<<set $arcologies[_i].FSRestart -= 20>>
<</if>>
<</for>>
- <<set _pregmag = "a cut out magazine cover of your renowned hyperbroodmother inventor, " + $activeSlave.slaveName + ", and her myriad toys">>
+ <<set _pregmag = "a cut out magazine cover of your renowned hyperbroodmother inventor, " + $activeSlave.slaveName + ", and " + $his + " myriad toys">>
<<set $trinkets.push(_pregmag)>>
<</replace>>
<</link>>
@@ -827,7 +827,7 @@
<br><<link "Fund Additional Ads [Requires 10k funds]">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You fund an aggressive ad campaign featuring your slave in provocative positions and selling a "life changing interview" on "Husbandry With Millie." By the day of her interview, user boards all through the global web are discussing your slave and what she might be about to reveal. Even social demographics not typically inclined toward the idea of breeding slaves seem to be intrigued, and you're confident that many users will be watching as your slave sells your vision for the world's future.
+ You fund an aggressive ad campaign featuring your slave in provocative positions and selling a "life changing interview" on "Husbandry With Millie." By the day of $his interview, user boards all through the global web are discussing your slave and what she might be about to reveal. Even social demographics not typically inclined toward the idea of breeding slaves seem to be intrigued, and you're confident that many users will be watching as your slave sells your vision for the world's future.
<br><br>
That done, you settle in to watch the interview.
<br><br>
@@ -849,7 +849,7 @@
<<set $arcologies[_i].FSRestart -= 20>>
<</if>>
<</for>>
- <<set _pregmag = "a cut out magazine cover of your renowned hyperbroodmother inventor, " + $activeSlave.slaveName + ", and her myriad toys">>
+ <<set _pregmag = "a cut out magazine cover of your renowned hyperbroodmother inventor, " + $activeSlave.slaveName + ", and " + $his + " myriad toys">>
<<set $trinkets.push(_pregmag)>>
<</replace>>
<</link>>
@@ -858,13 +858,13 @@
<<replace "#result">>
It's a gamble, but you decide to trust in the charisma of your slave and the fame she has already accrued to sell your vision for the world's future during the interview.
<<if ($activeSlave.pornPrestige > 2)>>
- She's enormously popular, so your gambit has a good chance of success.
+ $He's enormously popular, so your gambit has a good chance of success.
<<elseif ($activeSlave.pornPrestige > 1)>>
- She's quite popular, so your gambit has a reasonable chance of success.
+ $He's quite popular, so your gambit has a reasonable chance of success.
<<else>>
- She's only really well known in local pornography, but you still decide to bet on her ability to sway the masses.
+ $He's only really well known in local pornography, but you still decide to bet on $his ability to sway the masses.
<</if>>
- Regardless, there's only so much your direct involvement could do to help her as she sells your vision for the world's future, and the natural cleverness she's already demonstrated might well allow her to achieve results on her own that would be impossible otherwise.
+ Regardless, there's only so much your direct involvement could do to help $him as she sells your vision for the world's future, and the natural cleverness $he's already demonstrated might well allow $him to achieve results on $his own that would be impossible otherwise.
<br><br>
When the day arrives, you settle in to watch the interview.
<br><br>
@@ -907,7 +907,7 @@
<<set _pregmag = "a cut out magazine cover of your renowned hyperbroodmother inventor, " + $activeSlave.slaveName + ", and her myriad toys">>
<<set $trinkets.push(_pregmag)>>
<<elseif $activeSlave.pornPrestige >= 3 && random(1,100) > 15>>
- You turn your FCTV screen off satisifed that your slave has done a satisfactory job. Over the course of the next several weeks, it becomes clear that $activeSlave.slaveName's appearance on "Husbandry With Milly" has had a @@.green;significant impact@@ on public opinion, though only at a local level.
+ You turn your FCTV screen off satisfied that your slave has done a satisfactory job. Over the course of the next several weeks, it becomes clear that $activeSlave.slaveName's appearance on "Husbandry With Milly" has had a @@.green;significant impact@@ on public opinion, though only at a local level.
<<if $activeSlave.prestige < 1>>
<<set $activeSlave.prestige = 1>>
<<set $activeSlave.prestigeDesc = "She is a locally respected inventor of hyperpregnant sex accessories and toys.">>
@@ -921,7 +921,7 @@
<</if>>
<</for>>
<<elseif $activeSlave.pornPrestige >= 3>>
- You turn your FCTV screen off disappointed that your slave has done a mediocre job. Over the course of the next several weeks, it becomes clear that @@.green;what little impact@@ she has had is on a local scale only.
+ You turn your FCTV screen off disappointed that your slave has done a mediocre job. Over the course of the next several weeks, it becomes clear that @@.green;what little impact@@ $he has had is on a local scale only.
<<set $rep += 100>>
<<for _i = 1; _i < _l; _i++>>
<<if $arcologies[_i].FSRepopulationFocus != "unset">>
@@ -965,7 +965,7 @@
<<set _pregmag = "a cut out magazine cover of your renowned hyperbroodmother inventor, " + $activeSlave.slaveName + ", and her myriad toys">>
<<set $trinkets.push(_pregmag)>>
<<elseif $activeSlave.pornPrestige >= 2 && random(1,100) > 30>>
- You turn your FCTV screen off satisifed that your slave has done a satisfactory job. Over the course of the next several weeks, it becomes clear that $activeSlave.slaveName's appearance on "Husbandry With Milly" has had a @@.green;significant impact@@ on public opinion, though only at a local level.
+ You turn your FCTV screen off satisfied that your slave has done a satisfactory job. Over the course of the next several weeks, it becomes clear that $activeSlave.slaveName's appearance on "Husbandry With Milly" has had a @@.green;significant impact@@ on public opinion, though only at a local level.
<<if $activeSlave.prestige < 1>>
<<set $activeSlave.prestige = 1>>
<<set $activeSlave.prestigeDesc = "She is a locally respected inventor of hyperpregnant sex accessories and toys.">>
@@ -1023,7 +1023,7 @@
<<set _pregmag = "a cut out magazine cover of your renowned hyperbroodmother inventor, " + $activeSlave.slaveName + ", and her myriad toys">>
<<set $trinkets.push(_pregmag)>>
<<elseif random(1,100) > 50>>
- You turn your FCTV screen off satisifed that your slave has done a satisfactory job. Over the course of the next several weeks, it becomes clear that $activeSlave.slaveName's appearance on "Husbandry With Milly" has had a @@.green;significant impact@@ on public opinion, though only at a local level.
+ You turn your FCTV screen off satisfied that your slave has done a satisfactory job. Over the course of the next several weeks, it becomes clear that $activeSlave.slaveName's appearance on "Husbandry With Milly" has had a @@.green;significant impact@@ on public opinion, though only at a local level.
<<if $activeSlave.prestige < 1>>
<<set $activeSlave.prestige = 1>>
<<set $activeSlave.prestigeDesc = "She is a locally respected inventor of hyperpregnant sex accessories and toys.">>
diff --git a/src/pregmod/seBurst.tw b/src/pregmod/seBurst.tw
index 10bc7be768af99b22f797c9fdd8fb1c47f61ffc4..73a84bb8f98ccf9283595e2d186c9d09eaa38a9c 100644
--- a/src/pregmod/seBurst.tw
+++ b/src/pregmod/seBurst.tw
@@ -1,5 +1,5 @@
-:: SE Burst [nobr]
-
+:: SE Burst [nobr]
+
<<set $nextButton = "Continue", $returnTo = "Scheduled Event">>
<<for _b = 0; _b < $slaves.length; _b++>>
diff --git a/src/pregmod/seDeath.tw b/src/pregmod/seDeath.tw
index 1d4d3e82cb37cd64444017d8c6b7799f5b51c67c..830a36069adb44b6445185337509d5edf6b15602 100644
--- a/src/pregmod/seDeath.tw
+++ b/src/pregmod/seDeath.tw
@@ -1,5 +1,5 @@
:: SE Death [nobr]
-
+
<<set $nextButton = "Continue", $nextLink = "Scheduled Event">>
<<set _killedSlaves = []>>
diff --git a/src/pregmod/seFCTVinstall.tw b/src/pregmod/seFCTVinstall.tw
index 48446339d7a0542268e260be253cfcf9f09cecd5..ebad2ad9e951b1022e1902a14d4fd0fba28d8e40 100644
--- a/src/pregmod/seFCTVinstall.tw
+++ b/src/pregmod/seFCTVinstall.tw
@@ -1,4 +1,4 @@
-:: SE FCTV Install [nobr]
+:: SE FCTV Install [nobr]
<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "FCTV", $receiverAvailable = 1>>
<<set $showOne = 0, $showTwo = 0, $showThree = 0, $showFour = 0, $showFive = 0, $showSix = 0, $showSeven = 0, $showEight = 0, $showNine = 0, $showTen = 0, $showEleven = 0, $showTwelve = 0, $showThirteen = 0, $showFourteen = 0, $randShow = 0, $lastShow = -1>>
diff --git a/src/pregmod/slaveAgeIntro.tw b/src/pregmod/slaveAgeIntro.tw
index f59658006aad7c35d3fe055f94adc8e48e09ac0b..14263347057ad2b08b2da66df20a77c94808bb8b 100644
--- a/src/pregmod/slaveAgeIntro.tw
+++ b/src/pregmod/slaveAgeIntro.tw
@@ -1,5 +1,5 @@
:: Slave Age Intro [nobr]
-
+
Do you want to see content involving girls younger than 18 in this game?
<br><br>
diff --git a/src/pregmod/slaveSlaveSwapWorkaround.tw b/src/pregmod/slaveSlaveSwapWorkaround.tw
index 2454a85b7cb9b0c5f8dd141d48754b8d3d1dd91b..788020a3bd05ebbd37fc7414891d93c185a43d13 100644
--- a/src/pregmod/slaveSlaveSwapWorkaround.tw
+++ b/src/pregmod/slaveSlaveSwapWorkaround.tw
@@ -1,5 +1,5 @@
:: Slave Slave Swap Workaround [nobr]
-
+
<<set $nextButton = "Abort Operation", $nextLink = "Main">>
<<set $slaves[$slaveIndices[$activeSlave.ID]] = $activeSlave>>
diff --git a/src/pregmod/widgets/assignmentFilterWidget.tw b/src/pregmod/widgets/assignmentFilterWidget.tw
index 8312536d3002360d82adf56561882b217a3f9577..498d6654f0e6ce7b30e6913809e0ddb6fe8dbae8 100644
--- a/src/pregmod/widgets/assignmentFilterWidget.tw
+++ b/src/pregmod/widgets/assignmentFilterWidget.tw
@@ -1,6 +1,6 @@
:: assignment-filter widget [widget nobr]
-/*
+/*
* filters the list according to the selected Facility
* function(y) is a loop through $slaves to set assignmentVisible to 1 and returns a new array
* function(x) filters the slaves with the given condition ( here its the assignment )
diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw
index 2c8e14077eb5c9f77c8b9c5d216bc4a744627795..a1182cde32030d573912f8ea5ff93759470b9e16 100644
--- a/src/pregmod/widgets/bodyswapWidgets.tw
+++ b/src/pregmod/widgets/bodyswapWidgets.tw
@@ -283,7 +283,7 @@
<<else>>
<<set $args[0].origBodyOwner = $args[1].slaveName>>
<</if>>
-<<else>>
+<<else>>
<<set $args[0].origBodyOwner = $args[1].origBodyOwner>>
<</if>>
diff --git a/src/pregmod/widgets/economyWidgets.tw b/src/pregmod/widgets/economyWidgets.tw
index d87830603b3ef793995e34e9f8c005f6f5465fb1..dcb61e0c56ce80c6c0a303edf227d04568c993b1 100644
--- a/src/pregmod/widgets/economyWidgets.tw
+++ b/src/pregmod/widgets/economyWidgets.tw
@@ -458,17 +458,17 @@
<</if>>
<</widget>>
-/* Call with <<CorpDevBuySell "asset" "Numasset">> TODO: replace eval parse with appropriate functions */
+/* Call with <<CorpDevBuySell "asset" "Numasset">> TODO: replace eval parse with appropriate functions */
<<widget "CorpDevBuySell">>
<<set _textboxMLArg = '_'+$args[1]>>
-| Trade Qty
-<<textbox `'_Num' + $args[0]` `eval(parse('_Num' + $args[0]))`>><<script>>setTextboxMaxLength(State.temporary["textboxMLArg"], 10);<</script>>:
+| Trade Qty
+<<textbox `'_Num' + $args[0]` `eval(parse('_Num' + $args[0]))`>><<script>>setTextboxMaxLength(State.temporary["textboxMLArg"], 10);<</script>>:
<<link "Buy">>
<<if !Number.isInteger(Number.parseFloat(eval(parse('_Num' + $args[0]))))>> /* Checks if _Numasset is string */
/* Buy all */
- <<if ["all", "max"].includes(State.temporary[$args[1]].toLowerCase())>>
+ <<if ["all", "max"].includes(State.temporary[$args[1]].toLowerCase())>>
<<set State.temporary[$args[1]] = Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500))>>
- <<replace `'#'+$args[0]+'AssetsPurchasing'`>>
+ <<replace `'#'+$args[0]+'AssetsPurchasing'`>>
Bought <<print commaNum(Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500)))>> units for <<print cashFormat(Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500))*500*State.variables[$args[0]+"AssetPrice"])>>
<</replace>>
<<set State.variables[$args[0]+"Assets"] += (eval(parse('_Num' + $args[0]))) * 500>>
@@ -488,7 +488,7 @@
<<elseif Number.parseFloat(eval(parse('_Num' + $args[0]))) < 0>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>>Please input a positive number.<</replace>>
/* Buy % */
- <<elseif State.temporary[$args[1]].toString().includes("%")>>
+ <<elseif State.temporary[$args[1]].toString().includes("%")>>
<<set _DesPerc = State.temporary[$args[1]]>>
<<set State.temporary[$args[1]] = Math.floor((Math.clamp((Number.parseFloat(State.temporary[$args[1]])/100),0,1)*$corpCash)/(State.variables[$args[0]+"AssetPrice"] * 500))>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>>
@@ -515,19 +515,19 @@
<</replace>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>><</replace>>
/* Unsuccessful buy but have enough cash for more than 1 unit */
- <<elseif $corpCash > 500 * State.variables[$args[0]+"AssetPrice"]>>
+ <<elseif $corpCash > 500 * State.variables[$args[0]+"AssetPrice"]>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>>
- The corp can only buy <<print commaNum(Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500)))>> more unit<<if Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500)) > 1 >>s<</if>> of $args[0] assets.
+ The corp can only buy <<print commaNum(Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500)))>> more unit<<if Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500)) > 1 >>s<</if>> of $args[0] assets.
<</replace>>
<<set State.temporary[$args[1]] = Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500))>>
<<replace `'#'+'controls'+$args[0]`>><<CorpDevBuySell $args[0] $args[1]>><</replace>><<script>>setReplaceTextboxMaxLength(State.temporary["textboxMLArg"], 10);<</script>>
/* Unsuccessful buy */
- <<else>>
- <<replace `'#'+$args[0]+'AssetsPurchasing'`>>There are insufficient funds for additional purchases.<</replace>>
+ <<else>>
+ <<replace `'#'+$args[0]+'AssetsPurchasing'`>>There are insufficient funds for additional purchases.<</replace>>
<</if>>
<</link>>
| <<link "Sell">>
- <<if !Number.isInteger(Number.parseFloat(eval(parse('_Num' + $args[0]))))>>
+ <<if !Number.isInteger(Number.parseFloat(eval(parse('_Num' + $args[0]))))>>
/* Sell all */
<<if ["all", "max"].includes(State.temporary[$args[1]].toLowerCase())>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>>
@@ -580,7 +580,7 @@
/* Unsuccessful sell but have enough assets for more than 1 unit */
<<elseif State.variables[$args[0]+"Assets"] > 500>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>>
- The corp can only sell <<print commaNum(Math.ceil((State.variables[$args[0]+"Assets"]-500)/500))>> more unit<<if Math.ceil((State.variables[$args[0]+"Assets"]-500)/500) > 1 >>s<</if>> of $args[0] assets.
+ The corp can only sell <<print commaNum(Math.ceil((State.variables[$args[0]+"Assets"]-500)/500))>> more unit<<if Math.ceil((State.variables[$args[0]+"Assets"]-500)/500) > 1 >>s<</if>> of $args[0] assets.
<</replace>>
<<set State.temporary[$args[1]] = Math.ceil((State.variables[$args[0]+"Assets"]-500)/500)>>
<<replace `'#'+'controls'+$args[0]`>><<CorpDevBuySell $args[0] $args[1]>><</replace>><<script>>setReplaceTextboxMaxLength(State.temporary["textboxMLArg"], 10);<</script>>
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index 1a8b0ad53e866692096c0c794cd4f35ad3ab26ea..7b896563c46343a2d16bb91e50ca2efd7ae13d58 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -324,7 +324,7 @@
/* Here support for partial birth cases but if slaves still NOT have broodmother implant. Right now remaining babies will be lost, need to add research option for selective births. It should control labor and stop it after ready to birth babies out. Should be Repopulation FS research before broodmothers (their implant obviously have it as a part of functional). */
<<if $slaves[$i].broodmother == 0>>
- <<if $slaves[$i].prematureBirth == 1>> /* emergency birth, anything less than 23 weeks of age is not making it through this */
+ <<if $slaves[$i].prematureBirth == 1>> /* emergency birth, anything less than 23 weeks of age is not making it through this */
<<set $slaves[$i].curStillBirth = $slaves[$i].womb.length>>
<<set WombFlush($slaves[$i])>>
<<elseif $surgeryUpgrade == 1>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 4bbd02f11c397e1291097653144cc46743207ac0..fdac1bd2a0f4f0dc39e6c275105d6ebc9d212134 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -526,7 +526,7 @@
<<set $propOutcome = 0>>
<</if>>
<<if ndef $EliteSires>>
- <<set $EliteSires = ["moves", "quick", "crazy", "virgin", "futa", "preggo"]>>
+ <<set $EliteSires = ["crazy", "futa", "moves", "preggo", "quick", "virgin"]>>
<</if>>
<<if ndef $startingPoint>>
<<set $startingPoint = -1>>
@@ -1058,10 +1058,10 @@
<<set $eugenicsFullControl = 0>>
<</if>>
<<if ndef $merchantFSWares>>
- <<set $merchantFSWares = ["GenderRadicalistResearch", "TransformationFetishistResearch", "AssetExpansionistResearch", "SlimnessEnthusiastResearch", "YouthPreferentialistResearch", "HedonisticDecadenceResearch"]>>
+ <<set $merchantFSWares = ["AssetExpansionistResearch", "GenderRadicalistResearch", "HedonisticDecadenceResearch", "SlimnessEnthusiastResearch", "TransformationFetishistResearch", "YouthPreferentialistResearch"]>>
<</if>>
<<if ndef $merchantIllegalWares>>
- <<set $merchantIllegalWares = ["childhoodFertilityInducedNCS", "UterineRestraintMesh", "RapidCellGrowthFormula", "PGHack", "sympatheticOvaries", "asexualReproduction"]>>
+ <<set $merchantIllegalWares = ["asexualReproduction", "childhoodFertilityInducedNCS", "PGHack", "RapidCellGrowthFormula", "sympatheticOvaries", "UterineRestraintMesh"]>>
<<elseif $merchantIllegalWares.length == 0>>
<<set $merchantIllegalWares.push("childhoodFertilityInducedNCS")>>
<<set $merchantIllegalWares.push("UterineRestraintMesh")>>
@@ -1092,7 +1092,7 @@
<<set $showInches = 0>>
<</if>>
<<if ndef $prisonCircuit>>
- <<set $prisonCircuit = ["low tier criminals", "gangs and smugglers", "white collar", "military prison"]>>
+ <<set $prisonCircuit = ["gangs and smugglers", "low tier criminals", "military prison", "white collar"]>>
<<set $prisonCircuitIndex = random(0,$prisonCircuit.length-1)>>
<</if>>
<<if $captureUpgradeRace === "">>
@@ -1275,19 +1275,18 @@
<<if ndef $month>>
-<<set $month = either("January","February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December")>>
+ <<set $month = either("April", "August", "December", "February", "January", "July", "June", "March", "May", "November", "October", "September")>>
<</if>>
<<if ndef $day>>
-<<set $day = random(1,28)>>
+ <<set $day = random(1,28)>>
<</if>>
<<if ndef $year>>
<<set $year = (2037+Math.floor($week/52))>>
<</if>>
<<if ndef $arcologies>>
-<<set $arcologies = []>>
-
-<<set $arcologies[0] = {name: "Arcology X-", direction: 0, government: 1, honeymoon: 0, prosperity: 50, FSSupremacist: "unset", FSSupremacistRace: 0, FSSubjugationist: "unset", FSSubjugationistRace: 0, 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", FSRepopulationFocus: "unset", FSRestart: "unset", FSHedonisticDecadence: "unset", embargo: 1, embargoTarget: -1, influenceTarget: -1, influenceBonus: 0, rival: 0}>>
+ <<set $arcologies = []>>
+ <<set $arcologies[0] = {name: "Arcology X-", direction: 0, government: 1, honeymoon: 0, prosperity: 50, FSSupremacist: "unset", FSSupremacistRace: 0, FSSubjugationist: "unset", FSSubjugationistRace: 0, 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", FSRepopulationFocus: "unset", FSRestart: "unset", FSHedonisticDecadence: "unset", embargo: 1, embargoTarget: -1, influenceTarget: -1, influenceBonus: 0, rival: 0}>>
<</if>>
<<if def $arcologyName>>
@@ -2599,7 +2598,7 @@ Setting missing global variables:
<</if>>
<<if ndef $justiceEvents>>
- <<set $justiceEvents = ["slave deal", "slave training", "majority deal", "indenture deal", "virginity deal"]>>
+ <<set $justiceEvents = ["indenture deal", "majority deal", "slave deal", "slave training", "virginity deal"]>>
<</if>>
<<if (($ver.startsWith("0.6") && !$ver.startsWith("10.6")) || ($ver.startsWith("0.7")) || ($ver.startsWith("0.8")) || ($ver == "0.9"))>>
@@ -2826,23 +2825,32 @@ Setting missing slave variables:
<<if ndef _backwardsCompatibility>><<set _Slave.relation = 0, _Slave.relationTarget = 0>><</if>>
<</if>>
-<<if _Slave.race == "surgically altered to look white">>
- <<set _Slave.race = "white">>
+<<if _Slave.race == "surgically altered to look amerindian">>
+ <<set _Slave.race = "amerindian">>
+<</if>>
+<<if _Slave.race == "surgically altered to look asian">>
+ <<set _Slave.race = "asian">>
<</if>>
<<if _Slave.race == "surgically altered to look black">>
<<set _Slave.race = "black">>
<</if>>
+<<if _Slave.race == "surgically altered to look indo-aryan">>
+ <<set _Slave.race = "indo-aryan">>
+<</if>>
<<if _Slave.race == "surgically altered to look latina">>
<<set _Slave.race = "latina">>
<</if>>
-<<if _Slave.race == "surgically altered to look asian">>
- <<set _Slave.race = "asian">>
+<<if _Slave.race == "surgically altered to look malay">>
+ <<set _Slave.race = "malay">>
<</if>>
<<if _Slave.race == "surgically altered to look middle eastern">>
<<set _Slave.race = "middle eastern">>
<</if>>
-<<if _Slave.race == "surgically altered to look amerindian">>
- <<set _Slave.race = "amerindian">>
+<<if (_Slave.race == "surgically altered to look mixed race") || (_Slave.race == "surgically altered to look mixed")>>
+ <<set _Slave.race = "mixed race">>
+<</if>>
+<<if (_Slave.race == "surgically altered to look pacific islander") || (_Slave.race == "surgically altered to look like a pacific islander")>>
+ <<set _Slave.race = "pacific islander">>
<</if>>
<<if (_Slave.race == "surgically altered to look southern european") || (_Slave.race == "southern European")>>
<<set _Slave.race = "southern european">>
@@ -2850,17 +2858,8 @@ Setting missing slave variables:
<<if _Slave.race == "surgically altered to look semitic">>
<<set _Slave.race = "semitic">>
<</if>>
-<<if _Slave.race == "surgically altered to look malay">>
- <<set _Slave.race = "malay">>
-<</if>>
-<<if _Slave.race == "surgically altered to look indo-aryan">>
- <<set _Slave.race = "indo-aryan">>
-<</if>>
-<<if (_Slave.race == "surgically altered to look pacific islander") || (_Slave.race == "surgically altered to look like a pacific islander")>>
- <<set _Slave.race = "pacific islander">>
-<</if>>
-<<if (_Slave.race == "surgically altered to look mixed race") || (_Slave.race == "surgically altered to look mixed")>>
- <<set _Slave.race = "mixed race">>
+<<if _Slave.race == "surgically altered to look white">>
+ <<set _Slave.race = "white">>
<</if>>
<<if ndef _Slave.override_Race>>
@@ -3126,49 +3125,49 @@ Setting missing slave variables:
<<if (($ver.startsWith("0.6") && !$ver.startsWith("10.6")) || ($ver.startsWith("0.7")) || ($ver.startsWith("0.8")) || ($ver.startsWith("0.9"))) && (!$ver.startsWith("0.9.5")) && (!$ver.startsWith("0.9.6")) && (!$ver.startsWith("0.9.7")) && (!$ver.startsWith("0.9.8")) && (!$ver.startsWith("0.9.9")) && (!$ver.startsWith("0.9.10"))>>
<<if _Slave.oralSkill > 0>>
- <<if _Slave.oralSkill == 3>>
- <<set _Slave.oralSkill = 100>>
- <<elseif _Slave.oralSkill == 2>>
- <<set _Slave.oralSkill = 65>>
- <<else>>
- <<set _Slave.oralSkill = 35>>
- <</if>>
+ <<if _Slave.oralSkill == 3>>
+ <<set _Slave.oralSkill = 100>>
+ <<elseif _Slave.oralSkill == 2>>
+ <<set _Slave.oralSkill = 65>>
+ <<else>>
+ <<set _Slave.oralSkill = 35>>
+ <</if>>
<</if>>
<<if _Slave.vaginalSkill > 0>>
- <<if _Slave.vaginalSkill == 3>>
- <<set _Slave.vaginalSkill = 100>>
- <<elseif _Slave.vaginalSkill == 2>>
- <<set _Slave.vaginalSkill = 65>>
- <<else>>
- <<set _Slave.vaginalSkill = 35>>
- <</if>>
+ <<if _Slave.vaginalSkill == 3>>
+ <<set _Slave.vaginalSkill = 100>>
+ <<elseif _Slave.vaginalSkill == 2>>
+ <<set _Slave.vaginalSkill = 65>>
+ <<else>>
+ <<set _Slave.vaginalSkill = 35>>
+ <</if>>
<</if>>
<<if _Slave.analSkill > 0>>
- <<if _Slave.analSkill == 3>>
- <<set _Slave.analSkill = 100>>
- <<elseif _Slave.analSkill == 2>>
- <<set _Slave.analSkill = 65>>
- <<else>>
- <<set _Slave.analSkill = 35>>
- <</if>>
+ <<if _Slave.analSkill == 3>>
+ <<set _Slave.analSkill = 100>>
+ <<elseif _Slave.analSkill == 2>>
+ <<set _Slave.analSkill = 65>>
+ <<else>>
+ <<set _Slave.analSkill = 35>>
+ <</if>>
<</if>>
<<if _Slave.whoreSkill > 0>>
- <<if _Slave.whoreSkill == 3>>
- <<set _Slave.whoreSkill = 100>>
- <<elseif _Slave.whoreSkill == 2>>
- <<set _Slave.whoreSkill = 65>>
- <<else>>
- <<set _Slave.whoreSkill = 35>>
- <</if>>
+ <<if _Slave.whoreSkill == 3>>
+ <<set _Slave.whoreSkill = 100>>
+ <<elseif _Slave.whoreSkill == 2>>
+ <<set _Slave.whoreSkill = 65>>
+ <<else>>
+ <<set _Slave.whoreSkill = 35>>
+ <</if>>
<</if>>
<<if _Slave.entertainSkill > 0>>
- <<if _Slave.entertainSkill == 3>>
- <<set _Slave.entertainSkill = 100>>
- <<elseif _Slave.entertainSkill == 2>>
- <<set _Slave.entertainSkill = 65>>
- <<else>>
- <<set _Slave.entertainSkill = 35>>
- <</if>>
+ <<if _Slave.entertainSkill == 3>>
+ <<set _Slave.entertainSkill = 100>>
+ <<elseif _Slave.entertainSkill == 2>>
+ <<set _Slave.entertainSkill = 65>>
+ <<else>>
+ <<set _Slave.entertainSkill = 35>>
+ <</if>>
<</if>>
<<if ($ver != "0.9.4")>>
<<set _Slave.aphrodisiacs = 0>>
@@ -3515,8 +3514,8 @@ Done!
/* Sec Exp */
<<if $secExp == 1>>
-<br>
-<<include "SecExpBackwardCompatibility">>
+ <br>
+ <<include "SecExpBackwardCompatibility">>
<<else>>
<<set $crime = 0, $security = 0>>
<</if>>
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index 3124416196473505e7ab424cf1ba83affe4ad5a9..66f5359b69d3cd28363870667d20c5936ea61302 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -137,7 +137,7 @@ When you've finished your task, you raise your eyes to examine $him. $He's stand
$He's nude, making it obvious that $his poor soft member has done its duty today. It even looks a little moist, as though it bred a fertile slave's pussy only a few minutes ago.
<<elseif ["body oil", "chains", "clubslut netting", "restrictive latex", "shibari ropes", "uncomfortable straps"].indexOf($activeSlave.clothes) != -1>>
$His clothes don't cover $his dick, making it obvious that $his poor soft member has done its duty today. It even looks a little moist, as though it bred a fertile slave's pussy only a few minutes ago.
-<<elseif ["a burkini", "a comfortable bodysuit", "a fallen nuns habit", "a latex catsuit", "a leotard", "a monokini", "a cybersuit", "a scalemail bikini", "shimapan panties", "a string bikini", "attractive lingerie for a pregnant woman", "attractive lingerie", "harem gauze", "kitty lingerie", "restrictive latex", "slutty jewelry", "spats and a tank top", "stretch pants and a crop-top"].indexOf($activeSlave.clothes) != -1>>
+<<elseif ["a burkini", "a comfortable bodysuit", "a cybersuit", "a fallen nuns habit", "a latex catsuit", "a leotard", "a monokini", "a scalemail bikini", "a string bikini", "attractive lingerie for a pregnant woman", "attractive lingerie", "harem gauze", "kitty lingerie", "restrictive latex", "shimapan panties", "slutty jewelry", "spats and a tank top", "stretch pants and a crop-top"].indexOf($activeSlave.clothes) != -1>>
$His clothes cover $his groin, but they're pretty tight, making it clear that $his poor soft member has done its duty today.
<<else>>
$His clothes are relatively modest, so you can't see it, but it's clear that $his poor soft member has done its duty today.
diff --git a/src/uncategorized/REFS.tw b/src/uncategorized/REFS.tw
index 1b4cc30bc92e5e97254340113adaa29606751fae..afad1404d68b2288b88734481f61d4e8f37ef97b 100644
--- a/src/uncategorized/REFS.tw
+++ b/src/uncategorized/REFS.tw
@@ -376,7 +376,7 @@ On this particular outing you happen to cross paths with a comely female citizen
<span id="result">
<<link "Let them pass">>
<<replace "#result">>
- You step aside gracefully and bow your head, while signifying to the $girl that you intend to allow $him to pass you. $He seems taken aback by your geniality, especially given the gulf in social standing between the two of you, and has to be chaperoned from your presence by $his father. Nonetheless, $he is struck by $his chance encounter with you and cannot stop recounting the story to all $his friends, soon @@.green;the anecdote has seized the imaginations of $arcologies[0].name's youthful, female citizens.@@
+ You step aside gracefully and bow your head, while signifying to the $girl that you intend to allow $him to pass you. $He seems taken aback by your geniality, especially given the gulf in social standing between the two of you, and has to be chaperoned from your presence by $his father. Nonetheless, $he is struck by $his chance encounter with you and cannot stop recounting the story to all $his friends, soon @@.green;the anecdote has seized the imaginations of $arcologies[0].name's youthful, female citizens.@@
<<set $rep += 100>>
<</replace>>
<</link>>
@@ -390,7 +390,7 @@ On this particular outing you happen to cross paths with a comely female citizen
<</if>>
<br><<link "Manipulate $him into having sex with you">>
<<replace "#result">>
- It only takes a moment for $assistantName to uncover the father's financial records and the copious debt therein, and only another moment for you to browbeat the terrified father into allowing his daughter to sleep with you under threat of purchasing all their debt and summarily enslaving $him.
+ It only takes a moment for $assistantName to uncover the father's financial records and the copious debt therein, and only another moment for you to browbeat the terrified father into allowing his daughter to sleep with you under threat of purchasing all their debt and summarily enslaving $him.
<br><br>
Once you both retire to your private suite, you peel the girl's clothes off as easily as one might shed a gift of its wrapping. In the nude $his body is tastefully youthful, with narrow hips, firm breasts, and a delicate blush across $his shamefaced, rosy cheeks. Despite the circumstances of your sexual conquest of $him, $he seems to enjoy the fuck well enough by the sounds of $his frenzied moans - citizens like $him often do since sexual submission to a slave would be a crippling scandal to a prominent citizen, let alone one of $his diminished social stature.
<<if $cash >= 10000>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index bf005e5dc54190425357aa79a27cf5bbf40326c2..e136468ae8a66fd716284402b048add72e686656 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -325,7 +325,7 @@ clings to you in $his sleep as the warmth of your body begins to move away from
<<case "confident tanning">>
It's an unusually nice day, with mild sunshine, light breezes, and nothing offensive or dangerous in the atmosphere. In the middle of the afternoon, you take a break from your busy schedule of sex and business and stroll out onto one of your penthouse balconies. It seems <<EventNameLink $activeSlave>> was struck by a similar impulse. <<if $activeSlave.assignment == "rest">>$He's assigned to do little but rest<<else>>This is one of $his rest periods<</if>>, so $he's come out here to lay naked on a towel and enjoy the sun.
-<<if ["dark olive", "dark", "brown", "dark brown", "black", "ebony", "pure black"].includes($activeSlave.skin)>>
+<<if ["black", "brown", "dark brown", "dark olive", "dark", "ebony", "pure black"].includes($activeSlave.skin)>>
$His $activeSlave.skin doesn't tan much, so $he's just out here to bask in its warmth. $His body shines with lotion from a bottle lying next to $him, but it's just general-purpose stuff.
<<elseif ($activeSlave.skin == "tanned")>>
$His tanned skin shines with lotion from a bottle lying next to $him.
@@ -3117,7 +3117,7 @@ and flirting with passersby. Or $he would be, if $he weren't surrounded by a hos
<br><br>
"Why the fuck did you say that shit? We're not lesbians," says one.
<br><br>
-"You're fucking //gross,//" says another. "Like, ew. Even if it's free, why the fuck would we let you touch us?"
+"You're fucking //gross//," says another. "Like, ew. Even if it's free, why the fuck would we let you touch us?"
<br><br>
<<if $activeSlave.bellyPreg >= 750000>>
"Holy shit, $he's gonna blow! Bitch'll keep fucking till $his belly pops open and keep on fucking still,"
@@ -3517,7 +3517,7 @@ $He shrieks, backpedaling, and then falls backward, $his <<if $activeSlave.butt
There are sturdy leather seats placed strategically throughout your penthouse. They offer something convenient to bend your slaves over, wherever you happen to encounter them, and they're comfortable, too. At the moment, you're sitting on one, using a tablet to take care of some business that caught you away from your office, but isn't worth heading back to your desk for. Slaves move by your impromptu throne as you work, mostly <<if $averageTrust > 50>>greeting you cheerfully<<elseif $averageTrust > 20>>greeting you properly<<elseif $averageTrust > -20>>doing their best to greet you properly<<elseif $averageTrust > -50>>greeting you fearfully<<else>>struggling to greet you through their terror<</if>> as they pass. Busy, you spare few of them more than a glance.
<br><br>
-One of them slows as $he goes by, however. Looking up, you see that it's <<EventNameLink $activeSlave>>. <<if canTalk($activeSlave)>>"Hi <<Master>>," $he <<say>>s flirtily<<if $activeSlave.belly >= 1500>> rubbing a hand across $his _belly <<if $activeSlave.bellyPreg > 0>> pregnancy<<else>>belly<</if>><</if>>. "That look<<s>> like a really comfortable <<s>>eat. Can I <<s>>it down and re<<s>>t <<if $activeSlave.belly >= 10000>>my tired leg<<s>> <</if>>for a little while?"<<else>>$He greets you properly, but adds a flirtiness to $his gestures, and asks if $he can sit down and rest <<if $activeSlave.belly >= 10000>> $his <<if $activeSlave.bellyPreg > 0>>gravid<<else>>_belly<</if>> bulk <</if>>on the comfortable seat for a little while.<</if>> $He is not pointing at the soft leather cushion next to you: $he's pointing at your crotch.
+One of them slows as $he goes by, however. Looking up, you see that it's <<EventNameLink $activeSlave>>. <<if canTalk($activeSlave)>>"Hi <<Master>>," $he <<say>>s flirtatiously<<if $activeSlave.belly >= 1500>> rubbing a hand across $his _belly <<if $activeSlave.bellyPreg > 0>> pregnancy<<else>>belly<</if>><</if>>. "That look<<s>> like a really comfortable <<s>>eat. Can I <<s>>it down and re<<s>>t <<if $activeSlave.belly >= 10000>>my tired leg<<s>> <</if>>for a little while?"<<else>>$He greets you properly, but adds a flirtiness to $his gestures, and asks if $he can sit down and rest <<if $activeSlave.belly >= 10000>> $his <<if $activeSlave.bellyPreg > 0>>gravid<<else>>_belly<</if>> bulk <</if>>on the comfortable seat for a little while.<</if>> $He is not pointing at the soft leather cushion next to you: $he's pointing at your crotch.
<br><br>
You're nude, a consequence of <<if $Concubine != 0 && $Concubine.ID != $activeSlave.ID>>recent activities involving $Concubine.slaveName<<else>>recent unrelated activities<</if>>. <<if $PC.dick == 1>>Your formidable dick is three quarters hard,<<else>>Nude, that is, all except for the strap-on you were just using and haven't taken off yet,<</if>> and $activeSlave.slaveName is pointing right at it. $He knows exactly what $he's asking for and gives $his <<if $activeSlave.hips > 0>>broad<<elseif $activeSlave.hips > -1>>trim<<else>>narrow<</if>> hips a little wiggle to make it even more abundantly clear.
<<if ["chastity", "combined chastity"].includes($activeSlave.dickAccessory)>>
@@ -3893,7 +3893,7 @@ and flirting with passersby. Or $he would be, if $he weren't surrounded by a gro
<<elseif $activeSlave.belly >= 150000>>
"Oh my god, I didn't know a $girl could get //that// pregnant,"
<<elseif $activeSlave.dick > 6>>
- "I didn't even know <<= $girl>>s could have dicks that bid,"
+ "I didn't even know <<= $girl>>s could have dicks that big,"
<<elseif $activeSlave.weight > 130>>
"$He looks so soft and pillowy,"
<<elseif $activeSlave.belly >= 1500>>
@@ -4317,7 +4317,7 @@ You are working late tonight, poring over some particularly troublesome business
<<elseif $PC.refreshmentType == 6>>
tab of $PC.refreshment
<</if>>
-brought in to you. This time <<EventNameLink $activeSlave>> has been sent to deliver it. $He loves you, but fears you simultaneously. Such relationships were not uncommon before the advent of modern slavery, but they are especially prevalent in its wake, as fear has proven a highly effective control method for those slaveowners with the inclination and relative lack of conscience to utilize it as such. You hurriedly put the finishing touches on your work, eager to be done, and reach for your $PC.refreshment. $activeSlave.slaveName flinches at your sudden movement, taking a few frightened steps back, nearly dropping the serving tray and leaving you grasping at thin air. It was a simple fear response; $he didn't realize you were ready for your treat and instinctively thought you were reaching out to strike $him. Tears swell up in $his eyes as $he apologizes profusely.
+brought in to you. This time <<EventNameLink $activeSlave>> has been sent to deliver it. $He loves you, but fears you simultaneously. Such relationships were not uncommon before the advent of modern slavery, but they are especially prevalent in its wake, as fear has proven a highly effective control method for those slaveowners with the inclination and relative lack of conscience to utilize it as such. You hurriedly put the finishing touches on your work, eager to be done, and then reach for your $PC.refreshment. $activeSlave.slaveName flinches at your sudden movement, taking a few frightened steps back, nearly dropping the serving tray and leaving you grasping at thin air. It was a simple fear response; $he didn't realize you were ready for your treat and instinctively thought you were reaching out to strike $him. Tears swell up in $his eyes as $he apologizes profusely.
<<default>>
<br>ERROR: bad RESS event $RESSevent
@@ -4387,7 +4387,7 @@ brought in to you. This time <<EventNameLink $activeSlave>> has been sent to del
<<else>>
"You don't want me to get pregnant <<Master>>?"
<</if>>
- You bring $his over to the couch, set $him on your lap, and teasingly call $him a buttslut. Every so often you graze a finger around $his chastity belt, noting how much $his body wants you in $him, but you only make it the center of attention once the poor over-aroused slave
+ You bring $him over to the couch, set $him on your lap, and teasingly call $him a buttslut. Every so often you graze a finger around $his chastity belt, noting how much $his body wants you in $him, but you only make it the center of attention once the poor over-aroused slave
<<if !canTalk($activeSlave)>>
begins to use piteous gestures to beg you abjectly to penetrate $him.
<<else>>
@@ -4422,9 +4422,9 @@ brought in to you. This time <<EventNameLink $activeSlave>> has been sent to del
<<if !canTalk($activeSlave)>>
$His expression shifts to confusion.
<<else>>
- "What<<s>> that mean <<Master>>?"
+ "What doe<<s>> that mean <<Master>>?"
<</if>>
- You quickly approach and catch $him, forcing $his <<if $activeSlave.belly >= 1500>><<if $activeSlave.bellyPreg >= 1500>>gravid <<else>>distended <</if>><</if>>body face up onto the couch. $He <<if canSee($activeSlave)>>watches you carefully<<else>>listens to your movements<</if>> as you size up $his fully erect
+ You quickly approach and catch $him, forcing $his <<if $activeSlave.belly >= 1500>><<if $activeSlave.bellyPreg >= 1500>>gravid <<else>>distended <</if>><</if>>body face up onto the couch. $He <<if canSee($activeSlave)>>watches you carefully<<elseif canHear($activeSlave)>>listens to your movements<<else>>waits with trepidation<</if>> as you size up $his fully erect
<<if $activeSlave.dick == 1>>
tiny dick.
<<elseif $activeSlave.dick == 2>>
@@ -4466,9 +4466,9 @@ brought in to you. This time <<EventNameLink $activeSlave>> has been sent to del
<<if !canTalk($activeSlave)>>
$His expression shifts to confusion.
<<else>>
- "What<<s>> that mean <<Master>>?"
+ "What doe<<s>> that mean <<Master>>?"
<</if>>
- You quickly approach and catch $him, forcing $him <<if $activeSlave.belly >= 1500>><<if $activeSlave.bellyPreg >= 1500>>gravid <<else>>distended <</if>><</if>>body face down onto the couch<<if $activeSlave.belly >= 100000>> as best you can<</if>>. $He <<if canSee($activeSlave)>>watches you carefully<<else>>listens to your movements<</if>> as you size up $his fully erect
+ You quickly approach and catch $him, forcing $his <<if $activeSlave.belly >= 1500>><<if $activeSlave.bellyPreg >= 1500>>gravid <<else>>distended <</if>><</if>>body face down onto the couch<<if $activeSlave.belly >= 100000>> as best you can<</if>>. $He <<if canSee($activeSlave)>>watches you carefully<<else>>listens to your movements<</if>> as you size up $his fully erect
<<if $activeSlave.dick == 1>>
tiny dick.
<<elseif $activeSlave.dick == 2>>
@@ -4525,7 +4525,7 @@ brought in to you. This time <<EventNameLink $activeSlave>> has been sent to del
<<else>>
"What<<s>> that mean <<Master>>?"
<</if>>
- You quickly approach and catch $him, forcing $his <<if $activeSlave.belly >= 1500>><<if $activeSlave.bellyPreg >= 1500>>gravid <<else>>distended <</if>><</if>>body face up onto the couch. $He <<if canSee($activeSlave)>>watches you carefully<<else>>listens to your movements<</if>> as you size up $his fully erect
+ You quickly approach and catch $him, forcing $his <<if $activeSlave.belly >= 1500>><<if $activeSlave.bellyPreg >= 1500>>gravid <<else>>distended <</if>><</if>>body face up onto the couch. $He <<if canSee($activeSlave)>>watches you carefully<<elseif canHear($activeSlave)>>listens to your movements<<else>>waits with trepidation<</if>> as you size up $his fully erect
<<if $activeSlave.dick == 1>>
tiny dick.
<<elseif $activeSlave.dick == 2>>
@@ -4581,7 +4581,7 @@ brought in to you. This time <<EventNameLink $activeSlave>> has been sent to del
<</replace>>
<</link>><<if ($activeSlave.anus == 0)>> //This option will take anal virginity//<</if>>
<<if $seeExtreme == 1 && $activeSlave.indentureRestrictions <= 0>>
-<br><<link "Geld $him to render $his impotent again">>
+<br><<link "Geld $him to render $him impotent again">>
<<set $activeSlave.balls = 0, $activeSlave.health -= 10, $activeSlave.trust -= 20>>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
@@ -4939,7 +4939,7 @@ brought in to you. This time <<EventNameLink $activeSlave>> has been sent to del
<br><<link "Fake playing along">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You start removing your top and putting on a show of seducing your slave, dropping to your knees while looking doe-eyed at $him. By sucking $him off, you'll probably get $him to lower their guard enough to get the upper hand. You take $his
+ You start removing your top and putting on a show of seducing your slave, dropping to your knees while looking doe-eyed at $him. By sucking $him off, you'll probably get $him to lower $his guard enough to get the upper hand. You take $his
<<if $activeSlave.dick == 1>>
pathetic
<<elseif $activeSlave.dick == 2>>
@@ -5924,9 +5924,9 @@ brought in to you. This time <<EventNameLink $activeSlave>> has been sent to del
<<replace "#result">>
Wordlessly, you fetch a towel of your own. $He raises $his head a little to see if $he's needed, but as soon as $he <<if canSee($activeSlave)>>sees<<else>>realizes<</if>> what you're doing, $he smiles with simple satisfaction and closes $his eyes again. You strip and lie down next to $him. $He made a good decision <<if $activeSlave.assignment == "rest">>about how to spend $his rest<<else>>about what to do with $his rest period<</if>>. The sun is warm and gentle, and the interminable demands of leadership and your harem suddenly seem very far away. You drop off for a short while, only waking when your apologetic personal assistant breaks in with notice of an upcoming meeting. As you get your senses back, you notice that $activeSlave.slaveName's hand is right next to yours, flattened out against the decking. $His eyes remain closed, and $his breath is steady; $he's fast asleep. It seems $he did not want to wake you, but @@.hotpink;wanted very much to be a little closer to you.@@ You consider canceling the meeting and waking the sun-warmed
<<if $activeSlave.physicalAge > 30>>
- woman,
+ $woman,
<<elseif $activeSlave.physicalAge > 17>>
- girl,
+ $girl,
<<elseif $activeSlave.physicalAge > 12>>
teen,
<<else>>
@@ -5936,7 +5936,7 @@ brought in to you. This time <<EventNameLink $activeSlave>> has been sent to del
<<set $activeSlave.devotion += 4>>
<</replace>>
<</link>>
-<br><<link "Bring your good girls out for a day at the beach">>
+<br><<link "Bring your good slaves out for a day at the beach">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
You direct $assistantName to bring your girls who deserve it out for a day at the beach. There might be little sand out on the balcony, but there's plenty of warm sun. And beaches are overrated these days anyway, with the ocean becoming so unpredictable. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> advises them to get naked, and bring towels and sun lotion appropriate for their individual skin types, so they know they're going to get some sunshine, but they're surprised when they get outside. They're obviously expecting an orgy of some kind, but all they see is you and $activeSlave.slaveName luxuriating on the decking. As they arrive, they take the cue and line up with you one by one. After a long sunbathing session, you send a couple of them inside to bring out cool drinks, a beach ball, and other essentials. The hornier girls are doubtful for a while, but eventually they all relax and @@.mediumaquamarine;gain confidence@@ from the simple, nonsexual pleasure of a little time in the sun.
@@ -6167,7 +6167,7 @@ brought in to you. This time <<EventNameLink $activeSlave>> has been sent to del
<<set $rep += 50>>
<<set $activeSlave.oralCount++, $oralTotal++>>
<<elseif ($activeSlave.fetish == "humiliation")>>
- You sit down on a balcony bench and pull $him down to sit on your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>>, and then pull $his legs as wide as they'll go as you fuck $him, displaying everything to the whole balcony<<if $activeSlave.belly >= 120000>>; $his _belly stomach hangs so low that it blocks the view, however<<else>><<if $PC.vagina == 1>><<if $PC.dick == 1>>: incidentally including your own pussy, which slides up and down as you piston the cock above it in and out of $him<</if>><</if>><</if>>. $He @@.hotpink;laps up@@ the @@.green;openly aroused@@ stares from $his growing audience.
+ You sit down on a balcony bench and pull $him down to sit on your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>>, and then pull $his legs as wide as they'll go as you fuck $him, displaying everything to the whole balcony<<if $activeSlave.belly >= 120000>>; $his _belly stomach hangs so low that it blocks the view, however<<else>><<if $PC.vagina == 1>><<if $PC.dick == 1>>: incidentally including your own pussy, which slides up and down as you piston the cock above it in and out of $his<</if>><</if>><</if>>. $He @@.hotpink;laps up@@ the @@.green;openly aroused@@ stares from $his growing audience.
<<set $rep += 100>>
<<set $activeSlave.devotion += 3>>
<<if canDoVaginal($activeSlave)>>
@@ -6623,7 +6623,7 @@ brought in to you. This time <<EventNameLink $activeSlave>> has been sent to del
<br><<link "Buttfuck $him against the railing">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You move quietly over to $him and encircle $his with your arms, holding both $his hands over $his _belly<<if $activeSlave.pregKnown == 1>> pregnant<</if>> belly with both of yours. $He relaxes into your
+ You move quietly over to $him and encircle $him with your arms, holding both $his hands over $his _belly<<if $activeSlave.pregKnown == 1>> pregnant<</if>> belly with both of yours. $He relaxes into your
<<if $PC.boobsBonus > 2>>
enormous<<if $PC.boobsImplant == 1>> fake<</if>> breasts
<<elseif $PC.boobsBonus == 2>>
@@ -7568,11 +7568,11 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<if ($activeSlave.muscles > 30)>>
$His powerful form has to be sedated for immurement in the arcade.
<<elseif ($activeSlave.weight >= 190)>>
- $He is so massively fat that immuring $his in the arcade is a struggle, even when $he isn't trying to.
+ $He is so massively fat that immuring $him in the arcade is a struggle, even when $he isn't trying to.
<<elseif $activeSlave.belly >= 120000>>
- $He is so enormously gravid that immuring $his in the arcade is a hassle, even though $his _belly middle limits $his ability to struggle.
+ $He is so enormously gravid that immuring $him in the arcade is a hassle, even though $his _belly middle limits $his ability to struggle.
<<elseif ($activeSlave.weight >= -10)>>
- $His desperate struggles make immuring $his in the arcade difficult.
+ $His desperate struggles make immuring $him in the arcade difficult.
<<elseif $activeSlave.belly >= 1500>>
$His <<if $activeSlave.bellyPreg >= 3000>>pregnant<<else>>_belly<</if>> body makes it slightly difficult to fit $him properly into the restraints for immurement in the arcade.
<<elseif $activeSlave.muscles < -15>>
@@ -8386,7 +8386,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<set $activeSlave.devotion -= 5>>
<</replace>>
<</link>>
-<br><<link "Sissy slave girls don't need to climax to serve">>
+<br><<link "Sissy slave <<= $girl>>s don't need to climax to serve">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
You explain patiently that $he needs to stop focusing on getting off. $He's a sex slave, and what matters is that $he pleasures others. If $he doesn't climax $himself, that's unfortunate but not really significant. $He looks terribly forlorn, so to drive home the point you push $him down to the floor, give $him a rough face fuck, and send $him away with tousled hair, <<if $PC.dick == 0>>a tired tongue<<else>>a mouthful of ejaculate<</if>>, and the same limp dick as before. @@.mediumorchid;It's frustrating for $him.@@
@@ -9140,7 +9140,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<else>>
You finger fuck $him for a while, the sting of the soap on $him sensitive insides making $him gasp.
<</if>>
- As $he moans down on the shower floor, you lie down behind $him, spooning $him helpless body<<if $activeSlave.belly >= 5000>>, your hands encircling $him _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>middle<</if>><</if>>.
+ As $he moans down on the shower floor, you lie down behind $him, spooning $his helpless body<<if $activeSlave.belly >= 5000>>, your hands encircling $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>middle<</if>><</if>>.
<<if $PC.dick == 1>>
Your cock slides into $him with ease
<<elseif $PC.boobs == 1>>
@@ -9244,10 +9244,10 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<case "obedient bitchy">>
-<<link "Beg $his pardon and offer to loan the bitch to $him">>
+<<link "Beg her pardon and offer to loan the bitch to her">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- The businesswoman's anger turns to malicious anticipation as you call $activeSlave.slaveName over and inform $him that you and the businesswoman have decided $activeSlave.slaveName will be spending the night with $him. Now that you look at your business partner, she has certain signs of a sadist. $activeSlave.slaveName notices too, and begins to cry<<if $activeSlave.bellyPreg >= 1500>> and shield $his pregnancy<</if>> as the businesswoman promises that there will be "no permanent damage." $activeSlave.slaveName is unceremoniously returned in the early hours of the morning. $His back and buttocks have been meticulously flogged right up to the very edge of damage, leaving angry marks across $his $activeSlave.skin skin. $His mouth lolls open, as though $he's been doing little but give cunnilingus. <<if $activeSlave.vagina != -1>>$His pussy,<<elseif $activeSlave.dick == 0>>$His shamefully featureless groin with its tiny little hole,<<else>>$His dick,<</if>> anus,<<if $activeSlave.belly >= 10001>> popped navel,<</if>> and even $his nipples show signs of torture. Whenever $he thinks of a sharp remark in the future, @@.hotpink;$he'll remember the pain and keep $his mouth shut.@@
+ The businesswoman's anger turns to malicious anticipation as you call $activeSlave.slaveName over and inform $him that you and the businesswoman have decided $activeSlave.slaveName will be spending the night with her. Now that you look at your business partner, she has certain signs of a sadist. $activeSlave.slaveName notices too, and begins to cry<<if $activeSlave.bellyPreg >= 1500>> and shield $his pregnancy<</if>> as the businesswoman promises that there will be "no permanent damage." $activeSlave.slaveName is unceremoniously returned in the early hours of the morning. $His back and buttocks have been meticulously flogged right up to the very edge of damage, leaving angry marks across $his $activeSlave.skin skin. $His mouth lolls open, as though $he's been doing little but give cunnilingus. <<if $activeSlave.vagina != -1>>$His pussy,<<elseif $activeSlave.dick == 0>>$His shamefully featureless groin with its tiny little hole,<<else>>$His dick,<</if>> anus,<<if $activeSlave.belly >= 10001>> popped navel,<</if>> and even $his nipples show signs of torture. Whenever $he thinks of a sharp remark in the future, @@.hotpink;$he'll remember the pain and keep $his mouth shut.@@
<<set $activeSlave.behavioralFlaw = "none", $activeSlave.oralCount += 5, $oralTotal += 5>>
<</replace>>
<</link>>
@@ -9890,7 +9890,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<</link>><<if ($activeSlave.anus == 0 && canDoAnal($activeSlave)) || ($activeSlave.vagina == 0 && canDoVaginal($activeSlave))>> //This option will take virginity//<</if>>
<</if>>
<<if canDoAnal($activeSlave)>>
-<br><<link "Assrape $his">>
+<br><<link "Assrape $him">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
You order $him to kneel. $He looks hopeful and complies, but $his anticipation of enjoyable sex vanishes with a pathetic little gasp when you<<if $PC.dick == 0>> don a strap-on and<</if>> <<if $PC.vagina == 1>>use a couple of fingers to collect some of your pussyjuice for improvised lube<<else>>spit on $his butthole<</if>>. With only a little saliva as lubrication, you brutally sodomize $him, fucking $his <<if $seeRace == 1>>$activeSlave.race <</if>>ass to the limit of what you can get away with without damaging $him.
@@ -10117,7 +10117,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<set $activeSlave.devotion += 4>>
<</replace>>
<</link>>
-<br><<link "Share some refreshments with $his">>
+<br><<link "Share some refreshments with $him">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
You reach into the back of your desk, where your private reserves are, and wordlessly offer $him a
@@ -10449,11 +10449,11 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<replace "#artFrame">>
/* 000-250-006 */
<<if $seeImages == 1>>
- <<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><<SlaveArt $activeSlave 2 0>></div>
- <<else>>
- <div class="imageRef lrgRender"><<SlaveArt $activeSlave 2 0>></div>
- <</if>>
+ <<if $imageChoice == 1>>
+ <div class="imageRef lrgVector"><<SlaveArt $activeSlave 2 0>></div>
+ <<else>>
+ <div class="imageRef lrgRender"><<SlaveArt $activeSlave 2 0>></div>
+ <</if>>
<</if>>
/* 000-250-006 */
<</replace>>
@@ -10722,7 +10722,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<</if>>
without putting too much weight on $his poor overused butthole. You ask $him about $his day.
<<if !canTalk($activeSlave)>>
- $He uses gestures to recount it through $his tears. Apparently while one guy was using $his anus, another thought it was hot and waited for him to be done before using $him in turn, without letting $him rest or clean $himself. It took four cocks total for another slave to notice and rescue $him.
+ $He uses gestures to recount it through her tears. Apparently while one guy was using $his anus, another thought it was hot and waited for him to be done before using $him in turn, without letting her rest or clean $himself. It took four cocks total for another slave to notice and rescue $him.
<<else>>
$He <<say>>s, a little tearfully, "<<Master>>, thi<<s>> guy wanted to u<<s>>e my butt in public. <<S>>o of cour<<s>>e I let him, and he made me <<s>>it in hi<<s>> lap to do it, and held my leg<<s>> back <<s>>o everyone could <<s>>ee! And then another guy thought it wa<<s>> hot and waited, and then fucked me in my a<<ss>> too. Another girl finally noti<<c>>ed and re<<s>>cued me after four cock<<s>>, <<Master>>. I'm really <<s>>ore."
<</if>>
@@ -10834,7 +10834,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
$He almost cries with relief when you tell $him to
<<switch $activeSlave.fetish>>
<<case "submissive">>
- lie down on your desk on $his side in the fetal position. $He clambers up hurriedly and hugs $his knees<<if $activeSlave.belly >= 10000>> as best $he can with $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy <</if>>in the way<</if>>, spinning $himself around on the smooth surface so $his rear is pointing right at you. You stand up and pull $his over, $his $activeSlave.skin skin sliding across the cool glass desktop, until $his
+ lie down on your desk on $his side in the fetal position. $He clambers up hurriedly and hugs $his knees<<if $activeSlave.belly >= 10000>> as best $he can with $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy <</if>>in the way<</if>>, spinning $himself around on the smooth surface so $his rear is pointing right at you. You stand up and pull $him over, $his $activeSlave.skin skin sliding across the cool glass desktop, until $his
<<if canDoAnal($activeSlave) && canDoVaginal($activeSlave)>>
butt is right at the edge of the desk. You warm yourself up with a pussy fuck before shifting your attention to $his neglected asshole.
<<= BothVCheck(3)>>
@@ -11212,7 +11212,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
@@.lightcoral;$His enjoyment of pain has increased.@@
<<elseif random(1,100) > 50>>
<<set $activeSlave.fetishStrength = 65, $activeSlave.fetish = "masochist", $activeSlave.fetishKnown = 1>>
- Before $he realizes what's happening, @@.lightcoral;$he's getting aroused at the thought of <<= WrittenMaster()>> beating $him.@@
+ Before $he realizes what's happening, @@.lightcoral;$he's getting aroused at the thought of $his <<= WrittenMaster()>> beating $him.@@
<</if>>
<</replace>>
<</link>>
@@ -14172,10 +14172,10 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<set $activeSlave.trust -= 4, $activeSlave.devotion += 4>>
<</replace>>
<</link>><<if (($activeSlave.anus == 0) || ($activeSlave.vagina == 0)) && ($PC.dick == 1)>> //This option will take virginity//<</if>>
-<br><<link "Get the truth out of $his">>
+<br><<link "Get the truth out of $him">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You ask $his why $he's really here, with devastating directness and in a tone that will brook no disobedience. $He quails, $him shoulders slumping as $he
+ You ask $him why $he's really here, with devastating directness and in a tone that will brook no disobedience. $He quails, $his shoulders slumping as $he
<<if $activeSlave.belly >= 1500>>
<<if $activeSlave.pregKnown == 1>>
hugs $his pregnancy
@@ -15582,7 +15582,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<else>>
slides slowly inside $his tight cunt.
<</if>>
- As you fuck $him, you ask $his how succubi feed. "W-well," $he gasps, struggling to gather $his wits,
+ As you fuck $him, you ask $him how succubi feed. "W-well," $he gasps, struggling to gather $his wits,
<<else>>
<<if $activeSlave.belly >= 300000>>
leans onto $his _belly belly
@@ -16093,11 +16093,11 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<</if>>
$He spreads $his legs as wide as they'll go, and reaches down to spread $his buttocks even wider, offering you $his
<<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>>
- $his holes.
+ holes.
<<elseif canDoVaginal($activeSlave)>>
- $his pussy.
+ pussy.
<<else>>
- $his asshole.
+ asshole.
<</if>>
$He <<if $activeSlave.voice == 0>>tries to groan<<else>>groans<</if>> with anticipation of the coming relief as you slide <<if $PC.dick == 1>>your cock<<else>>a strap-on<</if>> past $his
<<if canDoVaginal($activeSlave)>>
@@ -16146,7 +16146,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<</if>>
$His cock is so long that it drags along the floor as you pound
<<if $activeSlave.belly >= 300000>>
- $his against $his _belly dome of a stomach.
+ $him against $his _belly dome of a stomach.
<<elseif $activeSlave.boobs > 12000>>
$him, $his enormous tits serving as a cushion for $his torso to rest against.
<<elseif $activeSlave.boobs > 7000>>
@@ -16159,7 +16159,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<br><br>
When you finally climax yourself, you stand, leaving $him writhing at your feet with $his huge soft cock positively pressurized. Considering the situation, you kneel down at $his side, deciding what to do. Stroking $him in a mockery of reassurance, you grab $his agonized member, producing a <<if $activeSlave.voice == 0>>gaping, silent scream<<else>>little shriek<</if>>.
<<if $activeSlave.toyHole == "dick" && ($PC.preg == 0 || $PC.vagina == 0)>>
- You maneuver the massive thing into your own <<if $PC.preg == 0 && $PC.vagina == 1>>pussy<<else>>asshole<</if>>, slide a finger in alongside the monstrous thing as $he <<if $activeSlave.voice == 0>>moans with expectation<<else>>begs abjectly to unleash $his<</if>>, and pop the elastic off. You get to watch $his face as $he floods your <<if $PC.preg == 0 && $PC.vagina == 1>>womanhood<<else>>bowels<</if>> with cum, your stomach taking on a distinctive swell as $his pentup load empties into you.
+ You maneuver the massive thing into your own <<if $PC.preg == 0 && $PC.vagina == 1>>pussy<<else>>asshole<</if>>, slide a finger in alongside the monstrous thing as $he <<if $activeSlave.voice == 0>>moans with expectation<<else>>begs abjectly to unleash $his<</if>>, and pop the elastic off. You get to watch $his face as $he floods your <<if $PC.preg == 0 && $PC.vagina == 1>>womanhood<<else>>bowels<</if>> with cum, your stomach taking on a distinctive swell as $his pent-up load empties into you.
<<set $activeSlave.penetrativeCount++, $penetrativeTotal++>>
<<if canImpreg($PC, $activeSlave)>>
<<= knockMeUp($PC, 50, 0, $activeSlave.ID)>>
@@ -16175,7 +16175,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<set $activeSlave.analCount++, $analTotal++>>
<</if>>
<</if>>
- The cum pressurization brought $his almost to half-hardness, and as this effect diminishes, $his dick slides out again, releasing a lewd torrent of cum. $He cries with overstimulation, relief, pain, and humiliation, @@.hotpink;groveling below you@@ in utter subjugation.
+ The cum pressurization brought $him almost to half-hardness, and as this effect diminishes, $his dick slides out again, releasing a lewd torrent of cum. $He cries with overstimulation, relief, pain, and humiliation, @@.hotpink;groveling below you@@ in utter subjugation.
<<set $activeSlave.devotion += 4>>
<</replace>>
<</link>><<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0)>>//This option will take virginity//<<elseif !canDoVaginal($activeSlave) && ($activeSlave.anus == 0)>> //This option will take anal virginity//<</if>>
@@ -16221,7 +16221,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<elseif $activeSlave.fetish == "pregnancy" && $activeSlave.pregKnown == 1>>
Being on the bottom for some missionary lovemaking is very much to $his tastes, even though $he is already pregnant. $He builds to orgasm slowly, reveling in the feeling of being your woman.
<<elseif $activeSlave.fetish == "pregnancy">>
- Being on the bottom for some missionary lovemaking is very much to $his tastes, even though the encounter isn't particularly likely to get $him pregnant. $He builds to orgasm slowly, reveling in the feeling of being your woman.
+ Being on the bottom for some missionary lovemaking is very much to $his tastes, even though the encounter isn't particularly likely to get $him pregnant. $He builds to orgasm slowly, reveling in the feeling of being your $woman.
<</if>>
As you made love to $him, the gentle motions, feminine sighs, and delicate aroma of pleasure woke the other girls in bed with you, and they began their own intimacy with each other. As you go back to sleep, you're surrounded with something very like Sapphic paradise. $activeSlave.slaveName nestles up to you once more, embracing you with @@.mediumaquamarine;trust born of love.@@
<<set $activeSlave.trust += 4, $activeSlave.vaginalCount++, $vaginalTotal++>>
@@ -16232,7 +16232,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<replace "#result">>
You feel your libido building, building, building within you, an endless cycle that mounts rapidly to an inevitable explosion. It comes, and you perform a catlike glide around until your head is at $his feet. As you did, you infiltrated one of your legs between $hers from its convenient starting point. $He wakes suddenly to the feeling of being manhandled, and then comes fully awake to the shockingly intimate sensation of your pussies pressed together as closely as physically possible.
<br><br>
- Holding $his upper thighs with your hands to pull $him against you, you grind into $him, fucking $him about as comprehensively as it's possible for someone without a cock to fuck a woman. $He's most definitely up for it, and you see $his eyes fly wide in the gloom as the full weight of the pleasure crashes into $him. It's not exactly a position for lovemaking, since your faces are about as far apart as they can possibly be during sex, but kissing be damned, you're here to fuck. Naturally, this evolution wakes everyone else up too, and before long, there's a regular lesbian orgy going on. When it's over, $activeSlave.slaveName finds $himself returning exhaustedly to sleep, one of your arms curled
+ Holding $his upper thighs with your hands to pull $him against you, you grind into $him, fucking $him about as comprehensively as it's possible for someone without a cock to fuck a $woman. $He's most definitely up for it, and you see $his eyes fly wide in the gloom as the full weight of the pleasure crashes into $him. It's not exactly a position for lovemaking, since your faces are about as far apart as they can possibly be during sex, but kissing be damned, you're here to fuck. Naturally, this evolution wakes everyone else up too, and before long, there's a regular lesbian orgy going on. When it's over, $activeSlave.slaveName finds $himself returning exhaustedly to sleep, one of your arms curled
<<if $activeSlave.belly >= 5000>>
under $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>>
<<else>>
@@ -16274,7 +16274,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<if $activeSlave.fetish == "boobs">>
$He orgasms strongly soon after the first jet of milk, producing an especially thick squirt.
<</if>>
- After you're satisfied, you move your hands to $his nipples and milk $him like a cow, getting the last drops of milk out of $his
+ After you're satisfied, you move your hands to $his nipples and milk $him like a cow, getting the last drops of milk out of $him
<<if $activeSlave.fetish == "boobs">>
and producing a shuddering series of aftershocks.
<<else>>
@@ -16291,9 +16291,9 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<replace "#result">>
You ask $him if $he really wants to be treated like a cow. $He nods, a bit hesitantly, sensing a certain danger but not really knowing what else to do. You lead $him to the utility area of the penthouse, where the milkers are, but stop $him when $he starts for one. Instead, you
<<if $activeSlave.belly >= 300000>>
- pull $his over $his _belly belly with $his udders hanging beneath $his<<if $activeSlave.boobs > 5000>>, the twin masses of female flesh almost reaching the floor<</if>>.
+ pull $him over $his _belly belly with $his udders hanging beneath $his<<if $activeSlave.boobs > 5000>>, the twin masses of female flesh almost reaching the floor<</if>>.
<<else>>
- fetch a pair of low stools, make $his kneel on one, and put $his hands on the other, so $he's on all fours with $his udders hanging beneath $his<<if $activeSlave.boobs > 5000>>, the twin masses of female flesh almost reaching the floor<</if>>.
+ fetch a pair of low stools, make $him kneel on one, and put $his hands on the other, so $he's on all fours with $his udders hanging beneath $his<<if $activeSlave.boobs > 5000>>, the twin masses of female flesh almost reaching the floor<</if>>.
<</if>>
<br><br>
You swing a bucket under $his nipples and milk $him by hand, as though $he were a cow. This isn't exactly what $he had in mind, but the feeling of your hands on $his nipples, tugging the streams of milk out of $him and into the bucket beneath <<if $activeSlave.fetish == "boobs">>brings $his very close to orgasm<<else>>eventually relaxes $his<</if>>. Seeing this, you muse aloud, as though to yourself, that a little farmyard bestiality wouldn't hurt, since there's no one here but you and a dairy cow. Pawing the cow's behind possessively, you finger $him aggressively before deciding on
@@ -16596,7 +16596,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<link "Hug $him">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You reach out to hug $him, but as soon as your hand touches $his shoulder, $he writhes instinctively away. <<if canSee($activeSlave)>>$His eyes fly open, searching frantically for $his assailant. Seeing that it's you, $he screams and scrabbles away even harder. After making it a few feet, $he collects $his wits enough to bring $himself to a stop and stop screaming, though $he continues to sob, staring at you in terror<<else>>$He gropes frantically for $his assailant, before making contact with you. $He screams and scrabbles away, only stopping when $he collides with the nearest solid object. <<if canHear($activeSlave)>>Only after several call outs that it is you does $he stop screaming, though $he continues to sob, listening to your every breath in terror<<else>>After screaming $himself horase, $he realizes that $his assault has abruptly ended, and gently feels around $his surroundings with a shaking hand to discover $himself back in $his room<</if>><</if>>. $He remains frozen in place as you slowly advance on $him and give $him a light embrace. $His tears gradually stop, but $he does not relax, <<if canSee($activeSlave)>>remaining dumbly stiff<<else>>continuing to quake in fear<</if>> within your arms. Eventually you let $him go, and $he crawls pathetically back under $his sheet, still weeping softly. It seems $he is @@.gold;more afraid of you@@ than ever, and if you thought that a simple hug could win $him over, you were wrong.
+ You reach out to hug $him, but as soon as your hand touches $his shoulder, $he writhes instinctively away. <<if canSee($activeSlave)>>$His eyes fly open, searching frantically for $his assailant. Seeing that it's you, $he screams and scrabbles away even harder. After making it a few feet, $he collects $his wits enough to bring $himself to a stop and stop screaming, though $he continues to sob, staring at you in terror<<else>>$He gropes frantically for $his assailant, before making contact with you. $He screams and scrabbles away, only stopping when $he collides with the nearest solid object. <<if canHear($activeSlave)>>Only after several call outs that it is you does $he stop screaming, though $he continues to sob, listening to your every breath in terror<<else>>After screaming $himself hoarse, $he realizes that $his assault has abruptly ended, and gently feels around $his surroundings with a shaking hand to discover $himself back in $his room<</if>><</if>>. $He remains frozen in place as you slowly advance on $him and give $him a light embrace. $His tears gradually stop, but $he does not relax, <<if canSee($activeSlave)>>remaining dumbly stiff<<else>>continuing to quake in fear<</if>> within your arms. Eventually you let $him go, and $he crawls pathetically back under $his sheet, still weeping softly. It seems $he is @@.gold;more afraid of you@@ than ever, and if you thought that a simple hug could win $him over, you were wrong.
<<if canSee($activeSlave)>>
<<set $activeSlave.trust -= 4>>
<<elseif canHear($activeSlave)>>
@@ -16750,7 +16750,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<set _carried = 0>>
<<elseif $activeSlave.dick > 30>>
<<if $arcologies[0].FSPhysicalIdealist != "unset">>
- $His hanging dick adds tremendously to $his weight and touches the floor, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $his some distance.
+ $His hanging dick adds tremendously to $his weight and touches the floor, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $him some distance.
<<else>>
$His hanging dick adds tremendously to $his weight and touches the floor, preventing you from really carrying $him very far.
<<set _carried = 0>>
@@ -16758,14 +16758,14 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<elseif $activeSlave.belly >= 100000>>
<<if $activeSlave.bellyPreg > 3000>>
<<if $arcologies[0].FSPhysicalIdealist != "unset">>
- $His pregnancy is truly gigantic, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $his some distance.
+ $His pregnancy is truly gigantic, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $him some distance.
<<else>>
$His pregnancy is truly gigantic and a little too big for you to safely carry without the risk of dropping, quickly forcing you to lower $him.
<<set _carried = 0>>
<</if>>
<<else>>
<<if $arcologies[0].FSPhysicalIdealist != "unset">>
- $His _belly belly is truly gigantic, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $his some distance.
+ $His _belly belly is truly gigantic, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $him some distance.
<<else>>
$His _belly belly is truly an armful and a little to heavy for you to carry, quickly forcing you to lower $him.
<<set _carried = 0>>
@@ -16774,7 +16774,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<elseif $activeSlave.boobs > 25000>>
$His enormous boobs
<<if $arcologies[0].FSPhysicalIdealist != "unset">>
- add tremendously to $his weight and are awkward to manage, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $his some distance.
+ add tremendously to $his weight and are awkward to manage, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $him some distance.
<<else>>
add tremendously to $his weight and are awkward to manage, quickly forcing you to lower $him.
<<set _carried = 0>>
@@ -16782,7 +16782,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<elseif $activeSlave.weight > 130>>
$He's a
<<if $arcologies[0].FSPhysicalIdealist != "unset">>
- fatty, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $his some distance.
+ fatty, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $him some distance.
<<else>>
fatty and a little too big and heavy for you to hold for long.
<<set _carried = 0>>
@@ -16790,35 +16790,35 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<elseif $activeSlave.balls > 100>>
$His enormous balls
<<if $arcologies[0].FSPhysicalIdealist != "unset">>
- add tremendously to $his weight and dangle ponderously, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $his some distance, even though you have to step awkwardly to avoid kneeing $his sensitive sack.
+ add tremendously to $his weight and dangle ponderously, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $him some distance, even though you have to step awkwardly to avoid kneeing $his sensitive sack.
<<else>>
add tremendously to $his weight and dangle ponderously, quickly forcing you to lower $him or risk accidentally kneeing the sensitive sack.
<<set _carried = 0>>
<</if>>
<<elseif $activeSlave.dick > 20>>
- $His dangling cock adds tremendously to $his weight and is awkward to walk with, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $his some distance.
+ $His dangling cock adds tremendously to $his weight and is awkward to walk with, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $him some distance.
<<elseif $activeSlave.butt > 18>>
$His expansive ass
<<if $arcologies[0].FSPhysicalIdealist != "unset">>
- adds tremendously to $his weight and is awkward to handle, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $his some distance.
+ adds tremendously to $his weight and is awkward to handle, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $him some distance.
<<else>>
adds tremendously to $his weight and is awkward to handle, quickly forcing you to lower $him.
<<set _carried = 0>>
<</if>>
<<elseif $activeSlave.boobs > 8000>>
- $His boobs add tremendously to $his weight, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $his some distance.
+ $His boobs add tremendously to $his weight, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $him some distance.
<<elseif $activeSlave.weight > 95>>
- $He's got some extra weight on $him, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $his some distance.
+ $He's got some extra weight on $him, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $him some distance.
<<elseif $activeSlave.height > 180>>
- $He's a big $girl, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $his some distance.
+ $He's a big $girl, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $him some distance.
<<elseif $activeSlave.weight > 30>>
- $He's a chubby $girl, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $his some distance.
+ $He's a chubby $girl, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $him some distance.
<<elseif $activeSlave.bellyPreg >= 10000>>
- $He's heavily pregnant, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $his some distance.
+ $He's heavily pregnant, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $him some distance.
<<elseif $activeSlave.bellyImplant >= 10000>>
- $His belly is greatly laden with inert filler, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $his some distance.
+ $His belly is greatly laden with inert filler, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $him some distance.
<<elseif $activeSlave.bellyFluid >= 10000>>
- $His belly is greatly laden with <<print $activeSlave.inflationType>>, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $his some distance.
+ $His belly is greatly laden with <<print $activeSlave.inflationType>>, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $him some distance.
<<elseif $activeSlave.height > 160>>
$He's no little $girl, but you're <<if $PC.title == 1>>strong<<else>>fit<</if>> enough to carry $him.
<<elseif $activeSlave.weight > 10>>
@@ -16987,7 +16987,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<set $activeSlave.trust += 4, $activeSlave.oralCount++, $oralTotal++>>
<</replace>>
<</link>>
-<br><<link "Dance along with $his">>
+<br><<link "Dance along with $him">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
$He doesn't <<if canSee($activeSlave)>>see<<else>>notice<</if>> you advance on $him; $he's facing away from you, and in any case, $he's lost in $his own little world. At the same moment, however, $he begins to hear the track $he's humming, in perfect synchrony with the way $he's humming it, and senses a presence at $his side. You timed it perfectly, directing the sound system here to play the right track, match it to $him, and fade it in as you approached and began to dance beside $him.
@@ -17215,7 +17215,11 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<br><<link "Enslave them all">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
+<<<<<<< HEAD
You seize a tablet and hurry out of your office, working furiously and using every feature of $assistantName to the utmost. These bitches have offended you, and you quickly frame the structure of an appropriate revenge. By the time you get to where $activeSlave.slaveName is still being heckled by spoiled, drunken harpies, everyone else present in that arcology hall has mysteriously received urgent messages and gone elsewhere. $activeSlave.slaveName <<if canSee($activeSlave)>>sees you approach, and stares at you<<else>>recognizes your dominant footsteps approaching, and turns to face you<</if>>, $his sudden intense look alerting your vile little guests to your presence. One of them attempts to frame an insult for the interloper, but one of her friends pokes her in the side and whispers something in her ear and she goes silent, staring at you with wide eyes.
+=======
+ You seize a tablet and hurry out of your office, working furiously and using every feature of $assistantName to the utmost. These bitches have offended you, and you quickly frame the structure of an appropriate revenge. By the time you get to where $activeSlave.slaveName is still being heckled by spoiled, drunken harpies, everyone else present in that arcology hall has mysteriously received urgent messages and gone elsewhere. $activeSlave.slaveName <<if canSee($activeSlave)>>sees you approach, and stares at you<<else>>recognizes your dominant footsteps approaching, and turns to face you<</if>>, $his sudden intense look alerting your vile little guests to your presence. One of them attempts to frame an insult for the interloper, but one of her friends pokes her in the side and whispers something in her ear, and she goes silent, staring at you with wide eyes.
+>>>>>>> 79ad62ff4ecf42ba2aeaf35e1877f339623376b6
<<if $PC.title != 1>>She then winces, visibly realizing that you're likely aware that she called $activeSlave.slaveName's owner $his Master. Somehow, the mistake seems important to her now that you're standing here, effortlessly dominating the space for all your femininity.<</if>>
<br><br>
You hold the tablet out to them wordlessly. It's displaying security footage of the three of them, boarding a public VTOL transport for another arcology nearby. The prominent timestamp is thirty minutes in the future. The scene changes, showing them partying in one of that arcology's nightclubs. You clear your throat, dragging their attention away from the counterfeited footage, and describe in detail the other evidence - tickets, identification checks, biometrics - that will prove they left your arcology and visited two others before regrettably disappearing. One of them tries, with utter predictability, to threaten you with her father, but you tell her bluntly that if he does make the effort, he'll be looking in the wrong place.
@@ -17232,7 +17236,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<</if>>
<<set $fixedNationality = "American">>
<<include "Generate New Slave">>
- <<set _origin = "You enslaved her for abusing " + $eventSlave.slaveName + " while $he was serving the public.">>
+ <<set _origin = "You enslaved her for abusing " + $eventSlave.slaveName + " while she was serving the public.">>
<<set $activeSlave.origin = _origin>>
<<set $activeSlave.career = "a student">>
<<set $activeSlave.markings = "none", $activeSlave.weight = -20>>
@@ -17254,7 +17258,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<set $activeSlave.health = random(30,50)>>
<<set $activeSlave.attrXY = random(60,90)>>
<<set $activeSlave.attrXX = random(10,20)>>
- <<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
+ <<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy")>>
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</for>>
<br><br><span id="result2">
@@ -17329,7 +17333,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<link "Give them a surprise massage">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You move stealthily up behind $him in a predatory crouch, your arms forward and your fingers spread. When $he reaches up to <<if $activeSlave.makeup != 0>>do $his eyes<<else>>massage $his forehead<</if>>, you take advantage of $his newly vulnerable flanks and reach around $him to take $his torpedo tits in hand. $He <<if $activeSlave.voice != 0>>howls<<else>>makes the raspy noise that mute slaves make when<</if>> in shock, writhing away from the grasping digits. Your hands aren't particularly cold, but $he's deliciously warm from the shower and you're holding onto $his firmly. $His
+ You move stealthily up behind $him in a predatory crouch, your arms forward and your fingers spread. When $he reaches up to <<if $activeSlave.makeup != 0>>do $his eyes<<else>>massage $his forehead<</if>>, you take advantage of $his newly vulnerable flanks and reach around $him to take $his torpedo tits in hand. $He <<if $activeSlave.voice != 0>>howls<<else>>makes the raspy noise that mute slaves make when<</if>> in shock, writhing away from the grasping digits. Your hands aren't particularly cold, but $he's deliciously warm from the shower and you're holding onto $him firmly. $His
<<if $activeSlave.butt > 12>>
titanic ass
<<elseif $activeSlave.butt > 5>>
@@ -17476,12 +17480,12 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<set $activeSlave.health -= 20>>
<<if ($arcologies[0].FSSubjugationistRace == "white")>>
<<set $activeSlave.race = "white">>
- <<set $activeSlave.skin = either("pale", "light", "fair")>>
+ <<set $activeSlave.skin = either("fair", "light", "pale")>>
<<set $activeSlave.eyeColor = either("blue", "brown", "green")>>
- <<set $activeSlave.hColor = either("black", "blonde", "red", "brown")>>
+ <<set $activeSlave.hColor = either("black", "blonde", "brown", "red")>>
<<elseif ($arcologies[0].FSSubjugationistRace == "latina")>>
<<set $activeSlave.race = "latina">>
- <<set $activeSlave.skin = either("light olive", "brown", "dark brown", "tanned", "dark olive")>>
+ <<set $activeSlave.skin = either("brown", "dark brown", "dark olive", "light olive", "tanned")>>
<<set $activeSlave.hColor = either("black", "black", "brown", "brown")>>
<<elseif ($arcologies[0].FSSubjugationistRace == "black")>>
<<set $activeSlave.race = "black">>
@@ -17489,11 +17493,11 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<set $activeSlave.hColor = either("black", "black", "black", "brown")>>
<<elseif ($arcologies[0].FSSubjugationistRace == "asian")>>
<<set $activeSlave.race = "asian">>
- <<set $activeSlave.skin = either("light olive", "dark olive", "light")>>
+ <<set $activeSlave.skin = either("dark olive", "light olive", "light")>>
<<set $activeSlave.hColor = either("black")>>
<<elseif ($arcologies[0].FSSubjugationistRace == "middle eastern")>>
<<set $activeSlave.race = "middle eastern">>
- <<set $activeSlave.skin = either("tanned", "dark olive", "light olive")>>
+ <<set $activeSlave.skin = either("dark olive", "light olive", "tanned")>>
<<set $activeSlave.hColor = "black">>
<<elseif ($arcologies[0].FSSubjugationistRace == "indo-aryan")>>
<<set $activeSlave.race = "indo-aryan">>
@@ -17501,7 +17505,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<set $activeSlave.hColor = "black">>
<<elseif ($arcologies[0].FSSubjugationistRace == "amerindian")>>
<<set $activeSlave.race = "amerindian">>
- <<set $activeSlave.skin = either("tanned", "dark", "light")>>
+ <<set $activeSlave.skin = either("dark", "light", "tanned")>>
<<set $activeSlave.hColor = either("black")>>
<<elseif ($arcologies[0].FSSubjugationistRace == "pacific islander")>>
<<set $activeSlave.race = "pacific islander">>
@@ -17509,15 +17513,15 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<set $activeSlave.hColor = either("black")>>
<<elseif ($arcologies[0].FSSubjugationistRace == "malay")>>
<<set $activeSlave.race = "malay">>
- <<set $activeSlave.skin = either("light", "light olive", "dark olive")>>
+ <<set $activeSlave.skin = either("dark olive", "light olive", "light")>>
<<set $activeSlave.hColor = either("black")>>
<<elseif ($arcologies[0].FSSubjugationistRace == "southern european")>>
<<set $activeSlave.race = "southern european">>
- <<set $activeSlave.skin = either("light", "dark olive", "light olive")>>
+ <<set $activeSlave.skin = either("dark olive", "light olive", "light")>>
<<set $activeSlave.hColor = either("black")>>
<<elseif ($arcologies[0].FSSubjugationistRace == "semitic")>>
<<set $activeSlave.race = "semitic">>
- <<set $activeSlave.skin = either("tanned", "dark olive", "light olive")>>
+ <<set $activeSlave.skin = either("dark olive", "light olive", "tanned")>>
<<set $activeSlave.hColor = either("black")>>
<<elseif ($arcologies[0].FSSubjugationistRace == "mixed race")>>
<<set $activeSlave.race = "mixed race">>
@@ -17819,7 +17823,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<link "Make love to $his ready cunt">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- $His body is so perfectly made to be fucked that it's getting itself ready for you, without your even having to give the order. Deciding not to bother with verbal commands, you approach $him and reach for one of $his hands; $he obediently extends it towards your grasp, and follows <<if ($activeSlave.energy > 40) || ($activeSlave.aphrodisiacs > 0) || $activeSlave.inflationType == "aphrodisiac">>eagerly<<else>>willingly<</if>> as you pull $his in for a hug
+ $His body is so perfectly made to be fucked that it's getting itself ready for you, without your even having to give the order. Deciding not to bother with verbal commands, you approach $him and reach for one of $his hands; $he obediently extends it towards your grasp, and follows <<if ($activeSlave.energy > 40) || ($activeSlave.aphrodisiacs > 0) || $activeSlave.inflationType == "aphrodisiac">>eagerly<<else>>willingly<</if>> as you pull $him in for a hug
<<if $activeSlave.boobs > 5000>>
hug (cushioned by $his enormous udders),
<<elseif $activeSlave.belly >= 10000>>
@@ -18319,7 +18323,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<set $activeSlave.devotion += 5>>
<</replace>>
<</link>>
-<br><<link "Play with $his">>
+<br><<link "Play with $him">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
You're not a slave, so you can't understand $his inner workings through direct empathy. But in your experience, a quick orgasm never fails to make a good day better. You're not slow, and of course you know where $he's going, so you catch up to $him on quiet feet and
@@ -19289,7 +19293,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<replace "#result">>
You linger in the hallway a while with $activeSlave.slaveName and enjoy a brief but verbose discussion. It's clear $he hasn't had the chance to engage in any meaningful conversations in a while, so $he relishes the opportunity energetically.
<br><br>
- Though the two of you only touch upon a handful of sophisticated topics, by the time you leave $him to tend to other matters, $activeSlave.slaveName is beaming happily as $he continues on to $his duties for the day. $He @@.mediumaquamarine;trusts you more@@ for taking the time to engage with $his intellectually.
+ Though the two of you only touch upon a handful of sophisticated topics, by the time you leave $him to tend to other matters, $activeSlave.slaveName is beaming happily as $he continues on to $his duties for the day. $He @@.mediumaquamarine;trusts you more@@ for taking the time to engage with $him intellectually.
<<set $activeSlave.trust += 4>>
<</replace>>
<</link>>
@@ -19790,7 +19794,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<</link>>
<</if>>
<<if canDoAnal($activeSlave) || canDoVaginal($activeSlave) || $activeSlave.belly >= 300000>>
-<br><<link "Use $his as an exercise ball">>
+<br><<link "Use $him as an exercise ball">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
<<if $activeSlave.belly >= 3000000>>
@@ -19847,7 +19851,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<link "Give $him a nice massage">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You sit on the couch next to your desk and pat your thighs. $He smiles and comes over, lowering $himself <<if $PC.dick == 0>>into your lap<<else>>onto your member<<if $PC.vagina == 1>> and sliding a hand down to see to your pussy<</if>><</if>> without hesitation. You help $his get comfortable and instead of <<if $PC.dick == 0>>grinding<<else>>thrusting<</if>> or telling $him to ride, you just sit there with $his in your lap, gently massaging $his <<if $activeSlave.boobs < 900>>big <<else>>huge <</if>> tits. Despite their fine craftsmanship, implants are prone to rendering breasts sore, so $he's soon groaning with relief at the attention you lavish upon them. You finally manage to bring $him to orgasm with almost nothing but delicate stimulation of $his nipples, despite $his implants making them less sensitive than usual. @@.mediumaquamarine;$He has become more trusting of you.@@
+ You sit on the couch next to your desk and pat your thighs. $He smiles and comes over, lowering $himself <<if $PC.dick == 0>>into your lap<<else>>onto your member<<if $PC.vagina == 1>> and sliding a hand down to see to your pussy<</if>><</if>> without hesitation. You help $him get comfortable and instead of <<if $PC.dick == 0>>grinding<<else>>thrusting<</if>> or telling $him to ride, you just sit there with $him in your lap, gently massaging $his <<if $activeSlave.boobs < 900>>big <<else>>huge <</if>> tits. Despite their fine craftsmanship, implants are prone to rendering breasts sore, so $he's soon groaning with relief at the attention you lavish upon them. You finally manage to bring $him to orgasm with almost nothing but delicate stimulation of $his nipples, despite $his implants making them less sensitive than usual. @@.mediumaquamarine;$He has become more trusting of you.@@
<<set $activeSlave.trust += 4>>
<</replace>>
<</link>>
@@ -19880,7 +19884,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>>
Even a switch to $his ass does little to slow your thrusts, and so $his breasts continue to rest impassively on $his chest as their owner is buttfucked senseless.
<</if>>
- You finish with a particularly hard thrust <<if $PC.dick == 0>>and shake with climax<<else>>to spill your seed deep inside $his<</if>>, ramming forward hard enough to knock $him down to the floor. As you rise, $his discomfited form is a pretty sight, with $his perfectly rounded breasts
+ You finish with a particularly hard thrust <<if $PC.dick == 0>>and shake with climax<<else>>to spill your seed deep inside $him<</if>>, ramming forward hard enough to knock $him down to the floor. As you rise, $his discomfited form is a pretty sight, with $his perfectly rounded breasts
<<if $activeSlave.belly >= 300000>>
neatly stack on top each other
<<else>>
@@ -19893,7 +19897,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<</link>><<if ($activeSlave.anus == 0 && canDoAnal($activeSlave)) || ($activeSlave.vagina == 0 && canDoVaginal($activeSlave))>> //This option will take virginity//<</if>>
<</if>>
<<if canDoAnal($activeSlave) || canDoVaginal($activeSlave)>>
-<br><<link "Show $his off in public">>
+<br><<link "Show $him off in public">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
You bring $his out onto the promenade, still nude, $his impressively augmented breasts attracting open stares with their perfect roundness and perkiness.
diff --git a/src/uncategorized/RESSTR.tw b/src/uncategorized/RESSTR.tw
index 75b19232503d838d288a73c05ca57f54fdc35975..796b9e90c7d1bfaad2ed005195570cd15d87221b 100644
--- a/src/uncategorized/RESSTR.tw
+++ b/src/uncategorized/RESSTR.tw
@@ -39,7 +39,7 @@
<</if>>
<<else>>
-<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Next Week">>
+ <<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Next Week">>
/* 000-250-006 */
<<if $seeImages == 1>>
@@ -51,27 +51,27 @@
<</if>>
/* 000-250-006 */
-<<set $desc = SlaveTitle($activeSlave)>>
-<<run Enunciate($activeSlave)>>
+ <<set $desc = SlaveTitle($activeSlave)>>
+ <<run Enunciate($activeSlave)>>
-<<switch $RESSTRevent>>
+ <<switch $RESSTRevent>>
-<<default>>
- <br>ERROR: bad RESSTR event $RESSTRevent
-<</switch>>
+ <<default>>
+ <br>ERROR: bad RESSTR event $RESSTRevent
+ <</switch>>
-<br><br>
-<span id="result">
-<<switch $RESSTRevent>>
+ <br><br>
+ <span id="result">
+ <<switch $RESSTRevent>>
-<<default>>
- <br>ERROR: bad RESSTR event $RESSTRevent
-<</switch>>
+ <<default>>
+ <br>ERROR: bad RESSTR event $RESSTRevent
+ <</switch>>
-<<if $cheatMode == 1>>
- <br><br>DEBUG: [[Go back to Nonrandom Event|Nonrandom Event][$activeSlave = 0, $eventSlave = 0]]
-<</if>>
+ <<if $cheatMode == 1>>
+ <br><br>DEBUG: [[Go back to Nonrandom Event|Nonrandom Event][$activeSlave = 0, $eventSlave = 0]]
+ <</if>>
-</span>
+ </span>
<</if>> /* CLOSES EVENT SELECTION */
diff --git a/src/uncategorized/cellblock.tw b/src/uncategorized/cellblock.tw
index f8eedd24c715d2c900b739c59a0c1b75a3de3137..a34fd44e292b0fea6e4b0bf53de443e2c680b293 100644
--- a/src/uncategorized/cellblock.tw
+++ b/src/uncategorized/cellblock.tw
@@ -2,6 +2,10 @@
<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Cellblock", $showEncyclopedia = 1, $encyclopedia = "Cellblock", $cellblockSlaves = $CellBiIDs.length>>
+<<if $Wardeness != 0>>
+ <<setLocalPronouns $Wardeness>>
+<</if>>
+
<<if $cellblockName != "the Cellblock">>
<<set $cellblockNameCaps = $cellblockName.replace("the ", "The ")>>
<</if>>
diff --git a/src/uncategorized/discardConfirm.tw b/src/uncategorized/discardConfirm.tw
index 0d2780f4ae744cae6af0103c9b7ebb20197d5bed..5243c52d3155f4b54357278d0d9d6a98cd4b4a1a 100644
--- a/src/uncategorized/discardConfirm.tw
+++ b/src/uncategorized/discardConfirm.tw
@@ -1,5 +1,5 @@
:: Discard Confirm [nobr]
-
+
This will permanently remove $activeSlave.slaveName from the game, and you will not receive any money for $him. This is primarily intended as a way to rid yourself of bugged slaves. Are you certain?
<br><br>
diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw
index e1261d48b8b7463887a2577f340503bbbbb0489e..efaed8ec2228c2f9dde540c75a24968fc6298fde 100644
--- a/src/uncategorized/economics.tw
+++ b/src/uncategorized/economics.tw
@@ -16,16 +16,9 @@
<br><br>
<<if $useTabs == 0>>
-<<include "Neighbors Development">>
+ <<include "Neighbors Development">>
-<br><br>
-
-<<include "Arcology Management">>
-
-<<if $FSAnnounced > 0>>
<br><br>
- <<include "FS Developments">>
-<</if>>
<<if $corpAnnounced == 1>>
<br><br>
@@ -36,7 +29,6 @@
<<else>>
<<include "Corporation Developments">>
<</if>>
-<</if>>
<<if $secExp == 1>>
<br><br>
@@ -45,13 +37,18 @@
<<include "securityReport">>
<</if>>
-<br><br>
+ <<if $secExp == 1>>
+ <br><br>
+ <<include "authorityReport">>
+ <br><br>
+ <<include "securityReport">>
+ <</if>>
-<<include "Reputation">>
+ <br><br>
-<br><br>
+ <<include "Reputation">>
-<<include "Personal Business">>
+ <br><br>
<<if ($PC.boobs == 1 && $PC.boobsBonus > 0) || $PC.pregKnown == 1 || $playerAging != 0>>
<br><br>
@@ -78,7 +75,8 @@
<button class="tablinks" onclick="opentab(event, 'Reputation')">Reputation</button>
<button class="tablinks" onclick="opentab(event, 'Business')">Personal Business</button>
<<if ($PC.boobs == 1 && $PC.boobsBonus > 0) || $PC.pregKnown == 1 || $playerAging != 0>>
- <button class="tablinks" onclick="opentab(event, 'Personal')">Personal Notes</button>
+ <br><br>
+ <<include "Personal Notes">>
<</if>>
</div>
@@ -89,9 +87,9 @@
</div>
<div id="Management" class="tabcontent">
-<div class="content">
-<<include "Arcology Management">>
-</div>
+ <div class="content">
+ <<include "Arcology Management">>
+ </div>
</div>
<<if $FSAnnounced > 0>>
diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw
index 66267d422cf36fe3b71184b0f41b3d429ade3fc9..1a707ddf6168169a550c0745e99d6e1c1eb42357 100644
--- a/src/uncategorized/fsDevelopments.tw
+++ b/src/uncategorized/fsDevelopments.tw
@@ -7,8 +7,8 @@
[6000,9000,12000,15000],
[6000,9000,12000,15000,18000],
[6000,9000,12000,15000,17000,19000]]>>
-<<set _FSRepDescriptors = ["solid","high","remarkable","great","excellent","unparalleled"]>>
-<<set _ordinalNames = ["second","third","fourth","fifth","sixth","seventh"]>>
+<<set _FSRepDescriptors = ["solid", "high", "remarkable", "great", "excellent", "unparalleled"]>>
+<<set _ordinalNames = ["second", "third", "fourth", "fifth", "sixth", "seventh"]>>
<<if $FSCredits > 0>>
@@.yellow;$arcologies[0].name's society is ready to begin accepting a new societal direction.@@
<</if>>
diff --git a/src/uncategorized/growthResearchInstitute.tw b/src/uncategorized/growthResearchInstitute.tw
index ddd3764868934c1ed1d87f2523a495f5cd934144..cead9b5cfa20355ad8d5acd2449d1984a76d0c4f 100644
--- a/src/uncategorized/growthResearchInstitute.tw
+++ b/src/uncategorized/growthResearchInstitute.tw
@@ -35,7 +35,6 @@
//You lack the necessary funds to buy this slave.//
<</if>>
<br>[["Decline to purchase " + $him + " and check out another slave"|Growth Research Institute][$slavesSeen += 1]]
-
<<if $newSlaves.length > 0>>
<br>[[Finish your order of slaves|Bulk Slave Intro]]
<</if>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 2e96c590150ac80a192230df59fd528926d16910..7d15b8e578b07f83f326fb0d2b7b8336c11bf29b 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1147,7 +1147,7 @@ is
<<if $activeSlave.fuckdoll == 0>>
<<if $showBodyMods == 1>>
- <<if ["neck", "left cheek", "right cheek", "cheeks", "left ears", "right ears", "ears"].includes($activeSlave.brandLocation)>>
+ <<if ["cheeks", "ears", "left cheek", "left ears", "neck", "right cheek", "right ears"].includes($activeSlave.brandLocation)>>
<<brandDescription>>
<</if>>
<</if>>
@@ -1704,19 +1704,19 @@ and
<<if $arcologies[0].FSHedonisticDecadence != "unset">>
<<print either("perfectly curvy", "perfectly plush")>>.
<<else>>
- @@.red;<<print either("dangerously overweight", "extremely obese", "dangerously fat")>>.@@
+ @@.red;<<print either("dangerously fat", "dangerously overweight", "extremely obese")>>.@@
<</if>>
<<elseif $activeSlave.weight > 160 >>
<<if $arcologies[0].FSHedonisticDecadence != "unset">>
<<print either("spectacularly curvy", "spectacularly plush")>>.
<<else>>
- @@.red;<<print either("extremely overweight", "very obese", "extremely fat")>>.@@
+ @@.red;<<print either("extremely fat", "extremely overweight", "very obese")>>.@@
<</if>>
<<elseif $activeSlave.weight > 130 >>
<<if $arcologies[0].FSHedonisticDecadence != "unset">>
<<print either("amazingly curvy", "amazingly plush")>>.
<<else>>
- @@.red;<<print either("very overweight", "obese", "very fat")>>.@@
+ @@.red;<<print either("obese", "very fat", "very overweight")>>.@@
<</if>>
<<elseif $activeSlave.weight > 95>>
<<if $activeSlave.hips > 1>>
@@ -1724,7 +1724,7 @@ and
<<elseif $arcologies[0].FSHedonisticDecadence != "unset">>
<<print either("extremely curvy", "extremely plush")>>.
<<else>>
- @@.red;<<print either("overweight", "carrying a lot of extra weight", "fat")>>.@@
+ @@.red;<<print either("carrying a lot of extra weight", "fat", "overweight")>>.@@
<</if>>
<<elseif $activeSlave.weight > 30>>
<<if $activeSlave.hips > 1>>
@@ -1732,20 +1732,20 @@ and
<<elseif $arcologies[0].FSHedonisticDecadence != "unset">>
<<print either("quite curvy", "very plush")>>.
<<else>>
- @@.red;<<print either("chubby", "carrying extra weight")>>.@@
+ @@.red;<<print either("carrying extra weight", "chubby")>>.@@
<</if>>
-<<elseif $activeSlave.weight > 10 >><<print either("pleasingly curvy", "nicely plush")>>.
-<<elseif $activeSlave.weight >= -10>><<print either("a healthy weight", "neither too fat nor too skinny", "an attractive weight for $his frame")>>.
-<<elseif $activeSlave.weight >= -30>><<print either("pleasingly thin", "appealingly skinny")>>.
+<<elseif $activeSlave.weight > 10 >><<print either("nicely plush", "pleasingly curvy")>>.
+<<elseif $activeSlave.weight >= -10>><<print either("a healthy weight", "an attractive weight for $his frame", "neither too fat nor too skinny")>>.
+<<elseif $activeSlave.weight >= -30>><<print either("appealingly skinny", "pleasingly thin")>>.
<<elseif $activeSlave.weight >= -95>>
<<if $activeSlave.hips > 1>>
- <<print either("very thin", "quite skinny")>>, but $his wide hips make the gap between $his thighs very noticeable.
+ <<print either("quite skinny", "very thin")>>, but $his wide hips make the gap between $his thighs very noticeable.
<<elseif $activeSlave.hips < -1>>
- <<print either("very thin", "quite skinny")>>, but $his trim hips make $his look like a model.
+ <<print either("quite skinny", "very thin")>>, but $his trim hips make $his look like a model.
<<else>>
- @@.red;<<print either("rail thin", "underweight", "too skinny")>>.@@
+ @@.red;<<print either("rail thin", "too skinny", "underweight")>>.@@
<</if>>
-<<else>>@@.red;<<print either("emaciated", "dangerously skinny")>>.@@
+<<else>>@@.red;<<print either("dangerously skinny", "emaciated")>>.@@
<</if>>
<<if $activeSlave.hips > 2>>
@@ -1943,7 +1943,7 @@ $He is
<<if $activeSlave.fuckdoll == 0>>
<<if $showBodyMods == 1>>
/* Check it's not a facial brand: */
- <<if ["back", "lower back", "chest", "right shoulder", "left shoulder", "shoulders", "right upper arm", "left upper arm", "upper arms", "right lower arm", "left lower arm", "lower arms", "right wrist", "left wrist", "wrists", "right hand", "left hand", "hands", "left ankle", "right ankle", "ankles", "right calf", "left calf", "calves", "right foot", "left foot", "feet"].includes($activeSlave.brandLocation)>>
+ <<if ["ankles", "back", "calves", "chest", "feet", "hands", "left ankle", "left calf", "left foot", "left hand", "left lower arm", "left shoulder", "left upper arm", "left wrist", "lower arms", "lower back", "right ankle", "right calf", "right foot", "right hand", "right lower arm", "right shoulder", "right upper arm", "right wrist", "shoulders", "upper arms", "wrists"].includes($activeSlave.brandLocation)>>
<<brandDescription>>
<</if>>
<</if>>
diff --git a/src/uncategorized/manufacturing.tw b/src/uncategorized/manufacturing.tw
index 7a6ab7be92407a1f64a3ab3ef19a200f5d7e42f2..6ea655497a30d11c79e6453df4437223f372bcf5 100644
--- a/src/uncategorized/manufacturing.tw
+++ b/src/uncategorized/manufacturing.tw
@@ -16,7 +16,7 @@ This is a space in the arcology's service areas,
<<if $sectors[$AS].type == "Sweatshops">>
<<if $menials > 0>>
<br><br>
- You own <<print commaNum($menials)>> menial slaves. All your sweatshops together can use only <<print $Sweatshops*500>>,
+ You own <<print commaNum($menials)>> menial slaves. All your sweatshops together can use only <<print $Sweatshops*500>>,
<<if $menials > $Sweatshops*500>>
the remainder is assigned to various odd-jobs in the arcology.
<<elseif $menials == $Sweatshops*500>>
diff --git a/src/uncategorized/marketsReport.tw b/src/uncategorized/marketsReport.tw
index 9133b1261e7501f0a93166f730022e8ea6ba1e14..042ed6ce76bc0bbaec94f07cc2c6ffd9169c58f9 100644
--- a/src/uncategorized/marketsReport.tw
+++ b/src/uncategorized/marketsReport.tw
@@ -2,8 +2,8 @@
//FC Markets Report://
-<<set _assetAffected = either("general", "slaves", "entrapment", "capture", "training", "surgical", "drugs")>>
-<<set _assetDirection = either("up", "down")>>
+<<set _assetAffected = either("capture", "drugs", "entrapment", "general", "slaves", "surgical", "training")>>
+<<set _assetDirection = either("down", "up")>>
<<if _assetAffected == "general">>
<<if _assetDirection == "up">>
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 2d3e9c1c5825fc742f0f3a0e772736d24ef7b3cd..c0c76fa034beadc34ba7854860d1aa2512148067 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -118,7 +118,7 @@
<<if $verboseDescriptions == 1>>
Keeping such a prestigious slave as your concubine @@.green;adds to your fame.@@
<<if $Concubine.prestigeDesc == "She is a famed Free Cities whore, and commands top prices.">>
- When $he has a free moment, $he refines $his flexibility so that $he is prepared for any sexual position you can think of, and many more that $he researched just for your pleasure.
+ When $he has a free moment, $he refines $his flexibility so that $he is prepared for any sexual position you can think of, and many more that $he researched just for your pleasure.
<</if>>
<<if $Concubine.prestigeDesc == "She is a famed Free Cities slut, and can please anyone.">>
When $he has a free moment, $he pretties $himself up so that $he may be as beautiful as possible to make you look even better.
diff --git a/src/uncategorized/motherDaughterWorkaround.tw b/src/uncategorized/motherDaughterWorkaround.tw
index 7b4655921d5de53f891e7ed9a3e8ab31ca057c95..e21e5f7e5b37ce00554ae068c13b8fad73d4e0b9 100644
--- a/src/uncategorized/motherDaughterWorkaround.tw
+++ b/src/uncategorized/motherDaughterWorkaround.tw
@@ -46,12 +46,12 @@ Your new pair of slaves look frightened and uncertain, but seem encouraged by ea
<<set _secondSlave.attrXY = Math.clamp(_secondSlave.attrXY, 0, 100)>>
<<set _secondSlave.energy += random(-20,20)>>
<<set _secondSlave.fetishStrength = random(0,90)>>
-<<set _secondSlave.fetish = either("none", "none", "none", "none", "none", "none", "submissive", "cumslut", "humiliation", "buttslut", "pregnancy", "sadist", "dom", "masochist")>>
-<<set _secondSlave.behavioralFlaw = either("none", "none", "none", "arrogant", "bitchy", "odd", "hates men", "hates women", "hates women", "anorexic", "masochist", "gluttonous", "devout", "liberated")>>
+<<set _secondSlave.fetish = either("buttslut", "cumslut", "dom", "humiliation", "masochist", "none", "none", "none", "none", "none", "none", "pregnancy", "sadist", "submissive")>>
+<<set _secondSlave.behavioralFlaw = either("anorexic", "arrogant", "bitchy", "devout", "gluttonous", "hates men", "hates women", "hates women", "liberated", "masochist", "none", "none", "none", "odd")>>
<<if (_secondSlave.behavioralFlaw == "devout")>>
- <<set _secondSlave.sexualFlaw = either("none", "repressed", "shamefast", "apathetic")>>
+ <<set _secondSlave.sexualFlaw = either("apathetic", "none", "repressed", "shamefast")>>
<<else>>
- <<set _secondSlave.sexualFlaw = either("none", "none", "none", "none", "hates oral", "hates anal", "hates penetration", "repressed", "idealistic", "shamefast", "apathetic", "crude", "judgemental")>>
+ <<set _secondSlave.sexualFlaw = either("apathetic", "crude", "hates anal", "hates oral", "hates penetration", "idealistic", "judgemental", "none", "none", "none", "none", "repressed", "shamefast")>>
<</if>>
<<if $familyTesting == 1>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index a946f6b63c0e6e490c356de1743a41e409dba515..f10d39c6c6f5f79778aefe3b0babccf52515bbce 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -990,7 +990,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<if $activeSlave.stampTat == 0>>
<br>
<<link "Give $him a lewd tramp stamp">>
- <<set $activeSlave.stampTat = either("advertisements", "rude words", "degradation")>>
+ <<set $activeSlave.stampTat = either("advertisements", "degradation", "rude words")>>
<<replace "#introResult">>
You <<if $activeSlave.devotion > 20>>bring $him down to the studio, lay the compliant<<else>>drag $him down to the studio, strap the reluctant<</if>> slave in the chair face-down, and select a sufficiently lewd pattern to decorate $his lower back. When the automated tattooing is done, a topical application of analgesics leaves $him with nothing more than a slight ache there. When allowed to stand, $he immediately turns $his back to one of the studio's full length mirrors and cranes around to read the writing just over $his butt. It's difficult, since of course it's reversed, and $he mouths the words letter by letter.
<<if $activeSlave.stampTat == "advertisements">>
diff --git a/src/uncategorized/pCoupAttempt.tw b/src/uncategorized/pCoupAttempt.tw
index 256b03af319ccf2c4df10499ab74184acf320313..14bb3c413c70330ad5f6af0313b71c469d085024 100644
--- a/src/uncategorized/pCoupAttempt.tw
+++ b/src/uncategorized/pCoupAttempt.tw
@@ -13,7 +13,7 @@
<<else>>/* still pregnant slave */
<<set $traitor.preg = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
<<set $traitor.pregWeek = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
- <</if>>
+ <</if>>
<<run SetBellySize($traitor)>> /*In any case it's useful to do.*/
<<if $traitor.bald != 1>>
diff --git a/src/uncategorized/pCoupCollaboration.tw b/src/uncategorized/pCoupCollaboration.tw
index 0a6afe6549c835ad898ce2fd80a15c20189c0419..f159edd0d93129aeebca3dc3a2c12e5348c8869f 100644
--- a/src/uncategorized/pCoupCollaboration.tw
+++ b/src/uncategorized/pCoupCollaboration.tw
@@ -12,7 +12,7 @@
<<else>>/* still pregnant slave */
<<set $traitor.preg = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
<<set $traitor.pregWeek = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
-<</if>>
+<</if>>
<<run SetBellySize($traitor)>> /*In any case it's useful to do.*/
You are awakened in the middle of the night by an odd darkness. All the normal lights of your healthy arcology are out. Main power has gone out, and you claw your way in the darkness to the video feeds, running on emergency backup.
diff --git a/src/uncategorized/pCoupLoss.tw b/src/uncategorized/pCoupLoss.tw
index e6ea560ff933dc4066feb38f4d6e8e1f08ddb8ae..b97ca7f9a0714b9a5805f93d4293fdbcb11a044f 100644
--- a/src/uncategorized/pCoupLoss.tw
+++ b/src/uncategorized/pCoupLoss.tw
@@ -11,7 +11,7 @@
<<else>>/* still pregnant slave */
<<set $traitor.preg = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
<<set $traitor.pregWeek = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
-<</if>>
+<</if>>
<<run SetBellySize($traitor)>> /*In any case it's useful to do.*/
You are awakened in the middle of the night by a jolt that shakes the entire arcology, accompanied by a distant boom. It is followed by another, and another, and then the wail of the arcology's alarm systems, and then finally by a faint crackle that grows to a constant chatter of gunfire. Main power goes out, and you claw your way in the darkness to the video feeds, running on emergency backup.
diff --git a/src/uncategorized/pPeacekeepersIntro.tw b/src/uncategorized/pPeacekeepersIntro.tw
index 7af89b0edd0d9e4c7e4cc17a23488799d3de089c..4744510527e37bd234224f63582b9e81401db4a4 100644
--- a/src/uncategorized/pPeacekeepersIntro.tw
+++ b/src/uncategorized/pPeacekeepersIntro.tw
@@ -22,7 +22,7 @@ The aftermath of the attack on the Free City by forces from the neighboring fail
<<else>>
hard-fought, but the attackers did most of the dying. Modern weapons are powerful, especially on the defensive, and there's no appetite in that area to repeat the experiment.
<</if>>
-There are still enough weapons and desperate people there to keep banditry and warlordism going more or less indefinitely, though.
+There are still enough weapons and desperate people there to keep banditry and warlordism going more or less indefinitely, though.
<br><br>
diff --git a/src/uncategorized/pRivalryCapture.tw b/src/uncategorized/pRivalryCapture.tw
index 8f2db9cbd804dea8438a9adabd3c1cbc32d61176..6c124e783045381637032a7dc77bce407539080a 100644
--- a/src/uncategorized/pRivalryCapture.tw
+++ b/src/uncategorized/pRivalryCapture.tw
@@ -258,7 +258,7 @@
<<set $activeSlave.pregAdaptation = $activeSlave.birthsTotal*2>>
<<else>>
<<set $activeSlave.vagina = 5>>
- <<set $activeSlave.pregType = either(3,3,4,4,4,5,5,6,6,7,7,8,8,8)>>
+ <<set $activeSlave.pregType = either(3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 8)>>
<<set $activeSlave.birthsTotal = random(18,27)>>
<<set $activeSlave.bellySag = 2, $activeSlave.bellySagPreg = 2>>
<<set $activeSlave.pregAdaptation = random(60,100)>>
diff --git a/src/uncategorized/pTraitorMessage.tw b/src/uncategorized/pTraitorMessage.tw
index 5127bb2c2188cadbcc96d04de81ec70400cfd561..0783ef9bbbf5b4f16bf4f60cf768a83d39252539 100644
--- a/src/uncategorized/pTraitorMessage.tw
+++ b/src/uncategorized/pTraitorMessage.tw
@@ -23,7 +23,7 @@
<<else>>/* still pregnant slave */
<<set $traitor.preg = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
<<set $traitor.pregWeek = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
-<</if>>
+<</if>>
<<run SetBellySize($traitor)>> /*In any case it's useful to do.*/
<<if $traitor.preg > 0>>
@@ -32,7 +32,7 @@
<<set _isPreg = 0>>
<</if>>
-/* ------------------ pregnancy setup end here-----------------
+/* ------------------ pregnancy setup end here-----------------
As no broodmother cases in code below, it's no need to setup every case of impregnation through new system. Backup mechanic will do it for normal pregnancies.
*/
diff --git a/src/uncategorized/prestigiousSlave.tw b/src/uncategorized/prestigiousSlave.tw
index 1cdd6e120a1ad79069fcecd85a2b45f276ad46aa..75286ece4c6047532c4acd27693f54356fba16c3 100644
--- a/src/uncategorized/prestigiousSlave.tw
+++ b/src/uncategorized/prestigiousSlave.tw
@@ -52,7 +52,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlave.career = "a porn star">>
<<set $activeSlave.boobsImplant += random(4,6)*200>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
- <<set $activeSlave.nipples = either("cute", "puffy", "huge")>>
+ <<set $activeSlave.nipples = either("cute", "huge", "puffy")>>
<<set $activeSlave.areolae = 1>>
<<set $activeSlave.butt += 1>>
<<set $activeSlave.buttImplant += 1>>
diff --git a/src/uncategorized/previousSlaveInLine.tw b/src/uncategorized/previousSlaveInLine.tw
index 9df0c2e9e303b8e340eb038d4c7434cfabc3a56d..dea877bde169068827c36517f22bb87d253b7f0b 100644
--- a/src/uncategorized/previousSlaveInLine.tw
+++ b/src/uncategorized/previousSlaveInLine.tw
@@ -11,4 +11,3 @@
<<goto "Slave Interact">>
<</silently>>
-
diff --git a/src/uncategorized/reBrothelFunction.tw b/src/uncategorized/reBrothelFunction.tw
index 69b5258015ebedfff9d3ff107130fd4560d7f64e..4c84453c38ff3accf510fab60bb6ffb9ae610d8b 100644
--- a/src/uncategorized/reBrothelFunction.tw
+++ b/src/uncategorized/reBrothelFunction.tw
@@ -9,7 +9,7 @@ One request comes to you written on a letterhead featuring the logo of a fellow
<br><br>
Another of these bids for your brothel comes in the form of a curious video call. The video comes from an infamous lothario in your arcology, a seducer of powerful and prominent women citizens. Indeed, the recording was surreptitiously recorded in the bedroom of one such influential woman, with the Casanova describing his request in hushed tones while his wealthy host minces about unknowingly in the background. He explains that he is finally ready to hang up his coat and end his days of debauchery and copious casual sex, but that he would like to do so by engaging in a full day of indulgence at $brothelNameCaps.
<br><br>
-The last of these requests comes in the form of a letter, stamped with the herald of a prominent arcology family. It seems the eldest son of the family, known to you largely as a spoiled child riding on the coattails of his parents, is about to reach the age of majority. At his behest, his parents have contacted you to reserve your brothel for a day so that their son may become a man in true Free Cities fashion - amongst a roil of writhing flesh and wanton debauchery.
+The last of these requests comes in the form of a letter, stamped with the herald of a prominent arcology family. It seems the eldest son of the family, known to you largely as a spoiled child riding on the coattails of his parents, is about to reach the age of majority. At his behest, his parents have contacted you to reserve your brothel for a day so that their son may become a man in true Free Cities fashion - amongst a roil of writhing flesh and wanton debauchery.
<br><br>
@@ -27,7 +27,7 @@ The last of these requests comes in the form of a letter, stamped with the heral
<</link>> //This will earn you <<print cashFormat(10000)>>//
<br><<link "Give this lady-killing rake a proper send off into retirement">>
<<replace "#result">>
- Though a citizen he may be, this serial seducer may have more notches on his proverbial bedpost than even your oldest slaves. Though you are not present to view his mastery of the sexual craft first-hand, the dreamy fucked-out looks of exhaustion and gratified satisfaction painting every single one of your girls' faces at the end of the day speak volumes. Indeed, all of your brothel slaves with any room for improvement in their whoring skills @@.green;learn from his skillful coupling,@@ while even those with nothing to learn from him @@.hotpink;gain confidence@@ from the intensity of their sexual congress.
+ Though a citizen he may be, this serial seducer may have more notches on his proverbial bedpost than even your oldest slaves. Though you are not present to view his mastery of the sexual craft first-hand, the dreamy fucked-out looks of exhaustion and gratified satisfaction painting every single one of your girls' faces at the end of the day speak volumes. Indeed, all of your brothel slaves with any room for improvement in their whoring skills @@.green;learn from his skillful coupling,@@ while even those with nothing to learn from him @@.hotpink;gain confidence@@ from the intensity of their sexual congress.
<<for $i = 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].assignment == "work in the brothel">>
<<if $slaves[$i].whoreSkill < 100>>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index be1b46e0685776fd83700c3d6a1dd9b05c499eaf..8308ee7ea996b96f2e7e3277f96121ce946ee613 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -1285,7 +1285,7 @@ This one is a little odd; it merely begs you for an in person audience and offer
Ever since you have been steering $arcologies[0].name towards a belief in chattel religionism, you've been receiving increasingly useful communications from groups that share your ideals. With much of the Old World in freefall, many groups with particularly vehement religious beliefs are expanding unchecked by the mores of big government, and by taking the chattel religionist side, you've automatically inserted yourself into a worldwide network of like-minded organizations. You receive a message from one such group.
<br><br>
-It seems that the Chattel Religionists have all but taken over their town and driven out or converted the local worshippers of old world religions, save for a single religious building and its clergy who continue in defiance. This group has stepped in to put an end to this impiety. However, though they may be ruthless vigilantes, they don't consider themselves murderers. They're interested in fencing a member clergy to you, no questions asked, on a flat fee basis. Included in the message is a slave dossier detailing the piece of human chattel they're offering: <<if $activeSlave.genes == "XX">>a lovely virgin nun<<else>>a rather stuck up priest<</if>>.
+It seems that the Chattel Religionists have all but taken over their town and driven out or converted the local worshipers of old world religions, save for a single religious building and its clergy who continue in defiance. This group has stepped in to put an end to this impiety. However, though they may be ruthless vigilantes, they don't consider themselves murderers. They're interested in fencing a member clergy to you, no questions asked, on a flat fee basis. Included in the message is a slave dossier detailing the piece of human chattel they're offering: <<if $activeSlave.genes == "XX">>a lovely virgin nun<<else>>a rather stuck up priest<</if>>.
<<case "Roman Revivalist">>
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index 95d16bcb09d80cdf1ec6143224501fb558dbac17..fe6dbe95f2b4f5d2557622d220e34a7d830409bf 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -845,7 +845,7 @@
<<set $notApplyDesc = "believes that this means $he's going to have to lose weight soon, causing $him some trepidation.">>
<<case "fat">>
- <<set $nickname = either("'Baluga'", "'Bed Breaker'", "'Blimp'", "'Bloated'", "'Buffet Closer'", "'Cow'", "'Double Wide'", "'Fat'", "'Fatass'", "'Fatso'", "'Fatty'", "'Feedee'", "'Hambeast'", "'Jabba'", "'Jiggles'", "'Jiggly'", "'Jumbo'", "'Lap Crusher'", "'Lardy'", "'Piggy'", "'Roller'", "'Scale Breaker'", "'Smothers'", "'SSBBW'", "'Thud'", "'Whale'")>>
+ <<set $nickname = either("'Beluga'", "'Bed Breaker'", "'Blimp'", "'Bloated'", "'Buffet Closer'", "'Cow'", "'Double Wide'", "'Fat'", "'Fatass'", "'Fatso'", "'Fatty'", "'Feedee'", "'Hambeast'", "'Jabba'", "'Jiggles'", "'Jiggly'", "'Jumbo'", "'Lap Crusher'", "'Lardy'", "'Piggy'", "'Roller'", "'Scale Breaker'", "'Smothers'", "'SSBBW'", "'Thud'", "'Whale'")>>
<<set $situationDesc = "is carrying a lot of extra weight. The cruelty of life as a slave increases your property's willingness to do cruelty where they can get away with it - what is passed to them, they pass to others - so $he finds $himself mocked for $his size.">>
<<set $applyDesc = "knows that being obese makes $him less valuable on the market, but $he begins to accept that $he's going to have to put up with being fat for now.">>
<<set $notApplyDesc = "believes that this means $he's going to have to lose a lot of weight soon, causing $him some trepidation, though deep down $he hopes you'll just have it sucked out instead of making $him run.">>
diff --git a/src/uncategorized/rePokerNight.tw b/src/uncategorized/rePokerNight.tw
index 23e00cb7bdeb8f39a3626cbbcce79da7cf620f1f..6bdf42ba2bc869c7b0072a3ada7793ac9755ba3a 100644
--- a/src/uncategorized/rePokerNight.tw
+++ b/src/uncategorized/rePokerNight.tw
@@ -101,12 +101,12 @@ On a particularly lackadaisical evening, you find yourself alerted to a message
<<link "A year of servitude">>
<<replace "#aliveresult">>
<<if random(1,100) > 50>>
- For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck was not on your side. As the victor sweeps up $his spoils, the other mercenaries clap you on the back and offer their condolences for your defeat. Though you may have lost your ¤, it seems you've @@.green;made some friends.@@
- <<set $rep += 1000, $cash -= 5000>>
+ For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck was not on your side. As the victor sweeps up $his spoils, the other mercenaries clap you on the back and offer their condolences for your defeat. Though you may have lost your ¤, it seems you've @@.green;made some friends.@@
+ <<set $rep += 1000, $cash -= 5000>>
<<else>>
- For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck has rendered you the victor. A silence falls over the room as the result is declared, but after some time your opponent breaks the hush by joking that life as your slave is probably easier than fighting for $arcologies[0].name. After some awkward laughter the night continues, and at the end your former mercenary joins you on your trip back to the penthouse to submit to processing and to begin $his new life as your sexual servant. $He's not young, but $he's tough and not distrusting of you due to $his service in the $mercenariesTitle.
- <br>
- <<include "New Slave Intro">>
+ For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck has rendered you the victor. A silence falls over the room as the result is declared, but after some time your opponent breaks the hush by joking that life as your slave is probably easier than fighting for $arcologies[0].name. After some awkward laughter the night continues, and at the end your former mercenary joins you on your trip back to the penthouse to submit to processing and to begin $his new life as your sexual servant. $He's not young, but $he's tough and not distrusting of you due to $his service in the $mercenariesTitle.
+ <br>
+ <<include "New Slave Intro">>
<</if>>
<</replace>>
<</link>>
@@ -116,11 +116,11 @@ On a particularly lackadaisical evening, you find yourself alerted to a message
<<link "Dock $his wages">>
<<replace "#aliveresult">>
<<if random(1,100) > 50>>
- For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck was not on your side. As the victor sweeps up $his spoils, the other mercenaries clap you on the back and offer their condolences for your defeat. Though you may have lost your ¤, it seems you've @@.green;made some friends.@@
- <<set $rep += 1000, $cash -= 5000>>
+ For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck was not on your side. As the victor sweeps up $his spoils, the other mercenaries clap you on the back and offer their condolences for your defeat. Though you may have lost your ¤, it seems you've @@.green;made some friends.@@
+ <<set $rep += 1000, $cash -= 5000>>
<<else>>
- For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck has rendered you the victor. Your opponent accepts $his defeat with grace and jokes to $his comrades that $he'll be fighting in $his underwear for the next few months, and their uproar of laughter fills the room. Though you take the lion's share of the ¤, your mercenaries also @@.green;had a good time fraternizing with you.@@
- <<set $rep += 200, $cash += 5000>>
+ For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck has rendered you the victor. Your opponent accepts $his defeat with grace and jokes to $his comrades that $he'll be fighting in $his underwear for the next few months, and their uproar of laughter fills the room. Though you take the lion's share of the ¤, your mercenaries also @@.green;had a good time fraternizing with you.@@
+ <<set $rep += 200, $cash += 5000>>
<</if>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 5b52a3907d24819a9a3493b64df7432af1e49195..bbf02990cc146b2e244a75f2edcbf1cc76d1df76 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -2203,7 +2203,7 @@ After the fighting died down, they found a dickgirl inside the compound, harshly
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, they 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, $he<<if $activeSlave.physicalAge >= $activeSlave.pubertyAge>> is pregnant with some dead criminal's offspring,<</if>> has been crudely gelded, and 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, they 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's offspring,<</if>> $he has been crudely gelded, and 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 dickgirl 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)>>.//
@@ -2211,9 +2211,9 @@ 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,<</if>> and 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)>>.//
+//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)>>.//
<<case "CCS angel">>
@@ -2221,7 +2221,7 @@ As a minor point of information on your daily news download, you see that yet an
<br><br>
Wondering what sorts of strange paraphernalia or weird sex toys the grifter might have kept himself amused with, you casually select the feed of one of the surveillance cameras that overlooks the area. And indeed, the contents of many boxes being carried out of there do have a certain perverted look to them, prompting you to zoom in - which is when a pretty, young and almost naked <<if ($activeSlave.actualAge >= 18)>>woman<<elseif ($activeSlave.actualAge >= 13)>>girl<<else>>little girl<</if>> walks through the image, escorted by two repo men. Immediately directing the camera to follow $him, you see that they scan and log $him like any of the other items in the household liquidation - $he must have been the cult leader's personal slave. $He certainly has a unique look, waking your interest enough to check the slave markets for $him - and indeed, half an hour later $he's being listed as for sale.
<br><br>
-The <<if ($activeSlave.actualAge >= 18)>>young woman<<else>>girl<</if>> is best described as being 'angelic', in a stereotypical Western view of the mythical divine messengers. Blonde-haired, blue-eyed, and with milky-white skin, $he has had a pair of beautifully detailed wings tattooed on $his back. The small icon of two cherries next to one another also designates $him to be a complete virgin.
+The <<if ($activeSlave.actualAge >= 18)>>young $woman<<else>>$girl<</if>> is best described as being 'angelic', in a stereotypical Western view of the mythical divine messengers. Blonde-haired, blue-eyed, and with milky-white skin, $he has had a pair of beautifully detailed wings tattooed on $his back. The small icon of two cherries next to one another also designates $him to be a complete virgin.
<br><br>
// Someone already started bidding for $him and more bids are coming in fast. As such things usually go, you guess that the price will come out to about <<print cashFormat(5000)>> in the end.//
diff --git a/src/uncategorized/resEndowment.tw b/src/uncategorized/resEndowment.tw
index 69511bac14d2ab18fafe83dc7ebe437dcce46770..007a8e23704dbfbff8e620a0421c4db5784facdb 100644
--- a/src/uncategorized/resEndowment.tw
+++ b/src/uncategorized/resEndowment.tw
@@ -33,7 +33,7 @@
<br><br>
"A generous donation," the representative insists, "would help us advance our mission to provide the very finest livestock to persons of quality such as yourself." Getting down to the business advantages, he adds that "donors receive considerable price advantage on available stock," which seems to translate into a discount of around 20% once the sales language is stripped off it. You point out that's bordering on pointlessness to you, given your ability to purchase almost anything you wish; he hesitates, but then admits that "as our foremost investor" you could use an endowment to guide stock policy to an extent.
<<else>>
- You receive a personal call from an older member of the Futanari Sisters. Like all of the Sisters, she's very beautiful, but you know how to judge age through the most cutting-edge treatments, and you guess she's in her early forties. That makes her one of the most senior Sisters, at the age when mandatory enslavement will happen very soon for her. She doesn't seem preoccupied by the prospect, though the pair of gorgeous young women cooperating to suck off her enormous cock may have something to do with that.
+ You receive a personal call from an older member of the Futanari Sisters. Like all of the Sisters, she's very beautiful, but you know how to judge age through the most cutting-edge treatments, and you guess she's in her early forties. That makes her one of the most senior Sisters, at the age when mandatory enslavement will happen very soon for her. She doesn't seem preoccupied by the prospect, though the pair of gorgeous young women cooperating to suck off her enormous cock may have something to do with that.
<<if $PC.surname>>"<<if $PC.title>>Mr.<<else>>Ms.<</if>> <<print $PC.surname>>,"<<else>>"<<print $PC.name>>,"<</if>>
she says forthrightly,
<<if ($PC.dick == 1) && ($PC.vagina == 1) && ($PC.boobs == 1)>>
@@ -274,13 +274,13 @@
<br>
<<link "Propose a dynamic compromise that supports both visions">>
<<replace "#result">>
- You reconnect the call you had with the first matron, splitting your desktop's display to accommodate both video call windows so that you can address both at once. Then you begin to suggest a compromise that should gratify both parties:
+ You reconnect the call you had with the first matron, splitting your desktop's display to accommodate both video call windows so that you can address both at once. Then you begin to suggest a compromise that should gratify both parties:
<br><br>
With their not so feminine voices, conspicuous Adam's Apples, dry barren artificial pussies, and naturally masculine hormonal balances, it is more or less an open secret that futanari 'Sisters' are all biologically, well, men. It is considered poor taste to mention such a thing among polite company, however, as some men who own futas willfully try to ignore this fact or are otherwise are upset to be reminded of it. Your proposed remedy allows both sisters to have their way: With your extensive funding, those current Sisters who were biologically born male (all of them) will be endowed with bigger balls at the second matron's behest. Meanwhile, a new lineup of biologically female Futanari Sisters will be very rapidly inducted, transformed, cultured, trained, and readied for resale, under the expert leadership of the first matron. These new lady-futas will only have erect dicks to complement their natural fertile pussies, feminine hormones, and soft voices; nary a testicle in sight. Slaveowning society on the other hand will enjoy a wider variety of futanari slaves to choose from, opening up exciting new opportunities for owner to sate their personal preferences and perfect their harems. In 15 weeks, the absolute minimum time that all can be feasibly accomplished, everybody wins. Business will continue as usual in the Futanari Sisters until then, with no immediate change in merchandise.
<br><br>
"Well, you aren't the first one to think of that." the first matron reluctantly states. "You see, there's this outcast group of Sisters who would be perfect for this, it's just... We haven't seen eye to eye for a long time." The second chimes in: "You could talk her into it, she approves of your build far more than mine. Will probably take several months though, to move them all over and integrate all the new Sisters into our fold, and to enjoy the new pussies, of course." After a moment of consideration, the first agrees. You donate the funds to the Sisters with your compliments, ensuring that neither matron completely controls the vast sum. They both understand what they have to do now, starting immediately.
<br><br>
- Days later, the grateful institution begins a mass marketing campaign all across the world's Free Cities, which includes adverts in FCNN, FCTV, and FC social media about the upcoming changes to their Sister inventory and their need for willing new blood and new specialists to help them bolster their ranks. You feature prominently in each and every promotional item as their foremost contributor. Thanks to this @@.green;you will be a household name in the Free Cities for some time.@@ Such a public flex of your financial muscles has also made your relative power very clear to some in the New World, attracting important players who @@.green;will start to show an interest@@ in doing business with you and your Free City.
+ Days later, the grateful institution begins a mass marketing campaign all across the world's Free Cities, which includes adverts in FCNN, FCTV, and FC social media about the upcoming changes to their Sister inventory and their need for willing new blood and new specialists to help them bolster their ranks. You feature prominently in each and every promotional item as their foremost contributor. Thanks to this @@.green;you will be a household name in the Free Cities for some time.@@ Such a public flex of your financial muscles has also made your relative power very clear to some in the New World, attracting important players who @@.green;will start to show an interest@@ in doing business with you and your Free City.
<<set $TFS.schoolUpgrade = 3>>
<<set $cash -= 250000>>
<<set $rep += 2000>>
diff --git a/src/uncategorized/saDevotion.tw b/src/uncategorized/saDevotion.tw
index 740419ecfb8104a616bd524355c73166458fc6e4..db7012e3640185bc122d65de10f5cab43241e5d1 100644
--- a/src/uncategorized/saDevotion.tw
+++ b/src/uncategorized/saDevotion.tw
@@ -161,10 +161,10 @@
<</if>>
<<if ($arcologies[0].FSRestart != "unset")>>
<<if $slaves[$i].bellyPreg >= 1500 && $slaves[$i].devotion <= 20>>
- Being visibly pregnant in a society that loathes slave breeding fills $him with @@.gold;fear@@ for $himself and $his unborn child.
+ Being visibly pregnant in a society that loathes slave breeding fills $him with @@.gold;fear@@ for $himself and $his unborn child.
<<set $slaves[$i].trust -= 10>>
<<elseif $slaves[$i].pregKnown == 1 && $slaves[$i].devotion <= 20>>
- Being pregnant in a society that loathes slave breeding fills $him with @@.gold;worry@@ that you'll harm $him or $his unborn child.
+ Being pregnant in a society that loathes slave breeding fills $him with @@.gold;worry@@ that you'll harm $him or $his unborn child.
<<set $slaves[$i].trust -= 5>>
<</if>>
<</if>>
diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw
index dc6cfe2cc560817869a7414033fa86f938381543..973c192fbc82febd6b161235eb5706f29e2914c1 100644
--- a/src/uncategorized/saPleaseYou.tw
+++ b/src/uncategorized/saPleaseYou.tw
@@ -114,7 +114,7 @@ serves you this week.
<<if $PC.dick == 1>>
<<if ($slaves[$i].fetish != "mindbroken")>>
<<if $slaves[$i].fetish == "submissive">>
- $He frequently climaxes with your <<if $PC.title == 1>>strong<<else>>soft<</if>> hands holding $him and your cock spreading heat through $his core,
+ $He frequently climaxes with your <<if $PC.title == 1>>strong<<else>>soft<</if>> hands holding $him and your cock spreading heat through $his core,
<<if $slaves[$i].fetishKnown == 1>>
@@.hotpink;fulfilling $his life's role completely.@@
<<else>>
@@ -136,7 +136,7 @@ serves you this week.
<<if ($slaves[$i].fetish == "mindbroken")>>
$He is completely oblivious to $his @@.lime;increasingly swollen belly@@ and stands no chance of linking it to
<<else>>
- $He notices $his @@.lime;belly has swollen@@ after
+ $He notices $his @@.lime;belly has swollen@@ after
<</if>>
all the vaginal sex $he's had with you.
<<set $slaves[$i].bellyImplant += _cervixPump*20>>
@@ -169,7 +169,7 @@ serves you this week.
<<elseif ($slaves[$i].toyHole == "ass")>>
<<if $slaves[$i].fuckdoll == 0>>
- $He spends the week
+ $He spends the week
<<if ($slaves[$i].fetish == "mindbroken")>>
unaware of your intent to use $his anus.
<<elseif ($slaves[$i].trust < -20)>>
@@ -569,7 +569,7 @@ serves you this week.
<<set $slaves[$i].devotion += 2>>
<<elseif _fetishChangeChance > random(0,100)>>
<<set $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10, $slaves[$i].fetish = "boobs">>
- $He climaxes to nipple stimulation alone, and starts acting as though
+ $He climaxes to nipple stimulation alone, and starts acting as though
<<if $slaves[$i].clit > 0 && $slaves[$i].nipples != "fuckable">>
$he has @@.lightcoral;three pleasure buttons@@ rather than just one.
<<elseif $slaves[$i].vagina > -1 && $slaves[$i].nipples == "fuckable">>
@@ -608,7 +608,7 @@ serves you this week.
/*check*/
<<elseif ($slaves[$i].toyHole == "dick")>>
<<if $slaves[$i].fuckdoll > 0>>
- All it takes is a simple command to force $his dick to attention. You have the sexual energy to ride $him
+ All it takes is a simple command to force $his dick to attention. You have the sexual energy to ride $him
<<if ($fuckSlaves <= $PC.sexualEnergy/2)>>
<<set _penetrativeUse = random(21,40)>>
several times a day.
diff --git a/src/uncategorized/saRivalries.tw b/src/uncategorized/saRivalries.tw
index 186ab373d7757c41e0c5defb06f7d9023026f9b0..11f699aac62abf410473692650ddd494690a58b9 100644
--- a/src/uncategorized/saRivalries.tw
+++ b/src/uncategorized/saRivalries.tw
@@ -154,14 +154,14 @@
<<if $slaves[$i].fetish == "sadist">>
$slaves[$i].slaveName is horny and sadistic, so $he rapes $his rival <<= SlaveFullName($slaves[_j])>> every chance $he gets; this @@.hotpink;thrills@@ $slaves[$i].slaveName, but $slaves[_j].slaveName is @@.golden;frightened@@ that you let it happen.
<<set $slaves[$i].need = 0, $slaves[$i].devotion += 3, $slaves[_j].trust -= 3, $slaves[$i].penetrativeCount += 5, $slaves[_j].oralCount += 5>>
- <<if $slaves[$i].rivalry < 3>>
+ <<if $slaves[$i].rivalry < 3>>
Of course, this @@.lightsalmon;worsens their rivalry.@@
<<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1, _worsenedRivalry = 1>>
<</if>>
<<elseif $slaves[$i].fetish == "dom">>
$slaves[$i].slaveName is horny and dominant, so $he forces $his rival <<= SlaveFullName($slaves[_j])>> to submit to $him whenever $he can; this @@.hotpink;thoroughly satisfies@@ $slaves[$i].slaveName, but $slaves[_j].slaveName is @@.golden;angered@@ that you let it happen.
<<set $slaves[$i].need = 0, $slaves[$i].devotion += 3, $slaves[_j].devotion -= 3, $slaves[$i].penetrativeCount += 5, $slaves[_j].oralCount += 5>>
- <<if $slaves[$i].rivalry < 3>>
+ <<if $slaves[$i].rivalry < 3>>
Of course, this @@.lightsalmon;worsens their rivalry.@@
<<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1, _worsenedRivalry = 1>>
<</if>>
diff --git a/src/uncategorized/saServeYourOtherSlaves.tw b/src/uncategorized/saServeYourOtherSlaves.tw
index 31c1fff60b596cecd3c5c32104bffc9e05b5fc92..9db2239d4bb7ecb3cc53477596a4007bbbfa9cc2 100644
--- a/src/uncategorized/saServeYourOtherSlaves.tw
+++ b/src/uncategorized/saServeYourOtherSlaves.tw
@@ -260,7 +260,7 @@ is serving ''$slaves[_dom].slaveName'' this week.
<<else>>
$slaves[_dom].slaveName finds _himself2 under the weight of $slaves[$i].slaveName's limbless body and
<<if $slaves[_dom].boobs >= 300>>
- _his2 _domRace tits
+ _his2 _domRace tits
<<else>>
_his2 <<print nippleColor($slaves[_dom])>> nipples
<</if>>
@@ -280,7 +280,7 @@ is serving ''$slaves[_dom].slaveName'' this week.
<<else>>
$slaves[_dom].slaveName finds _himself2 pushed firmly into _his2 bedsheets and _his2
<<if $slaves[_dom].boobs >= 300>>
- _domRace tits
+ _domRace tits
<<else>>
<<print nippleColor($slaves[_dom])>> nipples
<</if>>
@@ -292,7 +292,7 @@ is serving ''$slaves[_dom].slaveName'' this week.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].devotion >= -20) && ($slaves[_dom].fetishKnown == 1) && ($slaves[_dom].fetishStrength > 60) && ($slaves[_dom].fetish == "dom") && canWalk($slaves[_dom])>>
- $slaves[_dom].slaveName loves to dominate, and the first indication $slaves[$i].slaveName gets of what $he's in for this week is when $slaves[_dom].slaveName ambushes $him in the dormitory, tackles $him from behind, and
+ $slaves[_dom].slaveName loves to dominate, and the first indication $slaves[$i].slaveName gets of what $he's in for this week is when $slaves[_dom].slaveName ambushes $him in the dormitory, tackles $him from behind, and
<<if $slaves[$i].amp == 1>>
bursts out <<if canTalk($slaves[_dom])>>laughing<<else>>in silent laughter<</if>> at $his inability to right $himself without limbs.
<<else>>
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index e8986453004b49e010caa8e758edbaf68e184e58..6cf783e22a2fe07adb16e34bbec4791de287dfa4 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -218,7 +218,7 @@ _beautyCorrection = 0>>
$FResult = Math.trunc(_beautyCorrection * $FResult)>>
<</if>>
-$His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a day)<<if $beauty > 160>>, so many that <<if canDoVaginal($slaves[$i]) && canDoAnal($slaves[$i])>>each of $his holes was<<elseif canDoVaginal($slaves[$i]) || canDoAnal($slaves[$i])>>each of $his available holes was<<else>>$his mouth and anywhere else a cock could fit was<</if>> often filled by more than one cock<<elseif $beauty > 140>>, so many that $he spent much of $his time getting gangbanged<<elseif $beauty > 120>>, so many that customers often <<if canDoAnal($slaves[$i]) || canDoVaginal($slaves[$i])>>spitroasted<<else>>double-teamed<</if>> the slut<<elseif $beauty > 100>>, so many that $he frequently had sex with multiple customers at once<<elseif $beauty > 70>>, so many that $he occasionally had sex with multiple customers at once<</if>>. They paid <<print cashFormat($FResult)>> on average<<if _beautyCorrection > 1>>, including a premium for being in extremely high demand<</if>>.
+$His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a day)<<if $beauty > 160>>, so many that <<if canDoVaginal($slaves[$i]) && canDoAnal($slaves[$i])>>each of $his holes was<<elseif canDoVaginal($slaves[$i]) || canDoAnal($slaves[$i])>>each of $his available holes was<<else>>$his mouth and anywhere else a cock could fit was<</if>> often filled by more than one cock<<elseif $beauty > 140>>, so many that $he spent much of $his time getting gangbanged<<elseif $beauty > 120>>, so many that customers often <<if canDoAnal($slaves[$i]) || canDoVaginal($slaves[$i])>>spitroasted<<else>>double-teamed<</if>> the slut<<elseif $beauty > 100>>, so many that $he frequently had sex with multiple customers at once<<elseif $beauty > 70>>, so many that $he occasionally had sex with multiple customers at once<</if>>. They paid <<print cashFormat($FResult)>> on average<<if _beautyCorrection > 1>>, including a premium for being in extremely high demand<</if>>.
<<set _incomeStats.customers = $beauty>>
<<if $seeAge == 1>>
diff --git a/src/uncategorized/saWorkAGloryHole.tw b/src/uncategorized/saWorkAGloryHole.tw
index 6a84bf488acc64b39661bc3ee4fc53c5c6ce2382..b607de2e6997ec8855349eb1d61da94718cf657c 100644
--- a/src/uncategorized/saWorkAGloryHole.tw
+++ b/src/uncategorized/saWorkAGloryHole.tw
@@ -152,7 +152,7 @@ $His feelings, skills, and appearance do not matter. $He is condemned to a world
<<case "Chinese Revivalist">>
<<set $arcologies[0].FSChineseRevivalist += _seed>>
<<case "Repopulation Focus">>
- <<set $arcologies[0].FSRepopulationFocus += _seed>>
+ <<set $arcologies[0].FSRepopulationFocus += _seed>>
<<case "Eugenics">>
<<set $arcologies[0].FSRestart += _seed>>
<<case "Chattel Religionist">>
diff --git a/src/uncategorized/seBirth.tw b/src/uncategorized/seBirth.tw
index 19f03ca9abcdba9a4fa8c12b7e2439e6b2d9be39..eda708096e7e402e9488514e9f0f0ff04fbc20b6 100644
--- a/src/uncategorized/seBirth.tw
+++ b/src/uncategorized/seBirth.tw
@@ -8,7 +8,7 @@ Refactoring this passage. Main idea for structure:
3. Make calculation of birth process. All live babies will be added to slave property .curBabies as array. They will be in it as long as slave not give next birth. Enough time for any processing.
4. Showing scene of birth based on calculation (broodmother and normal is merged in one scene, just with variations).
5. Dealing with babies - they are in separate array, no need to mess with mother .pregType or .preg now.
-6. Setting up postpartum
+6. Setting up postpartum
7. Dealing with mother critical states.
I need to break single passage to several widgets, as it's been overcomplicated monster with too many nested if's - true horror for me. :) At least for testing and bugfixing time, later it can be merged back, if needed for processing speed up.
diff --git a/src/uncategorized/seNicaeaCouncil.tw b/src/uncategorized/seNicaeaCouncil.tw
index 6d974a3e78a8da4215233685115bdc96b8388c2d..5fc4ea96d821834db75d0ac6a6c95f7ae09130e5 100644
--- a/src/uncategorized/seNicaeaCouncil.tw
+++ b/src/uncategorized/seNicaeaCouncil.tw
@@ -9,7 +9,7 @@
<<set $arcologies[0].FSChattelReligionistCreed = 1>>
The $nicaeaName is held in another arcology, without your involvement. Your abstention has weakened it. It authored a creed which the Council claims all good Chattel Religionists should subscribe. Most of it is uncontroversial, giving beliefs about slavery and faith that virtually all Chattel Religionists agree on. However, the new creed does purport to settle three major points of contention.
<br><br>
-First, it emphasizes
+First, it emphasizes
<<if $nicaeaFocus == "slaves">>
slaves throughout. The creed goes so far as to imply that slaveowners have a duty to slaves, which they fulfill by providing them the opportunity to enjoy the holy and pure state of being a sex slave.
<<else>>
diff --git a/src/uncategorized/siblingsWorkaround.tw b/src/uncategorized/siblingsWorkaround.tw
index ef5763064efd05dc778f4a36d1677305b8153b11..3c3035f7774b971cc72bfcb0294a4861695a657b 100644
--- a/src/uncategorized/siblingsWorkaround.tw
+++ b/src/uncategorized/siblingsWorkaround.tw
@@ -39,17 +39,17 @@ Your new pair of slaves look frightened and uncertain, but seem encouraged by ea
<<set _secondSlave.attrXY = Math.clamp(_secondSlave.attrXY, 0, 100)>>
<<set _secondSlave.energy += random(-20,20)>>
<<set _secondSlave.fetishStrength = random(0,90)>>
-<<set _secondSlave.fetish = either("none", "none", "none", "none", "none", "none", "submissive", "cumslut", "humiliation", "buttslut", "pregnancy", "sadist", "dom", "masochist")>>
-<<set _secondSlave.behavioralFlaw = either("none", "none", "none", "arrogant", "bitchy", "odd", "hates men", "hates women", "hates women", "anorexic", "masochist", "gluttonous", "devout", "liberated")>>
+<<set _secondSlave.fetish = either("buttslut", "cumslut", "dom", "humiliation", "masochist", "none", "none", "none", "none", "none", "none", "pregnancy", "sadist", "submissive")>>
+<<set _secondSlave.behavioralFlaw = either("anorexic", "arrogant", "bitchy", "devout", "gluttonous", "hates men", "hates women", "hates women", "liberated", "masochist", "none", "none", "none", "odd")>>
<<if (_secondSlave.behavioralFlaw == "devout")>>
- <<set _secondSlave.sexualFlaw = either("none", "repressed", "shamefast", "apathetic")>>
+ <<set _secondSlave.sexualFlaw = either("apathetic", "none", "repressed", "shamefast")>>
<<else>>
- <<set _secondSlave.sexualFlaw = either("none", "none", "none", "none", "hates oral", "hates anal", "hates penetration", "repressed", "idealistic", "shamefast", "apathetic", "crude", "judgemental")>>
+ <<set _secondSlave.sexualFlaw = either("apathetic", "crude", "hates anal", "hates oral", "hates penetration", "idealistic", "judgemental", "none", "none", "none", "none", "repressed", "shamefast")>>
<</if>>
<<if $familyTesting == 0>>
-<<set _secondSlave.relation = "sister">>
-<<set _secondSlave.relationTarget = _secondSlave.ID - 1000>>
+ <<set _secondSlave.relation = "sister">>
+ <<set _secondSlave.relationTarget = _secondSlave.ID - 1000>>
<</if>>
<<if _secondSlave.actualAge < $minimumSlaveAge>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index b34f0a06bc6b3e8d42db0721149211e5beb58026..94e1587ac0efe5d4ced09a54bf76eaf22ad4aa25 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -37,7 +37,7 @@
<</switch>>
<</if>>
-<<set $encyclopedia = either("Drugs and Their Effects", "From Rebellious to Devoted", "Costs Summary", "Disease in the Free Cities", "Slave Couture", "Nymphomania", "Gender", "Independent Slaves", "Modern Anal")>>
+<<set $encyclopedia = either("Costs Summary", "Disease in the Free Cities", "Drugs and Their Effects", "From Rebellious to Devoted", "Gender", "Independent Slaves", "Modern Anal", "Nymphomania", "Slave Couture")>>
<<if $activeSlave.dick > 0>><<set $showEncyclopedia = 1, $encyclopedia = "Gender">><</if>>
<<include "Place In Line">>
diff --git a/src/uncategorized/slaveShelter.tw b/src/uncategorized/slaveShelter.tw
index ec566ff3780d9697a4e40c428d8cc8501e2749e1..15c9d5501ec3733bc2ff485e410f7f6c87c26b09 100644
--- a/src/uncategorized/slaveShelter.tw
+++ b/src/uncategorized/slaveShelter.tw
@@ -34,7 +34,6 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set _possibleOrigins.push("degraded DoL")>>
<</if>>
-
<<set _origin = _possibleOrigins.random()>>
<<switch _origin>>
@@ -192,7 +191,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $shelterSlave.weight = random(-90,-30)>>
<<set $shelterSlave.muscles = random(-75,0)>>
<<set $shelterSlave.energy = random(0,30)>>
- <<set $shelterSlave.fetish = either("none", "none", "submissive", "masochist", "humiliation", "humiliation")>>
+ <<set $shelterSlave.fetish = either("humiliation", "humiliation", "masochist", "none", "none", "submissive")>>
<<set $shelterSlave.boobsTat = either("degradation", "rude words", "none")>>
<<set $shelterSlave.buttTat = either("degradation", "rude words", 0)>>
<<set $shelterSlave.lipsTat = either("degradation", "rude words", 0)>>
@@ -370,6 +369,8 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<</if>>
<<set $slaveCost = 1000>>
+<<setLocalPronouns $shelterSlave>>
+
The placement fee is <<print cashFormat($slaveCost)>>.
<br><br>
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index 24eab6835a248de1af41699156886d9c61ec25b7..d0bc51244fb268ec8e838ecd50de329eccfc470a 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -6,184 +6,185 @@
<<set $display = 0>>
<<if !["abortion TV", "elite auction", "eugenics arcology", "organ crafter", "peacekeepers", "repopulationist arcology", "tentacle bred", "womb filler"].includes($buyer) && ((($activeSlave.actualAge < $retirementAge-1) && $PhysicalRetirementAgePolicy != 1) || (($activeSlave.physicalAge < $retirementAge-1) && $PhysicalRetirementAgePolicy == 1))>> /* organ crafter is not viable now, the elite won't part so easily with a prize, some take place x months later when the event's max is 15 weeks, and the rest are snuff events. You don't want that slave back. */
-<<if !$boomerangSlave || $boomerangWeeks > 15>>
- <<if $activeSlave.fuckdoll == 0>>
- <<if canWalk($activeSlave)>>
- <<if canTalk($activeSlave)>>
- <<if $activeSlave.fetish != "mindbroken">>
- <<if $activeSlave.devotion > 50>>
- <<if $activeSlave.trust > 95 || $activeSlave.trust < -20 || ($activeSlave.intelligence+$activeSlave.intelligenceImplant < -15)>>
- <<set $boomerangSlave = clone($activeSlave), $boomerangWeeks = 1, $boomerangBuyer = $buyer>>
- <<set $boomerangSlave.assignment = "rest">>
- <<set $boomerangStats = {PCpregSource: 0, PCmother: 0, PCfather: 0, boomerangMother: [], boomerangFather: [], boomerangPregSources: [], boomerangMotherTank: [], boomerangFatherTank: [], boomerangRelationship: 0, boomerangRivalry: 0, boomerangRelation: 0, boomerangBody: 0}>>
- <<if $familyTesting == 1>>
- <<if $activeSlave.ID == $PC.pregSource>>
- <<set $boomerangStats.PCpregSource = $activeSlave.ID>>
- <</if>>
- <<if $PC.mother == $activeSlave.ID>>
- <<set $boomerangStats.PCmother = $activeSlave.ID>>
- <</if>>
- <<if $PC.father == $activeSlave.ID>>
- <<set $boomerangStats.PCfather = $activeSlave.ID>>
- <</if>>
- <<for _ss = 0; _ss < $slaves.length; _ss++>>
- <<if $slaves[_ss].ID != $activeSlave.ID>>
- <<if $slaves[_ss].mother == $activeSlave.ID>>
- <<set $boomerangStats.boomerangMother.push($slaves[_ss].ID)>>
- <</if>>
- <<if $slaves[_ss].father == $activeSlave.ID>>
- <<set $boomerangStats.boomerangFather.push($slaves[_ss].ID)>>
- <</if>>
- <<if $activeSlave.ID == $slaves[_ss].pregSource>>
- <<set $boomerangStats.boomerangPregSources.push($slaves[_ss].ID)>>
+ <<if !$boomerangSlave || $boomerangWeeks > 15>>
+ <<if $activeSlave.fuckdoll == 0>>
+ <<if canWalk($activeSlave)>>
+ <<if canTalk($activeSlave)>>
+ <<if $activeSlave.fetish != "mindbroken">>
+ <<if $activeSlave.devotion > 50>>
+ <<if $activeSlave.trust > 95 || $activeSlave.trust < -20 || ($activeSlave.intelligence+$activeSlave.intelligenceImplant < -15)>>
+ <<set $boomerangSlave = clone($activeSlave), $boomerangWeeks = 1, $boomerangBuyer = $buyer>>
+ <<set $boomerangSlave.assignment = "rest">>
+ <<set $boomerangStats = {PCpregSource: 0, PCmother: 0, PCfather: 0, boomerangMother: [], boomerangFather: [], boomerangPregSources: [], boomerangMotherTank: [], boomerangFatherTank: [], boomerangRelationship: 0, boomerangRivalry: 0, boomerangRelation: 0, boomerangBody: 0}>>
+ <<if $familyTesting == 1>>
+ <<if $activeSlave.ID == $PC.pregSource>>
+ <<set $boomerangStats.PCpregSource = $activeSlave.ID>>
+ <</if>>
+ <<if $PC.mother == $activeSlave.ID>>
+ <<set $boomerangStats.PCmother = $activeSlave.ID>>
+ <</if>>
+ <<if $PC.father == $activeSlave.ID>>
+ <<set $boomerangStats.PCfather = $activeSlave.ID>>
+ <</if>>
+ <<for _ss = 0; _ss < $slaves.length; _ss++>>
+ <<if $slaves[_ss].ID != $activeSlave.ID>>
+ <<if $slaves[_ss].mother == $activeSlave.ID>>
+ <<set $boomerangStats.boomerangMother.push($slaves[_ss].ID)>>
+ <</if>>
+ <<if $slaves[_ss].father == $activeSlave.ID>>
+ <<set $boomerangStats.boomerangFather.push($slaves[_ss].ID)>>
+ <</if>>
+ <<if $activeSlave.ID == $slaves[_ss].pregSource>>
+ <<set $boomerangStats.boomerangPregSources.push($slaves[_ss].ID)>>
+ <</if>>
+ <</if>>
+ <</for>>
+ <<if $incubator > 0>>
+ <<for _z = 0; _z < $tanks.length; _z++>>
+ <<if $activeSlave.ID == $tanks[_z].mother>>
+ <<set $boomerangStats.boomerangMotherTank.push($slaves[_z].ID)>>
+ <</if>>
+ <<if $activeSlave.ID == $tanks[_z].father>>
+ <<set $boomerangStats.boomerangFatherTank.push($slaves[_z].ID)>>
+ <</if>>
+ <</for>>
+ <</if>>
+ <<if $nursery > 0>>
+ <<for _z = 0; _z < $cribs.length; _z++>>
+ <<if $activeSlave.ID == $cribs[_z].mother>>
+ <<set $boomerangStats.boomerangMotherTank.push($slaves[_z].ID)>>
+ <</if>>
+ <<if $activeSlave.ID == $cribs[_z].father>>
+ <<set $boomerangStats.boomerangFatherTank.push($slaves[_z].ID)>>
+ <</if>>
+ <</for>>
+ <</if>>
+ <<set $boomerangSlave.sisters = 0, $boomerangSlave.daughters = 0>>
+ <<else>>
+ <<if $activeSlave.relation != 0>>
+ <<set $boomerangStats.boomerangRelation = $activeSlave.relationTarget>>
+ <</if>>
+ <<for _ss = 0; _ss < $slaves.length; _ss++>>
+ <<if $slaves[_ss].ID != $activeSlave.ID>>
+ <<if $activeSlave.ID == $slaves[_ss].pregSource>>
+ <<set $boomerangStats.boomerangPregSources.push($slaves[_ss].ID)>>
+ <</if>>
+ <</if>>
+ <</for>>
+ <</if>>
+ <<if $activeSlave.relationship > 0>>
+ <<set $boomerangStats.boomerangRelationship = $activeSlave.relationshipTarget>>
+ <</if>>
+ <<if $activeSlave.rivalry > 0>>
+ <<set $boomerangStats.boomerangRivalry = $activeSlave.rivalryTarget>>
+ <</if>>
+ <<if $activeSlave.bodySwap > 0>>
+ <<set _myBody = $slaves.findIndex(function(s) { return s.origBodyOwnerID == $activeSlave.ID; })>>
+ <<if _myBody != -1>>
+ <<set $boomerangStats.boomerangBody = $slaves[_myBody].ID>>
+ <</if>>
+ <</if>>
+ <</if>>
<</if>>
<</if>>
- <</for>>
- <<if $incubator > 0>>
- <<for _z = 0; _z < $tanks.length; _z++>>
- <<if $activeSlave.ID == $tanks[_z].mother>>
- <<set $boomerangStats.boomerangMotherTank.push($slaves[_z].ID)>>
- <</if>>
- <<if $activeSlave.ID == $tanks[_z].father>>
- <<set $boomerangStats.boomerangFatherTank.push($slaves[_z].ID)>>
- <</if>>
- <</for>>
- <</if>>
- <<if $nursery > 0>>
- <<for _z = 0; _z < $cribs.length; _z++>>
- <<if $activeSlave.ID == $cribs[_z].mother>>
- <<set $boomerangStats.boomerangMotherTank.push($slaves[_z].ID)>>
- <</if>>
- <<if $activeSlave.ID == $cribs[_z].father>>
- <<set $boomerangStats.boomerangFatherTank.push($slaves[_z].ID)>>
- <</if>>
- <</for>>
- <</if>>
- <<set $boomerangSlave.sisters = 0, $boomerangSlave.daughters = 0>>
- <<else>>
- <<if $activeSlave.relation != 0>>
- <<set $boomerangStats.boomerangRelation = $activeSlave.relationTarget>>
- <</if>>
- <<for _ss = 0; _ss < $slaves.length; _ss++>>
- <<if $slaves[_ss].ID != $activeSlave.ID>>
- <<if $activeSlave.ID == $slaves[_ss].pregSource>>
- <<set $boomerangStats.boomerangPregSources.push($slaves[_ss].ID)>>
- <</if>>
- <</if>>
- <</for>>
- <</if>>
- <<if $activeSlave.relationship > 0>>
- <<set $boomerangStats.boomerangRelationship = $activeSlave.relationshipTarget>>
- <</if>>
- <<if $activeSlave.rivalry > 0>>
- <<set $boomerangStats.boomerangRivalry = $activeSlave.rivalryTarget>>
- <</if>>
- <<if $activeSlave.bodySwap > 0>>
- <<set _myBody = $slaves.findIndex(function(s) { return s.origBodyOwnerID == $activeSlave.ID; })>>
- <<if _myBody != -1>>
- <<set $boomerangStats.boomerangBody = $slaves[_myBody].ID>>
<</if>>
<</if>>
<</if>>
<</if>>
- <</if>>
- <</if>>
- <</if>>
- <</if>>
-<</if>>
<</if>>
- <<if $familyTesting == 1>>
- <<for _ss = 0; _ss < $slaves.length; _ss++>>
- <<setLocalPronouns $slaves[_ss] 2>>
- <<if $activeSlave.mother == $slaves[_ss].ID>>
- $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling _his2 daughter.
- <<run clearSummaryCache($slaves[_ss])>>
- <br><br>
- <<set $slaves[_ss].devotion -= 20>>
- <</if>>
- <<if $activeSlave.father == $slaves[_ss].ID>>
- $slaves[_ss].slaveName is @@.mediumorchid;disappointed@@ that you are selling _his2 daughter.
- <<run clearSummaryCache($slaves[_ss])>>
- <br><br>
- <<set $slaves[_ss].devotion -= 10>>
- <</if>>
- <<if $activeSlave.ID == $slaves[_ss].father>>
- $slaves[_ss].slaveName is @@.mediumorchid;saddened@@ that you are selling _his2 father.
- <<run clearSummaryCache($slaves[_ss])>>
- <br><br>
- <<set $slaves[_ss].devotion -= 10>>
- <</if>>
- <<if $activeSlave.ID == $slaves[_ss].mother>>
- $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling _his2 mother.
- <<run clearSummaryCache($slaves[_ss])>>
- <br><br>
- <<set $slaves[_ss].devotion -= 20>>
- <</if>>
- <<switch areSisters($activeSlave, $slaves[_ss])>>
- <<case 1>>
- $slaves[_ss].slaveName is @@.mediumorchid;devastated@@ that you are selling _his2 twin.
- <<run clearSummaryCache($slaves[_ss])>>
- <br><br>
- <<set $slaves[_ss].devotion -= 30>>
- <<case 2>>
- $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling _his2 sister.
- <<run clearSummaryCache($slaves[_ss])>>
- <br><br>
- <<set $slaves[_ss].devotion -= 20>>
- <<case 3>>
- $slaves[_ss].slaveName is @@.mediumorchid;disheartened@@ that you are selling _his2 half-sister.
- <<run clearSummaryCache($slaves[_ss])>>
- <br><br>
- <<set $slaves[_ss].devotion -= 10>>
- <</switch>>
- <</for>>
- <<else>>
- <<if $activeSlave.relation != 0>>
- <<set _ss = $slaveIndices[$activeSlave.relationTarget]>>
- <<if def _ss && $slaves[_ss].fetish != "mindbroken">>
- <<setLocalPronouns $slaves[_ss] 2>>
- $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling _his2 $activeSlave.relation.
- <<run clearSummaryCache($slaves[_ss])>>
- <br><br>
- <<set $slaves[_ss].devotion -= 20>>
- <<set $display = 1>>
- <</if>>
+<<if $familyTesting == 1>>
+ <<for _ss = 0; _ss < $slaves.length; _ss++>>
+ <<setLocalPronouns $slaves[_ss] 2>>
+ <<if $activeSlave.mother == $slaves[_ss].ID>>
+ $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling _his2 daughter.
+ <<run clearSummaryCache($slaves[_ss])>>
+ <br><br>
+ <<set $slaves[_ss].devotion -= 20>>
<</if>>
- <</if>>
- <<if $activeSlave.relationship > 0>>
- <<set _ss = $slaveIndices[$activeSlave.relationshipTarget]>>
+ <<if $activeSlave.father == $slaves[_ss].ID>>
+ $slaves[_ss].slaveName is @@.mediumorchid;disappointed@@ that you are selling _his2 daughter.
+ <<run clearSummaryCache($slaves[_ss])>>
+ <br><br>
+ <<set $slaves[_ss].devotion -= 10>>
+ <</if>>
+ <<if $activeSlave.ID == $slaves[_ss].father>>
+ $slaves[_ss].slaveName is @@.mediumorchid;saddened@@ that you are selling _his2 father.
+ <<run clearSummaryCache($slaves[_ss])>>
+ <br><br>
+ <<set $slaves[_ss].devotion -= 10>>
+ <</if>>
+ <<if $activeSlave.ID == $slaves[_ss].mother>>
+ $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling _his2 mother.
+ <<run clearSummaryCache($slaves[_ss])>>
+ <br><br>
+ <<set $slaves[_ss].devotion -= 20>>
+ <</if>>
+ <<switch areSisters($activeSlave, $slaves[_ss])>>
+ <<case 1>>
+ $slaves[_ss].slaveName is @@.mediumorchid;devastated@@ that you are selling _his2 twin.
+ <<run clearSummaryCache($slaves[_ss])>>
+ <br><br>
+ <<set $slaves[_ss].devotion -= 30>>
+ <<case 2>>
+ $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling _his2 sister.
+ <<run clearSummaryCache($slaves[_ss])>>
+ <br><br>
+ <<set $slaves[_ss].devotion -= 20>>
+ <<case 3>>
+ $slaves[_ss].slaveName is @@.mediumorchid;disheartened@@ that you are selling _his2 half-sister.
+ <<run clearSummaryCache($slaves[_ss])>>
+ <br><br>
+ <<set $slaves[_ss].devotion -= 10>>
+ <</switch>>
+ <</for>>
+<<else>>
+ <<if $activeSlave.relation != 0>>
+ <<set _ss = $slaveIndices[$activeSlave.relationTarget]>>
<<if def _ss && $slaves[_ss].fetish != "mindbroken">>
<<setLocalPronouns $slaves[_ss] 2>>
- $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling _his2 best source of comfort and companionship in a life of bondage.
+ $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling _his2 $activeSlave.relation.
<<run clearSummaryCache($slaves[_ss])>>
<br><br>
- <<set $slaves[_ss].devotion -= $slaves[_ss].relationship*10>>
+ <<set $slaves[_ss].devotion -= 20>>
<<set $display = 1>>
<</if>>
- <<elseif $activeSlave.relationship == -3>>
- Selling one of your slave wives is @@.red;socially unacceptable.@@ In addition, your other devoted slaves are @@.gold;worried@@ that you may not respect their status.
- <<run clearSummaryCache()>>
+ <</if>>
+<</if>>
+
+<<if $activeSlave.relationship > 0>>
+ <<set _ss = $slaveIndices[$activeSlave.relationshipTarget]>>
+ <<if def _ss && $slaves[_ss].fetish != "mindbroken">>
+ <<setLocalPronouns $slaves[_ss] 2>>
+ $slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling _his2 best source of comfort and companionship in a life of bondage.
+ <<run clearSummaryCache($slaves[_ss])>>
<br><br>
- <<set $rep -= 200>>
+ <<set $slaves[_ss].devotion -= $slaves[_ss].relationship*10>>
<<set $display = 1>>
- <<for _ss = 0; _ss < $slaves.length; _ss++>>
- <<if $slaves[_ss].devotion > 50>>
- <<set $slaves[_ss].trust -= 5>>
- <</if>>
- <</for>>
<</if>>
- <<if $activeSlave.rivalry != 0>>
- <<set _ss = $slaveIndices[$activeSlave.rivalryTarget]>>
- <<if def _ss && $slaves[_ss].fetish != "mindbroken">>
- <<setLocalPronouns $slaves[_ss] 2>>
- $slaves[_ss].slaveName is @@.hotpink;pleased@@ that _he2 won't have to see _his2 rival any more.
- <<run clearSummaryCache($slaves[_ss])>>
- <br><br>
- <<set $slaves[_ss].devotion += $slaves[_ss].rivalry*3>>
- <<set $display = 1>>
+<<elseif $activeSlave.relationship == -3>>
+ Selling one of your slave wives is @@.red;socially unacceptable.@@ In addition, your other devoted slaves are @@.gold;worried@@ that you may not respect their status.
+ <<run clearSummaryCache()>>
+ <br><br>
+ <<set $rep -= 200>>
+ <<set $display = 1>>
+ <<for _ss = 0; _ss < $slaves.length; _ss++>>
+ <<if $slaves[_ss].devotion > 50>>
+ <<set $slaves[_ss].trust -= 5>>
<</if>>
+ <</for>>
+<</if>>
+<<if $activeSlave.rivalry != 0>>
+ <<set _ss = $slaveIndices[$activeSlave.rivalryTarget]>>
+ <<if def _ss && $slaves[_ss].fetish != "mindbroken">>
+ <<setLocalPronouns $slaves[_ss] 2>>
+ $slaves[_ss].slaveName is @@.hotpink;pleased@@ that _he2 won't have to see _his2 rival any more.
+ <<run clearSummaryCache($slaves[_ss])>>
+ <br><br>
+ <<set $slaves[_ss].devotion += $slaves[_ss].rivalry*3>>
+ <<set $display = 1>>
<</if>>
+<</if>>
<<set _slaveImpact = 0>>
<<switch $buyer>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 3ccb21eba0af4fcdc76bd63e93a1d609486ba367..43878c4ff18f6dc4ec25244121e06d39d4c40597 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -105,12 +105,12 @@
<<set _tableCount = _tableCount || 0>>
<<set _tableCount++>>
/*
- * we want <button data-quick-index="<<= _tableCount>>"> ...
+ * we want <button data-quick-index="<<= _tableCount>>"> ...
*/
<<set _buttonAttributes = { 'data-quick-index': _tableCount }>>
<<htag _buttonAttributes 'button'>>Quick Index<</htag>>
/*
- * we want <div id="list_index3" class=" hidden">...
+ * we want <div id="list_index3" class=" hidden">...
*/
<<set _divAttributes = { id: 'list_index' + _tableCount, class: 'hidden'}>>
<<htag _divAttributes>>
diff --git a/src/uncategorized/stewardessWorkaround.tw b/src/uncategorized/stewardessWorkaround.tw
index 7efd7ede9c6f08f6007e9e3a663a9deae01a8030..99c517aa1df49bda08582aa8d438d569a6f9c8ed 100644
--- a/src/uncategorized/stewardessWorkaround.tw
+++ b/src/uncategorized/stewardessWorkaround.tw
@@ -10,4 +10,3 @@
<</if>>
<<goto "Servants' Quarters">>
-
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 0880b62046e5e2b2d08ee850ccdb3e6b560c9d31..b4e1c9070fb97d44ef67fab5710861243af09081 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -27,7 +27,7 @@
<span id="cost"><<SlaveCostDescription>></span>
<<elseif $ui == "disclaimer">>\
-<span id="nextButton"><strong><<link [[($nextButton)|($nextLink)]]>><</link>></strong></span>
+ <span id="nextButton"><strong><<link [[($nextButton)|($nextLink)]]>><</link>></strong></span>
<<elseif $ui != "start">>\
<<nobr>>
diff --git a/src/uncategorized/theSlavegirlSchool.tw b/src/uncategorized/theSlavegirlSchool.tw
index 50fef1f068e773d58c2b19ad43d7e5c907ee02d7..784a60a26f85c24921670e5bc4eccf44c83d940c 100644
--- a/src/uncategorized/theSlavegirlSchool.tw
+++ b/src/uncategorized/theSlavegirlSchool.tw
@@ -35,7 +35,7 @@
<</if>>
<br>[["Decline to purchase " + $him + " and check out another slave"|The Slavegirl School][$slavesSeen += 1]]
<<if $newSlaves.length > 0>>
- <br>[[Finish your order of slaves|Bulk Slave Intro]]
+ <br>[[Finish your order of slaves"|Bulk Slave Intro]]
<</if>>
<br><br>
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index 8716011a655bfb8840a4788cdbaec7fb684cb160..47306cdfcbffc34975ec9b5666a96b361c49b8be 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -855,7 +855,7 @@
<<case "clubslut netting">>
As $he moves, $his clubslut netting moves with $him, leaving nothing to the imagination.
<<case "a cheerleader outfit">>
- As $he moves, $his pleated cheerleader bounces up and down flirtily.
+ As $he moves, $his pleated cheerleader bounces up and down flirtatiously.
<<case "cutoffs and a t-shirt">>
As $he moves, $his cutoffs hug $his butt.
<<case "spats and a tank top">>
diff --git a/src/utility/descriptionWidgetsPiercings.tw b/src/utility/descriptionWidgetsPiercings.tw
index 3743cce78ded2877c1de00d12a8c8c7e09252adf..06c84921fa74eb42127dffe6b05adf380bca8ec7 100644
--- a/src/utility/descriptionWidgetsPiercings.tw
+++ b/src/utility/descriptionWidgetsPiercings.tw
@@ -480,7 +480,7 @@ $He has a corset piercing, a ladder of steel rings running up each side of $his
<<case "a tube top" "a tube top and thong" "a slutty klan robe" "a slutty pony outfit" "a sports bra" "a tank-top and panties" "leather pants and a tube top">>
the piercings are only partly visible on $his back.
-<<case "a button-up shirt" "a button-up shirt and panties" "a police uniform" "a t-shirt" "a t-shirt and jeans" "a t-shirt and panties" "a t-shirt and thong" "a tank-top" "an oversized t-shirt" "an oversized t-shirt and boyshorts" "sport shorts and a sports bra" "sport shorts and a t-shirt">>
+<<case "a button-up shirt" "a button-up shirt and panties" "a police uniform" "a t-shirt and jeans" "a t-shirt and panties" "a t-shirt and thong" "a t-shirt" "a tank-top" "an oversized t-shirt and boyshorts" "an oversized t-shirt" "sport shorts and a sports bra" "sport shorts and a t-shirt">>
$his shirt hides them completely, but they're laced tightly, so $he's aware they're there.
<<case "a sweater" "a sweater and cutoffs" "a sweater and panties">>
diff --git a/src/utility/descriptionWidgetsTattoos.tw b/src/utility/descriptionWidgetsTattoos.tw
index 41a8635fbab302f0df7fb27fa2129b147af29dc3..87286810190fd564bab77d60f741e8145febc684 100644
--- a/src/utility/descriptionWidgetsTattoos.tw
+++ b/src/utility/descriptionWidgetsTattoos.tw
@@ -404,7 +404,7 @@
$activeSlave.buttTat
<</switch>>
<</if>>
-<<if ($activeSlave.brand != 0) && ["left buttock", "right buttock", "buttocks", "left thigh", "right thigh", "thighs"].includes($activeSlave.brandLocation)>>
+<<if ($activeSlave.brand != 0) && ["buttocks", "left buttock", "left thigh", "right buttock", "right thigh", "thighs"].includes($activeSlave.brandLocation)>>
<<brandDescription>>
<</if>>
<</widget>>
diff --git a/src/utility/saRulesWidgets.tw b/src/utility/saRulesWidgets.tw
index 047707e8a0a16fbd5ff0c2037b09c54e1f161b5a..38b5e07c4fc0ffb3d89d249e3e719f023071edcb 100644
--- a/src/utility/saRulesWidgets.tw
+++ b/src/utility/saRulesWidgets.tw
@@ -221,7 +221,7 @@ and
<</if>>
<</if>>
<</if>> /* close overactive balls block */
- <<if $slaves[$i].drugs == "super fertility drugs" && canImpreg($slaves[$i], $PC)>>
+ <<if $slaves[$i].drugs == "super fertility drugs" && canImpreg($slaves[$i], $PC)>>
<<if ($slaves[$i].devotion > 20) || ($slaves[$i].trust < -20)>>
$His reproductive system is in overdrive leading $him to come to you for insemination several times a day; $he @@.mediumaquamarine;desperately hopes@@ for the day your seed takes root in $his womb.
<<set $slaves[$i].trust += 1>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 0c4616de86867c5802d7d4ca8d89a617b7bb7ecd..129225ead1d4956f7ea9ee32296b4a37886f242d 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -788,7 +788,7 @@
<<widget "ToggleFetish">>
<<if ($args[0] == 0)>>
- <<set $activeSlave.fetish = either("none", "none", "none", "none", "none", "none", "none", "none", "none", "none", "submissive", "cumslut", "humiliation", "buttslut", "boobs", "pregnancy", "dom", "sadist", "masochist"), $activeSlave.fetishKnown = 0>>
+ <<set $activeSlave.fetish = either("boobs", "buttslut", "cumslut", "dom", "humiliation", "masochist", "none", "none", "none", "none", "none", "none", "none", "none", "none", "none", "pregnancy", "sadist", "submissive"), $activeSlave.fetishKnown = 0>>
<<replace "#fetishblock">>
//Not known.//
<<link "Known">>
@@ -2550,7 +2550,7 @@
<<set $activeSlave.behavioralFlaw = "gluttonous">>
<</if>>
<<if $activeSlave.fetish == "none">>
- <<set $activeSlave.fetish = either("submissive", "cumslut", "humiliation", "buttslut", "boobs", "pregnancy", "dom", "sadist", "masochist")>>
+ <<set $activeSlave.fetish = either("boobs", "buttslut", "cumslut", "dom", "humiliation", "masochist", "pregnancy", "sadist", "submissive")>>
<</if>>
<<set $activeSlave.fetishStrength = random(60,90)>>
<<if random(1,100) <= 5 && $activeSlave.fetish != "mindbroken">>
@@ -2751,7 +2751,7 @@
<<set $activeSlave.nationality = "Stateless">>
<<set $activeSlave.devotion = 40>>
<<set $activeSlave.trust = -100>>
- <<set $activeSlave.career = either("a politician", "a college scout", "a business owner", "a house DJ", "a soldier", "a prison guard", "a doctor", "a counselor", "a dairy worker", "a secretary", "a teacher")>>
+ <<set $activeSlave.career = either("a business owner", "a college scout", "a counselor", "a dairy worker", "a doctor", "a house DJ", "a politician", "a prison guard", "a secretary", "a soldier", "a teacher")>>
<<set $activeSlave.intelligence = Intelligence.random({limitIntelligence: [20,100]})>>
<<set $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.health = random(-99,-50)>>
@@ -2900,8 +2900,8 @@
<<set $activeSlave.analSkill = random(15,100)>>
<<set $activeSlave.anus = random(1,3)>>
<<set $activeSlave.weight = Math.clamp(-25, 25, $activeSlave.weight)>>
- <<set $activeSlave.behavioralFlaw = either("arrogant", "bitchy", "odd", "hates men", "hates women", "hates women", "anorexic", "gluttonous", "devout", "liberated")>>
- <<set $activeSlave.sexualFlaw = either("hates oral", "hates anal", "hates penetration", "repressed", "idealistic", "shamefast", "apathetic", "crude", "judgemental")>>
+ <<set $activeSlave.behavioralFlaw = either("anorexic", "arrogant", "bitchy", "devout", "gluttonous", "hates men", "hates women", "hates women", "liberated", "odd")>>
+ <<set $activeSlave.sexualFlaw = either("apathetic", "crude", "hates anal", "hates oral", "hates penetration", "idealistic", "judgemental", "repressed", "shamefast")>>
<<if random(1,2) == 1>>
<<set _slaveGen = random(2,8)*200>>
<<set $activeSlave.boobs += _slaveGen>>
@@ -3299,8 +3299,8 @@
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $activeSlave.birthWeek = 0>>
- <<set $activeSlave.sexualFlaw = either("none", "apathetic")>>
- <<set $activeSlave.behavioralFlaw = either("none", "arrogant", "odd")>>
+ <<set $activeSlave.sexualFlaw = either("apathetic", "none")>>
+ <<set $activeSlave.behavioralFlaw = either("arrogant", "none", "odd")>>
<<set $activeSlave.hStyle = "short">>
<<set $activeSlave.hLength = 2>>
<<set $activeSlave.customTat = "She has the baroque crest of the Gymnasium-Academy that trained her branded into her left cheek.">>
@@ -3461,7 +3461,7 @@
<</if>>
<<set $activeSlave.origin = "You bought her from the enigmatic Futanari Sisters after they sold her into slavery.">>
<<set $activeSlave.career = "a Futanari Sister">>
- <<set $activeSlave.faceShape = either("sensual", "exotic")>>
+ <<set $activeSlave.faceShape = either("exotic", "sensual")>>
<<set $activeSlave.pubertyXY = 1>>
<<set _sisterAge = random(1,5)>>
<<if _sisterAge == 1>>
@@ -3523,7 +3523,7 @@
<<set $activeSlave.waist = random(-30,10)>>
<<set $activeSlave.vagina = 2>>
<<set $activeSlave.anus = 2>>
- <<set $activeSlave.fetish = either("submissive", "buttslut", "cumslut")>>
+ <<set $activeSlave.fetish = either("buttslut", "cumslut", "submissive")>>
<<elseif _sisterAge == 3>>
<<set $activeSlave.intelligence = 0>>
<<set $activeSlave.hips = 2>>