diff --git a/src/arcologyBuilding/markets.js b/src/arcologyBuilding/markets.js
index 01d987f827adfb03f554e7244895660de111de03..80db25abc4c786cca45d2c992cdebddedd10b48e 100644
--- a/src/arcologyBuilding/markets.js
+++ b/src/arcologyBuilding/markets.js
@@ -109,7 +109,7 @@ App.Arcology.Cell.Market = class extends App.Arcology.Cell.BaseCell {
V.pit = {
name: "the Pit",
- BG: false,
+ bodyguardFights: false,
animal: false,
animalType: null,
audience: "none",
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index 5267361c6f16b52f5dd9844ed7264df10f2aa649..62774bc64ce861d8531f33e3239bc3a93db666d3 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -311,10 +311,10 @@ App.Update.globalVariables = function(node) {
V.pit.virginities = virginities[V.pit.virginities];
}
- V.pit.BG = V.pit.BG || V.pitBG || false;
+ V.pit.bodyguardFights = V.pit.bodyguardFights || V.pitBG || false;
V.pit.fighterIDs = V.pit.fighterIDs || V.fighterIDs || [];
- if (V.pit.BG && V.pit.fighterIDs.includes(V.BodyguardID)) {
+ if (V.pit.bodyguardFights && V.pit.fighterIDs.includes(V.BodyguardID)) {
V.pit.fighterIDs.delete(V.BodyguardID);
}
diff --git a/src/facilities/pit/pit.js b/src/facilities/pit/pit.js
index 4da42d183440c8f3fd0193520b60b8dfea8776b4..b19ed3a665328f62eb2b3e4764a06d70d0177c3e 100644
--- a/src/facilities/pit/pit.js
+++ b/src/facilities/pit/pit.js
@@ -159,11 +159,11 @@ App.Facilities.Pit.pit = function() {
links = [];
if (S.Bodyguard || V.activeCanine || V.activeHooved || V.activeFeline) {
- if (V.pit.BG) {
+ if (V.pit.bodyguardFights) {
mainDiv.append(`Your bodyguard ${S.Bodyguard.slaveName} will fight a slave selected from the pool at random.`);
links.push(App.UI.DOM.link("Make both slots random", () => {
- V.pit.BG = false;
+ V.pit.bodyguardFights = false;
V.pit.animal = false;
if (V.pit.fighterIDs.includes(V.BodyguardID)) {
@@ -175,7 +175,7 @@ App.Facilities.Pit.pit = function() {
if (V.activeCanine || V.activeHooved || V.activeFeline) {
links.push(App.UI.DOM.link("Have a slave fight an animal", () => {
- V.pit.BG = false;
+ V.pit.bodyguardFights = false;
V.pit.animal = true;
if (V.pit.fighterIDs.includes(V.BodyguardID)) {
@@ -191,14 +191,14 @@ App.Facilities.Pit.pit = function() {
links.push(
App.UI.DOM.link("Have them fight another slave", () => {
- V.pit.BG = false;
+ V.pit.bodyguardFights = false;
V.pit.animal = false;
V.pit.animalType = null;
refresh(mainDiv, fighters);
}),
App.UI.DOM.link("Have them fight your bodyguard", () => {
- V.pit.BG = true;
+ V.pit.bodyguardFights = true;
V.pit.animal = false;
V.pit.animalType = null;
@@ -210,7 +210,7 @@ App.Facilities.Pit.pit = function() {
if (S.Bodyguard) {
links.push(
App.UI.DOM.link("Guarantee your bodyguard a slot", () => {
- V.pit.BG = true;
+ V.pit.bodyguardFights = true;
V.pit.animal = false;
V.pit.animalType = null;
@@ -222,7 +222,7 @@ App.Facilities.Pit.pit = function() {
if (V.activeCanine || V.activeHooved || V.activeFeline) {
links.push(
App.UI.DOM.link("Have a slave fight an animal", () => {
- V.pit.BG = false;
+ V.pit.bodyguardFights = false;
V.pit.animal = true;
refresh(mainDiv, fighters);
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index a069f7d0034d9b74577068177bd21828844b0f83..b7a4a7529d982024ac1a7802e5353ac64e1ab5ec 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -386,7 +386,7 @@ globalThis.assignJob = function(slave, job) {
if (V.dojo > 1) {
slave.rules.living = LivingRule.LUXURIOUS;
}
- if (V.pit.BG && V.pit.fighterIDs.includes(slave.ID)) { V.pit.fighterIDs.delete(slave.ID); }
+ if (V.pit.bodyguardFights && V.pit.fighterIDs.includes(slave.ID)) { V.pit.fighterIDs.delete(slave.ID); }
break;
case Job.AGENT.toLowerCase():
diff --git a/src/uncategorized/scheduledEvent.tw b/src/uncategorized/scheduledEvent.tw
index d10fc0b300b64f764370bc1705f82ca55965d831..3989c36020283a14228db8cd5522c8f7960582d9 100644
--- a/src/uncategorized/scheduledEvent.tw
+++ b/src/uncategorized/scheduledEvent.tw
@@ -148,7 +148,7 @@
<<goto "SE coursing">>
<<elseif $policies.raidingMercenaries == 1 && ($week > ($raided + 6))>>
<<goto "SE raiding">>
-<<elseif ((($fighterIDs.length > 1) && (!$pit.BG)) || (($fighterIDs.length > 0) && ($BodyguardID != 0) && ($pit.BG)) || (($pit.animal) && ($fighterIDs.length > 0)) || ($killChoice == 2)) && ($pit.fought == 0)>>
+<<elseif ((($fighterIDs.length > 1) && (!$pit.bodyguardFights)) || (($fighterIDs.length > 0) && ($BodyguardID != 0) && ($pit.bodyguardFights)) || (($pit.animal) && ($fighterIDs.length > 0)) || ($killChoice == 2)) && ($pit.fought == 0)>>
<<if $pit.lethal>><<goto "SE lethal pit">><<else>><<goto "SE nonlethal pit">><</if>>
<<elseif ($bioreactorPerfectedID != 0) && ($bioreactorsAnnounced != 1)>>
<<goto "P bioreactor perfected">>
diff --git a/src/uncategorized/seLethalPit.tw b/src/uncategorized/seLethalPit.tw
index 7d4421d6731fb48a104d2f2c36a43366056b7a9d..80648a19166e60d6a202ed4715c0c5c05eb29ac2 100644
--- a/src/uncategorized/seLethalPit.tw
+++ b/src/uncategorized/seLethalPit.tw
@@ -9,7 +9,7 @@
<<setLocalPronouns _fighterOne>>
<<setLocalPronouns _fighterTwo 2>>
<<else>>
- <<if !$pit.BG>>
+ <<if !$pit.bodyguardFights>>
<<set _fighterOne = $fighterIDs.pluck()>> /* .pluck() removes the element from the array, preventing _fighterTwo from also choosing this ID */
<<set _fighterOne = getSlave(_fighterOne)>>
<<else>>
@@ -811,7 +811,7 @@ In any case, <<if !$pit.animal>>both of the slaves have<<else>>the slave and the
<<set $pitKillsTotal += 1>>
<<set $slaves[$slaveIndices[_winner.ID]] = _winner>>
- <<if !$pit.BG || ($BodyguardID != _winner.ID)>>
+ <<if !$pit.bodyguardFights || ($BodyguardID != _winner.ID)>>
<<set $fighterIDs.push(_winner.ID)>>
<</if>>
<<if !$pit.animal>>
diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw
index 3bacc89d2569f7edf958341c9e0128ff5bbb2901..d9babcd33e1187225650161bac002f0aedb9fc67 100644
--- a/src/uncategorized/seNonlethalPit.tw
+++ b/src/uncategorized/seNonlethalPit.tw
@@ -2,7 +2,7 @@
<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $pit.fought = 1, _fighterOne = 0, _fighterTwo = 0>>
-<<if !$pit.BG>>
+<<if !$pit.bodyguardFights>>
<<set _fighterOne = $fighterIDs.pluck()>> /* .pluck() removes the element from the array, preventing _fighterTwo from also choosing this ID */
<<set _fighterOne = getSlave(_fighterOne)>>
<<else>>
@@ -61,7 +61,7 @@
<<else>>
This week, _fighterOne.slaveName was scheduled to be used by an animal, but is spared because no animal has been chosen.
<<set $slaves[$slaveIndices[_fighterOne.ID]] = _fighterOne>>
- <<if !$pit.BG || ($BodyguardID != _fighterOne.ID)>>
+ <<if !$pit.bodyguardFights || ($BodyguardID != _fighterOne.ID)>>
<<set $fighterIDs.push(_fighterOne.ID)>>
<</if>>
<</if>>
@@ -952,10 +952,10 @@
<<set $slaves[$slaveIndices[_winner.ID]] = _winner>>
<<set $slaves[$slaveIndices[_loser.ID]] = _loser>>
- <<if !$pit.BG || ($BodyguardID != _winner.ID)>>
+ <<if !$pit.bodyguardFights || ($BodyguardID != _winner.ID)>>
<<set $fighterIDs.push(_winner.ID)>>
<</if>>
- <<if !$pit.BG || ($BodyguardID != _loser.ID)>>
+ <<if !$pit.bodyguardFights || ($BodyguardID != _loser.ID)>>
<<set $fighterIDs.push(_loser.ID)>>
<</if>>
@@ -1031,7 +1031,7 @@
/* TODO: write an ending / post-fight message */
<</if>>
<<set $slaves[$slaveIndices[_fighterOne.ID]] = _fighterOne>>
- <<if !$pit.BG || ($BodyguardID != _fighterOne.ID)>>
+ <<if !$pit.bodyguardFights || ($BodyguardID != _fighterOne.ID)>>
<<set $fighterIDs.push(_fighterOne.ID)>>
<</if>>
<</if>>