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) {