From 67d357c459e1ba2023a1535a136563b365e9bfa2 Mon Sep 17 00:00:00 2001 From: darkfire006 Date: Thu, 23 Jul 2020 21:02:59 -0500 Subject: [PATCH] Mach V fixes --- .../Data/Scripts/league/halloffame.dat | Bin 2264 -> 2254 bytes P3D/Content/Data/Scripts/pewter/caraliss.dat | Bin 12888 -> 12640 bytes .../Data/Scripts/pewter/fossilscientist.dat | Bin 21278 -> 23376 bytes .../Data/Scripts/quest/tower/owner.dat | Bin 11342 -> 11198 bytes .../trainer/quest/tower/double/006_1.trainer | Bin 1066 -> 1038 bytes .../trainer/quest/tower/double/006_2.trainer | Bin 1038 -> 1066 bytes .../quest/tower/knockout/001_3.trainer | Bin 910 -> 910 bytes .../trainer/quest/tower/single/001.trainer | Bin 978 -> 978 bytes .../trainer/quest/tower/single/007.trainer | Bin 988 -> 990 bytes P3D/Content/Data/maps/barktown.dat | Bin 76862 -> 76876 bytes .../V2/ScriptCommands/DoPokemon.vb | 25 +++++++++++++++++- 11 files changed, 24 insertions(+), 1 deletion(-) diff --git a/P3D/Content/Data/Scripts/league/halloffame.dat b/P3D/Content/Data/Scripts/league/halloffame.dat index c68b4cb6d0264f7caf0467334e507667e20b7baf..13120f4f668aa8cdd6e51c54fcb134d2859dbede 100644 GIT binary patch delta 12 Tcmca1cusJG4f|#{_DPHYAgcsV delta 22 dcmX>nctdc54LfHVLq0(5df}+c8CA~ delta 876 zcmaEmbR%Vhys~IDgAzjkLq0<`Ln=cqkj?}0qbECXDo;Ky&Qq_+V8;;4P|E;P70szw?w^{%I diff --git a/P3D/Content/Data/Scripts/pewter/fossilscientist.dat b/P3D/Content/Data/Scripts/pewter/fossilscientist.dat index 84fbda2d2cca84a34180514d3ba0d268cd58b102..ebec2e5c98cc1dd4ed9095bd56bb6c00c293cdbb 100644 GIT binary patch delta 2543 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 KJ2RyZ`SU;MVP=j1 diff --git a/P3D/Content/Data/Scripts/quest/tower/owner.dat b/P3D/Content/Data/Scripts/quest/tower/owner.dat index 3ce844da7c576e09293dd8a8cf534bd8d4eadac3..4469919c5774c08adeb6287a833cc20e1d365f5d 100644 GIT binary patch delta 520 zcmX>Xu`hhXdl|;M$sc6&fuw@0Kaebt)drGtz~l+ptF9Id77V5gIt)f&GKe9Sp`0O+ zp@<=cL4hF+Nar);0$CwIx*RB11Z4XIS$SZ#4p>hjL&@X>30ZX=1_PiuHVg#}IY1LC z!7B8CDieVwq%zn6jE07E`QHbW{y zE|AUx@}n6nfY6j7mZ6pbB<};1D+A&ju$&=-0bItJA(5ekA(%NY{&7>a-b3JhsLIv?l&n3b6f#SFnf<(WVSRYI)=%1u_2cN{uS p28Yw+5ArLAj*|^RF#rr@`^l{eB16a7u#ncAT&*Fp*;=WY69D=gm2Ut5 diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/double/006_1.trainer b/P3D/Content/Data/Scripts/trainer/quest/tower/double/006_1.trainer index 19ca0a225e736fa36ca892c69014d3de36181940..85d6dce3de92bdaa8adc05584dd76fd6bec2abb6 100644 GIT binary patch delta 122 zcmZ3*(Z?~tkl&Rdm!XnDhry8{har_Ad!j?BaXLdLLkbX9GAJ;V1KA}E89-JJLq0

I4}R$#~ivMVQkQJx&gXfauo(Q0xhqtfKvjC$;b45mPHEhm3qygONv*@Mw& M@+l_o$%)J-0mlv=lK=n! delta 150 zcmeC$K*ZPmH8w9>|!JJ diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/double/006_2.trainer b/P3D/Content/Data/Scripts/trainer/quest/tower/double/006_2.trainer index 85d6dce3de92bdaa8adc05584dd76fd6bec2abb6..19ca0a225e736fa36ca892c69014d3de36181940 100644 GIT binary patch delta 150 zcmeC$K*ZPmH8w9>|!JJ delta 122 zcmZ3*(Z?~tkl&Rdm!XnDhry8{har_Ad!j?BaXLdLLkbX9GAJ;V1KA}E89-JJLq0

I4}R$#~ivMVQkQJx&gXfauo(Q0xhqtfKvjC$;b45mPHEhm3qygONv*@Mw& M@+l_o$%)J-0mlv=lK=n! diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/001_3.trainer b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/001_3.trainer index 4e221551fbf45045570b8ed31a797c739af2cd2f..11e71c20be06abfa27ce8e8733dfc6b95ad1eb80 100644 GIT binary patch delta 12 TcmeBU?_-~^lCf^%swYeU9`gkx delta 12 TcmeBU?_-~^l2KvfswYeU9UTP5 diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/single/001.trainer b/P3D/Content/Data/Scripts/trainer/quest/tower/single/001.trainer index 6d1817d5ec6e571cb5ba5b4ef1c05b8c9bb7547e..5f5462e46a8738c64051094679519cff00a6c492 100644 GIT binary patch delta 46 wcmcb_eu;g9I3r{6WC=z`>12j{hCGI3hE#?WAl3sz1qM$B1%{l>C5&-Q00Tw|&j0`b delta 46 wcmcb_eu;g9I3r{5WC=z`X=jFfhCGI3hE#?WAl3sz1qM$B1qPqZC5&-Q0Qt8GZvX%Q diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/single/007.trainer b/P3D/Content/Data/Scripts/trainer/quest/tower/single/007.trainer index 564f54078d22a36c8829bb30579b4506dba9cd69..1279cd3d6622ff5cacc1e0596dd66ceb38b3d120 100644 GIT binary patch delta 12 Tcmcb^evf^^MMk}i7kHQfBnAZO delta 10 Rcmcb|eusU+#f_J_nE@Qp1iSzM diff --git a/P3D/Content/Data/maps/barktown.dat b/P3D/Content/Data/maps/barktown.dat index 820de12bcac443202af578f5942a6f3a708218c3..69a71d340877b7358de2e1298e8d64a26f746767 100644 GIT binary patch delta 132 zcmdmYgXPQ(mJNQZr(fe?w3+;8t=;BhtN$=gUJxj-`NG-?CJC#6yNl9a*TJjPmp3< GCkOzF(K?a< delta 133 zcmX?egJs_hmJNQZr%zI2wAtLV+JXtpn%uM6X7YvyJe$4NF(E`YAKQ?C#9OfWTEgT< z?M{>V(ha8nlV)_=ZXn9Ij}c^m)no%{mhF1tjC^4AVD5Av*KPV9ImSEF10)!4O;*?u Lw*8zmW1Rp1b;>h9 diff --git a/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb b/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb index 82939fca0..0f82f42b1 100644 --- a/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb +++ b/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb @@ -85,6 +85,11 @@ heldItem = CInt(argument.GetSplit(7)) End If + Dim isShiny As Boolean = False + If commas > 7 Then + isShiny = CBool(argument.GetSplit(8)) + End If + Dim Pokemon As Pokemon = Pokemon.GetPokemonByID(PokemonID) Pokemon.Generate(Level, True) @@ -106,6 +111,8 @@ Pokemon.Item = Item.GetItemByID(heldItem) End If + Pokemon.IsShiny = isShiny + Core.Player.Pokemons.Add(Pokemon) Dim pokedexType As Integer = 2 @@ -714,7 +721,7 @@ End If Case "addtostorage" ' @Pokemon.AddToStorage([BoxIndex], PokemonData) - ' @Pokemon.AddToStorage(PokemonID, Level, [Method], [BallID], [Location], [isEgg], [trainerName]) + ' @Pokemon.AddToStorage(PokemonID, Level, [Method], [BallID], [Location], [isEgg], [trainerName], [heldItem], [isShiny]) If argument.StartsWith("{") = True Or argument.Remove(0, argument.IndexOf(",")).StartsWith(",{") = True Then Dim insertIndex As Integer = -1 @@ -771,6 +778,16 @@ catchTrainer = argument.GetSplit(6) End If + Dim heldItem As Integer = 0 + If commas > 6 Then + heldItem = CInt(argument.GetSplit(7)) + End If + + Dim isShiny As Boolean = False + If commas > 7 Then + isShiny = CBool(argument.GetSplit(8)) + End If + Dim Pokemon As Pokemon = Pokemon.GetPokemonByID(PokemonID) Pokemon.Generate(Level, True) @@ -788,6 +805,12 @@ Pokemon.EggSteps = 0 End If + If heldItem <> 0 Then + Pokemon.Item = Item.GetItemByID(heldItem) + End If + + Pokemon.IsShiny = isShiny + StorageSystemScreen.DepositPokemon(Pokemon) Dim pokedexType As Integer = 2