From 5efefe9ceb8aa8a0524c1949eae7d7eda83ae37c Mon Sep 17 00:00:00 2001 From: Xylopia Date: Wed, 1 Feb 2023 03:46:32 -0500 Subject: [PATCH] Change the interpretation a little and added an else fallback, can't figure out that 'battlemessage' will need assistance --- .../common/api/battles/model/PokemonBattle.kt | 2 +- .../mod/common/battles/ShowdownInterpreter.kt | 31 ++++++++++++------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/battles/model/PokemonBattle.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/battles/model/PokemonBattle.kt index 2e9a956858..b66487b22e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/battles/model/PokemonBattle.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/battles/model/PokemonBattle.kt @@ -47,7 +47,7 @@ open class PokemonBattle( val side2: BattleSide ) { /** Whether or not logging will be silenced for this battle. */ - var mute = true + var mute = false init { side1.battle = this diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/battles/ShowdownInterpreter.kt b/common/src/main/kotlin/com/cobblemon/mod/common/battles/ShowdownInterpreter.kt index b7ade972eb..9485174ee1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/battles/ShowdownInterpreter.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/battles/ShowdownInterpreter.kt @@ -743,26 +743,33 @@ object ShowdownInterpreter { private fun handleFieldStartInstructions(battle: PokemonBattle, message: String, remainingLines: MutableList){ battle.dispatch{ - when { - "move: Mud Sport" in message -> battle.broadcastChatMessage(battleLang("mud_sport_field")) - "move: Electric Terrain" in message -> battle.broadcastChatMessage(battleLang("electric_terrain_field")) - "move: Grassy Terrain" in message -> battle.broadcastChatMessage(battleLang("grassy_terrain_field")) - "move: Misty Terrain" in message -> battle.broadcastChatMessage(battleLang("misty_terrain_field")) - "move: Psychic Terrain" in message -> battle.broadcastChatMessage(battleLang("psychic_terrain_field")) - "move: Water Sport" in message -> battle.broadcastChatMessage(battleLang("water_sport_field")) + val editedMessage = message.split("|-fieldstart|")[1] + val pnx = editedMessage.substring(0, 3) + val fromWhat = editedMessage.split("|")[1] + when (fromWhat) { + "move: Mud Sport" -> battle.broadcastChatMessage(battleLang("mud_sport_field")) + "move: Electric Terrain" -> battle.broadcastChatMessage(battleLang("electric_terrain_field")) + "move: Grassy Terrain" -> battle.broadcastChatMessage(battleLang("grassy_terrain_field")) + "move: Misty Terrain" -> battle.broadcastChatMessage(battleLang("misty_terrain_field")) + "move: Psychic Terrain" -> battle.broadcastChatMessage(battleLang("psychic_terrain_field")) + "move: Water Sport" -> battle.broadcastChatMessage(battleLang("water_sport_field")) + else -> battle.broadcastChatMessage(editedMessage.text()) } - GO + WaitDispatch(1F) } } private fun handleAbilityInstructions(battle: PokemonBattle, message: String, remainingLines: MutableList) { battle.dispatch { - val pnx = message.split("|-ability|")[1].substring(0, 3) + val editedMessage = message.split("|-ability|")[1] + val pnx = editedMessage.substring(0, 3) val (_, pokemon) = battle.getActorAndActiveSlotFromPNX(pnx) - when { - "Speed Boost" in message -> battle.broadcastChatMessage(battleLang("speed_boost_ability",pokemon.battlePokemon!!.getName())) + val fromWhat = editedMessage.split("|")[1] + when (fromWhat) { + "Speed Boost" -> battle.broadcastChatMessage(battleLang("speed_boost_ability", pokemon.battlePokemon!!.getName())) + else -> battle.broadcastChatMessage(editedMessage.text()) } - GO + WaitDispatch(1F) } }