mirror of
https://github.com/PokeAPI/pokeapi
synced 2024-11-22 03:13:06 +00:00
Merge pull request #1083 from GreatNovaDragon/master
Resolve #1082: Add Linking cord
This commit is contained in:
commit
367fbe1899
5 changed files with 10 additions and 2 deletions
|
@ -3,8 +3,8 @@ evolution_trigger_id,local_language_id,name
|
||||||
1,6,Levelaufstieg
|
1,6,Levelaufstieg
|
||||||
1,9,Level up
|
1,9,Level up
|
||||||
2,5,Échange
|
2,5,Échange
|
||||||
2,6,Tausch
|
2,6,Tausch oder Verbindungsschnur
|
||||||
2,9,Trade
|
2,9,Trade or Linking Cord
|
||||||
3,5,Utilisation d'un objet
|
3,5,Utilisation d'un objet
|
||||||
3,6,Gegenstand nutzen
|
3,6,Gegenstand nutzen
|
||||||
3,9,Use item
|
3,9,Use item
|
||||||
|
|
|
|
@ -610,3 +610,7 @@ item_id,item_flag_id
|
||||||
303,7
|
303,7
|
||||||
304,5
|
304,5
|
||||||
304,7
|
304,7
|
||||||
|
2160,1
|
||||||
|
2160,2
|
||||||
|
2160,3
|
||||||
|
2160,5
|
|
|
@ -17822,3 +17822,5 @@ item_id,local_language_id,name
|
||||||
2159,1,チャデスのこな
|
2159,1,チャデスのこな
|
||||||
2159,9,Poltchageist Powder
|
2159,9,Poltchageist Powder
|
||||||
2159,11,チャデスのこな
|
2159,11,チャデスのこな
|
||||||
|
2160,9,Linking Cord
|
||||||
|
2160,11, つながりのヒモ
|
|
|
@ -1519,3 +1519,4 @@ This item can only be obtained or used via the Wonder Launcher."
|
||||||
1003,9,XXX new effect for roto-pp-restore,XXX new effect for roto-pp-restore
|
1003,9,XXX new effect for roto-pp-restore,XXX new effect for roto-pp-restore
|
||||||
1004,9,XXX new effect for roto-boost,XXX new effect for roto-boost
|
1004,9,XXX new effect for roto-boost,XXX new effect for roto-boost
|
||||||
1005,9,XXX new effect for roto-catch,XXX new effect for roto-catch
|
1005,9,XXX new effect for roto-catch,XXX new effect for roto-catch
|
||||||
|
2160,9,Allows a Pokemon whose evolution is usually triggered by trading to evolve, The Linking Cord triggers the evolution of certain Pokémon (all of which can alternatively evolve when traded) upon use. This consumes the Linking Cord.
|
||||||
|
|
|
|
@ -2107,5 +2107,6 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
|
||||||
2157,cramorant-down,54,30,,
|
2157,cramorant-down,54,30,,
|
||||||
2158,morpeko-snack,54,15,,
|
2158,morpeko-snack,54,15,,
|
||||||
2159,poltchageist-powder,54,30,,
|
2159,poltchageist-powder,54,30,,
|
||||||
|
2160,linking-cord,10,8000,,
|
||||||
10001,black-augurite,10,0,,
|
10001,black-augurite,10,0,,
|
||||||
10002,peat-block,10,0,,
|
10002,peat-block,10,0,,
|
||||||
|
|
|
Loading…
Reference in a new issue