From ae7826225b93fcae169187af08877a31b399ee79 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Tue, 3 Mar 2020 02:06:23 -0500
Subject: [PATCH] mroe cleanup

---
 js/003-data/gameVariableData.js | 491 ++++++++++++++++++--------------
 src/init/storyInit.tw           |  62 ----
 2 files changed, 272 insertions(+), 281 deletions(-)

diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 7d094359ef8..1fe225790b6 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -251,7 +251,7 @@ App.Data.defaultGameStateVariables = {
 	dividendTimer: 0,
 	personalShares: 0,
 	publicShares: 0,
-	targetArcology: {},
+	targetArcology: {type: "New"},
 	REFeminizationCheckinIDs: [],
 	REMILFCheckinIDs: [],
 	REOrientationCheckinIDs: [],
@@ -396,26 +396,26 @@ App.Data.defaultGameStateVariables = {
 	cellblockWardenCumsInside: 1,
 	masterSuiteDecoration: "standard",
 	masterSuiteUpgradeLuxury: 0,
-	masterSuiteUpgradePregnancy: 0,				// Is the upgrade active?
-	masterSuitePregnancyFertilityDrugs: 0,			// Are slaves being put on fertility drugs?
-	masterSuitePregnancyFertilitySupplements: 0,	// Are those drugs being supplemented (health benefits and (even) more multiple pregnancies)
-	masterSuitePregnancySlaveLuxuries: 0,			// Are the slaves being given some nicer things to reduce stress during preg? (health/devotion/trust benefits)
-	universalHGImpregnateMasterSuiteToggle: 0,		// Will the HG impregnate fertile slaves in the MS?
+	masterSuiteUpgradePregnancy: 0, // Is the upgrade active?
+	masterSuitePregnancyFertilityDrugs: 0, // Are slaves being put on fertility drugs?
+	masterSuitePregnancyFertilitySupplements: 0, // Are those drugs being supplemented (health benefits and (even) more multiple pregnancies)
+	masterSuitePregnancySlaveLuxuries: 0, // Are the slaves being given some nicer things to reduce stress during preg? (health/devotion/trust benefits)
+	universalHGImpregnateMasterSuiteToggle: 0, // Will the HG impregnate fertile slaves in the MS?
 	masterSuiteHyperPregnancy: 0,
 	masterSuite: 0,
 	masterSuiteName: "the Master Suite",
 	masterSuiteNameCaps: "The Master Suite",
 	// Nursery Subsection
-	nursery: 0,						// counts the number of children the nursery can support
-	nurseryNannies: 0,					// counts the number of nannies the nursery can support
-	nurseryBabies: 0,					// counts the number of children currently in the nursery
-	MatronInfluence: 0,				// check for whether the children are influenced by the Matron
-	nannyInfluence: 0,					// check for whether the children are influenced by the nannies
+	nursery: 0, // counts the number of children the nursery can support
+	nurseryNannies: 0, // counts the number of nannies the nursery can support
+	nurseryBabies: 0, // counts the number of children currently in the nursery
+	MatronInfluence: 0, // check for whether the children are influenced by the Matron
+	nannyInfluence: 0, // check for whether the children are influenced by the nannies
 	nurseryDecoration: "standard",
 	nurseryWeight: 0,
 	nurseryMuscles: 0,
 	nurseryHormones: 0,
-	nurseryOrgans: 0,					// not currently in use
+	nurseryOrgans: 0, // not currently in use
 	nurseryImprintSetting: 0,
 	nurseryWeightSetting: 0,
 	nurseryMusclesSetting: 0,
@@ -423,14 +423,14 @@ App.Data.defaultGameStateVariables = {
 	nurseryName: "the Nursery",
 	nurseryNameCaps: "The Nursery",
 	reservedChildrenNursery: 0,
-	cribs: [],							// array of children in the nursery
-	cribsFreed: [],					// array of children that have been freed
-	childToSlave: -1,					// number of total children that have become slaves
+	cribs: [], // array of children in the nursery
+	cribsFreed: [], // array of children that have been freed
+	childToSlave: -1, // number of total children that have become slaves
 	cribsIndices: 0,
 	// Farmyard Subsection
 	farmyard: 0,
-	farmyardShowgirls: [],			// array of farmhands putting on shows
-	farmyardFarmers: [],			// array of farmhands farming
+	farmyardShowgirls: [], // array of farmhands putting on shows
+	farmyardFarmers: [], // array of farmhands farming
 	farmMenials: 0,
 	farmMenialsSpace: 0,
 	farmyardDecoration: "standard",
@@ -451,7 +451,9 @@ App.Data.defaultGameStateVariables = {
 	activeFeline: 0,
 	farmyardLab: 0,
 	farmyardLabUpgrades: {animalOvaries: 0, animalTesticles: 0, animalMpreg: 0},
-	animalsBought: {},
+	animalsBought: {
+ canines: 0, hooved: 0, felines: 0, labradorRetrievers: 0, germanShepherds: 0, goldenRetrievers: 0, frenchBulldogs: 0, bulldogs: 0, beagles: 0, poodles: 0, rottweilers: 0, yorkshireTerriers: 0, siberianHuskies: 0, horses: 0, bulls: 0, pigs: 0, siameses: 0, persians: 0, maineCoons: 0, ragdolls: 0, bengals: 0, abbysinians: 0, birmans: 0, orientalShorthairs: 0, sphynxes: 0, russianBlues: 0, wolves: 0, foxes: 0, jackals: 0, dingos: 0, zebras: 0, cougars: 0, jaguars: 0, pumas: 0, lynx: 0, leopards: 0, lions: 0, tigers: 0
+},
 	canines: [],
 	hooved: [],
 	felines: [],
@@ -505,7 +507,9 @@ App.Data.defaultGameStateVariables = {
 	FSSpending: 0,
 	FSLockinLevel: 100,
 	applyLaw: 0,
-	FSPromenade: {},
+	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, Repopulationist: 0, Eugenics: 0, Hedonism: 0, IntellectualDependency: 0, SlaveProfessionalism: 0, PetiteAdmiration: 0, StatuesqueGlorification: 0
+},
 	// new corporation variables
 	newCorp: 1,
 	vanillaShareSplit: 1,
@@ -538,8 +542,18 @@ App.Data.defaultGameStateVariables = {
 	corpMarket: 0,
 	// Slave sexual services and goods variables
 	publicFuckdolls: 0,
-	classSatisfied: {},
-	whoreBudget: {},
+	classSatisfied: {
+		lowerClass: 0,
+		middleClass: 0,
+		upperClass: 0,
+		topClass: 0
+	},
+	whoreBudget: {
+		lowerClass: 7,
+		middleClass: 40,
+		upperClass: 200,
+		topClass: 1500
+	},
 	arcadePrice: 2,
 	clubSlaveSexAmount: 0,
 	shelterSlave: 0,
@@ -733,7 +747,7 @@ App.Data.defaultGameStateVariables = {
 		schoolSale: 0
 	},
 	IDNumber: 1,
-	nIDNumber: 1,	// tracks children in the nursery
+	nIDNumber: 1, // tracks children in the nursery
 	week: 1,
 	weddingPlanned: 0,
 	personalAttention: "sex",
@@ -764,18 +778,18 @@ App.Data.defaultGameStateVariables = {
 	Wardeness: 0,
 	Concubine: 0,
 	economicUncertainty: 10,
-	justiceEvents: [],
+	justiceEvents: ["slave deal", "slave training", "majority deal", "indenture deal", "virginity deal", "breeding deal"],
 	// not in setupVars because we remove events from this array as they occur
-	prisonCircuit: [],
+	prisonCircuit: ["low tier criminals", "gangs and smugglers", "white collar", "military prison"],
 	prisonCircuitIndex: 0,
 	fixedNationality: 0,
 	fixedRace: 0,
 	ui: "start",
 	tooltipsEnabled: 1,
-	brandTarget: {},
-	brandDesign: {},
-	scarTarget: {},
-	scarDesign: {},
+	brandTarget: {primary: "buttock", secondary: "buttock", local: "buttock"},
+	brandDesign: {primary: "your initials", official: "your initials", local: "your initials"},
+	scarTarget: {primary: "left cheek", secondary: "left cheek", local: "left cheek"},
+	scarDesign: {primary: "generic", local: "generic"},
 	oralTotal: 0,
 	vaginalTotal: 0,
 	analTotal: 0,
@@ -882,23 +896,59 @@ App.Data.defaultGameStateVariables = {
 	deltaDemandOld: 0,
 	deltaSupply: 0,
 	deltaSupplyOld: 0,
-	NPCSexSupply: {},
-	NPCMarketShare: {},
-	sexSubsidies: {},
-	sexSupplyBarriers: {},
+	NPCSexSupply: {
+		lowerClass: 3000,
+		middleClass: 3000,
+		upperClass: 3000,
+		topClass: 3000
+	},
+	NPCMarketShare: {
+		lowerClass: 1000,
+		middleClass: 1000,
+		upperClass: 1000,
+		topClass: 1000
+	},
+	sexSubsidies: {
+		lowerClass: 0,
+		middleClass: 0,
+		upperClass: 0,
+		topClass: 0
+	},
+	sexSupplyBarriers: {
+		lowerClass: 0,
+		middleClass: 0,
+		upperClass: 0,
+		topClass: 0
+	},
 	minimumSlaveCost: 2500,
 	facilityCost: 100,
 	enduringRep: 1000,
 	rep: 0,
 	repLastWeek: 0,
-	arcologyUpgrade: {},
+	arcologyUpgrade: {
+		drones: 0,
+		hydro: 0,
+		apron: 0,
+		grid: 0,
+		spire: 0
+	},
 	AGrowth: 2,
 	ACitizens: 4250,
 	lowerClass: 3120,
 	LSCBase: 800,
 	visitors: 0,
-	rentDefaults: {},
-	rent: {},
+	rentDefaults: {
+		lowerClass: 20,
+		middleClass: 50,
+		upperClass: 180,
+		topClass: 650
+	},
+	rent: {
+		lowerClass: 20,
+		middleClass: 50,
+		upperClass: 180,
+		topClass: 650
+	},
 	rentEffectL: 1,
 	middleClass: 890,
 	MCBase: 200,
@@ -926,7 +976,7 @@ App.Data.defaultGameStateVariables = {
 		upper: 2.2,
 		top: 2.4
 	},
-	foodConsumption: 0,	// total amount food consumed per week
+	foodConsumption: 0, // total amount food consumed per week
 	revealFoodEffects: 0,
 	rations: 0,
 	building: {},
@@ -1117,7 +1167,7 @@ App.Data.defaultGameStateVariables = {
 	lastWeeksCashErrors: "",
 	Sweatshops: 0,
 	thisWeeksFSWares: 0,
-	thisWeeksIllegalWares : 0,
+	thisWeeksIllegalWares: 0,
 	milkTap: 0,
 	corpSpecTimer: 0,
 	debugModeCustomFunction: 0,
@@ -1153,180 +1203,182 @@ App.Data.defaultGameStateVariables = {
 	boomerangStats: {},
 	FSNonconformist: "",
 	econAdvantage: 0,
-	attackType:"none",
-	attackThisWeek:0,
-	lastAttackWeeks:0,
+	attackType: "none",
+	attackThisWeek: 0,
+	lastAttackWeeks: 0,
 	lastRebellionWeeks: 0,
-	hasFoughtOnce:0,
-	hasFoughtMajorBattleOnce:0,
-	hasRebelledOnce:0,
-	majorBattle:0,
-	PCvictoryStreak:0,
-	PClossStreak:0,
-	foughtThisWeek:0,
+	hasFoughtOnce: 0,
+	hasFoughtMajorBattleOnce: 0,
+	hasRebelledOnce: 0,
+	majorBattle: 0,
+	PCvictoryStreak: 0,
+	PClossStreak: 0,
+	foughtThisWeek: 0,
 
 	/* edicts */
-	alternativeRents:0,
-	enslavementRights:0,
-	securityExemption:0,
-	sellData:0,
-	propCampaignBoost:0,
-	slaveWatch:0,
-	subsidyChurch:0,
-	limitImmigration:0,
-	openBorders:0,
-	slavesOfficers:0,
-	martialSchool:0,
-	discountMercenaries:0,
-	militiaFounded:0,
-	recruitVolunteers:0,
-	conscription:0,
-	militaryService:0,
-	militarizedSociety:0,
-	militaryExemption:0,
-	lowerRquirements:0,
-	noSubhumansInArmy:0,
-	pregExemption:0,
-	eliteOfficers:0,
-	liveTargets:0,
-	legionTradition:0,
-	eagleWarriors:0,
-	ronin:0,
-	sunTzu:0,
-	mamluks:0,
-	pharaonTradition:0,
-	weaponsLaw:3,
-	soldierWages:1,
-	militiaSoldierPrivilege:0,
-	slaveSoldierPrivilege:0,
-	mercSoldierPrivilege:0,
-	tradeLegalAid:0,
-	taxTrade:0,
+	alternativeRents: 0,
+	enslavementRights: 0,
+	securityExemption: 0,
+	sellData: 0,
+	propCampaignBoost: 0,
+	slaveWatch: 0,
+	subsidyChurch: 0,
+	limitImmigration: 0,
+	openBorders: 0,
+	slavesOfficers: 0,
+	martialSchool: 0,
+	discountMercenaries: 0,
+	militiaFounded: 0,
+	recruitVolunteers: 0,
+	conscription: 0,
+	militaryService: 0,
+	militarizedSociety: 0,
+	militaryExemption: 0,
+	lowerRquirements: 0,
+	noSubhumansInArmy: 0,
+	pregExemption: 0,
+	eliteOfficers: 0,
+	liveTargets: 0,
+	legionTradition: 0,
+	eagleWarriors: 0,
+	ronin: 0,
+	sunTzu: 0,
+	mamluks: 0,
+	pharaonTradition: 0,
+	weaponsLaw: 3,
+	soldierWages: 1,
+	militiaSoldierPrivilege: 0,
+	slaveSoldierPrivilege: 0,
+	mercSoldierPrivilege: 0,
+	tradeLegalAid: 0,
+	taxTrade: 0,
 
 	/* buildings */
-	secHQ:0,
+	secHQ: 0,
 	secMenials: 0,
-	secUpgrades:{},
-	crimeUpgrades:{},
-	intelUpgrades:{},
-	readinessUpgrades:{},
-	riotCenter:0,
-	riotUpgrades:{},
-	fort:{},
-	sentUnitCooldown:0,
-	advancedRiotEquip:0,
-	brainImplant:-1,
-	brainImplantProject:0,
+	secUpgrades: {},
+	crimeUpgrades: {},
+	intelUpgrades: {},
+	readinessUpgrades: {},
+	riotCenter: 0,
+	riotUpgrades: {},
+	fort: {},
+	sentUnitCooldown: 0,
+	advancedRiotEquip: 0,
+	brainImplant: -1,
+	brainImplantProject: 0,
 	weapMenials: 0,
-	weapManu:0,
-	weapProductivity:1,
-	weapLab:1,
-	baseUpgradeTime:10,
-	weapUpgrades:[],
-	currentUpgrade:{},
-	droneUpgrades:{},
-	humanUpgrade:{},
-	sellTo:{},
-	completedUpgrades:[],
-	transportHub:0,
-	airport:1,
-	railway:1,
-	docks:1,
-	hubSecurity:1,
+	weapManu: 0,
+	weapProductivity: 1,
+	weapLab: 1,
+	baseUpgradeTime: 10,
+	weapUpgrades: [],
+	currentUpgrade: {},
+	droneUpgrades: {},
+	humanUpgrade: {},
+	sellTo: {},
+	completedUpgrades: [],
+	transportHub: 0,
+	airport: 1,
+	railway: 1,
+	docks: 1,
+	hubSecurity: 1,
 
 	/* events */
-	smilingManProgress:0,
-	investedFunds:0,
-	relationshipLM:0,
-	captureRoute:0,
-	collaborationRoute:0,
-	smilingManWeek:0,
-	globalCrisisWeeks:0,
-	smilingManFate:4,
+	smilingManProgress: 0,
+	investedFunds: 0,
+	relationshipLM: 0,
+	captureRoute: 0,
+	collaborationRoute: 0,
+	smilingManWeek: 0,
+	globalCrisisWeeks: 0,
+	smilingManFate: 4,
 
 	/* rebellions */
-	tension:0,
-	slaveProgress:0,
-	citizenProgress:0,
-	slaveRebellionEventFires:0,
-	citizenRebellionEventFires:0,
-	slaveRebellion:0,
-	citizenRebellion:0,
-	rebellingUnits:[],
-	engageRule:0,
-	irregulars:0,
-	rebellingMilitia:0,
-	rebellingSlaves:0,
-	rebellingMercs:0,
-	repairTime:3,
-	arcRepairTime:0,
-	garrison:{},
-	rebellionsCount:0,
-	PCrebWon:0,
-	PCrebLoss:0,
+	tension: 0,
+	slaveProgress: 0,
+	citizenProgress: 0,
+	slaveRebellionEventFires: 0,
+	citizenRebellionEventFires: 0,
+	slaveRebellion: 0,
+	citizenRebellion: 0,
+	rebellingUnits: [],
+	engageRule: 0,
+	irregulars: 0,
+	rebellingMilitia: 0,
+	rebellingSlaves: 0,
+	rebellingMercs: 0,
+	repairTime: 3,
+	arcRepairTime: 0,
+	garrison: {},
+	rebellionsCount: 0,
+	PCrebWon: 0,
+	PCrebLoss: 0,
 
 	/* armed forces stats */
-	targetUnit:0,
-	targetIndex:0,
-	secBotsCost:500,
-	secBotsUpgradeCost:250,
-	equipUpgradeCost:250,
-	maxTroops:30,
-	militiaTotalManpower:0,
-	militiaFreeManpower:0,
-	militiaEmployedManpower:0,
-	militiaTotalCasualties:0,
-	slavesEmployedManpower:0,
-	slavesTotalCasualties:0,
-	slavesMaxTroops:30,
-	mercTotalManpower:0,
-	mercFreeManpower:0,
-	mercEmployedManpower:0,
-	mercTotalCasualties:0,
-	militiaLoyalty:0,
-	slaveArmyLoyalty:0,
-	mercLoyalty:0,
-	createdSlavesUnits:0,
-	createdMilitiaUnits:0,
-	createdMercUnits:0,
+	targetUnit: 0,
+	targetIndex: 0,
+	secBotsCost: 500,
+	secBotsUpgradeCost: 250,
+	equipUpgradeCost: 250,
+	maxTroops: 30,
+	militiaTotalManpower: 0,
+	militiaFreeManpower: 0,
+	militiaEmployedManpower: 0,
+	militiaTotalCasualties: 0,
+	slavesEmployedManpower: 0,
+	slavesTotalCasualties: 0,
+	slavesMaxTroops: 30,
+	mercTotalManpower: 0,
+	mercFreeManpower: 0,
+	mercEmployedManpower: 0,
+	mercTotalCasualties: 0,
+	militiaLoyalty: 0,
+	slaveArmyLoyalty: 0,
+	mercLoyalty: 0,
+	createdSlavesUnits: 0,
+	createdMilitiaUnits: 0,
+	createdMercUnits: 0,
 
 	/* battle relevant vars */
-	slaveVictories:[],
-	slaveIncreasedPrestige:0,
-	totalKills:0,
-	battlesCount:0,
-	majorBattlesCount:0,
-	chosenTactic:"none",
-	leadingTroops:"none",
-	attackTroops:0,
-	attackEquip:0,
-	battleTerrain:"none",
-	maxTurns:10,
-	battleResult:4,				/* sets battleResult value outside accepted range (-3,3) to avoid evaluation problems */
-	losses:0,
-	enemyLosses:0,
-	battleTurns:0,
-	tacticsSuccessful:0,
-	leaderWounded:0,				/* 0=no wound, 1=mute, 2=blind, 3=amputee, 4=health */
-	gainedCombat:0,
-	gainedWarfare:0,
-	expectedEquip:0,
-	estimatedMen:0,
-	SFIntervention:0,
-	carriableSoldiers:0,
-	SFatk:0,
-	SFdef:0,
-	SFhp:0,
-	rebellingID:[],
-	saveValid:0,
-	lastSelection:[],
+	slaveVictories: [],
+	slaveIncreasedPrestige: 0,
+	totalKills: 0,
+	battlesCount: 0,
+	majorBattlesCount: 0,
+	chosenTactic: "none",
+	leadingTroops: "none",
+	attackTroops: 0,
+	attackEquip: 0,
+	battleTerrain: "none",
+	maxTurns: 10,
+	battleResult: 4,
+	/* sets battleResult value outside accepted range (-3,3) to avoid evaluation problems */
+	losses: 0,
+	enemyLosses: 0,
+	battleTurns: 0,
+	tacticsSuccessful: 0,
+	leaderWounded: 0,
+	/* 0=no wound, 1=mute, 2=blind, 3=amputee, 4=health */
+	gainedCombat: 0,
+	gainedWarfare: 0,
+	expectedEquip: 0,
+	estimatedMen: 0,
+	SFIntervention: 0,
+	carriableSoldiers: 0,
+	SFatk: 0,
+	SFdef: 0,
+	SFhp: 0,
+	rebellingID: [],
+	saveValid: 0,
+	lastSelection: [],
 
 	/* statistics */
-	equipMod:0.15,
-	secBotsBaseAttack:7,
-	secBotsBaseDefense:3,
-	secBotsMorale:200,
-	secBotsBaseHp:3,
+	equipMod: 0.15,
+	secBotsBaseAttack: 7,
+	secBotsBaseDefense: 3,
+	secBotsMorale: 200,
+	secBotsBaseHp: 3,
 	militiaBaseAttack: 0,
 	militiaBaseDefense: 0,
 	militiaBaseMorale: 0,
@@ -1344,35 +1396,35 @@ App.Data.defaultGameStateVariables = {
 	SFBaseMorale: 0,
 	SFBaseHp: 0,
 
-	raBaseAttack:7,
-	raBaseDefense:2,
-	raBaseMorale:100,
-	raBaseHp:2,
-	fcBaseAttack:6,
-	fcBaseDefense:4,
-	fcBaseMorale:130,
-	fcBaseHp:3,
-	owBaseAttack:8,
-	owBaseDefense:4,
-	owBaseMorale:110,
-	owBaseHp:2,
-	ffBaseAttack:9,
-	ffBaseDefense:2,
-	ffBaseMorale:160,
-	ffBaseHp:2,
+	raBaseAttack: 7,
+	raBaseDefense: 2,
+	raBaseMorale: 100,
+	raBaseHp: 2,
+	fcBaseAttack: 6,
+	fcBaseDefense: 4,
+	fcBaseMorale: 130,
+	fcBaseHp: 3,
+	owBaseAttack: 8,
+	owBaseDefense: 4,
+	owBaseMorale: 110,
+	owBaseHp: 2,
+	ffBaseAttack: 9,
+	ffBaseDefense: 2,
+	ffBaseMorale: 160,
+	ffBaseHp: 2,
 
 	/* units */
-	secBots:{},
+	secBots: {},
 
-	militiaUnits:[],
-	slaveUnits:[],
-	mercUnits:[],
+	militiaUnits: [],
+	slaveUnits: [],
+	mercUnits: [],
 
 	/* SFanon additions */
-	SFSupportLevel:0,
-	SFGear:0,
-	SavedLeader:0,
-	SavedSFI:0,
+	SFSupportLevel: 0,
+	SFGear: 0,
+	SavedLeader: 0,
+	SavedSFI: 0,
 
 	/* base vars */
 	secExp: {},
@@ -1380,7 +1432,8 @@ App.Data.defaultGameStateVariables = {
 	PClosses: 0,
 
 	/* buildings */
-	woundType: 0, /* 0:no wound, 1:mute, 2:blind, 3:amputee, 4<:health */
+	woundType: 0,
+	/* 0:no wound, 1:mute, 2:blind, 3:amputee, 4<:health */
 
 	showOne: 0,
 	showTwo: 0,
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 489567efbf2..1fd0439fed6 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -193,8 +193,6 @@ You should have received a copy of the GNU General Public License along with thi
 	<<set $slaves[_i].lastWeeksRepIncome = 0>>
 <</for>>
 
-
-
 /* 0 out the record books as we start a new game */
 <<setupLastWeeksCash>>
 <<setupLastWeeksRep>>
@@ -281,8 +279,6 @@ You should have received a copy of the GNU General Public License along with thi
 	<<set $pornStars[_genre.fameVar] = { p1count: 0, p3ID: 0 }>>
 <</for>>
 
-
-
 <<run assistant.object()>>
 <<run repX(1000, "event")>>
 <<set $building = App.Arcology.defaultBuilding()>>
@@ -293,71 +289,13 @@ You should have received a copy of the GNU General Public License along with thi
 	$prosthetics[id] = {amount: 0, research: 0};
 })>>
 
-/* array of farmhands farming */
-<<set $farmyardUpgrade = {pump: 0, fertilizer: 0, hydroponics: 0, machinery: 0, seeds: 0, lab: 0}>>
-<<set $farmyardLabUpgrades = {animalOvaries: 0, animalTesticles: 0, animalMpreg: 0}>>
-<<set $animalsBought = {canines: 0, hooved: 0, felines: 0, labradorRetrievers: 0, germanShepherds: 0, goldenRetrievers: 0, frenchBulldogs: 0, bulldogs: 0, beagles: 0, poodles: 0, rottweilers: 0, yorkshireTerriers: 0, siberianHuskies: 0, horses: 0, bulls: 0, pigs: 0, siameses: 0, persians: 0, maineCoons: 0, ragdolls: 0, bengals: 0, abbysinians: 0, birmans: 0, orientalShorthairs: 0, sphynxes: 0, russianBlues: 0, wolves: 0, foxes: 0, jackals: 0, dingos: 0, zebras: 0, cougars: 0, jaguars: 0, pumas: 0, lynx: 0, leopards: 0, lions: 0, tigers: 0}>>
-
-<<set $targetArcology = {type: "New"}>>
-<<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, Repopulationist: 0, Eugenics: 0, Hedonism: 0, IntellectualDependency: 0, SlaveProfessionalism: 0, PetiteAdmiration: 0, StatuesqueGlorification: 0}>>
-<<set $experimental = {
-	nursery: 0,
-	food: 0,
-	animalOvaries: 0,
-	dinnerParty: 0
-}>>
 /*SFVAR*/ <<set $SF = Object.assign({}, $SF, {Toggle:0, Active: -1}), $SF.Facility = Object.assign({}, $SF.Facility, {Toggle:0, Active:0})>>
-<<set $adjustProsthetics = []>> /*format: {id: string, workleft: int, slaveID: int}*/
-/*task: {type: "research"/"craft/craftFit", id: string, workLeft: int, [if constructFit] slaveID: int}*/
-<<set $researchLab = {
-	level: 0,
-	aiModule: 1,
-	tasks: [],
-	maxSpace: 0,
-	hired: 0,
-	menials: 0,
-}>>
-
-<<set $sideBarOptions = {compact:1, Cash:1, Upkeep:1, SexSlaveCount:1, roomPop:1, Rep:1, GSP:1, Authority:1, Security:1, Crime:1}>>
-<<set $classSatisfied = {lowerClass: 0, middleClass: 0, upperClass: 0, topClass: 0}>>
-<<set $whoreBudget = {lowerClass: 7, middleClass: 40, upperClass: 200, topClass: 1500}>>
-<<set $TSS = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>>
-<<set $GRI = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>>
-<<set $SCP = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>>
-<<set $LDE = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>>
-<<set $TGA = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>>
-<<set $TCR = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>>
-<<set $TFS = {farmUpgrade: 0, schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0, compromiseWeek: 0}>>
-<<set $HA = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>>
-<<set $NUL = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>>
-<<set $brandTarget = {primary: "buttock", secondary: "buttock", local: "buttock"}>>
-<<set $brandDesign = {primary: "your initials", official: "your initials", local: "your initials"}>>
 
-<<set $scarTarget = {primary: "left cheek", secondary: "left cheek", local: "left cheek"}>>
-<<set $scarDesign = {primary: "generic", local: "generic"}>>
-<<set $animalOvaries = 0>> /*{pigOvaries: 0, canineOvaries: 0, horseOvaries: 0, cowOvaries: 0} currently unused*/
-<<set $animalTesticles = 0>> /*{pigTestes: 0, dogTestes: 0, horseTestes: 0, cowTestes: 0} currently unused*/
-<<set $animalMpreg = 0>> /*{pigMpreg: 0, dogMpreg: 0, horseMpreg: 0, cowMpreg: 0} currently unused*/
-<<set $NPCSexSupply = {lowerClass: 3000, middleClass: 3000, upperClass: 3000, topClass: 3000}>>
-<<set $NPCMarketShare = {lowerClass: 1000, middleClass: 1000, upperClass: 1000, topClass: 1000}>>
-<<set $sexSubsidies = {lowerClass: 0, middleClass: 0, upperClass: 0, topClass: 0}>>
-<<set $sexSupplyBarriers = {lowerClass: 0, middleClass: 0, upperClass: 0, topClass: 0}>>
-<<set $arcologyUpgrade = {drones: 0, hydro: 0, apron: 0, grid: 0, spire: 0}>>
-<<set $rentDefaults = {lowerClass: 20, middleClass: 50, upperClass: 180, topClass: 650}>>
-<<set $rent = {lowerClass: 20, middleClass: 50, upperClass: 180, topClass: 650}>>
-<<set $foodRate = {slave: 2, lower: 1.8, middle: 2, upper: 2.2, top: 2.4}>>
 <<set $foodConsumption = (($lowerClass*$foodRate.lower) + ($middleClass*$foodRate.middle) + ($upperClass*$foodRate.upper) + ($topClass*$foodRate.top))>>	/* total amount food consumed per week */
 
-
 <<set $weatherToday = App.Data.weather.nice.random()>>
-<<set $merchantFSWares = ["AssetExpansionistResearch", "GenderRadicalistResearch", "HedonisticDecadenceResearch", "SlaveProfessionalismResearch", "SlimnessEnthusiastResearch", "TransformationFetishistResearch", "YouthPreferentialistResearch"]>>
-<<set $merchantIllegalWares = ["asexualReproduction", "childhoodFertilityInducedNCS", "PGHack", "RapidCellGrowthFormula", "sympatheticOvaries", "UterineRestraintMesh"]>> /* "AnimalOrgans" for future use */
-<<set $EliteSires = ["crazy", "futa", "moves", "preggo", "quick", "virgin"]>>
-<<set $justiceEvents = ["slave deal", "slave training", "majority deal", "indenture deal", "virginity deal", "breeding deal"]>> /* not in setupVars because we remove events from this array as they occur */
-<<set $prisonCircuit = ["low tier criminals", "gangs and smugglers", "white collar", "military prison"]>>
 <<set $prisonCircuitIndex = random(0,$prisonCircuit.length-1)>>
 
-
 /* I am not a slave object! Do not treat me like one! */
 <<set $customSlave = new App.Entity.CustomSlaveOrder()>>
 <<set $huskSlave = new App.Entity.CustomSlaveOrder()>>
-- 
GitLab