From c13ba0e58a68960c3676d1a20a2ba33d8684448e Mon Sep 17 00:00:00 2001 From: "Lynn \"Zhorken\" Vaughan" Date: Mon, 19 May 2014 21:41:39 -0400 Subject: [PATCH] Rerip move stats. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Notes: - I left all the flags surskitty added alone (powder, bite, pulse, ballistics, and mental) because they don't seem to be in with the other move flags. The only new flags are the Sky Battle one that I added, and a mystery one, which I didn't add — http://pastebin.com/K27Vk95J - move_meta_* is a mess and I don't like it but X/Y seem to have all the same move meta as B/W did so I updated it for the time being - I didn't update effect_id because I'd have to sort out all the new effects that I added manually and that sounds like a bigger endeavour --- pokedex/data/csv/move_flag_map.csv | 129 ++++++++++++++++++-- pokedex/data/csv/move_flag_prose.csv | 1 + pokedex/data/csv/move_flags.csv | 1 + pokedex/data/csv/move_meta.csv | 58 ++++++++- pokedex/data/csv/move_meta_stat_changes.csv | 32 ++++- pokedex/data/csv/move_target_prose.csv | 2 + pokedex/data/csv/move_targets.csv | 2 + pokedex/data/csv/moves.csv | 68 +++++------ 8 files changed, 247 insertions(+), 46 deletions(-) diff --git a/pokedex/data/csv/move_flag_map.csv b/pokedex/data/csv/move_flag_map.csv index d1943aa..c8afd6d 100644 --- a/pokedex/data/csv/move_flag_map.csv +++ b/pokedex/data/csv/move_flag_map.csv @@ -68,12 +68,14 @@ move_id,move_flag_id 21,1 21,4 21,7 +21,20 22,1 22,4 22,7 23,1 23,4 23,7 +23,20 24,1 24,4 24,7 @@ -108,6 +110,7 @@ move_id,move_flag_id 34,1 34,4 34,7 +34,20 35,1 35,4 35,7 @@ -174,6 +177,7 @@ move_id,move_flag_id 56,7 57,4 57,7 +57,20 58,4 58,7 59,4 @@ -206,13 +210,16 @@ move_id,move_flag_id 69,1 69,4 69,7 +69,20 70,1 70,4 70,7 71,4 71,7 +71,13 72,4 72,7 +72,13 73,4 73,5 73,7 @@ -257,12 +264,15 @@ move_id,move_flag_id 88,7 89,4 89,7 +89,20 90,4 90,7 +90,20 91,1 91,2 91,4 91,7 +91,20 92,4 92,5 92,7 @@ -305,6 +315,7 @@ move_id,move_flag_id 111,6 112,6 113,6 +114,14 115,6 116,6 117,1 @@ -357,6 +368,7 @@ move_id,move_flag_id 137,7 138,4 138,7 +138,13 139,4 139,5 139,7 @@ -366,6 +378,7 @@ move_id,move_flag_id 141,1 141,4 141,7 +141,13 142,4 142,5 142,7 @@ -418,6 +431,7 @@ move_id,move_flag_id 163,4 163,7 164,6 +164,20 165,1 165,4 166,14 @@ -441,6 +455,7 @@ move_id,move_flag_id 173,4 173,7 173,9 +173,14 174,14 175,1 175,4 @@ -485,6 +500,7 @@ move_id,move_flag_id 190,7 190,18 191,5 +191,20 192,4 192,7 193,4 @@ -506,6 +522,7 @@ move_id,move_flag_id 200,7 202,4 202,7 +202,13 204,4 204,5 204,7 @@ -529,7 +546,6 @@ move_id,move_flag_id 211,1 211,4 211,7 -212,4 212,5 212,7 213,4 @@ -539,6 +555,7 @@ move_id,move_flag_id 213,19 215,6 215,9 +215,12 215,14 216,1 216,4 @@ -556,6 +573,7 @@ move_id,move_flag_id 221,11 222,4 222,7 +222,20 223,1 223,4 223,7 @@ -671,6 +689,7 @@ move_id,move_flag_id 273,6 273,13 275,6 +275,20 276,1 276,4 276,7 @@ -706,6 +725,7 @@ move_id,move_flag_id 291,2 291,4 291,7 +291,20 292,1 292,4 292,7 @@ -723,6 +743,7 @@ move_id,move_flag_id 299,1 299,4 299,7 +300,20 301,1 301,4 301,7 @@ -760,6 +781,7 @@ move_id,move_flag_id 311,7 311,18 312,6 +312,12 313,4 313,5 313,7 @@ -809,6 +831,7 @@ move_id,move_flag_id 329,7 330,4 330,7 +330,20 331,4 331,7 331,18 @@ -819,7 +842,6 @@ move_id,move_flag_id 333,4 333,7 334,6 -335,4 335,5 335,7 336,6 @@ -829,6 +851,7 @@ move_id,move_flag_id 338,3 338,4 338,7 +338,20 339,6 340,1 340,2 @@ -849,6 +872,7 @@ move_id,move_flag_id 344,7 345,4 345,7 +346,20 347,6 348,1 348,4 @@ -866,6 +890,7 @@ move_id,move_flag_id 354,7 355,6 355,13 +356,20 357,4 357,5 357,7 @@ -887,6 +912,7 @@ move_id,move_flag_id 362,7 363,4 363,7 +364,7 365,1 365,4 365,7 @@ -948,6 +974,7 @@ move_id,move_flag_id 389,4 389,7 390,5 +390,20 391,4 391,7 391,14 @@ -1006,6 +1033,7 @@ move_id,move_flag_id 409,4 409,7 409,8 +409,13 410,4 410,7 411,4 @@ -1020,6 +1048,7 @@ move_id,move_flag_id 413,12 414,4 414,7 +414,20 415,4 415,7 416,1 @@ -1108,7 +1137,9 @@ move_id,move_flag_id 447,1 447,4 447,7 +447,20 448,4 +448,7 448,9 448,12 448,14 @@ -1176,6 +1207,7 @@ move_id,move_flag_id 478,7 479,4 479,7 +479,20 480,1 480,4 480,7 @@ -1187,6 +1219,7 @@ move_id,move_flag_id 484,1 484,4 484,7 +484,20 485,4 485,7 486,4 @@ -1265,24 +1298,27 @@ move_id,move_flag_id 514,1 514,4 514,7 -515,1 515,4 -516,4 516,7 +516,14 517,4 517,7 518,4 518,7 +518,20 519,4 519,7 +519,20 520,4 520,7 +520,20 521,4 521,7 522,4 522,7 523,4 523,7 +523,20 524,4 524,7 525,1 @@ -1306,6 +1342,7 @@ move_id,move_flag_id 532,1 532,4 532,7 +532,13 533,1 533,4 533,7 @@ -1315,6 +1352,7 @@ move_id,move_flag_id 535,1 535,4 535,7 +535,20 536,4 536,7 537,1 @@ -1378,53 +1416,130 @@ move_id,move_flag_id 559,7 560,1 560,4 +560,7 +560,10 +560,12 +560,20 +561,6 +561,20 562,4 +563,12 +563,20 +564,5 565,1 565,4 +565,7 566,1 566,2 +566,7 567,4 +567,5 +567,7 568,4 +568,5 +568,7 +568,9 +568,14 570,4 +570,7 +570,13 571,4 +571,5 +571,7 572,4 +572,7 573,4 +573,7 574,4 +574,7 574,9 574,14 575,4 +575,5 +575,7 +575,9 +575,14 576,4 +576,5 +576,7 577,1 577,4 +577,7 577,13 -578,4 +579,12 +580,20 +581,20 582,4 +582,7 +583,1 583,4 +583,7 584,4 +584,7 585,4 +585,7 586,4 +586,7 586,9 586,14 +587,7 +587,14 +589,5 +589,7 +589,14 +590,5 +590,7 +590,9 +590,14 +591,4 +591,7 594,4 +594,7 595,4 +595,7 +597,14 598,4 -598,9 -598,14 +598,5 +598,7 599,4 +599,5 +599,7 600,4 +600,5 +600,7 +600,14 600,15 601,2 +601,20 +602,6 +602,12 +602,14 +604,20 605,4 +605,7 608,4 +608,5 +608,7 609,1 609,4 +609,7 +610,1 +610,4 +610,7 611,1 611,4 +611,7 612,1 612,4 +612,7 612,8 613,4 +613,7 +613,12 +613,13 616,4 +616,7 +616,20 10001,1 10001,4 10002,4 diff --git a/pokedex/data/csv/move_flag_prose.csv b/pokedex/data/csv/move_flag_prose.csv index ed06d4b..b76b2ca 100644 --- a/pokedex/data/csv/move_flag_prose.csv +++ b/pokedex/data/csv/move_flag_prose.csv @@ -18,3 +18,4 @@ move_flag_id,local_language_id,name,description 17,9,Pulse-based,This move has 1.5× its usual power when used by a Pokémon with []{ability:mega-launcher}. 18,9,Ballistics-based,This move is blocked by []{ability:bulletproof}. 19,9,Mental effects,This move is blocked by []{ability:aroma-veil} and cured by []{item:mental-herb}. +20,9,Unusable during Sky Battles,This move is unusable during Sky Battles. diff --git a/pokedex/data/csv/move_flags.csv b/pokedex/data/csv/move_flags.csv index 60a5eb5..36c18d9 100644 --- a/pokedex/data/csv/move_flags.csv +++ b/pokedex/data/csv/move_flags.csv @@ -18,3 +18,4 @@ id,identifier 17,pulse 18,ballistics 19,mental +20,non-sky-battle diff --git a/pokedex/data/csv/move_meta.csv b/pokedex/data/csv/move_meta.csv index cef5e5d..0d51ba3 100644 --- a/pokedex/data/csv/move_meta.csv +++ b/pokedex/data/csv/move_meta.csv @@ -41,7 +41,7 @@ move_id,meta_category_id,meta_ailment_id,min_hits,max_hits,min_turns,max_turns,r 40,4,5,,,,,0,0,0,30,0,0 41,4,5,2,2,,,0,0,0,20,0,0 42,0,0,2,5,,,0,0,0,0,0,0 -43,2,0,,,,,0,0,0,0,0,0 +43,2,0,,,,,0,0,0,0,0,100 44,0,0,,,,,0,0,0,0,30,0 45,2,0,,,,,0,0,0,0,0,0 46,12,0,,,,,0,0,0,0,0,0 @@ -303,7 +303,7 @@ move_id,meta_category_id,meta_ailment_id,min_hits,max_hits,min_turns,max_turns,r 302,0,0,,,,,0,0,0,0,30,0 303,3,0,,,,,0,50,0,0,0,0 304,0,0,,,,,0,0,0,0,0,0 -305,4,5,,,15,15,0,0,0,30,0,0 +305,4,5,,,15,15,0,0,0,50,0,0 306,6,0,,,,,0,0,0,0,0,50 307,0,0,,,,,0,0,0,0,0,0 308,0,0,,,,,0,0,0,0,0,0 @@ -446,7 +446,7 @@ move_id,meta_category_id,meta_ailment_id,min_hits,max_hits,min_turns,max_turns,r 445,2,0,,,,,0,0,0,0,0,0 446,11,0,,,,,0,0,0,0,0,0 447,0,0,,,,,0,0,0,0,0,0 -448,4,6,,,2,5,0,0,0,0,0,0 +448,4,6,,,2,5,0,0,0,100,0,0 449,0,0,,,,,0,0,0,0,0,0 450,0,0,,,,,0,0,0,0,0,0 451,7,0,,,,,0,0,0,0,0,70 @@ -558,3 +558,55 @@ move_id,meta_category_id,meta_ailment_id,min_hits,max_hits,min_turns,max_turns,r 557,7,0,,,,,0,0,0,0,0,100 558,0,0,,,,,0,0,0,0,0,0 559,0,0,,,,,0,0,0,0,0,0 +560,0,0,,,,,0,0,0,0,0,0 +561,11,0,,,,,0,0,0,0,0,0 +562,0,0,,,,,0,0,0,0,0,0 +563,2,0,,,,,0,0,0,0,0,100 +564,11,0,,,,,0,0,0,0,0,0 +565,0,0,,,,,0,0,0,0,0,0 +566,0,0,,,,,0,0,0,0,0,0 +567,13,0,,,,,0,0,0,0,0,0 +568,2,0,,,,,0,0,0,0,0,100 +569,10,0,,,,,0,0,0,0,0,0 +570,8,0,,,,,50,0,0,0,0,0 +571,13,0,,,,,0,0,0,0,0,0 +572,0,0,,,,,0,0,0,0,0,0 +573,4,3,,,,,0,0,0,10,0,0 +574,0,0,,,,,0,0,0,0,0,0 +575,2,0,,,,,0,0,0,0,0,100 +576,13,0,,,,,0,0,0,0,0,0 +577,8,0,,,,,75,0,0,0,0,0 +578,11,0,,,,,0,0,0,0,0,0 +579,13,0,,,,,0,0,0,0,0,100 +580,10,0,,,,,0,0,0,0,0,0 +581,10,0,,,,,0,0,0,0,0,0 +582,13,0,,,,,0,0,0,0,0,0 +583,6,0,,,,,0,0,0,0,0,10 +584,0,0,,,,,0,0,0,0,0,0 +585,6,0,,,,,0,0,0,0,0,30 +586,0,0,,,,,0,0,0,0,0,0 +587,10,0,,,,,0,0,0,0,0,0 +588,13,0,,,,,0,0,0,0,0,0 +589,2,0,,,,,0,0,0,0,0,100 +590,2,0,,,,,0,0,0,0,0,100 +591,7,0,,,,,0,0,0,0,0,50 +594,0,0,2,5,,,0,0,0,0,0,0 +595,6,0,,,,,0,0,0,0,0,100 +596,13,0,,,,,0,0,0,0,0,0 +597,2,0,,,,,0,0,0,0,0,0 +598,2,0,,,,,0,0,0,0,0,0 +599,2,0,,,,,0,0,0,0,0,100 +600,13,0,,,,,0,0,0,0,0,0 +601,2,0,,,,,0,0,0,0,0,0 +602,2,0,,,,,0,0,0,0,0,0 +603,13,0,,,,,0,0,0,0,0,0 +604,10,0,,,,,0,0,0,0,0,0 +605,0,0,,,,,0,0,0,0,0,0 +606,13,0,,,,,0,0,0,0,0,0 +608,2,0,,,,,0,0,0,0,0,0 +609,4,1,,,,,0,0,0,100,0,0 +610,0,0,,,,,0,0,0,0,0,0 +611,4,8,,,5,6,0,0,0,100,0,0 +612,7,0,,,,,0,0,0,0,0,100 +613,8,0,,,,,75,0,0,0,0,0 +616,0,0,,,,,0,0,0,0,0,0 diff --git a/pokedex/data/csv/move_meta_stat_changes.csv b/pokedex/data/csv/move_meta_stat_changes.csv index a57a5e3..9c2421f 100644 --- a/pokedex/data/csv/move_meta_stat_changes.csv +++ b/pokedex/data/csv/move_meta_stat_changes.csv @@ -9,7 +9,7 @@ move_id,stat_id,change 62,2,-1 74,2,1 74,4,1 -81,6,-1 +81,6,-2 94,5,-1 96,2,1 97,6,2 @@ -36,10 +36,11 @@ move_id,stat_id,change 204,2,-2 207,2,2 211,3,1 -230,8,-1 +230,8,-2 231,3,-1 232,2,1 242,3,-1 +246,1,1 246,2,1 246,3,1 246,4,1 @@ -60,6 +61,7 @@ move_id,stat_id,change 313,5,-2 315,4,-2 317,6,-1 +318,1,1 318,2,1 318,3,1 318,4,1 @@ -100,6 +102,7 @@ move_id,stat_id,change 455,3,1 455,5,1 465,5,-2 +466,1,1 466,2,1 466,3,1 466,4,1 @@ -134,3 +137,28 @@ move_id,stat_id,change 557,3,-1 557,5,-1 557,6,-1 +563,2,1 +563,4,1 +568,2,-1 +568,4,-1 +575,2,-1 +575,4,-1 +579,3,1 +583,2,-1 +585,4,-1 +589,2,-1 +590,4,-1 +591,3,1 +595,4,-1 +597,5,1 +598,4,-2 +599,2,-1 +599,4,-1 +599,6,-1 +601,4,2 +601,5,2 +601,6,2 +602,3,1 +602,5,1 +608,2,-1 +612,2,1 diff --git a/pokedex/data/csv/move_target_prose.csv b/pokedex/data/csv/move_target_prose.csv index b1c2aee..67502c3 100644 --- a/pokedex/data/csv/move_target_prose.csv +++ b/pokedex/data/csv/move_target_prose.csv @@ -11,3 +11,5 @@ move_target_id,local_language_id,name,description 10,9,Selected Pokémon,"One other Pokémon on the field, selected by the trainer." 11,9,All opponents,All opposing Pokémon. 12,9,Entire field,The entire field. Affects all Pokémon. +13,9,User and allies,The user and its allies. +14,9,All Pokémon,Every Pokémon on the field. diff --git a/pokedex/data/csv/move_targets.csv b/pokedex/data/csv/move_targets.csv index 67f9837..624323a 100644 --- a/pokedex/data/csv/move_targets.csv +++ b/pokedex/data/csv/move_targets.csv @@ -11,3 +11,5 @@ id,identifier 10,selected-pokemon 11,all-opponents 12,entire-field +13,user-and-allies +14,all-pokemon diff --git a/pokedex/data/csv/moves.csv b/pokedex/data/csv/moves.csv index b592a27..083cce8 100644 --- a/pokedex/data/csv/moves.csv +++ b/pokedex/data/csv/moves.csv @@ -41,7 +41,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 40,poison-sting,1,4,15,35,100,0,10,2,3,30,4,9,19 41,twineedle,1,7,25,20,100,0,10,2,78,20,1,9,7 42,pin-missile,1,7,25,20,95,0,10,2,30,,1,10,7 -43,leer,1,1,,30,100,0,11,1,20,,1,24,19 +43,leer,1,1,,30,100,0,11,1,20,100,1,24,19 44,bite,1,17,60,25,100,0,10,2,32,30,5,5,5 45,growl,1,1,,40,100,0,11,1,19,,3,28,19 46,roar,1,1,,20,,-6,10,1,29,,1,21,19 @@ -64,7 +64,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 63,hyper-beam,1,1,150,5,90,0,10,3,81,,1,6,22 64,peck,1,3,35,35,100,0,10,2,1,,1,1,5 65,drill-peck,1,3,80,20,100,0,10,2,1,,1,1,5 -66,submission,1,2,80,25,80,0,10,2,49,,1,3,5 +66,submission,1,2,80,20,80,0,10,2,49,,1,3,5 67,low-kick,1,2,,20,100,0,10,2,197,,5,4,5 68,counter,1,2,,20,100,-5,1,2,90,,5,16,15 69,seismic-toss,1,2,,20,100,0,10,2,88,,5,23,5 @@ -163,7 +163,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 162,super-fang,1,1,,10,90,0,10,2,41,,5,14,5 163,slash,1,1,70,20,100,0,10,2,44,,1,2,5 164,substitute,1,1,,10,,0,7,1,80,,4,16,23 -165,struggle,1,1,50,,,0,10,2,255,,1,1,5 +165,struggle,1,1,50,,,0,8,2,255,,1,1,5 166,sketch,2,1,,1,,0,10,1,96,,4,19,23 167,triple-kick,2,2,10,10,90,0,10,2,105,,1,1,7 168,thief,2,17,60,25,100,0,10,2,106,,5,20,12 @@ -176,7 +176,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 175,flail,2,1,,15,100,0,10,2,100,,3,26,15 176,conversion-2,2,1,,30,,0,10,1,94,,2,12,23 177,aeroblast,2,3,100,5,95,0,10,3,44,,1,2,22 -178,cotton-spore,2,12,,40,100,0,10,1,61,,2,10,1 +178,cotton-spore,2,12,,40,100,0,11,1,61,,2,10,1 179,reversal,2,2,,15,100,0,10,2,100,,1,28,15 180,spite,2,8,,10,100,0,10,1,101,,5,28,19 181,powder-snow,2,15,40,25,100,0,11,3,6,10,2,1,5 @@ -193,7 +193,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 192,zap-cannon,2,13,120,5,50,0,10,3,7,100,1,1,4 193,foresight,2,1,,40,,0,10,1,114,,4,33,20 194,destiny-bond,2,8,,5,,0,7,1,99,,4,7,9 -195,perish-song,2,1,,5,,0,12,1,115,,2,14,10 +195,perish-song,2,1,,5,,0,14,1,115,,2,14,10 196,icy-wind,2,15,55,15,95,0,11,3,71,100,2,5,2 197,detect,2,2,,5,,4,7,1,112,,1,16,16 198,bone-rush,2,5,25,10,90,0,10,2,30,,5,1,7 @@ -213,7 +213,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 212,mean-look,2,1,,5,,0,10,1,107,,2,18,10 213,attract,2,1,,15,100,0,10,1,121,,3,18,19 214,sleep-talk,2,1,,10,,0,7,1,98,,3,17,5 -215,heal-bell,2,1,,5,,0,4,1,103,,2,28,8 +215,heal-bell,2,1,,5,,0,13,1,103,,2,28,8 216,return,2,1,,20,100,0,10,2,122,,3,13,17 217,present,2,1,,15,90,0,10,2,123,,3,17,16 218,frustration,2,1,,20,100,0,10,2,124,,3,13,18 @@ -265,7 +265,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 264,focus-punch,3,2,150,20,100,-3,10,2,171,,5,31,6 265,smelling-salts,3,1,70,10,100,0,10,2,172,,4,9,16 266,follow-me,3,1,,20,,2,7,1,173,,3,24,14 -267,nature-power,3,1,,20,,0,1,1,174,,2,11,14 +267,nature-power,3,1,,20,,0,10,1,174,,2,11,14 268,charge,3,13,,20,,0,7,1,175,,4,12,11 269,taunt,3,17,,20,100,0,10,1,176,,4,18,16 270,helping-hand,3,1,,20,,5,3,1,177,,4,18,20 @@ -280,7 +280,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 279,revenge,3,2,60,10,100,-4,10,2,186,,5,31,15 280,brick-break,3,2,75,15,100,0,10,2,187,,1,4,5 281,yawn,3,1,,10,,0,10,1,188,,3,18,19 -282,knock-off,3,17,65,25,100,0,10,2,189,,4,4,5 +282,knock-off,3,17,65,20,100,0,10,2,189,,4,4,5 283,endeavor,3,1,,5,100,0,10,2,190,,5,28,15 284,eruption,3,10,150,5,100,0,11,3,191,,2,26,18 285,skill-swap,3,14,,10,,0,10,1,192,,4,20,12 @@ -303,14 +303,14 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 302,needle-arm,3,12,60,15,100,0,10,2,32,30,4,4,5 303,slack-off,3,1,,10,,0,7,1,33,,3,26,8 304,hyper-voice,3,1,90,10,100,0,11,3,1,,1,5,5 -305,poison-fang,3,4,50,15,100,0,10,2,203,30,4,33,4 +305,poison-fang,3,4,50,15,100,0,10,2,203,50,4,33,4 306,crush-claw,3,1,75,10,95,0,10,2,70,50,1,4,5 307,blast-burn,3,10,150,5,90,0,10,3,81,,2,6,22 308,hydro-cannon,3,11,150,5,90,0,10,3,81,,2,6,22 309,meteor-mash,3,9,90,10,90,0,10,2,140,20,1,12,18 310,astonish,3,8,30,15,100,0,10,2,32,30,4,9,5 311,weather-ball,3,1,50,10,100,0,10,3,204,,4,1,4 -312,aromatherapy,3,12,,5,,0,4,1,103,,4,28,8 +312,aromatherapy,3,12,,5,,0,13,1,103,,4,28,8 313,fake-tears,3,17,,20,100,0,10,1,63,,4,28,19 314,air-cutter,3,3,60,25,95,0,11,3,44,,1,23,5 315,overheat,3,10,130,5,90,0,10,3,205,100,2,3,22 @@ -446,7 +446,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 445,captivate,4,1,,20,100,0,11,1,266,,2,,19 446,stealth-rock,4,6,,20,,0,6,1,267,,1,,13 447,grass-knot,4,12,,20,100,0,10,3,197,,4,,4 -448,chatter,4,3,65,20,100,0,10,3,268,,4,,23 +448,chatter,4,3,65,20,100,0,10,3,268,100,4,,23 449,judgment,4,1,100,10,100,0,10,3,269,,4,,14 450,bug-bite,4,7,60,20,100,0,10,2,225,,5,,12 451,charge-beam,4,13,50,10,90,0,10,3,277,70,2,,17 @@ -483,7 +483,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 482,sludge-wave,5,4,95,10,100,0,9,3,3,10,,, 483,quiver-dance,5,7,,20,,0,7,1,291,,,, 484,heavy-slam,5,9,,10,100,0,10,2,292,,,, -485,synchronoise,5,14,120,15,100,0,9,3,293,,,, +485,synchronoise,5,14,120,10,100,0,9,3,293,,,, 486,electro-ball,5,13,,10,100,0,10,3,294,,,, 487,soak,5,11,,20,100,0,10,1,295,,,, 488,flame-charge,5,10,50,20,100,0,10,2,296,100,,, @@ -555,50 +555,50 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 554,ice-burn,5,15,140,5,90,0,10,3,333,30,,, 555,snarl,5,17,55,15,95,0,11,3,72,100,,, 556,icicle-crash,5,15,85,10,90,0,10,2,32,30,,, -557,v-create,5,10,180,5,95,0,10,2,335,,,, +557,v-create,5,10,180,5,95,0,10,2,335,100,,, 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,339,,,, -561,mat-block,6,2,,10,,0,10,1,340,,,, +561,mat-block,6,2,,10,,0,4,1,340,,,, 562,belch,6,4,120,10,90,0,10,3,341,,,, -563,rototiller,6,5,,10,,0,12,1,342,,,, -564,sticky-web,6,7,,20,,0,10,1,343,,,, +563,rototiller,6,5,,10,,0,14,1,342,100,,, +564,sticky-web,6,7,,20,,0,6,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,,20,100,0,10,1,345,,,, -568,noble-roar,6,1,,30,100,0,10,1,346,,,, -569,ion-deluge,6,13,,25,,1,10,1,347,,,, -570,parabolic-charge,6,13,50,20,100,0,11,3,348,,,, +568,noble-roar,6,1,,30,100,0,10,1,346,100,,, +569,ion-deluge,6,13,,25,,1,12,1,347,,,, +570,parabolic-charge,6,13,50,20,100,0,9,3,348,,,, 571,forests-curse,6,12,,20,100,0,10,1,349,,,, 572,petal-blizzard,6,12,90,15,100,0,9,2,1,,,, -573,freeze-dry,6,15,70,20,100,0,10,3,350,,,, -574,disarming-voice,6,18,40,15,,0,10,3,18,,,, -575,parting-shot,6,17,,20,100,0,10,1,351,,,, +573,freeze-dry,6,15,70,20,100,0,10,3,350,10,,, +574,disarming-voice,6,18,40,15,,0,11,3,18,,,, +575,parting-shot,6,17,,20,100,0,10,1,351,100,,, 576,topsy-turvy,6,17,,20,,0,10,1,352,,,, 577,draining-kiss,6,18,50,10,100,0,10,3,353,,,, -578,crafty-shield,6,18,,10,,4,4,1,354,,,, -579,flower-shield,6,18,,10,,0,4,1,355,,,, +578,crafty-shield,6,18,,10,,3,4,1,354,,,, +579,flower-shield,6,18,,10,,0,14,1,355,100,,, 580,grassy-terrain,6,12,,10,,0,12,1,356,,,, 581,misty-terrain,6,18,,10,,0,12,1,357,,,, 582,electrify,6,13,,20,,0,10,1,358,,,, -583,play-rough,6,18,90,10,90,0,10,2,69,30,,, +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,,10,,0,12,1,359,,,, 588,kings-shield,6,9,,10,,4,7,1,360,,,, -589,play-nice,6,1,,20,,0,10,1,19,,,, -590,confide,6,1,,20,,0,10,1,361,,,, -591,diamond-storm,6,6,100,5,95,0,10,2,139,50,,, -594,water-shuriken,6,11,15,20,100,1,10,2,30,100,,, +589,play-nice,6,1,,20,,0,10,1,19,100,,, +590,confide,6,1,,20,,0,10,1,361,100,,, +591,diamond-storm,6,6,100,5,95,0,11,2,139,50,,, +594,water-shuriken,6,11,15,20,100,1,10,2,30,,,, 595,mystical-fire,6,10,65,10,100,0,10,3,72,100,,, 596,spiky-shield,6,12,,10,,4,7,1,362,,,, -597,aromatic-mist,6,18,,20,100,0,4,1,363,,,, +597,aromatic-mist,6,18,,20,,0,3,1,363,,,, 598,eerie-impulse,6,13,,15,100,0,10,1,59,,,, -599,venom-drench,6,4,,20,100,0,10,1,364,,,, +599,venom-drench,6,4,,20,100,0,11,1,364,100,,, 600,powder,6,7,,20,100,1,10,1,365,,,, 601,geomancy,6,18,,10,,0,7,1,366,,,, -602,magnetic-flux,6,13,,20,,0,4,1,367,,,, +602,magnetic-flux,6,13,,20,,0,13,1,367,,,, 603,happy-hour,6,1,,30,,0,4,1,370,,,, 604,electric-terrain,6,13,,10,,0,12,1,368,,,, 605,dazzling-gleam,6,18,80,10,100,0,11,3,1,,,, @@ -606,10 +606,10 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 608,baby-doll-eyes,6,18,,30,100,1,10,1,19,,,, 609,nuzzle,6,13,20,20,100,0,10,2,7,100,,, 610,hold-back,6,1,40,40,100,0,10,2,102,,,, -611,infestation,6,7,20,20,100,0,10,3,43,,,, +611,infestation,6,7,20,20,100,0,10,3,43,100,,, 612,power-up-punch,6,2,40,20,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,,,, +616,lands-wrath,6,5,90,10,100,0,11,2,1,,,, 10001,shadow-rush,3,10002,55,,100,0,10,2,10001,,,, 10002,shadow-blast,3,10002,80,,100,0,10,3,44,,,, 10003,shadow-blitz,3,10002,40,,100,0,10,2,1,,,,