From f620110313110327f155c6bc2bf391356ffe43cc Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 3 May 2018 17:55:51 -0400
Subject: [PATCH] fixes
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 12 ++++++++++++
devNotes/twine JS | 2 +-
src/pregmod/widgets/seBirthWidgets.tw | 3 +++
src/uncategorized/seLethalPit.tw | 4 +++-
src/uncategorized/seNonlethalPit.tw | 8 ++++++--
src/uncategorized/slaveAssignmentsReport.tw | 2 +-
6 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index a8e16ac348f..45d357aea4c 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,18 @@
0.10.7.1-0.1.x
+5/03/2018
+
+ 82
+ -fix for broken FS progress
+ -better handling for getSlave() returning undefined
+ -fix for some obscure BS that led to slave duplication
+
+ 81
+ -fixed player cheat edit pregnancy weirdness
+ -fixed various little issues
+ -work towards fuckable nipples
+
5/02/2018
80
diff --git a/devNotes/twine JS b/devNotes/twine JS
index e0dbf4a8df0..a39bcc66fed 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -6907,7 +6907,7 @@ window.slaves2indices = function slaves2indices() {
window.getSlave = function getSlave(ID) {
const index = State.variables.slaveIndices[ID];
- if (index === undefined) return null;
+ if (index === undefined) return undefined;
else return State.variables.slaves[index];
};
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index 9462cb58e27..937bfc86946 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -755,12 +755,15 @@ All in all,
<<if _origReserve > 0 && _curBabies > 0>> /*Do we need incubator checks?*/
<<if _curBabies >= _origReserve>>
/*adding normal*/
+ <<set $reservedChildren -= _origReserve>>
<<set _cToIncub = _origReserve, $slaves[$i].reservedChildren = 0>>
<<elseif _curBabies < _origReserve && $slaves[$i].womb.length > 0>>
/*broodmother or partial birth, we will wait for next time to get remaining children*/
<<set $slaves[$i].reservedChildren -= _curBabies, _cToIncub = _curBabies>>
+ <<set $reservedChildren -= _curBabies>>
<<else>>
/*Stillbirth or something other go wrong. Correcting children count.*/
+ <<set $reservedChildren -= _origReserve>>
<<set $slaves[$i].reservedChildren = 0, _cToIncub = _curBabies>>
<</if>>
<<set $mom = $slaves[$i]>>
diff --git a/src/uncategorized/seLethalPit.tw b/src/uncategorized/seLethalPit.tw
index 9c5d79dfa7e..d3a73a8fd29 100644
--- a/src/uncategorized/seLethalPit.tw
+++ b/src/uncategorized/seLethalPit.tw
@@ -631,7 +631,9 @@ You let the winner _winner.slaveName, shaking as she comes off the adrenaline, d
<</if>>
<<set $slaves[$slaveIndices[_winner.ID]] = _winner>>
-<<set $fighterIDs.push(_winner.ID)>>
+<<if $pitBG == 0 || ($Bodyguard.ID != _winner.ID)>>
+ <<set $fighterIDs.push(_winner.ID)>>
+<</if>>
<<set $activeSlave = getSlave(_loser.ID)>>
<<include "Remove activeSlave">>
diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw
index 8afc5cd55ff..a66e127a828 100644
--- a/src/uncategorized/seNonlethalPit.tw
+++ b/src/uncategorized/seNonlethalPit.tw
@@ -953,5 +953,9 @@ You throw the victor's strap-on down to _winner.slaveName.
<<set $slaves[$slaveIndices[_winner.ID]] = _winner>>
<<set $slaves[$slaveIndices[_loser.ID]] = _loser>>
-<<set $fighterIDs.push(_winner.ID)>>
-<<set $fighterIDs.push(_loser.ID)>>
+<<if $pitBG == 0 || ($Bodyguard.ID != _winner.ID)>>
+ <<set $fighterIDs.push(_winner.ID)>>
+<</if>>
+<<if $pitBG == 0 || ($Bodyguard.ID != _loser.ID)>>
+ <<set $fighterIDs.push(_loser.ID)>>
+<</if>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index e9ecf31c334..01e81a4000d 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -276,7 +276,7 @@
<</if>>
<<if $fighterIDs.includes($slaves[$i])>>
- <<if canWalk($slaves[$i]) != true>>
+ <<if canWalk($slaves[$i])>>
''__@@.pink;$slaves[$i].slaveName@@__'' is no longer independently mobile @@.yellow;and cannot fight any more.@@ She has been removed from $pitName roster<br>.
<<set $fighterIDs.delete($slaves[$i].ID)>>
<</if>>
--
GitLab