From 10c4140d2078661e931abbd5106c336d32358507 Mon Sep 17 00:00:00 2001 From: Yoshiblaze <53023564+Yoshiblaze@users.noreply.github.com> Date: Thu, 7 Dec 2023 13:43:35 -0500 Subject: [PATCH 01/11] Update rulesets.ts --- data/mods/moderngen1/rulesets.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/data/mods/moderngen1/rulesets.ts b/data/mods/moderngen1/rulesets.ts index 623d4d3364b9..4c1865246bae 100644 --- a/data/mods/moderngen1/rulesets.ts +++ b/data/mods/moderngen1/rulesets.ts @@ -37,4 +37,15 @@ export const Rulesets: {[k: string]: ModdedFormatData} = { this.add('-message', `https://www.smogon.com/forums/threads/gen-9-modern-gen-1.3711533/`); }, }, + uselessmovesclause: { + effectType: 'ValidatorRule', + name: 'Useless Moves Clause', + desc: "Bans moves that have no effect (to aid in teambuilding).", + banlist: ['Conversion 2', 'Electric Terrain', 'Electrify', 'Encore', 'Flower Shield', 'Grassy Terrain', 'Hail', 'Healing Wish', 'Heart Swap', + 'Ion Deluge', 'Laser Focus', 'Lunar Dance', 'Misty Terrain', 'Perish Song', 'Psych Up', 'Psychic Terrain', 'Rain Dance', 'Revival Blessing', + 'Sandstorm', 'Sleep Talk', 'Snowscape', 'Speed Swap', 'Sunny Day', 'Wish'], + onBegin() { + this.add('rule', 'Useless Moves Clause: Prevents trainers from bringing moves with no effect'); + }, + }, }; From 6904a7d04e753b96ebae8fb96bc52c17aa0a6e2d Mon Sep 17 00:00:00 2001 From: Yoshiblaze <53023564+Yoshiblaze@users.noreply.github.com> Date: Thu, 7 Dec 2023 13:44:46 -0500 Subject: [PATCH 02/11] Create moves.ts --- data/mods/moderngen1/moves.ts | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 data/mods/moderngen1/moves.ts diff --git a/data/mods/moderngen1/moves.ts b/data/mods/moderngen1/moves.ts new file mode 100644 index 000000000000..205308c6a09e --- /dev/null +++ b/data/mods/moderngen1/moves.ts @@ -0,0 +1,7 @@ +export const Moves: {[k: string]: ModdedMoveData} = { + doubleironbash: { + inherit: true, + isNonstandard: null, + gen: 1, + }, +}; From b8cc8c023de50f5e31bc99fe27679d123adc947c Mon Sep 17 00:00:00 2001 From: Yoshiblaze <53023564+Yoshiblaze@users.noreply.github.com> Date: Thu, 7 Dec 2023 13:45:12 -0500 Subject: [PATCH 03/11] Update moves.ts --- data/mods/vaporemons/moves.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/data/mods/vaporemons/moves.ts b/data/mods/vaporemons/moves.ts index 9bda81186fe4..a283a04a1d1c 100644 --- a/data/mods/vaporemons/moves.ts +++ b/data/mods/vaporemons/moves.ts @@ -1661,6 +1661,19 @@ export const Moves: {[k: string]: ModdedMoveData} = { this.field.clearTerrain(); return success; }, + self: { + onHit(pokemon, source, move) { + if (source.hasItem('airfreshener')) { + this.add('-activate', source, 'move: Aromatherapy'); + for (const ally of source.side.pokemon) { + if (ally !== source && (ally.volatiles['substitute'] && !move.infiltrates)) { + continue; + } + ally.cureStatus(); + } + } + }, + }, secondary: null, target: "normal", type: "Flying", From 1e1e58f300ea9dfcccb8f845522f71461131d15e Mon Sep 17 00:00:00 2001 From: Yoshiblaze <53023564+Yoshiblaze@users.noreply.github.com> Date: Thu, 7 Dec 2023 13:45:47 -0500 Subject: [PATCH 04/11] Update formats.ts --- config/formats.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/formats.ts b/config/formats.ts index 6cfc68bb68ee..5f7940e7cf6f 100644 --- a/config/formats.ts +++ b/config/formats.ts @@ -547,7 +547,7 @@ export const Formats: FormatList = [ ], mod: 'moderngen1', - ruleset: ['Standard', 'Partial Trapping Clause', 'Protect Clause', 'Field Effect Clause', 'Sleep Moves Clause', 'MG1 Mod'], + ruleset: ['Standard', 'Partial Trapping Clause', 'Protect Clause', 'Field Effect Clause', 'Sleep Moves Clause', 'Useless Moves Clause', 'MG1 Mod'], banlist: ['Uber', 'Fake Out', 'Confuse Ray', 'Supersonic', 'Swagger', 'Sweet Kiss', 'Flatter'], }, { From 916b35bceab4e9dfcc058a59a0c20b60afc524ae Mon Sep 17 00:00:00 2001 From: Yoshiblaze <53023564+Yoshiblaze@users.noreply.github.com> Date: Thu, 7 Dec 2023 13:53:54 -0500 Subject: [PATCH 05/11] Update moves.ts --- data/mods/vaporemons/moves.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/data/mods/vaporemons/moves.ts b/data/mods/vaporemons/moves.ts index a283a04a1d1c..7835a2c667ad 100644 --- a/data/mods/vaporemons/moves.ts +++ b/data/mods/vaporemons/moves.ts @@ -490,6 +490,19 @@ export const Moves: {[k: string]: ModdedMoveData} = { this.add('-end', target, 'Wind Breaker', '[silent]'); }, }, + self: { + onHit(pokemon, source, move) { + if (source.hasItem('airfreshener')) { + this.add('-activate', source, 'move: Aromatherapy'); + for (const ally of source.side.pokemon) { + if (ally !== source && (ally.volatiles['substitute'] && !move.infiltrates)) { + continue; + } + ally.cureStatus(); + } + } + }, + }, secondary: { chance: 100, onHit(target) { From d6e45036583376f4a8aea7618994eba283d660ff Mon Sep 17 00:00:00 2001 From: Yoshiblaze <53023564+Yoshiblaze@users.noreply.github.com> Date: Thu, 7 Dec 2023 13:54:28 -0500 Subject: [PATCH 06/11] Update moves.ts --- data/mods/moderngen1/moves.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/moderngen1/moves.ts b/data/mods/moderngen1/moves.ts index 205308c6a09e..57883e028960 100644 --- a/data/mods/moderngen1/moves.ts +++ b/data/mods/moderngen1/moves.ts @@ -1,7 +1,7 @@ export const Moves: {[k: string]: ModdedMoveData} = { doubleironbash: { inherit: true, - isNonstandard: null, + isNonstandard: null, gen: 1, }, }; From 6e1ecac5899158f5625077756ad0b980928080a9 Mon Sep 17 00:00:00 2001 From: Yoshiblaze <53023564+Yoshiblaze@users.noreply.github.com> Date: Thu, 7 Dec 2023 13:55:01 -0500 Subject: [PATCH 07/11] Update rulesets.ts --- data/mods/moderngen1/rulesets.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/moderngen1/rulesets.ts b/data/mods/moderngen1/rulesets.ts index 4c1865246bae..6cd8cf122724 100644 --- a/data/mods/moderngen1/rulesets.ts +++ b/data/mods/moderngen1/rulesets.ts @@ -42,8 +42,8 @@ export const Rulesets: {[k: string]: ModdedFormatData} = { name: 'Useless Moves Clause', desc: "Bans moves that have no effect (to aid in teambuilding).", banlist: ['Conversion 2', 'Electric Terrain', 'Electrify', 'Encore', 'Flower Shield', 'Grassy Terrain', 'Hail', 'Healing Wish', 'Heart Swap', - 'Ion Deluge', 'Laser Focus', 'Lunar Dance', 'Misty Terrain', 'Perish Song', 'Psych Up', 'Psychic Terrain', 'Rain Dance', 'Revival Blessing', - 'Sandstorm', 'Sleep Talk', 'Snowscape', 'Speed Swap', 'Sunny Day', 'Wish'], + 'Ion Deluge', 'Laser Focus', 'Lunar Dance', 'Misty Terrain', 'Perish Song', 'Psych Up', 'Psychic Terrain', 'Rain Dance', 'Revival Blessing', + 'Sandstorm', 'Sleep Talk', 'Snowscape', 'Speed Swap', 'Sunny Day', 'Wish'], onBegin() { this.add('rule', 'Useless Moves Clause: Prevents trainers from bringing moves with no effect'); }, From 7c5ea18bd1cc20aa8a1e730db756d5c9a5061e73 Mon Sep 17 00:00:00 2001 From: Yoshiblaze <53023564+Yoshiblaze@users.noreply.github.com> Date: Thu, 7 Dec 2023 14:13:04 -0500 Subject: [PATCH 08/11] Update rulesets.ts --- data/mods/moderngen1/rulesets.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/moderngen1/rulesets.ts b/data/mods/moderngen1/rulesets.ts index 6cd8cf122724..0e5d904e8ab9 100644 --- a/data/mods/moderngen1/rulesets.ts +++ b/data/mods/moderngen1/rulesets.ts @@ -43,7 +43,7 @@ export const Rulesets: {[k: string]: ModdedFormatData} = { desc: "Bans moves that have no effect (to aid in teambuilding).", banlist: ['Conversion 2', 'Electric Terrain', 'Electrify', 'Encore', 'Flower Shield', 'Grassy Terrain', 'Hail', 'Healing Wish', 'Heart Swap', 'Ion Deluge', 'Laser Focus', 'Lunar Dance', 'Misty Terrain', 'Perish Song', 'Psych Up', 'Psychic Terrain', 'Rain Dance', 'Revival Blessing', - 'Sandstorm', 'Sleep Talk', 'Snowscape', 'Speed Swap', 'Sunny Day', 'Wish'], + 'Sandstorm', 'Sleep Talk', 'Snowscape', 'Speed Swap', 'Sunny Day', 'Wish', 'Jungle Healing', 'Lunar Blessing', 'Life Dew'], onBegin() { this.add('rule', 'Useless Moves Clause: Prevents trainers from bringing moves with no effect'); }, From 0241d3be54fffb4cf1b28b30d568b0585ead1982 Mon Sep 17 00:00:00 2001 From: Yoshiblaze <53023564+Yoshiblaze@users.noreply.github.com> Date: Fri, 8 Dec 2023 18:39:34 -0500 Subject: [PATCH 09/11] Update abilities.ts --- data/mods/vaporemons/abilities.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/vaporemons/abilities.ts b/data/mods/vaporemons/abilities.ts index 7e24f6153368..4da5444f51c7 100644 --- a/data/mods/vaporemons/abilities.ts +++ b/data/mods/vaporemons/abilities.ts @@ -110,7 +110,7 @@ export const Abilities: {[k: string]: ModdedAbilityData} = { }, onTryMovePriority: -2, onTryMove(pokemon, target, move) { - if (!pokemon.hasItem('musclememory')) { + if (!pokemon.hasAbility('musclememory')) { pokemon.removeVolatile('musclememory'); return; } From 890145c73a30ed8cde0d945a88e34bf7b32c7271 Mon Sep 17 00:00:00 2001 From: Yoshiblaze <53023564+Yoshiblaze@users.noreply.github.com> Date: Sun, 10 Dec 2023 21:10:24 -0500 Subject: [PATCH 10/11] Update moves.ts --- data/mods/vaporemons/moves.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/vaporemons/moves.ts b/data/mods/vaporemons/moves.ts index 7835a2c667ad..c73292c18603 100644 --- a/data/mods/vaporemons/moves.ts +++ b/data/mods/vaporemons/moves.ts @@ -1365,7 +1365,7 @@ export const Moves: {[k: string]: ModdedMoveData} = { accuracy: 95, basePower: 100, category: "Physical", - shortDesc: "(Mostly functional) Either Fighting or Flying-type, whichever is more effective.", + shortDesc: "Either Fighting or Flying-type, whichever is more effective.", name: "Flying Press", pp: 10, flags: {contact: 1, protect: 1, mirror: 1, gravity: 1, distance: 1, nonsky: 1}, @@ -1400,7 +1400,7 @@ export const Moves: {[k: string]: ModdedMoveData} = { accuracy: 95, basePower: 100, category: "Special", - shortDesc: "(Mostly functional) Either Bug or Electric-type, whichever is more effective.", + shortDesc: "Either Bug or Electric-type, whichever is more effective.", name: "Software Crash", pp: 10, flags: {protect: 1, mirror: 1}, From e938686ed3729866a411faf8842f5e1175f6a8a0 Mon Sep 17 00:00:00 2001 From: Kris Johnson <11083252+KrisXV@users.noreply.github.com> Date: Mon, 11 Dec 2023 11:08:53 -0700 Subject: [PATCH 11/11] Update data/mods/moderngen1/rulesets.ts --- data/mods/moderngen1/rulesets.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/data/mods/moderngen1/rulesets.ts b/data/mods/moderngen1/rulesets.ts index 0e5d904e8ab9..35ae54cd3ca4 100644 --- a/data/mods/moderngen1/rulesets.ts +++ b/data/mods/moderngen1/rulesets.ts @@ -41,9 +41,11 @@ export const Rulesets: {[k: string]: ModdedFormatData} = { effectType: 'ValidatorRule', name: 'Useless Moves Clause', desc: "Bans moves that have no effect (to aid in teambuilding).", - banlist: ['Conversion 2', 'Electric Terrain', 'Electrify', 'Encore', 'Flower Shield', 'Grassy Terrain', 'Hail', 'Healing Wish', 'Heart Swap', + banlist: [ + 'Conversion 2', 'Electric Terrain', 'Electrify', 'Encore', 'Flower Shield', 'Grassy Terrain', 'Hail', 'Healing Wish', 'Heart Swap', 'Ion Deluge', 'Laser Focus', 'Lunar Dance', 'Misty Terrain', 'Perish Song', 'Psych Up', 'Psychic Terrain', 'Rain Dance', 'Revival Blessing', - 'Sandstorm', 'Sleep Talk', 'Snowscape', 'Speed Swap', 'Sunny Day', 'Wish', 'Jungle Healing', 'Lunar Blessing', 'Life Dew'], + 'Sandstorm', 'Sleep Talk', 'Snowscape', 'Speed Swap', 'Sunny Day', 'Wish', 'Jungle Healing', 'Lunar Blessing', 'Life Dew', + ], onBegin() { this.add('rule', 'Useless Moves Clause: Prevents trainers from bringing moves with no effect'); },