From 5ab5dbb8b81960eead26bc17fda5434a9e9ebb53 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@mailbox.org>
Date: Sun, 19 Feb 2023 00:42:06 +0100
Subject: [PATCH] remove animal fight code
---
src/facilities/farmyard/animals/Animal.js | 8 ++++----
src/facilities/farmyard/farmyard.js | 7 ++++---
src/js/assignJS.js | 1 -
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/facilities/farmyard/animals/Animal.js b/src/facilities/farmyard/animals/Animal.js
index dde095cc057..7f30b113735 100644
--- a/src/facilities/farmyard/animals/Animal.js
+++ b/src/facilities/farmyard/animals/Animal.js
@@ -38,11 +38,11 @@ App.Entity.Animal = class Animal {
/** @returns {this} */
purchase() {
V.animals[this.type].push(this.name);
-
+ /*
if (V.pit && !V.pit.animal) {
V.pit.animal = this.name;
}
-
+ */
return this;
}
@@ -51,11 +51,11 @@ App.Entity.Animal = class Animal {
if (this.isActive) {
V.active[this.type] = V.animals[this.type].random() || null;
}
-
+ /*
if (V.pit && V.pit.animal === this.name) {
V.pit.animal = null;
}
-
+ */
V.animals[this.type] = V.animals[this.type].filter(animal => animal !== this.name);
return this;
diff --git a/src/facilities/farmyard/farmyard.js b/src/facilities/farmyard/farmyard.js
index d7b88f35780..5f6f2c008d8 100644
--- a/src/facilities/farmyard/farmyard.js
+++ b/src/facilities/farmyard/farmyard.js
@@ -21,11 +21,11 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
V.farmyardKennels = 0;
V.farmyardStables = 0;
V.farmyardCages = 0;
-
+ /*
if (V.pit) {
V.pit.animal = null;
}
-
+ */
V.farmyardUpgrades = {
pump: 0,
fertilizer: 0,
@@ -717,10 +717,11 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
hooved: null,
feline: null,
};
-
+ /*
if (V.pit) {
V.pit.animal = null;
}
+ */
V.farmyardShows = 0;
V.farmyardBreeding = 0;
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index 4f1409dcbd4..0352498ae50 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -384,7 +384,6 @@ globalThis.assignJob = function(slave, job) {
if (V.dojo > 1) {
slave.rules.living = LivingRule.LUXURIOUS;
}
- if (V.pit && V.pit.bodyguardFights && V.pit.fighterIDs.includes(slave.ID)) { V.pit.fighterIDs.delete(slave.ID); }
break;
case Job.AGENT.toLowerCase():
--
GitLab