From 9a38272040b4c8c4b40086beb0ce441708ee02dc Mon Sep 17 00:00:00 2001
From: DCoded <dicoded@email.com>
Date: Sun, 2 May 2021 12:36:53 -0400
Subject: [PATCH] Partners fixes
---
src/npc/descriptions/womb/pregnancy.js | 42 +++++++++----------
src/npc/interaction/fSlaveImpregConsummate.tw | 2 +-
.../passage/fSlaveSlaveDickConsummate.tw | 2 +
3 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/src/npc/descriptions/womb/pregnancy.js b/src/npc/descriptions/womb/pregnancy.js
index 27357c000bb..ccfc3aa695a 100644
--- a/src/npc/descriptions/womb/pregnancy.js
+++ b/src/npc/descriptions/womb/pregnancy.js
@@ -569,29 +569,29 @@ App.Desc.pregnancy = function(slave, {market, eventDescription} = {}) {
r.push(`${daddy}'s growing child.`);
}
}
- // } else if (slave.partners.size === 1) {
- // let daddy = slave.partners.values().next().value;
+ } else if (slave.partners.size === 1) {
+ let daddy = slave.partners.values().next().value;
- // if (daddy > 0) {
- // if (daddy === slave.ID) {
- // daddy = himself;
- // } else {
- // daddy = getSlave(daddy).slaveName;
- // }
- // } else {
- // let desc = {
- // 1: `you`,
- // 2: `one of the citizens of ${V.arcologies[0].name}`,
- // 3: `your former Master`,
- // 4: `the owner of another arcology`,
- // 6: `a member of the Societal Elite`,
- // 8: `one of your pets`,
- // 9: `a Futanari Sister`,
- // };
- // daddy = desc[Math.abs(daddy)];
- // }
+ if (daddy > 0) {
+ if (daddy === slave.ID) {
+ daddy = himself;
+ } else {
+ daddy = SlaveFullName(getSlave(daddy));
+ }
+ } else {
+ let desc = {
+ 1: `you`,
+ 2: `one of the citizens of ${V.arcologies[0].name}`,
+ 3: `your former Master`,
+ 4: `the owner of another arcology`,
+ 6: `a member of the Societal Elite`,
+ 8: `one of your pets`,
+ 9: `a Futanari Sister`,
+ };
+ daddy = desc[Math.abs(daddy)];
+ }
- // r.push(`${His} ${slave.pregType > 1 ? `children were` : `child was`} fathered by ${daddy}.`);
+ r.push(`${His} ${slave.pregType > 1 ? `children were` : `child was`} fathered by ${daddy}.`);
} else {
r.push(`It is too early to tell who exactly fathered the child growing in ${his} womb.`);
}
diff --git a/src/npc/interaction/fSlaveImpregConsummate.tw b/src/npc/interaction/fSlaveImpregConsummate.tw
index d6e53583944..4297525bfa1 100644
--- a/src/npc/interaction/fSlaveImpregConsummate.tw
+++ b/src/npc/interaction/fSlaveImpregConsummate.tw
@@ -2,7 +2,7 @@
The first necessary step is to prepare the donatrix.
<<run App.Utils.setLocalPronouns(getSlave($AS))>>
-<<run addPartner(getSlave($AS), -1)>>
+<<run addPartner(getSlave($AS), $impregnatrix)>>
<<set _belly = bellyAdjective(getSlave($AS))>>
<<set _superfetation = (getSlave($AS).geneticQuirks.superfetation == 2 && getSlave($AS).pregKnown == 1) ? 1 : 0>>
<<set _penCountBonus = random(6,20), _analCountBonus = _penCountBonus, _vagCountBonus = _penCountBonus>>
diff --git a/src/npc/interaction/passage/fSlaveSlaveDickConsummate.tw b/src/npc/interaction/passage/fSlaveSlaveDickConsummate.tw
index 4b3669575a5..1ec2fcb5258 100644
--- a/src/npc/interaction/passage/fSlaveSlaveDickConsummate.tw
+++ b/src/npc/interaction/passage/fSlaveSlaveDickConsummate.tw
@@ -29,6 +29,8 @@
<<set _isIncest = 1>>
<</if>>
+<<= addPartner(getSlave($AS), $slaverapistx)>>
+
You take a look at the bound cock toy.
--
GitLab