From c2ad5a42f2e91ce63de975531872c3003d7fba71 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Mon, 11 Jan 2021 10:48:57 -0800
Subject: [PATCH] Move Customize Slave Trade to DomPassage, remove TW file.
---
src/005-passages/introPassages.js | 2 ++
.../{customizeSlaveTrade => }/customizeSlaveTrade.js | 4 ++--
.../intro/customizeSlaveTrade/customizeSlaveTrade.tw | 10 ----------
3 files changed, 4 insertions(+), 12 deletions(-)
rename src/events/intro/{customizeSlaveTrade => }/customizeSlaveTrade.js (98%)
delete mode 100644 src/events/intro/customizeSlaveTrade/customizeSlaveTrade.tw
diff --git a/src/005-passages/introPassages.js b/src/005-passages/introPassages.js
index 5a7e68624ea..cb38ab30ea9 100644
--- a/src/005-passages/introPassages.js
+++ b/src/005-passages/introPassages.js
@@ -8,3 +8,5 @@ new App.DomPassage("Acquisition",
return App.Intro.acquisition();
}
);
+
+new App.DomPassage("Customize Slave Trade", () => { return App.Intro.CustomSlaveTrade(); });
diff --git a/src/events/intro/customizeSlaveTrade/customizeSlaveTrade.js b/src/events/intro/customizeSlaveTrade.js
similarity index 98%
rename from src/events/intro/customizeSlaveTrade/customizeSlaveTrade.js
rename to src/events/intro/customizeSlaveTrade.js
index c17a83331fa..e6a5083c791 100644
--- a/src/events/intro/customizeSlaveTrade/customizeSlaveTrade.js
+++ b/src/events/intro/customizeSlaveTrade.js
@@ -1,4 +1,4 @@
-App.UI.CustomSlaveTrade = function() {
+App.Intro.CustomSlaveTrade = function() {
const frag = new DocumentFragment();
let span = document.createElement("span");
let baseControlsFilter = "all";
@@ -24,7 +24,7 @@ App.UI.CustomSlaveTrade = function() {
if (hashSum(V.nationalities) < 1) {
App.UI.DOM.appendNewElement("div", p, `You cannot be a slaveowner without a slave trade. Please add nationalities to continue.`, "note");
} else {
- destination = (V.customWA === 0) ? "Intro Summary" : "Extreme Intro";
+ destination = V.customWA ? "Extreme Intro" : "Intro Summary";
App.UI.DOM.appendNewElement(
"div",
p,
diff --git a/src/events/intro/customizeSlaveTrade/customizeSlaveTrade.tw b/src/events/intro/customizeSlaveTrade/customizeSlaveTrade.tw
deleted file mode 100644
index 3d00a9c55e1..00000000000
--- a/src/events/intro/customizeSlaveTrade/customizeSlaveTrade.tw
+++ /dev/null
@@ -1,10 +0,0 @@
-:: Customize Slave Trade [nobr]
-
-<<if ndef $nationalities>>
- <<set $nationalities = {}>>
-<</if>>
-<<if ndef $customWA>>
- <<set $customWA = 0>>
-<</if>>
-<<includeDOM App.UI.CustomSlaveTrade()>>
-
--
GitLab