From 21619603cd9cbcd3ac635535069fbe49a7db0935 Mon Sep 17 00:00:00 2001 From: GregHib Date: Fri, 16 Feb 2024 16:55:48 +0000 Subject: [PATCH] Use string ids for client scripts closes #442 --- data/definitions/scripts.yml | 12 +++++++++++- .../gregs/voidps/engine/client/EncodeExtensions.kt | 9 +++++++-- .../voidps/engine/client/ui/InterfaceOptions.kt | 2 +- .../voidps/engine/client/ui/InterfaceOptionsTest.kt | 2 +- .../gregs/voidps/world/activity/bank/BankOpen.kts | 4 ++-- .../world/gregs/voidps/world/activity/quest/Quest.kt | 4 ++-- .../world/activity/skill/crafting/Jewellery.kts | 2 +- .../world/activity/skill/crafting/SilverCasting.kts | 2 +- .../voidps/world/activity/skill/smithing/Anvil.kts | 2 +- .../voidps/world/command/debug/InterfaceCommands.kts | 3 +-- .../gregs/voidps/world/community/clan/ClanSetup.kts | 2 +- .../voidps/world/community/trade/TradeRequest.kts | 2 +- .../gregs/voidps/world/community/trade/TradeSync.kts | 2 +- .../voidps/world/interact/dialogue/type/IntEntry.kt | 4 +--- .../voidps/world/interact/dialogue/type/ItemBox.kt | 3 +-- .../world/interact/dialogue/type/StringEntry.kt | 4 +--- .../entity/player/equip/ItemsKeptOnDeathScreen.kts | 2 +- .../interact/entity/player/equip/PriceChecker.kts | 2 +- .../world/gregs/voidps/world/map/al_kharid/Ellis.kts | 2 +- .../voidps/world/interact/dialogue/DialogueTest.kt | 5 +++++ .../voidps/world/interact/dialogue/IntEntryTest.kt | 2 +- .../voidps/world/interact/dialogue/ItemBoxTest.kt | 4 ++-- .../world/interact/dialogue/StringEntryTest.kt | 2 +- 23 files changed, 46 insertions(+), 32 deletions(-) diff --git a/data/definitions/scripts.yml b/data/definitions/scripts.yml index f9d71b44a..a787467bb 100644 --- a/data/definitions/scripts.yml +++ b/data/definitions/scripts.yml @@ -8,4 +8,14 @@ quest_progress: 2194 activate_prayer: 2295 achievement_has_requirements: 3224 achievement_complete: 3994 -close_dialogue: 571 \ No newline at end of file +clear_dialogues: 571 +primary_options: 150 +secondary_options: 695 +update_bank_slots: 1465 +quest_journal_refresh: 2165 +quest_journal_length: 1207 +trade_warning: 143 +int_entry: 108 +string_entry: 109 +dialogue_item_zoom: 3449 +items_kept_on_death: 118 \ No newline at end of file diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/client/EncodeExtensions.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/client/EncodeExtensions.kt index c0e66ebae..0699e0380 100644 --- a/engine/src/main/kotlin/world/gregs/voidps/engine/client/EncodeExtensions.kt +++ b/engine/src/main/kotlin/world/gregs/voidps/engine/client/EncodeExtensions.kt @@ -2,9 +2,11 @@ package world.gregs.voidps.engine.client import net.pearx.kasechange.toSnakeCase import world.gregs.voidps.engine.client.ui.chat.Colours +import world.gregs.voidps.engine.data.definition.ClientScriptDefinitions import world.gregs.voidps.engine.entity.character.Character import world.gregs.voidps.engine.entity.character.player.Player import world.gregs.voidps.engine.entity.character.player.chat.ChatType +import world.gregs.voidps.engine.get import world.gregs.voidps.network.encode.* import world.gregs.voidps.type.Tile @@ -104,9 +106,12 @@ fun Player.sendRunEnergy(energy: Int) = client?.sendRunEnergy(energy) ?: Unit * @param params Additional parameters to run the script with (strings & integers only) */ fun Player.sendScript( - id: Int, + id: String, vararg params: Any? -) = sendScript(id, params.toList()) +) { + val definition = get().get(id) + sendScript(definition.id, params.toList()) +} fun Player.sendScript( id: Int, diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/client/ui/InterfaceOptions.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/client/ui/InterfaceOptions.kt index 832697b37..a742ed584 100644 --- a/engine/src/main/kotlin/world/gregs/voidps/engine/client/ui/InterfaceOptions.kt +++ b/engine/src/main/kotlin/world/gregs/voidps/engine/client/ui/InterfaceOptions.kt @@ -23,7 +23,7 @@ class InterfaceOptions( fun send(id: String, component: String) { val comp = definitions.getComponent(id, component) ?: return - val script = if (comp["primary", true]) 150 else 695 + val script = if (comp["primary", true]) "primary_options" else "secondary_options" val inventory = inventoryDefinitions.get(comp["inventory", ""]) if (inventory.id != -1) { val combined = (comp["parent", -1] shl 16) or comp.id diff --git a/engine/src/test/kotlin/world/gregs/voidps/engine/client/ui/InterfaceOptionsTest.kt b/engine/src/test/kotlin/world/gregs/voidps/engine/client/ui/InterfaceOptionsTest.kt index 531adb43f..432b944ab 100644 --- a/engine/src/test/kotlin/world/gregs/voidps/engine/client/ui/InterfaceOptionsTest.kt +++ b/engine/src/test/kotlin/world/gregs/voidps/engine/client/ui/InterfaceOptionsTest.kt @@ -59,7 +59,7 @@ internal class InterfaceOptionsTest { every { inventoryDefinitions.get(any()) } returns InventoryDefinition(10, extras = mapOf("width" to 2, "height" to 3)) options.send(name, comp) verify { - player.sendScript(695, (5 shl 16) or 0, 10, 2, 3, 0, -1, "", "", "", "", "", "", "", "", "") + player.sendScript("secondary_options", (5 shl 16) or 0, 10, 2, 3, 0, -1, "", "", "", "", "", "", "", "", "") } } diff --git a/game/src/main/kotlin/world/gregs/voidps/world/activity/bank/BankOpen.kts b/game/src/main/kotlin/world/gregs/voidps/world/activity/bank/BankOpen.kts index 30e3fc5bd..89149a3b7 100644 --- a/game/src/main/kotlin/world/gregs/voidps/world/activity/bank/BankOpen.kts +++ b/game/src/main/kotlin/world/gregs/voidps/world/activity/bank/BankOpen.kts @@ -26,7 +26,7 @@ objectOperate("Collect") { interfaceClose("bank") { player: Player -> player.close("bank_side") - player.sendScript(571) + player.sendScript("clear_dialogues") } interfaceOpen("bank") { player: Player -> @@ -38,7 +38,7 @@ interfaceOpen("bank") { player: Player -> player.sendVariable("bank_tab_$tab") } player.sendVariable("last_bank_amount") - player.sendScript(1465) + player.sendScript("update_bank_slots") player.interfaceOptions.unlockAll("bank", "inventory", 0 until 516) player.interfaceOptions.unlockAll("bank_side", "inventory", 0 until 28) } diff --git a/game/src/main/kotlin/world/gregs/voidps/world/activity/quest/Quest.kt b/game/src/main/kotlin/world/gregs/voidps/world/activity/quest/Quest.kt index fed2781b4..d8038c484 100644 --- a/game/src/main/kotlin/world/gregs/voidps/world/activity/quest/Quest.kt +++ b/game/src/main/kotlin/world/gregs/voidps/world/activity/quest/Quest.kt @@ -10,7 +10,7 @@ fun Player.quest(name: String): String = this[name, "unstarted"] fun Player.questComplete(name: String): Boolean = quest(name) == "completed" fun Player.refreshQuestJournal() { - sendScript(2165) + sendScript("quest_journal_refresh") } private const val QUEST_SCROLL_ID = "quest_scroll" @@ -19,7 +19,7 @@ fun Player.sendQuestJournal(name: String, lines: List) { if (!interfaces.open(QUEST_SCROLL_ID)) { return } - sendScript(1207, lines.size + 1) + sendScript("quest_journal_length", lines.size + 1) interfaces.sendText(QUEST_SCROLL_ID, "quest_name", name) interfaces.sendText(QUEST_SCROLL_ID, "line0", "") for (i in 0..301) { diff --git a/game/src/main/kotlin/world/gregs/voidps/world/activity/skill/crafting/Jewellery.kts b/game/src/main/kotlin/world/gregs/voidps/world/activity/skill/crafting/Jewellery.kts index 04e1ad28e..bf896cc86 100644 --- a/game/src/main/kotlin/world/gregs/voidps/world/activity/skill/crafting/Jewellery.kts +++ b/game/src/main/kotlin/world/gregs/voidps/world/activity/skill/crafting/Jewellery.kts @@ -71,7 +71,7 @@ interfaceOption("Make *", "make*", "make_mould*") { } interfaceClose("make_mould*") { player: Player -> - player.sendScript(571) + player.sendScript("clear_dialogues") } fun CharacterContext.make(component: String, amount: Int) { diff --git a/game/src/main/kotlin/world/gregs/voidps/world/activity/skill/crafting/SilverCasting.kts b/game/src/main/kotlin/world/gregs/voidps/world/activity/skill/crafting/SilverCasting.kts index 74842bb3d..0f4dff45a 100644 --- a/game/src/main/kotlin/world/gregs/voidps/world/activity/skill/crafting/SilverCasting.kts +++ b/game/src/main/kotlin/world/gregs/voidps/world/activity/skill/crafting/SilverCasting.kts @@ -82,7 +82,7 @@ interfaceOption(component = "*_button", id = "silver_mould") { } interfaceClose("silver_mould") { player: Player -> - player.sendScript(571) + player.sendScript("clear_dialogues") } fun Player.make(item: Item, amount: Int) { diff --git a/game/src/main/kotlin/world/gregs/voidps/world/activity/skill/smithing/Anvil.kts b/game/src/main/kotlin/world/gregs/voidps/world/activity/skill/smithing/Anvil.kts index 31af4d7f2..032067714 100644 --- a/game/src/main/kotlin/world/gregs/voidps/world/activity/skill/smithing/Anvil.kts +++ b/game/src/main/kotlin/world/gregs/voidps/world/activity/skill/smithing/Anvil.kts @@ -125,7 +125,7 @@ itemOnObjectOperate("hammer", "anvil*", arrive = false) { } interfaceClose("smithing") { player: Player -> - player.sendScript(571) + player.sendScript("clear_dialogues") } suspend fun CharacterContext.smith(player: Player, metal: String, type: String, amount: Int) { diff --git a/game/src/main/kotlin/world/gregs/voidps/world/command/debug/InterfaceCommands.kts b/game/src/main/kotlin/world/gregs/voidps/world/command/debug/InterfaceCommands.kts index 84dabba13..c6328ef8b 100644 --- a/game/src/main/kotlin/world/gregs/voidps/world/command/debug/InterfaceCommands.kts +++ b/game/src/main/kotlin/world/gregs/voidps/world/command/debug/InterfaceCommands.kts @@ -3,7 +3,6 @@ package world.gregs.voidps.world.command.debug import world.gregs.voidps.engine.client.message import world.gregs.voidps.engine.client.sendInterfaceSettings import world.gregs.voidps.engine.client.sendInventoryItems -import world.gregs.voidps.engine.client.sendScript import world.gregs.voidps.engine.client.ui.event.adminCommand import world.gregs.voidps.engine.client.ui.menu.InterfaceOptionSettings.getHash import world.gregs.voidps.engine.data.definition.InterfaceDefinitions @@ -74,7 +73,7 @@ adminCommand("setting") { adminCommand("script") { val parts = content.split(" ") val remainder = parts.subList(1, parts.size).map { it.toIntOrNull() ?: it }.toTypedArray() - player.sendScript(parts[0].toInt(), *remainder) + player.client?.sendScript(parts[0].toInt(), remainder.toList()) } adminCommand("sendItems") { diff --git a/game/src/main/kotlin/world/gregs/voidps/world/community/clan/ClanSetup.kts b/game/src/main/kotlin/world/gregs/voidps/world/community/clan/ClanSetup.kts index 1326e61e5..7f21c0297 100644 --- a/game/src/main/kotlin/world/gregs/voidps/world/community/clan/ClanSetup.kts +++ b/game/src/main/kotlin/world/gregs/voidps/world/community/clan/ClanSetup.kts @@ -139,7 +139,7 @@ interfaceOption("Set prefix", "name", "clan_chat_setup") { } interfaceClose("clan_chat_setup") { player: Player -> - player.sendScript(571) + player.sendScript("clear_dialogues") } interfaceOption("Disable", "name", "clan_chat_setup") { diff --git a/game/src/main/kotlin/world/gregs/voidps/world/community/trade/TradeRequest.kts b/game/src/main/kotlin/world/gregs/voidps/world/community/trade/TradeRequest.kts index 97bdba831..7071fe9e0 100644 --- a/game/src/main/kotlin/world/gregs/voidps/world/community/trade/TradeRequest.kts +++ b/game/src/main/kotlin/world/gregs/voidps/world/community/trade/TradeRequest.kts @@ -106,5 +106,5 @@ fun reset(player: Player, other: Player) { player.loan.moveAll(player.inventory) player.loan.clear() player.otherLoan.clear() - player.sendScript(571) + player.sendScript("clear_dialogues") } \ No newline at end of file diff --git a/game/src/main/kotlin/world/gregs/voidps/world/community/trade/TradeSync.kts b/game/src/main/kotlin/world/gregs/voidps/world/community/trade/TradeSync.kts index d0e63840e..51e5d5274 100644 --- a/game/src/main/kotlin/world/gregs/voidps/world/community/trade/TradeSync.kts +++ b/game/src/main/kotlin/world/gregs/voidps/world/community/trade/TradeSync.kts @@ -43,7 +43,7 @@ fun highlightRemovedSlots(player: Player, other: Player, update: ItemChanged) { fun Player.warn(id: String, componentId: String, slot: Int) { val component = interfaceDefinitions.getComponent(id, componentId) ?: return val inventory = inventoryDefinitions.get(component["inventory", ""]) - sendScript(143, (component["parent", -1] shl 16) or component.id, inventory["width", 0.0], inventory["height", 0.0], slot) + sendScript("trade_warning", (component["parent", -1] shl 16) or component.id, inventory["width", 0.0], inventory["height", 0.0], slot) } fun updateValue(player: Player, other: Player) { diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/IntEntry.kt b/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/IntEntry.kt index 9f652bcde..23b632649 100644 --- a/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/IntEntry.kt +++ b/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/IntEntry.kt @@ -4,9 +4,7 @@ import world.gregs.voidps.engine.client.sendScript import world.gregs.voidps.engine.entity.character.CharacterContext import world.gregs.voidps.engine.suspend.dialogue.IntSuspension -private const val INTEGER_ENTRY_SCRIPT = 108 - suspend fun CharacterContext.intEntry(text: String): Int { - player.sendScript(INTEGER_ENTRY_SCRIPT, text) + player.sendScript("int_entry", text) return IntSuspension() } \ No newline at end of file diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/ItemBox.kt b/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/ItemBox.kt index 0c4911fdf..94dae5875 100644 --- a/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/ItemBox.kt +++ b/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/ItemBox.kt @@ -11,11 +11,10 @@ import world.gregs.voidps.engine.suspend.dialogue.ContinueSuspension private const val ITEM_INTERFACE_ID = "dialogue_obj_box" private const val DOUBLE_ITEM_INTERFACE_ID = "dialogue_double_obj_box" -private const val ITEM_SCRIPT_ID = 3449 suspend fun CharacterContext.item(item: String, zoom: Int, text: String, sprite: Int? = null) { check(player.open(ITEM_INTERFACE_ID)) { "Unable to open item dialogue for $player" } - player.sendScript(ITEM_SCRIPT_ID, get().get(item).id, zoom) + player.sendScript("dialogue_item_zoom", get().get(item).id, zoom) if (sprite != null) { player.interfaces.sendSprite(ITEM_INTERFACE_ID, "sprite", sprite) } diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/StringEntry.kt b/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/StringEntry.kt index c5004530a..925634679 100644 --- a/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/StringEntry.kt +++ b/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/StringEntry.kt @@ -4,9 +4,7 @@ import world.gregs.voidps.engine.client.sendScript import world.gregs.voidps.engine.entity.character.CharacterContext import world.gregs.voidps.engine.suspend.dialogue.StringSuspension -private const val STRING_ENTRY_SCRIPT = 109 - suspend fun CharacterContext.stringEntry(text: String): String { - player.sendScript(STRING_ENTRY_SCRIPT, text) + player.sendScript("string_entry", text) return StringSuspension() } \ No newline at end of file diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/entity/player/equip/ItemsKeptOnDeathScreen.kts b/game/src/main/kotlin/world/gregs/voidps/world/interact/entity/player/equip/ItemsKeptOnDeathScreen.kts index ba5e90ea5..e5a6a64b2 100644 --- a/game/src/main/kotlin/world/gregs/voidps/world/interact/entity/player/equip/ItemsKeptOnDeathScreen.kts +++ b/game/src/main/kotlin/world/gregs/voidps/world/interact/entity/player/equip/ItemsKeptOnDeathScreen.kts @@ -52,7 +52,7 @@ interfaceRefresh("items_kept_on_death") { player: Player -> } fun Player.updateItemsOnDeath(items: List, carriedWealth: Int, riskedWealth: Int, familiar: Boolean = false, gravestone: Boolean = false, skull: Boolean = false) { - sendScript(118, + sendScript("items_kept_on_death", AreaType.Dangerous.ordinal, items.size.coerceAtMost(4), items.getOrNull(0)?.def?.id ?: 0, diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/entity/player/equip/PriceChecker.kts b/game/src/main/kotlin/world/gregs/voidps/world/interact/entity/player/equip/PriceChecker.kts index 94b7876a3..9e76df083 100644 --- a/game/src/main/kotlin/world/gregs/voidps/world/interact/entity/player/equip/PriceChecker.kts +++ b/game/src/main/kotlin/world/gregs/voidps/world/interact/entity/player/equip/PriceChecker.kts @@ -49,7 +49,7 @@ interfaceOption("Remove-*", "items", "price_checker") { interfaceClose("price_checker") { player -> player.close("price_checker_side") - player.sendScript(571) + player.sendScript("clear_dialogues") player.offer.moveAll(player.inventory) } diff --git a/game/src/main/kotlin/world/gregs/voidps/world/map/al_kharid/Ellis.kts b/game/src/main/kotlin/world/gregs/voidps/world/map/al_kharid/Ellis.kts index a74a63043..f638ceef2 100644 --- a/game/src/main/kotlin/world/gregs/voidps/world/map/al_kharid/Ellis.kts +++ b/game/src/main/kotlin/world/gregs/voidps/world/map/al_kharid/Ellis.kts @@ -81,7 +81,7 @@ interfaceOption(component = "Tan *", id = "tanner") { } interfaceClose("tanner") { player: Player -> - player.sendScript(571) + player.sendScript("clear_dialogues") } fun tan(player: Player, type: String, amount: Int) { diff --git a/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/DialogueTest.kt b/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/DialogueTest.kt index d37f03fce..db40a4672 100644 --- a/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/DialogueTest.kt +++ b/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/DialogueTest.kt @@ -11,11 +11,13 @@ import kotlinx.coroutines.test.UnconfinedTestDispatcher import kotlinx.coroutines.test.runTest import org.junit.jupiter.api.BeforeEach import org.koin.test.mock.declareMock +import world.gregs.voidps.cache.definition.data.ClientScriptDefinition import world.gregs.voidps.cache.definition.data.FontDefinition import world.gregs.voidps.cache.definition.data.InterfaceComponentDefinition import world.gregs.voidps.cache.definition.data.InterfaceDefinition import world.gregs.voidps.engine.client.ui.Interfaces import world.gregs.voidps.engine.client.ui.open +import world.gregs.voidps.engine.data.definition.ClientScriptDefinitions import world.gregs.voidps.engine.data.definition.FontDefinitions import world.gregs.voidps.engine.data.definition.InterfaceDefinitions import world.gregs.voidps.engine.entity.character.Character @@ -33,6 +35,7 @@ abstract class DialogueTest : KoinMock() { lateinit var continuation: Continuation lateinit var interfaceDefinitions: InterfaceDefinitions lateinit var fontDefinitions: FontDefinitions + lateinit var clientScriptDefinitions: ClientScriptDefinitions fun dialogueBlocking(block: suspend CharacterContext.() -> Unit) { runTest { @@ -54,6 +57,7 @@ abstract class DialogueTest : KoinMock() { player.interfaces = interfaces interfaceDefinitions = declareMock() fontDefinitions = declareMock() + clientScriptDefinitions = declareMock() continuation = object : Continuation { override val context: CoroutineContext get() = UnconfinedTestDispatcher() @@ -65,6 +69,7 @@ abstract class DialogueTest : KoinMock() { override val character: Character = this@DialogueTest.player override var onCancel: (() -> Unit)? = null }) + every { clientScriptDefinitions.get("string_entry") } returns ClientScriptDefinition(id = 109) every { player.open(any()) } returns true every { interfaceDefinitions.get(any()) } returns InterfaceDefinition() every { interfaceDefinitions.getComponent(any(), any()) } returns InterfaceComponentDefinition() diff --git a/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/IntEntryTest.kt b/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/IntEntryTest.kt index 2fcaf4120..26aa2a35a 100644 --- a/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/IntEntryTest.kt +++ b/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/IntEntryTest.kt @@ -19,7 +19,7 @@ internal class IntEntryTest : DialogueTest() { } assertTrue(player.dialogueSuspension is IntSuspension) verify { - player.sendScript(108, "text") + player.sendScript("int_entry", "text") } } diff --git a/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/ItemBoxTest.kt b/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/ItemBoxTest.kt index 5d3ffbf99..a3055e2b6 100644 --- a/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/ItemBoxTest.kt +++ b/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/ItemBoxTest.kt @@ -32,7 +32,7 @@ internal class ItemBoxTest : DialogueTest() { (player.dialogueSuspension as ContinueSuspension).resume() verify { player.open("dialogue_obj_box") - player.sendScript(3449, 9009, 650) + player.sendScript("dialogue_item_zoom", 9009, 650) interfaces.sendSprite("dialogue_obj_box", "sprite", 10) interfaces.sendText("dialogue_obj_box", "line1", "An item
description") } @@ -72,7 +72,7 @@ internal class ItemBoxTest : DialogueTest() { } } coVerify(exactly = 0) { - player.sendScript(3449, 650, 9009) + player.sendScript("dialogue_item_zoom", 650, 9009) } } } diff --git a/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/StringEntryTest.kt b/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/StringEntryTest.kt index 7d54e0dff..a3ce4c108 100644 --- a/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/StringEntryTest.kt +++ b/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/StringEntryTest.kt @@ -17,7 +17,7 @@ internal class StringEntryTest : DialogueTest() { stringEntry("text") } verify { - player.sendScript(109, "text") + player.sendScript("string_entry", "text") } }