From 874b028c6ef7b8aaf0779a000fa64b162dec342f Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Wed, 21 Apr 2021 01:53:28 -0400
Subject: [PATCH] testing
---
src/events/scheduled/seWeddingDouble.js | 27 +++++++++----------------
1 file changed, 10 insertions(+), 17 deletions(-)
diff --git a/src/events/scheduled/seWeddingDouble.js b/src/events/scheduled/seWeddingDouble.js
index 63bb16fc5cc..8b01809cb23 100644
--- a/src/events/scheduled/seWeddingDouble.js
+++ b/src/events/scheduled/seWeddingDouble.js
@@ -20,13 +20,13 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
const {
He2,
he2, his2, him2, himself2, wife2
- } = getPronouns(slave1).appendSuffix("2");
+ } = getPronouns(slave2).appendSuffix("2");
const wives = (wife === wife2) ? getPronouns(slave1).wives : `spouses`; // are they using the same pronouns? Otherwise, fall back to "spouses" for plural.
const relSlave1 = getSlave(slave1.relationshipTarget);
- const {his3, him3} = getPronouns(relSlave1).appendSuffix("3");
+ const {his3, him3} = getPronouns(relSlave1 ? relSlave1 : {pronoun: App.Data.Pronouns.Kind.plural}).appendSuffix("3");
const relSlave2 = getSlave(slave2.relationshipTarget);
- const {his4, him4} = getPronouns(relSlave1).appendSuffix("4");
+ const {his4, him4} = getPronouns(relSlave2 ? relSlave2 : {pronoun: App.Data.Pronouns.Kind.plural}).appendSuffix("4");
const belly = bellyAdjective(slave1);
const belly2 = bellyAdjective(slave2);
const ML = V.marrying.length;
@@ -75,8 +75,8 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
r.push(`In the days leading up to your wedding, ${slave1.slaveName} spent ${his} time`);
r.push(App.Events.weddingIntro(slave1));
if (ML > 1) {
- for (const id of V.marrying) {
- const slave = getSlave(id);
+ for (let i = 1; i < 0; i++) { // Skip first slave
+ const slave = getSlave(V.marrying[i]);
const {his} = getPronouns(slave);
r.push(`${slave.slaveName}, meanwhile, spent ${his} time`);
r.push(App.Events.weddingIntro(slave));
@@ -108,9 +108,9 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
App.Events.addParagraph(node, r);
r = [];
} else if (V.weddingPlanned === 2) { // Orgiastic ceremony
- r.push(`The ceremony to bind ${SlaveFullName(slave1)} and ${SlaveFullName(slave2)} to you as your slave ${wives}is an all day affair.`);
+ r.push(`is an all day affair.`);
} else if (V.weddingPlanned === 1) { // Straightforward ceremony
- r.push(`The ceremony to bind ${SlaveFullName(slave1)} and ${SlaveFullName(slave2)} to you as your slave ${wives} is a polite affair which you host in the lower floor of your penthouse. All the arcology's most prominent citizens are there, most with a favored slave or two and some even with their slave wives. Many of your other slaves, that is your slaves who are not being married tonight, are present to serve your guests, but are dressed more conservatively than usual. When assignations between citizen and slave develop, guests are politely encouraged to perform them in side rooms rather than out in view of the main gathering.`);
+ r.push(`is a polite affair which you host in the lower floor of your penthouse. All the arcology's most prominent citizens are there, most with a favored slave or two and some even with their slave wives. Many of your other slaves, that is your slaves who are not being married tonight, are present to serve your guests, but are dressed more conservatively than usual. When assignations between citizen and slave develop, guests are politely encouraged to perform them in side rooms rather than out in view of the main gathering.`);
App.Events.addParagraph(node, r);
r = [];
}
@@ -2354,18 +2354,11 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent {
_h += 1;
}
}
- r.push(`The new Mrs. ${V.PC.slaveSurname}`);
-
- if (_c > 1) {
- r.push(`s`);
- }
+ r.push(`The new Mrs. ${V.PC.slaveSurname}${(_c > 1) ? `s` : ``}`);
if (_h > 0) {
- r.push(`hear`);
+ r.push((_c === 1) ? `hear` : `hears`);
} else {
- r.push(`understand`);
- }
- if (_c === 1) {
- r.push(`s`);
+ r.push((_c === 1) ? `understand` : `understands`);
}
r.push(`this, of course, and`);
if (
--
GitLab