From 10a4773dc253aaca614987ea2e171439f0b32c51 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sat, 3 Jul 2021 18:53:38 -0400
Subject: [PATCH] polish
---
.../nonRandom/daughters/pCoupAftermath.js | 98 +++++++------------
1 file changed, 38 insertions(+), 60 deletions(-)
diff --git a/src/events/nonRandom/daughters/pCoupAftermath.js b/src/events/nonRandom/daughters/pCoupAftermath.js
index acd2027fc66..3c40f237b2a 100644
--- a/src/events/nonRandom/daughters/pCoupAftermath.js
+++ b/src/events/nonRandom/daughters/pCoupAftermath.js
@@ -5,8 +5,7 @@ App.Events.PCoupAftermath = class REShippingContainer extends App.Events.BaseEve
V.nextButton = " "; // hide button until user makes a selection
V.rivalOwner = 0;
V.rivalryPower = 0;
- const _num = random(0, 99);
- if (_num <= V.seeDicks) {
+ if (random(0, 99) <= V.seeDicks) {
V.rivalGender = 2;
} else {
V.rivalGender = 1;
@@ -14,10 +13,10 @@ App.Events.PCoupAftermath = class REShippingContainer extends App.Events.BaseEve
const {
HeR,
heR, himR,
- } = getPronouns({ pronoun: (V.rivalGender === 2) ? App.Data.Pronouns.Kind.male : App.Data.Pronouns.Kind.female }).appendSuffix("R");
- const {
- HeA, heA, hisA, himA, girlA, himselfA, womanA, loliA
- } = getPronouns(assistant.pronouns().main).appendSuffix("A");
+ } = getPronouns({pronoun: (V.rivalGender === 2) ? App.Data.Pronouns.Kind.male : App.Data.Pronouns.Kind.female}).appendSuffix("R");
+ const {heA} = getPronouns(assistant.pronouns().main).appendSuffix("A");
+
+ const rivalArc = (V.rivalSet !== 0) ? V.arcologies.find(arc => arc.rival === 1) : null;
V.fcnn.push("...evidence also suggests that the Daughters of Liberty had also planned a terrorist attack on...");
if (V.mercenaries > 3) {
@@ -50,26 +49,22 @@ App.Events.PCoupAftermath = class REShippingContainer extends App.Events.BaseEve
}
r.push(`you want, ${properTitle()}."`);
} else {
- r.push(`"This," _heA says neutrally, "is the culprit, ${properTitle()}."`);
+ r.push(`"This," ${heA} says neutrally, "is the culprit, ${properTitle()}."`);
}
r.push(`The face is vigorous, determined, and`);
if (V.rivalGender === 2) {
- r.push(`masculine. The very stereotype of the male arcology owner`);
- } else if ((V.rivalGender === 1)) {
- r.push(`feminine. The very stereotype of the female arcology owner`);
+ r.push(`masculine. The very stereotype of the male arcology owner.`);
+ } else if (V.rivalGender === 1) {
+ r.push(`feminine. The very stereotype of the female arcology owner.`);
} else {
- r.push(`androgynous. The very stereotype of the dissolute arcology owner`);
+ r.push(`androgynous. The very stereotype of the dissolute arcology owner.`);
}
- r.push(`.`);
- if (V.rivalSet !== 0) {
- r.push(`And, as you suspected, it's one of your neighbors. It's the individual who owns`);
- for (let V.i = 0; V.i < V.arcologies.length; V.i++) {
- if (V.arcologies[V.i].rival === 1) {
- r.push(`''${V.arcologies[V.i].name}.''`);
- break;
- }
- }
+ if (rivalArc) {
+ r.push(
+ `And, as you suspected, it's one of your neighbors. It's the individual who owns`,
+ App.UI.DOM.makeElement("span", `${rivalArc.name}.`, "bold")
+ );
App.Events.addParagraph(node, r);
r = [];
}
@@ -82,25 +77,25 @@ App.Events.PCoupAftermath = class REShippingContainer extends App.Events.BaseEve
r = [];
r.push(`You inquire as to whether there's any identifiable cause for the evident dislike.`);
if (V.rivalryFS !== 0) {
- r.push(`"Definitely," says your assistant. "The most cursory review of the recent history of this Free City shows that divergence began with your selection of V.rivalryFS as a society model for the future. They immediately went the opposite direction."`);
+ r.push(`"Definitely," says your assistant. "The most cursory review of the recent history of this Free City shows that divergence began with your selection of ${V.rivalryFS} as a society model for the future. They immediately went the opposite direction."`);
} else {
r.push(`"No," says your assistant. "It may be that giving the Daughters an alternative target was necessary and you were simply unlucky. Alternatively, this may be envy of your success; of rising arcology owners, you have come farthest, fastest."`);
}
App.Events.addParagraph(node, r);
+ const cashTrace = 20000;
App.Events.addResponses(node, [
new App.Events.Result(`Contact the culprit privately and discuss the matter`, privately),
new App.Events.Result(`Reveal the evidence publicly`, publicly),
- new App.Events.Result(`Devote funds to tracing the evidence`, trace, `This will cost ${cashFormat(20000)}`)
+ new App.Events.Result(`Devote funds to tracing the evidence`, trace, `This will cost ${cashFormat(cashTrace)}`)
]);
function privately() {
const frag = new DocumentFragment();
let r = [];
- V.nextButton = "Continue";
- App.Utils.updateUserButton();/* unlock Continue button */
- r.push(`Your fellow arcology owner proves very receptive to your missive, as well they might. Your defeat of the Daughters has made a major impact on the willingness of slaveowners to discuss slave revolts in public, and any arcology owner who was proved to be funding anti-slaver violence, even under duress, would be shunned. With very little prompting, ${heR} forwards a <span class="yellowgreen">huge indemnity payment.</span> It's nowhere near enough to cause bankruptcy, but it's enough to give you a massive advantage should you find yourselves at odds again.`);
+ unlock();
+ r.push(`Your fellow arcology owner proves very receptive to your missive, as well they might. Your defeat of the Daughters has made a major impact on the willingness of slaveowners to discuss slave revolts in public, and any arcology owner who was proved to be funding anti-slaver violence, even under duress, would be shunned. With very little prompting, ${heR} forwards a <span class="cash inc">huge indemnity payment.</span> It's nowhere near enough to cause bankruptcy, but it's enough to give you a massive advantage should you find yourselves at odds again.`);
cashX(100000, "war");
App.Events.addParagraph(frag, r);
return frag;
@@ -109,22 +104,16 @@ App.Events.PCoupAftermath = class REShippingContainer extends App.Events.BaseEve
function publicly() {
const frag = new DocumentFragment();
let r = [];
- V.nextButton = "Continue";
- App.Utils.updateUserButton();/* unlock Continue button */
+ unlock();
r.push(`Free Cities society is understandably reluctant to condemn, never mind depose, arcology owners. The precedent of removing one would be bad, even if the public brought enough strength together to accomplish it. Your evidence looks quite bad, but isn't so incontrovertible as to cause your fellow aristocrats to take such a drastic measure. Nonetheless, the public is aghast at the spectacle of an arcology owner funding an attack on another. Opinion <span class="green">rallies</span> around you, and you even receive some discreet <span class="yellowgreen">donations,</span> delivered with the intimation that they are to be used against your enemy. There is stony silence from the Daughters' backer; today, you began a real inter-arcology war.`);
repX(1000, "war");
cashX(10000, "war");
V.rivalryPower = 1;
- if (V.rivalSet !== 0) {
- for (let V.i = 0; V.i < V.arcologies.length; V.i++) {
- if (V.arcologies[V.i].rival === 1) {
- V.arcologies[V.i].embargo = 2;
- V.arcologies[V.i].embargoTarget = 0;
- V.arcologies[V.i].influenceTarget = 0;
- V.rivalOwner = V.arcologies[V.i].prosperity;
- break;
- }
- }
+ if (rivalArc) {
+ rivalArc.embargo = 2;
+ rivalArc.embargoTarget = 0;
+ rivalArc.influenceTarget = 0;
+ V.rivalOwner = rivalArc.prosperity;
} else {
V.rivalOwner = V.arcologies[0].prosperity;
}
@@ -135,21 +124,15 @@ App.Events.PCoupAftermath = class REShippingContainer extends App.Events.BaseEve
function trace() {
const frag = new DocumentFragment();
let r = [];
- V.nextButton = "Continue";
- App.Utils.updateUserButton();/* unlock Continue button */
+ unlock();
r.push(`The money flows out, and the information flows in. You are rewarded with a reasonably complete picture of your rival's operations. The intelligence will be extremely useful going forward, since by gathering it, you sent an unmistakable signal that you do not consider the matter closed. There is stony silence from the Daughters' backer; today, you began a real inter-arcology war. But, with this information, you can maintain it from a position of advantage.`);
- cashX(-20000, "war");
+ cashX(-cashTrace, "war");
V.rivalryPower = 5;
- if (V.rivalSet !== 0) {
- for (let V.i = 0; V.i < V.arcologies.length; V.i++) {
- if (V.arcologies[V.i].rival === 1) {
- V.arcologies[V.i].embargo = 3;
- V.arcologies[V.i].embargoTarget = 0;
- V.arcologies[V.i].influenceTarget = 0;
- V.rivalOwner = V.arcologies[V.i].prosperity;
- break;
- }
- }
+ if (rivalArc) {
+ rivalArc.embargo = 3;
+ rivalArc.embargoTarget = 0;
+ rivalArc.influenceTarget = 0;
+ V.rivalOwner = rivalArc.prosperity;
} else {
V.rivalOwner = V.arcologies[0].prosperity;
}
@@ -157,15 +140,10 @@ App.Events.PCoupAftermath = class REShippingContainer extends App.Events.BaseEve
return frag;
}
- //<<link "Reveal the evidence publicly">>
-
- //<</replace>>
- //<</link>>
- //<br>
- //<<link "Devote funds to tracing the evidence">>
-
- //<</replace>>
- //<</link>>
- //</span>
+ /** unlock Continue button */
+ function unlock() {
+ V.nextButton = "Continue";
+ App.Utils.updateUserButton();
+ }
}
};
--
GitLab