Skip to content

Commit

Permalink
Update Phantom/Shadow Force interaction with Minimize
Browse files Browse the repository at this point in the history 
Fixes #4830
  • Loading branch information
@Marty-D
Marty-D committed Aug 28, 2018
1 parent 5cd0e07 commit 87a1542
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions data/moves.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10394,7 +10394,7 @@ let BattleMovedex = {
accuracy: true,
basePower: 0,
category: "Status",
desc: "Raises the user's evasiveness by 2 stages. Whether or not the user's evasiveness was changed, Body Slam, Dragon Rush, Flying Press, Heat Crash, Heavy Slam, Malicious Moonsault, Phantom Force, Shadow Force, Steamroller, and Stomp will not check accuracy and have their damage doubled if used against the user while it is active.",
desc: "Raises the user's evasiveness by 2 stages. Whether or not the user's evasiveness was changed, Body Slam, Dragon Rush, Flying Press, Heat Crash, Heavy Slam, Malicious Moonsault, Steamroller, and Stomp will not check accuracy and have their damage doubled if used against the user while it is active.",
shortDesc: "Raises the user's evasiveness by 2.",
id: "minimize",
name: "Minimize",
Expand All @@ -10405,12 +10405,12 @@ let BattleMovedex = {
effect: {
noCopy: true,
onSourceModifyDamage: function (damage, source, target, move) {
if (['stomp', 'steamroller', 'bodyslam', 'flyingpress', 'dragonrush', 'phantomforce', 'heatcrash', 'shadowforce', 'heavyslam', 'maliciousmoonsault'].includes(move.id)) {
if (['stomp', 'steamroller', 'bodyslam', 'flyingpress', 'dragonrush', 'heatcrash', 'heavyslam', 'maliciousmoonsault'].includes(move.id)) {
return this.chainModify(2);
}
},
onAccuracy: function (accuracy, target, source, move) {
if (['stomp', 'steamroller', 'bodyslam', 'flyingpress', 'dragonrush', 'phantomforce', 'heatcrash', 'shadowforce', 'heavyslam', 'maliciousmoonsault'].includes(move.id)) {
if (['stomp', 'steamroller', 'bodyslam', 'flyingpress', 'dragonrush', 'heatcrash', 'heavyslam', 'maliciousmoonsault'].includes(move.id)) {
return true;
}
return accuracy;
Expand Down Expand Up @@ -11655,7 +11655,7 @@ let BattleMovedex = {
accuracy: 100,
basePower: 90,
category: "Physical",
desc: "If this move is successful, it breaks through the target's Baneful Bunker, Detect, King's Shield, Protect, or Spiky Shield for this turn, allowing other Pokemon to attack the target normally. If the target's side is protected by Crafty Shield, Mat Block, Quick Guard, or Wide Guard, that protection is also broken for this turn and other Pokemon may attack the target's side normally. This attack charges on the first turn and executes on the second. On the first turn, the user avoids all attacks. If the user is holding a Power Herb, the move completes in one turn. Damage doubles and no accuracy check is done if the target has used Minimize while active.",
desc: "If this move is successful, it breaks through the target's Baneful Bunker, Detect, King's Shield, Protect, or Spiky Shield for this turn, allowing other Pokemon to attack the target normally. If the target's side is protected by Crafty Shield, Mat Block, Quick Guard, or Wide Guard, that protection is also broken for this turn and other Pokemon may attack the target's side normally. This attack charges on the first turn and executes on the second. On the first turn, the user avoids all attacks. If the user is holding a Power Herb, the move completes in one turn.",
shortDesc: "Disappears turn 1. Hits turn 2. Breaks protection.",
id: "phantomforce",
name: "Phantom Force",
Expand Down Expand Up @@ -14384,7 +14384,7 @@ let BattleMovedex = {
accuracy: 100,
basePower: 120,
category: "Physical",
desc: "If this move is successful, it breaks through the target's Baneful Bunker, Detect, King's Shield, Protect, or Spiky Shield for this turn, allowing other Pokemon to attack the target normally. If the target's side is protected by Crafty Shield, Mat Block, Quick Guard, or Wide Guard, that protection is also broken for this turn and other Pokemon may attack the target's side normally. This attack charges on the first turn and executes on the second. On the first turn, the user avoids all attacks. If the user is holding a Power Herb, the move completes in one turn. Damage doubles and no accuracy check is done if the target has used Minimize while active.",
desc: "If this move is successful, it breaks through the target's Baneful Bunker, Detect, King's Shield, Protect, or Spiky Shield for this turn, allowing other Pokemon to attack the target normally. If the target's side is protected by Crafty Shield, Mat Block, Quick Guard, or Wide Guard, that protection is also broken for this turn and other Pokemon may attack the target's side normally. This attack charges on the first turn and executes on the second. On the first turn, the user avoids all attacks. If the user is holding a Power Herb, the move completes in one turn.",
shortDesc: "Disappears turn 1. Hits turn 2. Breaks protection.",
id: "shadowforce",
isViable: true,
Expand Down

4 comments on commit 87a1542

@Zarel
Copy link
Member

@Zarel Zarel commented on 87a1542 Aug 28, 2018

Choose a reason for hiding this comment

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

Is this all gens? If not, we may need to update past gens?

@Deathmage777
Copy link

Choose a reason for hiding this comment

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

@Zarel this is only from Gen7 onwards that it shouldn't deal double against minimized targets

@penpexgit
Copy link
Contributor

Choose a reason for hiding this comment

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

Well, before Gen VI it didn't bypass accuracy or deal double damage either for Shadow Force (Phantom Force being a Gen VI move). Basically, there should be a special case for Gen VI only, where these two moves do bypass accuracy and deal double damage.

@Marty-D
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The only changes necessary were in this file, because Gen 6 already had Minimize overriding this for the Heavy Slam difference, and the Phantom/Shadow Force descriptions were already different because Baneful Bunker didn't exist.

Please sign in to comment.