Existing content fixes

data/area/asgarnia/mudskipper_point/asgarnian_ice_dungeon/skeletal_wyvern/skeletal_wyvern.drops.toml

@@ -4,6 +4,7 @@ drops = [
     { table = "skeletal_wyvern_primary" },
     { table = "skeletal_wyvern_secondary" },
     { table = "skeletal_wyvern_tertiary" },
+    { table = "hard_clue_scroll", roll = 128 },
 ]
 
 [skeletal_wyvern_primary]
@@ -15,39 +16,38 @@ drops = [
 roll = 512
 drops = [
     { id = "granite_legs" },
-    { id = "dragon_platelegs" },
-    { id = "dragon_plateskirt" },
-    { id = "earth_battlestaff", chance = 16 },
-    { id = "battlestaff_noted", amount = 10, chance = 12 },
-    { id = "rune_hatchet", chance = 12 },
-    { id = "rune_battleaxe", chance = 8 },
-    { id = "rune_warhammer", chance = 8 },
-    { id = "rune_full_helm", chance = 8 },
-    { id = "rune_kiteshield", chance = 8 },
-    { id = "air_rune", amount = 225, chance = 24 },
-    { id = "rune_arrow", amount = 36, chance = 20 },
-    { id = "water_rune", amount = 150, chance = 16 },
-    { id = "chaos_rune", amount = 80, chance = 16 },
-    { id = "law_rune", amount = 45, chance = 16 },
-    { id = "death_rune", amount = 40, chance = 16 },
-    { id = "blood_rune", amount = 25, chance = 16 },
-    { id = "adamant_bolts", min = 75, max = 99, chance = 12 },
-    { id = "runite_bolts", min = 35, max = 44, chance = 12 },
-    { id = "soul_rune", amount = 20, chance = 4 },
-    { table = "herb_drop_table", chance = 28 },
-    { id = "pure_essence_noted", amount = 250, chance = 32 },
-    { id = "magic_logs_noted", amount = 35, chance = 24 },
-    { id = "adamant_bar_noted", amount = 10, chance = 24 },
-    { id = "iron_ore_noted", amount = 200, chance = 12 },
-    { id = "uncut_ruby_noted", amount = 10, chance = 8 },
-    { id = "uncut_diamond_noted", amount = 5, chance = 8 },
-    { id = "coins", amount = 300, chance = 48 },
-    { id = "lobster", amount = 6, chance = 32 },
-    { id = "prayer_potion_4", amount = 2, chance = 28 },
-    { id = "unpowered_orb_noted", amount = 75, chance = 8 },
-    { id = "rune_crossbow_u", chance = 8 },
-    { id = "ranarr_seed", amount = 3, chance = 8 },
-    { id = "snapdragon_seed", chance = 8 },
+    { id = "soul_rune", min = 5, max = 14, chance = 28 },
+    { id = "air_rune", min = 10, max = 64, chance = 24 },
+    { id = "water_rune", min = 10, max = 33, chance = 20 },
+    { id = "runite_bolts", min = 5, max = 22, chance = 20 },
+    { id = "adamant_bolts", min = 5, max = 29, chance = 20 },
+    { id = "mithril_bolts", min = 8, max = 35, chance = 20 },
+    { id = "blood_rune", min = 2, max = 11, chance = 16 },
+    { id = "bone_bolts", min = 2, max = 29, chance = 16 },
+    { id = "law_rune", min = 2, max = 5, chance = 12 },
+    { id = "chaos_rune", amount = 10, chance = 12 },
+    { id = "cosmic_talisman", chance = 4 },
+    { id = "chaos_talisman", chance = 4 },
+    { id = "pure_essence_noted", amount = 60, chance = 20 },
+    { id = "super_attack_1", chance = 20 },
+    { id = "defence_potion_3", chance = 20 },
+    { id = "lobster", amount = 3, chance = 8 },
+    { id = "bass", chance = 8 },
+    { id = "snakeskin_chaps", chance = 8 },
+    { id = "earth_battlestaff", chance = 4 },
+    { id = "adamant_crossbow_u", chance = 4 },
+    { id = "uncut_emerald", chance = 8 },
+    { id = "uncut_ruby", chance = 8 },
+    { id = "uncut_diamond", chance = 4 },
+    { id = "coins", min = 50, max = 349, chance = 60 },
+    { id = "coins", min = 30, max = 229, chance = 40 },
+    { id = "coins", min = 20, max = 519, chance = 24 },
+    { id = "coins", min = 250, max = 499, chance = 12 },
+    { id = "mithril_sword", chance = 16 },
+    { id = "adamant_hatchet", chance = 8 },
+    { id = "black_hatchet", chance = 8 },
+    { table = "herb_drop_table", chance = 68 },
+    { table = "rare_seed_drop_table", chance = 12 },
 ]
 
 [skeletal_wyvern_tertiary]

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

@@ -15,6 +15,7 @@ slayer_xp = 210.0
 slayer_level = 72
 xp_bonus = 0.5
 combat_def = "skeletal_wyvern"
+drop_table = "skeletal_wyvern"
 examine = "A very dangerous pile of animated wyvern bones."
 
 [skeletal_wyvern_horns]

data/area/misthalin/edgeville/edgeville.anims.toml

@@ -0,0 +1,8 @@
+[edgeville_guard_death]
+id = 7213
+
+[edgeville_guard_defend]
+id = 7214
+
+[edgeville_guard_attack]
+id = 7218

data/area/misthalin/edgeville/edgeville.combat.toml

@@ -0,0 +1,11 @@
+[guard_edgeville]
+attack_speed = 4
+defend_anim = "edgeville_guard_defend"
+defend_sound = "man_defend"
+death_anim = "edgeville_guard_death"
+death_sound = "man_death"
+
+[guard_edgeville.melee]
+range = 1
+anim = "edgeville_guard_attack"
+target_hit = { offense = "slash", max = 34 }

data/area/misthalin/edgeville/edgeville.drops.toml

@@ -31,3 +31,40 @@ drops = [
     { id = "bones" },
     { id = "ram_skull", variable = "rag_and_bone_man_wish_list", equals = "started", default = "unstarted" },
 ]
+
+[edgeville_guard_drop_table]
+type = "all"
+drops = [
+    { id = "bones" },
+    { table = "edgeville_guard_secondary" },
+    { table = "medium_clue_scroll", roll = 128 },
+]
+
+[edgeville_guard_secondary]
+roll = 128
+drops = [
+    { id = "iron_dagger", chance = 6 },
+    { id = "steel_arrow", chance = 4 },
+    { id = "steel_arrow", amount = 5 },
+    { id = "bronze_arrow", chance = 3 },
+    { id = "bronze_arrow", amount = 2, chance = 2 },
+    { id = "air_rune", amount = 6, chance = 2 },
+    { id = "earth_rune", amount = 3, chance = 2 },
+    { id = "fire_rune", amount = 2, chance = 2 },
+    { id = "nature_rune" },
+    { id = "chaos_rune", min = 1, max = 2 },
+    { id = "blood_rune", min = 1, max = 4, members = true },
+    { id = "coins", chance = 19 },
+    { id = "coins", amount = 4, chance = 8 },
+    { id = "coins", amount = 12, chance = 9 },
+    { id = "coins", amount = 17, chance = 4 },
+    { id = "coins", amount = 25, chance = 4 },
+    { id = "coins", amount = 30 },
+    { id = "law_talisman", members = true },
+    { id = "body_talisman", chance = 3 },
+    { id = "iron_ore" },
+    { id = "grapes", amount = 3, chance = 16 },
+    { id = "grain" },
+    { id = "nothing", amount = 0, chance = 4 },
+    { table = "allotment_seed_drop_table", chance = 18 },
+]

data/area/misthalin/edgeville/edgeville.npcs.toml

@@ -44,20 +44,31 @@ examine = "A holy man."
 
 [guard_edgeville]
 id = 296
+hitpoints = 220
+att = 19
+str = 18
+def = 14
+combat_def = "guard_edgeville"
+drop_table = "edgeville_guard"
+respawn_delay = 50
+categories = ["human"]
 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_edgeville_2]
 id = 297
 clone = "guard_edgeville"
+combat_def  = "guard_edgeville"
 
 [guard_edgeville_3]
 id = 298
 clone = "guard_edgeville"
+combat_def  = "guard_edgeville"
 
 [guard_edgeville_4]
 id = 299
 clone = "guard_edgeville"
+combat_def  = "guard_edgeville"
 
 [doris_edgeville]
 id = 3381

data/area/misthalin/edgeville/stronghold_of_player_safety/stronghold_of_player_safety.ifaces.toml

@@ -0,0 +1,20 @@
+[report_abuse_instructions]
+id = 695
+
+[report_abuse_instructions_2]
+id = 698
+
+[report_abuse_instructions_3]
+id = 701
+
+[report_abuse_instructions_4]
+id = 702
+
+[report_abuse_instructions_5]
+id = 703
+
+[report_abuse_instructions_6]
+id = 706
+
+[report_abuse_instructions_7]
+id = 711

data/area/misthalin/varrock/sewer/varrock_sewer.item-spawns.toml

@@ -14,6 +14,6 @@ spawns = [
   { id = "coins", x = 3088, y = 9899, delay = 100 },
   { id = "bronze_arrow", amount = 3, x = 3130, y = 9903, delay = 100 },
   { id = "bronze_arrow", x = 3135, y = 9916, delay = 100 },
-  { id = "brass_key", x = 3131, y = 9862, delay = 100 },
+  { id = "brass_key", x = 3131, y = 9862, level = 0, delay = 100 },
   { id = "brass_necklace", x = 3122, y = 9881, delay = 100 },
 ]

data/area/wilderness/wilderness.npcs.toml

@@ -85,8 +85,18 @@ fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["
 
 [giant_rat_wilderness]
 id = 4927
+att = 6
+str = 5
+def = 2
 categories = ["rats"]
 examine = "Overgrown vermin."
+hitpoints = 100
+slayer_xp = 10.0
+combat_def = "giant_rat"
+wander_range = 10
+drop_table = "giant_rat"
+categories = ["giant_rats", "rats"]
+examine = "Overgrown vermin."
 
 [black_salamander]
 id = 5116

data/entity/npc/animal/chicken/chicken.sounds.toml

@@ -6,3 +6,6 @@ id = 356
 
 [chicken_attack]
 id = 355
+
+[lay_eggs]
+id = 358

data/entity/npc/animal/rat/rat.npcs.toml

@@ -24,12 +24,12 @@ drop_table = "stronghold_rat"
 
 [stronghold_giant_rat]
 id = 4944
-hitpoints = 50
-att = 2
-str = 3
-def = 2
+hitpoints = 250
+att = 22
+str = 23
+def = 22
 combat_def = "giant_rat"
-slayer_xp = 5.0
+slayer_xp = 25.0
 respawn_delay = 30
 categories = ["rats"]
 drop_table = "stronghold_rat"
@@ -59,18 +59,23 @@ drop_table = "giant_rat"
 categories = ["giant_rats", "rats"]
 examine = "Overgrown vermin."
 
-[giant_rat_brimhaven]
-clone = "giant_rat"
-id = 4926
-
 [giant_rat_dark]
-clone = "giant_rat"
 id = 8828
 att = 6
 str = 5
 def = 2
 hitpoints = 100
 slayer_xp = 10.0
+combat_def = "giant_rat"
+wander_range = 10
+drop_table = "giant_rat"
+categories = ["giant_rats", "rats"]
+examine = "Overgrown vermin."
+
+[giant_rat_brimhaven]
+id = 4926
+categories = ["rats"]
+clone = "giant_rat_dark"
 
 [giant_rat_dark_injured]
 clone = "giant_rat_dark"

data/entity/npc/humanoid/human/human.drops.toml

@@ -24,5 +24,7 @@ drops = [
     { id = "copper_ore", chance = 2 },
     { id = "earth_talisman", chance = 2 },
     { id = "cabbage", chance = 1  },
+    { id = "bronze_med_helm", chance = 2 },
+    { id = "iron_dagger" },
     { table = "herb_drop_table", chance = 23 }
 ]

data/entity/npc/monster/draconic/dragon.drops.toml

@@ -7,6 +7,7 @@ drops = [
 ]
 
 [bronze_dragon_primary]
+type = "all"
 drops = [
   { id = "dragon_bones" },
   { id = "bronze_bar", amount = 5 },
@@ -49,6 +50,7 @@ drops = [
 ]
 
 [iron_dragon_primary]
+type = "all"
 drops = [
   { id = "dragon_bones" },
   { id = "iron_bar", amount = 5 },
@@ -97,6 +99,7 @@ drops = [
 ]
 
 [black_dragon_primary]
+type = "all"
 drops = [
   { id = "dragon_bones" },
   { id = "black_dragonhide" },
@@ -142,6 +145,7 @@ drops = [
 ]
 
 [blue_dragon_primary]
+type = "all"
 drops = [
   { id = "blue_dragonhide" },
   { id = "dragon_bones" },
@@ -182,6 +186,7 @@ drops = [
 ]
 
 [green_dragon_primary]
+type = "all"
 drops = [
   { id = "dragon_bones" },
   { id = "green_dragonhide" },
@@ -221,6 +226,7 @@ drops = [
 ]
 
 [steel_dragon_primary]
+type = "all"
 drops = [
   { id = "dragon_bones" },
   { id = "steel_bar", amount = 5 },
@@ -268,6 +274,7 @@ drops = [
 ]
 
 [red_dragon_primary]
+type = "all"
 drops = [
   { id = "dragon_bones" },
   { id = "red_dragonhide" },

data/entity/npc/monster/draconic/dragons.npcs.toml

@@ -169,7 +169,7 @@ def = 40
 combat_def = "baby_dragon"
 max_hit_slash = 50
 wander_range = 3
-hunt_mode = "aggressive"
+hunt_mode = "cowardly"
 allowed_under = true
 slayer_xp = 50.0
 drop_table = "baby_dragon"
@@ -210,7 +210,7 @@ str = 40
 def = 40
 combat_def = "baby_dragon"
 wander_range = 3
-hunt_mode = "aggressive"
+hunt_mode = "cowardly"
 allowed_under = true
 slayer_xp = 50.0
 drop_table = "baby_dragon"

data/entity/npc/monster/giant/hill_giant/hill_giant.npcs.toml

@@ -5,7 +5,7 @@ att = 18
 str = 22
 def = 26
 combat_def = "hill_giant"
-hunt_mode = "aggressive"
+hunt_mode = "cowardly"
 respawn_delay = 30
 wander_range = 4
 slayer_xp = 35.0