From 25738a7982b24a93e7a2adafa69ffe82122ec786 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Thu, 22 Oct 2020 21:48:46 -0400
Subject: [PATCH] simplify
---
js/003-data/miscData.js | 2 +-
src/endWeek/economics/arcmgmt.js | 1 +
src/markets/bulkSlave/bulkSlaveIntro.js | 4 ++--
src/markets/marketUI.js | 2 +-
src/markets/theMarket/buySlaves.js | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/js/003-data/miscData.js b/js/003-data/miscData.js
index ba27c48c3d2..7a17f071a09 100644
--- a/js/003-data/miscData.js
+++ b/js/003-data/miscData.js
@@ -2011,7 +2011,7 @@ App.Data.misc.lawlessMarkets = [
"neighbor",
"wetware",
"white collar",
- ...Array.from(App.Data.misc.schools.keys())
+ ...App.Data.misc.schools.keys()
];
App.Data.weather = {
diff --git a/src/endWeek/economics/arcmgmt.js b/src/endWeek/economics/arcmgmt.js
index 1dbc8e6ebbb..bac289398ea 100644
--- a/src/endWeek/economics/arcmgmt.js
+++ b/src/endWeek/economics/arcmgmt.js
@@ -156,6 +156,7 @@ globalThis.arcmgmt = function() {
appendDiv(`${_TCD} Top Class Demand | ${_topClassP} TC Multiplier`);
}
appendDiv(`${V.arcologies[0].name} is home to the following:`);
+ appendDiv(`Citizens | ${V.ACitizens} | ${_percACitizens}%`);
appendDiv(`Lower Class Citizens | ${V.lowerClass} | ${_percLowerClass}%`);
appendDiv(`Middle Class Citizens | ${V.middleClass} | ${_percMiddleClass}%`);
appendDiv(`Upper Class Citizens | ${V.upperClass} | ${_percUpperClass}%`);
diff --git a/src/markets/bulkSlave/bulkSlaveIntro.js b/src/markets/bulkSlave/bulkSlaveIntro.js
index bcaa0cf599d..a1184fd8a8e 100644
--- a/src/markets/bulkSlave/bulkSlaveIntro.js
+++ b/src/markets/bulkSlave/bulkSlaveIntro.js
@@ -177,7 +177,7 @@ App.Markets.bulkSlaveIntro = function() {
}
/* increment Slave school purchase counts if needed */
- if (Array.from(App.Data.misc.schools.keys()).includes(V.market.slaveMarket)) {
+ if (App.Data.misc.schools.has(V.market.slaveMarket)) {
V[V.market.slaveMarket].studentsBought += V.market.newSlaves.length;
}
}
@@ -204,7 +204,7 @@ App.Markets.bulkSlaveIntro = function() {
opinion = App.Neighbor.opinion(0, V.market.numArcology);
opinion = Math.clamp(Math.trunc(opinion/20), -10, 10);
discount -= (opinion * 25);
- } else if (Array.from(App.Data.misc.schools.keys()).includes(V.market.slaveMarket)) {
+ } else if (App.Data.misc.schools.has(V.market.slaveMarket)) {
if (V[V.market.slaveMarket].schoolUpgrade !== 0) {
discount = 375;
}
diff --git a/src/markets/marketUI.js b/src/markets/marketUI.js
index e21bb45adfd..af2110b9a03 100644
--- a/src/markets/marketUI.js
+++ b/src/markets/marketUI.js
@@ -141,7 +141,7 @@ App.Markets.purchaseFramework = function(slaveMarket, {sTitleSingular = "slave",
return el;
function student() {
- if (Array.from(App.Data.misc.schools.keys()).includes(slaveMarket)) {
+ if (App.Data.misc.schools.has(slaveMarket)) {
V[slaveMarket].schoolSale = 0;
V[slaveMarket].studentsBought += 1;
}
diff --git a/src/markets/theMarket/buySlaves.js b/src/markets/theMarket/buySlaves.js
index e2f3a1c09bd..a6c743a3bac 100644
--- a/src/markets/theMarket/buySlaves.js
+++ b/src/markets/theMarket/buySlaves.js
@@ -192,7 +192,7 @@ App.UI.buySlaves = function() {
if (store.note) {
App.UI.DOM.appendNewElement("span", el, ` ${store.note}`, "note");
}
- if (Array.from(App.Data.misc.schools.keys()).includes(store.marketType)) {
+ if (App.Data.misc.schools.has(store.marketType)) {
if (V[store.marketType].schoolSale === 1) {
App.UI.DOM.appendNewElement("span", el, `Offering your first purchase at half price this week. `, "yellow");
}
--
GitLab