From dd4351a7e449bfe060e13d55309054eed9317ed3 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Tue, 16 Mar 2021 19:03:13 -0700
Subject: [PATCH] Enable strict typechecking for decoration names. Fixes for
stray Repopulationist and Neo-Imperialist decoration flavor text and living
standards.
---
js/003-data/gameVariableData.js | 36 +++++++++++++++--------
src/endWeek/reports/clinicReport.js | 2 +-
src/endWeek/saRules.js | 4 +--
src/facilities/farmyard/farmyard.js | 4 +--
src/facilities/nursery/nursery.tw | 4 +--
src/js/assignJS.js | 10 +++----
src/uncategorized/arcade.tw | 4 +--
src/uncategorized/brothel.tw | 4 +--
src/uncategorized/brothelAdvertisement.tw | 6 ++--
src/uncategorized/cellblock.tw | 4 +--
src/uncategorized/clinic.tw | 4 +--
src/uncategorized/club.tw | 6 ++--
src/uncategorized/clubAdvertisement.tw | 4 +--
src/uncategorized/dairy.tw | 8 ++---
src/uncategorized/masterSuite.tw | 12 ++++----
src/uncategorized/schoolroom.tw | 4 +--
src/uncategorized/servantsQuarters.tw | 4 +--
src/uncategorized/spa.tw | 4 +--
18 files changed, 68 insertions(+), 56 deletions(-)
diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index dd8ce9f024d..39a09606a2a 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -491,7 +491,8 @@ App.Data.resetOnNGPlus = {
rooms: 5,
roomsPopulation: 0,
- brothelDecoration: "standard",
+ /** @type {FC.FutureSocietyDeco} */
+ brothelDecoration: (/** @type {FC.FutureSocietyDeco} */ "standard"),
brothelUpgradeDrugs: 0,
brothelAdsSpending: 0,
brothelAdsOld: 0,
@@ -505,7 +506,8 @@ App.Data.resetOnNGPlus = {
brothelBoost: {
selected: 0, eligible: 0
},
- dairyDecoration: "standard",
+ /** @type {FC.FutureSocietyDeco} */
+ dairyDecoration: (/** @type {FC.FutureSocietyDeco} */ "standard"),
dairyPrepUpgrade: 0,
dairyStimulatorsUpgrade: 0,
dairyStimulatorsSetting: 0,
@@ -534,7 +536,8 @@ App.Data.resetOnNGPlus = {
dairyName: "the Dairy",
dairy: 0,
cumSlaves: 0,
- clubDecoration: "standard",
+ /** @type {FC.FutureSocietyDeco} */
+ clubDecoration: (/** @type {FC.FutureSocietyDeco} */ "standard"),
clubUpgradePDAs: 0,
clubAdsSpending: 0,
clubAdsOld: 0,
@@ -545,18 +548,21 @@ App.Data.resetOnNGPlus = {
clubAdsXX: 0,
clubName: "the Club",
club: 0,
- servantsQuartersDecoration: "standard",
+ /** @type {FC.FutureSocietyDeco} */
+ servantsQuartersDecoration: (/** @type {FC.FutureSocietyDeco} */ "standard"),
servantsQuartersUpgradeMonitoring: 0,
servantsQuarters: 0,
servantsQuartersName: "the Servants' Quarters",
- schoolroomDecoration: "standard",
+ /** @type {FC.FutureSocietyDeco} */
+ schoolroomDecoration: (/** @type {FC.FutureSocietyDeco} */ "standard"),
schoolroomUpgradeSkills: 0,
schoolroomUpgradeLanguage: 0,
schoolroomUpgradeRemedial: 0,
schoolroomRemodelBimbo: 0,
schoolroom: 0,
schoolroomName: "the Schoolroom",
- spaDecoration: "standard",
+ /** @type {FC.FutureSocietyDeco} */
+ spaDecoration: (/** @type {FC.FutureSocietyDeco} */ "standard"),
spa: 0,
spaSpots: 0,
spaUpgrade: 0,
@@ -565,7 +571,8 @@ App.Data.resetOnNGPlus = {
incubator: {capacity: 0, tanks: []},
- clinicDecoration: "standard",
+ /** @type {FC.FutureSocietyDeco} */
+ clinicDecoration: (/** @type {FC.FutureSocietyDeco} */ "standard"),
clinic: 0,
clinicUpgradeFilters: 0,
clinicUpgradeScanner: 0,
@@ -574,7 +581,8 @@ App.Data.resetOnNGPlus = {
clinicInflateBelly: 0,
clinicSpeedGestation: 0,
clinicName: "the Clinic",
- arcadeDecoration: "standard",
+ /** @type {FC.FutureSocietyDeco} */
+ arcadeDecoration: (/** @type {FC.FutureSocietyDeco} */ "standard"),
arcadeUpgradeInjectors: 0,
arcadeUpgradeFuckdolls: 0,
arcadeUpgradeCollectors: 0,
@@ -582,12 +590,14 @@ App.Data.resetOnNGPlus = {
arcadeName: "the Arcade",
arcade: 0,
fuckdollsSold: 0,
- cellblockDecoration: "standard",
+ /** @type {FC.FutureSocietyDeco} */
+ cellblockDecoration: (/** @type {FC.FutureSocietyDeco} */ "standard"),
cellblockUpgrade: 0,
cellblock: 0,
cellblockName: "the Cellblock",
cellblockWardenCumsInside: 1,
- masterSuiteDecoration: "standard",
+ /** @type {FC.FutureSocietyDeco} */
+ masterSuiteDecoration: (/** @type {FC.FutureSocietyDeco} */ "standard"),
masterSuiteUpgradeLuxury: 0,
masterSuiteUpgradePregnancy: 0, /* Is the upgrade active? */
masterSuitePregnancyFertilityDrugs: 0, /* Are slaves being put on fertility drugs? */
@@ -607,7 +617,8 @@ App.Data.resetOnNGPlus = {
nurseryChildren: 0,
/** Check for whether the children are influenced by the nannies */
nannyInfluence: 0,
- nurseryDecoration: "standard",
+ /** @type {FC.FutureSocietyDeco} */
+ nurseryDecoration: (/** @type {FC.FutureSocietyDeco} */ "standard"),
nurseryWeight: 0,
nurseryMuscles: 0,
nurseryHormones: 0,
@@ -629,7 +640,8 @@ App.Data.resetOnNGPlus = {
farmyardFarmers: [], /* array of farmhands farming */
farmMenials: 0,
farmMenialsSpace: 0,
- farmyardDecoration: "standard",
+ /** @type {FC.FutureSocietyDeco} */
+ farmyardDecoration: (/** @type {FC.FutureSocietyDeco} */ "standard"),
farmyardUpgrades: {
pump: 0,
fertilizer: 0,
diff --git a/src/endWeek/reports/clinicReport.js b/src/endWeek/reports/clinicReport.js
index 7866fd66217..0317c4012b8 100644
--- a/src/endWeek/reports/clinicReport.js
+++ b/src/endWeek/reports/clinicReport.js
@@ -302,7 +302,7 @@ App.EndWeek.clinicReport = function() {
case "Maturity Preferentialist":
case "Paternalist":
case "Petite Admiration":
- case "Repopulation Focus":
+ case "Repopulationist":
case "Slimness Enthusiast":
case "Statuesque Glorification":
case "Youth Preferentialist":
diff --git a/src/endWeek/saRules.js b/src/endWeek/saRules.js
index f49b0f93bfc..a53e2859b46 100644
--- a/src/endWeek/saRules.js
+++ b/src/endWeek/saRules.js
@@ -664,7 +664,7 @@ App.SlaveAssignment.rules = function(slave) {
case "Hedonistic":
case "Maturity Preferentialist":
case "Paternalist":
- case "Repopulation Focus":
+ case "Repopulationist":
case "Slimness Enthusiast":
case "Youth Preferentialist":
case "Neo-Imperialist":
@@ -711,7 +711,7 @@ App.SlaveAssignment.rules = function(slave) {
case "Hedonistic":
case "Maturity Preferentialist":
case "Paternalist":
- case "Repopulation Focus":
+ case "Repopulationist":
case "Slimness Enthusiast":
case "Youth Preferentialist":
case "Neo-Imperialist":
diff --git a/src/facilities/farmyard/farmyard.js b/src/facilities/farmyard/farmyard.js
index fcbb9365ac2..369ae801acc 100644
--- a/src/facilities/farmyard/farmyard.js
+++ b/src/facilities/farmyard/farmyard.js
@@ -53,7 +53,7 @@ App.Facilities.Farmyard.farmyard = function() {
case "Roman Revivalist":
desc.append(`Its red tiles and white stone walls are the very picture of a Roman farm villa's construction, as are the marble statues and reliefs. Saturn and Ceres look over the prosperity of the fields${V.seeBestiality ? `. Mercury watches over the health of the animals, and Feronia ensures strong litters in your slaves.` : `, and Mercury watches over the health of the animals.`} The slaves here are all looked after well, as they have one of the most important jobs in ${V.arcologies[0].name}.`);
break;
- case "Neo Imperialist":
+ case "Neo-Imperialist":
desc.append(`Its high-tech, sleek black design invocates an embracement of the future, tempered by the hanging banners displaying your family crest as the rightful lord and master of these farms. Serf-like peasants work tirelessly in the fields, both to grow crops and oversee the slaves beneath them. Despite the harsh nature of the fieldwork, the slaves here are all looked after well, as they have one of the most important jobs in ${V.arcologies[0].name}.`);
break;
case "Aztec Revivalist":
@@ -77,7 +77,7 @@ App.Facilities.Farmyard.farmyard = function() {
case "Degradationist":
desc.append(`It is constructed less as a converted warehouse and more as something to visit, allowing guests to enjoy the spectacle of slaves ${V.seeBestiality ? `being pounded by eager animals` : `elbow deep in scrubbing animal waste`} to their satisfaction.`);
break;
- case "Repopulation Focus":
+ case "Repopulationist":
desc.append(`It teems with life, both in the belly of every animal and the belly of every slave, though the latter makes tending the fields difficult. They're ordered to take care, as they carry the future ${V.seeBestiality ? `of this farm` : `of the arcology`} in their bellies.`);
break;
case "Eugenics":
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index 9decd73212e..11c9054aab5 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -11,7 +11,7 @@
<<switch $nurseryDecoration>>
<<case "Roman Revivalist">>
is run with the Roman dream in mind, with wide open windows exposing the babies to the elements. The sleek marble halls bring a sense of serenity and duty as wet nurses wander the halls.
- <<case "Neo Imperialist">>
+ <<case "Neo-Imperialist">>
is modeled as an ultra high-tech nursing area, with omnipresent advanced machinery monitoring every heartbeat of the babies within, the soft glow of machines pulsating against the banners of your family crest lining the walls.
<<case "Aztec Revivalist">>
is lined head to toe in illustrious Aztec gold. Tiny but notable subscripts lay in plaques to honor the mothers who died giving birth, the children of said mothers, alive or dead, are tirelessly watched over to tend to their every need.
@@ -27,7 +27,7 @@
is decorated with childish religious cartoons and artistic tapestries of slaves bowing in submission, their themes always subsiding varying degrees of sexual worship. The caretakers that wander the halls obediently wear their habits, and never waste a moment to tenderly lull the children to sleep with stories of their prophet.
<<case "Degradationist">>
is bare and sullen. The cries of the neglected children destined for slavery trying to find comfort in their burlap coverings echo the halls, while those that await freedom are raised among luxury and are taught to look down on their less fortunate peers.
- <<case "Repopulation Focus">>
+ <<case "Repopulationist">>
is designed to be very open and public; a showing testament to your arcology's repopulation efforts. For those old enough to support them, they are strapped with big, but body warming, empathy bellies as to remind them of their destiny.
<<case "Eugenics">>
is of utmost quality without a single pleasantry missing — if the parents are of the elite blood of course. While there are rare stragglers of unworthy genes, the child populace overall is pampered with warm rooms and plentiful small toys.
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index 32f86468427..f6bc5ac4e7a 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -122,7 +122,7 @@ globalThis.assignJob = function(slave, job) {
case "clinic":
slave.assignment = Job.CLINIC;
switch (V.clinicDecoration) {
- case "Repopulation Focus":
+ case "Repopulationist":
case "Eugenics":
case "Gender Radicalist":
case "Gender Fundamentalist":
@@ -134,7 +134,7 @@ globalThis.assignJob = function(slave, job) {
case "Intellectual Dependency":
case "Petite Admiration":
case "Statuesque Glorification":
- case "Neo Imperialist":
+ case "Neo-Imperialist":
slave.rules.living = LivingRule.LUXURIOUS;
break;
@@ -165,7 +165,7 @@ globalThis.assignJob = function(slave, job) {
slave.assignment = Job.DAIRY;
switch (V.dairyDecoration) {
case "Roman Revivalist":
- case "Neo Imperialist":
+ case "Neo-Imperialist":
case "Aztec Revivalist":
case "Chinese Revivalist":
case "Chattel Religionist":
@@ -187,7 +187,7 @@ globalThis.assignJob = function(slave, job) {
case "farmyard":
slave.assignment = Job.FARMYARD;
switch (V.farmyardDecoration) {
- case "Neo Imperialist":
+ case "Neo-Imperialist":
case "Aztec Revivalist":
case "Chinese Revivalist":
case "Chattel Religionist":
@@ -238,7 +238,7 @@ globalThis.assignJob = function(slave, job) {
slave.assignment = Job.QUARTER;
switch (V.servantsQuartersDecoration) {
case "Roman Revivalist":
- case "Neo Imperialist":
+ case "Neo-Imperialist":
case "Aztec Revivalist":
case "Chinese Revivalist":
case "Chattel Religionist":
diff --git a/src/uncategorized/arcade.tw b/src/uncategorized/arcade.tw
index db8d593a71d..31f7c66b5fd 100644
--- a/src/uncategorized/arcade.tw
+++ b/src/uncategorized/arcade.tw
@@ -8,7 +8,7 @@
<<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 "Neo Imperialist">>
+ <<case "Neo-Imperialist">>
is built out as a Neo-Imperial temple, the banners of your house and a few other prominent noble families fluttering over the writhing bodies of the inmates. There's a lively bar and tables built out to one side where citizens can drink and relax when not enjoying themselves with the captive slaves.
<<case "Aztec Revivalist">>
is built out as 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.
@@ -26,7 +26,7 @@
is nothing but a system of harnesses to hold slaves in the usual posture they would hold within a normal Free Cities sex arcade. This way, no iota of their degradation here is missed.
<<case "Asset Expansionist">>
is constructed so that the slaves lie within the arcade facing up. The wall itself ends at waist height, so their breasts stick up to be groped while they are used from either end.
- <<case "Repopulation Focus">>
+ <<case "Repopulationist">>
is constructed so that the slaves lie within the arcade facing up. A hole is situated above them, so that their belly has room to protrude upwards as they are fucked pregnant.
<<case "Eugenics">>
is designed with built in dispensers for various prophylactics. Numerous reminders to not impregnate subhumans line the walls along with offers for patrons to join the ranks of the Elite.
diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index 5a318e8c462..ea77a3677cf 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -8,7 +8,7 @@
<<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 "Neo Imperialist">>
+ <<case "Neo-Imperialist">>
is decorated as a seemless intersection of technology and tradition. Slaves dressed in tight bodysuits and skimpy nanoweave flit underneath the glow of sleek walls and flowing feudal banners.
<<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.
@@ -24,7 +24,7 @@
is decorated as a place of carnal worship. The air is scented by censers, and the slaves here maintain an air of holiness even when being sodomized in public.
<<case "Degradationist">>
is decorated to look like a dungeon. The décor involves a lot of black leather and burnished steel, and the slaves on offer are mostly chained to beds and walls.
- <<case "Repopulation Focus">>
+ <<case "Repopulationist">>
is clean and full of soft couches and chairs for its' pregnant whores to lounge upon while showing off their assets. Several of the rooms are prepped to allow a whore to give birth in front of an audience. A supply of freshly squeezed breast milk is available on tap.
<<case "Eugenics">>
is decorated to look like a club. Loud music is playing, and the whores that aren't with customers are stripping and pole dancing on a stage. Safe sex is greatly encouraged. The real action happens in several reserved rooms dedicated to society's best, since the loud music drowns out private conversations.
diff --git a/src/uncategorized/brothelAdvertisement.tw b/src/uncategorized/brothelAdvertisement.tw
index dae5e859ff8..1b4c8d8ce3e 100644
--- a/src/uncategorized/brothelAdvertisement.tw
+++ b/src/uncategorized/brothelAdvertisement.tw
@@ -5,8 +5,8 @@
<<switch $brothelDecoration>>
<<case "Roman Revivalist">>
_brothelNameCaps is decorated as a Roman whorehouse. Refreshments are served at a bar, and someone is playing pipes in the back.
- <<case "Neo Imperialist">>
- _brothelNameCaps is decorated as a seemless intersection of technology and tradition. Slaves dressed in tight bodysuits and skimpy nanoweave flit underneath the glow of sleek walls and flowing feudal banners.
+ <<case "Neo-Imperialist">>
+ _brothelNameCaps is decorated as a seamless intersection of technology and tradition. Slaves dressed in tight bodysuits and skimpy nanoweave flit underneath the glow of sleek walls and flowing feudal banners.
<<case "Aztec Revivalist">>
_brothelNameCaps 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">>
@@ -21,7 +21,7 @@
_brothelNameCaps is decorated as a place of worship. The air is scented by censers, and the slaves here maintain an air of holiness even when being sodomized in public.
<<case "Degradationist">>
_brothelNameCaps is decorated to look like a dungeon. The décor involves a lot of black leather and burnished steel, and the slaves on offer are mostly chained to beds and walls.
- <<case "Repopulation Focus">>
+ <<case "Repopulationist">>
_brothelNameCaps is clean and full of soft couches and chairs for its' pregnant whores to lounge upon while showing off their assets. Several of the rooms are prepped to allow a whore to give birth in front of an audience. A supply of freshly squeezed breast milk is available on tap.
<<case "Eugenics">>
_brothelNameCaps is decorated to look like a club. Loud music is playing, and the whores that aren't with customers are stripping and pole dancing on a stage. Safe sex is greatly encouraged. The real action happens in several reserved rooms dedicated to society's best, since the loud music drowns out private conversations.
diff --git a/src/uncategorized/cellblock.tw b/src/uncategorized/cellblock.tw
index beb66b4c199..33a0856b1f4 100644
--- a/src/uncategorized/cellblock.tw
+++ b/src/uncategorized/cellblock.tw
@@ -8,7 +8,7 @@
<<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 "Neo Imperialist">>
+ <<case "Neo-Imperialist">>
is designed as an ultra high-tech cellblock. Holographic shackles keep slaves locked to rough black cells, kept totally isolated from one another through the complete silence of thick metal walls.
<<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 <<if $arcologies[0].FSPaternalist != "unset">>ropes and penetrators<<else>>knives, ropes and blunt instruments<</if>>.
@@ -38,7 +38,7 @@
is a straightforward prison whose menace is provided by context that, although subtle, adds up to a nightmare. Everyone outside the cells is $arcologies[0].FSSupremacistRace, and everyone inside them is not. The darkness of history is palpable here.
<<case "Subjugationist">>
is a straightforward prison whose menace is provided by context that, although subtle, adds up to a nightmare. The inmates inside the cells are $arcologies[0].FSSubjugationistRace, and everyone outside them is not. The darkness of history is palpable here.
- <<case "Repopulation Focus">>
+ <<case "Repopulationist">>
is a straightforward prison, with two exceptions. One cell style features a screen displaying plans for its inmate's impregnation, the other is covered with mirrors for its inmate to watch her pregnancy grow. Day and night, inmates are confronted with the sight of themselves transformed.
<<case "Eugenics">>
is designed to make very clear to its inmates that they are subhuman. Many screens showcasing their inadequacy intermingled with propaganda play on nonstop loops.
diff --git a/src/uncategorized/clinic.tw b/src/uncategorized/clinic.tw
index c0d0179c46d..fe1a4a83dcb 100644
--- a/src/uncategorized/clinic.tw
+++ b/src/uncategorized/clinic.tw
@@ -8,7 +8,7 @@
<<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 "Neo Imperialist">>
+ <<case "Neo-Imperialist">>
is white and sterile, filled with so many high-tech machines that you cannot discern the purpose of them all. The space reminds you of a laboratory, kept painstakingly clean at all time by small robotic drones.
<<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.
@@ -24,7 +24,7 @@
is open and airy; shaded beams of sunlight shine through skylights to bathe each bed in a pool of healing warmth.
<<case "Degradationist">>
is clean and cold, all scrubbed tile and cool steel. The beds have prominent restraint attachment points to force patients into any position desired.
- <<case "Repopulation Focus">>
+ <<case "Repopulationist">>
is warm and inviting, with wide corridors and ample seating for its pregnant clientèle. All the equipment is designed to accommodate heavily pregnant women.
<<case "Eugenics">>
is warm and inviting on one side, cold and utilitarian on the other. Only the toys of the elite are allowed the best of care.
diff --git a/src/uncategorized/club.tw b/src/uncategorized/club.tw
index 665d1e6ffba..4d43ced8042 100644
--- a/src/uncategorized/club.tw
+++ b/src/uncategorized/club.tw
@@ -8,7 +8,7 @@
<<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 "Neo Imperialist">>
+ <<case "Neo-Imperialist">>
is a genuine temple of Imperial decadence. The blaze of bright neon lights flash and strobe on a mass of sweaty bodies, sleek speakers blaring synthetic music as banners with your family's crest flutter above the serenity of mindless dance. The stoic stone figures of Imperial Knights watching the entrance provide a stark contrast to the Bacchian passion of the dancers.
<<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.
@@ -24,7 +24,7 @@
isn't a religious establishment, but it almost looks like one. It's clean and proper, with beams of natural light that come down to highlight holy sex slaves' bodies.
<<case "Degradationist">>
has a perverted, debauched appearance. The décor is utilitarian so it can be cleaned easily, and the reason is obvious. Many patrons have brought their own slaves to publicly rape here.
- <<case "Repopulation Focus">>
+ <<case "Repopulationist">>
has a gaudy appearance. There are lots of deep soft chairs for pregnant patrons and slaves to rest in and screens showing girls with large bellies lining the walls.
<<case "Eugenics">>
has a gaudy appearance. There are screens lining the walls discouraging unprotected slave sex. The real action happens in the several exclusive rooms reserved for society's best.
@@ -159,7 +159,7 @@
From one of the private rooms, praying interspersed with the slap of leather on flesh can be heard.
<<case "Degradationist">>
Agonized screaming can be heard from one of the private rooms.
- <<case "Repopulation Focus">>
+ <<case "Repopulationist">>
A wet slapping sound is coming from one of the private rooms, the kind of sound made by mammary intercourse with very milky breasts. Occasionally crying can be heard from one of the rooms specially designed for patrons wishing to assfuck a slave as she gives birth.
<<case "Eugenics">>
The slight sounds of whispering can be heard emanating from one of the restricted rooms.
diff --git a/src/uncategorized/clubAdvertisement.tw b/src/uncategorized/clubAdvertisement.tw
index d219671284d..dd0cac4c160 100644
--- a/src/uncategorized/clubAdvertisement.tw
+++ b/src/uncategorized/clubAdvertisement.tw
@@ -5,7 +5,7 @@
<<switch $clubDecoration>>
<<case "Roman Revivalist">>
_clubNameCaps is decorated like a Roman villa's entertainment rooms. There is a lot of white stone, plaster, and terracotta.
- <<case "Neo Imperialist">>
+ <<case "Neo-Imperialist">>
_clubNameCaps is a genuine temple of Imperial decadence. The blaze of bright neon lights flash and strobe on a mass of sweaty bodies, sleek speakers blaring synthetic music as banners with your family's crest flutter above the serenity of mindless dance. The stoic stone figures of Imperial Knights watching the entrance provide a stark contrast to the Bacchian passion of the dancers.
<<case "Aztec Revivalist">>
_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.
@@ -21,7 +21,7 @@
_clubNameCaps isn't a religious establishment, but it almost looks like one. It's clean and proper, with beams of natural light that come down to highlight holy sex slaves' bodies.
<<case "Degradationist">>
_clubNameCaps has a perverted, debauched appearance. The décor is utilitarian so it can be cleaned easily, and the reason is obvious. Many patrons have brought their own slaves to publicly rape here.
- <<case "Repopulation Focus">>
+ <<case "Repopulationist">>
_clubNameCaps has a gaudy appearance. There are lots of deep soft chairs for pregnant patrons and slaves to rest in and screens showing girls with large bellies lining the walls.
<<case "Eugenics">>
_clubNameCaps has a gaudy appearance. There are screens lining the walls discouraging unprotected slave sex. The real action happens in the several exclusive rooms reserved for society's best.
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index 408d97e42f4..c0edcf4eee3 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -159,7 +159,7 @@
<<switch $dairyDecoration>>
<<case "Roman Revivalist">>
The screens there review each slave's liquid contributions to the state in minute detail.
- <<case "Neo Imperialist">>
+ <<case "Neo-Imperialist">>
The sleek screens display a variety of statistics on each slave's vitals and production.
<<case "Aztec Revivalist">>
The strange sight of the milking machines, designed to look like fertility statues gives the space an imposing feeling.
@@ -175,7 +175,7 @@
It presents the inmates as lessons, here to expiate their sins in a purgatory created by technology.
<<case "Degradationist">>
The screens there feature, among a sea of facts and figures about each slave, their most recent brain scan.
- <<case "Repopulation Focus">>
+ <<case "Repopulationist">>
The gallery is placed for a good view of each slave's swelling breasts and growing pregnancy. A screen is prominently displayed before each slave, detailing the number of babies she produced and the current number occupying their womb.
<<case "Eugenics">>
The screens there tell very little about the slaves within. That information is privy only to Society's Elite.
@@ -223,7 +223,7 @@
<<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 "Neo Imperialist">>
+ <<case "Neo-Imperialist">>
is cold and industrial, filled with the latest in industrial harvesting technology. The slaves do their duty underneath the hanging banners of your house, reminding them who owns their very bodies and all they produce.
<<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.
@@ -239,7 +239,7 @@
is functional and clean. There are nice quotations from the holy book on the walls, and there is a little shrine designed to allow a cow who has difficulty standing to make their devotions comfortably.
<<case "Degradationist">>
is harsh and utilitarian. There are stands to restrain cows who aren't being milked for dosing, punishment, or sexual use. There are cattle prods here and there to use on resistant cows, unproductive cows, or cows one wishes to hear scream.
- <<case "Repopulation Focus">>
+ <<case "Repopulationist">>
is comfortable and well-kept. The milking machines are specially designed to maximize a pregnant cow's comfort. After a milking, cows have a wide selection of soft furniture to choose from, so comfortable that most fall fast asleep.
<<case "Eugenics">>
is comfortable, well-kept and well-monitored. Cows are kept track of at all times to make sure no-one tries to increase milk production via pregnancy.
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index 53b40bc8120..02080c50600 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -33,7 +33,7 @@ _masterSuiteNameCaps is furnished
<<switch $masterSuiteDecoration>>
<<case "Roman Revivalist">>
as a Roman emperor's apartment. There is a small shrine to the old gods the <<= properMaster()>> 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 "Neo Imperialist">>
+ <<case "Neo-Imperialist">>
as an apartment worthy of a modern-day Emperor. The highest of technology decorates every space, allowing you to remain in constant communication with the rest of the arcology - your fledgling empire - even when in your room. The <<= properMaster()>>'s suite is an elaborate shrine to your many victories, fitted with many low couches to fit a whole harem inside, and the banners of your house hang around you on every side. The centerpiece of your personal apartment is a massive tapestry, designed in ancient style and depicting the creation of your Arcology from the collapsing Old World, all the way up to the modern day, with you standing over a great cheering crowd in your golden crown. You wonder for a moment if you'll have to commission more tapestries as the Arcology advances further.
<<case "Aztec Revivalist">>
as an Aztec cultural, spiritual and military leader of the city you're allowed great leniency. The <<= properMaster()>>'s room is created to gratify you as a true god of the people.
@@ -49,7 +49,7 @@ _masterSuiteNameCaps is furnished
as a severe place of cold stone and hard wood. A single shaft of sunlight illuminates an enormous stone platform that serves as a bed where penitents give their bodies to their <<= properMaster()>>.
<<case "Degradationist">>
with a gothic grandeur. Blood-red upholstery and hardwood menace crouch in the center of the space in the form of a massive poster bed with curtains of chain mail.
- <<case "Repopulation Focus">>
+ <<case "Repopulationist">>
comfortably, with lots of cushions and seats for pregnant slaves to lounge on. Various specialized toys, as well as, lotions and creams are readily available. There's a huge, reinforced, low to the ground bed in the middle of the suite.
<<case "Eugenics">>
comfortably, with lots of easy-to-clean leather and plentiful tools, toys, and lubricants to make fucking slave girls lots of fun. There's a huge bed in the middle of the suite, with hidden compartments containing condoms and spermicides.
@@ -110,7 +110,7 @@ _masterSuiteNameCaps is furnished
<<switch $masterSuiteDecoration>>
<<case "Roman Revivalist">>
as a Roman emperor's apartment. There is a small shrine to the old gods the <<= properTitle()>> favors in a side room, and the flooring is erotic mosaic.
- <<case "Neo Imperialist">>
+ <<case "Neo-Imperialist">>
as an apartment worthy of a modern-day Emperor. The highest of technology decorates every space, allowing you to remain in constant communication with the rest of the arcology - your fledgling empire - even when in your room. The <<= properMaster()>>'s suite is an elaborate shrine to your many victories, fitted with a large bed with hanging golden bedposts, and the banners of your house hang around you on every side. The centerpiece of your personal apartment is a massive tapestry, designed in ancient style and depicting the creation of your Arcology from the collapsing Old World, all the way up to the modern day, with you standing over a great cheering crowd in your golden crown. You wonder for a moment if you'll have to commission more tapestries as the Arcology advances further.
<<case "Aztec Revivalist">>
as an Aztec cultural, spiritual and military leader of the city you're allowed great leniency. The <<= properTitle()>>'s room is created to gratify you as a true god of the people.
@@ -126,7 +126,7 @@ _masterSuiteNameCaps is furnished
as a severe place of cold stone and hard wood. A single shaft of sunlight illuminates the central space.
<<case "Degradationist">>
with a gothic grandeur. Blood-red upholstery and hardwood menace decorate the walls.
- <<case "Repopulation Focus">>
+ <<case "Repopulationist">>
comfortably, with lots of cushions and seats for a pregnant slaves to lounge on. There are various specialized toys, as well as, lotions and creams readily available.
<<case "Eugenics">>
comfortably, with lots of easy-to-clean leather and plentiful tools, toys, and lubricants to make fucking slave girls lots of fun. Condoms and spermicides are readily available throughout the suite.
@@ -206,7 +206,7 @@ _masterSuiteNameCaps is furnished
<<switch $masterSuiteDecoration>>
<<case "Roman Revivalist">>
as a Roman patrician's apartment. There is a small shrine to the old gods the <<= properTitle()>> favors in a side room, and the flooring is erotic mosaic.
- <<case "Neo Imperialist">>
+ <<case "Neo-Imperialist">>
as an apartment worthy of a modern-day King. The highest of technology decorates every space, allowing you to remain in constant communication with the rest of the arcology - your fledgling empire - even when in your room. The <<= properMaster()>>'s suite is an elaborate shrine to your many victories, fitted with a king-sized pod-bed, and the banners of your house hang around you on every side. The centerpiece of your personal apartment is a massive tapestry, designed in ancient style and depicting the creation of your Arcology from the collapsing Old World, all the way up to the modern day, with you standing over a great cheering crowd in your golden crown. You wonder for a moment if you'll have to commission more tapestries as the Arcology advances further.
<<case "Aztec Revivalist">>
as an Aztec cultural, spiritual and military leader of the city you're allowed great leniency. The <<= properTitle()>>'s room is created to gratify you as a true god of the people.
@@ -220,7 +220,7 @@ _masterSuiteNameCaps is furnished
like the mansion of a senior mandarin of ancient China. The walls are gorgeous hand-carved wooden screens, and heavy jade statues of favored gods crouch in the corners.
<<case "Chattel Religionist">>
as a severe place of cold stone and hard wood. A single shaft of sunlight illuminates the bed where penitents give their bodies to their <<= properTitle()>>.
- <<case "Repopulation Focus">>
+ <<case "Repopulationist">>
comfortably, with lots of cushions and seats for a pregnant slaves to lounge on. Various specialized toys, as well as, lotions and creams are readily available.
<<case "Eugenics">>
comfortably, with lots of easy-to-clean leather and plentiful tools, toys, and lubricants to make fucking slave girls lots of fun. Condoms and spermicides are readily available throughout the suite.
diff --git a/src/uncategorized/schoolroom.tw b/src/uncategorized/schoolroom.tw
index 2a14875352d..0fc6e33cecb 100644
--- a/src/uncategorized/schoolroom.tw
+++ b/src/uncategorized/schoolroom.tw
@@ -8,7 +8,7 @@
<<switch $schoolroomDecoration>>
<<case "Roman Revivalist">>
showing the story of a famous Roman slave who sacrificed her life for the life of her <<= properMaster()>>.
- <<case "Neo Imperialist">>
+ <<case "Neo-Imperialist">>
showing the work of many serfs building a great monument to their Imperial <<= properMaster()>>, and emphasising the beauty of the society they built together.
<<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.
@@ -24,7 +24,7 @@
displaying a passage from the holy book that supports slavery.
<<case "Degradationist">>
displaying a rote recitation of a slave's proper acceptance of her subhuman status.
- <<case "Repopulation Focus">>
+ <<case "Repopulationist">>
reviewing a number of sexual positions to accommodate a heavily pregnant girl.
<<case "Eugenics">>
reviewing ways to better your owner's standing intermixed with exaggerated pregnancy horror stories focused on slave pregnancy.
diff --git a/src/uncategorized/servantsQuarters.tw b/src/uncategorized/servantsQuarters.tw
index ae0516d2d56..262d910410f 100644
--- a/src/uncategorized/servantsQuarters.tw
+++ b/src/uncategorized/servantsQuarters.tw
@@ -8,7 +8,7 @@
<<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 "Neo Imperialist">>
+ <<case "Neo-Imperialist">>
are surprisingly luxurious for mere servant's quarters. They're a large, public dormitory, but the barracks-like beds are soft, clean, high-tech pods stacked two to a row, separated by banners emblazoned with your family crest. A few small tapestries decorate the walls, mostly showing happy-looking servants cleaning and cooking.
<<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.
@@ -24,7 +24,7 @@
are spartan, yet functional. Servants here are expected to be clean and hardworking, and there is a penitents cell ready for them if they are not.
<<case "Degradationist">>
are severe and utilitarian. Servants sleep uncomfortably here, knowing that even on their meager bedrolls, they are fair game for abuse.
- <<case "Repopulation Focus">>
+ <<case "Repopulationist">>
are comfortable and well-kept. Though there is little privacy here, the servants are provided for. There's even a small rest area for them to rest their pregnant bodies between shifts. A closet contains specialized cleaning tools to accommodate their distended bodies.
<<case "Eugenics">>
are comfortable and well-kept. Though there is little privacy here, the servants are provided for. They are required to always be carrying prophylactics for other slaves and any low class citizens who require them.
diff --git a/src/uncategorized/spa.tw b/src/uncategorized/spa.tw
index c4083687c37..0966d569f6c 100644
--- a/src/uncategorized/spa.tw
+++ b/src/uncategorized/spa.tw
@@ -8,7 +8,7 @@
<<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 "Neo Imperialist">>
+ <<case "Neo-Imperialist">>
is built as a modern Imperial garden. Bright green plants mix with the pulsating lights of high technology, and clear, sleek windows fog up with the steam of a central bath heated by the latest hydraulic technology.
<<case "Aztec Revivalist">>
is built as an Aztec bathhouse. Water steams from the middle of the room and the air is heavy with the scent of herbs and essences. The idols by the door glisten with moisture.
@@ -28,7 +28,7 @@
is utilitarian. It is equipped with all sorts of devices to help slaves care for huge assets, including lifts to help them in and out of the water, and all around showers to help clean and moisturize difficult to reach spots.
<<case "Transformation Fetishist">>
is utilitarian. It is equipped with special devices to help speed surgical recovery, including a series of baths designed to prevent scarring.
- <<case "Repopulation Focus">>
+ <<case "Repopulationist">>
is comfortable, with waterproof cushions lining the pools. It is equipped with all sorts of devices to aid pregnant slaves, including lifts to help them in and out of the water, baths just for their feet, and all around showers to help clean and moisturize difficult to reach spots.
<<case "Eugenics">>
is comfortable, albeit split in half. One side for the lower classes' slaves, and the other for the Elite and their pets.
--
GitLab