2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2026-08-01 14:39:13 -06:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'housekeeping' into 'master'

Browse source 
Fixed an obscure DialogueLabeller bug

See merge request 2009scape/2009scape!2501
This commit is contained in:
Bishop 2026-07-31 16:01:05 +00:00
commit ba7405244b
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Server/src/main/content/global/ame/events/quizmaster/QuizMasterDialogueFile.kt
View file

@ -78,9 +78,6 @@ class QuizMasterDialogueFile : DialogueLabeller() {
override fun addConversation() {
assignToIds(NPCs.QUIZ_MASTER_2477)
afterClose { player ->
loadLabel(player, "question")
}
npc(FacialExpression.FRIENDLY,"WELCOME to the GREATEST QUIZ SHOW in the", "whole of ${ServerConstants.SERVER_NAME}:", "<col=8A0808>O D D</col> <col=8A088A>O N E</col> <col=08088A>O U T</col>", unclosable = true)
player(FacialExpression.THINKING, "I'm sure I didn't ask to take part in a quiz show...", unclosable = true)

1
Server/src/main/content/global/skill/slayer/Tasks.java
View file

@ -14,6 +14,7 @@ import content.data.Quests;
* A non-garbage way of representing tasks
* Slayer level source: <a href="https://web.archive.org/web/20090202035813/http://runescape.com/kbase/viewarticle.ws?article_id=1933">...</a>
* Combat level source: None
* ORDINAL BOUND
* @author ceik
* @author gregf
*/

1
Server/src/main/core/game/dialogue/DialogueLabeller.kt
View file

@ -257,6 +257,7 @@ abstract class DialogueLabeller : DialogueFile() {
/** Runs arbitrary code when the dialogue closes, once. **/
fun afterClose(callback: (player: Player) -> Unit) {
if (!stageHit || super.stage != dialogueCounter || jumpTo != null) return
val hook = object : EventHook<DialogueCloseEvent> {
override fun process(entity: Entity, event: DialogueCloseEvent) {
val you = entity as Player

25
Server/src/main/core/game/dialogue/FacialExpression.java
View file

@ -17,22 +17,22 @@ public enum FacialExpression {
//Chat heads from oldschool 2009scape?
//Maybe for gnomes or dwarves? Chat heads are frozen when used on Human NPCs
OLD_HAPPY(588),
OLD_CALM_TALK1(589),
OLD_CALM_TALK2(590),
OLD_DEFAULT(591),
OLD_EVIL1(592),
OLD_EVIL2(593),
OLD_NORMAL(594),
OLD_SNEAKY(595),
OLD_DISTRESSED(596),
OLD_DISTRESSED2(597),
OLD_ALMOST_CRYING(598),
OLD_HAPPY(588), // head moves up and to the left
OLD_CALM_TALK1(589), // head moves to the left
OLD_CALM_TALK2(590), // head nods up and down
OLD_DEFAULT(591), // head moves to the left
OLD_EVIL1(592), // head moves down, then to the left
OLD_EVIL2(593), // head moves subtly down and to the right
OLD_NORMAL(594), // head tilts to the left
OLD_SNEAKY(595), // head moves down and to the right
OLD_DISTRESSED(596), // head shakes left and right, mouth open
OLD_DISTRESSED2(597), // head moves down
OLD_ALMOST_CRYING(598), // head moves to the right, then up
OLD_BOWS_HEAD_SAD(599),
OLD_DRUNK_LEFT(600),
OLD_DRUNK_RIGHT(601),
OLD_NOT_INTERESTED(602),
OLD_SLEEPY(603),
OLD_SLEEPY(603), // head moves severely down and to the right
OLD_PLAIN_EVIL(604),
OLD_LAUGH1(605),
OLD_LAUGH2(606),
@ -70,6 +70,7 @@ public enum FacialExpression {
SLEEPING(9802),
SILENT(9804),
NEUTRAL(9808),
NEUTRAL_FAST(9810), // Like neutral but mouth starts moving immediately
THINKING(9812),
HALF_THINKING(9814),
DISGUSTED(9816),