From 8f7dd3a75dfb2cf5c47d36b9781c4f091346b5fb Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Thu, 12 Mar 2020 01:33:10 -0400
Subject: [PATCH] svorn suggestions
---
src/js/heroCreator.js | 12 +++++++-----
src/npc/databases/customSlavesDatabase.tw | 2 +-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/js/heroCreator.js b/src/js/heroCreator.js
index 4e30e6de42f..bbba28fe383 100644
--- a/src/js/heroCreator.js
+++ b/src/js/heroCreator.js
@@ -3,23 +3,25 @@
*/
App.Utils.buildHeroArray = function() {
let array;
+ $.wiki(`<<include "custom Slaves Database">>`);
if (V.seeExtreme === 1) {
array = App.Data.HeroSlaves.D.concat(
App.Data.HeroSlaves.DD,
App.Data.HeroSlaves.DF,
App.Data.HeroSlaves.Dextreme,
App.Data.HeroSlaves.DDextreme,
- App.Data.HeroSlaves.DFextreme
+ App.Data.HeroSlaves.DFextreme,
+ V.heroSlaves
);
} else {
array = App.Data.HeroSlaves.D.concat(
App.Data.HeroSlaves.DD,
- App.Data.HeroSlaves.DF
+ App.Data.HeroSlaves.DF,
+ V.heroSlaves
);
}
- if (V.heroSlaves) {
- array = array.concat(V.heroSlaves);
- }
+ delete V.heroSlaves;
+
for (let hero = 0; hero < array.length; hero++) {
if (V.seePreg !== 1 && [900089, 900102].includes(array[hero].ID)) {
array.splice(hero, 1);
diff --git a/src/npc/databases/customSlavesDatabase.tw b/src/npc/databases/customSlavesDatabase.tw
index 90b502e1f73..a2aba917737 100644
--- a/src/npc/databases/customSlavesDatabase.tw
+++ b/src/npc/databases/customSlavesDatabase.tw
@@ -1,4 +1,4 @@
-:: custom Slaves Database [nobr]
+:: custom Slaves Database
<<set $heroSlaves = []>>
<<set _i = 1000000>>
--
GitLab