veniasilente/veekun_pokedex
1
0
Fork 0
mirror of https://github.com/veekun/pokedex.git synced 2024-08-20 18:16:34 +00:00
Code Issues Projects Releases Wiki Activity

Flesh out move effects some more.

Browse source
This commit is contained in:
Lynn "Zhorken" Vaughan 2012-08-04 23:50:39 -04:00
parent 789a1bdc0e
commit 0596032d00
6 changed files with 108 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pokedex/data/csv/conquest_move_data.csv
View file

@ -111,7 +111,7 @@ move_id,power,accuracy,effect_chance,effect_id,range_id,displacement_id
510,28,100,,47,4, 510,28,100,,47,4,
521,41,100,,19,11,3 521,41,100,,19,11,3
523,33,100,100,58,5, 523,33,100,100,58,5,
525,33,90,,20,7,4 525,33,90,,20,7,5
529,41,95,,9,11,1 529,41,95,,9,11,1
533,45,100,,4,2, 533,45,100,,4,2,
535,43,100,,60,11,1 535,43,100,,60,11,1

1 move_id power accuracy effect_chance effect_id range_id displacement_id
111 510 28 100 47 4
112 521 41 100 19 11 3
113 523 33 100 100 58 5
114 525 33 90 20 7 4 5
115 529 41 95 9 11 1
116 533 45 100 4 2
117 535 43 100 60 11 1

11
pokedex/data/csv/conquest_move_displacement_prose.csv
View file

@ -1,5 +1,6 @@
move_displacement_id,local_language_id,short_effect,effect move_displacement_id,local_language_id,name,short_effect,effect
1,9,User advances one tile.,"The user moves to the tile directly in front of it. If the user cannot occupy that tile or another Pokémon is already occupying that tile, the move cannot be used." 1,9,Advance one tile,User advances one tile.,"The user moves to the tile directly in front of it. If the user cannot move to that tile or another Pokémon is already occupying that tile, the move cannot be used."
2,9,User jumps ahead two tiles.,"The user jumps ahead two tiles without crossing the tile in-between. If the user cannot occupy that tile or another Pokémon is already occupying that tile, the move cannot be used." 2,9,Advance two tiles,User jumps ahead two tiles.,"The user jumps ahead two tiles without crossing the tile in-between. If the user cannot move to that tile or another Pokémon is already occupying that tile, the move cannot be used."
3,9,"User retreats one tile, switching places with any Pokémon already there.","The user moves to the tile behind it, if it can occupy that tile. If another Pokémon is already occupying that tile, the user switches places with it." 3,9,Switch back,"User retreats one tile, switching places with any Pokémon already there.","The user moves to the tile behind it, if it can move to that tile. If another Pokémon is already occupying that tile, the user switches places with it."
4,9,Deals knockback.,All targets are knocked one tile backward in the direction the user is facing. 4,9,Knockback,Deals knockback.,"$Target is knocked one tile backward in the direction the user is facing, if that tile is one it can move to and if no other Pokémon is already occupying that tile."
5,9,Knockback & switch,"Deals knockback, switching $target with the Pokémon behind it if applicable.","$Target is knocked one tile backward in the direction the user is facing, if that tile is one it can move to. If another Pokémon is already occupying that tile, the Pokémon switch places."

1 move_displacement_id local_language_id name short_effect effect
2 1 9 Advance one tile User advances one tile. The user moves to the tile directly in front of it. If the user cannot occupy that tile or another Pokémon is already occupying that tile, the move cannot be used. The user moves to the tile directly in front of it. If the user cannot move to that tile or another Pokémon is already occupying that tile, the move cannot be used.
3 2 9 Advance two tiles User jumps ahead two tiles. The user jumps ahead two tiles without crossing the tile in-between. If the user cannot occupy that tile or another Pokémon is already occupying that tile, the move cannot be used. The user jumps ahead two tiles without crossing the tile in-between. If the user cannot move to that tile or another Pokémon is already occupying that tile, the move cannot be used.
4 3 9 Switch back User retreats one tile, switching places with any Pokémon already there. The user moves to the tile behind it, if it can occupy that tile. If another Pokémon is already occupying that tile, the user switches places with it. The user moves to the tile behind it, if it can move to that tile. If another Pokémon is already occupying that tile, the user switches places with it.
5 4 9 Knockback Deals knockback. All targets are knocked one tile backward in the direction the user is facing. $Target is knocked one tile backward in the direction the user is facing, if that tile is one it can move to and if no other Pokémon is already occupying that tile.
6 5 9 Knockback & switch Deals knockback, switching $target with the Pokémon behind it if applicable. $Target is knocked one tile backward in the direction the user is facing, if that tile is one it can move to. If another Pokémon is already occupying that tile, the Pokémon switch places.

1
pokedex/data/csv/conquest_move_displacements.csv
View file

@ -3,3 +3,4 @@ id,identifier,affects_target
2,advance-2,0 2,advance-2,0
3,switch-back,0 3,switch-back,0
4,knockback,1 4,knockback,1
5,knockback-switch,1

1 id identifier affects_target
3 2 advance-2 0
4 3 switch-back 0
5 4 knockback 1
6 5 knockback-switch 1

100
pokedex/data/csv/conquest_move_effect_prose.csv
View file

@ -1,51 +1,55 @@
conquest_move_effect_id,local_language_id,short_effect,effect conquest_move_effect_id,local_language_id,short_effect,effect
0,9,Inflicts exactly 40 HP in damage.,"Inflicts exactly 40 HP in damage, unaffected by stats or types." 0,9,Inflicts exactly 40 HP in damage.,"Inflicts exactly 40 HP in damage, unaffected by stats or types."
2,9,Has double power if the target has a major status ailment.,Inflicts damage. Has double power if the target has a major status ailment. 2,9,Has double power if $target has a major status ailment.,Inflicts regular damage. Has double power if $target has a major status ailment.
3,9,Doubles in power with each consecutive successful use.,"Inflicts damage. Every time this move succeeds, its power doubles; if it fails, it resets." 3,9,Doubles in power with each consecutive successful use.,"Inflicts regular damage. Every time this move succeeds, its power doubles; if it fails or is not used for a turn, it resets."
4,9,Ignores the target's stat modifiers.,"Inflicts damage, ignoring the target's stat modifiers." 4,9,Ignores $target's stat modifiers.,"Inflicts damage, ignoring $target's stat modifiers."
5,9,Power rises the faster the user is compared to the target.,"Inflicts damage. The greater the user's Speed compared to the target's, the more power this move has." 5,9,Power rises the faster the user is compared to $target.,"Inflicts regular damage. The greater the user's Speed compared to $target's, the more power this move has."
6,9,Power rises the slower the user is compared to the target.,"Inflicts damage. The lower the user's Speed compared to the target's, the more power this move has." 6,9,Power rises the slower the user is compared to $target.,"Inflicts regular damage. The lower the user's Speed compared to $target's, the more power this move has."
7,9,, 7,9,Has double power if $target has already taken damage this turn.,Inflicts regular damage. Has double power if $target has already taken damage this turn.
8,9,, 8,9,Uses $target's Attack stat for damage.,Inflicts regular damage. Uses $target's Attack stat for damage calculations.
9,9,Has an increased chance for a critical hit.,"Inflicts damage. This move's critical hit rate is higher than usual." 9,9,Has an increased chance for a critical hit.,"Inflicts regular damage. This move's critical hit rate is higher than usual."
14,9,Hits 2 to 5 times in one turn.,"Inflicts damage. Hits two to five times in one turn, with damage calculated separately each time." 14,9,Hits 2 to 5 times in one turn.,"Inflicts regular damage. Hits two to five times in one turn, with damage calculated separately each time."
15,9,, 15,9,Hits 4 to 5 times in one turn.,"Inflicts regular damage. Hits four to five times in one turn, with damage calculated separately each time."
16,9,"Digs underground and hits at the beginning of the next turn.","Inflicts damage. The user digs underground, dodging all moves until it attacks. At the beginning of the next turn, the user hits the target, even if the target has moved, and cannot move again that turn." 16,9,"Digs underground and hits at the beginning of the next turn.","Inflicts regular damage. The user digs underground, dodging all moves until it attacks. At the beginning of the next turn, the user hits $target, even if $target has moved, and cannot move again that turn."
17,9,"Lifts the target into the sky and hits at the beginning of the next turn.","Inflicts damage. The user carries the target into the sky. No moves can hit either Pokémon in this state. At the beginning of the next turn, the user slams the target to the ground, inflicting regular damage. The user cannot move again that turn." 17,9,"Lifts $target into the sky and hits at the beginning of the next turn.","Inflicts regular damage. The user carries $target into the sky. No moves can hit either Pokémon in this state. At the beginning of the next turn, the user slams $target to the ground, inflicting regular damage. The user cannot move again that turn."
18,9,, 18,9,Hits $target at the beginning of the turn after next.,"Inflicts regular damage. Hits $target at the beginning of the user's turn two turns after this one, even if the target has moved.
19,9,,Inflicts damage.
20,9,, In the turn in-between, the user can use this move again, but it will miss any target that already has a Future Sight pending."
21,9,Heals the user by half the damage dealt.,Inflicts damage. The user heals for half as many HP as it dealt in damage. 19,9, ,Inflicts regular damage.
22,9,Teleports randomly., 20,9, ,Inflicts regular damage.
23,9,Cannot be used the turn after hitting.,"Inflicts damage. If the move succeeds, it cannot be used again on the next turn." 21,9,Heals the user by half the damage dealt.,Inflicts regular damage. The user heals for half as many HP as it dealt in damage.
25,9,"","" 22,9,Teleports randomly.,The user teleports randomly to another tile.
26,9,, 23,9,Cannot be used the turn after hitting.,"Inflicts regular damage. If the move succeeds, it cannot be used again on the next turn."
28,9,Has a $effect_chance% chance to raise the user's Attack.,Inflicts damage. Has a $effect_chance% chance to raise the user's Attack afterward. 25,9,"Lowers the user's range and Defense until its next turn.",Inflicts regular damage. The user's Defense is lowered and its range is lowered to one tile until the beginning of its next turn.
29,9,Lowers the user's Attack.,Inflicts damage. Lowers the user's Attack afterward. 26,9,Damages the user if it misses.,"Inflicts regular damage. If this move misses, the user takes damage instead."
30,9,Has a $effect_chance% chance to lower each target's Defense.,Inflicts damage. Has a $effect_chance% chance to lower each target's Defense afterward. 28,9,Has a $effect_chance% chance to raise the user's Attack.,Inflicts regular damage. Has a $effect_chance% chance to raise the user's Attack afterward.
33,9,Has a $effect_chance% chance to lower each target's Speed.,Inflicts damage. Has a $effect_chance% chance to lower each target's Speed afterward. 29,9,Lowers the user's Attack.,Inflicts regular damage. Lowers the user's Attack afterward.
36,9,Has a $effect_chance% chance to lower each target's accuracy.,Inflicts damage. Has a $effect_chance% chance to lower each target's accuracy. 30,9,Has a $effect_chance% chance to lower $target's Defense.,Inflicts regular damage. Has a $effect_chance% chance to lower $target's Defense afterward.
37,9,Has a $effect_chance% chance to paralyze each target.,Inflicts damage. Has a $effect_chance% chance to paralyze each target. 33,9,Has a $effect_chance% chance to lower $target's Speed.,Inflicts regular damage. Has a $effect_chance% chance to lower $target's Speed afterward.
38,9,Puts each target to sleep.,Puts each target to sleep. 36,9,Has a $effect_chance% chance to lower $target's accuracy.,Inflicts regular damage. Has a $effect_chance% chance to lower $target's accuracy.
39,9,Has a $effect_chance% chance to poison each target.,Inflicts damage. Has a $effect_chance% chance to poison each target. 37,9,Has a $effect_chance% chance to paralyze $target.,Inflicts regular damage. Has a $effect_chance% chance to paralyze $target.
40,9,Has a $effect_chance% chance to badly poison each target.,Inflicts damage. Has a $effect_chance% chance to badly poison each target. 38,9,Puts $target to sleep.,Puts $target to sleep.
41,9,Has a $effect_chance% chance to burn each target.,Inflicts damage. Has a $effect_chance% chance to burn each target. 39,9,Has a $effect_chance% chance to poison $target.,Inflicts regular damage. Has a $effect_chance% chance to poison $target.
42,9,Has a $effect_chance% chance to freeze each target.,Inflicts damage. Has a $effect_chance% chance to freeze each target. 40,9,Has a $effect_chance% chance to badly poison $target.,Inflicts regular damage. Has a $effect_chance% chance to badly poison $target.
43,9,Has a $effect_chance% chance to confuse each target.,Inflicts damage. Has a $effect_chance% chance to confuse each target. 41,9,Has a $effect_chance% chance to burn $target.,Inflicts regular damage. Has a $effect_chance% chance to burn $target.
44,9,Has a $effect_chance% chance to make each target flinch.,Inflicts damage. Has a $effect_chance% chance to make each target flinch. 42,9,Has a $effect_chance% chance to freeze $target.,Inflicts regular damage. Has a $effect_chance% chance to freeze $target.
47,9,, 43,9,Has a $effect_chance% chance to confuse $target.,Inflicts regular damage. Has a $effect_chance% chance to confuse $target.
48,9,, 44,9,Has a $effect_chance% chance to make $target flinch.,Inflicts regular damage. Has a $effect_chance% chance to make $target flinch.
49,9,, 47,9,Permanently destroys $target's item if it is consumable.,Inflicts regular damage. Permanently destroys $target's item if the item can be consumed in battle.
51,9,, 48,9,Has double power against Pokémon with less than half their max HP remaining.,"Inflicts regular damage. Has double power when calculating damage against a target with less than half its max HP remaining, on a target-by-target basis."
52,9,Never misses.,"Inflicts damage. Always has 100% accuracy, but still misses Pokémon under the effects of []{move:dig} or []{move:sky-drop}." 49,9,Has double power against poisoned Pokémon.,"Inflicts regular damage. Has double power when calculating damage against a poisoned target, on a target-by-target basis."
58,9,Lowers each target's range.,Inflicts damage. Lowers each target's range by one tile. 51,9,Uses $target's item if it is consumable.,"Inflicts regular damage. The user steals $target's item, if the item can be consumed in battle, and uses it on itself, or destroys it if it would have no effect."
59,9,, 52,9,Never misses.,"Inflicts regular damage. Always has 100% accuracy.
This move still misses Pokémon under the effects of []{move:dig} or []{move:sky-drop} and can still be dodged by abilities such as []{ability:instinct}."
58,9,Has a $effect_chance% chance to lower $target's range by one tile.,Inflicts regular damage. Has a $effect_chance% chance to lower $target's range by one tile.
59,9,Lowers the user's Attack and Defense.,Inflicts regular damage. Lowers the user's Attack and Defense afterward.
60,9,Inflicts damage with no additional effect.,Inflicts regular damage. 60,9,Inflicts damage with no additional effect.,Inflicts regular damage.
61,9,Has a $effect_chance% chance each to burn each target or make it flinch.,"Inflicts damage. Has a $effect_chance% chance to burn each target, and a $effect_chance% chance, separately rolled, to make each target flinch." 61,9,Has a $effect_chance% chance each to burn $target or make it flinch.,"Inflicts regular damage. Has a $effect_chance% chance to burn $target, and a $effect_chance% chance, separately rolled, to make $target flinch."
62,9,Has a $effect_chance% chance to burn each target. Thaws the user out if frozen.,"Inflicts damage. Has a $effect_chance% chance to burn each target. Can be used if the user is frozen, in which case it thaws out." 62,9,Has a $effect_chance% chance to burn $target. Thaws the user out if frozen.,"Inflicts regular damage. Has a $effect_chance% chance to burn $target. Can be used if the user is frozen, in which case it thaws out."
63,9,, 63,9,"Lowers the user's range and Defense until its next turn. Has a $effect_chance% chance to paralyze $target.",Inflicts regular damage. The user's Defense is lowered and its range is lowered to one tile until the beginning of its next turn. Has a $effect_chance% chance to paralyze $target.
64,9,, 64,9,Hits 2 to 3 times in one turn. User has 0 range on its next turn.,"Inflicts regular damage. Hits two to three times in one turn, with damage calculated separately for each hit. The user's range is lowered to 0 on its next turn."
65,9,Has double power and wakes the target up if it is asleep.,"Inflicts damage. If the target is asleep, this move has double power and wakes the target up." 65,9,Has double power and wakes $target up if it is asleep.,"Inflicts regular damage. If $target is asleep, this move has double power and wakes $target up."
66,9,Has a $effect_chance% chance to poison each target and an increased chance for a critical hit., 66,9,Has a $effect_chance% chance to poison $target and an increased chance for a critical hit.,
67,9,Heals the user by half the damage inflicted. Only works if each target is asleep.,"Inflicts damage if each target is asleep, and fails otherwise. Heals the user for half as many HP as it dealt in damage." 67,9,Heals the user by half the damage inflicted. Only works if $target is asleep.,"Inflicts damage if $target is asleep, and fails otherwise. Heals the user for half as many HP as it dealt in damage."
68,9,Hits twice in one turn. Has a $effect_chance% chance to poison each target with each hit.,Inflicts damage. Hits twice in one turn. Has a $effect_chance% chance to poison each target with each hit. 68,9,Hits twice in one turn. Has a $effect_chance% chance to poison $target with each hit.,Inflicts regular damage. Hits twice in one turn. Has a $effect_chance% chance to poison $target with each hit.

1 conquest_move_effect_id local_language_id short_effect effect
2 0 9 Inflicts exactly 40 HP in damage. Inflicts exactly 40 HP in damage, unaffected by stats or types.
3 2 9 Has double power if the target has a major status ailment. Has double power if $target has a major status ailment. Inflicts damage. Has double power if the target has a major status ailment. Inflicts regular damage. Has double power if $target has a major status ailment.
4 3 9 Doubles in power with each consecutive successful use. Inflicts damage. Every time this move succeeds, its power doubles; if it fails, it resets. Inflicts regular damage. Every time this move succeeds, its power doubles; if it fails or is not used for a turn, it resets.
5 4 9 Ignores the target's stat modifiers. Ignores $target's stat modifiers. Inflicts damage, ignoring the target's stat modifiers. Inflicts damage, ignoring $target's stat modifiers.
6 5 9 Power rises the faster the user is compared to the target. Power rises the faster the user is compared to $target. Inflicts damage. The greater the user's Speed compared to the target's, the more power this move has. Inflicts regular damage. The greater the user's Speed compared to $target's, the more power this move has.
7 6 9 Power rises the slower the user is compared to the target. Power rises the slower the user is compared to $target. Inflicts damage. The lower the user's Speed compared to the target's, the more power this move has. Inflicts regular damage. The lower the user's Speed compared to $target's, the more power this move has.
8 7 9 Has double power if $target has already taken damage this turn. Inflicts regular damage. Has double power if $target has already taken damage this turn.
9 8 9 Uses $target's Attack stat for damage. Inflicts regular damage. Uses $target's Attack stat for damage calculations.
10 9 9 Has an increased chance for a critical hit. Inflicts damage. This move's critical hit rate is higher than usual. Inflicts regular damage. This move's critical hit rate is higher than usual.
11 14 9 Hits 2 to 5 times in one turn. Inflicts damage. Hits two to five times in one turn, with damage calculated separately each time. Inflicts regular damage. Hits two to five times in one turn, with damage calculated separately each time.
12 15 9 Hits 4 to 5 times in one turn. Inflicts regular damage. Hits four to five times in one turn, with damage calculated separately each time.
13 16 9 Digs underground and hits at the beginning of the next turn. Inflicts damage. The user digs underground, dodging all moves until it attacks. At the beginning of the next turn, the user hits the target, even if the target has moved, and cannot move again that turn. Inflicts regular damage. The user digs underground, dodging all moves until it attacks. At the beginning of the next turn, the user hits $target, even if $target has moved, and cannot move again that turn.
14 17 9 Lifts the target into the sky and hits at the beginning of the next turn. Lifts $target into the sky and hits at the beginning of the next turn. Inflicts damage. The user carries the target into the sky. No moves can hit either Pokémon in this state. At the beginning of the next turn, the user slams the target to the ground, inflicting regular damage. The user cannot move again that turn. Inflicts regular damage. The user carries $target into the sky. No moves can hit either Pokémon in this state. At the beginning of the next turn, the user slams $target to the ground, inflicting regular damage. The user cannot move again that turn.
15 18 9 Hits $target at the beginning of the turn after next. Inflicts regular damage. Hits $target at the beginning of the user's turn two turns after this one, even if the target has moved. In the turn in-between, the user can use this move again, but it will miss any target that already has a Future Sight pending.
16 19 9 Inflicts damage. Inflicts regular damage.
17 20 9 Inflicts regular damage.
18 21 9 Heals the user by half the damage dealt. Inflicts damage. The user heals for half as many HP as it dealt in damage. Inflicts regular damage. The user heals for half as many HP as it dealt in damage.
19 22 9 Teleports randomly. The user teleports randomly to another tile.
20 23 9 Cannot be used the turn after hitting. Inflicts damage. If the move succeeds, it cannot be used again on the next turn. Inflicts regular damage. If the move succeeds, it cannot be used again on the next turn.
21 25 9 Lowers the user's range and Defense until its next turn. Inflicts regular damage. The user's Defense is lowered and its range is lowered to one tile until the beginning of its next turn.
22 26 9 Damages the user if it misses. Inflicts regular damage. If this move misses, the user takes damage instead.
23 28 9 Has a $effect_chance% chance to raise the user's Attack. Inflicts damage. Has a $effect_chance% chance to raise the user's Attack afterward. Inflicts regular damage. Has a $effect_chance% chance to raise the user's Attack afterward.
24 29 9 Lowers the user's Attack. Inflicts damage. Lowers the user's Attack afterward. Inflicts regular damage. Lowers the user's Attack afterward.
25 30 9 Has a $effect_chance% chance to lower each target's Defense. Has a $effect_chance% chance to lower $target's Defense. Inflicts damage. Has a $effect_chance% chance to lower each target's Defense afterward. Inflicts regular damage. Has a $effect_chance% chance to lower $target's Defense afterward.
26 33 9 Has a $effect_chance% chance to lower each target's Speed. Has a $effect_chance% chance to lower $target's Speed. Inflicts damage. Has a $effect_chance% chance to lower each target's Speed afterward. Inflicts regular damage. Has a $effect_chance% chance to lower $target's Speed afterward.
27 36 9 Has a $effect_chance% chance to lower each target's accuracy. Has a $effect_chance% chance to lower $target's accuracy. Inflicts damage. Has a $effect_chance% chance to lower each target's accuracy. Inflicts regular damage. Has a $effect_chance% chance to lower $target's accuracy.
28 37 9 Has a $effect_chance% chance to paralyze each target. Has a $effect_chance% chance to paralyze $target. Inflicts damage. Has a $effect_chance% chance to paralyze each target. Inflicts regular damage. Has a $effect_chance% chance to paralyze $target.
29 38 9 Puts each target to sleep. Puts $target to sleep. Puts each target to sleep. Puts $target to sleep.
30 39 9 Has a $effect_chance% chance to poison each target. Has a $effect_chance% chance to poison $target. Inflicts damage. Has a $effect_chance% chance to poison each target. Inflicts regular damage. Has a $effect_chance% chance to poison $target.
31 40 9 Has a $effect_chance% chance to badly poison each target. Has a $effect_chance% chance to badly poison $target. Inflicts damage. Has a $effect_chance% chance to badly poison each target. Inflicts regular damage. Has a $effect_chance% chance to badly poison $target.
32 41 9 Has a $effect_chance% chance to burn each target. Has a $effect_chance% chance to burn $target. Inflicts damage. Has a $effect_chance% chance to burn each target. Inflicts regular damage. Has a $effect_chance% chance to burn $target.
33 42 9 Has a $effect_chance% chance to freeze each target. Has a $effect_chance% chance to freeze $target. Inflicts damage. Has a $effect_chance% chance to freeze each target. Inflicts regular damage. Has a $effect_chance% chance to freeze $target.
34 43 9 Has a $effect_chance% chance to confuse each target. Has a $effect_chance% chance to confuse $target. Inflicts damage. Has a $effect_chance% chance to confuse each target. Inflicts regular damage. Has a $effect_chance% chance to confuse $target.
35 44 9 Has a $effect_chance% chance to make each target flinch. Has a $effect_chance% chance to make $target flinch. Inflicts damage. Has a $effect_chance% chance to make each target flinch. Inflicts regular damage. Has a $effect_chance% chance to make $target flinch.
36 47 9 Permanently destroys $target's item if it is consumable. Inflicts regular damage. Permanently destroys $target's item if the item can be consumed in battle.
37 48 9 Has double power against Pokémon with less than half their max HP remaining. Inflicts regular damage. Has double power when calculating damage against a target with less than half its max HP remaining, on a target-by-target basis.
38 49 9 Has double power against poisoned Pokémon. Inflicts regular damage. Has double power when calculating damage against a poisoned target, on a target-by-target basis.
39 51 9 Uses $target's item if it is consumable. Inflicts regular damage. The user steals $target's item, if the item can be consumed in battle, and uses it on itself, or destroys it if it would have no effect.
40 52 9 Never misses. Inflicts damage. Always has 100% accuracy, but still misses Pokémon under the effects of []{move:dig} or []{move:sky-drop}. Inflicts regular damage. Always has 100% accuracy. This move still misses Pokémon under the effects of []{move:dig} or []{move:sky-drop} and can still be dodged by abilities such as []{ability:instinct}.
41 58 9 Lowers each target's range. Has a $effect_chance% chance to lower $target's range by one tile. Inflicts damage. Lowers each target's range by one tile. Inflicts regular damage. Has a $effect_chance% chance to lower $target's range by one tile.
42 59 9 Lowers the user's Attack and Defense. Inflicts regular damage. Lowers the user's Attack and Defense afterward.
43 60 9 Inflicts damage with no additional effect. Inflicts regular damage.
44 61 9 Has a $effect_chance% chance each to burn $target or make it flinch. Inflicts regular damage. Has a $effect_chance% chance to burn $target, and a $effect_chance% chance, separately rolled, to make $target flinch.
45 62 9 Has a $effect_chance% chance to burn $target. Thaws the user out if frozen. Inflicts regular damage. Has a $effect_chance% chance to burn $target. Can be used if the user is frozen, in which case it thaws out.
46 63 9 Lowers the user's range and Defense until its next turn. Has a $effect_chance% chance to paralyze $target. Inflicts regular damage. The user's Defense is lowered and its range is lowered to one tile until the beginning of its next turn. Has a $effect_chance% chance to paralyze $target.
47 60 64 9 Inflicts damage with no additional effect. Hits 2 to 3 times in one turn. User has 0 range on its next turn. Inflicts regular damage. Inflicts regular damage. Hits two to three times in one turn, with damage calculated separately for each hit. The user's range is lowered to 0 on its next turn.
48 61 65 9 Has a $effect_chance% chance each to burn each target or make it flinch. Has double power and wakes $target up if it is asleep. Inflicts damage. Has a $effect_chance% chance to burn each target, and a $effect_chance% chance, separately rolled, to make each target flinch. Inflicts regular damage. If $target is asleep, this move has double power and wakes $target up.
49 62 66 9 Has a $effect_chance% chance to burn each target. Thaws the user out if frozen. Has a $effect_chance% chance to poison $target and an increased chance for a critical hit. Inflicts damage. Has a $effect_chance% chance to burn each target. Can be used if the user is frozen, in which case it thaws out.
50 63 67 9 Heals the user by half the damage inflicted. Only works if $target is asleep. Inflicts damage if $target is asleep, and fails otherwise. Heals the user for half as many HP as it dealt in damage.
51 64 68 9 Hits twice in one turn. Has a $effect_chance% chance to poison $target with each hit. Inflicts regular damage. Hits twice in one turn. Has a $effect_chance% chance to poison $target with each hit.
52
53
54
55

29
pokedex/db/markdown.py
View file

@ -99,10 +99,21 @@ def _markdownify_effect_text(move, effect_text, language=None):
effect_text = effect_text.replace( effect_text = effect_text.replace(
u'$effect_chance', u'$effect_chance',
unicode(move.effect_chance), unicode(move.effect_chance),
).replace(
u'$target',
_target_labels[move.range.targets > 1]
).replace(
u'$Target',
_target_labels[move.range.targets > 1].capitalize()
) )
return MarkdownString(effect_text, session, language) return MarkdownString(effect_text, session, language)
_target_labels = {
False: 'the target',
True: 'each target'
}
class MoveEffectProperty(object): class MoveEffectProperty(object):
"""Property that wraps move effects. Used like this: """Property that wraps move effects. Used like this:
@ -117,16 +128,26 @@ class MoveEffectProperty(object):
Use `MoveEffectPropertyMap` for dict-like association proxies. Use `MoveEffectPropertyMap` for dict-like association proxies.
""" """
def __init__(self, effect_column): def __init__(self, *effect_columns):
self.effect_column = effect_column self.effect_columns = effect_columns
def __get__(self, obj, cls): def __get__(self, obj, cls):
if obj is None: if obj is None:
return self return self
if obj.move_effect is None: if obj.move_effect is None:
return None return None
prop = getattr(obj.move_effect, self.effect_column) props = []
return _markdownify_effect_text(obj, prop) for prop, column in self.effect_columns:
prop = getattr(obj, prop)
if prop is None:
continue
column = getattr(prop, column)
if column is None:
print(prop)
props.append(column)
return _markdownify_effect_text(obj, ' '.join(prop for prop in props))
class MoveEffectPropertyMap(MoveEffectProperty): class MoveEffectPropertyMap(MoveEffectProperty):
"""Similar to `MoveEffectProperty`, but works on dict-like association """Similar to `MoveEffectProperty`, but works on dict-like association

30
pokedex/db/tables.py
View file

@ -321,16 +321,18 @@ class ConquestMoveDisplacement(TableBase):
__singlename__ = 'move_displacement' __singlename__ = 'move_displacement'
id = Column(Integer, primary_key=True, autoincrement=True, id = Column(Integer, primary_key=True, autoincrement=True,
info=dict(description=u'An ID for this displacement.')) info=dict(description=u'An ID for this displacement.'))
identifier = Column(Unicode(11), nullable=False, identifier = Column(Unicode(18), nullable=False,
info=dict(description=u'A readable identifier for this displacement.')) info=dict(description=u'A readable identifier for this displacement.'))
affects_target = Column(Boolean, nullable=False, affects_target = Column(Boolean, nullable=False,
info=dict(description=u'True iff the move displaces its target(s) and not its user.')) info=dict(description=u'True iff the move displaces its target(s) and not its user.'))
create_translation_table('conquest_move_displacement_prose', ConquestMoveDisplacement, 'prose', create_translation_table('conquest_move_displacement_prose', ConquestMoveDisplacement, 'prose',
name = Column(Unicode(20), nullable=True,
info=dict(description='A name for the displacement.', format='plaintext')),
short_effect = Column(Unicode(128), nullable=True, short_effect = Column(Unicode(128), nullable=True,
info=dict(description="A short summary of how the displacement works, to be used with the move's short effect.", format='plaintext')), info=dict(description="A short summary of how the displacement works, to be used in the move's short effect.", format='markdown')),
effect = Column(Unicode(256), nullable=True, effect = Column(Unicode(256), nullable=True,
info=dict(description="A detailed description of how the displacement works, to be used with the move's long effect.", format='plaintext')), info=dict(description="A detailed description of how the displacement works, to be used alongside the move's long effect.", format='markdown')),
) )
class ConquestPokemonAbility(TableBase): class ConquestPokemonAbility(TableBase):
@ -2047,14 +2049,28 @@ ConquestMaxLink.warrior_rank = relationship(ConquestWarriorRank,
backref=backref('max_links', lazy='dynamic')) backref=backref('max_links', lazy='dynamic'))
ConquestMaxLink.warrior = association_proxy('warrior_rank', 'warrior') ConquestMaxLink.warrior = association_proxy('warrior_rank', 'warrior')
ConquestMoveData.effect = relationship(ConquestMoveEffect, ConquestMoveData.move_displacement = relationship(ConquestMoveDisplacement,
uselist=False, uselist=False,
innerjoin=True, lazy='joined', backref='move_data')
backref='moves')
ConquestMoveData.move = relationship(Move, ConquestMoveData.move = relationship(Move,
uselist=False, uselist=False,
innerjoin=True, lazy='joined', innerjoin=True, lazy='joined',
backref='conquest_data') backref=backref('conquest_data', uselist=False))
ConquestMoveData.move_effect = relationship(ConquestMoveEffect,
innerjoin=True,
backref='move_data')
ConquestMoveData.range = relationship(ConquestMoveRange,
innerjoin=True,
backref='move_data')
ConquestMoveData.effect = markdown.MoveEffectProperty(('move_effect', 'effect'))
ConquestMoveData.effect_map = markdown.MoveEffectPropertyMap(('move_effect', 'effect_map'))
ConquestMoveData.short_effect = markdown.MoveEffectProperty(
('move_effect', 'short_effect'),
('move_displacement', 'short_effect')
)
ConquestMoveData.short_effect_map = markdown.MoveEffectPropertyMap(('move_effect', 'short_effect_map'))
ConquestMoveData.displacement = markdown.MoveEffectProperty(('move_displacement', 'effect'))
ConquestPokemonEvolution.gender = relationship(Gender, ConquestPokemonEvolution.gender = relationship(Gender,
backref='conquest_evolutions') backref='conquest_evolutions')