From 8a752f3be45d42752a9ff61ae3baa71961a49202 Mon Sep 17 00:00:00 2001 From: "Lynn \"Zhorken\" Vaughan" Date: Thu, 7 Nov 2013 10:29:20 -0500 Subject: [PATCH] Add effects for new moves. --- pokedex/data/csv/move_effect_prose.csv | 31 ++++++++- pokedex/data/csv/move_effects.csv | 31 ++++++++- pokedex/data/csv/moves.csv | 96 +++++++++++++------------- 3 files changed, 108 insertions(+), 50 deletions(-) diff --git a/pokedex/data/csv/move_effect_prose.csv b/pokedex/data/csv/move_effect_prose.csv index f0a0d77..7250e25 100644 --- a/pokedex/data/csv/move_effect_prose.csv +++ b/pokedex/data/csv/move_effect_prose.csv @@ -1002,10 +1002,39 @@ If the user is a []{pokemon:meloetta}, it will toggle between Aria and Pirouette This move can hit Pokémon under the effect of []{move:bounce}, []{move:fly}, or []{move:sky-drop}. During []{move:rain-dance}, this move has 100% accuracy. During []{move:sunny-day}, this move has 50% accuracy." +339,9,Deals both []{type:fighting} and []{type:flying}-type damage.,Deals both []{type:fighting} and []{type:flying}-type damage. +340,9,Protects all friendly Pokémon from damaging moves. Only works on the first turn after the user is sent out.,Protects all friendly Pokémon from damaging moves. Only works on the first turn after the user is sent out. +341,9,Uses up the user's berry. Fails if it is not holding one.,Uses up the user's berry. Fails if it is not holding one. +342,9,Raises friendly []{type:grass} Pokémon's Attack and Special Attack.,Raises friendly []{type:grass} Pokémon's Attack and Special Attack. +343,9,Lowers opponents' Speed by one stage when they enter battle.,Lowers opponents' Speed by one stage when they enter battle. +344,9,Raises the user's Attack by two stages if it KOs the target.,Raises the user's Attack by two stages if it KOs the target. +345,9,Adds []{type:ghost} to the target's types.,Adds []{type:ghost} to the target's types. +346,9,Lower's the target's Attack and Special Attack by one stage.,Lower's the target's Attack and Special Attack by one stage. +347,9,Changes []{type:normal} moves to []{type:electric} moves.,Changes []{type:normal} moves to []{type:electric} moves. +348,9,Heals the user for half the total damage dealt to all targets.,Heals the user for half the total damage dealt to all targets. +349,9,Adds []{type:grass} to the target's types.,Adds []{type:grass} to the target's types. +350,9,Super-effective against []{type:water}-types.,Super-effective against []{type:water}-types. +351,9,Lowers all targets' Attack and Special Attack by one stage. Makes the user switch out.,Lowers all targets' Attack and Special Attack by one stage. Makes the user switch out. +352,9,Inverts the target's stat modifiers.,Inverts the target's stat modifiers. +353,9,Drains 75% of the damage inflicted to heal the user.,Drains 75% of the damage inflicted to heal the user. +354,9,Protects all friendly Pokémon from non-damaging moves.,Protects all friendly Pokémon from non-damaging moves. +355,9,Raises friendly []{type:grass} Pokémon's Defense.,Raises friendly []{type:grass} Pokémon's Defense. +356,9,"For five turns, heals all Pokémon on the ground for 1/16 their max HP each turn and strengthens their []{type:grass} moves to 1.5× their power.","For five turns, heals all Pokémon on the ground for 1/16 their max HP each turn and strengthens their []{type:grass} moves to 1.5× their power." +357,9,"For five turns, protects all Pokémon on the ground from major status ailments and confusion and weakens their []{type:dragon} moves to 0.5× their power.","For five turns, protects all Pokémon on the ground from major status ailments and confusion and weakens their []{type:dragon} moves to 0.5× their power." +358,9,Changes the target's move's type to []{type:electric} if it hasn't moved yet this turn.,Changes the target's move's type to []{type:electric} if it hasn't moved yet this turn. +359,9,Prevents all Pokémon from fleeing or switching out during the next turn.,Prevents all Pokémon from fleeing or switching out during the next turn. +360,9,Blocks damaging attacks and lowers attacking Pokémon's Attack by two stages on contact. Switches Aegislash to Shield Forme.,Blocks damaging attacks and lowers attacking Pokémon's Attack by two stages on contact. Switches Aegislash to Shield Forme. +361,9,Lowers the target's Special Attack by one stage.,Lowers the target's Special Attack by one stage. +362,9,Blocks damaging attacks and damages attacking Pokémon for 1/8 their max HP.,Blocks damaging attacks and damages attacking Pokémon for 1/8 their max HP. +363,9,Raises all friendly Pokémon's Special Defense by one stage.,Raises all friendly Pokémon's Special Defense by one stage. +364,9,"Lowers the target's Attack, Special Attack, and Speed by one stage if it is poisoned.","Lowers the target's Attack, Special Attack, and Speed by one stage if it is poisoned." +365,9,Damages the target if it uses a []{type:fire} move.,Damages the target if it uses a []{type:fire} move. +366,9,"Takes one turn to charge, then raises the user's Special Attack, Special Defense, and Speed by one stage.","Takes one turn to charge, then raises the user's Special Attack, Special Defense, and Speed by one stage." +367,9,Raises Defense and Special Defense by one stage for friendly Pokémon with with []{ability:plus} or []{ability:minus}.,Raises Defense and Special Defense by one stage for friendly Pokémon with with []{ability:plus} or []{ability:minus}. +368,9,"For five turns, prevents Pokémon on the ground from sleeping and strengthens their []{type:electric} moves to 1.5× their power.","For five turns, prevents Pokémon on the ground from sleeping and strengthens their []{type:electric} moves to 1.5× their power." 10001,9,Has an increased chance for a critical hit in Hyper Mode.,Inflicts [regular damage]{mechanic:regular-damage}. User's [critical hit]{mechanic:critical-hit} rate is one level higher when using this move while in [hyper mode]{mechanic:hyper-mode}. 10002,9,User receives 1/2 its HP in recoil.,Inflicts [regular damage]{mechanic:regular-damage}. User takes 1/2 of its current [HP]{mechanic:hp} in recoil. 10003,9,Halves HP of all Pokémon on the field. Must recharge,"Halves [HP]{mechanic:hp} of all Pokémon on the field. User loses its next turn to ""recharge"", and cannot attack or [switch]{mechanic:switch} out during that turn." 10004,9,Lowers the target's evasion by two stages.,Lowers the target's [evasion]{mechanic:evasion} by two [stages]{mechanic:stage}. 10005,9,"Removes [Light Screen]{move:light-screen}, [Reflect]{move:reflect}, and [Safeguard]{move:safeguard}.","Removes the effects of []{move:light-screen}, []{move:reflect}, and []{move:safeguard}." 10006,9,Changes the weather to Shadow Sky for five turns.,Changes the weather to Shadow Sky for five turns. Pokémon other than []{type:shadow} Pokémon take 1/16 their max [HP]{mechanic:hp} at the end of every turn. This move is typeless for the purposes of []{move:weather-ball}. -10007,9,[Gen VI placeholder],[Gen VI placeholder] diff --git a/pokedex/data/csv/move_effects.csv b/pokedex/data/csv/move_effects.csv index 00dc5bf..3a851a4 100644 --- a/pokedex/data/csv/move_effects.csv +++ b/pokedex/data/csv/move_effects.csv @@ -316,10 +316,39 @@ id 336 337 338 +339 +340 +341 +342 +343 +344 +345 +346 +347 +348 +349 +350 +351 +352 +353 +354 +355 +356 +357 +358 +359 +360 +361 +362 +363 +364 +365 +366 +367 +368 10001 10002 10003 10004 10005 10006 -10007 diff --git a/pokedex/data/csv/moves.csv b/pokedex/data/csv/moves.csv index 17f8b81..e064dbd 100644 --- a/pokedex/data/csv/moves.csv +++ b/pokedex/data/csv/moves.csv @@ -558,54 +558,54 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 557,v-create,5,10,180,5,95,0,10,2,335,,,, 558,fusion-flare,5,10,100,5,100,0,10,3,336,,,, 559,fusion-bolt,5,13,100,5,100,0,10,2,337,,,, -560,flying-press,6,2,80,10,95,0,10,2,10007,,,, -561,mat-block,6,2,0,10,,0,10,1,10007,,,, -562,belch,6,4,120,10,90,0,10,3,10007,,,, -563,rototiller,6,5,0,10,,0,12,1,10007,,,, -564,sticky-web,6,7,0,20,,0,10,1,10007,,,, -565,fell-stinger,6,7,30,25,100,0,10,2,10007,,,, -566,phantom-force,6,8,90,10,100,0,10,2,10007,,,, -567,trick-or-treat,6,8,0,20,100,0,10,1,10007,,,, -568,noble-roar,6,1,0,30,100,0,10,1,10007,,,, -569,ion-deluge,6,13,0,25,,0,10,1,10007,,,, -570,parabolic-charge,6,13,50,20,100,0,11,3,10007,,,, -571,forests-curse,6,12,0,20,100,0,10,1,10007,,,, -572,petal-blizzard,6,12,90,15,100,0,9,2,10007,,,, -573,freeze-dry,6,15,70,15,100,0,10,3,10007,,,, -574,disarming-voice,6,18,40,15,,0,10,3,10007,,,, -575,parting-shot,6,17,0,20,100,0,10,1,10007,,,, -576,topsy-turvy,6,17,0,10,,0,10,1,10007,,,, -577,draining-kiss,6,18,50,20,100,0,10,3,10007,,,, -578,crafty-shield,6,18,0,10,,4,4,1,10007,,,, -579,flower-shield,6,18,0,10,,0,4,1,10007,,,, -580,grassy-terrain,6,12,0,10,,0,12,1,10007,,,, -581,misty-terrain,6,18,0,15,,0,12,1,10007,,,, -582,electrify,6,13,0,20,,0,10,1,10007,,,, -583,play-rough,6,18,90,10,90,0,10,2,10007,,,, -584,fairy-wind,6,18,40,30,100,0,10,3,10007,,,, -585,moonblast,6,18,95,15,100,0,10,3,10007,,,, -586,boomburst,6,1,140,10,100,0,9,3,10007,,,, -587,fairy-lock,6,18,0,10,,0,12,1,10007,,,, -588,kings-shield,6,9,0,10,,4,7,1,10007,,,, -589,play-nice,6,1,0,20,,0,10,1,10007,,,, -590,confide,6,1,0,20,,0,10,1,10007,,,, -594,water-shuriken,6,11,15,20,100,1,10,2,10007,,,, -595,mystical-fire,6,10,65,10,100,0,10,3,10007,,,, -596,spiky-shield,6,12,0,20,,4,7,1,10007,,,, -597,aromatic-mist,6,18,0,20,,0,4,1,10007,,,, -598,eerie-impulse,6,13,0,15,100,0,10,1,10007,,,, -599,venom-drench,6,4,0,20,100,0,10,1,10007,,,, -600,powder,6,7,0,20,100,1,10,1,10007,,,, -601,geomancy,6,18,0,10,,0,7,1,10007,,,, -602,magnetic-flux,6,13,0,20,,0,4,1,10007,,,, -604,electric-terrain,6,13,0,10,,0,12,1,10007,,,, -605,dazzling-gleam,6,18,80,10,100,0,11,3,10007,,,, -608,baby-doll-eyes,6,18,0,30,100,1,10,1,10007,,,, -609,nuzzle,6,13,20,20,100,0,10,2,10007,,,, -611,infestation,6,7,20,35,100,0,10,3,10007,,,, -612,power-up-punch,6,2,40,30,100,0,10,2,10007,,,, -613,oblivion-wing,6,3,80,10,100,0,10,3,10007,,,, -616,lands-wrath,6,5,90,10,100,0,10,2,10007,,,, +560,flying-press,6,2,80,10,95,0,10,2,339,,,, +561,mat-block,6,2,0,10,,0,10,1,340,,,, +562,belch,6,4,120,10,90,0,10,3,341,,,, +563,rototiller,6,5,0,10,,0,12,1,342,,,, +564,sticky-web,6,7,0,20,,0,10,1,343,,,, +565,fell-stinger,6,7,30,25,100,0,10,2,344,,,, +566,phantom-force,6,8,90,10,100,0,10,2,273,,,, +567,trick-or-treat,6,8,0,20,100,0,10,1,345,,,, +568,noble-roar,6,1,0,30,100,0,10,1,346,,,, +569,ion-deluge,6,13,0,25,,0,10,1,347,,,, +570,parabolic-charge,6,13,50,20,100,0,11,3,348,,,, +571,forests-curse,6,12,0,20,100,0,10,1,349,,,, +572,petal-blizzard,6,12,90,15,100,0,9,2,1,,,, +573,freeze-dry,6,15,70,15,100,0,10,3,350,,,, +574,disarming-voice,6,18,40,15,,0,10,3,18,,,, +575,parting-shot,6,17,0,20,100,0,10,1,351,,,, +576,topsy-turvy,6,17,0,10,,0,10,1,352,,,, +577,draining-kiss,6,18,50,20,100,0,10,3,353,,,, +578,crafty-shield,6,18,0,10,,4,4,1,354,,,, +579,flower-shield,6,18,0,10,,0,4,1,355,,,, +580,grassy-terrain,6,12,0,10,,0,12,1,356,,,, +581,misty-terrain,6,18,0,15,,0,12,1,357,,,, +582,electrify,6,13,0,20,,0,10,1,358,,,, +583,play-rough,6,18,90,10,90,0,10,2,69,10,,, +584,fairy-wind,6,18,40,30,100,0,10,3,1,,,, +585,moonblast,6,18,95,15,100,0,10,3,72,30,,, +586,boomburst,6,1,140,10,100,0,9,3,1,,,, +587,fairy-lock,6,18,0,10,,0,12,1,359,,,, +588,kings-shield,6,9,0,10,,4,7,1,360,,,, +589,play-nice,6,1,0,20,,0,10,1,19,,,, +590,confide,6,1,0,20,,0,10,1,361,,,, +594,water-shuriken,6,11,15,20,100,1,10,2,30,100,,, +595,mystical-fire,6,10,65,10,100,0,10,3,72,100,,, +596,spiky-shield,6,12,0,20,,4,7,1,362,,,, +597,aromatic-mist,6,18,0,20,,0,4,1,363,,,, +598,eerie-impulse,6,13,0,15,100,0,10,1,59,,,, +599,venom-drench,6,4,0,20,100,0,10,1,364,,,, +600,powder,6,7,0,20,100,1,10,1,365,,,, +601,geomancy,6,18,0,10,,0,7,1,366,,,, +602,magnetic-flux,6,13,0,20,,0,4,1,367,,,, +604,electric-terrain,6,13,0,10,,0,12,1,368,,,, +605,dazzling-gleam,6,18,80,10,100,0,11,3,1,,,, +608,baby-doll-eyes,6,18,0,30,100,1,10,1,19,,,, +609,nuzzle,6,13,20,20,100,0,10,2,7,100,,, +611,infestation,6,7,20,35,100,0,10,3,43,,,, +612,power-up-punch,6,2,40,30,100,0,10,2,140,100,,, +613,oblivion-wing,6,3,80,10,100,0,10,3,353,,,, +616,lands-wrath,6,5,90,10,100,0,10,2,1,,,, 10001,shadow-rush,3,10002,55,,100,0,2,2,10001,,,, 10002,shadow-blast,3,10002,80,,100,0,2,3,44,,,, 10003,shadow-blitz,3,10002,40,,100,0,2,2,1,,,,