From 9ac68d809f801cf071bac7b2b3abbfadec7392ca Mon Sep 17 00:00:00 2001
From: darkfire006 <blazer257@live.com>
Date: Sun, 8 May 2022 02:02:26 -0500
Subject: [PATCH] add optional param for <daycare.canbreed>

bool for if it should calc multipliers or not
---
 P3D/Content/Data/Scripts/floe/daycare/man.dat | Bin 3842 -> 3846 bytes
 P3D/Content/Data/Scripts/phone/012.dat        | Bin 3258 -> 3262 bytes
 P3D/Content/Data/Scripts/phone/034.dat        | Bin 3246 -> 3250 bytes
 P3D/Content/Data/Scripts/phone/035.dat        |   2 +-
 .../Data/Scripts/route34/daycare/oldLady.dat  | Bin 2898 -> 2906 bytes
 .../V2/ScriptConstructs/DoDaycare.vb          |   6 +++++-
 6 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/P3D/Content/Data/Scripts/floe/daycare/man.dat b/P3D/Content/Data/Scripts/floe/daycare/man.dat
index 976a69be30f4bc7bfcef989a7cf3f98f11a01bd7..ecab3911ca8ce9d8e5c31780ea09d92ba145b9dd 100644
GIT binary patch
delta 16
XcmZpYYm?isfP-0w!C>=zj$}3fE4Bo`

delta 20
bcmZpZYm(crfP-0+!EQ1mtLWxE9A0byJ}d=%

diff --git a/P3D/Content/Data/Scripts/phone/012.dat b/P3D/Content/Data/Scripts/phone/012.dat
index 47bd402c2cfd18582b5154c51334b3a844ca8249..9a3af8d89c6367f313fc3ae929dd2922c5cd3de6 100644
GIT binary patch
delta 24
gcmdlbxleM#308I;1_K672D`}@*(EnWVZFu%0AiB|?f?J)

delta 20
ccmdldxl3}x307uJ2D{0PY?7N_uwG*W08P{fK>z>%

diff --git a/P3D/Content/Data/Scripts/phone/034.dat b/P3D/Content/Data/Scripts/phone/034.dat
index f07ba14cf6c24edee031610db40d4ee170ba9f7f..45b4351f9b702caf93b85c7932c0fdd7ac33cb65 100644
GIT binary patch
delta 24
gcmZ1{xk+-v9#(c81_K672D{0HY?7OAuwG*W09;T9T>t<8

delta 16
YcmdlaxlVG!9@fca%zT^Au|8n~06ESEjsO4v

diff --git a/P3D/Content/Data/Scripts/phone/035.dat b/P3D/Content/Data/Scripts/phone/035.dat
index d86997b0a..b33b68bdd 100644
--- a/P3D/Content/Data/Scripts/phone/035.dat
+++ b/P3D/Content/Data/Scripts/phone/035.dat
@@ -14,7 +14,7 @@ version=2
 			:when:1
 				@text.show(Glad you called!~Your <daycare.pokemonname(2,0)> is~doing just fine!)
 			:when:2
-				:select:<daycare.canbreed(2)>
+				:select:<daycare.canbreed(2,0)>
 				:when:70
 					@storage.set(string,breed_text,The two seem to get~along very well.)
 				:when:50
diff --git a/P3D/Content/Data/Scripts/route34/daycare/oldLady.dat b/P3D/Content/Data/Scripts/route34/daycare/oldLady.dat
index 6f6ebdce340568ce88950b033f05f15ff04d9c9d..b49ab6de5cd8154f477c47c9a6a8bff8fc08e6e6 100644
GIT binary patch
delta 21
bcmca4c1vu-5hg~R%?FuW*?<%?r#}+_SI!1{

delta 29
lcmca5c1di*5hiv`20I2$2F}ThY@(Z=FsZR^=Hv8X0swyc2U`FD

diff --git a/P3D/World/ActionScript/V2/ScriptConstructs/DoDaycare.vb b/P3D/World/ActionScript/V2/ScriptConstructs/DoDaycare.vb
index 79f84081e..0761638fe 100644
--- a/P3D/World/ActionScript/V2/ScriptConstructs/DoDaycare.vb
+++ b/P3D/World/ActionScript/V2/ScriptConstructs/DoDaycare.vb
@@ -154,8 +154,12 @@
                     Next
                 Case "canbreed"
                     Dim dayCareID As Integer = int(argument.GetSplit(0))
+                    Dim wmultiplier As Boolean = True
+                    If argument.Contains(CChar(",")) Then
+                        wmultiplier = CBool(argument.GetSplit(1))
+                    End If
 
-                    Return Daycare.CanBreed(dayCareID)
+                    Return Daycare.CanBreed(dayCareID, wmultiplier)
             End Select
 
             Return DEFAULTNULL