From d3cd75ce8d8226937a9d7d2084d4921c61faca82 Mon Sep 17 00:00:00 2001 From: Torracat <49970341+Torracat@users.noreply.github.com> Date: Fri, 11 Oct 2019 18:14:24 -0400 Subject: [PATCH] SSB: Convert Distortion World to a Pseudo Weather (#5868) --- data/mods/ssb/abilities.js | 2 +- data/mods/ssb/moves.js | 8 +------- data/mods/ssb/scripts.js | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/data/mods/ssb/abilities.js b/data/mods/ssb/abilities.js index c0fca4fe45..46e13073af 100644 --- a/data/mods/ssb/abilities.js +++ b/data/mods/ssb/abilities.js @@ -173,7 +173,7 @@ let BattleAbilities = { name: "Distortion World", isNonstandard: "Custom", onStart() { - this.field.setTerrain('distortionworld'); + this.field.addPseudoWeather('distortionworld'); }, }, // A Quag To The Past diff --git a/data/mods/ssb/moves.js b/data/mods/ssb/moves.js index 735bf4483b..ae0adf1454 100644 --- a/data/mods/ssb/moves.js +++ b/data/mods/ssb/moves.js @@ -561,15 +561,9 @@ let BattleMovedex = { this.add('-anim', source, 'Dark Void', source); this.add('-anim', target, 'Dark Void', target); }, - terrain: 'distortionworld', + pseudoWeather: 'distortionworld', effect: { duration: 5, - durationCallback(source, effect) { - if (source && source.hasItem('terrainextender')) { - return 8; - } - return 5; - }, onBasePower(basePower, attacker, defender, move) { if (move.type === 'Ghost') { this.debug('distortion world boost'); diff --git a/data/mods/ssb/scripts.js b/data/mods/ssb/scripts.js index f3797086fe..21ab51e8cc 100644 --- a/data/mods/ssb/scripts.js +++ b/data/mods/ssb/scripts.js @@ -361,7 +361,7 @@ let BattleScripts = { !(this.battle.field.getPseudoWeather('trickroom') && this.battle.field.getPseudoWeather('alienwave'))) { speed = 0x2710 - speed; } - if (this.battle.field.isTerrain('distortionworld')) { + if (this.battle.field.getPseudoWeather('distortionworld')) { speed = 0; // Anything times 0 is still 0 } return this.battle.trunc(speed, 13);