From 9e474503a56641cedc428cec4277cc4779aa26ae Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@mailbox.org>
Date: Tue, 21 Feb 2023 22:04:19 +0100
Subject: [PATCH] Fix usages of V.pit.lethal
---
src/events/PE/pePitFightInvite.js | 2 +-
src/npc/interaction/killSlave.js | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/events/PE/pePitFightInvite.js b/src/events/PE/pePitFightInvite.js
index bb87accef41..fac0557e5a4 100644
--- a/src/events/PE/pePitFightInvite.js
+++ b/src/events/PE/pePitFightInvite.js
@@ -14,7 +14,7 @@ App.Events.PEPitFightInvite = class PEPitFightInvite extends App.Events.BaseEven
App.Events.addParagraph(node, r);
r = [];
if (V.pit) {
- r.push(`Of course, ${capFirstChar(V.pit.name)} in ${V.arcologies[0].name} sees regular fights${(V.pit.lethal) ? " to the death" : ""}, but there's something extra special about attending these outside fights${(V.pit.lethal) ? ", especially with the very real risk of violent death" : ""}.`);
+ r.push(`Of course, ${capFirstChar(V.pit.name)} in ${V.arcologies[0].name} sees regular fights${(V.pit.lethal > 0) ? " to the death" : ""}, but there's something extra special about attending these outside fights${(V.pit.lethal > 0) ? ", especially with the very real risk of violent death" : ""}.`);
}
App.Events.addParagraph(node, r);
diff --git a/src/npc/interaction/killSlave.js b/src/npc/interaction/killSlave.js
index a3423600f14..d703c7a983b 100644
--- a/src/npc/interaction/killSlave.js
+++ b/src/npc/interaction/killSlave.js
@@ -783,7 +783,9 @@ App.UI.SlaveInteract.killSlave = function(slave) {
subDiv.append(`You tell ${him} you'll let your bodyguard decide ${his} fate — if ${he} wants to live, ${he}'ll have to beat ${S.Bodyguard.slaveName} in hand-to-hand combat in ${V.pit.name}. `, reactionText);
V.pit.slaveFightingBodyguard = slave.ID;
- V.pit.lethal = 1;
+ if (V.pit.lethal === 0) {
+ V.pit.lethal = 1;
+ }
return subDiv;
}
--
GitLab