From cc49c6cc82d0c687ac2293091803592e7e90a875 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Fri, 20 Nov 2020 02:50:31 -0500
Subject: [PATCH] convert from setup
---
js/003-data/arcologyNames.js | 2 +-
src/endWeek/economics/neighborsDevelopment.js | 110 +++++++++---------
src/events/intro/arcologySelection.js | 106 ++++++++---------
src/uncategorized/seNicaeaAnnouncement.tw | 2 +-
4 files changed, 110 insertions(+), 110 deletions(-)
diff --git a/js/003-data/arcologyNames.js b/js/003-data/arcologyNames.js
index d77cc0d6dee..d4b602701e8 100644
--- a/js/003-data/arcologyNames.js
+++ b/js/003-data/arcologyNames.js
@@ -1,4 +1,4 @@
-App.Data.Misc.ArcologyNames = {
+App.Data.ArcologyNames = {
SupremacistAmerindian: ["Akilineq", "Amerindia", "Aquadoctan", "Cahokia", "Caral", "Chicora", "Cowee", "Cusco", "Dugiluyi", "Five Nations", "Gran Chaco", "Indigenismo", "Isunigu", "Moundville", "Norumbega", "Onaquaga", "Onondaga Lake", "Paititi", "Porcupine", "Pueblo de Taos", "Quito", "Red Power", "Saguenay", "Shackamaxon", "Tamoanchan", "The Confederated Tribes", "Werowocomoco"],
SupremacistAsian: ["Asiatic Empire", "Ciimnuai", "Eastern Sun", "Greater Asia", "Jade Empire", "Jade Library", "Kalapa", "Mahoroba", "Pan-Asia", "Penglai", "Shambhala", "Shangri-La", "Sinosphere", "The Celestial Temple", "The Orient", "Tian", "Yangtze", "Yellow River", "Zhonghua Minzu"],
SupremacistBlack: ["Africana", "Afrocentral", "Azania", "Benin", "Door of Return", "Great Zimbabwe", "Houssa", "Kwanzaa Island", "Liberia", "Mezzoramia", "Négritude", "New Afrika", "Nubia", "Pan-Africa", "Panther Valley", "Rhapta", "The Promised Land", "Timbuktu", "United Africa", "Wakanda", "Zazamanc"],
diff --git a/src/endWeek/economics/neighborsDevelopment.js b/src/endWeek/economics/neighborsDevelopment.js
index 7a6d2a912b6..a48fb764cbf 100644
--- a/src/endWeek/economics/neighborsDevelopment.js
+++ b/src/endWeek/economics/neighborsDevelopment.js
@@ -459,40 +459,40 @@ App.EndWeek.neighborsDevelopment = function() {
r.push(`Racial Supremacy for ${arc.FSSupremacistRace} people has reached stability and acceptance there. The arcology has been renamed`);
switch (arc.FSSupremacistRace) {
case "white":
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSupremacistWhite);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SupremacistWhite);
break;
case "asian":
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSupremacistAsian);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SupremacistAsian);
break;
case "latina":
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSupremacistLatina);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SupremacistLatina);
break;
case "middle eastern":
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSupremacistMiddleEastern);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SupremacistMiddleEastern);
break;
case "black":
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSupremacistBlack);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SupremacistBlack);
break;
case "indo-aryan":
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSupremacistIndoAryan);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SupremacistIndoAryan);
break;
case "pacific islander":
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSupremacistPacificIslander);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SupremacistPacificIslander);
break;
case "malay":
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSupremacistMalay);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SupremacistMalay);
break;
case "amerindian":
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSupremacistAmerindian);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SupremacistAmerindian);
break;
case "southern european":
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSupremacistSouthernEuropean);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SupremacistSouthernEuropean);
break;
case "semitic":
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSupremacistSemitic);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SupremacistSemitic);
break;
default:
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSupremacistMixedRace);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SupremacistMixedRace);
}
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
@@ -520,40 +520,40 @@ App.EndWeek.neighborsDevelopment = function() {
r.push(`Racial Subjugationism of ${arc.FSSubjugationistRace} people has reached stability and acceptance there. The arcology has been renamed`);
switch (arc.FSSubjugationistRace) {
case "white":
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSubjugationistWhite);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SubjugationistWhite);
break;
case "asian":
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSubjugationistAsian);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SubjugationistAsian);
break;
case "latina":
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSubjugationistLatina);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SubjugationistLatina);
break;
case "middle eastern":
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSubjugationistMiddleEastern);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SubjugationistMiddleEastern);
break;
case "black":
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSubjugationistBlack);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SubjugationistBlack);
break;
case "indo-aryan":
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSubjugationistIndoAryan);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SubjugationistIndoAryan);
break;
case "pacific islander":
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSubjugationistPacificIslander);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SubjugationistPacificIslander);
break;
case "malay":
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSubjugationistMalay);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SubjugationistMalay);
break;
case "amerindian":
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSubjugationistAmerindian);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SubjugationistAmerindian);
break;
case "southern european":
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSubjugationistSouthernEuropean);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SubjugationistSouthernEuropean);
break;
case "semitic":
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSubjugationistSemitic);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SubjugationistSemitic);
break;
default:
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSubjugationistMixedRace);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SubjugationistMixedRace);
}
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
@@ -579,7 +579,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.FSRepopulationFocus >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
r.push(`Repopulationism has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesRepopulationist);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.Repopulationist);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSRepopulationFocus < 0) {
@@ -611,7 +611,7 @@ App.EndWeek.neighborsDevelopment = function() {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
arc.FSRestartResearch = 1;
r.push(`Eugenics has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesEugenics);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.Eugenics);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSRestart < 0) {
@@ -645,7 +645,7 @@ App.EndWeek.neighborsDevelopment = function() {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
arc.FSGenderRadicalistResearch = 1;
r.push(`Gender Radicalism has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesGenderRadicalist);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.GenderRadicalist);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSGenderRadicalist < 0) {
@@ -682,7 +682,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.FSGenderFundamentalist >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
r.push(`Gender Fundamentalism has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesGenderFundamentalist);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.GenderFundamentalist);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSGenderFundamentalist < 0) {
@@ -707,7 +707,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.FSPaternalist >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
r.push(`Paternalism has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesPaternalist);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.Paternalist);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSPaternalist < 0) {
@@ -739,7 +739,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.FSDegradationist >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
r.push(`Degradationism has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesDegradationist);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.Degradationist);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSDegradationist < 0) {
@@ -773,7 +773,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.FSIntellectualDependency >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
r.push(`Intellectual Dependency has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesIntellectualDependency);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.IntellectualDependency);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSIntellectualDependency < 0) {
@@ -800,7 +800,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.FSSlaveProfessionalism >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
arc.FSSlaveProfessionalismResearch = 1;
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSlaveProfessionalism);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SlaveProfessionalism);
r.push(`Slave Professionalism has reached stability and acceptance there. The arcology has been renamed <span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSSlaveProfessionalism < 0) {
@@ -842,7 +842,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.direction !== 0) {
if (arc.FSBodyPurist >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesBodyPurist);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.BodyPurist);
r.push(`Body Purism has reached stability and acceptance there. The arcology has been renamed <span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSBodyPurist < 0) {
@@ -867,7 +867,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.FSTransformationFetishist >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
arc.FSTransformationFetishistResearch = 1;
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesTransformationFetishist);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.TransformationFetishist);
r.push(`Transformation Fetishism has reached stability and acceptance there. The arcology has been renamed <span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSTransformationFetishist < 0) {
@@ -897,11 +897,11 @@ App.EndWeek.neighborsDevelopment = function() {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
r.push(`Youth Preferentialism has reached stability and acceptance there. The arcology has been renamed`);
if (V.pedo_mode === 1 || V.minimumSlaveAge < 6) {
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesYouthPreferentialistLow);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.YouthPreferentialistLow);
} else if (V.minimumSlaveAge < 14) {
- arc.name = App.Neighbor.getUnusedName(either(setup.ArcologyNamesYouthPreferentialist, setup.ArcologyNamesYouthPreferentialistLow));
+ arc.name = App.Neighbor.getUnusedName(either(App.Data.ArcologyNames.YouthPreferentialist, App.Data.ArcologyNames.YouthPreferentialistLow));
} else {
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesYouthPreferentialist);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.YouthPreferentialist);
}
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
arc.FSYouthPreferentialistResearch = 1;
@@ -926,7 +926,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.FSMaturityPreferentialist >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
r.push(`Maturity Preferentialism has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesMaturityPreferentialist);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.MaturityPreferentialist);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSMaturityPreferentialist < 0) {
@@ -951,7 +951,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.FSPetiteAdmiration >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
r.push(`Petite Admiration has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesPetiteAdmiration);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.PetiteAdmiration);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSPetiteAdmiration < 0) {
@@ -978,7 +978,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.FSStatuesqueGlorification >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
r.push(`Statuesque Glorification has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesStatuesqueGlorification);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.StatuesqueGlorification);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSStatuesqueGlorification < 0) {
@@ -1007,7 +1007,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.FSSlimnessEnthusiast >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
r.push(`Slimness Enthusiasm has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesSlimnessEnthusiast);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.SlimnessEnthusiast);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
arc.FSSlimnessEnthusiastResearch = 1;
}
@@ -1034,7 +1034,7 @@ App.EndWeek.neighborsDevelopment = function() {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
arc.FSAssetExpansionistResearch = 1;
r.push(`Asset Expansionism has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesAssetExpansionist);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.AssetExpansionist);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSAssetExpansionist < 0) {
@@ -1067,7 +1067,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.FSPastoralist >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
r.push(`Pastoralism has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesPastoralist);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.Pastoralist);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSPastoralist < 0) {
@@ -1094,7 +1094,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.FSCummunism >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
r.push(`Cummunism has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesCummunism);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.Cummunism);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSCummunism < 0) {
@@ -1127,7 +1127,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.FSPhysicalIdealist >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
r.push(`Physical Idealism has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesPhysicalIdealist);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.PhysicalIdealist);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSPhysicalIdealist < 0) {
@@ -1159,7 +1159,7 @@ App.EndWeek.neighborsDevelopment = function() {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
arc.FSHedonisticDecadenceResearch = 1;
r.push(`Decadent Hedonism has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesHedonisticDecadence);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.HedonisticDecadence);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSHedonisticDecadence < 0) {
@@ -1188,7 +1188,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.FSIncestFetishist >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
r.push(`Incest Fetishism has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesIncestFetishist);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.IncestFetishist);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSIncestFetishist < 0) {
@@ -1213,7 +1213,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.FSChattelReligionist >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
r.push(`Chattel Religionism has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesChattelReligionist);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.ChattelReligionist);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSChattelReligionist < 0) {
@@ -1242,7 +1242,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.FSRomanRevivalist >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
r.push(`Roman Revivalism has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesRomanRevivalist);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.RomanRevivalist);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSRomanRevivalist < 0) {
@@ -1265,7 +1265,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.FSNeoImperialist >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
r.push(`Neo-Imperialism has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesNeoImperialist);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.NeoImperialist);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSNeoImperialist < 0) {
@@ -1288,7 +1288,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.FSAztecRevivalist >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
r.push(`Aztec Revivalism has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesAztecRevivalist);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.AztecRevivalist);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSAztecRevivalist < 0) {
@@ -1311,7 +1311,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.FSEgyptianRevivalist >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
r.push(`Egyptian Revivalism has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesEgyptianRevivalist);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.EgyptianRevivalist);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSEgyptianRevivalist < 0) {
@@ -1334,7 +1334,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.FSEdoRevivalist >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
r.push(`Edo Revivalism has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesEdoRevivalist);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.EdoRevivalist);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSEdoRevivalist < 0) {
@@ -1357,7 +1357,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.FSArabianRevivalist >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
r.push(`Arabian Revivalism has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesArabianRevivalist);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.ArabianRevivalist);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSArabianRevivalist < 0) {
@@ -1384,7 +1384,7 @@ App.EndWeek.neighborsDevelopment = function() {
if (arc.FSChineseRevivalist >= V.FSLockinLevel) {
if ((arc.name.indexOf("Arcology") !== -1) && (random(0, 2) === 0)) {
r.push(`Chinese Revivalism has reached stability and acceptance there. The arcology has been renamed`);
- arc.name = App.Neighbor.getUnusedName(setup.ArcologyNamesChineseRevivalist);
+ arc.name = App.Neighbor.getUnusedName(App.Data.ArcologyNames.ChineseRevivalist);
r.push(`<span class="bold">${arc.name}</span> to mark the occasion.`);
}
} else if (arc.FSChineseRevivalist < 0) {
diff --git a/src/events/intro/arcologySelection.js b/src/events/intro/arcologySelection.js
index c3d5327a51b..150b3d9946e 100644
--- a/src/events/intro/arcologySelection.js
+++ b/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";
}
diff --git a/src/uncategorized/seNicaeaAnnouncement.tw b/src/uncategorized/seNicaeaAnnouncement.tw
index 157f943d79e..fe5d66491b2 100644
--- a/src/uncategorized/seNicaeaAnnouncement.tw
+++ b/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>>
--
GitLab