General bug fixes (#748)

* Fix missing zaros items

* Fix fairy ring travel log

* Fix sir gerry dialogue

* Fix knights notes

* Fix drinking sound

* Fix recover special potion

Author: GregHib

data/area/troll_country/god_wars_dungeon/god_wars_dungeon.items.toml

@@ -376,6 +376,7 @@ id = 20115
 limit = 2
 slot = "Hat"
 type = "FullFace"
+god = "zaros"
 examine = "A ceremonial mask dedicated to an ancient god."
 
 [ancient_ceremonial_top_2]
@@ -442,6 +443,7 @@ limit = 2
 weight = 0.453
 slot = "Hat"
 type = "FullFace"
+god = "zaros"
 examine = "A ceremonial mask dedicated to an ancient god."
 
 [ancient_ceremonial_mask_noted]
@@ -453,6 +455,7 @@ price = 282900
 limit = 2
 weight = 2.721
 slot = "Chest"
+god = "zaros"
 examine = "The top half of ceremonial robes dedicated to an ancient god."
 
 [ancient_ceremonial_top_noted]
@@ -464,6 +467,7 @@ price = 157300
 limit = 2
 weight = 1.814
 slot = "Legs"
+god = "zaros"
 examine = "The bottom half of ceremonial robes dedicated to an ancient god."
 
 [ancient_ceremonial_legs_noted]
@@ -475,6 +479,7 @@ price = 185000
 limit = 2
 weight = 0.453
 slot = "Hands"
+god = "zaros"
 examine = "Ceremonial gloves dedicated to an ancient god."
 
 [ancient_ceremonial_gloves_noted]
@@ -486,6 +491,7 @@ price = 84800
 limit = 2
 weight = 0.453
 slot = "Feet"
+god = "zaros"
 examine = "Ceremonial boots dedicated to an ancient god."
 
 [ancient_ceremonial_boots_noted]

data/minigame/treasure_trail/treasure_trail.items.toml

@@ -3948,6 +3948,7 @@ price = 54500
 limit = 2
 weight = 2.0
 slot = "Weapon"
+god = "zaros"
 examine = "A blessed crozier."
 
 [ancient_crozier_noted]
@@ -3983,6 +3984,7 @@ price = 145800
 limit = 2
 weight = 0.4
 slot = "Cape"
+god = "zaros"
 examine = "A blessed cloak."
 
 [ancient_cloak_noted]
@@ -4022,6 +4024,7 @@ weight = 0.3
 aka = ["zaros_mitre"]
 slot = "Hat"
 type = "Hair"
+god = "zaros"
 examine = "A blessed mitre."
 
 [ancient_mitre_noted]
@@ -4045,6 +4048,7 @@ price = 127900
 limit = 2
 weight = 1.8
 slot = "Chest"
+god = "zaros"
 examine = "A vestment of Zaros."
 
 [ancient_robe_top_noted]
@@ -4092,6 +4096,7 @@ price = 128900
 limit = 2
 weight = 2.7
 slot = "Legs"
+god = "zaros"
 examine = "Legs that match the Zaros vestment."
 
 [ancient_robe_legs_noted]
@@ -4127,6 +4132,7 @@ price = 108100
 limit = 2
 weight = 0.01
 slot = "Amulet"
+god = "zaros"
 examine = "A blessed stole."
 
 [ancient_stole_noted]
@@ -4140,6 +4146,7 @@ weight = 9.979
 aka = ["zaros_platebody"]
 slot = "Chest"
 material = "metal"
+god = "zaros"
 examine = "A rune platebody in the colours of Zaros."
 
 [rune_platebody_ancient_noted]
@@ -4156,6 +4163,7 @@ weight = 9.071
 aka = ["zaros_platelegs"]
 slot = "Legs"
 material = "metal"
+god = "zaros"
 examine = "Rune platelegs in the colours of Zaros."
 
 [rune_platelegs_ancient_noted]
@@ -4172,6 +4180,7 @@ weight = 9.071
 aka = ["zaros_plateskirt"]
 slot = "Legs"
 material = "metal"
+god = "zaros"
 examine = "A rune plateskirt in the colours of Zaros."
 
 [rune_plateskirt_ancient_noted]
@@ -4189,6 +4198,7 @@ aka = ["zaros_full_helm"]
 slot = "Hat"
 material = "metal"
 type = "FullFace"
+god = "zaros"
 examine = "A rune full helmet in the colours of Zaros."
 
 [rune_full_helm_ancient_noted]
@@ -4205,6 +4215,7 @@ weight = 5.443
 aka = ["zaros_kiteshield"]
 slot = "Shield"
 material = "metal"
+god = "zaros"
 examine = "A rune kiteshield in the colours of Zaros."
 
 [rune_kiteshield_ancient_noted]
@@ -4382,6 +4393,7 @@ limit = 2
 weight = 1.0
 slot = "Hands"
 material = "leather"
+god = "zaros"
 examine = "Blessed dragonhide vambraces."
 
 [ancient_vambraces_noted]
@@ -4395,6 +4407,7 @@ weight = 6.0
 aka = ["zaros_body"]
 slot = "Chest"
 material = "leather"
+god = "zaros"
 examine = "Blessed dragonhide body armour."
 
 [ancient_body_noted]
@@ -4407,6 +4420,7 @@ limit = 2
 weight = 5.0
 slot = "Legs"
 material = "leather"
+god = "zaros"
 examine = "Blessed dragonhide chaps."
 
 [ancient_chaps_noted]
@@ -4421,6 +4435,7 @@ aka = ["zaros_coif"]
 slot = "Hat"
 material = "leather"
 type = "Hair"
+god = "zaros"
 examine = "Blessed dragonhide coif."
 
 [ancient_coif_noted]

data/quest/members/another_slice_of_ham/another_slice_of_ham.items.toml

@@ -80,6 +80,7 @@ special_energy = 1000
 special = "favour_of_the_war_god"
 god = "bandos"
 slot = "Weapon"
+god = "zaros"
 examine = "It has ancient goblin symbols on it."
 
 [zanik_slice]

data/quest/members/desert_treasure/desert_treasure.items.toml

@@ -166,6 +166,7 @@ limit = 100
 weight = 2.267
 category = "staff"
 slot = "Weapon"
+god = "zaros"
 examine = "A magical staff of ancient origin..."
 
 [ancient_staff_noted]

data/quest/members/horror_from_the_deep/horror_from_the_deep.items.toml

@@ -289,9 +289,10 @@ id = 19616
 tradeable = false
 weight = 1.0
 slot = "Shield"
+kept = "Wilderness"
+god = "zaros"
 destroy = "Talk to Jossik at the lighthouse west of Rellekka for another copy."
 examine = "An incomplete ancient book."
-kept = "Wilderness"
 
 [ancient_book]
 id = 19617
@@ -300,6 +301,7 @@ bank_stacks = false
 weight = 1.0
 aka = ["zaros_book"]
 slot = "Shield"
+god = "zaros"
 destroy = "This book can be reclaimed from the bookcase in your player-owned house for a fee, are you sure you wish to destroy it?"
 examine = "The holy book of a forgotten god."
 kept = "Reclaim"

data/skill/herblore/potion.items.toml

@@ -1416,6 +1416,7 @@ id = 15300
 weight = 0.035
 excess = "recover_special_3"
 empty = "vial"
+aka = ["spec_restore", "special_restore", "special_restore_4", "spec_restore_4", "restore_special_4", "restore_spec_4", "spec"]
 examine = "4 doses of recover special potion."
 
 [recover_special_3]

game/src/main/kotlin/content/area/troll_country/god_wars_dungeon/SirGerry.kts

@@ -48,7 +48,7 @@ objectOperate("Search", "godwars_knight*") {
     player.inventory.add("knights_notes")
 }
 
-inventoryItem("Open", "knights_notes") {
+inventoryItem("Read", "knights_notes") {
     choice("The scroll is sealed. Do you still want to open it?") {
         option("Yes") {
             if (player.inventory.replace(item.id, "knights_notes_opened")) {
@@ -68,7 +68,7 @@ objectOperate("Tie-rope", "godwars_hole") {
         player.inventory.remove("rope")
         player["godwars_entrance_rope"] = true
     } else {
-        npc<Scared>("sir_gerry", "Cough... Hey, over here.")
+        npc<Scared>("sir_gerry_normal", "Cough... Hey, over here.")
     }
 }
 

game/src/main/kotlin/content/quest/member/fairy_tale_part_2/fairy_ring/FairyRing.kts

@@ -43,7 +43,7 @@ objectOperate("Use", "fairy_ring_*") {
     player.walkOverDelay(target.tile)
     delay()
     Teleport.teleport(player, fairyRing.tile, "fairy_ring")
-    val list: MutableList<String> = player["travel_log_locations"] ?: return@objectOperate
+    val list: MutableList<String> = player.getOrPut("travel_log_locations") { mutableListOf() }
     list.add(code)
 }
 

game/src/main/kotlin/content/quest/member/fairy_tale_part_2/fairy_ring/TravelLog.kts

@@ -20,7 +20,6 @@ interfaceOpen("travel_log") { player ->
     val list: List<String> = player["travel_log_locations"] ?: return@interfaceOpen
     for ((code, def) in fairyRing.codes) {
         if (list.contains(code)) {
-            println(code)
             player.interfaces.sendText(id, def.id.lowercase(), "<br>${def.name}")
         }
     }

game/src/main/kotlin/content/skill/constitution/Eating.kts

@@ -50,7 +50,7 @@ inventoryOptions("Eat", "Drink", "Heal") {
     } else {
         player.message("You ${if (drink) "drink" else "eat"} the ${item.def.name.lowercase()}.", ChatType.Filter)
     }
-    player.sound(if (drink) "pour_tea" else "eat")
+    player.sound(if (drink) "drink" else "eat")
     player.emit(Consume(item, slot))
     if (smash) {
         player.message("You quickly smash the empty vial using the trick a Barbarian taught you.", ChatType.Filter)