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

Mined every Sir Renitee facial expression on youtube

Browse source
This commit is contained in:
Bishop 2026-06-21 23:23:47 -05:00
parent 2174719a4a
commit cf8e90651b
2 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Server/src/main/content/region/asgarnia/falador/dialogue/SirReniteeDialogue.kt
View file

@ -2,6 +2,7 @@ package content.region.asgarnia.falador.dialogue
import content.global.skill.construction.CrestType
import content.global.skill.construction.PaintingType
import content.global.skill.crafting.HeraldicProduct
import core.ServerConstants
import core.Util
import core.api.*
@ -86,11 +87,11 @@ class SirReniteeDialogueFile : DialogueLabeller() {
)
label("family_crest")
npc(ChatAnim.NEUTRAL, "What is your name?")
npc(ChatAnim.NEUTRAL2, "What is your name?")
player(ChatAnim.NEUTRAL, "${player!!.username}.")
npc(ChatAnim.NEUTRAL, "Mmm, ${player!!.username}, let me see...")
npc(ChatAnim.NEUTRAL2, "Mmm, ${player!!.username}, let me see...")
exec { player, _ ->
if (hasLevelStat(player, Skills.CONSTRUCTION, 16)) {
if (hasLevelStat(player, Skills.CONSTRUCTION, HeraldicProduct.STEEL_HELM.constructionReq)) {
loadLabel(player, "has_construction_level")
} else {
loadLabel(player, "no_construction_level")
@ -119,8 +120,7 @@ class SirReniteeDialogueFile : DialogueLabeller() {
}
label("show_existing_crest")
npc(ChatAnim.NEUTRAL, "According to my records, your crest is",
"${player!!.houseManager.crest.crestName}.")
npc(ChatAnim.NEUTRAL, "According to my records, your crest is ${player!!.houseManager.crest.crestName}.") // test line breaks here
goto("crest_options")
label("show_new_crest")
@ -139,7 +139,7 @@ class SirReniteeDialogueFile : DialogueLabeller() {
npc(ChatAnim.NEUTRAL, "You're welcome, my ${if (player!!.isMale) "boy" else "girl"}.")
label("change_crest")
npc(ChatAnim.NEUTRAL, "Mmm, very well. Changing your crest will cost", "5,000 coins.")
npc(ChatAnim.NEUTRAL, "Mmm, very well. Changing your crest will cost 5,000", "coins.")
exec { player, _ ->
if (amountInInventory(player, Items.COINS_995) < CrestType.ASGARNIA.cost) {
loadLabel(player, "no_money")
@ -152,7 +152,7 @@ class SirReniteeDialogueFile : DialogueLabeller() {
player(ChatAnim.NEUTRAL, "I'll have to go and get some money then.")
label("choose_symbol")
npc(ChatAnim.NEUTRAL, "There are sixteen different symbols;", "which one would you like?")
npc(ChatAnim.NEUTRAL, "There are sixteen different symbols; which one would", "you like?")
goto("crest_page1")
label("crest_page1")
@ -228,6 +228,11 @@ class SirReniteeDialogueFile : DialogueLabeller() {
label("crest_buy_ok")
manual { player, _ ->
val crest = getAttribute(player, attributeTempCrest, CrestType.ASGARNIA)
val expression = if (crest == CrestType.SKULL) {
ChatAnim.AFRAID
} else {
ChatAnim.HAPPY
}
val messages = when (crest) {
CrestType.ARRAV ->
arrayOf("Ah yes, the shield that you helped to retrieve. You have",
@ -272,7 +277,7 @@ class SirReniteeDialogueFile : DialogueLabeller() {
else ->
arrayOf("This shouldn't be happening. Please report this.")
}
interpreter!!.sendDialogues(npc, ChatAnim.NEUTRAL, *messages)
interpreter!!.sendDialogues(npc, expression, *messages)
}
label("crest_buy_fail")
@ -359,8 +364,8 @@ class SirReniteeDialogueFile : DialogueLabeller() {
*/
label("portrait")
npc(ChatAnim.NEUTRAL, "Mmm, well, there are a few portraits I can paint. I",
"can only let you have one if you've got some connection", "with that person though. Who would you like?")
npc(ChatAnim.NEUTRAL, "Mmm, well, there are a few portraits I can paint. I can",
"only let you have one if you've got some connection with", "that person though. Who would you like?")
options(
DialogueOption("portrait_arthur", "King Arthur", skipPlayer = true),
DialogueOption("portrait_elena", "Elena of Ardougne", skipPlayer = true),
@ -369,7 +374,7 @@ class SirReniteeDialogueFile : DialogueLabeller() {
)
label("landscape")
npc(ChatAnim.NEUTRAL, "Mmm, well, I can paint a few places. Where have you", "had your adventures?")
npc(ChatAnim.NEUTRAL, "Mmm, well, I can paint a few places. Where have you had", "your adventures?")
options(
DialogueOption("landscape_lumbridge", "The River Lum", skipPlayer = true),
DialogueOption("landscape_desert", "The Kharid desert", skipPlayer = true),
@ -379,8 +384,8 @@ class SirReniteeDialogueFile : DialogueLabeller() {
)
label("map")
npc(ChatAnim.NEUTRAL, "Mmm, yes, ah, I have painted maps of the known world",
"on several different sizes of parchment. Which size", "would you like?")
npc(ChatAnim.NEUTRAL, "Mmm, yes, ah, I have painted maps of the known world on",
"several different sizes of parchment. Which size would", "you like?")
options(
DialogueOption("map_small", "Small", skipPlayer = true),
DialogueOption("map_medium", "Medium", skipPlayer = true),
@ -430,8 +435,8 @@ class SirReniteeDialogueFile : DialogueLabeller() {
label("painting_buy_confirm")
options(
DialogueOption("painting_accept", "All right.", expression = ChatAnim.NEUTRAL),
DialogueOption("painting_refuse", "No thanks.", expression = ChatAnim.NEUTRAL),
DialogueOption("painting_accept", "All right", skipPlayer = true),
DialogueOption("painting_refuse", "No thanks", skipPlayer = true),
)
label("painting_buy_fail")

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

@ -70,6 +70,7 @@ public enum FacialExpression {
SLEEPING(9802),
SILENT(9804),
NEUTRAL(9808),
NEUTRAL2(9810), // Like neutral but mouth starts moving immediately
THINKING(9812),
HALF_THINKING(9814),
DISGUSTED(9816),