From 8c5d4554a9ded2cd06d3bc51c1c3c26e51a01b59 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Wed, 30 Jun 2021 22:53:51 -0400
Subject: [PATCH] more checks
---
src/events/RE/reLegendaryFormerAbolitionist.js | 3 ++-
src/js/eventSelectionJS.js | 6 ------
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/events/RE/reLegendaryFormerAbolitionist.js b/src/events/RE/reLegendaryFormerAbolitionist.js
index e56c2f77b39..dd5d5619581 100644
--- a/src/events/RE/reLegendaryFormerAbolitionist.js
+++ b/src/events/RE/reLegendaryFormerAbolitionist.js
@@ -2,6 +2,7 @@ App.Events.RELegendaryFormerAbolitionist = class RELegendaryFormerAbolitionist e
actorPrerequisites() {
return [[
(s) => s.devotion > 95,
+ (s) => s.trust > 50,
(s) => s.prestige === 0,
(s) => [
"You sentenced $him to enslavement as a punishment for attempted theft of a slave.",
@@ -10,7 +11,7 @@ App.Events.RELegendaryFormerAbolitionist = class RELegendaryFormerAbolitionist e
"$He is an enslaved member of an anti-slavery extremist group.",
].includes(s.origin) ||
s.career === "an antislavery activist",
- (s) => [Job.MASTERSUITE, Job.CONCUBINE].includes(s.assignment)
+ (s) => [Job.MASTERSUITE, Job.CONCUBINE, Job.FUCKTOY].includes(s.assignment)
]];
}
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index e779d1d3314..b758d1b7490 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -1118,12 +1118,6 @@ if(eventSlave.drugs === "breast injections") {
}
}
}
-
- if (eventSlave.origin === "You sentenced $him to enslavement as a punishment for attempted theft of a slave." || eventSlave.origin === "$He is an enslaved Daughter of Liberty." || eventSlave.origin === "You got $him at the Slave Shelter. $He is an enslaved Daughter of Liberty, caught some weeks after the failed coup. $His previous owner used $him as a punching bag and dart board, then when he was bored of $him tattooed obscenities all over $his body and threw $him away." || eventSlave.origin === "$He is an enslaved member of an anti-slavery extremist group." || eventSlave.career === "an antislavery activist") {
- if (eventSlave.devotion > 95 && eventSlave.assignment === Job.FUCKTOY) {
- V.events.push("RE former abolitionist");
- }
- }
}
}
}
--
GitLab