From 98c0698097dafb4ea51eec6b9560ac191e507a1f Mon Sep 17 00:00:00 2001 From: Player Name Date: Sat, 8 Jun 2024 12:17:37 +0000 Subject: [PATCH] Fixed random events occurring at kalphite queen and tormented demons Fixed bots trying to speak unicode --- Server/data/botdata/bot_dialogue.json | 10 +++++----- .../region/desert/handlers/KalphiteQueenArea.kt | 10 ++++++++++ .../misthalin/lumbridge/handlers/TormentedDemonArea.kt | 2 +- Server/src/main/core/game/node/entity/Entity.java | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 Server/src/main/content/region/desert/handlers/KalphiteQueenArea.kt diff --git a/Server/data/botdata/bot_dialogue.json b/Server/data/botdata/bot_dialogue.json index 4f3a510fc..e79ac6ee9 100644 --- a/Server/data/botdata/bot_dialogue.json +++ b/Server/data/botdata/bot_dialogue.json @@ -257,7 +257,7 @@ "What do you think @name?", "How does that sound @name?", "That sounds great @name.", - "I’m learning English.", + "I'm learning English.", "I don't understand.", "Could you repeat that please @name?", "Could you please talk slower @name?", @@ -338,7 +338,7 @@ "I couldn't agree more @name", "It cost me a fortune @name", "I am dog tired", - "Don’t take it personally", + "Don't take it personally", "We will be having a good time", "Same as always @name", "No problem", @@ -504,9 +504,9 @@ "Goliath Online", "I'm escaping to the one place that hasn't been corrupted by Capitalism. Lunar Isle!", "Selling wildy protection, 100k gp", - "Can’t we get you on Mastermind, @name? Next contestant – @name from Lumbridge. Special subject – the bleedin’ obvious.", - "Oh, you’re German! I’m sorry, I thought there was something wrong with you.", - "Listen, don’t mention the war! I mentioned it once, but I think I got away with it all right.", + "Can't we get you on Mastermind, @name? Next contestant - @name from Lumbridge. Special subject - the bleedin' obvious.", + "Oh, you're German! I'm sorry, I thought there was something wrong with you.", + "Listen, don't mention the war! I mentioned it once, but I think I got away with it all right.", "Cunnilingus and psychiatry brought us to this.", "Oh, poor baby. What do you want, a Brimstail's Sampler?", "There's an old TzHarrian saying, you fuck up once, you lose two teeth.", diff --git a/Server/src/main/content/region/desert/handlers/KalphiteQueenArea.kt b/Server/src/main/content/region/desert/handlers/KalphiteQueenArea.kt new file mode 100644 index 000000000..e59ae6c86 --- /dev/null +++ b/Server/src/main/content/region/desert/handlers/KalphiteQueenArea.kt @@ -0,0 +1,10 @@ +package content.region.desert.handlers + +import core.api.* +import core.game.world.map.zone.ZoneBorders +import core.game.world.map.zone.ZoneRestriction + +class KalphiteQueenArea : MapArea { + override fun defineAreaBorders() : Array { return arrayOf(ZoneBorders(3456, 9472, 3519, 9535, 0, true)) } + override fun getRestrictions() : Array { return arrayOf(ZoneRestriction.RANDOM_EVENTS) } +} diff --git a/Server/src/main/content/region/misthalin/lumbridge/handlers/TormentedDemonArea.kt b/Server/src/main/content/region/misthalin/lumbridge/handlers/TormentedDemonArea.kt index 22aef3339..2b5a9003d 100644 --- a/Server/src/main/content/region/misthalin/lumbridge/handlers/TormentedDemonArea.kt +++ b/Server/src/main/content/region/misthalin/lumbridge/handlers/TormentedDemonArea.kt @@ -6,5 +6,5 @@ import core.game.world.map.zone.ZoneRestriction class TormentedDemonArea : MapArea { override fun defineAreaBorders() : Array { return arrayOf (ZoneBorders.forRegion(10329)) } - override fun getRestrictions() : Array { return arrayOf (ZoneRestriction.CANNON) } + override fun getRestrictions() : Array { return arrayOf (ZoneRestriction.CANNON, ZoneRestriction.RANDOM_EVENTS) } } diff --git a/Server/src/main/core/game/node/entity/Entity.java b/Server/src/main/core/game/node/entity/Entity.java index c1c930645..8058376f9 100644 --- a/Server/src/main/core/game/node/entity/Entity.java +++ b/Server/src/main/core/game/node/entity/Entity.java @@ -660,7 +660,7 @@ public abstract class Entity extends Node { /** * Registers a new force chat update flag to the update masks. * @param string The string. - * @return {@code True} if succesful. + * @return {@code True} if successful. */ public boolean sendChat(String string) { return getUpdateMasks().register(EntityFlag.ForceChat, string);