Merge branch 'move-arc-names' into 'pregmod-master'

Move ArcologyNames data

See merge request !8337

devTools/types/SugarCubeExtensions.d.ts

@@ -5,61 +5,6 @@ declare module "twine-sugarcube" {
 	}
 
 	interface SugarCubeSetupObject {
-		ArcologyNamesSupremacistWhite: string[];
-		ArcologyNamesSupremacistAsian: string[];
-		ArcologyNamesSupremacistLatina: string[];
-		ArcologyNamesSupremacistMiddleEastern: string[];
-		ArcologyNamesSupremacistBlack: string[];
-		ArcologyNamesSupremacistIndoAryan: string[];
-		ArcologyNamesSupremacistPacificIslander: string[];
-		ArcologyNamesSupremacistMalay: string[];
-		ArcologyNamesSupremacistAmerindian: string[];
-		ArcologyNamesSupremacistSouthernEuropean: string[];
-		ArcologyNamesSupremacistSemitic: string[];
-		ArcologyNamesSupremacistMixedRace: string[];
-		ArcologyNamesSubjugationistWhite: string[];
-		ArcologyNamesSubjugationistAsian: string[];
-		ArcologyNamesSubjugationistLatina: string[];
-		ArcologyNamesSubjugationistMiddleEastern: string[];
-		ArcologyNamesSubjugationistBlack: string[];
-		ArcologyNamesSubjugationistIndoAryan: string[];
-		ArcologyNamesSubjugationistPacificIslander: string[];
-		ArcologyNamesSubjugationistMalay: string[];
-		ArcologyNamesSubjugationistAmerindian: string[];
-		ArcologyNamesSubjugationistSouthernEuropean: string[];
-		ArcologyNamesSubjugationistSemitic: string[];
-		ArcologyNamesSubjugationistMixedRace: string[];
-		ArcologyNamesGenderRadicalist: string[];
-		ArcologyNamesGenderFundamentalist: string[];
-		ArcologyNamesPaternalist: string[];
-		ArcologyNamesDegradationist: string[];
-		ArcologyNamesAssetExpansionist: string[];
-		ArcologyNamesSlimnessEnthusiast: string[];
-		ArcologyNamesTransformationFetishist: string[];
-		ArcologyNamesBodyPurist: string[];
-		ArcologyNamesMaturityPreferentialist: string[];
-		ArcologyNamesYouthPreferentialistLow: string[];
-		ArcologyNamesYouthPreferentialist: string[];
-		ArcologyNamesPastoralist: string[];
-		ArcologyNamesPhysicalIdealist: string[];
-		ArcologyNamesChattelReligionist: string[];
-		ArcologyNamesRomanRevivalist: string[];
-		ArcologyNamesNeoImperialist: string[];
-		ArcologyNamesAztecRevivalist: string[];
-		ArcologyNamesEgyptianRevivalist: string[];
-		ArcologyNamesEdoRevivalist: string[];
-		ArcologyNamesArabianRevivalist: string[];
-		ArcologyNamesChineseRevivalist: string[];
-		ArcologyNamesRepopulationist: string[];
-		ArcologyNamesEugenics: string[];
-		ArcologyNamesHedonisticDecadence: string[];
-		ArcologyNamesIntellectualDependency: string[];
-		ArcologyNamesSlaveProfessionalism: string[];
-		ArcologyNamesPetiteAdmiration: string[];
-		ArcologyNamesStatuesqueGlorification: string[];
-		ArcologyNamesCummunism: string[];
-		ArcologyNamesIncestFetishist: string[];
-
 		badWords: string[];
 		badNames: string[];
 		chattelReligionistSlaveNames: string[];

src/events/intro/arcologySelection.js

@@ -217,117 +217,117 @@ App.Intro.generateEstablishedArcologies = function() {
 				case "Supremacist":
 					switch (arcology.race) {
 						case "white":
-							return setup.ArcologyNamesSupremacistWhite.random();
+							return App.Data.ArcologyNames.SupremacistWhite.random();
 						case "asian":
-							return setup.ArcologyNamesSupremacistAsian.random();
+							return App.Data.ArcologyNames.SupremacistAsian.random();
 						case "latina":
-							return setup.ArcologyNamesSupremacistLatina.random();
+							return App.Data.ArcologyNames.SupremacistLatina.random();
 						case "middle eastern":
-							return setup.ArcologyNamesSupremacistMiddleEastern.random();
+							return App.Data.ArcologyNames.SupremacistMiddleEastern.random();
 						case "black":
-							return setup.ArcologyNamesSupremacistBlack.random();
+							return App.Data.ArcologyNames.SupremacistBlack.random();
 						case "indo-aryan":
-							return setup.ArcologyNamesSupremacistIndoAryan.random();
+							return App.Data.ArcologyNames.SupremacistIndoAryan.random();
 						case "pacific islander":
-							return setup.ArcologyNamesSupremacistPacificIslander.random();
+							return App.Data.ArcologyNames.SupremacistPacificIslander.random();
 						case "malay":
-							return setup.ArcologyNamesSupremacistMalay.random();
+							return App.Data.ArcologyNames.SupremacistMalay.random();
 						case "amerindian":
-							return setup.ArcologyNamesSupremacistAmerindian.random();
+							return App.Data.ArcologyNames.SupremacistAmerindian.random();
 						case "southern european":
-							return setup.ArcologyNamesSupremacistSouthernEuropean.random();
+							return App.Data.ArcologyNames.SupremacistSouthernEuropean.random();
 						case "semitic":
-							return setup.ArcologyNamesSupremacistSemitic.random();
+							return App.Data.ArcologyNames.SupremacistSemitic.random();
 						default:
-							return setup.ArcologyNamesSupremacistMixedRace.random();
+							return App.Data.ArcologyNames.SupremacistMixedRace.random();
 					}
 				case "Subjugationist":
 					switch (arcology.race) {
 						case "white":
-							return setup.ArcologyNamesSubjugationistWhite.random();
+							return App.Data.ArcologyNames.SubjugationistWhite.random();
 						case "asian":
-							return setup.ArcologyNamesSubjugationistAsian.random();
+							return App.Data.ArcologyNames.SubjugationistAsian.random();
 						case "latina":
-							return setup.ArcologyNamesSubjugationistLatina.random();
+							return App.Data.ArcologyNames.SubjugationistLatina.random();
 						case "middle eastern":
-							return setup.ArcologyNamesSubjugationistMiddleEastern.random();
+							return App.Data.ArcologyNames.SubjugationistMiddleEastern.random();
 						case "black":
-							return setup.ArcologyNamesSubjugationistBlack.random();
+							return App.Data.ArcologyNames.SubjugationistBlack.random();
 						case "indo-aryan":
-							return setup.ArcologyNamesSubjugationistIndoAryan.random();
+							return App.Data.ArcologyNames.SubjugationistIndoAryan.random();
 						case "pacific islander":
-							return setup.ArcologyNamesSubjugationistPacificIslander.random();
+							return App.Data.ArcologyNames.SubjugationistPacificIslander.random();
 						case "malay":
-							return setup.ArcologyNamesSubjugationistMalay.random();
+							return App.Data.ArcologyNames.SubjugationistMalay.random();
 						case "amerindian":
-							return setup.ArcologyNamesSubjugationistAmerindian.random();
+							return App.Data.ArcologyNames.SubjugationistAmerindian.random();
 						case "southern european":
-							return setup.ArcologyNamesSubjugationistSouthernEuropean.random();
+							return App.Data.ArcologyNames.SubjugationistSouthernEuropean.random();
 						case "semitic":
-							return setup.ArcologyNamesSubjugationistSemitic.random();
+							return App.Data.ArcologyNames.SubjugationistSemitic.random();
 						default:
-							return setup.ArcologyNamesSubjugationistMixedRace.random();
+							return App.Data.ArcologyNames.SubjugationistMixedRace.random();
 					}
 				case "GenderRadicalist":
-					return setup.ArcologyNamesGenderRadicalist.random();
+					return App.Data.ArcologyNames.GenderRadicalist.random();
 				case "GenderFundamentalist":
-					return setup.ArcologyNamesGenderFundamentalist.random();
+					return App.Data.ArcologyNames.GenderFundamentalist.random();
 				case "Paternalist":
-					return setup.ArcologyNamesPaternalist.random();
+					return App.Data.ArcologyNames.Paternalist.random();
 				case "Degradationist":
-					return setup.ArcologyNamesDegradationist.random();
+					return App.Data.ArcologyNames.Degradationist.random();
 				case "AssetExpansionist":
-					return setup.ArcologyNamesAssetExpansionist.random();
+					return App.Data.ArcologyNames.AssetExpansionist.random();
 				case "SlimnessEnthusiast":
-					return setup.ArcologyNamesSlimnessEnthusiast.random();
+					return App.Data.ArcologyNames.SlimnessEnthusiast.random();
 				case "TransformationFetishist":
-					return setup.ArcologyNamesTransformationFetishist.random();
+					return App.Data.ArcologyNames.TransformationFetishist.random();
 				case "BodyPurist":
-					return setup.ArcologyNamesBodyPurist.random();
+					return App.Data.ArcologyNames.BodyPurist.random();
 				case "MaturityPreferentialist":
-					return setup.ArcologyNamesMaturityPreferentialist.random();
+					return App.Data.ArcologyNames.MaturityPreferentialist.random();
 				case "YouthPreferentialist":
 					if (V.pedo_mode === 1 || V.minimumSlaveAge < 6) {
-						return setup.ArcologyNamesYouthPreferentialistLow.random();
+						return App.Data.ArcologyNames.YouthPreferentialistLow.random();
 					} else if (V.minimumSlaveAge < 14) {
-						return setup.ArcologyNamesYouthPreferentialist.concat(setup.ArcologyNamesYouthPreferentialistLow).random();
+						return App.Data.ArcologyNames.YouthPreferentialist.concat(App.Data.ArcologyNames.YouthPreferentialistLow).random();
 					} else {
-						return setup.ArcologyNamesYouthPreferentialist.random();
+						return App.Data.ArcologyNames.YouthPreferentialist.random();
 					}
 				case "Pastoralist":
-					return setup.ArcologyNamesPastoralist.random();
+					return App.Data.ArcologyNames.Pastoralist.random();
 				case "PhysicalIdealist":
-					return setup.ArcologyNamesPhysicalIdealist.random();
+					return App.Data.ArcologyNames.PhysicalIdealist.random();
 				case "ChattelReligionist":
-					return setup.ArcologyNamesChattelReligionist.random();
+					return App.Data.ArcologyNames.ChattelReligionist.random();
 				case "RomanRevivalist":
-					return setup.ArcologyNamesRomanRevivalist.random();
+					return App.Data.ArcologyNames.RomanRevivalist.random();
 				case "NeoImperialist":
-					return setup.ArcologyNamesNeoImperialist.random();
+					return App.Data.ArcologyNames.NeoImperialist.random();
 				case "AztecRevivalist":
-					return setup.ArcologyNamesAztecRevivalist.random();
+					return App.Data.ArcologyNames.AztecRevivalist.random();
 				case "EgyptianRevivalist":
-					return setup.ArcologyNamesEgyptianRevivalist.random();
+					return App.Data.ArcologyNames.EgyptianRevivalist.random();
 				case "EdoRevivalist":
-					return setup.ArcologyNamesEdoRevivalist.random();
+					return App.Data.ArcologyNames.EdoRevivalist.random();
 				case "ArabianRevivalist":
-					return setup.ArcologyNamesArabianRevivalist.random();
+					return App.Data.ArcologyNames.ArabianRevivalist.random();
 				case "ChineseRevivalist":
-					return setup.ArcologyNamesChineseRevivalist.random();
+					return App.Data.ArcologyNames.ChineseRevivalist.random();
 				case "Repopulationist":
-					return setup.ArcologyNamesRepopulationist.random();
+					return App.Data.ArcologyNames.Repopulationist.random();
 				case "Eugenics":
-					return setup.ArcologyNamesEugenics.random();
+					return App.Data.ArcologyNames.Eugenics.random();
 				case "HedonisticDecadence":
-					return setup.ArcologyNamesHedonisticDecadence.random();
+					return App.Data.ArcologyNames.HedonisticDecadence.random();
 				case "IntellectualDependency":
-					return setup.ArcologyNamesIntellectualDependency.random();
+					return App.Data.ArcologyNames.IntellectualDependency.random();
 				case "SlaveProfessionalism":
-					return setup.ArcologyNamesSlaveProfessionalism.random();
+					return App.Data.ArcologyNames.SlaveProfessionalism.random();
 				case "PetiteAdmiration":
-					return setup.ArcologyNamesPetiteAdmiration.random();
+					return App.Data.ArcologyNames.PetiteAdmiration.random();
 				case "StatuesqueGlorification":
-					return setup.ArcologyNamesStatuesqueGlorification.random();
+					return App.Data.ArcologyNames.StatuesqueGlorification.random();
 				default:
 					return "Arcology X-4";
 			}

src/uncategorized/seNicaeaAnnouncement.tw

@@ -3,7 +3,7 @@
 <<if $plot == 1>><<set $nextLink = "Nonrandom Event">><<else>><<set $nextLink = "Random Nonindividual Event">><</if>>
 <<set $nextButton = "Continue">>
 <<set $nicaea.announced = 1, $nicaea.preparation = 1, $nicaea.involvement = 0, $nicaea.power = 1>>
-<<set $nicaea.name = "Council of " + setup.ArcologyNamesChattelReligionist.random()>>
+<<set $nicaea.name = "Council of " + App.Data.ArcologyNames.ChattelReligionist.random()>>
 
 <<if $PC.title == 1>><<set _advocate = "male">><<elseif $PC.dick != 0>><<set _advocate = "futa">><<else>><<set _advocate = "female">><</if>>