Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-09-14 12:15:44 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Refactor getEffect for speed safely (#5201)

Browse Source 
Rollforward of 7a20245 which retains the `hasOwnProperty` checks.

Also changes the method to call `toId` earlier and use the id
as the key to the cache to ensure 'Stealth Rock' and 'stealthrock'
return the same. NOTE: 'move: Stealth Rock' and 'Stealth Rock' will
still continue to return different results.
This commit is contained in:
Kirk Scheibelhut
2019-02-23 17:28:06 -08:00
committed by Guangcong Luo
parent 48ecdd492d
commit 4e421c1bd9
2 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sim/dex.js
View File

@@ -476,7 +476,8 @@ class ModdedDex {
return /** @type {PureEffect} */ (name);
}
let effect = this.effectCache.get(name);
let id = toId(name);
let effect = this.effectCache.get(id);
if (effect) {
return /** @type {PureEffect} */ (effect);
}
@@ -489,25 +490,20 @@ class ModdedDex {
effect = this.getAbility(name.slice(8));
}
if (effect) {
this.effectCache.set(name, effect);
this.effectCache.set(id, effect);
// @ts-ignore
return effect;
}
let id = toId(name);
if (this.data.Statuses.hasOwnProperty(id)) {
effect = new Data.PureEffect({name}, this.data.Statuses[id]);
} else if (this.data.Movedex.hasOwnProperty(id) && this.data.Movedex[id].effect) {
name = this.data.Movedex[id].name || name;
effect = new Data.PureEffect({name}, this.data.Movedex[id].effect);
} else if (this.data.Abilities.hasOwnProperty(id) && this.data.Abilities[id].effect) {
name = this.data.Abilities[id].name || name;
effect = new Data.PureEffect({name}, this.data.Abilities[id].effect);
} else if (this.data.Items.hasOwnProperty(id) && this.data.Items[id].effect) {
name = this.data.Items[id].name || name;
effect = new Data.PureEffect({name}, this.data.Items[id].effect);
} else if (this.data.Formats.hasOwnProperty(id)) {
let found;
if (this.data.Formats.hasOwnProperty(id)) {
effect = new Data.Format({name}, this.data.Formats[id]);
} else if (this.data.Statuses.hasOwnProperty(id)) {
effect = new Data.PureEffect({name}, this.data.Statuses[id]);
} else if ((this.data.Movedex.hasOwnProperty(id) && (found = this.data.Movedex[id]).effect) ||
(this.data.Abilities.hasOwnProperty(id) && (found = this.data.Abilities[id]).effect) ||
(this.data.Items.hasOwnProperty(id) && (found = this.data.Items[id]).effect)) {
effect = new Data.PureEffect({name: found.name || name}, found.effect);
} else if (id === 'recoil') {
effect = new Data.PureEffect({name: 'Recoil', effectType: 'Recoil'});
} else if (id === 'drain') {
@@ -516,7 +512,7 @@ class ModdedDex {
effect = new Data.PureEffect({name, exists: false});
}
this.effectCache.set(name, effect);
this.effectCache.set(id, effect);
return /** @type {PureEffect} */ (effect);
}
/**

11
test/simulator/misc/dex.js
View File

@@ -20,3 +20,14 @@ describe('Mod loader', function () {
}
});
});
describe('Dex#getEffect', function () {
it('returns the same object for the same id', function () {
assert.strictEqual(Dex.getEffect('Stealth Rock'), Dex.getEffect('stealthrock'));
assert.notStrictEqual(Dex.getEffect('move: Stealth Rock'), Dex.getEffect('stealthrock'));
});
it('does not return elements from the Object prototype', function () {
assert.false(Dex.getEffect('constructor').exists);
});
});