From 69c482ba0c5ac5115915f9f62e50e2e3f6a70ef1 Mon Sep 17 00:00:00 2001
From: torbjornhub <13432-torbjornhub@users.noreply.gitgud.io>
Date: Sun, 15 Dec 2019 09:48:45 -0800
Subject: [PATCH] Replace DefaultRules.js
---
src/js/DefaultRules.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index b0c48692cb0..160b5675fab 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -1524,13 +1524,13 @@ window.DefaultRules = (function() {
function ProcessPit(slave,rule){
if (rule.pitRules !== undefined && rule.pitRules !== null){
if (V.pit > 0){
- if (rule.pitRules === 0){
+ if (rule.pitRules===0){
V.fighterIDs = V.fighterIDs.filter(e => e !== slave.ID);
- r += `<br>${slave.slaveName} has been automatically unassigned from the pit.`;
+ r += `<br>${slave.slaveName} has been removed from the pit.`;
}else{
- if ((slave.breedingMark === 1 && State.variables.propOutcome === 1 && State.variables.eugenicsFullControl !== 1 && State.variables.arcologies[0].FSRestart !== "unset") || (slave.indentureRestrictions > 1) || ( (slave.indentureRestrictions > 0) && (V.pitLethal)) ) {
+ if (App.Entity.facilities.pit.job().checkRequirements(slave).length === 1) {
V.fighterIDs = V.fighterIDs.filter(e => e !== slave.ID);
- r += `<br>${slave.slaveName} has been automatically unassigned from the pit.`;
+ r += `<br>${slave.slaveName} is not eligible to fight.`;
} else{
V.fighterIDs.push(slave.ID);
r += `<br>${slave.slaveName} has been automatically assigned to fight in the pit.`;
--
GitLab