tyler.durden
/
P3D-Legacy
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pokédex evo/form screen progress

This commit is contained in:
JappaWakka 2023-07-21 16:30:12 +02:00
parent cc60a782f4
commit c3fb81a4c4
12 changed files with 521 additions and 384 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
P3D/Battle/BattleSystemV2/BattleMenu.vb
View File

@ -220,14 +220,8 @@
End If End If
If DrawCaught = True Then If DrawCaught = True Then
Dim dexID As String = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData) Dim dexID As String = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData, True)
If dexID.Contains("_") = False Then
If PokemonForms.GetAdditionalDataForms(p.Number) IsNot Nothing AndAlso PokemonForms.GetAdditionalDataForms(p.Number).Contains(p.AdditionalData) Then
dexID = p.Number & ";" & p.AdditionalData
Else
dexID = p.Number.ToString
End If
End If
If Pokedex.GetEntryType(Core.Player.PokedexData, dexID) > 1 Then If Pokedex.GetEntryType(Core.Player.PokedexData, dexID) > 1 Then
Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Battle\Interface"), New Rectangle(CInt(pos.X) + caughtX, CInt(pos.Y) + 22, 20, 20), New Rectangle(0, 46, 10, 10), New Color(255, 255, 255, _moveMenuAlpha)) Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Battle\Interface"), New Rectangle(CInt(pos.X) + caughtX, CInt(pos.Y) + 22, 20, 20), New Rectangle(0, 46, 10, 10), New Color(255, 255, 255, _moveMenuAlpha))
End If End If

476
P3D/Content/Data/forms.dat
View File

@ -1,240 +1,240 @@
# {DexNumber|AdditionalValue|InPartyFormTriggers|FormNamePrefix|FormNameSuffix|DataFileSuffix|MenuIconFile,X_Coordinate,Y_Coordinate|FrontBackSpriteFileSuffix|OverworldSpriteFileSuffix|CryFileSuffix|WildFormTriggers|TypeChange} # {DexNumber|AdditionalValue|InPartyFormTriggers|FormNamePrefix|FormNameSuffix|DataFileSuffix|MenuIconFile,X_Coordinate,Y_Coordinate|FrontBackSpriteFileSuffix|OverworldSpriteFileSuffix|CryFileSuffix|WildFormTriggers|TypeChange|IncludeBaseFormInDexCount}
# "InPartyFormTriggers" can take one or an array of the following value types (separated by commas): Gender;GenderID / Season;SeasonID / Environment;EnvironmentType1;EnvironmentType2 (etc.) / Item;ItemID # "InPartyFormTriggers" can take one or an array of the following value types (separated by commas): Gender;GenderID / Season;SeasonID / Environment;EnvironmentType1;EnvironmentType2 (etc.) / Item;ItemID
# "WildFormTriggers" can take one or an array of the following value types (separated by commas): Random;String1;String2 (etc.) / Random;MinValue-MaxValue / Gender;GenderID / Season;SeasonID / Environment;EnvironmentType1;EnvironmentType2 (etc.) # "WildFormTriggers" can take one or an array of the following value types (separated by commas): Random;String1;String2 (etc.) / Random;MinValue-MaxValue / Gender;GenderID / Season;SeasonID / Environment;EnvironmentType1;EnvironmentType2 (etc.)
{3|mega||Mega ||_mega|Megas,0,0|_mega|_mega|||} {3|mega||Mega ||_mega|Megas,0,0|_mega|_mega||||}
{6|mega_x||Mega | X|_mega_x|Megas,1,0|_mega_x|_mega_x|||} {6|mega_x||Mega | X|_mega_x|Megas,1,0|_mega_x|_mega_x||||}
{6|mega_y||Mega | Y|_mega_y|Megas,2,0|_mega_y|_mega_y|||} {6|mega_y||Mega | Y|_mega_y|Megas,2,0|_mega_y|_mega_y||||}
{9|mega||Mega ||_mega|Megas,3,0|_mega|_mega|||} {9|mega||Mega ||_mega|Megas,3,0|_mega|_mega||||}
{15|mega||Mega ||_mega|Megas,12,1|_mega|_mega|||} {15|mega||Mega ||_mega|Megas,12,1|_mega|_mega||||}
{18|mega||Mega ||_mega|Megas,13,1|_mega|_mega|||} {18|mega||Mega ||_mega|Megas,13,1|_mega|_mega||||}
{19|alola||Alolan ||_alola|Regional,0,0|_alola|_alola|||} {19|alola||Alolan ||_alola|Regional,0,0|_alola|_alola||||}
{20|alola||Alolan ||_alola|Regional,1,0|_alola|_alola|||} {20|alola||Alolan ||_alola|Regional,1,0|_alola|_alola||||}
{26|alola||Alolan ||_alola|Regional,2,0|_alola|_alola|||} {26|alola||Alolan ||_alola|Regional,2,0|_alola|_alola||||}
{27|alola||Alolan ||_alola|Regional,3,0|_alola|_alola|||} {27|alola||Alolan ||_alola|Regional,3,0|_alola|_alola||||}
{28|alola||Alolan ||_alola|Regional,4,0|_alola|_alola|||} {28|alola||Alolan ||_alola|Regional,4,0|_alola|_alola||||}
{37|alola||Alolan ||_alola|Regional,5,0|_alola|_alola|||} {37|alola||Alolan ||_alola|Regional,5,0|_alola|_alola||||}
{38|alola||Alolan ||_alola|Regional,6,0|_alola|_alola|||} {38|alola||Alolan ||_alola|Regional,6,0|_alola|_alola||||}
{50|alola||Alolan ||_alola|Regional,7,0|_alola|_alola|||} {50|alola||Alolan ||_alola|Regional,7,0|_alola|_alola||||}
{51|alola||Alolan ||_alola|Regional,8,0|_alola|_alola|||} {51|alola||Alolan ||_alola|Regional,8,0|_alola|_alola||||}
{52|alola||Alolan ||_alola|Regional,9,0|_alola|_alola|||} {52|alola||Alolan ||_alola|Regional,9,0|_alola|_alola||||}
{52|galar||Galarian ||_galar|Regional,0,2|_galar|_galar|||} {52|galar||Galarian ||_galar|Regional,0,2|_galar|_galar||||}
{53|alola||Alolan ||_alola|Regional,10,0|_alola|_alola|||} {53|alola||Alolan ||_alola|Regional,10,0|_alola|_alola||||}
{58|hisui||Hisuian ||_hisui|Regional,0,4|_hisui|_hisui|||} {58|hisui||Hisuian ||_hisui|Regional,0,4|_hisui|_hisui||||}
{59|hisui||Hisuian ||_hisui|Regional,1,4|_hisui|_hisui|||} {59|hisui||Hisuian ||_hisui|Regional,1,4|_hisui|_hisui||||}
{65|mega||Mega ||_mega|Megas,4,0|_mega|_mega|||} {65|mega||Mega ||_mega|Megas,4,0|_mega|_mega||||}
{74|alola||Alolan ||_alola|Regional,11,0|_alola|_alola|||} {74|alola||Alolan ||_alola|Regional,11,0|_alola|_alola||||}
{75|alola||Alolan ||_alola|Regional,12,0|_alola|_alola|||} {75|alola||Alolan ||_alola|Regional,12,0|_alola|_alola||||}
{76|alola||Alolan ||_alola|Regional,13,0|_alola|_alola|||} {76|alola||Alolan ||_alola|Regional,13,0|_alola|_alola||||}
{77|galar||Galarian ||_galar|Regional,1,2|_galar|_galar|||} {77|galar||Galarian ||_galar|Regional,1,2|_galar|_galar||||}
{78|galar||Galarian ||_galar|Regional,2,2|_galar|_galar|||} {78|galar||Galarian ||_galar|Regional,2,2|_galar|_galar||||}
{79|galar||Galarian ||_galar|Regional,3,2|_galar|_galar|||} {79|galar||Galarian ||_galar|Regional,3,2|_galar|_galar||||}
{80|mega||Mega ||_mega|Megas,14,1|_mega|_mega|||} {80|mega||Mega ||_mega|Megas,14,1|_mega|_mega||||}
{80|galar||Galarian ||_galar|Regional,4,2|_galar|_galar|||} {80|galar||Galarian ||_galar|Regional,4,2|_galar|_galar||||}
{83|galar||Galarian ||_galar|Regional,5,2|_galar|_galar|||} {83|galar||Galarian ||_galar|Regional,5,2|_galar|_galar||||}
{88|alola||Alolan ||_alola|Regional,14,0|_alola|_alola|||} {88|alola||Alolan ||_alola|Regional,14,0|_alola|_alola||||}
{89|alola||Alolan ||_alola|Regional,15,0|_alola|_alola|||} {89|alola||Alolan ||_alola|Regional,15,0|_alola|_alola||||}
{94|mega||Mega ||_mega|Megas,5,0|_mega|_mega|||} {94|mega||Mega ||_mega|Megas,5,0|_mega|_mega||||}
{100|hisui||Hisuian ||_hisui|Regional,2,4|_hisui|_hisui|||} {100|hisui||Hisuian ||_hisui|Regional,2,4|_hisui|_hisui||||}
{101|hisui||Hisuian ||_hisui|Regional,3,4|_hisui|_hisui|||} {101|hisui||Hisuian ||_hisui|Regional,3,4|_hisui|_hisui||||}
{103|alola||Alolan ||_alola|Regional,0,1|_alola|_alola|||} {103|alola||Alolan ||_alola|Regional,0,1|_alola|_alola||||}
{105|alola||Alolan ||_alola|Regional,1,1|_alola|_alola|||} {105|alola||Alolan ||_alola|Regional,1,1|_alola|_alola||||}
{110|galar||Galarian ||_galar|Regional,6,2|_galar|_galar|||} {110|galar||Galarian ||_galar|Regional,6,2|_galar|_galar||||}
{115|mega||Mega ||_mega|Megas,6,0|_mega|_mega|||} {115|mega||Mega ||_mega|Megas,6,0|_mega|_mega||||}
{122|galar||Galarian ||_galar|Regional,7,2|_galar|_galar|||} {122|galar||Galarian ||_galar|Regional,7,2|_galar|_galar||||}
{127|mega||Mega ||_mega|Megas,7,0|_mega|_mega|||} {127|mega||Mega ||_mega|Megas,7,0|_mega|_mega||||}
{130|mega||Mega ||_mega|Megas,8,0|_mega|_mega|||} {130|mega||Mega ||_mega|Megas,8,0|_mega|_mega||||}
{142|mega||Mega ||_mega|Megas,9,0|_mega|_mega|||} {142|mega||Mega ||_mega|Megas,9,0|_mega|_mega||||}
{144|galar||Galarian ||_galar|Regional,8,2|_galar|_galar|||} {144|galar||Galarian ||_galar|Regional,8,2|_galar|_galar||||}
{145|galar||Galarian ||_galar|Regional,9,2|_galar|_galar|||} {145|galar||Galarian ||_galar|Regional,9,2|_galar|_galar||||}
{146|galar||Galarian ||_galar|Regional,10,2|_galar|_galar|||} {146|galar||Galarian ||_galar|Regional,10,2|_galar|_galar||||}
{150|mega_x||Mega | X|_mega_x|Megas,10,0|_mega_x|_mega_x|||} {150|mega_x||Mega | X|_mega_x|Megas,10,0|_mega_x|_mega_x||||}
{150|mega_y||Mega | Y|_mega_y|Megas,11,0|_mega_y|_mega_y|||} {150|mega_y||Mega | Y|_mega_y|Megas,11,0|_mega_y|_mega_y||||}
{157|hisui||Hisuian ||_hisui|Regional,4,4|_hisui|_hisui|||} {157|hisui||Hisuian ||_hisui|Regional,4,4|_hisui|_hisui||||}
{172|spiky-eared||Spiky-Eared ||_spiky-eared|OtherForms,0,2|_spiky-eared|_spiky-eared|||} {172|spiky-eared||Spiky-Eared ||_spiky-eared|OtherForms,0,2|_spiky-eared|_spiky-eared||||}
{181|mega||Mega ||_mega|Megas,12,0|_mega|_mega|||} {181|mega||Mega ||_mega|Megas,12,0|_mega|_mega||||}
{199|galar||Galarian ||_galar|Regional,11,2|_galar|_galar|||} {199|galar||Galarian ||_galar|Regional,11,2|_galar|_galar||||}
{201||||||Unown,0,0|_a|-a||Random;0-27|} {201||||||Unown,0,0|_a|-a||Random;0-27||}
{201|0|||||Unown,0,0|_a|-a|||} {201|0|||||Unown,0,0|_a|-a||||1}
{201|1|||||Unown,1,0|_b|-b|||} {201|1|||||Unown,1,0|_b|-b||||1}
{201|2|||||Unown,2,0|_c|-c|||} {201|2|||||Unown,2,0|_c|-c||||1}
{201|3|||||Unown,3,0|_d|-d|||} {201|3|||||Unown,3,0|_d|-d||||1}
{201|4|||||Unown,4,0|_e|-e|||} {201|4|||||Unown,4,0|_e|-e||||1}
{201|5|||||Unown,5,0|_f|-f|||} {201|5|||||Unown,5,0|_f|-f||||1}
{201|6|||||Unown,6,0|_g|-g|||} {201|6|||||Unown,6,0|_g|-g||||1}
{201|7|||||Unown,7,0|_h|-h|||} {201|7|||||Unown,7,0|_h|-h||||1}
{201|8|||||Unown,8,0|_i|-i|||} {201|8|||||Unown,8,0|_i|-i||||1}
{201|9|||||Unown,9,0|_j|-j|||} {201|9|||||Unown,9,0|_j|-j||||1}
{201|10|||||Unown,10,0|_k|-k|||} {201|10|||||Unown,10,0|_k|-k||||1}
{201|11|||||Unown,11,0|_l|-l|||} {201|11|||||Unown,11,0|_l|-l||||1}
{201|12|||||Unown,12,0|_m|-m|||} {201|12|||||Unown,12,0|_m|-m||||1}
{201|13|||||Unown,13,0|_n|-n|||} {201|13|||||Unown,13,0|_n|-n||||1}
{201|14|||||Unown,14,0|_o|-o|||} {201|14|||||Unown,14,0|_o|-o||||1}
{201|15|||||Unown,15,0|_p|-p|||} {201|15|||||Unown,15,0|_p|-p||||1}
{201|16|||||Unown,0,1|_q|-q|||} {201|16|||||Unown,0,1|_q|-q||||1}
{201|17|||||Unown,1,1|_r|-r|||} {201|17|||||Unown,1,1|_r|-r||||1}
{201|18|||||Unown,2,1|_s|-s|||} {201|18|||||Unown,2,1|_s|-s||||1}
{201|19|||||Unown,3,1|_t|-t|||} {201|19|||||Unown,3,1|_t|-t||||1}
{201|20|||||Unown,4,1|_u|-u|||} {201|20|||||Unown,4,1|_u|-u||||1}
{201|21|||||Unown,5,1|_v|-v|||} {201|21|||||Unown,5,1|_v|-v||||1}
{201|22|||||Unown,6,1|_w|-w|||} {201|22|||||Unown,6,1|_w|-w||||1}
{201|23|||||Unown,7,1|_x|-x|||} {201|23|||||Unown,7,1|_x|-x||||1}
{201|24|||||Unown,8,1|_y|-y|||} {201|24|||||Unown,8,1|_y|-y||||1}
{201|25|||||Unown,9,1|_z|-z|||} {201|25|||||Unown,9,1|_z|-z||||1}
{201|26|||||Unown,10,1|_question|-question|||} {201|26|||||Unown,10,1|_question|-question||||}
{201|27|||||Unown,11,1|_exclamation|-exclamation|||} {201|27|||||Unown,11,1|_exclamation|-exclamation||||}
{208|mega||Mega ||_mega|Megas,15,1|_mega|_mega|||} {208|mega||Mega ||_mega|Megas,15,1|_mega|_mega||||}
{211|hisui||Hisuian ||_hisui|Regional,5,4|_hisui|_hisui|||} {211|hisui||Hisuian ||_hisui|Regional,5,4|_hisui|_hisui||||}
{212|mega||Mega ||_mega|Megas,13,0|_mega|_mega|||} {212|mega||Mega ||_mega|Megas,13,0|_mega|_mega||||}
{214|mega||Mega ||_mega|Megas,14,0|_mega|_mega|||} {214|mega||Mega ||_mega|Megas,14,0|_mega|_mega||||}
{215|hisui||Hisuian ||_hisui|Regional,6,4|_hisui|_hisui|||} {215|hisui||Hisuian ||_hisui|Regional,6,4|_hisui|_hisui||||}
{222|galar||Galarian ||_galar|Regional,12,2|_galar|_galar|||} {222|galar||Galarian ||_galar|Regional,12,2|_galar|_galar||||}
{229|mega||Mega ||_mega|Megas,15,0|_mega|_mega|||} {229|mega||Mega ||_mega|Megas,15,0|_mega|_mega||||}
{248|mega||Mega ||_mega|Megas,0,1|_mega|_mega|||} {248|mega||Mega ||_mega|Megas,0,1|_mega|_mega||||}
{254|mega||Mega ||_mega|Megas,0,2|_mega|_mega|||} {254|mega||Mega ||_mega|Megas,0,2|_mega|_mega||||}
{257|mega||Mega ||_mega|Megas,1,1|_mega|_mega|||} {257|mega||Mega ||_mega|Megas,1,1|_mega|_mega||||}
{260|mega||Mega ||_mega|Megas,1,2|_mega|_mega|||} {260|mega||Mega ||_mega|Megas,1,2|_mega|_mega||||}
{263|galar||Galarian ||_galar|Regional,13,2|_galar|_galar|||} {263|galar||Galarian ||_galar|Regional,13,2|_galar|_galar||||}
{264|galar||Galarian ||_galar|Regional,14,2|_galar|_galar|||} {264|galar||Galarian ||_galar|Regional,14,2|_galar|_galar||||}
{282|mega||Mega ||_mega|Megas,2,1|_mega|_mega|||} {282|mega||Mega ||_mega|Megas,2,1|_mega|_mega||||}
{302|mega||Mega ||_mega|Megas,2,2|_mega|_mega|||} {302|mega||Mega ||_mega|Megas,2,2|_mega|_mega||||}
{303|mega||Mega ||_mega|Megas,3,1|_mega|_mega|||} {303|mega||Mega ||_mega|Megas,3,1|_mega|_mega||||}
{306|mega||Mega ||_mega|Megas,4,1|_mega|_mega|||} {306|mega||Mega ||_mega|Megas,4,1|_mega|_mega||||}
{308|mega||Mega ||_mega|Megas,5,1|_mega|_mega|||} {308|mega||Mega ||_mega|Megas,5,1|_mega|_mega||||}
{310|mega||Mega ||_mega|Megas,6,1|_mega|_mega|||} {310|mega||Mega ||_mega|Megas,6,1|_mega|_mega||||}
{319|mega||Mega ||_mega|Megas,3,2|_mega|_mega|||} {319|mega||Mega ||_mega|Megas,3,2|_mega|_mega||||}
{323|mega||Mega ||_mega|Megas,4,2|_mega|_mega|||} {323|mega||Mega ||_mega|Megas,4,2|_mega|_mega||||}
{334|mega||Mega ||_mega|Megas,5,2|_mega|_mega|||} {334|mega||Mega ||_mega|Megas,5,2|_mega|_mega||||}
{354|mega||Mega ||_mega|Megas,7,1|_mega|_mega|||} {354|mega||Mega ||_mega|Megas,7,1|_mega|_mega||||}
{359|mega||Mega ||_mega|Megas,8,1|_mega|_mega|||} {359|mega||Mega ||_mega|Megas,8,1|_mega|_mega||||}
{362|mega||Mega ||_mega|Megas,6,2|_mega|_mega|||} {362|mega||Mega ||_mega|Megas,6,2|_mega|_mega||||}
{373|mega||Mega ||_mega|Megas,7,2|_mega|_mega|||} {373|mega||Mega ||_mega|Megas,7,2|_mega|_mega||||}
{376|mega||Mega ||_mega|Megas,8,2|_mega|_mega|||} {376|mega||Mega ||_mega|Megas,8,2|_mega|_mega||||}
{380|mega||Mega ||_mega|Megas,9,2|_mega|_mega|||} {380|mega||Mega ||_mega|Megas,9,2|_mega|_mega||||}
{381|mega||Mega ||_mega|Megas,10,2|_mega|_mega|||} {381|mega||Mega ||_mega|Megas,10,2|_mega|_mega||||}
{382|primal||Primal ||_primal|OtherForms,3,3|_primal|_primal|||} {382|primal||Primal ||_primal|OtherForms,3,3|_primal|_primal||||}
{383|primal||Primal ||_primal|OtherForms,4,3|_primal|_primal|||} {383|primal||Primal ||_primal|OtherForms,4,3|_primal|_primal||||}
{384|mega||Mega ||_mega|Megas,11,2|_mega|_mega|||} {384|mega||Mega ||_mega|Megas,11,2|_mega|_mega||||}
{386|attack||||_attack|OtherForms,5,3|_attack|_attack|||} {386|attack||||_attack|OtherForms,5,3|_attack|_attack||||1}
{386|defense||||_defense|OtherForms,6,3|_defense|_defense|||} {386|defense||||_defense|OtherForms,6,3|_defense|_defense||||1}
{386|speed||||_speed|OtherForms,7,3|_speed|_speed|||} {386|speed||||_speed|OtherForms,7,3|_speed|_speed||||1}
{412|plant||||||_plant|_plant||environment;0;5|} {412|plant||||||_plant|_plant||environment;0;5||1}
{412|sandy|||||OtherForms,0,4|_sandy|_sandy||environment;2;3|} {412|sandy|||||OtherForms,0,4|_sandy|_sandy||environment;2;3||1}
{412|trash|||||OtherForms,1,4|_trash|_trash||environment;1|} {412|trash|||||OtherForms,1,4|_trash|_trash||environment;1||1}
{413|plant||||||_plant|_plant||environment;0;5|} {413|plant||||||_plant|_plant||environment;0;5||1}
{413|sandy||||_sandy|OtherForms,2,4|_sandy|_sandy||environment;2;3|} {413|sandy||||_sandy|OtherForms,2,4|_sandy|_sandy||environment;2;3||1}
{413|trash||||_trash|OtherForms,3,4|_trash|_trash||environment;1|} {413|trash||||_trash|OtherForms,3,4|_trash|_trash||environment;1||1}
{422|||||||_w|_w||Random;west;east|} {422|||||||_w|_w||Random;west;east||}
{422|west||||||_w|_w|||} {422|west||||||_w|_w||||1}
{422|east|||||OtherForms,5,4|_e|_e|||} {422|east|||||OtherForms,5,4|_e|_e||||1}
{423|||||||_w|_w||Random;west;east|} {423|||||||_w|_w||Random;west;east||}
{423|west||||||_w|_w|||} {423|west||||||_w|_w||||1}
{423|east|||||OtherForms,6,4|_e|_e|||} {423|east|||||OtherForms,6,4|_e|_e||||1}
{428|mega||Mega ||_mega|Megas,12,2|_mega|_mega|||} {428|mega||Mega ||_mega|Megas,12,2|_mega|_mega||||}
{445|mega||Mega ||_mega|Megas,9,1|_mega|_mega|||} {445|mega||Mega ||_mega|Megas,9,1|_mega|_mega||||}
{448|mega||Mega ||_mega|Megas,10,1|_mega|_mega|||} {448|mega||Mega ||_mega|Megas,10,1|_mega|_mega||||}
{460|mega||Mega ||_mega|Megas,11,1|_mega|_mega|||} {460|mega||Mega ||_mega|Megas,11,1|_mega|_mega||||}
{475|mega||Mega ||_mega|Megas,13,2|_mega|_mega|||} {475|mega||Mega ||_mega|Megas,13,2|_mega|_mega||||}
{479|fan||||_fan|OtherForms,12,4|_fan|_fan|||} {479|fan||||_fan|OtherForms,12,4|_fan|_fan||||1}
{479|frost||||_frost|OtherForms,11,4|_frost|_frost|||} {479|frost||||_frost|OtherForms,11,4|_frost|_frost||||1}
{479|heat||||_heat|OtherForms,9,4|_heat|_heat|||} {479|heat||||_heat|OtherForms,9,4|_heat|_heat||||1}
{479|mow||||_mow|OtherForms,13,4|_mow|_mow|||} {479|mow||||_mow|OtherForms,13,4|_mow|_mow||||1}
{479|wash||||_wash|OtherForms,12,4|_wash|_wash|||} {479|wash||||_wash|OtherForms,12,4|_wash|_wash||||1}
{483|primal||Primal ||_primal|OtherForms,14,26|_primal|_primal|||} {483|primal||Primal ||_primal|OtherForms,14,26|_primal|_primal||||}
{493||Item;267||||Arceus,14,0|_dragon|_dragon|||dragon} {493||Item;267||||Arceus,14,0|_dragon|_dragon|||dragon|1}
{493||Item;268||||Arceus,15,0|_dark|_dark|||dark} {493||Item;268||||Arceus,15,0|_dark|_dark|||dark|1}
{493||Item;269||||Arceus,8,0|_ground|_ground|||ground} {493||Item;269||||Arceus,8,0|_ground|_ground|||ground|1}
{493||Item;270||||Arceus,6,0|_fighting|_fighting|||fighting} {493||Item;270||||Arceus,6,0|_fighting|_fighting|||fighting|1}
{493||Item;271||||Arceus,1,0|_fire|_fire|||fire} {493||Item;271||||Arceus,1,0|_fire|_fire|||fire|1}
{493||Item;272||||Arceus,5,0|_ice|_ice|||ice} {493||Item;272||||Arceus,5,0|_ice|_ice|||ice|1}
{493||Item;273||||Arceus,11,0|_bug|_bug|||bug} {493||Item;273||||Arceus,11,0|_bug|_bug|||bug|1}
{493||Item;274||||Arceus,0,1|_steel|_steel|||steel} {493||Item;274||||Arceus,0,1|_steel|_steel|||steel|1}
{493||Item;275||||Arceus,4,0|_grass|_grass|||grass} {493||Item;275||||Arceus,4,0|_grass|_grass|||grass|1}
{493||Item;276||||Arceus,10,0|_psychic|_psychic|||psychic} {493||Item;276||||Arceus,10,0|_psychic|_psychic|||psychic|1}
{493||Item;277||||Arceus,1,1|_fairy|_fairy|||fairy} {493||Item;277||||Arceus,1,1|_fairy|_fairy|||fairy|1}
{493||Item;278||||Arceus,9,0|_flying|_flying|||flying} {493||Item;278||||Arceus,9,0|_flying|_flying|||flying|1}
{493||Item;279||||Arceus,2,0|_water|_water|||water} {493||Item;279||||Arceus,2,0|_water|_water|||water|1}
{493||Item;280||||Arceus,13,0|_ghost|_ghost|||ghost} {493||Item;280||||Arceus,13,0|_ghost|_ghost|||ghost|1}
{493||Item;281||||Arceus,12,0|_rock|_rock|||rock} {493||Item;281||||Arceus,12,0|_rock|_rock|||rock|1}
{493||Item;282||||Arceus,7,0|_poison|_poison|||poison} {493||Item;282||||Arceus,7,0|_poison|_poison|||poison|1}
{493||Item;283||||Arceus,3,0|_electric|_electric|||electric} {493||Item;283||||Arceus,3,0|_electric|_electric|||electric|1}
{493||||||Arceus,0,0|||||} {493||||||Arceus,0,0||||||}
{503|hisui||Hisuian ||_hisui|Regional,7,4|_hisui|_hisui|||} {503|hisui||Hisuian ||_hisui|Regional,7,4|_hisui|_hisui||||}
{531|mega||Mega ||_mega|Megas,14,2|_mega|_mega|||} {531|mega||Mega ||_mega|Megas,14,2|_mega|_mega||||}
{549|hisui||Hisuian ||_hisui|Regional,8,4|_hisui|_hisui|||} {549|hisui||Hisuian ||_hisui|Regional,8,4|_hisui|_hisui||||}
{550|||||||_white|_white||Random;white;blue|} {550|||||||_white|_white||Random;white;blue||}
{550|white||||||_white|_white|||} {550|white||||||_white|_white||||1}
{550|blue||||_blue|OtherForms,0,5|_blue|_blue|||} {550|blue||||_blue|OtherForms,0,5|_blue|_blue||||1}
{554|galar||Galarian ||_galar|Regional,15,2|_galar|_galar|||} {554|galar||Galarian ||_galar|Regional,15,2|_galar|_galar||||}
{555|galar||Galarian ||_galar|Regional,0,3|_galar|_galar|||} {555|galar||Galarian ||_galar|Regional,0,3|_galar|_galar||||}
{562|galar||Galarian ||_galar|Regional,1,3|_galar|_galar|||} {562|galar||Galarian ||_galar|Regional,1,3|_galar|_galar||||}
{570|hisui||Hisuian ||_hisui|Regional,9,4|_hisui|_hisui|||} {570|hisui||Hisuian ||_hisui|Regional,9,4|_hisui|_hisui||||}
{571|hisui||Hisuian ||_hisui|Regional,10,4|_hisui|_hisui|||} {571|hisui||Hisuian ||_hisui|Regional,10,4|_hisui|_hisui||||}
{585||Season;0||||OtherForms,5,5|_wi|_wi|||} {585||Season;0||||OtherForms,5,5|_wi|_wi||||}
{585||Season;1|||||_sp|_sp||Season;1|} {585||Season;1|||||_sp|_sp||Season;1||}
{585||Season;2||||OtherForms,3,5|_su|_su|||} {585||Season;2||||OtherForms,3,5|_su|_su||||}
{585||Season;3||||OtherForms,4,5|_fa|_fa|||} {585||Season;3||||OtherForms,4,5|_fa|_fa||||}
{586||Season;0||||OtherForms,8,5|_wi|_wi|||} {586||Season;0||||OtherForms,8,5|_wi|_wi||||}
{586||Season;1|||||_sp|_sp||Season;1|} {586||Season;1|||||_sp|_sp||Season;1||}
{586||Season;2||||OtherForms,6,5|_su|_su|||} {586||Season;2||||OtherForms,6,5|_su|_su||||}
{586||Season;3||||OtherForms,7,5|_fa|_fa|||} {586||Season;3||||OtherForms,7,5|_fa|_fa||||}
{592||Gender;0|||||_m|_m|||} {592||Gender;0|||||_m|_m||||}
{592||Gender;1||||Gender,1,0|_f|_f|||} {592||Gender;1||||Gender,1,0|_f|_f||||}
{593||Gender;0|||||_m|_m|||} {593||Gender;0|||||_m|_m||||}
{593||Gender;1||||Gender,2,0|_f|_f|||} {593||Gender;1||||Gender,2,0|_f|_f||||}
{618|galar||Galarian ||_galar|Regional,2,3|_galar|_galar|||} {618|galar||Galarian ||_galar|Regional,2,3|_galar|_galar||||}
{628|hisui||Hisuian ||_hisui|Regional,11,4|_hisui|_hisui|||} {628|hisui||Hisuian ||_hisui|Regional,11,4|_hisui|_hisui||||}
{641|therian||||_therian|OtherForms,9,5|_therian|_therian|||} {641|therian||||_therian|OtherForms,9,5|_therian|_therian||||1}
{642|therian||||_therian|OtherForms,10,5|_therian|_therian|||} {642|therian||||_therian|OtherForms,10,5|_therian|_therian||||1}
{645|therian||||_therian|OtherForms,11,5|_therian|_therian|||} {645|therian||||_therian|OtherForms,11,5|_therian|_therian||||1}
{646|black||||_black|OtherForms,13,5|_black|_black|||} {646|black||||_black|OtherForms,13,5|_black|_black||||1}
{646|white||||_white|OtherForms,12,5|_white|_white|||} {646|white||||_white|OtherForms,12,5|_white|_white||||1}
{665||||||||||Random;archipelago;continental;elegant;fancy;garden;high_planes;icy_snow;jungle;marine;modern;monsoon;ocean;pokeball;polar;river;sandstorm;savanna;sun;tundra|} {665||||||||||Random;archipelago;continental;elegant;fancy;garden;high_planes;icy_snow;jungle;marine;modern;monsoon;ocean;pokeball;polar;river;sandstorm;savanna;sun;tundra||}
{666||||||Vivillon,0,0|_meadow|_meadow||Random;archipelago;continental;elegant;fancy;garden;high_planes;icy_snow;jungle;marine;modern;monsoon;ocean;pokeball;polar;river;sandstorm;savanna;sun;tundra|} {666||||||Vivillon,0,0|_meadow|_meadow||Random;archipelago;continental;elegant;fancy;garden;high_planes;icy_snow;jungle;marine;modern;monsoon;ocean;pokeball;polar;river;sandstorm;savanna;sun;tundra||}
{666|archipelago|||||Vivillon,1,0|_archipelago|_archipelago|||} {666|archipelago|||||Vivillon,1,0|_archipelago|_archipelago||||1}
{666|continental|||||Vivillon,2,0|_continental|_continental|||} {666|continental|||||Vivillon,2,0|_continental|_continental||||1}
{666|elegant|||||Vivillon,3,0|_elegant|_elegant|||} {666|elegant|||||Vivillon,3,0|_elegant|_elegant||||1}
{666|fancy|||||Vivillon,4,0|_fancy|_fancy|||} {666|fancy|||||Vivillon,4,0|_fancy|_fancy||||1}
{666|garden|||||Vivillon,5,0|_garden|_garden|||} {666|garden|||||Vivillon,5,0|_garden|_garden||||1}
{666|high_planes|||||Vivillon,6,0|_high_planes|_high_planes|||} {666|high_planes|||||Vivillon,6,0|_high_planes|_high_planes||||1}
{666|icy_snow|||||Vivillon,7,0|_icy_snow|_icy_snow|||} {666|icy_snow|||||Vivillon,7,0|_icy_snow|_icy_snow||||1}
{666|jungle|||||Vivillon,8,0|_jungle|_jungle|||} {666|jungle|||||Vivillon,8,0|_jungle|_jungle||||1}
{666|marine|||||Vivillon,9,0|_marine|_marine|||} {666|marine|||||Vivillon,9,0|_marine|_marine||||1}
{666|meadow|||||Vivillon,0,0|_meadow|_meadow|||} {666|meadow|||||Vivillon,0,0|_meadow|_meadow||||1}
{666|modern|||||Vivillon,10,0|_modern|_modern|||} {666|modern|||||Vivillon,10,0|_modern|_modern||||1}
{666|monsoon|||||Vivillon,11,0|_monsoon|_monsoon|||} {666|monsoon|||||Vivillon,11,0|_monsoon|_monsoon||||1}
{666|ocean|||||Vivillon,12,0|_ocean|_ocean|||} {666|ocean|||||Vivillon,12,0|_ocean|_ocean||||1}
{666|pokeball|||||Vivillon,13,0|_pokeball|_pokeball|||} {666|pokeball|||||Vivillon,13,0|_pokeball|_pokeball||||1}
{666|polar|||||Vivillon,14,0|_polar|_polar|||} {666|polar|||||Vivillon,14,0|_polar|_polar||||1}
{666|river|||||Vivillon,15,0|_river|_river|||} {666|river|||||Vivillon,15,0|_river|_river||||1}
{666|sandstorm|||||Vivillon,0,1|_sandstorm|_sandstorm|||} {666|sandstorm|||||Vivillon,0,1|_sandstorm|_sandstorm||||1}
{666|savanna|||||Vivillon,1,1|_savanna|_savanna|||} {666|savanna|||||Vivillon,1,1|_savanna|_savanna||||1}
{666|sun|||||Vivillon,2,1|_sun|_sun|||} {666|sun|||||Vivillon,2,1|_sun|_sun||||1}
{666|tundra|||||Vivillon,3,1|_tundra|_tundra|||} {666|tundra|||||Vivillon,3,1|_tundra|_tundra||||1}
{668||Gender;0|||||_m|_m|||} {668||Gender;0|||||_m|_m||||}
{668||Gender;1||||Gender,3,0|_f|_f|||} {668||Gender;1||||Gender,3,0|_f|_f||||}
{669|||||||_red|_red||Random;red;yellow;blue;orange;white|} {669|||||||_red|_red||Random;red;yellow;blue;orange;white||}
{669|red||||||_red|_red|||} {669|red||||||_red|_red||||1}
{669|yellow|||||OtherForms,0,7|_yellow|_yellow|||} {669|yellow|||||OtherForms,0,7|_yellow|_yellow||||1}
{669|blue|||||OtherForms,1,7|_blue|_blue|||} {669|blue|||||OtherForms,1,7|_blue|_blue||||1}
{669|orange|||||OtherForms,2,7|_orange|_orange|||} {669|orange|||||OtherForms,2,7|_orange|_orange||||1}
{669|white|||||OtherForms,3,7|_white|_white|||} {669|white|||||OtherForms,3,7|_white|_white||||1}
{670|||||||_red|_red||Random;red;yellow;blue;orange;white|} {670|||||||_red|_red||Random;red;yellow;blue;orange;white||}
{670|eternal||||_eternal|OtherForms,4,7|_eternal|_eternal|||} {670|eternal||||_eternal|OtherForms,4,7|_eternal|_eternal||||1}
{670|red||||||_red|_red|||} {670|red||||||_red|_red||||1}
{670|yellow|||||OtherForms,5,7|_yellow|_yellow|||} {670|yellow|||||OtherForms,5,7|_yellow|_yellow||||1}
{670|blue|||||OtherForms,6,7|_blue|_blue|||} {670|blue|||||OtherForms,6,7|_blue|_blue||||1}
{670|orange|||||OtherForms,7,7|_orange|_orange|||} {670|orange|||||OtherForms,7,7|_orange|_orange||||1}
{670|white|||||OtherForms,8,7|_white|_white|||} {670|white|||||OtherForms,8,7|_white|_white||||1}
{671|||||||_red|_red||Random;red;yellow;blue;orange;white|} {671|||||||_red|_red||Random;red;yellow;blue;orange;white||}
{671|red||||||_red|_red|||} {671|red||||||_red|_red||||1}
{671|yellow|||||OtherForms,9,7|_yellow|_yellow|||} {671|yellow|||||OtherForms,9,7|_yellow|_yellow||||1}
{671|blue|||||OtherForms,10,7|_blue|_blue|||} {671|blue|||||OtherForms,10,7|_blue|_blue||||1}
{671|orange|||||OtherForms,11,7|_orange|_orange|||} {671|orange|||||OtherForms,11,7|_orange|_orange||||1}
{671|white|||||OtherForms,12,7|_white|_white|||} {671|white|||||OtherForms,12,7|_white|_white||||1}
{681|blade||||_blade|OtherForms,6,8|_blade|_blade|||} {681|blade||||_blade|OtherForms,6,8|_blade|_blade||||1}
{705|hisui||Hisuian ||_hisui|Regional,12,4|_hisui|_hisui|||} {705|hisui||Hisuian ||_hisui|Regional,12,4|_hisui|_hisui||||}
{706|hisui||Hisuian ||_hisui|Regional,13,4|_hisui|_hisui|||} {706|hisui||Hisuian ||_hisui|Regional,13,4|_hisui|_hisui||||}
{713|hisui||Hisuian ||_hisui|Regional,14,4|_hisui|_hisui|||} {713|hisui||Hisuian ||_hisui|Regional,14,4|_hisui|_hisui||||}
{719|mega||Mega ||_mega|Megas,15,2|_mega|_mega|||} {719|mega||Mega ||_mega|Megas,15,2|_mega|_mega||||}
{720|unbound||||_unbound|OtherForms,0,9|_unbound|_unbound|||} {720|unbound||||_unbound|OtherForms,0,9|_unbound|_unbound||||1}
{724|hisui||Hisuian ||_hisui|Regional,15,4|_hisui|_hisui|||} {724|hisui||Hisuian ||_hisui|Regional,15,4|_hisui|_hisui||||}

2
P3D/Content/Data/pokedex.dat
View File

@ -1,5 +1,5 @@
Johto Pokédex|0|152-160,16-18,21,22,163,164,19,20,161,162,10-15,165-168,175,176,468,174,39,40,298,183,184,60-62,186,194,195,118,119,550,79,80,199,54,55,74-76,41,42,169,92-94,206,23,24,179-181,231,232,216,217,50,51,27,28,187-189,191,192,69-71,43-45,182,546-549,46-49,102,103,193,469,204,205,123,212,127,214,190,424,742,743,438,185,96,97,63-65,177,178,213,327,235,201,360,202,132,442,203,234,29-34,52,53,83,37,38,58,59,209,210,241,128-130,98,99,72,73,120,121,211,222,90,91,170,171,458,226,116,117,230,369,688-691,109,110,81,82,462,837-839,56,57,66-68,95,208,200,429,108,463,440,113,242,228,229,207,472,227,225,333,334,215,461,238,124,220,221,473,524-526,703,302,303,621,86,87,602-604,131,636,637,133-136,196,197,470,471,700,243-245,147-149,249-251,719|0 Johto Pokédex|0|152-160,16-18,21,22,163,164,19,20,161,162,10-15,165-168,175,176,468,174,39,40,298,183,184,60-62,186,194,195,118,119,550,79,80,199,54,55,74-76,41,42,169,92-94,206,23,24,179-181,231,232,216,217,50,51,27,28,187-189,191,192,69-71,43-45,182,546-549,46-49,102,103,193,469,204,205,123,212,127,214,190,424,742,743,438,185,96,97,63-65,177,178,213,327,235,201,360,202,132,442,203,234,29-34,52,53,83,37,38,58,59,209,210,241,128-130,98,99,72,73,120,121,211,222,90,91,170,171,458,226,116,117,230,369,688-691,109,110,81,82,462,837-839,56,57,66-68,95,208,200,429,108,463,440,113,242,228,229,207,472,227,225,333,334,215,461,238,124,220,221,473,524-526,703,302,303,621,86,87,602-604,131,636,637,133-136,196,197,470,471,700,243-245,147-149,249-251,719|0
Unown Pokédex|pokedex_unown|201;0,201;1,201;2,201;3,201;4,201;5,201;6,201;7,201;8,201;9,201;10,201;11,201;12,201;13,201;14,201;15,201;16,201;17,201;18,201;19,201;20,201;21,201;22,201;23,201;24,201;25,201;26,201;27|0
Kanto Pokédex|pokedex_kanto|1-9,16-18,21,22,163,164,19,20,161,162,172,25,26,10-15,173,35,36,174,39,40,60-62,186,194,195,118,119,79,80,199,54,55,74-76,524-526,41,42,169,92-94,23,24,231,232,216,217,50,51,27,28,104,105,187-189,191,192,69-71,43-45,182,114,465,46-49,708,709,96,97,63-65,439,122,280-282,475,605,606,177,178,360,202,442,29-34,52,53,84,85,77,78,37,38,58,59,209,210,129,130,98,99,72,73,211,222,120,121,170,171,116,117,230,88,89,100,101,239,125,466,599-601,81,82,462,436,437,374-376,236,106,107,237,447,448,56,57,296,297,307,308,66-68,218,219,299,476,703,337,338,95,208,111,112,464,304-306,707,200,429,622,623,562,563,679-681,115,440,113,242,198,430,228,229,215,461,238,124,86,87,613,614,582-584,132,138-142,714,715,446,143-146,246-248,150,385|0 Kanto Pokédex|pokedex_kanto|1-9,16-18,21,22,163,164,19,20,161,162,172,25,26,10-15,173,35,36,174,39,40,60-62,186,194,195,118,119,79,80,199,54,55,74-76,524-526,41,42,169,92-94,23,24,231,232,216,217,50,51,27,28,104,105,187-189,191,192,69-71,43-45,182,114,465,46-49,708,709,96,97,63-65,439,122,280-282,475,605,606,177,178,360,202,442,29-34,52,53,84,85,77,78,37,38,58,59,209,210,129,130,98,99,72,73,211,222,120,121,170,171,116,117,230,88,89,100,101,239,125,466,599-601,81,82,462,436,437,374-376,236,106,107,237,447,448,56,57,296,297,307,308,66-68,218,219,299,476,703,337,338,95,208,111,112,464,304-306,707,200,429,622,623,562,563,679-681,115,440,113,242,198,430,228,229,215,461,238,124,86,87,613,614,582-584,132,138-142,714,715,446,143-146,246-248,150,385|0
Sevii Pokédex|pokedex_sevii|16-18,21,22,19_alola,20_alola,161,162,172,25,26_alola,10-15,165-168,298,183,184,60-62,186,194,195,118,119,79,80,199,54,55,74_alola,75_alola,76_alola,524-528,41,42,169,92-94,618,231,232,50_alola,51_alola,187-189,69-71,43-45,182,48,49,102,103_alola,114,465,193,469,588,589,616,617,214,96,97,177,178,201,360,202,52_alola,53_alola,77,78,198,430,129,130,456,457,318,319,692,693,98,99,690,691,223,224,72,73,592,593,120,121,211,222,688,689,90,91,366-370,320,321,458,226,278,279,116,117,230,88_alola,89_alola,66-68,218,219,324,104,105_alola,240,126,467,95,208,200,429,227,225,215,461,238,124,37_alola,38_alola,27_alola,28_alola,220,221,473,86,87,131,246-248,721,489,490,151|0 Sevii Pokédex|pokedex_sevii|16-18,21,22,19_alola,20_alola,161,162,172,25,26_alola,10-15,165-168,298,183,184,60-62,186,194,195,118,119,79,80,199,54,55,74_alola,75_alola,76_alola,524-528,41,42,169,92-94,618,231,232,50_alola,51_alola,187-189,69-71,43-45,182,48,49,102,103_alola,114,465,193,469,588,589,616,617,214,96,97,177,178,201,360,202,52_alola,53_alola,77,78,198,430,129,130,456,457,318,319,692,693,98,99,690,691,223,224,72,73,592,593,120,121,211,222,688,689,90,91,366-370,320,321,458,226,278,279,116,117,230,88_alola,89_alola,66-68,218,219,324,104,105_alola,240,126,467,95,208,200,429,227,225,215,461,238,124,37_alola,38_alola,27_alola,28_alola,220,221,473,86,87,131,246-248,721,489,490,151|0
Unown Pokédex|pokedex_unown|201;0,201;1,201;2,201;3,201;4,201;5,201;6,201;7,201;8,201;9,201;10,201;11,201;12,201;13,201;14,201;15,201;16,201;17,201;18,201;19,201;20,201;21,201;22,201;23,201;24,201;25,201;26,201;27|0
National Pokédex|pokedex_national|1-[MAX]|1 National Pokédex|pokedex_national|1-[MAX]|1

9
P3D/Player/Player.vb
View File

@ -725,14 +725,7 @@
If Line.StartsWith("{") = True And Line.EndsWith("}") = True Then If Line.StartsWith("{") = True And Line.EndsWith("}") = True Then
Dim p As Pokemon = Pokemon.GetPokemonByData(Line) Dim p As Pokemon = Pokemon.GetPokemonByData(Line)
Dim dexID As String = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData) Dim dexID As String = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData, True)
If dexID.Contains("_") = False Then
If PokemonForms.GetAdditionalDataForms(p.Number) IsNot Nothing AndAlso PokemonForms.GetAdditionalDataForms(p.Number).Contains(p.AdditionalData) Then
dexID = p.Number & ";" & p.AdditionalData
Else
dexID = p.Number.ToString
End If
End If
If p.IsEgg() = False Then If p.IsEgg() = False Then
If p.IsShiny = True Then If p.IsShiny = True Then

95
P3D/Player/Pokedex.vb
View File

@ -103,10 +103,8 @@
Dim cData As String = Data Dim cData As String = Data
If cOriginalEntry <> "" Then If cOriginalEntry <> "" Then
If CInt(cOriginalEntry) < Type Then If CInt(cOriginalEntry) < Type Then
If Data.Contains("{" & ID.GetSplit(0, ";").GetSplit(0, "_") & "|") = True Then If Data.Contains("{" & ID.GetSplit(0, ";").GetSplit(0, "_") & "|") = False Then
cData = Data.Replace("{" & ID.GetSplit(0, ";").GetSplit(0, "_") & "|" & cEntry & "}", "{" & ID.GetSplit(0, ";").GetSplit(0, "_") & "|" & Type & "}") cData &= Environment.NewLine & "{" & ID.GetSplit(0, ";").GetSplit(0, "_") & "|" & 0 & "}"
Else
cData &= Environment.NewLine & "{" & ID.GetSplit(0, ";").GetSplit(0, "_") & "|" & Type & "}"
End If End If
End If End If
End If End If
@ -125,20 +123,20 @@
If ID.Contains("_") Then If ID.Contains("_") Then
If Pokemon.GetPokemonByID(CInt(ID.GetSplit(0, "_"))).DexForms.Contains(ID.GetSplit(1, "_")) Then If Pokemon.GetPokemonByID(CInt(ID.GetSplit(0, "_"))).DexForms.Contains(ID.GetSplit(1, "_")) Then
If cData.Contains("{" & ID.GetSplit(0, "_") & "|") = False Then If cData.Contains("{" & ID.GetSplit(0, "_") & "|") = False Then
cData &= "{" & ID.GetSplit(0, "_") & "|" & Type & "}" & Environment.NewLine cData &= "{" & ID.GetSplit(0, "_") & "|" & 0 & "}" & Environment.NewLine
End If End If
End If End If
End If End If
If ID.Contains(";") Then If ID.Contains(";") Then
If cData.Contains("{" & ID.GetSplit(0, ";") & "|") = False Then If cData.Contains("{" & ID.GetSplit(0, ";") & "|") = False Then
cData &= "{" & ID.GetSplit(0, ";") & "|" & Type & "}" & Environment.NewLine cData &= "{" & ID.GetSplit(0, ";") & "|" & 0 & "}" & Environment.NewLine
End If End If
End If End If
cData &= "{" & ID & "|" & Type & "}" cData &= "{" & ID & "|" & Type & "}"
Return cData Return cData
End If End If
End If End If
Return Data Return Data
End Function End Function
@ -338,6 +336,21 @@
For Each v As String In _originalPokemonList.Values For Each v As String In _originalPokemonList.Values
If GetEntryType(Core.Player.PokedexData, v) > 1 Then If GetEntryType(Core.Player.PokedexData, v) > 1 Then
o += 1 o += 1
Else
If v.Contains("_") = False AndAlso v.Contains(";") = False Then
Dim Forms As List(Of String) = PokemonForms.GetCountForms(CInt(v))
Dim addCount As Boolean = False
If Forms IsNot Nothing Then
For f = 0 To Forms.Count - 1
If GetEntryType(Core.Player.PokedexData, Forms(f)) > 1 Then
addCount = True
End If
Next
End If
If addCount = True Then
o += 1
End If
End If
End If End If
Next Next
Return o Return o
@ -350,12 +363,80 @@
For Each v As String In _originalPokemonList.Values For Each v As String In _originalPokemonList.Values
If GetEntryType(Core.Player.PokedexData, v) = 1 Then If GetEntryType(Core.Player.PokedexData, v) = 1 Then
o += 1 o += 1
Else
If v.Contains("_") = False AndAlso v.Contains(";") = False Then
Dim Forms As List(Of String) = PokemonForms.GetCountForms(CInt(v))
Dim addCount As Boolean = False
If Forms IsNot Nothing Then
For f = 0 To Forms.Count - 1
If GetEntryType(Core.Player.PokedexData, Forms(f)) = 1 Then
addCount = True
End If
Next
If addCount = True Then
o += 1
End If
End If
End If
End If End If
Next Next
Return o Return o
End Get End Get
End Property End Property
Public Shared Function HasAnyForm(ID As Integer) As Integer
If GetEntryType(Core.Player.PokedexData, ID.ToString) > 0 Then
Return GetEntryType(Core.Player.PokedexData, ID.ToString)
Else
Dim p As Pokemon = Pokemon.GetPokemonByID(ID, "", True)
Dim EntryType As Integer = 0
If p.DexForms.Count > 0 AndAlso p.DexForms(0) <> " " Then
For i = 0 To p.DexForms.Count - 1
Dim pAD As String = PokemonForms.GetAdditionalValueFromDataFile(CStr(p.Number & "_" & p.DexForms(i)))
If pAD <> "" Then
If GetEntryType(Core.Player.PokedexData, CStr(p.Number & "_" & p.DexForms(i))) > 0 Then
Dim Forms As List(Of String) = PokemonForms.GetCountForms(CInt(p.Number))
If Forms IsNot Nothing Then
If Forms.Contains(CStr(p.Number & "_" & p.DexForms(i))) = True Then
If GetEntryType(Core.Player.PokedexData, CStr(p.Number & "_" & p.DexForms(i))) > EntryType Then
EntryType = GetEntryType(Core.Player.PokedexData, CStr(p.Number & "_" & p.DexForms(i)))
End If
Else
If 1 > EntryType Then
EntryType = 1
End If
End If
End If
End If
End If
Next
Else
Dim ADlist As List(Of String) = PokemonForms.GetAdditionalDataForms(p.Number)
If ADlist IsNot Nothing AndAlso ADlist.Count > 0 Then
For i = 0 To ADlist.Count - 1
If GetEntryType(Core.Player.PokedexData, CStr(p.Number & ";" & ADlist(i))) > 0 Then
Dim Forms As List(Of String) = PokemonForms.GetCountForms(CInt(p.Number))
If Forms IsNot Nothing Then
If Forms.Contains(CStr(p.Number & ";" & ADlist(i))) = True Then
If GetEntryType(Core.Player.PokedexData, CStr(p.Number & ";" & ADlist(i))) > EntryType Then
EntryType = GetEntryType(Core.Player.PokedexData, CStr(p.Number & ";" & ADlist(i)))
End If
Else
If 1 > EntryType Then
EntryType = 1
End If
End If
End If
End If
Next
End If
End If
Return EntryType
End If
End Function
Public ReadOnly Property Count() As Integer Public ReadOnly Property Count() As Integer
Get Get
Return Me._originalPokemonList.Keys.Count Return Me._originalPokemonList.Keys.Count

30
P3D/Pokemon/Monster/Resource/PokemonForms.vb
View File

@ -122,6 +122,11 @@ Public Class PokemonForms
Case Else Case Else
form.TypeChange = Element.Types.Blank form.TypeChange = Element.Types.Blank
End Select End Select
If arguments.Count >= 13 Then
If arguments(12) <> "" Then
form.IncludeBaseFormInDexCount = CBool(arguments(12))
End If
End If
End If End If
End If End If
End If End If
@ -487,6 +492,30 @@ Public Class PokemonForms
Return "" Return ""
End Function End Function
Public Shared Function GetCountForms(ByVal Number As Integer) As List(Of String)
Dim Forms As New List(Of String)
If _pokemonList.Count > 0 Then
For Each listP In _pokemonList
If listP.IsNumber(Number) = True AndAlso listP.IncludeBaseFormInDexCount = True Then
If listP.DataFileSuffix = "" Then
Forms.Add(Number.ToString & ";" & listP.AdditionalValue)
Else
Forms.Add(Number.ToString & listP.DataFileSuffix)
End If
End If
Next
End If
If Forms.Count > 0 Then
Return Forms
End If
Return Nothing
End Function
Public Shared Function GetDefaultOverworldSpriteAddition(ByVal Number As Integer) As String Public Shared Function GetDefaultOverworldSpriteAddition(ByVal Number As Integer) As String
Return "" Return ""
End Function End Function
@ -510,6 +539,7 @@ Public Class PokemonForms
Public CryFileSuffix As String = "" Public CryFileSuffix As String = ""
Public WildFormTriggers As New List(Of String) Public WildFormTriggers As New List(Of String)
Public TypeChange As Element.Types = Element.Types.Blank Public TypeChange As Element.Types = Element.Types.Blank
Public IncludeBaseFormInDexCount As Boolean = False
Public Overridable Function GetInitialAdditionalData(ByVal P As Pokemon) As String Public Overridable Function GetInitialAdditionalData(ByVal P As Pokemon) As String
If WildFormTriggers.Count > 0 Then If WildFormTriggers.Count > 0 Then

9
P3D/Screens/Battle/BattleCatchScreen.vb
View File

@ -287,14 +287,7 @@ nextIndex:
Dim s As String = "Gotcha!~" & p.GetName() & " was caught!" Dim s As String = "Gotcha!~" & p.GetName() & " was caught!"
Dim dexID As String = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData) Dim dexID As String = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData, True)
If dexID.Contains("_") = False Then
If PokemonForms.GetAdditionalDataForms(p.Number) IsNot Nothing AndAlso PokemonForms.GetAdditionalDataForms(p.Number).Contains(p.AdditionalData) Then
dexID = p.Number & ";" & p.AdditionalData
Else
dexID = p.Number.ToString
End If
End If
If Core.Player.HasPokedex = True Then If Core.Player.HasPokedex = True Then
If Pokedex.GetEntryType(Core.Player.PokedexData, dexID) < 2 Then If Pokedex.GetEntryType(Core.Player.PokedexData, dexID) < 2 Then

179
P3D/Screens/Pokedex/PokedexScreen.vb
View File

@ -557,14 +557,7 @@ Public Class PokedexScreen
Dim id As Integer = (y + Scroll) * 6 + x Dim id As Integer = (y + Scroll) * 6 + x
If id <= Me.PokemonList.Count - 1 Then If id <= Me.PokemonList.Count - 1 Then
Dim dexID As String = PokemonForms.GetPokemonDataFileName(Me.PokemonList(id).Number, Me.PokemonList(id).AdditionalData) Dim dexID As String = PokemonForms.GetPokemonDataFileName(Me.PokemonList(id).Number, Me.PokemonList(id).AdditionalData, True)
If dexID.Contains("_") = False Then
If PokemonForms.GetAdditionalDataForms(Me.PokemonList(id).Number) IsNot Nothing AndAlso PokemonForms.GetAdditionalDataForms(Me.PokemonList(id).Number).Contains(Me.PokemonList(id).AdditionalData) Then
dexID = Me.PokemonList(id).Number & ";" & Me.PokemonList(id).AdditionalData
Else
dexID = Me.PokemonList(id).Number.ToString
End If
End If
If Not CHabitat Is Nothing OrElse Me.Profile.Pokedex.OriginalCount >= Profile.Pokedex.GetPlace(dexID) Then If Not CHabitat Is Nothing OrElse Me.Profile.Pokedex.OriginalCount >= Profile.Pokedex.GetPlace(dexID) Then
Canvas.DrawRectangle(New Rectangle(50 + x * 100, 140 + y * 100, 64, 92), New Color(42, 167, 198, 150)) Canvas.DrawRectangle(New Rectangle(50 + x * 100, 140 + y * 100, 64, 92), New Color(42, 167, 198, 150))
@ -586,6 +579,13 @@ Public Class PokedexScreen
DrawPokemonPreview(p) DrawPokemonPreview(p)
End If End If
If entryType = 0 Then
Dim formEntry As Integer = Pokedex.HasAnyForm(Me.PokemonList(id).Number)
If formEntry > 0 Then
entryType = formEntry
End If
End If
Dim c As Color = Color.Gray Dim c As Color = Color.Gray
If entryType > 0 Then If entryType > 0 Then
If entryType > 1 Then If entryType > 1 Then
@ -668,17 +668,17 @@ Public Class PokedexScreen
End Function End Function
Private Sub DrawPokemonPreview(ByVal p As Pokemon) Private Sub DrawPokemonPreview(ByVal p As Pokemon)
Dim dexID As String = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData) Dim dexID As String = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData, True)
If dexID.Contains("_") = False Then
If PokemonForms.GetAdditionalDataForms(p.Number) IsNot Nothing AndAlso PokemonForms.GetAdditionalDataForms(p.Number).Contains(p.AdditionalData) Then
dexID = p.Number & ";" & p.AdditionalData
Else
dexID = p.Number.ToString
End If
End If
Dim entryType As Integer = Pokedex.GetEntryType(Core.Player.PokedexData, dexID) Dim entryType As Integer = Pokedex.GetEntryType(Core.Player.PokedexData, dexID)
If entryType = 0 Then
Dim formEntry As Integer = Pokedex.HasAnyForm(p.Number)
If formEntry > 0 Then
entryType = formEntry
End If
End If
For i = 0 To 4 For i = 0 To 4
Canvas.DrawGradient(New Rectangle(650, 300 + i * 40, 50, 2), New Color(255, 255, 255, 10), New Color(255, 255, 255, 255), True, -1) Canvas.DrawGradient(New Rectangle(650, 300 + i * 40, 50, 2), New Color(255, 255, 255, 10), New Color(255, 255, 255, 255), True, -1)
Canvas.DrawRectangle(New Rectangle(700, 300 + i * 40, 350, 2), Color.White) Canvas.DrawRectangle(New Rectangle(700, 300 + i * 40, 350, 2), Color.White)
@ -812,6 +812,13 @@ Public Class PokedexScreen
SoundManager.PlaySound("select") SoundManager.PlaySound("select")
Core.SetScreen(New PokedexViewScreen(Me, TempPokemonStorage(dexIndex), False, dexIndex - 1)) Core.SetScreen(New PokedexViewScreen(Me, TempPokemonStorage(dexIndex), False, dexIndex - 1))
Else
Dim formEntry As Integer = Pokedex.HasAnyForm(TempPokemonStorage(dexIndex).Number)
If formEntry > 0 Then
SoundManager.PlaySound("select")
Core.SetScreen(New PokedexViewScreen(Me, TempPokemonStorage(dexIndex), False, dexIndex - 1))
End If
End If End If
Else Else
Cursor.X = x Cursor.X = x
@ -1366,12 +1373,7 @@ Public Class PokedexViewScreen
End Sub End Sub
Private Sub LoadPokemonData(ByVal newDexIndex As Integer, Optional ByVal newPokemon As Pokemon = Nothing, Optional playCry As Boolean = False) Private Sub LoadPokemonData(ByVal newDexIndex As Integer, Optional ByVal newPokemon As Pokemon = Nothing, Optional playCry As Boolean = False)
Dim oldCry As String = ""
Dim oldNumber As Integer = -1
If Me.Pokemon IsNot Nothing Then
oldNumber = Me.Pokemon.Number
oldCry = PokemonForms.GetCrySuffix(Me.Pokemon)
End If
If newPokemon IsNot Nothing Then If newPokemon IsNot Nothing Then
EvolutionLineConnections.Clear() EvolutionLineConnections.Clear()
Me.Pokemon = newPokemon Me.Pokemon = newPokemon
@ -1401,11 +1403,18 @@ Public Class PokedexViewScreen
Me.EntryType = Pokedex.GetEntryType(Core.Player.PokedexData, dexID) Me.EntryType = Pokedex.GetEntryType(Core.Player.PokedexData, dexID)
If Me.EntryType = 0 Then
Dim formEntry As Integer = Pokedex.HasAnyForm(Me.Pokemon.Number)
If formEntry > 0 Then
Me.EntryType = formEntry
End If
End If
Me.GetYOffset() Me.GetYOffset()
Me.FillHabitats() Me.FillHabitats()
Me.FillEvolutionGrid() Me.FillEvolutionGrid()
If playCry = True AndAlso oldNumber <> Me.Pokemon.Number OrElse oldCry <> PokemonForms.GetCrySuffix(Me.Pokemon) Then If playCry = True Then
Dim crySuffix As String = PokemonForms.GetCrySuffix(Me.Pokemon) Dim crySuffix As String = PokemonForms.GetCrySuffix(Me.Pokemon)
SoundManager.PlayPokemonCry(Pokemon.Number, crySuffix) SoundManager.PlayPokemonCry(Pokemon.Number, crySuffix)
End If End If
@ -1857,18 +1866,33 @@ Public Class PokedexViewScreen
Dim PDexScreen As PokedexScreen = CType(Me.PreScreen, PokedexScreen) Dim PDexScreen As PokedexScreen = CType(Me.PreScreen, PokedexScreen)
If Me.DexIndex > 0 Then If Me.DexIndex > 0 Then
Dim index As Integer = Me.DexIndex - 1 Dim index As Integer = Me.DexIndex - 1
While Pokedex.GetEntryType(Core.Player.PokedexData, PokemonForms.GetPokemonDataFileName(PDexScreen.PokemonList(index).Number, PDexScreen.PokemonList(index).AdditionalData, True)) = 0
If index > 0 Then Dim pokeID As String = ""
index -= 1
Else If Pokedex.GetEntryType(Core.Player.PokedexData, PokemonForms.GetPokemonDataFileName(PDexScreen.PokemonList(index).Number, PDexScreen.PokemonList(index).AdditionalData, True)) = 0 Then
Exit While pokeID = PokemonForms.GetPokemonDataFileName(PDexScreen.PokemonList(index).Number, PDexScreen.PokemonList(index).AdditionalData, True)
While Pokedex.GetEntryType(Core.Player.PokedexData, pokeID) = 0
Dim formEntry As Integer = Pokedex.HasAnyForm(PDexScreen.PokemonList(index).Number)
If formEntry > 0 Then
pokeID = PDexScreen.PokemonList(index).Number.ToString
Exit While
Else
If index > 0 Then
index -= 1
pokeID = PokemonForms.GetPokemonDataFileName(PDexScreen.PokemonList(index).Number, PDexScreen.PokemonList(index).AdditionalData, True)
Else
Exit While
End If
End If
End While
End If
If pokeID <> "" Then
If Pokedex.GetEntryType(Core.Player.PokedexData, pokeID) > 0 OrElse Pokedex.HasAnyForm(PDexScreen.PokemonList(index).Number) > 0 Then
vLineLength = 1
mLineLength = 1
fadeMainImage = 0
LoadPokemonData(index, Nothing, True)
End If End If
End While
If Pokedex.GetEntryType(Core.Player.PokedexData, PokemonForms.GetPokemonDataFileName(PDexScreen.PokemonList(index).Number, PDexScreen.PokemonList(index).AdditionalData, True)) > 0 Then
vLineLength = 1
mLineLength = 1
fadeMainImage = 0
LoadPokemonData(index, Nothing, True)
End If End If
End If End If
End If End If
@ -1878,29 +1902,58 @@ Public Class PokedexViewScreen
If Me.DexIndex < PDexScreen.PokemonList.count - 1 Then If Me.DexIndex < PDexScreen.PokemonList.count - 1 Then
Dim index As Integer = Me.DexIndex + 1 Dim index As Integer = Me.DexIndex + 1
While Pokedex.GetEntryType(Core.Player.PokedexData, PokemonForms.GetPokemonDataFileName(PDexScreen.PokemonList(index).Number, PDexScreen.PokemonList(index).AdditionalData, True)) = 0 Dim pokeID As String = PokemonForms.GetPokemonDataFileName(PDexScreen.PokemonList(index).Number, PDexScreen.PokemonList(index).AdditionalData, True)
If index < PDexScreen.PokemonList.Count - 1 Then
index += 1 While Pokedex.GetEntryType(Core.Player.PokedexData, pokeID) = 0
Else Dim formEntry As Integer = Pokedex.HasAnyForm(PDexScreen.PokemonList(index).Number)
If formEntry > 0 Then
pokeID = PDexScreen.PokemonList(index).Number.ToString
Exit While Exit While
Else
If index < PDexScreen.PokemonList.Count - 1 Then
index += 1
pokeID = PokemonForms.GetPokemonDataFileName(PDexScreen.PokemonList(index).Number, PDexScreen.PokemonList(index).AdditionalData, True)
Else
Exit While
End If
End If End If
End While End While
If Pokedex.GetEntryType(Core.Player.PokedexData, PokemonForms.GetPokemonDataFileName(PDexScreen.PokemonList(index).Number, PDexScreen.PokemonList(index).AdditionalData, True)) > 0 Then If pokeID <> "" Then
vLineLength = 1 If Pokedex.GetEntryType(Core.Player.PokedexData, pokeID) > 0 OrElse Pokedex.HasAnyForm(PDexScreen.PokemonList(index).Number) > 0 Then
mLineLength = 1 vLineLength = 1
fadeMainImage = 0 mLineLength = 1
LoadPokemonData(index, Nothing, True) fadeMainImage = 0
LoadPokemonData(index, Nothing, True)
End If
End If End If
End If End If
End If End If
End If End If
If Controls.ShiftPressed = True Or ControllerHandler.ButtonPressed(Buttons.Back) Then If Controls.ShiftPressed = True Or ControllerHandler.ButtonPressed(Buttons.Back) Then
Dim OriginalFormIndex As Integer = Me.FormIndex
Me.FormIndex += 1 Me.FormIndex += 1
If Me.FormIndex > Me.Forms.Count - 1 Then If Me.FormIndex > Me.Forms.Count - 1 Then
Me.FormIndex = 0 Me.FormIndex = 0
End If End If
Dim formID As String = Me.Forms(Me.FormIndex)
If formID <> "" AndAlso Pokedex.GetEntryType(Core.Player.PokedexData, formID) = 0 Then
While Pokedex.GetEntryType(Core.Player.PokedexData, formID) = 0
Me.FormIndex += 1
If Me.FormIndex > Me.Forms.Count - 1 Then
Me.FormIndex = 0
End If
formID = Me.Forms(Me.FormIndex)
If FormIndex = OriginalFormIndex Then
Exit While
End If
End While
End If
If Me.Forms(Me.FormIndex) IsNot "" Then If Me.Forms(Me.FormIndex) IsNot "" Then
Dim PokeID As Integer = CInt(Me.Forms(Me.FormIndex).GetSplit(0, "_").GetSplit(0, ";")) Dim PokeID As Integer = CInt(Me.Forms(Me.FormIndex).GetSplit(0, "_").GetSplit(0, ";"))
Dim PokeAD As String = "" Dim PokeAD As String = ""
@ -2068,29 +2121,53 @@ Public Class PokedexViewScreen
If pokemon IsNot Nothing Then If pokemon IsNot Nothing Then
Dim dexID As String = PokemonForms.GetPokemonDataFileName(pokemon.Number, pokemon.AdditionalData, True) Dim dexID As String = PokemonForms.GetPokemonDataFileName(pokemon.Number, pokemon.AdditionalData, True)
Dim TempForms As New List(Of String)
If pokemon.Number <> Me.Pokemon.Number Then
TempForms.Add(pokemon.Number.ToString)
If pokemon.EvolutionLines.Count > 0 Then
For e = 0 To pokemon.EvolutionLines.Count - 1
Dim PokemonIDs As New List(Of String)
Dim DataEntries As String() = pokemon.EvolutionLines(e).Split(",")
For i = 0 To DataEntries.Count - 1
PokemonIDs.Add(DataEntries(i).GetSplit(0, "\"))
Next
For Each f As String In PokemonIDs
If CInt(f.GetSplit(0, "_").GetSplit(0, ";")) = pokemon.Number Then
If Me.Forms.Contains(f) = False Then
TempForms.Add(f)
End If
End If
Next
Next
Else
TempForms.AddRange(Me.Forms)
End If
End If
Dim fIndex As Integer = -1 Dim fIndex As Integer = -1
For f = 0 To Me.Forms.Count - 1 For f = 0 To TempForms.Count - 1
If Me.Forms(f) = dexID Then If TempForms(f) = dexID Then
If Pokedex.GetEntryType(Core.Player.PokedexData, dexID) > 0 Then If Pokedex.GetEntryType(Core.Player.PokedexData, dexID) > 0 Then
fIndex = f fIndex = f
End If End If
End If End If
Next Next
If fIndex <> -1 AndAlso Me.Forms(fIndex) IsNot "" Then If fIndex <> -1 AndAlso TempForms(fIndex) IsNot "" Then
Me.FormIndex = fIndex Me.FormIndex = fIndex
Dim PokeID As Integer = CInt(Me.Forms(Me.FormIndex).GetSplit(0, "_").GetSplit(0, ";")) Dim PokeID As Integer = CInt(TempForms(Me.FormIndex).GetSplit(0, "_").GetSplit(0, ";"))
Dim PokeAD As String = "" Dim PokeAD As String = ""
If Me.Forms(Me.FormIndex).Contains("_") Then If TempForms(Me.FormIndex).Contains("_") Then
PokeAD = PokemonForms.GetAdditionalValueFromDataFile(Me.Forms(Me.FormIndex)) PokeAD = PokemonForms.GetAdditionalValueFromDataFile(TempForms(Me.FormIndex))
ElseIf Me.Forms(Me.FormIndex).Contains(";") Then ElseIf TempForms(Me.FormIndex).Contains(";") Then
PokeAD = Me.Forms(Me.FormIndex).GetSplit(1, ";") PokeAD = TempForms(Me.FormIndex).GetSplit(1, ";")
End If End If
Dim newPokemon As Pokemon = Pokemon.GetPokemonByID(PokeID, PokeAD, True) Dim newPokemon As Pokemon = Pokemon.GetPokemonByID(PokeID, PokeAD, True)
Me.Forms = TempForms
LoadPokemonData(-1, newPokemon, True) LoadPokemonData(-1, newPokemon, True)
ElseIf Me.DexIndex > -1 Then ElseIf Me.DexIndex > -1 Then

19
P3D/World/ActionScript/V1/ScriptV1.vb
View File

@ -710,14 +710,7 @@
If p.IsShiny = True Then If p.IsShiny = True Then
i = 3 i = 3
End If End If
Dim dexID As String = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData) Dim dexID As String = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData, True)
If dexID.Contains("_") = False Then
If PokemonForms.GetAdditionalDataForms(p.Number) IsNot Nothing AndAlso PokemonForms.GetAdditionalDataForms(p.Number).Contains(p.AdditionalData) Then
dexID = p.Number & ";" & p.AdditionalData
Else
dexID = p.Number.ToString
End If
End If
Core.Player.PokedexData = Pokedex.ChangeEntry(Core.Player.PokedexData, dexID, i) Core.Player.PokedexData = Pokedex.ChangeEntry(Core.Player.PokedexData, dexID, i)
Next Next
@ -1024,14 +1017,8 @@
Dim p As Pokemon = Pokemon.GetPokemonByID(ID) Dim p As Pokemon = Pokemon.GetPokemonByID(ID)
p.Generate(Level, True) p.Generate(Level, True)
Dim dexID As String = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData) Dim dexID As String = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData, True)
If dexID.Contains("_") = False Then
If PokemonForms.GetAdditionalDataForms(p.Number) IsNot Nothing AndAlso PokemonForms.GetAdditionalDataForms(p.Number).Contains(p.AdditionalData) Then
dexID = p.Number & ";" & p.AdditionalData
Else
dexID = p.Number.ToString
End If
End If
Core.Player.PokedexData = Pokedex.ChangeEntry(Core.Player.PokedexData, dexID, 1) Core.Player.PokedexData = Pokedex.ChangeEntry(Core.Player.PokedexData, dexID, 1)
Dim b As New BattleSystem.BattleScreen(p, Core.CurrentScreen, 0) Dim b As New BattleSystem.BattleScreen(p, Core.CurrentScreen, 0)

9
P3D/World/ActionScript/V2/ScriptCommands/DoBattle.vb
View File

@ -169,14 +169,7 @@
End If End If
End If End If
Dim dexID As String = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData) Dim dexID As String = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData, True)
If dexID.Contains("_") = False Then
If PokemonForms.GetAdditionalDataForms(p.Number) IsNot Nothing AndAlso PokemonForms.GetAdditionalDataForms(p.Number).Contains(p.AdditionalData) Then
dexID = p.Number & ";" & p.AdditionalData
Else
dexID = p.Number.ToString
End If
End If
Core.Player.PokedexData = Pokedex.ChangeEntry(Core.Player.PokedexData, dexID, 1) Core.Player.PokedexData = Pokedex.ChangeEntry(Core.Player.PokedexData, dexID, 1)
Dim b As New BattleSystem.BattleScreen(p, Core.CurrentScreen, method) Dim b As New BattleSystem.BattleScreen(p, Core.CurrentScreen, method)

9
P3D/World/ActionScript/V2/ScriptCommands/DoPlayer.vb
View File

@ -19,14 +19,7 @@
i = 3 i = 3
End If End If
Dim dexID As String = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData) Dim dexID As String = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData, True)
If dexID.Contains("_") = False Then
If PokemonForms.GetAdditionalDataForms(p.Number) IsNot Nothing AndAlso PokemonForms.GetAdditionalDataForms(p.Number).Contains(p.AdditionalData) Then
dexID = p.Number & ";" & p.AdditionalData
Else
dexID = p.Number.ToString
End If
End If
Core.Player.PokedexData = Pokedex.ChangeEntry(Core.Player.PokedexData, dexID, i) Core.Player.PokedexData = Pokedex.ChangeEntry(Core.Player.PokedexData, dexID, i)
Next Next

58
P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb
View File

@ -12,9 +12,18 @@
Select Case command.ToLower() Select Case command.ToLower()
Case "cry" Case "cry"
Dim PokemonID As Integer = int(argument) Dim PokemonID As String = argument.GetSplit(0)
Dim PokemonAddition As String = "xXx"
If PokemonID.Contains("_") Then
PokemonAddition = PokemonForms.GetAdditionalValueFromDataFile(argument.GetSplit(0))
PokemonID = argument.GetSplit(0).GetSplit(0, "_")
End If
If PokemonID.Contains(";") Then
PokemonAddition = argument.GetSplit(0).GetSplit(1, ";")
PokemonID = argument.GetSplit(0).GetSplit(0, ";")
End If
Dim p As Pokemon = Pokemon.GetPokemonByID(PokemonID) Dim p As Pokemon = Pokemon.GetPokemonByID(CInt(PokemonID), PokemonAddition, True)
p.PlayCry() p.PlayCry()
Case "remove" Case "remove"
Dim index As Integer = int(argument) Dim index As Integer = int(argument)
@ -43,14 +52,7 @@
End If End If
If p.IsEgg() = False Then If p.IsEgg() = False Then
Dim dexID As String = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData) Dim dexID As String = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData, True)
If dexID.Contains("_") = False Then
If PokemonForms.GetAdditionalDataForms(p.Number) IsNot Nothing AndAlso PokemonForms.GetAdditionalDataForms(p.Number).Contains(p.AdditionalData) Then
dexID = p.Number & ";" & p.AdditionalData
Else
dexID = p.Number.ToString
End If
End If
Core.Player.PokedexData = Pokedex.ChangeEntry(Core.Player.PokedexData, dexID, pokedexType) Core.Player.PokedexData = Pokedex.ChangeEntry(Core.Player.PokedexData, dexID, pokedexType)
End If End If
@ -65,8 +67,12 @@
Dim PokemonID As String = argument.GetSplit(0) Dim PokemonID As String = argument.GetSplit(0)
Dim PokemonAddition As String = "xXx" Dim PokemonAddition As String = "xXx"
If PokemonID.Contains("_") Then If PokemonID.Contains("_") Then
PokemonAddition = argument.GetSplit(0).GetSplit(1, "_") PokemonAddition = PokemonForms.GetAdditionalValueFromDataFile(argument.GetSplit(0))
PokemonID = argument.GetSplit(0, "_") PokemonID = argument.GetSplit(0).GetSplit(0, "_")
End If
If PokemonID.Contains(";") Then
PokemonAddition = argument.GetSplit(0).GetSplit(1, ";")
PokemonID = argument.GetSplit(0).GetSplit(0, ";")
End If End If
Dim Level As Integer = int(argument.GetSplit(1)) Dim Level As Integer = int(argument.GetSplit(1))
@ -147,14 +153,7 @@
End If End If
If Pokemon.IsEgg() = False Then If Pokemon.IsEgg() = False Then
Dim dexID As String = PokemonForms.GetPokemonDataFileName(Pokemon.Number, Pokemon.AdditionalData) Dim dexID As String = PokemonForms.GetPokemonDataFileName(Pokemon.Number, Pokemon.AdditionalData, True)
If dexID.Contains("_") = False Then
If PokemonForms.GetAdditionalDataForms(Pokemon.Number) IsNot Nothing AndAlso PokemonForms.GetAdditionalDataForms(Pokemon.Number).Contains(Pokemon.AdditionalData) Then
dexID = Pokemon.Number & ";" & Pokemon.AdditionalData
Else
dexID = Pokemon.Number.ToString
End If
End If
Core.Player.PokedexData = Pokedex.ChangeEntry(Core.Player.PokedexData, dexID, pokedexType) Core.Player.PokedexData = Pokedex.ChangeEntry(Core.Player.PokedexData, dexID, pokedexType)
End If End If
@ -891,14 +890,7 @@
End If End If
If p.IsEgg() = False Then If p.IsEgg() = False Then
Dim dexID As String = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData) Dim dexID As String = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData, True)
If dexID.Contains("_") = False Then
If PokemonForms.GetAdditionalDataForms(p.Number) IsNot Nothing AndAlso PokemonForms.GetAdditionalDataForms(p.Number).Contains(p.AdditionalData) Then
dexID = p.Number & ";" & p.AdditionalData
Else
dexID = p.Number.ToString
End If
End If
Core.Player.PokedexData = Pokedex.ChangeEntry(Core.Player.PokedexData, dexID, pokedexType) Core.Player.PokedexData = Pokedex.ChangeEntry(Core.Player.PokedexData, dexID, pokedexType)
End If End If
Else Else
@ -910,10 +902,14 @@
Next Next
Dim PokemonID As String = argument.GetSplit(0) Dim PokemonID As String = argument.GetSplit(0)
Dim PokemonAddition As String = "" Dim PokemonAddition As String = "xXx"
If PokemonID.Contains("_") Then If PokemonID.Contains("_") Then
PokemonAddition = argument.GetSplit(1, "_") PokemonAddition = PokemonForms.GetAdditionalValueFromDataFile(argument.GetSplit(0))
PokemonID = argument.GetSplit(0, "_") PokemonID = argument.GetSplit(0).GetSplit(0, "_")
End If
If PokemonID.Contains(";") Then
PokemonAddition = argument.GetSplit(0).GetSplit(1, ";")
PokemonID = argument.GetSplit(0).GetSplit(0, ";")
End If End If
Dim Level As Integer = int(argument.GetSplit(1)) Dim Level As Integer = int(argument.GetSplit(1))