diff --git a/devNotes/AnatomyOfAFreeCitiesEvent.txt b/devNotes/AnatomyOfAFreeCitiesEvent.txt
index 3bd915117c8100bae6a7d87206daceb1d65972e1..5a6ac0cba79470c0cda7124c4bfa60431d7118fa 100644
--- a/devNotes/AnatomyOfAFreeCitiesEvent.txt
+++ b/devNotes/AnatomyOfAFreeCitiesEvent.txt
@@ -30,7 +30,7 @@ Immediate effects
Every event can have immediate effects, which happen when the event gets chosen. For most events, those are what should happen if the player ignores the event (by hitting "Continue" or the space bar on the keyboard). Choice effects (see below) can override or roll back those.
- reRecuit (4-19)
+ reRecuit (4-19)
<<if Array.isArray($recruit)>>
<<if $cheatMode == 1>>
<<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */
@@ -71,17 +71,17 @@ Choices should also be hidden when they run against the game rules, like for exa
diary (313-325)
<<if $dairyFeedersUpgrade == 1>>
- The milking machines can hold feeders in slaves' mouths and inject drugs into their bodies, ensuring ideal nutrition and production.
- <br> The feeders are
- <<if $dairyFeedersSetting == 2>>
- ''industrial.'' [[Moderate|Dairy][$dairyFeedersSetting = 1, $dairyFeedersSettingChanged = -1]]
- <<elseif $dairyFeedersSetting == 1>>
- ''active.'' [[Inactive|Dairy][$dairyFeedersSetting = 0]]<<if ($seeExtreme != 0) && ($dairyRestraintsSetting == 2)>> | [[Industrial|Dairy][$dairyFeedersSetting = 2, $dairyFeedersSettingChanged = 1]]<</if>>
- <<else>>
- ''inactive.'' [[Active|Dairy][$dairyFeedersSetting = 1]]
- <</if>>
+ The milking machines can hold feeders in slaves' mouths and inject drugs into their bodies, ensuring ideal nutrition and production.
+ <br> The feeders are
+ <<if $dairyFeedersSetting == 2>>
+ ''industrial.'' [[Moderate|Dairy][$dairyFeedersSetting = 1, $dairyFeedersSettingChanged = -1]]
+ <<elseif $dairyFeedersSetting == 1>>
+ ''active.'' [[Inactive|Dairy][$dairyFeedersSetting = 0]]<<if ($seeExtreme != 0) && ($dairyRestraintsSetting == 2)>> | [[Industrial|Dairy][$dairyFeedersSetting = 2, $dairyFeedersSettingChanged = 1]]<</if>>
+ <<else>>
+ ''inactive.'' [[Active|Dairy][$dairyFeedersSetting = 1]]
+ <</if>>
<<else>>
- $dairyNameCaps is equipped to feed and clean slaves normally. [[Upgrade the milking machines with intubators|Dairy][$cash -= _Tmult1, $dairyFeedersUpgrade = 1]] //Costs ¤_Tmult1 and will increase upkeep costs//
+ $dairyNameCaps is equipped to feed and clean slaves normally. [[Upgrade the milking machines with intubators|Dairy][$cash -= _Tmult1, $dairyFeedersUpgrade = 1]] //Costs ¤_Tmult1 and will increase upkeep costs//
<</if>>
In order to enable the industrial feeder option both any of the see extreme content options has be enabled and the restraint's have to be already set to industrial.
@@ -115,10 +115,10 @@ A choice doesn't need to have a specific effect. If your event has an immediate
<</replace>>
<</link>>
<<if $cash >= 2000>>
- <br><<link "Take the poor slave girl into your custody">>
- <<replace "#result">>
- Confronting the citizen is simplicity in itself; he would not dare defy you under threat of arrest by your security drones and is unlikely to garner any sympathy from the public for his degradationist behaviors. As such, you are able to take civil ownership over the poor slave girl and take her into your care with only minimal compensation to the citizen. As you stride away from her former owner with the girl in your arms, she leans over to plant a chaste kiss of thanks on your cheek.
- <<set $cash -= 2000>>
+ <br><<link "Take the poor slave girl into your custody">>
+ <<replace "#result">>
+ Confronting the citizen is simplicity in itself; he would not dare defy you under threat of arrest by your security drones and is unlikely to garner any sympathy from the public for his degradationist behaviors. As such, you are able to take civil ownership over the poor slave girl and take her into your care with only minimal compensation to the citizen. As you stride away from her former owner with the girl in your arms, she leans over to plant a chaste kiss of thanks on your cheek.
+ <<set $cash -= 2000>>
<<set $activeSlaveOneTimeMaxAge = 22>>
<<include "Generate New Slave">>
<<set $activeSlave.origin = "She was taken into your custody from an abusive owner.">>
@@ -130,8 +130,8 @@ A choice doesn't need to have a specific effect. If your event has an immediate
<<set $activeSlave.health = random(10,20)>>
<<include "New Slave Intro">>
<<set $nextLink = "AS Dump", $returnTo = "RIE Eligibility Check">>
- <</replace>>
- <</link>> // Taking custody of the girl will cost ¤2000. //
+ <</replace>>
+ <</link>> // Taking custody of the girl will cost ¤2000. //
<</if>>
<br><<link "Publicly confront the citizen">>
<<replace "#result">>
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 174d2c8b7b2b6ebacb5be628c3fdf909993a844a..d723d796cb412d74c5a3168a37ed959c50e8ef88 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -1,4 +1,4 @@
-Pregmod
+Pregmod
0.10.7.1-2.1.x
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index aefeb7daa54ab81fbdb9587926c9fd7a6f2783c2..120a84eb27414cd5af33dbe8f41de7b69fb25d4d 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -2682,28 +2682,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:
@@ -3506,19 +3506,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..05714e0fcf94d78ac44b31270bbf8ba78204126c 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>>
@@ -501,40 +501,7 @@
<<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>>
@@ -568,73 +535,137 @@
<<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">>
+
+ /* 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 == "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 $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.15>>
- <<set _tacChance += 0.25>>
- <<elseif $chosenTactic == "Human Wave">>
- <<set _atkMod -= 0.15>>
- <<set _defMod -= 0.15>>
- <<set _tacChance -= 0.30>>
+ <<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>>
+ <</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>>
+
+ /* 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>>
<<elseif $battleTerrain == "coast">>
<<if $chosenTactic == "Bait and Bleed">>
@@ -736,39 +767,27 @@
<<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>>
+
+ <<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>>
<</if>>
@@ -792,7 +811,9 @@
<<elseif $attackType == "freedom fighters">>
<<set _tacChance -= 0.25>>
<</if>>
-<<elseif $chosenTactic == "Choke Points">>
+
+ <<set _enemyMoraleTroopMod = Math.clamp($attackTroops / 100,1,5)>>
+
<<if $attackType == "raiders">>
<<set _tacChance += 0.25>>
<<elseif $attackType == "free city">>
@@ -802,15 +823,16 @@
<<elseif $attackType == "freedom fighters">>
<<set _tacChance += 0.05>>
<</if>>
-<<elseif $chosenTactic == "Interior Lines">>
- <<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>>
+
+ /* 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 == "Pincer Maneuver">>
<<if $attackType == "raiders">>
@@ -966,208 +988,22 @@
<<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>>
-
-/* 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>>
@@ -1200,39 +1036,95 @@ __Enemy__:
<<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>>
+ __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>>
-<</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>>
+
+ /* 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>>
+
+ /* 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>>
-<<if $showBattleStatistics == 1>>
- <br>
- <br>Losses: <<print commaNum(Math.trunc($losses))>>
- <br>Enemy losses: <<print commaNum(Math.trunc($enemyLosses))>>
-<</if>>
+ <<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 $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">>
+ <<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>>
diff --git a/src/SecExp/unitsRebellionReport.tw b/src/SecExp/unitsRebellionReport.tw
index 3d362d09c22a42c9371dd08c3e0eca3edc58b3ba..fb3230c27ba8515cc145178f6f9c0b844e77ba98 100644
--- a/src/SecExp/unitsRebellionReport.tw
+++ b/src/SecExp/unitsRebellionReport.tw
@@ -104,8 +104,7 @@
/* slaves */
<<set _slaveRebelledID = []>>
<<set _slaveManpower = 0>>
- <br>
- <br>
+ <br><br>
<<for _j = 0; _j < $slaveUnits.length; _j++>>
<<if $slaveUnits[_j].active == 1 && $rebellingID.includes($slaveUnits[_j].ID)>>
$slaveUnits[_j].platoonName,
@@ -158,8 +157,7 @@
/* mercs */
<<set _mercRebelledID = []>>
<<set _mercManpower = 0>>
- <br>
- <br>
+ <br><br>
<<for _j = 0; _j < $mercUnits.length; _j++>>
<<if $mercUnits[_j].active == 1 && $rebellingID.includes($mercUnits[_j].ID)>>
$mercUnits[_j].platoonName,
@@ -297,8 +295,7 @@
/* assigns the losses and notify the player */
<<if $irregulars > 0>>
- <br>
- <br>
+ <br><br>
<<set _loss = _lossesList.pluck()>>
<<if _loss > $ACitizens * 0.95>>
<<set _loss = Math.trunc($ACitizens * 0.95)>> /* this is unlikely to happen, but might as well be safe*/
@@ -341,8 +338,7 @@
<</if>>
<</if>>
<<if $secBots.active == 1>>
- <br>
- <br>
+ <br><br>
<<set _loss = _lossesList.pluck()>>
<<set _loss = Math.clamp(_loss,0,$secBots.troops)>>
<<set $secBots.troops -= _loss>>
@@ -367,8 +363,7 @@
<</if>>
<</if>>
<<if $SF.Toggle && $SF.Active >= 1>>
- <br>
- <br>
+ <br><br>
<<set _loss = _lossesList.pluck()>>
<<set _loss = Math.clamp(_loss,0,$SF.Squad.Troops)>>
$SF.Lower, $SF.Squad.Troops strong, is called to join the battle:
@@ -389,8 +384,7 @@
<<if $deployingMilitia == 1>>
<<for _j = 0; _j < $militiaUnits.length; _j++>>
<<if $militiaUnits[_j].active == 1 && $loyalID.includes($militiaUnits[_j].ID)>>
- <br>
- <br>
+ <br><br>
<<set $militiaUnits[_j].battlesFought++>>
<<set _loss = _lossesList.pluck()>>
<<set _loss = Math.clamp(_loss,0,$militiaUnits[_j].troops)>>
@@ -434,8 +428,7 @@
<<set _med = 0>>
<<for _j = 0; _j < $slaveUnits.length; _j++>>
<<if $slaveUnits[_j].active == 1 && $loyalID.includes($slaveUnits[_j].ID)>>
- <br>
- <br>
+ <br><br>
<<set $slaveUnits[_j].battlesFought++>>
<<set _loss = _lossesList.pluck()>>
<<if !(Number.isInteger(_loss))>>
@@ -482,8 +475,7 @@
<<if $deployingMercs == 1>>
<<for _j = 0; _j < $mercUnits.length; _j++>>
<<if $mercUnits[_j].active == 1 && $loyalID.includes($mercUnits[_j].ID)>>
- <br>
- <br>
+ <br><br>
<<set $mercUnits[_j].battlesFought++>>
<<set _loss = _lossesList.pluck()>>
<<set _loss = Math.clamp(_loss,0,$mercUnits[_j].troops)>>
@@ -523,8 +515,7 @@
<</if>>
<</for>>
<</if>>
- <br>
- <br>
+ <br><br>
<<if $rebellingID.length > 0 && $battleResult >= 2>>
/* win */
/* militia */
diff --git a/src/SpecialForce/Upgrades.tw b/src/SpecialForce/Upgrades.tw
index 1fe617a441ff48d8fb447c11c227e5a9e67fd441..11c560502b55d7704572b42cf3c75743da294481 100644
--- a/src/SpecialForce/Upgrades.tw
+++ b/src/SpecialForce/Upgrades.tw
@@ -116,7 +116,7 @@
<<else>>//Cannot afford to upgrade Transport Vehicle Fleet.//<</if>>
- //Costs @@.yellowgreen;<<print cashFormat(_cTV)>>@@//<span style="float:right;"><<print progress($SF.Squad.TV)>> </span>
+ //Costs @@.yellowgreen;<<print cashFormat(_cTV)>>@@//<span style="float:right;"><<print progress($SF.Squad.TV)>> </span>
<<elseif $SF.Squad.TV == _TVU>>//The Transport Vehicle Fleet has been fully upgraded.//<span style="float:right;"><<print progress($SF.Squad.TV)>></span>
diff --git a/src/art/artJS.js b/src/art/artJS.js
index eec18a632ece6b05ae0ed0be9eba33191fec8d55..30a25baec93a307b6b6549b2984ec07759fdb9c9 100644
--- a/src/art/artJS.js
+++ b/src/art/artJS.js
@@ -72,12 +72,11 @@ window.ArtControlRendered = function ArtControlRendered(slave, sizePlacement) {
/*
This takes a textual hair color description and tries to guess the appropriate HTML compliant color code.
-
-color should be a color name, but can also be a string describing hair color.
+Color should be a color name, but can also be a string describing hair color.
eyes can be nearly anything, it only indicates that the function is being used for eye color instead of hair color.
-
This code's working is described to the user in the Encyclopedia, chapter "Lore", section "Dyes".
*/
+
window.extractColor = function (color, eyes) {
/*
these are color names known and used in FreeCities
diff --git a/src/art/assistantArt.js b/src/art/assistantArt.js
index b441c2fb827b246662cdf479524409867ac45260..5b8130f2031086c0f84ce7fa9ba2991542877e5a 100644
--- a/src/art/assistantArt.js
+++ b/src/art/assistantArt.js
@@ -12,7 +12,7 @@ window.assistantArt = function assistantArt(sizePlacement) {
if (V.imageChoice === 0 || V.imageChoice === 1) {
if (V.imageChoice === 1) {
- switch (V.assistantAppearance) {
+ switch (V.assistantAppearance) {
case "monstergirl":
fileName = "'data:image/png;base64,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'";
break;
@@ -63,7 +63,7 @@ window.assistantArt = function assistantArt(sizePlacement) {
break;
default:
fileName = "'data:image/png;base64,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'";
- }
+ }
} else /* V.imageChoice === 0*/ {
fileName += "'resources/renders/assistant ";
switch (V.assistantAppearance) {
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/debugging/debugWidgets.tw b/src/debugging/debugWidgets.tw
index b4d13efc7b22536bd3b063747a4c3eaadd47dab3..ef640d1eacc76f2dc5ba350918d032cc65dc3032 100644
--- a/src/debugging/debugWidgets.tw
+++ b/src/debugging/debugWidgets.tw
@@ -22,7 +22,7 @@ The included "Go Back" link is intended to replace the usual NextButton.
<br>
Differences:
<<if _diffArrayFromNew.length > 0>>
- <<for _i = 0; _i < _diffArrayFromNew.length; _i++>> /* Print variable names, and changed values. Will output the new values correctly, may not output old values correctly */
+ <<for _i = 0; _i < _diffArrayFromNew.length; _i++>> /* Print variable names, and changed values. Will output the new values correctly, may not output old values correctly */
<<if _diffArrayFromNew[_i].variable != "nextButton" && _diffArrayFromNew[_i].variable != "nextLink" && _diffArrayFromNew[_i].variable != "args">>
<br> Variable: <<print _diffArrayFromNew[_i].variable>>, Original Value: <<print _diffArrayFromNew[_i].oldVal>>, New Value: <<print _diffArrayFromNew[_i].newVal>>
<</if>>
diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw
index 8786c347863cf4e07299d79de9084df3ad81cf88..cea2e129407c815f373af384b51dc7e8d09a932e 100644
--- a/src/facilities/farmyard/farmyardReport.tw
+++ b/src/facilities/farmyard/farmyardReport.tw
@@ -95,7 +95,7 @@
$His turgid dick helps $him manage $his workers.
<<set $FarmerCashBonus += 0.05>>
<</if>>
-
+
<<for _dI = 0; _dI < _DL; _dI++>>
<<set $i = $slaveIndices[$FarmyardiIDs[_dI]]>>
<<if $Farmer.rivalryTarget == $slaves[$i].ID>>
@@ -128,7 +128,7 @@
<<set $slaves[$i].trust++, $FarmerCashBonus += 0.05>>
<</if>>
<</for>>
-
+
<<set _oldCash = $cash>>
<<if (_DL < 5)>>
/* TODO: will we need this block?
@@ -317,7 +317,7 @@
<<set $food += _foodWeek>>
<<if $farmyardDecoration != "standard">>
- <br>$farmyardNameCaps's customers enjoyed
+ <br>$farmyardNameCaps's customers enjoyed
<<if $seeBestiality == 1 && $farmyardBreeding > 0 && ($canines.length > 0 || $hooved.length > 0 || $felines.length > 0)>>
@@.green;watching farmhands fuck animals in $farmyardDecoration surroundings.@@
<<elseif $farmyardShows == 1>>
diff --git a/src/facilities/nursery/childSummary.tw b/src/facilities/nursery/childSummary.tw
index 617469096500ffcf3b604fab92cd7466be2b9069..0eda81903843d86aaea0abac4bb20071c8b481d8 100644
--- a/src/facilities/nursery/childSummary.tw
+++ b/src/facilities/nursery/childSummary.tw
@@ -5,7 +5,7 @@
"Nursery" c => (c.assignmentVisible == 1 && c.fuckdoll == 0),
"Personal Attention Select": c => (c.assignmentVisible == 1 && c.fuckdoll <= 0) && (
($Flag == 0 && c.assignment != "be a child")
- || ($Flag == 1 && c.assignment == "be a child")
+ || ($Flag == 1 && c.assignment == "be a child")
),
"New Game Plus": c => (($Flag == 0 && c.assignment != "be imported") || ($Flag != 0 && c.assignment == "be imported")),
"Rules Slave Select": c => (($Flag == 0 && !ruleSlaveSelected(s, $currentRule)) || ($Flag != 0 && ruleSlaveSelected(s, $currentRule))),
diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index 3ccf1f25fb50f678201b0ffa013b2456102e413c..fc748c7fdb35ae4cb02ba0dd84f14437e6b93fc5 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/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index 78098219fb314c8c2d417af2e628745801c4b9d7..1b9d83f97065287a7859050d1a751ed7adba7df0 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -407,7 +407,7 @@ Target age for release: <<textbox "$targetAgeNursery" $targetAgeNursery "Nursery
Children are purposefully getting more exercise than recommended; excessive muscle gain likely.
[[Limit exercise|Nursery][$nurseryMusclesSetting = 1]] | [[Disable|Nursery][$nurseryMusclesSetting = 0]]
<<elseif $nurseryMusclesSetting == 1>>
- Excercise is being carefully managed; children will be raised with average strength.
+ Exercise is being carefully managed; children will be raised with average strength.
[[More exercise|Nursery][$nurseryMusclesSetting = 2]] | [[Disable|Nursery][$nurseryMusclesSetting = 0]]
<<elseif $nurseryMusclesSetting == 0>>
Children are no getting any exercise; they will likely be extremely weak.
@@ -592,7 +592,7 @@ Filter by assignment: |
| <<print "[[Abuse her|FAbuse][$activeSlave = $cribs["+$i+"], $childSex = 1, $nextButton = _j,$nextLink = _k,$returnTo = _l]]">>
<<else>>
all of her holes equally, but for now://
- <br> <<print "[[Use her mouth|FLips][$activeSlave = $cribs["+$i+"], $childSex = 1, $nextButton = _j, $nextLink = _k, $returnTo = _l]]">> | <<print "[[Play with her tits|FBoobs][$activeSlave = $cribs["+$i+"], $childSex = 1, $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
+ <br> <<print "[[Use her mouth|FLips][$activeSlave = $cribs["+$i+"], $childSex = 1, $nextButton = _j, $nextLink = _k, $returnTo = _l]]">> | <<print "[[Play with her tits|FBoobs][$activeSlave = $cribs["+$i+"], $childSex = 1, $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
<<if canDoVaginal($cribs[$i])>>
| <<print "[[Fuck her|FVagina][$activeSlave = $cribs["+$i+"], $childSex = 1, $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
<<if canDoAnal($cribs[$i])>>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index a0f54669b9e792174370c7fbeadef4c0a3fe4820..f48636c0d322a9198dbe402fe5151a3d2657e8e9 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -216,7 +216,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>>
@@ -358,7 +357,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>>
@@ -494,7 +493,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>>
@@ -878,7 +877,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>>
@@ -1465,8 +1464,8 @@ electrolarynx: 0,
erectileImplant: 0
} >>
-<<set $merchantFSWares = ["GenderRadicalistResearch", "TransformationFetishistResearch", "AssetExpansionistResearch", "SlimnessEnthusiastResearch", "YouthPreferentialistResearch", "HedonisticDecadenceResearch"]>>
-<<set $merchantIllegalWares = ["childhoodFertilityInducedNCS", "UterineRestraintMesh", "RapidCellGrowthFormula", "PGHack", "sympatheticOvaries", "asexualReproduction"]>> /* "AnimalOrgans" for future use */
+<<set $merchantFSWares = ["AssetExpansionistResearch", "GenderRadicalistResearch", "HedonisticDecadenceResearch", "SlimnessEnthusiastResearch", "TransformationFetishistResearch", "YouthPreferentialistResearch"]>>
+<<set $merchantIllegalWares = ["asexualReproduction", "childhoodFertilityInducedNCS", "PGHack", "RapidCellGrowthFormula", "sympatheticOvaries", "UterineRestraintMesh"]>> /* "AnimalOrgans" for future use */
<<set $RapidCellGrowthFormula = 0>>
<<set $UterineRestraintMesh = 0>>
<<set $PGHack = 0>>
diff --git a/src/js/SetBellySize.js b/src/js/SetBellySize.js
index 6b9cc142ca3a00412b617c93d04cb89f31f16376..cc164d372eaac91885b57e1079896b982eaf171d 100644
--- a/src/js/SetBellySize.js
+++ b/src/js/SetBellySize.js
@@ -1,6 +1,7 @@
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/assayJS.js b/src/js/assayJS.js
index 47e539a8d80c0f0ae37083a0a02f648bc00a0f89..f778ef1d8e78c1d3ccdc56ac821477b0de3f5c40 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -1813,7 +1813,7 @@ window.DegradingName = function DegradingName(slave) {
} else if (slave.intelligence+slave.intelligenceImplant < -50) {
names.push("Cretin", "Dumb", "Retarded", "Stupid");
}
- if (slave.vagina === 1 && slave.vaginaSkill <= 10) {
+ if (slave.vagina === 1 && slave.vaginalSkill <= 10) {
names.push("Fresh", "New", "Tight");
}
if (slave.devotion < -75) {
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index fa9fa3b048dfdf5d4ebedeb90cc9d3c4ff001ec2..419284878d70ba628235d22ffbdb5559b649b8c9 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -1253,7 +1253,7 @@ window.EconomyDatatypeCleanup = function EconomyDatatypeCleanup() {
V.lowerClass = Math.max(+V.lowerClass, 0) || 3120;
}
if (V.LCRent !== 0) {
- V.LCRent = Math.max(+V.LCRent, 0) || 20;
+ V.LCRent = Math.max(+V.LCRent, 0) || 20;
}
V.MCBase = Math.max(+V.MCBase, 0) || 200; /* nowhere modified */
@@ -1262,7 +1262,7 @@ window.EconomyDatatypeCleanup = function EconomyDatatypeCleanup() {
V.middleClass = Math.max(+V.middleClass, 0) || 890;
}
if (V.MCRent !== 0) {
- V.MCRent = Math.max(+V.MCRent, 0) || 50;
+ V.MCRent = Math.max(+V.MCRent, 0) || 50;
}
V.UCBase = Math.max(+V.UCBase, 0) || 40; /* nowhere modified */
@@ -1271,7 +1271,7 @@ window.EconomyDatatypeCleanup = function EconomyDatatypeCleanup() {
V.upperClass = Math.max(+V.upperClass, 0) || 200;
}
if (V.UCRent !== 0) {
- V.UCRent = Math.max(+V.UCRent, 0) || 175;
+ V.UCRent = Math.max(+V.UCRent, 0) || 175;
}
V.TCBase = Math.max(+V.TCBase, 0) || 20; /* nowhere modified */
@@ -1280,7 +1280,7 @@ window.EconomyDatatypeCleanup = function EconomyDatatypeCleanup() {
V.topClass = Math.max(+V.topClass, 0) || 38;
}
if (V.TCRent !== 0) {
- V.TCRent = Math.max(+V.TCRent, 0) || 650;
+ V.TCRent = Math.max(+V.TCRent, 0) || 650;
}
};
diff --git a/src/js/sexActsJS.js b/src/js/sexActsJS.js
index b6307e9e08fb227f01fbb25a20ff809bf43348b0..5276ff697a8eb07e10236580fbef2b4bec43b3f6 100644
--- a/src/js/sexActsJS.js
+++ b/src/js/sexActsJS.js
@@ -296,6 +296,7 @@ window.PartnerVCheck = function PartnerVCheck(analTimes, bothTimes) {
let He = capFirstChar(he);
let 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.js b/src/js/wombJS.js
index a4f88a287b44901131a43e2faacc341811bb2f9b..a5db8aec38f3edbc66428c2abff6cc3c2cef0fb3 100644
--- a/src/js/wombJS.js
+++ b/src/js/wombJS.js
@@ -1,5 +1,5 @@
/*
-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/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/pregmod/fSlaveSlaveVag.tw b/src/pregmod/fSlaveSlaveVag.tw
index ae584a4152d20a1b701983e198ef004dea3bf0ee..a2da70af1f7963f607c336fc6d17fccc9091294e 100644
--- a/src/pregmod/fSlaveSlaveVag.tw
+++ b/src/pregmod/fSlaveSlaveVag.tw
@@ -1,6 +1,5 @@
:: FSlaveSlaveVag [nobr]
-
<<set $nextButton = "Back", $nextLink = "Slave Interact">>
<<set $slaverapistx = 0, $eligibility = 0>>
diff --git a/src/pregmod/rePregInventor.tw b/src/pregmod/rePregInventor.tw
index a468df343e31c6a786453ccf862723eacfda0845..f8451baa1d2171f0d2b23866ae8d816092ca1189 100644
--- a/src/pregmod/rePregInventor.tw
+++ b/src/pregmod/rePregInventor.tw
@@ -356,7 +356,7 @@
<<set $pregInventions = 1>>
<<set $activeSlave.trust += 4, $activeSlave.devotion += 10>>
<</replace>>
- <</link>> // This will cost <<= cashFormat(10000)>>//
+ <</link>> //This will cost <<= cashFormat(10000)>>//
<</if>>
</span>
<</replace>>
@@ -820,7 +820,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>>
@@ -850,7 +850,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>>
@@ -908,7 +908,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.">>
@@ -966,7 +966,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.">>
@@ -1024,7 +1024,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 2fa8b90bfec60d8d0d6ba6ad1c5a0eac22241488..cb37324eea64a412190d0abf2bdd13a631c7b7de 100644
--- a/src/pregmod/seBurst.tw
+++ b/src/pregmod/seBurst.tw
@@ -6,12 +6,12 @@
<<if $slaves[_b].burst == 1>>
<<if (($slaves[_b].belly > ($slaves[_b].pregAdaptation*3200)) || $slaves[_b].bellyPreg > 600000)>>
-
+
<<set $slaves[_b].curBabies = WombBirth($slaves[_b], $slaves[_b].pregData.minLiveBirth)>>
<<set $slaves[_b].curStillBirth = 0 >>
<<set _curBabies = $slaves[_b].curBabies.length>> /*just to improve speed and usability here.*/
<<set $birthsTotal += _curBabies>>
-
+
<<set _others = 0, _PC = 0, _citizens = 0, _oldMaster = 0, _arcOwner = 0, _lab = 0, _fathers = [], _babyFatherLink = []>>
<<for _cb = 0; _cb < $slaves[_b].curBabies.length; _cb++>>
<<if $slaves[_b].curBabies[_cb].fatherID == 0 || $slaves[_b].curBabies[_cb].fatherID == -5>>
@@ -129,7 +129,7 @@
/* ------------------------------------------------ */
$slaves[_b].slaveName's straining womb finally gave out and burst, taking $his
-
+
<<if _curBabies > 0>>
life, but not <<if _curBabies <= 1>>that of $his child<<else>>those of all $his children<</if>>;
<<if _fathersReduced.length > 2>>
@@ -273,7 +273,7 @@
<<set $reservedChildren = FetusGlobalReserveCount("incubator")>>
<<set $reservedChildrenNursery = FetusGlobalReserveCount("nursery")>>
-
+
<<elseif $slaves[_b].inflation != 0>>
<<pop $slaves[_b]>>
<</if>>
diff --git a/src/pregmod/widgets/economyWidgets.tw b/src/pregmod/widgets/economyWidgets.tw
index 841e1c9e2b1a2c9f06f1e94162078ec0cd3bc084..99e69b2ec2bfeb7c9fc696b3d437e454ac375eb8 100644
--- a/src/pregmod/widgets/economyWidgets.tw
+++ b/src/pregmod/widgets/economyWidgets.tw
@@ -459,7 +459,7 @@
<</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
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index 02dec838ce46faf5f2bf9ba5b95b61b223205de7..c57c03285d69eb82582863c7a88dfd319ed97a3f 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 94b3f45d306c1645193a7c6e7799852e05a45d1b..fb4fbecc0b55c04621e5a24acd67a310a94b6e02 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -543,7 +543,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>>
@@ -1046,10 +1046,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")>>
@@ -1255,19 +1255,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>>
@@ -2372,7 +2371,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"))>>
@@ -2753,23 +2752,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">>
@@ -2777,17 +2785,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>>
@@ -3053,49 +3052,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>>
@@ -3339,7 +3338,7 @@ Setting missing slave variables:
<<set _Slave = $genePool[_bci]>>
<<PMODinit _Slave>>
-
+
<<if $genePool.map(function(s) { return s.ID; }).count(_Slave.ID) > 1>> /* first check for duplicate IDs, keep the first entry and delete the others */
<<for _bci2 = _bci + 1; _bci2 < $genePool.length; _bci2++>>
<<if $genePool[_bci2].ID == _Slave.ID>>
@@ -3449,8 +3448,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 b0ac09113c329e1249fafd9a8cc2fb1210200678..563a26bad4913aa98200aa7069e867589f166ad9 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/RESS.tw b/src/uncategorized/RESS.tw
index 832151f04aca051c3f071fb2a09e5aa383e5a41c..073d9d570810342392b8b9275d855b3c0ac334ff 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.
@@ -8387,7 +8387,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 facefuck, 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.@@
@@ -9141,7 +9141,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>>
@@ -9245,10 +9245,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>>
@@ -9891,7 +9891,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.
@@ -10118,7 +10118,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
@@ -10450,11 +10450,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>>
@@ -10835,7 +10835,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)>>
@@ -11213,7 +11213,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>>
@@ -14173,10 +14173,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 $him 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
@@ -16095,11 +16095,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)>>
@@ -16148,7 +16148,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>>
@@ -16177,7 +16177,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>>
@@ -16223,7 +16223,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++>>
@@ -16234,7 +16234,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>>
@@ -16276,7 +16276,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>>
@@ -16293,9 +16293,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
@@ -16989,7 +16989,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.
@@ -17233,7 +17233,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 " + $he + " was serving the public.">>
<<set $activeSlave.origin = _origin>>
<<set $activeSlave.career = "a student">>
<<set $activeSlave.markings = "none", $activeSlave.weight = -20>>
@@ -17255,7 +17255,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 */
<<run cashX(-8333, "slaveTransfer", $activeSlave)>>
<</for>>
@@ -17331,7 +17331,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>>
@@ -17478,12 +17478,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">>
@@ -17491,11 +17491,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">>
@@ -17503,7 +17503,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">>
@@ -17511,15 +17511,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">>
@@ -19291,7 +19291,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>>
@@ -19883,7 +19883,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>>
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/assign.tw b/src/uncategorized/assign.tw
index 964791f95e4766d7027dcc0c5353a15710773f1c..9fb35d058a7c6fff5f76faa31fb1b3c4d9f0df69 100644
--- a/src/uncategorized/assign.tw
+++ b/src/uncategorized/assign.tw
@@ -16,7 +16,7 @@
<<case "Coursing Association">>
<<set $Lurcher = $activeSlave>>
<<goto $returnTo>>
-
+
<<default>>
<<= assignJob($activeSlave, $assignTo)>>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index 04aa173a28b88cabbab7ced8278b41baa164e4c0..f1fcebaf670da0fe88dd7586d5cb514446218482 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -21,45 +21,66 @@
<<unset $brandApplied>>
<</if>>
<<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>>
- <<if $degradation > 1>>
- <<if $degradation > 5>>
- <<if $activeSlave.devotion <= 50 && $activeSlave.trust < -50>>
- $He is appalled by the whorish spectacle you have made of $him. $He @@.gold;fears@@ you all the more for this but is so terrified of you it does not affect $his submission.
- <<set $activeSlave.trust -= 10>>
- <<elseif $activeSlave.devotion <= 50>>
- $He is appalled by the whorish spectacle you have made of $him. $He @@.mediumorchid;hates@@ and @@.gold;fears@@ you for this.
- <<set $activeSlave.devotion -= 10, $activeSlave.trust -= 10>>
+ <<if $degradation > 1>>
+ <<if $degradation > 5>>
+ <<if $activeSlave.devotion <= 50 && $activeSlave.trust < -50>>
+ $He is appalled by the whorish spectacle you have made of $him. $He @@.gold;fears@@ you all the more for this but is so terrified of you it does not affect $his submission.
+ <<set $activeSlave.trust -= 10>>
+ <<elseif $activeSlave.devotion <= 50>>
+ $He is appalled by the whorish spectacle you have made of $him. $He @@.mediumorchid;hates@@ and @@.gold;fears@@ you for this.
+ <<set $activeSlave.devotion -= 10, $activeSlave.trust -= 10>>
+ <<else>>
+ $He is shocked by the whorish spectacle you have made of $him. However, $he is so submissive to your will that $he @@.hotpink;accepts@@ that the slave <<if canSee($activeSlave)>>in the mirror<<else>>$he pictures<</if>> is who $he is now.
+ <<set $activeSlave.devotion += 4>>
+ <</if>>
+ <br><br>
<<else>>
- $He is shocked by the whorish spectacle you have made of $him. However, $he is so submissive to your will that $he @@.hotpink;accepts@@ that the slave <<if canSee($activeSlave)>>in the mirror<<else>>$he pictures<</if>> is who $he is now.
- <<set $activeSlave.devotion += 4>>
+ <<if $activeSlave.devotion < -20 && $activeSlave.trust < 20>>
+ $He is @@.gold;afraid@@ that $he has been permanently altered against $his will, but is also scared of your reaction to any objection and suppresses $his disgust.
+ <<set $activeSlave.trust -= 5>>
+ <<elseif $activeSlave.devotion < -20>>
+ $He is @@.mediumorchid;angry@@ and @@.gold;afraid@@ that $he has been permanently altered against $his will.
+ <<set $activeSlave.devotion -= 5, $activeSlave.trust -= 5>>
+ <<else>>
+ $He is saddened to have been altered against $his will. However, $he realizes that $he is a slave, so $he @@.hotpink;accepts@@ your work.
+ <<set $activeSlave.devotion += 4>>
+ <</if>>
<</if>>
- <br><br>
- <<else>>
- <<if $activeSlave.devotion < -20 && $activeSlave.trust < 20>>
- $He is @@.gold;afraid@@ that $he has been permanently altered against $his will, but is also scared of your reaction to any objection and suppresses $his disgust.
- <<set $activeSlave.trust -= 5>>
- <<elseif $activeSlave.devotion < -20>>
- $He is @@.mediumorchid;angry@@ and @@.gold;afraid@@ that $he has been permanently altered against $his will.
- <<set $activeSlave.devotion -= 5, $activeSlave.trust -= 5>>
- <<else>>
- $He is saddened to have been altered against $his will. However, $he realizes that $he is a slave, so $he @@.hotpink;accepts@@ your work.
- <<set $activeSlave.devotion += 4>>
+ <<set $degradation = 0>>
+ <</if>>
+ <<set _slaveBeforeSession = getSlave($activeSlave.ID)>>
+ <<if $activeSlave.tonguePiercing != _slaveBeforeSession.tonguePiercing>>
+ <<if $activeSlave.fetishKnown>>
+ <<if $activeSlave.fetishStrength > 10>>
+ <<if $activeSlave.fetish == "cumslut">>
+ Since $he's an oral whore, $he's
+ <<if $activeSlave.tonguePiercing > _slaveBeforeSession.tonguePiercing>>
+ <<if $activeSlave.tonguePiercing > 1>>@@.hotpink;very happy@@ you took the time to personally pierce $his tongue so heavily<<else>>@@.hotpink;happy@@ to get a tongue piercing from you personally<</if>>. After all, $he's pretty sure it's a sign there will be plenty of <<if $PC.dick>>dick for $him to suck<<else>>pussy for $him to eat<</if>> in the future.
+ <<set $activeSlave.devotion += ($activeSlave.tonguePiercing-_slaveBeforeSession.tonguePiercing)*2>>
+ <<elseif $activeSlave.devotion <= 95>>
+ @@.mediumorchid;saddened@@ you decided to take out $his tongue piercings yourself. $He's afraid this means something about $his future as a suck slut.
+ <<set $activeSlave.devotion += ($activeSlave.tonguePiercing-_slaveBeforeSession.tonguePiercing)*2>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<if $activeSlave.sexualFlaw == "hates oral">>
+ $He has trouble thinking of $his mouth as a warm, wet, playful hole, so $his new piercings will be therapeutic. Having something to suck on at all times should force $him past $his hangups.
+ <</if>>
<</if>>
<</if>>
- <<set $degradation = 0>>
- <</if>>
- <<set _slaveBeforeSession = getSlave($activeSlave.ID)>>
- <<if $activeSlave.tonguePiercing != _slaveBeforeSession.tonguePiercing>>
- <<if $activeSlave.fetishKnown>>
- <<if $activeSlave.fetishStrength > 10>>
- <<if $activeSlave.fetish == "cumslut">>
- Since $he's an oral whore, $he's
- <<if $activeSlave.tonguePiercing > _slaveBeforeSession.tonguePiercing>>
- <<if $activeSlave.tonguePiercing > 1>>@@.hotpink;very happy@@ you took the time to personally pierce $his tongue so heavily<<else>>@@.hotpink;happy@@ to get a tongue piercing from you personally<</if>>. After all, $he's pretty sure it's a sign there will be plenty of <<if $PC.dick>>dick for $him to suck<<else>>pussy for $him to eat<</if>> in the future.
- <<set $activeSlave.devotion += ($activeSlave.tonguePiercing-_slaveBeforeSession.tonguePiercing)*2>>
- <<elseif $activeSlave.devotion <= 95>>
- @@.mediumorchid;saddened@@ you decided to take out $his tongue piercings yourself. $He's afraid this means something about $his future as a suck slut.
- <<set $activeSlave.devotion += ($activeSlave.tonguePiercing-_slaveBeforeSession.tonguePiercing)*2>>
+ <<if $activeSlave.nipplesPiercing+$activeSlave.areolaePiercing != _slaveBeforeSession.nipplesPiercing+_slaveBeforeSession.areolaePiercing>>
+ <<if $activeSlave.fetishKnown>>
+ <<if $activeSlave.fetishStrength > 10>>
+ <<if $activeSlave.fetish == "boobs">>
+ Since $he's fixated on $his boobs, $he's
+ <<if $activeSlave.nipplesPiercing+$activeSlave.areolaePiercing > _slaveBeforeSession.nipplesPiercing+_slaveBeforeSession.areolaePiercing>>
+ <<if $activeSlave.nipplesPiercing+$activeSlave.areolaePiercing > 2>>@@.hotpink;very happy@@ you took the time to personally pierce them so heavily<<else>>@@.hotpink;happy@@ to get nipple piercings from you personally<</if>>. As far as $he's concerned, more attention on $his tits is always good.
+ <<set $activeSlave.devotion += ($activeSlave.nipplesPiercing+$activeSlave.areolaePiercing-_slaveBeforeSession.nipplesPiercing-_slaveBeforeSession.areolaePiercing)*2>>
+ <<elseif $activeSlave.devotion <= 95>>
+ @@.mediumorchid;saddened@@ you decided to take out $his nipple piercings yourself. $He doesn't like anything that makes $his tits less distinctive.
+ <<set $activeSlave.devotion += ($activeSlave.tonguePiercing-_slaveBeforeSession.tonguePiercing)*2>>
+ <</if>>
+ <</if>>
<</if>>
<</if>>
<</if>>
@@ -118,34 +139,43 @@
$He has trouble thinking of $his vagina as a fuckhole rather than something special to protect and cherish, so $his new piercings will be therapeutic. The constant, inescapable stimulation of $his labia should force $him past $his hang-ups.
<</if>>
<</if>>
- <</if>>
- <<if $activeSlave.dickPiercing != _slaveBeforeSession.dickPiercing>>
- <<if $activeSlave.fetishKnown>>
- <<if $activeSlave.fetishStrength > 10>>
- <<if $activeSlave.fetish == "pregnancy">>
- Since $he's fixated on using $his cock to impregnate other slaves, $he's
- <<if $activeSlave.dickPiercing > _slaveBeforeSession.dickPiercing>>
- <<if $activeSlave.dickPiercing > 1>>@@.hotpink;very happy@@ you took the time to personally stick so much metal into $his dick<<if $activeSlave.scrotum>> and ballsack<</if>><<else>>@@.hotpink;happy@@ to get penis piercings from you personally<</if>>. $He's extremely proud of $his newly decorated member.
- <<set $activeSlave.devotion += ($activeSlave.dickPiercing-_slaveBeforeSession.dickPiercing)*2>>
- <<elseif $activeSlave.devotion <= 95>>
- @@.mediumorchid;saddened@@ you decided to take out $his dick<<if $activeSlave.scrotum>> and ballsack<</if>> piercings yourself. $He passionately loves using $his penis, and $he's concerned you're planning to let $him do less of that.
- <<set $activeSlave.devotion += ($activeSlave.dickPiercing-_slaveBeforeSession.dickPiercing)*2>>
+ <<if $activeSlave.anusPiercing != _slaveBeforeSession.anusPiercing>>
+ <<if $activeSlave.fetishKnown>>
+ <<if $activeSlave.fetishStrength > 10>>
+ <<if $activeSlave.fetish == "buttslut">>
+ Since $he's an anal slut, $he's
+ <<if $activeSlave.anusPiercing > _slaveBeforeSession.anusPiercing>>
+ <<if $activeSlave.anusPiercing > 1>>@@.hotpink;very happy@@ you took the time to personally pierce the entire area around $his whorish asspussy<<else>>@@.hotpink;happy@@ to get a piercing next to $his favorite hole from you personally<</if>>. $He can't wait to find out how the metal will feel against $his butthole when $he moves around.
+ <<set $activeSlave.devotion += ($activeSlave.anusPiercing-_slaveBeforeSession.anusPiercing)*2>>
+ <<elseif $activeSlave.devotion <= 95>>
+ @@.mediumorchid;saddened@@ you decided to take out $his backdoor piercings yourself. $He will miss the constant anal titillation, and $he's worried this means you're becoming less interested in $his butthole.
+ <<set $activeSlave.devotion += ($activeSlave.anusPiercing-_slaveBeforeSession.anusPiercing)*2>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<if $activeSlave.sexualFlaw == "hates anal">>
+ $He has trouble thinking of $his asshole as a sexy, fuckable hole, so $his new piercings will be therapeutic. The constant tickling back there should force $him past $his hangups.
+ <</if>>
<</if>>
<</if>>
- <</if>>
- <</if>>
- <</if>>
- <<if $activeSlave.anusPiercing != _slaveBeforeSession.anusPiercing>>
- <<if $activeSlave.fetishKnown>>
- <<if $activeSlave.fetishStrength > 10>>
- <<if $activeSlave.fetish == "buttslut">>
- Since $he's an anal slut, $he's
- <<if $activeSlave.anusPiercing > _slaveBeforeSession.anusPiercing>>
- <<if $activeSlave.anusPiercing > 1>>@@.hotpink;very happy@@ you took the time to personally pierce the entire area around $his whorish asspussy<<else>>@@.hotpink;happy@@ to get a piercing next to $his favorite hole from you personally<</if>>. $He can't wait to find out how the metal will feel against $his butthole when $he moves around.
- <<set $activeSlave.devotion += ($activeSlave.anusPiercing-_slaveBeforeSession.anusPiercing)*2>>
- <<elseif $activeSlave.devotion <= 95>>
- @@.mediumorchid;saddened@@ you decided to take out $his backdoor piercings yourself. $He will miss the constant anal titillation, and $he's worried this means you're becoming less interested in $his butthole.
- <<set $activeSlave.devotion += ($activeSlave.anusPiercing-_slaveBeforeSession.anusPiercing)*2>>
+ <<if $activeSlave.genes == "XY">>
+ <<if $activeSlave.attrXY <= 35>>
+ <<if $activeSlave.earPiercing+$activeSlave.nosePiercing+$activeSlave.eyebrowPiercing+$activeSlave.lipsPiercing+$activeSlave.navelPiercing > _slaveBeforeSession.earPiercing+_slaveBeforeSession.nosePiercing+_slaveBeforeSession.eyebrowPiercing+_slaveBeforeSession.lipsPiercing+_slaveBeforeSession.navelPiercing>>
+ $His girly new
+ <<if $activeSlave.nosePiercing == 1 && _slaveBeforeSession.nosePiercing == 0>>
+ pierced ears should help $him a little with $his issues about $his self-image as a fuckable slave girl.
+ <<elseif $activeSlave.nosePiercing == 1 && _slaveBeforeSession.nosePiercing == 0>>
+ nose piercing should make $his reflection in the mirror seem just a bit more fuckably feminine to $him.
+ <<elseif $activeSlave.eyebrowPiercing == 1 && _slaveBeforeSession.eyebrowPiercing == 0>>
+ facial piercing should help destroy $his vestiges of sexual identity outside of $his life as a hole for cocks.
+ <<elseif $activeSlave.lipsPiercing == 1 && _slaveBeforeSession.lipsPiercing == 0>>
+ facial piercing, just below $his pretty mouth, should help $him get used to the idea of it being a warm, wet hole for cocks.
+ <<elseif $activeSlave.navelPiercing == 1 && _slaveBeforeSession.navelPiercing == 0>>
+ navel piercing should help $his see $his naked body in a submissively sexual way, especially as $him turns to hide it and present $his asspussy.
+ <<else>>
+ new set of slutty facial piercings should help $him get used to the idea of being a girly slave meant to please dicks.
+ <</if>>
+ <<if $activeSlave.devotion < -20>>Unfortunately, that positive effect will have to wait until $he's a little less resistant to the idea of being a sex slave.<</if>>
<</if>>
<</if>>
<</if>>
@@ -315,9 +345,6 @@
<</switch>>
<</if>>
<</if>>
- <</if>>
- <</if>>
- <</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index e808b0c15da5e64ea8e5ff9320e9c71bf7314b35..8efe26db319872fe67c36952cc6970bf06b43a92 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -195,7 +195,7 @@ Last week this
<<set $lastWeeksCashProfits.brothelAds = $lastWeeksCashIncome.brothelAds + $lastWeeksCashExpenses.brothelAds>>
<<if $lastWeeksCashProfits.brothelAds > 0>>
made you an extra @@.green;<<print cashFormat($lastWeeksCashProfits.brothelAds)>>@@,<<if $brothelSlaves > 1>> as well as increasing business for your whores.<</if>>
-<<elseif $lastWeeksCashProfits.brothelAds < 0>>
+<<elseif $lastWeeksCashProfits.brothelAds < 0>>
cost you @@.red;<<print cashFormat($lastWeeksCashProfits.brothelAds)>>@@,<<if $brothelSlaves > 1>> but still increased business for your whores.<</if>>
<</if>>
<<link "Manage brothel advertisements" "Brothel Advertisement">><<set $nextLink = passage(), $nextButton = "Back">><</link>>
diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw
index d1180127fd9a5c94b2affe56bc34190cd563f942..da15571c75a1370a4df644a08d97643bcd39fa63 100644
--- a/src/uncategorized/economics.tw
+++ b/src/uncategorized/economics.tw
@@ -83,56 +83,56 @@
</div>
<div id="Management" class="tabcontent">
-<div class="content">
-<<include "Arcology Management">>
-</div>
+ <div class="content">
+ <<include "Arcology Management">>
+ </div>
</div>
<<if $FSAnnounced > 0>>
<div id="Societies" class="tabcontent">
- <div class="content">
- <<include "FS Developments">>
- </div>
+ <div class="content">
+ <<include "FS Developments">>
+ </div>
</div>
<</if>>
<<if $corpIncorporated == 1>>
<div id="Corporation" class="tabcontent">
- <div class="content">
- <<include "Corporation Developments">>
- </div>
+ <div class="content">
+ <<include "Corporation Developments">>
+ </div>
</div>
<</if>>
<div id="Authority" class="tabcontent">
-<div class="content">
-<<include "authorityReport">>
-</div>
+ <div class="content">
+ <<include "authorityReport">>
+ </div>
</div>
<div id="securityReport" class="tabcontent">
-<div class="content">
-<<include "securityReport">>
-</div>
+ <div class="content">
+ <<include "securityReport">>
+ </div>
</div>
<div id="Reputation" class="tabcontent">
-<div class="content">
-<<include "Reputation">>
-</div>
+ <div class="content">
+ <<include "Reputation">>
+ </div>
</div>
<div id="Business" class="tabcontent">
-<div class="content">
-<<include "Personal Business">>
-</div>
+ <div class="content">
+ <<include "Personal Business">>
+ </div>
</div>
<<if ($PC.boobs == 1 && $PC.boobsBonus > 0) || $PC.pregKnown == 1 || $playerAging != 0>>
<div id="Personal" class="tabcontent">
- <div class="content">
- <<include "Personal Notes">>
- </div>
+ <div class="content">
+ <<include "Personal Notes">>
+ </div>
</div>
<</if>>
diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw
index 66267d422cf36fe3b71184b0f41b3d429ade3fc9..5fff75208f2982f729c34aac6aee2061c37e4850 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>>
@@ -209,14 +209,14 @@
<<case 7>>Maintaining seven societal goals requires @@.red;extremely unfocused social engineering.@@
<</switch>>
<<else>>
-<<set _broadProgress += 2 - _societies>>
-<<switch _societies>>
-<<case 1>>Maintaining a single societal goal allows @@.green;very focused social engineering.@@
-<<case 2>>Maintaining two societal goals allows @@.green;focused social engineering.@@
-<<case 3>>Maintaining three societal goals requires @@.yellow;broad social engineering.@@
-<<case 4>>Maintaining four societal goals requires @@.red;unfocused social engineering.@@
-<<case 5>>Maintaining five societal goals requires @@.red;very unfocused social engineering.@@
-<</switch>>
+ <<set _broadProgress += 2 - _societies>>
+ <<switch _societies>>
+ <<case 1>>Maintaining a single societal goal allows @@.green;very focused social engineering.@@
+ <<case 2>>Maintaining two societal goals allows @@.green;focused social engineering.@@
+ <<case 3>>Maintaining three societal goals requires @@.yellow;broad social engineering.@@
+ <<case 4>>Maintaining four societal goals requires @@.red;unfocused social engineering.@@
+ <<case 5>>Maintaining five societal goals requires @@.red;very unfocused social engineering.@@
+ <</switch>>
<</if>> /*closes FS count changes */
<<if _broadProgress != 0>>
<<if $arcologies[0].FSSupremacist != "unset">>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 0a2fe8f10395dffd0d8df209a0cf17f45d4b6230..35e18d9a3b5898e7cea12ef3313ea1b98da5cb46 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1150,7 +1150,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>>
@@ -1707,19 +1707,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>>
@@ -1727,7 +1727,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>>
@@ -1735,7 +1735,7 @@ 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("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")>>.
@@ -1946,7 +1946,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/main.tw b/src/uncategorized/main.tw
index 0f8a78e26df06f187a4299e786f8eda846a4212f..21d38c23b16c03f180ee773de37176b7b906951b 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -74,7 +74,7 @@
<</if>>
/* Saves use the first eight printed words to make the "file name", the below line cheats and makes saves here nicer named. */
-@@font-size: 0; $arcologies[0].name, Week $week, $slaves.length Slaves, <<print cashFormat($cash)>> … … … @@
+@@font-size: 0; $arcologies[0].name, Week $week, $slaves.length Slaves, <<print cashFormat($cash)>> … … … @@
<<if $newModelUI == 1>><<DisplayBuilding>><</if>>
<<if $seeArcology == 1>> <<include "Arcology Description">> | [[Hide|Main][$seeArcology = 0]]<br><</if>>
@@ -462,7 +462,7 @@ Filter by assignment: |
<<set $slaves.filter(function(x){return x.assignment != ($jobTypes[" + _i + "].asgn)}).map(function(y){y.assignmentVisible = 0})>>
<<replace '#summarylist'>><<include 'Slave Summary'>><</replace>>
<</link>>
- ">> |
+ ">> |
<</if>>
<</for>>
diff --git a/src/uncategorized/marketsReport.tw b/src/uncategorized/marketsReport.tw
index ce4c2582000e923efebf44fcc99916e8fa9afe1c..5706634f77f1b63902d47f39cdd5369e471fb3cb 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/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 2b931074b7dfe62c9fbe7d6dc9058e3f81ee0ef9..05373db71919ebb3254df969ed2cffee92a0e549 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -992,7 +992,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">>
@@ -1259,7 +1259,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</if>>
<</if>>
<br><br>
- Whenever you feel able, you drain your balls into $his <<if $activeSlave.mpreg == 1>>ass<<else>>cunt<</if>>, only releasing $him for other duties when scans verify a fertilized ovum.
+ Whenever you feel able, you drain your balls into $his <<if $activeSlave.mpreg == 1>>ass<<else>>cunt<</if>>, only releasing $him for other duties when scans verify a fertilized ovum.
<<if $activeSlave.intelligence+$activeSlave.intelligenceImplant < -50>>
$He didn't properly understand the scans, so $he just thought it was bound, forced sex; $he won't realize what happened for some weeks at least.
<<elseif $activeSlave.fetish == "pregnancy">>
@@ -1267,8 +1267,8 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<else>>
$He wasn't sure what this was all about, but $he has $his suspicions.
<</if>>
-
-
+
+
<<if $activeSlave.mpreg == 1>>
<<= AnalVCheck()>>
<<else>>
diff --git a/src/uncategorized/pRivalryCapture.tw b/src/uncategorized/pRivalryCapture.tw
index 26b8b8331c5467bb2cc2fc622b18f9a94e855318..c2441845e91239dc5863c87f973d5d85f0208ae2 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/prestigiousSlave.tw b/src/uncategorized/prestigiousSlave.tw
index 1af9266b843e4c6ee00f94d709827b4a43a99006..53450b58a32afb905469e274835054a6d6fd921e 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/reFSNonconformist.tw b/src/uncategorized/reFSNonconformist.tw
index ba64b75122696aeb2f884e06cb937e2cf159677f..4cf088fa276be94a3c09e2e94f585de2bfb5cfe9 100644
--- a/src/uncategorized/reFSNonconformist.tw
+++ b/src/uncategorized/reFSNonconformist.tw
@@ -274,7 +274,7 @@ The nonconformist is far too prominent and prosperous to make this an easy dilem
<</nobr>><</replace>>
<</link>> //This will cost <<print cashFormat(10000)>>//
<<else>>
-//You lack the necessary ready cash to manage a nuanced solution//
+ //You lack the necessary ready cash to manage a nuanced solution//
<</if>>
<<if $PC.rumor == "force">>
<br><<link "Leverage your reputation with some credible threats">>
diff --git a/src/uncategorized/rePokerNight.tw b/src/uncategorized/rePokerNight.tw
index feaa75f287641943d961cbbc72ca207f92ab8881..585549e2be43b89c2cdab2e035aa72de5cca46ba 100644
--- a/src/uncategorized/rePokerNight.tw
+++ b/src/uncategorized/rePokerNight.tw
@@ -103,13 +103,13 @@ 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>>
- <<run cashX(-5000, "event")>>
+ 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>>
+ <<run cashX(-5000, "event")>>
<<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>>
@@ -119,13 +119,13 @@ 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>>
- <<run cashX(-5000, "event")>>
+ 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>>
+ <<run cashX(-5000, "event")>>
<<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>>
- <<run cashX(5000, "event")>>
+ 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>>
+ <<run cashX(5000, "event")>>
<</if>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 8c5b0829ade6b80e5cdfbefe205e6d1fa862c432..aab01f727b1a7e80971a32b6ae440907a0cce8c3 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 gangbangs 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 gangbangs 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">>
diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw
index b5a7031558e34ce1dd51006c57dcb7ccf777b65c..6f3547dfcb96b59f272445474bb3ea6008bf0154 100644
--- a/src/uncategorized/reputation.tw
+++ b/src/uncategorized/reputation.tw
@@ -572,8 +572,13 @@ On formal occasions, you are announced as $PCTitle.
Society @@.green;approves@@ of your poor treatment of slave infants.
<<set $rep += 5*$FSSingleSlaveRep*($arcologies[0].FSDegradationist/$FSLockinLevel)>>
<<elseif $arcologies[0].FSRestart != "unset">>
- The Societal Elite @@.red;strongly disapproves@@ of your creating an economic incentive for the lower classes to breed and sell infants, holding back acceptance of your new society.
- <<set $failedElite += 5, $arcologies[0].FSRestart -= $FSSingleSlaveRep, $rep -= (5*$FSSingleSlaveRep*($arcologies[0].FSRestart/$FSLockinLevel))+($rep/40)>>
+ <<if $eugenicsFullControl != 1>>
+ The Societal Elite @@.red;strongly disapproves@@ of your creating an economic incentive for the lower classes to breed and sell infants, holding back acceptance of your new society.
+ <<set $failedElite += 5>>
+ <<else>>
+ Society @@.red;strongly disapproves@@ of your creating an economic incentive for the lower classes to breed and sell infants, holding back acceptance of your new society.
+ <</if>>
+ <<set $arcologies[0].FSRestart -= $FSSingleSlaveRep, $rep -= (5*$FSSingleSlaveRep*($arcologies[0].FSRestart/$FSLockinLevel))+($rep/40)>>
<<elseif $arcologies[0].FSPaternalist != "unset">>
Society @@.red;greatly despises@@ your poor treatment of slave infants.
<<set $rep -= (25*$FSSingleSlaveRep*($arcologies[0].FSPaternalist/$FSLockinLevel))+($rep/20)>>
@@ -727,19 +732,19 @@ On formal occasions, you are announced as $PCTitle.
<</if>>
<<if $alwaysSubsidizeRep == 1>>
-<<if $rep <= 19900>>
- <<set $rep += 100>>
- Reputation subsidized as planned.
- <<if $PC.degeneracy > 1>>
+ <<if $rep <= 19900>>
+ <<set $rep += 100>>
+ Reputation subsidized as planned.
+ <<if $PC.degeneracy > 1>>
+ <<set $PC.degeneracy -= 1>>
+ <</if>>
+ <<elseif $PC.degeneracy > 1>>
<<set $PC.degeneracy -= 1>>
+ Rumors quelled as planned.
+ <<else>>
+ <<run cashX(1000, "policies")>>
+ Reputation subsidy reclaimed this week since your reputation is capped.
<</if>>
-<<elseif $PC.degeneracy > 1>>
- <<set $PC.degeneracy -= 1>>
- Rumors quelled as planned.
-<<else>>
- <<run cashX(1000, "policies")>>
- Reputation subsidy reclaimed this week since your reputation is capped.
-<</if>>
<</if>>
<<if $failedElite > 1>>
@@ -778,7 +783,7 @@ On formal occasions, you are announced as $PCTitle.
<<set $eliteFail = $topClass - 20>>
<</if>>
<<if $arcologies[0].prosperity > 50>>
- <<set $arcologies[0].prosperity -= random(20,40)>>
+ <<set $arcologies[0].prosperity -= random(20,40)>>
<</if>>
<<elseif $failedElite > 250>>
The Societal Elite @@.red;are openly discussing leaving.@@ It would be in your best interests to appease them.
diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw
index eb16a3971393317f8bc70bf98d23af1fda924d95..d2b349bcbc3a0d80b5972602e796928bcb5d68d9 100644
--- a/src/uncategorized/saServeThePublic.tw
+++ b/src/uncategorized/saServeThePublic.tw
@@ -867,7 +867,7 @@ $His appearance attracted $beauty members of the public (<<print Math.trunc($bea
<</if>>
<</if>>
<<case "mindbroken">>
- $He receives less attention because $he just lies there, mindbroken.
+ $He receives less attention because $he just lies there, totally unresponsive.
<</switch>>
<</if>>
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index d92d42876653c20c02ac8a79c7955cf09da912c9..449a586a851977476656a6d22f48b0e8b6b2eec0 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -878,7 +878,7 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
<</if>>
<</if>>
<<case "mindbroken">>
- $He gets less ¤ because $he just lies there, mindbroken.
+ $He gets less ¤ because $he just lies there, totally unresponsive.
<</switch>>
<</if>>
<</if>>
diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw
index a1917f985ea06e70a8a13a10d8c41824f4ba4d74..9e88d0f42e40e59ba87b129b510996a67107fde3 100644
--- a/src/uncategorized/seNonlethalPit.tw
+++ b/src/uncategorized/seNonlethalPit.tw
@@ -1008,7 +1008,7 @@
<<if $pitBG == 0 || ($Bodyguard.ID != _loser.ID)>>
<<set $fighterIDs.push(_loser.ID)>>
<</if>>
-<<else>> /*if an animal is using the slave*/
+<<else>> /*if an animal is using the slave*/
<<set $activeSlave = _fighterOne>>
<<if canDoVaginal($activeSlave)>>
diff --git a/src/uncategorized/shops.tw b/src/uncategorized/shops.tw
index dada283f36dc8a2d80196792fce1e2ac6f1f4064..f37b51480fdad7907267a75f5364299c5ae1461f 100644
--- a/src/uncategorized/shops.tw
+++ b/src/uncategorized/shops.tw
@@ -37,7 +37,7 @@ This is a section of the promenade
dedicated to Maturity Preferentialism. It's not immediately apparent, though the stores here offer fashions that are obviously designed to flatter mature women, and anti-aging products of all kinds are prominently displayed. What there are, though, are quite a number of pretty, scantily clad female citizens here, obviously retired from sexual slavery and looking to slake their still trained libidos with any handsome fellow citizen interested.
<span id="result"><<link "Hook up with a MILF">><<replace "#result">>Many of them recognize you, and it's immediately apparent that you have your choice of pretty much every retired slave present. You select the prettiest and make out with her for a while, among many admirers, until you feel like bringing her over to a nearby bench and doing her. <<if $PC.dick == 0>>She's as eager as a teenager to have a lesbian experience in public, and can't stop giggling as you fuck.<<elseif $arcologies[0].FSGenderFundamentalist != "unset">>Like many recently retired slaves in your arcology, she's gotten pregnant as a free woman, and it's supercharged her sex drive. No matter what you do to her, she just wants more.<<elseif $arcologies[0].FSGenderRadicalist != "unset">>She's got a big dick, and clearly has close friends among the other recently retired girls, but is very willing to be your bottom, especially in public.<<else>>She was horny to begin with, but the foreplay and the naughtiness of doing it out in public has her as eager as a teenager, and she goes wild.<</if>><</replace>><</link>></span>
<<case "Slimness Enthusiast">>
- dedicated to Slimness Enthusiasm. The shops here are quite varied. Some, like the tailors, only betray their focus on slim slaves by their selections of lingerie for petite breasts and trim hips. There are a large number of contract slave exercisers and slave dieticians, since many citizens who can afford a slave need assistance there.
+ dedicated to Slimness Enthusiasm. The shops here are quite varied. Some, like the tailors, only betray their focus on slim slaves by their selections of lingerie for petite breasts and trim hips. There are a large number of contract slave exercisers and slave dietitians, since many citizens who can afford a slave need assistance there.
<span id="result"><<link "Tour the trainers">><<replace "#result">>You decide to put in an appearance and look around the trainers. They're very eager to show you around, of course, and have you seen looking around; your expertise in keeping slaves slender is well known. The most inspiring sight you're shown is a long row of slaves on treadmills, running as fast as their individual fitness can support. They do this nude, since none of them have boobs big enough to require support, offering the sight of a long row of cute butts covered in a sheen of feminine sweat.<</replace>><</link>></span>
<<case "Asset Expansionist">>
dedicated to Asset Expansionism. The sector's focus is unmissable, even in the clothes stores. Many of the bras on offer look like a cross between an engineering marvel and a bad joke, and there are dresses that look like parachutes when they aren't on a mannequin or worn by a slave salesgirl. Then there's the crane store.
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 a88cb9b211ee91575389cbc4b7a28ebc385c7717..90b8a50dec72e2622d41f04e6b5055202168e86b 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>>
<<set _CL = $canines.length, _HL = $hooved.length, _FL = $felines.length>>
diff --git a/src/uncategorized/slaveShelter.tw b/src/uncategorized/slaveShelter.tw
index 2f9568493bdd777f3781435ee2b73e79b12b4197..3e5cea4d830878115fc77d26a4f81fc554a4f04a 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)>>
@@ -214,7 +213,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<</if>>
<<if $shelterSlave.vagina > -1>>
<<set $shelterSlave.vagina = random(1,4)>>
- <<set $shelterSlave.vaginaSkill = random(10,25)>>
+ <<set $shelterSlave.vaginalSkill = random(10,25)>>
<<set $shelterSlave.vaginalTat = either("degradation", "rude words", 0)>>
<</if>>
<<if $shelterSlave.dick > 1>>
@@ -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..e55052e5383f2fcd77eb24e4e81ec41041e8f7af 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -6,184 +6,184 @@
<<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 98ea7560a738da631a4ff71bdb762bedb4e574c3..8b9444e82235598e555303b37cfe2beb2110d8ea 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/spaReport.tw b/src/uncategorized/spaReport.tw
index c848d8562b87b96878918b1513bca1e7a289c477..7c2760101b7ac3f6251a3753cb568760d0bceb2e 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -163,8 +163,8 @@
<<case "She is remembered for winning best in show as a breeder.">>
<<if $slaves[$i].bellyPreg >= 5000>>
<<if $Attendant.fetish == "pregnancy">>
- $He can't keep $his hands off $slaves[$i].slaveName's pregnancy, but _he2 doesn't mind _his2 full belly being fondled.
- <<set $Attendant.fetishStrength += 4, $slaves[_FLs].fetishStrength += 4>>
+ $He can't keep $his hands off $slaves[$i].slaveName's pregnancy, but _he2 doesn't mind _his2 full belly being fondled.
+ <<set $Attendant.fetishStrength += 4, $slaves[_FLs].fetishStrength += 4>>
<<else>>
$He does $his best to accommodate $slaves[$i].slaveName's pregnancy and to make sure the mother-to-be is happy and comfortable.
<<if random(1,100) > 65 && $Attendant.fetish == "none">>
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 4ba552a5e51d8b18497a4ab4d03e0b39e7d09134..c24ff8913cb629b46118b93106e283f5abce936a 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>>
@@ -139,7 +139,7 @@
</span>
<br>
-
+
<<set _TFood2 = ($food-$foodLastWeek)>>
<span id="oldfood">
<<if _TFood2 < 0>>
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index 95ca971db81ab3b65ccb16062526d8eb31296231..4e5e36f7711d0659036d20bfe300f862189742c6 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -462,7 +462,7 @@
<<if _seed > 50>>
displaying _his2 <<if $seeRace == 1>>_partnerSlave.race <</if>>body, keeping citizens company, and flirting with anyone who shows interest.
<<else>>
- or rather just off it, having taken a prominent citizen back to a discreet room so he can use _his2 <<if $seeRace == 1>>_partnerSlave.race <</if>>body.
+ or rather just off it, having taken a prominent citizen back to a discreet room so he can use _his2 <<if $seeRace == 1>>_partnerSlave.race <</if>>body.
<</if>>
<<case "work as a servant">>
<<if _seed > 50>>
@@ -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/uncategorized/wardrobeUse.tw b/src/uncategorized/wardrobeUse.tw
index 8b0a772206b65f7e011e73f27b5fd68d9c9566b4..f24ba56c5a00f4d0f74276caca652b1bb3a42568 100644
--- a/src/uncategorized/wardrobeUse.tw
+++ b/src/uncategorized/wardrobeUse.tw
@@ -847,7 +847,7 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.''
<<set $activeSlave.collar = "cruel retirement counter">>
<<replace "#collar">>$activeSlave.collar<</replace>>
<<replace "#collarDescription">><br>//<<collarDescription>>//<</replace>>
- <</link>>
+ <</link>>
<</if>>
| <<link "Uncomfortable leather">>
<<set $activeSlave.collar = "uncomfortable leather">>
diff --git a/src/utility/descriptionWidgetsPiercings.tw b/src/utility/descriptionWidgetsPiercings.tw
index 51668090538088ed5186568739a3ecb05c96e864..b061c126c13dcf64c8c7e1a360e4119782bd5024 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 7845bb320ca02bd6cef176b3bf89afd4a945bef0..ce619004b72a9ae4a06bcb0ac670f862acc2dd09 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/extendedFamilyWidgets.tw b/src/utility/extendedFamilyWidgets.tw
index 85501d63f4de3b32187403d89c410899bfb645bc..bf96b5f826801d071eeaf6c19d2def020ae778f1 100644
--- a/src/utility/extendedFamilyWidgets.tw
+++ b/src/utility/extendedFamilyWidgets.tw
@@ -334,15 +334,15 @@
/*testtest uncle passage - determines how many uncles a slave has*/
<<for $i = 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].ID != $activeSlave.ID>>
- <<if $slaves[$i].ID == $activeSlave.mother || $slaves[$i].ID == $activeSlave.father>>
- <<for $j = 0; $j < $slaves.length; $j++>>
- <<if $slaves[$j].genes == "XY">>
- <<if areSisters($slaves[$j], $slaves[$i]) == 1 || areSisters($slaves[$j], $slaves[$i]) == 2>>
- <<set $children.push($slaves[$j])>>
- <</if>>
- <</if>>
- <</for>>
- <</if>>
+ <<if $slaves[$i].ID == $activeSlave.mother || $slaves[$i].ID == $activeSlave.father>>
+ <<for $j = 0; $j < $slaves.length; $j++>>
+ <<if $slaves[$j].genes == "XY">>
+ <<if areSisters($slaves[$j], $slaves[$i]) == 1 || areSisters($slaves[$j], $slaves[$i]) == 2>>
+ <<set $children.push($slaves[$j])>>
+ <</if>>
+ <</if>>
+ <</for>>
+ <</if>>
<</if>>
<</for>>
<<if $children.length > 0>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 0471e9262a153a5fd72005d9e11ce36dfeb0552a..b21d6e46cdbfc25bcaa1cdcab523cfada1cb6134 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">>
@@ -2617,7 +2617,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">>
@@ -2818,7 +2818,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)>>
@@ -2967,8 +2967,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>>
@@ -3366,8 +3366,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.">>
@@ -3528,7 +3528,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>>
@@ -3590,7 +3590,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>>