From 15bfaa5d7efb04778459875393d8ed774b0aa5b9 Mon Sep 17 00:00:00 2001 From: Svornost <11434-svornost@users.noreply.gitgud.io> Date: Tue, 13 Jul 2021 15:35:51 -0700 Subject: [PATCH 1/3] Make FSes work again --- src/events/nonRandomEvent.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/events/nonRandomEvent.js b/src/events/nonRandomEvent.js index d84bc0c510d..c23b7441f24 100644 --- a/src/events/nonRandomEvent.js +++ b/src/events/nonRandomEvent.js @@ -93,6 +93,7 @@ App.Events.getNonrandomEvents = function() { new App.Events.SEPoorKnight(), new App.Events.SEFcnnStation(), new App.Events.SEFctvInstall(), + new App.Events.PFSAnnouncement(), new App.Events.PBodyswapReveal(), new App.Events.PCorpAnnouncement(), ]; -- GitLab From ed6998fb385ff1bd363414ec11e48888df22ff92 Mon Sep 17 00:00:00 2001 From: Svornost <11434-svornost@users.noreply.gitgud.io> Date: Tue, 13 Jul 2021 15:37:49 -0700 Subject: [PATCH 2/3] Fixes for FS Announcement event --- src/events/nonRandom/pFSAnnouncement.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/events/nonRandom/pFSAnnouncement.js b/src/events/nonRandom/pFSAnnouncement.js index 587dfe2cf9b..f1c2db6ffe9 100644 --- a/src/events/nonRandom/pFSAnnouncement.js +++ b/src/events/nonRandom/pFSAnnouncement.js @@ -9,13 +9,12 @@ App.Events.PFSAnnouncement = class PFSAnnouncement extends App.Events.BaseEvent execute(node) { V.nextButton = "Continue"; - V.nextLink = "Random Nonindividual Event"; V.FSAnnounced = 1; V.FSGotRepCredits = 1; if (V.seeImages === 1) { - node.append(assistantArt(3)); + node.append(App.UI.DOM.assistantArt(3)); } const {heA} = getPronouns(assistant.pronouns().main).appendSuffix("A"); // TODO: does assistant actually have gender at this point? App.Events.addParagraph(node, [`The simple pleasure of power has to be experienced to be understood. You often take a moment to stand on a balcony overlooking an interior atrium, watching the living, breathing, flowing current of your demesne. ${capFirstChar(V.assistant.name)} knows to allow you these moments of peace.`]); -- GitLab From cf8af18e2c274962980d471a15d5bfbc0207f8a0 Mon Sep 17 00:00:00 2001 From: Svornost <11434-svornost@users.noreply.gitgud.io> Date: Tue, 13 Jul 2021 15:39:32 -0700 Subject: [PATCH 3/3] space fix --- src/events/nonRandom/pFSAnnouncement.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/events/nonRandom/pFSAnnouncement.js b/src/events/nonRandom/pFSAnnouncement.js index f1c2db6ffe9..c7c62386419 100644 --- a/src/events/nonRandom/pFSAnnouncement.js +++ b/src/events/nonRandom/pFSAnnouncement.js @@ -19,7 +19,7 @@ App.Events.PFSAnnouncement = class PFSAnnouncement extends App.Events.BaseEvent const {heA} = getPronouns(assistant.pronouns().main).appendSuffix("A"); // TODO: does assistant actually have gender at this point? App.Events.addParagraph(node, [`The simple pleasure of power has to be experienced to be understood. You often take a moment to stand on a balcony overlooking an interior atrium, watching the living, breathing, flowing current of your demesne. ${capFirstChar(V.assistant.name)} knows to allow you these moments of peace.`]); - App.Events.addParagraph(node, [`You immediately pay attention, therefore, when ${heA} interrupts. "${properTitle()},"${heA} says, "this is an appropriate moment to bring a serious matter to your attention. I monitor conversations, social media, and general opinion within the arcology where I can. You are respected, and the inhabitants of this arcology are starting to look to you to give direction to society."`]); + App.Events.addParagraph(node, [`You immediately pay attention, therefore, when ${heA} interrupts. "${properTitle()}," ${heA} says, "this is an appropriate moment to bring a serious matter to your attention. I monitor conversations, social media, and general opinion within the arcology where I can. You are respected, and the inhabitants of this arcology are starting to look to you to give direction to society."`]); App.Events.addParagraph(node, [`"This is not a situation that requires your attention," ${heA} continues. "You can continue to lead them by simple example. Or, you can take a more active role in defining the future. The rewards could be considerable. I will make the necessary additions to the arcology management interface to support societal modification."`]); } -- GitLab