From ae13656aa5b8c469443323c54ce93e49103112eb Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sat, 1 Aug 2020 20:51:11 -0400
Subject: [PATCH] event tweaks
---
src/events/RESS/serveThePublicDevoted.js | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/events/RESS/serveThePublicDevoted.js b/src/events/RESS/serveThePublicDevoted.js
index bddd8d3aa93..24076dea2ff 100644
--- a/src/events/RESS/serveThePublicDevoted.js
+++ b/src/events/RESS/serveThePublicDevoted.js
@@ -24,10 +24,6 @@ App.Events.RESSServeThePublicDevoted = class RESSServeThePublicDevoted extends A
} = getPronouns(eventSlave);
const belly = bellyAdjective(eventSlave);
-
- /** @type {App.Entity.PlayerState} */
- let PC = V.PC;
-
V.nextLink = "Next Week";
App.Events.drawEventArt(node, eventSlave);
@@ -35,7 +31,13 @@ App.Events.RESSServeThePublicDevoted = class RESSServeThePublicDevoted extends A
let t = [];
t.push(App.UI.DOM.slaveDescriptionDialog(eventSlave));
- t.push(`is a real public servant. This morning, ${he} rose early, did ${his} chores, and looked after ${himself}. ${He} heads out past your desk toward the arcology's lower floors to offer ${himself} freely to everyone ${he} meets.`);
+ t.push(`is a real public servant. This morning, ${he} rose early, did ${his} chores, and looked after ${himself}.`);
+ if (canWalk(eventSlave) || (canMove(eventSlave) && eventSlave.rules.mobility === "permissive")) {
+ t.push(`${He} heads out`);
+ } else {
+ t.push(`${He}'s being escorted`);
+ }
+ t.push(`past your desk toward the arcology's lower floors to offer ${himself} freely to everyone ${he} meets.`);
App.Events.addParagraph(node, t);
t = [];
@@ -111,10 +113,12 @@ App.Events.RESSServeThePublicDevoted = class RESSServeThePublicDevoted extends A
function share() {
let frag = document.createDocumentFragment();
t = [];
- if (canMove(eventSlave)) {
+ if (canWalk(eventSlave) || (canMove(eventSlave) && eventSlave.rules.mobility === "permissive")) {
t.push(`${eventSlave.slaveName} is surprised to find you walking beside ${him}, but obediently falls in behind you as a proper slave should.`);
- } else {
- t.push(`You scoop ${eventSlave.slaveName}'s limbless form up and carry ${him} out.`);
+ } else if (canMove(eventSlave)) {
+ t.push(`${eventSlave.slaveName} is surprised to find you swapping places with ${his} assistant to support ${his} weight.`);
+ } else { // strength/height check here!
+ t.push(`You scoop ${eventSlave.slaveName}'s ${isAmuptee(eventSlave) ? "limbless" : "immobile"} form up and carry ${him} out.`);
}
t.push(`You take ${him} to a lovely open balcony and seat yourself on a bench surrounded by the lush greenery and flowing water of ${V.arcologies[0].name}'s food systems. You pull ${his} ass down onto your`);
if (V.PC.dick === 0) {
--
GitLab