diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 4e98cca9bfc51bc94342fdfd43117c5de2c700bb..afe5ff9f20972ba28090d7c8ab562fb27cc4f09b 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,6 +4,12 @@
3/23/2018
+ 2
+ -fixed boomerang slaves null pointer excetions regarding rivalries and relationships
+
+ 1.1
+ -reverted change to traitor slave origin concatenation
+
1
-many spelling corrections
-fixes to decreasing custom nationality weighting
diff --git a/src/uncategorized/reBoomerang.tw b/src/uncategorized/reBoomerang.tw
index 4fba34e6719a2dab81a914c48a7b16c20234221f..859a01c4879bb868dab8620fd34292b889743873 100644
--- a/src/uncategorized/reBoomerang.tw
+++ b/src/uncategorized/reBoomerang.tw
@@ -389,6 +389,22 @@ It isn't obvious how she managed to escape, though no doubt you could review the
<</for>>
<</if>>
<</if>>
+ <<if $boomerangStats.boomerangRelationship > 0>>
+ <<set _reb = $slaves.findIndex(function(s) { return s.ID == $boomerangStats.boomerangRelationship; })>>
+ <<if _reb != -1>>
+ <<set $slaves[_reb].relationship = $activeSlave.relationship, $slaves[_reb].relationshipTarget = $activeSlave.ID>>
+ <<else>>
+ <<set $activeSlave.relationship = 0, $activeSlave.relationshipTarget = 0>>
+ <</if>>
+ <</if>>
+ <<if $boomerangStats.boomerangRivalry > 0>>
+ <<set _reb = $slaves.findIndex(function(s) { return s.ID == $boomerangStats.boomerangRivalry; })>>
+ <<if _reb != -1>>
+ <<set $slaves[_reb].rivalry = $activeSlave.rivalry, $slaves[_reb].rivalryTarget = $activeSlave.ID>>
+ <<else>>
+ <<set $activeSlave.rivalry = 0, $activeSlave.rivalryTarget = 0>>
+ <</if>>
+ <</if>>
<<set $boomerangStats = 0>>
<<replace "#result">>
The penthouse opens, and $activeSlave.slaveName stumbles inside, sobbing her thanks. She's immediately conducted to the autosurgery for some quick cosmetic surgery, while you and $assistantName do the necessary work to falsify the arcology records and conceal her origins. Even so, it would probably be wise to keep her off public assignments for a while. In no time at all, she's standing in front of your desk like any other new slave. She waits obediently, knowing that it's in her best interests not to mention anything out of the ordinary.
diff --git a/src/uncategorized/seRecruiterSuccess.tw b/src/uncategorized/seRecruiterSuccess.tw
index 419020ebf24c8367c2cb190fe2e6d7cbf2236c8b..089fec83f5aa19a020addc0aa671928f78003be3 100644
--- a/src/uncategorized/seRecruiterSuccess.tw
+++ b/src/uncategorized/seRecruiterSuccess.tw
@@ -141,7 +141,7 @@ Your recruiter $Recruiter.slaveName has succeeded; she's convinced an old world
<<set $activeSlave.health = random(-80,-20)>>
<<set $activeSlave.vagina = random(1,3)>>
<<set $activeSlave.preg = random(15,39)>>
-<<SetPregType $activeSlave>>
+<<set $activeSlave.pregType = setPregType($activeSlave)>>
<<set WombImpregnate($activeSlave, $activeSlave.pregType, 0, $activeSlave.preg)>>
<<set $activeSlave.pregKnown = 1>>
<<set $activeSlave.pregWeek = $activeSlave.preg>>
diff --git a/src/uncategorized/seWedding.tw b/src/uncategorized/seWedding.tw
index fe71022465b9b6e7ed6514d5bdc2cfb9a274004e..d845c26f30d21714bef3a5144cfe8ec97b28a2ef 100644
--- a/src/uncategorized/seWedding.tw
+++ b/src/uncategorized/seWedding.tw
@@ -42,7 +42,7 @@
<<if canGetPregnant($activeSlave) && (random(1,100) > 70) && $activeSlave.eggType == "human">>
A pre-wedding checkup following an unusual bout of morning nausea reveals the bitch managed to get knocked up. There is no time before the ceremony to deal with it.
<<set $activeSlave.preg = 1, $activeSlave.pregKnown = 1, $activeSlave.pregWeek = 1>>
- <<SetPregType $activeSlave>>
+ <<set $activeSlave.pregType = setPregType($activeSlave)>>
<<set WombImpregnate($activeSlave, $activeSlave.pregType, $activeSlave.pregSource, $activeSlave.preg)>>
<</if>>
<<elseif canDoVaginal($activeSlave)>>
@@ -57,7 +57,7 @@
<<if canGetPregnant($activeSlave) && (random(1,100) > 70) && $activeSlave.eggType == "human">>
A pre-wedding checkup following an unusual bout of morning nausea reveals the bitch managed to get knocked up. There is no time before the ceremony to deal with it.
<<set $activeSlave.preg = 1, $activeSlave.pregKnown = 1, $activeSlave.pregWeek = 1>>
- <<SetPregType $activeSlave>>
+ <<set $activeSlave.pregType = setPregType($activeSlave)>>
<<set WombImpregnate($activeSlave, $activeSlave.pregType, $activeSlave.pregSource, $activeSlave.preg)>>
<</if>>
<<elseif canDoAnal($activeSlave)>>
@@ -72,7 +72,7 @@
<<if canGetPregnant($activeSlave) && (random(1,100) > 70) && $activeSlave.eggType == "human">>
A pre-wedding checkup following an unusual bout of morning nausea reveals the bitch managed to get knocked up. There is no time before the ceremony to deal with it.
<<set $activeSlave.preg = 1, $activeSlave.pregKnown = 1, $activeSlave.pregWeek = 1>>
- <<SetPregType $activeSlave>>
+ <<set $activeSlave.pregType = setPregType($activeSlave)>>
<<set WombImpregnate($activeSlave, $activeSlave.pregType, $activeSlave.pregSource, $activeSlave.preg)>>
<</if>>
<<else>>
@@ -98,7 +98,7 @@
<<if canImpreg($activeSlave, $slaves[_m]) && (random(1,100) > 70)>>
A pre-wedding checkup following an unusual bout of morning nausea reveals the bitch managed to get knocked up. There is no time before the ceremony to deal with it.
<<set $activeSlave.preg = 1, $activeSlave.pregKnown = 1, $activeSlave.pregWeek = 1, $activeSlave.pregSource = $slaves[_m].ID, $slaves[_m].penetrativeCount += (_randomVag+_randomAnal), $penetrativeTotal += (_randomVag+_randomAnal)>>
- <<SetPregType $activeSlave>>
+ <<set $activeSlave.pregType = setPregType($activeSlave)>>
<<set WombImpregnate($activeSlave, $activeSlave.pregType, $activeSlave.pregSource, $activeSlave.preg)>>
<</if>>
<<elseif canDoVaginal($activeSlave)>>
@@ -112,7 +112,7 @@
<<if canImpreg($activeSlave, $slaves[_m]) && (random(1,100) > 70)>>
A pre-wedding checkup following an unusual bout of morning nausea reveals the bitch managed to get knocked up. There is no time before the ceremony to deal with it.
<<set $activeSlave.preg = 1, $activeSlave.pregKnown = 1, $activeSlave.pregWeek = 1, $activeSlave.pregSource = $slaves[_m].ID, $slaves[_m].penetrativeCount += (_randomVag), $penetrativeTotal += (_randomVag)>>
- <<SetPregType $activeSlave>>
+ <<set $activeSlave.pregType = setPregType($activeSlave)>>
<<set WombImpregnate($activeSlave, $activeSlave.pregType, $activeSlave.pregSource, $activeSlave.preg)>>
<</if>>
<<elseif canDoAnal($activeSlave)>>
@@ -126,7 +126,7 @@
<<if canImpreg($activeSlave, $slaves[_m]) && (random(1,100) > 70)>>
A pre-wedding checkup following an unusual bout of morning nausea reveals the bitch managed to get knocked up. There is no time before the ceremony to deal with it.
<<set $activeSlave.preg = 1, $activeSlave.pregKnown = 1, $activeSlave.pregWeek = 1, $activeSlave.pregSource = $slaves[_m].ID, $slaves[_m].penetrativeCount += (_randomAnal), $penetrativeTotal += (_randomAnal)>>
- <<SetPregType $activeSlave>>
+ <<set $activeSlave.pregType = setPregType($activeSlave)>>
<<set WombImpregnate($activeSlave, $activeSlave.pregType, $activeSlave.pregSource, $activeSlave.preg)>>
<</if>>
<<else>>
@@ -152,7 +152,7 @@
<<if canImpreg($activeSlave, $slaves[_m]) && (random(1,100) > 70)>>
A pre-wedding checkup following an unusual bout of morning nausea reveals the bitch managed to get knocked up. There is no time before the ceremony to deal with it.
<<set $activeSlave.preg = 1, $activeSlave.pregKnown = 1, $activeSlave.pregWeek = 1, $activeSlave.pregSource = $slaves[_m].ID, $slaves[_m].penetrativeCount += (_randomVag+_randomAnal), $penetrativeTotal += (_randomVag+_randomAnal)>>
- <<SetPregType $activeSlave>>
+ <<set $activeSlave.pregType = setPregType($activeSlave)>>
<<set WombImpregnate($activeSlave, $activeSlave.pregType, $activeSlave.pregSource, $activeSlave.preg)>>
<</if>>
<<elseif canDoVaginal($activeSlave)>>
@@ -166,7 +166,7 @@
<<if canImpreg($activeSlave, $slaves[_m]) && (random(1,100) > 70)>>
A pre-wedding checkup following an unusual bout of morning nausea reveals the bitch managed to get knocked up. There is no time before the ceremony to deal with it.
<<set $activeSlave.preg = 1, $activeSlave.pregKnown = 1, $activeSlave.pregWeek = 1, $activeSlave.pregSource = $slaves[_m].ID, $slaves[_m].penetrativeCount += (_randomVag), $penetrativeTotal += (_randomVag)>>
- <<SetPregType $activeSlave>>
+ <<set $activeSlave.pregType = setPregType($activeSlave)>>
<<set WombImpregnate($activeSlave, $activeSlave.pregType, $activeSlave.pregSource, $activeSlave.preg)>>
<</if>>
<<elseif canDoAnal($activeSlave)>>
@@ -180,7 +180,7 @@
<<if canImpreg($activeSlave, $slaves[_m]) && (random(1,100) > 70)>>
A pre-wedding checkup following an unusual bout of morning nausea reveals the bitch managed to get knocked up. There is no time before the ceremony to deal with it.
<<set $activeSlave.preg = 1, $activeSlave.pregKnown = 1, $activeSlave.pregWeek = 1, $activeSlave.pregSource = $slaves[_m].ID, $slaves[_m].penetrativeCount += (_randomAnal), $penetrativeTotal += (_randomAnal)>>
- <<SetPregType $activeSlave>>
+ <<set $activeSlave.pregType = setPregType($activeSlave)>>
<<set WombImpregnate($activeSlave, $activeSlave.pregType, $activeSlave.pregSource, $activeSlave.preg)>>
<</if>>
<<else>>
@@ -216,7 +216,7 @@
<<if canImpreg($activeSlave, $slaves[_m]) && (random(1,100) > 90)>>
A pre-wedding checkup following an unusual bout of morning nausea reveals $activeSlave.slaveName managed to get knocked up. There is no time before the ceremony to deal with it and the distraught girl is in a panic for making you go through this.
<<set $activeSlave.preg = 1, $activeSlave.pregKnown = 1, $activeSlave.pregWeek = 1, $activeSlave.pregSource = $slaves[_m].ID, $slaves[_m].penetrativeCount++, $penetrativeTotal++>>
- <<SetPregType $activeSlave>>
+ <<set $activeSlave.pregType = setPregType($activeSlave)>>
<<set WombImpregnate($activeSlave, $activeSlave.pregType, $activeSlave.pregSource, $activeSlave.preg)>>
<</if>>
<<elseif canDoAnal($activeSlave)>>
@@ -225,7 +225,7 @@
<<if canImpreg($activeSlave, $slaves[_m]) && (random(1,100) > 90)>>
A pre-wedding checkup following an unusual bout of morning nausea reveals $activeSlave.slaveName managed to get knocked up. There is no time before the ceremony to deal with it and the distraught girl is in a panic for making you go through this.
<<set $activeSlave.preg = 1, $activeSlave.pregKnown = 1, $activeSlave.pregWeek = 1, $activeSlave.pregSource = $slaves[_m].ID, $slaves[_m].penetrativeCount++, $penetrativeTotal++>>
- <<SetPregType $activeSlave>>
+ <<set $activeSlave.pregType = setPregType($activeSlave)>>
<<set WombImpregnate($activeSlave, $activeSlave.pregType, $activeSlave.pregSource, $activeSlave.preg)>>
<</if>>
<<else>>
@@ -240,7 +240,7 @@
<<if canImpreg($activeSlave, $slaves[_m]) && (random(1,100) > 90)>>
A pre-wedding checkup following an unusual bout of morning nausea reveals $activeSlave.slaveName managed to get knocked up. There is no time before the ceremony to deal with it and the distraught girl is in a panic for making you go through this.
<<set $activeSlave.preg = 1, $activeSlave.pregKnown = 1, $activeSlave.pregWeek = 1, $activeSlave.pregSource = $slaves[_m].ID, $slaves[_m].penetrativeCount++, $penetrativeTotal++>>
- <<SetPregType $activeSlave>>
+ <<set $activeSlave.pregType = setPregType($activeSlave)>>
<<set WombImpregnate($activeSlave, $activeSlave.pregType, $activeSlave.pregSource, $activeSlave.preg)>>
<</if>>
<<elseif canDoAnal($activeSlave)>>
@@ -249,7 +249,7 @@
<<if canImpreg($activeSlave, $slaves[_m]) && (random(1,100) > 90)>>
A pre-wedding checkup following an unusual bout of morning nausea reveals $activeSlave.slaveName managed to get knocked up. There is no time before the ceremony to deal with it and the distraught girl is in a panic for making you go through this.
<<set $activeSlave.preg = 1, $activeSlave.pregKnown = 1, $activeSlave.pregWeek = 1, $activeSlave.pregSource = $slaves[_m].ID, $slaves[_m].penetrativeCount++, $penetrativeTotal++>>
- <<SetPregType $activeSlave>>
+ <<set $activeSlave.pregType = setPregType($activeSlave)>>
<<set WombImpregnate($activeSlave, $activeSlave.pregType, $activeSlave.pregSource, $activeSlave.preg)>>
<</if>>
<<else>>
@@ -389,7 +389,7 @@
$activeSlave.slaveName isn’t particularly excited about what’s coming, but she’s fully prepared for it and accepted it as a fact of life. There are worse things one can be than the slave-wife of a wealthy arcology owner. You <<if $activeSlave.amp == 1>>gather her up and hold her in front of you, pulling her panties off as you do. Showing considerable dexterity, you maneuver your dick inside her while holding her against your <<if $PC.boobs == 1>>breasts<<else>>chest<</if>><<else>>take her hand and pull her to her feet while she shimmies out of her panties. She cocks her hips for you and you slide your cock inside her before taking her knees and drawing them up to hold her in midair, impaled on you<</if>>. Though her face is towards the crowd, her mind is concentrated on your hard cock, pumping in and out of her at an angle; to her, it is what it is. She gasps when your seed flows into her, orgasming shortly after to @@.green;applause from your guests.@@ You'll fuck her repeatedly over the next few days, ensuring impregnation.
<</if>>
<<set $activeSlave.preg = 1, $activeSlave.pregKnown = 1, $activeSlave.pregWeek = 1>>
- <<SetPregType $activeSlave>>
+ <<set $activeSlave.pregType = setPregType($activeSlave)>>
<<set WombImpregnate($activeSlave, $activeSlave.pregType, -1, $activeSlave.preg)>>
<<set $activeSlave.pregSource = -1>>
<<if ($activeSlave.vagina == 0) || ($activeSlave.mpreg == 1 && $activeSlave.anus == 0)>>
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index 9896a7f9a08aeaaa7f6267514a3e6e3dd94f3c06..2680800c1c67592eeb8e19aafe3ebfdcdb0006a8 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: []}>>
+ <<set $boomerangStats = {PCpregSource: 0, PCmother: 0, PCfather: 0, boomerangMother: [], boomerangFather: [], boomerangPregSources: [], boomerangMotherTank: [], boomerangFatherTank: [], boomerangRelationship: 0, boomerangRivalry: 0}>>
<<if $familyTesting == 1>>
<<if $activeSlave.ID == $PC.pregSource>>
<<set $boomerangStats.PCpregSource = $activeSlave.ID>>
@@ -57,6 +57,12 @@
<</if>>
<</for>>
<</if>>
+ <<if $activeSlave.relationship > 0>>
+ <<set $boomerangStats.boomerangRelationship = $activeSlave.relationshipTarget>>
+ <</if>>
+ <<if $activeSlave.rivalry > 0>>
+ <<set $boomerangStats.boomerangRivalry = $activeSlave.rivalryTarget>>
+ <</if>>
<</if>>
<</if>>
<</if>>