From b37edb2af5df36359d6f92ecc4334e2a39fa7539 Mon Sep 17 00:00:00 2001 From: Kris Johnson <11083252+KrisXV@users.noreply.github.com> Date: Fri, 1 Nov 2024 11:41:01 -0600 Subject: [PATCH] Fix commands that have optional format args --- server/chat.ts | 2 +- sim/dex-formats.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/chat.ts b/server/chat.ts index 95c76921cf..d93ee7fbcc 100644 --- a/server/chat.ts +++ b/server/chat.ts @@ -325,7 +325,7 @@ export abstract class MessageContext { } if (toID(formatOrMod) in Dex.dexes) { - return {dex: Dex.mod(toID(formatOrMod)).includeData(), format: null, isMatch: true}; + return {dex: Dex.mod(toID(formatOrMod)), format: null, isMatch: true}; } return this.extractFormat(); diff --git a/sim/dex-formats.ts b/sim/dex-formats.ts index 567c698186..67532013a5 100644 --- a/sim/dex-formats.ts +++ b/sim/dex-formats.ts @@ -480,7 +480,7 @@ export class Format extends BasicEffect implements Readonly { super(data); this.mod = Utils.getString(data.mod) || 'gen9'; - this.effectType = Utils.getString(data.effectType) as FormatEffectType || 'Format'; + this.effectType = Utils.getString(data.effectType) as FormatEffectType || 'Condition'; this.debug = !!data.debug; this.rated = (typeof data.rated === 'string' ? data.rated : data.rated !== false); this.gameType = data.gameType || 'singles';