From 0fee2291df4bd271ce699caf1f5cbb468babbd3d Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Wed, 18 Nov 2020 21:12:03 -0500
Subject: [PATCH] Pit bugfix, removed animals from deadliness()
---
src/events/scheduled/pitFight.js | 1 +
src/js/assayJS.js | 6 +-----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/events/scheduled/pitFight.js b/src/events/scheduled/pitFight.js
index 9735e8a1ade..3a62fd9c430 100644
--- a/src/events/scheduled/pitFight.js
+++ b/src/events/scheduled/pitFight.js
@@ -22,6 +22,7 @@ App.Facilities.Pit.fight = function(lethal) {
fighters.push(S.Bodyguard.ID);
} else {
fighters.push(available.pluck());
+ fighters.push(available.pluck());
}
// second fighter
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 843314ad8e0..5764907752a 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -1404,14 +1404,10 @@ globalThis.faceIncrease = function(slave, amount) {
};
/**
- * @param {App.Entity.SlaveState|App.Entity.Animal} slave
+ * @param {App.Entity.SlaveState} slave
* @returns {number}
*/
globalThis.deadliness = function(slave) {
- if (slave instanceof App.Entity.Animal || slave.hasOwnProperty('species')) { // FIXME: temporary workaround
- return slave.deadliness;
- }
-
let deadliness = 2;
if (slave.skill.combat > 0) {
--
GitLab