Dex Evo/Form Screen Progress + Pichu form fix
This commit is contained in:
parent
d80a9170c1
commit
dae28c537a
|
@ -50,7 +50,7 @@
|
|||
{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|||}
|
||||
{157|hisui||Hisuian ||_hisui|Regional,4,4|_hisui|_hisui|||}
|
||||
{172|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|||}
|
||||
{199|galar||Galarian ||_galar|Regional,11,2|_galar|_galar|||}
|
||||
{201||||||Unown,0,0|_a|-a||Random;0-27|}
|
||||
|
|
|
@ -43,4 +43,7 @@ Move|13,86
|
|||
Move|18,417
|
||||
TradeValue|50
|
||||
Item|50,2006
|
||||
DexForms|spiky-eared
|
||||
EvolutionCondition|25,friendship,220,Level
|
||||
EvolutionLine|172\-1\0,25\0\0,26\1\0
|
||||
EvolutionLine|25\0\0,26_alola\1\1
|
|
@ -1,4 +1,4 @@
|
|||
Name|Spiky-Eared Pichu
|
||||
Name|Pichu
|
||||
Number|172
|
||||
ExperienceType|1
|
||||
BaseExperience|41
|
||||
|
@ -43,3 +43,5 @@ Move|13,86
|
|||
Move|18,417
|
||||
TradeValue|100
|
||||
Item|50,2006
|
||||
EvolutionLine|172\-1\0,25\0\0,26\1\0
|
||||
EvolutionLine|25\0\0,26_alola\1\1
|
|
@ -50,4 +50,6 @@ Move|34,283
|
|||
EvolutionCondition|20,Level,20,Level
|
||||
Item|5,2051
|
||||
TradeValue|10
|
||||
DexForms|Alola
|
||||
DexForms|Alola
|
||||
EvolutionLine|19\0\0,20\1\0
|
||||
EvolutionLine|19_alola\0\1,20_alola\1\1
|
|
@ -58,3 +58,7 @@ Move|58,505
|
|||
TradeValue|50
|
||||
Item|5,82
|
||||
DexForms|Galar
|
||||
EvolutionLine|79\0\0,80\1\-1
|
||||
EvolutionLine|79\0\0,199\1\0
|
||||
EvolutionLine|79_galar\0\1,80_galar\1\1
|
||||
EvolutionLine|79_galar\0\1,199_galar\1\2
|
||||
|
|
|
@ -60,3 +60,7 @@ Move|41,244
|
|||
Move|46,240
|
||||
Move|51,505
|
||||
TradeValue|50
|
||||
EvolutionLine|79\0\0,80\1\-1
|
||||
EvolutionLine|79\0\0,199\1\0
|
||||
EvolutionLine|79_galar\0\1,80_galar\1\1
|
||||
EvolutionLine|79_galar\0\1,199_galar\1\2
|
|
@ -50,4 +50,6 @@ Move|34,283
|
|||
EvolutionCondition|20_alola,Level,20,Level
|
||||
EvolutionCondition|20_alola,daytime,0;3,level
|
||||
Item|5,2002
|
||||
TradeValue|10
|
||||
TradeValue|10
|
||||
EvolutionLine|19\0\0,20\1\0
|
||||
EvolutionLine|19_alola\0\1,20_alola\1\1
|
|
@ -53,4 +53,6 @@ Move|39,38
|
|||
Move|44,283
|
||||
Item|5,2051
|
||||
TradeValue|20
|
||||
DexForms|Alola
|
||||
DexForms|Alola
|
||||
EvolutionLine|19\0\0,20\1\0
|
||||
EvolutionLine|19_alola\0\1,20_alola\1\1
|
|
@ -53,3 +53,5 @@ Move|39,38
|
|||
Move|44,283
|
||||
Item|5,2002
|
||||
TradeValue|20
|
||||
EvolutionLine|19\0\0,20\1\0
|
||||
EvolutionLine|19_alola\0\1,20_alola\1\1
|
|
@ -57,3 +57,5 @@ EvolutionCondition|26_alola,item,23,item
|
|||
Item|5,163
|
||||
Item|50,2006
|
||||
TradeValue|20
|
||||
EvolutionLine|172\-1\0,25\0\0,26\1\0
|
||||
EvolutionLine|25\0\0,26_alola\1\1
|
|
@ -41,3 +41,6 @@ Move|1,85
|
|||
Move|1,98
|
||||
Item|50,2006
|
||||
TradeValue|40
|
||||
DexForms|Alola
|
||||
EvolutionLine|172\-1\0,25\0\0,26\1\0
|
||||
EvolutionLine|25\0\0,26_alola\1\1
|
|
@ -56,3 +56,5 @@ TradeValue|5
|
|||
Item|5,2006
|
||||
EvolutionCondition|264,Level,20,Level
|
||||
DexForms|Galar
|
||||
EvolutionLine|263\-1\0,264\0\0
|
||||
EvolutionLine|263_galar\-1\1,264_galar\0\1,862\1\1
|
|
@ -55,3 +55,5 @@ Move|36,38
|
|||
TradeValue|5
|
||||
Item|5,2006
|
||||
EvolutionCondition|264_galar,Level,20,Level
|
||||
EvolutionLine|263\-1\0,264\0\0
|
||||
EvolutionLine|263_galar\-1\1,264_galar\0\1,862\1\1
|
|
@ -61,3 +61,5 @@ TradeValue|15
|
|||
Item|5,2009
|
||||
Item|50,2006
|
||||
DexForms|Galar
|
||||
EvolutionLine|263\-1\0,264\0\0
|
||||
EvolutionLine|263_galar\-1\1,264_galar\0\1,862\1\1
|
||||
|
|
|
@ -62,3 +62,5 @@ Item|5,2009
|
|||
Item|50,2006
|
||||
EvolutionCondition|862,Level,35,Level
|
||||
EvolutionCondition|862,daytime,0;3,level
|
||||
EvolutionLine|263\-1\0,264\0\0
|
||||
EvolutionLine|263_galar\-1\1,264_galar\0\1,862\1\1
|
|
@ -42,3 +42,5 @@ Move|1,98
|
|||
Move|1,85
|
||||
Item|50,2006
|
||||
TradeValue|40
|
||||
EvolutionLine|172\-1\0,25\0\0,26\1\0
|
||||
EvolutionLine|25\0\0,26_alola\1\1
|
|
@ -50,3 +50,7 @@ Move|89,354
|
|||
Move|97,63
|
||||
TradeValue|120
|
||||
DexForms|attack,defense,speed
|
||||
EvolutionLine|386\0\0
|
||||
EvolutionLine|386_attack\1\-1
|
||||
EvolutionLine|386_defense\1\0
|
||||
EvolutionLine|386_speed\1\1
|
||||
|
|
|
@ -53,3 +53,6 @@ EvolutionCondition|53,Level,28,Level
|
|||
Item|5,73
|
||||
TradeValue|15
|
||||
DexForms|Alola,Galar
|
||||
EvolutionLine|52\0\-1,53\1\-1
|
||||
EvolutionLine|52_alola\0\0,53_alola\1\0
|
||||
EvolutionLine|52_galar\0\1,863\1\1
|
||||
|
|
|
@ -52,3 +52,6 @@ Move|55,399
|
|||
EvolutionCondition|53_alola,friendship,220,level
|
||||
Item|5,73
|
||||
TradeValue|15
|
||||
EvolutionLine|52\0\-1,53\1\-1
|
||||
EvolutionLine|52_alola\0\0,53_alola\1\0
|
||||
EvolutionLine|52_galar\0\1,863\1\1
|
|
@ -49,3 +49,6 @@ Move|44,37
|
|||
EvolutionCondition|863,level,28,level
|
||||
Item|5,73
|
||||
TradeValue|15
|
||||
EvolutionLine|52\0\-1,53\1\-1
|
||||
EvolutionLine|52_alola\0\0,53_alola\1\0
|
||||
EvolutionLine|52_galar\0\1,863\1\1
|
|
@ -57,3 +57,6 @@ Move|65,364
|
|||
Item|5,73
|
||||
TradeValue|25
|
||||
DexForms|Alola
|
||||
EvolutionLine|52\0\-1,53\1\-1
|
||||
EvolutionLine|52_alola\0\0,53_alola\1\0
|
||||
EvolutionLine|52_galar\0\1,863\1\1
|
|
@ -58,3 +58,6 @@ Move|65,364
|
|||
Move|69,399
|
||||
Item|5,73
|
||||
TradeValue|25
|
||||
EvolutionLine|52\0\-1,53\1\-1
|
||||
EvolutionLine|52_alola\0\0,53_alola\1\0
|
||||
EvolutionLine|52_galar\0\1,863\1\1
|
|
@ -57,3 +57,7 @@ Item|5,142
|
|||
EvolutionCondition|80,Level,37,Level
|
||||
EvolutionCondition|199,holditem,82,trade
|
||||
DexForms|Galar
|
||||
EvolutionLine|79\0\-1,80\1\-3
|
||||
EvolutionLine|79\0\-1,199\1\-1
|
||||
EvolutionLine|79_galar\0\1,80_galar\1\1
|
||||
EvolutionLine|79_galar\0\1,199_galar\1\3
|
|
@ -56,3 +56,7 @@ TradeValue|15
|
|||
Item|5,142
|
||||
EvolutionCondition|80_galar,Level,37,Level
|
||||
EvolutionCondition|199_galar,holditem,82,trade
|
||||
EvolutionLine|79\0\-1,80\1\-3
|
||||
EvolutionLine|79\0\-1,199\1\-1
|
||||
EvolutionLine|79_galar\0\1,80_galar\1\1
|
||||
EvolutionLine|79_galar\0\1,199_galar\1\3
|
|
@ -58,3 +58,7 @@ Move|68,505
|
|||
TradeValue|30
|
||||
Item|5,82
|
||||
DexForms|Galar
|
||||
EvolutionLine|79\0\-1,80\1\-3
|
||||
EvolutionLine|79\0\-1,199\1\-1
|
||||
EvolutionLine|79_galar\0\1,80_galar\1\1
|
||||
EvolutionLine|79_galar\0\1,199_galar\1\3
|
|
@ -55,3 +55,7 @@ Move|41,244
|
|||
Move|46,240
|
||||
Move|51,505
|
||||
TradeValue|30
|
||||
EvolutionLine|79\0\-2,80\1\-3
|
||||
EvolutionLine|79\0\-2,199\1\-1
|
||||
EvolutionLine|79_galar\0\2,80_galar\1\1
|
||||
EvolutionLine|79_galar\0\2,199_galar\1\3
|
|
@ -51,4 +51,6 @@ Move|42,163
|
|||
Move|48,319
|
||||
Move|54,37
|
||||
TradeValue|25
|
||||
DexForms|53
|
||||
EvolutionLine|52\0\-1,53\1\-1
|
||||
EvolutionLine|52_alola\0\0,53_alola\1\0
|
||||
EvolutionLine|52_galar\0\1,863\1\1
|
|
@ -633,6 +633,7 @@ Public Class Pokemon
|
|||
Public WildItems As New Dictionary(Of Integer, String)
|
||||
Public RegionalForms As String = ""
|
||||
Public DexForms As New List(Of String)
|
||||
Public EvolutionLines As New List(Of String)
|
||||
|
||||
Private _name As String
|
||||
Private _number As Integer
|
||||
|
@ -1504,6 +1505,8 @@ Public Class Pokemon
|
|||
Else
|
||||
Me.DexForms.Add(" ".ToLower)
|
||||
End If
|
||||
Case "evolutionline"
|
||||
Me.EvolutionLines.Add(Value.ToLower)
|
||||
Case "canbreed"
|
||||
Me.CanBreed = CBool(Value)
|
||||
Case "basehp"
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue