From ada0054ef8c8a764ca5b7d63a5a025b20cba7a49 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 30 Dec 2018 14:55:38 -0500
Subject: [PATCH] re-sync
---
sanityCheck | 2 +-
src/init/storyInit.tw | 3 +++
src/pregmod/surrogacy.tw | 6 +++++-
src/uncategorized/BackwardsCompatibility.tw | 9 +++++++++
4 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/sanityCheck b/sanityCheck
index e5a1ab62043..387055bf566 100755
--- a/sanityCheck
+++ b/sanityCheck
@@ -51,7 +51,7 @@ $GREP "<<[^<>]*[<>]\?[^<>]*>>>" -- "src/*.tw" | myprint "TooManyAngleBrackets"
$GREP "<<<[^<>]*[<>]\?[^<>]*>>" -- "src/*.tw" | myprint "TooManyAngleBrackets"
# Check for wrong capitalization on 'activeslave' and other common typos
$GREP -e "\$act" --and --not -e "\$\(activeSlave\|activeChild\|activeArcology\|activeStandard\|activeOrgan\|activeLimbs\|activeUnits\|activeCanine\|activeHooved\|activeFeline\)" -- "src/*" | myprint "WrongCapitilization"
-$GREP "\(csae\|[a-z] She \|attepmts\|youreslf\|advnaces\|canAcheive\|setBellySize\|SetbellySize\|setbellySize\|bellypreg\|pregBelly\|bellyimplant\|bellyfluid\|pronounCaps\|carress\|hormonebalance\)" -- 'src/*' | myprint "SpellCheck"
+$GREP "\(csae\|[a-z] She \|attepmts\|youreslf\|advnaces\|canAcheive\|setBellySize\|SetbellySize\|setbellySize\|bellypreg\|pregBelly\|bellyimplant\|bellyfluid\|pronounCaps\|carress\|hormonebalance\|fetishknown\)" -- 'src/*' | myprint "SpellCheck"
$GREP "\(recieve\|recieves\)" -- 'src/*' | myprint "PregmodderCannotSpellReceive"
$GREP "\$slave\[" -- 'src/*' | myprint "ShouldBeSlaves"
# Check for strange spaces e.g. $slaves[$i]. lips
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index d28a43160fc..f3c689b7d30 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1035,6 +1035,9 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $meshImplants = 0>>
<<set $prostateImplants = 0>>
<<set $youngerOvaries = 0>>
+<<set $sympatheticOvaries = 0>>
+<<set $fertilityImplant = 0>>
+<<set $asexualReproduction = 0>>
<<set $animalOvaries = 0>> /*{pigOvaries: 0, canineOvaries: 0, horseOvaries: 0, cowOvaries: 0} currently unused*/
<<set $animalTesticles = 0>> /*{pigTestes: 0, dogTestes: 0, horseTestes: 0, cowTestes: 0} currently unused*/
<<set $animalMpreg = 0>> /*{pigMpreg: 0, dogMpreg: 0, horseMpreg: 0, cowMpreg: 0} currently unused*/
diff --git a/src/pregmod/surrogacy.tw b/src/pregmod/surrogacy.tw
index faa29826b61..19f79f6f502 100644
--- a/src/pregmod/surrogacy.tw
+++ b/src/pregmod/surrogacy.tw
@@ -189,6 +189,10 @@
<<set _surr = $slaves.findIndex(function(s) { return s.ID == $receptrix.ID; })>>
<<set $slaves[_surr] = $receptrix>>
<</if>>
- <<set $receptrix = 0, $impregnatrix = 0, $donatrix = 0>>
+ <<if $donatrix.ID != -1>>
+ <<set _surr = $slaves.findIndex(function(s) { return s.ID == $donatrix.ID; })>>
+ <<set $slaves[_surr] = $donatrix>>
+ <</if>>
+ <<set $receptrix = 0, $donatrix = 0>>
<</switch>>
\ No newline at end of file
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index ac5db99a776..20972b47705 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -2258,6 +2258,15 @@ Setting missing global variables:
<<if ndef $prostateImplants>>
<<set $prostateImplants = 0>>
<</if>>
+<<if ndef $sympatheticOvaries>>
+ <<set $sympatheticOvaries = 0>>
+<</if>>
+<<if ndef $fertilityImplant>>
+ <<set $fertilityImplant = 0>>
+<</if>>
+<<if ndef $asexualReproduction>>
+ <<set $asexualReproduction = 0>>
+<</if>>
<<if ndef $shelterSlaveGeneratedWeek || $shelterSlaveGeneratedWeek > $week>>
<<set $shelterSlaveGeneratedWeek = 0>>
<</if>>
--
GitLab