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

Merge pull request #126 from V4Victini/patch-1

Browse Source 
Fix GK/LK
This commit is contained in:
TheImmortal 2012-12-28 10:24:31 -08:00
commit fdc170b749
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
data/moves.js
View File

@ -4457,23 +4457,23 @@ exports.BattleMovedex = {
accuracy: 100,
basePower: false,
basePowerCallback: function(pokemon, target) {
if (target.weightkg > 200) {
if (target.weightkg >= 200) {
this.debug('120 bp');
return 120;
}
if (target.weightkg > 100) {
if (target.weightkg >= 100) {
this.debug('100 bp');
return 100;
}
if (target.weightkg > 50) {
if (target.weightkg >= 50) {
this.debug('80 bp');
return 80;
}
if (target.weightkg > 25) {
if (target.weightkg >= 25) {
this.debug('60 bp');
return 60;
}
if (target.weightkg > 10) {
if (target.weightkg >= 10) {
this.debug('40 bp');
return 40;
}
@ -6528,19 +6528,19 @@ exports.BattleMovedex = {
basePower: false,
basePowerCallback: function(pokemon, target) {
var targetWeight = target.weightkg;
if (target.weightkg > 200) {
if (target.weightkg >= 200) {
return 120;
}
if (target.weightkg > 100) {
if (target.weightkg >= 100) {
return 100;
}
if (target.weightkg > 50) {
if (target.weightkg >= 50) {
return 80;
}
if (target.weightkg > 25) {
if (target.weightkg >= 25) {
return 60;
}
if (target.weightkg > 10) {
if (target.weightkg >= 10) {
return 40;
}
return 20;