From 2acca429e369a3db04a837410772e97fb3317c19 Mon Sep 17 00:00:00 2001
From: chardub <pkmninfinitefusion@gmail.com>
Date: Mon, 26 Dec 2022 18:33:37 -0500
Subject: [PATCH] Adds support for shinies in online wondertrade

---
 Data/Map129.rxdata                           | Bin 30091 -> 30091 bytes
 Data/Scripts/050_AddOns/OnlineWondertrade.rb |  34 ++++++++++++++++---
 Data/System.rxdata                           | Bin 28010 -> 28010 bytes
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/Data/Map129.rxdata b/Data/Map129.rxdata
index c998f3a330a51cb2d08af7ebcffc311e1d8bf7c1..a141d8fb05700dc13bacc853a318bc2264be66ac 100644
GIT binary patch
delta 94
zcmeBv&Di~#af5*HW)We1#>sxZ;*<MrxF+XjxlCRtB0c$nFXv=?Pxi^@MK~G7Hs2Ic
q3Y+{t%Nwf9f-z+BJYTWNE3;*w3OP6}t<5tTtSvGnHb2T<$q4{W)FFTX

delta 102
zcmeBv&Di~#af5&`vuGy6W`1D<#>u|60+ah~#3#pdn@?UMB0c#*j_~C3BAkp8n{SFJ
zg@M#f{*~neRmL?rL4<d*T#5=~$mEN9!jsoz%K$Zqa9UcMXL4FwWD0M7l)aJ@0LsZC
AM*si-

diff --git a/Data/Scripts/050_AddOns/OnlineWondertrade.rb b/Data/Scripts/050_AddOns/OnlineWondertrade.rb
index ba71be5f2..e69a55abf 100644
--- a/Data/Scripts/050_AddOns/OnlineWondertrade.rb
+++ b/Data/Scripts/050_AddOns/OnlineWondertrade.rb
@@ -1,7 +1,4 @@
 class OnlineWondertrade
-
-
-
   def pbWonderTrade()
     givenPokemon = selectPokemonToGive
     return if givenPokemon == nil
@@ -11,6 +8,8 @@ class OnlineWondertrade
     if response[:status] == 200
       body = HTTPLite::JSON.parse(response[:body])
       doTrade(body)
+    else
+      pbMessage("Could not find a trading partner...")
     end
     rescue MKXPError
       pbMessage("There was an error while sending your Pokémon...")
@@ -26,16 +25,37 @@ class OnlineWondertrade
     receivedPokemonTrainerName = receivedData["trainer_name"]
     receivedPokemonTrainerGender = receivedData["trainer_gender"].to_i
 
+    is_head_shiny = receivedData["head_shiny"]
+    is_body_shiny = receivedData["body_shiny"]
+    is_debug_shiny = receivedData["debug_shiny"]
+
     newpoke = pbStartTrade(pbGet(1), receivedPokemonSpecies, receivedPokemonName, receivedPokemonTrainerName, receivedPokemonTrainerGender, true) # Starts the trade
     newpoke.owner=Pokemon::Owner.new(receivedPokemonTrainerId.to_i,receivedPokemonOT,2,2)
     newpoke.level=receivedPokemonLevel
+
+    if is_head_shiny || is_body_shiny
+      newpoke.shiny=true
+      newpoke.head_shiny=is_head_shiny
+      newpoke.body_shiny = is_body_shiny
+      if is_debug_shiny
+        newpoke.debug_shiny=false
+        newpoke.natural_shiny=true
+      else
+        newpoke.debug_shiny=true
+        newpoke.natural_shiny=false
+      end
+    end
     newpoke.calc_stats
   end
 
   def selectPokemonToGive
     pbChoosePokemon(1, 2, # Choose eligable pokemon
                     proc {
-                      |poke| !poke.egg? && !(poke.isShadow?)
+                      |poke| !poke.egg? &&
+                        !(poke.isShadow?) &&
+                        poke.isFusion? &&
+                      customSpriteExists(poke.species) #&&
+                      #  !poke.debug_shiny
                     })
     poke = $Trainer.party[pbGet(1)]
 
@@ -48,6 +68,7 @@ class OnlineWondertrade
 
   # @param [Pokemon] givenPokemon
   def buildWondertradeQueryJson(givenPokemon)
+    isDebugShiny = givenPokemon.debug_shiny || !givenPokemon.natural_shiny
     postData = {
       "trainer_name" => $Trainer.name,
       "trainer_gender" => $Trainer.gender,
@@ -58,6 +79,11 @@ class OnlineWondertrade
       "nickname" => givenPokemon.name,
       "original_trainer_name" => givenPokemon.owner.name,
       "original_trainer_id" => givenPokemon.owner.id.to_s,
+      "body_shiny" => givenPokemon.body_shiny == nil ? false : givenPokemon.body_shiny,
+      "head_shiny" => givenPokemon.head_shiny == nil ? false : givenPokemon.head_shiny,
+      "debug_shiny" => isDebugShiny,
+      "original_trainer_id" => givenPokemon.owner.id.to_s,
+
     }
     return HTTPLite::JSON.stringify(postData)
   end
diff --git a/Data/System.rxdata b/Data/System.rxdata
index dadfac252797007dc164196e2d20cc11b4ff5e7c..7be5c586d10befd321f239cede90490ab4ae8177 100644
GIT binary patch
delta 19
bcmaELi}BSh#tqvgSUUFxGjHB4u|5O<WOE5K

delta 19
bcmaELi}BSh#tqvgSl(ZhW7@o1VtohzXD|tO