From 937a029e1ed16cfae40a5bd7dfc0b7b5dba1db29 Mon Sep 17 00:00:00 2001
From: Blank_Alt <12406-Blank_Alt@users.noreply.gitgud.io>
Date: Wed, 27 Apr 2022 18:24:47 +1200
Subject: [PATCH] Tweak both citizenHookups
---
src/events/RE/reCitizenHookup.js | 10 ++--------
src/events/RE/reMaleCitizenHookup.js | 15 +++++----------
2 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/src/events/RE/reCitizenHookup.js b/src/events/RE/reCitizenHookup.js
index 5302a742e74..611e5022458 100644
--- a/src/events/RE/reCitizenHookup.js
+++ b/src/events/RE/reCitizenHookup.js
@@ -16,16 +16,10 @@ App.Events.RECitizenHookup = class RECitizenHookup extends App.Events.BaseEvent
}
}
const FS = fsArray.random();
- console.log(FS);
const fsAdj = (fsArray.length > 0) ? App.Data.FutureSociety.records[FS].adj : "none";
r.push(`At night, the best living areas in the arcology offer a constant mélange of selective entertainments. There's a perpetual social scrum of who is to be invited to what going on, and you occupy a preeminent place atop it, mostly aloof from the struggles of your citizens for recognition and influence. You're invited to almost everything, since everyone who lives here knows the value of being in favor with the owner of the arcology. Invitations to your parties, of course, are some of the most valuable social currency in the arcology and one of ${V.assistant.name}'s most important duties is to help you manage them without wasting your valuable time. It's not actually necessary for you to attend your own parties, since almost everyone will be glad to be seen in the entertainment area of the penthouse whether or not the`);
- if (V.PC.title === 1) {
- r.push(`proprietor`);
- } else {
- r.push(`proprietress`);
- }
- r.push(`is actually present.`);
+ r.push(`${V.PC.title === 1 ? 'proprietor' : 'proprietress'} is actually present.`);
App.Events.addParagraph(node, r);
r = [];
r.push(`But tonight, you've put in an appearance. Your citizens are drinking your`);
@@ -525,7 +519,7 @@ App.Events.RECitizenHookup = class RECitizenHookup extends App.Events.BaseEvent
default:
r.push(`hot young body`);
}
- r.push(`is obvious to everyone. The message is clear, and your guest of honor is the center of attention as you take her there in view of the arcology's leading citizens. Naturally, the story percolates, making it clear that there's nothing you won't do to <span class="green">further acceptance of ${fsAdj} principles.</span>`);
+ r.push(`is obvious to everyone. The message is clear, and your guest of honor is the center of attention as you take her there in view of the arcology's leading citizens. Naturally, the story percolates, making it clear that there's nothing you won't do to <span class="green">further acceptance of ${fsArray.length > 0 ? FutureSocieties.displayAdj(FS) : "societal"}} principles.</span>`);
App.Events.addParagraph(frag, r);
return frag;
diff --git a/src/events/RE/reMaleCitizenHookup.js b/src/events/RE/reMaleCitizenHookup.js
index 80529834309..080a5e7ee85 100644
--- a/src/events/RE/reMaleCitizenHookup.js
+++ b/src/events/RE/reMaleCitizenHookup.js
@@ -17,12 +17,7 @@ App.Events.REMaleCitizenHookup = class REMaleCitizenHookup extends App.Events.Ba
let r = [];
r.push(`At night, the best living areas in the arcology offer a constant mélange of selective entertainments. There's a perpetual social scrum of who is to be invited to what going on, and you occupy a preeminent place atop it, mostly aloof from the struggles of your citizens for recognition and influence. You're invited to almost everything, since everyone who lives here knows the value of being in favor with the owner of the arcology. Invitations to your parties, of course, are some of the most valuable social currency in the arcology and one of ${V.assistant.name}'s most important duties is to help you manage them without wasting your valuable time. It's not actually necessary for you to attend your own parties, since almost everyone will be glad to be seen in the entertainment area of the penthouse whether or not the`);
- if (V.PC.title === 1) {
- r.push(`proprietor`);
- } else {
- r.push(`proprietress`);
- }
- r.push(`is actually present.`);
+ r.push(`${V.PC.title === 1 ? 'proprietor' : 'proprietress'} is actually present.`);
App.Events.addParagraph(node, r);
r = [];
r.push(`But tonight, you've put in an appearance. Your citizens are drinking your`);
@@ -646,6 +641,9 @@ App.Events.REMaleCitizenHookup = class REMaleCitizenHookup extends App.Events.Ba
const frag = new DocumentFragment();
let r = [];
r.push(`You turn to face him straight on, and something about the look in your eye fills him with mixed apprehension and anticipation. You agree with his banter and praise him for being so forward-thinking, before transitioning to more direct praise of his style and then his body. You're speaking in a tone that cuts through the room, and by the time you kiss your willing conquest, there's not a person in the room who isn't paying attention. They all understand the message: this gathering is turning into something else, now. Those few who aren't willing to fuck in public withdraw, and everyone who didn't come with a sexual partner sends urgent messages to have appropriate slaves brought from their apartments. You make out with him for a while, letting everyone make arrangements, and then pull his clothes off, making sure his`);
+ if (!["none", "FSNull"].includes(FS)) {
+ V.arcologies[0][FS] += 5;
+ }
switch (FS) {
case "FSSubjugationist":
case "FSSupremacist":
@@ -738,10 +736,7 @@ App.Events.REMaleCitizenHookup = class REMaleCitizenHookup extends App.Events.Ba
default:
r.push(`hot young body`);
}
- if (!["none", "FSNull"].includes(FS)) {
- V.arcologies[0][FS] += 5;
- }
- r.push(`is obvious to everyone. The message is clear, and your guest of honor is the center of attention as you take him there in view of the arcology's leading citizens. Naturally, the story percolates, making it clear that there's nothing you won't do to <span class="green">further acceptance of ${FS} principles.</span>`);
+ r.push(`is obvious to everyone. The message is clear, and your guest of honor is the center of attention as you take him there in view of the arcology's leading citizens. Naturally, the story percolates, making it clear that there's nothing you won't do to <span class="green">further acceptance of ${FS !== "none" ? FutureSocieties.displayAdj(FS) : "societal"} principles.</span>`);
if (canGetPregnant(V.PC)) {
r.push(knockMeUp(V.PC, 40, 0, -2));
}
--
GitLab