From b53dd36af5746c668c8e289282da7d9d97f41f67 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Tue, 20 Mar 2018 15:35:23 -0400
Subject: [PATCH] brands, name fuckery and manual merge of !1511
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 8 +
src/cheats/mod_EditArcologyCheat.tw | 2 +-
.../mod_EditNeighborArcologyCheatWidget.tw | 78 ++++-----
src/uncategorized/arcologyDescription.tw | 2 +-
.../bodyModRulesAssistantSettings.tw | 5 +
src/uncategorized/bodyModification.tw | 3 +-
src/uncategorized/buySlaves.tw | 2 +-
src/uncategorized/longSlaveDescription.tw | 39 +----
src/uncategorized/neighborDescription.tw | 2 +-
src/uncategorized/neighborInteract.tw | 4 +-
src/uncategorized/neighborsDevelopment.tw | 68 ++++----
src/uncategorized/neighborsFSAdoption.tw | 2 +-
src/uncategorized/pCoupAftermath.tw | 2 +-
src/uncategorized/pRivalryHostage.tw | 2 +-
src/uncategorized/ptWorkaround.tw | 2 +-
src/uncategorized/randomNonindividualEvent.tw | 9 +
src/uncategorized/reRecruit.tw | 154 +++++++++++++++++-
src/uncategorized/slaveAssignmentsReport.tw | 2 +-
src/uncategorized/slaveMarkets.tw | 4 +-
src/utility/slaveCreationWidgets.tw | 8 +-
20 files changed, 270 insertions(+), 128 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 8ca29bf6d16..a75ad9e5e6e 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,14 @@
0.10.7.0/1
+3/20/2018
+
+ 402
+ -SFanon's new trio of recruits
+ -Pregmodfan's continued fixing and tweaking of his preg tracking system
+ -lower back brand location
+ -fixes
+
3/19/2018
401
diff --git a/src/cheats/mod_EditArcologyCheat.tw b/src/cheats/mod_EditArcologyCheat.tw
index ca915825dce..56933e38cab 100644
--- a/src/cheats/mod_EditArcologyCheat.tw
+++ b/src/cheats/mod_EditArcologyCheat.tw
@@ -425,7 +425,7 @@ __Player Character__
<</if>>
<br><br>__Arcologies:__
-<br> __''$arcologies[0].name''__ is your arcology.
+<br> __'' $arcologies[0].name''__ is your arcology.
<br>You own: ''$arcologies[0].ownership%'' of the arcology <<textbox "$arcologies[0].ownership" $arcologies[0].ownership>>
<br>Other minority ownership: ''$arcologies[0].minority%'' <<textbox "$arcologies[0].minority" $arcologies[0].minority>>
<br>$arcologies[0].name's GSP is @@.yellowgreen;<<print cashFormat(Math.trunc(0.1*$arcologies[0].prosperity))>>m@@.
diff --git a/src/cheats/mod_EditNeighborArcologyCheatWidget.tw b/src/cheats/mod_EditNeighborArcologyCheatWidget.tw
index 94505d7a058..34df6f4138f 100644
--- a/src/cheats/mod_EditNeighborArcologyCheatWidget.tw
+++ b/src/cheats/mod_EditNeighborArcologyCheatWidget.tw
@@ -11,7 +11,7 @@
<br>
- ''$arcologies[_i].name direction:'' $arcologies[_i].direction
+ '' $arcologies[_i].name direction:'' $arcologies[_i].direction
<br><<radiobutton "$arcologies[_i].direction" "north">> north
| <<radiobutton "$arcologies[_i].direction" "northeast">> northeast
| <<radiobutton "$arcologies[_i].direction" "east">> east
@@ -23,7 +23,7 @@
<br>
- ''$arcologies[_i].name government:'' $arcologies[_i].government
+ '' $arcologies[_i].name government:'' $arcologies[_i].government
<br><<radiobutton "$arcologies[_i].government" "elected officials">> elected officials
| <<radiobutton "$arcologies[_i].government" "a committee">> a committee
| <<radiobutton "$arcologies[_i].government" "an oligarchy">> an oligarchy
@@ -35,39 +35,39 @@
<br>
- ''$arcologies[_i].name honeymoon:'' $arcologies[_i].honeymoon
+ '' $arcologies[_i].name honeymoon:'' $arcologies[_i].honeymoon
<br><<textbox "$arcologies[_i].honeymoon" $arcologies[_i].honeymoon>>
<br>
- ''$arcologies[_i].name prosperity:'' $arcologies[_i].prosperity
+ '' $arcologies[_i].name prosperity:'' $arcologies[_i].prosperity
<br><<textbox "$arcologies[_i].prosperity" $arcologies[_i].prosperity>>
<br>
- ''$arcologies[_i].name ownership:'' $arcologies[_i].ownership
+ '' $arcologies[_i].name ownership:'' $arcologies[_i].ownership
<br><<textbox "$arcologies[_i].ownership" $arcologies[_i].ownership>>
<br>
- ''$arcologies[_i].name minority ownership:'' $arcologies[_i].minority
+ '' $arcologies[_i].name minority ownership:'' $arcologies[_i].minority
<br><<textbox "$arcologies[_i].minority" $arcologies[_i].minority>>
<br>
- ''$arcologies[_i].name player ownership:'' $arcologies[_i].PCminority
+ '' $arcologies[_i].name player ownership:'' $arcologies[_i].PCminority
<br><<textbox "$arcologies[_i].PCminority" $arcologies[_i].PCminority>>
<br>
- ''$arcologies[_i].name demand factor:'' $arcologies[_i].demandFactor
+ '' $arcologies[_i].name demand factor:'' $arcologies[_i].demandFactor
<br><<textbox "$arcologies[_i].demandFactor" $arcologies[_i].demandFactor>>
<br>
- ''$arcologies[_i].name Supremacist (unset or 1-100):'' $arcologies[_i].FSSupremacist
+ '' $arcologies[_i].name Supremacist (unset or 1-100):'' $arcologies[_i].FSSupremacist
<br><<textbox "$arcologies[_i].FSSupremacist" $arcologies[_i].FSSupremacist>>
<br>
- ''$arcologies[_i].name Supremacist race:'' $arcologies[_i].FSSupremacistRace
+ '' $arcologies[_i].name Supremacist race:'' $arcologies[_i].FSSupremacistRace
<br><<radiobutton "$arcologies[_i].FSSupremacistRace" white>> White |
<<radiobutton "$arcologies[_i].FSSupremacistRace" asian>> Asian |
<<radiobutton "$arcologies[_i].FSSupremacistRace" latina>> Latina |
@@ -82,12 +82,12 @@
<br>
- ''$arcologies[_i].name Subjugationist (unset or 1-100):'' $arcologies[_i].FSSubjugationist
+ '' $arcologies[_i].name Subjugationist (unset or 1-100):'' $arcologies[_i].FSSubjugationist
<br><<textbox "$arcologies[_i].FSSubjugationist" $arcologies[_i].FSSubjugationist>>
<br>
- ''$arcologies[_i].name Subjugationist race:'' $arcologies[_i].FSSubjugationistRace
+ '' $arcologies[_i].name Subjugationist race:'' $arcologies[_i].FSSubjugationistRace
<br><<radiobutton "$arcologies[_i].FSSubjugationistRace" white>> White |
<<radiobutton "$arcologies[_i].FSSubjugationistRace" asian>> Asian |
<<radiobutton "$arcologies[_i].FSSubjugationistRace" latina>> Latina |
@@ -102,137 +102,137 @@
<br>
- ''$arcologies[_i].name Gender Radicalist (unset or 1-100):'' $arcologies[_i].FSGenderRadicalist
+ '' $arcologies[_i].name Gender Radicalist (unset or 1-100):'' $arcologies[_i].FSGenderRadicalist
<br><<textbox "$arcologies[_i].FSGenderRadicalist" $arcologies[_i].FSGenderRadicalist>>
<br>
- ''$arcologies[_i].name Gender Fundamentalist (unset or 1-100):'' $arcologies[_i].FSGenderFundamentalist
+ '' $arcologies[_i].name Gender Fundamentalist (unset or 1-100):'' $arcologies[_i].FSGenderFundamentalist
<br><<textbox "$arcologies[_i].FSGenderFundamentalist" $arcologies[_i].FSGenderFundamentalist>>
<br>
- ''$arcologies[_i].name Paternalist (unset or 1-100):'' $arcologies[_i].FSPaternalist
+ '' $arcologies[_i].name Paternalist (unset or 1-100):'' $arcologies[_i].FSPaternalist
<br><<textbox "$arcologies[_i].FSPaternalist" $arcologies[_i].FSPaternalist>>
<br>
- ''$arcologies[_i].name Degradationist (unset or 1-100):'' $arcologies[_i].FSDegradationist
+ '' $arcologies[_i].name Degradationist (unset or 1-100):'' $arcologies[_i].FSDegradationist
<br><<textbox "$arcologies[_i].FSDegradationist" $arcologies[_i].FSDegradationist>>
<br>
- ''$arcologies[_i].name Body Purist (unset or 1-100):'' $arcologies[_i].FSBodyPurist
+ '' $arcologies[_i].name Body Purist (unset or 1-100):'' $arcologies[_i].FSBodyPurist
<br><<textbox "$arcologies[_i].FSBodyPurist" $arcologies[_i].FSBodyPurist>>
<br>
- ''$arcologies[_i].name Transformation Fetishist (unset or 1-100):'' $arcologies[_i].FSTransformationFetishist
+ '' $arcologies[_i].name Transformation Fetishist (unset or 1-100):'' $arcologies[_i].FSTransformationFetishist
<br><<textbox "$arcologies[_i].FSTransformationFetishist" $arcologies[_i].FSTransformationFetishist>>
<br>
- ''$arcologies[_i].name Youth Preferentialist (unset or 1-100):'' $arcologies[_i].FSYouthPreferentialist
+ '' $arcologies[_i].name Youth Preferentialist (unset or 1-100):'' $arcologies[_i].FSYouthPreferentialist
<br><<textbox "$arcologies[_i].FSYouthPreferentialist" $arcologies[_i].FSYouthPreferentialist>>
<br>
- ''$arcologies[_i].name Maturity Preferentialist (unset or 1-100):'' $arcologies[_i].FSMaturityPreferentialist
+ '' $arcologies[_i].name Maturity Preferentialist (unset or 1-100):'' $arcologies[_i].FSMaturityPreferentialist
<br><<textbox "$arcologies[_i].FSMaturityPreferentialist" $arcologies[_i].FSMaturityPreferentialist>>
<br>
- ''$arcologies[_i].name Slimness Enthusiast (unset or 1-100):'' $arcologies[_i].FSSlimnessEnthusiast
+ '' $arcologies[_i].name Slimness Enthusiast (unset or 1-100):'' $arcologies[_i].FSSlimnessEnthusiast
<br><<textbox "$arcologies[_i].FSSlimnessEnthusiast" $arcologies[_i].FSSlimnessEnthusiast>>
<br>
- ''$arcologies[_i].name Asset Expansionist (unset or 1-100):'' $arcologies[_i].FSAssetExpansionist
+ '' $arcologies[_i].name Asset Expansionist (unset or 1-100):'' $arcologies[_i].FSAssetExpansionist
<br><<textbox "$arcologies[_i].FSAssetExpansionist" $arcologies[_i].FSAssetExpansionist>>
<br>
- ''$arcologies[_i].name Pastoralist (unset or 1-100):'' $arcologies[_i].FSPastoralist
+ '' $arcologies[_i].name Pastoralist (unset or 1-100):'' $arcologies[_i].FSPastoralist
<br><<textbox "$arcologies[_i].FSPastoralist" $arcologies[_i].FSPastoralist>>
<br>
- ''$arcologies[_i].name Physical Idealist (unset or 1-100):'' $arcologies[_i].FSPhysicalIdealist
+ '' $arcologies[_i].name Physical Idealist (unset or 1-100):'' $arcologies[_i].FSPhysicalIdealist
<br><<textbox "$arcologies[_i].FSPhysicalIdealist" $arcologies[_i].FSPhysicalIdealist>>
<br>
- ''$arcologies[_i].name Chattel Religionist (unset or 1-100):'' $arcologies[_i].FSChattelReligionist
+ '' $arcologies[_i].name Chattel Religionist (unset or 1-100):'' $arcologies[_i].FSChattelReligionist
<br><<textbox "$arcologies[_i].FSChattelReligionist" $arcologies[_i].FSChattelReligionist>>
<br>
- ''$arcologies[_i].name Roman Revivalist (unset or 1-100):'' $arcologies[_i].FSRomanRevivalist
+ '' $arcologies[_i].name Roman Revivalist (unset or 1-100):'' $arcologies[_i].FSRomanRevivalist
<br><<textbox "$arcologies[_i].FSRomanRevivalist" $arcologies[_i].FSRomanRevivalist>>
<br>
- ''$arcologies[_i].name Aztec Revivalist (unset or 1-100):'' $arcologies[_i].FSAztecRevivalist
+ '' $arcologies[_i].name Aztec Revivalist (unset or 1-100):'' $arcologies[_i].FSAztecRevivalist
<br><<textbox "$arcologies[_i].FSAztecRevivalist" $arcologies[_i].FSAztecRevivalist>>
<br>
- ''$arcologies[_i].name Egyptian Revivalist (unset or 1-100):'' $arcologies[_i].FSEgyptianRevivalist
+ '' $arcologies[_i].name Egyptian Revivalist (unset or 1-100):'' $arcologies[_i].FSEgyptianRevivalist
<br><<textbox "$arcologies[_i].FSEgyptianRevivalist" $arcologies[_i].FSEgyptianRevivalist>>
<br>
- ''$arcologies[_i].name Edo Revivalist (unset or 1-100):'' $arcologies[_i].FSEdoRevivalist
+ '' $arcologies[_i].name Edo Revivalist (unset or 1-100):'' $arcologies[_i].FSEdoRevivalist
<br><<textbox "$arcologies[_i].FSEdoRevivalist" $arcologies[_i].FSEdoRevivalist>>
<br>
- ''$arcologies[_i].name Arabian Revivalist (unset or 1-100):'' $arcologies[_i].FSArabianRevivalist
+ '' $arcologies[_i].name Arabian Revivalist (unset or 1-100):'' $arcologies[_i].FSArabianRevivalist
<br><<textbox "$arcologies[_i].FSArabianRevivalist" $arcologies[_i].FSArabianRevivalist>>
<br>
- ''$arcologies[_i].name Chinese Revivalist (unset or 1-100):'' $arcologies[_i].FSChineseRevivalist
+ '' $arcologies[_i].name Chinese Revivalist (unset or 1-100):'' $arcologies[_i].FSChineseRevivalist
<br><<textbox "$arcologies[_i].FSChineseRevivalist" $arcologies[_i].FSChineseRevivalist>>
<br>
- ''$arcologies[_i].name FSNull (unset or 1-100):'' $arcologies[_i].FSNull
+ '' $arcologies[_i].name FSNull (unset or 1-100):'' $arcologies[_i].FSNull
<br><<textbox "$arcologies[_i].FSNull" $arcologies[_i].FSNull>>
<br>
- ''$arcologies[_i].name Repopulation Focus (unset or 1-100):'' $arcologies[_i].FSRepopulationFocus
+ '' $arcologies[_i].name Repopulation Focus (unset or 1-100):'' $arcologies[_i].FSRepopulationFocus
<br><<textbox "$arcologies[_i].FSRepopulationFocus" $arcologies[_i].FSRepopulationFocus>>
<br>
- ''$arcologies[_i].name FSRestart (unset or 1-100):'' $arcologies[_i].FSRestart
+ '' $arcologies[_i].name FSRestart (unset or 1-100):'' $arcologies[_i].FSRestart
<br><<textbox "$arcologies[_i].FSRestart" $arcologies[_i].FSRestart>>
<br>
- ''$arcologies[_i].name embargo (1 to 3):'' $arcologies[_i].embargo
+ '' $arcologies[_i].name embargo (1 to 3):'' $arcologies[_i].embargo
<br><<textbox "$arcologies[_i].embargo" $arcologies[_i].embargo>>
<br>
- ''$arcologies[_i].name embargoTarget (0 to 7):'' $arcologies[_i].embargoTarget
+ '' $arcologies[_i].name embargoTarget (0 to 7):'' $arcologies[_i].embargoTarget
<br><<textbox "$arcologies[_i].embargoTarget" $arcologies[_i].embargoTarget>>
<br>
- ''$arcologies[_i].name influenceTarget:'' $arcologies[_i].influenceTarget
+ '' $arcologies[_i].name influenceTarget:'' $arcologies[_i].influenceTarget
<br><<textbox "$arcologies[_i].influenceTarget" $arcologies[_i].influenceTarget>>
<br>
- ''$arcologies[_i].name influenceBonus:'' $arcologies[_i].influenceBonus
+ '' $arcologies[_i].name influenceBonus:'' $arcologies[_i].influenceBonus
<br><<textbox "$arcologies[_i].influenceBonus" $arcologies[_i].influenceBonus>>
<br>
- ''$arcologies[_i].name rival (0 or 1):'' $arcologies[_i].rival
+ '' $arcologies[_i].name rival (0 or 1):'' $arcologies[_i].rival
<br><<textbox "$arcologies[_i].rival" $arcologies[_i].rival>>
<br>
diff --git a/src/uncategorized/arcologyDescription.tw b/src/uncategorized/arcologyDescription.tw
index a8b94e396ed..5e957219b56 100644
--- a/src/uncategorized/arcologyDescription.tw
+++ b/src/uncategorized/arcologyDescription.tw
@@ -1,7 +1,7 @@
:: Arcology Description [nobr]
-__''$arcologies[0].name''__, your arcology, is located in a Free City in <<if $terrain == "oceanic">>the middle of the ocean<<else>>$continent<</if>>. It is a huge structure whose<<if $arcologyUpgrade.apron == 1>> solar-panelled<</if>> skin gleams in the sunshine<<if $arcologyUpgrade.hydro == 1>>, while verdant exterior hydroponics bays lend it an air of growth<</if>>.
+__'' $arcologies[0].name''__, your arcology, is located in a Free City in <<if $terrain == "oceanic">>the middle of the ocean<<else>>$continent<</if>>. It is a huge structure whose<<if $arcologyUpgrade.apron == 1>> solar-panelled<</if>> skin gleams in the sunshine<<if $arcologyUpgrade.hydro == 1>>, while verdant exterior hydroponics bays lend it an air of growth<</if>>.
<<if $weatherCladding == 1>>
Much of its beautiful exterior is now hidden behind dull panels of weather cladding<<if $arcologyUpgrade.spire == 1>>, though its highest point is capped by tall, elegant spire<</if>>.
<<elseif $weatherCladding == 2>>
diff --git a/src/uncategorized/bodyModRulesAssistantSettings.tw b/src/uncategorized/bodyModRulesAssistantSettings.tw
index 56cda64a821..c04fa06f498 100644
--- a/src/uncategorized/bodyModRulesAssistantSettings.tw
+++ b/src/uncategorized/bodyModRulesAssistantSettings.tw
@@ -623,6 +623,11 @@ Other:
<<set $brandTarget = "back">>
<<RAChangeBrandTarget>>
<</link>>
+|
+<<link "Lower Back">>
+<<set $brandTarget = "lower back">>
+<<RAChangeBrandTarget>>
+<</link>>
<br>
<span id = "branddesign">
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index 3381fcdef4e..97a8c27cdac 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -1772,12 +1772,13 @@ Choose a site for branding:
| [[Belly|Body Modification][$brandTarget = "belly"]]
| [[Pubic Mound|Body Modification][$brandTarget = "pubic mound"]]
| [[Back|Body Modification][$brandTarget = "back"]]
+| [[Lower Back|Body Modification][$brandTarget = "lower back"]]
/* Branding expansion contributed by Anon1888 */
<br>
-<<if ($brandTarget == "neck" || $brandTarget == "chest" || $brandTarget == "belly" || $brandTarget == "pubic mound" || $brandTarget == "back")>>
+<<if ($brandTarget == "neck" || $brandTarget == "chest" || $brandTarget == "belly" || $brandTarget == "pubic mound" || $brandTarget == "back" || $brandTarget == "lower back")>>
[[Brand|Body Modification][$brandApplied = 1,$activeSlave.brand = $brandDesign,$activeSlave.brandLocation = $brandTarget,$cash -= $modCost,$degradation += 10]] with $brandDesign on the $brandTarget.
<<else>>
Brand $object now with ''$brandDesign'' on the
diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw
index 907b01a531d..addeef16f6e 100644
--- a/src/uncategorized/buySlaves.tw
+++ b/src/uncategorized/buySlaves.tw
@@ -55,7 +55,7 @@ __Sex Slave Purchase Options__
<<for _i = 0; _i < $arcologies.length; _i++>>
<<if $arcologies[_i].direction != 0>>
<br> <<print '[[Slaves from|Slave Markets][$slaveMarket = "neighbor", $numArcology = ' + _i + ']]'>>
- ''$arcologies[_i].name''
+ '' $arcologies[_i].name''
<<if $cash > _minimumFive>>
| <<print '[[(x5)|Bulk Slave Generate][$slaveMarket = "neighbor", $introType = "bulk", $numSlaves = 5, $numArcology = '+_i+']]'>>
<</if>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 0fb1a31f2ab..7ae95c486c9 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1082,14 +1082,8 @@ when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of its lower
<<if $activeSlave.fuckdoll == 0>>
<<if $showBodyMods == 1>>
- <<if ($activeSlave.brandLocation == "neck")
- || ($activeSlave.brandLocation == "left cheek")
- || ($activeSlave.brandLocation == "right cheek")
- || ($activeSlave.brandLocation == "cheeks")
- || ($activeSlave.brandLocation == "left ears")
- || ($activeSlave.brandLocation == "right ears")
- || ($activeSlave.brandLocation == "ears")>>
- <<brandDescription>>
+ <<if ["neck", "left cheek", "right cheek", "cheeks", "left ears", "right ears", "ears"].includes($activeSlave.brandLocation)>>
+ <<brandDescription>>
<</if>>
<</if>>
<</if>>
@@ -1818,33 +1812,8 @@ $pronounCap is
<<if $activeSlave.fuckdoll == 0>>
<<if $showBodyMods == 1>>
/* Check it's not a facial brand: */
- <<if ($activeSlave.brandLocation == "back")
- || ($activeSlave.brandLocation == "chest")
- || ($activeSlave.brandLocation == "right shoulder")
- || ($activeSlave.brandLocation == "left shoulder")
- || ($activeSlave.brandLocation == "shoulders")
- || ($activeSlave.brandLocation == "right upper arm")
- || ($activeSlave.brandLocation == "left upper arm")
- || ($activeSlave.brandLocation == "upper arms")
- || ($activeSlave.brandLocation == "right lower arm")
- || ($activeSlave.brandLocation == "left lower arm")
- || ($activeSlave.brandLocation == "lower arms")
- || ($activeSlave.brandLocation == "right wrist")
- || ($activeSlave.brandLocation == "left wrist")
- || ($activeSlave.brandLocation == "wrists")
- || ($activeSlave.brandLocation == "right hand")
- || ($activeSlave.brandLocation == "left hand")
- || ($activeSlave.brandLocation == "hands")
- || ($activeSlave.brandLocation == "left ankle")
- || ($activeSlave.brandLocation == "right ankle")
- || ($activeSlave.brandLocation == "ankles")
- || ($activeSlave.brandLocation == "right calf")
- || ($activeSlave.brandLocation == "left calf")
- || ($activeSlave.brandLocation == "calves")
- || ($activeSlave.brandLocation == "right foot")
- || ($activeSlave.brandLocation == "left foot")
- || ($activeSlave.brandLocation == "feet")>>
- <<brandDescription>>
+ <<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)>>
+ <<brandDescription>>
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/neighborDescription.tw b/src/uncategorized/neighborDescription.tw
index efb79c38875..0e4740973a5 100644
--- a/src/uncategorized/neighborDescription.tw
+++ b/src/uncategorized/neighborDescription.tw
@@ -1,7 +1,7 @@
:: Neighbor Description [nobr]
<br><br>
-''$arcologies[$i].name'' is located to the $arcologies[$i].direction of your arcology. It is governed by
+'' $arcologies[$i].name'' is located to the $arcologies[$i].direction of your arcology. It is governed by
<<switch $arcologies[$i].government>>
<<case "elected officials">>
elected officials, periodically paralyzing its development.
diff --git a/src/uncategorized/neighborInteract.tw b/src/uncategorized/neighborInteract.tw
index 76c3123fb59..7dbc4de068f 100644
--- a/src/uncategorized/neighborInteract.tw
+++ b/src/uncategorized/neighborInteract.tw
@@ -38,7 +38,7 @@
<<else>>
<<for $i = 0; $i < $arcologies.length; $i++>>
<<if $arcologies[$i].direction == $arcologies[0].embargoTarget>>
- You have targeted ''$arcologies[$i].name'' for economic warfare.
+ You have targeted '' $arcologies[$i].name'' for economic warfare.
<<break>>
<</if>>
<</for>>
@@ -59,7 +59,7 @@
<<else>>
<<for $i = 0; $i < $arcologies.length; $i++>>
<<if $arcologies[$i].direction == $arcologies[0].influenceTarget>>
- You have targeted ''$arcologies[$i].name'' for cultural influence.
+ You have targeted '' $arcologies[$i].name'' for cultural influence.
<<break>>
<</if>>
<</for>>
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index 99cd0ecd131..5f3a3dcf3cd 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -16,7 +16,7 @@
<<for $i = 0; $i < $arcologies.length; $i++>>
<br>
-''$arcologies[$i].name'', your <<if $arcologies[$i].direction == 0>>arcology<<else>>neighbor to the $arcologies[$i].direction<</if>>,
+'' $arcologies[$i].name'', your <<if $arcologies[$i].direction == 0>>arcology<<else>>neighbor to the $arcologies[$i].direction<</if>>,
/* PROSPERITY */
@@ -495,7 +495,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if $arcologies[$i].direction != $arcologies[$j].direction>>
<<if $arcologies[$i].name == $arcologies[$j].name>>
<<set $arcologies[$i].name = "Arcology X-"+($i < 4 ? $i : $i + 1)>> /* X-4 is reserved for player's arcology, so X-1 is available */
- It resumes its original name, ''$arcologies[$i].name'', since the arcology to the $arcologies[$i].direction of yours is also named $arcologies[$j].name.
+ It resumes its original name, '' $arcologies[$i].name'', since the arcology to the $arcologies[$i].direction of yours is also named $arcologies[$j].name.
<<break>>
<</if>>
<</if>>
@@ -597,7 +597,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<default>>
<<set $arcologies[$i].name = setup.ArcologyNamesSupremacistMixedRace.random()>>
<</switch>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSSupremacist < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on $arcologies[$i].FSSupremacistRace Supremacy.
@@ -666,7 +666,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<default>>
<<set $arcologies[$i].name = setup.ArcologyNamesSubjugationistMixedRace.random()>>
<</switch>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSSubjugationist < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on $arcologies[$i].FSSubjugationistRace Subjugationism.
@@ -706,7 +706,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>>
Repopulationism has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name to setup.ArcologyNamesRepopulationist.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSRepopulationFocus < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on Repopulationism.
@@ -749,7 +749,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<set $arcologies[$i].FSRestartResearch = 1>>
Eugenics has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name = setup.ArcologyNamesEugenics.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSRestart < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on Eugenics.
@@ -798,7 +798,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<set $arcologies[$i].FSGenderRadicalistResearch = 1>>
Gender Radicalism has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name = setup.ArcologyNamesGenderRadicalist.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSGenderRadicalist < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on Gender Radicalism.
@@ -852,7 +852,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>>
Gender Fundamentalism has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name = setup.ArcologyNamesGenderFundamentalist.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSGenderFundamentalist < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on Gender Fundamentalism.
@@ -892,7 +892,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>>
Paternalism has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name = setup.ArcologyNamesPaternalist.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSPaternalist < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on Paternalism.
@@ -935,7 +935,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>>
Degradationism has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name = setup.ArcologyNamesDegradationist.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSDegradationist < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on Degradationism.
@@ -984,7 +984,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>>
Body Purism has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name = setup.ArcologyNamesBodyPurist.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSBodyPurist < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on Body Purism.
@@ -1025,7 +1025,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<set $arcologies[$i].FSTransformationFetishistResearch = 1>>
Transformation Fetishism has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name = setup.ArcologyNamesTransformationFetishist.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSTransformationFetishist < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on Transformation Fetishism.
@@ -1069,7 +1069,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>>
Youth Preferentialism has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name = setup.ArcologyNamesYouthPreferentialist.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<<set $arcologies[$i].FSYouthPreferentialistResearch = 1>>
<</if>>
<<elseif $arcologies[$i].FSYouthPreferentialist < 0>>
@@ -1108,7 +1108,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>>
Maturity Preferentialism has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name = setup.ArcologyNamesMaturityPreferentialist.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSMaturityPreferentialist < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on Maturity Preferentialism.
@@ -1148,7 +1148,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>>
Slimness Enthusiasm has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name = setup.ArcologyNamesSlimnessEnthusiast.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<<set $arcologies[$i].FSSlimnessEnthusiastResearch = 1>>
<</if>>
<<elseif $arcologies[$i].FSSlimnessEnthusiast < 0>>
@@ -1196,7 +1196,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<set $arcologies[$i].FSAssetExpansionistResearch = 1>>
Asset Expansionism has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name = setup.ArcologyNamesAssetExpansionist.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSAssetExpansionist < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on Asset Expansionism.
@@ -1241,7 +1241,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>>
Pastoralism has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name = setup.ArcologyNamesPastoralist.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSPastoralist < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on Pastoralism.
@@ -1279,7 +1279,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>>
Cummunism has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name = setup.ArcologyNamesCummunism.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSCummunism < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on Cummunism.
@@ -1323,7 +1323,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>>
Physical Idealism has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name = setup.ArcologyNamesPhysicalIdealist.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSPhysicalIdealist < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on Physical Idealism.
@@ -1366,7 +1366,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<set $arcologies[$i].FSHedonisticDecadenceResearch = 1>>
Decadent Hedonism has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name = setup.ArcologyNamesHedonisticDecadence.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSHedonisticDecadence < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on Decadent Hedonism.
@@ -1407,7 +1407,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>>
Incest Fetishism has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name = setup.ArcologyNamesIncestFetishist.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSIncestFetishist < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on Incest Fetishism.
@@ -1444,7 +1444,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>>
Chattel Religionism has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name = setup.ArcologyNamesChattelReligionist.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSChattelReligionist < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on Chattel Religionism.
@@ -1500,7 +1500,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>>
Roman Revivalism has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name = setup.ArcologyNamesRomanRevivalist.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSRomanRevivalist < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on Roman Revivalism.
@@ -1550,7 +1550,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>>
Aztec Revivalism has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name = setup.ArcologyNamesAztecRevivalist.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSAztecRevivalist < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on Aztec Revivalism.
@@ -1600,7 +1600,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>>
Egyptian Revivalism has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name = setup.ArcologyNamesEgyptianRevivalist.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSEgyptianRevivalist < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on Egyptian Revivalism.
@@ -1650,7 +1650,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>>
Edo Revivalism has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name = setup.ArcologyNamesEdoRevivalist.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSEdoRevivalist < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on Edo Revivalism.
@@ -1700,7 +1700,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>>
Arabian Revivalism has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name = setup.ArcologyNamesArabianRevivalist.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSArabianRevivalist < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on Arabian Revivalism.
@@ -1754,7 +1754,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>>
Chinese Revivalism has reached stability and acceptance there. The arcology has been renamed
<<set $arcologies[$i].name = setup.ArcologyNamesChineseRevivalist.random()>>
- ''$arcologies[$i].name'' to mark the occasion.
+ '' $arcologies[$i].name'' to mark the occasion.
<</if>>
<<elseif $arcologies[$i].FSChineseRevivalist < 0>>
$arcologies[$i].name @@.cyan;has given up@@ on Chinese Revivalism.
@@ -2131,9 +2131,9 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<</if>>
<<if $desc.length == 0>>
- ''$arcologies[$j].name'' attempts to influence it, but has no significant impacts.
+ '' $arcologies[$j].name'' attempts to influence it, but has no significant impacts.
<<elseif $desc.length > 2>>
- ''$arcologies[$j].name'''s mature culture influences $arcologies[$i].name, $desc[0],
+ '' $arcologies[$j].name'''s mature culture influences $arcologies[$i].name, $desc[0],
<<for _k = 1; _k < $desc.length; _k++>>
<<if _k < $desc.length-1>>
$desc[_k],
@@ -2142,9 +2142,9 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<</if>>
<</for>>
<<elseif $desc.length == 2>>
- ''$arcologies[$j].name'''s culture influences $arcologies[$i].name's $desc[0] and $desc[1].
+ '' $arcologies[$j].name'''s culture influences $arcologies[$i].name's $desc[0] and $desc[1].
<<else>>
- ''$arcologies[$j].name'''s culture is beginning to influence $arcologies[$i].name's $desc[0].
+ '' $arcologies[$j].name'''s culture is beginning to influence $arcologies[$i].name's $desc[0].
<</if>>
<<if $appliedInfluenceBonus < 0>>
@@ -2160,10 +2160,10 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if $arcologies[$j].direction != 0>>
<<if $desc.length == 0>>
- ''$arcologies[$j].name'' is not satisfied with the impact its directed influence is having, and withdraws it with the intention of targeting it elsewhere.
+ '' $arcologies[$j].name'' is not satisfied with the impact its directed influence is having, and withdraws it with the intention of targeting it elsewhere.
<<set $arcologies[$j].influenceTarget = -1>>
<<elseif _alignment >= 4>>
- ''$arcologies[$j].name'' is satisfied that its influence has brought $arcologies[$i].name into alignment, and withdraws its direct influence with the intention of targeting it elsewhere.
+ '' $arcologies[$j].name'' is satisfied that its influence has brought $arcologies[$i].name into alignment, and withdraws its direct influence with the intention of targeting it elsewhere.
<<set $arcologies[$j].influenceTarget = -1>>
<</if>>
<</if>>
diff --git a/src/uncategorized/neighborsFSAdoption.tw b/src/uncategorized/neighborsFSAdoption.tw
index 376cb3ac111..47a2979d695 100644
--- a/src/uncategorized/neighborsFSAdoption.tw
+++ b/src/uncategorized/neighborsFSAdoption.tw
@@ -1,7 +1,7 @@
:: Neighbors FS Adoption [nobr]
<br><br>
-''$arcologies[$i].name'', your <<if $arcologies[$i].direction == 0>>arcology<<else>>neighbor to the $arcologies[$i].direction<</if>>,
+'' $arcologies[$i].name'', your <<if $arcologies[$i].direction == 0>>arcology<<else>>neighbor to the $arcologies[$i].direction<</if>>,
is prosperous enough that
<<switch $arcologies[$i].government>>
<<case "elected officials">>
diff --git a/src/uncategorized/pCoupAftermath.tw b/src/uncategorized/pCoupAftermath.tw
index 6555fd36d31..3df68be957f 100644
--- a/src/uncategorized/pCoupAftermath.tw
+++ b/src/uncategorized/pCoupAftermath.tw
@@ -15,7 +15,7 @@ The face is vigorous, determined, <<if _num < $seeDicks>>and masculine. The very
And, as you suspected, it's one of your neighbors. It's the individual who owns
<<for $i = 0; $i < $arcologies.length; $i++>>
<<if $arcologies[$i].rival == 1>>
- ''$arcologies[$i].name.''
+ '' $arcologies[$i].name.''
<<break>>
<</if>>
<</for>>
diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw
index 36a177bdaf1..e52dfb29ae4 100644
--- a/src/uncategorized/pRivalryHostage.tw
+++ b/src/uncategorized/pRivalryHostage.tw
@@ -22,7 +22,7 @@
<<set $activeSlave.waist = Math.clamp($activeSlave.waist,-55,15)>>
<<set $activeSlave.hips = 0>>
<<set $activeSlave.shoulders = -1>>
-<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina = 1>><</if>>
+<<if $activeSlave.vagina <= 0>><<set $activeSlave.vagina = 1>><</if>>
<<if $activeSlave.anus == 0>><<set $activeSlave.anus = 1>><</if>>
<<set $activeSlave.burst = 0>>
<<set $activeSlave.relation = 0>>
diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw
index e153eae9a32..884a74c94d3 100644
--- a/src/uncategorized/ptWorkaround.tw
+++ b/src/uncategorized/ptWorkaround.tw
@@ -26,7 +26,7 @@
Since $activeSlave.slaveName has an unusual taste for having her tits fondled, you @@.hotpink;build her devotion to you@@ by indulging her. You keep her near you as a sort of living stress ball. Whenever you have a free hand, whether you're conducting business or buttfucking another slave, you reach over and play with her. She sometimes masturbates while you massage her breasts and pinch her nipples, but often she doesn't even need to.
<<set $activeSlave.mammaryCount += 20, $mammaryTotal += 20>>
<<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetish == "pregnancy")>>
- Since $activeSlave.slaveName has an unusual taste for big pregnant bellies, you @@.hotpink;build her devotion to you@@ by indulging her. You <<if isItemAccessible("a small empathy belly") && $activeSlave.belly < 1500 && $activeSlave.weight < 130>>strap an enormous sympathy belly onto her and <<elseif $activeSlave.belly < 1500>>give strap a pillow around her middle, give her an oversized shirt and <</if>>keep her near you as a sort of living stress ball. Whenever you have a free hand, whether you're conducting business or buttfucking another slave, you reach over and rub her dome of a belly for luck. Occasionally you pay more attention to her, making sure to fondle her rounded middle as you feel up her motherly body. She sometimes masturbates when you aren't groping her, enjoying her gravid figure, but often she doesn't even need to.
+ Since $activeSlave.slaveName has an unusual taste for big pregnant bellies, you @@.hotpink;build her devotion to you@@ by indulging her. You <<if isItemAccessible("a small empathy belly") && $activeSlave.belly < 1500 && $activeSlave.weight < 130>>strap an enormous sympathy belly onto her and <<elseif $activeSlave.belly < 1500>>strap a pillow around her middle, give her an oversized shirt and <</if>>keep her near you as a sort of living stress ball. Whenever you have a free hand, whether you're conducting business or buttfucking another slave, you reach over and rub her dome of a belly for luck. Occasionally you pay more attention to her, making sure to fondle her rounded middle as you feel up her motherly body. She sometimes masturbates when you aren't groping her, enjoying her gravid figure, but often she doesn't even need to.
<<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetish == "humiliation") && ((canDoVaginal($activeSlave) && $activeSlave.vagina > 0) || (canDoAnal($activeSlave) && $activeSlave.anus > 0))>>
Since $activeSlave.slaveName has an unusual sexuality, you @@.hotpink;build her devotion to you@@ by indulging her perversions. Since she's an absolute slut for humiliation, you let her whore around inside the special camera room whenever possible. When you're going out and feel like putting on a show, you bring her on a leash and fuck her in public. She comes harder than ever when you push her naked body up against the wall of a crowded public arcology elevator and molest her.
<<set $activeSlave.oralCount += 4, $oralTotal += 4>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index d8f547e4d46..6bb237ccc05 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -514,6 +514,9 @@
<<if $seeHyperPreg == 1 && $cheatMode == 1>>
<<set $recruit.push("overwhelmed farmgirl")>>
<</if>>
+ <<if $PC.medicine > 50 && $PC.hacking > 75 && random(0,100) > 75>>
+ <<set $recruit.push("embryo appropriation")>>
+ <</if>>
<</if>>
<<set $recruit.push("female SD")>>
<<set $recruit.push("female SD 2")>>
@@ -536,6 +539,12 @@
<<if ($HeadGirl.devotion > 50) && ($HeadGirl.whoreSkill >= 100)>>
<<set $recruit.push("whore recruit")>>
<</if>>
+<<if $PC.hacking >= 50 && random(0,100) < $PC.hacking>>
+ <<set $recruit.push("held POW")>>
+<</if>>
+<<if($pedo_mode == 1 || $minimumSlaveAge <= 13) && $PC.hacking >= 100 && random(0,100) > 95 && $cash >= 500000>>
+ <<set $recruit.push("rogue cyborg")>>
+<</if>>
<<if $arcologyUpgrade.drones == 1>>
<<set $events.push("RE malefactor")>>
<<set $malefactor = ["liberator", "whore", "businesswoman", "addict"]>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index d68cff0552f..9b2575e037d 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -1787,6 +1787,140 @@ Every push, every desperate contraction must be agonizing to her. Fortunately yo
Your desk flags a video message as having potential. It's a rather homely farmer begging for you to enslave her, not truly unusual given the ever increasing droughts and dangerous weather patterns. Given the huge stomach rounding out her worn clothing, she is likely ready to drop quints and desperately seeking any sort of future for them. You allow her to speak her plea. "Please <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>, I just can't go on out here. I'm always hungry and can barely even work with this belly in the way. I swear, it gets heavier every day and a life of physical labor just won't let me get by. I don't know what I'll do if you say no, so please, have mercy on a poor farmer."
+<<case "held POW">>
+
+ <<set $activeSlaveOneTimeMinAge = Math.max($fertilityAge, 8)>>
+ <<set $activeSlaveOneTimeMaxAge = 22>>
+ <<set $one_time_age_overrides_pedo_mode = 1>>
+ <<include "Generate XX Slave">>
+ <<set $activeSlave.origin = "You helped free her from a POW camp after being abandoned by her country, leaving her deeply indebted to you.">>
+ <<set $activeSlave.devotion = random(0,20)>>
+ <<set $activeSlave.trust = random(0,20)>>
+ <<set $activeSlave.health = -80>>
+ <<set $activeSlave.muscles = random(-80, 0)>>
+ <<set $activeSlave.weight = random(-80, -60)>>
+ <<set $activeSlave.waist = random(-40, -20)>>
+ <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.boobs = random(3,6)*100>>
+ <<set $activeSlave.behavioralFlaw = "odd">>
+ <<set $activeSlave.behavioralQuirk = "insecure">>
+ <<set $activeSlave.sexualFlaw = "self hating">>
+ <<set $activeSlave.sexualQuirk = "unflinching">>
+ <<set $activeSlave.fetish = "masochist">>
+ <<set $activeSlave.fetishStrength = 100>>
+ <<set $activeSlave.fetishKnown = 0>>
+ <<set $activeSlave.vaginaLube = 0>>
+ <<set $activeSlave.collar = "shock punishment">>
+ <<set $activeSlave.tired = 1>>
+ <<set $activeSlave.energy = 0>>
+ <<if $activeSlave.actualAge < 13>>
+ <<set $activeSlave.career = "a child soldier">>
+ <<elseif (random(1,100) > 50)>>
+ <<set $activeSlave.career = "a mercenary">>
+ <<else>>
+ <<set $activeSlave.career = "a soldier">>
+ <</if>>
+ <<set $activeSlave.vagina = 3>>
+ <<set $activeSlave.anus = 2>>
+
+ While digging through the database of a POW camp for anything of value, you find records of a <<if $activeSlave.actualAge > 17>>rather attractive<<elseif $activeSlave.actualAge > 12>>teenage<<else>>child<</if>> soldier long abandoned by her nation. You forge false orders to have her transported to a new location, a location that would be trivial for you to obtain her from.
+
+ <br>Upon her inevitable arrival in your penthouse, you see
+ <<if $seeExtreme == 1>>
+ the traces of her wounds, that she has been greatly modified for war, and that she had been raped, repeatedly, despite her powerful body.
+ <<set $activeSlave.amp = -5, $activeSlave.teeth = "pointy", $activeSlave.muscles = random(30,70), $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 3, spread: .2, limitMult: [1, 4]})), set $activeSlave.chem = 1000, $activeSlave.attrXX = 0, $activeSlave.attrXY = 0>>
+ <<else>>
+ the traces of her wounds, that she had been left bound long enough for her body to atrophy, and that she had been raped, repeatedly.
+ <<if $seePreg == 1>>
+ <<set $activeSlave.preg = 2>>
+ <<set $activeSlave.pregType = 1>>
+ <<set $activeSlave.pregWeek = 2>>
+ <<SetBellySize $activeSlave>>
+ <</if>>
+ <</if>>
+ Her odd behaviour suggests that her will to live has nearly been snuffed out. She likely wouldn't have lasted much longer, though it's questionable if she still will if you let her walk free.
+
+<<case "embryo appropriation">>
+
+ <<set $activeSlaveOneTimeMinAge = Math.max($fertilityAge, 8)>>
+ <<if $pedo_mode == 1>>
+ <<set $activeSlaveOneTimeMaxAge = 16>>
+ <<else>>
+ <<set $activeSlaveOneTimeMaxAge = 22>>
+ <</if>>
+ <<set $one_time_age_overrides_pedo_mode = 1>>
+ <<include "Generate XX Slave">>
+ <<set $activeSlave.origin = "Her womb held a baby you desired.">>
+ <<set $activeSlave.face = 100>>
+ <<set $activeSlave.intelligence = 100>>
+ <<set $activeSlave.preg = 20>>
+ <<set $activeSlave.pregWeek = 20>>
+ <<set $activeSlave.pregKnown = 1>>
+ <<if $seeHyperPreg == 0>>
+ <<set $activeSlave.pregType = 1>>
+ <<else>>
+ <<set $activeSlave.pregType = random(2,8)>>
+ <</if>>
+ <<SetBellySize $activeSlave>>
+ <<if $arcologies[0].FSSupremacist != "unset">>
+ <<set $activeSlave.race = $arcologies[0].FSSupremacistRace>>
+ <<elseif $arcologies[0].FSSubjugationist != "unset" && $activeSlave.race == $arcologies[0].FSSubjugationistRace>>
+ <<if $arcologies[0].FSSubjugationistRace == "white">>
+ <<set $activeSlave.race = "asian">>
+ <<else>>
+ <<set $activeSlave.race = "white">>
+ <</if>>
+ <</if>>
+ While perusing the confidential documents in a nearby hospital's databases, you come across a particularly interesting medical record with a rather lovely face attached to it. It would seem an incredibly attractive and good gened
+ <<if $activeSlave.actualAge > 17>>
+ young woman
+ <<elseif $activeSlave.actualAge > 12>>
+ teenager
+ <<else>>
+ little girl
+ <</if>>
+ has been has been recieving frequent prenatal check ups
+ <<if $seeHyperPreg == 0>>
+ for her growing pregnancy.
+ <<else>>
+ for the multiples crowding her womb.
+ <</if>>
+ Judging by her payment plan, the worrisome mother is driving herself into a steep debt and doesn't even realize it. You could easily buy her out and make a tidy profit off her likely to be valuable child<<if $seeHyperPreg == 1>>ren<</if>>, or keep them for yourself, if you wanted.
+
+<<case "rogue cyborg">>
+ <<set $activeSlaveOneTimeMaxAge = 13>>
+ <<include "Generate XX Slave">>
+ <<set $activeSlave.career = setup.bodyguardCareers.random()>>
+ <<set $activeSlave.origin = "An unsuccessful cyborg experiment set free.">>
+ <<set $activeSlave.devotion = random(0,20)>>
+ <<set $activeSlave.trust = random(0,20)>>
+ <<set $activeSlave.health = 100>>
+ <<set $activeSlave.weight = random(-11 -30)>>
+ <<set $activeSlave.waist = random(-11, -40)>>
+ <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.amp = -5, $activeSlave.teeth = "pointy", $activeSlave.muscles = random(30,70), $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 3, spread: .2, limitMult: [1, 4]}))>>
+ <<set $activeSlave.face = 100>>
+ <<set $activeSlave.vagina = -1>>
+ <<set $activeSlave.ovaries = 0>>
+ <<set $activeSlave.anus = 0>>
+ <<set $activeSlave.chem = 1500>>
+ <<set $activeSlave.clothes = "a comfortable bodysuit">>
+ <<set $activeSlave.intelligence = 3>>
+ <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.energy = 0>>
+ <<set $activeSlave.attrXX = 0, $activeSlave.attrXY = 0>>
+ <<set $activeSlave.customLabel = "Z-23series">>
+ <<set $activeSlave.behavioralFlaw = "none">>
+ <<set $activeSlave.behavioralQuirk = "none">>
+ <<set $activeSlave.sexualFlaw = "none">>
+ <<set $activeSlave.sexualQuirk = "none">>
+ <<set $activeSlave.fetish = "none">>
+ <<set $activeSlave.fetishStrength = 96>>
+ <<set $activeSlave.fetishKnown = 0>>
+ <<set $activeSlave.boobsTat = "She has the characters 'z-23' printed across her left breast."
+ <<set $slaveCost += 800000>>
+ While digging through the highest security and clearance level database of a powerful old govermenent for anything of value, you discover the existance of a ultra top secret project to develop the most powerful and effective child cyborg ever created. The entire notion is absurd, but it seems they succeeded in creating something. During field testing it was discovered that it retained far too much humanity, resulting in the death of its handler. Unsure of what to do with the project, it has been placed on ice in the bowels of a black site. With a few simple commands, you could release it and order it to your arcology.
+
<</switch>> /* END SLAVE GENERATION AND INTRODUCTION */
<<switch $recruit>>
@@ -1798,12 +1932,14 @@ Your desk flags a video message as having potential. It's a rather homely farmer
<<set $contractCost = 2000>>
<<case "DG SE" "farm virgin cow" "orphan rebellious female" "orphan femboy">>
<<set $contractCost = 1500>>
-<<case "CCS angel" "racer DG chaser" "racer loser">>
+<<case "CCS angel" "racer DG chaser" "racer loser" "held POW">>
<<set $contractCost = 5000>>
<<case "CCS DA">>
<<set $contractCost = 7500>>
-<<case "racer winner" "captured teen" "paternalist swan song">>
+<<case "racer winner" "captured teen" "paternalist swan song" "embryo appropriation">>
<<set $contractCost = 10000>>
+<<case "rogue cyborg">>
+ <<set $contractCost = 500000>>
<<case "repo housekeeper" "repo nanny" "farm cow" "farm bull" "school sale" "school trap">>
<<set $contractCost = 2500>>
<<default>>
@@ -1824,6 +1960,12 @@ Your desk flags a video message as having potential. It's a rather homely farmer
<<set $cash -= $contractCost>>
<<replace "#result">>
<<switch $recruit>>
+ <<case "held POW">>
+ You complete the legalities and biometric scanning quickly and without fuss; her will to fight long since broken.
+ <<case "embryo appropriation">>
+ She sobs as the biometric scanners scrupulously record her every particular as belonging not to a person but to a piece of human property. She tries to resist placing her biometric signature in testament to the truth of her debt, but when you observe that the alternative is the death of her and her unborn, she complies. The process is completed with a distinct anticlimax: she is one of your slaves now, and soon so shall her spawn.
+ <<case "rogue cyborg">>
+ With your order received the target quickly seeks you out. After a huge sum of credits changes hands to render it penthouse safe, the legalities and biometric scanning are complete and you are now the proud owner of a cyberloli.
<<case "female recruit">>
You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName bounces nervously on her heels. Finally she works up her courage and asks, <<if $HeadGirl.clothes != "no clothing">>"Can I have <<if $HeadGirl.clothes == "choosing her own clothes">>a cute outfit<<else>>$HeadGirl.clothes<</if>> like $HeadGirl.slaveName?"<<else>>"Can I work with $HeadGirl.slaveName?"<</if>> Your sternly tell her to call you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, to ask questions only with permission, and to strip. She looks at $HeadGirl.slaveName, but $HeadGirl.slaveName returns her look with no compassion at all and tells her to do what you say. Looking suddenly fearful, $activeSlave.slaveName strips. Once your inspection of her body reaches her anus, she becomes suddenly nervous. "A-am I going to have t-to do butt stuff, <<Master>>?"
<<case "male recruit">>
@@ -1956,6 +2098,14 @@ Your desk flags a video message as having potential. It's a rather homely farmer
<<set $cash += $slaveCost>>
<<replace "#result">>
<<switch $recruit>>
+ <<case "held POW">>
+ You complete the legalities and biometric scanning quickly and without fuss; her will to fight long since broken. Though you do catch a faint glimmer of joy in her eyes as you tell her she's been purchased by a notorious Pit Master and will likely spend the rest of her life in combat.
+ <<case "embryo appropriation">>
+ <<set _profit = $slaveCost*$activeSlave.pregCount>>
+ <<set $cash += _profit>>
+ She sobs as the biometric scanners scrupulously record her every particular as belonging not to a person but to a piece of human property. She tries to resist placing her biometric signature in testament to the truth of her debt, but when you observe that the alternative is the death of her and her unborn, she complies. A purchasing agent appears to take her away, but not after the slave breeder that bought her paid a ludicrous amount of ¤ per child. An additional @@.yellowgreen;¤<<print _profit>>@@ overall.
+ <<case "rogue cyborg">>
+ With your order received the target quickly seeks you out. After a huge sum of credits changes hands to render it safe, the legalities and biometric scanning are complete and it is sold off to a very eager robophile.
<<case "female recruit">>
You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName bounces nervously on her heels. Finally she works up her courage and asks, <<if $HeadGirl.clothes != "no clothing">>"Can I have <<if $HeadGirl.clothes == "choosing her own clothes">>a cute outfit<<else>>$HeadGirl.clothes<</if>> like $HeadGirl.slaveName?"<<else>>"Can I work with $HeadGirl.slaveName?"<</if>> Your answer appears in the form of a purchasing agent, here to take her away. As he restrains the disbelieving girl, you tell her she's been purchased by a brothel, so she's going to be fucked about 70,000 times before she gets to be too old and is retired, so she can be sure she won't be bored. She releases a wail of utter despair, quickly cut off by a sturdy bag being fastened over her head.
<<case "male recruit">>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 66d6960bfc3..6b21ad2c906 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -2,7 +2,7 @@
<<set $nextLink = "Economics", $nextButton = "Continue", _SL = $slaves.length, $RapeableIDs = []>>
-<h1>$arcologies[0].name Weekly Slave Report - Week $week</h1>
+<h1> $arcologies[0].name Weekly Slave Report - Week $week</h1>
<<for $i = 0; $i < _SL; $i++>>
diff --git a/src/uncategorized/slaveMarkets.tw b/src/uncategorized/slaveMarkets.tw
index aed3114825f..a3e771c53cb 100644
--- a/src/uncategorized/slaveMarkets.tw
+++ b/src/uncategorized/slaveMarkets.tw
@@ -168,9 +168,9 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<<if $opinion != 0>>
<<set $slaveCost -= Math.trunc($slaveCost*$opinion*0.05)>>
<<if $opinion > 2>>
- Your cultural ties with ''$arcologies[$numArcology].name'' helps keep the price reasonable.
+ Your cultural ties with '' $arcologies[$numArcology].name'' helps keep the price reasonable.
<<elseif $opinion < -2>>
- Your social misalignment with ''$arcologies[$numArcology].name'' drives up the price.
+ Your social misalignment with '' $arcologies[$numArcology].name'' drives up the price.
<</if>>
<</if>>
<</if>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 55af475b4eb..27bce4a48e7 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -2742,20 +2742,20 @@
<<if ($arcologies[0].FSDegradationist != "unset") && ($arcologies[_market].FSPaternalist != "unset")>>
<<set $activeSlave.devotion = random(-90,-60)>>
<<set $activeSlave.trust = -20>>
- ''$arcologies[_market].name'' is Paternalist, and your arcology is Degradationist. To its slaves, other niceties of social alignment are trivial. They view your arcology as a literal Hell on Earth.
+ '' $arcologies[_market].name'' is Paternalist, and your arcology is Degradationist. To its slaves, other niceties of social alignment are trivial. They view your arcology as a literal Hell on Earth.
<<elseif ($arcologies[0].FSDegradationist != "unset") && ($arcologies[_market].FSPaternalist != "unset")>>
<<set $activeSlave.devotion = random(60,90)>>
<<set $activeSlave.trust = 20>>
- ''$arcologies[_market].name'' is Degradationist, and your arcology is Paternalist. To its slaves, other niceties of social alignment are trivial. They view your arcology as a promised land.
+ '' $arcologies[_market].name'' is Degradationist, and your arcology is Paternalist. To its slaves, other niceties of social alignment are trivial. They view your arcology as a promised land.
<<elseif $opinion != 0>>
<<set $activeSlave.devotion += $opinion>>
<<set $activeSlave.trust += $opinion>>
<<set $activeSlave.devotion = Math.clamp($activeSlave.devotion, -100, 75)>>
<<set $activeSlave.trust = Math.clamp($activeSlave.trust, -100, 75)>>
<<if $opinion > 2>>
- Your arcology's close social alignment with ''$arcologies[_market].name'' makes its slaves more accepting of the prospect of life in your arcology, and willing to trust that they'll know how to survive there.
+ Your arcology's close social alignment with '' $arcologies[_market].name'' makes its slaves more accepting of the prospect of life in your arcology, and willing to trust that they'll know how to survive there.
<<elseif $opinion < -2>>
- Your arcology's very different culture from ''$arcologies[_market].name'''s makes its slaves unhappy with the prospect of life in your arcology, and afraid of what will happen to them there.
+ Your arcology's very different culture from '' $arcologies[_market].name'''s makes its slaves unhappy with the prospect of life in your arcology, and afraid of what will happen to them there.
<</if>>
<</if>>
--
GitLab