Skip to content

Commit

Permalink
Update screen-related descriptions
Browse files Browse the repository at this point in the history
  • Loading branch information
Marty-D committed Sep 16, 2017
1 parent 358f620 commit b365d3f
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 4 deletions.
8 changes: 4 additions & 4 deletions data/moves.js
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ exports.BattleMovedex = {
accuracy: true,
basePower: 0,
category: "Status",
desc: "For 5 turns, the user and its party members take 0.5x damage from physical and special attacks, or 0.66x damage if in a Double Battle. Critical hits ignore this protection. It is removed from the user's side if the user or an ally is successfully hit by Brick Break, Psychic Fangs, or Defog. Lasts for 8 turns if the user is holding Light Clay. Fails unless the weather is Hail.",
desc: "For 5 turns, the user and its party members take 0.5x damage from physical and special attacks, or 0.66x damage if in a Double Battle; does not reduce damage further with Reflect or Light Screen. Critical hits ignore this protection. It is removed from the user's side if the user or an ally is successfully hit by Brick Break, Psychic Fangs, or Defog. Brick Break and Psychic Fangs remove the effect before damage is calculated. Lasts for 8 turns if the user is holding Light Clay. Fails unless the weather is Hail.",
shortDesc: "For 5 turns, damage to allies is halved. Hail only.",
id: "auroraveil",
isViable: true,
Expand Down Expand Up @@ -3177,7 +3177,7 @@ exports.BattleMovedex = {
accuracy: true,
basePower: 0,
category: "Status",
desc: "Lowers the target's evasiveness by 1 stage. If this move is successful and whether or not the target's evasiveness was affected, the effects of Reflect, Light Screen, Safeguard, Mist, Spikes, Toxic Spikes, Stealth Rock, and Sticky Web end for the target's side, and the effects of Spikes, Toxic Spikes, Stealth Rock, and Sticky Web end for the user's side. Ignores a target's substitute, although a substitute will still block the lowering of evasiveness.",
desc: "Lowers the target's evasiveness by 1 stage. If this move is successful and whether or not the target's evasiveness was affected, the effects of Reflect, Light Screen, Aurora Veil, Safeguard, Mist, Spikes, Toxic Spikes, Stealth Rock, and Sticky Web end for the target's side, and the effects of Spikes, Toxic Spikes, Stealth Rock, and Sticky Web end for the user's side. Ignores a target's substitute, although a substitute will still block the lowering of evasiveness.",
shortDesc: "-1 evasion; clears user and target side's hazards.",
id: "defog",
isViable: true,
Expand Down Expand Up @@ -9225,7 +9225,7 @@ exports.BattleMovedex = {
accuracy: true,
basePower: 0,
category: "Status",
desc: "For 5 turns, the user and its party members take 0.5x damage from special attacks, or 0.66x damage if in a Double or Triple Battle. Critical hits ignore this protection. It is removed from the user's side if the user or an ally is successfully hit by Brick Break or Defog. Lasts for 8 turns if the user is holding Light Clay.",
desc: "For 5 turns, the user and its party members take 0.5x damage from special attacks, or 0.66x damage if in a Double Battle; does not reduce damage further with Aurora Veil. Critical hits ignore this protection. It is removed from the user's side if the user or an ally is successfully hit by Brick Break, Psychic Fangs, or Defog. Lasts for 8 turns if the user is holding Light Clay.",
shortDesc: "For 5 turns, special damage to allies is halved.",
id: "lightscreen",
isViable: true,
Expand Down Expand Up @@ -13046,7 +13046,7 @@ exports.BattleMovedex = {
accuracy: true,
basePower: 0,
category: "Status",
desc: "For 5 turns, the user and its party members take 0.5x damage from physical attacks, or 0.66x damage if in a Double or Triple Battle. Critical hits ignore this protection. It is removed from the user's side if the user or an ally is successfully hit by Brick Break or Defog. Brick Break removes the effect before damage is calculated. Lasts for 8 turns if the user is holding Light Clay.",
desc: "For 5 turns, the user and its party members take 0.5x damage from physical attacks, or 0.66x damage if in a Double Battle; does not reduce damage further with Aurora Veil. Critical hits ignore this protection. It is removed from the user's side if the user or an ally is successfully hit by Brick Break, Psychic Fangs, or Defog. Brick Break and Psychic Fangs remove the effect before damage is calculated. Lasts for 8 turns if the user is holding Light Clay.",
shortDesc: "For 5 turns, physical damage to allies is halved.",
id: "reflect",
isViable: true,
Expand Down
5 changes: 5 additions & 0 deletions mods/gen5/abilities.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ exports.BattleAbilities = {
}
},
},
"infiltrator": {
inherit: true,
desc: "This Pokemon's moves ignore the opposing side's Reflect, Light Screen, Safeguard, and Mist.",
shortDesc: "This Pokemon's moves ignore the foe's Reflect, Light Screen, Safeguard, and Mist.",
},
"keeneye": {
inherit: true,
desc: "Prevents other Pokemon from lowering this Pokemon's accuracy stat stage.",
Expand Down
5 changes: 5 additions & 0 deletions mods/gen6/abilities.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ exports.BattleAbilities = {
},
rating: 4.5,
},
"infiltrator": {
inherit: true,
desc: "This Pokemon's moves ignore substitutes and the opposing side's Reflect, Light Screen, Safeguard, and Mist.",
shortDesc: "Moves ignore substitutes and the foe's Reflect, Light Screen, Safeguard, and Mist.",
},
"ironbarbs": {
inherit: true,
onAfterDamage: function (damage, target, source, move) {
Expand Down
12 changes: 12 additions & 0 deletions mods/gen6/moves.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ exports.BattleMovedex = {
accuracy: 80,
onTryMove: function () {},
},
defog: {
inherit: true,
desc: "Lowers the target's evasiveness by 1 stage. If this move is successful and whether or not the target's evasiveness was affected, the effects of Reflect, Light Screen, Safeguard, Mist, Spikes, Toxic Spikes, Stealth Rock, and Sticky Web end for the target's side, and the effects of Spikes, Toxic Spikes, Stealth Rock, and Sticky Web end for the user's side. Ignores a target's substitute, although a substitute will still block the lowering of evasiveness.",
},
destinybond: {
inherit: true,
desc: "Until the user's next turn, if an opposing Pokemon's attack knocks the user out, that Pokemon faints as well, unless the attack was Doom Desire or Future Sight.",
Expand Down Expand Up @@ -101,6 +105,10 @@ exports.BattleMovedex = {
isViable: false,
pp: 15,
},
lightscreen: {
inherit: true,
desc: "For 5 turns, the user and its party members take 0.5x damage from special attacks, or 0.66x damage if in a Double or Triple Battle. Critical hits ignore this protection. It is removed from the user's side if the user or an ally is successfully hit by Brick Break or Defog. Lasts for 8 turns if the user is holding Light Clay.",
},
minimize: {
inherit: true,
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, 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.",
Expand Down Expand Up @@ -195,6 +203,10 @@ exports.BattleMovedex = {
inherit: true,
desc: "The user and its party members are protected from attacks with original or altered priority greater than 0 made by other Pokemon, including allies, during this turn. This move modifies the same 1/X chance of being successful used by other protection moves, where X starts at 1 and triples each time this move is successfully used, but does not use the chance to check for failure. X resets to 1 if this move fails or if the user's last move used is not Detect, Endure, King's Shield, Protect, Quick Guard, Spiky Shield, or Wide Guard. Fails if the user moves last this turn or if this move is already in effect for the user's side.",
},
reflect: {
inherit: true,
desc: "For 5 turns, the user and its party members take 0.5x damage from physical attacks, or 0.66x damage if in a Double or Triple Battle. Critical hits ignore this protection. It is removed from the user's side if the user or an ally is successfully hit by Brick Break or Defog. Brick Break removes the effect before damage is calculated. Lasts for 8 turns if the user is holding Light Clay.",
},
reflecttype: {
inherit: true,
desc: "Causes the user's types to become the same as the current types of the target. Fails if the user is an Arceus.",
Expand Down

0 comments on commit b365d3f

Please sign in to comment.