Fix for forewarn not displaying moves with spaces in them.

2023-08-19 03:55:54 -04:00 · 2023-08-19 03:53:31 -04:00 · 2023-08-19 03:47:11 -04:00 · 2023-08-18 23:48:01 -04:00 · 2023-06-28 00:08:07 -04:00 · 2023-06-28 00:07:13 -04:00
1 changed files with 2 additions and 2 deletions
@@ -678,7 +678,7 @@ object ShowdownInterpreter {
            val effectID = message.effectAt(1)?.id ?: return@dispatchWaiting
            val name = pokemon.getName()
            // Move may be null as it's not always given
-            val moveName = message.argumentAt(2)?.let { Moves.getByName(it)?.displayName } ?: Text.EMPTY
+                val moveName = message.argumentAt(2)?.let { Moves.getByName(it.replace(" ",""))?.displayName } ?: "".text()
            val lang = when (effectID) {
                // TODO: in the games they use a generic image because there is a popup of the ability and the sprite of the mon, it may be good to have a similar system here
@@ -949,7 +949,7 @@ object ShowdownInterpreter {
                }
                // Includes revealed move
                "forewarn" -> {
-                    val moveName = message.argumentAt(2)?.let { Moves.getByName(it)?.displayName } ?: Text.EMPTY
+                    val moveName = message.argumentAt(2)?.let { Moves.getByName(it.replace(" ",""))?.displayName } ?: "".text()
                    battleLang("activate.forewarn", sourceName, moveName)
                }
                "focussash", "focusband" -> battleLang("activate.focusband", pokemonName, message.effectAt(1)!!.typelessData)
Author	SHA1	Message	Date
Islana	17ca9a31f1	Fix for forewarn not displaying moves with spaces in them.	2023-08-19 03:55:54 -04:00
Islana	c851f57e36	Fix for forewarn not displaying moves with spaces in them.	2023-08-19 03:53:31 -04:00
Islana	2b3497e63d	Fix for forewarn not displaying moves with spaces in them.	2023-08-19 03:47:11 -04:00
Islana	c014efa9a6	Merge remote-tracking branch 'origin/main'	2023-08-18 23:48:01 -04:00
Islana	f63970163a	Merge remote-tracking branch 'origin/main'	2023-06-28 00:08:07 -04:00
Islana	b34adc6b57	Shedinja revive Fix	2023-06-28 00:07:13 -04:00