From e3a78b83a54709a90fa715aa765d44fe759bbc14 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Mon, 16 Nov 2020 16:13:33 -0800
Subject: [PATCH] Don't ever schedule three fighters
---
src/events/scheduled/pitFight.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/events/scheduled/pitFight.js b/src/events/scheduled/pitFight.js
index aabac27a271..9735e8a1ade 100644
--- a/src/events/scheduled/pitFight.js
+++ b/src/events/scheduled/pitFight.js
@@ -16,16 +16,18 @@ App.Facilities.Pit.fight = function(lethal) {
fighters.push(S.Bodyguard.ID, V.pit.slaveFightingBodyguard);
} else {
if (available.length > 0) {
+ // first fighter
if (S.Bodyguard && V.pit.bodyguardFights) {
available.delete(S.Bodyguard.ID);
fighters.push(S.Bodyguard.ID);
+ } else {
+ fighters.push(available.pluck());
}
+ // second fighter
if (available.length > 1 && !V.pit.animal) {
fighters.push(available.pluck());
}
-
- fighters.push(available.pluck());
} else {
throw new Error(`Pit fight triggered with ${V.pit.fighterIDs.length} fighters.`); // should technically never be triggered
}
--
GitLab