Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-06-02 22:08:36 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Correct crit ratio boosting Z-Effect

Browse Source
This commit is contained in:
Marty-D 2016-12-18 11:06:55 -05:00
parent ef8c92b49f
commit 3c9d6c2687
4 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chat-plugins/info.js
View File

@ -408,7 +408,7 @@ exports.commands = {
} else if (move.zMoveEffect) {
details["Z-Effect"] = {
'clearnegativeboost': "Restores negative stat stages to 0",
'crit1': "Crit ratio +1",
'crit2': "Crit ratio +2",
'heal': "Restores HP 100%",
'curse': "Restores HP 100% if user is Ghost type, otherwise Attack +1",
'redirect': "Redirects opposing attacks to user",

18
data/moves.js
View File

@ -227,7 +227,7 @@ exports.BattleMovedex = {
secondary: false,
target: "adjacentAllyOrSelf",
type: "Normal",
zMoveEffect: 'crit1',
zMoveEffect: 'crit2',
contestType: "Tough",
},
"aerialace": {
@ -5644,8 +5644,12 @@ exports.BattleMovedex = {
flags: {snatch: 1},
volatileStatus: 'focusenergy',
effect: {
onStart: function (pokemon) {
this.add('-start', pokemon, 'move: Focus Energy');
onStart: function (target, source, effect) {
if (effect && effect.id === 'zpower') {
this.add('-start', target, 'move: Focus Energy', '[zeffect]');
} else {
this.add('-start', target, 'move: Focus Energy');
}
},
onModifyCritRatio: function (critRatio) {
return critRatio + 2;
@ -5788,7 +5792,7 @@ exports.BattleMovedex = {
secondary: false,
target: "normal",
type: "Normal",
zMoveEffect: 'crit1',
zMoveEffect: 'crit2',
contestType: "Clever",
},
"forestscurse": {
@ -7315,7 +7319,7 @@ exports.BattleMovedex = {
secondary: false,
target: "normal",
type: "Psychic",
zMoveEffect: 'crit1',
zMoveEffect: 'crit2',
contestType: "Clever",
},
"heatcrash": {
@ -14987,7 +14991,7 @@ exports.BattleMovedex = {
secondary: false,
target: "self",
type: "Normal",
zMoveEffect: 'crit1',
zMoveEffect: 'crit2',
contestType: "Cute",
},
"sludge": {
@ -16863,7 +16867,7 @@ exports.BattleMovedex = {
secondary: false,
target: "allySide",
type: "Flying",
zMoveEffect: 'crit1',
zMoveEffect: 'crit2',
contestType: "Cool",
},
"takedown": {

4
data/scripts.js
View File

@ -130,8 +130,8 @@ exports.BattleScripts = {
this.add('-clearnegativeboost', pokemon, '[zeffect]');
} else if (zMove && move.zMoveEffect === 'redirect') {
pokemon.addVolatile('followme', pokemon, {id: 'zpower'});
} else if (zMove && move.zMoveEffect === 'crit1') {
pokemon.addVolatile('crit1', pokemon, {id: 'zpower'});
} else if (zMove && move.zMoveEffect === 'crit2') {
pokemon.addVolatile('focusenergy', pokemon, {id: 'zpower'});
} else if (zMove && move.zMoveEffect === 'curse') {
if (pokemon.hasType('Ghost')) {
this.heal(pokemon.maxhp, pokemon, pokemon, {id: 'zpower'});

12
data/statuses.js
View File

@ -202,18 +202,6 @@ exports.BattleStatuses = {
trapper: {
noCopy: true,
},
crit1: {
onStart: function (target, source, effect) {
if (effect && effect.id === 'zpower') {
this.add('-start', target, 'move: Focus Energy', '[zeffect]');
} else {
this.add('-start', target, 'move: Focus Energy');
}
},
onModifyCritRatio: function (critRatio) {
return critRatio + 1;
},
},
partiallytrapped: {
duration: 5,
durationCallback: function (target, source) {