Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions data/v2/csv/move_targets.csv
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ id,identifier
13,user-and-allies
14,all-pokemon
15,all-allies
16,fainting-pokemon
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Revival Blessing" is the first move to use for fainting Pokémon.
So I introduced a new category for the move.

120 changes: 60 additions & 60 deletions data/v2/csv/moves.csv
Original file line number Diff line number Diff line change
Expand Up @@ -827,66 +827,66 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
826,eerie-spell,8,14,80,5,100,0,10,3,1,,,,
828,psyshield-bash,8,14,70,10,90,0,10,2,444,100,,,
839,barb-barrage,8,4,60,15,100,0,10,2,3,30,,,
840,esper-wing,9,13,80,10,100,0,0,3,,,,,
841,bitter-malice,9,7,75,10,100,0,0,3,,,,,
842,shelter,9,8,0,10,,0,0,1,,,,,
843,triple-arrows,9,1,90,10,100,0,0,2,,,,,
844,infernal-parade,9,7,60,15,100,0,0,3,,,,,
845,ceaseless-edge,9,16,65,15,90,0,0,2,,,,,
846,bleakwind-storm,9,2,100,10,80,0,0,3,,,,,
847,wildbolt-storm,9,12,100,10,80,0,0,3,,,,,
848,sandsear-storm,9,4,100,10,80,0,0,3,,,,,
849,lunar-blessing,9,13,0,5,,0,0,1,,,,,
851,tera-blast,9,0,80,10,100,0,0,3,,,,,
852,silk-trap,9,6,0,10,,4,0,1,,,,,
853,axe-kick,9,1,120,10,90,0,0,2,,,,,
854,last-respects,9,7,50,10,100,0,0,2,,,,,
855,lumina-crash,9,13,80,10,100,0,0,3,,,,,
856,order-up,9,15,80,10,100,0,0,2,,,,,
857,jet-punch,9,10,60,15,100,1,0,2,,,,,
858,spicy-extract,9,11,0,15,,0,0,1,,,,,
859,spin-out,9,8,100,5,100,0,0,2,,,,,
860,population-bomb,9,0,20,10,90,0,0,2,,,,,
861,ice-spinner,9,14,80,15,100,0,0,2,,,,,
862,glaive-rush,9,15,120,5,100,0,0,2,,,,,
863,revival-blessing,9,0,0,1,,0,0,1,,,,,
864,salt-cure,9,5,40,15,100,0,0,2,,,,,
865,triple-dive,9,10,30,10,95,0,0,2,,,,,
866,mortal-spin,9,3,30,15,100,0,0,2,,,,,
867,doodle,9,0,0,10,100,0,0,1,,,,,
868,fillet-away,9,0,0,10,,0,0,1,,,,,
869,kowtow-cleave,9,16,85,10,,0,0,2,,,,,
870,flower-trick,9,11,70,10,,0,0,2,,,,,
871,torch-song,9,9,80,10,100,0,0,3,,,,,
872,aqua-step,9,10,80,10,100,0,0,2,,,,,
873,raging-bull,9,0,90,10,100,0,0,2,,,,,
874,make-it-rain,9,8,120,5,100,0,0,3,,,,,
875,pound,9,0,40,35,100,0,0,2,,,,,
876,pound,9,0,40,35,100,0,0,2,,,,,
877,ruination,9,16,1,10,90,0,0,3,,,,,
878,collision-course,9,1,100,5,100,0,0,2,,,,,
879,electro-drift,9,12,100,5,100,0,0,3,,,,,
880,shed-tail,9,0,0,10,,0,0,1,,,,,
881,chilly-reception,9,14,0,10,,0,0,1,,,,,
882,tidy-up,9,0,0,10,,0,0,1,,,,,
883,snowscape,9,14,0,10,,0,0,1,,,,,
884,pounce,9,6,50,20,100,0,0,2,,,,,
885,trailblaze,9,11,50,20,100,0,0,2,,,,,
886,chilling-water,9,10,50,20,100,0,0,3,,,,,
887,hyper-drill,9,0,100,5,100,0,0,2,,,,,
888,twin-beam,9,13,40,10,100,0,0,3,,,,,
889,rage-fist,9,7,50,10,100,0,0,2,,,,,
890,armor-cannon,9,9,120,5,100,0,0,3,,,,,
891,bitter-blade,9,9,90,10,100,0,0,2,,,,,
892,double-shock,9,12,120,5,100,0,0,2,,,,,
893,gigaton-hammer,9,8,160,5,100,0,0,2,,,,,
894,comeuppance,9,16,1,10,100,0,0,2,,,,,
895,aqua-cutter,9,10,70,20,100,0,0,2,,,,,
896,blazing-torque,9,9,80,10,100,0,0,2,,,,,
897,wicked-torque,9,16,80,10,100,0,0,2,,,,,
898,noxious-torque,9,3,100,10,100,0,0,2,,,,,
899,combat-torque,9,1,100,10,100,0,0,2,,,,,
900,magical-torque,9,17,100,10,100,0,0,2,,,,,
840,esper-wing,9,13,80,10,100,0,10,3,,,,,
841,bitter-malice,9,7,75,10,100,0,10,3,,,,,
842,shelter,9,8,0,10,,0,7,1,,,,,
843,triple-arrows,9,1,90,10,100,0,10,2,,,,,
844,infernal-parade,9,7,60,15,100,0,10,3,,,,,
845,ceaseless-edge,9,16,65,15,90,0,10,2,,,,,
846,bleakwind-storm,9,2,100,10,80,0,11,3,,,,,
847,wildbolt-storm,9,12,100,10,80,0,11,3,,,,,
848,sandsear-storm,9,4,100,10,80,0,11,3,,,,,
849,lunar-blessing,9,13,0,5,,0,15,1,,,,,
851,tera-blast,9,0,80,10,100,0,10,3,,,,,
852,silk-trap,9,6,0,10,,4,7,1,,,,,
853,axe-kick,9,1,120,10,90,0,10,2,,,,,
854,last-respects,9,7,50,10,100,0,10,2,,,,,
855,lumina-crash,9,13,80,10,100,0,10,3,,,,,
856,order-up,9,15,80,10,100,0,10,2,,,,,
857,jet-punch,9,10,60,15,100,1,10,2,,,,,
858,spicy-extract,9,11,0,15,,0,10,1,,,,,
859,spin-out,9,8,100,5,100,0,10,2,,,,,
860,population-bomb,9,0,20,10,90,0,10,2,,,,,
861,ice-spinner,9,14,80,15,100,0,10,2,,,,,
862,glaive-rush,9,15,120,5,100,0,10,2,,,,,
863,revival-blessing,9,0,0,1,,0,16,1,,,,,
864,salt-cure,9,5,40,15,100,0,10,2,,,,,
865,triple-dive,9,10,30,10,95,0,10,2,,,,,
866,mortal-spin,9,3,30,15,100,0,11,2,,,,,
867,doodle,9,0,0,10,100,0,10,1,,,,,
868,fillet-away,9,0,0,10,,0,7,1,,,,,
869,kowtow-cleave,9,16,85,10,,0,10,2,,,,,
870,flower-trick,9,11,70,10,,0,10,2,,,,,
871,torch-song,9,9,80,10,100,0,10,3,,,,,
872,aqua-step,9,10,80,10,100,0,10,2,,,,,
873,raging-bull,9,0,90,10,100,0,10,2,,,,,
874,make-it-rain,9,8,120,5,100,0,11,3,,,,,
875,pound,9,0,40,35,100,0,10,2,,,,,
876,pound,9,0,40,35,100,0,10,2,,,,,
877,ruination,9,16,1,10,90,0,10,3,,,,,
878,collision-course,9,1,100,5,100,0,10,2,,,,,
879,electro-drift,9,12,100,5,100,0,10,3,,,,,
880,shed-tail,9,0,0,10,,0,7,1,,,,,
881,chilly-reception,9,14,0,10,,0,12,1,,,,,
882,tidy-up,9,0,0,10,,0,7,1,,,,,
Copy link
Contributor Author

@giginet giginet Jan 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Tidy up" has various effects at once.
So it's difficult to set the existing target_id. I choose user for this move.
What do you think? Do you need a new move_target?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, for now let's leave it like that :) Thanks!

883,snowscape,9,14,0,10,,0,12,1,,,,,
884,pounce,9,6,50,20,100,0,10,2,,,,,
885,trailblaze,9,11,50,20,100,0,10,2,,,,,
886,chilling-water,9,10,50,20,100,0,10,3,,,,,
887,hyper-drill,9,0,100,5,100,0,10,2,,,,,
888,twin-beam,9,13,40,10,100,0,10,3,,,,,
889,rage-fist,9,7,50,10,100,0,10,2,,,,,
890,armor-cannon,9,9,120,5,100,0,10,3,,,,,
891,bitter-blade,9,9,90,10,100,0,10,2,,,,,
892,double-shock,9,12,120,5,100,0,10,2,,,,,
893,gigaton-hammer,9,8,160,5,100,0,10,2,,,,,
894,comeuppance,9,16,1,10,100,0,1,2,,,,,
895,aqua-cutter,9,10,70,20,100,0,10,2,,,,,
896,blazing-torque,9,9,80,10,100,0,10,2,,,,,
897,wicked-torque,9,16,80,10,100,0,10,2,,,,,
898,noxious-torque,9,3,100,10,100,0,10,2,,,,,
899,combat-torque,9,1,100,10,100,0,10,2,,,,,
900,magical-torque,9,17,100,10,100,0,10,2,,,,,
10001,shadow-rush,3,10002,55,,100,0,10,2,10001,,,,
10002,shadow-blast,3,10002,80,,100,0,10,2,44,,,,
10003,shadow-blitz,3,10002,40,,100,0,10,2,1,,,,
Expand Down