diff --git a/Server/data/configs/item_configs.json b/Server/data/configs/item_configs.json index e036a9edf..58410b664 100644 --- a/Server/data/configs/item_configs.json +++ b/Server/data/configs/item_configs.json @@ -71136,7 +71136,7 @@ "turn180_anim": "1423", "turn90ccw_anim": "1425", "turn90cw_anim": "1424", - "two_handed": "true", + "two_handed": "false", "walk_anim": "1422", "weapon_interface": "14", "weight": "2" @@ -71160,7 +71160,7 @@ "turn180_anim": "1423", "turn90ccw_anim": "1425", "turn90cw_anim": "1424", - "two_handed": "true", + "two_handed": "false", "walk_anim": "1422", "weapon_interface": "14", "weight": "2" @@ -71184,7 +71184,7 @@ "turn180_anim": "1423", "turn90ccw_anim": "1425", "turn90cw_anim": "1424", - "two_handed": "true", + "two_handed": "false", "walk_anim": "1422", "weapon_interface": "14", "weight": "2" @@ -71208,7 +71208,7 @@ "turn180_anim": "1423", "turn90ccw_anim": "1425", "turn90cw_anim": "1424", - "two_handed": "true", + "two_handed": "false", "walk_anim": "1422", "weapon_interface": "14", "weight": "2" @@ -71232,7 +71232,7 @@ "turn180_anim": "1423", "turn90ccw_anim": "1425", "turn90cw_anim": "1424", - "two_handed": "true", + "two_handed": "false", "walk_anim": "1422", "weapon_interface": "14", "weight": "2" @@ -71256,7 +71256,7 @@ "turn180_anim": "1423", "turn90ccw_anim": "1425", "turn90cw_anim": "1424", - "two_handed": "true", + "two_handed": "false", "walk_anim": "1422", "weapon_interface": "14", "weight": "2" @@ -71280,7 +71280,7 @@ "turn180_anim": "1423", "turn90ccw_anim": "1425", "turn90cw_anim": "1424", - "two_handed": "true", + "two_handed": "false", "walk_anim": "1422", "weapon_interface": "14", "weight": "2" @@ -71304,7 +71304,7 @@ "turn180_anim": "1423", "turn90ccw_anim": "1425", "turn90cw_anim": "1424", - "two_handed": "true", + "two_handed": "false", "walk_anim": "1422", "weapon_interface": "14", "weight": "2" @@ -71328,7 +71328,7 @@ "turn180_anim": "1423", "turn90ccw_anim": "1425", "turn90cw_anim": "1424", - "two_handed": "true", + "two_handed": "false", "walk_anim": "1422", "weapon_interface": "14", "weight": "2" @@ -71352,7 +71352,7 @@ "turn180_anim": "1423", "turn90ccw_anim": "1425", "turn90cw_anim": "1424", - "two_handed": "true", + "two_handed": "false", "walk_anim": "1422", "weapon_interface": "14", "weight": "2" @@ -71376,7 +71376,7 @@ "turn180_anim": "1423", "turn90ccw_anim": "1425", "turn90cw_anim": "1424", - "two_handed": "true", + "two_handed": "false", "walk_anim": "1422", "weapon_interface": "14", "weight": "2" @@ -71400,7 +71400,7 @@ "turn180_anim": "1423", "turn90ccw_anim": "1425", "turn90cw_anim": "1424", - "two_handed": "true", + "two_handed": "false", "walk_anim": "1422", "weapon_interface": "14", "weight": "2" @@ -71424,7 +71424,7 @@ "turn180_anim": "1423", "turn90ccw_anim": "1425", "turn90cw_anim": "1424", - "two_handed": "true", + "two_handed": "false", "walk_anim": "1422", "weapon_interface": "14", "weight": "2" @@ -71448,7 +71448,7 @@ "turn180_anim": "1423", "turn90ccw_anim": "1425", "turn90cw_anim": "1424", - "two_handed": "true", + "two_handed": "false", "walk_anim": "1422", "weapon_interface": "14", "weight": "2" @@ -71472,7 +71472,7 @@ "turn180_anim": "1423", "turn90ccw_anim": "1425", "turn90cw_anim": "1424", - "two_handed": "true", + "two_handed": "false", "walk_anim": "1422", "weapon_interface": "14", "weight": "2" @@ -71496,7 +71496,7 @@ "turn180_anim": "1423", "turn90ccw_anim": "1425", "turn90cw_anim": "1424", - "two_handed": "true", + "two_handed": "false", "walk_anim": "1422", "weapon_interface": "14", "weight": "2" diff --git a/Server/src/main/content/global/skill/construction/BuildHotspot.java b/Server/src/main/content/global/skill/construction/BuildHotspot.java index c5ca6c8e7..640771c62 100644 --- a/Server/src/main/content/global/skill/construction/BuildHotspot.java +++ b/Server/src/main/content/global/skill/construction/BuildHotspot.java @@ -59,7 +59,7 @@ public enum BuildHotspot { DINING_BENCH_1(15300, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_MID_ANIM, Decoration.BENCH_WOODEN, Decoration.BENCH_OAK, Decoration.BENCH_CARVED_OAK, Decoration.BENCH_TEAK, Decoration.BENCH_CARVED_TEAK, Decoration.BENCH_MAHOGANY, Decoration.BENCH_GILDED), DINING_BENCH_2(15299, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_MID_ANIM, Decoration.BENCH_WOODEN, Decoration.BENCH_OAK, Decoration.BENCH_CARVED_OAK, Decoration.BENCH_TEAK, Decoration.BENCH_CARVED_TEAK, Decoration.BENCH_MAHOGANY,Decoration.BENCH_GILDED), ROPE_BELL_PULL(15304, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_HIGH_ANIM, Decoration.ROPE_PULL, Decoration.BELL_PULL, Decoration.FANCY_BELL_PULL), - WALL_DECORATION(15303, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.OAK_DECORATION, Decoration.TEAK_DECORATION, Decoration.GILDED_DECORATION), + WALL_DECORATION(15303, BuildHotspotType.CREST, BuildingUtils.BUILD_HIGH_ANIM, Decoration.OAK_DECO, Decoration.TEAK_DECO, Decoration.GILDED_DECO), /** * Low-level Work shop hotspots. @@ -191,7 +191,7 @@ public enum BuildHotspot { /** * Combat room hotspots. */ - WALL_DECORATION2(15297, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.OAK_DECORATION, Decoration.TEAK_DECORATION, Decoration.GILDED_DECORATION), + WALL_DECORATION2(15297, BuildHotspotType.CREST, BuildingUtils.BUILD_HIGH_ANIM, Decoration.OAK_DECO, Decoration.TEAK_DECO, Decoration.GILDED_DECO), STORAGE_SPACE(15296, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.GLOVE_RACK, Decoration.WEAPONS_RACK, Decoration.EXTRA_WEAPONS_RACK), CR_RING(15277, BuildHotspotType.LINKED, BuildingUtils.BUILD_MID_ANIM, Decoration.BOXING_RING, Decoration.FENCING_RING, Decoration.COMBAT_RING, Decoration.NOTHING, Decoration.NOTHING2), CR_CORNER(15278, BuildHotspotType.LINKED, BuildingUtils.BUILD_MID_ANIM, Decoration.BOXING_RING, Decoration.FENCING_RING, Decoration.COMBAT_RING, Decoration.NOTHING, Decoration.NOTHING2), diff --git a/Server/src/main/content/global/skill/construction/decoration/workshop/EaselListeners.kt b/Server/src/main/content/global/skill/construction/decoration/workshop/EaselListeners.kt index aa3fcd8e9..881b049f5 100644 --- a/Server/src/main/content/global/skill/construction/decoration/workshop/EaselListeners.kt +++ b/Server/src/main/content/global/skill/construction/decoration/workshop/EaselListeners.kt @@ -73,7 +73,7 @@ class EaselListener : InteractionListener { } override fun defineListeners() { - on(easels, SCENERY, "use") { player, node -> + on(easels, SCENERY, "use", "make-helmet") { player, node -> val options = when (node.id) { Scenery.HELMET_PLUMING_STAND_13716 -> arrayOf("Plumed steel helmet", "Plumed rune helmet") diff --git a/Server/src/main/content/region/asgarnia/falador/dialogue/SirReniteeDialogue.kt b/Server/src/main/content/region/asgarnia/falador/dialogue/SirReniteeDialogue.kt index 51f1a910e..11dc5a4ef 100644 --- a/Server/src/main/content/region/asgarnia/falador/dialogue/SirReniteeDialogue.kt +++ b/Server/src/main/content/region/asgarnia/falador/dialogue/SirReniteeDialogue.kt @@ -87,9 +87,9 @@ class SirReniteeDialogueFile : DialogueLabeller() { ) label("family_crest") - npc(ChatAnim.NEUTRAL2, "What is your name?") + npc(ChatAnim.NEUTRAL_FAST, "What is your name?") player(ChatAnim.NEUTRAL, "${player!!.username}.") - npc(ChatAnim.NEUTRAL2, "Mmm, ${player!!.username}, let me see...") + npc(ChatAnim.NEUTRAL_FAST, "Mmm, ${player!!.username}, let me see...") exec { player, _ -> if (hasLevelStat(player, Skills.CONSTRUCTION, HeraldicProduct.STEEL_HELM.constructionReq)) { loadLabel(player, "has_construction_level") diff --git a/Server/src/main/core/game/dialogue/FacialExpression.java b/Server/src/main/core/game/dialogue/FacialExpression.java index ce09ffff7..ff596dee3 100644 --- a/Server/src/main/core/game/dialogue/FacialExpression.java +++ b/Server/src/main/core/game/dialogue/FacialExpression.java @@ -70,7 +70,7 @@ public enum FacialExpression { SLEEPING(9802), SILENT(9804), NEUTRAL(9808), - NEUTRAL2(9810), // Like neutral but mouth starts moving immediately + NEUTRAL_FAST(9810), // Like neutral but mouth starts moving immediately THINKING(9812), HALF_THINKING(9814), DISGUSTED(9816),