From 53b138849be3d10ab8c3b22ea713b12115c37fcf Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Tue, 16 May 2017 16:34:37 -0400
Subject: [PATCH] Vanilla v1010?
---
src/cheats/mod_EditArcologyCheat.tw | 2 +-
src/cheats/mod_EditFSCheat.tw | 34 ++-
src/cheats/mod_EditFSCheatDatatypeCleanup.tw | 5 +
src/events/intro/initNationalities.tw | 8 +-
src/events/intro/introSummary.tw | 2 +-
src/events/intro/terrainIntro.tw | 1 +
src/gui/Encyclopedia/encyclopedia.tw | 25 +-
src/init/storyInit.tw | 19 +-
src/npc/acquisition.tw | 13 +
src/npc/fFeelings.tw | 11 +-
src/npc/removeActiveSlave.tw | 14 +-
src/npc/takeoverTarget.tw | 8 +-
src/pregmod/reMaleCitizenHookup.tw | 11 +
src/uncategorized/RESS.tw | 6 +
src/uncategorized/RESSTR.tw | 231 ++++++++++++++++-
src/uncategorized/addCustomDescriptors.tw | 6 +-
src/uncategorized/arcade.tw | 2 +
src/uncategorized/arcmgmt.tw | 19 +-
src/uncategorized/arcologyDescription.tw | 23 +-
src/uncategorized/arcologyOpinion.tw | 35 +++
src/uncategorized/assistantEvents.tw | 50 +++-
src/uncategorized/barracks.tw | 11 +-
.../bodyModRulesAssistantSettings.tw | 5 +
src/uncategorized/bodyModification.tw | 4 +-
src/uncategorized/brothel.tw | 9 +-
src/uncategorized/brothelAdvertisement.tw | 2 +
src/uncategorized/brothelReport.tw | 2 +-
src/uncategorized/buildingWidgets.tw | 49 ++++
src/uncategorized/bulkSlaveGenerate.tw | 5 +-
src/uncategorized/cellblock.tw | 2 +
src/uncategorized/changeLanguage.tw | 4 +
src/uncategorized/clinic.tw | 2 +
src/uncategorized/club.tw | 11 +-
src/uncategorized/clubAdvertisement.tw | 2 +
src/uncategorized/clubReport.tw | 5 +-
src/uncategorized/costs.tw | 3 +-
src/uncategorized/costsReport.tw | 3 +-
src/uncategorized/dairy.tw | 4 +
src/uncategorized/fsDevelopments.tw | 209 ++++++++++++++-
src/uncategorized/futureSocities.tw | 128 +++++++++-
src/uncategorized/lawCompliance.tw | 4 +
src/uncategorized/longSlaveDescription.tw | 2 +-
src/uncategorized/manufacturing.tw | 6 +-
src/uncategorized/masterSuite.tw | 6 +
src/uncategorized/multiImplant.tw | 46 ++--
src/uncategorized/neighborDescription.tw | 18 ++
src/uncategorized/neighborInteract.tw | 6 +
src/uncategorized/neighborsDevelopment.tw | 138 +++++++++-
src/uncategorized/neighborsFSAdoption.tw | 98 +++++---
src/uncategorized/newSlaveIntro.tw | 5 +
src/uncategorized/nonRandomEvent.tw | 2 +-
src/uncategorized/pCitizensAndCivilians.tw | 12 +
src/uncategorized/pRivalryHostage.tw | 2 +
src/uncategorized/peConcubineInterview.tw | 6 +
.../personalAssistantAppearance.tw | 40 ++-
src/uncategorized/personalAssistantOptions.tw | 12 +
src/uncategorized/policies.tw | 27 +-
src/uncategorized/randomIndividualEvent.tw | 28 +++
src/uncategorized/randomNonindividualEvent.tw | 10 +-
src/uncategorized/reCitizenHookup.tw | 13 +-
src/uncategorized/reFSAcquisition.tw | 35 +++
src/uncategorized/reFSNonconformist.tw | 11 +-
src/uncategorized/reRelativeRecruiter.tw | 8 +-
src/uncategorized/recETSWorkaround.tw | 2 +
src/uncategorized/reputation.tw | 23 ++
src/uncategorized/rulesAssistant.tw | 9 +
src/uncategorized/saChoosesOwnClothes.tw | 5 +-
src/uncategorized/saChoosesOwnJob.tw | 8 +
src/uncategorized/saGetMilked.tw | 2 +
src/uncategorized/saLongTermEffects.tw | 2 +
src/uncategorized/saServeThePublic.tw | 14 +-
src/uncategorized/saWhore.tw | 14 +-
src/uncategorized/saWorkAGloryHole.tw | 2 +
src/uncategorized/schoolroom.tw | 2 +
src/uncategorized/seIndependenceDay.tw | 10 +
src/uncategorized/seLethalPit.tw | 4 +
src/uncategorized/sellSlave.tw | 36 ++-
src/uncategorized/servantsQuarters.tw | 2 +
src/uncategorized/shops.tw | 237 +++++++++++++++++-
src/uncategorized/slaveGenerationWidgets.tw | 10 +-
src/uncategorized/slaveInteract.tw | 3 +
src/uncategorized/slaveSold.tw | 12 +
src/uncategorized/slaveSummary.tw | 4 +
src/uncategorized/spa.tw | 2 +
src/uncategorized/storyCaption.tw | 3 +-
src/uncategorized/toychest.tw | 2 +
src/uncategorized/useGuard.tw | 4 +
src/uncategorized/walkPast.tw | 90 ++++++-
src/uncategorized/wardrobe.tw | 9 +-
src/utility/artWidgets.tw | 121 +++++----
src/utility/birthWidgets.tw | 23 +-
src/utility/descriptionWidgets.tw | 167 +++++++++++-
src/utility/miscWidgets.tw | 18 ++
src/utility/slaveCreationWidgets.tw | 5 +
94 files changed, 2144 insertions(+), 221 deletions(-)
diff --git a/src/cheats/mod_EditArcologyCheat.tw b/src/cheats/mod_EditArcologyCheat.tw
index 8d6e5f1b713..16c177833d6 100644
--- a/src/cheats/mod_EditArcologyCheat.tw
+++ b/src/cheats/mod_EditArcologyCheat.tw
@@ -406,7 +406,7 @@ __Player Character__
<<if $arcologies.length < 8>>
<<link "Add neighbor">>
<<set $seed = ["north", "northeast", "east", "southeast", "south", "southwest", "west", "northwest"]>>
- <<set $activeArcology = {name: "Arcology X-", direction: "north", government: "an individual", honeymoon: 0, prosperity: 50, ownership: 50, minority: 20, PCminority: 0, demandFactor:0, 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", embargo: 1, embargoTarget: -1, influenceTarget: -1, influenceBonus: 0, rival: 0}>>
+ <<set $activeArcology = {name: "Arcology X-", direction: "north", government: "an individual", honeymoon: 0, prosperity: 50, ownership: 50, minority: 20, PCminority: 0, demandFactor:0, 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", FSAztecRevivalist: "unset", FSEgyptianRevivalist: "unset", FSEdoRevivalist: "unset", FSArabianRevivalist: "unset", FSChineseRevivalist: "unset", FSNull: "unset", FSRepopulationFocus: "unset", FSRestart: "unset", embargo: 1, embargoTarget: -1, influenceTarget: -1, influenceBonus: 0, rival: 0}>>
<<if $arcologies.length < 4>>
<<set $activeArcology.name += $arcologies.length>>
diff --git a/src/cheats/mod_EditFSCheat.tw b/src/cheats/mod_EditFSCheat.tw
index fb3e1358972..9817089888a 100644
--- a/src/cheats/mod_EditFSCheat.tw
+++ b/src/cheats/mod_EditFSCheat.tw
@@ -451,7 +451,31 @@
<<radiobutton "$arcologies[0].FSRomanRevivalistLaw" 0>> 0 (Not passed.)
| <<radiobutton "$arcologies[0].FSRomanRevivalistLaw" 1>> 1 (Passed.)
- <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSEgyptianRevivalist = "unset",$arcologies[0].FSEgyptianRevivalistDecoration = 20,$arcologies[0].FSEgyptianRevivalistLaw = 0,$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0]]
+ <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSAztecRevivalist = "unset",$arcologies[0].FSAztecRevivalistDecoration = 20,$arcologies[0].FSAztecRevivalistLaw = 0,$arcologies[0].FSEgyptianRevivalist = "unset",$arcologies[0].FSEgyptianRevivalistDecoration = 20,$arcologies[0].FSEgyptianRevivalistLaw = 0,$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0]]
+ <</nobr>>
+ +
+ +<<nobr>>
+ +
+ + <<if $arcologies[0].FSAztecRevivalist != "unset">>
+ + <br>You are ''pursuing'' Aztec Revivalism.
+ + <<else>>
+ + <br>You are ''not pursuing'' Aztec Revivalism.
+ + <</if>>
+ +
+ + <br>Aztec Revivalism (0-100 or unset): <<textbox "$arcologies[0].FSAztecRevivalist" $arcologies[0].FSAztecRevivalist>>
+ + <br>Decoration: $arcologies[0].FSAztecRevivalistDecoration
+ +
+ + <br><<radiobutton "$arcologies[0].FSAztecRevivalistDecoration" 20>> 20 (Minimum)
+ + <br><<radiobutton "$arcologies[0].FSAztecRevivalistDecoration" 40>> 40 (Media support.)
+ + <br><<radiobutton "$arcologies[0].FSAztecRevivalistDecoration" 60>> 60 (Decorated public spaces.)
+ + <br><<radiobutton "$arcologies[0].FSAztecRevivalistDecoration" 80>> 80 (Slaves stationed in public spaces.)
+ + <br><<radiobutton "$arcologies[0].FSAztecRevivalistDecoration" 100>> 100 (Remodeled exterior; Fully customized.)
+ +
+ + <br>Law: $arcologies[0].FSAztecRevivalistLaw |
+ + <<radiobutton "$arcologies[0].FSAztecRevivalistLaw" 0>> 0 (Not passed.)
+ + | <<radiobutton "$arcologies[0].FSAztecRevivalistLaw" 1>> 1 (Passed.)
+ +
+ + <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSRomanRevivalist = "unset",$arcologies[0].FSRomanRevivalistDecoration = 20,$arcologies[0].FSRomanRevivalistLaw = 0,$arcologies[0].FSEgyptianRevivalist = "unset",$arcologies[0].FSEgyptianRevivalistDecoration = 20,$arcologies[0].FSEgyptianRevivalistLaw = 0,$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0]]
<</nobr>>
<<nobr>>
@@ -474,7 +498,7 @@
<<radiobutton "$arcologies[0].FSEgyptianRevivalistLaw" 0>> 0 (Not passed.)
| <<radiobutton "$arcologies[0].FSEgyptianRevivalistLaw" 1>> 1 (Passed.)
- <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSRomanRevivalist = "unset",$arcologies[0].FSRomanRevivalistDecoration = 20,$arcologies[0].FSRomanRevivalistLaw = 0,$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0]]
+ <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSRomanRevivalist = "unset",$arcologies[0].FSRomanRevivalistDecoration = 20,$arcologies[0].FSRomanRevivalistLaw = 0,$arcologies[0].FSAztecRevivalist = "unset",$arcologies[0].FSAztecRevivalistDecoration = 20,$arcologies[0].FSAztecRevivalistLaw = 0,$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0]]
<</nobr>>
<<nobr>>
@@ -497,7 +521,7 @@
<<radiobutton "$arcologies[0].FSEdoRevivalistLaw" 0>> 0 (Not passed.)
| <<radiobutton "$arcologies[0].FSEdoRevivalistLaw" 1>> 1 (Passed.)
- <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSRomanRevivalist = "unset",$arcologies[0].FSRomanRevivalistDecoration = 20,$arcologies[0].FSRomanRevivalistLaw = 0,$arcologies[0].FSEgyptianRevivalistDecoration = 20,$arcologies[0].FSEgyptianRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0]]
+ <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSRomanRevivalist = "unset",$arcologies[0].FSRomanRevivalistDecoration = 20,$arcologies[0].FSRomanRevivalistLaw = 0,$arcologies[0].FSAztecRevivalist = "unset",$arcologies[0].FSAztecRevivalistDecoration = 20,$arcologies[0].FSAztecRevivalistLaw = 0,$arcologies[0].FSEgyptianRevivalistDecoration = 20,$arcologies[0].FSEgyptianRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0]]
<</nobr>>
<<nobr>>
@@ -520,7 +544,7 @@
<<radiobutton "$arcologies[0].FSArabianRevivalistLaw" 0>> 0 (Not passed.)
| <<radiobutton "$arcologies[0].FSArabianRevivalistLaw" 1>> 1 (Passed.)
- <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSRomanRevivalist = "unset",$arcologies[0].FSRomanRevivalistDecoration = 20,$arcologies[0].FSRomanRevivalistLaw = 0,$arcologies[0].FSEgyptianRevivalistDecoration = 20,$arcologies[0].FSEgyptianRevivalistLaw = 0,$arcologies[0].FSEdoRevivalist = "unset",$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0]]
+ <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSRomanRevivalist = "unset",$arcologies[0].FSRomanRevivalistDecoration = 20,$arcologies[0].FSRomanRevivalistLaw = 0,$arcologies[0].FSAztecRevivalist = "unset",$arcologies[0].FSAztecRevivalistDecoration = 20,$arcologies[0].FSAztecRevivalistLaw = 0,$arcologies[0].FSEgyptianRevivalistDecoration = 20,$arcologies[0].FSEgyptianRevivalistLaw = 0,$arcologies[0].FSEdoRevivalist = "unset",$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0]]
<</nobr>>
<<nobr>>
@@ -543,5 +567,5 @@
<<radiobutton "$arcologies[0].FSChineseRevivalistLaw" 0>> 0 (Not passed.)
| <<radiobutton "$arcologies[0].FSChineseRevivalistLaw" 1>> 1 (Passed.)
- <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSRomanRevivalist = "unset",$arcologies[0].FSRomanRevivalistDecoration = 20,$arcologies[0].FSRomanRevivalistLaw = 0,$arcologies[0].FSEgyptianRevivalistDecoration = 20,$arcologies[0].FSEgyptianRevivalistLaw = 0,$arcologies[0].FSEdoRevivalist = "unset",$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0]]
+ <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSRomanRevivalist = "unset",$arcologies[0].FSRomanRevivalistDecoration = 20,$arcologies[0].FSRomanRevivalistLaw = 0,$arcologies[0].FSAztecRevivalist = "unset",$arcologies[0].FSAztecRevivalistDecoration = 20,$arcologies[0].FSAztecRevivalistLaw = 0,$arcologies[0].FSEgyptianRevivalistDecoration = 20,$arcologies[0].FSEgyptianRevivalistLaw = 0,$arcologies[0].FSEdoRevivalist = "unset",$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0]]
<</nobr>>\
diff --git a/src/cheats/mod_EditFSCheatDatatypeCleanup.tw b/src/cheats/mod_EditFSCheatDatatypeCleanup.tw
index 354b322afa0..ba382907267 100644
--- a/src/cheats/mod_EditFSCheatDatatypeCleanup.tw
+++ b/src/cheats/mod_EditFSCheatDatatypeCleanup.tw
@@ -101,6 +101,11 @@
<<set $arcologies[0].FSRomanRevivalistDecoration = Number($arcologies[0].FSRomanRevivalistDecoration) || 0>>
<<set $arcologies[0].FSRomanRevivalistLaw = Number($arcologies[0].FSRomanRevivalistLaw) || 0>>
<</if>>
++<<if $arcologies[0].FSAztecRevivalist != "unset">>
++ <<set $arcologies[0].FSAztecRevivalist = Number($arcologies[0].FSAztecRevivalist) || 0>>
++ <<set $arcologies[0].FSAztecRevivalistDecoration = Number($arcologies[0].FSAztecRevivalistDecoration) || 0>>
++ <<set $arcologies[0].FSAztecRevivalistLaw = Number($arcologies[0].FSAztecRevivalistLaw) || 0>>
++<</if>>
<<if $arcologies[0].FSEgyptianRevivalist != "unset">>
<<set $arcologies[0].FSEgyptianRevivalist = Number($arcologies[0].FSEgyptianRevivalist) || 0>>
<<set $arcologies[0].FSEgyptianRevivalistDecoration = Number($arcologies[0].FSEgyptianRevivalistDecoration) || 0>>
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index deab2ec361d..0e29a113b9b 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -358,11 +358,11 @@
<<set $seed = ["north", "northeast", "east", "southeast", "south", "southwest", "west", "northwest"]>>
<<set $neighboringArcologies = Math.clamp($neighboringArcologies, 0, 8)>>
<<for $i = 0; $i <= $neighboringArcologies; $i++>>
- <<set $activeArcology = {name: "Arcology X-", direction: "north", government: "an individual", leaderID: 0, honeymoon: 0, prosperity: 50, ownership: 50, minority: 20, PCminority: 0, demandFactor: 0, FSSupremacist: "unset", FSSubjugationist: "unset", FSRestart: "unset", FSRepopulationFocus: "unset", FSGenderRadicalist: "unset", FSGenderFundamentalist: "unset", FSPaternalist: "unset", FSDegradationist: "unset", FSBodyPurist: "unset", FSTransformationFetishist: "unset", FSYouthPreferentialist: "unset", FSMaturityPreferentialist: "unset", FSSlimnessEnthusiast: "unset", FSAssetExpansionist: "unset", FSPastoralist: "unset", FSPhysicalIdealist: "unset", FSChattelReligionist: "unset", FSRomanRevivalist: "unset", FSEgyptianRevivalist: "unset", FSEdoRevivalist: "unset", FSArabianRevivalist: "unset", FSChineseRevivalist: "unset", FSNull: "unset", FSGenderRadicalistResearch: 0, FSGenderFundamentalistResearch: 0, FSPaternalistResearch: 0, FSDegradationistResearch: 0, FSBodyPuristResearch: 0, FSTransformationFetishistResearch: 0, FSYouthPreferentialistResearch: 0, FSMaturityPreferentialistResearch: 0, FSSlimnessEnthusiastResearch: 0, FSAssetExpansionistResearch: 0, FSPastoralistResearch: 0, FSPhysicalIdealistResearch: 0, FSRepopulationFocusResearch: 0, FSRestartResearch: 0, embargo: 1, embargoTarget: -1, influenceTarget: -1, influenceBonus: 0, rival: 0}>>
+ <<set $activeArcology = {name: "Arcology X-", direction: "north", government: "an individual", leaderID: 0, honeymoon: 0, prosperity: 50, ownership: 50, minority: 20, PCminority: 0, demandFactor: 0, FSSupremacist: "unset", FSSubjugationist: "unset", FSRestart: "unset", FSRepopulationFocus: "unset", FSGenderRadicalist: "unset", FSGenderFundamentalist: "unset", FSPaternalist: "unset", FSDegradationist: "unset", FSBodyPurist: "unset", FSTransformationFetishist: "unset", FSYouthPreferentialist: "unset", FSMaturityPreferentialist: "unset", FSSlimnessEnthusiast: "unset", FSAssetExpansionist: "unset", FSPastoralist: "unset", FSPhysicalIdealist: "unset", FSChattelReligionist: "unset", FSRomanRevivalist: "unset", FSAZtecRevivalist: "unset", FSEgyptianRevivalist: "unset", FSEdoRevivalist: "unset", FSArabianRevivalist: "unset", FSChineseRevivalist: "unset", FSNull: "unset", FSGenderRadicalistResearch: 0, FSGenderFundamentalistResearch: 0, FSPaternalistResearch: 0, FSDegradationistResearch: 0, FSBodyPuristResearch: 0, FSTransformationFetishistResearch: 0, FSYouthPreferentialistResearch: 0, FSMaturityPreferentialistResearch: 0, FSSlimnessEnthusiastResearch: 0, FSAssetExpansionistResearch: 0, FSPastoralistResearch: 0, FSPhysicalIdealistResearch: 0, FSRepopulationFocusResearch: 0, FSRestartResearch: 0, embargo: 1, embargoTarget: -1, influenceTarget: -1, influenceBonus: 0, rival: 0}>>
<<if $i == 0>>
<<set $activeArcology.direction = 0>>
<<set $activeArcology.name = "Arcology X-4">>
- <<set $activeArcology.FSSupremacistDecoration = 20, $activeArcology.FSSubjugationistDecoration = 20, $activeArcology.FSGenderRadicalistDecoration = 20, $activeArcology.FSGenderFundamentalistDecoration = 20, $activeArcology.FSPaternalistDecoration = 20, $activeArcology.FSDegradationistDecoration = 20, $activeArcology.FSBodyPuristDecoration = 20, $activeArcology.FSTransformationFetishistDecoration = 20, $activeArcology.FSYouthPreferentialistDecoration = 20, $activeArcology.FSMaturityPreferentialistDecoration = 20, $activeArcology.FSSlimnessEnthusiastDecoration = 20, $activeArcology.FSAssetExpansionistDecoration = 20, $activeArcology.FSPastoralistDecoration = 20, $activeArcology.FSPhysicalIdealistDecoration = 20, $activeArcology.FSChattelReligionistDecoration = 20, $activeArcology.FSRomanRevivalistDecoration = 20, $activeArcology.FSEgyptianRevivalistDecoration = 20, $activeArcology.FSEdoRevivalistDecoration = 20, $activeArcology.FSArabianRevivalistDecoration = 20, $activeArcology.FSChineseRevivalistDecoration = 20, $activeArcology.FSRepopulationFocusDecoration = 20, $activeArcology.FSRestartDecoration = 20>>
+ <<set $activeArcology.FSSupremacistDecoration = 20, $activeArcology.FSSubjugationistDecoration = 20, $activeArcology.FSGenderRadicalistDecoration = 20, $activeArcology.FSGenderFundamentalistDecoration = 20, $activeArcology.FSPaternalistDecoration = 20, $activeArcology.FSDegradationistDecoration = 20, $activeArcology.FSBodyPuristDecoration = 20, $activeArcology.FSTransformationFetishistDecoration = 20, $activeArcology.FSYouthPreferentialistDecoration = 20, $activeArcology.FSMaturityPreferentialistDecoration = 20, $activeArcology.FSSlimnessEnthusiastDecoration = 20, $activeArcology.FSAssetExpansionistDecoration = 20, $activeArcology.FSPastoralistDecoration = 20, $activeArcology.FSPhysicalIdealistDecoration = 20, $activeArcology.FSChattelReligionistDecoration = 20, $activeArcology.FSRomanRevivalistDecoration = 20, $activeArcology.FSAztecRevivalistDecoration = 20, $activeArcology.FSEgyptianRevivalistDecoration = 20, $activeArcology.FSEdoRevivalistDecoration = 20, $activeArcology.FSArabianRevivalistDecoration = 20, $activeArcology.FSChineseRevivalistDecoration = 20, $activeArcology.FSRepopulationFocusDecoration = 20, $activeArcology.FSRestartDecoration = 20>>
<<if $targetArcology.type != "New">>
<<set $FSAnnounced = 1>>
<<set $activeArcology.name = $targetArcology.name, $activeArcology.prosperity = $targetArcology.prosperity, $ACitizens += $targetArcology.citizens*500>>
@@ -400,6 +400,8 @@
<<set $activeArcology.FSChattelReligionist = $targetArcology.FSProgress, $activeArcology.FSChattelReligionistDecoration = _decoration>>
<<case "RomanRevivalist">>
<<set $activeArcology.FSRomanRevivalist = $targetArcology.FSProgress, $activeArcology.FSRomanRevivalistDecoration = _decoration>>
+ <<case "AztecRevivalist">>
+ <<set $activeArcology.FSAztecRevivalist = $targetArcology.FSProgress, $activeArcology.FSAztecRevivalistDecoration = _decoration>>
<<case "EgyptianRevivalist">>
<<set $activeArcology.FSEgyptianRevivalist = $targetArcology.FSProgress, $activeArcology.FSEgyptianRevivalistDecoration = _decoration>>
<<case "EdoRevivalist">>
@@ -466,6 +468,8 @@
<<set $arcologies[0].FSChattelReligionistCreed = 0>>
<<set $arcologies[0].FSRomanRevivalistLaw = 0>>
<<set $arcologies[0].FSRomanRevivalistSMR = 0>>
+<<set $arcologies[0].FSAztecRevivalistLaw = 0>>
+<<set $arcologies[0].FSAztecRevivalistSMR = 0>>
<<set $arcologies[0].FSEgyptianRevivalistLaw = 0>>
<<set $arcologies[0].FSEgyptianRevivalistSMR = 0>>
<<set $arcologies[0].FSEdoRevivalistLaw = 0>>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 8adf580ea84..068ddade020 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -409,7 +409,7 @@ The Free City is located in ''$continent''.
<</if>>
<</if>>
-<<if ($targetArcology.type != "RomanRevivalist") && ($targetArcology.type != "EgyptianRevivalist") && ($targetArcology.type != "EdoRevivalist") && ($targetArcology.type != "ArabianRevivalist") && ($targetArcology.type != "ChineseRevivalist")>>
+<<if ($targetArcology.type != "RomanRevivalist") && ($targetArcology.type != "AztecRevivalist") && ($targetArcology.type != "EgyptianRevivalist") && ($targetArcology.type != "EdoRevivalist") && ($targetArcology.type != "ArabianRevivalist") && ($targetArcology.type != "ChineseRevivalist")>>
<br>
The lingua franca of your arcology is ''$language''.
<<if $language != "English">>
diff --git a/src/events/intro/terrainIntro.tw b/src/events/intro/terrainIntro.tw
index 0d0f47577a6..ec172d76757 100644
--- a/src/events/intro/terrainIntro.tw
+++ b/src/events/intro/terrainIntro.tw
@@ -4,6 +4,7 @@
<<set $terrain = $targetArcology.terrain, $continent = $targetArcology.continent>>
<<switch $targetArcology.type>>
<<case "RomanRevivalist">><<set $language = "Latin">>
+ <<case "AztecRevivalist">><<set $language = "Nahuatl">>
<<case "EgyptianRevivalist">><<set $language = "Ancient Egyptian">>
<<case "EdoRevivalist">><<set $language = "Japanese">>
<<case "ArabianRevivalist">><<set $language = "Arabic">>
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index cbfeff98d65..09198caa169 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -52,6 +52,20 @@ The game supports a few keyboard shortcuts.
''Right arrow'', ''left arrow'' and ''q'', ''e'' will move between slaves in slaves' individual menus.
On the main menus, ''C'' will open arcology management, ''S'' will open the slave markets, ''A'' will open personal attention options, ''H'' will open Head Girl management, ''B'' will open Bodyguard management, ''R'' will open Recruiter management, and ''F'' will initiate the short sex scene at the bottom of the main menu.
+<<case "The Arcology Interface">>\
+The Arcology Interface is the large table-based display at the top of the main menu. It's designed as an abstract representation of the arcology.
+
+It is divided into levels and sectors. Levels are the horizontal rows. An arcology is a very large building, and each Level includes many floors. Sectors are slices of those levels. For example, on Levels with four Sectors, each sector includes a quarter of each floor that's part of that Level. Each Sector has its own cell in the interface, and each Sector is occupied by facilities, tenants, or both. Each type of Sector occupant is bordered in a different color. The contents of a Sector can be viewed and changed by clicking on the text inside a Sector.
+
+The uppermost Level is the Penthouse. It's where the player character and the slaves under their direct supervision live, and it can be upgraded with a number of facilities that can be accessed through shortcuts that are added to the Penthouse in the interface once they're installed. Some of these facilities can house some of the player character's sex slaves. Unlike every other Sector, the Penthouse is always owned by the player and cannot be sold. Every other Sector can be privately owned, reducing the player's control of the arcology. Privately owned Sectors can be purchased, or acquired using reputation if the player character's reputation is extremely high. Privately owned sectors are bordered in red regardless of what's in them.
+
+The next Level down, with three Sectors, is the Promenade, which is a major social area and hosts most of the businesses which cater to the arcology's citizens. Promenade Sectors are occupied by Shops by default, which will automatically be filled by business tenants that will pay the player character rent if they own the Sector. Promenade Sectors can be upgraded into [[Brothels|Encyclopedia][$encyclopedia = "Brothel"]], [[Clubs|Encyclopedia][$encyclopedia = "Club"]], or an enhanced version of Shops which will attract business tenants that help advance a specific [[future society|Encyclopedia][$encyclopedia = "Future Societies"]] model, and still provide rent.
+
+The next three Levels have four Sectors and are living areas that are occupied by Apartments by default. These house arcology citizens, who pay rent, and who are indirectly very important because they determine the level of local demand for sexual services provided by whores, public servants, and other sex slaves doing sexual jobs. Apartments can be upgraded for either density or luxury. Dense Apartments increase the citizen population, and are therefore useful to keep demand up if the player is relying on selling or giving away sexual services. Luxury Apartments increase the arcology's prosperity, and are therefore a better choice if demand for sexual services isn't a priority.
+
+The first level with five Sectors is the Concourse. Like the Promenade, it hosts businesses, but these focus more on bulk trade and less on citizens' luxury needs, and include the arcology's slave markets. Its Sectors are occupied by Markets by default, which pay rent. Concourse Sectors can be upgraded into a [[Pit|Encyclopedia][$encyclopedia = "Pit"]] for fighting slaves, an [[Arcade|Encyclopedia][$encyclopedia = "Arcade"]], or into a flagship store for the player character's [[corporation|Encyclopedia][$encyclopedia = "The Corporation"]].
+
+The lowest level, also with five Sectors, is the Service level. Its Sectors are occupied by Manufacturing by default, which of course pay rent. If the player is focusing on menial slaves, its Sectors can be upgraded into Pens, to increase the total number of [[menial slaves|Encyclopedia][$encyclopedia = "Menial Slaves"]] that can be kept in the arcology, or into Sweatshops, to put the labor of menial slaves in the arcology to use. Alternatively, these Sectors can be upgraded into a [[Dairy|Encyclopedia][$encyclopedia = "Dairy"]], or into a Barracks, which will reduce the weekly upkeep of any mercenaries the player character has hired.
<<case "Tips and Tricks">>\
Buy low, sell high.
@@ -1593,6 +1607,15 @@ Money can be expended to directly advance future societies; the spending level c
Provides demand for basic educations from [[the corporation|Encyclopedia][$encyclopedia = "The Corporation"]].
Mutually exclusive with the other Revivalist models.
\
+<<case "Aztec Revivalism">>\
+''Aztec Revivalism'' is a future society model which approves of qualities like good military education and an older leader.
+ Improves all military acquisitions of slaves and allows for the sacrifice of slaves for reputation.
+ Can apply unique names to slaves.
+ Slows increases in the ratio of slaves to citizens.
+ Can be developed to greatly rely on the Head Girl position as an advisor and assistant.
+ Provides demand for menial slaves from [[the corporation|Encyclopedia][$encyclopedia = "The Corporation"]].
+ Mutually exclusive with the other Revivalist models.
+\
<<case "Egyptian Revivalism">>\
''Egyptian Revivalism'' is a future society model which approves of keeping a large harem, slave incest, and having a wide racial variety of public slaves.
Improves value of slaves in incestuous relationships and efficiency of fucktoys in improving reputation.
@@ -2014,7 +2037,7 @@ Error: bad title.
<</nobr>>
__Encyclopedia FC__
-Gameplay: <<link "First Game Guide">><<set $encyclopedia = "First Game Guide">><<goto "Encyclopedia">><</link>> | <<link "How to Play">><<set $encyclopedia = "How to Play">><<goto "Encyclopedia">><</link>> | <<link "Keyboard Shortcuts">><<set $encyclopedia = "Keyboard Shortcuts">><<goto "Encyclopedia">><</link>> | <<link "Tips and Tricks">><<set $encyclopedia = "Tips and Tricks">><<goto "Encyclopedia">><</link>> | <<link "Drugs and Their Effects">><<set $encyclopedia = "Drugs and Their Effects">><<goto "Encyclopedia">><</link>> | <<link "From Rebellious to Devoted">><<set $encyclopedia = "From Rebellious to Devoted">><<goto "Encyclopedia">><</link>> | <<link "Sexual Energy">><<set $encyclopedia = "Sexual Energy">><<goto "Encyclopedia">><</link>> | <<link "Random Events">><<set $encyclopedia = "Random Events">><<goto "Encyclopedia">><</link>> | <<link "Enslaving People">><<set $encyclopedia = "Enslaving People">><<goto "Encyclopedia">><</link>> | <<link "Arcologies and Reputation">><<set $encyclopedia = "Arcologies and Reputation">><<goto "Encyclopedia">><</link>> | <<link "Pre-Owned Slaves">><<set $encyclopedia = "Pre-Owned Slaves">><<goto "Encyclopedia">><</link>> | <<link "The Corporation">><<set $encyclopedia = "The Corporation">><<goto "Encyclopedia">><</link>> | <<link "Costs Summary">><<set $encyclopedia = "Costs Summary">><<goto "Encyclopedia">><</link>> | <<link "Rules Assistant">><<set $encyclopedia = "Rules Assistant">><<goto "Encyclopedia">><</link>>
+Gameplay: <<link "First Game Guide">><<set $encyclopedia = "First Game Guide">><<goto "Encyclopedia">><</link>> | <<link "How to Play">><<set $encyclopedia = "How to Play">><<goto "Encyclopedia">><</link>> | <<link "Keyboard Shortcuts">><<set $encyclopedia = "Keyboard Shortcuts">><<goto "Encyclopedia">><</link>> | <<link "The Arcology Interface">><<set $encyclopedia = "The Arcology Interface">><<goto "Encyclopedia">><</link>> | <<link "Tips and Tricks">><<set $encyclopedia = "Tips and Tricks">><<goto "Encyclopedia">><</link>> | <<link "Drugs and Their Effects">><<set $encyclopedia = "Drugs and Their Effects">><<goto "Encyclopedia">><</link>> | <<link "From Rebellious to Devoted">><<set $encyclopedia = "From Rebellious to Devoted">><<goto "Encyclopedia">><</link>> | <<link "Sexual Energy">><<set $encyclopedia = "Sexual Energy">><<goto "Encyclopedia">><</link>> | <<link "Random Events">><<set $encyclopedia = "Random Events">><<goto "Encyclopedia">><</link>> | <<link "Enslaving People">><<set $encyclopedia = "Enslaving People">><<goto "Encyclopedia">><</link>> | <<link "Arcologies and Reputation">><<set $encyclopedia = "Arcologies and Reputation">><<goto "Encyclopedia">><</link>> | <<link "Pre-Owned Slaves">><<set $encyclopedia = "Pre-Owned Slaves">><<goto "Encyclopedia">><</link>> | <<link "The Corporation">><<set $encyclopedia = "The Corporation">><<goto "Encyclopedia">><</link>> | <<link "Costs Summary">><<set $encyclopedia = "Costs Summary">><<goto "Encyclopedia">><</link>> | <<link "Rules Assistant">><<set $encyclopedia = "Rules Assistant">><<goto "Encyclopedia">><</link>>
The X-Series Arcology: <<link "What the Upgrades Do">><<set $encyclopedia = "What the Upgrades Do">><<goto "Encyclopedia">><</link>> | <<link "Personal Assistant">><<set $encyclopedia = "Personal Assistant">><<goto "Encyclopedia">><</link>> | <<link "Security Drones">><<set $encyclopedia = "Security Drones">><<goto "Encyclopedia">><</link>> | <<link "Water Filtration">><<set $encyclopedia = "Water Filtration">><<goto "Encyclopedia">><</link>> | <<link "Slave Nutrition">><<set $encyclopedia = "Slave Nutrition">><<goto "Encyclopedia">><</link>> | <<link "The Remote Surgery">><<set $encyclopedia = "The Remote Surgery">><<goto "Encyclopedia">><</link>> | <<link "The Pharmaceutical Fab.">><<set $encyclopedia = "The Pharmaceutical Fab.">><<goto "Encyclopedia">><</link>> | <<link "The Studio">><<set $encyclopedia = "The Studio">><<goto "Encyclopedia">><</link>> | <<link "The Auto Salon">><<set $encyclopedia = "The Auto Salon">><<goto "Encyclopedia">><</link>>
The Free Cities today: <<link "Money">><<set $encyclopedia = "Money">><<goto "Encyclopedia">><</link>> | <<link "Slave Couture">><<set $encyclopedia = "Slave Couture">><<goto "Encyclopedia">><</link>> | <<link "Nymphomania">><<set $encyclopedia = "Nymphomania">><<goto "Encyclopedia">><</link>> | <<link "Gender">><<set $encyclopedia = "Gender">><<goto "Encyclopedia">><</link>> | <<link "The Head Girl">><<set $encyclopedia = "The Head Girl">><<goto "Encyclopedia">><</link>> | <<link "Madams">><<set $encyclopedia = "Madams">><<goto "Encyclopedia">><</link>> | <<link "DJs">><<set $encyclopedia = "DJs">><<goto "Encyclopedia">><</link>> | <<link "Milkmaids">><<set $encyclopedia = "Milkmaids">><<goto "Encyclopedia">><</link>> | <<link "Stewardesses">><<set $encyclopedia = "Stewardesses">><<goto "Encyclopedia">><</link>> | <<link "Slave Bodyguards">><<set $encyclopedia = "Slave Bodyguards">><<goto "Encyclopedia">><</link>> | <<link "Slave Dairy">><<set $encyclopedia = "Slave Dairy">><<goto "Encyclopedia">><</link>> | <<link "The Ejaculate Market">><<set $encyclopedia = "The Ejaculate Market">><<goto "Encyclopedia">><</link>> | <<link "Modern Anal">><<set $encyclopedia = "Modern Anal">><<goto "Encyclopedia">><</link>> | <<link "Disease in the Free Cities">><<set $encyclopedia = "Disease in the Free Cities">><<goto "Encyclopedia">><</link>> | <<link "Free Cities Justice">><<set $encyclopedia = "Free Cities Justice">><<goto "Encyclopedia">><</link>> | <<link "Slave Marriage">><<set $encyclopedia = "Slave Marriage">><<goto "Encyclopedia">><</link>> | <<link "Arcades">><<set $encyclopedia = "Arcades">><<goto "Encyclopedia">><</link>> | <<link "Fuckdolls">><<set $encyclopedia = "Fuckdolls">><<goto "Encyclopedia">><</link>>
Free Cities culture tomorrow: <<link "The Future of Society">><<set $encyclopedia = "The Future of Society">><<goto "Encyclopedia">><</link>> | <<link "The New Rome">><<set $encyclopedia = "The New Rome">><<goto "Encyclopedia">><</link>> | <<link "Naked, Barefoot, and Pregnant">><<set $encyclopedia = "Naked, Barefoot, and Pregnant">><<goto "Encyclopedia">><</link>> | <<link "The Top">><<set $encyclopedia = "The Top">><<goto "Encyclopedia">><</link>> | <<link "The Bottom">><<set $encyclopedia = "The Bottom">><<goto "Encyclopedia">><</link>> | <<link "The Purity of the Human Form">><<set $encyclopedia = "The Purity of the Human Form">><<goto "Encyclopedia">><</link>> | <<link "A World Built on Implants">><<set $encyclopedia = "A World Built on Implants">><<goto "Encyclopedia">><</link>> | <<link "Slaves as Stock">><<set $encyclopedia = "Slaves as Stock">><<goto "Encyclopedia">><</link>> | <<link "Slavery and the Physical Ideal">><<set $encyclopedia = "Slavery and the Physical Ideal">><<goto "Encyclopedia">><</link>> | <<link "Faith in the Free Cities">><<set $encyclopedia = "Faith in the Free Cities">><<goto "Encyclopedia">><</link>>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 022849e9ef4..05e88bf9513 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -37,6 +37,8 @@
<<set $slaves[_i].breedingMark = 0>>
<<if $arcologies[0].FSRomanRevivalist > 90>>
<<set $slaves[_i].nationality = "Roman Revivalist">>
+ <<elseif $arcologies[0].FSAztecRevivalist > 90>>
+ <<set $slaves[_i].nationality = "Aztec Revivalist">>
<<elseif $arcologies[0].FSEgyptianRevivalist > 90>>
<<set $slaves[_i].nationality = "Ancient Egyptian Revivalist">>
<<elseif $arcologies[0].FSEdoRevivalist > 90>>
@@ -500,6 +502,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $FSSpending = 0>>
<<set $FSLockinLevel = 100>>
<<set $applyLaw = 0>>
+<<set $FSPromenade = {Subjugationist: 0, Supremacist: 0, GenderRadicalist: 0, GenderFundamentalist: 0, Paternalist: 0, Degradationist: 0, BodyPurist: 0, TransformationFetishist: 0, YouthPreferentialist: 0, MaturityPreferentialist: 0, SlimnessEnthusiast: 0, AssetExpansionist: 0, Pastoralist: 0, PhysicalIdealist: 0, ChattelReligionist: 0, RomanRevivalist: 0, AztecRevivalist: 0, EgyptianRevivalist: 0, EdoRevivalist: 0, ArabianRevivalist: 0, ChineseRevivalist: 0, RepopulationFocus: 0, Restart: 0}>>
<<set $corpAnnounced = 0>>
<<set $corpIncorporated = 0>>
@@ -562,6 +565,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $clothesBoughtOil = 0>>
<<set $clothesBoughtHabit = 0>>
<<set $clothesBoughtToga = 0>>
+<<set $clothesBoughtHuipil = 0>>
<<set $clothesBoughtKimono = 0>>
<<set $clothesBoughtHarem = 0>>
<<set $clothesBoughtQipao = 0>>
@@ -1040,7 +1044,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $argentinianSlaveNames = ["Abril", "Agostina", "Agus", "Agustina", "Andrea", "Anto", "Antonella", "Ayelén", "Belén", "Cami", "Camila", "Candelaria", "Carla", "Carolina", "Clara", "Daniela", "Emilia", "Florencia", "Gaby", "Jessica", "Julia", "Julieta", "Karen", "Magali", "Magdalena", "Malena", "Maria", "Marlene", "Marti", "Martina", "Melisa", "Micaela", "Milagros", "Nadia", "Nani", "Natalia", "Nayla", "Paula", "Paz", "Riffo", "Rocio", "Romina", "Rosario", "Sara", "Sofia", "Sol", "Tania", "Tatiana", "Valentina", "Victoria", "Virginia"]>>
-<<set $vietnameseSlaveNames = ["An", "Anh", "Annie", "Bui", "Bình", "Ca", "Cam", "Chau", "Chi", "Cuc", "Dieu", "Do", "Ha", "Hai", "Hang", "Hanh", "Hao", "Hien", "Hoa", "Hong", "Hue", "Huong", "Huyen", "Jane", "Jenny", "Kieu", "Kim Cuc", "Kim", "Kim-Ly", "Lan", "Lanh", "Le", "Lien", "Linh", "Loan", "Mai", "Minh", "My", "Natalie", "Nga", "Ngan", "Nghi", "Ngoc Bich", "Ngoc", "Ngon", "Nguyen", "Nguyet", "Nhat", "Nhung", "Oanh", "Phuc", "Phuong", "Phýõng", "Quy", "Quyen", "Rose", "Sang", "Thanh", "Thao", "Thi", "Thu", "Thuy", "Tien", "Tiên", "Trang", "Truc", "Tu", "Tuyen", "Tuyet", "Uyên", "Van", "Vinh", "Xuan", "Yen"]>>
+<<set $vietnameseSlaveNames = ["An", "Anh", "Annie", "Bich", "Bui", "Bình", "Ca", "Cam", "Chau", "Chi", "Cuc", "Dieu", "Do", "Ha", "Hai", "Hang", "Hanh", "Hao", "Hien", "Hoa", "Hong", "Hue", "Huong", "Huyen", "Jane", "Jenny", "Kieu", "Kim Cuc", "Kim", "Kim-Ly", "Lan", "Lanh", "Le", "Lien", "Linh", "Loan", "Mai", "Minh", "My", "Natalie", "Nga", "Ngan", "Nghi", "Ngoc Bich", "Ngoc", "Ngon", "Nguyen", "Nguyet", "Nhat", "Nhung", "Oanh", "Phuc", "Phuong", "Phýõng", "Quy", "Quyen", "Rose", "Sang", "Thanh", "Thao", "Thi", "Thu", "Thuy", "Tien", "Tiên", "Trang", "Truc", "Tu", "Tuyen", "Tuyet", "Uyên", "Van", "Vinh", "Xuan", "Yen"]>>
<<set $iranianSlaveNames = ["Aeen", "Angel", "Assal", "Atousa", "Azin", "Boshra", "Donya", "Elisa", "Fatemeh", "Fatima", "Ghazaleh", "Haniye", "Katy", "Mahdie", "Mandana", "Mania", "Mari", "Maria", "Marjan", "Maryam", "Mehrnaz", "Mina", "Mino", "Mojan", "Nazi", "Neda", "Negin", "Nikki", "Niloofar", "Nooshin", "Pani", "Parinaz", "Poone", "Raha", "Raheleh", "Romi", "Rozhin", "Saba", "Sabs", "Saedeh", "Sajedeh", "Sara", "Sarah", "Saye", "Setareaseman", "Shaghayegh", "Sima", "Soha", "Somaye", "Zahra"]>>
@@ -1068,13 +1072,13 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $venezuelanSlaveNames = ["Alejandra", "Ambar", "Andrea", "Astrid", "Aurismar", "Aury", "Belkis", "Canónicco", "Carolina", "Claudia", "Dayan", "Dayana", "De", "Denise", "Desireez", "Euclarissa", "Exis", "Fabiana", "Fabiola", "Fiora", "Gab", "Genesis", "Gliosmar", "Iris", "Isabell", "Jashiel", "Juliana", "Junca", "Karelys", "Kattye", "Keybell", "Keysha", "La", "Lis", "Loli", "Lucero", "Maria Alejandra", "Marian", "Marilyn", "Martha", "Molina", "Montes", "Nana", "Nathaly", "Nicel", "Noely", "Oca", "Orii", "Patricia", "Pauled", "Rossi", "Rossybell", "Sharai", "Steffany", "Yaneth", "Zenahir", "Zuleibis"]>>
-<<set $irishSlaveNames = ["Emily", "Sophie", "Emma", "Grace", "Ella", "Aoife", "Amelia", "Lily", "Ava", "Sarah", "Hannah", "Lucy", "Sophia", "Mia", "Anna", "Olivia", "Ruby", "Saoirse", "Caoimhe", "Kate", "Chloe", "Katie", "Holly", "Lauren", "Erin", "Ellie", "Cara", "Niamh", "Leah", "Molly", "Jessica", "Isabelle", "Ciara", "Amy", "Julia", "Zoe", "Eva", "Isabella", "Robyn", "Sofia", "Laura", "Freya", "Kayla", "Aisling", "Abigail", "Charlotte", "Ellen", "Eve", "RóisÃn", "Millie", "Faye", "Rachel"]>>
+<<set $irishSlaveNames = ["Abigail", "Aisling", "Amelia", "Amy", "Anna", "Aoife", "Ava", "Caoimhe", "Cara", "Charlotte", "Chloe", "Ciara", "Ella", "Ellen", "Ellie", "Emily", "Emma", "Erin", "Eva", "Eve", "Faye", "Freya", "Grace", "Hannah", "Holly", "Isabella", "Isabelle", "Jessica", "Julia", "Kate", "Katie", "Kayla", "Laura", "Lauren", "Leah", "Lily", "Lucy", "Mia", "Millie", "Molly", "Niamh", "Olivia", "Rachel", "Robyn", "Ruby", "RóisÃn", "Saoirse", "Sarah", "Sofia", "Sophia", "Sophie", "Zoe"]>>
<<set $icelandicSlaveNames = ["Anna", "Auður", "Berglind", "Birna", "BryndÃs", "Edda", "ElÃn", "ElÃsabet", "Erla", "Erna", "Eva", "Guðbjörg", "Guðný", "Guðrún", "Halldóra", "Hanna", "Helga", "Hildur", "Hrafnhildur", "Hulda", "Inga", "Ingibjörg", "Jóhanna", "Jóna", "JónÃna", "Karen", "KatrÃn", "Kolbrún", "KristÃn", "Lilja", "Linda", "Margrjet", "MarÃa", "Ragnheiður", "Rakel", "Sara", "SigrÃður", "Sigrún", "Steinunn", "Sólveig", "Thelma", "Unnur", "Valgerður", "ÃsdÃs", "Ãsta", "Ãris", "Ólöf", "Þóra", "ÞórdÃs", "Þórunn"]>>
<<set $finnishSlaveNames = ["Aada", "Aava", "Aino", "Aleksandra", "Alexandra", "Alina", "Alisa", "Alma", "Amanda", "Anna", "Anni", "Aurora", "Eevi", "Elina", "Elisabet", "Ella", "Ellen", "Elli", "Elsa", "Emilia", "Emma", "Enni", "Eveliina", "Helena", "Helmi", "Iida", "Ilona", "Inkeri", "Isla", "Johanna", "Josefiina", "Julia", "Kaarina", "Karoliina", "Katariina", "Kerttu", "Kristiina", "Lilja", "Linnea", "Lumi", "Maria", "Matilda", "Olivia", "Pihla", "Sara", "Siiri", "Sofia", "Venla", "Vilhelmiina", "Vilma"]>>
-<<set $newZealanderSlaveNames = ["Aaliyah" , "Abigail", "Alexis", "Alice", "Amelia", "Aria", "Ava", "Bella", "Charlotte", "Chloe", "Eden", "Elizabeth", "Ella", "Emily", "Emma", "Eva", "Evelyn", "Evie", "Georgia", "Grace", "Hannah", "Harper", "Hazel", "Holly", "Indie", "Isabella", "Isabelle", "Isla", "Ivy", "Jessica", "Lily", "Lucy", "Mackenzie", "Maddison", "Madison", "Maia", "Mia", "Mila", "Millie", "Olive", "Olivia", "Paige", "Ruby", "Scarlett", "Sienna", "Sophia", "Sophie", "Willow", "Zara", "Zoe"]>>
+<<set $newZealanderSlaveNames = ["Aaliyah", "Abigail", "Alexis", "Alice", "Amelia", "Aria", "Ava", "Bella", "Charlotte", "Chloe", "Eden", "Elizabeth", "Ella", "Emily", "Emma", "Eva", "Evelyn", "Evie", "Georgia", "Grace", "Hannah", "Harper", "Hazel", "Holly", "Indie", "Isabella", "Isabelle", "Isla", "Ivy", "Jessica", "Lily", "Lucy", "Mackenzie", "Maddison", "Madison", "Maia", "Mia", "Mila", "Millie", "Olive", "Olivia", "Paige", "Ruby", "Scarlett", "Sienna", "Sophia", "Sophie", "Willow", "Zara", "Zoe"]>>
<<set $polishSlaveNames = ["Ada", "Adrianna", "Agata", "Agnieszka", "Aleksandra", "Alicja", "Amelia", "Anastazja", "Angelika", "Aniela", "Anita", "Anna", "Antonina", "Aurelia", "Barbara", "Bianka", "Blanka", "Dagmara", "Daria", "Diana", "Dominika", "Dorota", "Elena", "Eliza", "Emilia", "Ewa", "Ewelina", "Gabriela", "Hanna", "Helena", "Iga", "Izabela", "Jagoda", "Jessica", "Joanna", "Julia", "Julita", "Justyna", "Kaja", "Kalina", "Kamila", "Karina", "Karolina", "Katarzyna", "Kinga", "Klara", "Klaudia", "Kornelia", "Laura", "Lena", "Lidia", "Liliana", "Lilianna", "Liwia", "Lucja", "Magdalena", "Maja", "Malgorzata", "Malwina", "Marcelina", "Maria", "Marianna", "Marika", "Marlena", "Marta", "Martyna", "Matylda", "Maya", "Michalina", "Milena", "Monika", "Nadia", "Natalia", "Natasza", "Nela", "Nicola", "Nicole", "Nikola", "Nina", "Olga", "Olivia", "Oliwia", "Patrycja", "Paulina", "Pola", "Roksana", "Rozalia", "Róza", "Sandra", "Sara", "Sonia", "Sylwia", "Tatiana", "Urszula", "Vanessa", "Victoria", "Weronika", "Wiktoria", "Zofia", "Zuzanna"]>>
@@ -1116,7 +1120,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $slovakSlaveNames = ["Alžbeta", "Anna", "Ema", "Eva", "Helena", "Jana", "KatarÃna", "KristÃna", "Laura", "Margita", "Marta", "Michaela", "Mária", "Natália", "Nela", "Nina", "Simona", "Sofia", "Viktória", "Zuzana"]>>
-<<set $kazakhSlaveNames = ["Aisha", "Alina", "Amina", "Aruzhan", "Ayala", "Ayana", "Ayaru", "Ayaulym", "Ayzere", "Darya", "Diana", "Inkar", "Inzhu", "Kausar", "Madina", "Nurai" , "Sezim", "Sofia", "Victoria", "Zhanerke"]>>
+<<set $kazakhSlaveNames = ["Aisha", "Alina", "Amina", "Aruzhan", "Ayala", "Ayana", "Ayaru", "Ayaulym", "Ayzere", "Darya", "Diana", "Inkar", "Inzhu", "Kausar", "Madina", "Nurai", "Sezim", "Sofia", "Victoria", "Zhanerke"]>>
<<set $zimbabweanSlaveNames = ["Aneni", "Anodiwa", "Anokosha", "Batsirai", "Chenesai", "Chiedza", "Chiratidzo", "Chishamiso", "Chivaraidzo", "Dadisai", "Edzai", "Fadzai", "Haruperi", "Hazvinei", "Idai", "Ipaishe", "Kunashe", "Kundai", "Maitaishe", "Mawanda", "Mukudzei", "Mutsa", "Ndafadzwa", "Ngonidzashe", "Nyararai", "Paidamoyo", "Pamhidzai", "Panashe", "Ropafadzo", "Ropafadzo", "Ruponeso", "Ruramisai", "Ruvarashe", "Ruwadzano", "Sarudzai", "Tanatswa", "Tanyaradzwa", "Tapiwanashe", "Timukudzei", "Tinaye", "Tsungirirai", "Varaidzo", "Vhenekerayi", "Vongai", "Wadzanai", "Watinoda", "Yananiso", "Yemurai", "Zviedzo", "Zvinodaishe"]>>
@@ -1184,13 +1188,15 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $romanSlaveNames = ["Aconia", "Aelia", "Agricola", "Agrippa", "Agrippina", "Ahala", "Ahenobarba", "Alba", "Albina", "Ambusta", "Annalis", "Antistia", "Antonia", "Appia", "Aquila", "Aquilina", "Arria", "Arvina", "Asina", "Atella", "Atia", "Aula", "Aurela", "Avita", "Baebiana", "Balba", "Barba", "Barbata", "Bassa", "Bestia", "Bibacula", "Bibula", "Blaesa", "Broccha", "Bruta", "Bubulca", "Bulba", "Caeca", "Caecilia", "Caesonia", "Calida", "Calpurnia", "Calva", "Calvina", "Camilla", "Cana", "Canina", "Catilina", "Catula", "Celeris", "Celsa", "Cethega", "Cicurina", "Cincinnata", "Cinna", "Claudia", "Corda", "Cornelia", "Cornicen", "Cornuta", "Corva", "Corvina", "Cossa", "Costa", "Cotta", "Crassa", "Crassipes", "Crispa", "Crispina", "Crispina", "Curva", "Decima", "Dentata", "Dentra", "Diana", "Dives", "Dolabella", "Domitia", "Domitilla", "Drusa", "Drusilla", "Euphemia", "Eutropia", "Fabia", "Faustina", "Figula", "Fimbria", "Flacca", "Flava", "Flavia", "Flora", "Fusa", "Gaia", "Galeria", "Galla", "Gemella", "Gnaea", "Gnaea", "Graccha", "Gratidia", "Gurges", "Habita", "Helena", "Helva", "Helvia", "Herennia", "Honoria", "Hostia", "Imperiosa", "Iulla", "Julia", "Junia", "Justina", "Lactuca", "Laenas", "Laevina", "Lanata", "Laterensis", "Lentula", "Leontia", "Lepida", "Lepida", "Licina", "Licinia", "Livia", "Livilla", "Lollia", "Longa", "Lucia", "Lucilla", "Luculla", "Lupa", "Macra", "Macula", "Maecia", "Magia", "Malleola", "Mamerca", "Mania", "Manlia", "Marca", "Marcella", "Marcella", "Marcia", "Mellisa", "Merenda", "Merga", "Merula", "Messalina", "Messalla", "Metella", "Metella", "Minervina", "Munatia", "Murena", "Mus", "Musca", "Nasica", "Natta", "Nepos", "Nerva", "Nigra", "Novella", "Numeria", "Ocella", "Ocellina", "Octavia", "Orbiana", "Otacilia", "Paccia", "Pacila", "Paeta", "Pansa", "Papa", "Papianilla", "Patercula", "Paulina", "Paulla", "Pera", "Pictrix", "Placiaida", "Planca", "Plauta", "Plautia", "Plautilla", "Plotina", "Pompeia", "Popilla", "Poplicola", "Poppaea", "Porcia", "Postuma", "Potita", "Praeconina", "Praetextata", "Prisca", "Procula", "Publia", "Publicola", "Pulcheria", "Pulchra", "Pulla", "Pulvilla", "Quadrata", "Quinta", "Ralla", "Regilla", "Regula", "Risca", "Rufa", "Ruga", "Rulla", "Rutila", "Sabina", "Salinatrix", "Salonina", "Saturnina", "Scaeva", "Scaevola", "Scapula", "Scaura", "Scrofa", "Sempronia", "Seneca", "Servia", "Servilia", "Severa", "Severa", "Sexta", "Sila", "Silana", "Spuria", "Statilia", "Structa", "Sulla", "Sulpicia", "Sura", "Taura", "Terentia", "Theodora", "Tiberia", "Tita", "Titania", "Tranquillina", "Triaria", "Trigemina", "Tuberta", "Tubula", "Tuditana", "Tulla", "Tullia", "Turda", "Ulpia", "Urgulania", "Valeria", "Vara", "Vatia", "Verina", "Verres", "Vesta", "Vetus", "Vibia", "Vibia", "Violentilla", "Vipsania", "Vistilla", "Vitula", "Volusa"]>>
+<<set $aztecSlaveNames = ["Achcauhtli", "Ahuiliztli", "Amoxtli", "Atl", "Centehua", "Chicahua", "Chipahua", "Cihuaton", "Citlali", "Citlalmina", "Coaxoch", "Coszcatl", "Cozamalotl", "Cualli", "Cuicatl", "Eheloc", "Eleuia", "Eloxochitl", "Etalpalli", "Eztli", "Ichtaca", "Icnoyotl", "Ihuicatl", "Ilhuitl", "Itotia", "Itzel", "Iuitl", "Ixcatzin", "Ixchel", "Ixtli", "Izel", "Mahuizoh", "Malina", "Manauia", "Mazatl", "Mecatl", "Meztli", "Miyaoaxochitl", "Mizquixaual", "Momozlan", "Momoztli", "Moyolehuani", "Nahuatl", "Necahual", "Nelli", "Nenetl", "Nochtli", "Noxochicoztli", "Ohtli", "Papa", "Papan", "Patli", "Quetzalxochitl", "Sacnite", "Teicuih", "Teiuc", "Teoxihuitl", "Tepin", "Teuicui", "Teyacapan", "Tlachinolli", "Tlaco", "Tlacoehua", "Tlacotl", "Tlalli", "Tlanextli", "Tlataca", "Tlazohtzin", "Tlexictli", "Toltecatl", "Tonalnan", "Topiltia", "Xihuitl", "Xilonen", "Xiloxoch", "Xipil", "Xiuhcoatl", "Xiuhtonal", "Xochicotzin", "Xochiquetzal", "Xochitl", "Xochiyotl", "Xocoh", "Xocoyotl", "Yaotl", "Yaretzi", "Yayauhqui", "Yolihuani", "Yolotli", "Yoltzin", "Zaniyah", "Zeltzin", "Zolel", "Zuma", "Zyanya"]>>
+
<<set $ancientEgyptianSlaveNames = ["A'at", "Ahhotep", "Ahmose", "Ahmose", "Ahmose", "Ahmose", "Ahmose", "Ahmose", "Ahmose", "Ahmose", "Ahmose", "Ahmose", "Ahmose-Nefertari", "Ahset", "Amtes", "Amunet", "Ana", "Aneksi", "Ankhes-Pepi", "Ankhesenamon", "Ankhesenpaaten", "Ankhesenpaaten-ta-sherit", "Ankhetitat", "Ankhnes-Pepi", "Ankhnesmery-Re", "Aoh", "Ashait", "Ast", "Atet", "Baketamon", "Bakt", "Baktwerel", "Beketaten", "Berenib", "Betresh", "Betrest", "Bint-Anath", "Bunefer", "Dedyet", "Fent-Ankhet", "Gilukhipa", "Hapynma'at", "Hedjhekenu", "Henhenet", "Henite", "Hent", "Hent-Temehu", "Hent-Tenemu", "Hentaneb", "Hentempet", "Hentmereb", "Hentmire", "Henutmire", "Henutsen", "Henuttawy", "Henuttimehu", "Hep", "Herit", "Herneith", "Hetepheres", "Hetephernebty", "Heterphenebty", "Hornefrure'", "Huy", "Imi", "Inhapi", "Inhapi", "Intakaes", "Iput", "Ipwet", "Ipy", "Isetnofret", "Isis", "Istnofret", "Itekuyet", "Itet", "Kasmut", "Kawit", "Kemanub", "Kemanut", "Kemsit", "Kentetenka", "Khama'at", "Khamerernebty", "Khemut", "Khentikus", "Khentkawes", "Khenut", "Khuit", "Khumit", "Kiya", "Ma'at", "Maatkare-Nefertari", "Maia", "Meket-Aten", "Menhet", "Menwi", "Mereneith", "Mereryet", "Meresankh", "Merit-Amon", "Meritaten", "Meritites", "Merneith", "Merseger", "Merti", "Meryetamun", "Meryetamun", "Meryetre", "Merysankh", "Meryt-Amon", "Meryt-Re-Hatshepsut", "Merytamon", "Merytaten-tasherit", "Mutemwiya", "Mutnodjme", "Mutnofret", "Muyet", "Nebet", "Nebettawy", "Nebt", "Nebt-tawya", "Neferhent", "Neferhetep", "Neferhetepes", "Neferkent", "Neferneferure", "Nefertari", "Nefertiry", "Nefertiti", "Nefertkau", "Nefertkaw", "Neferu", "Neferu", "Neferu-Re", "Neferukhayt", "Neferukhebt", "Nefret", "Nefru", "Nefru-Ptah", "Nefru-Sobek", "Nefru-totenen", "Nefrusheri", "Neith", "Neithotep", "Nemathap", "Nenseddjedet", "Neshkons", "Nestanebtishru", "Nit", "Nitemat", "Nithotep", "Nodjmet", "Nofret", "Nofret", "Nubkhas", "Nubkhesed", "Rai", "Raia", "Redji", "Reputneb", "Sadeh", "Sadek", "Sebek-shedty-Neferu", "Senebsen", "Senisonbe", "Sennuwy", "Seshseshet", "Sit-Hathor-Yunet", "Sitamun", "Sitkamose", "Sitre", "Sobekemsaf", "Sotepenre", "Ta-Opet", "Tadukhipa", "Takhaet", "Tarset", "Taweret", "Tem", "Tener", "Teo", "Tetisheri", "Tey", "Thent", "Tia", "Tiy", "Tiye", "Tjepu", "Tuia", "Tumerisy", "Tuya", "Tuyu", "Twosre", "Weret-Imtes"]>>
<<set $edoSlaveNames = ["Adakichi", "Aihachi", "Aika", "Aikichi", "Aiko", "Aimatsu", "Akiko", "Ariko", "Asa", "Asakichi", "Asao", "Ayako", "Ayano", "Azuma", "Baicho", "Baisho", "Botan", "Charyoei", "Chieko", "Chikafuku", "Chikafumi", "Chikano", "Chikashizu", "Chikayoshi", "Chikayu", "Chikayuki", "Chisako", "Chiyo", "Chiyoe", "Chiyoha", "Chiyokichi", "Chiyoko", "Chiyoryo", "Chiyoteru", "Chiyotsuru", "Chiyowaka", "Chiyoyakko", "Chizu", "Chizuha", "Chizuru", "Cho", "Chocho", "Dango", "Danji", "Danko", "Dan’ei", "Edagiku", "Emi", "Emicho", "Emigiku", "Emiyo", "Enko", "Eriko", "Fuji", "Fujie", "Fujigiku", "Fujiha", "Fukichiyo", "Fukiha", "Fukimi", "Fukiyo", "Fukizo", "Fuku", "Fukuai", "Fukuaya", "Fukuchiyo", "Fukucho", "Fukudama", "Fukuha", "Fukuhana", "Fukuharu", "Fukuhina", "Fukuhiro", "Fukumi", "Fukumusume", "Fukunae", "Fukusato", "Fukusuke", "Fukusuzu", "Fukuteru", "Fukuya", "Fukuyo", "Fukuyoshi", "Fukuyu", "Fumi", "Fumichiyo", "Fumicho", "Fumihana", "Fumiko", "Fumino", "Fumukazu", "Fusakichi", "Fusako", "Fusao", "Hamako", "Hamayu", "Hanachiyo", "Hanaji", "Hanakichi", "Hanako", "Hanamatsu", "Hanaryo", "Hanayakko", "Harukichi", "Haruko", "Hatsu", "Hatsuko", "Hatsuyo", "Hidechiyo", "Hidecho", "Hideji", "Hidemi", "Hideryu", "Hideyakko", "Hidezuru", "Hinacho", "Hinagiku", "Hinako", "Hinazuru", "Hisa", "Hisacho", "Hisae", "Hisaei", "Hisamomo", "Hisasuzu", "Hisayo", "Hisazuru", "Ichiei", "Ichiemi", "Ichiharu", "Ichiho", "Ichika", "Ichimame", "Ichimomo", "Ichiraku", "Ichiryu", "Ichisayo", "Ichiteru", "Ichitomi", "Ichiume", "Ichiya", "Ichiyakko", "Iku", "Ikumatsu", "Imayoshi", "Ine", "Iroha", "Ishino", "Ishiyakko", "Iso", "Isoei", "Itozuru", "Kameji", "Kameko", "Kaneha", "Kanemi", "Kanoaki", "Kanoemi", "Kanoka", "Kasen", "Katsuchiyo", "Katsue", "Katsuha", "Katsuji", "Katsuna", "Katsune", "Katsuru", "Kayo", "Kichihana", "Kichiyakko", "Kichiyo", "Kichiyu", "Kiku", "Kikuka", "Kikumaru", "Kikumatsu", "Kikuno", "Kikuryo", "Kikutsuru", "Kikuya", "Kikuyakko", "Kikuyu", "Kimiei", "Kimikiku", "Kimina", "Kimitomo", "Kimiyakko", "Kin'ei", "Kin'ichi", "Kinhei", "Kinko", "Kinmatsu", "Kinroku", "Kinryo", "Kinryu", "Kinshi", "Kinsuke", "Kinu", "Kinyo", "Kitanomatsu", "Kiyo", "Koen", "Kofuku", "Kofusa", "Kogiku", "Koi", "Koiku", "Kojako", "Komagiku", "Komaji", "Komako", "Komame", "Komari", "Komaru", "Komasu", "Komomo", "Komume", "Koriki", "Korin", "Koroku", "Kosaki", "Kosaku", "Kosen", "Koshizu", "Kosome", "Kosue", "Kotaka", "Kotama", "Kotatsu", "Koteru", "Kotetsu", "Koto", "Kotobuki", "Kotoei", "Kotogiku", "Kotoha", "Kotoji", "Kotomi", "Kotono", "Kotoyo", "Kotsuma", "Koume", "Koyachiyo", "Koyakko", "Koyana", "Koyei", "Koyo", "Koyone", "Koyoshi", "Koyuka", "Koyuki", "Koyumi", "Kozakura", "Kozuru", "Kuma", "Kumakichi", "Kumano", "Kumayoshi", "Kunigiku", "Kyoka", "Kyoko", "Machi", "Mamefusa", "Mamegiku", "Mamehana", "Mameharu", "Mamehide", "Mamehiro", "Mameka", "Mamekichi", "Mameko", "Mameraku", "Mameriki", "Mameroku", "Mameryo", "Mameyakko", "Mameyo", "Mameyoshi", "Mameyu", "Maru", "Masuwaka", "Matsuko", "Matsuriki", "Matsuyakko", "Miharu", "Mineko", "Mitsu", "Mitsugiku", "Mitsuha", "Mitsuko", "Mitsuyo", "Miyagiku", "Miyo", "Miyoha", "Miyoharu", "Miyoka", "Miyozuru", "Momifuku", "Momiji", "Momochiyo", "Momoko", "Momomaru", "Momoyakko", "Momozuru", "Naka", "Naochiyo", "Naosome", "Naosono", "Narako", "Narayone", "Oimatsu", "Omine", "Omocha", "Onao", "Otomaru", "Otoyu", "Ran", "Ren", "Riki", "Rikigo", "Rikiha", "Rikiharu", "Rikihei", "Rikiji", "Rikiko", "Rikiya", "Royo", "Ryuko", "Sakae", "Sakiko", "Sakyo", "Sana", "Sanae", "Sankatsu", "Sanko", "Sanya", "Sasa", "Sato", "Satochiyo", "Satogiku", "Satoji", "Satoka", "Satokichi", "Satomi", "Satono", "Satotsuya", "Satoyu", "Satoyuki", "Satsuki", "Sayaka", "Sayoko", "Sekka", "Sen", "Shimekichi", "Shimematsu", "Shinneji", "Shizu", "Shizue", "Shizuko", "Shun", "Sodeko", "Somagiku", "Soyo", "Sue", "Sumiko", "Suzu", "Suzuhachi", "Suzuka", "Suzuko", "Takeko", "Takewaka", "Takeyakko", "Tama", "Tamagiku", "Tamakiku", "Tamako", "Tamaryo", "Tamasuke", "Tamaye", "Tamayu", "Tamazuru", "Tamiko", "Tane", "Taneji", "Taneju", "Taneko", "Tatsu", "Tatsuko", "Teruhina", "Teruji", "Teruko", "Teruyo", "Tetsu", "Toba", "Toki", "Tokiko", "Tokimatsu", "Toku", "Tome", "Tomeko", "Tomewaka", "Tomigiku", "Tomiko", "Tomimatsu", "Tomino", "Tomiryo", "Tomitae", "Tomitsuru", "Tomiwaka", "Tomiyakko", "Tomizuru", "Tomogiku", "Tomoko", "Tomoryo", "Tomowaka", "Tomoyuki", "Tonko", "Tora", "Toshifumi", "Toshihana", "Toshiko", "Toye", "Toyochiyo", "Toyofu", "Toyohina", "Toyoji", "Toyoka", "Tsunechiyo", "Tsuneko", "Tsunemomo", "Tsuneyo", "Tsuneyu", "Tsuru", "Tsurue", "Tsuruha", "Tsuruji", "Tsuruka", "Tsurumatsu", "Tsuruyo", "Tsuruyu", "Tsuta", "Tsutaji", "Tsuyachiyo", "Tsuyu", "Ume", "Umechie", "Umechiho", "Umechika", "Umechiyo", "Umegiku", "Umeha", "Umehisa", "Umeji", "Umeko", "Umeko", "Umematsu", "Umeo", "Umeraku", "Umeryo", "Umeryu", "Umesaya", "Umesuke", "Umesuzu", "Umewaka", "Umeyae", "Umeyakko", "Umeyu", "Uno", "Unofuku", "Unoha", "Unohide", "Unoji", "Unoka", "Unokayo", "Unokazu", "Unokiyo", "Unoko", "Unoshizu", "Unowaka", "Uta", "Utachiyo", "Utaji", "Utaka", "Utamatsu", "Utayu", "Wakaba", "Wakacho", "Wakagusa", "Wakai", "Wakaji", "Wakakimi", "Wakako", "Wakakoma", "Wakamurasaki", "Wakaroku", "Wakatsune", "Wakaume", "Wakayakko", "Wakayo", "Wakayone", "Wakazuru", "Wako", "Yachiyoko", "Yae", "Yaemi", "Yaewaka", "Yaezuru", "Yaichi", "Yasohachi", "Yasu", "Yasuku", "Yoi", "Yone", "Yonehachi", "Yoneyakko", "Yuiko", "Yukako", "Yukari", "Yukiryo", "Yukizono"]>>
<<set $ArcologyNamesSupremacistWhite = ["The Old Dominion", "Thule"]>>
<<set $ArcologyNamesSupremacistAsian = ["The Celestial Temple", "Shambhala", "Shangri-La"]>>
-<<set $ArcologyNamesSupremacistLatina = ["Tenochtitlan", "Aztlan"]>>
+<<set $ArcologyNamesSupremacistLatina = ["La Sagrada", "Alhambra", "Alcázar de Segovia", "Tenochtitlan", "Aztlan"]>>
<<set $ArcologyNamesSupremacistMiddleEastern = ["The Caliphate", "New Cairo"]>>
<<set $ArcologyNamesSupremacistBlack = ["United Africa", "Benin"]>>
<<set $ArcologyNamesSupremacistIndoAryan = ["Swarga Loka", "New New Delhi"]>>
@@ -1202,7 +1208,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $ArcologyNamesSupremacistMixedRace = ["Hybrid Vigor", "Meltingpot"]>>
<<set $ArcologyNamesSubjugationistWhite = ["The World Turned Upside Down", "Anticolonialism One"]>>
<<set $ArcologyNamesSubjugationistAsian = ["The East India Company", "Pearl of the Orient"]>>
-<<set $ArcologyNamesSubjugationistLatina = ["Fort Veracruz", "The Halls of Montezuma"]>>
+<<set $ArcologyNamesSubjugationistLatina = ["Los Conquistados", "Annual", "Fort Veracruz"]>>
<<set $ArcologyNamesSubjugationistMiddleEastern = ["Constantinople", "Vlad's Castle"]>>
<<set $ArcologyNamesSubjugationistBlack = ["Dixie", "The Plantation"]>>
<<set $ArcologyNamesSubjugationistIndoAryan = ["The East India Company", "Trade Fort"]>>
@@ -1226,6 +1232,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $ArcologyNamesPhysicalIdealist = ["Themyscira", "Midgard", "Muscle Beach", "Skid Row"]>>
<<set $ArcologyNamesChattelReligionist = ["Heaven", "The Light", "Heaven on Earth"]>>
<<set $ArcologyNamesRomanRevivalist = ["Elysian Fields", "Carthago Nova", "Nova Roma", "Neapolis", "Capua", "Ostia", "Salernum", "The City of the Seven Hills"]>>
+<<set $ArcologyNamesAztechRevivalist = ["The Halls of Montezuma", "Aztlan"]>>
<<set $ArcologyNamesEgyptianRevivalist = ["Thebes", "Memphis", "Alexandria"]>>
<<set $ArcologyNamesEdoRevivalist = ["Onogoro", "Kokyo", "Tengoku", "Takama-ga-hara", "New Kyoto", "The Imperial Palace", "New Tokyo"]>>
<<set $ArcologyNamesArabianRevivalist = ["Jannah", "Madinat al-Salam", "Madinat al-Hareer", "Madinat al-Zahra", "Madinat al-Yasmin", "Bayt al-Hikma", "Baghdad", "Alhambra", "Samarra"]>>
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index 24f74816bfe..6054e423d94 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -105,6 +105,8 @@ The previous owner seems to have left in something of a hurry.
They were recruiting a stable of slave whores by targeting people with religious complexes that made them particularly vulnerable to recruitment. Several of them are still here.
<<case "RomanRevivalist">>
The only one of their slaves left is the bodyguard. She should be very willing to transfer her loyalty to you, as her new owner.
+ <<case "AztecRevivalist">>
+ They maintained a combination of disobedient slaves, deemed incorrigible and blood priestesses. Since they offer themselves as slaves willingly, one has remained loyal to the owner of the arcology.
<<case "EgyptianRevivalist">>
They kept a harem of beautiful slave girls, who have been well-treated and well-trained. They should be very willing to serve you in turn.
<<case "EdoRevivalist">>
@@ -342,6 +344,17 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.behavioralFlaw = "none">>
<<set $activeSlave.clothes = "a toga", $activeSlave.collar = "pretty jewelry", $activeSlave.shoes = "flats">>
<<set $activeSlave.assignment = "guard you", $Bodyguard = $activeSlave>>
+ <<case "AztecRevivalist">>
+ <<set $fixedRace = "latina">><<include "Generate New Slave">><<set $fixedRace = 0>>
+ <<set $activeSlave.nationality = "Mexican">>
+ <<NationalityToName $activeSlave>>
+ <<set $activeSlave.accent = 0>>
+ <<set $activeSlave.devotion = 75, $activeSlave.trust = 75, $activeSlave.health = random(-20,20)>>
+ <<set $activeSlave.muscles = random(50,75)>>
+ <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.behavioralFlaw = "malicious", $activeSlave.behavioralQuirk = "none">>
+ <<set $activeSlave.clothes = "a huipil", $activeSlave.collar = "pretty jewelry", $activeSlave.shoes = "none">>
+ <<set $activeSlave.assignment = "be your Head Girl" $HeadGirl = $activeSlave>>
<<case "EgyptianRevivalist">>
<<include "Generate New Slave">>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(25,45), $activeSlave.health = random(25,45)>>
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index 9c94d208dad..e19b3e7d3a1 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -897,7 +897,7 @@ My favorite part of my body i<<s>>
A<<s>> far a<<s>> relationships go, <<Master>>," she laughs, "I'm <<s>>uch a fucking <<s>>lut. It's <<s>>o liberating, not having to worry about any of that crap anymore.
<</if>>
-<<if ($arcologies[0].FSSupremacistDecoration > 50) || ($arcologies[0].FSSubjugationistDecoration > 50) || ($arcologies[0].FSGenderRadicalistDecoration > 50) || ($arcologies[0].FSGenderFundamentalistDecoration > 50) || ($arcologies[0].FSPaternalistDecoration > 50) || ($arcologies[0].FSDegradationistDecoration > 50) || ($arcologies[0].FSBodyPuristDecoration > 50) || ($arcologies[0].FSTransformationFetishistDecoration > 50) || ($arcologies[0].FSSlimnessEnthusiastDecoration > 50) || ($arcologies[0].FSMaturityPreferentialistDecoration > 50) || ($arcologies[0].FSYouthPreferentialistDecoration > 50) || ($arcologies[0].FSAssetExpansionistDecoration > 50) || ($arcologies[0].FSPastoralistDecoration > 50) || ($arcologies[0].FSPhysicalIdealistDecoration > 50) || ($arcologies[0].FSChattelReligionistDecoration > 50) || ($arcologies[0].FSRomanRevivalistDecoration > 50) || ($arcologies[0].FSEgyptianRevivalistDecoration > 50) || ($arcologies[0].FSRepopulationFocusDecoration > 50) || ($arcologies[0].FSRestartDecoration > 50)>>
+<<if ($arcologies[0].FSSupremacistDecoration > 50) || ($arcologies[0].FSSubjugationistDecoration > 50) || ($arcologies[0].FSGenderRadicalistDecoration > 50) || ($arcologies[0].FSGenderFundamentalistDecoration > 50) || ($arcologies[0].FSPaternalistDecoration > 50) || ($arcologies[0].FSDegradationistDecoration > 50) || ($arcologies[0].FSBodyPuristDecoration > 50) || ($arcologies[0].FSTransformationFetishistDecoration > 50) || ($arcologies[0].FSSlimnessEnthusiastDecoration > 50) || ($arcologies[0].FSMaturityPreferentialistDecoration > 50) || ($arcologies[0].FSYouthPreferentialistDecoration > 50) || ($arcologies[0].FSAssetExpansionistDecoration > 50) || ($arcologies[0].FSPastoralistDecoration > 50) || ($arcologies[0].FSPhysicalIdealistDecoration > 50) || ($arcologies[0].FSChattelReligionistDecoration > 50) || ($arcologies[0].FSRomanRevivalistDecoration > 50) || ($arcologies[0].FSAztecRevivalistDecoration > 50) || ($arcologies[0].FSEgyptianRevivalistDecoration > 50) || ($arcologies[0].FSRepopulationFocusDecoration > 50) || ($arcologies[0].FSRestartDecoration > 50)>>
<<if ($activeSlave.devotion > 75)>>
I'll do everything I can to <<s>>upport your vi<<s>>ion for the future.
@@ -916,6 +916,15 @@ My favorite part of my body i<<s>>
Being a <<s>>lave in the new Rome is a little <<s>>cary, <<Master>>. I hear <<s>>lave<<s>> fighting <<s>>ometime<<s>>.
<</if>>
<</if>>
+<<if $arcologies[0].FSAztecRevivalist >= 10>>
+ <<if ($activeSlave.intelligence > 1)>>
+ The new Aztec Empire is enthralling, <<Master>>. I'm amazed at how easily people jump to sacrifice and debauchery when they're offered.
+ <<elseif ($activeSlave.devotion > 20)>>
+ I'm proud to <<s>>erve the will of the god<<s>>, and you.
+ <<else>>
+ Please, don't <<s>>acrifice me <<Master>>, I"ll do anything.
+ <</if>>
+<</if>>
<<if $arcologies[0].FSEgyptianRevivalist >= 10>>
<<if ($activeSlave.intelligence > 1)>>
This new Egypt is fa<<s>>cinating, <<Master>>. I'm glad to be a part of it.
diff --git a/src/npc/removeActiveSlave.tw b/src/npc/removeActiveSlave.tw
index 366f4217d4d..6387214483c 100644
--- a/src/npc/removeActiveSlave.tw
+++ b/src/npc/removeActiveSlave.tw
@@ -20,14 +20,11 @@
<</if>>
<<if $PC.mother == _ID>>
<<set $PC.mother = $missingParentID>>
- <<if $PC.father == _ID>>
- <<set $PC.father = $missingParentID>>
- <</if>>
- <<set $missingParentID-->>
+ <<set _missingID = 1>>
<</if>>
<<if $PC.father == _ID>>
<<set $PC.father = $missingParentID>>
- <<set $missingParentID-->>
+ <<set _missingID = 1>>
<</if>>
<<if $PC.sisters > 0>>
<<if areSisters($PC, $activeSlave) > 0>>
@@ -62,13 +59,12 @@
<</if>>
<</for>>
<</if>>
- <<set $missingParentID-->>
+ <<set _missingID = 1>>
<</if>>
<<if $activeSlave.mother > 0 || $activeSlave.father > 0>>
<<if $activeSlave.mother == $slaves[_y].ID || $activeSlave.father == $slaves[_y].ID>>
<<set $slaves[_y].daughters-->>
<</if>>
- <<set $missingParentID-->>
<</if>>
<<if $activeSlave.sisters > 0>>
<<if areSisters($activeSlave, $slaves[_y]) > 0>>
@@ -120,4 +116,8 @@
<<set $slavesOriginal.delete(_ID)>>
<<set _dump = $slaves.deleteAt(_x), _SL--, $activeSlave = 0>>
+
+ <<if _missingID == 1>>
+ <<set $missingParentID-->>
+ <</if>>
<</if>>
diff --git a/src/npc/takeoverTarget.tw b/src/npc/takeoverTarget.tw
index 7eef159524e..2973890acbc 100644
--- a/src/npc/takeoverTarget.tw
+++ b/src/npc/takeoverTarget.tw
@@ -14,7 +14,7 @@ Alternatively, arcologies are being built every day, and their owners' control i
<br>
//Recommended for new players.//
<hr style="margin:0">
-<<set _arcologyTypes = ["Supremacist", "Subjugationist", "Paternalist", "AssetExpansionist", "SlimnessEnthusiast", "TransformationFetishist", "BodyPurist", "MaturityPreferentialist", "YouthPreferentialist", "Pastoralist", "PhysicalIdealist", "ChattelReligionist", "RomanRevivalist", "EgyptianRevivalist", "EdoRevivalist", "ArabianRevivalist", "ChineseRevivalist", "Multiculturalist", "Repopulationist", "Eugenics"]>>
+<<set _arcologyTypes = ["Supremacist", "Subjugationist", "Paternalist", "AssetExpansionist", "SlimnessEnthusiast", "TransformationFetishist", "BodyPurist", "MaturityPreferentialist", "YouthPreferentialist", "Pastoralist", "PhysicalIdealist", "ChattelReligionist", "RomanRevivalist", "AztecRevivalist", "EgyptianRevivalist", "EdoRevivalist", "ArabianRevivalist", "ChineseRevivalist", "Multiculturalist", "Repopulationist", "Eugenics"]>>
<<if $seeDicks != 0>><<set _arcologyTypes.push("GenderRadicalist")>><</if>>
<<if $seeDicks != 100>><<set _arcologyTypes.push("GenderFundamentalist")>><</if>>
<<if $seeExtreme != 0>><<set _arcologyTypes.push("Degradationist")>><</if>>
@@ -98,6 +98,7 @@ Alternatively, arcologies are being built every day, and their owners' control i
<<case "PhysicalIdealist">><<set $targetArcology.name = $ArcologyNamesPhysicalIdealist.random()>>
<<case "ChattelReligionist">><<set $targetArcology.name = $ArcologyNamesChattelReligionist.random()>>
<<case "RomanRevivalist">><<set $targetArcology.name = $ArcologyNamesRomanRevivalist.random()>>
+ <<case "AztecRevivalist">><<set $targetArcology.name = $ArcologyNamesAztecRevivalist.random()>>
<<case "EgyptianRevivalist">><<set $targetArcology.name = $ArcologyNamesEgyptianRevivalist.random()>>
<<case "EdoRevivalist">><<set $targetArcology.name = $ArcologyNamesEdoRevivalist.random()>>
<<case "ArabianRevivalist">><<set $targetArcology.name = $ArcologyNamesArabianRevivalist.random()>>
@@ -168,6 +169,9 @@ Alternatively, arcologies are being built every day, and their owners' control i
<<case "RomanRevivalist">>@@.orange;Roman Revivalism,@@ which seeks to recreate the glory that was ancient Rome.
<br>
It has an established lingua franca: Latin.
+ <<case "AztecRevivalist">>@@.orange;Aztec Revivalism,@@ which aspires to reach the heights of the Aztec Empire at it's peak.
+ <br>
+ It has an established lingua franca: Nahuatl.
<<case "EgyptianRevivalist">>@@.orange;Egyptian Revivalism,@@ a movement to rebuild the monuments and greatness of ancient Egypt.
<br>
It has an established lingua franca: Ancient Egyptian.
@@ -185,4 +189,4 @@ Alternatively, arcologies are being built every day, and their owners' control i
<<default>>@@.orange;Multiculturalism,@@ a celebration of the total liberty that was the original purpose of the Free Cities.
<</switch>>
<hr style="margin:0">
-<</for>>
\ No newline at end of file
+<</for>>
diff --git a/src/pregmod/reMaleCitizenHookup.tw b/src/pregmod/reMaleCitizenHookup.tw
index 2a2586b6bc6..dba98d8d21e 100644
--- a/src/pregmod/reMaleCitizenHookup.tw
+++ b/src/pregmod/reMaleCitizenHookup.tw
@@ -49,6 +49,8 @@
<</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
<<set _FS.push("Roman Revivalist")>>
+<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ <<set _FS.push("Aztec Revivalist")>>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
<<set _FS.push("Egyptian Revivalist")>>
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -108,6 +110,8 @@ But tonight, you've put in an appearance. Your citizens are drinking your <<if $
cute, devout-looking young man
<<case "Roman Revivalist">>
proper young Roman man
+<<case "Aztec Revivalist">>
+ natural Aztec beauty
<<case "Egyptian Revivalist">>
handsome, sun-kissed man
<<case "Edo Revivalist">>
@@ -159,6 +163,8 @@ He's yours for the taking, if you want him, and if his praise and proximity were
sweep you off your feet into a bridal carry, demonstrating his strength.
<<case "Chattel Religionist">>
assume just a hint of a Chattel Religionist devotional pose used to request to penetrate. It's heavy flirting, of a modern religious sort.
+<<case "Aztec Revivalist">>
+ hint that his devotion, which is the most important thing, cannot be besmirched by tasting your divine power.
<<default>>
flirt with you quite hard without crossing any lines between a citizen and an arcology owner.
<</switch>>
@@ -267,6 +273,8 @@ He's clearly attracted to you; even the most consummate actor would have difficu
a chiseled Adonis. Before you can tip him onto your bed; he deftly pulls you out of your evening dress, scoops you up, dominantly spears your pussy and begins thrusting powerfully while holding you. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly fucking you. You <<if $PC.preg >= 20>>squirm in discomfort until he turns you around and gives your pregnancy room<<elseif $PC.boobsBonus > 0>>squirm in discomfort until he turns you around and uses his other arm to keep your huge breasts steady<<elseif $PC.boobsBonus < 0>>push your cute breasts against his firm pecs<<elseif $PC.boobs == 1>>push your ample breasts against his firm pecs<<else>>allow him pull your flat chest to his firm pecs<</if>>, before he starts showing off his strength. With a hard, firm thrust, he cums deep into your pussy. You follow shortly after, feeling the heat of his seed in your depths as you clamp down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
<<case "Chattel Religionist">>
a fresh and ready body, adorned here and there with sensual devotional jewelry, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.preg >= 20>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
+ <<default>>
+ a strong, tight, bronze body, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.preg >= 20>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
<<default>>
a hot young body, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.preg >= 20>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
<</switch>>
@@ -373,6 +381,9 @@ He's clearly attracted to you; even the most consummate actor would have difficu
<<case "Roman Revivalist">>
muscular form
<<set $arcologies[0].FSRomanRevivalist += 5>>
+ <<case "Aztec Revivalist">>
+ well-built form
+ <<set $arcologies[0].FSAztecRevivalist += 5>>
<<case "Egyptian Revivalist">>
beautiful tanned body
<<set $arcologies[0].FSEgyptianRevivalist += 5>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index f2969c1b39a..9c74c587f57 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -624,6 +624,8 @@ During a routine inspection of <span id="name"><<print "[[$activeSlave.slaveName
<</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
<<set $qualifiedFS.push("roman revivalist")>>
+<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ <<set $qualifiedFS.push("aztec revivalist")>>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
<<set $qualifiedFS.push("egyptian revivalist")>>
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -674,6 +676,8 @@ During a routine inspection of <span id="name"><<print "[[$activeSlave.slaveName
<<set _napkin = "a daffodil">>
<<elseif _napkinFS == "roman revivalist">>
<<set _napkin = "a laurel wreath">>
+<<elseif _napkinFS == "aztec revivalist">>
+ <<set _napkin = "a small statuette">>
<<elseif _napkinFS == "egyptian revivalist">>
<<set _napkin = "a perfect pyramid">>
<<elseif _napkinFS == "edo revivalist">>
@@ -1855,6 +1859,8 @@ She can't manage to
fit the loop of chain that goes around her waist over her buttocks. She's got it
<<case "Western clothing">>
get the upper part of her chaps pulled up and over her buttocks. She's got them
+<<case "a huipil">>
+ the huipil is very low and tight cut to hide only the front of the breasts and her buttocks. She's got it
<<case "a slutty qipao">>
the middle part of her step in qipao, the part which doesn't open from the top or the bottom, pulled up and over her buttocks. She's got it
<<case "uncomfortable straps">>
diff --git a/src/uncategorized/RESSTR.tw b/src/uncategorized/RESSTR.tw
index 75a7457a8c9..447e5bde934 100644
--- a/src/uncategorized/RESSTR.tw
+++ b/src/uncategorized/RESSTR.tw
@@ -19,6 +19,18 @@
<<switch $RESSTRevent>>
+<<case "young PC age difference">>
+
+As another long weeks draws to a close, <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span> happens to walk past your office toward bed. There's nothing inherently abnormal about her actions, but you do notice as she steps past the doorway that an expression of worry and concern adorns her $activeSlave.skin face. When you call her into your office, her face visibly brightens up in an attempt to conceal her obvious distress as she comes before you. Notably, although she stands still and patiently awaits further orders, you notice she <<if canSee($activeSlave)>>never manages to meet your eyes<<else>>keeps her sightless eyes downcast<</if>>. When you ask her what's troubling her, her face plainly falls.
+<br><br>
+"<<Master>>, you're <<s>>o young," she <<say>>s penitently before smiling shyly in an attempt to insert some levity into her confession. "It'<<s>> ju<<s>>t that I'm old enough to be your mother, <<Master>>. It'<<s>> a little weird, i<<s>>n't it?"
+
+<<case "old PC age difference">>
+
+As another long weeks draws to a close, <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span> happens to walk past your office toward bed. There's nothing inherently abnormal about her actions, but you do notice as she steps past the doorway that an expression of worry and concern adorns her $activeSlave.skin face. When you call her into your office, her face visibly brightens up in an attempt to conceal her obvious distress as she comes before you. Notably, although she stands still and patiently awaits further orders, you notice she <<if canSee($activeSlave)>>never manages to meet your eyes<<else>>keeps her sightless eyes downcast<</if>>. When you ask her what's troubling her, her face plainly falls.
+<br><br>
+"<<Master>>, you're <<s>>o old," she <<say>>s penitently before smiling shyly in an attempt to insert some levity into her confession. "It'<<s>> ju<<s>>t that I'm young enough to be your daughter, <<Master>>. It'<<s>> a little weird, i<<s>>n't it?"
+
<<case "devoted educated slave">>
<span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span> comes before you for a routine inspection. The $desc is a well-educated and obedient slave. Though she performs her duties devotedly and to the best of her abilities, slave life is not particularly conducive to straining an individual's brainpower. You happen to run into $activeSlave.slaveName in the hallways of the penthouse, where she takes the opportunity to wordlessly signal she wishes to gain your attention.
@@ -127,6 +139,64 @@ to advertise her uncomfortable state. Most slaves have obvious visual cues like
<br><br>
She does her very best to get through the inspection without disgrace, hugging herself uncomfortably and shivering. You let her suffer through it, deferring the delicious choice about how to take advantage of her situation until the inspection is done. She breaks before then, though, suddenly falling to her knees and starting to cry. "Plea<<s>>e, <<Master>>," she begs piteously. "Plea<<s>>e help me! I can't t-take it! It'<<s>> <<s>>-<<s>>o f-fucking f-fru<<s>>trating," she moans, trailing off, clasping her hands in supplication as she looks up at you desperately.
+<<case "back stretch">>
+
+You pass through your slaves' living area as some of them are starting your days. <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span> is one of them, and she's just
+<<if $activeSlave.livingRules == "spare">>
+ crawled out of her spartan bedroll.
+<<elseif $activeSlave.livingRules == "normal">>
+ gotten out of her neat little cot.
+<<elseif $activeSlave.relationship >= 4>>
+ climbed out of bed. ($activeSlave.slaveName's <<if $activeSlave.relationship == 5>>wife<<else>>girlfriend<</if>>
+ <<for _i = 0; _i < $slaves.length; _i++>>
+ <<if $slaves[_i].ID == $activeSlave.relationTarget>>
+ $slaves[_i].slaveName is still asleep in it, and the shape of her
+ <<if canAchieveErection($slaves[_i])>>half-erect dick is
+ <<elseif $slaves[_i].dick > 3>>huge soft cock
+ <<elseif $slaves[_i].preg > 15>>big pregnant belly
+ <<elseif $slaves[_i].nipples == "huge">>huge nipples
+ <<elseif $slaves[_i].boobsImplant>>fake tits
+ <<elseif $slaves[_i].boobs > 5000>>monstrous breasts
+ <<elseif $slaves[_i].boobs > 2000>>huge tits
+ <<elseif $slaves[_i].butt > 5>>monstrous ass
+ <<elseif $slaves[_i].muscles > 30>>muscular body
+ <<elseif $slaves[_i].weight > 10>>chubby belly
+ <<elseif $slaves[_i].weight >= -10>>feminine form
+ <<else>>thin body
+ <</if>>
+ is clearly visible under the sheet. They sleep naked, of course.)
+ <</if>>
+ <</for>>
+<<else>>
+ climbed out of her comfortable bed.
+<</if>>
+It's time for $activeSlave.slaveName to start another strenuous day of carrying the weight of her <<if $activeSlave.boobs > 10000>>disporportionate<<elseif $activeSlave.boobs > 5000>>massive<<else>>heavy<</if>> <<if $activeSlave.boobsImplant>>implants<<elseif $activeSlave.lactation>>milk-bearing udders<<else>>natural breasts<</if>>. She can manage it <<if $activeSlave.muscles <= 10>>only with difficulty, since she's not in good shape<<elseif $activeSlave.boobs <= 5000+($activeSlave.muscles*100)>>with ease, since she's in good shape<<else>>with some difficulty, since they're so big<</if>>. Slaves with endowments like hers are trained to stretch, and since she's a good $desc, she does it as soon as she gets up. She's doing it now.
+<br><br>
+She kneels with her legs together, and then sits back, her <<if $activeSlave.buttImplant>>fake ass not changing shape at all as it rests on her heels<<elseif $activeSlave.butt > 6>>mass of assflesh extinguishing her feet completely<<elseif $activeSlave.butt > 2>>big butt resting heavily on her heels<<else>>cute butt resting lightly on her heels<</if>>. Then she reaches her arms back, and leans back, as far as she can go. She arches her spine, closing her eyes voluptuously as she enjoys the stretch in her lower back. The pose thrusts her chest up and out,
+<<if $activeSlave.boobsImplant*0.5 > $activeSlave.boobs>>
+ but her implants stretch her skin so tight that they stay tacked to her chest, right where they are. She looks like a stereotypical silicone queen, arching her back and sticking her fake cans out.
+<<elseif $activeSlave.boobShape == "perky">>
+ making her spectacularly perky breasts point their $activeSlave.nipples nipples straight up at the ceiling. It's incredible, that they've managed to maintain their youthful shape despite their great weight.
+<<elseif $activeSlave.boobShape == "downward-facing">>
+ showing off the huge area of soft skin above her $activeSlave.nipples nipples. Since these face somewhat downward, her swell of bosom above them is a pair of uninterrupted mounds of $activeSlave.skin breast.
+<<elseif $activeSlave.boobShape == "torpedo-shaped">>
+ making her absurd torpedo-shaped tits stick out even farther than they usually do. Her $activeSlave.nipples nipples point out so far that it's difficult to see how such delectably soft flesh can support its shape.
+<<elseif $activeSlave.boobShape == "wide-set">>
+ making her wide-set breasts spread even farther, to hang almost to her armpits on either side. It's not conventionally attractive, but she's certainly very well endowed.
+<<elseif $activeSlave.boobShape == "saggy">>
+ emphasizing how saggy her tits are. They <<if $activeSlave.preg > 10>>rest heavily atop her tautly gravid belly<<else>>hang down far enough to obscure the top of her belly<</if>>. It's not conventionally attractive, but she's certainly very well endowed.
+<<else>>
+ making her beautiful breasts stick out nicely. They maintain their perfect shape surprisingly well for being so enormous, and her $activeSlave.nipples nipples stick out at you prominently.
+<</if>>
+She sits back up and rubs her hands down her lower back on either side, sighing contentedly at the feeling. She opens her eyes, and sees you looking at her.
+<<if $activeSlave.energy > 80>>
+ "Hi <<Master>>," she <<say>>s flirtatiously, and hugs herself under her boobs, presenting them even more obviously. Her strong sex drive is awake, too. She watches at you speculatively, obviously hoping to get fucked.
+<<elseif $activeSlave.trust > 20>>
+ "Hi <<Master>>," she <<say>>s cutely, and gives her torso a flirty little shake from side to side, making her boobs move interestingly. She watches you trustingly, obviously wondering if you'd like to enjoy her body.
+<<else>>
+ "Good morning, <<Master>>," she <<say>>s properly, doing her best to be good. She watches you closely, ready to obey any command you might give her.
+<</if>>
+
<<default>>
ERROR: bad event
<</switch>>
@@ -135,6 +205,90 @@ She does her very best to get through the inspection without disgrace, hugging h
<span id="result">
<<switch $RESSTRevent>>
+<<case "young PC age difference">>
+
+<<link "Gently acclimate her to the age difference with some lovemaking">>
+ <<replace "#name">>$activeSlave.slaveName<</replace>>
+ <<replace "#result">>
+ As you cross the breadth of your office to reach $activeSlave.slaveName, she presents herself for your sexual usage out of habit. However, you take her by surprise by drawing her into you arms, running the tips of your fingers through her $activeSlave.hColor hair, and looking into her $activeSlave.eyeColor eyes. <<if canSee($activeSlave)>>She meets your gaze for a brief moment before blushing girlishly, as if forgetting how many years your senior she is<<else>>She seems to feel the intensity of your gaze despite her sightless eyes and blushes girlishly, as if forgetting how many years your senior she is<</if>> . In lieu of words, you lift her chin with a single beckoning finger and steal her breath from her lips with a firm kiss. Once she's recovered her wits she clings to you with almost animalistic attachment. After a few moments she moves to get down on her knees, clearly defaulting to her role as a sex slave in response to your unexpected intimacy. Instead, you <<if $activeSlave.preg > 20>>carefully <</if>>lift her up from her low position beneath you and carry her to bed, laying the flushed older woman down on the sheets before gently positioning yourself on top of her. Together, the two of you make fiercely intimate love, while you whisper romantic reassurances into her ear, nip at her neck,<<if $activeSlave.preg > 20>>stroke her pregnant belly,<</if>> and bring her to climax again and again. After a final frantic orgasm together in her pussy she <<if canSee($activeSlave)>>looks<<else>>gazes sightlessly<</if>> up at you with @@.hotpink;adoration@@ and a new @@.mediumaquamarine;trust@@ in her young <<Master>>.
+ <<set $activeSlave.devotion += 4>>
+ <<set $activeSlave.trust += 4>>
+ <<set $activeSlave.vaginalCount += 1>>
+ <<set $vaginalTotal += 1>>
+ <</replace>>
+<</link>>
+<br><<link "Cruelly torment her about the age difference">>
+ <<replace "#name">>$activeSlave.slaveName<</replace>>
+ <<replace "#result">>
+ As you close in on $activeSlave.slaveName predatorily, her face blanches with visible regret at her prior candidness. By the time you have her bent over your desk and begun spanking her <<if $activeSlave.butt > 6>>massive behind<<elseif $activeSlave.butt > 3>>bountiful bottom<<else>>cute ass<</if>>, she seems almost resigned to accept any of the standard punishments you've been known to dole out. When your lips lightly brush one of her ears, she flinches harder at the gentle touch than any of your harsh, disciplinary spanks. When you start whispering wicked reminders about her sexual submission and subservience to so young a <<Master>>, she begins to sob quietly against the hard surface of your desk.
+ <br><br>
+ By the time you deign to <<if $PC.dick == 0>>don a strap-on and <</if>>mount her ass, she seems catatonic at the revelation that her body is owned by a cruel <<Master>>, nearly half her age. Even when you accompany each brutal thrust with a harsh spank and a harsher jab at the dearth in years between the two of you, she merely winces at the anal pain of your coupling. Judging by the empty look in her eyes that persists past her dismissal from your office, she might @@color:gold;not feel any better@@ about the age difference but you've definitely @@color:hotpink;fucked her into compliance@@.
+ <<set $activeSlave.devotion += 4>>
+ <<set $activeSlave.trust -= 4>>
+ <<set $activeSlave.analCount += 1>>
+ <<set $analTotal += 1>>
+ <</replace>>
+<</link>>
+<<if isFertile($activeSlave)>>
+<br><<link "Give her an afternoon off for some quality time with a local Frat House">>
+ <<replace "#name">>$activeSlave.slaveName<</replace>>
+ <<replace "#result">>
+ You direct $assistantName to clear $activeSlave.slaveName's schedule and to find a local Frat House willing to 'host' a woman of her age and experience. Perhaps a group of virile college boys running a train on $activeSlave.slaveName might accustom her to younger sexual partners. When $activeSlave.slaveName leaves the penthouse, she's dressed up to look like a frumpy Old World MILF and is clearly skeptical about your age-play therapy.
+ <br><br>
+ $activeSlave.slaveName returns to the penthouse naked, disheveled, and absolutely covered in a thick coating of drying cum. Despite her appearance, however, she is practically beaming with happiness. It seems young cock agrees with her, and by the state of her messy pussy her youthful partners particularly enjoyed filling her with their potent seed. Unsurprisingly, at a routine check up later that week, $activeSlave.slaveName joyfully discovers that she was impregnated during her Frat House excursion. It seems that being bred by a bunch of horny college boys has eliminated her prior worries about the importance of age and also caused her to fetishize impregnation. @@.hotpink;She has become more submissive to you@@ for giving her the means to broaden her sexual horizons.
+ <<set $activeSlave.devotion += 4>>
+ <<set $activeSlave.preg = 1>>
+ <<set $activeSlave.fetish = "pregnancy">>
+ <<set $activeSlave.fetishKnown = 1>>
+ <<set $activeSlave.fetishStrength = 5>>
+ <<set $activeSlave.vaginalCount += 10>>
+ <<set $vaginalTotal += 10>>
+ <</replace>>
+<</link>> //This option will render $activeSlave.slaveName pregnant//
+<</if>>
+
+<<case "old PC age difference">>
+
+<<link "Gently acclimate her to the age difference with some lovemaking">>
+ <<replace "#name">>$activeSlave.slaveName<</replace>>
+ <<replace "#result">>
+ As you cross the breadth of your office to reach $activeSlave.slaveName, she presents herself for your sexual usage out of habit. However, you take her by surprise by drawing her into you arms, running the tips of your fingers through her $activeSlave.hColor hair, and looking into her $activeSlave.eyeColor eyes. <<if canSee($activeSlave)>>She meets gaze for a brief moment before blushing girlishly, as if forgetting how many years her senior you are<<else>>She seems to feel the intensity of your gaze despite her sightless eyes and blushes girlishly, as if forgetting how many years her senior you are<</if>> . In lieu of words, you lift her chin with a single beckoning finger and steal her breath from her lips with a firm kiss. Once she's recovered her wits she clings to you with almost animalistic attachment. After a few moments she moves to get down on her knees, clearly defaulting to her role as a sex slave in response to your unexpected intimacy. Instead, you <<if canSee($activeSlave)>>looks<<else>>gazes sightlessly<</if>> up at you with @@.hotpink;adoration@@ and a new @@.mediumaquamarine;trust@@ in her aged <<Master>>.
+ <<set $activeSlave.devotion += 4>>
+ <<set $activeSlave.trust += 4>>
+ <<set $activeSlave.vaginalCount += 1>>
+ <<set $vaginalTotal += 1>>
+ <</replace>>
+<</link>>
+<br><<link "Cruelly torment her about the age difference">>
+ <<replace "#name">>$activeSlave.slaveName<</replace>>
+ <<replace "#result">>
+ As you close in on $activeSlave.slaveName predatorily, her face blanches with visible regret at her prior candidness. By the time you have her bent over your desk and begun spanking her <<if $activeSlave.butt > 6>>massive behind<<elseif $activeSlave.butt > 3>>bountiful bottom<<else>>cute ass<</if>>, she seems almost resigned to accept any of the standard punishments you've been known to dole out. When your lips lightly brush one of her ears, she flinches harder at the gentle touch than any of your harsh, disciplinary spanks. When you start whispering wicked reminders about her sexual submission and subservience to so old a <<Master>>, she begins to sob quietly against the hard surface of your desk.
+ <br><br>
+ By the time you deign to <<if $PC.dick == 0>>don a strap-on and <</if>>mount her ass, she seems catatonic at the revelation that her body is owned by so cruel an old <<Master>>. Even when you accompany each brutal thrust with a harsh spank and a harsh jab at the dearth in years between the two of you, she merely winces at the anal pain of your coupling. Judging by the empty look in her eyes that persists past her dismissal from your office, she might @@color:gold;not feel any better@@ about the age difference but you've definitely @@color:hotpink;fucked her into compliance@@.
+ <<set $activeSlave.devotion += 4>>
+ <<set $activeSlave.trust -= 4>>
+ <<set $activeSlave.analCount += 1>>
+ <<set $analTotal += 1>>
+ <</replace>>
+<</link>>
+<<if isFertile($activeSlave)>>
+<br><<link "Give her an afternoon off for some quality time with a local retirement community">>
+ <<replace "#name">>$activeSlave.slaveName<</replace>>
+ <<replace "#result">>
+ You direct $assistantName to clear $activeSlave.slaveName's schedule and to find a local retirement community willing to 'host' a girl of her age. Perhaps a group of venerable graybeards running a train on $activeSlave.slaveName might accustom her to older sexual partners. When $activeSlave.slaveName leaves the penthouse, she's dressed up to look like an Old World schoolgirl and is clearly skeptical about your age-play therapy.
+ <br><br>
+ $activeSlave.slaveName returns to the penthouse naked, disheveled, and absolutely covered in a thick coating of drying cum. Despite her appearance, however, she is practically beaming with happiness. It seems a good fucking from experienced older men agrees with her, and by the state of her messy pussy her aged partners particularly enjoyed filling her with their still potent seed. Unsurprisingly, at a routine check up later that week, $activeSlave.slaveName joyfully discovers that she was impregnated during her excursion. It seems that being bred by a bunch of horny old men has eliminated her prior worries about the importance of age and also caused her to fetishize impregnation. @@.hotpink;She has become more submissive to you@@ for giving her the means to broaden her sexual horizons.
+ <<set $activeSlave.devotion += 4>>
+ <<set $activeSlave.preg = 1>>
+ <<set $activeSlave.fetish = "pregnancy">>
+ <<set $activeSlave.fetishKnown = 1>>
+ <<set $activeSlave.fetishStrength = 5>>
+ <<set $activeSlave.vaginalCount += 10>>
+ <<set $vaginalTotal += 10>>
+ <</replace>>
+<</link>> //This option will render $activeSlave.slaveName pregnant//
+<</if>>
+
<<case "devoted educated slave">>
<<link "Have a conversation with her">>
@@ -248,7 +402,7 @@ She does her very best to get through the inspection without disgrace, hugging h
<<link "Enjoy some oral with an evening of wallscreen television">>
<<replace "#name">>$activeSlave.slaveName<</replace>>
<<replace "#result">>
- There are some things that never change, even after ascension to the high position of an arcology owner. One of these fixtures of life is the ability to enjoy a relaxing evening of wallscreen television and <<if $PC.dick == 1>>a blowjob<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>some cunnilingus<</if>>. With $activeSlave.slaveName sequestered between your legs, you tune into your favorite Free Cities serial drama and <<if !canSee($activeSlave)>>audibly <</if>>widen your legs slightly as you sink back into the chair with a sigh of contement. She <<if $activeSlave.preg > 20>>kneels carefully with an arm wrapped protectively around her bump<<else>>sinks to her knees obediently with her hands placed placidly on her thighs<</if>> before putting her mouth to work, <<if $activeSlave.oralSkill >= 100>>her mastery at giving oral providing a wealth of pleasure<<elseif $activeSlave.oralSkill > 60>>her skills in oral providing ample pleasure<<else>>her mediocre oral skills providing some relief<</if>>.<<if $activeSlave.teeth > 2>> Although most of your attention is focused on the intriguing drama unfolding on your wallscreen, you still feel the extreme care she has to take to keep her sharklike teeth clear of you.<<elseif $activeSlave.lips > 40>> Her huge lips are soft and pillowy against you.<<elseif ($activeSlave.teeth is "straightening braces") || ($activeSlave.teeth is "cosmetic braces")>> Although most of your attention is focused on the intriguing drama unfolding on your wallscreen, you can feel the slight hesitations as she takes care to keep her braces off you.<</if>> You have an enjoyable evening glued to your wallscreen, punctuated by the playful ruffling <<if $activeSlave.hLength > 1>>of $activeSlave.slaveName's $activeSlave.hColor hair<<else>>across $activeSlave.slaveName's scalp<</if>> and the occasional orgasm into her waiting mouth. Though your experience was more stimulating than hers, $activeSlave.slaveName enjoyed @@.hotpink;being used while you enjoyed yourself.@@
+ There are some things that never change, even after ascension to the high position of an arcology owner. One of these fixtures of life is the ability to enjoy a relaxing evening of wallscreen television and <<if $PC.dick == 1>>a blowjob<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>some cunnilingus<</if>>. With $activeSlave.slaveName sequestered between your legs, you tune into your favorite Free Cities serial drama and <<if !canSee($activeSlave)>>audibly <</if>>widen your legs slightly as you sink back into the chair with a sigh of contentment. She <<if $activeSlave.preg > 20>>kneels carefully with an arm wrapped protectively around her bump<<else>>sinks to her knees obediently with her hands placed placidly on her thighs<</if>> before putting her mouth to work, <<if $activeSlave.oralSkill >= 100>>her mastery at giving oral providing a wealth of pleasure<<elseif $activeSlave.oralSkill > 60>>her skills in oral providing ample pleasure<<else>>her mediocre oral skills providing some relief<</if>>.<<if $activeSlave.teeth > 2>> Although most of your attention is focused on the intriguing drama unfolding on your wallscreen, you still feel the extreme care she has to take to keep her sharklike teeth clear of you.<<elseif $activeSlave.lips > 40>> Her huge lips are soft and pillowy against you.<<elseif ($activeSlave.teeth is "straightening braces") || ($activeSlave.teeth is "cosmetic braces")>> Although most of your attention is focused on the intriguing drama unfolding on your wallscreen, you can feel the slight hesitations as she takes care to keep her braces off you.<</if>> You have an enjoyable evening glued to your wallscreen, punctuated by the playful ruffling <<if $activeSlave.hLength > 1>>of $activeSlave.slaveName's $activeSlave.hColor hair<<else>>across $activeSlave.slaveName's scalp<</if>> and the occasional orgasm into her waiting mouth. Though your experience was more stimulating than hers, $activeSlave.slaveName enjoyed @@.hotpink;being used while you enjoyed yourself.@@
<<set $activeSlave.devotion += 4, $activeSlave.oralCount += 1, $oralTotal += 1>>
<</replace>>
<</link>>
@@ -279,7 +433,7 @@ She does her very best to get through the inspection without disgrace, hugging h
<<else>>
<<if $activeSlave.boobs > 2000>>her huge breasts forming a soft cushion between your two bodies<<elseif $activeSlave.boobs > 800>>her breasts pressing up against your hard chest pleasantly<<else>>her chest pressing against yours<</if>>.
<</if>>
- Her body is held aloft entirely by your crushing embrance and her arms wrapped daintily about your shoulders, for as short as she is, her attempts to wrap her legs around your waist leave them dangling awkwardly in the air. This unique position soon has her crotch rubbing up against your own<<if $PC.dick == 0>>, so you don a strap-on<</if>>. Lightly maneuvering her in the air, you position her <<if $activeSlave.vagina > -1>>such that you press up against her pussy<<else>>such that you press up against her ass<</if>>. She moans softly in anticipation as you lift her up by her arms, before lowering her slowly onto your <<if $PC.dick == 0>>phallus<<else>>cock<</if>>, her knees desperately pressing against your hips in an attempt to steady herself. Held aloft in your arms, she arches her back and cocks her hips wildly to ride you in midair,<<if $activeSlave.preg > 20>> even as she carefully keeps her bulge from slamming into your hard body,<</if>> grunting and panting as her tiny body rubs up against your own.
+ Her body is held aloft entirely by your crushing embrace and her arms wrapped daintily about your shoulders, for as short as she is, her attempts to wrap her legs around your waist leave them dangling awkwardly in the air. This unique position soon has her crotch rubbing up against your own<<if $PC.dick == 0>>, so you don a strap-on<</if>>. Lightly maneuvering her in the air, you position her <<if $activeSlave.vagina > -1>>such that you press up against her pussy<<else>>such that you press up against her ass<</if>>. She moans softly in anticipation as you lift her up by her arms, before lowering her slowly onto your <<if $PC.dick == 0>>phallus<<else>>cock<</if>>, her knees desperately pressing against your hips in an attempt to steady herself. Held aloft in your arms, she arches her back and cocks her hips wildly to ride you in midair,<<if $activeSlave.preg > 20>> even as she carefully keeps her bulge from slamming into your hard body,<</if>> grunting and panting as her tiny body rubs up against your own.
<br><br>
When you grow bored of the position, you turn her around to impale her <<if $activeSlave.butt > 5>>huge<<elseif $activeSlave.butt > 3>>rounded<<else>>tight<</if>> butt as you pound her standing from behind, her <<if $activeSlave.boobs > 2000>>titanic<<elseif $activeSlave.boobs > 800>>big<<else>>small<</if>> breasts bouncing with every deep thrust upwards. Her small body spasms with the force of her immense pleasure, and when she orgasms, you have to wrap your arms beneath her breasts and pull her up against you to stop her limp body from crashing to the ground. Eventually, you lower her back down onto the ground level, watching with bemusement as she curls up, breathing heavily from her exertions. Eventually she recovers her composure somewhat, rising from her stupor to @@.hotpink;blow you a kiss.@@
<<set $activeSlave.devotion += 4>>
@@ -376,9 +530,80 @@ She does her very best to get through the inspection without disgrace, hugging h
<<set $activeSlave.energy -= 5>>
<</replace>>
<</link>>
+
+<<case "back stretch">>
+
+<<link "Fuck her boobs">>
+ <<replace "#name">>$activeSlave.slaveName<</replace>>
+ <<replace "#result">>
+ When she sees you <<if $PC.dick == 1>>get your dick out<<else>>approaching her with sapphic lust in your eyes<</if>>, she
+ <<if $activeSlave.energy > 80>>grins with anticipation,
+ <<elseif $activeSlave.trust > 20>>smiles appealingly,
+ <<else>>does her best to look submissive,
+ <</if>>
+ and offers you her chest.
+ <<if $PC.dick == 1>>
+ You collect some lubrication for it by sticking your dick in her mouth. <<if $activeSlave.oralSkill >= 100>>She swallows you to your base, and is such a skilled cocksucker that she salivates at will, doing her best to get you<<else>>She does her best to swallow you as deeply as she can manage, and get your cock<</if>> nice and slick. You pull your member out of her industriously sucking mouth with a pop, and slide it between her warm breasts. She promptly grabs them and squeezes them together, forming a nice channel for you to fuck. As you start pounding away, she does her best to crane her head down and suckle your dickhead whenever it appears between her boobs, adding more lubrication from her lewdly wet mouth. She knows when you're about to climax, and makes no attempt to avoid it, opening her mouth wide to accept your load. She catches most of it, but your generous ejaculation spatters her face with pearly decoration.
+ <<else>>
+ Deciding to do something a little more intimate than fucking her cleavage with a strap-on, you walk forward and into her face, pressing her inexorably backwards as she nuzzles your pussy until she's forced to collapse onto the ground. Then you scoot backwards a little, until you're straddling her ribcage just below her breasts. Her huge breasts rest atop your inner thighs, <<if $activeSlave.boobsImplant>>her skin taut against yours, from the implants<<else>>heavy and soft and female<</if>>. You ride her gently like this for a little while, enjoying the feminine weight of her and the effects of this intimacy on her face. Once you're ready for some more stimulation, you pull one of her hands down between her breasts; she gets her thumb down into her cleavage, all the way down until it can stimulate your button and bring you to a soft orgasm. Pleased, you slide down until you're face to face with her, and give her a kiss.
+ <</if>>
+ She
+ <<if $activeSlave.energy > 80>>was looking after herself with a hand the whole time, and she @@color:mediumaquamarine;smiles gratefully at you@@ with satisfaction.
+ <<elseif $activeSlave.trust > 20>>giggles a little, @@color:mediumaquamarine;pleased with herself.@@
+ <<else>>smiles hesitantly, clearly thinking that @@color:mediumaquamarine;she did well.@@
+ <</if>>
+ <<set $activeSlave.trust += 5>>
+ <<EventFetish "boobs">>
+ <</replace>>
+<</link>>
+<br><<link "Hurt her">>
+ <<replace "#name">>$activeSlave.slaveName<</replace>>
+ <<replace "#result">>
+ You decide to exercise a little maliciousness. You take a step forward, producing a look of
+ <<if $activeSlave.energy > 80>>lustful anticipation<<elseif $activeSlave.trust > 20>>expectation<<else>>trepidation<</if>>,
+ but then you stop, wordlessly gesturing at her to continue. She does, bending her back forward and backward, concave and convex, rolling herself around on her hips a little, and making her breasts move mesmerizingly. Eventually, she stretches deeply enough that<<if $activeSlave.trust <= 50>> she lets her guard down and<</if>> her eyes close again.
+ <<switch $activeSlave.nipples>>
+ <<case "tiny">>
+ Her tiny little nipples are too small to grab and pull effectively, so you simply flick them, aiming a vicious high-velocity fingernail at each of them, using both hands.
+ <<case "puffy">>
+ Her puffy nipples provide shamefully easy targets. You grab them in a mercilessly tight grip and haul, jerking her whole body forward until she's about to topple over.
+ <<case "partially inverted">>
+ You grab each of her nipples around the margins of her areolae, and squeeze them with such force that, partially inverted as they are, they protrude instantly.
+ <<case "inverted">>
+ You seize each of her inverted nipples, your thumbs uppermost, squeezing her sensitive, hidden nipples inside their fleshy prisons with cruel force.
+ <<case "huge">>
+ Her huge nipples provide you an excellent grip as you grab them and haul on them, jerking her whole body forward until she's about to topple over.
+ <<default>>
+ You grab each of her nipples in a merciless grip and pinch them with abandon, adding a cruel twist as soon as you've got them held tightly enough.
+ <</switch>>
+ Her $activeSlave.eyeColor eyes fly open and she <<if $activeSlave.voice == 1>>bellows with pain, her deep voice very loud<<elseif $activeSlave.voice == 2>>screams at the tops of her lungs<<elseif $activeSlave.voice == 3>>shrieks, her high, girlish voice very shrill<</if>>. The sudden agony discombobulates her so badly that for a few moments, she has no idea what's going on, and her hands fly forward reflexively. She manages to stop herself at the last minute, realizing that trying to knock your hands away from her poor nipples would be a very bad idea indeed. She looks up at you with huge eyes, mewling helplessly, @@color:gold;tears beginning to collect at the corners of her eyes.@@ Pleased, you turn and go.
+ <<set $activeSlave.trust -= 5>>
+ <<EventFetish "masochist">>
+ <</replace>>
+<</link>>
+<<if $activeSlave.lactation > 0>>
+<br><<link "Drink from her">>
+ <<replace "#name">>$activeSlave.slaveName<</replace>>
+ <<replace "#result">>
+ Her eyes widen with surprise when you kneel down in front of her. She begins to straighten, to face you, but you place a <<if $PC.title == 1>>strong<<else>>feminine<</if>> hand on her chest, right between her breasts, and keep her leaning backward. Then, without any preamble, you take her right breast in both of your hands, bend forward, and take her nipple into your mouth. She gasps, <<say>>s "Oh, <<Master>>," quietly, and then begins to moan as you begin to suck powerfully,
+ <<switch $activeSlave.nipples>>
+ <<case "tiny">>drawing her tiny nipple entirely into your mouth.
+ <<case "puffy">>engorging her soft, puffy nipple until it fills your mouth.
+ <<case "partially inverted">>pulling her partially inverted nipple straight out and into your mouth.
+ <<case "inverted">>gradually pulling at her inverted nipple until it's finally forced to pop out and into your mouth.
+ <<case "huge">>her huge nipple filling your mouth comfortably.
+ <<default>>pulling her soft nipple and some of the areolae around it into your mouth.
+ <</switch>>
+ Her rich milk begins to flow across your tongue, creamy and with a hint of vanilla. She breathes faster and faster as she becomes aroused, but then the stimulation peaks. You keep drinking from her, making no move to stop nursing and start fucking her. She sighs with sudden contentment, realizing that you're going to drink every drop she has, and her sudden relaxation sends a little extra gush of milk into your mouth. She @@color:hotpink;definitely enjoys the experience,@@ leaning back compliantly as you drain that breast and then her left one, too.
+ <<set $activeSlave.devotion += 5>>
+ <<EventFetish "boobs">>
+ <</replace>>
+<</link>>
+<</if>>
+
<<default>>
ERROR: bad event
<</switch>>
-
</span>
+
diff --git a/src/uncategorized/addCustomDescriptors.tw b/src/uncategorized/addCustomDescriptors.tw
index 7920c18c531..efe4a28f52e 100644
--- a/src/uncategorized/addCustomDescriptors.tw
+++ b/src/uncategorized/addCustomDescriptors.tw
@@ -59,6 +59,8 @@ You may enter custom descriptors for your slave's hair color, hair style, tattoo
<</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
| <<link "Give her a random Roman name">><<set $activeSlave.slaveName = $romanSlaveNames.random()>><<goto "Rename">><</link>>
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ | <<link "Give her a random Aztec name">><<set $activeSlave.slaveName = $aztecSlaveNames.random()>><<goto "Rename">><</link>>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
| <<link "Give her a random ancient Egyptian name">><<set $activeSlave.slaveName = $ancientEgyptianSlaveNames.random()>><<goto "Rename">><</link>>
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -79,6 +81,8 @@ You may enter custom descriptors for your slave's hair color, hair style, tattoo
<</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
<<link "Give her a random Roman name">><<set $activeSlave.slaveName = $romanSlaveNames.random()>><<goto "Rename">><</link>>
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ <<link "Give her a random Aztec name">><<set $activeSlave.slaveName = $aztecSlaveNames.random()>><<goto "Rename">><</link>>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
<<link "Give her a random ancient Egyptian name">><<set $activeSlave.slaveName = $ancientEgyptianSlaveNames.random()>><<goto "Rename">><</link>>
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -94,7 +98,7 @@ You may enter custom descriptors for your slave's hair color, hair style, tattoo
<br><br>
<<switch $activeSlave.hStyle>>
<<case "tails" "dreadlocks" "curls" "cornrows">>
-Her hair is in $activeSlave.hStyle.
+Her hair is in $activeSlave.hStyle.
<<case "ponytail">>
Her hair is in a $activeSlave.hStyle.
<<default>>
diff --git a/src/uncategorized/arcade.tw b/src/uncategorized/arcade.tw
index 6b0b7f276a5..3daed443c04 100644
--- a/src/uncategorized/arcade.tw
+++ b/src/uncategorized/arcade.tw
@@ -10,6 +10,8 @@ $arcadeNameCaps
<<switch $arcadeDecoration>>
<<case "Roman Revivalist">>
is built out as a Roman street restaurant, with the bar containing the inmates. Citizens can amuse themselves at either side of the bar while enjoying some wine and olives and talking over the day's events.
+<<case "Aztec Revivalist">>
+ is built out as a an Aztec stone temple, with a short stone staircase to lead the people straight to the slaves waiting in front of the establishment. A small canal leads the shed blood to the back and out of the building.
<<case "Egyptian Revivalist">>
is built to look like an ancient Egyptian temple, with a long altar of sacrifice serving as the wall in which the inmates are held. Incongruously, it's piled with fresh flowers.
<<case "Edo Revivalist">>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 5e3b3b64ca8..ea99cf8e9f9 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -152,10 +152,23 @@ $ACitizens citizens and <<print $ASlaves+$helots+$slaves.length>> slaves now liv
<<set $rents = random(1,100)>>
<<for _i = 1; _i < $sectors.length; _i++>>
<<if $sectors[_i].ownership == 1>>
- <<switch $sectors[_i].type>>
- <<case "DenseApartments" "LuxuryApartments" "Apartments" "Shops" "Markets" "Manufacturing">>
+ <<if $sectors[_i].type != "Brothel">>
+ <<if $sectors[_i].type != "Club">>
+ <<if $sectors[_i].type != "Arcade">>
+ <<if $sectors[_i].type != "Dairy">>
+ <<if $sectors[_i].type != "Pit">>
+ <<if $sectors[_i].type != "Sweatshops">>
+ <<if $sectors[_i].type != "Pens">>
+ <<if $sectors[_i].type != "Barracks">>
<<set $rents += $arcologies[0].prosperity*10>>
- <</switch>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
<</if>>
<</for>>
<<set $rentalMultiplier = 1>>
diff --git a/src/uncategorized/arcologyDescription.tw b/src/uncategorized/arcologyDescription.tw
index e520aeecffa..524190bd91b 100644
--- a/src/uncategorized/arcologyDescription.tw
+++ b/src/uncategorized/arcologyDescription.tw
@@ -20,6 +20,8 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
<</if>>
<<if $arcologies[0].FSRomanRevivalistDecoration >= 100>>
The entrances of the arcology are built of white stone, with graceful columns bringing Rome immediately to mind.
+<<elseif $arcologies[0].FSAztecRevivalistDecoration >= 100>>
+ The entrances of the arcology are built of obsidian, giving them a nice sheen, as they absorb the sun rays.
<<elseif $arcologies[0].FSEgyptianRevivalistDecoration >= 100>>
The entrances of the arcology are built of sandstone, with richly carved columns bringing ancient Egypt immediately to mind.
<<elseif $arcologies[0].FSEdoRevivalistDecoration >= 100>>
@@ -30,7 +32,7 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
The entrances of the arcology are guarded by bronze statues of traditional Chinese guardian spirits.
<</if>>
-<<if ($arcologies[0].FSSupremacistDecoration == 100) || ($arcologies[0].FSSubjugationistDecoration == 100) || ($arcologies[0].FSGenderRadicalistDecoration == 100) || ($arcologies[0].FSGenderFundamentalistDecoration == 100) || ($arcologies[0].FSRepopulationFocusDecoration == 100) || ($arcologies[0].FSRestartDecoration == 100) || ($arcologies[0].FSPaternalistDecoration == 100) || ($arcologies[0].FSDegradationistDecoration == 100) || ($arcologies[0].FSBodyPuristDecoration == 100) || ($arcologies[0].FSTransformationFetishistDecoration == 100) || ($arcologies[0].FSYouthPreferentialistDecoration == 100) || ($arcologies[0].FSMaturityPreferentialistDecoration == 100) || ($arcologies[0].FSSlimnessEnthusiastDecoration == 100) || ($arcologies[0].FSAssetExpansionistDecoration == 100) || ($arcologies[0].FSPastoralistDecoration == 100) || ($arcologies[0].FSPhysicalIdealistDecoration == 100) || ($arcologies[0].FSChattelReligionistDecoration == 100) || ($arcologies[0].FSRomanRevivalistDecoration == 100) || ($arcologies[0].FSEgyptianRevivalistDecoration == 100) || ($arcologies[0].FSEdoRevivalistDecoration == 100) || ($arcologies[0].FSArabianRevivalistDecoration == 100) || ($arcologies[0].FSChineseRevivalistDecoration == 100)>>
+<<if ($arcologies[0].FSSupremacistDecoration == 100) || ($arcologies[0].FSSubjugationistDecoration == 100) || ($arcologies[0].FSGenderRadicalistDecoration == 100) || ($arcologies[0].FSGenderFundamentalistDecoration == 100) || ($arcologies[0].FSPaternalistDecoration == 100) || ($arcologies[0].FSDegradationistDecoration == 100) || ($arcologies[0].FSBodyPuristDecoration == 100) || ($arcologies[0].FSTransformationFetishistDecoration == 100) || ($arcologies[0].FSYouthPreferentialistDecoration == 100) || ($arcologies[0].FSMaturityPreferentialistDecoration == 100) || ($arcologies[0].FSSlimnessEnthusiastDecoration == 100) || ($arcologies[0].FSAssetExpansionistDecoration == 100) || ($arcologies[0].FSPastoralistDecoration == 100) || ($arcologies[0].FSPhysicalIdealistDecoration == 100) || ($arcologies[0].FSChattelReligionistDecoration == 100) || ($arcologies[0].FSRomanRevivalistDecoration == 100) || ($arcologies[0].FSAztecRevivalistDecoration == 100) || ($arcologies[0].FSEgyptianRevivalistDecoration == 100) || ($arcologies[0].FSEdoRevivalistDecoration == 100) || ($arcologies[0].FSArabianRevivalistDecoration == 100) || ($arcologies[0].FSChineseRevivalistDecoration == 100) || ($arcologies[0].FSRepopulationFocusDecoration == 100) || ($arcologies[0].FSRestartDecoration == 100)>>
Outside the main entrance, there is an enormous statue of an idealized
<<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>>
with several statues of nude slaves at its feet.
@@ -107,6 +109,10 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
The central
<<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>> is wearing a toga; <<if $PC.title == 1>>he<<else>>she<</if>> has a laurel wreath about <<if $PC.title == 1>>his<<else>>her<</if>> brow.
<</if>>
+ <<if $arcologies[0].FSAztecRevivalistDecoration == 100>>
+ The central
+ <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>> is wearing a giant cloak, ornamented with jewels; <<if $PC.title == 1>>he<<else>>she<</if>> has a giant feathered headdress on <<if $PC.title == 1>>his<<else>>her<</if>> head.
+ <</if>>
<<if $arcologies[0].FSEgyptianRevivalistDecoration == 100>>
The central
<<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>> is wearing a pharaoh's crown.
@@ -143,7 +149,7 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
<</if>>
<</if>>
-<<if ($arcologies[0].FSSupremacistDecoration >= 40) || ($arcologies[0].FSSubjugationistDecoration >= 40) || ($arcologies[0].FSGenderRadicalistDecoration >= 40) || ($arcologies[0].FSGenderFundamentalistDecoration >= 40) || ($arcologies[0].FSPaternalistDecoration >= 40) || ($arcologies[0].FSDegradationistDecoration >= 40) || ($arcologies[0].FSRepopulationFocusDecoration >= 40) || ($arcologies[0].FSRestartDecoration >= 40) || ($arcologies[0].FSBodyPuristDecoration >= 40) || ($arcologies[0].FSTransformationFetishistDecoration >= 40) || ($arcologies[0].FSYouthPreferentialistDecoration >= 40) || ($arcologies[0].FSMaturityPreferentialistDecoration >= 40) || ($arcologies[0].FSSlimnessEnthusiastDecoration >= 40) || ($arcologies[0].FSAssetExpansionistDecoration >= 40) || ($arcologies[0].FSPastoralistDecoration >= 40) || ($arcologies[0].FSPhysicalIdealistDecoration >= 40) || ($arcologies[0].FSChattelReligionistDecoration >= 40) || ($arcologies[0].FSRomanRevivalistDecoration >= 40) || ($arcologies[0].FSEgyptianRevivalistDecoration >= 40) || ($arcologies[0].FSEdoRevivalistDecoration >= 40) || ($arcologies[0].FSArabianRevivalistDecoration >= 40) || ($arcologies[0].FSChineseRevivalistDecoration >= 40)>>
+<<if ($arcologies[0].FSSupremacistDecoration >= 40) || ($arcologies[0].FSSubjugationistDecoration >= 40) || ($arcologies[0].FSGenderRadicalistDecoration >= 40) || ($arcologies[0].FSGenderFundamentalistDecoration >= 40) || ($arcologies[0].FSPaternalistDecoration >= 40) || ($arcologies[0].FSDegradationistDecoration >= 40) || ($arcologies[0].FSBodyPuristDecoration >= 40) || ($arcologies[0].FSTransformationFetishistDecoration >= 40) || ($arcologies[0].FSYouthPreferentialistDecoration >= 40) || ($arcologies[0].FSMaturityPreferentialistDecoration >= 40) || ($arcologies[0].FSSlimnessEnthusiastDecoration >= 40) || ($arcologies[0].FSAssetExpansionistDecoration >= 40) || ($arcologies[0].FSPastoralistDecoration >= 40) || ($arcologies[0].FSPhysicalIdealistDecoration >= 40) || ($arcologies[0].FSChattelReligionistDecoration >= 40) || ($arcologies[0].FSRomanRevivalistDecoration >= 40) || ($arcologies[0].FSAztecRevivalistDecoration >= 40) || ($arcologies[0].FSEgyptianRevivalistDecoration >= 40) || ($arcologies[0].FSEdoRevivalistDecoration >= 40) || ($arcologies[0].FSArabianRevivalistDecoration >= 40) || ($arcologies[0].FSChineseRevivalistDecoration >= 40) || ($arcologies[0].FSRepopulationFocusDecoration >= 40) || ($arcologies[0].FSRestartDecoration >= 40)>>
<br>
The entryway features the first of $arcologies[0].name's many banks of public screens.
<<if $arcologies[0].FSSupremacistDecoration >= 40>>
@@ -199,6 +205,8 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
<</if>>
<<if $arcologies[0].FSRomanRevivalistDecoration >= 40>>
Some are showing announcements on $arcologies[0].name's progress prepared by the state media for the edification of citizens.
+ <<elseif $arcologies[0].FSAztecRevivalistDecoration >= 40>>
+ Some are gloryfying the Five Suns and the role of sacrifice and bloodletting.
<<elseif $arcologies[0].FSEgyptianRevivalistDecoration >= 40>>
Some are showing educational and scientific programs interspersed with multicultural features.
<<elseif $arcologies[0].FSEdoRevivalistDecoration >= 40>>
@@ -340,7 +348,7 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
<</if>>
<</if>>
-<<if ($arcologies[0].FSSupremacistDecoration >= 60) || ($arcologies[0].FSSubjugationistDecoration >= 60) || ($arcologies[0].FSGenderRadicalistDecoration >= 60) || ($arcologies[0].FSGenderFundamentalistDecoration >= 60) || ($arcologies[0].FSPaternalistDecoration >= 60) || ($arcologies[0].FSRepopulationFocusDecoration >= 60) || ($arcologies[0].FSRestartDecoration >= 60) || ($arcologies[0].FSDegradationistDecoration >= 60) || ($arcologies[0].FSBodyPuristDecoration >= 60) || ($arcologies[0].FSTransformationFetishistDecoration >= 60) || ($arcologies[0].FSYouthPreferentialistDecoration >= 60) || ($arcologies[0].FSMaturityPreferentialistDecoration >= 60) || ($arcologies[0].FSSlimnessEnthusiastDecoration >= 60) || ($arcologies[0].FSAssetExpansionistDecoration >= 60) || ($arcologies[0].FSPastoralistDecoration >= 60) || ($arcologies[0].FSPhysicalIdealistDecoration >= 60) || ($arcologies[0].FSChattelReligionistDecoration >= 60) || ($arcologies[0].FSRomanRevivalistDecoration >= 60) || ($arcologies[0].FSEgyptianRevivalistDecoration >= 60) || ($arcologies[0].FSEdoRevivalistDecoration >= 60) || ($arcologies[0].FSArabianRevivalistDecoration >= 60) || ($arcologies[0].FSChineseRevivalistDecoration >= 60)>>
+<<if ($arcologies[0].FSSupremacistDecoration >= 60) || ($arcologies[0].FSSubjugationistDecoration >= 60) || ($arcologies[0].FSGenderRadicalistDecoration >= 60) || ($arcologies[0].FSGenderFundamentalistDecoration >= 60) || ($arcologies[0].FSPaternalistDecoration >= 60) || ($arcologies[0].FSDegradationistDecoration >= 60) || ($arcologies[0].FSBodyPuristDecoration >= 60) || ($arcologies[0].FSTransformationFetishistDecoration >= 60) || ($arcologies[0].FSYouthPreferentialistDecoration >= 60) || ($arcologies[0].FSMaturityPreferentialistDecoration >= 60) || ($arcologies[0].FSSlimnessEnthusiastDecoration >= 60) || ($arcologies[0].FSAssetExpansionistDecoration >= 60) || ($arcologies[0].FSPastoralistDecoration >= 60) || ($arcologies[0].FSPhysicalIdealistDecoration >= 60) || ($arcologies[0].FSChattelReligionistDecoration >= 60) || ($arcologies[0].FSRomanRevivalistDecoration >= 60) || ($arcologies[0].FSAztecRevivalistDecoration >= 60) || ($arcologies[0].FSEgyptianRevivalistDecoration >= 60) || ($arcologies[0].FSEdoRevivalistDecoration >= 60) || ($arcologies[0].FSArabianRevivalistDecoration >= 60) || ($arcologies[0].FSChineseRevivalistDecoration >= 60) || ($arcologies[0].FSRepopulationFocusDecoration >= 60) || ($arcologies[0].FSRestartDecoration >= 60)>>
<br>
The central plaza is a large open atrium lined with banners.
<<if $arcologies[0].FSSupremacistDecoration >= 60>>
@@ -396,6 +404,8 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
<</if>>
<<if $arcologies[0].FSRomanRevivalistDecoration >= 60>>
The central plaza is decorated to look like a thriving Roman forum on market day.
+ <<elseif $arcologies[0].FSAztecRevivalistDecoration >= 60>>
+ The central plaza is decorated to look like a tribute to the gods, with huge statues, all looking in awe at the central temple. Many merchants peddle the goods of the new millennia.
<<elseif $arcologies[0].FSEgyptianRevivalistDecoration >= 60>>
The central plaza is decorated to look like a thriving ancient Egyptian market on a festival day.
<<elseif $arcologies[0].FSEdoRevivalistDecoration >= 60>>
@@ -410,7 +420,7 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
<<if $arcologyUpgrade.drones == 1>>The central plaza is a large atrium; a security drone occasionally flies across the open space.<</if>>
<</if>>
-<<if ($arcologies[0].FSSupremacistDecoration >= 80) || ($arcologies[0].FSSubjugationistDecoration >= 80) || ($arcologies[0].FSGenderRadicalistDecoration >= 80) || ($arcologies[0].FSGenderFundamentalistDecoration >= 80) || ($arcologies[0].FSPaternalistDecoration >= 80) || ($arcologies[0].FSDegradationistDecoration >= 80) || ($arcologies[0].FSBodyPuristDecoration >= 80) || ($arcologies[0].FSRepopulationFocusDecoration >= 80) || ($arcologies[0].FSRestartDecoration >= 80) || ($arcologies[0].FSTransformationFetishistDecoration >= 80) || ($arcologies[0].FSYouthPreferentialistDecoration >= 80) || ($arcologies[0].FSMaturityPreferentialistDecoration >= 80) || ($arcologies[0].FSSlimnessEnthusiastDecoration >= 80) || ($arcologies[0].FSAssetExpansionistDecoration >= 80) || ($arcologies[0].FSPastoralistDecoration >= 80) || ($arcologies[0].FSPhysicalIdealistDecoration >= 80) || ($arcologies[0].FSChattelReligionistDecoration >= 80) || ($arcologies[0].FSRomanRevivalistDecoration >= 80) || ($arcologies[0].FSEgyptianRevivalistDecoration >= 80) || ($arcologies[0].FSEdoRevivalistDecoration >= 80) || ($arcologies[0].FSArabianRevivalistDecoration >= 80) || ($arcologies[0].FSChineseRevivalistDecoration >= 80)>>
+<<if ($arcologies[0].FSSupremacistDecoration >= 80) || ($arcologies[0].FSSubjugationistDecoration >= 80) || ($arcologies[0].FSGenderRadicalistDecoration >= 80) || ($arcologies[0].FSGenderFundamentalistDecoration >= 80) || ($arcologies[0].FSPaternalistDecoration >= 80) || ($arcologies[0].FSDegradationistDecoration >= 80) || ($arcologies[0].FSBodyPuristDecoration >= 80) || ($arcologies[0].FSTransformationFetishistDecoration >= 80) || ($arcologies[0].FSYouthPreferentialistDecoration >= 80) || ($arcologies[0].FSMaturityPreferentialistDecoration >= 80) || ($arcologies[0].FSSlimnessEnthusiastDecoration >= 80) || ($arcologies[0].FSAssetExpansionistDecoration >= 80) || ($arcologies[0].FSPastoralistDecoration >= 80) || ($arcologies[0].FSPhysicalIdealistDecoration >= 80) || ($arcologies[0].FSChattelReligionistDecoration >= 80) || ($arcologies[0].FSRomanRevivalistDecoration >= 80) || ($arcologies[0].FSAztecRevivalistDecoration >= 80) || ($arcologies[0].FSEgyptianRevivalistDecoration >= 80) || ($arcologies[0].FSEdoRevivalistDecoration >= 80) || ($arcologies[0].FSArabianRevivalistDecoration >= 80) || ($arcologies[0].FSChineseRevivalistDecoration >= 80) || ($arcologies[0].FSRepopulationFocusDecoration >= 80) || ($arcologies[0].FSRestartDecoration >= 80)>>
There are numerous slaves stationed down on the plaza to greet visitors.
<<if $arcologies[0].FSPaternalistDecoration >= 80>>
They're intelligent and articulate.
@@ -455,6 +465,8 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
<</if>>
<<if $arcologies[0].FSRomanRevivalistDecoration >= 80>>
Many are wearing authentic ancient Roman stolas and maintaining composed and dignified attitudes.
+ <<elseif $arcologies[0].FSAztecRevivalistDecoration >= 80>>
+ Many are wearing authentic atztec Huipil, woven specifically to draw the attention of the visitors.
<<elseif $arcologies[0].FSEgyptianRevivalistDecoration >= 80>>
Many are wearing authentic ancient Egyptian dresses, and are dancing and making merry when they aren't assisting people.
<<elseif $arcologies[0].FSEdoRevivalistDecoration >= 80>>
@@ -547,6 +559,8 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
Faintly, the sound of cheering can be heard as a slave dies in gladiatorial combat.
<</if>>
/% End: mod to remove mention of galidiators dying if inappropriate. %/
+<<elseif $arcologies[0].FSAztecRevivalistDecoration >= 80>>
+ The sound of prayer and chanting echos across the space, briefly acompanied by a sacrifice's last scream as the rite completes.
<<elseif $arcologies[0].FSEgyptianRevivalistDecoration >= 80>>
To the side of the plaza is a huge stone entryway heading down: the entrance to the tomb you have prepared for yourself.
<<elseif $arcologies[0].FSEdoRevivalistDecoration >= 80>>
@@ -560,6 +574,7 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
$ACitizens citizens and <<print $ASlaves+$helots+$slaves.length>> slaves live in $arcologies[0].name.
<<if $arcologies[0].FSSupremacistLawME == 1>>The citizenry is entirely $arcologies[0].FSSupremacistRace.<</if>>
<<if $arcologies[0].FSRomanRevivalistLaw == 1>>Every citizen has military responsibilities, which are a point of pride to many, with most opting to wear utilitarian clothing even when off duty.<</if>>
+<<if $arcologies[0].FSAztecRevivalistLaw == 1>>Most citizens wear satin loincloths and cloakes, distinguised from most slaves only by the richness of their adornments<</if>>
<<if $arcologies[0].FSMaturityPreferentialistLaw == 1>>Most citizens are at least middle-aged, and graying hair on a citizen is considered attractive here.
<<elseif $arcologies[0].FSYouthPreferentialistLaw == 1>>Most citizens shine with youth and enthusiasm.<</if>>
<<if $arcologies[0].FSGenderRadicalistLaw == 1>>Every single one of the slaves is female by virtue of her fuckable asshole.
diff --git a/src/uncategorized/arcologyOpinion.tw b/src/uncategorized/arcologyOpinion.tw
index c98eb9c4e36..671b260123d 100644
--- a/src/uncategorized/arcologyOpinion.tw
+++ b/src/uncategorized/arcologyOpinion.tw
@@ -181,6 +181,9 @@
<<if $targetArcology.FSRomanRevivalist != "unset">>
<<set $opinion += $activeArcology.FSRomanRevivalist>>
<<set $opinion += $targetArcology.FSRomanRevivalist>>
+ <<elseif $targetArcology.FSAztecRevivalist != "unset">>
+ <<set $opinion -= $activeArcology.FSRomanRevivalist>>
+ <<set $opinion -= $targetArcology.FSAztecRevivalist>>
<<elseif $targetArcology.FSEgyptianRevivalist != "unset">>
<<set $opinion -= $activeArcology.FSRomanRevivalist>>
<<set $opinion -= $targetArcology.FSEgyptianRevivalist>>
@@ -194,6 +197,26 @@
<<set $opinion -= $activeArcology.FSRomanRevivalist>>
<<set $opinion -= $targetArcology.FSChineseRevivalist>>
<</if>>
+<<elseif $activeArcology.FSAztecRevivalist != "unset">>
+ <<if $targetArcology.FSAztecRevivalist != "unset">>
+ <<set $opinion += $activeArcology.FSAztecRevivalist>>
+ <<set $opinion += $targetArcology.FSAztecRevivalist>>
+ <<elseif $targetArcology.FSRomanRevivalist != "unset">>
+ <<set $opinion -= $activeArcology.FSAztecRevivalist>>
+ <<set $opinion -= $targetArcology.FSRomanRevivalist>>
+ <<elseif $targetArcology.FSEgyptianRevivalist != "unset">>
+ <<set $opinion -= $activeArcology.FSAztecRevivalist>>
+ <<set $opinion -= $targetArcology.FSEgyptianRevivalist>>
+ <<elseif $targetArcology.FSEdoRevivalist != "unset">>
+ <<set $opinion -= $activeArcology.FSAztecRevivalist>>
+ <<set $opinion -= $targetArcology.FSEdoRevivalist>>
+ <<elseif $targetArcology.FSArabianRevivalist != "unset">>
+ <<set $opinion -= $activeArcology.FSAztecRevivalist>>
+ <<set $opinion -= $targetArcology.FSArabianRevivalist>>
+ <<elseif $targetArcology.FSChineseRevivalist != "unset">>
+ <<set $opinion -= $activeArcology.FSAztecRevivalist>>
+ <<set $opinion -= $targetArcology.FSChineseRevivalist>>
+ <</if>>
<<elseif $activeArcology.FSEgyptianRevivalist != "unset">>
<<if $targetArcology.FSEgyptianRevivalist != "unset">>
<<set $opinion += $activeArcology.FSEgyptianRevivalist>>
@@ -201,6 +224,9 @@
<<elseif $targetArcology.FSRomanRevivalist != "unset">>
<<set $opinion -= $activeArcology.FSEgyptianRevivalist>>
<<set $opinion -= $targetArcology.FSRomanRevivalist>>
+ <<elseif $targetArcology.FSAztecRevivalist != "unset">>
+ <<set $opinion -= $activeArcology.FSEgyptianRevivalist>>
+ <<set $opinion -= $targetArcology.FSAztecRevivalist>>
<<elseif $targetArcology.FSEdoRevivalist != "unset">>
<<set $opinion -= $activeArcology.FSEgyptianRevivalist>>
<<set $opinion -= $targetArcology.FSEdoRevivalist>>
@@ -221,6 +247,9 @@
<<elseif $targetArcology.FSRomanRevivalist != "unset">>
<<set $opinion -= $activeArcology.FSEdoRevivalist>>
<<set $opinion -= $targetArcology.FSRomanRevivalist>>
+ <<elseif $targetArcology.FSAztecRevivalist != "unset">>
+ <<set $opinion -= $activeArcology.FSEdoRevivalist>>
+ <<set $opinion -= $targetArcology.FSAztecRevivalist>>
<<elseif $targetArcology.FSArabianRevivalist != "unset">>
<<set $opinion -= $activeArcology.FSEdoRevivalist>>
<<set $opinion -= $targetArcology.FSArabianRevivalist>>
@@ -241,6 +270,9 @@
<<elseif $targetArcology.FSRomanRevivalist != "unset">>
<<set $opinion -= $activeArcology.FSArabianRevivalist>>
<<set $opinion -= $targetArcology.FSRomanRevivalist>>
+ <<elseif $targetArcology.FSAztecRevivalist != "unset">>
+ <<set $opinion -= $activeArcology.FSArabianRevivalist>>
+ <<set $opinion -= $targetArcology.FSAztecRevivalist>>
<<elseif $targetArcology.FSChineseRevivalist != "unset">>
<<set $opinion -= $activeArcology.FSArabianRevivalist>>
<<set $opinion -= $targetArcology.FSChineseRevivalist>>
@@ -261,6 +293,9 @@
<<elseif $targetArcology.FSRomanRevivalist != "unset">>
<<set $opinion -= $activeArcology.FSChineseRevivalist>>
<<set $opinion -= $targetArcology.FSRomanRevivalist>>
+ <<elseif $targetArcology.FSAztecRevivalist != "unset">>
+ <<set $opinion -= $activeArcology.FSChineseRevivalist>>
+ <<set $opinion -= $targetArcology.FSAztecRevivalist>>
<</if>>
<</if>>
diff --git a/src/uncategorized/assistantEvents.tw b/src/uncategorized/assistantEvents.tw
index 334111e1438..45826aa8be3 100644
--- a/src/uncategorized/assistantEvents.tw
+++ b/src/uncategorized/assistantEvents.tw
@@ -131,6 +131,8 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
adjusts her outfit to resemble a priestess of your new religion.
<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
adjusts her appearance to resemble a greek demigoddess to conform with your vision of building a new Rome.
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ adjusts her appearance to resemble an Aztec goddess to conform with your vision of building a new Aztec Empire.
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her appearance to resemble an Egyptian deity to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -173,6 +175,8 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
adjusts her outfit to resemble a priestess of your new religion.
<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
adopts a roman lifestyle to conform with your vision of building a new Rome.
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ adjusts her outfit to a royal aztec cloth to conform with your vision of building a new Aztec Empire.
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble Egyptian garb to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -215,6 +219,8 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
adjusts her outfit to resemble a crusader of your new religion.
<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
adjusts her outfit to resemble a Roman warrior to conform with your vision of building a new Rome.
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ adjusts her outfit to resemble an Aztec champion to conform with your vision of building a new Aztec Empire.
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her appearance to resemble an Egyptian to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -257,6 +263,8 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
adjusts her outfit to prominently display a religious symbol of your new religion.
<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
adjusts her outfit to resemble a respectable Roman lady to conform with your vision of building a new Rome.
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ adjusts her outfit to resemble an Aztec priestess to conform with your vision of building a new Aztec Empire.
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble an Egyptian lady to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -297,6 +305,8 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
adjusts her outfit to prominently display a religious symbol of your new religion.
<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
adjusts her outfit to resemble a respectable Roman girl to conform with your vision of building a new Rome.
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ adjusts her outfit to resemble an Aztec woman to conform with your vision of building a new Aztec Empire.
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble an Egyptian girl to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -339,6 +349,8 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
adjusts her outfit to prominently display a religious symbol of your new religion.
<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
adjusts her outfit to resemble a Roman girl to conform with your vision of building a new Rome.
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ adjusts her outfit to resemble an Aztec woman to conform with your vision of building a new Aztec Empire.
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble an Egyptian girl to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -381,6 +393,8 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
adjusts appearance to resemble an angel of your new religion.
<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
adjusts her outfit to resemble a Roman lady to conform with your vision of building a new Rome.
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ adjusts her outfit to resemble an Aztec woman to conform with your vision of building a new Aztec Empire.
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble an Egyptian lady to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -423,6 +437,8 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
adjusts appearance to resemble an angel of your new religion.
<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
adjusts her outfit to resemble a Roman lady to conform with your vision of building a new Rome.
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ adjusts her outfit to resemble an Aztec woman to conform with your vision of building a new Aztec Empire.
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble an Egyptian lady to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -465,6 +481,8 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
adjusts her outfit to prominently display a religious symbol of your new religion.
<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
adjusts her outfit to resemble a respectable Roman girl to conform with your vision of building a new Rome.
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ adjusts her outfit to resemble an Aztec girl to conform with your vision of building a new Aztec Empire.
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble an Egyptian girl to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -507,6 +525,8 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
adjusts her outfit to prominently display a religious symbol of your new religion.
<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
adjusts her outfit to resemble a Roman girl to conform with your vision of building a new Rome.
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ adjusts her outfit to resemble an Aztec girl to conform with your vision of building a new Aztec Empire.
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble an Egyptian girl to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -549,6 +569,8 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
adjusts her outfit to prominently display a religious symbol of your new religion.
<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
adjusts her outfit to resemble a Roman woman to conform with your vision of building a new Rome.
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ adjusts her outfit to resemble an Aztec priestess to conform with your vision of building a new Aztec Empire.
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble an Egyptian woman to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -591,6 +613,8 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
adjusts her outfit to prominently display a religious symbol of your new religion.
<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
adjusts her outfit to resemble a Roman woman to conform with your vision of building a new Rome.
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ adjusts her outfit to resemble an Aztec priestess to conform with your vision of building a new Aztec Empire.
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble an Egyptian woman to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -632,15 +656,17 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
<<elseif $arcologies[0].FSChattelReligionist != "unset">>
adjusts her outfit to prominently display a religious symbol of your new religion.
<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
- adjusts her outfit to resemble a Roman woman, desipite her cock, to conform with your vision of building a new Rome.
+ adjusts her outfit to resemble a Roman woman, despite her cock, to conform with your vision of building a new Rome.
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ adjusts her outfit to resemble an Aztec woman, despite her cock, to conform with your vision of building a new Aztec Empire.
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
- adjusts her outfit to resemble an Egyptian woman, desipite her cock, to conform with your vision of building a new land of the Pharaohs.
+ adjusts her outfit to resemble an Egyptian woman, despite her cock, to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- adjusts her outfit to resemble a Japanese woman, desipite her cock, to conform with your vision of building new a Edo Japan.
+ adjusts her outfit to resemble a Japanese woman, despite her cock, to conform with your vision of building new a Edo Japan.
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
- adjusts her outfit to resemble an Arabian woman, desipite her cock, to conform with your vision of building a new Sultanate.
+ adjusts her outfit to resemble an Arabian woman, despite her cock, to conform with your vision of building a new Sultanate.
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
- adjusts her outfit to resemble a Chinese woman, desipite her cock, to conform with your vision of pursuing the Mandate of Heaven.
+ adjusts her outfit to resemble a Chinese woman, despite her cock, to conform with your vision of pursuing the Mandate of Heaven.
<</if>>
<<case "succubus">>
<<if $arcologies[0].FSPaternalist != "unset">>
@@ -675,6 +701,8 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
adjusts her outfit to prominently display a religious symbol of your new religion.
<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
adjusts her outfit to resemble a proper upper-class Roman lady to conform with your vision of building a new Rome.
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ adjusts her outfit to resemble an Aztec woman to conform with your vision of building a new Aztec Empire.
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble a topless Egyptian lady to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -717,6 +745,8 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
adjusts her outfit to prominently display a religious symbol of your new religion.
<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
adjusts her outfit to resemble a Roman woman to conform with your vision of building a new Rome.
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ adjusts her outfit to resemble an Aztec woman to conform with your vision of building a new Aztec Empire.
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble an Egyptian woman to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -768,6 +798,8 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
casts a spell to adorn her outfit with religious symbols of your new religion. She succeeds in conjuring them, at the expense of her other clothes.
<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
casts a spell to make herself appear Roman; she looks more Greek to you.
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ casts a spell to make herself appear Aztec; she adopts the perfect conquistador appearance.
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
casts a spell to make herself appear Egyption; bandages quickly wrap around her as a sarcophagus appears around her.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -810,6 +842,8 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
adjusts her outfit to prominently display a religious symbol of your new religion.
<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
adjusts her form to a Roman woman to conform with your vision of building a new Rome.
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ adjusts her outfit to resemble an Aztec woman to conform with your vision of building a new Aztec Empire.
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her form to an Egyptian woman to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -852,6 +886,8 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
adjusts her outfit to prominently display a religious symbol of your new religion.
<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
adjusts her outfit to resemble a proper upper-class Roman lady to conform with your vision of building a new Rome.
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ adjusts her outfit to resemble a high standing Aztec priestess to conform with your vision of building a new Aztec Empire.
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble a topless Egyptian lady to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -1298,6 +1334,8 @@ __Personal assistant appearances:__
<<set $assistantFSAppearance = "chattel religionist">>
<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
<<set $assistantFSAppearance = "roman revivalist">>
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ <<set $assistantFSAppearance = "aztec revivalist">>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
<<set $assistantFSAppearance = "egyptian revivalist">>
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -1547,6 +1585,8 @@ __Personal Assistant and Market Assistant relationship styles:__
Can my new body be a virgin? I want the arcology to turn me into a priestess!"
<<case "roman revivalist">>
Can my new body be Roman?"
+<<case "aztec revivalist">>
+ Can my new body be Aztec?"
<<case "egyptian revivalist">>
Can my new body be Egyptian?"
<<case "edo revivalist">>
diff --git a/src/uncategorized/barracks.tw b/src/uncategorized/barracks.tw
index e5b093fc9c2..1ad1b269c6b 100644
--- a/src/uncategorized/barracks.tw
+++ b/src/uncategorized/barracks.tw
@@ -16,7 +16,7 @@ As you enter the main bay of the barracks, lined with modern arms and armor and
<<else>>
there's enough equipment for a full platoon here.
<</if>>
-<</if>>
+<</if>>
<<if $mercenariesTitle != "mercenaries">>
They've taken to their role as $mercenariesTitle.
@@ -25,10 +25,12 @@ As you enter the main bay of the barracks, lined with modern arms and armor and
Every set of gear has some kind of chivalric device on it, and the heavier sets of powered armor are accented with a lot of burnished steel.
<<case "Evocati">>
The heavier sets of powered armor have Roman standards mounted on their backs, and officers' helmets are distinguished by horsehair crests.
+ <<case "Shorn Ones">>
+ The bigger sets of power armor are adorned with multiple ornaments and painted with symbols of the gods and victory.
<<case "Medjay">>
The gear is accented with bronze and animal skins. Some of the heavier armored helmets even have faceplates styled after Pharaonic death masks.
<<case "Samurai">>
- The gear is functional, but it has a distictive Sengoku style to it. A ceramic wazikashi is an almost universal tertiary weapon.
+ The gear is functional, but it has a distinctive Sengoku style to it. A ceramic wakizashi is an almost universal tertiary weapon.
<<case "Janissaries">>
They consider themselves a caste apart, and keep to themselves, priding themselves on relentless training and perpetual readiness.
<<case "Knights Templar">>
@@ -113,6 +115,7 @@ You head up a deck, to the staff area, and up one more, to look into the living
<<if _vignette >= 4>>Finally, a<<elseif _vignette >= 3>>Yet another<<elseif _vignette >= 2>>A third<<elseif _vignette>>Another<<else>>A<</if>> mercenary is being serviced by a slave with a visibly smooth crotch. He has a dildo rammed in her ass and moves it along with her sucking.
<</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
@@ -124,7 +127,7 @@ You head up a deck, to the staff area, and up one more, to look into the living
<br><br>
As you leave, a squad moves thunderously into the bay, fresh from a slave raid on behalf of your corporation. Most of their captures have been dropped off with the corporate receivers, but they've been given a pretty girl who isn't a good training prospect for the corporate brand, a common reward. The squad looks after their weapons and armor first, an inviolable rule, and as they do, they leave their naked slave standing in the middle of the bay, ignored. She isn't even bound, but she's standing nude and alone amongst modern mercenaries, and she knows there's nothing she can do. So, she does her best to cover herself with her hands, and she cries.
<</if>>
-
+
<br><br>
<<link "Decomission the barracks and return this sector to manufacturing">>
@@ -133,4 +136,4 @@ You head up a deck, to the staff area, and up one more, to look into the living
<<if $sectors[_i].type == "Barracks">><<set $sectors[_i].type = "Manufacturing">><<break>><</if>>
<</for>>
<<goto "Main">>
-<</link>>
\ No newline at end of file
+<</link>>
diff --git a/src/uncategorized/bodyModRulesAssistantSettings.tw b/src/uncategorized/bodyModRulesAssistantSettings.tw
index 8d4d2a56f14..4517876bb4c 100644
--- a/src/uncategorized/bodyModRulesAssistantSettings.tw
+++ b/src/uncategorized/bodyModRulesAssistantSettings.tw
@@ -769,6 +769,11 @@ Your brand design is ''$brandDesign.''
<<set $brandDesign = "a small crest of your Republic">>
<<RAChangeBrandDesign>>
<</link>> <</if>>
+<<if ($arcologies[0].FSAztecRevivalist != "unset")>>
+| //FS// <<link "Seven Serpents">>
+<<set $brandDesign = "a small symbol of the Aztec gods">>
+<<RAChangeBrandDesign>>
+<</link>> <</if>>
<<if ($arcologies[0].FSEgyptianRevivalist != "unset")>>
| //FS// <<link "Dynastic Sigil">>
<<set $brandDesign = "a small sigil of your Dynasty">>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index 48c2b8ce42a..23bb5d73f64 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -375,6 +375,8 @@ Your brand design is ''$brandDesign.''
| //FS// [[Religious Symbol|Body Modification][$brandDesign = "a religious symbol"]] <</if>>
<<if ($arcologies[0].FSRomanRevivalist != "unset")>>
| //FS// [[Republican Crest|Body Modification][$brandDesign = "the crest of your Republic"]] <</if>>
+<<if ($arcologies[0].FSAztecRevivalist != "unset")>>
+| //FS// [[Seven Serpents|Body Modification][$brandDesign = "the symbol of the Aztec gods"]] <</if>>
<<if ($arcologies[0].FSEgyptianRevivalist != "unset")>>
| //FS// [[Dynastic Sigil|Body Modification][$brandDesign = "the sigil of your Dynasty"]] <</if>>
<<if ($arcologies[0].FSEdoRevivalist != "unset")>>
@@ -1279,7 +1281,7 @@ __Apply full-body tattoos:__
Give $possessive a custom tattoo: <<textbox "$activeSlave.customTat" $activeSlave.customTat "Slave Interact">>
<<else>>
$pronounCap has a custom tattoo: $activeSlave.customTat
- Change $possessive custom tattoo: <<textbox "$activeSlave.customTat" $activeSlave.customTat "Slave Interact">>
+ Change $possessive custom tattoo: <<textbox "$activeSlave.customTat" $activeSlave.customTat "Slave Interact">>
<br>//For more than one tat, just use commas//
<</if>>
<<if $activeSlave.customTat != "">>
diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index ac031d01bee..7b8c7b70b54 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -10,6 +10,8 @@ $brothelNameCaps
<<switch $brothelDecoration>>
<<case "Roman Revivalist">>
is decorated as a Roman whorehouse. Refreshments are served at a bar, and someone is playing pipes in the back.
+<<case "Aztec Revivalist">>
+ is decorated as an Aztec ode to fertility and nature. Clients may sacrifice a bit of blood to honor the goddess of Filth or to partake in a fertility ritual before joining the girl of their choosing.
<<case "Egyptian Revivalist">>
is decorated as an ancient Egyptian fertility temple. Customers are bade relax on couches next to running water so that slaves may dance to entice them.
<<case "Edo Revivalist">>
@@ -155,13 +157,6 @@ $brothelNameCaps
It is a standard brothel. [[Upgrade the brothel with aphrodisiac injection systems|Brothel][$cash -= _Tmult1, $brothelUpgradeDrugs = 1]] //Costs ¤_Tmult1 and will increase upkeep costs//
<</if>>
-<br>
-<<if (def $brothelUpgradePreventatives) && $brothelUpgradePreventatives == 1>>
- The whores are supplied with drugs that protect them from most of the physical dangers of their work. [[Don't give them preventatives|Brothel][$brothelUpgradePreventatives = 0]] //Will reduce upkeep costs//
-<<else>>
- The whores could be supplied with drugs to protect them from most of the physical dangers of their work. [[Give them preventatives|Brothel][$brothelUpgradePreventatives = 1]] //Will increase upkeep costs//
-<</if>>
-
<br>$brothelNameCaps is
<<if $brothelAdsSpending > 0>>
the subject of an active ad campaign.
diff --git a/src/uncategorized/brothelAdvertisement.tw b/src/uncategorized/brothelAdvertisement.tw
index ad39e41c2e3..2e69c64c280 100644
--- a/src/uncategorized/brothelAdvertisement.tw
+++ b/src/uncategorized/brothelAdvertisement.tw
@@ -4,6 +4,8 @@
<<if $arcologies[0].FSRomanRevivalistDecoration >= 60>>
The brothel is decorated as a Roman whorehouse. Refreshments are served at a bar, and someone is playing pipes in the back.
+<<if $arcologies[0].FSAztecRevivalistDecoration >= 60>>
+ The brothel is decorated as an Aztec ode to fertility and nature. Clients may sacrifice a bit of blood to honor the goddess of Filth or to partake in a fertility ritual before joining the girl of their choosing.
<<elseif $arcologies[0].FSEgyptianRevivalistDecoration >= 60>>
The brothel is decorated as an ancient Egyptian fertility temple. Customers are bade relax on couches next to running water so that slaves may dance to entice them.
<<elseif $arcologies[0].FSEdoRevivalistDecoration >= 60>>
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index 5826ca16ec9..3a224623a4b 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -277,7 +277,7 @@
<</if>>
/* Perform facility based rule changes */
- <<set $slaves[_i].health += _healthBonus, $slaves[_i].aphrodisiacs = _aphrod, $slaves[_i].curatives = ($slaves[_i].curatives == 2) ? 2 : Number($brothelUpgradePreventatives)>>
+ <<set $slaves[_i].health += _healthBonus, $slaves[_i].aphrodisiacs = _aphrod>>
<<if $showEWD != 0>>
<br><br>
diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index 2e768b02c31..9d3ca264267 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -32,6 +32,9 @@ Yes, I am aware this is horrible. If anyone can figure out how to get widgets to
td#Shops {
border: 5px solid Thistle;
}
+ td#FSShops {
+ border: 5px solid MediumPurple;
+ }
td#Brothel {
border: 5px solid Violet;
}
@@ -188,6 +191,52 @@ Yes, I am aware this is horrible. If anyone can figure out how to get widgets to
<<else>>
<td colspan="2" id="Private"><<print "[[Shops|Private][$AS="+_i+"]]">></td>
<</if>>
+ <<case "Subjugationist">>
+ <td colspan="2" id="FSShops"><<print "[[Subjugationist Shops|Shops][$AS="+_i+"]]">></td>
+ <<case "Supremacist">>
+ <td colspan="2" id="FSShops"><<print "[[Supremacist Shops|Shops][$AS="+_i+"]]">></td>
+ <<case "Gender Radicalist">>
+ <td colspan="2" id="FSShops"><<print "[[Gender Radicalist Shops|Shops][$AS="+_i+"]]">></td>
+ <<case "Gender Fundamentalist">>
+ <td colspan="2" id="FSShops"><<print "[[Gender Fundamentalist Shops|Shops][$AS="+_i+"]]">></td>
+ <<case "Paternalist">>
+ <td colspan="2" id="FSShops"><<print "[[Paternalist Shops|Shops][$AS="+_i+"]]">></td>
+ <<case "Degradationist">>
+ <td colspan="2" id="FSShops"><<print "[[Degradationist Shops|Shops][$AS="+_i+"]]">></td>
+ <<case "Body Purist">>
+ <td colspan="2" id="FSShops"><<print "[[Body Purist Shops|Shops][$AS="+_i+"]]">></td>
+ <<case "Transformation Fetishist">>
+ <td colspan="2" id="FSShops"><<print "[[Transformation Fetishist Shops|Shops][$AS="+_i+"]]">></td>
+ <<case "Youth Preferentialist">>
+ <td colspan="2" id="FSShops"><<print "[[Youth Preferentialist Shops|Shops][$AS="+_i+"]]">></td>
+ <<case "Maturity Preferentialist">>
+ <td colspan="2" id="FSShops"><<print "[[Maturity Preferentialist Shops|Shops][$AS="+_i+"]]">></td>
+ <<case "Slimness Enthusiast">>
+ <td colspan="2" id="FSShops"><<print "[[Slimness Enthusiast Shops|Shops][$AS="+_i+"]]">></td>
+ <<case "Asset Expansionist">>
+ <td colspan="2" id="FSShops"><<print "[[Asset Expansionist Shops|Shops][$AS="+_i+"]]">></td>
+ <<case "Pastoralist">>
+ <td colspan="2" id="FSShops"><<print "[[Pastoralist Shops|Shops][$AS="+_i+"]]">></td>
+ <<case "Physical Idealist">>
+ <td colspan="2" id="FSShops"><<print "[[Physical Idealist Shops|Shops][$AS="+_i+"]]">></td>
+ <<case "Chattel Religionist">>
+ <td colspan="2" id="FSShops"><<print "[[Chattel Religionist Shops|Shops][$AS="+_i+"]]">></td>
+ <<case "Roman Revivalist">>
+ <td colspan="2" id="FSShops"><<print "[[Roman Revivalist Shops|Shops][$AS="+_i+"]]">></td>
+ <<case "Aztec Revivalist">>
+ <td colspan="2" id="FSShops"><<print "[[Aztec Revivalist Shops|Shops][$AS="+_i+"]]">></td>
+ <<case "Egyptian Revivalist">>
+ <td colspan="2" id="FSShops"><<print "[[Egyptian Revivalist Shops|Shops][$AS="+_i+"]]">></td>
+ <<case "Edo Revivalist">>
+ <td colspan="2" id="FSShops"><<print "[[Edo Revivalist Shops|Shops][$AS="+_i+"]]">></td>
+ <<case "Arabian Revivalist">>
+ <td colspan="2" id="FSShops"><<print "[[Arabian Revivalist Shops|Shops][$AS="+_i+"]]">></td>
+ <<case "Chinese Revivalist">>
+ <td colspan="2" id="FSShops"><<print "[[Chinese Revivalist Shops|Shops][$AS="+_i+"]]">></td>
+ <<case "Repopulationist">>
+ <td colspan="2" id="FSShops"><<print "[[Repopulationist Shops|Shops][$AS="+_i+"]]">></td>
+ <<case "Eugenics">>
+ <td colspan="2" id="FSShops"><<print "[[Eugenics Shops|Shops][$AS="+_i+"]]">></td>
<<default>><td></td>
<</switch>>
<</for>>
diff --git a/src/uncategorized/bulkSlaveGenerate.tw b/src/uncategorized/bulkSlaveGenerate.tw
index d91ce4384ff..05e064dca2d 100644
--- a/src/uncategorized/bulkSlaveGenerate.tw
+++ b/src/uncategorized/bulkSlaveGenerate.tw
@@ -71,7 +71,10 @@
<<for _i = 0; _i < $numSlaves; _i++>>
<<silently>>
- <<GenerateMarketSlave $slaveMarket $numArcology>>
+ <<GenerateMarketSlave $slaveMarket $numArcology>>
+ <<if $slaveMarket != "indentures" && $slaveMarket != "neighbor" && $slaveMarket != "heap">>
+ <<include "Law Compliance">>
+ <</if>>
<</silently>>
<<set $slavesSeen += 1>>
<<slaveCost $activeSlave>>
diff --git a/src/uncategorized/cellblock.tw b/src/uncategorized/cellblock.tw
index 9078804b9d6..0ab186b0689 100644
--- a/src/uncategorized/cellblock.tw
+++ b/src/uncategorized/cellblock.tw
@@ -10,6 +10,8 @@ $cellblockNameCaps
<<switch $cellblockDecoration>>
<<case "Roman Revivalist">>
is designed to resemble the holding pens beneath the old Coliseum. Whenever there's a fight in the arcology, screens in each cell helpfully keep inmates informed of what awaits (otherwise) useless slaves.
+<<case "Aztec Revivalist">>
+ is designed to frighten the prisoners to submission. All the cells look to the center of the facility, where a sacrificial altar stands, adorned with ceremonial knives, ropes and blunt instruments.
<<case "Egyptian Revivalist">>
uses the climate of Egypt as an additional source of discomfort. The air here is hot and dry, and inmates can easily imagine themselves confined in mud brick cells in a baking desert.
<<case "Edo Revivalist">>
diff --git a/src/uncategorized/changeLanguage.tw b/src/uncategorized/changeLanguage.tw
index b1b253bddb0..a70dd43d340 100644
--- a/src/uncategorized/changeLanguage.tw
+++ b/src/uncategorized/changeLanguage.tw
@@ -9,6 +9,10 @@
<<if $language != "Latin">>
<<set $revivalistLanguage = "Latin">>
<</if>>
+<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ <<if $language != "Nahuatl">>
+ <<set $revivalistLanguage = "Nahuatl">>
+ <</if>>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
<<if $language != "Ancient Egyptian">>
<<set $revivalistLanguage = "Ancient Egyptian">>
diff --git a/src/uncategorized/clinic.tw b/src/uncategorized/clinic.tw
index 3f5abac6bf7..d84f99820a3 100644
--- a/src/uncategorized/clinic.tw
+++ b/src/uncategorized/clinic.tw
@@ -10,6 +10,8 @@ $clinicNameCaps
<<switch $clinicDecoration>>
<<case "Roman Revivalist">>
is open and airy; a breeze wafts through the space, and Roman theories on natural cleanliness are very much on display.
+<<case "Aztec Revivalist">>
+ is open and airy; a light hint of herbs and natural oil permeates the air. Everything is incredibly sterile, especially the blood management equipment.
<<case "Egyptian Revivalist">>
is open and airy; clean rushes are strewn across the floor, making a gentle susurration when anyone crosses the space.
<<case "Edo Revivalist">>
diff --git a/src/uncategorized/club.tw b/src/uncategorized/club.tw
index 6ecd6a65772..120fae080b0 100644
--- a/src/uncategorized/club.tw
+++ b/src/uncategorized/club.tw
@@ -10,6 +10,8 @@ $clubNameCaps
<<switch $clubDecoration>>
<<case "Roman Revivalist">>
is decorated like a Roman villa's entertainment rooms. There is a lot of white stone, plaster, and terracotta.
+<<case "Aztec Revivalist">>
+ is decorated with obsidian figures inserted in the lime walls and giant oak pillars that give a homey feeling to the otherwise cold building.
<<case "Egyptian Revivalist">>
is decorated like a room in an ancient Egyptian palace. There are columns of warm stone and pools of clear water full of aquatic plants.
<<case "Edo Revivalist">>
@@ -175,6 +177,8 @@ $clubNameCaps
A faint gushing sound is audible from one of the private rooms.
<<case "Roman Revivalist">>
A business meeting is just audible from one of the private rooms; only an occasional moan indicates that the businessmen are enjoying a couple of serving girls at the same time.
+<<case "Aztec Revivalist">>
+ A muffled scream, followed by the sounds of liquid gently dripping on the stone floors denote the goings-on in the building.
<<case "Egyptian Revivalist">>
The smell of incense and the sounds of sex are drifting out of the private rooms.
<<case "Edo Revivalist">>
@@ -204,13 +208,6 @@ $clubNameCaps
The rooms are standard. [[Upgrade them with PDAs to help your recruiter|Club][$cash -= _Tmult1, $clubUpgradePDAs = 1]] //Costs ¤_Tmult1 and will increase upkeep costs//
<</if>>
-<br>
-<<if (def $clubUpgradePreventatives) && $clubUpgradePreventatives == 1>>
- The club sluts are supplied with drugs that protect them from most of the physical dangers of their work. [[Don't give them preventatives|Club][$clubUpgradePreventatives = 0]] //Will reduce upkeep costs//
-<<else>>
- The club sluts could be supplied with drugs to protect them from most of the physical dangers of their work. [[Give them preventatives|Club][$clubUpgradePreventatives = 1]] //Will increase upkeep costs//
-<</if>>
-
<br>
<<if $clubAdsSpending > 0>>
$clubNameCaps is the subject of an active ad campaign.
diff --git a/src/uncategorized/clubAdvertisement.tw b/src/uncategorized/clubAdvertisement.tw
index ec52efa0dad..b3f7766357b 100644
--- a/src/uncategorized/clubAdvertisement.tw
+++ b/src/uncategorized/clubAdvertisement.tw
@@ -4,6 +4,8 @@
<<if $arcologies[0].FSRomanRevivalistDecoration >= 60>>
$clubNameCaps is decorated like a Roman villa's entertainment rooms. There is a lot of white stone, plaster, and terracotta.
+<<elseif $arcologies[0].FSAztecRevivalistDecoration >= 60>>
+ $clubNameCaps is decorated with obsidian figures inserted in the lime walls and giant oak pillars that give a homey feeling to the otherwise cold building.
<<elseif $arcologies[0].FSEgyptianRevivalistDecoration >= 60>>
$clubNameCaps is decorated like a room in an ancient Egyptian palace. There are columns of warm stone and pools of clear water full of aquatic plants.
<<elseif $arcologies[0].FSEdoRevivalistDecoration >= 60>>
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 11339676d51..8c6761b764a 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -1,7 +1,7 @@
:: Club Report [nobr]
<<set $clubBonuses = 0, $DJRepBonus = 0, $implanted = 0, $legendaryEntertainerID = 0, $modded = 0, $old = 0, $pure = 0, $slim = 0, $stacked = 0, $unmodded = 0, $XX = 0, $XY = 0, $young = 0, _FLsFetish = 0, _DL = $ClubiIDs.length, $clubSlaves = _DL, _SL = $slaves.length, _FLs = -1>>
-<<set $legendaryWombID to 0, $pregYes to 0, $pregNo to 0>>
+<<set $legendaryWombID = 0, $pregYes = 0, $pregNo = 0>>
<<if $DJ != 0>>
@@ -208,9 +208,6 @@
<<set $slaves[_i].health += 7>>
<</if>>
- /* Perform facility based rule changes */
- <<set $slaves[_i].curatives = ($slaves[_i].curatives == 2) ? 2 : Number($clubUpgradePreventatives)>>
-
<<set $i = _i>>
<<if $showEWD != 0>>
diff --git a/src/uncategorized/costs.tw b/src/uncategorized/costs.tw
index d748e812d14..96a675f57af 100644
--- a/src/uncategorized/costs.tw
+++ b/src/uncategorized/costs.tw
@@ -234,7 +234,8 @@
<<elseif ($slaves[$i].drugs != "no drugs")>>
<<set $costs += ($drugsCost*2)>>
<</if>>
-<<if ($slaves[$i].curatives > 0)>>
+<<if $slaves[$i].curatives == 1 && $slaves[$i].assignmentVisible != 1>>
+<<elseif $slaves[$i].curatives > 0>>
<<set $costs += $drugsCost+($slaves[$i].curatives*$drugsCost)>>
<<elseif ndef $slaves[$i].curatives>>
<<set $slaves[$i].curatives = 0>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index e5f24f4b74b..b27179a0a57 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -336,7 +336,8 @@
<br> Standard drugs: ¤<<print ($drugsCost*2)>>
<<set $individualCosts += ($drugsCost*2)>>
<</if>>
- <<if ($slaves[$i].curatives > 0)>>
+ <<if $slaves[$i].curatives == 1 && $slaves[$i].assignmentVisible != 1>>
+ <<elseif $slaves[$i].curatives > 0>>
<br> Health drugs: ¤<<print $drugsCost+($slaves[$i].curatives*$drugsCost)>>
<<set $individualCosts += $drugsCost+($slaves[$i].curatives*$drugsCost)>>
<</if>>
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index 47b3cff0f4d..f90fa53e5a6 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -148,6 +148,8 @@ $dairyNameCaps is an industrial facility, but there's a viewing gallery for visi
<<switch $dairyDecoration>>
<<case "Roman Revivalist">>
The screens there review each slave's liquid contributions to the state in minute detail.
+<<case "Aztec Revivalist">>
+ The strange sight of the milking machines, designed to look like fertility statues gives the space an imposing feeling.
<<case "Egyptian Revivalist">>
The screens there list a tally of each slave's contributions to the harvest this season. They also identify related slaves who occupy multi-slave milking machines so that they may feed each other directly.
<<case "Edo Revivalist">>
@@ -200,6 +202,8 @@ $dairyNameCaps
<<switch $dairyDecoration>>
<<case "Roman Revivalist">>
is functional and clean, using traditional methods wherever possible. At one end of the long row of stalls there is an alcove with a shrine to the Roman goddess of bountiful harvests.
+<<case "Aztec Revivalist">>
+ is sterile and organized, using traditional methods wherever possible. At one end of the long row of stalls there is an alcove with a shrine to the Aztec god of the Earth.
<<case "Egyptian Revivalist">>
is functional and clean, using traditional methods wherever possible. At one end of the long row of stalls there is an alcove with a shrine to the Egyptian god of bountiful harvests.
<<case "Edo Revivalist">>
diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw
index 4c96d0b44cd..d7b186c380b 100644
--- a/src/uncategorized/fsDevelopments.tw
+++ b/src/uncategorized/fsDevelopments.tw
@@ -267,6 +267,12 @@
<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
<<set $arcologies[0].FSRomanRevivalist += $seed>>
<</if>>
+ <<if $arcologies[0].FSAztecRevivalist > $FSLockinLevel>>
+ <<set $arcologies[0].influenceBonus += $arcologies[0].FSAztecRevivalist - $FSLockinLevel>>
+ <<set $arcologies[0].FSAztecRevivalist = $FSLockinLevel>>
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ <<set $arcologies[0].FSAztecRevivalist += $seed>>
+ <</if>>
<<if $arcologies[0].FSEgyptianRevivalist > $FSLockinLevel>>
<<set $arcologies[0].influenceBonus += $arcologies[0].FSEgyptianRevivalist - $FSLockinLevel>>
<<set $arcologies[0].FSEgyptianRevivalist = $FSLockinLevel>>
@@ -293,6 +299,168 @@
<</if>>
<</if>>
+<<for _i = 5; _i <= 7; _i++>>
+<<if $sectors[_i].type =! "Shops">>
+<<if $sectors[_i].type =! "Brothel">>
+<<if $sectors[_i].type =! "Club">>
+ The $sectors[_i].type establishments on the Promenade help develop society.
+ <<FSChange $sectors[_i].type.replace(" ","") 4>>
+ <<break>>
+<</if>>
+<</if>>
+<</if>>
+<</for>>
+
+<<if $arcologies[0].FSSubjugationist != "unset">>
+ <<if $FSPromenade.Subjugationist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Subjugationist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.Subjugationist = 1, $sectors[$AS].type = "Subjugationist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<</if>>
+<<if $arcologies[0].FSSupremacist != "unset">>
+ <<if $FSPromenade.Supremacist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Supremacist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.Supremacist = 1, $sectors[$AS].type = "Supremacist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<</if>>
+<<if $arcologies[0].FSGenderRadicalist != "unset">>
+ <<if $FSPromenade.GenderRadicalist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Gender Radicalist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.GenderRadicalist = 1, $sectors[$AS].type = "GenderRadicalist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSGenderFundamentalist != "unset">>
+ <<if $FSPromenade.GenderFundamentalist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Gender Fundamentalist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.GenderFundamentalist = 1, $sectors[$AS].type = "GenderFundamentalist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<</if>>
+<<if $arcologies[0].FSPaternalist != "unset">>
+ <<if $FSPromenade.Paternalist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Paternalist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.Paternalist = 1, $sectors[$AS].type = "Paternalist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSDegradationist != "unset">>
+ <<if $FSPromenade.Degradationist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Degradationist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.Degradationist = 1, $sectors[$AS].type = "Degradationist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<</if>>
+<<if $arcologies[0].FSBodyPurist != "unset">>
+ <<if $FSPromenade.BodyPurist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Body Purist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.BodyPurist = 1, $sectors[$AS].type = "BodyPurist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSTransformationFetishist != "unset">>
+ <<if $FSPromenade.TransformationFetishist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Transformation Fetishist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.TransformationFetishist = 1, $sectors[$AS].type = "TransformationFetishist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<</if>>
+<<if $arcologies[0].FSYouthPreferentialist != "unset">>
+ <<if $FSPromenade.YouthPreferentialist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Youth Preferentialist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.YouthPreferentialist = 1, $sectors[$AS].type = "YouthPreferentialist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSMaturityPreferentialist != "unset">>
+ <<if $FSPromenade.MaturityPreferentialist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Subjugationist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.MaturityPreferentialist = 1, $sectors[$AS].type = "Maturity Preferentialist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<</if>>
+<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
+ <<if $FSPromenade.SlimnessEnthusiast == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Slimness Enthusiast establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.SlimnessEnthusiast = 1, $sectors[$AS].type = "SlimnessEnthusiast"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSAssetExpansionist != "unset">>
+ <<if $FSPromenade.AssetExpansionist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Asset Expansionist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.AssetExpansionist = 1, $sectors[$AS].type = "AssetExpansionist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<</if>>
+<<if $arcologies[0].FSPastoralist != "unset">>
+ <<if $FSPromenade.Pastoralist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Pastoralist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.Pastoralist = 1, $sectors[$AS].type = "Pastoralist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSPhysicalIdealist != "unset">>
+ <<if $FSPromenade.PhysicalIdealist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Physical Idealist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.PhysicalIdealist = 1, $sectors[$AS].type = "PhysicalIdealist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<</if>>
+<<if $arcologies[0].FSRepopulationFocus != "unset">>
+ <<if $FSPromenade.Repopulationist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Repopulationist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.Repopulationist = 1, $sectors[$AS].type = "Repopulationist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSRestart != "unset">>
+ <<if $FSPromenade.Eugenics == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Eugenics establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.Eugenics = 1, $sectors[$AS].type = "Eugenics"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<</if>>
+<<if $arcologies[0].FSChattelReligionist != "unset">>
+ <<if $FSPromenade.ChattelReligionist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Chattel Religionist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.ChattelReligionist = 1, $sectors[$AS].type = "ChattelReligionist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<</if>>
+<<if $arcologies[0].FSRomanRevivalist != "unset">>
+ <<if $FSPromenade.RomanRevivalist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Roman Revivalist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.RomanRevivalist = 1, $sectors[$AS].type = "RomanRevivalist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ <<if $FSPromenade.AztecRevivalist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Aztec Revivalist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.AztecRevivalist = 1, $sectors[$AS].type = "AztecRevivalist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
+ <<if $FSPromenade.EgyptianRevivalist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Egyptian Revivalist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.EgyptianRevivalist = 1, $sectors[$AS].type = "EgyptianRevivalist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
+ <<if $FSPromenade.EdoRevivalist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Edo Revivalist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.EdoRevivalist = 1, $sectors[$AS].type = "EdoRevivalist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
+ <<if $FSPromenade.ArabianRevivalist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Arabian Revivalist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.ArabianRevivalist = 1, $sectors[$AS].type = "ArabianRevivalist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
+ <<if $FSPromenade.ChineseRevivalist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Chinese Revivalist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.ChineseRevivalist = 1, $sectors[$AS].type = "ChineseRevivalist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<</if>>
+
<<if $PAPublic == 1 && $assistantAppearance != "normal">>
<<set _seed1 = 0, _seed2 = 0>>
<<if $arcologies[0].FSSupremacist != "unset">>
@@ -467,6 +635,16 @@
<<set _seed2 = 2>>
<</if>>
<</if>>
+<<if $arcologies[0].FSAztecRevivalist != "unset">>
+ <<if ($assistantAppearance == "amazon") || ($assistantAppearance == "businesswoman") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
+ <<set $arcologies[0].FSAztecRevivalist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed1 = 1>>
+ <</if>>
+ <<if ($assistantFSAppearance == "aztec revivalist")>>
+ <<set $arcologies[0].FSAztecRevivalist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed2 = 2>>
+ <</if>>
+<</if>>
<<if $arcologies[0].FSEgyptianRevivalist != "unset">>
<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
<<set $arcologies[0].FSEgyptianRevivalist += 0.1*$FSSingleSlaveRep>>
@@ -514,7 +692,7 @@ With her $assistantAppearance appearance, $assistantName's public visibility mes
<</if>>
<</if>>
-<<if ($arcologies[0].FSSupremacistSMR + $arcologies[0].FSSubjugationistSMR + $arcologies[0].FSGenderRadicalistSMR + $arcologies[0].FSGenderFundamentalistSMR + $arcologies[0].FSPaternalistSMR + $arcologies[0].FSDegradationistSMR + $arcologies[0].FSBodyPuristSMR + $arcologies[0].FSTransformationFetishistSMR + $arcologies[0].FSYouthPreferentialistSMR + $arcologies[0].FSMaturityPreferentialistSMR + $arcologies[0].FSSlimnessEnthusiastSMR + $arcologies[0].FSAssetExpansionistSMR + $arcologies[0].FSPastoralistSMR + $arcologies[0].FSPhysicalIdealistSMR + $arcologies[0].FSChattelReligionistSMR + $arcologies[0].FSRomanRevivalistSMR + $arcologies[0].FSEgyptianRevivalistSMR + $arcologies[0].FSEdoRevivalistSMR + $arcologies[0].FSRepopulationFocusSMR + $arcologies[0].FSRestartSMR + $arcologies[0].FSArabianRevivalistSMR + $arcologies[0].FSChineseRevivalistSMR) > 0>>
+<<if ($arcologies[0].FSSupremacistSMR + $arcologies[0].FSSubjugationistSMR + $arcologies[0].FSGenderRadicalistSMR + $arcologies[0].FSGenderFundamentalistSMR + $arcologies[0].FSPaternalistSMR + $arcologies[0].FSDegradationistSMR + $arcologies[0].FSBodyPuristSMR + $arcologies[0].FSTransformationFetishistSMR + $arcologies[0].FSYouthPreferentialistSMR + $arcologies[0].FSMaturityPreferentialistSMR + $arcologies[0].FSSlimnessEnthusiastSMR + $arcologies[0].FSAssetExpansionistSMR + $arcologies[0].FSPastoralistSMR + $arcologies[0].FSPhysicalIdealistSMR + $arcologies[0].FSChattelReligionistSMR + $arcologies[0].FSRomanRevivalistSMR + $arcologies[0].FSAztecRevivalistSMR + $arcologies[0].FSEgyptianRevivalistSMR + $arcologies[0].FSEdoRevivalistSMR + $arcologies[0].FSRepopulationFocusSMR + $arcologies[0].FSRestartSMR + $arcologies[0].FSArabianRevivalistSMR + $arcologies[0].FSChineseRevivalistSMR) > 0>>
The slave market regulations help ensure the arcology's slaves fit within its society.
<</if>>
@@ -1046,6 +1224,35 @@ With her $assistantAppearance appearance, $assistantName's public visibility mes
<</if>>
<</if>>
+<<if $arcologies[0].FSAztecRevivalist != "unset">>
+<<if $arcologies[0].FSAztecRevivalist < 0>>
+ <<set $arcologies[0].FSAztecRevivalist = "unset">><<set $FSCredits += 1>>
+ <<set $arcologies[0].FSAztecRevivalistSMR = 0, $arcologies[0].FSAztecRevivalistLaw = 0>>
+ <<ClearFacilityDecorations>>
+ @@.red;One of your future society projects has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
+<<elseif $arcologies[0].FSAztecRevivalist > $arcologies[0].FSAztecRevivalistDecoration>>
+ <<set $arcologies[0].FSAztecRevivalist = $arcologies[0].FSAztecRevivalistDecoration>>
+<</if>>
+<<if $arcologies[0].FSAztecRevivalist >= $FSLockinLevel>>
+ $arcologies[0].name believes implicitly that it is the new Aztec Empire.
+ <<set $independenceDay = 1>>
+<<elseif $arcologies[0].FSAztecRevivalist >= $FSLockinLevel*0.6>>
+ $arcologies[0].name agrees strongly with your project to build the new Aztec Empire.
+ <<set $independenceDay = 1>>
+<<elseif $arcologies[0].FSAztecRevivalist >= $FSLockinLevel*0.3>>
+ $arcologies[0].name is sympathetic to your project to build the new Aztec Empire.
+<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ $arcologies[0].name is unconvinced of the wisdom of your project to build the new Aztec Empire.
+<</if>>
+<<if $arcologies[0].FSAztecRevivalistDecoration < $FSLockinLevel>>
+<<if $arcologies[0].FSAztecRevivalist == $arcologies[0].FSAztecRevivalistDecoration>>
+ @@.yellow;Your societal development in this direction is being limited by $arcologies[0].name's lack of customization to support it.@@
+<<elseif $arcologies[0].FSAztecRevivalistSMR == 1>>
+ <<set $arcologies[0].FSAztecRevivalist += 0.1*$FSSingleSlaveRep>>
+<</if>>
+<</if>>
+<</if>>
+
<<if $arcologies[0].FSEgyptianRevivalist != "unset">>
<<if $arcologies[0].FSEgyptianRevivalist < 0>>
<<set $arcologies[0].FSEgyptianRevivalist = "unset">><<set $FSCredits += 1>>
diff --git a/src/uncategorized/futureSocities.tw b/src/uncategorized/futureSocities.tw
index 543bbb039df..9dd92ec2cff 100644
--- a/src/uncategorized/futureSocities.tw
+++ b/src/uncategorized/futureSocities.tw
@@ -61,6 +61,9 @@
<<if ndef $arcologies[0].FSRomanRevivalist>>
<<set $arcologies[0].FSRomanRevivalist = "unset">>
<</if>>
+<<if ndef $arcologies[0].FSAztecRevivalist>>
+ <<set $arcologies[0].FSAztecRevivalist = "unset">>
+<</if>>
<<if ndef $arcologies[0].FSEgyptianRevivalist>>
<<set $arcologies[0].FSEgyptianRevivalist = "unset">>
<</if>>
@@ -138,6 +141,8 @@
<</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
<<set $rivalryFS = "Roman Revivalism">>
+<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ <<set $rivalryFS = "Aztec Revivalism">>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
<<set $rivalryFS = "Egyptian Revivalism">>
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -354,6 +359,16 @@
$arcologies[0].name is unconvinced of the wisdom of your project to build the new Rome.
<</if>>
+<<if $arcologies[0].FSAztecRevivalist >= $FSLockinLevel>>
+ $arcologies[0].name believes implicitly that it is the new Aztec Empire.
+<<elseif $arcologies[0].FSAztecRevivalist >= $FSLockinLevel*0.6>>
+ $arcologies[0].name agrees strongly with your project to build the new Aztec Empire.
+<<elseif $arcologies[0].FSAztecRevivalist >= $FSLockinLevel*0.3>>
+ $arcologies[0].name is sympathetic to your project to build the new Aztec Empire.
+<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ $arcologies[0].name is unconvinced of the wisdom of your project to build the new Aztec Empire.
+<</if>>
+
<<if $arcologies[0].FSEgyptianRevivalist >= $FSLockinLevel>>
$arcologies[0].name believes implicitly that it is the land of the Pharaohs, reborn.
<<elseif $arcologies[0].FSEgyptianRevivalist >= $FSLockinLevel*0.6>>
@@ -465,6 +480,17 @@ You are spending ¤$FSSpending each week to support your societal goals.
<</replace>>
<</link>>
<br>
+<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ <br>
+ <<link "Rename all your slaves according to ancient Aztec custom">>
+ <<for _i = 0; _i < $slaves.length; _i++>>
+ <<set $slaves[_i].slaveName = $aztecSlaveNames.random()>>
+ <</for>>
+ <<replace "#mass">>
+ <br>Slaves renamed.<br>
+ <</replace>>
+ <</link>>
+ <br>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
<br>
<<link "Rename all your slaves according to ancient Egyptian custom">>
@@ -1414,7 +1440,7 @@ You are spending ¤$FSSpending each week to support your societal goals.
<</if>>
<</if>>
-<<if ($arcologies[0].FSEgyptianRevivalist == "unset") && ($arcologies[0].FSEdoRevivalist == "unset") && ($arcologies[0].FSArabianRevivalist == "unset") && ($arcologies[0].FSChineseRevivalist == "unset")>>
+<<if ($arcologies[0].FSAztecRevivalist == "unset") && ($arcologies[0].FSEgyptianRevivalist == "unset") && ($arcologies[0].FSEdoRevivalist == "unset") && ($arcologies[0].FSArabianRevivalist == "unset") && ($arcologies[0].FSChineseRevivalist == "unset")>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
<br>''You are pursuing'' a vision of a new Rome.
//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSRomanRevivalist = "unset", $arcologies[0].FSRomanRevivalistDecoration = 20, $arcologies[0].FSRomanRevivalistLaw = 0, $arcologies[0].FSRomanRevivalistSMR = 0, $FSCredits += 1>><<if $assistantFSAppearance == "roman revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>
@@ -1464,7 +1490,57 @@ You are spending ¤$FSSpending each week to support your societal goals.
<</if>>
<</if>>
-<<if ($arcologies[0].FSRomanRevivalist == "unset") && ($arcologies[0].FSEdoRevivalist == "unset") && ($arcologies[0].FSArabianRevivalist == "unset") && ($arcologies[0].FSChineseRevivalist == "unset")>>
+<<if ($arcologies[0].FSRomanRevivalist == "unset") && ($arcologies[0].FSEgyptianRevivalist == "unset") && ($arcologies[0].FSEdoRevivalist == "unset") && ($arcologies[0].FSArabianRevivalist == "unset") && ($arcologies[0].FSChineseRevivalist == "unset")>>
+<<if $arcologies[0].FSAztecRevivalist != "unset">>
+ <br>''You are pursuing'' a vision of a new Aztec Empire.
+ //<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSAztecRevivalist = "unset", $arcologies[0].FSAztecRevivalistDecoration = 20, $arcologies[0].FSAztecRevivalistSMR = 0, $arcologies[0].FSAztecRevivalistLaw = 0, $FSCredits += 1>><<if $assistantFSAppearance == "aztec revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>
+ <<switch $arcologies[0].FSAztecRevivalistDecoration>>
+ <<case 20>>
+ $arcologies[0].name is not customized to support this goal.
+ <<if $arcologies[0].FSAztecRevivalist >= 10>>
+ [[Modify your arcology's internal media to support this goal|Future Society][$arcologies[0].FSAztecRevivalistDecoration = 40, $cash -= 2500]] //Costs ¤2500//
+ <<else>>
+ You must advance this goal before customization to support it becomes available.
+ <</if>>
+ <<case 40>>
+ $arcologies[0].name's media is supporting this goal.
+ <<if $arcologies[0].FSAztecRevivalist >= 30>>
+ [[Redecorate your arcology's public spaces to support this goal|Future Society][$arcologies[0].FSAztecRevivalistDecoration = 60, $cash -= 10000]] //Costs ¤10000//
+ <<else>>
+ You must advance this goal before further customization to support it becomes available.
+ <</if>>
+ <<case 60>>
+ $arcologies[0].name's media is supporting this goal, and $arcologies[0].name's public spaces are decorated to support it too.
+ <<if $arcologies[0].FSAztecRevivalist >= 50>>
+ [[Station slaves in your arcology's public spaces to promote this goal|Future Society][$arcologies[0].FSAztecRevivalistDecoration = 80, $cash -= 10000]] //Costs ¤10000//
+ <<else>>
+ You must advance this goal before further customization to support it becomes available.
+ <</if>>
+ <<case 80>>
+ $arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it too.
+ <<if $arcologies[0].FSAztecRevivalist >= 70>>
+ [[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0].FSAztecRevivalistDecoration = 100, $cash -= 20000]] //Costs ¤20000//
+ <<else>>
+ You must advance this goal before further customization to support it becomes available.
+ <</if>>
+ <<case 100>>
+ $arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal.
+ <</switch>>
+ <<if $PAPublic == 1>>
+ <<if ($assistantAppearance == "goddess") || ($assistantAppearance == "amazon") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
+ With her $assistantAppearance appearance, $assistantName is a good public mascot for this model.
+ <</if>>
+ <</if>>
+<<else>>
+ <<if $FSCredits > 0>>
+ <br>''''[[Aztec Revivalism|Future Society][$arcologies[0].FSAztecRevivalist = 4, $FSCredits -= 1]]: a vision of a new Aztec Empire.
+ <<else>>
+ /*//''Aztec Revivalism'': a vision of a new Aztec Empire.//*/
+ <</if>>
+<</if>>
+<</if>>
+
+<<if ($arcologies[0].FSRomanRevivalist == "unset") && ($arcologies[0].FSAztecRevivalist == "unset") && ($arcologies[0].FSEdoRevivalist == "unset") && ($arcologies[0].FSArabianRevivalist == "unset") && ($arcologies[0].FSChineseRevivalist == "unset")>>
<<if $arcologies[0].FSEgyptianRevivalist != "unset">>
<br>''You are pursuing'' a vision of Pharaoh's Egypt.
//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSEgyptianRevivalist = "unset", $arcologies[0].FSEgyptianRevivalistDecoration = 20, $arcologies[0].FSEgyptianRevivalistLaw = 0, $arcologies[0].FSEgyptianRevivalistSMR = 0, $FSCredits += 1>><<if $assistantFSAppearance == "egyptian revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>
@@ -1514,7 +1590,7 @@ You are spending ¤$FSSpending each week to support your societal goals.
<</if>>
<</if>>
-<<if ($arcologies[0].FSRomanRevivalist == "unset") && ($arcologies[0].FSEgyptianRevivalist == "unset") && ($arcologies[0].FSArabianRevivalist == "unset") && ($arcologies[0].FSChineseRevivalist == "unset")>>
+<<if ($arcologies[0].FSRomanRevivalist == "unset") && ($arcologies[0].FSAztecRevivalist == "unset") && ($arcologies[0].FSEgyptianRevivalist == "unset") && ($arcologies[0].FSArabianRevivalist == "unset") && ($arcologies[0].FSChineseRevivalist == "unset")>>
<<if $arcologies[0].FSEdoRevivalist != "unset">>
<br>''You are pursuing'' a vision of Edo Japan.
//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSEdoRevivalist = "unset", $arcologies[0].FSEdoRevivalistDecoration = 20, $arcologies[0].FSEdoRevivalistLaw = 0, $arcologies[0].FSEdoRevivalistSMR = 0, $FSCredits += 1>><<if $assistantFSAppearance == "edo revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>
@@ -1562,7 +1638,7 @@ You are spending ¤$FSSpending each week to support your societal goals.
<</if>>
<</if>>
-<<if ($arcologies[0].FSRomanRevivalist == "unset") && ($arcologies[0].FSEgyptianRevivalist == "unset") && ($arcologies[0].FSEdoRevivalist == "unset") && ($arcologies[0].FSChineseRevivalist == "unset")>>
+<<if ($arcologies[0].FSRomanRevivalist == "unset") && ($arcologies[0].FSAztecRevivalist == "unset") && ($arcologies[0].FSEgyptianRevivalist == "unset") && ($arcologies[0].FSEdoRevivalist == "unset") && ($arcologies[0].FSChineseRevivalist == "unset")>>
<<if $arcologies[0].FSArabianRevivalist != "unset">>
<br>''You are pursuing'' a vision of the Sultanate of old.
//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSArabianRevivalist = "unset", $arcologies[0].FSArabianRevivalistDecoration = 20, $arcologies[0].FSArabianRevivalistLaw = 0, $arcologies[0].FSArabianRevivalistSMR = 0, $FSCredits += 1>><<if $assistantFSAppearance == "arabian revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>
@@ -1610,7 +1686,7 @@ You are spending ¤$FSSpending each week to support your societal goals.
<</if>>
<</if>>
-<<if ($arcologies[0].FSRomanRevivalist == "unset") && ($arcologies[0].FSEgyptianRevivalist == "unset") && ($arcologies[0].FSEdoRevivalist == "unset") && ($arcologies[0].FSArabianRevivalist == "unset")>>
+<<if ($arcologies[0].FSRomanRevivalist == "unset") && ($arcologies[0].FSAztecRevivalist == "unset") && ($arcologies[0].FSEgyptianRevivalist == "unset") && ($arcologies[0].FSEdoRevivalist == "unset") && ($arcologies[0].FSArabianRevivalist == "unset")>>
<<if $arcologies[0].FSChineseRevivalist != "unset">>
<br>''You are pursuing'' a vision of ancient China.
//<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSChineseRevivalist = "unset", $arcologies[0].FSChineseRevivalistDecoration = 20, $arcologies[0].FSChineseRevivalistLaw = 0, $arcologies[0].FSChineseRevivalistSMR = 0, $FSCredits += 1>><<if $assistantFSAppearance == "chinese revivalist">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>
@@ -1658,7 +1734,7 @@ You are spending ¤$FSSpending each week to support your societal goals.
<</if>>
<</if>>
-<<if $arcologies[0].FSChattelReligionist is "unset">>
+<<if $arcologies[0].FSChattelReligionist == "unset">>
<<if $FSCreditCount == 4>>
<<if $arcologies[0].FSNull != "unset">>
<br>''You are permitting <<if $arcologies[0].FSNull <= 25>>basic<<elseif $arcologies[0].FSNull <= 50>>considerable<<elseif $arcologies[0].FSNull <= 75>>advanced<<else>>absolute<</if>>'' cultural freedom in your arcology.
@@ -1775,6 +1851,8 @@ You are spending ¤$FSSpending each week to support your societal goals.
<<set $brothelDecoration = "standard">>
<<elseif ($arcologies[0].FSRomanRevivalist == "unset") && ($brothelDecoration == "Roman Revivalist")>>
<<set $brothelDecoration = "standard">>
+<<elseif ($arcologies[0].FSAztecRevivalist == "unset") && ($brothelDecoration == "Aztec Revivalist")>>
+ <<set $brothelDecoration = "standard">>
<<elseif ($arcologies[0].FSEgyptianRevivalist == "unset") && ($brothelDecoration == "Egyptian Revivalist")>>
<<set $brothelDecoration = "standard">>
<<elseif ($arcologies[0].FSEdoRevivalist == "unset") && ($brothelDecoration == "Edo Revivalist")>>
@@ -1843,6 +1921,8 @@ You are spending ¤$FSSpending each week to support your societal goals.
<</if>>
<<if ($arcologies[0].FSRomanRevivalist >= 20) && ($brothelDecoration != "Roman Revivalist")>>
<br> [[Roman Revivalist redecoration|Future Society][$brothelDecoration = "Roman Revivalist", $cash -= 5000]]
+<<elseif ($arcologies[0].FSAztecRevivalist >= 20) && ($brothelDecoration != "Aztec Revivalist")>>
+ <br> [[Aztec Revivalist redecoration|Future Society][$brothelDecoration = "Aztec Revivalist", $cash -= 5000]]
<<elseif ($arcologies[0].FSEgyptianRevivalist >= 20) && ($brothelDecoration != "Egyptian Revivalist")>>
<br> [[Egyptian Revivalist redecoration|Future Society][$brothelDecoration = "Egyptian Revivalist", $cash -= 5000]]
<<elseif ($arcologies[0].FSEdoRevivalist >= 20) && ($brothelDecoration != "Edo Revivalist")>>
@@ -1888,6 +1968,8 @@ You are spending ¤$FSSpending each week to support your societal goals.
<<set $clubDecoration = "standard">>
<<elseif ($arcologies[0].FSRomanRevivalist == "unset") && ($clubDecoration == "Roman Revivalist")>>
<<set $clubDecoration = "standard">>
+<<elseif ($arcologies[0].FSAztecRevivalist == "unset") && ($clubDecoration == "Aztec Revivalist")>>
+ <<set $clubDecoration = "standard">>
<<elseif ($arcologies[0].FSEgyptianRevivalist == "unset") && ($clubDecoration == "Egyptian Revivalist")>>
<<set $clubDecoration = "standard">>
<<elseif ($arcologies[0].FSEdoRevivalist == "unset") && ($clubDecoration == "Edo Revivalist")>>
@@ -1956,6 +2038,8 @@ You are spending ¤$FSSpending each week to support your societal goals.
<</if>>
<<if ($arcologies[0].FSRomanRevivalist >= 20) && ($clubDecoration != "Roman Revivalist")>>
<br> [[Roman Revivalist redecoration|Future Society][$clubDecoration = "Roman Revivalist", $cash -= 5000]]
+<<elseif ($arcologies[0].FSAztecRevivalist >= 20) && ($clubDecoration != "Aztec Revivalist")>>
+ <br> [[Aztec Revivalist redecoration|Future Society][$clubDecoration = "Aztec Revivalist", $cash -= 5000]]
<<elseif ($arcologies[0].FSEgyptianRevivalist >= 20) && ($clubDecoration != "Egyptian Revivalist")>>
<br> [[Egyptian Revivalist redecoration|Future Society][$clubDecoration = "Egyptian Revivalist", $cash -= 5000]]
<<elseif ($arcologies[0].FSEdoRevivalist >= 20) && ($clubDecoration != "Edo Revivalist")>>
@@ -2001,6 +2085,8 @@ You are spending ¤$FSSpending each week to support your societal goals.
<<set $dairyDecoration = "standard">>
<<elseif ($arcologies[0].FSRomanRevivalist == "unset") && ($dairyDecoration == "Roman Revivalist")>>
<<set $dairyDecoration = "standard">>
+<<elseif ($arcologies[0].FSAztecRevivalist == "unset") && ($dairyDecoration == "Aztec Revivalist")>>
+ <<set $dairyDecoration = "standard">>
<<elseif ($arcologies[0].FSEgyptianRevivalist == "unset") && ($dairyDecoration == "Egyptian Revivalist")>>
<<set $dairyDecoration = "standard">>
<<elseif ($arcologies[0].FSEdoRevivalist == "unset") && ($dairyDecoration == "Edo Revivalist")>>
@@ -2069,6 +2155,8 @@ You are spending ¤$FSSpending each week to support your societal goals.
<</if>>
<<if ($arcologies[0].FSRomanRevivalist >= 20) && ($dairyDecoration != "Roman Revivalist")>>
<br> [[Roman Revivalist redecoration|Future Society][$dairyDecoration = "Roman Revivalist", $cash -= 5000]]
+<<elseif ($arcologies[0].FSAztecRevivalist >= 20) && ($dairyDecoration != "Aztec Revivalist")>>
+ <br> [[Aztec Revivalist redecoration|Future Society][$dairyDecoration = "Aztec Revivalist", $cash -= 5000]]
<<elseif ($arcologies[0].FSEgyptianRevivalist >= 20) && ($dairyDecoration != "Egyptian Revivalist")>>
<br> [[Egyptian Revivalist redecoration|Future Society][$dairyDecoration = "Egyptian Revivalist", $cash -= 5000]]
<<elseif ($arcologies[0].FSEdoRevivalist >= 20) && ($dairyDecoration != "Edo Revivalist")>>
@@ -2114,6 +2202,8 @@ You are spending ¤$FSSpending each week to support your societal goals.
<<set $spaDecoration = "standard">>
<<elseif ($arcologies[0].FSRomanRevivalist == "unset") && ($spaDecoration == "Roman Revivalist")>>
<<set $spaDecoration = "standard">>
+<<elseif ($arcologies[0].FSAztecRevivalist == "unset") && ($spaDecoration == "Aztec Revivalist")>>
+ <<set $spaDecoration = "standard">>
<<elseif ($arcologies[0].FSEgyptianRevivalist == "unset") && ($spaDecoration == "Egyptian Revivalist")>>
<<set $spaDecoration = "standard">>
<<elseif ($arcologies[0].FSEdoRevivalist == "unset") && ($spaDecoration == "Edo Revivalist")>>
@@ -2182,6 +2272,8 @@ You are spending ¤$FSSpending each week to support your societal goals.
<</if>>
<<if ($arcologies[0].FSRomanRevivalist >= 20) && ($spaDecoration != "Roman Revivalist")>>
<br> [[Roman Revivalist redecoration|Future Society][$spaDecoration = "Roman Revivalist", $cash -= 5000]]
+<<elseif ($arcologies[0].FSAztecRevivalist >= 20) && ($spaDecoration != "Aztec Revivalist")>>
+ <br> [[Aztec Revivalist redecoration|Future Society][$spaDecoration = "Aztec Revivalist", $cash -= 5000]]
<<elseif ($arcologies[0].FSEgyptianRevivalist >= 20) && ($spaDecoration != "Egyptian Revivalist")>>
<br> [[Egyptian Revivalist redecoration|Future Society][$spaDecoration = "Egyptian Revivalist", $cash -= 5000]]
<<elseif ($arcologies[0].FSEdoRevivalist >= 20) && ($spaDecoration != "Edo Revivalist")>>
@@ -2227,6 +2319,8 @@ You are spending ¤$FSSpending each week to support your societal goals.
<<set $clinicDecoration = "standard">>
<<elseif ($arcologies[0].FSRomanRevivalist == "unset") && ($clinicDecoration == "Roman Revivalist")>>
<<set $clinicDecoration = "standard">>
+<<elseif ($arcologies[0].FSAztecRevivalist == "unset") && ($clinicDecoration == "Aztec Revivalist")>>
+ <<set $clinicDecoration = "standard">>
<<elseif ($arcologies[0].FSEgyptianRevivalist == "unset") && ($clinicDecoration == "Egyptian Revivalist")>>
<<set $clinicDecoration = "standard">>
<<elseif ($arcologies[0].FSEdoRevivalist == "unset") && ($clinicDecoration == "Edo Revivalist")>>
@@ -2295,6 +2389,8 @@ You are spending ¤$FSSpending each week to support your societal goals.
<</if>>
<<if ($arcologies[0].FSRomanRevivalist >= 20) && ($clinicDecoration != "Roman Revivalist")>>
<br> [[Roman Revivalist redecoration|Future Society][$clinicDecoration = "Roman Revivalist", $cash -= 5000]]
+<<elseif ($arcologies[0].FSAztecRevivalist >= 20) && ($clinicDecoration != "Aztec Revivalist")>>
+ <br> [[Aztec Revivalist redecoration|Future Society][$clinicDecoration = "Aztec Revivalist", $cash -= 5000]]
<<elseif ($arcologies[0].FSEgyptianRevivalist >= 20) && ($clinicDecoration != "Egyptian Revivalist")>>
<br> [[Egyptian Revivalist redecoration|Future Society][$clinicDecoration = "Egyptian Revivalist", $cash -= 5000]]
<<elseif ($arcologies[0].FSEdoRevivalist >= 20) && ($clinicDecoration != "Edo Revivalist")>>
@@ -2340,6 +2436,8 @@ You are spending ¤$FSSpending each week to support your societal goals.
<<set $schoolroomDecoration = "standard">>
<<elseif ($arcologies[0].FSRomanRevivalist == "unset") && ($schoolroomDecoration == "Roman Revivalist")>>
<<set $schoolroomDecoration = "standard">>
+<<elseif ($arcologies[0].FSAztecRevivalist == "unset") && ($schoolroomDecoration == "Aztec Revivalist")>>
+ <<set $schoolroomDecoration = "standard">>
<<elseif ($arcologies[0].FSEgyptianRevivalist == "unset") && ($schoolroomDecoration == "Egyptian Revivalist")>>
<<set $schoolroomDecoration = "standard">>
<<elseif ($arcologies[0].FSEdoRevivalist == "unset") && ($schoolroomDecoration == "Edo Revivalist")>>
@@ -2408,6 +2506,8 @@ You are spending ¤$FSSpending each week to support your societal goals.
<</if>>
<<if ($arcologies[0].FSRomanRevivalist >= 20) && ($schoolroomDecoration != "Roman Revivalist")>>
<br> [[Roman Revivalist redecoration|Future Society][$schoolroomDecoration = "Roman Revivalist", $cash -= 5000]]
+<<elseif ($arcologies[0].FSAztecRevivalist >= 20) && ($schoolroomDecoration != "Aztec Revivalist")>>
+ <br> [[Aztec Revivalist redecoration|Future Society][$schoolroomDecoration = "Aztec Revivalist", $cash -= 5000]]
<<elseif ($arcologies[0].FSEgyptianRevivalist >= 20) && ($schoolroomDecoration != "Egyptian Revivalist")>>
<br> [[Egyptian Revivalist redecoration|Future Society][$schoolroomDecoration = "Egyptian Revivalist", $cash -= 5000]]
<<elseif ($arcologies[0].FSEdoRevivalist >= 20) && ($schoolroomDecoration != "Edo Revivalist")>>
@@ -2453,6 +2553,8 @@ You are spending ¤$FSSpending each week to support your societal goals.
<<set $cellblockDecoration = "standard">>
<<elseif ($arcologies[0].FSRomanRevivalist == "unset") && ($cellblockDecoration == "Roman Revivalist")>>
<<set $cellblockDecoration = "standard">>
+<<elseif ($arcologies[0].FSAztecRevivalist == "unset") && ($cellblockDecoration == "Aztec Revivalist")>>
+ <<set $cellblockDecoration = "standard">>
<<elseif ($arcologies[0].FSEgyptianRevivalist == "unset") && ($cellblockDecoration == "Egyptian Revivalist")>>
<<set $cellblockDecoration = "standard">>
<<elseif ($arcologies[0].FSEdoRevivalist == "unset") && ($cellblockDecoration == "Edo Revivalist")>>
@@ -2521,6 +2623,8 @@ You are spending ¤$FSSpending each week to support your societal goals.
<</if>>
<<if ($arcologies[0].FSRomanRevivalist >= 20) && ($cellblockDecoration != "Roman Revivalist")>>
<br> [[Roman Revivalist redecoration|Future Society][$cellblockDecoration = "Roman Revivalist", $cash -= 5000]]
+<<elseif ($arcologies[0].FSAztecRevivalist >= 20) && ($cellblockDecoration != "Aztec Revivalist")>>
+ <br> [[Aztec Revivalist redecoration|Future Society][$cellblockDecoration = "Aztec Revivalist", $cash -= 5000]]
<<elseif ($arcologies[0].FSEgyptianRevivalist >= 20) && ($cellblockDecoration != "Egyptian Revivalist")>>
<br> [[Egyptian Revivalist redecoration|Future Society][$cellblockDecoration = "Egyptian Revivalist", $cash -= 5000]]
<<elseif ($arcologies[0].FSEdoRevivalist >= 20) && ($cellblockDecoration != "Edo Revivalist")>>
@@ -2566,6 +2670,8 @@ You are spending ¤$FSSpending each week to support your societal goals.
<<set $servantsQuartersDecoration = "standard">>
<<elseif ($arcologies[0].FSRomanRevivalist == "unset") && ($servantsQuartersDecoration == "Roman Revivalist")>>
<<set $servantsQuartersDecoration = "standard">>
+<<elseif ($arcologies[0].FSAztecRevivalist == "unset") && ($servantsQuartersDecoration == "Aztec Revivalist")>>
+ <<set $servantsQuartersDecoration = "standard">>
<<elseif ($arcologies[0].FSEgyptianRevivalist == "unset") && ($servantsQuartersDecoration == "Egyptian Revivalist")>>
<<set $servantsQuartersDecoration = "standard">>
<<elseif ($arcologies[0].FSEdoRevivalist == "unset") && ($servantsQuartersDecoration == "Edo Revivalist")>>
@@ -2634,6 +2740,8 @@ You are spending ¤$FSSpending each week to support your societal goals.
<</if>>
<<if ($arcologies[0].FSRomanRevivalist >= 20) && ($servantsQuartersDecoration != "Roman Revivalist")>>
<br> [[Roman Revivalist redecoration|Future Society][$servantsQuartersDecoration = "Roman Revivalist", $cash -= 5000]]
+<<elseif ($arcologies[0].FSAztecRevivalist >= 20) && ($servantsQuartersDecoration != "Aztec Revivalist")>>
+ <br> [[Aztec Revivalist redecoration|Future Society][$servantsQuartersDecoration = "Aztec Revivalist", $cash -= 5000]]
<<elseif ($arcologies[0].FSEgyptianRevivalist >= 20) && ($servantsQuartersDecoration != "Egyptian Revivalist")>>
<br> [[Egyptian Revivalist redecoration|Future Society][$servantsQuartersDecoration = "Egyptian Revivalist", $cash -= 5000]]
<<elseif ($arcologies[0].FSEdoRevivalist >= 20) && ($servantsQuartersDecoration != "Edo Revivalist")>>
@@ -2679,6 +2787,8 @@ You are spending ¤$FSSpending each week to support your societal goals.
<<set $arcadeDecoration = "standard">>
<<elseif ($arcologies[0].FSRomanRevivalist == "unset") && ($arcadeDecoration == "Roman Revivalist")>>
<<set $arcadeDecoration = "standard">>
+<<elseif ($arcologies[0].FSAztecRevivalist == "unset") && ($arcadeDecoration == "Aztec Revivalist")>>
+ <<set $arcadeDecoration = "standard">>
<<elseif ($arcologies[0].FSEgyptianRevivalist == "unset") && ($arcadeDecoration == "Egyptian Revivalist")>>
<<set $arcadeDecoration = "standard">>
<<elseif ($arcologies[0].FSEdoRevivalist == "unset") && ($arcadeDecoration == "Edo Revivalist")>>
@@ -2747,6 +2857,8 @@ You are spending ¤$FSSpending each week to support your societal goals.
<</if>>
<<if ($arcologies[0].FSRomanRevivalist >= 20) && ($arcadeDecoration != "Roman Revivalist")>>
<br> [[Roman Revivalist redecoration|Future Society][$arcadeDecoration = "Roman Revivalist", $cash -= 5000]]
+<<elseif ($arcologies[0].FSAztecRevivalist >= 20) && ($arcadeDecoration != "Aztec Revivalist")>>
+ <br> [[Aztec Revivalist redecoration|Future Society][$arcadeDecoration = "Aztec Revivalist", $cash -= 5000]]
<<elseif ($arcologies[0].FSEgyptianRevivalist >= 20) && ($arcadeDecoration != "Egyptian Revivalist")>>
<br> [[Egyptian Revivalist redecoration|Future Society][$arcadeDecoration = "Egyptian Revivalist", $cash -= 5000]]
<<elseif ($arcologies[0].FSEdoRevivalist >= 20) && ($arcadeDecoration != "Edo Revivalist")>>
@@ -2792,6 +2904,8 @@ You are spending ¤$FSSpending each week to support your societal goals.
<<set $masterSuiteDecoration = "standard">>
<<elseif ($arcologies[0].FSRomanRevivalist == "unset") && ($masterSuiteDecoration == "Roman Revivalist")>>
<<set $masterSuiteDecoration = "standard">>
+<<elseif ($arcologies[0].FSAztecRevivalist == "unset") && ($masterSuiteDecoration == "Aztec Revivalist")>>
+ <<set $masterSuiteDecoration = "standard">>
<<elseif ($arcologies[0].FSEgyptianRevivalist == "unset") && ($masterSuiteDecoration == "Egyptian Revivalist")>>
<<set $masterSuiteDecoration = "standard">>
<<elseif ($arcologies[0].FSEdoRevivalist == "unset") && ($masterSuiteDecoration == "Edo Revivalist")>>
@@ -2860,6 +2974,8 @@ You are spending ¤$FSSpending each week to support your societal goals.
<</if>>
<<if ($arcologies[0].FSRomanRevivalist >= 20) && ($masterSuiteDecoration != "Roman Revivalist")>>
<br> [[Roman Revivalist redecoration|Future Society][$masterSuiteDecoration = "Roman Revivalist", $cash -= 5000]]
+<<elseif ($arcologies[0].FSAztecRevivalist >= 20) && ($masterSuiteDecoration != "Aztec Revivalist")>>
+ <br> [[Aztec Revivalist redecoration|Future Society][$masterSuiteDecoration = "Aztec Revivalist", $cash -= 5000]]
<<elseif ($arcologies[0].FSEgyptianRevivalist >= 20) && ($masterSuiteDecoration != "Egyptian Revivalist")>>
<br> [[Egyptian Revivalist redecoration|Future Society][$masterSuiteDecoration = "Egyptian Revivalist", $cash -= 5000]]
<<elseif ($arcologies[0].FSEdoRevivalist >= 20) && ($masterSuiteDecoration != "Edo Revivalist")>>
diff --git a/src/uncategorized/lawCompliance.tw b/src/uncategorized/lawCompliance.tw
index 4f3771ad109..05c125dc477 100644
--- a/src/uncategorized/lawCompliance.tw
+++ b/src/uncategorized/lawCompliance.tw
@@ -276,6 +276,10 @@ has passed inspection to be sold in your arcology.
As she passed though the slave markets, she saw many less valuable slaves selected to die in gladiatorial combats. She is relieved she wasn't one of them, but @@.gold;terrified@@ that will be her fate if she makes mistakes.
<<set $activeSlave.trust -= 10>>
<</if>>
+<<if $arcologies[0].FSAztecRevivalistSMR == 1>>
+ As she passed though the golden city, she saw a less valuable slave get sacrificed on one of the many altars spread throughout the city. She was @@.gold;mortified@@ to learn what befalls lesser slaves here.
+ <<set $activeSlave.trust -= 20>>
+<</if>>
<<if $arcologies[0].FSEgyptianRevivalistSMR == 1>>
While she was in the slave pens, she was subjected to Egyptian cultural indoctrination.
<<if $activeSlave.entertainSkill > 10>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 2aa1015af79..5239fd9a87b 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -2280,7 +2280,7 @@ Her scars make her look like she's in the right place.
cheap glasses,
<<case "a bunny outfit">>
girly retro glasses,
- <<case "a slutty qipao" "a kimono" "a slutty maid outfit" "a nice maid outfit">>
+ <<case "a slutty qipao" "a kimono" "a revealing huipil" "a slutty maid outfit" "a nice maid outfit">>
an old fashioned pair of horn rimmed glasses,
<<case "a fallen nuns habit" "a cheerleader outfit" "a slutty nurse outfit">>
a daring pair of horn rimmed glasses,
diff --git a/src/uncategorized/manufacturing.tw b/src/uncategorized/manufacturing.tw
index bf9f28858b1..9abc380e0bc 100644
--- a/src/uncategorized/manufacturing.tw
+++ b/src/uncategorized/manufacturing.tw
@@ -10,7 +10,7 @@ This is a space in the arcology's service areas,
designed for labor intensive manufacturing by menial slaves.
<<default>>ERROR: bad sector type
<</switch>>
-<<SectorSell>>
+<<if $sectors[$AS].type == "Manufacturing">><<SectorSell>><</if>>
<br>
<<if $sectors[$AS].type == "Sweatshops">>
@@ -33,7 +33,7 @@ This is a space in the arcology's service areas,
<<if $mercenaries>>
<<if $barracks != 1>>
-<br>
+ <br>
[[Build a barracks to properly house your mercenaries|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $barracks = 1, $sectors[$AS].type = "Barracks"]]
//Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>> but will reduce mercenary upkeep//
<</if>>
@@ -53,4 +53,4 @@ This is a space in the arcology's service areas,
<br>
[[Return this sector to standard manufacturing|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $sectors[$AS].type = "Manufacturing"]]
//Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
-<</if>>
\ No newline at end of file
+<</if>>
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index ac40b3f37dd..83dc2ced084 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -74,6 +74,8 @@ $masterSuiteNameCaps is furnished
<<switch $masterSuiteDecoration>>
<<case "Roman Revivalist">>
as a Roman emperor's apartment. There is a small shrine to the old gods the <<if $PC.title == 1>>master<<else>>mistress<</if>> favors in a side room, and the flooring is erotic mosaic. Pride of place is given to a set of low couches placed together, capable of accommodating many nude bodies.
+<<case "Aztec Revivalist">>
+ as an Aztec cultural, spiritual and military leader of the city you're allowed great leniency. The <<if $PC.title == 1>>Master<<else>>Mistress<</if>>'s room is created to gratify you as a true god of the people.
<<case "Egyptian Revivalist">>
after the royal room of an ancient Egyptian palace. There is a small shrine to the old gods the <<if $PC.title == 1>>master<<else>>mistress<</if>> favors in a side room, and linen hangings decorate the walls and ceiling. An imposing bed of sandalwood occupies the center of the room.
<<case "Edo Revivalist">>
@@ -142,6 +144,8 @@ $masterSuiteNameCaps is furnished
<<switch $masterSuiteDecoration>>
<<case "Roman Revivalist">>
as a Roman emperor's apartment. There is a small shrine to the old gods the <<if $PC.title == 1>>master<<else>>mistress<</if>> favors in a side room, and the flooring is erotic mosaic.
+<<case "Aztec Revivalist">>
+ as an Aztec cultural, spiritual and military leader of the city you're allowed great leniency. The <<if $PC.title == 1>>Master<<else>>Mistress<</if>>'s room is created to gratify you as a true god of the people.
<<case "Egyptian Revivalist">>
after the royal room of an ancient Egyptian palace. There is a small shrine to the old gods the <<if $PC.title == 1>>master<<else>>mistress<</if>> favors in a side room, and linen hangings decorate the walls and ceiling.
<<case "Edo Revivalist">>
@@ -229,6 +233,8 @@ $masterSuiteNameCaps is furnished
<<switch $masterSuiteDecoration>>
<<case "Roman Revivalist">>
as a Roman patrician's apartment. There is a small shrine to the old gods the <<if $PC.title == 1>>master<<else>>mistress<</if>> favors in a side room, and the flooring is erotic mosaic.
+<<case "Aztec Revivalist">>
+ as an Aztec cultural, spiritual and military leader of the city you're allowed great leniency. The <<if $PC.title == 1>>Master<<else>>Mistress<</if>>'s room is created to gratify you as a true god of the people.
<<case "Egyptian Revivalist">>
after the best room of an ancient Egyptian mansion. There is a small shrine to the old gods the <<if $PC.title == 1>>master<<else>>mistress<</if>> favors in a side room, and linen hangings decorate the walls and ceiling.
<<case "Edo Revivalist">>
diff --git a/src/uncategorized/multiImplant.tw b/src/uncategorized/multiImplant.tw
index 763b213252b..0cc64ae5504 100644
--- a/src/uncategorized/multiImplant.tw
+++ b/src/uncategorized/multiImplant.tw
@@ -5,7 +5,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<for _i = 0; _i < $slaves.length; _i++>>
<<if ($organs.length == 0) && ($limbs.length == 0)>><<break>><</if>>
<<for _o = 0; _o < $organs.length; _o++>>
- <<if ($organs[_o].ID == $slaves[_i].ID) && ($organs[_o].weeksToCompletion == 0)>>
+ <<if ($organs[_o].ID == $slaves[_i].ID) && ($organs[_o].weeksToCompletion <= 0)>>
<<set $activeSlave = $slaves[_i]>>
<<switch $organs[_o].type>>
@@ -36,7 +36,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<<if $activeSlave.pubertyXY == 0>>
<<if $precociousPuberty == 1>>
- <<set $activeSlave.pubertyXY = ($activeSlave.physicalAge+1)>>
+ <<set $activeSlave.pubertyAgeXY = ($activeSlave.physicalAge+1)>>
<<else>>
<<if $activeSlave.physicalAge >= $potencyAge>>
<<set $activeSlave.pubertyXY = 1>>
@@ -64,9 +64,13 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<set $dump = $organs.pluck([_o], [_o])>>
<</if>>
<<case "foreskin">>
- <<if ($activeSlave.foreskin == 0) && ($activeSlave.penis >= 0)>>
+ <<if ($activeSlave.foreskin == 0)>>
<<set $cash -= $surgeryCost>>
- <<set $activeSlave.foreskin to $activeSlave.penis>>
+ <<if $activeSlave.dick > 0>>
+ <<set $activeSlave.foreskin = $activeSlave.penis>>
+ <<else>>
+ <<set $activeSlave.foreskin = $activeSlave.clit>>
+ <</if>>
<<set $activeSlave.health -= 10>>
<<if $organFarmUpgrade == 2>>
<<set $activeSlave.chem += 10>>
@@ -78,7 +82,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<set $dump = $organs.pluck([_o], [_o])>>
<</if>>
<<case "ovaries">>
- <<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina >= 0)>>
+ <<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina >= 0) && ($activeSlave.mpreg == 0) && ($activeSlave.bellyImplant == 0)>>
<<set $cash -= $surgeryCost>>
<<set $activeSlave.ovaries to 1>>
<<set $activeSlave.eggType = "human">>
@@ -89,7 +93,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<<if $activeSlave.pubertyXX == 0>>
<<if $precociousPuberty == 1>>
- <<set $activeSlave.pubertyXX = ($activeSlave.physicalAge+1)>>
+ <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>>
<<else>>
<<if $activeSlave.physicalAge >= $fertilityAge>>
<<set $activeSlave.pubertyXX = 1>>
@@ -166,7 +170,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<<if $activeSlave.pubertyXY == 0>>
<<if $precociousPuberty == 1>>
- <<set $activeSlave.pubertyXY = ($activeSlave.physicalAge+1)>>
+ <<set $activeSlave.pubertyAgeXY = ($activeSlave.physicalAge+1)>>
<<else>>
<<if $activeSlave.physicalAge >= $potencyAge>>
<<set $activeSlave.pubertyXY = 1>>
@@ -192,7 +196,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<<if $activeSlave.pubertyXY == 0>>
<<if $precociousPuberty == 1>>
- <<set $activeSlave.pubertyXY = ($activeSlave.physicalAge+1)>>
+ <<set $activeSlave.pubertyAgeXY = ($activeSlave.physicalAge+1)>>
<<else>>
<<if $activeSlave.physicalAge >= $potencyAge>>
<<set $activeSlave.pubertyXY = 1>>
@@ -205,7 +209,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<set $dump = $organs.pluck([_o], [_o])>>
<</if>>
<<case "pigOvaries">>
- <<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina >= 0)>>
+ <<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina >= 0) && ($activeSlave.mpreg == 0) && ($activeSlave.bellyImplant == 0)>>
<<set $cash -= $surgeryCost>>
<<set $activeSlave.ovaries = 1>>
@@ -217,7 +221,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<<if $activeSlave.pubertyXX == 0>>
<<if $precociousPuberty == 1>>
- <<set $activeSlave.pubertyXX = ($activeSlave.physicalAge+1)>>
+ <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>>
<<else>>
<<if $activeSlave.physicalAge >= $fertilityAge>>
<<set $activeSlave.pubertyXX = 1>>
@@ -230,7 +234,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<set $dump = $organs.pluck([_o], [_o])>>
<</if>>
<<case "dogOvaries">>
- <<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina >= 0)>>
+ <<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina >= 0) && ($activeSlave.mpreg == 0) && ($activeSlave.bellyImplant == 0)>>
<<set $cash -= $surgeryCost>>
<<set $activeSlave.ovaries = 1>>
@@ -242,7 +246,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<<if $activeSlave.pubertyXX == 0>>
<<if $precociousPuberty == 1>>
- <<set $activeSlave.pubertyXX = ($activeSlave.physicalAge+1)>>
+ <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>>
<<else>>
<<if $activeSlave.physicalAge >= $fertilityAge>>
<<set $activeSlave.pubertyXX = 1>>
@@ -255,7 +259,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<set $dump = $organs.pluck([_o], [_o])>>
<</if>>
<<case "mpreg">>
- <<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina < 0) && ($activeSlave.mpreg == 0)>>
+ <<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina < 0) && ($activeSlave.mpreg == 0) && ($activeSlave.bellyImplant == 0)>>
<<set $cash -= $surgeryCost>>
<<set $activeSlave.mpreg = 1>>
@@ -267,7 +271,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<<if $activeSlave.pubertyXX == 0>>
<<if $precociousPuberty == 1>>
- <<set $activeSlave.pubertyXX = ($activeSlave.physicalAge+1)>>
+ <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>>
<<else>>
<<if $activeSlave.physicalAge >= $fertilityAge>>
<<set $activeSlave.pubertyXX = 1>>
@@ -280,7 +284,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<set $dump = $organs.pluck([_o], [_o])>>
<</if>>
<<case "mpregPig">>
- <<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina < 0) && ($activeSlave.mpreg == 0)>>
+ <<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina < 0) && ($activeSlave.mpreg == 0) && ($activeSlave.bellyImplant == 0)>>
<<set $cash -= $surgeryCost>>
<<set $activeSlave.mpreg = 1>>
@@ -292,7 +296,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<<if $activeSlave.pubertyXX == 0>>
<<if $precociousPuberty == 1>>
- <<set $activeSlave.pubertyXX = ($activeSlave.physicalAge+1)>>
+ <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>>
<<else>>
<<if $activeSlave.physicalAge >= $fertilityAge>>
<<set $activeSlave.pubertyXX = 1>>
@@ -305,7 +309,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<set $dump = $organs.pluck([_o], [_o])>>
<</if>>
<<case "mpregDog">>
- <<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina < 0) && ($activeSlave.mpreg == 0)>>
+ <<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina < 0) && ($activeSlave.mpreg == 0) && ($activeSlave.bellyImplant == 0)>>
<<set $cash -= $surgeryCost>>
<<set $activeSlave.mpreg = 1>>
@@ -317,7 +321,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</if>>
<<if $activeSlave.pubertyXX == 0>>
<<if $precociousPuberty == 1>>
- <<set $activeSlave.pubertyXX = ($activeSlave.physicalAge+1)>>
+ <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>>
<<else>>
<<if $activeSlave.physicalAge >= $fertilityAge>>
<<set $activeSlave.pubertyXX = 1>>
@@ -339,7 +343,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<</for>>
<<if $slaves[_i].amp != 0>>
<<for _l = 0; _l < $limbs.length; _l++>>
- <<if ($limbs[_l].ID == $slaves[_i].ID) && ($organs[_o].weeksToCompletion == 0)>>
+ <<if ($limbs[_l].ID == $slaves[_i].ID) && ($limbs[_l].weeksToCompletion <= 0)>>
<<set $activeSlave = $slaves[_i]>>
<<switch $limbs[_l].type>>
@@ -381,14 +385,14 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
/* Clean-up */
<<set $organsCompleted = 0>>
<<for _i = 0; _i < $organs.length; _i++>>
- <<if $organs[_i].weeksToCompletion == 0>>
+ <<if $organs[_i].weeksToCompletion <= 0>>
<<set $organsCompleted++>>
<</if>>
<</for>>
<<set $limbsCompleted = 0>>
<<for _i = 0; _i < $limbs.length; _i++>>
- <<if $limbs[_i].weeksToCompletion == 0>>
+ <<if $limbs[_i].weeksToCompletion <= 0>>
<<set $limbsCompleted++>>
<</if>>
<</for>>
diff --git a/src/uncategorized/neighborDescription.tw b/src/uncategorized/neighborDescription.tw
index e8397bcdeda..7c4c8b6521c 100644
--- a/src/uncategorized/neighborDescription.tw
+++ b/src/uncategorized/neighborDescription.tw
@@ -380,6 +380,24 @@ its neighbors.
<</if>>
<<set $seed.push($desc)>>
<</if>>
+<<if $arcologies[$i].FSAztecRevivalist != "unset">>
+ <<if $arcologies[$i].FSAztecRevivalist > 80>>
+ <<set $desc = "committed to ">>
+ <<elseif $arcologies[$i].FSAztecRevivalist > 20>>
+ <<set $desc = "pursuing ">>
+ <<else>>
+ <<set $desc = "just establishing ">>
+ <</if>>
+ <<set $desc = $desc + "Aztec Revivalism, and is ">>
+ <<if $arcologies[$i].FSAztecRevivalist > 95>>
+ <<set $desc = $desc + "world famous for it's incredible architecture and highly qualified leading caste and military.">>
+ <<elseif $arcologies[$i].FSAztecRevivalist > 40>>
+ <<set $desc = $desc + "constructing great pyramids and statues, so still hampered by construction.">>
+ <<else>>
+ <<set $desc = $desc + "still strugling to embrace the ammount of blood and praying needed.">>
+ <</if>>
+ <<set $seed.push($desc)>>
+<</if>>
<<if $arcologies[$i].FSEgyptianRevivalist != "unset">>
<<if $arcologies[$i].FSEgyptianRevivalist > 80>>
<<set $desc = "committed to ">>
diff --git a/src/uncategorized/neighborInteract.tw b/src/uncategorized/neighborInteract.tw
index e8ff4237633..de018033bef 100644
--- a/src/uncategorized/neighborInteract.tw
+++ b/src/uncategorized/neighborInteract.tw
@@ -122,6 +122,9 @@
<<if $arcologies[0].FSRomanRevivalist > 60>>
<<set $desc.push("Roman Revivalism")>>
<</if>>
+<<if $arcologies[0].FSAztecRevivalist > 60>>
+ <<set $desc.push("Aztec Revivalism")>>
+<</if>>
<<if $arcologies[0].FSEgyptianRevivalist > 60>>
<<set $desc.push("Egyptian Revivalism")>>
<</if>>
@@ -268,6 +271,9 @@ A 1% interest in $activeArcology.name is worth ¤$seed and will require a transa
<<if $activeArcology.FSRomanRevivalist != "unset">>
<br><<link "Force Abandonment of Roman Revivalism">><<set $activeArcology.FSRomanRevivalist = "unset">><<goto "Neighbor Interact">><</link>>
<</if>>
+<<if $activeArcology.FSAztecRevivalist !== "unset">>
+ <br><<link "Force Abandonment of Aztec Revivalism">><<set $activeArcology.FSAztecRevivalist = "unset">><<goto "Neighbor Interact">><</link>>
+<</if>>
<<if $activeArcology.FSEgyptianRevivalist != "unset">>
<br><<link "Force Abandonment of Egyptian Revivalism">><<set $activeArcology.FSEgyptianRevivalist = "unset">><<goto "Neighbor Interact">><</link>>
<</if>>
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index ca6510210ed..8856cb6af05 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -301,6 +301,13 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<else>>
<<set $arcologies[$i].FSRomanRevivalist -= 10>>
<</if>>
+ <<elseif $arcologies[$i].FSAztecRevivalist != "unset">>
+ <<if $arcologies[$i].FSAztecRevivalist < random(10,150)>>
+ <<set $desc.push("Aztec Revivalism")>>
+ <<set $arcologies[$i].FSAztecRevivalist = "unset">>
+ <<else>>
+ <<set $arcologies[$i].FSAztecRevivalist -= 10>>
+ <</if>>
<<elseif $arcologies[$i].FSEgyptianRevivalist != "unset">>
<<if $arcologies[$i].FSEgyptianRevivalist < random(10,150)>>
<<set $desc.push("Egyptian Revivalism")>>
@@ -1308,6 +1315,9 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if $arcologies[$j].FSRomanRevivalist > $arcologies[$i].FSRomanRevivalist + _FSCrossThresh>>
<<if $showNeighborDetails != 0>>Roman Revivalism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
<<set $arcologies[$i].FSRomanRevivalist += 1>>
+ <<elseif $arcologies[$j].FSAztecRevivalist > $arcologies[$i].FSRomanRevivalist + _FSCrossThresh>>
+ <<if $showNeighborDetails != 0>>Development of Roman Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Aztec Revivalist society.<</if>>
+ <<set $arcologies[$i].FSRomanRevivalist -= 1>>
<<elseif $arcologies[$j].FSChineseRevivalist > $arcologies[$i].FSRomanRevivalist + _FSCrossThresh>>
<<if $showNeighborDetails != 0>>Development of Roman Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Chinese Revivalist society.<</if>>
<<set $arcologies[$i].FSRomanRevivalist -= 1>>
@@ -1345,6 +1355,56 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<set $corpCash += _corpBonus>>
<</if>>
<</if>>
+<<elseif $arcologies[$i].FSAztecRevivalist != "unset">>
+ <<set _societiesAdopted += 1>>
+ <<if $arcologies[$i].direction != 0>>
+ <<set $arcologies[$i].FSAztecRevivalist += $efficiency>>
+ <</if>>
+ <<for $j = 0; $j < $arcologies.length; $j++>>
+ <<if $arcologies[$i].direction != $arcologies[$j].direction>>
+ <<if $arcologies[$j].FSAztecRevivalist > $arcologies[$i].FSAztecRevivalist + _FSCrossThresh>>
+ <<if $showNeighborDetails != 0>>Aztec Revivalism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
+ <<set $arcologies[$i].FSAztecRevivalist += 1>>
+ <<elseif $arcologies[$j].FSEgyptianRevivalist > $arcologies[$i].FSAztecRevivalist + _FSCrossThresh>>
+ <<if $showNeighborDetails != 0>>Development of Aztec Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Egyptian Revivalist society.<</if>>
+ <<set $arcologies[$i].FSAztecRevivalist -= 1>>
+ <<elseif $arcologies[$j].FSRomanRevivalist > $arcologies[$i].FSAztecRevivalist + _FSCrossThresh>>
+ <<if $showNeighborDetails != 0>>Development of Aztec Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Roman Revivalist society.<</if>>
+ <<set $arcologies[$i].FSAztecRevivalist -= 1>>
+ <<elseif $arcologies[$j].FSChineseRevivalist > $arcologies[$i].FSAztecRevivalist + _FSCrossThresh>>
+ <<if $showNeighborDetails != 0>>Development of Aztec Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Chinese Revivalist society.<</if>>
+ <<set $arcologies[$i].FSAztecRevivalist -= 1>>
+ <<elseif $arcologies[$j].FSEdoRevivalist > $arcologies[$i].FSAztecRevivalist + _FSCrossThresh>>
+ <<if $showNeighborDetails != 0>>Development of Aztec Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Edo Revivalist society.<</if>>
+ <<set $arcologies[$i].FSAztecRevivalist -= 1>>
+ <<elseif $arcologies[$j].FSArabianRevivalist > $arcologies[$i].FSAztecRevivalist + _FSCrossThresh>>
+ <<if $showNeighborDetails != 0>>Development of Aztec Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Arabian Revivalist society.<</if>>
+ <<set $arcologies[$i].FSAztecRevivalist -= 1>>
+ <</if>>
+ <</if>>
+ <</for>>
+ <<if $arcologies[$i].direction != 0>>
+ <<if $arcologies[$i].FSAztecRevivalist >= $FSLockinLevel>>
+ <<set $arcologies[$i].influenceBonus += $arcologies[$i].FSAztecRevivalist - $FSLockinLevel>>
+ <<set $arcologies[$i].FSAztecRevivalist = $FSLockinLevel>>
+ <<set $toSearch = $arcologies[$i].name>>
+ <<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 = $ArcologyNamesAztecRevivalist.random()>>
+ ''$arcologies[$i].name'' to mark the occasion.
+ <</if>>
+ <<elseif $arcologies[$i].FSAztecRevivalist < 0>>
+ $arcologies[$i].name has given up on Aztec Revivalism.
+ <<set $arcologies[$i].FSAztecRevivalist = "unset">>
+ <</if>>
+ <</if>>
+ <<if $corpIncorporated == 1>>
+ <<if $trainingUpgradeAccent == "accents">>
+ It's a good market for your corporation's lovely mix of slave accents, improving sales and helping social progress.
+ <<set $arcologies[$i].FSAztecRevivalist += 1>>
+ <<set $corpCash += _corpBonus>>
+ <</if>>
+ <</if>>
<<elseif $arcologies[$i].FSEgyptianRevivalist != "unset">>
<<set _societiesAdopted += 1>>
<<if $arcologies[$i].direction != 0>>
@@ -1358,7 +1418,10 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<elseif $arcologies[$j].FSRomanRevivalist > $arcologies[$i].FSEgyptianRevivalist + _FSCrossThresh>>
<<if $showNeighborDetails != 0>>Development of Egyptian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Roman Revivalist society.<</if>>
<<set $arcologies[$i].FSEgyptianRevivalist -= 1>>
- <<elseif $arcologies[$j].FSEgyptianRevivalist > $arcologies[$i].FSChineseRevivalist + _FSCrossThresh>>
+ <<elseif $arcologies[$j].FSAztecRevivalist > $arcologies[$i].FSEgyptianRevivalist + _FSCrossThresh>>
+ <<if $showNeighborDetails != 0>>Development of Egyptian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Aztec Revivalist society.<</if>>
+ <<set $arcologies[$i].FSEgyptianRevivalist -= 1>>
+ <<elseif $arcologies[$j].FSEgyptianRevivalist > $arcologies[$i].FSEgyptianRevivalist + _FSCrossThresh>>
<<if $showNeighborDetails != 0>>Development of Egyptian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Chinese Revivalist society.<</if>>
<<set $arcologies[$i].FSEgyptianRevivalist -= 1>>
<<elseif $arcologies[$j].FSEdoRevivalist > $arcologies[$i].FSEgyptianRevivalist + _FSCrossThresh>>
@@ -1405,6 +1468,9 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<elseif $arcologies[$j].FSRomanRevivalist > $arcologies[$i].FSEdoRevivalist + _FSCrossThresh>>
<<if $showNeighborDetails != 0>>Development of Edo Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Roman Revivalist society.<</if>>
<<set $arcologies[$i].FSEdoRevivalist -= 1>>
+ <<elseif $arcologies[$j].FSAztecRevivalist > $arcologies[$i].FSEdoRevivalist + _FSCrossThresh>>
+ <<if $showNeighborDetails != 0>>Development of Edo Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Aztec Revivalist society.<</if>>
+ <<set $arcologies[$i].FSEdoRevivalist -= 1>>
<<elseif $arcologies[$j].FSEgyptianRevivalist > $arcologies[$i].FSEdoRevivalist + _FSCrossThresh>>
<<if $showNeighborDetails != 0>>Development of Edo Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Egyptian Revivalist society.<</if>>
<<set $arcologies[$i].FSEdoRevivalist -= 1>>
@@ -1452,6 +1518,9 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<elseif $arcologies[$j].FSRomanRevivalist > $arcologies[$i].FSArabianRevivalist + _FSCrossThresh>>
<<if $showNeighborDetails != 0>>Development of Arabian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Roman Revivalist society.<</if>>
<<set $arcologies[$i].FSArabianRevivalist -= 1>>
+ <<elseif $arcologies[$j].FSAztecRevivalist > $arcologies[$i].FSArabianRevivalist + _FSCrossThresh>>
+ <<if $showNeighborDetails != 0>>Development of Arabian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Aztec Revivalist society.<</if>>
+ <<set $arcologies[$i].FSArabianRevivalist -= 1>>
<<elseif $arcologies[$j].FSEgyptianRevivalist > $arcologies[$i].FSArabianRevivalist + _FSCrossThresh>>
<<if $showNeighborDetails != 0>>Development of Arabian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Egyptian Revivalist society.<</if>>
<<set $arcologies[$i].FSArabianRevivalist -= 1>>
@@ -1503,6 +1572,9 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<elseif $arcologies[$j].FSRomanRevivalist > $arcologies[$i].FSChineseRevivalist + _FSCrossThresh>>
<<if $showNeighborDetails != 0>>Development of Chinese Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Roman Revivalist society.<</if>>
<<set $arcologies[$i].FSChineseRevivalist -= 1>>
+ <<elseif $arcologies[$j].FSAztecRevivalist > $arcologies[$i].FSChineseRevivalist + _FSCrossThresh>>
+ <<if $showNeighborDetails != 0>>Development of Chinese Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Aztec Revivalist society.<</if>>
+ <<set $arcologies[$i].FSChineseRevivalist -= 1>>
<<elseif $arcologies[$j].FSEgyptianRevivalist > $arcologies[$i].FSChineseRevivalist + _FSCrossThresh>>
<<if $showNeighborDetails != 0>>Development of Chinese Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Egyptian Revivalist society.<</if>>
<<set $arcologies[$i].FSChineseRevivalist -= 1>>
@@ -1750,6 +1822,9 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<set $arcologies[$i].FSRomanRevivalist += Math.trunc(($arcologies[$j].FSRomanRevivalist-60)/4)+$appliedInfluenceBonus>>
<<if $arcologies[$i].FSRomanRevivalist > $FSLockinLevel>><<set _alignment += 1>><</if>>
<<set $desc.push("helping to advance its Roman Revivalism")>>
+ <<elseif $arcologies[$i].FSAztecRevivalist != "unset">>
+ <<set $arcologies[$i].FSAztecRevivalist -= Math.trunc(($arcologies[$j].FSRomanRevivalist-60)/4)+$appliedInfluenceBonus>>
+ <<set $desc.push("attacking its incompatible Revivalism")>>
<<elseif $arcologies[$i].FSEgyptianRevivalist != "unset">>
<<set $arcologies[$i].FSEgyptianRevivalist -= Math.trunc(($arcologies[$j].FSRomanRevivalist-60)/4)+$appliedInfluenceBonus>>
<<set $desc.push("attacking its incompatible Revivalism")>>
@@ -1763,6 +1838,27 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<set $arcologies[$i].FSChineseRevivalist -= Math.trunc(($arcologies[$j].FSRomanRevivalist-60)/4)+$appliedInfluenceBonus>>
<<set $desc.push("attacking its incompatible Revivalism")>>
<</if>>
+<<elseif $arcologies[$j].FSAztecRevivalist > 60>>
+ <<if $arcologies[$i].FSAztecRevivalist != "unset">>
+ <<set $arcologies[$i].FSAztecRevivalist += Math.trunc(($arcologies[$j].FSAztecRevivalist-60)/4)+$appliedInfluenceBonus>>
+ <<if $arcologies[$i].FSAztecRevivalist > $FSLockinLevel>><<set _alignment += 1>><</if>>
+ <<set $desc.push("helping to advance its Aztec Revivalism")>>
+ <<elseif $arcologies[$i].FSRomanRevivalist != "unset">>
+ <<set $arcologies[$i].FSRomanRevivalist -= Math.trunc(($arcologies[$j].FSAztecRevivalist-60)/4)+$appliedInfluenceBonus>>
+ <<set $desc.push("attacking its incompatible Revivalism")>>
+ <<elseif $arcologies[$i].FSEgyptianRevivalist != "unset">>
+ <<set $arcologies[$i].FSEgyptianRevivalist -= Math.trunc(($arcologies[$j].FSAztecRevivalist-60)/4)+$appliedInfluenceBonus>>
+ <<set $desc.push("attacking its incompatible Revivalism")>>
+ <<elseif $arcologies[$i].FSEdoRevivalist != "unset">>
+ <<set $arcologies[$i].FSEdoRevivalist -= Math.trunc(($arcologies[$j].FSAztecRevivalist-60)/4)+$appliedInfluenceBonus>>
+ <<set $desc.push("attacking its incompatible Revivalism")>>
+ <<elseif $arcologies[$i].FSArabianRevivalist != "unset">>
+ <<set $arcologies[$i].FSArabianRevivalist -= Math.trunc(($arcologies[$j].FSAztecRevivalist-60)/4)+$appliedInfluenceBonus>>
+ <<set $desc.push("attacking its incompatible Revivalism")>>
+ <<elseif $arcologies[$i].FSChineseRevivalist != "unset">>
+ <<set $arcologies[$i].FSChineseRevivalist -= Math.trunc(($arcologies[$j].FSAztecRevivalist-60)/4)+$appliedInfluenceBonus>>
+ <<set $desc.push("attacking its incompatible Revivalism")>>
+ <</if>>
<<elseif $arcologies[$j].FSEgyptianRevivalist > 60>>
<<if $arcologies[$i].FSEgyptianRevivalist != "unset">>
<<set $arcologies[$i].FSEgyptianRevivalist += Math.trunc(($arcologies[$j].FSEgyptianRevivalist-60)/4)+$appliedInfluenceBonus>>
@@ -1771,6 +1867,9 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<elseif $arcologies[$i].FSRomanRevivalist != "unset">>
<<set $arcologies[$i].FSRomanRevivalist -= Math.trunc(($arcologies[$j].FSEgyptianRevivalist-60)/4)+$appliedInfluenceBonus>>
<<set $desc.push("attacking its incompatible Revivalism")>>
+ <<elseif $arcologies[$i].FSAztecRevivalist != "unset">>
+ <<set $arcologies[$i].FSAztecRevivalist -= Math.trunc(($arcologies[$j].FSEgyptianRevivalist-60)/4)+$appliedInfluenceBonus>>
+ <<set $desc.push("attacking its incompatible Revivalism")>>
<<elseif $arcologies[$i].FSEdoRevivalist != "unset">>
<<set $arcologies[$i].FSEdoRevivalist -= Math.trunc(($arcologies[$j].FSEgyptianRevivalist-60)/4)+$appliedInfluenceBonus>>
<<set $desc.push("attacking its incompatible Revivalism")>>
@@ -1792,6 +1891,9 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<elseif $arcologies[$i].FSRomanRevivalist != "unset">>
<<set $arcologies[$i].FSRomanRevivalist -= Math.trunc(($arcologies[$j].FSEdoRevivalist-60)/4)+$appliedInfluenceBonus>>
<<set $desc.push("attacking its incompatible Revivalism")>>
+ <<elseif $arcologies[$i].FSAztecRevivalist != "unset">>
+ <<set $arcologies[$i].FSAztecRevivalist -= Math.trunc(($arcologies[$j].FSEdoRevivalist-60)/4)+$appliedInfluenceBonus>>
+ <<set $desc.push("attacking its incompatible Revivalism")>>
<<elseif $arcologies[$i].FSArabianRevivalist != "unset">>
<<set $arcologies[$i].FSArabianRevivalist -= Math.trunc(($arcologies[$j].FSEdoRevivalist-60)/4)+$appliedInfluenceBonus>>
<<set $desc.push("attacking its incompatible Revivalism")>>
@@ -1813,6 +1915,9 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<elseif $arcologies[$i].FSRomanRevivalist != "unset">>
<<set $arcologies[$i].FSRomanRevivalist -= Math.trunc(($arcologies[$j].FSArabianRevivalist-60)/4)+$appliedInfluenceBonus>>
<<set $desc.push("attacking its incompatible Revivalism")>>
+ <<elseif $arcologies[$i].FSAztecRevivalist != "unset">>
+ <<set $arcologies[$i].FSAztecRevivalist -= Math.trunc(($arcologies[$j].FSArabianRevivalist-60)/4)+$appliedInfluenceBonus>>
+ <<set $desc.push("attacking its incompatible Revivalism")>>
<<elseif $arcologies[$i].FSChineseRevivalist != "unset">>
<<set $arcologies[$i].FSChineseRevivalist -= Math.trunc(($arcologies[$j].FSArabianRevivalist-60)/4)+$appliedInfluenceBonus>>
<<set $desc.push("attacking its incompatible Revivalism")>>
@@ -1834,6 +1939,9 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<elseif $arcologies[$i].FSRomanRevivalist != "unset">>
<<set $arcologies[$i].FSRomanRevivalist -= Math.trunc(($arcologies[$j].FSChineseRevivalist-60)/4)+$appliedInfluenceBonus>>
<<set $desc.push("attacking its incompatible Revivalism")>>
+ <<elseif $arcologies[$i].FSAztecRevivalist != "unset">>
+ <<set $arcologies[$i].FSAztecRevivalist -= Math.trunc(($arcologies[$j].FSChineseRevivalist-60)/4)+$appliedInfluenceBonus>>
+ <<set $desc.push("attacking its incompatible Revivalism")>>
<</if>>
<</if>>
@@ -1931,6 +2039,8 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<</if>>
<<if $arcologies[$i].FSRomanRevivalist > 60>>
<<set _influential = 1>>
+<<elseif $arcologies[$i].FSAztecRevivalist > 60>>
+ <<set _influential = 1>>
<<elseif $arcologies[$i].FSEgyptianRevivalist > 60>>
<<set _influential = 1>>
<<elseif $arcologies[$i].FSEdoRevivalist > 60>>
@@ -2109,6 +2219,24 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if $arcologies[$j].FSRomanRevivalist < $FSLockinLevel>>
<<set _eligibleTargets.push($arcologies[$j].direction)>>
<</if>>
+ <<elseif $arcologies[$j].FSAztecRevivalist != "unset">>
+ <<set _eligibleTargets.push($arcologies[$j].direction)>>
+ <<elseif $arcologies[$j].FSEgyptianRevivalist != "unset">>
+ <<set _eligibleTargets.push($arcologies[$j].direction)>>
+ <<elseif $arcologies[$j].FSEdoRevivalist != "unset">>
+ <<set _eligibleTargets.push($arcologies[$j].direction)>>
+ <<elseif $arcologies[$j].FSArabianRevivalist != "unset">>
+ <<set _eligibleTargets.push($arcologies[$j].direction)>>
+ <<elseif $arcologies[$j].FSChineseRevivalist != "unset">>
+ <<set _eligibleTargets.push($arcologies[$j].direction)>>
+ <</if>>
+<<elseif $arcologies[$i].FSAztecRevivalist != "unset">>
+ <<if $arcologies[$j].FSAztecRevivalist != "unset">>
+ <<if $arcologies[$j].FSAztecRevivalist < $FSLockinLevel>>
+ <<set _eligibleTargets.push($arcologies[$j].direction)>>
+ <</if>>
+ <<elseif $arcologies[$j].FSRomanRevivalist != "unset">>
+ <<set _eligibleTargets.push($arcologies[$j].direction)>>
<<elseif $arcologies[$j].FSEgyptianRevivalist != "unset">>
<<set _eligibleTargets.push($arcologies[$j].direction)>>
<<elseif $arcologies[$j].FSEdoRevivalist != "unset">>
@@ -2125,6 +2253,8 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<</if>>
<<elseif $arcologies[$j].FSRomanRevivalist != "unset">>
<<set _eligibleTargets.push($arcologies[$j].direction)>>
+ <<elseif $arcologies[$j].FSAztecRevivalist != "unset">>
+ <<set _eligibleTargets.push($arcologies[$j].direction)>>
<<elseif $arcologies[$j].FSEdoRevivalist != "unset">>
<<set _eligibleTargets.push($arcologies[$j].direction)>>
<<elseif $arcologies[$j].FSArabianRevivalist != "unset">>
@@ -2141,6 +2271,8 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<set _eligibleTargets.push($arcologies[$j].direction)>>
<<elseif $arcologies[$j].FSRomanRevivalist != "unset">>
<<set _eligibleTargets.push($arcologies[$j].direction)>>
+ <<elseif $arcologies[$j].FSAztecRevivalist != "unset">>
+ <<set _eligibleTargets.push($arcologies[$j].direction)>>
<<elseif $arcologies[$j].FSArabianRevivalist != "unset">>
<<set _eligibleTargets.push($arcologies[$j].direction)>>
<<elseif $arcologies[$j].FSChineseRevivalist != "unset">>
@@ -2157,6 +2289,8 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<set _eligibleTargets.push($arcologies[$j].direction)>>
<<elseif $arcologies[$j].FSRomanRevivalist != "unset">>
<<set _eligibleTargets.push($arcologies[$j].direction)>>
+ <<elseif $arcologies[$j].FSAztecRevivalist != "unset">>
+ <<set _eligibleTargets.push($arcologies[$j].direction)>>
<<elseif $arcologies[$j].FSChineseRevivalist != "unset">>
<<set _eligibleTargets.push($arcologies[$j].direction)>>
<</if>>
@@ -2173,6 +2307,8 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<set _eligibleTargets.push($arcologies[$j].direction)>>
<<elseif $arcologies[$j].FSRomanRevivalist != "unset">>
<<set _eligibleTargets.push($arcologies[$j].direction)>>
+ <<elseif $arcologies[$j].FSAztecRevivalist != "unset">>
+ <<set _eligibleTargets.push($arcologies[$j].direction)>>
<</if>>
<</if>>
diff --git a/src/uncategorized/neighborsFSAdoption.tw b/src/uncategorized/neighborsFSAdoption.tw
index f616c755801..8dd30bdc541 100644
--- a/src/uncategorized/neighborsFSAdoption.tw
+++ b/src/uncategorized/neighborsFSAdoption.tw
@@ -97,8 +97,8 @@ societal development.
<<set $arcologies[$i].FSChattelReligionist = 5>><<set $adopted = 1>>
<<case "Roman Revivalism">>
<<if $arcologies[$i].FSRomanRevivalist != "unset">><<set $arcologies[$i].FSRomanRevivalist = "unset">><</if>>
- $desc fascinated by ancient Egyptian history, leading the arcology to @@.yellow;adopt Egyptian Revivalism.@@
- <<set $arcologies[$i].FSEgyptianRevivalist = 5>><<set $adopted = 1>>
+ $desc fascinated by ancient Aztec history, leading the arcology to @@.yellow;adopt Aztec Revivalism.@@
+ <<set $arcologies[$i].FSAztecRevivalist = 5>><<set $adopted = 1>>
<<case "Egyptian Revivalism">>
<<if $arcologies[$i].FSEgyptianRevivalist != "unset">><<set $arcologies[$i].FSEgyptianRevivalist = "unset">><</if>>
$desc fascinated by Arabian romanticism, leading the arcology to @@.yellow;adopt Arabian Revivalism.@@
@@ -109,12 +109,16 @@ societal development.
<<set $arcologies[$i].FSChineseRevivalist = 5>><<set $adopted = 1>>
<<case "Arabian Revivalism">>
<<if $arcologies[$i].FSArabianRevivalist != "unset">><<set $arcologies[$i].FSArabianRevivalist = "unset">><</if>>
- $desc fascinated by classical Roman history, leading the arcology to @@.yellow;adopt Roman Revivalism.@@
- <<set $arcologies[$i].FSRomanRevivalist = 5>><<set $adopted = 1>>
+ $desc fascinated by ancient Egyptian history, leading the arcology to @@.yellow;adopt Egyptian Revivalism.@@
+ <<set $arcologies[$i].FSEgyptianRevivalist = 5>><<set $adopted = 1>>
<<case "Chinese Revivalism">>
<<if $arcologies[$i].FSChineseRevivalist != "unset">><<set $arcologies[$i].FSChineseRevivalist = "unset">><</if>>
$desc fascinated by Japanese history, leading the arcology to @@.yellow;adopt Edo Revivalism.@@
<<set $arcologies[$i].FSEdoRevivalist = 5>><<set $adopted = 1>>
+ <<case "Aztec Revivalism">>
+ <<if $arcologies[$i].FSAztecRevivalist != "unset">><<set $arcologies[$i].FSAztecRevivalist = "unset">><</if>>
+ $desc fascinated by classical Roman history, leading the arcology to @@.yellow;adopt Roman Revivalism.@@
+ <<set $arcologies[$i].FSRomanRevivalist = 5>><<set $adopted = 1>>
<</switch>>
<<else>>
@@ -218,28 +222,32 @@ societal development.
<</if>>
<</if>>
<<if $arcologies[0].FSRomanRevivalist > random(5,60)>>
- <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
+ <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSAztecRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
+ $desc fascinated by ancient Aztec history, leading the arcology to @@.yellow;adopt Aztec Revivalism.@@
+ <<set $arcologies[$i].FSAztecRevivalist = 5>><<set $adopted = 1>>
+ <</if>>
+ <<elseif $arcologies[0].FSAztecRevivalist > random(5,60)>>
+ <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSAztecRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
+ $desc fascinated by classical Roman history, leading the arcology to @@.yellow;adopt Roman Revivalism.@@
+ <<set $arcologies[$i].FSRomanRevivalist = 5>><<set $adopted = 1>>
+ <</if>>
+ <<elseif $arcologies[0].FSEgyptianRevivalist > random(5,60)>>
+ <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSAztecRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
$desc fascinated by Arabian romanticism, leading the arcology to @@.yellow;adopt Arabian Revivalism.@@
<<set $arcologies[$i].FSArabianRevivalist = 5>><<set $adopted = 1>>
- <<break>>
- <</if>>
- <<elseif $arcologies[0].FSEgyptianRevivalist > random(5,60)>>
- <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
- $desc fascinated by classical Roman history, leading the arcology to @@.yellow;adopt Roman Revivalism.@@
- <<set $arcologies[$i].FSRomanRevivalist = 5>><<set $adopted = 1>>
<</if>>
<<elseif $arcologies[0].FSEdoRevivalist > random(5,60)>>
- <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
+ <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSAztecRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
$desc fascinated by the long tale of Chinese history, leading the arcology to @@.yellow;adopt Chinese Revivalism.@@
<<set $arcologies[$i].FSChineseRevivalist = 5>><<set $adopted = 1>>
<</if>>
<<elseif $arcologies[0].FSArabianRevivalist > random(5,60)>>
- <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
+ <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSAztecRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
$desc fascinated by ancient Egyptian history, leading the arcology to @@.yellow;adopt Egyptian Revivalism.@@
<<set $arcologies[$i].FSEgyptianRevivalist = 5>><<set $adopted = 1>>
<</if>>
<<elseif $arcologies[0].FSChineseRevivalist > random(5,60)>>
- <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
+ <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSAztecRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
$desc fascinated by Japanese history, leading the arcology to @@.yellow;adopt Edo Revivalism.@@
<<set $arcologies[$i].FSEdoRevivalist = 5>><<set $adopted = 1>>
<</if>>
@@ -362,6 +370,7 @@ societal development.
<<if $familyTesting == 1>>
<<if $adopted == 0>>
<<if ($arcologies[$i].FSRomanRevivalist == "unset")>>
+<<if ($arcologies[$i].FSAztecRevivalist == "unset")>>
<<if ($arcologies[$i].FSEgyptianRevivalist == "unset")>>
<<if ($arcologies[$i].FSEdoRevivalist == "unset")>>
<<if ($arcologies[$i].FSArabianRevivalist == "unset")>>
@@ -406,6 +415,9 @@ societal development.
<<elseif $leaders[$j].nationality == "Japanese">>
Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Edo Revivalism@@, since she's Japanese herself and can claim high honor in such a society.
<<set $arcologies[$i].FSEdoRevivalist = 5>><<set $adopted = 1>>
+ <<elseif $leaders[$j].nationality == "Mexican">>
+ Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Aztec Revivalism@@, since she's Mexican herself and can claim high honor in such a society.
+ <<set $arcologies[$i].FSAztecRevivalist = 5>><<set $adopted = 1>>
<<elseif $leaders[$j].behavioralQuirk == "confident">>
Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Roman Revivalism@@, since it appeals to her confident, patrician nature.
<<set $arcologies[$i].FSRomanRevivalist = 5>><<set $adopted = 1>>
@@ -422,6 +434,7 @@ societal development.
<<else>>
<<if $adopted == 0>>
<<if ($arcologies[$i].FSRomanRevivalist == "unset")>>
+<<if ($arcologies[$i].FSAztecRevivalist == "unset")>>
<<if ($arcologies[$i].FSEgyptianRevivalist == "unset")>>
<<if ($arcologies[$i].FSEdoRevivalist == "unset")>>
<<if ($arcologies[$i].FSArabianRevivalist == "unset")>>
@@ -435,6 +448,9 @@ societal development.
<<elseif $leaders[$j].nationality == "Japanese">>
Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Edo Revivalism@@, since she's Japanese herself and can claim high honor in such a society.
<<set $arcologies[$i].FSEdoRevivalist = 5>><<set $adopted = 1>>
+ <<elseif $leaders[$j].nationality == "Mexican">>
+ Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Aztec Revivalism@@, since she's Mexican herself and can claim high honor in such a society.
+ <<set $arcologies[$i].FSAztecRevivalist = 5>><<set $adopted = 1>>
<<elseif $leaders[$j].behavioralQuirk == "confident">>
Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Roman Revivalism@@, since it appeals to her confident, patrician nature.
<<set $arcologies[$i].FSRomanRevivalist = 5>><<set $adopted = 1>>
@@ -463,9 +479,12 @@ societal development.
The arcology's racial Subjugationist culture @@.yellow;pushes it towards Degradationism.@@
<<set $arcologies[$i].FSDegradationist = 5>><<set $adopted = 1>>
<<break>>
- <<elseif ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
+ <<elseif ($arcologies[$i].FSRomanRevivalist == "unset") && $arcologies[$i].FSAztecRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
The arcology's racial Subjugationist culture @@.yellow;pushes it towards Egyptian Revivalism,@@ since the Ancient Egyptians are famous for keeping a race of slaves.
<<set $arcologies[$i].FSRomanRevivalist = 5>><<set $adopted = 1>>
+ <<else>>
+ The arcology's racial Supremacist culture @@.yellow;pushes it towards Aztec Revivalism,@@ since the enslavement and sacrifice of slaves was fundamental to the culture.
+ <<set $arcologies[$i].FSAztecRevivalist = 5>><<set $adopted = 1>>
<<break>>
<</if>>
<</if>>
@@ -475,7 +494,7 @@ societal development.
<<if ($arcologies[$i].FSPaternalist == "unset") && ($arcologies[$i].FSDegradationist == "unset")>>
The arcology's racial Supremacist culture @@.yellow;pushes it towards Paternalism.@@
<<set $arcologies[$i].FSPaternalist = 5>><<set $adopted = 1>>
- <<elseif ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset") && ($arcologies[$i].FSSupremacistRace == "asian")>>
+ <<elseif ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSAztecRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset") && ($arcologies[$i].FSSupremacistRace == "asian")>>
<<if random(0,1) == 0>>
The arcology's racial Supremacist culture @@.yellow;pushes it towards Edo Revivalism,@@ since the beauty and grace of the Japanese people are watchwords there.
<<set $arcologies[$i].FSEdoRevivalist = 5>><<set $adopted = 1>>
@@ -529,7 +548,7 @@ societal development.
<<elseif ($arcologies[$i].FSBodyPurist == "unset") && ($arcologies[$i].FSTransformationFetishist == "unset")>>
The arcology's Paternalist culture @@.yellow;pushes it towards Body Purism,@@ since giving slaves dangerous drugs is hardly good for them.
<<set $arcologies[$i].FSBodyPurist = 5>><<set $adopted = 1>>
- <<elseif ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
+ <<elseif ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSAztecRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
The arcology's Paternalist culture @@.yellow;pushes it towards Roman Revivalism,@@ since loyal service to the res publica bears similarity to their existing mores.
<<set $arcologies[$i].FSRomanRevivalist = 5>><<set $adopted = 1>>
<</if>>
@@ -624,7 +643,7 @@ societal development.
<<if ($arcologies[$i].FSPaternalist == "unset") && ($arcologies[$i].FSDegradationist == "unset")>>
The arcology's Chattel Religionist culture @@.yellow;pushes it towards Paternalism,@@ since charitable care for slaves' welfare has become widespread.
<<set $arcologies[$i].FSPaternalist = 5>><<set $adopted = 1>>
- <<elseif ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
+ <<elseif ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSAztecRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
The arcology's Chattel Religionist culture @@.yellow;pushes it towards Arabian Revivalism,@@ since such an intermingling of slavery and faith fascinates them.
<<set $arcologies[$i].FSArabianRevivalist = 5>><<set $adopted = 1>>
<</if>>
@@ -639,6 +658,14 @@ societal development.
<</if>>
<</if>>
<<if $adopted == 0>>
+<<if $arcologies[$i].FSAztecRevivalist > random(50,200)>>
+ <<if ($arcologies[$i].FSDegradationist == "unset") && ($arcologies[$i].FSPaternalist == "unset")>>
+ The arcology's Aztec Revivalist culture @@.yellow;pushes it towards Degradation,@@ since most Aztec war slaves were tortured and sacrificed.
+ <<set $arcologies[$i].FSPaternalist = 5>><<set $adopted = 1>>
+ <</if>>
+<</if>>
+<</if>>
+<<if $adopted == 0>>
<<if $arcologies[$i].FSEgyptianRevivalist > random(50,200)>>
<<if ($arcologies[$i].FSChattelReligionist == "unset")>>
The arcology's Egyptian Revivalist culture @@.yellow;pushes it towards Chattel Religionism,@@ since worship is already becoming an established part of its life.
@@ -805,12 +832,17 @@ societal development.
<<break>>
<</if>>
<</if>>
- <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
+ <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSAztecRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
<<if $arcologies[$j].FSRomanRevivalist > random(0,200)+($adopted*100)-$influenceBonus>>
It @@.yellow;adopts Roman Revivalism@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSRomanRevivalist = 5>><<set $adopted = 1>>
<<break>>
<</if>>
+ <<if $arcologies[$j].FSAztecRevivalist > random(0,200)+($adopted*100)-$influenceBonus>>
+ It @@.yellow;adopts Aztec Revivalism@@ due to influence from its trading partner $arcologies[$j].name.
+ <<set $arcologies[$i].FSAztecRevivalist = 5>><<set $adopted = 1>>
+ <<break>>
+ <</if>>
<<if $arcologies[$j].FSEgyptianRevivalist > random(0,200)+($adopted*100)-$influenceBonus>>
It @@.yellow;adopts Egyptian Revivalism@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSEgyptianRevivalist = 5>><<set $adopted = 1>>
@@ -855,7 +887,7 @@ societal development.
<<default>>
<<set $desc = "Its citizens are">>
<</switch>>
-<<switch random(1,22)>>
+<<switch random(1,23)>>
<<case 1>>
<<set $seed = either("white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race")>>
<<if ($arcologies[$i].FSSubjugationist == "unset")>>
@@ -940,37 +972,41 @@ societal development.
<<set $arcologies[$i].FSChattelReligionist = 5>><<set $adopted = 1>>
<</if>>
<<case 16>>
- <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
+ <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSAztecRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
$desc fascinated by classical Roman history, leading the arcology to @@.yellow;adopt Roman Revivalism.@@
<<set $arcologies[$i].FSRomanRevivalist = 5>><<set $adopted = 1>>
<</if>>
<<case 17>>
- <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
+ <<if ($arcologies[$i].FSAztecRevivalist == "unset") && ($arcologies[$i].FSAztecRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
+ $desc fascinated by ancient Aztec history, leading the arcology to @@.yellow;adopt Aztec Revivalism.@@
+ <<set $arcologies[$i].FSAztecRevivalist = 5>><<set $adopted = 1>>
+ <</if>>
+<<case 18>>
+ <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSAztecRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
$desc fascinated by ancient Egyptian history, leading the arcology to @@.yellow;adopt Egyptian Revivalism.@@
<<set $arcologies[$i].FSEgyptianRevivalist = 5>><<set $adopted = 1>>
<</if>>
-<<case 18>>
- <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
+<<case 19>>
+ <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSAztecRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
$desc fascinated by Japanese history, leading the arcology to @@.yellow;adopt Edo Revivalism.@@
<<set $arcologies[$i].FSEdoRevivalist = 5>><<set $adopted = 1>>
<</if>>
-<<case 19>>
- <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
+<<case 20>>
+ <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSAztecRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
$desc fascinated by Arabian romanticism, leading the arcology to @@.yellow;adopt Arabian Revivalism.@@
<<set $arcologies[$i].FSArabianRevivalist = 5>><<set $adopted = 1>>
- <<break>>
<</if>>
-<<case 20>>
- <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
+<<case 21>>
+ <<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSAztecRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
$desc fascinated by the long tale of Chinese history, leading the arcology to @@.yellow;adopt Chinese Revivalism.@@
<<set $arcologies[$i].FSChineseRevivalist = 5>><<set $adopted = 1>>
<</if>>
-<<case 21>>
+<<case 22>>
<<if ($arcologies[$i].FSRepopulationFocus == "unset") && ($arcologies[$i].FSRestart == "unset")>>
$desc concerned for the future, and partial to watching bellies swell, leading the arcology to @@.yellow;adopt Repopulation Efforts.@@
<<set $arcologies[$i].FSRepopulationFocus = 5>><<set $adopted = 1>>
<</if>>
-<<case 22>>
+<<case 23>>
<<if ($arcologies[$i].FSRepopulationFocus == "unset") && ($arcologies[$i].FSRestart == "unset")>>
$desc concerned for the future, and believing their elite could do a better job, leading the arcology to @@.yellow;adopt Eugenics.@@
<<set $arcologies[$i].FSRestart = 5>><<set $adopted = 1>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 89e4890c23f..7db140bb6b6 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -413,6 +413,11 @@ The legalities completed, ''__@@.pink;$activeSlave.slaveName@@__'' <<if ($active
Though she knows it's not a truly authentic Roman restoration, her intelligent mind grasps the potential benefits of Roman mores for slaves, and she @@.mediumaquamarine;hopes@@ life in your arcology will be managed with virtue.
<<set $activeSlave.trust += 2>>
<</if>>
+<<elseif $arcologies[0].FSAztecRevivalist >= 50>>
+ <<if $activeSlave.intelligenceImplant == 1>>
+ Though she knows it's not a truly authentic ancient Aztec restoration, her educated mind grasps the potential benefits of ancient Aztec mores for slaves, and she @@.mediumaquamarine;hopes@@ your arcology will make respectful use of her devotion.
+<<set $activeSlave.trust += 2>>
+ <</if>>
<<elseif $arcologies[0].FSEgyptianRevivalist >= 50>>
<<if $activeSlave.intelligenceImplant == 1>>
Though she knows it's not a truly authentic ancient Egyptian restoration, her educated mind grasps the potential benefits of ancient Egyptian mores for slaves, and she @@.mediumaquamarine;hopes@@ your arcology will make good and respectful use of her learning.
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index 8cae29b765c..e6f970ed1b7 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -101,7 +101,7 @@
<<goto "P Bodyswap Reveal">>
<<elseif ($arcologies[0].prosperity > 80) && ($TSS.schoolPresent+$GRI.schoolPresent+$SCP.schoolPresent+$LDE.schoolPresent+$TGA.schoolPresent+$TFS.schoolPresent == 0) && ($schoolSuggestion == 0)>>
<<goto "P school suggestion">>
-<<elseif ($assistantFSOptions == 0) && ($assistant > 0) && ($assistantAppearance != "normal") && ($arcologies[0].FSGenderRadicalistDecoration > 20 or $arcologies[0].FSGenderFundamentalistDecoration > 20 or $arcologies[0].FSPaternalistDecoration > 20 or $arcologies[0].FSDegradationistDecoration > 20 or $arcologies[0].FSBodyPuristDecoration > 20 or $arcologies[0].FSTransformationFetishistDecoration > 20 or $arcologies[0].FSYouthPreferentialistDecoration > 20 or $arcologies[0].FSMaturityPreferentialistDecoration > 20 or $arcologies[0].FSSlimnessEnthusiastDecoration > 20 or $arcologies[0].FSAssetExpansionistDecoration > 20 or $arcologies[0].FSPastoralistDecoration > 20 or $arcologies[0].FSPhysicalIdealistDecoration > 20 or $arcologies[0].FSChattelReligionistDecoration > 20 or $arcologies[0].FSRomanRevivalistDecoration > 20 or $arcologies[0].FSEgyptianRevivalistDecoration > 20 or $arcologies[0].FSEdoRevivalistDecoration > 20 or $arcologies[0].FSArabianRevivalistDecoration > 20 or $arcologies[0].FSChineseRevivalistDecoration > 20)>>
+<<elseif ($assistantFSOptions == 0) && ($assistant > 0) && ($assistantAppearance != "normal") && ($arcologies[0].FSGenderRadicalistDecoration > 20 or $arcologies[0].FSGenderFundamentalistDecoration > 20 or $arcologies[0].FSPaternalistDecoration > 20 or $arcologies[0].FSDegradationistDecoration > 20 or $arcologies[0].FSBodyPuristDecoration > 20 or $arcologies[0].FSTransformationFetishistDecoration > 20 or $arcologies[0].FSYouthPreferentialistDecoration > 20 or $arcologies[0].FSMaturityPreferentialistDecoration > 20 or $arcologies[0].FSSlimnessEnthusiastDecoration > 20 or $arcologies[0].FSAssetExpansionistDecoration > 20 or $arcologies[0].FSPastoralistDecoration > 20 or $arcologies[0].FSPhysicalIdealistDecoration > 20 or $arcologies[0].FSChattelReligionistDecoration > 20 or $arcologies[0].FSRomanRevivalistDecoration > 20 or $arcologies[0].FSAztecRevivalistDecoration > 20 or $arcologies[0].FSEgyptianRevivalistDecoration > 20 or $arcologies[0].FSEdoRevivalistDecoration > 20 or $arcologies[0].FSArabianRevivalistDecoration > 20 or $arcologies[0].FSChineseRevivalistDecoration > 20)>>
<<set $Event = "assistant FS">>
<<goto "Assistant Events">>
<<elseif ($assistant > 0) && ($assistantNameAnnounced == 0) && ($assistantPower > 0)>>
diff --git a/src/uncategorized/pCitizensAndCivilians.tw b/src/uncategorized/pCitizensAndCivilians.tw
index 607c9ac11bf..e09423a6a47 100644
--- a/src/uncategorized/pCitizensAndCivilians.tw
+++ b/src/uncategorized/pCitizensAndCivilians.tw
@@ -73,6 +73,18 @@
<</replace>>
<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>
+<<if $arcologies[0].FSAztecRevivalist >= 10>>\
+<<link "They shall be my Shorn Ones">>
+ <<replace "#result">>
+ You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Centurion reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Shorn Ones - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons and bearing an Aztec standard adorned on a spear. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
+ <<set $nextButton = "Continue">>
+ <<set $rep += 1000>>
+ <<set $cash -= 20000>>
+ <<set $mercenaries = 5>>
+ <<set $mercenariesTitle = "Shorn Ones">>
+ <</replace>>
+<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</if>>
<<if $arcologies[0].FSEgyptianRevivalist >= 10>>
<br><<link "They shall be my Medjay">>
<<replace "#result">>
diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw
index 63b2f6ac1ec..299d7310838 100644
--- a/src/uncategorized/pRivalryHostage.tw
+++ b/src/uncategorized/pRivalryHostage.tw
@@ -238,6 +238,8 @@ but you do remember her, and your rival knows it. This is obviously the best the
whatever it is you do to liven up your boring arcology,
<<case "Roman Revivalism">>
feeding slaves to the lions, or whatever it is you do with your spare time,
+<<case "Aztec Revivalism">>
+ sacrificing slaves to the gods, or whatever it is you do with your spare time,
<<case "Egyptian Revivalism">>
your latest experiment in exactly how disgusting incest can possibly be,
<<case "Edo Revivalism">>
diff --git a/src/uncategorized/peConcubineInterview.tw b/src/uncategorized/peConcubineInterview.tw
index 53f7e1137e4..f4c4c1b95b2 100644
--- a/src/uncategorized/peConcubineInterview.tw
+++ b/src/uncategorized/peConcubineInterview.tw
@@ -255,6 +255,9 @@ You receive an official communication from a popular talk show hosted in one of
<<if $arcologies[0].FSRomanRevivalist > 0>>
Rome come again,
<</if>>
+ <<if $arcologies[0].FSAztecRevivalist > 0>>
+ Blood empire reborn,
+ <</if>>
<<if $arcologies[0].FSEgyptianRevivalist > 0>>
the land of the Pharaohth reborn,
<</if>>
@@ -325,6 +328,9 @@ You receive an official communication from a popular talk show hosted in one of
<<if $arcologies[0].FSRomanRevivalist > 0>>
Rome come again,
<</if>>
+ <<if $arcologies[0].FSAztecRevivalist > 0>>
+ Blood empire reborn,
+ <</if>>
<<if $arcologies[0].FSEgyptianRevivalist > 0>>
the land of the Pharaohs reborn,
<</if>>
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index ed4f4f0f23e..8f1b0c3b05e 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/uncategorized/personalAssistantAppearance.tw
@@ -12,6 +12,8 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
She's sharpened her appearance to be quite frightening: she has impressive fangs, and a snakelike tongue flicks out between them.
<<case "roman revivalist">>
She's wearing a conservative stola, which combined with her monstrous appearance makes her look like a Greek demigoddess.
+ <<case "aztec revivalist">>
+ She's wearing a traditional huipil, a long cape and a headdress, which amplify her monstrous visage.
<<case "egyptian revivalist">>
She's wearing golden jewelry and a Pharaoh's beard, which combined with her animal characteristics makes her look like an Egyptian deity.
<<case "edo revivalist">>
@@ -85,6 +87,8 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
She's made herself up to look almost comically evil: she's wearing black lipstick, black eyeliner, and a black barbed cockring.
<<case "roman revivalist">>
She's taken to reclining on a traditional Roman couch and drinking wine out of a shallow dish.
+ <<case "aztec revivalist">>
+ She's wearing a headdress and a loincloth, which can't hide her enviable package.
<<case "egyptian revivalist">>
She's wearing an Egyptian melting perfume cake on her head.
<<case "edo revivalist">>
@@ -162,6 +166,8 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
with ochre-dyed dreadlocks, war tattoos, shredded abs, and jewelry made from human bones. She has bigger natural tits than anyone that ripped could possibly maintain.
<<case "roman revivalist">>
wearing the armor of a Roman auxilia, complete with lorica hamata and oval shield painted with your arcology's symbols.
+ <<case "aztec revivalist">>
+ wearing the battledress of the greatest warriors, she stands incredibly imposing, holding a spear and shield.
<<case "egyptian revivalist">>
wearing a simple white linen dress, kohl eyeshadow, and sandals, making her look like a barbarian immigrant to the land of the Nile.
<<case "edo revivalist">>
@@ -235,6 +241,8 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
wearing an iron-gray suit, with her hair up in a severe bun. She's wearing deep red lipstick and a predatory expression.
<<case "roman revivalist">>
wearing a fine stola appropriate for a respectable Roman lady, with her hair up in a complicated style.
+ <<case "aztec revivalist">>
+ wearing a modest huipil, her hair braided to two ponytails, she's the picture of quiet elegance.
<<case "egyptian revivalist">>
wearing a simple white linen dress, kohl eyeshadow, sandals, and a serene expression.
<<case "edo revivalist">>
@@ -312,6 +320,8 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
with swollen hips and breasts and a huge pregnant belly. She's naked aside from the steel piercings in her protruding clit, navel, and nipples.
<<case "roman revivalist">>
with swollen hips and a big pregnant belly. She's clothed in a loose stola, with dozens of flowers woven into her curly auburn hair.
+ <<case "aztec revivalist">>
+ glowing like a sun goddess, her full belly commands awe and respect in all who see her.
<<case "egyptian revivalist">>
wielding an ankh-headed staff. She's wearing a gilded headdress and linen skirt, but leaves her breasts and pregnant stomach bare to gleam like bronze.
<<case "edo revivalist">>
@@ -389,6 +399,8 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
wearing a plaid skirt and a white shirt, though she's hiked the skirt up to show almost everything, and torn the shirt open to bare her perky boobs.
<<case "roman revivalist">>
wearing a girl's stola, with her hair pulled up into a proper upper-class Roman coiffure. She usually carries a wax tablet and a stylus.
+ <<case "aztec revivalist">>
+ wearing only an overshirt, her cute little legs are complimented by her twin tails.
<<case "egyptian revivalist">>
wearing a simple white linen skirt, kohl eyeshadow, sandals, and no top at all, baring her perky young breasts.
<<case "edo revivalist">>
@@ -463,13 +475,15 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
<<case "paternalist">>
She's made herself up to look a bit more classy recently: she has elegant fake nails, and has her hair piled up on her head. Occasionally a stream of liquid pours from her crotch along with a healthy baby.
<<case "repopulation focus">>
- She rests atop her newly modified belly. It bulges greatly from all sides and holds her far off the ground.
+ She rests atop her newly modified belly. It bulges greatly from all sides and holds her far off the ground.
<<case "eugenics">>
She appears as an ugly and unkept slavegirl, massively pregnant with hundreds of subhuman spawn. Her immense belly is coated in bulges and moving ominously. A malformed, impish child claws its way out of her ruined cunt periodically.
<<case "degradationist">>
She's made herself up to look almost comically evil: she's wearing black lipstick and black eyeliner. Numerous studs cover her bulging belly and a large, heavy ring is driven through her popped navel. Liquid constantly oozes from her gaping vagina where a baby is held mid-birth by several criss-crossing chains.
<<case "roman revivalist">>
She's taken to reclining on a traditional Roman couch and drinking wine out of a shallow dish. Occasionally a stream of liquid pours from her crotch along with a healthy baby.
+ <<case "aztec revivalist">>
+ She glows like a sun goddess, her life-giving belly commands awe and respect in all who see her. Every sacrifice before her coincides with another life entering the world.
<<case "egyptian revivalist">>
She's wearing an Egyptian melting perfume cake on her head. Occasionally a stream of liquid pours from her crotch along with a healthy baby.
<<case "edo revivalist">>
@@ -547,6 +561,8 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
girl wearing a cute pink dress.
<<case "roman revivalist">>
girl wearing a girl's stola.
+ <<case "aztec revivalist">>
+ girl wearing only an overshirt; her cute little legs are complimented by her twin tails.
<<case "egyptian revivalist">>
girl wearing a simple white linen dress, kohl eyeshadow and sandals.
<<case "edo revivalist">>
@@ -624,6 +640,8 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
belly wearing a cute pink dress. The middle is stretched tight by her growing belly.
<<case "roman revivalist">>
belly wearing a girl's stola.
+ <<case "aztec revivalist">>
+ belly wearing only an overshirt which struggles to cover her rounded middle; her cute little legs are complimented by her twin tails.
<<case "egyptian revivalist">>
belly wearing a bulging white linen dress, kohl eyeshadow and sandals.
<<case "edo revivalist">>
@@ -703,6 +721,8 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
wearing her birthday suit, with her hair in a mess.
<<case "roman revivalist">>
wearing a small handkercheif wrapped around her like a toga, with one tiny breast sticking out. A wreath made of twisted clovers sits on her head.
+ <<case "aztec revivalist">>
+ //Placeholder//
<<case "egyptian revivalist">>
wearing a simple white linen dress and has eyeshadow poorly applied around her eyes.
<<case "edo revivalist">>
@@ -778,6 +798,8 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
wearing her birthday suit, with her hair in a mess.
<<case "roman revivalist">>
wearing a small handkercheif wrapped around her like a toga, with one tiny milky breast sticking out. A wreath made of twisted clovers sits on her head.
+ <<case "aztec revivalist">>
+ //Placeholder//
<<case "egyptian revivalist">>
wearing a simple white linen dress and has eyeshadow poorly applied around her eyes.
<<case "edo revivalist">>
@@ -919,6 +941,8 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
She is wearing black eyeliner and lipstick while using a thin black ribbon to protect her modesty. It's pretty obvious she has a stud through her left nipple.
<<case "roman revivalist">>
She is wearing a fine stola appropriate for a respectable Roman lady, with her hair up in a complicated style.
+ <<case "aztec revivalist">>
+ She is wearing a modest huipil with her hair braided to two ponytails, she's the picture of quiet elegance.
<<case "egyptian revivalist">>
She is wearing a simple white linen dress, kohl eyeshadow, sandals, and a serene expression.
<<case "edo revivalist">>
@@ -996,6 +1020,8 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
She is wearing black lipstick along with her usual white linen dress with a short skirt. Occasionally you get a glance up that skirt; a dark black thong greets you.
<<case "roman revivalist">>
She is wearing a cute little toga. Occasionally you get a glance up it; a cute little pussy says hello.
+ <<case "aztec revivalist">>
+ wearing a huipil with her hair braided to two ponytails. You can clearly see through the sides that she has chosen to forgo underwear.
<<case "egyptian revivalist">>
She is wearing a simple white linen dress, kohl eyeshadow, and a serene expression. Her dress hangs low enough to block your view, unfortunately.
<<case "edo revivalist">>
@@ -1073,6 +1099,8 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
She has replaced her loincloth with a chastity belt containing an immense dildo; it is clearly seen distending her belly. Countless scars line her back and ass from the frequent lashings she enjoys.
<<case "roman revivalist">>
She'd fit in perfectly tormenting the condemned in Tartarus.
+ <<case "aztec revivalist">>
+ She's taken to carrying a pair of ceremonial daggers perfect for bloodletting and even an impromtu sacrifice. Two things she really enjoys performing.
<<case "egyptian revivalist">>
She has recently adjusted her appearance to resemble an Egyptian slave; that combined with a manufactured rebellious streak are sure to earn her a whipping.
<<case "edo revivalist">>
@@ -1150,6 +1178,8 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
She still hasn't managed to undo the spell; her face, hands and every surface of her body are completely covered in tattoos. It is especially noticeable when she talks that her tongue is tattoo'd too; wonder what decorates the surfaces of her body you can't see?
<<case "roman revivalist">>
While she acts like a typical Roman woman, she is pretty obviously Greek. She can't even name the Pantheon correctly.
+ <<case "aztec revivalist">>
+ She is still very obviously not a native and has become rathe caught up in the fear that she'll soon be sacrificed.
<<case "egyptian revivalist">>
She's managed to untangle herself from the wrappings, though she has chosen to leave several still wrapped around her body.
<<case "edo revivalist">>
@@ -1239,6 +1269,8 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
wearing nothing except some oversized, strange looking piercings all over her body. You swear you see movement under her skin and her piercings have a habit of never being in the same shape or location.
<<case "roman revivalist">>
wearing a poorly folded toga. You swear you see movement under her skin.
+ <<case "aztec revivalist">>
+ wearing a torn huipil. She looks Aztec, but wrong. You swear you see movement under her skin.
<<case "egyptian revivalist">>
wearing nothing at all. She looks vaguely Egyptian, but wrong. You swear you see movement under her skin.
<<case "edo revivalist">>
@@ -1329,6 +1361,8 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
She's recently added an obscene number of piercings to her cock and balls in addition to a pair of nipple rings. A thin chain links a ring attached to the head of her penis to the heavy rings adorning her chest.
<<case "roman revivalist">>
She is an ideal Roman man, complete with something big and heavy hanging under her toga.
+ <<case "aztec revivalist">>
+ She is an ideal Aztec man wearing a headdress and a loincloth, which can't hide her enviable package.
<<case "egyptian revivalist">>
She is an ideal Egyptian man, complete with something big and heavy dangling behind her loincloth.
<<case "edo revivalist">>
@@ -1417,7 +1451,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
She's fed a number of beads down her urethra and is struggling to hold back her orgasm. When she notices you watching, she waves her throbbing erection at you, imploring you to yank out the beads and give her release.
<<case "roman revivalist">>
She has her toga undone and is absentmindedly jerking off. When she notices you watching, she waves her throbbing erection at you, imploring you to finish her off.
- <<case "egyptian revivalist">>
+ <<case "egyptian revivalist" "aztec revivalist">>
She is absentmindedly jerking off, her loincloth pushed aside to make room. When she notices you watching, she waves her throbbing erection at you, imploring you to finish her off.
<<case "edo revivalist" "chinese revivalist">>
She has undone her clothing and is absentmindedly jerking off. When she notices you watching, she waves her throbbing erection at you, imploring you to finish her off.
@@ -1478,6 +1512,8 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
She's recently added an obscene number of piercings to her labia in addition to a pair of nipple rings and a big, heavy ring on her clit. A thin chain links the clit ring to the heavy rings adorning her chest.
<<case "roman revivalist">>
In fact, she is the most gorgeous Roman woman you've ever seen.
+ <<case "aztec revivalist">>
+ In fact, she is the most gorgeous Aztec woman you've ever seen.
<<case "egyptian revivalist">>
In fact, she is the most gorgeous Egyptian woman you've ever seen.
<<case "edo revivalist">>
diff --git a/src/uncategorized/personalAssistantOptions.tw b/src/uncategorized/personalAssistantOptions.tw
index 1a7a05becc6..f8fbe4d9617 100644
--- a/src/uncategorized/personalAssistantOptions.tw
+++ b/src/uncategorized/personalAssistantOptions.tw
@@ -75,6 +75,7 @@ She is currently using the ''$assistantAppearance'' avatar.
<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
+ <<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
<<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<set _seed.push("Egyptian revivalism")>> <</if>>
<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("Repopulationism")>> <</if>>
<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("Eugenics")>> <</if>>
@@ -84,6 +85,7 @@ She is currently using the ''$assistantAppearance'' avatar.
<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset">> <<set _seed.push("Roman revivalism")>> <</if>>
+ <<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
<<case "schoolgirl">>
<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
@@ -164,6 +166,7 @@ She is currently using the ''$assistantAppearance'' avatar.
<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset">> <<set _seed.push("Roman revivalism")>> <</if>>
+ <<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
<<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<set _seed.push("Egyptian revivalism")>> <</if>>
<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
<<if $arcologies[0].FSArabianRevivalist != "unset">> <<set _seed.push("Arabian revivalism")>> <</if>>
@@ -185,6 +188,7 @@ She is currently using the ''$assistantAppearance'' avatar.
<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset">> <<set _seed.push("Roman revivalism")>> <</if>>
+ <<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
<<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<set _seed.push("Egyptian revivalism")>> <</if>>
<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
<<if $arcologies[0].FSArabianRevivalist != "unset">> <<set _seed.push("Arabian revivalism")>> <</if>>
@@ -243,6 +247,7 @@ It has no impact on public opinion.
<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset">> <<set _seed.push("Roman revivalism")>> <</if>>
+ <<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
<<if $arcologies[0].FSArabianRevivalist != "unset">> <<set _seed.push("Arabian revivalism")>> <</if>>
<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("Eugenics")>> <</if>>
<<if _seed.length > 0>>
@@ -293,6 +298,7 @@ It has no impact on public opinion.
<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset">> <<set _seed.push("Roman revivalism")>> <</if>>
+ <<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
<<if _seed.length > 0>>
<<set _desc = "">>
@@ -657,6 +663,7 @@ It has no impact on public opinion.
<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset">> <<set _seed.push("Roman revivalism")>> <</if>>
+ <<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
<<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<set _seed.push("Egyptian revivalism")>> <</if>>
<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
<<if $arcologies[0].FSArabianRevivalist != "unset">> <<set _seed.push("Arabian revivalism")>> <</if>>
@@ -695,6 +702,7 @@ It has no impact on public opinion.
<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset">> <<set _seed.push("Roman revivalism")>> <</if>>
+ <<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
<<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<set _seed.push("Egyptian revivalism")>> <</if>>
<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
<<if $arcologies[0].FSArabianRevivalist != "unset">> <<set _seed.push("Arabian revivalism")>> <</if>>
@@ -883,6 +891,10 @@ She can further refine her avatar to match the arcology's social profile<<if $as
[[Roman Revivalist|Personal assistant options][$assistantFSAppearance = "roman revivalist"]]
<br>
<</if>>
+<<if $assistantFSAppearance != "aztec revivalist" && $arcologies[0].FSAztecRevivalistDecoration > 20>>
+ [[Aztec Revivalist|Personal assistant options][$assistantFSAppearance = "aztec revivalist"]]
+ <br>
+<</if>>
<<if $assistantFSAppearance != "egyptian revivalist" && $arcologies[0].FSEgyptianRevivalistDecoration > 20>>
[[Egyptian Revivalist|Personal assistant options][$assistantFSAppearance = "egyptian revivalist"]]
<br>
diff --git a/src/uncategorized/policies.tw b/src/uncategorized/policies.tw
index 225ea00f169..800673668dc 100644
--- a/src/uncategorized/policies.tw
+++ b/src/uncategorized/policies.tw
@@ -336,7 +336,7 @@
<</if>>
<<if ndef $arcologies[0].FSGenderFundamentalistLawBimbo>><<set $arcologies[0].FSGenderFundamentalistLawBimbo = 0>><</if>>
-<<if (($arcologies[0].FSSupremacistLawME + $arcologies[0].FSSupremacistSMR + $arcologies[0].FSSubjugationistLawME + $arcologies[0].FSSubjugationistSMR + $arcologies[0].FSGenderRadicalistLawBeauty + $arcologies[0].FSGenderRadicalistLawFuta + $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderFundamentalistLawBimbo + $arcologies[0].FSGenderFundamentalistSMR + $arcologies[0].FSPaternalistLaw + $arcologies[0].FSPaternalistSMR + $arcologies[0].FSDegradationistLaw + $arcologies[0].FSDegradationistSMR + $arcologies[0].FSBodyPuristLaw + $arcologies[0].FSBodyPuristSMR + $arcologies[0].FSTransformationFetishistSMR + $arcologies[0].FSYouthPreferentialistLaw + $arcologies[0].FSYouthPreferentialistSMR + $arcologies[0].FSMaturityPreferentialistLaw + $arcologies[0].FSMaturityPreferentialistSMR + $arcologies[0].FSSlimnessEnthusiastSMR + $arcologies[0].FSSlimnessEnthusiastLaw + $arcologies[0].FSAssetExpansionistSMR + $arcologies[0].FSPastoralistLaw + $arcologies[0].FSPastoralistSMR + $arcologies[0].FSPhysicalIdealistSMR + $arcologies[0].FSChattelReligionistLaw + $arcologies[0].FSChattelReligionistSMR + $arcologies[0].FSChattelReligionistCreed + $arcologies[0].FSRomanRevivalistLaw + $arcologies[0].FSRomanRevivalistSMR + $arcologies[0].FSEgyptianRevivalistLaw + $arcologies[0].FSEgyptianRevivalistSMR + $arcologies[0].FSEdoRevivalistLaw + $arcologies[0].FSEdoRevivalistSMR + $arcologies[0].FSArabianRevivalistLaw + $arcologies[0].FSArabianRevivalistSMR + $arcologies[0].FSChineseRevivalistLaw + $arcologies[0].FSChineseRevivalistSMR) > 0 + $arcologies[0].FSRepopulationFocusLaw + $arcologies[0].FSRepopulationFocusSMR + $arcologies[0].FSRestartLaw + $arcologies[0].FSRestartSMR > 0) || ($CulturalOpenness != 0)>>
+<<if (($arcologies[0].FSSupremacistLawME + $arcologies[0].FSSupremacistSMR + $arcologies[0].FSSubjugationistLawME + $arcologies[0].FSSubjugationistSMR + $arcologies[0].FSGenderRadicalistLawBeauty + $arcologies[0].FSGenderRadicalistLawFuta + $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderFundamentalistLawBimbo + $arcologies[0].FSGenderFundamentalistSMR + $arcologies[0].FSPaternalistLaw + $arcologies[0].FSPaternalistSMR + $arcologies[0].FSDegradationistLaw + $arcologies[0].FSDegradationistSMR + $arcologies[0].FSBodyPuristLaw + $arcologies[0].FSBodyPuristSMR + $arcologies[0].FSTransformationFetishistSMR + $arcologies[0].FSYouthPreferentialistLaw + $arcologies[0].FSYouthPreferentialistSMR + $arcologies[0].FSMaturityPreferentialistLaw + $arcologies[0].FSMaturityPreferentialistSMR + $arcologies[0].FSSlimnessEnthusiastSMR + $arcologies[0].FSSlimnessEnthusiastLaw + $arcologies[0].FSAssetExpansionistSMR + $arcologies[0].FSPastoralistLaw + $arcologies[0].FSPastoralistSMR + $arcologies[0].FSPhysicalIdealistSMR + $arcologies[0].FSChattelReligionistLaw + $arcologies[0].FSChattelReligionistSMR + $arcologies[0].FSChattelReligionistCreed + $arcologies[0].FSRomanRevivalistLaw + $arcologies[0].FSRomanRevivalistSMR + $arcologies[0].FSAztecRevivalistLaw + $arcologies[0].FSAztecRevivalistSMR + $arcologies[0].FSEgyptianRevivalistLaw + $arcologies[0].FSEgyptianRevivalistSMR + $arcologies[0].FSEdoRevivalistLaw + $arcologies[0].FSEdoRevivalistSMR + $arcologies[0].FSArabianRevivalistLaw + $arcologies[0].FSArabianRevivalistSMR + $arcologies[0].FSChineseRevivalistLaw + $arcologies[0].FSChineseRevivalistSMR) > 0 + $arcologies[0].FSRepopulationFocusLaw + $arcologies[0].FSRepopulationFocusSMR + $arcologies[0].FSRestartLaw + $arcologies[0].FSRestartSMR > 0) || ($CulturalOpenness != 0)>>
<br>__Future Society Policies__
<<if $CulturalOpenness == 1>>
@@ -534,6 +534,16 @@
[[Repeal|Policies][$arcologies[0].FSRomanRevivalistSMR = 0]]
<</if>>
+<<if $arcologies[0].FSAztecRevivalistLaw == 1>>
+ <br>''Mandatory Artisan Training:'' to inherit or receive a trade a citizen must pass a mandatory course in one of the academies.
+ [[Repeal|Policies][$arcologies[0].FSAztecRevivalistLaw = 0]]
+<</if>>
+
+<<if $arcologies[0].FSAztecRevivalistSMR == 1>>
+ <br>''Captured and Incorrigible Slaves Tribute:'' all captured and incorrigible slaves must be made tribute to the altars.
+ [[Repeal|Policies][$arcologies[0].FSAztecRevivalistSMR = 0]]
+<</if>>
+
<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>>
<br>''Pharaoh's Consort:'' your Head Girl holds legal status as your Consort, increasing her prominence.
[[Repeal|Policies][$arcologies[0].FSEgyptianRevivalistLaw = 0]]
@@ -1285,6 +1295,21 @@
<</if>>
<</if>>
+<<if $arcologies[0].FSAztecRevivalist >= 40>>
+<<if $arcologies[0].FSAztecRevivalistSMR == 0>>
+ <br>''@@.lime;Captured and Incorrigible Slaves Tribute:@@'' all captured and incorrigible slaves must be made tribute to the altars.
+ [[Implement|Policies][$arcologies[0].FSAztecRevivalistSMR = 1, $cash -=5000, $rep -= 1000]]
+ <br> //Will help advance Aztec Revivalism//
+<</if>>
+<<if $arcologies[0].FSAztecRevivalist >= 90>>
+<<if $arcologies[0].FSAztecRevivalistLaw == 0>>
+ <br>''@@.lime;Mandatory Artisan Training:@@'' to inherit or receive a trade a citizen must pass a mandatory course in one of the academies.
+ [[Implement|Policies][$arcologies[0].FSAztecRevivalistLaw = 1, $cash -=5000, $rep -= 1000]]
+ <br> //Will improve your arcology's combat power during crises//
+<</if>>
+<</if>>
+<</if>>
+
<<if $arcologies[0].FSEgyptianRevivalist >= 40>>
<<if $arcologies[0].FSEgyptianRevivalistSMR == 0>>
<br>''@@.lime;Egyptian Cultural Induction SMR:@@'' in order to be sold in the arcology, slaves must be instructed in the cultural tenets of ancient Egypt.
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index 5ec446a7e80..34e6557033e 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -595,6 +595,34 @@
<</if>>
<</if>>
+<<if ($eventSlave.devotion > 20)>>
+<<if ($eventSlave.trust > 20)>>
+<<if ($eventSlave.actualAge > 35)>>
+<<if ($eventSlave.anus > 0)>>
+<<if ($eventSlave.vagina > 0)>>
+<<if ($PC.actualAge < 25)>>
+ <<set $RESSTRevent.push("young PC age difference")>>
+<</if>>
+<</if>>
+<</if>>
+<</if>>
+<</if>>
+<</if>>
+
+<<if ($eventSlave.devotion > 20)>>
+<<if ($eventSlave.trust > 20)>>
+<<if ($eventSlave.actualAge < 22)>>
+<<if ($eventSlave.anus > 0)>>
+<<if ($eventSlave.vagina > 0)>>
+<<if ($PC.actualAge >= 50)>>
+ <<set $RESSTRevent.push("old PC age difference")>>
+<</if>>
+<</if>>
+<</if>>
+<</if>>
+<</if>>
+<</if>>
+
<<if ($eventSlave.fetish == "humiliation") || ($eventSlave.energy > 95)>>
<<if ($eventSlave.devotion <= 50)>>
<<if ($eventSlave.devotion >= -20)>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 3a87e54aa0e..e17d1fce3ed 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -902,6 +902,10 @@
<<set $FSAcquisitionEvents.push("Roman Revivalist")>>
<<set $events.push("RE FS acquisition")>>
<</if>>
+ <<if $arcologies[0].FSAztecRevivalist > random(1,100)>>
+ <<set $FSAcquisitionEvents.push("Aztec Revivalist")>>
+ <<set $events.push("RE FS acquisition")>>
+ <</if>>
<<if $arcologies[0].FSEdoRevivalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Edo Revivalist")>>
<<set $events.push("RE FS acquisition")>>
@@ -926,12 +930,10 @@
<<set $FSNonconformistEvents.push("Subjugationist")>>
<<set $events.push("RE FS nonconformist")>>
<</if>><</if>>
- <<if $seeHyperPreg == 1>>
<<if $arcologies[0].FSRepopulationFocus < 95>><<if $arcologies[0].FSRepopulationFocus > 50>>
<<set $FSNonconformistEvents.push("Repopulation Efforts")>>
<<set $events.push("RE FS nonconformist")>>
<</if>><</if>>
- <</if>>
<<if $arcologies[0].FSRestart < 95>><<if $arcologies[0].FSRestart > 50>>
<<set $FSNonconformistEvents.push("Eugenics")>>
<<set $events.push("RE FS nonconformist")>>
@@ -992,6 +994,10 @@
<<set $FSNonconformistEvents.push("Roman Revivalist")>>
<<set $events.push("RE FS nonconformist")>>
<</if>><</if>>
+ <<if $arcologies[0].FSAztecRevivalist < 95>><<if $arcologies[0].FSAztecRevivalist > 50>>
+ <<set $FSNonconformistEvents.push("Aztec Revivalist")>>
+ <<set $events.push("RE FS nonconformist")>>
+ <</if>><</if>>
<<if $arcologies[0].FSEdoRevivalist < 95>><<if $arcologies[0].FSEdoRevivalist > 50>>
<<set $FSNonconformistEvents.push("Edo Revivalist")>>
<<set $events.push("RE FS nonconformist")>>
diff --git a/src/uncategorized/reCitizenHookup.tw b/src/uncategorized/reCitizenHookup.tw
index b5c99ebf523..3c46ed648b5 100644
--- a/src/uncategorized/reCitizenHookup.tw
+++ b/src/uncategorized/reCitizenHookup.tw
@@ -49,6 +49,8 @@
<</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
<<set _FS.push("Roman Revivalist")>>
+<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ <<set _FS.push("Aztec Revivalist")>>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
<<set _FS.push("Egyptian Revivalist")>>
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
@@ -112,6 +114,8 @@ But tonight, you've put in an appearance. Your citizens are drinking your <<if $
pretty, devout-looking young woman
<<case "Roman Revivalist">>
proper young Roman lady
+<<case "Aztec Revivalist">>
+ natural Aztec beauty
<<case "Egyptian Revivalist">>
pretty, sun-kissed lady
<<case "Edo Revivalist">>
@@ -165,6 +169,8 @@ She's yours for the taking, if you want her, and if her praise and proximity wer
assume just a hint of a Chattel Religionist devotional pose used to request penetration. It's heavy flirting, of a modern religious sort.
<<case "Roman Revivalist">>
hint that her pudicitia, that is her purity, would be if anything enhanced by sexual commerce with someone as powerful as you.
+<<case "Aztec Revivalist">>
+ hint that her devotion, which is the most important thing, cannot be besmirched by tasting your divine power.
<<case "Egyptian Revivalist">>
hint that she would like nothing better than to bask in the pharaonic light in the arcology, very close to its source, while loosening her linen dress a little.
<<case "Edo Revivalist">>
@@ -232,6 +238,8 @@ She's clearly attracted to you; even the most consummate actress would have diff
a fresh and ready body, adorned here and there with sensual devotional jewelry.
<<case "Roman Revivalist">>
a graceful, milk-pale vision of classical beauty.
+ <<case "Aztec Revivalist">>
+ a strong, tight, bronze body.
<<case "Egyptian Revivalist">>
a perfect expanse of smooth, warm, tanned skin.
<<case "Edo Revivalist">>
@@ -324,6 +332,9 @@ She's clearly attracted to you; even the most consummate actress would have diff
<<case "Roman Revivalist">>
elegant form
<<set $arcologies[0].FSRomanRevivalist += 5>>
+ <<case "Aztec Revivalist">>
+ well-built form
+ <<set $arcologies[0].FSAztecRevivalist += 5>>
<<case "Egyptian Revivalist">>
beautiful tanned body
<<set $arcologies[0].FSEgyptianRevivalist += 5>>
@@ -343,4 +354,4 @@ She's clearly attracted to you; even the most consummate actress would have diff
<</replace>>
<</link>>
<</if>>
-</span>
\ No newline at end of file
+</span>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index be313f59d7d..8a3a99ca821 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -363,6 +363,31 @@
<<slaveCost $activeSlave>>
<<set $slaveCost -= 1000>>
+<<case "Aztec Revivalist">>
+
+<<set $contractCost = 1000>>
+<<set $activeSlaveOneTimeMinAge = 22>>
+<<set $activeSlaveOneTimeMaxAge = 28>>
+<<include "Generate XX Slave">>
+<<set $activeSlave.origin = "She offered herself to you for enslavement because she needs to feel a higher call.">>
+<<set $activeSlave.devotion = random(25,50)>>
+<<set $activeSlave.trust = random(25,50)>>
+<<set $activeSlave.career = "a merchant">>
+<<set $activeSlave.health = random(-20,20)>>
+<<set $activeSlave.face = random(-20,0)>>
+<<set $activeSlave.anus to 0>>
+<<if $activeSlave.vagina != -1>><<set $activeSlave.vagina to 0>><</if>>
+<<set $activeSlave.vaginalSkill = 1>>
+<<set $activeSlave.analSkill = 1>>
+<<set $activeSlave.oralSkill = 1>>
+<<set $activeSlave.whoreSkill = 0>>
+<<set $activeSlave.entertainSkill = 0>>
+<<set $activeSlave.intelligence = random(1,2)>>
+<<set $activeSlave.intelligenceImplant = 1>>
+<<set $activeSlave.teeth = "normal">>
+<<slaveCost $activeSlave>>
+<<set $slaveCost -= 1000>>
+
<<case "Edo Revivalist">>
<<set $contractCost = 1000>>
@@ -547,6 +572,12 @@ You receive so many messages, as a noted titan of the new Free Cities world, tha
The call comes in from an old world university. The caller is a young woman who explains that she's struggling with extreme student debt, and has recently graduated with a history degree that she can't seem to turn into gainful employment. She gushes at length about how much she enjoyed ancient history, and how she's heard all about your ideas about reviving ancient culture in the Free Cities. She sees joining your household as a romantic way out of her difficult situation. Apparently she read all the idyllic parts of history and somehow missed out on learning about the salt mines and slave galleys. She's not terribly pretty and seems socially awkward, but that's likely to have its side benefits. She nervously sends you a complete dossier on herself.
\
+<<case "Aztec Revivalist">>\
+\
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+
+The call comes in from an old world trading colony. The caller is a woman who humbly explains how tired she's from all the godless people and terrible conditions, and expresses interest to join the old empires. She probably knows only of the incredible architecture and the military accomplishments that are advertised in vids. Though the sacrifice and collaring of slaves is no secret, most people never find out the real truth to what you do. Nevertheless she's incredibly willing, so much so that she almost signs herself off to you by accident. Her file is displayed in front if you, pending your reaction.
+\
<<case "Edo Revivalist">>\
\
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
@@ -614,6 +645,8 @@ The call comes in from an office, and you suppress the urge to check whether $as
She lets out a convulsive sob when you accept her servitude, and is painfully obsequious as you complete the formalities of enslavement. Your exam reveals several minor indications of self-harm - chewed nails, bitten lips, and such. But for all that, a remarkable look of peace has settled on the poor woman's face. She waits patiently for a hint of your will, <<if $activeSlave.dick > 0>>her cock painfully erect<<else>>her pussy visibly moist<</if>> at the prospect of the servile sex she is convinced is her duty.
<<case "Roman Revivalist">>\
She arrives wide-eyed and enthusiastic about the historical style she saw on the way in. She swallows nervously throughout the enslavement process and even cries a little at the end. She's slow to undress, and when she's finished, she covers her modest breasts with one arm and her mons with the other. It seems that she's about to have a rude awakening about the realities of being a house slave.
+ <<case "Aztec Revivalist">>\
+ She arrives awestruck by all the sights she passed through to get to your abode. She probably didn't see anything too extreme, but she will soon. Feeling your gaze on her body, she quickly abandons all fears from her past life, strips off her clothes, and submits to you fully. Only time will tell if she made a mistake.
<<case "Edo Revivalist">>\
She arrives with doubt already clouding her eyes. It seems she passed one of the arcology's seedier bars on her way up to your penthouse; the sight of roaring patrons swilling cheap sake and manhandling whores in loose kimonos does not seem to have been part of her expectations. As the enslavement process winds on, she reflexively begins to look around for a means of escape, and slowly collapses into herself as she realizes there is none.
<<case "Arabian Revivalist">>\
@@ -664,6 +697,8 @@ The call comes in from an office, and you suppress the urge to check whether $as
She lets out a convulsive sob when you accept her servitude, and is painfully obsequious as you complete the formalities of enslavement. When her buyer arrives to take her away, the realization agonizes her, but she snuffs out her saddened reaction almost as soon as it dawns on her face. She visibly draws herself up, obviously telling herself that service under one master is as righteous as service under another.
<<case "Roman Revivalist">>\
She arrives with doubt already clouding her eyes. It seems she got an introduction to the reality of Roman Revivalism on her way up the arcology to your villa. The violence it did to her vision of Rome is deeply ironic; $arcologies[0].name is a fair reproduction of the decadence and vigor of imperial Rome. If she's shocked by the screams of a slave dying in gladiatorial combat or the spectacle of prisoners from the provinces being sold at auction, that's her ignorance. When you cause a price placard to be affixed to her chest so she can be sold at auction, the reality of her future finally comes home to her.
+ <<case "Aztec Revivalist">>\
+ She arrives so terrified, she can't stop shaking and won't acknowledge most of your commands. It seems she realized what really goes on in this arcology. The blood and gruesome mutilation is very far from she envisioned for her future; $arcologies[0].name is a close reproduction of the miasma of death that accompanied the Aztecs. She's currently too shaken to realize what awaits her. Whether good or bad, she can't back out. She's yours.
<<case "Edo Revivalist">>\
She arrives with doubt already clouding her eyes. It seems she passed one of the arcology's seedier bars on her way up to your penthouse; the sight of roaring patrons swilling cheap sake and manhandling whores in loose kimonos does not seem to have been part of her expectations. When a buyer's agent arrives to take charge of her low-value body, she manages to spit out a last bit of bad Japanese (a childish insult) before he bags her. The body in the bag struggles spastically until he knuckles it hard in the kidney, slings it over his shoulder, and carries the package out, grinning at you in commiseration.
<<case "Arabian Revivalist">>\
diff --git a/src/uncategorized/reFSNonconformist.tw b/src/uncategorized/reFSNonconformist.tw
index 5cc1ffd300b..15661df5189 100644
--- a/src/uncategorized/reFSNonconformist.tw
+++ b/src/uncategorized/reFSNonconformist.tw
@@ -47,6 +47,8 @@ A deputation of your citizens arrive at your penthouse and ask to see you. They'
committed to the new faith. They're looking quite grim, an unusual mood for a group of oligarchs who occupy favored places in a new religious hierarchy that affords them ample pleasure,
<<elseif $FSNonconformist == "Roman Revivalist">>
involved in your Revivalist vision. They're looking quite grim, an unusual mood for a group of oligarchs who compete with each other to project the upper-class Roman virtues of stoicism and self-possession,
+<<elseif $FSNonconformist == "Aztec Revivalist">>
+ involved in your Revivalist vision. They're looking quite grim, an unusual mood for a group of oligarchs who compete with each other to project the bloody virtues of their proud society,
<<elseif $FSNonconformist == "Edo Revivalist">>
involved in your Revivalist vision. They're looking quite grim, an unusual mood for a group of oligarchs who compete with each other to project the traditional Japanese virtue of stoicism,
<<elseif $FSNonconformist == "Arabian Revivalist">>
@@ -99,6 +101,8 @@ The nonconformist
originally moved to the Free Cities to get away from religion entirely, and has never missed a chance to register disdain for the new faith. Unfortunately, it seems that they've now edged over into open heresy. Typically, they're going about it in a hypocritical way. It's rumored that they've engaged the services of a charismatic itinerant preacher of one of the more popular old world faiths, and intend to bring him to the arcology to inveigh against the chattel religion.
<<elseif $FSNonconformist == "Roman Revivalist">>
has been a longtime skeptic of historical revivalism, publicly deploring it as a childish game of dress-up. This never got much traction, since Rome has become quite fashionable here. Frustrated, they're rumored to be planning a change of approach. Despairing of getting the population to give up the Roman project, they're going to set up a competing Gaulish Revivalism. The quixotic effort is almost certainly doomed to fail, but the oligarchs fear it will be a distraction.
+<<elseif $FSNonconformist == "Aztec Revivalist">>
+ has been a longtime skeptic of historical revivalism, publicly deploring it as a childish game of dress-up. This never got much traction, since Aztec has become quite fashionable here. Frustrated, they're rumored to be planning a change of approach. Despairing of getting the population to give up the Aztec project, they're going to set up a competing Spanish Revivalism. The quixotic effort is almost certainly doomed to fail, but the oligarchs fear it will be a distraction.
<<elseif $FSNonconformist == "Edo Revivalist">>
has been a longtime skeptic of historical revivalism, publicly deploring it as a childish game of dress-up. This never got much traction, since Edo Japan has become quite fashionable here. Frustrated, they're rumored to be planning a change of approach. Despairing of getting the population to give up the Japanese project, they're going to set up a competing Korean Revivalism. The quixotic effort is almost certainly doomed to fail, but the oligarchs fear it will be a distraction.
<<elseif $FSNonconformist == "Arabian Revivalist">>
@@ -135,7 +139,7 @@ The nonconformist is far too prominent and prosperous to make this an easy dilem
reveals the defeminized slave and then frees her, completing her return to maleness according to Gender Radicalism's own tenets, @@.red;setting back acceptance@@ of the society model.
<<set $arcologies[0].FSGenderRadicalist -= 10>>
<<elseif $FSNonconformist == "Repopulation Efforts">>
- publishes his information, @@.red;greatly hindering@@ the adoption of mass reproduction.<<if $PC.preg > 16>> Your own gravidity is brought into question as well, @@.red;hurting your public opinion.@@<<set $rep -= ($PC.preg*10)>><</if>>
+ publishes his information, @@.red;greatly hindering@@ the adoption of mass reproduction.<<if $PC.preg > 16>> Your own fecundity is brought into question as well, @@.red;hurting your public opinion.@@<<set $rep -= ($PC.preg*10)>><</if>>
<<set $arcologies[0].FSRepopulationFocus -= 10>>
<<elseif $FSNonconformist == "Eugenics">>
hosts a public wedding commemorating their love. This @@.red;sets back acceptance@@ of your class system and hinders Eugenics. The Societal Elite are @@.red;furious@@ at your inaction.
@@ -177,6 +181,9 @@ The nonconformist is far too prominent and prosperous to make this an easy dilem
<<elseif $FSNonconformist == "Roman Revivalist">>
offers their Gaulish Revivalism alternative with great fanfare. It fizzles out within a week, mostly because its main backer is privately against all revivalism, but during that time it serves as a focal point for many citizens who are privately impatient with Roman revivalism. This imbroglio @@.red;sets back acceptance@@ of your revivalist project.
<<set $arcologies[0].FSRomanRevivalist -= 10>>
+ <<elseif $FSNonconformist == "Aztec Revivalist">>
+ offers their Spanish Revivalism alternative with great fanfare. It fizzles out within a week, mostly because its main backer is privately against all revivalism, but during that time it serves as a focal point for many citizens who are privately impatient with Aztec revivalism. This imbroglio @@.red;sets back acceptance@@ of your revivalist project.
+ <<set $arcologies[0].FSAztecRevivalist -= 10>>
<<elseif $FSNonconformist == "Edo Revivalist">>
offers their Korean Revivalism alternative with great fanfare. It fizzles out within a week, mostly because its main backer is privately against all revivalism, but during that time it serves as a focal point for many citizens who are privately impatient with Edo revivalism. This imbroglio @@.red;sets back acceptance@@ of your revivalist project.
<<set $arcologies[0].FSEdoRevivalist -= 10>>
@@ -243,6 +250,8 @@ The nonconformist is far too prominent and prosperous to make this an easy dilem
brings in their pet dissenting preacher, who finds himself caught in a duel from the pulpit with a noted cleric of the slave religion, brought in from outside the arcology on short notice. The debate receives a great deal of attention, and is generally agreed to have been a close-fought draw.
<<elseif $FSNonconformist == "Roman Revivalist">>
offers their Gaulish Revivalism alternative with fanfare, but fanfare is something that the Romans could certainly manage. The nasty little attempt is forgotten in a day of public gladiatorial combat, chariot racing, and giveaways for the poorer citizens.
+ <<elseif $FSNonconformist == "Aztec Revivalist">>
+ offers their Spanish Revivalism alternative with fanfare, but fanfare is something that the Aztecs would never acknowledge. The nasty little attempt does nothing after a day of prayer, bloodletting and slave sacrifice.
<<elseif $FSNonconformist == "Edo Revivalist">>
offers their Korean Revivalism alternative with fanfare, but fanfare is inelegant next to Edo revivalism. The nasty little attempt has its day, but looks gauche next to the stately grace of your project.
<<elseif $FSNonconformist == "Arabian Revivalist">>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index db68f3bb432..1ab6cd70d99 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -516,6 +516,8 @@ She waits anxiously for your decision.
<<set $activeSlave.slaveName = $activeSlave.birthName>>
<<elseif $arcologies[0].FSRomanRevivalist > 20>>
<<set $activeSlave.slaveName = $romanSlaveNames.random()>>
+<<elseif $arcologies[0].FSAztecRevivalist > 20>>
+ <<set $activeSlave.slaveName = $aztecSlaveNames.random()>>
<<elseif $arcologies[0].FSEgyptianRevivalist > 20>>
<<set $activeSlave.slaveName = $ancientEgyptianSlaveNames.random()>>
<<elseif $arcologies[0].FSEdoRevivalist > 20>>
@@ -772,7 +774,7 @@ You look up the $relationType. She costs ¤$slaveCost, a bargain, but you won't
/* 000-250-006 */
/* <<if $seeImages == 1>><<SlaveArt $eventSlave 2 0>><</if>> */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
+ <div class="imageRef lrgImg">
<<SlaveArt $eventSlave 2 0>>
</div>
<</if>>
@@ -997,7 +999,7 @@ She waits anxiously for your decision.
<<set $activeSlave.behavioralFlaw = either("none", "none", "none", "arrogant", "bitchy", "odd", "anorexic", "hates men", "hates women", "hates women")>>
<<set $activeSlave.weekAcquired = $week>>
<<RandomizeAttraction>>
-
+
<<slaveCost $activeSlave>>
<<NationalityToName $activeSlave>>
@@ -1005,6 +1007,8 @@ She waits anxiously for your decision.
<<set $activeSlave.slaveName = $activeSlave.birthName>>
<<elseif $arcologies[0].FSRomanRevivalist > 20>>
<<set $activeSlave.slaveName = $romanSlaveNames.random()>>
+<<elseif $arcologies[0].FSAztecRevivalist > 20>>
+ <<set $activeSlave.slaveName = $aztecSlaveNames.random()>>
<<elseif $arcologies[0].FSEgyptianRevivalist > 20>>
<<set $activeSlave.slaveName = $ancientEgyptianSlaveNames.random()>>
<<elseif $arcologies[0].FSEdoRevivalist > 20>>
diff --git a/src/uncategorized/recETSWorkaround.tw b/src/uncategorized/recETSWorkaround.tw
index 347dd16b1f5..1529f444dda 100644
--- a/src/uncategorized/recETSWorkaround.tw
+++ b/src/uncategorized/recETSWorkaround.tw
@@ -264,6 +264,8 @@ They giggle and kiss each other rather passionately, their miniskirts becoming p
<<set $activeSlave.slaveName = $activeSlave.birthName>>
<<elseif $arcologies[0].FSRomanRevivalist > 20>>
<<set $activeSlave.slaveName = $romanSlaveNames.random()>>
+<<elseif $arcologies[0].FSAztecRevivalist > 20>>
+ <<set $activeSlave.slaveName = $aztecSlaveNames.random()>>
<<elseif $arcologies[0].FSEgyptianRevivalist > 20>>
<<set $activeSlave.slaveName = $ancientEgyptianSlaveNames.random()>>
<<elseif $arcologies[0].FSEdoRevivalist > 20>>
diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw
index e143c42d796..3ab643f50f6 100644
--- a/src/uncategorized/reputation.tw
+++ b/src/uncategorized/reputation.tw
@@ -324,6 +324,29 @@ On formal occasions, you are announced as $PCTitle.
Continuing to use $language as the lingua franca of $arcologies[0].name rather than the storied Latin @@.red;disappoints@@ society and causes doubt about your revivalist project.
<<FSChange "RomanRevivalist" -2>>
<</if>>
+<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ <<if $PC.visualAge >= 35>>
+ Society @@.green;approves@@ of your advancing age, which advances the ancient Aztec ideal an experienced leader to the people.
+ <<FSChange "AztecRevivalist" 1>>
+ <</if>>
+ <<if $HeadGirl == 0>>
+ Society @@.red;disapproves@@ of you not having a Head Girl as an advisor and assistant.
+ <<FSChange "AztecRevivalist" -2>>
+ <<else>>
+ Society @@.green;approves@@ of your reliance on a Head Girl as an advisor and assistant.
+ <<FSChange "AztecRevivalist" 2>>
+ <</if>>
+ <<if $PC.warfare < 50>>
+ Society @@.red;disapproves@@ of you not being properly trained in the art of combat.
+ <<FSChange "AztecRevivalist" -2>>
+ <<else>>
+ Society @@.green;approves@@ of having a leader, than can defend themselves properly in a life threatening situation.
+ <<FSChange "AztecRevivalist" 2>>
+ <</if>>
+ <<if $language != "Nahuatl">>
+ Continuing to use $language as the lingua franca of $arcologies[0].name rather than the revived Nahuatl @@.red;disappoints@@ society and causes doubt about your revivalist project.
+ <<FSChange "AztecRevivalist" -3>>
+ <</if>>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
<<if $racialVarieties.length > 4>>
Society @@.green;strongly approves@@ of how you own a cornucopia of different races, which advances the ancient Egyptian ideal of cosmopolitan sex slavery.
diff --git a/src/uncategorized/rulesAssistant.tw b/src/uncategorized/rulesAssistant.tw
index c682cb273b4..19e6e24310b 100644
--- a/src/uncategorized/rulesAssistant.tw
+++ b/src/uncategorized/rulesAssistant.tw
@@ -617,6 +617,15 @@ Clothes:
<<RAChangeApply>>
<</link>> |
<</if>>
+<<if ($arcologies[0].FSAztecRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtHuipil == 1)>>
+ //FS//
+<<link "Huipil">>
+ <<set $currentRule.clothes = "a huipil", $currentRule.choosesOwnClothes = 0>>
+ <<RAChangeClothes>>
+ <<RAChangeSave>>
+ <<RAChangeApply>>
+<</link>> |
+<</if>>
<<if ($arcologies[0].FSEdoRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtKimono == 1)>>
//FS//
<<link "Kimono">>
diff --git a/src/uncategorized/saChoosesOwnClothes.tw b/src/uncategorized/saChoosesOwnClothes.tw
index ab783646d8f..bf9292420db 100644
--- a/src/uncategorized/saChoosesOwnClothes.tw
+++ b/src/uncategorized/saChoosesOwnClothes.tw
@@ -22,6 +22,9 @@
<<elseif ($arcologies[0].FSRomanRevivalist > 0) && (random(1,3) == 1)>>
she commonly sees others wearing togas and is drawn to doing so herself.
<<set $slaves[$i].clothes = "a toga">>
+ <<elseif ($arcologies[0].FSAztecRevivalist > 0) && (random(1,3) == 1)>>
+ and wears a very revealing huipil, that accentuates her body.
+ <<set $slaves[$i].clothes = "a huipil">>
<<elseif ($arcologies[0].FSEdoRevivalist > 0) && (random(1,3) == 1)>>
she commonly sees others wearing kimonos and is drawn to doing so herself.
<<set $slaves[$i].clothes = "a kimono">>
@@ -341,4 +344,4 @@
<</if>>
-<</if>> /* closes MB check */
\ No newline at end of file
+<</if>> /* closes MB check */
diff --git a/src/uncategorized/saChoosesOwnJob.tw b/src/uncategorized/saChoosesOwnJob.tw
index 5806129288d..b9dc70de95e 100644
--- a/src/uncategorized/saChoosesOwnJob.tw
+++ b/src/uncategorized/saChoosesOwnJob.tw
@@ -335,6 +335,14 @@
is a devoted slave, so $pronoun decides $pronoun can best serve the state by raising money for the treasury, by selling $possessive body as a prostitute.
<<assignJob $slaves[$i] "whore">>
<</if>>
+ <<elseif ($arcologies[0].FSAztecRevivalist > 0)>>
+ <<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
+ is a devoted slave, so she decides she can best serve the empire by serving at the fertility temple.
+ <<assignJob $slaves[$i] "work in the brothel">>
+ <<else>>
+ is a devoted slave, so she decides she can best serve the empire by offering herself to the public.
+ <<set $slaves[$i].assignment = "serve the public", $slaves[$i].assignmentVisible = 1>>
+ <</if>>
<<elseif ($arcologies[0].FSPaternalist > 0)>>
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
decides to work in $brothelName, a respectable position for a slave in this enlightened arcology.
diff --git a/src/uncategorized/saGetMilked.tw b/src/uncategorized/saGetMilked.tw
index 1c751c61122..4ab4672cda5 100644
--- a/src/uncategorized/saGetMilked.tw
+++ b/src/uncategorized/saGetMilked.tw
@@ -448,6 +448,8 @@ gets milked this week.
<<switch $dairyDecoration>>
<<case "Roman Revivalist">>
<<set $arcologies[0].FSRomanRevivalist += $seed>>
+<<case "Aztec Revivalist">>
+ <<set $arcologies[0].FSAztecRevivalist += $seed>>
<<case "Egyptian Revivalist">>
<<set $arcologies[0].FSEgyptianRevivalist += $seed>>
<<case "Edo Revivalist">>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 5521972c17d..a84e9e1292f 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -267,6 +267,7 @@
<<if random(1,100) > 90>>
<<if $slaves[$i].clothes != "conservative clothing">>
<<if $slaves[$i].clothes != "a toga">>
+<<if $slaves[$i].clothes != "a huipil">>
<<if $slaves[$i].clothes != "a slutty qipao">>
<<if $slaves[$i].clothes != "restrictive latex">>
<<if $slaves[$i].clothes != "cutoffs and a t-shirt">>
@@ -322,6 +323,7 @@
<</if>>
<</if>>
<</if>>
+<</if>>
<<if ($slaves[$i].vaginalAccessory == "chastity belt")>>
<<if ($slaves[$i].devotion > 20)>>
diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw
index 6679985d237..65a9ff43965 100644
--- a/src/uncategorized/saServeThePublic.tw
+++ b/src/uncategorized/saServeThePublic.tw
@@ -252,8 +252,9 @@ Her appearance attracted $beauty members of the public (<<print Math.trunc($beau
<</if>>
<<set $injury = 0>>
-<<if ($slaves[$i].curatives > 0) || $slaves[$i].inflationType == "curative">>
- The drugs <<if $slaves[$i].inflationType == "curative">>she holds within her gut<<else>>she's on<</if>> protect her from the wear of being a slut.
+<<if $slaves[$i].assignment == "serve in the club">>
+<<elseif $slaves[$i].curatives > 0>>
+ The drugs she's on protect her from the wear of being a slut.
<<elseif ($slaves[$i].health < -50)>>
The stress of being a slut while ill is @@.red;very hard on her.@@
<<set $slaves[$i].health -= 10>>
@@ -938,6 +939,8 @@ Her appearance attracted $beauty members of the public (<<print Math.trunc($beau
<<switch $clubDecoration>>
<<case "Roman Revivalist">>
<<set $arcologies[0].FSRomanRevivalist += $seed>>
+<<case "Aztec Revivalist">>
+ <<set $arcologies[0].FSAztecRevivalist += $seed>>
<<case "Egyptian Revivalist">>
<<set $arcologies[0].FSEgyptianRevivalist += $seed>>
<<case "Edo Revivalist">>
@@ -1515,6 +1518,13 @@ Her appearance attracted $beauty members of the public (<<print Math.trunc($beau
<</if>>
<</if>>
<</if>>
+<<if $arcologies[0].FSAztecRevivalist != "unset">>
+ <<if ($slaves[$i].devotion > 75)>>
+ <<if ($slaves[$i].inteligence >= 2)>>
+ <<set $vignettes.push({text: "she indulged a citizen by following a fertility ritual completely,", type: "rep", effect: 1})>>
+ <</if>>
+ <</if>>
+<</if>>
<<if $arcologies[0].FSEgyptianRevivalist != "unset">>
<<set $vignettes.push({text: "she got extra attention from a group of citizens competing to get off with whores of each of the arcology's ethnic groups in the least time,", type: "rep", effect: 1})>>
<</if>>
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index 69a07db0b11..a26ebd728c0 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -240,8 +240,9 @@ Her appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a da
<</if>>
<<set $injury = 0>>
-<<if ($slaves[$i].curatives > 0) || $slaves[$i].inflationType == "curative">>
- The drugs <<if $slaves[$i].inflationType == "curative">>she holds inside her belly<<else>>she's on<</if>> protect her from the wear of whoring.
+<<if $slaves[$i].assignment == "work in the brothel">>
+<<elseif $slaves[$i].curatives > 0>>
+ The drugs she's on protect her from the wear of whoring.
<<elseif ($slaves[$i].health < -50)>>
The stress of whoring while ill is @@.red;very hard on her.@@
<<set $slaves[$i].health -= 10>>
@@ -936,6 +937,8 @@ In total, you were paid @@.yellowgreen;¤<<print Math.trunc($beauty*$FResult)>>@
<<switch $brothelDecoration>>
<<case "Roman Revivalist">>
<<set $arcologies[0].FSRomanRevivalist += $seed>>
+<<case "Aztec Revivalist">>
+ <<set $arcologies[0].FSAztecRevivalist += $seed>>
<<case "Egyptian Revivalist">>
<<set $arcologies[0].FSEgyptianRevivalist += $seed>>
<<case "Edo Revivalist">>
@@ -1541,6 +1544,13 @@ In total, you were paid @@.yellowgreen;¤<<print Math.trunc($beauty*$FResult)>>@
<</if>>
<</if>>
<</if>>
+<<if $arcologies[0].FSAztecRevivalist != "unset">>
+ <<if ($slaves[$i].devotion > 75)>>
+ <<if ($slaves[$i].inteligence >= 2)>>
+ <<set $vignettes.push({text: "she indulged a citizen by following a fertility ritual completely,", type: "rep", effect: 1})>>
+ <</if>>
+ <</if>>
+<</if>>
<<if $arcologies[0].FSEgyptianRevivalist != "unset">>
<<set $vignettes.push({text: "she got extra business from a group of citizens competing to get off with whores of each of the arcology's ethnic groups in the least time,", type: "cash", effect: 1})>>
<</if>>
diff --git a/src/uncategorized/saWorkAGloryHole.tw b/src/uncategorized/saWorkAGloryHole.tw
index dc44cedb636..f9a0f3a34db 100644
--- a/src/uncategorized/saWorkAGloryHole.tw
+++ b/src/uncategorized/saWorkAGloryHole.tw
@@ -137,6 +137,8 @@ $possessiveCap feelings, skills, and appearance do not matter. $pronounCap is co
<<switch $arcadeDecoration>>
<<case "Roman Revivalist">>
<<set $arcologies[0].FSRomanRevivalist += _seed>>
+<<case "Aztec Revivalist">>
+ <<set $arcologies[0].FSAztecRevivalist += _seed>>
<<case "Egyptian Revivalist">>
<<set $arcologies[0].FSEgyptianRevivalist += _seed>>
<<case "Edo Revivalist">>
diff --git a/src/uncategorized/schoolroom.tw b/src/uncategorized/schoolroom.tw
index 1ce053f9159..73ad62fe283 100644
--- a/src/uncategorized/schoolroom.tw
+++ b/src/uncategorized/schoolroom.tw
@@ -10,6 +10,8 @@ $schoolroomNameCaps is well-equipped, with wall screens to display lessons. Thes
<<switch $schoolroomDecoration>>
<<case "Roman Revivalist">>
showing the story of a famous Roman slave who sacrificed her life for the life of <<if def $PC.customTitle>>her $PC.customTitle<<elseif $PC.title != 0>>her master<<else>>her mistress<</if>>.
+<<case "Aztec Revivalist">>
+ showing the reenactment of a legendary story of a slave who ascended by offering her blood to the gods, and was granted eternal life.
<<case "Egyptian Revivalist">>
showing an interpretation of Egyptian history that attributes many great monuments to the enlightened use slave labor.
<<case "Edo Revivalist">>
diff --git a/src/uncategorized/seIndependenceDay.tw b/src/uncategorized/seIndependenceDay.tw
index 04cdf33df6e..3eb74d011bd 100644
--- a/src/uncategorized/seIndependenceDay.tw
+++ b/src/uncategorized/seIndependenceDay.tw
@@ -23,6 +23,8 @@ In the Free Cities, Independence Day falls on the day when the Free City achieve
the Keeper of the Blade and Chalice can command complete attention from <<if $PC.title == 1>>his arcology the moment he<<else>>her arcology the moment she<</if>> wishes.
<<elseif $arcologies[0].FSRomanRevivalist >= $FSLockinLevel*0.9>>
the First Consul can command complete attention from <<if $PC.title == 1>>his arcology the moment he<<else>>her arcology the moment she<</if>> wishes.
+ <<elseif $arcologies[0].FSAztecRevivalist >= $FSLockinLevel*0.9>>
+ the Head <<if $PC.title == 1>>Priest<<else>>Priestess<</if>> may demand unwavering faith and sacrifice for the honor of the gods.
<<elseif $arcologies[0].FSEgyptianRevivalist >= $FSLockinLevel*0.9>>
<<if $PC.title == 1>>
the Living God can command complete attention from his arcology the moment he wishes.
@@ -95,6 +97,8 @@ In the Free Cities, Independence Day falls on the day when the Free City achieve
as the Champion of the Faith can command complete attention from <<if $PC.title == 1>>his arcology the moment he<<else>>her arcology the moment she<</if>> wishes.
<<elseif $arcologies[0].FSRomanRevivalist >= $FSLockinLevel*0.6>>
as the Aedile, you command enough respect that your citizens will listen to you so long as you do not abuse the privilege.
+ <<elseif $arcologies[0].FSAztecRevivalist >= $FSLockinLevel*0.6>>
+ as the Tlatcani, you command enough respect that your citizens will listen to you so long as you do not abuse the privilege.
<<elseif $arcologies[0].FSEgyptianRevivalist >= $FSLockinLevel*0.6>>
as the Pharaoh, you command enough respect that your citizens will listen to you so long as you do not abuse the privilege.
<<elseif $arcologies[0].FSEdoRevivalist >= $FSLockinLevel*0.6>>
@@ -205,6 +209,12 @@ In the Free Cities, Independence Day falls on the day when the Free City achieve
<<elseif $arcologies[0].FSRomanRevivalist >= 40>>
You ask that your citizens will support Roman values.
<</if>>
+ <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ <<if $arcologies[0].FSAztecRevivalist >= 90>>
+ You speak warmly of the state of the new golden City of the Gods, and express a hope that this time, the empire will stand forever.
+ <<elseif $arcologies[0].FSAztecRevivalist >= 40>>
+ You ask that your citizens strengthen their belief in the Aztec Gods.
+ <</if>>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
<<if $arcologies[0].FSEgyptianRevivalist >= 90>>
You speak warmly of the state of the new land of the Nile, and express a hope that that most enduring of cultures shall endure again.
diff --git a/src/uncategorized/seLethalPit.tw b/src/uncategorized/seLethalPit.tw
index 7cefbea7055..7293ac30f24 100644
--- a/src/uncategorized/seLethalPit.tw
+++ b/src/uncategorized/seLethalPit.tw
@@ -52,6 +52,10 @@ This week's pit fight is between $fighterOne.slaveName and $fighterTwo.slaveName
They @@.green;passionately approve@@ of your hosting lethal combat between slaves; this advances ideas from antiquity about what public events should be.
<<set $rep += 20*$FSSingleSlaveRep*($arcologies[0].FSRomanRevivalist/$FSLockinLevel)>>
<<set $arcologies[0].FSRomanRevivalist += 0.4*$FSSingleSlaveRep>>
+<<else $arcologies[0].FSAztecRevivalist != "unset">>
+ They @@.green;approve@@ of your hosting lethal combat; this advances ideas that blood must flow as it did in ancient times.
+ <<set $rep += 10*$FSSingleSlaveRep*($arcologies[0].FSAztecRevivalist/$FSLockinLevel)>>
+ <<set $arcologies[0].FSAztecRevivalist += 0.2*$FSSingleSlaveRep>>
<</if>>
You review the rules - the combatants will use their choice of swords, and the fight will be to the death, with both combatants executed if no decision is reached. The winner will earn two complete days of rest, not to mention continued life. You take a moment to look over your girls before giving the word. After all, it's the last time you'll be seeing one of them alive.
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index 60fb855c9c2..4bff3713022 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -32,6 +32,8 @@ You prepare her for sale. Her response to being put up for purchase is
<<set $seed = []>>
<<if $arcologies[0].FSRomanRevivalist > 20>>
<<set $seed.push("roman")>>
+<<if $arcologies[0].FSAztecRevivalist > 20>>
+ <<set $seed.push("aztec")>>
<<elseif $arcologies[0].FSEgyptianRevivalist > 20>>
<<set $seed.push("egyptian")>>
<<elseif $arcologies[0].FSEdoRevivalist > 20>>
@@ -75,6 +77,21 @@ A reputable slave appraiser arrives promptly to inspect her and certify her qual
<</if>>
I have appraised your slave. As directed by law, my appraisal is based on her potential income in a brothel, with modification for any significant qualities. I have found the following.
<<set $appraiserGender = 1>>
+<<elseif $appraiser == "aztec">>
+ one of the arcology's slave examiners, comes elegantly in wearing a very richly ornamented cape and a simple headdress to accentuate her face.<<if $arcologies[0].FSRepopulationLaw == 1>> Her bronzed middle is noticeably swollen with pregnancy.<</if>> She acquaints herself with the slave and carries on a short inspection and a shorter conversation. She returns to you, goes on one knee, and follows by saying.
+ <<if def $PC.customTitle>>
+ "Your $PC.customTitle,
+ <<else>>
+ <<if $arcologies[0].FSAztecRevivalist >= $FSLockinLevel*0.9>>
+ "Piety,
+ <<elseif $arcologies[0].FSAztecRevivalist >= $FSLockinLevel*0.6>>
+ "Sanctity,
+ <<else>>
+ <<if $PC.title == 1>>
+ "Your Greantess,
+ <</if>>
+ <</if>>
+ I have appraised your slave. My appraisal is based on her potential income in a brothel, with modification for her special qualities. I have found the following.
<<elseif $appraiser == "egyptian">>
one of the arcology's traditional slave examiners, comes elegantly in wearing a simple gown shift that sweeps low, baring her bronzed back.<<if $arcologies[0].FSRepopulationLaw == 1>> Her gown is noticeably swollen with pregnancy.<</if>> She greets you warmly, and then turns to the slave. She inspects her and carries on a polite conversation with her, learning about her by talking with her. When she finishes, she turns to you and bows deeply.
<<if def $PC.customTitle>>
@@ -135,7 +152,7 @@ A reputable slave appraiser arrives promptly to inspect her and certify her qual
I have appraised your slave. My appraisal is based on her potential income in the whorehouse, with modification for special matters. As to them, I have found the following.
<<set $appraiserGender = 1>>
<<elseif $appraiser == "chinese">>
- an older and rather stout woman<<if $arcologies[0].FSRepopulationLaw == 1>>, with an noticeably heavy pregnancy,<</if>> in traditional Chinese dress, gives you a precise and proper greeting. She extracts a tablet from one of her wide sleeves and reviews video of the slave in action before performing a physical inspection. Then she seats herself, stows her tablet again, and recites in a didactic tone, "Honored
+ an older and rather stout woman<<if $arcologies[0].FSRepopulationLaw == 1>>, with a noticeably heavy pregnancy,<</if>> in traditional Chinese dress, gives you a precise and proper greeting. She extracts a tablet from one of her wide sleeves and reviews video of the slave in action before performing a physical inspection. Then she seats herself, stows her tablet again, and recites in a didactic tone, "Honored
<<if def $PC.customTitle>>
"$PC.customTitle,
<<else>>
@@ -502,6 +519,8 @@ A reputable slave appraiser arrives promptly to inspect her and certify her qual
<<if $appraiser == "roman">>
That is all." He rolls his screen-scroll up and tucks it into his toga, and nods. "A pleasure."
+<<elseif $appraiser == "aztec">>
+ That's all. Thank you." She turns to go, her long cape swiveling in the air, showing a glimpse of her <<if $arcologies[0].FSRepopulationLaw == 1>>fecund<<else>>pleasant<</if>> figure.
<<elseif $appraiser == "egyptian">>
That's all. Thank you for this delightful opportunity." She turns to go, but turns again in the doorway to offer another deep bow, this one so low that her linen dress discloses just a hint of her dimpled rear.
<<elseif $appraiser == "edo">>
@@ -1244,6 +1263,21 @@ __Bids Received__\
<</if>>
<</if>>
+<<if $activeSlave.combatSkill >= 1>>
+<<if $activeSlave.health > 40>>
+<<if $activeSlave.muscles > 25>>
+ <<if random(1,100) > 70>>
+ <br>''¤<<print 500*Math.trunc(($slaveCost*1.25)/500)>>'' from a fellow arcology owner building a recreation of the Great Aztec Empire. He's in the market for willing, strong and combat ready slaves, to bolster his empire
+ <<link "Accept bid">>
+ <<set $cash += 500*Math.trunc(($slaveCost*1.25)/500)>>
+ <<set $buyer = "aztec revivalist arcology">>
+ <<goto "Slave Sold">>
+ <</link>>
+ <</if>>
+<</if>>
+<</if>>
+<</if>>
+
<<if $activeSlave.combatSkill > 0>>
<<if $activeSlave.health > 40>>
<<if $activeSlave.muscles > 5>>
diff --git a/src/uncategorized/servantsQuarters.tw b/src/uncategorized/servantsQuarters.tw
index d3076e6656c..523542b48b8 100644
--- a/src/uncategorized/servantsQuarters.tw
+++ b/src/uncategorized/servantsQuarters.tw
@@ -10,6 +10,8 @@ $servantsQuartersNameCaps
<<switch $servantsQuartersDecoration>>
<<case "Roman Revivalist">>
are spartan, yet functional. At one end of the long dormitory there is an alcove with a shrine to the Roman goddess of domesticity.
+<<case "Aztec Revivalist">>
+ are simple, yet grandiose. In every corner stands a monument to a god, and as the sun peeks through, all the obsidian ornaments glisten with light.
<<case "Egyptian Revivalist">>
are utilitarian, yet warm and well-kept. At one end of the long dormitory there is an alcove with a shrine to the Egyptian goddess of servility.
<<case "Edo Revivalist">>
diff --git a/src/uncategorized/shops.tw b/src/uncategorized/shops.tw
index cdfd099512d..5733e576888 100644
--- a/src/uncategorized/shops.tw
+++ b/src/uncategorized/shops.tw
@@ -2,8 +2,87 @@
<<set $nextButton = "Back", $nextLink = "Main">>
-This is a section of the promenade filled with a variety of small, higher-end shops, salons, brothels, and clubs. You control this part of the arcology and all these businesses pay you rent.
-<<SectorSell>>
+This is a section of the promenade
+<<switch $sectors[$AS].type>>
+<<case "Shops">>
+ filled with a variety of small, higher-end shops, salons, brothels, and clubs. You control this part of the arcology and all these businesses pay you rent.
+<<case "Subjugationist">>
+ dedicated to $arcologies[0].FSSubjugationistRace subjugationism. There are genteel dining establishments with $arcologies[0].FSSubjugationistRace wait staff. Shops offer traditional slaving implements, including fine bespoke leather whips. To go by the shrieking, one of these is being tried on a shop's complimentary whipping targets.
+ <span id="result"><<link "Shop there">><<replace "#result">>Interested, you head in to see how the latest styles feel in hand. The fearful slave salesgirls offer you complimentary tries at the targets, of course. They barely manage to avoid bursting into tears, knowing that if they make the slightest mistake representing the shop to the arcology owner, they'll be chained up for whip trials, too. The rich handmade leather is supple and handy, and readily extracts throat rending screams from the slaves you're encouraged to try it on.<</replace>><</link>></span>
+<<case "Supremacist">>
+ dedicated to $arcologies[0].FSSupremacistRace supremacism. There are some select social establishments here which don't actually use any slaves at all, offering a surprisingly egalitarian atmosphere in which citizens of the master race can relax in each others' company without any subhuman filth present.
+ <span id="result"><<link "Put in an appearance">><<replace "#result">>You decide to stop in at one of these establishments, and of course your money's no good. You're welcomed with considerable bonhomie, and much less formality than you usually receive at social events in your arcology. Everyone's $arcologies[0].FSSupremacistRace here, and in that you're all equal, and all good friends. Everyone wants to have at least a quick word, and you stay longer than you originally meant to.<</replace>><</link>></span>
+<<case "Gender Radicalist">>
+ dedicated to Gender Radicalism. The shops here offer a bewildering cornucopia of sex toys. Citizens can kit themselves and their slaves out for anything, regardless of bodily layout. A female citizen is looking over the latest strap-ons, while a male peer is considering versions designed to enable double penetration by one person.
+ <span id="result"><<link "Try one">><<replace "#result">>You decide to try one of the latest models. Naturally, the store is eager to have you seen considering their products. The harness is very comfortable, and it <<if $PC.dick == 1>>equips you with a second phallus. The slave salesgirl lacks a vagina, but encourages you to try the setup on her anyway, promising that her backpussy can accept double penetration. It can.<<else>>provides you with an extremely large phallus, which cums from an internal reservior. The slave salesgirl encourages you to try the setup on her, promising that her holes can accomodate it. They can.<</if>><</replace>><</link>></span>
+<<case "Gender Fundamentalist">>
+ dedicated to Gender Fundamentalism. The establishments here are mostly focused on <<if $arcologies[0].FSRestart != "unset">>keeping slaves attractively feminine. There are shops offering all kinds of treatments, drugs, clothes, and furniture to satisfy even the most discerning lady<<else>>citizen reproduction with slaves. There are shops offering all kinds of treatments, drugs, clothes, and furniture to facilitate the succesful impregnation of one's chattel, along with a veriaty of beauty products to keep them soft and feminine<</if>>.
+ <span id="result"><<link "Get a massage">><<replace "#result">>You decide to put in an appearance at a tenant business, and the massage parlors are of course very eager to offer you complimentary services. The masseuse is very well-trained, and not at all a sex toy with poor massage skills as an veneer for handjob services. She releases the muscle soreness from your latest workout, and uses her delicate touch to bring you to an enjoyable orgasm; she <<if $PC.dick == 1>>catches your cum in her mouth and swallows it<<else>>swallows your femcum<</if>> with every appearance of appetite.<</replace>><</link>></span>
+<<case "Paternalist">>
+ dedicated to Paternalism. Many of the establishments here cater to slaves, some even to slaves exclusively. They offer luxurious and relaxing treatment for good girls whose owners send them here as rewards. Trusted slaves enter and exit these without any visible restraint or accompaniment, looking for all the world like pretty girls on a day out.
+ <span id="result"><<link "Tour the area">><<replace "#result">>You decide to put in an appearance at these establishments, and tour their front lobbies, listening politely to the educated slave receptionists' polished descriptions of the services offered. You stay out of the back areas, of course; those are for relaxing slaves, and owners typically leave them be while they're there. Most of the slaves moving through the area know who you are, and many of them are confident enough to give you respectful smiles.<</replace>><</link>></span>
+<<case "Degradationist">>
+ dedicated to Degradationism. The stores for slaveowners sell all sorts of inventive restraints and punishments. There are also a few of a uniquely Degradiationist establishment: torture parlors, where any citizen can send a slave for punishment by paying customers, within bounds defined by the owner.
+ <span id="result"><<link "Try a round">><<replace "#result">>You decide to put in an appearance at a tenant business and show off your skills, and the torture parlors are very eager to have you accept a complimentary round. You select a pretty girl sent to a torture parlor for some unknown failing by her owner, and use a switch to flog her calves, inner thighs, and breasts until she loses control of her bladder. <<if $PC.slaving >= 100>>You're skilled at this. The trick is to stop just short of blows that will break the skin, applying all possible pain without any inconvenient blood.<<else>>There's a bit of blood, but her owner will expect that.<</if>><</replace>><</link>></span>
+<<case "Body Purist">>
+ dedicated to Body Purism. There are high end clinics for citizens, with medical specialists skilled in the latest longevity treatments. Shops offer beauty treatments, anti-aging products, and personal massage services. The slave masseuses are naturally beautiful, and their bodies are obviously part of the services offered.
+ <span id="result"><<link "Get a massage">><<replace "#result">>You decide to put in an appearance at a tenant business, and the massage parlors are of course very eager to offer you complimentary services. The masseuse is very well-trained, and not at all a sex toy with poor massage skills as an veneer for handjob services. She releases the muscle soreness from your latest workout, and uses her delicate touch to bring you to an enjoyable orgasm; she <<if $PC.dick == 1>>catches your cum in her mouth and swallows it<<else>>swallows your femcum<</if>> with every appearance of appetite.<</replace>><</link>></span>
+<<case "Transformation Fetishist">>
+ dedicated to Transformation Fetishism. Autosurgeries are expensive, and require a lot of infrastructure, so almost all of your citizens have to send their slaves to clinics for surgical transformation. These establishments attempt to differentiate themselves by specializing in different surgeries, and advertising what they're best at.
+ <span id="result"><<link "Shop around">><<replace "#result">>You decide to shop around the best surgery clinics, to put in an appearance and check out the latest developments available to citizens less exalted than yourself. The slave salesgirls are all heavily modified silicone bimbos, with an emphasis on whatever their owner's surgical specialty is. The lip specialists' salesgirls have facepussies so huge they can't talk at all, so they wear touchscreens around their necks that do the talking for them.<</replace>><</link>></span>
+<<case "Youth Preferentialist">>
+ dedicated to Youth Preferentialism. The shops here are quite varied. Some, like the tailors, only betray their focus on young slaves by their selections of schoolgirl outfits, girlish leotards, and the like. There are several high-end slave trainers who specialize in maximizing slaves' <<if $seeDicks != 0>>vaginal and <</if>>anal skills while they're still virgins, with instruction only.
+ <span id="result"><<link "Look in on the classes">><<replace "#result">>You decide to put in an appearance and look into the training sessions. Of course, the trainers are very eager to share all the details with the arcology owner, and have you seen displaying an interest in their work. You're shown a classroom of obedient young slaves, right at sale age, paying rapt attention to a male trainer and a slave at the head of the classroom. He's reviewing how to relax during one's first time before 'deflowering' the teacher's assistant, whose <<if $seeDicks > 25>>asshole is allowed to rest and return to virgin tightness<<else>>hymen is surgically restored<</if>> between sessions.<</replace>><</link>></span>
+<<case "Maturity Preferentialist">>
+ 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 libidoes 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.
+ <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.
+ <span id="result"><<link "Shop there">><<replace "#result">>You decide to look in on the crane showroom, to see how citizens who don't own enough slaves to do the lifting and carrying are served. The huge-boobed slave salesgirls show you a variety of wheeled cranes that can help support a slave's breasts if they get too big for her to walk, and she needs to go somewhere. You have other slaves to help with that, and mechanical assistance built into your penthouse, but not everyone does. The salesgirls work in pairs, so one of them can unbutton her tentlike blouse and demonstrate the merchandise with her monstrous udders.<</replace>><</link>></span>
+<<case "Pastoralist">>
+ dedicated to Pastoralism. Milking is mostly done elsewhere, so the establishments here are a curious mix of farm supply stores and eateries. You can sample all kinds of ice cream, shakes, smoothies, cheeses, butter, and other dairy products here, all made from creamy human milk drawn from a busty slavegirl's breasts. <<if $seeDicks > 0>>There are also all kinds of slave beauty products and foods made from 'the other slavegirl milk,' cum.<</if>>
+ <span id="result"><<link "Tour the kitchens">><<replace "#result">>The eateries are very eager to have you seen inspecting their equipment and methods, and roll out the red carpet for you as they show you around. All kinds of old world culinary skill is on display here: artisan cheesemaking, butter hand-churned by muscular slaves, sweet custards and delicate flans that could compete in any dessert contest in the world. It's all so very refined and normal that it's quite easy to forget completely that the milk that is the basis of all this food comes from slaves.<</replace>><</link>></span>
+<<case "Physical Idealist">>
+ dedicated to Physical Idealism. There are supplement shops and workout equipment stores here, but they're small and packed into the spaces between all the gyms. These are some of the best patronized gyms in the world, because not only do physical idealists work out, there's a strong inclination to work out in public.
+ <span id="result"><<link "Leg day">><<replace "#result">>It's all very positive, and the one unspoken rule is not to disparage others, but there's definitely competition. So when you step forward and get a complimentary day pas from one of the bubbly, permed slavegirl receptionists, you have an audience. What kind of definition you've got in your quads is going to be a subject of conversation today, but you've got confidence. You lift, and receive respectful complements and bro-fists. Then you take your turn spotting others, an honor your citizens greatly appreciate.<</replace>><</link>></span>
+<<case "Chattel Religionist">>
+ dedicated to Chattel Religionism. The stores offer all the items useful to a slaveowner who holds the new faith: proper slave restraints and penitent slave garments, of course, but also fine oils and incense, candles, tapers, and other devotional necessities. There are also correctional convents for the assistance of citizens with wayward slaves.
+ <span id="result"><<link "Visit the convents">><<replace "#result">>As a leader of the new faith, your visitation rights on these convents are unquestioned, and their owners are indeed eager to have you look around and offer your revered advice. The average citizen with only a slave or two often needs help keeping girls within the faith. The convents are severe houses of correction, and the sounds of prayer and penitence are omnipresent. In one nave, a slave prostrates herself before a religious icon, praying in a loud, desperate tone while a <<if $seeDicks < 100>>a futanari in nun's attire<<else>>a man in monk's attire<</if>> fucks her mercilessly from behind.<</replace>><</link>></span>
+<<case "Roman Revivalist">>
+ dedicated to Roman Revivalism. Since the forums are out on the arcology's plazas, there are fewer stores here. There are eateries, from which the sharp smell of //garum// is distinctly identifiable, but most of the space is occupied by hypocaust baths, which are free to enter but include various concession stands run by slaves.
+ <span id="result"><<link "Clean yourself">><<replace "#result">>A good Roman trip to the baths serves to cleanse, but it's a social experience, too. After being oiled down by a skilled slave, you work out in the proper nude, and then have the oil and any dirt scraped off your skin with by another slave. Then you make your way across the heated floor through a set of baths of varying temperatures, ending in a large and egalitarian space where many naked citizens of the new Rome are sharing the news of teh day. You're welcomed with surprise, but also with comradeship, and made to feel welcome.<</replace>><</link>></span>
+<<case "Aztec Revivalist">>
+ //I need content!//
+<<case "Egyptian Revivalist">>
+ dedicated to Egyptian Revivalism. There are a bewildering multiplicity of shops here; ancient Egypt is wonderfully fertile of linen fashion, fine jewelry, perfumes, incense, and other luxury goods. Beautiful warm-skinned slavegirls of all races have wares in hand to offer citizens who pass by, and they seem well-treated.
+ <span id="result"><<link "Shop around">><<replace "#result">>You decide to tour the shops; with so much fine merchandise on offer, it's possible that someone's selling something that even you haven't heard of, and it's always good to see and be seen. The slave salesgirls are welcoming, and most are so well-trained that despite knowing who you are, they treat you with the same friendly courtesy that they offer everyone. They all offer you the peculiar straight-down curtsey that allows them to keep their necks straight, since they're all wearing gradually melting perfume cakes atop their hair, making them glisten with beguiling scent.<</replace>><</link>></span>
+<<case "Edo Revivalist">>
+ dedicated to Edo Revivalism. There are strict restrictions on the establishments' decor here, so //tatami// mats and paper partitions are ubiquitous. There are handsome //sake// shops and tea rooms offering the traditional ceremony, and //kabuki// theaters offering the traditional performance, with modern plots and themes.
+ <span id="result"><<link "See a show">><<replace "#result">>As soon as you enter a theater, the play stops, and refined slave attendants usher you forward to the place of honor. None of the citizens present resent the interruption; having you here is a great addition to the performance. The actors bow deeply to you and resume. The classical dance drama is almost impenetrable to outsiders, and the modernity of the characters and events would not be at all decipherable. Once you catch the thread, though, the richness of the allegory towards Free Cities personages and events is quite enjoyable.<</replace>><</link>></span>
+<<case "Arabian Revivalist">>
+ dedicated to Arabian Revivalism. The thriving mercantilism isn't limited to the slave markets, so many floors below; there are a bewildering variety of shops and stalls here, in no discernible order. Particolored cloth awnings, stacked goods, and bustling menial slaves constantly obscure your view, as pretty slavegirls hawking luxurious goods do their best to catch your eye.
+ <span id="result"><<link "Visit a coffee house">><<replace "#result">>But you disappoint them, even though some of them artfully manage to fall out of their slinky silk garments as you pass. You look into a little coffeehouse, densely packed with citizens drinking the strong, hot beverage out of tiny china and discussing the news of teh day. Coffeehouses are democratic sorts of places and you're welcomed with comradely warmth; prosperous citizens shuffle and pack a little closer to make you a space, and a steaming cup full of almost midnight black coffee appears before you, as if from nowhere.<</replace>><</link>></span>
+<<case "Chinese Revivalist">>
+ dedicated to Chinese Revivalism. The longest continuous cultural history humanity has provides so much material that no two establishments here fill quite the same niche. There are calligraphy schools and Confucian academies to teach ignorant citizens how to fit in. There are shops selling traditional cures and the latest pharmacological wonders side by side. There are even martial arts schools.
+ <span id="result"><<link "Exercise yourself">><<replace "#result">>You look into one of these. The students are exercising, moving through a series of forms in unison. The teacher recognizes you, <<if $PC.warfare >= 100>>and eagerly beckons you to join. Your martial skill is well known, and he's not disappointed. You're familiar with the forms, and join them seamlessly. Much later, when the exercise is done, the students are extremely pleased to discover exactly who their skilful temporary classmate was.<<else>>and gives you a doubtful, questioning glance, politely asking whether you can join with credit to yourself, all without words. You nod and pick up the forms, having a basic familiarity with them. They're difficult, but you're able to get through the enjoyable exercise with credit.<</if>><</replace>><</link>></span>
+<<case "Repopulationist">>
+ dedicated to Repopulationism. The shops here offer a lovely mix of sex toys, fertility agents, maternity wear and furniture to fit even the biggest pregnancy. An attractive slave salesgirl with a huge belly is demonstrating the proper use of a swing designed to accommodate her added heft to a female citizen just beginning to show and her curious husband.
+ <span id="result"><<link "Give the swing a try">><<replace "#result">>You wait for the couple to leave before approaching the hapless girl and placing a hand on her vulnerable middle. She squeaks in surprise before she realizes just who is browsing her toys and the goods between her legs. <<if $PC.preg > 20>>Spreading her legs, you find that she is suspended at the perfect height for you to comfortably penetrate her; or she would be, if your own rounded middle wasn't pushing into her own. She asks for a little help getting down, and afterwards, shows you to a series of harness designed to hold a girl with her belly dangling beneath her. The perfect toy for the very pregnant slaveowner hoping to plow her equally gravid chattel.<<elseif $PC.dick == 1>>Spreading her legs, you find that she is suspended at the perfect height for you to comfortably penetrate her.<<else>> Picking out an attractive strap-on, donning it, and spreading her legs, you find that she is suspended at the perfect height for you to comfortably penetrate her.<</if>> Even better, the swing handles her weight, so no sprained back!<</replace>><</link>></span>
+<<case "Eugenics">>
+ dedicated to Eugenics. You knew the individuals drawn into your society had connections, but you had no idea they were this extensive! If you can think of it, a shop here is selling it; though they are not cheap, only the the finest available merchandise is for sale here. Numerous recognizable faces browse the storefronts, accompanied by their favorite chattel, and upon noticing you, vie for your valuable attention.
+ <<if $PC.preg > 20 && $PC.pregSource == -1>>
+ <span id="result"><<link "Shop around">><<replace "#result">>You decide to waddle between the shops; with so much fine merchandise on offer, it's possible that someone's selling something to fufill your growing craving, and it's always good to see and be seen, especially with a middle rounded with a superiour child. The slave salesgirls are accommodating and welcoming, most are so well-trained that they treat you with the respect a memeber of the Societal Elite deserves. They all offer you the peculiar straight-down curtsey that allows them lift their skirts, reveiling the appropriate chastity.<</replace>><</link>></span>
+ <<elseif $PC.title == 1>>
+ <span id="result"><<link "Shop around">><<replace "#result">>You decide to wander between the shops; with so much fine merchandise on offer, it's possible that someone's selling something to catch your descerning eye, and it's always good to see and be seen. The slave salesgirls are welcoming and most are so well-trained that they treat you with the respect a memeber of the Societal Elite deserves. They all offer you the peculiar straight-down curtsey that allows them lift their skirts, reveiling the appropriate chastity. You end up leaving the stores with several fancy chastity belts and an amazing suit you can't wait to debute at your next social meeting.<</replace>><</link>></span>
+ <<else>>
+ <span id="result"><<link "Shop around">><<replace "#result">>You decide to wander between the shops; with so much fine merchandise on offer, it's possible that someone's selling something to catch your descerning eye, and it's always good to see and be seen. The slave salesgirls are welcoming and most are so well-trained that they treat you with the respect a memeber of the Societal Elite deserves. They all offer you the peculiar straight-down curtsey that allows them lift their skirts, reveiling the appropriate chastity. You end up leaving the stores with several fancy chastity belts, a bag of tasty treats and an alluring dress you can't wait to debute at your next social meeting.<</replace>><</link>></span>
+ <</if>>
+<<default>>ERROR: bad sector type
+<</switch>>
+<<if $sectors[$AS].type == "Shops">><<SectorSell>><</if>>
<br>
<<if $brothel == 0>>
@@ -16,4 +95,158 @@ This is a section of the promenade filled with a variety of small, higher-end sh
<br>
[[Build a club to serve as a focal point for public sluts|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $club = 5, $sectors[$AS].type = "Club"]]
//Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>> and will incur upkeep costs//
+<</if>>
+
+<<if $sectors[$AS].type == "Shops">>
+<<if $FSAnnounced>>
+<<if $arcologies[0].FSSubjugationist != "unset">>
+ <<if $FSPromenade.Subjugationist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Subjugationist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.Subjugationist = 1, $sectors[$AS].type = "Subjugationist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<</if>>
+<<if $arcologies[0].FSSupremacist != "unset">>
+ <<if $FSPromenade.Supremacist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Supremacist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.Supremacist = 1, $sectors[$AS].type = "Supremacist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<</if>>
+<<if $arcologies[0].FSGenderRadicalist != "unset">>
+ <<if $FSPromenade.GenderRadicalist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Gender Radicalist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.GenderRadicalist = 1, $sectors[$AS].type = "GenderRadicalist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSGenderFundamentalist != "unset">>
+ <<if $FSPromenade.GenderFundamentalist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Gender Fundamentalist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.GenderFundamentalist = 1, $sectors[$AS].type = "GenderFundamentalist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<</if>>
+<<if $arcologies[0].FSPaternalist != "unset">>
+ <<if $FSPromenade.Paternalist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Paternalist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.Paternalist = 1, $sectors[$AS].type = "Paternalist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSDegradationist != "unset">>
+ <<if $FSPromenade.Degradationist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Degradationist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.Degradationist = 1, $sectors[$AS].type = "Degradationist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<</if>>
+<<if $arcologies[0].FSBodyPurist != "unset">>
+ <<if $FSPromenade.BodyPurist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Body Purist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.BodyPurist = 1, $sectors[$AS].type = "BodyPurist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSTransformationFetishist != "unset">>
+ <<if $FSPromenade.TransformationFetishist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Transformation Fetishist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.TransformationFetishist = 1, $sectors[$AS].type = "TransformationFetishist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<</if>>
+<<if $arcologies[0].FSYouthPreferentialist != "unset">>
+ <<if $FSPromenade.YouthPreferentialist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Youth Preferentialist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.YouthPreferentialist = 1, $sectors[$AS].type = "YouthPreferentialist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSMaturityPreferentialist != "unset">>
+ <<if $FSPromenade.MaturityPreferentialist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Subjugationist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.MaturityPreferentialist = 1, $sectors[$AS].type = "Maturity Preferentialist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<</if>>
+<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
+ <<if $FSPromenade.SlimnessEnthusiast == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Slimness Enthusiast establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.SlimnessEnthusiast = 1, $sectors[$AS].type = "SlimnessEnthusiast"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSAssetExpansionist != "unset">>
+ <<if $FSPromenade.AssetExpansionist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Asset Expansionist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.AssetExpansionist = 1, $sectors[$AS].type = "AssetExpansionist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<</if>>
+<<if $arcologies[0].FSPastoralist != "unset">>
+ <<if $FSPromenade.Pastoralist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Pastoralist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.Pastoralist = 1, $sectors[$AS].type = "Pastoralist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSPhysicalIdealist != "unset">>
+ <<if $FSPromenade.PhysicalIdealist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Physical Idealist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.PhysicalIdealist = 1, $sectors[$AS].type = "PhysicalIdealist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<</if>>
+<<if $arcologies[0].FSRepopulationFocus != "unset">>
+ <<if $FSPromenade.Repopulationist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Repopulationist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.Repopulationist = 1, $sectors[$AS].type = "Repopulationist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSRestart != "unset">>
+ <<if $FSPromenade.Eugenics == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Eugenics establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.Eugenics = 1, $sectors[$AS].type = "Eugenics"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<</if>>
+<<if $arcologies[0].FSChattelReligionist != "unset">>
+ <<if $FSPromenade.ChattelReligionist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Chattel Religionist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.ChattelReligionist = 1, $sectors[$AS].type = "ChattelReligionist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<</if>>
+<<if $arcologies[0].FSRomanRevivalist != "unset">>
+ <<if $FSPromenade.RomanRevivalist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Roman Revivalist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.RomanRevivalist = 1, $sectors[$AS].type = "RomanRevivalist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
+ <<if $FSPromenade.AztecRevivalist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Aztec Revivalist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.AztecRevivalist = 1, $sectors[$AS].type = "AztecRevivalist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
+ <<if $FSPromenade.EgyptianRevivalist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Egyptian Revivalist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.EgyptianRevivalist = 1, $sectors[$AS].type = "EgyptianRevivalist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
+ <<if $FSPromenade.EdoRevivalist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Edo Revivalist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.EdoRevivalist = 1, $sectors[$AS].type = "EdoRevivalist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
+ <<if $FSPromenade.ArabianRevivalist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Arabian Revivalist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.ArabianRevivalist = 1, $sectors[$AS].type = "ArabianRevivalist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
+ <<if $FSPromenade.ChineseRevivalist == 0>>
+ <br>
+ [[Upgrade this sector to appeal to Chinese Revivalist establishments|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FSPromenade.ChineseRevivalist = 1, $sectors[$AS].type = "ChineseRevivalist"]]
+ //Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
+ <</if>>
+<</if>>
+<</if>>
<</if>>
\ No newline at end of file
diff --git a/src/uncategorized/slaveGenerationWidgets.tw b/src/uncategorized/slaveGenerationWidgets.tw
index da8402eaf85..e6364745ba8 100644
--- a/src/uncategorized/slaveGenerationWidgets.tw
+++ b/src/uncategorized/slaveGenerationWidgets.tw
@@ -421,6 +421,8 @@
<<set $args[0].slaveName = $chattelReligionistSlaveNames.random()>>
<<elseif $arcologies[0].FSRomanRevivalist > 20>>
<<set $args[0].slaveName = $romanSlaveNames.random()>>
+<<elseif $arcologies[0].FSAztecRevivalist > 20>>
+ <<set $args[0].slaveName = $aztecSlaveNames.random()>>
<<elseif $arcologies[0].FSEgyptianRevivalist > 20>>
<<set $args[0].slaveName = $ancientEgyptianSlaveNames.random()>>
<<elseif $arcologies[0].FSEdoRevivalist > 20>>
@@ -851,6 +853,12 @@
<<else>>
<<set $args[0].accent = $seed>>
<</if>>
+<<case "Aztec Revivalist">>
+ <<if $language == "Nahuatl">>
+ <<set $args[0].accent = 0>>
+ <<else>>
+ <<set $args[0].accent = $seed>>
+ <</if>>
<<case "Ancient Egyptian Revivalist">>
<<if $language == "Ancient Egyptian">>
<<set $args[0].accent = 0>>
@@ -883,4 +891,4 @@
<<set $args[0].accent = 0>>
<</if>>
-<</widget>>
\ No newline at end of file
+<</widget>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index f3b77d25fe9..e1fb84b8823 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -616,6 +616,9 @@
<<if ($arcologies[0].FSArabianRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtHarem == 1)>>
| //FS// <<link "Harem gauze">><<set $activeSlave.clothes = "harem gauze",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
<</if>>
+<<if ($arcologies[0].FSAztecRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtHuipil == 1)>>
+ | //FS// <<link "Huipil">><<set $activeSlave.clothes = "a huipil",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+<</if>>
<<if ($arcologies[0].FSEdoRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtKimono == 1)>>
| //FS// <<link "Kimono">><<set $activeSlave.clothes = "a kimono",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
<</if>>
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index ac1833beee4..248864cc83c 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -539,6 +539,18 @@
A gladiatrix's life expectancy in an arcology that enjoys lethal combats is punishingly low. Your other slaves with combat skill @@.gold;worry they'll follow her@@ out onto the sand.
<</if>>
+<<case "aztec revivalist arcology">>
+ $activeSlave.slaveName is transported after losing a military engagement. Though her will remains strong, she's @@.gold;filled with fear@@ when she sees the rivers of blood that flow through the city.
+ <<for $j = 0; $j < $slaves.length; $j++>>
+ <<if ($slaves[$j].combatSkill > 0)>>
+ <<set $slaves[$j].trust -= 2>>
+ <<set $seed = 1>>
+ <</if>>
+ <</for>>
+ <<if ($seed == 1)>>
+ Her willingness to obey will be tested. Her life will be forfeit, a fate many others@@.gold;fear might befall them@@, if she does not perform.
+ <</if>>
+
<<case "egyptian revivalist arcology">>
$activeSlave.slaveName's journey to her new home is respectful, even celebratory, as far as you can see. She is gravely informed by the purchasing agent that many slaves await her learned instruction.
<<for $j = 0; $j < $slaves.length; $j++>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index d731492f195..d60aa1a076f 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -1363,6 +1363,8 @@ Release rules: _Slave.releaseRules.
Edo Rev
<<case "Roman Revivalist">>
Rom Rev
+<<case "Aztec Revivalist">>
+ Atz Rev
<<case "Arabian Revivalist">>
Ara Rev
<<case "slave" "none" "">>
@@ -3126,6 +3128,8 @@ _Slave.faceShape face.
Body oil.
<<case "a toga">>
Toga.
+<<case "a huipil">>
+ Huipil.
<<case "a slutty qipao">>
Qipao.
<<default>>
diff --git a/src/uncategorized/spa.tw b/src/uncategorized/spa.tw
index f24cd998578..17d66d7d4d7 100644
--- a/src/uncategorized/spa.tw
+++ b/src/uncategorized/spa.tw
@@ -10,6 +10,8 @@ $spaNameCaps
<<switch $spaDecoration>>
<<case "Roman Revivalist">>
is built as a Roman bath. The flooring is pleasantly warm due to a modernized version of hypocaust heating, and is covered in mosaic depicting slaves enjoying sex.
+<<case "Aztec Revivalist">>
+ is built as a Aztec bathhouse. Water steams from the middle of the room and the idols by the door glisten with moisture from the thick with herbs and essences steamed air. There are no divisions for men or women, so everyone's allowed to look.
<<case "Egyptian Revivalist">>
is decorated like an Egyptian water garden. All but the hottest pools include aquatic plants around their edges, and the atmosphere is heavy with perfume.
<<case "Edo Revivalist">>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 83931d53b58..5a7f102a878 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -23,6 +23,7 @@
[[Attendant|Encyclopedia][$encyclopedia = "Attendant"]]
[[Attending Classes|Encyclopedia][$encyclopedia = "Attending Classes"]]
[[Attention Whores|Encyclopedia][$encyclopedia = "Attention Whores"]]
+[[Aztec Revivalism|Encyclopedia][$encyclopedia = "Aztec Revivalism"]]
[[Bitchy|Encyclopedia][$encyclopedia = "Bitchy"]]
[[Body (PC)|Encyclopedia][$encyclopedia = "PC Body"]]
[[Body Purism|Encyclopedia][$encyclopedia = "Body Purism"]]
@@ -560,4 +561,4 @@
<<else>>
//FCE:// [[$encyclopedia|Encyclopedia][$nextButton = "Back", $nextLink = _Pass]]
<</if>>
-<</nobr>>
\ No newline at end of file
+<</nobr>>
diff --git a/src/uncategorized/toychest.tw b/src/uncategorized/toychest.tw
index 253f7963401..8ccccf2f7ef 100644
--- a/src/uncategorized/toychest.tw
+++ b/src/uncategorized/toychest.tw
@@ -143,6 +143,8 @@
Her body oil makes her muscles a lovely ornament to the office, and makes all her holes nice and inviting.
<<elseif ($slaves[$i].clothes == "a toga")>>
Her toga lends an air of antiquity to the office.
+<<elseif ($slaves[$i].clothes == "a huipil")>>
+ Her revealing huipil is a delightfully exotic novelty in your office.
<<elseif ($slaves[$i].clothes == "a slutty qipao")>>
Her lovely qipao is a delicious contradiction of conservative silk patterns and scandalously high cuts.
<<elseif ($slaves[$i].vaginalAccessory == "chastity belt")>>
diff --git a/src/uncategorized/useGuard.tw b/src/uncategorized/useGuard.tw
index 4c5925df6cc..aa96d7a02c0 100644
--- a/src/uncategorized/useGuard.tw
+++ b/src/uncategorized/useGuard.tw
@@ -82,6 +82,10 @@ $slaves[$i].slaveName is standing behind your left shoulder, guarding your perso
Her kimono has discreet cuts that allow her to fight reasonably well in it if necessary, and are almost invisible when she stands straight.
<<elseif ($slaves[$i].clothes == "a slutty qipao")>>
Her qipao and weapons make her look like a character from a fighting game.
+<<elseif ($slaves[$i].clothes == "a toga")>>
+ Her toga and weapons make a stark contrast, making her stand out a lot.
+<<elseif ($slaves[$i].clothes == "a huipil")>>
+ Her huipil hides most of the weapons she carries, but carrying them on naked skin is a slight discomfort.
<<elseif ($slaves[$i].clothes == "a hijab and abaya")>>
Her weapons are strapped to the outside of her abaya, a juxtaposition that would be more ludicrous had not many women of the middle east recently been seen fighting dressed in just this way.
<<elseif ($slaves[$i].clothes == "battledress")>>
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index 88a9fb2091c..e01d97e9d80 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -144,7 +144,7 @@
<</if>>
<<case "serve in the master suite">>
<<if $activeSlave.fuckdoll > 0>>
- waiting for use in $masterSuiteName, next to a display case full of other sex toys.
+ waiting for use in $masterSuiteName, next to a display case full of other sex toys.
<<elseif $masterSuiteUpgradeLuxury == 1>>
<<if _seed > 50>>
is kneeling on the big bed in $masterSuiteName, awaiting your return.
@@ -788,7 +788,7 @@
<<case "dom" "sadist">>
sleeping in bed together. $activeSlave.slaveName is spooning her _activeSlaveRel possessively<<if $activeSlave.amp !== 1>>, and even in her sleep, has a proprietary hand on _partnerSlave.slaveName's <<if _partnerSlave.balls > 0>>balls<<elseif _partnerSlave.balls > 0>>soft cock<<else>>pussy<</if>><</if>>.
<<case "pregnancy">>
- sleeping in bed together.
+ sleeping in bed together.
<<if bigBelly($activeSlave) && bigBelly(_activeSlaveRel)>>
They are pressed as close as they can be with their rounded middles in the way.
<<elseif bigBelly($activeSlave)>>
@@ -1295,6 +1295,10 @@
Her teddy covers her rear, but in tight satin that flatters its curves.
<<case "harem gauze">>
Her hips are clearly visible through the thin gauze that covers it.
+ <<case "a toga">>
+ Her stellar behind is accented by the light material of her toga.
+ <<case "a huipil ">>
+ Her huipil is so short that her butt is on display.
<<case "slutty jewelry">>
Her belt of light chain accentuates her hips.
<<default>>
@@ -1341,6 +1345,10 @@
Her enormous belly pushes out her abaya.
<<case "a leotard">>
Her enormous belly lewdly stretches her leotard. You swear you can see her babies kicking under the material.
+ <<case "a toga">>
+ Her loose fitted toga dangles pathetically to either side of her enormous belly.
+ <<case "a huipil">>
+ Her pregnant belly is so enormous that the huipil barely covers any of it.
<<default>>
Her bare enormous squirming pregnant belly catches your eye.
<</switch>>
@@ -1381,6 +1389,10 @@
Her giant belly fills her abaya.
<<case "a leotard">>
Her giant belly lewdly stretches her leotard. You swear you can see her babies kicking under the material.
+ <<case "a toga">>
+ Her loose fitted toga dangles to either side of her giant belly.
+ <<case "a huipil">>
+ Her pregnant belly is so giant that the huipil barely makes it half-way to her protruding navel.
<<default>>
Her bare giant pregnant belly catches your eye.
<</switch>>
@@ -1429,6 +1441,10 @@
Her huge belly threatens to pop the buttons off her jacket.
<<case "harem gauze">>
Her silken garb and huge pregnant belly makes her look like a belly dancer.
+ <<case "a toga">>
+ Her loose fitted toga leaves plenty of space for her swollen belly.
+ <<case "a huipil">>
+ Her pregnant belly is so huge that the huipil won't even come close to reaching her protruding navel.
<<case "a comfortable bodysuit">>
Her huge belly lewdly fills her bodysuit. <<if ($activeSlave.bellyAccessory !== "a huge empathy belly") && ($activeSlave.bellyAccessory !== "a large empathy belly")>>You swear you can see her babies kicking underneath the form fitting material.<</if>>
<<case "a schoolgirl outfit">>
@@ -1491,6 +1507,10 @@
Her big belly strains the buttons on her jacket.
<<case "harem gauze">>
Her silken garb and big pregnant belly makes her look like a belly dancer.
+ <<case "a toga">>
+ Her loose fitted toga leaves plenty of space for her swollen belly.
+ <<case "a huipil">>
+ Her pregnant belly is so big that the huipil won't even reach her protruding navel.
<<case "a comfortable bodysuit">>
Her big belly fills her bodysuit. <<if ($activeSlave.bellyAccessory !== "a medium empathy belly")>>You swear you can see her babies kicking underneath the form fitting material.<</if>>
<<case "a schoolgirl outfit">>
@@ -1555,6 +1575,10 @@
Slight jiggling from her fat gut can be seen under her jacket.
<<case "harem gauze">>
Her silken garb and fat, jiggly gut makes her look like a belly dancer.
+ <<case "a toga">>
+ Her toga swerves loosely from side to side as her chubby body moves inside it.
+ <<case "a huipil">>
+ Her lithe huipil can't hide her voluptuous shape unless she stands completely still.
<<case "a comfortable bodysuit">>
The taut material of her bodysuit shows every jiggle in her fat gut as she moves.
<<case "a schoolgirl outfit">>
@@ -1568,7 +1592,7 @@
<<case "a chattel habit">>
Her fat gut jiggles around the strip of cloth down her front as she moves.
<<case "a bunny outfit">>
- She is a sight in her bunny outfit. The front of her fat gut is held still be her teddy, but everything else of it jiggles obscenely with her every motion.
+ She is a sight in her bunny outfit. The front of her fat gut is held still by her teddy, but everything else of it jiggles obscenely with her every motion.
<<default>>
Her bare, jiggling, fat gut catches your eye.
<</switch>>
@@ -1619,6 +1643,10 @@
Her growing belly bulges her suit jacket.
<<case "harem gauze">>
Her silken garb and growing pregnant belly makes her look like a belly dancer.
+ <<case "a toga">>
+ Her toga is so loose that you can barely notice her growing belly.
+ <<case "a huipil">>
+ Her growing belly can be seen from the sides of her huipil.
<<case "a comfortable bodysuit">>
Her growing belly fills her bodysuit.
<<case "a schoolgirl outfit">>
@@ -1675,9 +1703,9 @@
<</if>>
<<case "a maternity dress">>
<<if $activeSlave.dick > 2>>
- As she moves, something occasionally tents the front of her dress.
+ As she moves, something occasionally tents the front of her dress.
<<else>>
- Her loose dress gives no hints to what's inside it.
+ Her loose dress gives no hints to what's inside it.
<</if>>
<<case "attractive lingerie">>
<<if ($activeSlave.dick > 4) && ($activeSlave.balls > 3)>>
@@ -1917,6 +1945,10 @@
Her enormous belly pushes out her abaya.
<<case "a leotard">>
Her enormous belly lewdly stretches her leotard.
+ <<case "a toga">>
+ Her loose fitted toga dangles pathetically to either side of her enormous belly.
+ <<case "a huipil">>
+ Her taut belly is so enormous that the huipil barely covers any of it.
<<default>>
Her bare enormous stomach catches your eye.
<</switch>>
@@ -1957,6 +1989,10 @@
Her giant belly fills her abaya.
<<case "a leotard">>
Her giant belly lewdly stretches her leotard.
+ <<case "a toga">>
+ Her loose fitted toga dangles to either side of her giant belly.
+ <<case "a huipil">>
+ Her belly is so giant that the huipil barely makes it half-way to her protruding navel.
<<default>>
Her bare giant belly catches your eye.
<</switch>>
@@ -2019,6 +2055,10 @@
Her huge belly shoves the strip of cloth on her front to her side.
<<case "a bunny outfit">>
Her huge belly is threatening to tear her teddy, the seams along the side are already splitting.
+ <<case "a toga">>
+ Her loose fitted toga leaves plenty of space for her swollen belly.
+ <<case "a huipil">>
+ Her belly is so huge that the huipil won't even come close to reaching her protruding navel.
<<default>>
Her bare huge belly catches your eye.
<</switch>>
@@ -2077,6 +2117,10 @@
Her big belly shoves the strip of cloth on her front to her side.
<<case "a bunny outfit">>
Her big belly is strains her teddy, the seams along the side are showing signs of wear.
+ <<case "a toga">>
+ Her loose fitted toga leaves plenty of space for her swollen belly.
+ <<case "a huipil">>
+ Her pregnant belly is so big that the huipil won't even reach her protruding navel.
<<default>>
Her bare belly catches your eye.
<</switch>>
@@ -2136,7 +2180,11 @@
<<case "a chattel habit">>
Her fat gut jiggles around the strip of cloth down her front as she moves.
<<case "a bunny outfit">>
- She is a sight in her bunny outfit. The front of her fat gut is held still be her teddy, but everything else of it jiggles obscenely with her every motion.
+ She is a sight in her bunny outfit. The front of her fat gut is held still by her teddy, but everything else of it jiggles obscenely with her every motion.
+ <<case "a toga">>
+ Her toga swerves loosely from side to side as her chubby body moves inside it.
+ <<case "a huipil">>
+ Her lithe huipil can't hide her voluptuous shape unless she stands completely still.
<<default>>
Her bare, jiggling, fat gut catches your eye.
<</switch>>
@@ -2200,7 +2248,11 @@
<<case "a chattel habit">>
Her distended belly shows under the strip of cloth on her front.
<<case "a bunny outfit">>
- Her distended belly is fills her teddy.
+ Her distended belly fills her teddy.
+ <<case "a toga">>
+ Her toga is so loose that you can barely notice her growing belly.
+ <<case "a huipil">>
+ Her distended belly can be seen from the sides of her huipil.
<<default>>
Her slightly rounded belly catches your eye.
<</switch>>
@@ -2268,6 +2320,10 @@
Her taut, sloshing belly shoves the strip of cloth on her front to her side.
<<case "a bunny outfit">>
Her taut, sloshing belly is threatening to tear her teddy, the seams along the side are already splitting. Her belly is bulging out the gaps.
+ <<case "a toga">>
+ Her loose fitted toga leaves plenty of space for her taut, sloshing belly.
+ <<case "a huipil">>
+ Her taut, sloshing belly is so huge that the huipil doesn't even come close to covering it.
<<default>>
Her bare, taut, sloshing belly catches your eye.
<</switch>>
@@ -2332,6 +2388,10 @@
Her rounded, sloshing belly shoves the strip of cloth on her front to her side.
<<case "a bunny outfit">>
Her rounded, sloshing belly is strains her teddy, the seams along the side are showing signs of wear.
+ <<case "a toga">>
+ Her loose fitted toga leaves plenty of space for her rounded, sloshing belly.
+ <<case "a huipil">>
+ Her rounded, sloshing belly is so big that the huipil can barely cover it.
<<default>>
Her bare, rounded, sloshing belly catches your eye.
<</switch>>
@@ -2391,7 +2451,11 @@
<<case "a chattel habit">>
Her fat gut jiggles around the strip of cloth down her front as she moves.
<<case "a bunny outfit">>
- She is a sight in her bunny outfit. The front of her fat gut is held still be her teddy, but everything else of it jiggles obscenely with her every motion.
+ She is a sight in her bunny outfit. The front of her fat gut is held still by her teddy, but everything else of it jiggles obscenely with her every motion.
+ <<case "a toga">>
+ Her toga swerves loosely from side to side as her chubby body moves inside it.
+ <<case "a huipil">>
+ Her lithe huipil can't hide her voluptuous shape unless she stands completely still.
<<default>>
Her bare, jiggling, fat gut catches your eye.
<</switch>>
@@ -2455,7 +2519,11 @@
<<case "a chattel habit">>
Her distended belly shows under the strip of cloth on her front.
<<case "a bunny outfit">>
- Her distended belly is fills her teddy.
+ Her distended belly fills her teddy.
+ <<case "a toga">>
+ Her toga is so loose that you can barely notice her distended belly.
+ <<case "a huipil">>
+ Her distended belly can be seen from the sides of her huipil.
<<default>>
Her distended belly catches your eye.
<</switch>>
@@ -2569,6 +2637,10 @@
Her fluffy white cottontail draws attention to her butt, inevitably bringing anal to mind.
<<case "harem gauze">>
Her ass is clearly visible through the thin gauze that covers it.
+ <<case "a toga">>
+ Her toga is so transparent it can't hide her asscrack, which looks very seductive
+ <<case "a huipil">>
+ Her huipil can be easily lifted to access her naked butt.
<<case "slutty jewelry">>
Her belt of light chain threatens to dip into her asscrack with each step.
<<default>>
diff --git a/src/uncategorized/wardrobe.tw b/src/uncategorized/wardrobe.tw
index fa232416974..29f734bfc81 100644
--- a/src/uncategorized/wardrobe.tw
+++ b/src/uncategorized/wardrobe.tw
@@ -6,7 +6,7 @@
<</nobr>>\
\
''__Slave Wardrobe__''
-//The room containing all the clothes and accessories you have available to dress your slaves in, as well as the supplies and tools your tailor needs to resize them to better fit your slaves. Several mirrors are set up for a slave to try on outfits should she be allowed to dress herself. The selection includes <<if ($cheatMode == 1) || (($clothesBoughtBunny == 1 || $arcologies[0].FSGenderFundamentalist != "unset") && ($clothesBoughtChains == 1 || $arcologies[0].FSDegradationist != "unset") && ($clothesBoughtConservative == 1 || $arcologies[0].FSPaternalist != "unset") && ($clothesBoughtWestern == 1 || $arcologies[0].FSPastoralist != "unset") && ($clothesBoughtOil == 1 || $arcologies[0].FSPhysicalIdealist != "unset") && ($clothesBoughtHabit == 1 || $arcologies[0].FSChattelReligionist != "unset") && ($clothesBoughtToga == 1 || $arcologies[0].FSRomanRevivalist != "unset") && ($clothesBoughtKimono == 1 || $arcologies[0].FSEdoRevivalist != "unset") && ($clothesBoughtHarem == 1 || $arcologies[0].FSArabianRevivalist != "unset") && ($clothesBoughtQipao == 1 || $arcologies[0].FSChineseRevivalist != "unset") && ($clothesBoughtEgypt == 1 || $arcologies[0].FSEgyptianRevivalist != "unset") && ($clothesBoughtMaternityDress == 1 || $arcologies[0].FSRepopulationFocus != "unset") && ($clothesBoughtMaternityLingerie == 1 || $arcologies[0].FSRepopulationFocus != "unset") && ($clothesBoughtBelly == 1 || $arcologies[0].FSRepopulationFocus != "unset"))>>outfits from all manner of cultures and societies, not a single style eludes you.<<else>>many styles of clothing ranging from exciting to mundane and sexy to practical.<</if>><<if $toysBoughtDildos == 1 && $toysBoughtGags == 1 && $toysBoughtButtPlugs == 1>> Sex toys of all kinds and shapes line the shelves.<<elseif $toysBoughtDildos == 1 || $toysBoughtGags == 1 || $toysBoughtButtPlugs == 1>> Some sex toys line the shelves.<</if>><<if $enema == 1>> A number of drums of specially formulated water for use in enemas line one of the walls.<</if>><<if $medicalEnema == 1>> Alongside them, multiple drums of mixtures for use in medical enemas.<</if>>//
+//The room containing all the clothes and accessories you have available to dress your slaves in, as well as the supplies and tools your tailor needs to resize them to better fit your slaves. Several mirrors are set up for a slave to try on outfits should she be allowed to dress herself. The selection includes <<if ($cheatMode == 1) || (($clothesBoughtBunny == 1 || $arcologies[0].FSGenderFundamentalist != "unset") && ($clothesBoughtChains == 1 || $arcologies[0].FSDegradationist != "unset") && ($clothesBoughtConservative == 1 || $arcologies[0].FSPaternalist != "unset") && ($clothesBoughtWestern == 1 || $arcologies[0].FSPastoralist != "unset") && ($clothesBoughtOil == 1 || $arcologies[0].FSPhysicalIdealist != "unset") && ($clothesBoughtHabit == 1 || $arcologies[0].FSChattelReligionist != "unset") && ($clothesBoughtToga == 1 || $arcologies[0].FSRomanRevivalist != "unset") && ($clothesBoughtHuipil == 1 || $arcologies[0].FSAztecRevivalist != "unset") && ($clothesBoughtKimono == 1 || $arcologies[0].FSEdoRevivalist != "unset") && ($clothesBoughtHarem == 1 || $arcologies[0].FSArabianRevivalist != "unset") && ($clothesBoughtQipao == 1 || $arcologies[0].FSChineseRevivalist != "unset") && ($clothesBoughtEgypt == 1 || $arcologies[0].FSEgyptianRevivalist != "unset") && ($clothesBoughtMaternityDress == 1 || $arcologies[0].FSRepopulationFocus != "unset") && ($clothesBoughtMaternityLingerie == 1 || $arcologies[0].FSRepopulationFocus != "unset") && ($clothesBoughtBelly == 1 || $arcologies[0].FSRepopulationFocus != "unset"))>>outfits from all manner of cultures and societies, not a single style eludes you.<<else>>many styles of clothing ranging from exciting to mundane and sexy to practical.<</if>><<if $toysBoughtDildos == 1 && $toysBoughtGags == 1 && $toysBoughtButtPlugs == 1>> Sex toys of all kinds and shapes line the shelves.<<elseif $toysBoughtDildos == 1 || $toysBoughtGags == 1 || $toysBoughtButtPlugs == 1>> Some sex toys line the shelves.<</if>><<if $enema == 1>> A number of drums of specially formulated water for use in enemas line one of the walls.<</if>><<if $medicalEnema == 1>> Alongside them, multiple drums of mixtures for use in medical enemas.<</if>>//
<br>
<<nobr>>
<<if $clothesBoughtBunny == 0 && $arcologies[0].FSGenderFundamentalist == "unset" && $cheatMode == 0>>
@@ -64,6 +64,13 @@
<</if>>
<</nobr>>
<<nobr>>
+<<if $clothesBoughtHuipil == 0 && $arcologies[0].FSAztecRevivalist == "unset" && $cheatMode == 0>>
+ [[Order a shipment of huipil|Wardrobe][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $clothesBoughtHuipil = 1]]
+ //Costs ¤<<print Math.trunc(5000*$upgradeMultiplierArcology)>>//
+<<else>>You are well stocked with exquisite Aztech Huipil.
+<</if>>
+<</nobr>>
+<<nobr>>
<<if $clothesBoughtKimono == 0 && $arcologies[0].FSEdoRevivalist == "unset" && $cheatMode == 0>>
[[Order a shipment of kimonos|Wardrobe][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $clothesBoughtKimono = 1]]
//Costs ¤<<print Math.trunc(5000*$upgradeMultiplierArcology)>>//
diff --git a/src/utility/artWidgets.tw b/src/utility/artWidgets.tw
index 3ef85db725b..a7dd4c4daf8 100644
--- a/src/utility/artWidgets.tw
+++ b/src/utility/artWidgets.tw
@@ -275,32 +275,42 @@ $args[2]: icon UI Display for vector art, 1 for on.
<<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/glasses.svg'" + "/></object>">>
<</if>>
-/% Pubic hair %/
-<<if $args[0].pubicHStyle != "waxed">>
- <<switch $args[0].pubicHColor>>
- <<case "black">>
- <<set _pubicHColor = "black">>
- <<case "blonde">>
- <<set _pubicHColor = "blonde">>
- <<case "blue">>
- <<set _pubicHColor = "blue">>
- <<case "brown">>
- <<set _pubicHColor = "brown">>
- <<case "green">>
- <<set _pubicHColor = "green">>
- <<case "pink">>
- <<set _pubicHColor = "pink">>
- <<case "red">>
- <<set _pubicHColor = "red">>
- <<default>>
- <<set _pubicHColor = "brown">>
- <</switch>>
- <<if $args[0].pubicHStyle == "in a strip">>
- <<set _pubicHStyle = "strip">>
- <<else>>
- <<set _pubicHStyle = $args[0].pubicHStyle>>
+/% Chastity belt or Pubic hair %/
+<<if $args[0].dickAccessory == "chastity" || $args[0].dickAccessory == "anal chastity" || $args[0].dickAccessory == "combined chastity" || $args[0].vaginalAccessory == "chastity belt" || $args[0].vaginalAccessory == "anal chastity" || $args[0].vaginalAccessory == "combined chastity">>
+ <<if $args[0].dickAccessory == "chastity" || $args[0].dickAccessory == "combined chastity">>
+ <<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/chastity male aft.svg'" + "/></object>">>
+ <</if>>
+ <<if $args[0].vaginalAccessory == "chastity belt" || $args[0].vaginalAccessory == "combined chastity">>
+ <<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/chastity female.svg'" + "/></object>">>
+ <</if>>
+ <<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/chastity base.svg'" + "/></object>">>
+<<else>>
+ <<if $args[0].pubicHStyle != "waxed">>
+ <<switch $args[0].pubicHColor>>
+ <<case "black">>
+ <<set _pubicHColor = "black">>
+ <<case "blonde">>
+ <<set _pubicHColor = "blonde">>
+ <<case "blue">>
+ <<set _pubicHColor = "blue">>
+ <<case "brown">>
+ <<set _pubicHColor = "brown">>
+ <<case "green">>
+ <<set _pubicHColor = "green">>
+ <<case "pink">>
+ <<set _pubicHColor = "pink">>
+ <<case "red">>
+ <<set _pubicHColor = "red">>
+ <<default>>
+ <<set _pubicHColor = "brown">>
+ <</switch>>
+ <<if $args[0].pubicHStyle == "in a strip">>
+ <<set _pubicHStyle = "strip">>
+ <<else>>
+ <<set _pubicHStyle = $args[0].pubicHStyle>>
+ <</if>>
+ <<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/" + _pubicHStyle + " " + _pubicHColor +".svg'" + "/></object>">>
<</if>>
- <<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/" + _pubicHStyle + " " + _pubicHColor +".svg'" + "/></object>">>
<</if>>
/%if pregnant%/
@@ -332,13 +342,6 @@ $args[2]: icon UI Display for vector art, 1 for on.
<<else>>
<<set _boobSize = 7>>
<</if>>
-<<if $args[0].fuckdoll != 0>>
- <<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/boob " +_boobSize +" latex.svg'" + "/></object>">>
- <<if $args[0].lactation > 0>><<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/boob " +_boobSize + " areola.svg'" + "/></object>">><</if>>
-<<else>>
- <<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/boob " +_boobSize +".svg'" + "/></object>">>
- <<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/boob " +_boobSize + " areola.svg'" + "/></object>">>
-<</if>>
/% Scrotum %/
<<if $args[0].scrotum > 0>>
@@ -374,34 +377,68 @@ $args[2]: icon UI Display for vector art, 1 for on.
<</if>>
<</if>>
-<<if _boobSize <= 5>>
+<<set _needBoobs = 1>>
+<<if $args[0].dick > 0>>
+<<if canAchieveErection($args[0])>>
+ <<if $args[0].fuckdoll != 0>>
+ <<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/boob " +_boobSize +" latex.svg'" + "/></object>">>
+ <<if $args[0].lactation > 0>><<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/boob " +_boobSize + " areola.svg'" + "/></object>">><</if>>
+ <<else>>
+ <<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/boob " +_boobSize +".svg'" + "/></object>">>
+ <<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/boob " +_boobSize + " areola.svg'" + "/></object>">>
+ <</if>>
+ <set _needBoobs = 0>>
+<</if>>
+<</if>>
<<if $args[0].vagina > 0>>
<<if $args[0].dick > 0>>
<div class="highPenis">
- <<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/penis " + _penisSize + ".svg'" + "/></object>">>
+ <<if $args[0].scrotum > 0>>
+ <<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/ball " + _ballSize + ".svg'" + "/></object>">>
+ <</if>>
+ <<if canAchieveErection($args[0])>>
+ <<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/penis " + _penisSize + ".svg'" + "/></object>">>
+ <<else>>
+ <<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/flaccid " + _penisSize + ".svg'" + "/></object>">>
+ <<if $args[0].dickAccessory == "chastity" || $args[0].dickAccessory == "combined chastity">>
+ <<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/chastity male fore " + _penisSize + ".svg'" + "/></object>">>
+ <</if>>
+ <</if>>
/* 000-250-006 */
/* </div> */
/* 000-250-006 */
<</if>>
- <<if $args[0].scrotum > 0>>
- <<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/ball " + _ballSize + ".svg'" + "/></object>">>
- <</if>>
<<else>>
<<if $args[0].dick > 0>>
- /*<div class="lowPenis">*/
- <<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/penis " + _penisSize + ".svg'" + "/></object>">>
+ <div class="lowPenis">
+ <<if $args[0].scrotum > 0>>
+ <<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/ball " + _ballSize + ".svg'" + "/></object>">>
+ <</if>>
+ <<if canAchieveErection($args[0])>>
+ <<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/penis " + _penisSize + ".svg'" + "/></object>">>
+ <<else>>
+ <<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/flaccid " + _penisSize + ".svg'" + "/></object>">>
+ <<if $args[0].dickAccessory == "chastity" || $args[0].dickAccessory == "combined chastity">>
+ <<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/chastity male fore " + _penisSize + ".svg'" + "/></object>">>
+ <</if>>
+ <</if>>
/* 000-250-006 */
/* </div> */
/* 000-250-006 */
<</if>>
- <<if $args[0].scrotum > 0>>
- <<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/ball " + _ballSize + ".svg'" + "/></object>">>
- <</if>>
<</if>>
+<<if _needBoobs>>
+ <<if $args[0].fuckdoll != 0>>
+ <<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/boob " +_boobSize +" latex.svg'" + "/></object>">>
+ <<if $args[0].lactation > 0>><<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/boob " +_boobSize + " areola.svg'" + "/></object>">><</if>>
+ <<else>>
+ <<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/boob " +_boobSize +".svg'" + "/></object>">>
+ <<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/boob " +_boobSize + " areola.svg'" + "/></object>">>
+ <</if>>
<</if>>
/% piercings %/
diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw
index 6d8922de5ff..e9f91a8a2c5 100644
--- a/src/utility/birthWidgets.tw
+++ b/src/utility/birthWidgets.tw
@@ -1182,7 +1182,6 @@ She is carried to the auto-surgeon, since she is likely to face complications wi
<</widget>>
-
<<widget "DeadlyBirth">>
<br>
@@ -1237,7 +1236,7 @@ Her helper arrives with aid far too late. She screams when she sees $slaves[$i].
<<switch $slaves[$i].clothes>>
-<<case "slutty jewelry" "harem gauze" "slutty business attire" "a slutty maid outfit" "a slutty nurse outfit" "a schoolgirl outfit" "a cheerleader outfit" "clubslut netting" "Western clothing" "a slutty qipao" "a chattel habit" "a toga" "a fallen nun's habit" "a succubus outfit" "a mini dress" "a military uniform">> /* easy or pointless to remove */
+<<case "slutty jewelry" "harem gauze" "slutty business attire" "a slutty maid outfit" "a slutty nurse outfit" "a schoolgirl outfit" "a cheerleader outfit" "clubslut netting" "Western clothing" "a slutty qipao" "a chattel habit" "a toga" "a huipil" "a fallen nun's habit" "a succubus outfit" "a mini dress" "a military uniform">> /* easy or pointless to remove */
<<if $clothesSeed < 90>>
<<set $undressed = 1>>
<</if>>
@@ -1282,7 +1281,7 @@ Her helper arrives with aid far too late. She screams when she sees $slaves[$i].
Quickly she spreads her legs apart and shifts her g-string aside before beginning to push out her bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. She can't hide what's happening between her legs, <<if $slaves[$i].fetish == "humiliation">>but that only makes it more exciting<<else>>so she bears with it<</if>>.
<</if>>
-<<case "a succubus outfit" "slutty jewelry" "a fallen nuns habit" "harem gauze" "slutty business attire" "a slutty maid outfit" "a slutty nurse outfit" "a schoolgirl outfit" "restrictive latex" "a cheerleader outfit" "clubslut netting" "Western clothing" "a slutty qipao" "a chattel habit">>
+<<case "a succubus outfit" "slutty jewelry" "a fallen nuns habit" "harem gauze" "slutty business attire" "a slutty maid outfit" "a slutty nurse outfit" "a schoolgirl outfit" "restrictive latex" "a cheerleader outfit" "clubslut netting" "Western clothing" "a slutty qipao" "a huipil" "a chattel habit">>
<<if $slaves[$i].fetish == "mindbroken">>
Instinctively she begins to push out her bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, indifferent to who may be watching her naked asshole.
<<else>>
@@ -1409,6 +1408,13 @@ Her helper arrives with aid far too late. She screams when she sees $slaves[$i].
Quickly she spreads her legs apart and begins pushing out her bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>.<<if $slaves[$i].fetish == "humiliation">> She is disappointed that her toga hides what's happening between her legs<<else>> She does her best to hide what's happening between her legs<</if>>.
<</if>>
+<<case "a huipil">>
+ <<if $slaves[$i].fetish == "mindbroken">>
+ Instinctively she begins to push out her bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, indifferent to the obvious wetness forming under her rear.
+ <<else>>
+ Quickly she spreads her legs apart and begins pushing out her bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. She can't hide what's going on with how skimpy the huipil is<<if $slaves[$i].fetish == "humiliation">> but that only makes it more exciting<<else>> so she bears with it<</if>>.
+ <</if>>
+
<<case "a bunny outfit">>
<<if $slaves[$i].fetish == "mindbroken">>
Instinctively she begins to push out her bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, indifferent to who may be watching. Her teddy bulges as her baby crowns into it as she continues her tasks oblivious to the wetness and her child's dilemma. Seeing her in this state, someone manages to tear her outfit open to allow her bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>> to be born.
@@ -1605,6 +1611,13 @@ Her helper arrives with aid far too late. She screams when she sees $slaves[$i].
Quickly she spreads her legs apart and begins pushing out her bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>.<<if $slaves[$i].fetish == "humiliation">> She is disappointed that her toga hides what's happening between her legs<<else>> She does her best to hide what's happening between her legs<</if>>.
<</if>>
+<<case "a huipil">>
+ <<if $slaves[$i].fetish == "mindbroken">>
+ Instinctively she begins to push out her bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, indifferent to the obvious wetness forming over her crotch.
+ <<else>>
+ Quickly she spreads her legs apart and begins pushing out her bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. She can't hide what's going on with how skimpy the huipil is<<if $slaves[$i].fetish == "humiliation">> but that only makes it more exciting<<else>> so she bears with it<</if>>.
+ <</if>>
+
<<case "a bunny outfit">>
<<if $slaves[$i].fetish == "mindbroken">>
Instinctively she begins to push out her bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, indifferent to who may be watching. Her teddy bulges as her baby crowns into it as she continues her tasks oblivious to the wetness and her child's dilemma. Seeing her in this state, someone manages to tear her outfit open to allow her bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>> to be born.
@@ -1692,6 +1705,8 @@ Her helper arrives with aid far too late. She screams when she sees $slaves[$i].
chattel habit
<<case "a toga">>
toga
+ <<case "a huipil">>
+ huipil
<<case "a fallen nun's habit">>
fallen nun's habit
<<case "a succubus outfit">>
@@ -1753,6 +1768,8 @@ Her helper arrives with aid far too late. She screams when she sees $slaves[$i].
chattel habit
<<case "a toga">>
toga
+ <<case "a huipil">>
+ huipil
<<case "a fallen nun's habit">>
fallen nun's habit
<<case "a succubus outfit">>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index a01517fd758..e2c11f75901 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -207,6 +207,12 @@
<<else>>
$activeSlave.slaveName is wearing $possessive toga so as to leave one breast bare.
<</if>>
+ <<case "a huipil">>
+ <<if $activeSlave.boobs > 2000>>
+ $activeSlave.slaveName's breasts are so big that they pull up $possessive huipil uncomfortably high, so $pronoun needs to fold it between them.
+ <<else>>
+ $activeSlave.slaveName is wearing $possessive huipil which accentuates her breasts.
+ <</if>>
<<case "a slutty qipao">>
$activeSlave.slaveName's qipao
<<if $activeSlave.boobs > 6000>>
@@ -1495,6 +1501,15 @@ $possessiveCap
<<else>>
covers $possessive ass.
<</if>>
+<<case "a huipil">>
+ $possessiveCap huipil
+ <<if $activeSlave.butt > 10>>
+ dissapears between her monstrous asscheeks.
+ <<elseif $activeSlave.butt > 6>>
+ covers $possessive butt, though it cannot stop it from spilling from the sides.
+ <<else>>
+ covers $possessive butt.
+ <</if>>
<<case "attractive lingerie for a pregnant woman">>
$possessiveCap pretty silken panties
<<if $activeSlave.butt > 10>>
@@ -2454,7 +2469,7 @@ $pronounCap's got a
<<else>>
is made to be easily liftable for access to $possessive anus.
<</if>>
- <<case "conservative clothing" "a toga" "cutoffs and a t-shirt" "battledress" "slutty business attire" "nice business attire" "a military uniform" "a bunny outfit" "a nice nurse outfit" "a kimono" >>
+ <<case "conservative clothing" "a toga" "huipil" "cutoffs and a t-shirt" "battledress" "slutty business attire" "nice business attire" "a military uniform" "a bunny outfit" "a nice nurse outfit" "a kimono" >>
/* We could use chastity belt descriptions! */
<<default>>
<<if ($activeSlave.anus > 2)>>
@@ -2764,9 +2779,20 @@ $pronounCap's got a
<<if $activeSlave.dick > 3>>
Something is tenting the front of $activeSlave.slaveName's toga.
<</if>>
+<<case "a huipil">>
+ $activeSlave.slaveName's
+ <<if $activeSlave.dick > 3>>
+ dick is long enough that its head dangles down below the front of $possessive short huipil.
+ <<elseif $activeSlave.dick > 0>>
+ huipil occasionally tents in front when $pronoun moves.
+ <<elseif $activeSlave.vagina == -1>>
+ huipil barely comes down far enough to cover $possessive featureless groin.
+ <<else>>
+ huipil barely comes down far enough to cover $possessive pussy.
+ <</if>>
<<case "attractive lingerie for a pregnant woman">>
<<if ($activeSlave.dick > 5) && canAchieveErection($activeSlave) && ($activeSlave.devotion > 20) && ($activeSlave.preg > 10)>>
- $activeSlave.slaveName's huge erection is agonizingly pressed down by $possessive pregnancy.
+ $activeSlave.slaveName's huge erection is agonizingly pressed down by $possessive pregnancy.
<<elseif ($activeSlave.dick > 5) && canAchieveErection($activeSlave) && ($activeSlave.devotion > 20)>>
$activeSlave.slaveName's erection is so big that $pronoun's restrained it by trapping its head under $possessive bra.<<if $activeSlave.boobs > 800>> Its head peeks out from $possessive cleavage.<</if>>
<<elseif ($activeSlave.dick > 3) && ($activeSlave.vagina > -1)>>
@@ -4717,6 +4743,30 @@ $activeSlave.slaveName is
$possessiveCap extreme corsetage is hidden by the toga.
<</if>>
+<<case "a huipil">>
+ made of beautiful
+ <<if ($activeSlave.amp == 1)>>
+ silk.
+ <<else>>
+ silk, and
+ <<if ($activeSlave.shoes == "flats")>>
+ little leather sandals.
+ <<elseif ($activeSlave.shoes == "boots")>>
+ high leather boots with thin rope laces and wooden heels.
+ <<elseif ($activeSlave.shoes == "heels")>>
+ beautiful wood and leather stilletos with an ornamented heel.
+ <<elseif ($activeSlave.shoes == "extreme heels")>>
+ high wooden heels with leather straps.
+ <<else>>
+ bare feet with a small ankle chain.
+ <</if>>
+ <</if>>
+ <<if $activeSlave.bellyAccessory == "a corset">>
+ $possessiveCap sturdy corset is visible through the sides.
+ <<elseif $activeSlave.bellyAccessory == "an extreme corset">>
+ $possessiveCap extreme corsetage is visible through the sides.
+ <</if>>
+
<<case "a slutty qipao">>
made of beautiful
<<if ($activeSlave.amp == 1)>>
@@ -5755,6 +5805,9 @@ $pronounCap has a corset piercing, a ladder of steel rings running up each side
<<case "a toga">>
$possessive toga hides them completely, but they're laced tightly, so $pronoun's aware they're there.
+<<case "a huipil">>
+ $possessive huipil hides them partially, so the leather straps that pull on $possessive's skin are clearly evident.
+
<<case "a slutty qipao">>
$possessive qipao hides them completely, but they're laced tightly with silk cord, so $pronoun's aware they're there.
@@ -5995,6 +6048,8 @@ $possessiveCap
rampages down $possessive back in the glorious feathering of an 80's perm.
<<case "a slutty qipao">>
cascades down $possessive back, ornamented with little silver talismans here and there.
+ <<case "a huipil">>
+ flows down $possessive back, rustling freely in the wind.
<<case "restrictive latex" "a latex catsuit">>
is allowed a gap at the back of $possessive head so it can escape to cascade down $possessive back.
<<case "harem gauze">>
@@ -6031,6 +6086,8 @@ $possessiveCap
is in a big, classic 80's perm.
<<case "a slutty qipao">>
is brushed back over $possessive shoulders, ornamented with little silver talismans here and there.
+ <<case "a huipil">>
+ flows down $possessive shoulders, giving $possessive a very innocent look.
<<case "restrictive latex" "a latex catsuit">>
is allowed a gap at the back of $possessive head so it can escape down $possessive back.
<<case "harem gauze">>
@@ -6067,6 +6124,8 @@ $possessiveCap
is in a classic 80's perm.
<<case "a slutty qipao">>
is brushed back and ornamented with a little jade talisman.
+ <<case "a huipil">>
+ is short and neat, giving $possesive an innocent look.
<<case "restrictive latex" "a latex catsuit">>
is crammed under $possessive latex hood.
<<case "harem gauze">>
@@ -6139,6 +6198,8 @@ $possessiveCap
is in an 80's perm and back in a scrunchy, from which it explodes backwards with 80's violence.
<<case "a slutty qipao">>
is in a perfect bun, secured with a jade comb; $possessive bun is so large it forms an artful arrangement down to the nape of $possessive neck.
+ <<case "a huipil">>
+ is twisted into two horns that rest on top of $possessive head, the rest is bulked on the back of her neck.
<<case "a kimono">>
is in a perfect bun, secured with an ivory comb; $possessive bun is so large it forms an artful arrangement down to the nape of $possessive neck.
<<case "restrictive latex" "a latex catsuit">>
@@ -6174,6 +6235,8 @@ $possessiveCap
is in an 80's perm and back in a scrunchy, from which it bursts backwards with 80's violence.
<<case "a slutty qipao">>
is in a perfect bun, secured with a jade comb.
+ <<case "a huipil">>
+ is twisted into two horns that rest on top of $possessive head, the rest sits tightly on the back of her neck.
<<case "a kimono">>
is in a perfect bun, secured with an ivory comb.
<<case "restrictive latex" "a latex catsuit">>
@@ -6209,6 +6272,8 @@ $possessiveCap
is in an 80's perm and back in a scrunchy, from which it shoots backwards with 80's violence.
<<case "a slutty qipao">>
is in a tight little bun, secured with a jade comb.
+ <<case "a huipil">>
+ is twisted into two horns that rest on top of $possessive head.
<<case "a kimono">>
is in a tight little bun, secured with an ivory comb.
<<case "restrictive latex" "a latex catsuit">>
@@ -6260,6 +6325,8 @@ $possessiveCap
<<case "a slutty qipao">>
is back in huge tails secured by jade rings etched with images of
<<ImageDesc>>
+ <<case "a huipil">>
+ is twisted into two huge tails that rest on top of $possessive shoulders.
<<case "a kimono">>
is in huge tails secured by ivory combs carved with images of
<<ImageDesc>>
@@ -6310,6 +6377,8 @@ $possessiveCap
<<case "a slutty qipao">>
is back in big tails secured by jade rings etched with images of
<<ImageDesc>>
+ <<case "a huipil">>
+ is twisted into two tails that rest on top of $possessive shoulders.
<<case "a kimono">>
is in big tails secured by ivory combs carved with images of
<<ImageDesc>>
@@ -6360,6 +6429,8 @@ $possessiveCap
<<case "a slutty qipao">>
is back in short tails secured by jade rings etched with images of
<<ImageDesc>>
+ <<case "a huipil">>
+ is twisted into two short tails that give $possessive the look of a little girl.
<<case "a kimono">>
is in short tails secured by ivory combs carved with images of
<<ImageDesc>>
@@ -6414,6 +6485,8 @@ $possessiveCap
<<case "a slutty qipao">>
is tied back in a huge ponytail secured by jade rings etched with images of
<<ImageDesc>>
+ <<case "a huipil">>
+ is tied into a huge ponytail, that leaves $possessive long hair to wave in the wind.
<<case "a kimono">>
is in a huge ponytail secured by ivory combs carved with images of
<<ImageDesc>>
@@ -6464,6 +6537,8 @@ $possessiveCap
<<case "a slutty qipao">>
is back in a big ponytail secured by jade rings etched with images of
<<ImageDesc>>
+ <<case "a huipil">>
+ is tied into a modest ponytail, that leaves $possessive hair to wave in the wind.
<<case "a kimono">>
is in a big ponytail secured by ivory combs carved with images of
<<ImageDesc>>
@@ -6514,6 +6589,8 @@ $possessiveCap
<<case "a slutty qipao">>
is back in short ponytail secured by jade rings etched with images of
<<ImageDesc>>
+ <<case "a huipil">>
+ is tied into a small ponytail, that leaves $possessive short hair to wave in the wind.
<<case "a kimono">>
is in short ponytail secured by ivory combs carved with images of
<<ImageDesc>>
@@ -6566,6 +6643,8 @@ $possessiveCap
<<case "a slutty qipao">>
is back in huge braids secured by jade rings etched with images of
<<ImageDesc>>
+ <<case "a huipil">>
+ is twisted into huge braids, that rest on $possessive shoulders.
<<case "a kimono">>
is in huge braids secured by ivory combs carved with images of
<<ImageDesc>>
@@ -6614,6 +6693,8 @@ $possessiveCap
<<case "a slutty qipao">>
is back in big braids secured by jade rings etched with images of
<<ImageDesc>>
+ <<case "a huipil">>
+ is twisted into braids, that rest on $possessive shoulders.
<<case "a kimono">>
is in long braids secured by ivory combs carved with images of
<<ImageDesc>>
@@ -6662,6 +6743,8 @@ $possessiveCap
<<case "a slutty qipao">>
is back in short braids secured by jade rings etched with images of
<<ImageDesc>>
+ <<case "a huipil">>
+ is twisted into short braids, that rest on $possessive shoulders.
<<case "a kimono">>
is in short braids secured by ivory combs carved with images of
<<ImageDesc>>
@@ -6714,6 +6797,8 @@ $possessiveCap
<<case "a slutty qipao">>
is in long dreadlocks, some with jade ornaments etched with images of
<<ImageDesc>>
+ <<case "a huipil">>
+ is in long dreadlocks, with a couple of small ornaments important to $possessive.
<<case "a kimono">>
is in long dreadlocks, some in ivory rings carved with images of
<<ImageDesc>>
@@ -6762,6 +6847,8 @@ $possessiveCap
<<case "a slutty qipao">>
is in dreadlocks, some with jade rings etched with images of
<<ImageDesc>>
+ <<case "a huipil">>
+ is in dreadlocks, with a couple of small ornaments important to $possessive.
<<case "a kimono">>
is in dreadlocks, some in ivory rings carved with images of
<<ImageDesc>>
@@ -6814,6 +6901,8 @@ $possessiveCap
<<case "a slutty qipao">>
is in short dreadlocks, some in jade rings etched with images of
<<ImageDesc>>
+ <<case "a huipil">>
+ is in short dreadlocks, with a couple of small ornaments important to $possessive.
<<case "a kimono">>
is in short dreadlocks, some with ivory rings carved with images of
<<ImageDesc>>
@@ -6866,6 +6955,8 @@ $possessiveCap
<<case "a slutty qipao">>
is curled into long flowing locks secured by jade rings etched with images of
<<ImageDesc>>
+ <<case "a huipil">>
+ is in long curls, and the locks flow down $possessive shoulders.
<<case "a kimono">>
is curled into long flowing locks secured by ivory combs carved with images of
<<ImageDesc>>
@@ -6914,6 +7005,8 @@ $possessiveCap
<<case "a slutty qipao">>
is curled into long locks, secured by jade rings etched with images of
<<ImageDesc>>
+ <<case "a huipil">>
+ is in curls, and the locks flow down $possessive shoulders.
<<case "a kimono">>
is curled into long locks, secured by ivory combs carved with images of
<<ImageDesc>>
@@ -6962,6 +7055,8 @@ $possessiveCap
<<case "a slutty qipao">>
is curled into short locks secured by jade rings etched with images of
<<ImageDesc>>
+ <<case "a huipil">>
+ is in short curls, and the locks flow down $possessive shoulders.
<<case "a kimono">>
is curled into short locks secured by ivory combs carved with images of
<<ImageDesc>>
@@ -7014,6 +7109,8 @@ $possessiveCap
<<case "a slutty qipao">>
is permed into long flowing curls secured by jade rings etched with images of
<<ImageDesc>>
+ <<case "a huipil">>
+ is permed into long curls, and the locks flow down $possessive shoulders.
<<case "a kimono">>
is permed into long flowing curls secured by ivory combs carved with images of
<<ImageDesc>>
@@ -7062,6 +7159,8 @@ $possessiveCap
<<case "a slutty qipao">>
is permed into long locks, secured by jade rings etched with images of
<<ImageDesc>>
+ <<case "a huipil">>
+ is permed into curls, and the locks flow down $possessive shoulders.
<<case "a kimono">>
is permed and secured by ivory combs carved with images of
<<ImageDesc>>
@@ -7110,6 +7209,8 @@ $possessiveCap
<<case "a slutty qipao">>
is permed into short waves secured by jade rings etched with images of
<<ImageDesc>>
+ <<case "a huipil">>
+ is permed into short curls, and the locks flow down $possessive shoulders.
<<case "a kimono">>
is permed into short waves secured by ivory combs carved with images of
<<ImageDesc>>
@@ -7153,7 +7254,7 @@ $possessiveCap
<<switch $activeSlave.clothes>>
<<case "chains">>
is in luxurious layered locks, caught painfully in $possessive chains here and there.
- <<case "body oil">>
+ <<case "body oil" "a huipil">>
is in luxurious layered locks flowing gorgeously down $possessive back.
<<case "a slutty qipao">>
is in luxurious layered locks flowing gorgeously down $possessive back, ornamented with little silver talismans here and there.
@@ -7189,7 +7290,7 @@ $possessiveCap
<</switch>>
<<elseif $activeSlave.hLength > 30>>
<<switch $activeSlave.clothes>>
- <<case "body oil">>
+ <<case "body oil" "a huipil">>
in luxurious layered locks.
<<case "a slutty qipao">>
is in luxurious layered locks flowing over $possessive shoulders, ornamented with little silver talismans here and there.
@@ -7225,7 +7326,7 @@ $possessiveCap
<</switch>>
<<elseif $activeSlave.hLength > 10>>
<<switch $activeSlave.clothes>>
- <<case "body oil">>
+ <<case "body oil" "a huipil">>
is in luxuriously styled short locks.
<<case "a slutty qipao">>
is in luxuriously styled short locks, brushed back and ornamented with a little jade talisman.
@@ -7261,7 +7362,7 @@ $possessiveCap
<</switch>>
<<else>>
<<switch $activeSlave.clothes>>
- <<case "body oil" "a military uniform" "a slave gown" "a halter top dress" "a ball gown" "conservative clothing" "nice business attire" "slutty business attire" "battledress">>
+ <<case "body oil" "a huipil" "a military uniform" "a slave gown" "a halter top dress" "a ball gown" "conservative clothing" "nice business attire" "slutty business attire" "battledress">>
is in luxuriously styled short locks.
<<case "restrictive latex" "a latex catsuit">>
fits under $possessive latex hood.
@@ -7287,7 +7388,7 @@ $possessiveCap
is shaved into a strip that runs down $possessive back and ends attached to a steel ring.
<<case "Western clothing">>
is shaved into a strip under $possessive cowboy hat, and cascades magnificently down $possessive back.
- <<case "body oil">>
+ <<case "body oil" "a huipil">>
is shaved into a permed strip which cascades magnificently down $possessive back.
<<case "a kimono">>
is shaved into a strip that cascades magnificently down $possessive back, with scores of little ivory talismans woven into it.
@@ -7318,7 +7419,7 @@ $possessiveCap
is shaved into a long braided strip that ends attached to a steel ring.
<<case "Western clothing">>
is shaved into a strip under $possessive cowboy hat, but is visible as a party in the back.
- <<case "body oil">>
+ <<case "body oil" "a huipil">>
is shaved into a permed strip which falls down $possessive back.
<<case "a kimono">>
is shaved into a long braided strip with little ivory talismans woven into it.
@@ -7349,7 +7450,7 @@ $possessiveCap
is shaved into a strip down the middle of $possessive head that ends attached to a steel ring.
<<case "Western clothing">>
is shaved into a strip under $possessive cowboy hat, with nothing but a little rat tail visible in back.
- <<case "body oil">>
+ <<case "body oil" "a huipil">>
is shaved into a permed strip.
<<case "a kimono">>
is shaved into a strip down the middle of $possessive head with little ivory talismans woven into it.
@@ -7374,6 +7475,8 @@ $possessiveCap
<<default>>
is shaved into a strip.
<</switch>>
+ <<elseif $activeSlave.hStyle == "bald">>
+ is completely bald.
<<else>>
is shaved into a mohawk.
<</if>>
@@ -7692,12 +7795,16 @@ $pronounCap has
$pronounCap's wearing expensive, luxurious makeup.
<<elseif $activeSlave.makeup == 3>>
$possessiveCap makeup is color-coordinated with $possessive $activeSlave.hColor hair.
-<<elseif $activeSlave.makeup == 11>>
- $pronounCap's wearing expensive, metallic makeup.
-<<elseif $activeSlave.makeup == 12>>
- $possessiveCap metallic makeup is color-coordinated with $possessive $activeSlave.hColor hair.
<<elseif $activeSlave.makeup == 4>>
$pronounCap's wearing stereotypical, garish streetwalker makeup.
+<<elseif $activeSlave.makeup == 5>>
+ $pronounCap's wearing eye-catching neon makeup.
+<<elseif $activeSlave.makeup == 6>>
+ $possessiveCap neon makeup is color-coordinated with $possessive $activeSlave.hColor hair.
+<<elseif $activeSlave.makeup == 7>>
+ $pronounCap's wearing expensive, metallic makeup.
+<<elseif $activeSlave.makeup == 8>>
+ $possessiveCap metallic makeup is color-coordinated with $possessive $activeSlave.hColor hair.
<</if>>
<<if $activeSlave.lipsPiercing == 1>>
$pronounCap has a simple lip piercing.
@@ -8143,6 +8250,8 @@ $pronounCap has
$activeSlave.slaveName's titanic pregnant belly sticks out of $possessive corset, which is laced above it as best $pronoun can manage.
<<case "a toga">>
$activeSlave.slaveName's titanic bulging pregnant belly parts $possessive toga.
+<<case "a huipil">>
+ $activeSlave.slaveName's huipil meekly rests atop $possessive titanic bulging pregnant belly.
<<case "a slutty qipao">>
$possessiveCap qipao is slit up the side. However, it merely rests atop $possessive titanic bulging pregnant belly.
<<case "uncomfortable straps">>
@@ -8274,6 +8383,8 @@ $pronounCap has
$activeSlave.slaveName's gigantic belly is covered in a sheen of stretch-mark defeating oil.
<<case "a toga")>>
$activeSlave.slaveName's gigantic pregnant belly parts $possessive toga.
+<<case "a huipil">>
+ $activeSlave.slaveName's huipil meekly rests atop $possessive gigantic pregnant belly.
<<case "a slutty qipao")>>
$possessiveCap qipao is slit up the side. However, it merely rests atop $possessive gigantic pregnant belly.
<<case "uncomfortable straps")>>
@@ -8405,6 +8516,8 @@ $pronounCap has
$activeSlave.slaveName's huge belly is covered in a sheen of special oil meant to prevent stretch marks.
<<case "a toga">>
$activeSlave.slaveName's huge pregnant belly parts $possessive toga.
+<<case "a huipil">>
+ $activeSlave.slaveName's huge pregnant belly lifts $possessive huipil.
<<case "a slutty qipao">>
$possessiveCap qipao is slit up the side. However, it merely rests atop $possessive huge pregnant belly.
<<case "uncomfortable straps">>
@@ -8536,6 +8649,8 @@ $pronounCap has
$activeSlave.slaveName's belly is covered in a sheen of special oil meant to prevent stretch marks.
<<case "a toga">>
$activeSlave.slaveName's pregnant belly parts $possessive toga.
+<<case "a huipil">>
+ $activeSlave.slaveName's pregnant belly lifts $possessive huipil.
<<case "a slutty qipao">>
$possessiveCap qipao is slit up the side. However, it only covers the top of $possessive pregnant belly.
<<case "uncomfortable straps">>
@@ -8668,6 +8783,8 @@ $pronounCap has
$activeSlave.slaveName's fat belly is covered in a sheen of oil.
<<case "a toga">>
$activeSlave.slaveName's toga can barely be pulled shut over $possessive fat belly.
+<<case "a huipil">>
+ $activeSlave.slaveName's huipil gets lifted by $possessive fat belly, so it's useless for covering $possessive body.
<<case "a slutty qipao">>
$possessiveCap qipao is slit up the side. However, it only covers the top of $possessive fat belly, allowing it to hang free.
<<case "uncomfortable straps">>
@@ -8794,6 +8911,8 @@ $pronounCap has
$activeSlave.slaveName's growing belly is covered in a sheen of oil.
<<case "a toga">>
$activeSlave.slaveName's growing belly gently bulges under $possessive toga.
+<<case "a huipil">>
+ $activeSlave.slaveName's growing belly slightly bulges under $possessive huipil.
<<case "a slutty qipao">>
$possessiveCap qipao is slit up the side. The front is pushed out by $possessive growing belly.
<<case "uncomfortable straps">>
@@ -8924,6 +9043,8 @@ $pronounCap has
$activeSlave.slaveName's chubby belly is covered in a sheen of oil.
<<case "a toga">>
$activeSlave.slaveName's toga conceals $possessive chubby belly.
+<<case "a huipil">>
+ $activeSlave.slaveName's huipil conceals $possessive chubby little belly.
<<case "a slutty qipao">>
$possessiveCap qipao is slit up the side. The front is pushed out by $possessive chubby belly.
<<case "uncomfortable straps">>
@@ -9354,6 +9475,8 @@ $pronounCap has
$activeSlave.slaveName's titanic implant-filled sticks out of $possessive corset, which is laced above it as best $pronoun can manage.
<<case "a toga">>
$activeSlave.slaveName's titanic implant-filled belly parts $possessive toga.
+<<case "a huipil">>
+ $activeSlave.slaveName's huipil meekly rests atop $possessive titanic implant-filled belly.
<<case "a slutty qipao">>
$possessiveCap qipao is slit up the side. However, it merely rests atop $possessive titanic implant-filled belly.
<<case "uncomfortable straps">>
@@ -9483,6 +9606,8 @@ $pronounCap has
$activeSlave.slaveName's gigantic implant-filled belly is covered in a sheen of stretch-mark defeating oil.
<<case "a toga">>
$activeSlave.slaveName's gigantic implant-filled belly parts $possessive toga.
+<<case "a huipil">>
+ $activeSlave.slaveName's huipil meekly rests atop $possessive gigantic implant-filled belly.
<<case "a slutty qipao">>
$possessiveCap qipao is slit up the side. However, it merely rests atop $possessive gigantic implant-filled belly.
<<case "uncomfortable straps">>
@@ -9612,6 +9737,8 @@ $pronounCap has
$activeSlave.slaveName's huge implant-filled belly is covered in a sheen of special oil meant to prevent stretch marks.
<<case "a toga">>
$activeSlave.slaveName's huge implant-filled belly parts $possessive toga.
+<<case "a huipil">>
+ $activeSlave.slaveName's huge implant-filled belly lifts $possessive huipil.
<<case "a slutty qipao">>
$possessiveCap qipao is slit up the side. However, it merely rests atop $possessive huge implant-filled belly.
<<case "uncomfortable straps">>
@@ -9739,6 +9866,8 @@ $pronounCap has
$activeSlave.slaveName's implant-filled belly is covered in a sheen of special oil meant to prevent stretch marks.
<<case "a toga">>
$activeSlave.slaveName's implant-filled belly parts $possessive toga.
+<<case "a huipil">>
+ $activeSlave.slaveName's implant-filled belly lifts $possessive huipil.
<<case "a slutty qipao">>
$possessiveCap qipao is slit up the side. However, it only covers the top of $possessive implant-filled belly.
<<case "uncomfortable straps">>
@@ -9867,6 +9996,8 @@ $pronounCap has
$activeSlave.slaveName's fat belly is covered in a sheen of oil.
<<case "a toga">>
$activeSlave.slaveName's toga can barely be pulled shut over $possessive fat belly.
+<<case "a huipil">>
+ $activeSlave.slaveName's huipil gets lifted by $possessive fat belly, so it's useless for covering $possessive body.
<<case "a slutty qipao">>
$possessiveCap qipao is slit up the side. However, it only covers the top of $possessive fat belly, allowing it to hang free.
<<case "uncomfortable straps">>
@@ -9994,6 +10125,8 @@ $pronounCap has
$activeSlave.slaveName's implant-rounded belly is covered in a sheen of oil.
<<case "a toga">>
$activeSlave.slaveName's implant-rounded belly gently bulges under $possessive toga.
+<<case "a huipil">>
+ $activeSlave.slaveName's implant-rounded belly slightly bulges under $possessive huipil.
<<case "a slutty qipao">>
$possessiveCap qipao is slit up the side. The front is pushed out by $possessive implant-rounded belly.
<<case "uncomfortable straps">>
@@ -10353,6 +10486,8 @@ $pronounCap has
$activeSlave.slaveName's hugely swollen is covered in a sheen of oil.
<<case "a toga">>
$activeSlave.slaveName's hugely swollen belly parts $possessive toga.
+<<case "a huipil">>
+ $activeSlave.slaveName's hugely swollen belly lifts $possessive huipil.
<<case "a slutty qipao">>
$possessiveCap qipao is slit up the side. However, it merely rests atop $possessive hugely swollen belly.
<<case "uncomfortable straps">>
@@ -10474,6 +10609,8 @@ $pronounCap has
$activeSlave.slaveName's jiggling <<print $activeSlave.inflationType>>-filled belly is covered in a sheen of oil.
<<case "a toga">>
$activeSlave.slaveName's jiggling <<print $activeSlave.inflationType>>-filled belly parts $possessive toga.
+<<case "a huipil">>
+ $activeSlave.slaveName's jiggling <<print $activeSlave.inflationType>>-filled belly lifts $possessive huipil.
<<case "a slutty qipao">>
$possessiveCap qipao is slit up the side. However, it only covers the top of $possessive jiggling <<print $activeSlave.inflationType>>-filled belly.
<<case "uncomfortable straps">>
@@ -10597,6 +10734,8 @@ $pronounCap has
$activeSlave.slaveName's fat belly is covered in a sheen of oil.
<<case "a toga">>
$activeSlave.slaveName's toga can barely be pulled shut over $possessive fat belly.
+<<case "a huipil">>
+ $activeSlave.slaveName's huipil gets lifted by $possessive fat belly, so it's useless for covering $possessive body.
<<case "a slutty qipao">>
$possessiveCap qipao is slit up the side. However, it only covers the top of $possessive fat belly, allowing it to hang free.
<<case "uncomfortable straps">>
@@ -10721,6 +10860,8 @@ $pronounCap has
$activeSlave.slaveName's <<print $activeSlave.inflationType>>-swollen belly is covered in a sheen of oil.
<<case "a toga">>
$activeSlave.slaveName's <<print $activeSlave.inflationType>>-swollen belly gently bulges under $possessive toga.
+<<case "a huipil">>
+ $activeSlave.slaveName's <<print $activeSlave.inflationType>>-swollen belly slightly bulges under $possessive huipil.
<<case "a slutty qipao">>
$possessiveCap qipao is slit up the side. The front is pushed out by $possessive <<print $activeSlave.inflationType>>-swollen belly.
<<case "uncomfortable straps">>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index bb3582d0685..c462560cf63 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -792,6 +792,14 @@
<<set $titles.push("Quaestor")>>
<</if>>
+<<if $arcologies[0].FSAztecRevivalist >= $FSLockinLevel*0.9>>
+ <<set $titles.push("Tlatcani")>>
+<<elseif $arcologies[0].FSAztecRevivalist >= $FSLockinLevel*0.6>>
+ <<set $titles.push("Cihuacoatl")>>
+<<elseif $arcologies[0].FSAztecRevivalist >= $FSLockinLevel*0.3>>
+ <<set $titles.push("Tlatoani")>>
+<</if>>
+
<<if $arcologies[0].FSEgyptianRevivalist >= $FSLockinLevel*0.9>>
<<if $PC.title == 1>>
<<set $titles.push("the Living God")>>
@@ -1708,6 +1716,11 @@ Call as <<SlaveSort [$slaves]>>
<<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSRomanRevivalist/$FSLockinLevel)>>
<<set $arcologies[0].FSRomanRevivalist += 0.05*$args[1]*$FSSingleSlaveRep>>
<</if>>
+<<case "AztecRevivalist">>
+ <<if $activeArcology.FSAztecRevivalist != "unset">>
+ <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSAztecRevivalist/$FSLockinLevel)>>
+ <<set $arcologies[0].FSAztecRevivalist += 0.05*$args[1]*$FSSingleSlaveRep>>
+ <</if>>
<<case "EgyptianRevivalist">>
<<if $arcologies[0].FSEgyptianRevivalist != "unset">>
<<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSEgyptianRevivalist/$FSLockinLevel)>>
@@ -1832,6 +1845,11 @@ Call as <<SlaveSort [$slaves]>>
<<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSRomanRevivalist/$FSLockinLevel)>>
<<set $arcologies[0].FSRomanRevivalist += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>>
<</if>>
+<<case "AztecRevivalist">>
+ <<if $activeArcology.FSAztecRevivalist != "unset">>
+ <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSAztecRevivalist/$FSLockinLevel)>>
+ <<set $arcologies[0].FSAztecRevivalist += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>>
+ <</if>>
<<case "EgyptianRevivalist">>
<<if $arcologies[0].FSEgyptianRevivalist != "unset">>
<<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSEgyptianRevivalist/$FSLockinLevel)>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 470b5eda05d..8084390c0f4 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -2304,6 +2304,11 @@
<<if random(0,1) == 0>>
<<set $activeSlave.sexualQuirk = "unflinching">>
<</if>>
+ <<elseif $arcologies[$i].FSAztecRevivalist > 20>>
+ They've seen sights that will traumatize almost anyone.
+ <<if random(0,1) == 0>>
+ <<set $activeSlave.trust = -30>>
+ <</if>>
<<elseif $arcologies[_market].FSEgyptianRevivalist > 20>>
They've often done things that give them a distinct appetite for perversion.
<<set $activeSlave.slaveName = $ancientEgyptianSlaveNames.random()>>
--
GitLab