From 186230251fe44596aeeaf1e391c6e9cb698515e7 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 2 Aug 2020 03:20:51 -0400
Subject: [PATCH] Condition tweaks
---
src/events/RESS/devotedEducated.js | 4 ++--
src/events/RESS/kitchenMolestation.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/events/RESS/devotedEducated.js b/src/events/RESS/devotedEducated.js
index d11d2aaa111..c2b7cf7e16b 100644
--- a/src/events/RESS/devotedEducated.js
+++ b/src/events/RESS/devotedEducated.js
@@ -7,8 +7,8 @@ App.Events.RESSDevotedEducated = class RESSDevotedEducated extends App.Events.Ba
return [
[ // single event slave
s => s.fetish !== "mindbroken",
+ s => (canWalk(s) || (canMove(s) && s.rules.mobility === "permissive")),
hasAnyArms,
- hasAnyLegs,
canTalk,
s => s.devotion > 50,
s => s.intelligence + s.intelligenceImplant > 50,
@@ -126,7 +126,7 @@ App.Events.RESSDevotedEducated = class RESSDevotedEducated extends App.Events.Ba
function schooling() {
t = [];
- t.push(`You tell ${him} to take the day off for a trip to audit classes at ${V.arcologies[0].name}'s most renowned Paternalist slave schools. ${eventSlave.slaveName} is shocked into a reverie by your words before running to wrap ${his} arms around you in a tight hug. When ${he} eventually untangles ${himself} from you, ${he} races off to get ready for ${his} day of intellectualism while you direct ${V.assistant.name} to make the necessary arrangements.`);
+ t.push(`You tell ${him} to take the day off for a trip to audit classes at ${V.arcologies[0].name}'s most renowned Paternalist slave schools. ${eventSlave.slaveName} is shocked into a reverie by your words before running to wrap ${his} ${hasBothArms(eventSlave) ? "arms" : "arm";} around you in a tight hug. When ${he} eventually untangles ${himself} from you, ${he} races off to get ready for ${his} day of intellectualism while you direct ${V.assistant.name} to make the necessary arrangements.`);
App.Events.addParagraph(node, t);
t = [];
diff --git a/src/events/RESS/kitchenMolestation.js b/src/events/RESS/kitchenMolestation.js
index d6a6ee936ca..7a8932c7305 100644
--- a/src/events/RESS/kitchenMolestation.js
+++ b/src/events/RESS/kitchenMolestation.js
@@ -11,7 +11,7 @@ App.Events.RESSKitchenMolestation = class RESSKitchenMolestation extends App.Eve
[ // single event slave
s => s.fetish !== "mindbroken",
hasAnyArms,
- hasAnyLegs,
+ canWalk,
canTalk,
s => s.devotion > 50,
s => s.fetish === "sadist" || s.fetish === "dom" || s.energy > 95,
--
GitLab