From 588846e4a9b3d902648df8ce3351c6bf80f336ef Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sun, 6 Dec 2020 20:39:15 -0500
Subject: [PATCH] more
---
src/facilities/fsPassage.js | 23 +++--
src/uncategorized/futureSociety.tw | 159 -----------------------------
2 files changed, 13 insertions(+), 169 deletions(-)
diff --git a/src/facilities/fsPassage.js b/src/facilities/fsPassage.js
index a9cd1a1e6b6..31186f60f5a 100644
--- a/src/facilities/fsPassage.js
+++ b/src/facilities/fsPassage.js
@@ -22,6 +22,7 @@ App.UI.FSPassage = function() {
el.append(overview());
el.append(unlocks());
el.append(spending());
+ el.append(rename());
return el;
@@ -487,7 +488,7 @@ App.UI.FSPassage = function() {
"Give all your slaves devotional names",
() => {
for (const slave of V.slaves) {
- slave.slaveName = setup.chattelReligionistSlaveNames.random();
+ slave.slaveName = App.Data.misc.chattelReligionistSlaveNames.random();
}
refresh();
}
@@ -501,7 +502,7 @@ App.UI.FSPassage = function() {
"Give all your lactating slaves cow names",
() => {
for (const slave of V.slaves) {
- slave.slaveName = setup.cowSlaveNames.random();
+ slave.slaveName = App.Data.misc.cowSlaveNames.random();
}
refresh();
}
@@ -515,7 +516,7 @@ App.UI.FSPassage = function() {
"Give all your idiotic slaves stripper names",
() => {
for (const slave of V.slaves) {
- slave.slaveName = setup.bimboSlaveNames.random();
+ slave.slaveName = App.Data.misc.bimboSlaveNames.random();
}
refresh();
}
@@ -529,8 +530,8 @@ App.UI.FSPassage = function() {
"Rename all your slaves according to Roman custom",
() => {
for (const slave of V.slaves) {
- slave.slaveName = setup.romanSlaveNames.random(),
- slave.slaveSurname = setup.romanSlaveSurnames.random();
+ slave.slaveName = App.Data.misc.romanSlaveNames.random();
+ slave.slaveSurname = App.Data.misc.romanSlaveSurnames.random();
}
refresh();
}
@@ -542,7 +543,7 @@ App.UI.FSPassage = function() {
"Rename all your slaves according to ancient Aztec custom",
() => {
for (const slave of V.slaves) {
- slave.slaveName = setup.aztecSlaveNames.random(),
+ slave.slaveName = App.Data.misc.aztecSlaveNames.random();
slave.slaveSurname = 0;
}
refresh();
@@ -555,7 +556,7 @@ App.UI.FSPassage = function() {
"Rename all your slaves according to ancient Egyptian custom",
() => {
for (const slave of V.slaves) {
- slave.slaveName = setup.ancientEgyptianSlaveNames.random(),
+ slave.slaveName = App.Data.misc.ancientEgyptianSlaveNames.random();
slave.slaveSurname = 0;
}
refresh();
@@ -568,8 +569,8 @@ App.UI.FSPassage = function() {
"Rename all your slaves according to feudal Japanese custom",
() => {
for (const slave of V.slaves) {
- slave.slaveName = setup.edoSlaveNames.random(),
- slave.slaveSurname = setup.edoSlaveSurnames.random();
+ slave.slaveName = App.Data.misc.edoSlaveNames.random();
+ slave.slaveSurname = App.Data.misc.edoSlaveSurnames.random();
}
refresh();
}
@@ -632,7 +633,7 @@ App.UI.FSPassage = function() {
"Give all your slaves simple bimbo names",
() => {
for (const slave of V.slaves) {
- slave.slaveName = setup.bimboSlaveNames.random();
+ slave.slaveName = App.Data.misc.bimboSlaveNames.random();
slave.slaveSurname = 0;
}
refresh();
@@ -640,6 +641,8 @@ App.UI.FSPassage = function() {
)
);
}
+
+ el.append(App.UI.DOM.generateLinksStrip(linkArray));
return el;
function refresh(text = "Slaves renamed.") {
diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw
index f30b2ac185c..8cb527f4257 100644
--- a/src/uncategorized/futureSociety.tw
+++ b/src/uncategorized/futureSociety.tw
@@ -4,165 +4,6 @@
<<set $nextButton = "Back", $nextLink = "Main", $encyclopedia = "Future Societies">>
-
-<span id="mass">
-
-<<if $arcologies[0].FSChattelReligionist != "unset"
- || $arcologies[0].FSPastoralist != "unset"
- || $arcologies[0].FSRomanRevivalist != "unset"
- || $arcologies[0].FSNeoImperialist != "unset"
- || $arcologies[0].FSAztecRevivalist != "unset"
- || $arcologies[0].FSEgyptianRevivalist != "unset"
- || $arcologies[0].FSEdoRevivalist != "unset"
- || $arcologies[0].FSDegradationist != "unset"
- || $arcologies[0].FSPaternalist != "unset"
- || $arcologies[0].FSIntellectualDependency != "unset">>
-<h3>Names</h3>
-<</if>>
-
-<div>
- <<if $arcologies[0].FSChattelReligionist != "unset">>
- <<link "Give all your slaves devotional names">>
- <<for _i = 0; _i < $slaves.length; _i++>>
- <<set $slaves[_i].slaveName = setup.chattelReligionistSlaveNames.random()>>
- <</for>>
- <<replace "#mass">>
- <div>Slaves renamed.</div>
- <</replace>>
- <</link>>
- <</if>>
-</div>
-
-<div>
- <<if $arcologies[0].FSPastoralist != "unset">>
- <<link "Give all your lactating slaves cow names">>
- <<for _i = 0; _i < $slaves.length; _i++>>
- <<if $slaves[_i].lactation > 0>>
- <<set $slaves[_i].slaveName = setup.cowSlaveNames.random()>>
- <</if>>
- <</for>>
- <<replace "#mass">>
- <div>Slaves renamed.</div>
- <</replace>>
- <</link>>
- <</if>>
-</div>
-
-<div>
- <<if $arcologies[0].FSIntellectualDependency != "unset">>
- <<link "Give all your idiotic slaves stripper names">>
- <<for _i = 0; _i < $slaves.length; _i++>>
- <<if $slaves[_i].intelligence+$slaves[_i].intelligenceImplant < -10>>
- <<set $slaves[_i].slaveName = setup.bimboSlaveNames.random()>>
- <</if>>
- <</for>>
- <<replace "#mass">>
- <div>Slaves renamed.</div>
- <</replace>>
- <</link>>
- <</if>>
-</div>
-
-<div>
- <<if $arcologies[0].FSRomanRevivalist != "unset">>
- <<link "Rename all your slaves according to Roman custom">>
- <<for _i = 0; _i < $slaves.length; _i++>>
- <<set $slaves[_i].slaveName = setup.romanSlaveNames.random(), $slaves[_i].slaveSurname = setup.romanSlaveSurnames.random()>>
- <</for>>
- <<replace "#mass">>
- <div>Slaves renamed.</div>
- <</replace>>
- <</link>>
- <<elseif $arcologies[0].FSAztecRevivalist != "unset">>
- <<link "Rename all your slaves according to ancient Aztec custom">>
- <<for _i = 0; _i < $slaves.length; _i++>>
- <<set $slaves[_i].slaveName = setup.aztecSlaveNames.random(), $slaves[_i].slaveSurname = 0>>
- <</for>>
- <<replace "#mass">>
- <div>Slaves renamed.</div>
- <</replace>>
- <</link>>
- <<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
- <<link "Rename all your slaves according to ancient Egyptian custom">>
- <<for _i = 0; _i < $slaves.length; _i++>>
- <<set $slaves[_i].slaveName = setup.ancientEgyptianSlaveNames.random(), $slaves[_i].slaveSurname = 0>>
- <</for>>
- <<replace "#mass">>
- <div>Slaves renamed.</div>
- <</replace>>
- <</link>>
- <<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- <<link "Rename all your slaves according to feudal Japanese custom">>
- <<for _i = 0; _i < $slaves.length; _i++>>
- <<set $slaves[_i].slaveName = setup.edoSlaveNames.random(), $slaves[_i].slaveSurname = setup.edoSlaveSurnames.random()>>
- <</for>>
- <<replace "#mass">>
- <div>Slaves renamed.</div>
- <</replace>>
- <</link>>
- <</if>>
- <<if $arcologies[0].FSDegradationist != "unset">>
- <<link "Rename all your slaves according to Degradationist custom">>
- <<for $i = 0; $i < $slaves.length; $i++>>
- <<run DegradingName($slaves[$i])>>
- <</for>>
- <<replace "#mass">>
- <div>Slaves renamed.</div>
- <</replace>>
- <</link>>
- <</if>>
-</div>
-
-<div>
- <<if $arcologies[0].FSPaternalist != "unset">>
- <<link "Rename your obedient slaves according to Paternalist custom">>
- <<for $i = 0; $i < $slaves.length; $i++>>
- <<if ($slaves[$i].devotion > 20) || (($slaves[$i].devotion >= -20) && ($slaves[$i].trust < -20))>>
- <<set _toSearch = $slaves[$i].slaveName>>
- <<if (_toSearch.indexOf("Miss") == -1)>>
- <<if (_toSearch.indexOf("Ms.") == -1)>>
- <<if (_toSearch.indexOf("Mrs.") == -1)>>
- <<if ($slaves[$i].relationship > 4)>>
- /*
- <<for $j = 0; $j < $slaves.length; $j++>>
- <<if ($slaves[$i].relationshipTarget == $slaves[$j].ID)>>
- <<set $slaves[$i].slaveName = ("Mrs. " + $slaves[$i].slaveName + " " + $slaves[$j].slaveName)>>
- <</if>>
- <</for>>
- */
- <<set $slaves[$i].slaveName = ("Mrs. " + $slaves[$i].slaveName)>>
- <<elseif ($slaves[$i].actualAge > 24)>>
- <<set $slaves[$i].slaveName = ("Ms. " + $slaves[$i].slaveName)>>
- <<else>>
- <<set $slaves[$i].slaveName = ("Miss " + $slaves[$i].slaveName)>>
- <</if>>
- <</if>>
- <</if>>
- <</if>>
- <</if>>
- <</for>>
- <<replace "#mass">>
- <div>Obedient slaves renamed.</div>
- <</replace>>
- <</link>>
- <</if>>
-</div>
-
-<div>
- <<if $arcologies[0].FSIntellectualDependency != "unset">>
- <<link "Give all your slaves simple bimbo names">>
- <<for _i = 0; _i < $slaves.length; _i++>>
- <<set $slaves[_i].slaveName = setup.bimboSlaveNames.random(), $slaves[_i].slaveSurname = 0>>
- <</for>>
- <<replace "#mass">>
- <div>Slaves renamed.</div>
- <</replace>>
- <</link>>
- <</if>>
-</div>
-
-</span>
-
<h3>Future Societies</h3>
/* Race */
--
GitLab