From 1d066b56450d199c9ad5125ce611fc1d8892d21d Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Mon, 1 Mar 2021 17:07:12 -0800
Subject: [PATCH] Improve hero slave filtering
---
src/npc/generate/heroCreator.js | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/npc/generate/heroCreator.js b/src/npc/generate/heroCreator.js
index 69ada836db9..ada1ff41006 100644
--- a/src/npc/generate/heroCreator.js
+++ b/src/npc/generate/heroCreator.js
@@ -22,15 +22,11 @@ App.Utils.buildHeroArray = function() {
let array = [].concat(...chunks);
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);
- hero--;
- } else if (V.heroSlavesPurchased.includes(array[hero].ID)) {
- array.splice(hero, 1);
- hero--;
- }
- }
+ /** @type {function(App.Entity.SlaveState):boolean} */
+ const disallowedPregnantSlave = (s) => (V.seePreg !== 1 && s.preg > 0);
+ /** @type {function(App.Entity.SlaveState):boolean} */
+ const underAgedSlave = (s) => (s.actualAge < V.minimumSlaveAge);
+ array.deleteWith((s) => V.heroSlavesPurchased.includes(s.ID) || disallowedPregnantSlave(s) || underAgedSlave(s));
const collator = new Intl.Collator('en', {usage: "sort", ignorePunctuation: true});
return array.sort((a, b) => collator.compare(a.slaveName, b.slaveName));
--
GitLab