Even more bug fixes

cache/src/main/kotlin/world/gregs/voidps/cache/definition/Category.kt

@@ -78,4 +78,44 @@ object Category {
         else -> error("Category $id not found")
     }
 
+    fun id(name: String) = when (name) {
+        "throwable" -> THROWABLE
+        "arrow" -> ARROW
+        "bolt" -> BOLT
+        "construction" -> CONSTRUCTION
+        "furniture" -> FURNITURE
+        "uncooked_food" -> UNCOOKED_FOOD
+        "construction_storable_clothes" -> CONSTRUCTION_STORABLE_CLOTHES
+        "crafting" -> CRAFTING
+        "summoning_pouches" -> SUMMONING_POUCHES
+        "construction_plant" -> CONSTRUCTION_PLANT
+        "fletching" -> FLETCHING
+        "edible" -> EDIBLE
+        "herblore" -> HERBLORE
+        "hunter_required_item" -> HUNTER_REQUIRED_ITEM
+        "hunter_reward" -> HUNTER_REWARD
+        "jewellery" -> JEWELLERY
+        "magic_armour" -> MAGIC_ARMOUR
+        "magic_weapon" -> MAGIC_WEAPON
+        "melee_armour_low" -> MELEE_ARMOUR_LOW
+        "melee_armour_mid" -> MELEE_ARMOUR_MID
+        "melee_armour_high" -> MELEE_ARMOUR_HIGH
+        "melee_weapon_low" -> MELEE_WEAPON_LOW
+        "melee_weapon_mid" -> MELEE_WEAPON_MID
+        "melee_weapon_high" -> MELEE_WEAPON_HIGH
+        "mining_smelting" -> MINING_SMELTING
+        "potion" -> POTION
+        "prayer_armour" -> PRAYER_ARMOUR
+        "prayer_consumable" -> PRAYER_CONSUMABLE
+        "range_armour" -> RANGE_ARMOUR
+        "range_weapon" -> RANGE_WEAPON
+        "runecrafting" -> RUNECRAFTING
+        "teleport" -> TELEPORT
+        "seed" -> SEED
+        "summoning_scroll" -> SUMMONING_SCROLL
+        "item_on_item" -> ITEM_ON_ITEM
+        "log" -> LOG
+        else -> error("Category $name not found")
+    }
+
 }

cache/src/main/kotlin/world/gregs/voidps/cache/definition/Parameterized.kt

@@ -9,6 +9,7 @@ import world.gregs.voidps.cache.definition.Params.CATEGORY
 import world.gregs.voidps.cache.definition.Params.MAGIC_STRENGTH
 import world.gregs.voidps.cache.definition.Params.RANGED_STRENGTH
 import world.gregs.voidps.cache.definition.Params.STRENGTH
+import kotlin.collections.set
 
 @Suppress("UNCHECKED_CAST")
 interface Parameterized {
@@ -67,11 +68,12 @@ interface Parameterized {
             writer.writeByte(params.size)
             params.forEach { (id, value) ->
                 writer.writeByte(value is String)
-                writer.writeMedium(id)
-                if (value is String) {
-                    writer.writeString(value)
-                } else if (value is Int) {
-                    writer.writeInt(value)
+                writer.writeMedium(if (value is Set<*>) CATEGORY else id)
+                when (value) {
+                    is String -> writer.writeString(value)
+                    is Int -> writer.writeInt(value)
+                    is Double -> writer.writeInt((value * 10.0).toInt())
+                    is Set<*> -> writer.writeInt(Category.id((value as Set<String>).first()))
                 }
             }
         }

cache/src/main/kotlin/world/gregs/voidps/cache/definition/Params.kt

@@ -262,8 +262,10 @@ object Params {
     const val VARIABLES = 5263
     const val SUMMONING_BEAST_OF_BURDEN_ESSENCE = 5264
     const val SUMMONING_SPECIAL_COST = 5265
+    const val DISENGAGE = 5266
 
     private fun custom(name: String) = when (name) {
+        "disengage" -> DISENGAGE
         "summoning_beast_of_burden_essence" -> SUMMONING_BEAST_OF_BURDEN_ESSENCE
         "summoning_special_cost" -> SUMMONING_SPECIAL_COST
         "variables" -> VARIABLES

data/activity/event/random/freaky_forester/freaky_forester.objs.toml

@@ -1,3 +1,6 @@
 [bank_deposit_box_freaky_forester]
 id = 32931
 examine = "Lets you put items into your bank."
+
+[exit_portal_freaky_forester]
+id = 15645

data/area/asgarnia/black_knights_fortress/black_knight.drops.toml

@@ -0,0 +1,6 @@
+[jailer_black_knights_base_drop_table]
+type = "all"
+drops = [
+    { id = "bones" },
+    { id = "jail_key" },
+]

data/area/asgarnia/black_knights_fortress/black_knight.npcs.toml

@@ -6,12 +6,17 @@ examine = "One of the Black Knights."
 id = 200
 examine = "Wears a stylish suit of armour."
 
+[velrak_the_explorer]
+id = 798
+examine = "He looks cold and hungry."
+
 [jailer_black_knights_base]
 id = 201
 hitpoints = 470
 att = 40
 str = 40
 def = 40
+drop_table = "jailer_black_knights_base"
 combat_def = "man"
 max_hit_crush = 50
 respawn_delay = 50

data/area/asgarnia/taverley/dungeon/black_knight_base.npc-spawns.toml

@@ -46,5 +46,6 @@ spawns = [
       { id = "jailer_black_knights_base", x = 2933, y = 9693 },
       { id = "captain_gilroy", x = 2915, y = 9674, members = true },
       { id = "lord_daquarius", x = 2892, y = 9680, members = true },
+      { id = "velrak_the_explorer", x = 2931, y = 9686, members = true },
       { id = "black_knight_void_stares_back", x = 2913, y = 9674, members = true },
 ]

data/area/asgarnia/taverley/taverley.drops.toml

@@ -28,3 +28,83 @@ drops = [
     { id = "limpwurt_root", chance = 3 },
     { id = "antipoison_3" },
 ]
+
+[crystal_chest_drop_table]
+type = "all"
+drops = [
+    { id = "uncut_dragonstone" },
+    { table = "crystal_chest_secondary" },
+]
+
+[crystal_chest_secondary]
+roll = 128
+drops = [
+    { table = "crystal_chest_1", chance = 34 },
+    { table = "crystal_chest_2", chance = 12 },
+    { table = "crystal_chest_3", chance = 12 },
+    { id = "rune_bar", amount = 3, chance = 12 },
+    { table = "crystal_chest_5", chance = 10 },
+    { id = "iron_ore_noted", amount = 150, chance = 10 },
+    { id = "coal_noted", amount = 100, chance = 10 },
+    { table = "crystal_chest_8", chance = 8 },
+    { id = "adamant_sq_shield", chance = 2 },
+    { table = "crystal_chest_10", chance = 1 },
+]
+
+[crystal_chest_1]
+type = "all"
+drops = [
+    { id = "spinach_roll" },
+    { id = "coins", amount = 2000 },
+]
+
+[crystal_chest_2]
+type = "all"
+drops = [
+    { id = "air_rune", amount = 50 },
+    { id = "water_rune", amount = 50 },
+    { id = "earth_rune", amount = 50 },
+    { id = "fire_rune", amount = 50 },
+    { id = "body_rune", amount = 50 },
+    { id = "mind_rune", amount = 50 },
+    { id = "chaos_rune", amount = 10 },
+    { id = "death_rune", amount = 10 },
+    { id = "cosmic_rune", amount = 10 },
+    { id = "nature_rune", amount = 10 },
+    { id = "law_rune", amount = 10 },
+]
+
+[crystal_chest_3]
+type = "all"
+drops = [
+    { id = "ruby", amount = 2 },
+    { id = "diamond", amount = 2 },
+]
+
+[crystal_chest_5]
+type = "all"
+drops = [
+    { id = "coins", amount = 750 },
+    { table = "crystal_key" },
+]
+
+[crystal_key]
+roll = 10
+drops = [
+    { id = "loop_half_of_a_key", chance = 5 },
+    { id = "tooth_half_of_a_key", chance = 5 },
+]
+
+[crystal_chest_8]
+type = "all"
+drops = [
+    { id = "raw_swordfish", amount = 5 },
+    { id = "coins", amount = 1000 },
+]
+
+[crystal_chest_10]
+roll = 2
+drops = [
+    { id = "rune_platelegs" },
+    { id = "rune_plateskirt" },
+]

data/area/asgarnia/taverley/taverley.objs.toml

@@ -0,0 +1,7 @@
+[crystal_chest]
+id = 172
+examine = "I wonder what's inside."
+
+[crystal_chest_open]
+id = 173
+examine = "Perhaps I should search it."

data/area/asgarnia/taverley/taverley.recipes.toml

@@ -0,0 +1,4 @@
+[crystal_key]
+remove = ["tooth_half_of_a_key", "loop_half_of_a_key"]
+add = ["crystal_key"]
+message = "You join the two halves of the key together."

data/area/kandarin/yanille/yanille.npcs.toml

@@ -56,6 +56,7 @@ examine = "A Supplier of Magical items."
 
 [aleck]
 id = 5110
+shop = "alecks_hunter_emporium"
 examine = "He acts as if he owns the place."
 
 [leon]
@@ -76,6 +77,7 @@ examine = "A wizard."
 
 [frenita]
 id = 593
+shop = "frenitas_cookery_shop"
 examine = "A recipe for success- in Cooking."
 
 [pet_shop_owner_yanille]

data/area/kharidian_desert/nardah/nardah.npc-spawns.toml

@@ -10,7 +10,7 @@ spawns = [
   { id = "meskhenet", x = 3427, y = 2900 },
   { id = "zahra", x = 3448, y = 2898 },
   { id = "zahur", x = 3442, y = 2886 },
-  { id = "seddu", x = 3407, y = 2926 },
+  { id = "seddu", x = 3406, y = 2922 },
   { id = "kazemde", x = 3414, y = 2906 },
   { id = "awusah_the_mayor", x = 3442, y = 2912, members = true },
   { id = "tarik_nardah", x = 3438, y = 2917 },

data/area/kharidian_desert/nardah/nardah.npcs.toml

@@ -1,5 +1,6 @@
 [rokuh]
 id = 13181
+shop = "roks_chocs_box"
 
 [ghaslor_the_elder]
 id = 3029
@@ -35,10 +36,12 @@ examine = "A herbalist... sells herbs."
 
 [seddu]
 id = 3038
+shop = "seddus_adventurers_store"
 examine = "An armour merchant."
 
 [kazemde]
 id = 3039
+shop = "nardah_general_store"
 examine = "A seller of many things."
 
 [awusah_the_mayor]
@@ -106,6 +109,7 @@ examine = "They'll eat anything!"
 
 [artimeus]
 id = 5109
+shop = "nardah_hunter_shop"
 examine = "He looks like he knows what he's doing."
 
 [ali_the_wise]

data/area/kharidian_desert/nardah/nardah.vars.toml

@@ -0,0 +1,3 @@
+[spoke_nardah_herblist]
+format = "boolean"
+persist = true