From ea6ce202050047efb932950eed1d6c1a77b74fc3 Mon Sep 17 00:00:00 2001
From: Skriv <skrivelese@gmail.com>
Date: Tue, 27 Apr 2021 19:23:08 +0000
Subject: [PATCH] Merge branch 'pregmod-dev' into 'pregmod-master'
clean reDevotedTwins.js
See merge request pregmodfan/fc-pregmod!9069
---
src/events/nonRandom/rival/pRivalryActions.js | 26 +++++++++----------
src/events/nonRandom/rival/pRivalryHostage.js | 10 +++----
src/npc/interaction/fFeelings.js | 2 +-
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/events/nonRandom/rival/pRivalryActions.js b/src/events/nonRandom/rival/pRivalryActions.js
index 336e92c2b19..8b50884ff18 100644
--- a/src/events/nonRandom/rival/pRivalryActions.js
+++ b/src/events/nonRandom/rival/pRivalryActions.js
@@ -209,18 +209,18 @@ App.Events.pRivalryActions = function() {
V.hostage.sexualFlaw = "shamefast";
r.push(`being weighed and measured to document ${his} trim body.`);
break;
- case "Physical IdealismOLD":
- V.hostage.lactation = 2;
- V.hostage.lactationDuration = 2;
- V.hostage.trust -= 5;
- V.hostage.devotion -= 5;
- V.hostage.boobs += 1000;
- V.hostage.weight = 0;
- V.hostage.butt = 4;
- V.hostage.behavioralFlaw = "anorexic";
- V.hostage.sexualFlaw = "shamefast";
- r.push(`standing in front of a mirror sobbing as droplets of milk form on ${his} ${V.hostage.nipples} nipples, courtesy of ${his} newly implanted lactation drugs.`);
- break;
+ // case "Physical IdealismOLD": // FIXME: Remove duplicate case?
+ // V.hostage.lactation = 2;
+ // V.hostage.lactationDuration = 2;
+ // V.hostage.trust -= 5;
+ // V.hostage.devotion -= 5;
+ // V.hostage.boobs += 1000;
+ // V.hostage.weight = 0;
+ // V.hostage.butt = 4;
+ // V.hostage.behavioralFlaw = "anorexic";
+ // V.hostage.sexualFlaw = "shamefast";
+ // r.push(`standing in front of a mirror sobbing as droplets of milk form on ${his} ${V.hostage.nipples} nipples, courtesy of ${his} newly implanted lactation drugs.`);
+ // break;
case "Pastoralism":
V.hostage.trust -= 5;
V.hostage.devotion -= 5;
@@ -1470,7 +1470,7 @@ App.Events.pRivalryActions = function() {
V.hostage.addict += 2;
V.hostage.fetishStrength = 100;
V.hostage.tonguePiercing = 1;
- V.hostage.stampTat = "'Princess' is tattooed over ${his} rear.";
+ V.hostage.stampTat = "'Princess' is tattooed over $his rear.";
V.hostage.hLength += 7;
V.hostage.lips = Math.clamp(V.hostage.lips + 5, 0, 100);
r.push(`giggling and chatting with a group of fellow bimbos as they try to entice a quick fuck from passersby.`);
diff --git a/src/events/nonRandom/rival/pRivalryHostage.js b/src/events/nonRandom/rival/pRivalryHostage.js
index 88ef72bb91c..ce58110a19a 100644
--- a/src/events/nonRandom/rival/pRivalryHostage.js
+++ b/src/events/nonRandom/rival/pRivalryHostage.js
@@ -17,7 +17,7 @@ App.Events.pRivalryHostage = function() {
const {
He, His,
- he, him, himself, his, girl, woman, brother
+ he, him, himself, his, girl, woman, sister
} = getPronouns(V.hostage);
const {
HeR,
@@ -49,7 +49,7 @@ App.Events.pRivalryHostage = function() {
r.push(` ran in the same sex circles. You were never particularly close,`);
} else if (V.PC.career === "child prostitute") {
if (V.hostage.actualAge >= V.PC.actualAge + 6) {
- r.push(`${He} was a pretty little slut that kept a watchful eye on you to make sure you stayed safe, as if ${he} were your big ${brother}.`);
+ r.push(`${He} was a pretty little slut that kept a watchful eye on you to make sure you stayed safe, as if ${he} were your big ${sister}.`);
} else {
r.push(`${He} was a pretty little slut around your age that you spent most of your time with. You played together, bathed together, shared clients together, and even lost your virginities together.`);
}
@@ -75,7 +75,7 @@ App.Events.pRivalryHostage = function() {
r.push(`fellow servant under your late Master`);
if (V.hostage.actualAge >= V.PC.actualAge + 6) {
r.push(`that dedicated a lot of ${his} time to raising`);
- if (slave.counter.birthsTotal > 0 && V.seePreg) {
+ if (V.hostage.counter.birthsTotal > 0 && V.seePreg) {
r.push(`you, even when burdened with ${his} own growing pregnancy.`);
} else {
r.push(`you.`);
@@ -89,9 +89,9 @@ App.Events.pRivalryHostage = function() {
}
} else {
r.push(`about the same are as you. You spent a lot of time playing and doing chores`);
- if (V.seePreg && (slave.counter.birthsTotal > 0 || V.PC.counter.birthMaster >= 2)) {
+ if (V.seePreg && (V.hostage.counter.birthsTotal > 0 || V.PC.counter.birthMaster >= 2)) {
r.push(`together, and later,`);
- if (slave.counter.birthsTotal > 0) {
+ if (V.hostage.counter.birthsTotal > 0) {
if (V.PC.counter.birthMaster >= 8) {
r.push(`just resting against each other since ${he} never became so swollen with children to the point that ${he} could no longer move.`);
} else if (V.PC.counter.birthMaster >= 2) {
diff --git a/src/npc/interaction/fFeelings.js b/src/npc/interaction/fFeelings.js
index 28f4a0071a8..ec234dcc57f 100644
--- a/src/npc/interaction/fFeelings.js
+++ b/src/npc/interaction/fFeelings.js
@@ -1753,7 +1753,7 @@ App.Interact.feelings = function(slave) {
r.push(` ${He} looks down, blushing a little harder.`);
r.push(Spoken(slave, `"But I love ${his2} hot young body.`));
}
- if ((slave.actualAge - 5) > _partner.actualAge && 20 > _partner.actualAge) {
+ if ((slave.actualAge - 5) > _partner.actualAge && _partner.actualAge < 20) {
r.push(Spoken(slave, `${He2}'s a little immature at times, but having sex with a teenager is so awesome, it's worth it.`));
}
if (hasAnyProstheticLimbs(_partner)) {
--
GitLab