From ecdca52cd1ba9ae195818d1e3191f5c1240a0da2 Mon Sep 17 00:00:00 2001 From: Yentis Date: Sat, 18 May 2024 00:45:33 +0200 Subject: [PATCH] don't set color to white, just leave it unchanged --- src/field/pokemon.ts | 2 +- src/ui/fight-ui-handler.ts | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 5a09adfad9e..22797ccaa37 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -1440,7 +1440,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return 'lightblue'; } - return 'white'; + return undefined; } toggleStats(visible: boolean): void { diff --git a/src/ui/fight-ui-handler.ts b/src/ui/fight-ui-handler.ts index 8f98055afca..7ae18541600 100644 --- a/src/ui/fight-ui-handler.ts +++ b/src/ui/fight-ui-handler.ts @@ -234,7 +234,9 @@ export default class FightUiHandler extends UiHandler { if (stab) moveText.setFontStyle('bold'); const moveColors = moveEffectivenessList.sort((a, b) => b - a).map((effectiveness) => this.getMoveColor(effectiveness)); - moveText.setColor(moveColors[0]); + const color = moveColors[0]; + + if (color !== undefined) moveText.setColor(color); } private getMoveEffectivenessText(moveEffectiveness?: TypeDamageMultiplier): string { @@ -242,7 +244,7 @@ export default class FightUiHandler extends UiHandler { return ` ${moveEffectiveness}x`; } - private getMoveColor(moveEffectiveness?: TypeDamageMultiplier): string { + private getMoveColor(moveEffectiveness?: TypeDamageMultiplier): string | undefined { switch (moveEffectiveness) { case 0: return 'black'; @@ -260,7 +262,7 @@ export default class FightUiHandler extends UiHandler { return 'darkgreen'; } - return 'white'; + return undefined; } clear() {