From 45cef2a6703d78a6cc7788fde5a088e85726459f Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 23 Mar 2018 16:27:34 -0400
Subject: [PATCH] more fixes
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 4 ++++
src/uncategorized/RETS.tw | 2 +-
src/uncategorized/reBoomerang.tw | 15 +++++++++++++++
src/uncategorized/remoteSurgery.tw | 2 +-
src/uncategorized/slaveSold.tw | 5 ++++-
5 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index afe5ff9f209..8ca1f58d438 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,6 +4,10 @@
3/23/2018
+ 2.1
+ -minor fixes
+ -fixed boomerang slave relation null pointer exception
+
2
-fixed boomerang slaves null pointer excetions regarding rivalries and relationships
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 1a313bf2ae4..d9bd0b0e650 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -1087,7 +1087,7 @@ she adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of
<br><<link "Look, a bare butt">>
<<replace "#name">>$activeSlave.slaveName<</replace>>
<<replace "#result">>
- You move in, looking intently at $subSlave.slaveName's bare, vulnerable butt. $activeSlave.slaveName <<if canSee($activeSlave)>>catches sight of<<else>> your approach, and then follows the line of your gaze<<else>>notices your approach, the realization of what your intent likely quickly dawns on her<</if>>. You see the corners of her mouth quirk upward with horny maliciousness. She leans back against the edge of the kitchen counter, pulling $subSlave.slaveName with her, and then reaches down and
+ You move in, looking intently at $subSlave.slaveName's bare, vulnerable butt. $activeSlave.slaveName <<if canSee($activeSlave)>>catches sight of your approach, and then follows the line of your gaze<<else>>notices your approach<</if>>, the realization of what your intent likely quickly dawns on her. You see the corners of her mouth quirk upward with horny maliciousness. She leans back against the edge of the kitchen counter, pulling $subSlave.slaveName with her, and then reaches down and
<<if ($subSlave.butt > 6)>>
grabs handfuls of $subSlave.slaveName's massive ass,
<<elseif ($subSlave.butt > 3)>>
diff --git a/src/uncategorized/reBoomerang.tw b/src/uncategorized/reBoomerang.tw
index 859a01c4879..ce9114cfc9e 100644
--- a/src/uncategorized/reBoomerang.tw
+++ b/src/uncategorized/reBoomerang.tw
@@ -381,6 +381,21 @@ It isn't obvious how she managed to escape, though no doubt you could review the
<</for>>
<</if>>
<<else>>
+ <<if $boomerangStats.boomerangRelation > 0>>
+ <<set _reb = $slaves.findIndex(function(s) { return s.ID == $boomerangStats.boomerangRelation; })>>
+ <<if _reb != -1>>
+ <<if $activeSlave.relation == "mother">>
+ <<set $slaves[_reb].relation = "daughter">>
+ <<elseif $activeSlave.relation == "daughter">>
+ <<set $slaves[_reb].relation = "mother">>
+ <<else>>
+ <<set $slaves[_reb].relation = $activeSlave.relation>>
+ <</if>>
+ <<set $slaves[_reb].relationshipTarget = $activeSlave.ID>>
+ <<else>>
+ <<set $activeSlave.relation = 0, $activeSlave.relationTarget = 0>>
+ <</if>>
+ <</if>>
<<if $boomerangStats.boomerangPregSources.length > 0>>
<<for _reb = 0; _reb < $slaves.length; _reb++>>
<<if $boomerangStats.boomerangPregSources.includes($slaves[_reb].ID) && $slaves[_reb].preg > 0 && $slaves[_reb].pregSource == 0>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 51f638e0af1..6a20cb58d96 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -766,7 +766,7 @@ Work on her sex:
<<if $activeSlave.womb.length == 0 >>
[[Remove a pregnancy generator|Surgery Degradation][$activeSlave.preg = 0,$activeSlave.pregWeek = -2,$activeSlave.pregSource = 0,$activeSlave.pregWeek = 0,$activeSlave.pregKnown = 0,$activeSlave.pregType = 0,$activeSlave.broodmother = 0,$activeSlave.broodmotherFetuses = 0,$activeSlave.broodmotherOnHold = 0,$cash -= $surgeryCost,$activeSlave.pregControl = "none",$activeSlave.health -= 10,$surgeryType = "pregRemove"]]
<<else>>
- $possessiveCap is pregnant right now, so her broodmother implant can't be safely extracted.
+ $pronounCap is pregnant right now, so $possessive broodmother implant can't be safely extracted.
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index 2680800c1c6..ad84364685e 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -13,7 +13,7 @@
<<if $activeSlave.devotion > 50>>
<<if $activeSlave.trust > 95 || $activeSlave.trust < -20 || $activeSlave.intelligence < 0>>
<<set $boomerangSlave = $activeSlave, $boomerangWeeks = 1, $boomerangBuyer = $buyer>>
- <<set $boomerangStats = {PCpregSource: 0, PCmother: 0, PCfather: 0, boomerangMother: [], boomerangFather: [], boomerangPregSources: [], boomerangMotherTank: [], boomerangFatherTank: [], boomerangRelationship: 0, boomerangRivalry: 0}>>
+ <<set $boomerangStats = {PCpregSource: 0, PCmother: 0, PCfather: 0, boomerangMother: [], boomerangFather: [], boomerangPregSources: [], boomerangMotherTank: [], boomerangFatherTank: [], boomerangRelationship: 0, boomerangRivalry: 0, boomerangRelation: 0}>>
<<if $familyTesting == 1>>
<<if $activeSlave.ID == $PC.pregSource>>
<<set $boomerangStats.PCpregSource = $activeSlave.ID>>
@@ -49,6 +49,9 @@
<</if>>
<<set $activeSlave.sisters = 0, $activeSlave.daughters = 0>>
<<else>>
+ <<if $activeSlave.relation != 0>>
+ <<set $boomerangStats.boomerangRelation = $activeSlave.relationTarget>>
+ <</if>>
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if $slaves[_ss].ID != $activeSlave.ID>>
<<if $activeSlave.ID == $slaves[_ss].pregSource>>
--
GitLab