From 207a6fe2d664aa011e169213372ea0035c0b2c50 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Fri, 13 Nov 2020 18:47:51 -0500
Subject: [PATCH] switch to using a map
---
js/003-data/gameVariableData.js | 6 +--
.../backwardsCompatibility.js | 6 +--
src/endWeek/death.js | 37 ++++++++-----------
src/uncategorized/scheduledEvent.tw | 2 +-
4 files changed, 19 insertions(+), 32 deletions(-)
diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 23bc8c11e70..8d4b01837a8 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -831,11 +831,7 @@ App.Data.resetOnNGPlus = {
cumPipeline: 0,
wcPiping: 0,
burstee: 0,
- slaveDeath: {
- oldAge: [],
- overdosed: [],
- lowHealth: []
- },
+ slaveDeath: new Map(),
playerBred: 0,
propOutcome: 0,
EliteSires: ["crazy", "futa", "moves", "preggo", "quick", "virgin"],
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index d39d44c7412..bb258db12d9 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -1145,11 +1145,7 @@ App.Update.globalVariables = function(node) {
// Slave death
if (!isNaN(V.slaveDeath)) {
- V.slaveDeath = {
- oldAge: [],
- overdosed: [],
- lowHealth: []
- };
+ V.slaveDeath = new Map()
}
FacilityDatatypeCleanup();
diff --git a/src/endWeek/death.js b/src/endWeek/death.js
index d1bd26a61a6..87d3da2de6d 100644
--- a/src/endWeek/death.js
+++ b/src/endWeek/death.js
@@ -1,23 +1,26 @@
-globalThis.planDeath = function(slave, reason) {
- V.slaveDeath[reason].push(slave.ID);
+/**
+ *
+ * @param {App.Entity.SlaveState} slave
+ * @param {"oldAge"|"overdosed"|"lowHealth"} deathType
+ */
+globalThis.planDeath = function(slave, deathType) {
+ V.slaveDeath.set(slave.ID, deathType);
};
globalThis.allDeaths = function() {
const el = new DocumentFragment();
- for (const deathType in V.slaveDeath) {
- for (const id of V.slaveDeath[deathType]) {
- const deceased = getSlave(id);
- if (deceased) {
- App.UI.DOM.appendNewElement("p", el, death(deceased, deathType));
- el.append(sectionBreak());
- removeSlave(deceased);
- }
+ for (const [id, deathType] of V.slaveDeath) {
+ const deceased = getSlave(id);
+ if (deceased) {
+ App.UI.DOM.appendNewElement("p", el, death(deceased, deathType));
+ el.append(sectionBreak());
+ removeSlave(deceased);
}
-
- V.slaveDeath[deathType] = [];
}
+ V.slaveDeath = new Map();
+
return el;
function sectionBreak() {
@@ -28,7 +31,7 @@ globalThis.allDeaths = function() {
};
/**
- *
+ *
* @param {App.Entity.SlaveState} slave
* @param {"oldAge"|"overdosed"|"lowHealth"} deathType
*/
@@ -169,11 +172,3 @@ globalThis.death = function(slave, deathType) {
return el;
};
-
-globalThis.deathCheck = function() {
- for (const deathType in V.slaveDeath) {
- if (V.slaveDeath[deathType].length > 0) {
- return true;
- }
- }
-};
diff --git a/src/uncategorized/scheduledEvent.tw b/src/uncategorized/scheduledEvent.tw
index 66f86f17f2d..d496164f619 100644
--- a/src/uncategorized/scheduledEvent.tw
+++ b/src/uncategorized/scheduledEvent.tw
@@ -111,7 +111,7 @@
<<elseif ($burstee != 0)>>
<<set $burst = 0>>
<<goto "SE Burst">>
-<<elseif (deathCheck())>>
+<<elseif ($slaveDeath.size)>>
<<goto "SE Death">>
<<elseif ($birthee != 0)>>
<<goto "SE Birth">>
--
GitLab