From 7cd9f36e24cdb741f531be36189e09f4cd50d885 Mon Sep 17 00:00:00 2001 From: "Lynn \"Zhorken\" Vaughan" Date: Sun, 9 Mar 2014 20:50:13 -0400 Subject: [PATCH] Improve effects for new moves and abilities a little. --- pokedex/data/csv/ability_prose.csv | 12 ++++--- pokedex/data/csv/move_effect_prose.csv | 46 +++++++++++++++++--------- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/pokedex/data/csv/ability_prose.csv b/pokedex/data/csv/ability_prose.csv index 1c6eba9..4ae58f0 100644 --- a/pokedex/data/csv/ability_prose.csv +++ b/pokedex/data/csv/ability_prose.csv @@ -544,13 +544,15 @@ This ability functions identically to []{ability:mold-breaker} and []{ability:tu 165,9,Protects allies against moves that affect their mental state.,Protects allies against moves that affect their mental state. 166,9,Protects friendly []{type:grass} Pokémon from having their stats lowered by other Pokémon.,Protects friendly []{type:grass} Pokémon from having their stats lowered by other Pokémon. 167,9,"Restores HP upon eating a Berry, in addition to the Berry's effect.","Restores HP upon eating a Berry, in addition to the Berry's effect." -168,9,Changes the bearer's type to match each move it uses.,Changes the bearer's type to match each move it uses. +168,9,Changes the bearer's type to match each move it uses.,"Changes the bearer's type to match each move it uses. + +The type change takes place just before the move is used." 169,9,Halves damage from physical attacks.,Halves damage from physical attacks. 170,9,Steals the target's held item when the bearer uses a damaging move.,Steals the target's held item when the bearer uses a damaging move. 171,9,"Protects against bullet, ball, and bomb-based moves.","Protects against bullet, ball, and bomb-based moves." 172,9,Raises Special Attack by two stages upon having any stat lowered.,Raises Special Attack by two stages upon having any stat lowered. 173,9,Strengthens biting moves to 1.5× their power.,Strengthens biting moves to 1.5× their power. -174,9,Turns the bearer's []{type:normal} moves into []{type:ice} moves.,Turns the bearer's []{type:normal} moves into []{type:ice} moves. +174,9,Turns the bearer's []{type:normal} moves into []{type:ice} moves and strengthens them to 1.3× their power.,Turns the bearer's []{type:normal}-type moves into []{type:ice}-type moves. Moves changed by this ability have 1.3× their power. 175,9,Prevents friendly Pokémon from sleeping.,Prevents friendly Pokémon from sleeping. 176,9,"Changes []{pokemon:aegislash} to Blade Forme before using a damaging move, or Shield Forme before using []{move:kings-shield}.","Changes []{pokemon:aegislash} to Blade Forme before using a damaging move, or Shield Forme before using []{move:kings-shield}." 177,9,Raises []{type:flying} moves' priority by one stage.,Raises []{type:flying} moves' priority by one stage. @@ -558,10 +560,10 @@ This ability functions identically to []{ability:mold-breaker} and []{ability:tu 179,9,Boosts Defense while []{move:grassy-terrain} is in effect.,Boosts Defense while []{move:grassy-terrain} is in effect. 180,9,Passes the bearer's held item to an ally when the ally uses up its item.,Passes the bearer's held item to an ally when the ally uses up its item. 181,9,Strengthens moves that make contact to 1.33× their power.,Strengthens moves that make contact to 1.33× their power. -182,9,Turns the bearer's []{type:normal} moves into []{type:fairy} moves.,Turns the bearer's []{type:normal} moves into []{type:fairy} moves. +182,9,Turns the bearer's []{type:normal} moves into []{type:fairy} moves and strengthens them to 1.3× their power.,Turns the bearer's []{type:normal}-type moves into []{type:fairy} moves. Moves changed by this ability have 1.3× their power. 183,9,Lowers attacking Pokémon's Speed by one stage on contact.,Lowers attacking Pokémon's Speed by one stage on contact. 184,9,Lets the bearer hit twice with damaging moves. The second hit has half power.,Lets the bearer hit twice with damaging moves. The second hit has half power. -185,9,Turns the bearer's []{type:normal} moves into []{type:flying} moves.,Turns the bearer's []{type:normal} moves into []{type:flying} moves. +185,9,Turns the bearer's []{type:normal} moves into []{type:flying} moves and strengthens them to 1.3× their power.,Turns the bearer's []{type:normal}-type moves into []{type:flying}-type moves. Moves changed by this ability have 1.3× their power. 186,9,Strengthens []{type:dark} moves to 1.33× their power for all friendly and opposing Pokémon.,Strengthens []{type:dark} moves for all friendly and opposing Pokémon. 187,9,Strengthens []{type:fairy} moves to 1.33× their power for all friendly and opposing Pokémon.,Strengthens []{type:fairy} moves for all friendly and opposing Pokémon. -188,9,Reverses the effects of []{ability:dark-aura} and []{ability:fairy-aura}.,Reverses the effects of []{ability:dark-aura} and []{ability:fairy-aura}. +188,9,Makes []{ability:dark-aura} and []{ability:fairy-aura} weaken moves of their respective types.,"While this Pokémon is on the field, []{ability:dark-aura} and []{ability:fairy-aura} weaken moves of their respective types to 2/3 their power, rather than strengthening them." diff --git a/pokedex/data/csv/move_effect_prose.csv b/pokedex/data/csv/move_effect_prose.csv index 5abb024..4915278 100644 --- a/pokedex/data/csv/move_effect_prose.csv +++ b/pokedex/data/csv/move_effect_prose.csv @@ -1000,27 +1000,41 @@ 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. +339,9,Deals both []{type:fighting} and []{type:flying}-type damage.,"Inflicts regular damage. For the purposes of type effectiveness, this move is both []{type:fighting}- and []{type:flying}-type: its final effectiveness is determined by multiplying the effectiveness of each type against each of the target's types. + +For all other purposes, this move is pure Fighting-type. If this move's type is changed, its Fighting typing is overwritten, and its secondary type remains Flying. + +If the target has used []{move:minimize} since entering battle, this move has double power and will never miss." 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 the Attack and Special Attack of all []{type:grass} Pokémon in battle.,Raises the Attack and Special Attack of all []{type:grass} Pokémon in battle -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. +341,9,Can only be used after the user has eaten a berry.,"Inflicts regular damage. Can only be used if the user has eaten a berry since the beginning of the battle. + +After the user eats a berry, it may use this move any number of times until the end of the battle, even if it switches out. Eating a held berry, eating a berry via []{move:bug-bite} or []{move:pluck}, or being the target of a [Flung]{move:fling} berry will enable this move. Feeding a Pokémon a berry from the bag or using []{move:natural-gift} will not. + +If the trainer chooses this move when it cannot be used, the choice is rejected outright and the trainer must choose another move." +342,9,Raises the Attack and Special Attack of all []{type:grass} Pokémon in battle.,Raises the Attack and Special Attack of all []{type:grass} Pokémon in battle. +343,9,"Covers the opposing field, lowering opponents' Speed by one stage upon switching in.","Shoots a web over the opponents' side of the field, which lowers the Speed of any opposing Pokémon that enters the field by one stage. + +Pokémon in the air, such as []{type:flying}-types and those with []{ability:levitate}, are unaffected. []{move:rapid-spin} removes Sticky Web from the user's side of the field; []{move:defog} removes it from both sides." +344,9,Raises the user's Attack by two stages if it KOs the target.,Inflicts regular damage. 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,Lowers the target's Attack and Special Attack by one stage.,Lowers 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. +347,9,Changes all []{type:normal} moves to []{type:electric} moves for the rest of the turn.,Changes all Pokémon's []{type:normal} moves to []{type:electric} moves for the rest of the turn. 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. +350,9,Super-effective against []{type:water}.,"Deals regular damage. This move is super-effective against the []{type:water} type. + +The target's other type will affect damage as usual. If this move's type is changed, it remains super-effective against Water regardless of its type." 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. +353,9,Drains 75% of the damage inflicted to heal the user.,Deals regular damage. 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 for the rest of the turn. + +Unlike other blocking moves, this move may be used consecutively without its chance of success falling." 355,9,Raises the Defense of all []{type:grass} Pokémon in battle,Raises the Defense of all []{type:grass} Pokémon in battle. -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. +356,9,"For five turns, heals all Pokémon on the ground for 1/16 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. Changes []{move:nature-power} to []{move:energy-ball}." -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. +357,9,"For five turns, protects all Pokémon on the ground from major status ailments and confusion, and halves the power of incoming []{type:dragon} moves.","For five turns, protects all Pokémon on the ground from major status ailments and confusion and weakens []{type:dragon} moves used against them to 0.5× their power. Changes []{move:nature-power} to []{move:moonblast}." 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. @@ -1030,14 +1044,16 @@ Changes []{move:nature-power} to []{move:moonblast}." 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 a selected ally's Special Defense by one stage.,Raises a selected ally'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. +365,9,"Explodes if the target uses a []{type:fire} move this turn, damaging it for 1/4 its max HP and preventing the move.","Explodes if the target uses a []{type:fire} move this turn, damaging it for 1/4 its max HP and preventing the move." 366,9,"Takes one turn to charge, then raises the user's Special Attack, Special Defense, and Speed by two stages.","Takes one turn to charge, then raises the user's Special Attack, Special Defense, and Speed by two stages." -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. +367,9,Raises the Defense and Special Defense of all friendly Pokémon with []{ability:plus} or []{ability:minus} by one stage.,Raises the Defense and Special Defense of all friendly Pokémon with []{ability:plus} or []{ability:minus} by one stage. +368,9,"For five turns, prevents all Pokémon on the ground from sleeping and strengthens their []{type:electric} moves to 1.5× their power.","For five turns, prevents all Pokémon on the ground from sleeping and strengthens their []{type:electric} moves to 1.5× their power. Changes []{move:nature-power} to []{move:thunderbolt}." 369,9,Lowers the target's Special Attack by two stages.,Lowers the target's Special Attack by two stages. -370,9,Doubles prize money.,Doubles prize money. Stacks with a held item. Only works once per battle.. +370,9,Doubles prize money.,"Doubles prize money. + +Stacks with a held item. Only works once per battle." 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."