Renumbered ???, added Shadow type and moves

TODO: Shadow Rush version changes, move foreign names

diff --git a/pokedex/data/csv/move_changelog.csv b/pokedex/data/csv/move_changelog.csv
index c31f262..2bfb286 100644 (file)
--- a/pokedex/data/csv/move_changelog.csv
+++ b/pokedex/data/csv/move_changelog.csv
@@ -43,7 +43,7 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,effect_id,effect_c
 157,3,,,,,1,0
 161,3,,,,,1,0
 170,11,,,40,,,
-174,11,18,,,,,
+174,11,10001,,,,,
 178,11,,,,85,,
 202,11,,60,,,,
 210,11,,10,,,,

diff --git a/pokedex/data/csv/move_effects.csv b/pokedex/data/csv/move_effects.csv
index f0edf53..9f97ecd 100644 (file)
--- a/pokedex/data/csv/move_effects.csv
+++ b/pokedex/data/csv/move_effects.csv
@@ -261,7 +261,7 @@ This move cannot be selected by [Assist]{move} or [Metronome]{move}."
 This effect is passed on by [Baton Pass]{move}.
 
 This move cannot be copied by [Mirror Move]{move}."
-116,Changes the weather to a sandstorm for five turns.,"Changes the weather to a sandstorm for five turns.  Pokémon that are not [Ground]{type}, [Rock]{type}, or [Steel]{type} take 1/8 their max [HP]{mechanic} at the end of every turn.  Every [Rock]{type} Pokémon's original [Special Defense]{mechanic} is raised by 50% for the duration of this effect.
+116,Changes the weather to a sandstorm for five turns.,"Changes the weather to a sandstorm for five turns.  Pokémon that are not [Ground]{type}, [Rock]{type}, or [Steel]{type} take 1/16 their max [HP]{mechanic} at the end of every turn.  Every [Rock]{type} Pokémon's original [Special Defense]{mechanic} is raised by 50% for the duration of this effect.
 
 [SolarBeam]{move}'s power is halved.
 
@@ -662,7 +662,7 @@ Waterfall      | Puts target to [sleep]{mechanic}
 201,Has an increased chance for a critical hit and a $effect_chance% chance to burn the target.,Inflicts [regular damage]{mechanic}.  User's [critical hit]{mechanic} rate is one level higher when using this move. Has a $effect_chance% chance to [burn]{mechanic} the target.
 202,All damage from Electric moves is halved until the end of the battle.,"[Electric]{type} moves inflict half damage, regardless of target.  If the user leaves the [field]{mechanic}, this effect ends."
 203,Has a $effect_chance% chance to badly poison the target.,Inflicts [regular damage]{mechanic}.  Has a $effect_chance% chance to [badly poison]{mechanic} the target.
-204,"If there be weather, this move has doubled power and the weather's type.","Inflicts [regular damage]{mechanic}.  If a weather move is active, this move has double power, and its type becomes the type of the weather move."
+204,"If there be weather, this move has doubled power and the weather's type.","Inflicts [regular damage]{mechanic}.  If a weather move is active, this move has double power, and its type becomes the type of the weather move.  [Shadow Sky]{move} counts as [???]{type} for the purposes of this move."
 205,Lowers the user's Special Attack by two stages after inflicting damage.,"Inflicts [regular damage]{mechanic}, then lowers the user's [Special Attack]{mechanic} by two [stages]{mechanic:stage}."
 206,Lowers the target's Attack and Defense by one stage.,Lowers the target's [Attack]{mechanic} and [Defense]{mechanic} by one [stage]{mechanic}.
 207,Raises the user's Defense and Special Defense by one stage.,Raises the user's [Defense]{mechanic} and [Special Defense]{mechanic} by one [stage]{mechanic}.
@@ -998,3 +998,9 @@ If the user is a [meroetta]{pokemon}, it will toggle between Voice and Step form
 This move can hit Pokémon under the effect of [Bounce]{move}, [Fly]{move}, or [freefall]{move}.
 
 During [Rain Dance]{move}, this move has 100% accuracy.  During [Sunny Day]{move}, this move has 50% accuracy."
+10001,Has an increased chance for a critical hit in Hyper Mode.,Inflicts [regular damage]{mechanic}.  User's [critical hit]{mechanic} rate is one level higher when using this move while in [hyper mode]{mechanic}.
+10002,User receives 1/2 its HP in recoil.,Inflicts [regular damage]{mechanic}.  User takes 1/2 of its current [HP]{mechanic} in recoil.
+10003,Halves HP of all Pokémon on the field.  Must recharge,"Halves [HP]{mechanic} of all Pokémon on the field.  User loses its next turn to ""recharge"", and cannot attack or [switch]{mechanic} out during that turn."
+10004,Lowers the target's evasion by two stages.,Lowers the target's [evasion]{mechanic} by two [stages]{mechanic:stage}.
+10005,"Removes [Light Screen]{move}, [Reflect]{move}, and [Safeguard]{move}.","Removes the effects of [Light Screen]{move}, [Reflect]{move}, and [Safeguard]{move}."
+10006,Changes the weather to Shadow Sky for five turns.,"Changes the weather to Shadow Sky for five turns.  Pokémon other than [Shadow]{type} Pokémon take 1/16 their max [HP]{mechanic} at the end of every turn.  This move counts as [???]{type}-type for the purposes of [Weather Ball]{move}."

diff --git a/pokedex/data/csv/move_flags.csv b/pokedex/data/csv/move_flags.csv
index 01a0d6d..f0d51c8 100644 (file)
--- a/pokedex/data/csv/move_flags.csv
+++ b/pokedex/data/csv/move_flags.csv
@@ -1324,3 +1324,37 @@ move_id,move_flag_type_id
 558,11
 559,4
 559,7
+10001,1
+10001,4
+10002,4
+10003,1
+10003,4
+10003,7
+10004,4
+10005,1
+10005,4
+10005,7
+10006,4
+10006,7
+10007,1
+10007,4
+10007,7
+10008,4
+10008,7
+10009,4
+10009,7
+10010,4
+10011,4
+10012,4
+10012,7
+10013,3
+10013,4
+10014,4
+10014,7
+10015,4
+10015,7
+10016,4
+10016,7
+10016,9
+10017,4
+10018,4

diff --git a/pokedex/data/csv/moves.csv b/pokedex/data/csv/moves.csv
index ec125a6..9512fb4 100644 (file)
--- a/pokedex/data/csv/moves.csv
+++ b/pokedex/data/csv/moves.csv
@@ -555,6 +555,24 @@ id,name,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_class_
 554,cold flare,5,15,140,5,90,0,10,3,333,30,,,
 555,bark out,5,17,55,15,95,0,11,3,72,100,,,
 556,icicle drop,5,15,85,10,90,0,10,2,32,30,,,
-557,v-generate,5,10,180,5,95,0,10,2,335,100,,,
+557,v-generate,5,10,180,5,95,0,10,2,335,,,,
 558,cross flame,5,10,100,5,100,0,10,3,336,,,,
 559,cross thunder,5,13,100,5,100,0,10,2,337,,,,
+10001,Shadow Rush,3,10002,55,1,100,0,2,2,10001,,,,
+10002,Shadow Blast,3,10002,80,1,100,0,2,3,44,,,,
+10003,Shadow Blitz,3,10002,40,1,100,0,2,2,1,,,,
+10004,Shadow Bolt,3,10002,75,1,100,0,2,3,7,10,,,
+10005,Shadow Break,3,10002,75,1,100,0,2,2,1,,,,
+10006,Shadow Chill,3,10002,75,1,100,0,2,3,6,10,,,
+10007,Shadow End,3,10002,120,1,60,0,2,2,10002,,,,
+10008,Shadow Fire,3,10002,75,1,100,0,2,3,5,10,,,
+10009,Shadow Rave,3,10002,70,1,100,0,6,3,1,,,,
+10010,Shadow Storm,3,10002,95,1,100,0,6,3,1,,,,
+10011,Shadow Wave,3,10002,50,1,100,0,6,3,1,,,,
+10012,Shadow Down,3,10002,0,1,100,0,6,1,60,,,,
+10013,Shadow Half,3,10002,1,1,100,0,12,3,10003,,,,
+10014,Shadow Hold,3,10002,0,1,,0,6,1,107,,,,
+10015,Shadow Mist,3,10002,0,1,100,0,6,1,10004,,,,
+10016,Shadow Panic,3,10002,0,1,90,0,6,1,50,,,,
+10017,Shadow Shed,3,10002,0,1,,0,12,1,10005,,,,
+10018,Shadow Sky,3,10002,0,1,,0,12,1,10006,,,,

diff --git a/pokedex/data/csv/type_efficacy.csv b/pokedex/data/csv/type_efficacy.csv
index 3da0b97..bbec547 100644 (file)
--- a/pokedex/data/csv/type_efficacy.csv
+++ b/pokedex/data/csv/type_efficacy.csv
@@ -16,7 +16,7 @@ damage_type_id,target_type_id,damage_factor
 1,15,100
 1,16,100
 1,17,100
-1,18,100
+1,10001,100
 2,1,200
 2,2,100
 2,3,50
@@ -34,7 +34,7 @@ damage_type_id,target_type_id,damage_factor
 2,15,200
 2,16,100
 2,17,200
-2,18,100
+2,10001,100
 3,1,100
 3,2,200
 3,3,100
@@ -52,7 +52,7 @@ damage_type_id,target_type_id,damage_factor
 3,15,100
 3,16,100
 3,17,100
-3,18,100
+3,10001,100
 4,1,100
 4,2,100
 4,3,100
@@ -70,7 +70,7 @@ damage_type_id,target_type_id,damage_factor
 4,15,100
 4,16,100
 4,17,100
-4,18,100
+4,10001,100
 5,1,100
 5,2,100
 5,3,0
@@ -88,7 +88,7 @@ damage_type_id,target_type_id,damage_factor
 5,15,100
 5,16,100
 5,17,100
-5,18,100
+5,10001,100
 6,1,100
 6,2,50
 6,3,200
@@ -106,7 +106,7 @@ damage_type_id,target_type_id,damage_factor
 6,15,200
 6,16,100
 6,17,100
-6,18,100
+6,10001,100
 7,1,100
 7,2,50
 7,3,50
@@ -124,7 +124,7 @@ damage_type_id,target_type_id,damage_factor
 7,15,100
 7,16,100
 7,17,200
-7,18,100
+7,10001,100
 8,1,0
 8,2,100
 8,3,100
@@ -142,7 +142,7 @@ damage_type_id,target_type_id,damage_factor
 8,15,100
 8,16,100
 8,17,50
-8,18,100
+8,10001,100
 9,1,100
 9,2,100
 9,3,100
@@ -160,7 +160,7 @@ damage_type_id,target_type_id,damage_factor
 9,15,200
 9,16,100
 9,17,100
-9,18,100
+9,10001,100
 10,1,100
 10,2,100
 10,3,100
@@ -178,7 +178,7 @@ damage_type_id,target_type_id,damage_factor
 10,15,200
 10,16,50
 10,17,100
-10,18,100
+10,10001,100
 11,1,100
 11,2,100
 11,3,100
@@ -196,7 +196,7 @@ damage_type_id,target_type_id,damage_factor
 11,15,100
 11,16,50
 11,17,100
-11,18,100
+11,10001,100
 12,1,100
 12,2,100
 12,3,50
@@ -214,7 +214,7 @@ damage_type_id,target_type_id,damage_factor
 12,15,100
 12,16,50
 12,17,100
-12,18,100
+12,10001,100
 13,1,100
 13,2,100
 13,3,200
@@ -232,7 +232,7 @@ damage_type_id,target_type_id,damage_factor
 13,15,100
 13,16,50
 13,17,100
-13,18,100
+13,10001,100
 14,1,100
 14,2,200
 14,3,100
@@ -250,7 +250,7 @@ damage_type_id,target_type_id,damage_factor
 14,15,100
 14,16,100
 14,17,0
-14,18,100
+14,10001,100
 15,1,100
 15,2,100
 15,3,200
@@ -268,7 +268,7 @@ damage_type_id,target_type_id,damage_factor
 15,15,50
 15,16,200
 15,17,100
-15,18,100
+15,10001,100
 16,1,100
 16,2,100
 16,3,100
@@ -286,7 +286,7 @@ damage_type_id,target_type_id,damage_factor
 16,15,100
 16,16,200
 16,17,100
-16,18,100
+16,10001,100
 17,1,100
 17,2,50
 17,3,100
@@ -304,22 +304,22 @@ damage_type_id,target_type_id,damage_factor
 17,15,100
 17,16,100
 17,17,50
-17,18,100
-18,1,100
-18,2,100
-18,3,100
-18,4,100
-18,5,100
-18,6,100
-18,7,100
-18,8,100
-18,9,100
-18,10,100
-18,11,100
-18,12,100
-18,13,100
-18,14,100
-18,15,100
-18,16,100
-18,17,100
-18,18,100
+17,10001,100
+10001,1,100
+10001,2,100
+10001,3,100
+10001,4,100
+10001,5,100
+10001,6,100
+10001,7,100
+10001,8,100
+10001,9,100
+10001,10,100
+10001,11,100
+10001,12,100
+10001,13,100
+10001,14,100
+10001,15,100
+10001,16,100
+10001,17,100
+10001,10001,100

diff --git a/pokedex/data/csv/type_names.csv b/pokedex/data/csv/type_names.csv
index 1b30a33..6110c8c 100644 (file)
--- a/pokedex/data/csv/type_names.csv
+++ b/pokedex/data/csv/type_names.csv
@@ -84,8 +84,9 @@ type_id,language_id,name
 17,6,Unlicht
 17,7,Siniestro
 17,8,Buio
-18,1,？？？
-18,5,???
-18,6,???
-18,7,???
-18,8,???
+10001,1,？？？
+10001,5,???
+10001,6,???
+10001,7,???
+10001,8,???
+10002,1,ダーク

diff --git a/pokedex/data/csv/types.csv b/pokedex/data/csv/types.csv
index abd1afa..7676b5c 100644 (file)
--- a/pokedex/data/csv/types.csv
+++ b/pokedex/data/csv/types.csv
@@ -16,4 +16,5 @@ id,name,abbreviation,generation_id,damage_class_id
 15,Ice,ICE,1,3
 16,Dragon,DRG,1,3
 17,Dark,DAR,2,3
-18,???,???,2,1
+10001,???,???,2,1
+10002,Shadow,SHA,3,1