yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bot dialogue now always starts with uppercase character

Browse Source 
Fixed hard-coded server name references
Replaced incorrect use of "Keldagrim" with "Gielinor"
This commit is contained in:
Player Name
2023-12-29 00:50:26 +00:00
committed by Ryan
parent 9d19ce2355
commit ece16af7ab
40 changed files with 161 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/content/global/ame/events/evilbob/EvilBobListeners.kt
+3 -2
View File
@@ -1,5 +1,6 @@
package content.global.ame.events.evilbob
import core.ServerConstants
import core.api.*
import core.game.dialogue.FacialExpression
import core.game.interaction.IntType
@@ -119,7 +120,7 @@ class EvilBobListeners : InteractionListener, MapArea {
return@queueScript delayScript(player, 2)
}
3 -> {
sendMessage(player, "Welcome back to 2009Scape.")
sendMessage(player, "Welcome back to ${ServerConstants.SERVER_NAME}.")
teleport(player, getAttribute(player, EvilBobUtils.prevLocation, Location.create(3222, 3219, 0)))
EvilBobUtils.reward(player)
EvilBobUtils.cleanup(player)
@@ -145,4 +146,4 @@ class EvilBobListeners : InteractionListener, MapArea {
entity.locks.lockTeleport(1000000)
}
}
}
Server/src/main/content/global/ame/events/evilbob/ServantDialogue.kt
+3 -2
View File
@@ -1,5 +1,6 @@
package content.global.ame.events.evilbob
import core.ServerConstants
import core.api.getAttribute
import core.api.setAttribute
import core.game.dialogue.DialogueFile
@@ -34,7 +35,7 @@ class ServantDialogue : DialogueFile() {
}
}
2 -> npcl(FacialExpression.SAD, "Come? Come where?").also { stage++ }
3 -> playerl(FacialExpression.FRIENDLY, "Away from this place! To 2009Scape proper!").also { stage++ }
3 -> playerl(FacialExpression.FRIENDLY, "Away from this place! To ${ServerConstants.SERVER_NAME} proper!").also { stage++ }
4 -> npcl(FacialExpression.SAD, "You go, ${player!!.username}, I don't belong there... I belong here, in Scape2009. This is the only place I can ever go...").also { stage++ }
5 -> options("But I love you!", "Oh alright then.").also { stage++ }
6 -> when(buttonID) {
@@ -54,4 +55,4 @@ class ServantDialogue : DialogueFile() {
}
}
}
}
}
Server/src/main/content/global/skill/cooking/recipe/Recipe.java
+1 -1
View File
@@ -23,7 +23,7 @@ import core.game.node.item.Item;
public abstract class Recipe {
/**
* Represents the array of active recipes in Keldagrim..
* Represents the array of active recipes in 2009Scape.
*/
// TODO:
// - Making this an enum would drastically save on file/line count, since the recipes seem to mostly be plain-old-data classes
Server/src/main/content/global/skill/summoning/familiar/FamiliarManager.java
+1 -1
View File
@@ -182,7 +182,7 @@ public final class FamiliarManager {
final int npcId = pouch.getNpcId();
Familiar fam = !renew ? FAMILIARS.get(npcId) : familiar;
if (fam == null) {
player.getPacketDispatch().sendMessage("Invalid familiar " + npcId + " - report on 2009scape GitLab");
player.getPacketDispatch().sendMessage("Invalid familiar " + npcId + " - report on 2009Scape GitLab");
return;
}
if(!renew) {
Server/src/main/content/minigame/bountyhunter/BountyHunterActivity.java
+1 -1
View File
@@ -121,7 +121,7 @@ public final class BountyHunterActivity extends ActivityPlugin {
};
/**
* The game pulse (doesn't update every tick on 2009scape as well).
* The game pulse (doesn't update every tick on 2009Scape as well).
*/
private final Pulse gamePulse = new Pulse(10) {
@Override
Server/src/main/content/minigame/mta/AlchemyGuardianDialogue.java
+1 -1
View File
@@ -73,7 +73,7 @@ public class AlchemyGuardianDialogue extends DialoguePlugin {
stage++;
break;
case 12:
npc("around Keldagrim. Keep an eye on the cost of each", "items as these will change from time-to-time, as will the", "location of the items. Occasionally one of the items will", "be indicated as costing no runestones to convert to");
npc("around Gielinor. Keep an eye on the cost of each", "item as these will change from time-to-time, as will the", "location of the items. Occasionally one of the items will", "be indicated as costing no runestones to convert to");
stage++;
break;
case 13:
Server/src/main/content/minigame/mta/GraveyardGuardianDialogue.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class GraveyardGuardianDialogue extends DialoguePlugin {
}
break;
case 10:
npc("Have you noticed all the bones around the room? These", "are teleported here from all over Keldagrim to help", "clean up the landscape of countless bones left behind", "from combat. What better use for these bones than to");
npc("Have you noticed all the bones around the room? These", "are teleported here from all over Gielinor to help", "clean up the landscape of countless bones left behind", "from combat. What better use for these bones than to");
stage++;
break;
case 11:
Server/src/main/content/minigame/pestcontrol/OutpostSquireDialogue.java
+6 -6
View File
@@ -74,11 +74,11 @@ public final class OutpostSquireDialogue extends DialoguePlugin {
stage = 6;
break;
case 6:
npc("The Void Knights, they are great warriors of balance", "who do Guthix's work here in 2009scape.");
npc("The Void Knights, they are great warriors of balance", "who do Guthix's work here in Gielinor.");
stage = 11;
break;
case 11:
options("Wow, can I join?", "What kind of work?", "What's '2009scape'?", "Uh huh, sure.");
options("Wow, can I join?", "What kind of work?", "What's 'Gielinor'?", "Uh huh, sure.");
stage = 12;
break;
case 12:
@@ -92,7 +92,7 @@ public final class OutpostSquireDialogue extends DialoguePlugin {
stage = 17;
break;
case 3:
player("What's '2009scape'?");
player("What's 'Gielinor'?");
stage = 15;
break;
case 4:
@@ -112,11 +112,11 @@ public final class OutpostSquireDialogue extends DialoguePlugin {
end();
break;
case 17:
npc("Ah well you see we try to keep 2009scape as Guthix", "intended, it's very challenging. Actually we've been", "having some problems recently, maybe you could help", "us?");
npc("Ah well you see we try to keep Gielinor as Guthix", "intended, it's very challenging. Actually we've been", "having some problems recently, maybe you could help", "us?");
stage = 18;
break;
case 18:
options("Yeah ok, what's the problem?", "What's '2009scape'?", "I'd rather not, sorry.");
options("Yeah OK, what's the problem?", "What's 'Gielinor'?", "I'd rather not, sorry.");
stage = 19;
break;
case 19:
@@ -126,7 +126,7 @@ public final class OutpostSquireDialogue extends DialoguePlugin {
stage = 191;
break;
case 2:
player("What's '2009scape'?");
player("What's 'Gielinor'?");
stage = 15;
break;
case 3:
Server/src/main/content/minigame/pestcontrol/SquireDialogue.java
+1 -1
View File
@@ -127,7 +127,7 @@ public class SquireDialogue extends DialoguePlugin {
stage = 12;
break;
case 12:
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "The Void Knights, they are great warriors of balance", "who do Guthix's work here in 2009scape.");
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "The Void Knights, they are great warriors of balance", "who do Guthix's work here in Gielinor.");
stage = 13;
break;
case 13:
Server/src/main/content/minigame/pestcontrol/SquireTypeDialogue.java
+1 -1
View File
@@ -75,7 +75,7 @@ public final class SquireTypeDialogue extends DialoguePlugin {
stage = 12;
break;
case 12:
npc("The Void Knights, they are great warriors of balance", "who do Guthix's work here in 2009scape.");
npc("The Void Knights, they are great warriors of balance", "who do Guthix's work here in Gielinor.");
stage = 13;
break;
case 13:
Server/src/main/content/minigame/pestcontrol/reward/VoidKnightDialogue.java
+6 -6
View File
@@ -83,12 +83,12 @@ public final class VoidKnightDialogue extends DialoguePlugin {
case 10:
npc("I'm a Void Knight, one of the order of Guthix. We are",
"warriors of balance who do Guthix's work here in",
"2009scape.");
"Gielinor.");
stage = 11;
break;
case 11:
options("Wow, can I join?", "What kind of work?",
"What's '2009scape'?", "Uh huh, sure.");
"What's 'Gielinor'?", "Uh huh, sure.");
stage = 12;
break;
case 12:
@@ -102,7 +102,7 @@ public final class VoidKnightDialogue extends DialoguePlugin {
stage = 17;
break;
case 3:
player("What's '2009scape'?");
player("What's 'Gielinor'?");
stage = 15;
break;
case 4:
@@ -123,14 +123,14 @@ public final class VoidKnightDialogue extends DialoguePlugin {
end();
break;
case 17:
npc("Ah well you see we try to keep 2009scape as Guthix",
npc("Ah well, you see, we try to keep Gielinor as Guthix",
"intended, it's very challenging. Actually we've been",
"having some problems recently, maybe you could help",
"us?");
stage = 18;
break;
case 18:
options("Yeah ok, what's the problem?", "What's '2009scape'?",
options("Yeah OK, what's the problem?", "What's 'Gielinor'?",
"I'd rather not, sorry.");
stage = 19;
break;
@@ -141,7 +141,7 @@ public final class VoidKnightDialogue extends DialoguePlugin {
stage = 191;
break;
case 2:
player("What's '2009scape'?");
player("What's 'Gielinor'?");
stage = 15;
break;
case 3:
Server/src/main/content/region/asgarnia/falador/dialogue/ChemistDialogue.java
+1 -1
View File
@@ -290,7 +290,7 @@ public final class ChemistDialogue extends DialoguePlugin {
break;
case 110:
npc("Ah, well it's a diary that helps you keep track of", "particular achievements you've made here on", "2009Scape.");
npc("Ah, well, it's a diary that helps you keep track of", "particular achievements you've made here on Gielinor.");
stage = 111;
break;
case 111:
Server/src/main/content/region/asgarnia/falador/dialogue/FaladorSquireDialogue.java
+1 -1
View File
@@ -161,7 +161,7 @@ public final class FaladorSquireDialogue extends DialoguePlugin {
break;
case 110:
npc("Ah, well it's a diary that helps you keep track of", "particular achievements you've made here on", "2009Scape.");
npc("Ah, well, it's a diary that helps you keep track of", "particular achievements you've made here on Gielinor.");
stage = 111;
break;
case 111:
Server/src/main/content/region/asgarnia/falador/dialogue/MiningGuildDwarf.java
+1 -1
View File
@@ -111,7 +111,7 @@ public final class MiningGuildDwarf extends DialoguePlugin {
stage = 22;
break;
case 22:
interpreter.sendDialogues(npc, FacialExpression.NEUTRAL, "No, this is only a mining outpost. We dwarves don't", "much like to settle in human cities. Most of the ore is", "carted off to Keldagrim, the great dwarven city-", "They've got a special blast furnace up there - it makes");
interpreter.sendDialogues(npc, FacialExpression.NEUTRAL, "No, this is only a mining outpost. We dwarves don't", "much like to settle in human cities. Most of the ore is", "carted off to Keldagrim, the great dwarven city.", "They've got a special blast furnace up there - it makes");
stage = 23;
break;
case 23:
Server/src/main/content/region/asgarnia/falador/dialogue/SirReniteeDialogue.java
+2 -1
View File
@@ -1,5 +1,6 @@
package content.region.asgarnia.falador.dialogue;
import core.ServerConstants;
import core.Util;
import core.game.dialogue.DialoguePlugin;
import core.game.dialogue.FacialExpression;
@@ -65,7 +66,7 @@ public class SirReniteeDialogue extends DialoguePlugin {
end();
break;
case 100:
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Hmm, well, mmm, do you have a family crest? I keep", "track of every 2009Scape family, you know, so I might", "be able to find yours.");
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Hmm, well, mmm, do you have a family crest? I keep", "track of every " + ServerConstants.SERVER_NAME + " family, you know, so I might", "be able to find yours.");
stage = 110;
break;
case 110:
Server/src/main/content/region/asgarnia/portsarim/dialogue/RedbeardFrankDialogue.java
+1 -1
View File
@@ -378,7 +378,7 @@ public class RedbeardFrankDialogue extends DialoguePlugin {
break;
case 110:
npc("Ah, well it's a diary that helps you keep track of", "particular achievements you've made here on", "2009Scape.");
npc("Ah, well, it's a diary that helps you keep track of", "particular achievements you've made here on Gielinor.");
stage = 111;
break;
case 111:
Server/src/main/content/region/asgarnia/portsarim/handlers/ElementalWizardNPC.java
+2 -1
View File
@@ -1,5 +1,6 @@
package content.region.asgarnia.portsarim.handlers;
import core.ServerConstants;
import core.game.node.entity.player.link.diary.DiaryType;
import core.plugin.Initializable;
import core.game.dialogue.DialoguePlugin;
@@ -245,7 +246,7 @@ public final class ElementalWizardNPC extends AbstractNPC {
stage = 21;
break;
case 21:
npc("Many say it was the greatest building in the history of", "2009scape, a magnificent monument to human ingenuity.");
npc("Many say it was the greatest building in the history of", ServerConstants.SERVER_NAME + ", a magnificent monument to human ingenuity.");
stage = 22;
break;
case 22:
Server/src/main/content/region/asgarnia/taverley/dialogue/PikkupstixDialogue.java
+2 -1
View File
@@ -1,5 +1,6 @@
package content.region.asgarnia.taverley.dialogue;
import core.ServerConstants;
import core.game.dialogue.DialoguePlugin;
import core.game.dialogue.FacialExpression;
import core.game.node.entity.skill.Skills;
@@ -698,7 +699,7 @@ public final class PikkupstixDialogue extends DialoguePlugin {
stage = 104;
break;
case 104:
npc("This is reflected in your increased ability to raise animals", "as pets. It takes a skilled summoner to be able to raise", "some of 2009scape's more exotic animals, such as the lizards", "of Karamja, or even dragons!");
npc("This is reflected in your increased ability to raise animals", "as pets. It takes a skilled summoner to be able to raise", "some of " + ServerConstants.SERVER_NAME + "'s more exotic animals, such as the lizards", "of Karamja, or even dragons!");
stage = 105;
break;
case 105:
Server/src/main/content/region/asgarnia/taverley/quest/witchshouse/WitchsExperimentNPC.java
+1 -1
View File
@@ -180,4 +180,4 @@ public class WitchsExperimentNPC extends AbstractNPC {
}
}
}
Server/src/main/content/region/desert/alkharid/quest/princealirescue/NedPARDialogue.kt
+2 -2
View File
@@ -19,7 +19,7 @@ class NedPARDialogue(val questStage: Int) : DialogueFile() {
START_DIALOGUE -> options(
"Ned, could you make other things from wool?",
"Yes, I would like some rope.",
"No thanks Ned, I don't need any."
"No thanks, Ned, I don't need any."
).also { stage++ }
1 -> when(buttonID){
@@ -97,4 +97,4 @@ class NedPARDialogue(val questStage: Int) : DialogueFile() {
}
}
}
}
Server/src/main/content/region/desert/pollniv/dialogue/AliTheKebabSeller.java
+2 -1
View File
@@ -1,5 +1,6 @@
package content.region.desert.pollniv.dialogue;
import core.ServerConstants;
import core.game.dialogue.DialoguePlugin;
import core.game.dialogue.FacialExpression;
import core.game.node.entity.npc.NPC;
@@ -62,7 +63,7 @@ public class AliTheKebabSeller extends DialoguePlugin {
stage = 8;
break;
case 8:
npc("I offer two different types of kebabs: the standard","run-of-the-mill kebab seen throughout 2009scape and","enjoyed by many a intoxicated dwarf, and my specialty,","the extra-hot kebab. So which shall it be?");
npc("I offer two different types of kebabs: the standard","run-of-the-mill kebab seen throughout " + ServerConstants.SERVER_NAME + " and","enjoyed by many a intoxicated dwarf, and my specialty,","the extra-hot kebab. So which shall it be?");
stage = 9;
break;
case 9:
Server/src/main/content/region/kandarin/dialogue/AstronomyBook.kt
+4 -3
View File
@@ -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.api.setAttribute
import core.game.interaction.IntType
import core.game.interaction.InteractionListener
@@ -19,7 +20,7 @@ class AstronomyBook : InteractionListener {
PageSet(
Page(
BookLine("A History of Astronomy", 55),
BookLine("in 2009Scape.", 56),
BookLine("in ${ServerConstants.SERVER_NAME}.", 56),
BookLine("", 57),
BookLine("At the start of the 4th age,", 58),
BookLine("a learned man by the", 59),
@@ -50,7 +51,7 @@ class AstronomyBook : InteractionListener {
BookLine("grew adept at using his", 56),
BookLine("specialized skills, and followed", 57),
BookLine("the movements of stars", 58),
BookLine("in 2009Scape, which are", 59),
BookLine("in ${ServerConstants.SERVER_NAME}, which are", 59),
BookLine("mapped and named, and still", 60),
BookLine("used to this day.", 61),
BookLine("", 62),
@@ -126,4 +127,4 @@ class AstronomyBook : InteractionListener {
return@on true
}
}
}
}
Server/src/main/content/region/kandarin/quest/grandtree/CharlieDialogue.kt
+7 -6
View File
@@ -1,6 +1,7 @@
package content.region.kandarin.quest.grandtree
import content.region.kandarin.quest.grandtree.TheGrandTree.Companion.questName
import core.ServerConstants
import core.api.*
import core.game.dialogue.DialogueFile
import core.game.global.action.DoorActionHandler
@@ -50,8 +51,8 @@ class CharlieDialogue : DialogueFile() {
2 -> npcl("I shouldn't tell you this adventurer. But if you want to get to the bottom of this you should go and talk to the Karamja Shipyard foreman.").also { stage++ }
3 -> playerl("Why?").also { stage++ }
4 -> npcl("Glough sent me to Karamja to meet him. I delivered a large amount of gold. For what? I don't know. He may be able to tell you what Glough's up to. That's if you can get out of here. You'll find him").also { stage++ }
5 -> npcl("in the Karamja Shipyard, east of Shilo Village. Be careful! If he discovers you're not working for Glough, there'll be trouble! The sea men use the password Ka-Lu-Min.").also { stage++ }
6 -> playerl("Thanks Charlie!").also {
5 -> npcl("in the Karamja Shipyard, east of Shilo Village. Be careful! If he discovers you're not working for Glough, there'll be trouble! The seamen use the password Ka-Lu-Min.").also { stage++ }
6 -> playerl("Thanks, Charlie!").also {
stage = END_DIALOGUE
GameWorld.Pulser.submit(object : Pulse(0) {
var count = 0
@@ -66,7 +67,7 @@ class CharlieDialogue : DialogueFile() {
}
2 -> {
sendNPCDialogue(player!!, npc.id,"Traveller please accept my apologies! Glough had no right to arrest you! I just think he's scared of humans. Let me get you out of there.")
sendNPCDialogue(player!!, npc.id,"Traveller, please accept my apologies! Glough had no right to arrest you! I just think he's scared of humans. Let me get you out of there.")
}
4 -> {
@@ -92,9 +93,9 @@ class CharlieDialogue : DialogueFile() {
55 -> {
if(player!!.hasItem(Item(Items.LUMBER_ORDER_787))){
when(stage) {
0 -> playerl("How are you doing Charlie?").also { stage++ }
0 -> playerl("How are you doing, Charlie?").also { stage++ }
1 -> npcl("I've been better.").also { stage++ }
2 -> playerl("Glough has some plan to rule 2009Scape!").also { stage++ }
2 -> playerl("Glough has some plan to rule ${ServerConstants.SERVER_NAME}!").also { stage++ }
3 -> npcl("I wouldn't put it past him, the Gnome's crazy!").also { stage++ }
4 -> playerl("I need some proof to convince the King.").also { stage++ }
5 -> npcl("Hmm...you could be in luck! Before Glough had me locked up I heard him mention that he'd left his chest keys at his girlfriend's.").also { stage++ }
@@ -120,4 +121,4 @@ class CharlieDialogue : DialogueFile() {
}
}
}
}
}
Server/src/main/content/region/kandarin/seers/quest/elementalworkshop/ElementalWorkshopQuest.kt
+1 -1
View File
@@ -25,7 +25,7 @@ import core.game.system.command.Privilege
* Quality Assurance: Andrew C
* QuestHelp: Rob M
*
* 2009scape adaptation:
* 2009Scape adaptation:
* @author Woah, with love
*/
@Initializable
Server/src/main/content/region/misc/tutisland/dialogue/TutorialMagicTutorDialogue.kt
+2 -2
View File
@@ -179,10 +179,10 @@ class TutorialMagicTutorDialogue(player: Player? = null) : core.game.dialogue.Di
RulesAndInfo.openFor(player)
if (GameWorld.settings!!.enable_default_clan) {
player.communication.currentClan = ServerConstants.SERVER_NAME
player.communication.currentClan = ServerConstants.SERVER_NAME.toLowerCase()
val clanJoin = JoinClanRequest.newBuilder()
clanJoin.clanName = ServerConstants.SERVER_NAME
clanJoin.clanName = ServerConstants.SERVER_NAME.toLowerCase()
clanJoin.username = player.name
ManagementEvents.publish(clanJoin.build())
Server/src/main/content/region/misthalin/barbvillage/stronghold/playersafety/ProfessorHenryDialogue.java
+2 -1
View File
@@ -1,5 +1,6 @@
package content.region.misthalin.barbvillage.stronghold.playersafety;
import core.ServerConstants;
import core.api.Container;
import core.game.component.Component;
import core.game.node.entity.player.link.emote.Emotes;
@@ -138,7 +139,7 @@ public class ProfessorHenryDialogue extends DialoguePlugin {
increment();
break;
case 10:
sendNormalDialogue(npc, FacialExpression.HALF_GUILTY, "Here you can take part in the Player Safety test: a set", "of valuable lessons to learn about staying safe in ", "2009scape.");
sendNormalDialogue(npc, FacialExpression.HALF_GUILTY, "Here you can take part in the Player Safety test: a set", "of valuable lessons to learn about staying safe in ", ServerConstants.SERVER_NAME + ".");
increment();
break;
case 11:
Server/src/main/content/region/misthalin/lumbridge/dialogue/BobDialogue.java
+1 -1
View File
@@ -211,7 +211,7 @@ public final class BobDialogue extends DialoguePlugin {
}
break;
case 110:
npc("Ah, well it's a diary that helps you keep track of", "particular achievements you've made in the world of", "Keldagrim. In Lumbridge and Draynor i can help you", "discover some very useful things indeed.");
npc("Ah, well, it's a diary that helps you keep track of", "particular achievements you've made in the world of", "Gielinor. In Lumbridge and Draynor I can help you", "discover some very useful things indeed.");
stage++;
break;
case 111:
Server/src/main/content/region/misthalin/lumbridge/dialogue/ExplorerJackDialogue.java
+4 -4
View File
@@ -87,7 +87,7 @@ public class ExplorerJackDialogue extends DialoguePlugin {
}
break;
case 1:
player("Oh sorry. I was just looking around");
player("Oh sorry. I was just looking around.");
stage++;
break;
case 2:
@@ -95,15 +95,15 @@ public class ExplorerJackDialogue extends DialoguePlugin {
stage++;
break;
case 3:
player("Uh...and all what?");
player("Uh... and all what?");
stage++;
break;
case 4:
npc("Splendid! I love a person with a sense of humour. I bet", "you're from Ardougne eh? Ha!");
npc("Splendid! I love a person with a sense of humour. I bet", "you're from Ardougne, eh? Ha!");
stage = -1;
break;
case 10:
npc("Ah, well it's a diary that helps you keep track of", "particular achievements you've made in the world of", "Keldagrim. In Lumbridge and Draynor I can help you", "discover some very useful things indeed.");
npc("Ah, well, it's a diary that helps you keep track of", "particular achievements you've made in the world of Gielinor. In Lumbridge and Draynor I can help you", "discover some very useful things indeed.");
stage++;
break;
case 11:
Server/src/main/content/region/misthalin/lumbridge/diary/NedDiaryDialogue.kt
+3 -3
View File
@@ -47,9 +47,9 @@ class NedDiaryDialogue : DialogueFile() {
}
10 -> {
npc(
"Ah, well it's a diary that helps you keep track of",
"Ah, well, it's a diary that helps you keep track of",
"particular achievements you've made in the world of",
"2009Scape. In Lumbridge and Draynor i can help you",
"Gielinor. In Lumbridge and Draynor I can help you",
"discover some very useful things indeed."
)
stage++
@@ -121,4 +121,4 @@ class NedDiaryDialogue : DialogueFile() {
}
}
}
}
}
Server/src/main/content/region/misthalin/lumbridge/handlers/GameInstructorPlugin.java
+1 -1
View File
@@ -9,7 +9,7 @@ import core.plugin.Initializable;
import core.plugin.Plugin;
/**
* Represents the 2009scape instructor plugin.
* Represents the 2009Scape instructor plugin.
* @author 'Vexia
* @date 20.11.2013
*/
Server/src/main/content/region/misthalin/varrock/dialogue/SaniDialogue.java
+2 -2
View File
@@ -107,11 +107,11 @@ public class SaniDialogue extends DialoguePlugin {
stage++;
break;
case 22:
player("I see...", "So this means that you only sell common armours", "to help adventurers like nyself get started in the world", "of Keldagrim.");
player("I see...", "So this means that you only sell common armours", "to help adventurers like myself get started in the world", "of Gielinor.");
stage++;
break;
case 23:
npc("Indeed, that is true. If you have any more questions", "The Keldagrim guide near the green portal should be able", "to assist you further.");
npc("Indeed, that is true. If you have any more questions", "The Gielinor guide near the green portal should be able", "to assist you further.");
stage = 0;
break;
case 30:
Server/src/main/content/region/misthalin/wiztower/handlers/rcguild/RCGuildMap.java
+2 -1
View File
@@ -1,5 +1,6 @@
package content.region.misthalin.wiztower.handlers.rcguild;
import core.ServerConstants;
import core.cache.def.impl.SceneryDefinition;
import core.game.interaction.OptionHandler;
import core.game.node.Node;
@@ -22,7 +23,7 @@ public class RCGuildMap extends OptionHandler {
@Override
public boolean handle(Player player, Node node, String option) {
if(option.equals("study")){
player.getPacketDispatch().sendMessage("A map of 2009scape.");
player.getPacketDispatch().sendMessage("A map of " + ServerConstants.SERVER_NAME + ".");
}
return false;
}
Server/src/main/core/game/node/Node.java
+1 -1
View File
@@ -12,7 +12,7 @@ import core.tools.StringUtils;
import core.api.utils.Vector;
/**
* Represents a node which is anything that is interactable in Keldagrim.
* Represents a node which is anything that is interactable in 2009Scape.
* @author Emperor
*/
public abstract class Node {
Server/src/main/core/game/node/entity/player/info/login/LoginConfiguration.java
+1 -1
View File
@@ -113,7 +113,7 @@ public final class LoginConfiguration {
player.getPacketDispatch().sendString("Credits", 378, 94);
player.getPacketDispatch().sendString(player.getDetails().getCredits() + "", 378, 96);
player.getPacketDispatch().sendString(" ", 378, 229);
player.getPacketDispatch().sendString("Want to contribute to 2009scape? <br>Visit the github using the link below!", 378, 230);
player.getPacketDispatch().sendString("Want to contribute to " + ServerConstants.SERVER_NAME + "? <br>Visit the GitLab using the link below!", 378, 230);
player.getPacketDispatch().sendString(" ", 378, 231);
player.getPacketDispatch().sendString("Github", 378, 240);
player.getPacketDispatch().sendString(GameWorld.getSettings().getMessage_string(), messModel, getMessageChild(messModel));
Server/src/main/core/game/system/communication/ClanRepository.java
+2 -1
View File
@@ -1,5 +1,6 @@
package core.game.system.communication;
import core.ServerConstants;
import core.game.component.Component;
import core.game.activity.ActivityPlugin;
import core.game.node.entity.player.Player;
@@ -100,7 +101,7 @@ public final class ClanRepository {
* @return {@code True} if the player successfully entered the clan chat.
*/
public boolean enter(Player player) {
if (!owner.equals("2009scape") && players.size() >= MAX_MEMBERS) {
if (!owner.equals(ServerConstants.SERVER_NAME.toLowerCase()) && players.size() >= MAX_MEMBERS) {
player.getPacketDispatch().sendMessage("The channel you tried to join is full.:clan:");
return false;
}
Server/src/main/core/net/lobby/WorldList.java
+1 -1
View File
@@ -211,4 +211,4 @@ public final class WorldList {
public static void flagUpdate() {
WorldList.updateStamp = GameWorld.getTicks();
}
}
}
Server/src/main/core/worker/ManagementEvents.kt
+2 -2
View File
@@ -270,10 +270,10 @@ object ManagementEvents {
initializeClanWith(info)
} else {
SystemLogger.logMS("Creating default server clan")
if (GameWorld.settings!!.enable_default_clan && event.clanOwner == ServerConstants.SERVER_NAME) {
if (GameWorld.settings!!.enable_default_clan && event.clanOwner == ServerConstants.SERVER_NAME.toLowerCase()) {
//Create a user with the default clan and some basic settings and stick them in the account storage
if (info == UserAccountInfo.createDefault()) {
info.username = ServerConstants.SERVER_NAME
info.username = ServerConstants.SERVER_NAME.toLowerCase()
info.password = ServerConstants.MS_SECRET_KEY
info.rights = 2
GameWorld.authenticator.createAccountWith(info)
Server/src/test/resources/test.conf
+2 -2
View File
@@ -15,7 +15,7 @@ database_port = "3306"
[world]
name = "2009scape"
name = "2009Scape"
debug = true
dev = true
start_gui = false
@@ -25,7 +25,7 @@ world_id = "1"
country_id = "0"
members = true
#activity as displayed on the world list
activity = "2009scape classic."
activity = "2009Scape Classic."
pvp = false
default_xp_rate = 5.0
allow_slayer_reroll = false