Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed Scale Shot Effect Text #758

Merged
merged 4 commits into from
Oct 1, 2022
Merged

Changed Scale Shot Effect Text #758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a245ba
Changed Scale Shot Effect Text
Sep 30, 2022
0aff861
Merge branch 'master' into scale-shot-fix
Naramsim Sep 30, 2022
64f8fc3
Comma Formatting Error Fixed
Sep 30, 2022
da54209
data: add colons
Naramsim Oct 1, 2022
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_effect_prose.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1120,6 +1120,7 @@ Any [regular damage]{mechanic:regular-damage} dealt to an affected Pokémon is r
423,9,Seeds the target after inflicting damage.,"Inflicts [regular damage]{mechanic:regular-damage}, then (if successful) sets []{move:leech-seed} on the target."
424,9,Cures the entire party of major status effects after inflicting damage.,"Inflicts [regular damage]{mechanic:regular-damage}, then (if successful) removes [major status effects]{mechanic:major-status-effects} from every Pokémon in the user's party."
425,9,Hits twice in one turn, with a $effect_chance% chance to make the target flinch.,"Inflicts [regular damage]{mechanic:regular-damage}. Hits twice in one turn, with a $effect_chance% chance to make the target [flinch]{mechanic:flinch}."
443,9,Boosts the user's Speed and lowers their Defense by one stage after inflicting damage two to five times in a row.,"Inflicts [regular damage]{mechanic:regular-damage} two to five times in a row, raising the user's [Speed]{mechanic:speed} and lowering the user's [Defense]{mechanic:defense} by one [stage]{mechanic:stage} each upon last hit."
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."
Expand Down
1 change: 1 addition & 0 deletions data/v2/csv/move_effects.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,7 @@ id
440
441
442
443
10001
10002
10003
Expand Down
2 changes: 1 addition & 1 deletion data/v2/csv/moves.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
796,steel-beam,8,9,140,5,95,0,10,3,420,,,,
797,expanding-force,8,14,80,10,100,0,10,3,1,,,,
798,steel-roller,8,9,130,5,100,0,10,2,1,,,,
799,scale-shot,8,16,25,20,90,0,10,2,1,,,,
799,scale-shot,8,16,25,20,90,0,10,2,443,,,,
800,meteor-beam,8,6,120,10,90,0,10,3,1,100,,,
801,shell-side-arm,8,4,90,10,100,0,10,3,1,20,,,
802,misty-explosion,8,18,100,5,100,0,9,3,1,,,,
Expand Down