From 138362dbaea782a8328d54ae4ccd938bcaf23de8 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 2 Sep 2020 16:38:39 -0400
Subject: [PATCH] work
---
src/events/scheduled/murderAttempt.js | 31 ++++++++++++---------------
1 file changed, 14 insertions(+), 17 deletions(-)
diff --git a/src/events/scheduled/murderAttempt.js b/src/events/scheduled/murderAttempt.js
index ea2e9732473..7529b8cf79b 100644
--- a/src/events/scheduled/murderAttempt.js
+++ b/src/events/scheduled/murderAttempt.js
@@ -26,7 +26,7 @@ App.Events.murderAttempt = function() {
}
}
const companyName = "RealTec"; // TODO generate name
- const {he, his, him, woman: man, himself} = getPronouns(V.arcologies[0].FSGenderRadicalist === "unset"
+ const {he, his, him, man, himself} = getPronouns((V.arcologies[0].FSGenderFundamentalist !== "unset" || V.seeDicks > random(0, 99))
? {pronoun: App.Data.Pronouns.Kind.male} : {pronoun: App.Data.Pronouns.Kind.female});
const documentFragment = document.createDocumentFragment();
@@ -35,7 +35,7 @@ App.Events.murderAttempt = function() {
function intro(fragment) {
const r = [];
- r.push("As per routine, you are sifting through the messages your personal assistant has flagged as relevant from the mass that fills your inbox each day.");
+ r.push(`As per routine, you are sifting through the messages ${assistant.name} has flagged as relevant from the mass that fills your inbox each day.`);
r.push(`One is a request from a company called ${companyName} for a personal meeting to propose some kind of`);
switch (variation) {
case "trade":
@@ -98,23 +98,20 @@ App.Events.murderAttempt = function() {
const fragment = document.createDocumentFragment();
let r = [];
- r.push("Your assistant makes a meeting a few days later in your personal office, despite those meetings usually being conducted in a more neutral, albeit less secure location, but",
- companyName, "insisted on meeting in your office.");
- if (["capitalist", "mercenary", "slaver", "engineer"].includes(V.PC.career)) {
- r.push("You should prepare for anything.");
+ r.push(`${capFirstChar($assistant.name)} schedules a meeting a few days later to take place in your personal office, an oddity given these meetings are usually conducted in a more neutral, albeit less secure location, but ${companyName} insisted on it.`);
+ if (["capitalist", "mercenary", "slaver", "engineer", "escort"].includes(V.PC.career)) {
+ r.push("You should prepare for anything; it's better to be prepared in case something goes awry.");
} else {
- r.push("Less time wasted in case nothing comes out of it.");
+ r.push("You can't really complain; it's easier for you and cheaper should nothing come of it.");
}
App.Events.addParagraph(fragment, r);
r = [];
- r.push("At the time of the meeting a", man,
- "arrives at your penthouse and is brought to your office by one of your slaves, while you watch him on your PC screen. The",
- man, "is distinctively average looking, as if you took all business man that did their job well, but did not overachieve, and created the perfect average of it. Someone looking this average is certainly anything but average.");
+ r.push(`When it comes time for the meeting, a ${man} arrives at the entryway of the penthouse and is escorted to your office by one of your slaves as you watch ${him} on your monitor. The ${man} is distinctively average looking, as if you took all business men that did their job well, but did not overachieve, and created the perfect average of it. Someone trying this hard to appear average is certainly anything but average.`);
App.Events.addParagraph(fragment, r);
r = [];
- r.push("Once", he, "arrives at your office you settle down after a short greeting and", he, "starts");
+ r.push("Once ${he} reaches your office, you settle down after a short greeting for ${him} to begin");
switch (variation) {
case "trade":
case "military":
@@ -128,16 +125,16 @@ App.Events.murderAttempt = function() {
}
if (S.Bodyguard) {
- r.push("Before getting anywhere though", he, "interrupts", himself,
- "looking at your bodyguard. \"I'm sorry, this is meant only for your ears, can you please send your bodyguard outside?\"");
+ r.push(`Before getting anywhere though, ${he} interrupts ${himself}, gesturing at your bodyguard.`);
+ r.push("I'm sorry, this is meant only for your ears, can you please send your bodyguard outside?");
App.Events.addParagraph(fragment, r);
- const {she: sheBG} = getPronouns(S.Bodyguard);
+ const {He} = getPronouns(S.Bodyguard).appendSuffix("BG");
App.Events.addResponses(fragment, [
- new App.Events.Result("\"No one gives me commands in my own office. You can leave now.\"", endEvent),
- new App.Events.Result(`"${S.Bodyguard.slaveName} IS my ears, ${sheBG} stays."`, bgStaysRoute),
- new App.Events.Result(`"This better be worth it." Order ${S.Bodyguard.slaveName} to leave.`, bgLeavesRoute)
+ new App.Events.Result(`Order ${him} to leave for making such a request.`, endEvent),
+ new App.Events.Result(`${S.Bodyguard.slaveName} goes everywhere and does everything with you. ${HeBG} stays.`, bgStaysRoute),
+ new App.Events.Result(`This better be worth it. Order ${S.Bodyguard.slaveName} to leave.`, bgLeavesRoute)
], "bodyguard");
} else {
noSlaveRoute(fragment, r, false);
--
GitLab