From 35ca74ea1db94dbdecd8ca4472e2428a263d0808 Mon Sep 17 00:00:00 2001 From: "Lynn \"Zhorken\" Vaughan" Date: Mon, 19 May 2014 14:27:19 -0400 Subject: [PATCH] Update the identifiers of abilities and items whose names changed. #117 --- pokedex/data/csv/abilities.csv | 4 +- pokedex/data/csv/items.csv | 68 +++++++++++++------------- pokedex/data/csv/move_effect_prose.csv | 2 +- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/pokedex/data/csv/abilities.csv b/pokedex/data/csv/abilities.csv index 9dca311..726dfab 100644 --- a/pokedex/data/csv/abilities.csv +++ b/pokedex/data/csv/abilities.csv @@ -12,7 +12,7 @@ id,identifier,generation_id,is_main_series 11,water-absorb,3,1 12,oblivious,3,1 13,cloud-nine,3,1 -14,compoundeyes,3,1 +14,compound-eyes,3,1 15,insomnia,3,1 16,color-change,3,1 17,immunity,3,1 @@ -29,7 +29,7 @@ id,identifier,generation_id,is_main_series 28,synchronize,3,1 29,clear-body,3,1 30,natural-cure,3,1 -31,lightningrod,3,1 +31,lightning-rod,3,1 32,serene-grace,3,1 33,swift-swim,3,1 34,chlorophyll,3,1 diff --git a/pokedex/data/csv/items.csv b/pokedex/data/csv/items.csv index 0c3faab..da290ef 100644 --- a/pokedex/data/csv/items.csv +++ b/pokedex/data/csv/items.csv @@ -32,7 +32,7 @@ id,identifier,category_id,cost,fling_power,fling_effect_id 31,soda-pop,27,300,30, 32,lemonade,27,350,30, 33,moomoo-milk,27,500,30, -34,energypowder,27,500,30, +34,energy-powder,27,500,30, 35,energy-root,27,800,30, 36,heal-powder,30,450,30, 37,revival-herb,29,2800,30, @@ -59,7 +59,7 @@ id,identifier,category_id,cost,fling_power,fling_effect_id 58,x-defense,1,550,30, 59,x-speed,1,350,30, 60,x-accuracy,1,950,30, -61,x-special,1,350,30, +61,x-sp-atk,1,350,30, 62,x-sp-def,1,350,30, 63,poke-doll,11,1000,30, 64,fluffy-tail,11,1000,30, @@ -81,10 +81,10 @@ id,identifier,category_id,cost,fling_power,fling_effect_id 80,sun-stone,10,2100,30, 81,moon-stone,10,2100,30, 82,fire-stone,10,2100,30, -83,thunderstone,10,2100,30, +83,thunder-stone,10,2100,30, 84,water-stone,10,2100,30, 85,leaf-stone,10,2100,30, -86,tinymushroom,24,500,30, +86,tiny-mushroom,24,500,30, 87,big-mushroom,24,5000,30, 88,pearl,24,1400,30, 89,big-pearl,24,7500,30, @@ -188,7 +188,7 @@ id,identifier,category_id,cost,fling_power,fling_effect_id 187,custap-berry,5,20,10, 188,jaboca-berry,4,20,10, 189,rowap-berry,4,20,10, -190,brightpowder,12,10,10, +190,bright-powder,12,10,10, 191,white-herb,12,100,10,4 192,macho-brace,14,3000,60, 193,exp-share,16,3000,30, @@ -197,12 +197,12 @@ id,identifier,category_id,cost,fling_power,fling_effect_id 196,mental-herb,12,100,10,4 197,choice-band,13,100,10, 198,kings-rock,12,100,30,7 -199,silverpowder,19,100,10, +199,silver-powder,19,100,10, 200,amulet-coin,16,100,30, 201,cleanse-tag,16,200,30, 202,soul-dew,18,200,30, -203,deepseatooth,18,200,90, -204,deepseascale,18,200,30, +203,deep-sea-tooth,18,200,90, +204,deep-sea-scale,18,200,30, 205,smoke-ball,12,200,30, 206,everstone,16,200,30, 207,focus-band,12,200,10, @@ -215,7 +215,7 @@ id,identifier,category_id,cost,fling_power,fling_effect_id 214,soft-sand,19,100,10, 215,hard-stone,19,100,100, 216,miracle-seed,19,100,30, -217,blackglasses,19,100,30, +217,black-glasses,19,100,30, 218,black-belt,19,100,30, 219,magnet,19,100,30, 220,mystic-water,19,100,30, @@ -223,7 +223,7 @@ id,identifier,category_id,cost,fling_power,fling_effect_id 222,poison-barb,19,100,70,6 223,never-melt-ice,19,100,30, 224,spell-tag,19,100,30, -225,twistedspoon,19,100,30, +225,twisted-spoon,19,100,30, 226,charcoal,19,9800,30, 227,dragon-fang,19,100,70, 228,silk-scarf,19,100,10, @@ -439,14 +439,14 @@ id,identifier,category_id,cost,fling_power,fling_effect_id 438,coupon-2,22,0,, 439,coupon-3,22,0,, 440,storage-key,22,0,, -441,secretpotion,22,0,, +441,secret-potion,22,0,, 442,griseous-orb,18,10000,, 443,vs-recorder,21,0,, 444,gracidea,20,0,, 445,secret-key,20,0,, 446,apricorn-box,21,0,, 447,berry-pots,21,0,, -448,squirtbottle,22,0,, +448,squirt-bottle,22,0,, 449,lure-ball,39,300,, 450,level-ball,39,300,, 451,moon-ball,39,300,, @@ -457,21 +457,21 @@ id,identifier,category_id,cost,fling_power,fling_effect_id 456,park-ball,34,0,, 457,sport-ball,34,0,, 458,red-apricorn,40,0,, -459,blu-apricorn,40,0,, -460,ylw-apricorn,40,0,, -461,grn-apricorn,40,0,, -462,pnk-apricorn,40,0,, -463,wht-apricorn,40,0,, -464,blk-apricorn,40,0,, +459,blue-apricorn,40,0,, +460,yellow-apricorn,40,0,, +461,green-apricorn,40,0,, +462,pink-apricorn,40,0,, +463,white-apricorn,40,0,, +464,black-apricorn,40,0,, 465,dowsing-machine,21,0,, -466,ragecandybar,21,0,, +466,rage-candy-bar,21,0,, 467,red-orb,22,0,, 468,blue-orb,22,0,, 469,jade-orb,22,0,, 470,enigma-stone,20,0,, 471,unown-report,21,0,, 472,blue-card,21,0,, -473,slowpoketail,23,0,, +473,slowpoke-tail,23,0,, 474,clear-bell,22,0,, 475,card-key,22,0,, 476,basement-key,22,0,, @@ -573,11 +573,11 @@ id,identifier,category_id,cost,fling_power,fling_effect_id 572,inquiry-mail,25,50,, 573,like-mail,25,50,, 574,reply-mail,25,50,, -575,bridgemail-s,25,50,, -576,bridgemail-d,25,50,, -577,bridgemail-t,25,50,, -578,bridgemail-v,25,50,, -579,bridgemail-m,25,50,, +575,bridge-mail-s,25,50,, +576,bridge-mail-d,25,50,, +577,bridge-mail-t,25,50,, +578,bridge-mail-v,25,50,, +579,bridge-mail-m,25,50,, 580,prism-scale,10,500,30, 581,eviolite,12,200,40, 582,float-stone,12,200,30, @@ -619,7 +619,7 @@ id,identifier,category_id,cost,fling_power,fling_effect_id 618,poke-toy,11,1000,30, 619,prop-case,21,0,, 620,dragon-skull,22,0,, -621,balmmushroom,24,0,30, +621,balm-mushroom,24,0,30, 622,big-nugget,24,0,30, 623,pearl-string,24,0,30, 624,comet-shard,24,0,30, @@ -633,21 +633,21 @@ id,identifier,category_id,cost,fling_power,fling_effect_id 632,casteliacone,30,100,30, 633,dire-hit-2,43,0,, 634,x-speed-2,43,0,, -635,x-special-2,43,0,, +635,x-sp-atk-2,43,0,, 636,x-sp-def-2,43,0,, -637,x-defend-2,43,0,, +637,x-defense-2,43,0,, 638,x-attack-2,43,0,, 639,x-accuracy-2,43,0,, 640,x-speed-3,43,0,, -641,x-special-3,43,0,, +641,x-sp-atk-3,43,0,, 642,x-sp-def-3,43,0,, -643,x-defend-3,43,0,, +643,x-defense-3,43,0,, 644,x-attack-3,43,0,, 645,x-accuracy-3,43,0,, 646,x-speed-6,43,0,, -647,x-special-6,43,0,, +647,x-sp-atk-6,43,0,, 648,x-sp-def-6,43,0,, -649,x-defend-6,43,0,, +649,x-defense-6,43,0,, 650,x-attack-6,43,0,, 651,x-accuracy-6,43,0,, 652,ability-urge,43,0,, @@ -674,7 +674,7 @@ id,identifier,category_id,cost,fling_power,fling_effect_id 675,shiny-charm,21,0,, 676,plasma-card,22,0,, 677,grubby-hanky,22,0,, -678,colress-mchn,22,0,, +678,colress-machine,22,0,, 679,dropped-item,22,0,, 681,reveal-glass,21,0,, 682,weakness-policy,12,0,, @@ -721,7 +721,7 @@ id,identifier,category_id,cost,fling_power,fling_effect_id 723,roseli-berry,7,0,, 724,kee-berry,4,0,, 725,maranga-berry,4,0,, -726,bargain-ticket,10001,0,, +726,discount-coupon,10001,0,, 727,strange-souvenir,10001,0,, 728,lumiose-galette,30,0,, 729,jaw-fossil,35,0,, diff --git a/pokedex/data/csv/move_effect_prose.csv b/pokedex/data/csv/move_effect_prose.csv index 4915278..52f8605 100644 --- a/pokedex/data/csv/move_effect_prose.csv +++ b/pokedex/data/csv/move_effect_prose.csv @@ -504,7 +504,7 @@ This move cannot be copied by []{move:mirror-move}, nor selected by []{move:assi 172,9,"If the target is paralyzed, inflicts double damage and cures the paralysis.","Inflicts [regular damage]{mechanic:regular-damage}. If the target is [paralyzed]{mechanic:paralyzed}, this move has double power, and the target is cured of its [paralysis]{mechanic:paralysis}." 173,9,Redirects the target's single-target effects to the user for this turn.,"Until the end of this turn, any moves that opposing Pokémon target solely at the user's ally will instead target the user. If both Pokémon on the same side of the [field]{mechanic:field} use this move on the same turn, the Pokémon that uses it last will become the target. -This effect takes priority over []{ability:lightningrod} and []{ability:storm-drain}. +This effect takes priority over []{ability:lightning-rod} and []{ability:storm-drain}. If the user's ally [switches out]{mechanic:switches-out}, opposing Pokémon may still hit it with []{move:pursuit}.