From 49d02f348bde574fd6bdd616f573423e4c852214 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Thu, 22 Oct 2020 19:27:27 -0400
Subject: [PATCH] Pit fixes
---
src/events/scheduled/pitFightLethal.js | 16 ++++++++--------
src/events/scheduled/pitFightNonlethal.js | 12 ++++++------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/events/scheduled/pitFightLethal.js b/src/events/scheduled/pitFightLethal.js
index b4f352e3554..1a4e7a77a83 100644
--- a/src/events/scheduled/pitFightLethal.js
+++ b/src/events/scheduled/pitFightLethal.js
@@ -140,12 +140,12 @@ App.Facilities.Pit.fight.lethal = function(fighters) {
function age() {
if (V.AgePenalty !== 0) {
- if (slave.physicalAge >= 100) {
- r.push(`${He} seems prepared for death, in a way.`);
- } else if (slave.physicalAge >= 85) {
- r.push(`${He} tries not to waste ${his} strength before the fight, knowing that ${his} extreme age won't allow ${him} a second wind.`);
- } else if (slave.physicalAge >= 70) {
- r.push(`${He} steadies ${himself} as well as ${he} can in ${his} advanced age.`);
+ if (fighter.physicalAge >= 100) {
+ return `${He} seems prepared for death, in a way.`;
+ } else if (fighter.physicalAge >= 85) {
+ return `${He} tries not to waste ${his} strength before the fight, knowing that ${his} extreme age won't allow ${him} a second wind.`;
+ } else if (fighter.physicalAge >= 70) {
+ return `${He} steadies ${himself} as well as ${he} can in ${his} advanced age.`;
}
}
}
@@ -306,8 +306,8 @@ App.Facilities.Pit.fight.lethal = function(fighters) {
function fight() {
const fightDiv = document.createElement("div");
- const winnerDeadliness = fighterDeadliness(winner);
- const loserDeadliness = fighterDeadliness(loser);
+ const winnerDeadliness = deadliness(winner);
+ const loserDeadliness = deadliness(loser);
const {he, his, him, himself, girl, He} = getPronouns(winner);
const {he: he2, his: his2, him: him2, girl: girl2} = getPronouns(loser);
diff --git a/src/events/scheduled/pitFightNonlethal.js b/src/events/scheduled/pitFightNonlethal.js
index d11a572c9d0..ca1cf55f539 100644
--- a/src/events/scheduled/pitFightNonlethal.js
+++ b/src/events/scheduled/pitFightNonlethal.js
@@ -139,12 +139,12 @@ App.Facilities.Pit.fight.nonlethal = function(fighters) {
function age() {
if (V.AgePenalty !== 0) {
- if (slave.physicalAge >= 100) {
- r.push(`${He} seems preoccupied, which is unsurprising given ${his} age and resulting fragility.`);
- } else if (slave.physicalAge >= 85) {
- r.push(`${He} tries not to waste ${his} strength before the fight, knowing that ${his} extreme age won't allow ${him} a second wind.`);
- } else if (slave.physicalAge >= 70) {
- r.push(`${He} steadies ${himself} as well as ${he} can in ${his} advanced age.`);
+ if (fighter.physicalAge >= 100) {
+ return `${He} seems preoccupied, which is unsurprising given ${his} age and resulting fragility.`;
+ } else if (fighter.physicalAge >= 85) {
+ return `${He} tries not to waste ${his} strength before the fight, knowing that ${his} extreme age won't allow ${him} a second wind.`;
+ } else if (fighter.physicalAge >= 70) {
+ return `${He} steadies ${himself} as well as ${he} can in ${his} advanced age.`;
}
}
}
--
GitLab