Convert custom data classes to enum configs

cache/src/main/kotlin/world/gregs/voidps/cache/definition/data/EnumDefinition.kt

@@ -20,10 +20,14 @@ data class EnumDefinition(
 
     fun int(id: Int) = map?.get(id) as? Int ?: defaultInt
 
+    fun intOrNull(id: Int) = map?.get(id) as? Int
+
     fun randomInt() = map?.values?.random(random) as? Int ?: defaultInt
 
     fun string(id: Int) = map?.get(id) as? String ?: defaultString
 
+    fun stringOrNull(id: Int) = map?.get(id) as? String
+
     override fun toString(): String {
         return "EnumDefinition(id=$id, keyType=${EnumTypes.name(keyType)}, valueType=${EnumTypes.name(valueType)}, defaultString=$defaultString, defaultInt=$defaultInt, length=$length, map=$map, stringId=$stringId, extras=$extras)"
     }

cache/src/main/kotlin/world/gregs/voidps/cache/definition/data/EnumTypes.kt

@@ -19,6 +19,7 @@ object EnumTypes {
     const val NPC = 'n'
     const val ENUM = 'g'
     const val INV = 'v'
+    const val OBJ = 'z' // Custom
 
     fun name(char: Char) = when (char) {
         STRING -> "string"
@@ -39,6 +40,7 @@ object EnumTypes {
         NPC -> "npc"
         ENUM -> "enum"
         INV -> "inv"
+        OBJ -> "object"
         else -> "null"
     }
 
@@ -60,6 +62,7 @@ object EnumTypes {
         "npc" -> NPC
         "enum" -> ENUM
         "inv" -> INV
+        "object" -> OBJ
         else -> null
     }
 }

cache/src/main/kotlin/world/gregs/voidps/cache/definition/decoder/ObjectDecoder.kt

@@ -7,8 +7,8 @@ import world.gregs.voidps.cache.definition.Parameters
 import world.gregs.voidps.cache.definition.data.ObjectDefinition
 
 open class ObjectDecoder(
-    val member: Boolean,
-    val lowDetail: Boolean,
+    val member: Boolean = true,
+    val lowDetail: Boolean = false,
     private val parameters: Parameters = Parameters.EMPTY,
 ) : DefinitionDecoder<ObjectDefinition>(OBJECTS) {
 

data/activity/shooting_star/shooting_star.items.toml

@@ -1,7 +1,6 @@
 [stardust]
 id = 13727
 tradeable = false
-mining = { xp = 80.0, chance_min = 10, chance_max = 75 }
 destroy = "You can mine more if you find another crashed star."
 examine = "Small, shiny bits of rock."
 kept = "Wilderness"

data/activity/shooting_star/shooting_star.objs.toml

@@ -5,89 +5,44 @@ examine = "It's a crashed star."
 [crashed_star_tier_9]
 id = 38660
 collect_for_next_layer = 15
-mining = {
-  level = 90,
-  ores = [ "stardust" ],
-  gems = true
-}
 examine = "This is a size-9 star."
 
 [crashed_star_tier_8]
 id = 38661
 collect_for_next_layer = 40
-mining = {
-  level = 80,
-  ores = [ "stardust" ],
-  gems = true
-}
 examine = "This is a size-8 star."
 
 [crashed_star_tier_7]
 id = 38662
 collect_for_next_layer = 40
-mining = {
-  level = 70,
-  ores = [ "stardust" ],
-  gems = true
-}
 examine = "This is a size-7 star."
 
 [crashed_star_tier_6]
 id = 38663
 collect_for_next_layer = 80
-mining = {
-  level = 60,
-  ores = [ "stardust" ],
-  gems = true
-}
 examine = "This is a size-6 star."
 
 [crashed_star_tier_5]
 id = 38664
 collect_for_next_layer = 175
-mining = {
-  level = 50,
-  ores = [ "stardust" ],
-  gems = true
-}
 examine = "This is a size-5 star."
 
 [crashed_star_tier_4]
 id = 38665
 collect_for_next_layer = 250
-mining = {
-  level = 40,
-  ores = [ "stardust" ],
-  gems = true
-}
 examine = "This is a size-4 star."
 
 [crashed_star_tier_3]
 id = 38666
 collect_for_next_layer = 450
-mining = {
-  level = 30,
-  ores = [ "stardust" ],
-  gems = true
-}
 examine = "This is a size-3 star."
 
 [crashed_star_tier_2]
 id = 38667
 collect_for_next_layer = 700
-mining = {
-  level = 20,
-  ores = [ "stardust" ],
-  gems = true
-}
 examine = "This is a size-2 star."
 
 [crashed_star_tier_1]
 id = 38668
 collect_for_next_layer = 1200
-mining = {
-  level = 10,
-  ores = [ "stardust" ],
-  gems = true
-}
 examine = "This is a size-1 star."

data/area/asgarnia/dwarven_mines/living_rock_cavern.items.toml

@@ -9,8 +9,6 @@ id = 15264
 price = 656
 limit = 20000
 weight = 0.35
-fishing = { level = 85, xp = 300.0, chance_min = 2, chance_max = 24 }
-cooking = { level = 88, xp = 214.0, chances = { fire = "4-230", gauntlet = "12-269" }, cooked = "cavefish" }
 examine = "I should try cooking this."
 
 [raw_cavefish_noted]
@@ -39,8 +37,6 @@ id = 15270
 price = 1804
 limit = 20000
 weight = 0.4
-fishing = { level = 90, xp = 380.0, chance_min = 1, chance_max = 16 }
-cooking = { level = 92, xp = 225.0, chances = { fire = "1-180", gauntlet = "1-269" }, cooked = "rocktail", cooked_message = "You successfully cook a rocktail.", burnt_message = "You accidentally burn the rocktail." }
 examine = "I should try cooking this."
 
 [raw_rocktail_noted]

data/area/asgarnia/dwarven_mines/living_rock_caverns/living_rock_caverns.npcs.toml

@@ -14,12 +14,10 @@ examine = "What are these things?"
 
 [cavefish_shoal]
 id = 8841
-fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_cavefish"] } }
 examine = "It looks like there are fish swimming in the water."
 
 [rocktail_shoal]
 id = 8842
-fishing_bait = { items = ["fishing_rod"], bait = { living_minerals = ["raw_rocktail"] } }
 examine = "It looks like there are fish swimming in the water."
 
 [living_rock_caverns_controller]

data/area/asgarnia/entrana/entrana.npcs.toml

@@ -38,13 +38,9 @@ examine = "Mazion seems to be covered in sand."
 
 [fishing_spot_entrana]
 id = 318
-fishing_lure = { items = ["fly_fishing_rod"], bait = { feather = ["raw_trout", "raw_salmon"], stripy_feather = ["raw_rainbow_fish"] } }
-fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_pike"] } }
 
 [fishing_spot_entrana_net]
 id = 319
-fishing_net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_anchovies"] } }
-fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_sardine", "raw_herring"] } }
 
 [fritz_the_glassblower]
 id = 4909

data/area/asgarnia/falador/falador.npcs.toml

@@ -60,15 +60,6 @@ examine = "He wanders around the Crafting Guild pretending to be working."
 
 [barmaid_emily]
 id = 736
-bar_crawl = {
-    id = "hand_of_death_cocktail",
-    price = 70,
-    insufficient = "I don't have that much money on me.",
-    give = "You buy a Hand of Death cocktail.",
-    drink = "You drink the cocktail.",
-    effect = "You stumble around the room.",
-    sign = "The barmaid giggles and signs your card."
-}
 categories = ["human"]
 wander_range = 3
 collision = "indoors"
@@ -255,7 +246,6 @@ wander_range = 2
 combat_def = "guard"
 respawn_delay = 50
 drop_table = "guard"
-pickpocket = { level = 40, stun_ticks = 8, stun_hit = 20, xp = 46.8, chance_min = 50, chance_max = 240, table = "guard" }
 examine = "He tries to keep order around here."
 
 [guard_falador_2]

data/area/asgarnia/mudskipper_point/mudskipper_point.npcs.toml

@@ -13,8 +13,6 @@ id = 2727
 
 [fishing_spot_mudskipper_point]
 id = 325
-fishing_net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_anchovies"] } }
-fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_sardine", "raw_herring"] } }
 
 [giant_rat_mudskipper_point]
 id = 446

data/area/asgarnia/port_sarim/port_sarim.npcs.toml

@@ -14,7 +14,6 @@ def = 14
 combat_def = "guard"
 attack_bonus = 4
 respawn_delay = 50
-pickpocket = { level = 40, stun_ticks = 8, stun_hit = 20, xp = 46.8, chance_min = 50, chance_max = 240, table = "guard" }
 examine = "Keeping an eye out for suspicious activity."
 
 [port_sarim_guard_1]
@@ -45,15 +44,6 @@ examine = "Keeping an eye out for suspicious activity."
 
 [bartender_rusty_anchor_inn]
 id = 734
-bar_crawl = {
-    id = "black_skull_ale",
-    price = 8,
-    insufficient = "I don't have 8 coins with me.",
-    give = "You buy a Black Skull Ale.",
-    drink = "You drink your Black Skull Ale...",
-    effect = "Your vision blurs.",
-    sign = "The bartender signs your card."
-}
 categories = ["human"]
 wander_range = 4
 collision = "indoors"

data/area/asgarnia/taverley/dungeon/taverley_dungeon.npcs.toml

@@ -13,7 +13,6 @@ examine = "A dusty old suit of armour."
 
 [fishing_spot_taverley_dungeon]
 id = 800
-fishing_bait = { items = ["oily_fishing_rod"], bait = { fishing_bait = ["raw_lava_eel"] } }
 examine = "It looks like there might be eels swimming in the lava."
 
 [kharid_scorpion_taverley_dungeon]

data/area/fremennik_province/fremennik_isles/jatizso/jatizso.npcs.toml

@@ -1,21 +1,8 @@
 [fishing_spot_jatizso]
 id = 5470
-fishing_cage = { items = ["lobster_pot"], bait = { none = ["raw_lobster"] } }
-fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_tuna", "raw_swordfish"] } }
 
 [fishing_spot_jatizso_big_net]
 id = 5471
-fishing_net = { items = ["big_fishing_net"], bait = { none = [
-    "raw_mackerel",
-    "raw_cod",
-    "raw_bass",
-    "oyster",
-    "casket",
-    "seaweed",
-    "leather_gloves",
-    "leather_boots"
-] } }
-fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_shark"] } }
 
 [king_gjuki_sorvott_iv]
 id = 5478

data/area/fremennik_province/rellekka/rellekka.npcs.toml

@@ -134,7 +134,6 @@ examine = "He's strong to the finish, because he eats cabbage."
 
 [agnar_rellekka]
 id = 1305
-pickpocket = { level = 45, stun_ticks = 8, stun_hit = 20, xp = 65.0, chance_min = 90, chance_max = 240, table = "fremmennik" }
 examine = "One of Rellekka's many citizens."
 
 [pontak_rellekka]
@@ -248,27 +247,12 @@ examine = "Fearsome predator found only in the Fremennik Province, renowned for
 
 [fishing_spot_rellekka]
 id = 1331
-fishing_net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_anchovies"] } }
-fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_sardine", "raw_herring"] } }
 
 [fishing_spot_rellekka_cage]
 id = 1332
-fishing_cage = { items = ["lobster_pot"], bait = { none = ["raw_lobster"] } }
-fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_tuna", "raw_swordfish"] } }
 
 [fishing_spot_rellekka_big_net]
 id = 1333
-fishing_net = { items = ["big_fishing_net"], bait = { none = [
-    "raw_mackerel",
-    "raw_cod",
-    "raw_bass",
-    "oyster",
-    "casket",
-    "seaweed",
-    "leather_gloves",
-    "leather_boots"
-] } }
-fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_shark"] } }
 
 [rhonen]
 id = 2334
@@ -329,11 +313,9 @@ id = 7575
 
 [fishing_spot_rellekka_4]
 id = 7862
-fishing_cage = { items = ["lobster_pot"], bait = { none = ["raw_lobster"] } }
 
 [fishing_spot_rellekka_5]
 id = 7863
-fishing_cage = { items = ["lobster_pot"], bait = { none = ["raw_lobster"] } }
 
 [larry_rellekka_2]
 id = 8694

data/area/kandarin/ape_atoll/ape_atoll.npcs.toml

@@ -46,31 +46,9 @@ id = 13240
 
 [fishing_spot_ape_atoll]
 id = 1405
-fishing_net = { items = ["big_fishing_net"], bait = { none = [
-    "raw_mackerel",
-    "raw_cod",
-    "raw_bass",
-    "oyster",
-    "casket",
-    "seaweed",
-    "leather_gloves",
-    "leather_boots"
-] } }
-fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_shark"] } }
 
 [fishing_spot_ape_atoll_2]
 id = 1406
-fishing_net = { items = ["big_fishing_net"], bait = { none = [
-    "raw_mackerel",
-    "raw_cod",
-    "raw_bass",
-    "oyster",
-    "casket",
-    "seaweed",
-    "leather_gloves",
-    "leather_boots"
-] } }
-fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_shark"] } }
 
 [garkor]
 id = 1411

data/area/kandarin/arandar/arandar.npcs.toml

@@ -27,7 +27,6 @@ attack_bonus = -42
 ranged_strength = 2
 combat_def = "gnome"
 respawn_delay = 60
-pickpocket = { level = 75, stun_ticks = 8, stun_hit = 10, xp = 133.5, chance_min = 43, chance_max = 175, table = "gnome" }
 drop_table = "bones"
 examine = "Like a mini man!"