From d9a68e8d89b90c57f8365425c858cfd4b532cc9c Mon Sep 17 00:00:00 2001 From: Eevee Date: Tue, 28 Sep 2010 22:00:08 -0700 Subject: [PATCH] Gen V ability (and a move) effect fixing, round 1. --- pokedex/data/csv/abilities.csv | 30 +++++++++++++++--------------- pokedex/data/csv/move_effects.csv | 2 +- pokedex/data/csv/move_flavor_text.csv | 10 +++++----- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pokedex/data/csv/abilities.csv b/pokedex/data/csv/abilities.csv index ee159bb..5864ed8 100644 --- a/pokedex/data/csv/abilities.csv +++ b/pokedex/data/csv/abilities.csv @@ -480,12 +480,12 @@ Unlike [Forecast]{ability} and [Multitype]{ability}, this ability is not tied to This ability stacks if two allied Pokémon have it.",Damages [sleeping]{mechanic} opponents for 1/8 their max [HP]{mechanic} after each turn. 124,wicked trick,5,"Whenever a move makes contact with this Pokémon, it steals the attacker's held item.",Steals attacking Pokémon's held item on contact. -125,brute force,5,Strong attacks are more powerful. (?),Strong attacks are more powerful. (?) +125,brute force,5,"Moves have greater power, but secondary effects never occur.","Moves have greater power, but secondary effects never occur." 126,antagonist,5,Stat changes are inverted for this Pokémon.,Stat changes are inverted. 127,tension,5,Opposing Pokémon will not automatically eat held Berries. (?),Opposing Pokémon can't eat their Berries. (?) -128,competitive spirit,5,Not yet known. [[ability 128]],Not yet known. [[ability 128]] -129,faint-hearted,5,"When this Pokémon has less than half its max HP, opposing Pokémon's stats are lower. (?)",Lowers opposing Pokémon's stats when HP is less than half. (?) -130,cursed body,5,Not yet known. [[ability 130]],Not yet known. [[ability 130]] +128,competitive spirit,5,"When any of this Pokémon's stats are lowered, its Attack raises by one stage.",Attack rises when stats are lowered. +129,faint-hearted,5,"When this Pokémon has less than half its max HP, its stats are lower.",Stats drop when HP is less than half. +130,cursed body,5,"When this Pokémon attacks, it has a chance to disable one of its target's moves.",May disable a move when attacking. 131,healing heart,5,Occasionally cures friendly Pokémon's major status ailments. (?),Cures allies' major status ailments. (?) 132,friend guard,5,Takes less damage from allies. (?),Takes less damage from allies. (?) 133,fragile armor,5,Every physical move that hits this Pokémon lowers its Attack and raises its Speed. (?),Physical hits lower Attack and raise Speed. @@ -495,28 +495,28 @@ This ability stacks if two allied Pokémon have it.",Damages [sleeping]{mechanic 137,poison rampage,5,This Pokémon inflicts more damage when poisoned.,Power increases when poisoned. 138,heat rampage,5,This Pokémon inflicts more damage when burned.,Power increases when burned. 139,harvest,5,Held berry is reusable. (?),Held berry is reusable. (?) -140,telepathy,5,Not yet known. [[ability 140]],Not yet known. [[ability 140]] +140,telepathy,5,This Pokémon does not take damage from friendly Pokémon's moves.,Avoids attacks from friendly Pokémon. 141,sudden impulse,5,"When this Pokémon enters the field, one of its stats raises by one stage, and one of its stats lowers by one stage.",One stat is raised and one stat is lowered. 142,dustproof,5,This Pokémon takes no damage from weather.,Takes no damage from weather. 143,poisoned drink,5,Poisons attacking Pokémon on contact.,Poisons attacking Pokémon on contact. 144,regeneration,5,Recovers a little HP when switched out. (?),Recovers a little HP when switched out. (?) 145,pigeon chest,5,This Pokémon's Defense cannot be lowered.,Defense cannot be lowered. 146,sand fence,5,This Pokémon's Speed is raised during Sandstorm.,Raises Speed during Sandstorm. -147,miracle skin,5,Not yet known. [[ability 147]],Not yet known. [[ability 147]] +147,miracle skin,5,Not affected by non-damaging moves. (?),Not affected by non-damaging moves. (?) 148,analyze,5,This Pokémon inflicts more damage when it moves last within a turn.,Raises power when moving last. 149,illusion,5,Changes to the appearance of an ally. (?),Changes to the appearance of an ally. (?) 150,eccentric,5,Uses Transform upon entering battle.,Uses Transform upon entering battle. -151,slip through,5,Not yet known. [[ability 151]],Not yet known. [[ability 151]] +151,slip through,5,Ignores Barrier and Light Screen. (?),Ignores Barrier and Light Screen. (?) 152,mummify,5,"Whenever a contact move hits this Pokémon, the attacking Pokémon's ability changes to mummify.",Attacker's ability changes to mummify on contact. -153,brazen,5,Not yet known. [[ability 153]],Not yet known. [[ability 153]] +153,brazen,5,"When this Pokémon faints another Pokémon, its Attack rises by one stage.",Attack raises by one stage after fainting a Pokémon. 154,righteous heart,5,Raises Attack when hit by dark-type moves. (?),Raises Attack when hit by dark-type moves. (?) -155,chatter,5,Not yet known. [[ability 155]],Not yet known. [[ability 155]] -156,magic mirror,5,Not yet known. [[ability 156]],Not yet known. [[ability 156]] +155,skittish,5,Speed rises under some condition... (?),Speed rises under some condition... (?) +156,magic mirror,5,"When this Pokémon is targeted by a non-damaging move, that move will instead hit its user.",Reflects non-damaging moves back at their user. 157,herbivore,5,Raises Attack when hit by grass-type moves. (?),Raises Attack when hit by grass-type moves. (?) -158,mischievous heart,5,Not yet known. [[ability 158]],Not yet known. [[ability 158]] +158,mischievous heart,5,"When this Pokémon selects a non-damaging move, it will act first that turn.",Always acts first when using a non-damaging move. 159,sand power,5,Inflicts more damage during Sandstorm. (?),Inflicts more damage during Sandstorm. (?) -160,iron thorns,5,Inflicts damage on contact. (?),Inflicts damage on contact. (?) +160,iron thorns,5,Inflicts extra damage when using a contact move.,Inflicts extra damage when using a contact move. 161,daruma mode,5,Changes to Daruma form in a pinch.,Changes to Daruma form in a pinch. -162,victory star,5,Not yet known. [[ability 162]],Not yet known. [[ability 162]] -163,turbo blaze,5,Not yet known. [[ability 163]],Not yet known. [[ability 163]] -164,teravoltage,5,Not yet known. [[ability 164]],Not yet known. [[ability 164]] +162,victory star,5,"Raises every friendly Pokémon's Accuracy, including this Pokémon's.","Raises every friendly Pokémon's Accuracy, including this Pokémon's." +163,turbo blaze,5,"When this Pokémon acts, if the target has an ability that would hinder or prevent this Pokémon's selected move, that ability is ignored.",Moves ignore abilities that would hinder or prevent them. +164,teravoltage,5,"When this Pokémon acts, if the target has an ability that would hinder or prevent this Pokémon's selected move, that ability is ignored.",Moves ignore abilities that would hinder or prevent them. diff --git a/pokedex/data/csv/move_effects.csv b/pokedex/data/csv/move_effects.csv index 3d48455..7d0e8c4 100644 --- a/pokedex/data/csv/move_effects.csv +++ b/pokedex/data/csv/move_effects.csv @@ -902,7 +902,7 @@ This move breaks through [Wonder Guard]{ability}." 297,0,Lowers the target's Special Defense by one stage.,Inflicts regular damage. Lowers the target's Special Defense by one stage. 298,0,More powerful against fighting-type Pokémon. (?),More powerful against fighting-type Pokémon. (?) 299,0,Changes target's ability to Simple. (?),Changes target's ability to [Simple]{ability}. (?) -300,0,User copies the target's nature.,User copies the target's nature. +300,0,Copies the user's ability onto the target.,Changes the target's ability to match the user's. This effect ends when the target leaves battle. 301,0,Copies non-damaging moves but makes the user go last.,"If the target would use a non-damaging move this turn, the user will copy the move and act last." 302,0,Power increases the more Pokémon in the trainer's team know this move.,Power increases the more Pokémon in the trainer's team know this move. 303,0,Not yet known. [[effect 303]],Not yet known. [[effect 303]] diff --git a/pokedex/data/csv/move_flavor_text.csv b/pokedex/data/csv/move_flavor_text.csv index cb9e768..1b1cc41 100644 --- a/pokedex/data/csv/move_flavor_text.csv +++ b/pokedex/data/csv/move_flavor_text.csv @@ -10855,7 +10855,7 @@ foe protects itself." 484,11,重たい　体で　相手に　ぶつかって 攻撃する。自分が　相手より 重いほど　威力が　あがる。 485,11,不思議な　電波で　周りに　いる 自分と　同じ　タイプの　 ポケモンに　ダメージを　与える。 486,11,電気の　塊を　相手に ぶつける。相手より　素早さが 速いほど　威力が　あがる。 -487,11,たくさんの　水を　浴びせかけて 相手を　みずタイプに　する。 +487,11,たくさんの　水を　浴びせかけて 相手を　みずタイプに　する。 488,11,炎を　まとい　相手を　攻撃する。 力を　ためて　自分の 素早さを　あげる。 489,11,とぐろを　まいて　集中する。 自分の　攻撃と　防御と　 命中率を　あげる。 490,11,素早い　動きで　相手の　足を ねらって　攻撃する。 相手の　素早さを　さげる。 @@ -10881,7 +10881,7 @@ foe protects itself." 510,11,炎で　相手を　攻撃する。 相手が　きのみを　持っているとき 燃やして　使えなくする。 511,11,相手を　おさえつけて 行動の　順番を 最後に　する。 512,11,軽やかに　相手を　攻撃する。 自分が　道具を　持っていないとき 大きな　ダメージを　与える。　 -513,11,相手の　タイプを　反射して 自分も　同じ　タイプに　なる。 +513,11,相手の　タイプを　反射して 自分も　同じ　タイプに　なる。 514,11,倒れた　味方の　かたきを　討つ。 前の　ターンに　味方が 倒されていると　威力が　あがる。　 515,11,命懸けで　相手を　攻撃する。 自分は　ひんしに　なるが　相手に ＨＰ分の　ダメージを　与える。 516,11,相手が　道具を　持っていないとき 自分が　持っている　道具を 相手に　わたす。 @@ -10890,11 +10890,11 @@ foe protects itself." 519,11,炎の柱で　攻撃する。 くさと　組みあわせると　威力が あがって　周りが　火の海に　なる。 520,11,草の柱で　攻撃する。 みずと　組みあわせると　威力が あがって　あたりが　湿原に　なる。 521,11,攻撃したあと ものすごい　スピードで　もどってきて 控えポケモンと　入れ替わる。 -522,11,抵抗して　相手を　攻撃する。 相手の　特攻を　さげる。 +522,11,抵抗して　相手を　攻撃する。 相手の　特攻を　さげる。 523,11,地面を　踏みならして　自分の 周りに　いるものを　攻撃する。 相手の　素早さを　さげる。 524,11,冷たい　息を 相手に　吹きつけて　攻撃する。 必ず　急所に　当たる。 525,11,相手を　はじきとばして 控えの　ポケモンを　ひきずりだす。 野生の　場合は　戦闘が　終わる。 -526,11,自分を　奮いたてて 攻撃と　特攻を　あげる。 +526,11,自分を　奮いたてて 攻撃と　特攻を　あげる。 527,11,電気の　ネットで 相手を　捕まえて　攻撃する。 相手の　素早さを　さげる。 528,11,電気を　まとって 相手に　ぶつかって　攻撃する。 自分も　少し　ダメージを　受ける。 529,11,ドリルのように　体を　回転しながら 相手に　体当たりする。 急所に　当たりやすい。 @@ -10923,7 +10923,7 @@ foe protects itself." 552,11,炎を　まとい　はばたいて　相手を 攻撃する。自分の　特攻が あがることが　ある。 553,11,電気を　まとった　氷の　塊で ２ターン目に　相手を　たたきつける。 まひ状態に　することが　ある。 554,11,すべてを　凍らせる　激しい　冷気で ２ターン目に　相手を　包みこむ。 やけど状態に　することが　ある。 -555,11,まくしたてる　ように　怒鳴りつけて 相手の　特攻を　さげる。 +555,11,まくしたてる　ように　怒鳴りつけて 相手の　特攻を　さげる。 556,11,大きな　氷柱を 激しく　ぶつけて　攻撃する。 相手を　ひるませることが　ある。 557,11,しゃく熱の　炎を　額から 発生させて　捨て身の　体当たり。 防御　特防　素早さが　さがる。 558,11,巨大な　炎を　たたきつける。 巨大な　雷の　影響を受け 技の　威力が　あがる。 -- 2.7.4