From 3df509744242fadf23cf74d2576d2914e21afb10 Mon Sep 17 00:00:00 2001 From: Player Name Date: Sun, 3 Mar 2024 05:47:37 +0000 Subject: [PATCH] Cleaned up more server name references and related strings --- Server/data/botdata/bot_dialogue.json | 2 +- Server/data/configs/item_configs.json | 22 +++++++++---------- Server/data/configs/object_configs.json | 22 +++++++++---------- .../global/handlers/item/book/GoblinBook.kt | 3 ++- .../quest/grandtree/BlackDemonCutscene.kt | 3 ++- .../kandarin/quest/grandtree/ForemanNPC.kt | 11 +++++----- .../quest/tribaltotem/CrompertyDialogue.kt | 7 +++--- .../lumbridge/handlers/ChurchSignListener.kt | 6 +++-- 8 files changed, 41 insertions(+), 35 deletions(-) diff --git a/Server/data/botdata/bot_dialogue.json b/Server/data/botdata/bot_dialogue.json index 27bc74658..4f3a510fc 100644 --- a/Server/data/botdata/bot_dialogue.json +++ b/Server/data/botdata/bot_dialogue.json @@ -467,7 +467,7 @@ "Join 2009scape Clan Chat!", "Join 2009scape Cc!", "Chop chop!", - "Runescape rox my sox!!!!!!1", + "2009Scape rox my sox!!!!!!1", "Type ::scripts for all 99s", "Help I just died to Evil Chicken and I lost my stuff!", "Can you fight Bandos in this game?", diff --git a/Server/data/configs/item_configs.json b/Server/data/configs/item_configs.json index 5d1ee7242..16609aa7a 100644 --- a/Server/data/configs/item_configs.json +++ b/Server/data/configs/item_configs.json @@ -2770,7 +2770,7 @@ "id": "291" }, { - "examine": "A book on elven history in northern RuneScape.", + "examine": "A book on elven history in northern 2009Scape.", "durability": null, "name": "Book on baxtorian", "archery_ticket_price": "0", @@ -5044,7 +5044,7 @@ { "shop_price": "1", "ge_buy_limit": "100", - "examine": "Issued by RuneScape Council to all new citizens.", + "examine": "Issued by 2009Scape Council to all new citizens.", "grand_exchange_price": "123", "durability": null, "name": "Newcomer map", @@ -5547,7 +5547,7 @@ }, { "ge_buy_limit": "100", - "examine": "A book on the history of astronomy in RuneScape.", + "examine": "A book on the history of astronomy in 2009Scape.", "grand_exchange_price": "658", "durability": null, "name": "Astronomy book", @@ -25863,7 +25863,7 @@ "id": "2573" }, { - "examine": "Used by navigators to find their position in RuneScape.", + "examine": "Used by navigators to find their position in 2009Scape.", "durability": null, "name": "Sextant", "weight": "0.2", @@ -25879,7 +25879,7 @@ "id": "2575" }, { - "examine": "A navigator's chart of RuneScape.", + "examine": "A navigator's chart of 2009Scape.", "durability": null, "name": "Chart", "archery_ticket_price": "0", @@ -32009,7 +32009,7 @@ "id": "3240" }, { - "examine": "One of RuneScape's many citizens. In Karamja or South of Falador: One of RuneScape's many citizens, apparently trying to be an explorer. In Lumbridge: One of Lumbridge's many citizens. In a Falador home: One of RuneScape's many citizens. He looks worried ", + "examine": "One of 2009Scape's many citizens.", "durability": null, "name": "Man", "archery_ticket_price": "0", @@ -41824,7 +41824,7 @@ "stand_turn_anim": "823" }, { - "examine": "Perhaps not the most powerful weapon in RuneScape.", + "examine": "Perhaps not the most powerful weapon in 2009Scape.", "durability": null, "weight": "0.4", "attack_speed": "4", @@ -92026,7 +92026,7 @@ }, { "turn90cw_anim": "821", - "examine": "Perhaps not the most powerful weapon in RuneScape.", + "examine": "Perhaps not the most powerful weapon in 2009Scape.", "walk_anim": "1830", "durability": null, "weight": "0.4", @@ -117691,9 +117691,9 @@ }, { "destroy_message": "Hopefully, the family has more papyrus and charcoal.", - "examine": "Your best impression of a map of RuneScape.", + "examine": "Your best impression of a map of 2009Scape.", "durability": null, - "name": "Map of runescape", + "name": "Map of 2009Scape", "destroy": "true", "archery_ticket_price": "0", "attack_speed": "4", @@ -123695,7 +123695,7 @@ "bonuses": "55,55,55,0,0,5,5,5,5,5,0,60,0,0,0" }, { - "destroy_message": "You can get another copy by searching bookshelves around RuneScape.", + "destroy_message": "You can get another copy by searching bookshelves around 2009Scape.", "shop_price": "5", "examine": "A book about the Wilderness.", "durability": null, diff --git a/Server/data/configs/object_configs.json b/Server/data/configs/object_configs.json index 3fd42b4c7..6878b0cb9 100644 --- a/Server/data/configs/object_configs.json +++ b/Server/data/configs/object_configs.json @@ -968,7 +968,7 @@ "ids": "573" }, { - "examine": "A carving of a figure from the history of RuneScape.", + "examine": "A carving of a figure from the history of 2009Scape.", "ids": "574,575,576,577,578" }, { @@ -2148,7 +2148,7 @@ "ids": "1231" }, { - "examine": "One of the most common trees in RuneScape.", + "examine": "One of the most common trees in 2009Scape.", "ids": "1276" }, { @@ -4964,7 +4964,7 @@ "ids": "3032" }, { - "examine": "One of the most common trees in RuneScape.", + "examine": "One of the most common trees in 2009Scape.", "ids": "3033,3034,3035,3036" }, { @@ -8592,7 +8592,7 @@ "ids": "5789,5790" }, { - "examine": "A carving of a figure from the history of RuneScape.", + "examine": "A carving of a figure from the history of 2009Scape.", "ids": "5791,36749,36751" }, { @@ -12788,7 +12788,7 @@ "ids": "8972" }, { - "examine": "One of the most common trees in RuneScape.", + "examine": "One of the most common trees in 2009Scape.", "ids": "8973" }, { @@ -14100,7 +14100,7 @@ "ids": "10080" }, { - "examine": "One of the most common trees in RuneScape.", + "examine": "One of the most common trees in 2009Scape.", "ids": "10081" }, { @@ -15964,7 +15964,7 @@ "ids": "11354,11355" }, { - "examine": "A gateway back to RuneScape.", + "examine": "A gateway back to 2009Scape.", "ids": "11356" }, { @@ -16564,7 +16564,7 @@ "ids": "11759" }, { - "examine": "A carving of a figure from the history of RuneScape.", + "examine": "A carving of a figure from the history of 2009Scape.", "ids": "11761" }, { @@ -18728,7 +18728,7 @@ "ids": "13409,13410" }, { - "examine": "One of the most common trees in RuneScape.", + "examine": "One of the most common trees in 2009Scape.", "ids": "13411,13412" }, { @@ -18996,11 +18996,11 @@ "ids": "13525" }, { - "examine": "A map of RuneScape.", + "examine": "A map of 2009Scape.", "ids": "13526" }, { - "examine": "A map of RuneScape including major cave systems.", + "examine": "A map of 2009Scape including major cave systems.", "ids": "13527" }, { diff --git a/Server/src/main/content/global/handlers/item/book/GoblinBook.kt b/Server/src/main/content/global/handlers/item/book/GoblinBook.kt index 150b7002c..5f9661fa6 100644 --- a/Server/src/main/content/global/handlers/item/book/GoblinBook.kt +++ b/Server/src/main/content/global/handlers/item/book/GoblinBook.kt @@ -4,6 +4,7 @@ import content.global.handlers.iface.BookInterface import content.global.handlers.iface.BookLine import content.global.handlers.iface.Page import content.global.handlers.iface.PageSet +import core.ServerConstants import core.game.interaction.IntType import core.game.interaction.InteractionListener import core.game.node.entity.player.Player @@ -211,7 +212,7 @@ class GoblinBook : InteractionListener { BookLine("Commander to lead you.", 74), BookLine("Under new Commander", 75), BookLine("goblins will conquer all of", 76), - BookLine("RuneScape, every race and", 77), + BookLine(ServerConstants.SERVER_NAME + ", every race and", 77), BookLine("every god! And then Big", 78), BookLine("High War God will return", 79), BookLine("and sit on throne of bronze", 80), diff --git a/Server/src/main/content/region/kandarin/quest/grandtree/BlackDemonCutscene.kt b/Server/src/main/content/region/kandarin/quest/grandtree/BlackDemonCutscene.kt index cbab8e7bb..2afe9f1cf 100644 --- a/Server/src/main/content/region/kandarin/quest/grandtree/BlackDemonCutscene.kt +++ b/Server/src/main/content/region/kandarin/quest/grandtree/BlackDemonCutscene.kt @@ -1,6 +1,7 @@ package content.region.kandarin.quest.grandtree import content.region.misthalin.dorgeshuun.quest.thelosttribe.LostTribeCutscene +import core.ServerConstants import core.api.openDialogue import core.api.sendChat import core.api.sendDialogue @@ -61,7 +62,7 @@ class BlackDemonCutscene(player: Player) : Cutscene(player) { playerDialogueUpdate(FacialExpression.SCARED, "Glough?") } 6 -> { - dialogueUpdate(NPCs.GLOUGH_671, FacialExpression.ANGRY, "You really are becoming a headache! Well, at least now you can die knowing you were right, it will save me having to hunt you down like all the other human filth of RuneScape!") + dialogueUpdate(NPCs.GLOUGH_671, FacialExpression.ANGRY, "You really are becoming a headache! Well, at least now you can die knowing you were right, it will save me having to hunt you down like all the other human filth of " + ServerConstants.SERVER_NAME + "!") } 7 -> { playerDialogueUpdate(FacialExpression.SCARED, "You're crazy, Glough!") diff --git a/Server/src/main/content/region/kandarin/quest/grandtree/ForemanNPC.kt b/Server/src/main/content/region/kandarin/quest/grandtree/ForemanNPC.kt index 312e463cd..56381b09e 100644 --- a/Server/src/main/content/region/kandarin/quest/grandtree/ForemanNPC.kt +++ b/Server/src/main/content/region/kandarin/quest/grandtree/ForemanNPC.kt @@ -1,5 +1,6 @@ package content.region.kandarin.quest.grandtree +import core.ServerConstants import core.api.* import core.game.component.Component import core.game.dialogue.DialogueFile @@ -57,7 +58,7 @@ class ForemanDialogue: DialogueFile(){ 2 -> playerl("Glough sent me to check on how you are doing.").also { stage++ } 3 -> npcl("Right. Glough sent a human?").also { stage++ } 4 -> playerl("His gnomes are busy.").also { stage++ } - 5 -> npcl("Hmm...in that case we'd better go to my office. Follow me.").also { + 5 -> npcl("Hmm... in that case we'd better go to my office. Follow me.").also { val foremanOffice = Location.create(2954, 3024, 0) GameWorld.Pulser.submit(object : Pulse(0) { var count = 0 @@ -81,7 +82,7 @@ class ForemanDialogue: DialogueFile(){ stage++ } 6 -> npcl("Tell me again why you're here.").also { stage++ } - 7 -> playerl("Er...Glough sent me?").also { stage++ } + 7 -> playerl("Er... Glough sent me?").also { stage++ } 8 -> npcl("By the way how is Glough? Still with his wife?").also { stage++ } 9 -> options("Yes, they're getting on great.","Always arguing as usual!","Sadly his wife is no longer with us!").also { stage++ } 10 -> when(buttonID){ @@ -89,7 +90,7 @@ class ForemanDialogue: DialogueFile(){ 2 -> playerl("Always arguing as usual!").also { stage++ } 3 -> playerl("Sadly his wife is no longer with us!").also { stage = 20 } } - 11 -> npcl("Really? That's odd, considering she died last year. Die imposter!").also { + 11 -> npcl("Really? That's odd, considering she died last year. Die, imposter!").also { attackPlayer() stage = END_DIALOGUE } @@ -111,7 +112,7 @@ class ForemanDialogue: DialogueFile(){ 2 -> playerl("Alia.").also { stage++ } 3 -> playerl("Elena.").also { stage++ } } - 33 -> npcl("You almost had me fooled! Die imposter!").also { + 33 -> npcl("You almost had me fooled! Die, imposter!").also { attackPlayer() stage = END_DIALOGUE } @@ -121,7 +122,7 @@ class ForemanDialogue: DialogueFile(){ 38 -> playerl("Indeed.").also { stage++ } 39 -> npcl("When I was asked to build a fleet large enough to invade Port Sarim and carry 300 gnome troops I said: 'If anyone can, I can.'").also { stage++ } 40 -> playerl("That's a lot of troops!").also { stage++ } - 41 -> npcl("True but if the gnomes are really going to take over RuneScape they'll need at least that.").also { stage++ } + 41 -> npcl("True, but if the gnomes are really going to take over " + ServerConstants.SERVER_NAME + " they'll need at least that.").also { stage++ } 42 -> playerl("Take over?").also { stage++ } 43 -> npcl("Of course, why else would Glough want 30 battleships? Between you and me I don't think he stands a chance.").also { stage++ } 44 -> playerl("No?").also { stage++ } diff --git a/Server/src/main/content/region/karamja/quest/tribaltotem/CrompertyDialogue.kt b/Server/src/main/content/region/karamja/quest/tribaltotem/CrompertyDialogue.kt index ed7a7948f..a8d6ba8ea 100644 --- a/Server/src/main/content/region/karamja/quest/tribaltotem/CrompertyDialogue.kt +++ b/Server/src/main/content/region/karamja/quest/tribaltotem/CrompertyDialogue.kt @@ -10,6 +10,7 @@ import core.game.world.update.flag.context.Graphics import core.plugin.Initializable import org.rs09.consts.NPCs import content.global.travel.EssenceTeleport +import core.ServerConstants import core.api.playAudio import core.game.world.GameWorld import org.rs09.consts.Sounds @@ -27,7 +28,7 @@ class CrompertyDialogue(player: Player? = null) : core.game.dialogue.DialoguePlu override fun handle(interfaceId: Int, buttonId: Int): Boolean { when(stage){ 0 -> options("Two jobs? that's got to be tough","So what have you invented?","Can you teleport me to the Rune Essence?").also { stage++ } - 1 ->when(buttonId){ + 1 -> when(buttonId){ 1 -> playerl(core.game.dialogue.FacialExpression.HAPPY,"Two jobs? That's got to be tough.").also { stage = 5 } 2 -> playerl(core.game.dialogue.FacialExpression.ASKING,"So, what have you invented?").also { stage = 10 } 3 -> playerl(core.game.dialogue.FacialExpression.HAPPY,"Can you teleport me to the Rune Essence?").also { @@ -56,11 +57,11 @@ class CrompertyDialogue(player: Player? = null) : core.game.dialogue.DialoguePlu 2 -> playerl(core.game.dialogue.FacialExpression.ASKING,"Can I be teleported please?").also { stage = 25 } } - 15 -> npcl(core.game.dialogue.FacialExpression.THINKING,"Well...Hmm. I would guess somewhere between here and the Wizards' Tower in Misthalin.").also { stage++ } + 15 -> npcl(core.game.dialogue.FacialExpression.THINKING,"Well... Hmm. I would guess somewhere between here and the Wizards' Tower in Misthalin.").also { stage++ } 16 -> npcl(core.game.dialogue.FacialExpression.HAPPY,"All I know is that it hasn't got there yet as the wizards there would have contacted me.").also { stage++ } 17 -> npcl(core.game.dialogue.FacialExpression.THINKING,"I'm using the RPDT for delivery. They assured me it would be delivered promptly.").also { stage++ } 18 -> playerl(core.game.dialogue.FacialExpression.ASKING,"Who are the RPDT?").also { stage++ } - 19 -> npcl(core.game.dialogue.FacialExpression.HAPPY,"The Runescape Parcel Delivery Team. They come very highly recommended.").also { stage++ } + 19 -> npcl(core.game.dialogue.FacialExpression.HAPPY,"The ${ServerConstants.SERVER_NAME} Parcel Delivery Team. They come very highly recommended.").also { stage++ } 20 -> npcl(core.game.dialogue.FacialExpression.HAPPY,"Their motto is: \"We aim to deliver your stuff at some point after you have paid us!\"").also { stage = 1000 } 25 -> npcl(core.game.dialogue.FacialExpression.HAPPY,"By all means! I'm afraid I can't give you any specifics as to where you will come out however. Presumably wherever the other block is located.").also { stage++ } diff --git a/Server/src/main/content/region/misthalin/lumbridge/handlers/ChurchSignListener.kt b/Server/src/main/content/region/misthalin/lumbridge/handlers/ChurchSignListener.kt index 111e757dd..ed6d21643 100644 --- a/Server/src/main/content/region/misthalin/lumbridge/handlers/ChurchSignListener.kt +++ b/Server/src/main/content/region/misthalin/lumbridge/handlers/ChurchSignListener.kt @@ -3,6 +3,7 @@ package content.region.misthalin.lumbridge.handlers import core.api.* import org.rs09.consts.Scenery import core.GlobalStats +import core.ServerConstants import core.game.interaction.InteractionListener import core.game.interaction.IntType @@ -13,10 +14,11 @@ class ChurchSignListener : InteractionListener { override fun defineListeners() { on(CHURCH_SIGN, IntType.SCENERY, "read"){ player, _ -> val deaths = GlobalStats.getDailyDeaths() + val servername = ServerConstants.SERVER_NAME if(deaths > 0) { - sendDialogue(player, "So far today $deaths unlucky adventurers have died on RuneScape and been sent to their respawn location. Be careful out there.") + sendDialogue(player, "So far today $deaths unlucky adventurers have died on $servername and been sent to their respawn location. Be careful out there.") } else { - sendDialogue(player, "So far today not a single adventurer on RuneScape has met their end grisly or otherwise. Either the streets are getting safer or adventurers are getting warier.") + sendDialogue(player, "So far today not a single adventurer on $servername has met their end grisly or otherwise. Either the streets are getting safer or adventurers are getting warier.") } return@on true }