From 2fdae5404b8dd429274a696ffad66ba75e22cbb0 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 26 Jul 2018 19:26:54 -0400
Subject: [PATCH] fixes
---
devNotes/twine JS.txt | 2 +-
src/js/fresult.tw | 2 +-
src/uncategorized/slaveInteract.tw | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 12e0224c33d..c23d2e2ee0d 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -10445,7 +10445,7 @@ window.FResult = (function() {
if (slave.preg > 10) V.FResult += 2;
else V.FResult -= 2;
} else if (V.arcologies[0].FSRestart > 20) {
- if (slave.bellyPreg >= 500 && slave.breedingMark === 1 && V.propResult === 1)
+ if (slave.bellyPreg >= 500 && slave.breedingMark === 1 && V.propOutcome === 1)
V.FResult += 1;
else if (slave.preg > 10)
V.FResult -= 10;
diff --git a/src/js/fresult.tw b/src/js/fresult.tw
index 1622e867e4a..c0f73efc8e2 100644
--- a/src/js/fresult.tw
+++ b/src/js/fresult.tw
@@ -138,7 +138,7 @@ window.FResult = (function() {
if (slave.preg > 10) V.FResult += 2;
else V.FResult -= 2;
} else if (V.arcologies[0].FSRestart > 20) {
- if (slave.bellyPreg >= 500 && slave.breedingMark === 1 && V.propResult === 1)
+ if (slave.bellyPreg >= 500 && slave.breedingMark === 1 && V.propOutcome === 1)
V.FResult += 1;
else if (slave.preg > 10)
V.FResult -= 10;
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 4393ed254ff..2febacd2153 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1074,7 +1074,7 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1
<</if>>
<<elseif ($activeSlave.preg > 35)>>
| <<link "Give $him a cesarean section" "csec">><</link>>
- <<elseif ($activeSlave.preg > 0) && ($activeSlave.breedingMark != 1 || $propOutcome == 0) && $activeSlave.pregSource == -1>>
+ <<elseif ($activeSlave.preg > 0) && $activeSlave.breedingMark == 1 && $propOutcome == 1 && $activeSlave.pregSource == -1>>
//You are forbidden from aborting an elite child//
<<elseif ($activeSlave.preg > 0)>>
<<link "Abort $his pregnancy" "Abort">><</link>>
--
GitLab