diff --git a/src/events/scheduled/seWedding.js b/src/events/scheduled/seWedding.js index ba2a0a2cc854bdb0a5a97c818e22fddfd8cece94..7992d3ec2f9c12f8fb25845fc729717a52cb31d8 100644 --- a/src/events/scheduled/seWedding.js +++ b/src/events/scheduled/seWedding.js @@ -22,8 +22,11 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent { const { HeC, - heC, hisC, himC, wivesC + heC, hisC, himC } = getPronouns(solo ? slave1 : {pronoun: App.Data.Pronouns.Kind.plural}).appendSuffix("C"); // "C" is for collective. Used for flexibility in scenes that may have just one slave, or more than one. "she/they bow before you." + const wivesC = solo ? + getPronouns(slave1).wife : + getPronouns({pronoun: App.Data.Pronouns.Kind.plural}).wives; const belly = bellyAdjective(slave1); const ML = V.marrying.length; @@ -770,7 +773,7 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent { r.push(`You'll fuck them repeatedly over the next few days, ensuring`); if (brides.every(b => b.devotion < -20)) { r.push(`impregnation, despite their protests.`); - } else if (brides.some(b => b)) { + } else if (brides.some(b => b.devotion < -20)) { const lowDevNames = brides .filter(slave => slave.devotion < -20) .map(slave => slave.slaveName); @@ -1628,7 +1631,7 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent { const r = []; let _c = 0; let _h = 0; - r.push(`You also proclaim your new slave ${wives} ${namesString} ${V.PC.slaveSurname}.`); + r.push(`You also proclaim your new slave ${wivesC} ${namesString} ${V.PC.slaveSurname}.`); for (const slave of brides) { _c += 1; if (canHear(slave)) { @@ -1637,9 +1640,9 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent { } r.push(`The new Mrs. ${V.PC.slaveSurname}${(_c > 1) ? `s` : ``}`); if (_h > 0) { - r.push((_c === 1) ? `hear` : `hears`); + r.push((_c === 1) ? `hears` : `hear`); } else { - r.push((_c === 1) ? `understand` : `understands`); + r.push((_c === 1) ? `understands` : `understand`); } r.push(`this, of course, and`); const nameCheck = !solo && brides.every(b => b.slaveSurname !== V.PC.slaveSurname); @@ -1657,7 +1660,7 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent { let meanwhile; for (const slave of brides) { const {he, his, him} = getPronouns(slave); - if (_c > 1 && slave.slaveSurname !== V.PC.slaveSurname) { + if (slave.slaveSurname !== V.PC.slaveSurname) { if (!meanwhile) { r.push(slave.slaveName); } else { @@ -1665,41 +1668,26 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent { } meanwhile = true; if (slave.fetish === "mindbroken") { - if (_c < 1) { - r.push(slave.slaveName); - } - r.push(`shows no reaction. Like many things, names mean nothing to ${him} now. Your guests, on the other hand, appreciate the gift.`); + r.push(`${slave.slaveName} shows no reaction. Like many things, names mean nothing to ${him} now. Your guests, on the other hand, appreciate the gift.`); } else if (slave.devotion + slave.trust >= 175) { - if (_c < 1) { - r.push(slave.slaveName); - } if (V.weddingPlanned === 3) { r.push(`breaks down again. Not only is ${he} to be blessed with your child, but ${he}'s to take your surname as well.`); } else { r.push(`breaks down again; it's like a dream come true.`); } } else if (slave.devotion < -20 && slave.trust > 20) { - if (_c < 1) { - r.push(slave.slaveName); - } if (V.weddingPlanned === 3) { r.push(`scoffs audibly. Just another burden for ${him} to carry; like the child soon to be growing in ${his} womb.`); } else { r.push(`scoffs audibly; just another burden for ${him} to carry.`); } } else if (slave.devotion < -20) { - if (_c < 1) { - r.push(slave.slaveName); - } if (V.weddingPlanned === 3) { r.push(`breaks down again. Not only are you binding ${him} to you with your child, but with your name as well.`); } else { r.push(`breaks down again; this is nothing more than another unwanted link to you.`); } } else { - if (_c < 1) { - r.push(slave.slaveName); - } r.push(`nods acceptingly. Your will is ${his} will, after all.`); } } @@ -1755,7 +1743,7 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent { function ringCeremony() { const r = []; - if (brides.every(b => hasAnyArms(b))) { + if (!solo && brides.every(b => hasAnyArms(b))) { r.push(`on each slave's`); if (brides.every((b) => b.devotion < -20 && b.trust <= 20)) { r.push(`trembling`); @@ -1766,9 +1754,9 @@ App.Events.SEWedding = class SEWedding extends App.Events.BaseEvent { for (const slave of brides) { const {he} = getPronouns(slave); if (!hasAnyArms(slave)) { - r.push(`on a cord around ${slave.slaveName}'s neck, since ${he} lacks fingers to wear it on`); + ring.push(`on a cord around ${slave.slaveName}'s neck, since ${he} lacks fingers to wear it on`); } else { - r.push(`on ${slave.slaveName}'s ${(slave.devotion < -20 && slave.trust <= 20) ? `trembling ` : ``}finger`); + ring.push(`on ${slave.slaveName}'s ${(slave.devotion < -20 && slave.trust <= 20) ? `trembling ` : ``}middle finger`); } } r.push(`${toSentence(ring, " and another ring ")}.`);