From 4bb44e16a93f923f0ab9e77b33125de914f5754d Mon Sep 17 00:00:00 2001 From: Harley Gilpin Date: Thu, 6 Aug 2026 11:46:08 -0700 Subject: [PATCH 01/13] add scorpion drop tables --- .../reptile/scorpion/scorpion.drops.toml | 11 +++++++++- .../reptile/scorpion/scorpion.npcs.toml | 21 +++++++++++++------ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/data/entity/npc/monster/reptile/scorpion/scorpion.drops.toml b/data/entity/npc/monster/reptile/scorpion/scorpion.drops.toml index a12e5fc6e1..79ea548101 100644 --- a/data/entity/npc/monster/reptile/scorpion/scorpion.drops.toml +++ b/data/entity/npc/monster/reptile/scorpion/scorpion.drops.toml @@ -1,5 +1,14 @@ [scorpion_drop_table] type = "all" drops = [ - { table = "bones" }, + { table = "scorpion_charms", members = true }, +] + +[scorpion_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 2500 }, + { id = "green_charm", chance = 6500 }, + { id = "crimson_charm", chance = 800 }, + { id = "blue_charm", chance = 400 }, ] diff --git a/data/entity/npc/monster/reptile/scorpion/scorpion.npcs.toml b/data/entity/npc/monster/reptile/scorpion/scorpion.npcs.toml index 3c45c900b3..d438a683a4 100644 --- a/data/entity/npc/monster/reptile/scorpion/scorpion.npcs.toml +++ b/data/entity/npc/monster/reptile/scorpion/scorpion.npcs.toml @@ -5,6 +5,7 @@ att = 11 str = 12 def = 11 combat_def = "scorpion" +hunt_mode = "aggressive" respawn_delay = 25 slayer_xp = 17.0 drop_table = "scorpion" @@ -18,8 +19,10 @@ att = 16 str = 17 def = 15 combat_def = "poison_scorpion" +hunt_mode = "aggressive" respawn_delay = 25 slayer_xp = 23.0 +drop_table = "scorpion" categories = ["scorpions"] examine = "It has a very vicious looking tail." @@ -30,9 +33,10 @@ att = 23 str = 23 def = 23 combat_def = "small_scorpion" -hunt_mode = "cowardly" +hunt_mode = "aggressive" respawn_delay = 50 slayer_xp = 32.0 +drop_table = "scorpion" categories = ["scorpions"] examine = "Tiny, annoying, stinging thing." @@ -44,9 +48,10 @@ str = 29 def = 23 combat_def = "king_scorpion" max_hit_stab = 40 -hunt_mode = "cowardly" +hunt_mode = "aggressive" respawn_delay = 25 slayer_xp = 30.0 +drop_table = "scorpion" categories = ["scorpions"] examine = "Wow! Scorpions shouldn't grow that big." @@ -58,8 +63,9 @@ str = 39 def = 34 combat_def = "scorpion" max_hit_stab = 50 -hunt_mode = "cowardly" +hunt_mode = "aggressive" slayer_xp = 30.0 +drop_table = "scorpion" categories = ["scorpions"] examine = "A large angry scorpion." @@ -71,9 +77,10 @@ str = 12 def = 14 combat_def = "small_scorpion" max_hit_stab = 20 -hunt_mode = "cowardly" +hunt_mode = "aggressive" respawn_delay = 50 slayer_xp = 7.0 +drop_table = "scorpion" categories = ["scorpions"] examine = "A vicious, little, stinging thing." @@ -85,9 +92,10 @@ str = 52 def = 50 combat_def = "scorpion" max_hit_stab = 60 -hunt_mode = "cowardly" +hunt_mode = "aggressive" respawn_delay = 22 slayer_xp = 55.0 +drop_table = "scorpion" categories = ["scorpions"] examine = "An extremely vicious scorpion." @@ -99,8 +107,9 @@ str = 32 def = 31 combat_def = "scorpion" max_hit_stab = 40 -hunt_mode = "cowardly" +hunt_mode = "aggressive" respawn_delay = 25 slayer_xp = 37.0 +drop_table = "scorpion" categories = ["scorpions"] examine = "An extremely vicious scorpion." \ No newline at end of file From bf29e98fd2edbd2e7f935b35e4e26dbcb23c8c12 Mon Sep 17 00:00:00 2001 From: Harley Gilpin Date: Thu, 6 Aug 2026 12:41:16 -0700 Subject: [PATCH 02/13] Add missing charm drop tables Compared against rsmod reference: 38 NPC families had no charm drops. Rates from runescape.wiki charm logs (Module:Data/) at 1/100000 precision; cave slime, outlaw, rockslug, unicorn and tzhaar use rsmod rates as no charm log exists. KBD drops charms four at a time. - add charm-only tables for spider, deadly red spider and wolves, which previously dropped nothing - wrap cave_bug, rockslug and tzhaar tables in type = "all" to support charm rolls - remove hobgoblins.drops.toml, stale duplicate of hobgoblin/hobgoblin.drops.toml --- data/area/asgarnia/falador/falador.drops.toml | 12 ++++- .../cockatrice/cockatrice.drops.toml | 10 ++++ .../barbarian_outpost.drops.toml | 11 ++++ data/area/kandarin/ourania/ourania.drops.toml | 12 ++++- .../tzhaar_city/tzhaar_city.drops.toml | 42 +++++++++++++++ .../barbarian_village.drops.toml | 12 ++++- .../catablepon/catablepon.drops.toml | 12 ++++- .../flesh_crawler/flesh_crawler.drops.toml | 12 ++++- .../misthalin/edgeville/edgeville.drops.toml | 13 ++++- .../goblin_mines/goblin_mines.drops.toml | 11 ++++ .../caves/lumbridge_swamp_caves.drops.toml | 1 + .../swamp/lumbridge_swamp.drops.toml | 16 ++++++ .../slayer_tower/gargoyle/gargoyle.drops.toml | 12 ++++- .../infernal_mage/infernal_mage.drops.toml | 12 ++++- .../nechryael/nechryael.drops.toml | 10 ++++ data/entity/npc/animal/cow/cow.drops.toml | 12 ++++- data/entity/npc/animal/wolf/wolf.drops.toml | 47 +++++++++++++++++ data/entity/npc/animal/wolf/wolf.npcs.toml | 11 ++-- .../king_black_dragon.drops.toml | 12 ++++- .../npc/humanoid/dwarf/dwarf.drops.toml | 25 ++++++++- data/entity/npc/humanoid/thug/thug.drops.toml | 12 ++++- .../monster/cave/cave_bug/cave_bug.drops.toml | 19 ++++++- .../cave/cave_crawler/cave_crawler.drops.toml | 13 ++++- .../cave/cave_slime/cave_slime.drops.toml | 10 ++++ .../entity/npc/monster/demon/demon.drops.toml | 22 +++++++- .../giant/hill_giant/hill_giant.drops.toml | 10 ++++ .../giant/moss_giant/moss_giant.drops.toml | 15 +++++- .../npc/monster/goblin/goblin.drops.toml | 15 +++++- .../goblin/hobgoblin/hobgoblin.drops.toml | 13 ++++- .../npc/monster/goblin/hobgoblins.drops.toml | 51 ------------------- .../monster/reptile/spider/spider.drops.toml | 43 +++++++++++++++- .../monster/reptile/spider/spider.npcs.toml | 3 ++ .../crawling_hand/crawling_hand.drops.toml | 10 ++++ .../undead/skeleton/skeleton.drops.toml | 17 ++++++- .../monster/undead/zombie/zombie.drops.toml | 14 ++++- .../earth_warrior/earth_warrior.drops.toml | 12 ++++- 36 files changed, 503 insertions(+), 81 deletions(-) create mode 100644 data/entity/npc/animal/wolf/wolf.drops.toml delete mode 100644 data/entity/npc/monster/goblin/hobgoblins.drops.toml diff --git a/data/area/asgarnia/falador/falador.drops.toml b/data/area/asgarnia/falador/falador.drops.toml index 07c5db6a43..ce35d1e647 100644 --- a/data/area/asgarnia/falador/falador.drops.toml +++ b/data/area/asgarnia/falador/falador.drops.toml @@ -134,6 +134,7 @@ drops = [ { id = "bones" }, { table = "guard_burthorpe_secondary" }, { table = "medium_clue_scroll", roll = 128 }, + { table = "guard_charms", members = true }, ] [guard_burthorpe_secondary] @@ -204,4 +205,13 @@ roll = 20 drops = [ { id = "water_rune", min = 5, max = 10, chance = 19 }, { id = "water_talisman" }, -] \ No newline at end of file +] + +[guard_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 7000 }, + { id = "green_charm", chance = 793 }, + { id = "crimson_charm", chance = 437 }, + { id = "blue_charm", chance = 163 }, +] diff --git a/data/area/fremennik_province/rellekka/fremennik_dungeon/cockatrice/cockatrice.drops.toml b/data/area/fremennik_province/rellekka/fremennik_dungeon/cockatrice/cockatrice.drops.toml index 1aa65c9c2f..10904cb5f7 100644 --- a/data/area/fremennik_province/rellekka/fremennik_dungeon/cockatrice/cockatrice.drops.toml +++ b/data/area/fremennik_province/rellekka/fremennik_dungeon/cockatrice/cockatrice.drops.toml @@ -4,6 +4,7 @@ drops = [ { id = "bones" }, { table = "cockatrice_secondary" }, { table = "cockatrice_tertiary" }, + { table = "cockatrice_charms", members = true }, ] [cockatrice_secondary] @@ -39,3 +40,12 @@ drops = [ { table = "medium_clue_scroll", chance = 7 }, { id = "cockatrice_head" }, ] + +[cockatrice_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 2266 }, + { id = "green_charm", chance = 7365 }, + { id = "crimson_charm", chance = 1174 }, + { id = "blue_charm", chance = 269 }, +] diff --git a/data/area/kandarin/barbarian_outpost/barbarian_outpost.drops.toml b/data/area/kandarin/barbarian_outpost/barbarian_outpost.drops.toml index df62e2836a..20694be4b0 100644 --- a/data/area/kandarin/barbarian_outpost/barbarian_outpost.drops.toml +++ b/data/area/kandarin/barbarian_outpost/barbarian_outpost.drops.toml @@ -4,6 +4,7 @@ drops = [ { id = "bones" }, { table = "barbarian_low_secondary" }, { table = "easy_clue_scroll", roll = 128 }, + { table = "barbarian_charms", members = true }, ] [barbarian_low_secondary] @@ -37,6 +38,7 @@ drops = [ { id = "bones" }, { table = "barbarian_high_secondary" }, { table = "easy_clue_scroll", roll = 128 }, + { table = "barbarian_charms", members = true }, ] [barbarian_high_secondary] @@ -156,3 +158,12 @@ drops = [ { id = "red_egg", amount = 2 }, ] + +[barbarian_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 4213 }, + { id = "green_charm", chance = 1173 }, + { id = "crimson_charm", chance = 267 }, + { id = "blue_charm", chance = 267 }, +] diff --git a/data/area/kandarin/ourania/ourania.drops.toml b/data/area/kandarin/ourania/ourania.drops.toml index a95237cd49..70b839282f 100644 --- a/data/area/kandarin/ourania/ourania.drops.toml +++ b/data/area/kandarin/ourania/ourania.drops.toml @@ -104,5 +104,15 @@ drops = [ type = "all" drops = [ { table = "bones" }, - { table = "monk_of_zamorak_secondary" } + { table = "monk_of_zamorak_secondary" }, + { table = "monk_of_zamorak_charms", members = true }, +] + +[monk_of_zamorak_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 525 }, + { id = "green_charm", chance = 8702 }, + { id = "crimson_charm", chance = 1650 }, + { id = "blue_charm", chance = 525 }, ] diff --git a/data/area/karamja/tzhaar_city/tzhaar_city.drops.toml b/data/area/karamja/tzhaar_city/tzhaar_city.drops.toml index 66f656ce2a..c1efbc086b 100644 --- a/data/area/karamja/tzhaar_city/tzhaar_city.drops.toml +++ b/data/area/karamja/tzhaar_city/tzhaar_city.drops.toml @@ -1,4 +1,11 @@ [tzhaar_hur_drop_table] +type = "all" +drops = [ + { table = "tzhaar_hur_secondary" }, + { table = "tzhaar_charms", members = true }, +] + +[tzhaar_hur_secondary] roll = 512 drops = [ { id = "uncut_sapphire", chance = 2 }, @@ -15,6 +22,13 @@ drops = [ ] [tzhaar_mej_drop_table] +type = "all" +drops = [ + { table = "tzhaar_mej_secondary" }, + { table = "tzhaar_charms", members = true }, +] + +[tzhaar_mej_secondary] roll = 4096 drops = [ { id = "obsidian_cape" }, @@ -33,6 +47,13 @@ drops = [ ] [tzhaar_xil_drop_table] +type = "all" +drops = [ + { table = "tzhaar_xil_secondary" }, + { table = "tzhaar_charms", members = true }, +] + +[tzhaar_xil_secondary] roll = 2048 drops = [ { id = "toktz_xil_ul", min = 10, max = 29, chance = 4 }, @@ -48,6 +69,13 @@ drops = [ ] [tzhaar_ket_drop_table] +type = "all" +drops = [ + { table = "tzhaar_ket_secondary" }, + { table = "tzhaar_charms", members = true }, +] + +[tzhaar_ket_secondary] roll = 2048 drops = [ { id = "tzhaar_ket_om", chance = 4 }, @@ -62,6 +90,13 @@ drops = [ ] [tzhaar_ket_high_drop_table] +type = "all" +drops = [ + { table = "tzhaar_ket_high_secondary" }, + { table = "tzhaar_charms", members = true }, +] + +[tzhaar_ket_high_secondary] roll = 2048 drops = [ { id = "tzhaar_ket_om", chance = 4 }, @@ -75,3 +110,10 @@ drops = [ { id = "tokkul", min = 20, max = 83, chance = 768 }, { id = "nothing", chance = 1096 }, ] + +[tzhaar_charms] +roll = 100000 +drops = [ + { id = "obsidian_charm", chance = 36000 }, + { id = "obsidian_charm", amount = 2, chance = 36000 }, +] diff --git a/data/area/misthalin/barbarian_village/barbarian_village.drops.toml b/data/area/misthalin/barbarian_village/barbarian_village.drops.toml index 694e8b5c02..97d2d6082c 100644 --- a/data/area/misthalin/barbarian_village/barbarian_village.drops.toml +++ b/data/area/misthalin/barbarian_village/barbarian_village.drops.toml @@ -4,6 +4,7 @@ drops = [ { id = "bones" }, { id = "unicorn_horn" }, { table = "unicorn_tertiary" }, + { table = "unicorn_charms", members = true }, ] [unicorn_tertiary] @@ -28,4 +29,13 @@ drops = [ { id = "green_charm", chance = 8695 }, { id = "crimson_charm", chance = 543 }, { id = "blue_charm", chance = 108 }, -] \ No newline at end of file +] + +[unicorn_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 13000 }, + { id = "green_charm", chance = 6000 }, + { id = "crimson_charm", chance = 4000 }, + { id = "blue_charm", chance = 500 }, +] diff --git a/data/area/misthalin/barbarian_village/stronghold_of_security/catablepon/catablepon.drops.toml b/data/area/misthalin/barbarian_village/stronghold_of_security/catablepon/catablepon.drops.toml index 3ce12b6f20..1cd482889a 100644 --- a/data/area/misthalin/barbarian_village/stronghold_of_security/catablepon/catablepon.drops.toml +++ b/data/area/misthalin/barbarian_village/stronghold_of_security/catablepon/catablepon.drops.toml @@ -4,6 +4,7 @@ drops = [ { table = "bones" }, { table = "catablepon_secondary" }, { table = "medium_clue_scroll", roll = 101 }, + { table = "catablepon_charms", members = true }, ] [catablepon_secondary] @@ -30,4 +31,13 @@ drops = [ { id = "unlit_torch", chance = 9, members = true }, { id = "top_of_sceptre", chance = 3 }, { table = "gem_drop_table", chance = 2 }, -] \ No newline at end of file +] + +[catablepon_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 19020 }, + { id = "green_charm", chance = 1372 }, + { id = "crimson_charm", chance = 2330 }, + { id = "blue_charm", chance = 319 }, +] diff --git a/data/area/misthalin/barbarian_village/stronghold_of_security/flesh_crawler/flesh_crawler.drops.toml b/data/area/misthalin/barbarian_village/stronghold_of_security/flesh_crawler/flesh_crawler.drops.toml index 7d301bb174..f63131797f 100644 --- a/data/area/misthalin/barbarian_village/stronghold_of_security/flesh_crawler/flesh_crawler.drops.toml +++ b/data/area/misthalin/barbarian_village/stronghold_of_security/flesh_crawler/flesh_crawler.drops.toml @@ -2,6 +2,7 @@ type = "all" drops = [ { table = "flesh_crawler_secondary" }, + { table = "flesh_crawler_charms", members = true }, ] [flesh_crawler_secondary] @@ -23,4 +24,13 @@ drops = [ { id = "nothing", chance = 56, members = false }, { table = "herb_drop_table", chance = 35, members = true }, { table = "gem_drop_table", chance = 2 }, -] \ No newline at end of file +] + +[flesh_crawler_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 4114 }, + { id = "green_charm", chance = 5957 }, + { id = "crimson_charm", chance = 736 }, + { id = "blue_charm", chance = 264 }, +] diff --git a/data/area/misthalin/edgeville/edgeville.drops.toml b/data/area/misthalin/edgeville/edgeville.drops.toml index 7056687f29..a87d883ea0 100644 --- a/data/area/misthalin/edgeville/edgeville.drops.toml +++ b/data/area/misthalin/edgeville/edgeville.drops.toml @@ -4,6 +4,7 @@ drops = [ { id = "bones" }, { id = "rats_paper" }, { table = "outlaw_secondary" }, + { table = "outlaw_charms", members = true }, ] [outlaw_secondary] @@ -38,6 +39,7 @@ drops = [ { id = "bones" }, { table = "edgeville_guard_secondary" }, { table = "medium_clue_scroll", roll = 128 }, + { table = "guard_charms", members = true }, ] [edgeville_guard_secondary] @@ -67,4 +69,13 @@ drops = [ { id = "grain" }, { id = "nothing", amount = 0, chance = 4 }, { table = "allotment_seed_drop_table", chance = 18 }, -] \ No newline at end of file +] + +[outlaw_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 36000 }, + { id = "green_charm", chance = 3000 }, + { id = "crimson_charm", chance = 3000 }, + { id = "blue_charm", chance = 700 }, +] diff --git a/data/area/misthalin/lumbridge/cellar/goblin_mines/goblin_mines.drops.toml b/data/area/misthalin/lumbridge/cellar/goblin_mines/goblin_mines.drops.toml index 13081c4097..98bce2a3c4 100644 --- a/data/area/misthalin/lumbridge/cellar/goblin_mines/goblin_mines.drops.toml +++ b/data/area/misthalin/lumbridge/cellar/goblin_mines/goblin_mines.drops.toml @@ -4,6 +4,7 @@ drops = [ { id = "bones" }, { table = "cave_goblin_guard_secondary" }, { table = "cave_goblin_guard_tertiary" }, + { table = "cave_goblin_charms", members = true }, ] [cave_goblin_guard_secondary] @@ -31,6 +32,7 @@ drops = [ { id = "bones" }, { table = "cave_goblin_miner_secondary" }, { table = "cave_goblin_miner_tertiary" }, + { table = "cave_goblin_charms", members = true }, ] [cave_goblin_miner_secondary] @@ -50,3 +52,12 @@ roll = 4 drops = [ { id = "cave_goblin_skull", variable = "rag_and_bone_man_wish_list", equals = "started", default = "unstarted" }, ] + +[cave_goblin_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 6550 }, + { id = "green_charm", chance = 2476 }, + { id = "crimson_charm", chance = 2849 }, + { id = "blue_charm", chance = 1198 }, +] diff --git a/data/area/misthalin/lumbridge/swamp/caves/lumbridge_swamp_caves.drops.toml b/data/area/misthalin/lumbridge/swamp/caves/lumbridge_swamp_caves.drops.toml index 343f078309..6f6aafc9aa 100644 --- a/data/area/misthalin/lumbridge/swamp/caves/lumbridge_swamp_caves.drops.toml +++ b/data/area/misthalin/lumbridge/swamp/caves/lumbridge_swamp_caves.drops.toml @@ -4,6 +4,7 @@ drops = [ { id = "bones" }, { table = "cave_goblin_monster_secondary" }, { table = "cave_goblin_monster_tertiary" }, + { table = "cave_goblin_charms", members = true }, ] [cave_goblin_monster_secondary] diff --git a/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.drops.toml b/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.drops.toml index 919d694594..9bc57310fd 100644 --- a/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.drops.toml +++ b/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.drops.toml @@ -1,4 +1,11 @@ [rockslug_drop_table] +type = "all" +drops = [ + { table = "rockslug_secondary" }, + { table = "rockslug_charms", members = true }, +] + +[rockslug_secondary] roll = 512 drops = [ { id = "mystic_gloves_light" }, @@ -16,3 +23,12 @@ drops = [ { id = "hammer", chance = 40 }, { table = "gem_drop_table", chance = 24 }, ] + +[rockslug_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 9000 }, + { id = "green_charm", chance = 2000 }, + { id = "crimson_charm", chance = 1000 }, + { id = "blue_charm", chance = 500 }, +] diff --git a/data/area/morytania/slayer_tower/gargoyle/gargoyle.drops.toml b/data/area/morytania/slayer_tower/gargoyle/gargoyle.drops.toml index fa1771eee5..12b26dc278 100644 --- a/data/area/morytania/slayer_tower/gargoyle/gargoyle.drops.toml +++ b/data/area/morytania/slayer_tower/gargoyle/gargoyle.drops.toml @@ -4,6 +4,7 @@ drops = [ { table = "gargoyle_secondary" }, { table = "hard_clue_scroll", roll = 128 }, + { table = "gargoyle_charms", members = true }, ] [gargoyle_secondary] @@ -31,4 +32,13 @@ drops = [ { id = "coins", min = 500, max = 1000, chance = 80 }, { id = "coins", amount = 10000, chance = 20 }, { table = "gem_drop_table", chance = 20 }, -] \ No newline at end of file +] + +[gargoyle_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 9565 }, + { id = "green_charm", chance = 4798 }, + { id = "crimson_charm", chance = 4881 }, + { id = "blue_charm", chance = 6989 }, +] diff --git a/data/area/morytania/slayer_tower/infernal_mage/infernal_mage.drops.toml b/data/area/morytania/slayer_tower/infernal_mage/infernal_mage.drops.toml index d83cf4819c..4d32464d3b 100644 --- a/data/area/morytania/slayer_tower/infernal_mage/infernal_mage.drops.toml +++ b/data/area/morytania/slayer_tower/infernal_mage/infernal_mage.drops.toml @@ -3,6 +3,7 @@ type = "all" drops = [ { id = "bones" }, { table = "infernal_mage_secondary" }, + { table = "infernal_mage_charms", members = true }, ] [infernal_mage_secondary] @@ -31,4 +32,13 @@ drops = [ { id = "coins", amount = 4, chance = 63 }, { id = "coins", amount = 29, chance = 21 }, { id = "nothing", chance = 112 }, -] \ No newline at end of file +] + +[infernal_mage_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 32864 }, + { id = "green_charm", chance = 2767 }, + { id = "crimson_charm", chance = 2518 }, + { id = "blue_charm", chance = 606 }, +] diff --git a/data/area/morytania/slayer_tower/nechryael/nechryael.drops.toml b/data/area/morytania/slayer_tower/nechryael/nechryael.drops.toml index 9a6577f5b0..84c7e7ea2a 100644 --- a/data/area/morytania/slayer_tower/nechryael/nechryael.drops.toml +++ b/data/area/morytania/slayer_tower/nechryael/nechryael.drops.toml @@ -3,6 +3,7 @@ type = "all" drops = [ { table = "nechryael_secondary" }, { table = "hard_clue_scroll", roll = 128 }, + { table = "nechryael_charms", members = true }, ] [nechryael_secondary] @@ -35,3 +36,12 @@ type = "all" drops = [ { id = "ashes" }, ] + +[nechryael_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 8836 }, + { id = "green_charm", chance = 4369 }, + { id = "crimson_charm", chance = 30473 }, + { id = "blue_charm", chance = 1031 }, +] diff --git a/data/entity/npc/animal/cow/cow.drops.toml b/data/entity/npc/animal/cow/cow.drops.toml index 4deb21d4d7..e9e94199fe 100644 --- a/data/entity/npc/animal/cow/cow.drops.toml +++ b/data/entity/npc/animal/cow/cow.drops.toml @@ -2,7 +2,8 @@ type = "all" drops = [ { table = "cow_primary" }, - { table = "easy_clue_scroll", roll = 128 } + { table = "easy_clue_scroll", roll = 128 }, + { table = "cow_charms", members = true }, ] [cow_primary] @@ -12,3 +13,12 @@ drops = [ { id = "raw_beef" }, { id = "bones" } ] + +[cow_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 856 }, + { id = "green_charm", chance = 3892 }, + { id = "crimson_charm", chance = 226 }, + { id = "blue_charm", chance = 49 }, +] diff --git a/data/entity/npc/animal/wolf/wolf.drops.toml b/data/entity/npc/animal/wolf/wolf.drops.toml new file mode 100644 index 0000000000..a7fc108379 --- /dev/null +++ b/data/entity/npc/animal/wolf/wolf.drops.toml @@ -0,0 +1,47 @@ +[wolf_drop_table] +type = "all" +drops = [ + { id = "wolf_bones" }, + { table = "wolf_charms", members = true }, +] + +[wolf_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 32008 }, + { id = "green_charm", chance = 2813 }, + { id = "crimson_charm", chance = 3395 }, + { id = "blue_charm", chance = 388 }, +] + +[white_wolf_drop_table] +type = "all" +drops = [ + { id = "wolf_bones" }, + { table = "white_wolf_charms", members = true }, +] + +[white_wolf_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 9845 }, + { id = "green_charm", chance = 3849 }, + { id = "crimson_charm", chance = 12879 }, + { id = "blue_charm", chance = 370 }, +] + +[big_wolf_drop_table] +type = "all" +drops = [ + { id = "wolf_bones" }, + { table = "big_wolf_charms", members = true }, +] + +[big_wolf_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 9033 }, + { id = "green_charm", chance = 6143 }, + { id = "crimson_charm", chance = 15808 }, + { id = "blue_charm", chance = 813 }, +] diff --git a/data/entity/npc/animal/wolf/wolf.npcs.toml b/data/entity/npc/animal/wolf/wolf.npcs.toml index 5f7f92a05e..41690fca67 100644 --- a/data/entity/npc/animal/wolf/wolf.npcs.toml +++ b/data/entity/npc/animal/wolf/wolf.npcs.toml @@ -10,7 +10,7 @@ slayer_xp = 69.0 hunt_mode = "aggressive" respawn_delay = 90 categories = ["wolves"] -drop_table = "wolf_bones" +drop_table = "wolf" examine = "Not man's best friend." [white_wolf] @@ -24,7 +24,7 @@ slayer_xp = 34.0 hunt_mode = "aggressive" respawn_delay = 90 categories = ["wolves"] -drop_table = "wolf_bones" +drop_table = "white_wolf" examine = "A vicious mountain wolf." [white_wolf_level_38] @@ -39,7 +39,7 @@ slayer_xp = 44.0 hunt_mode = "aggressive" respawn_delay = 90 categories = ["wolves"] -drop_table = "wolf_bones" +drop_table = "white_wolf" examine = "A vicious mountain wolf." [big_wolf] @@ -54,6 +54,7 @@ hunt_mode = "cowardly" slayer_xp = 74.0 categories = ["wolves"] respawn_delay = 90 +drop_table = "big_wolf" examine = "Must be the pack leader." [wolf_stronghold_of_security] @@ -66,6 +67,7 @@ def = 10 max_hit_stab = 20 slayer_xp = 10.0 hunt_mode = "" +drop_table = "white_wolf" [wolf_stronghold_of_security_2] clone = "wolf" @@ -77,6 +79,7 @@ def = 10 max_hit_stab = 30 slayer_xp = 15.0 hunt_mode = "" +drop_table = "white_wolf" [big_wolf_2] clone = "wolf" @@ -86,6 +89,7 @@ att = 60 str = 61 def = 62 max_hit_stab = 70 +drop_table = "big_wolf" examine = "Must be the pack leader." [wolf_2] @@ -97,4 +101,5 @@ str = 16 def = 22 max_hit_stab = 30 slayer_xp = 34.0 +drop_table = "white_wolf" examine = "A social killer." \ No newline at end of file diff --git a/data/entity/npc/boss/king_black_dragon/king_black_dragon.drops.toml b/data/entity/npc/boss/king_black_dragon/king_black_dragon.drops.toml index e7bafa82ec..81620b8835 100644 --- a/data/entity/npc/boss/king_black_dragon/king_black_dragon.drops.toml +++ b/data/entity/npc/boss/king_black_dragon/king_black_dragon.drops.toml @@ -3,7 +3,8 @@ type = "all" drops = [ { table = "king_black_dragon_primary" }, { table = "king_black_dragon_secondary" }, - { table = "king_black_dragon_tertiary" } + { table = "king_black_dragon_tertiary" }, + { table = "king_black_dragon_charms", members = true }, ] [king_black_dragon_primary] @@ -55,3 +56,12 @@ drops = [ { table = "elite_clue_scroll", chance = 4 }, { table = "hard_clue_scroll" } ] + +[king_black_dragon_charms] +roll = 100000 +drops = [ + { id = "gold_charm", amount = 4, chance = 5741 }, + { id = "green_charm", amount = 4, chance = 4294 }, + { id = "crimson_charm", amount = 4, chance = 62756 }, + { id = "blue_charm", amount = 4, chance = 949 }, +] diff --git a/data/entity/npc/humanoid/dwarf/dwarf.drops.toml b/data/entity/npc/humanoid/dwarf/dwarf.drops.toml index b7c90d1511..7d499ec052 100644 --- a/data/entity/npc/humanoid/dwarf/dwarf.drops.toml +++ b/data/entity/npc/humanoid/dwarf/dwarf.drops.toml @@ -3,7 +3,8 @@ type = "all" drops = [ { table = "bones" }, { table = "dwarf_secondary" }, - { table = "easy_clue_scroll", roll = 100 } + { table = "easy_clue_scroll", roll = 100 }, + { table = "dwarf_charms", members = true }, ] [dwarf_hammer_drop_table] @@ -11,6 +12,7 @@ type = "all" drops = [ { table = "bones" }, { table = "dwarf_secondary" }, + { table = "dwarf_charms", members = true }, ] [dwarf_secondary] @@ -43,6 +45,7 @@ type = "all" drops = [ { id = "bones" }, { table = "black_knight_secondary" }, + { table = "chaos_dwarf_charms", members = true }, ] [chaos_dwarf_secondary] @@ -72,4 +75,22 @@ drops = [ { id = "mithril_bar", chance = 6 }, { id = "tomato" }, { table = "gem_drop_table", chance = 5 }, -] \ No newline at end of file +] + +[dwarf_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 3785 }, + { id = "green_charm", chance = 1856 }, + { id = "crimson_charm", chance = 2984 }, + { id = "blue_charm", chance = 586 }, +] + +[chaos_dwarf_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 9562 }, + { id = "green_charm", chance = 4722 }, + { id = "crimson_charm", chance = 2388 }, + { id = "blue_charm", chance = 2396 }, +] diff --git a/data/entity/npc/humanoid/thug/thug.drops.toml b/data/entity/npc/humanoid/thug/thug.drops.toml index ad523472e3..6a8bd98de5 100644 --- a/data/entity/npc/humanoid/thug/thug.drops.toml +++ b/data/entity/npc/humanoid/thug/thug.drops.toml @@ -4,6 +4,7 @@ drops = [ { id = "bones" }, { table = "thug_secondary" }, { table = "easy_clue_scroll", roll = 128 }, + { table = "thug_charms", members = true }, ] [thug_secondary] @@ -26,4 +27,13 @@ drops = [ { id = "coins", amount = 30, chance = 2 }, { id = "coins", amount = 20 }, { id = "nothing", amount = 0, chance = 30 }, -] \ No newline at end of file +] + +[thug_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 11508 }, + { id = "green_charm", chance = 771 }, + { id = "crimson_charm", chance = 643 }, + { id = "blue_charm", chance = 338 }, +] diff --git a/data/entity/npc/monster/cave/cave_bug/cave_bug.drops.toml b/data/entity/npc/monster/cave/cave_bug/cave_bug.drops.toml index 633eb7a906..70d3953525 100644 --- a/data/entity/npc/monster/cave/cave_bug/cave_bug.drops.toml +++ b/data/entity/npc/monster/cave/cave_bug/cave_bug.drops.toml @@ -1,4 +1,11 @@ [cave_bug_drop_table] +type = "all" +drops = [ + { table = "cave_bug_primary" }, + { table = "cave_bug_charms", members = true }, +] + +[cave_bug_primary] roll = 128 drops = [ { id = "earth_rune", amount = 6, chance = 2 }, @@ -25,6 +32,7 @@ type = "all" drops = [ { table = "cave_bug_secondary" }, { table = "easy_clue_scroll", roll = 128 }, + { table = "cave_bug_charms", members = true }, ] [cave_bug_secondary] @@ -42,4 +50,13 @@ drops = [ { id = "swamp_weed", min = 1, max = 4, chance = 31 }, { id = "swamp_weed", min = 5, max = 8, chance = 10 }, { table = "gem_drop_table", chance = 5 }, -] \ No newline at end of file +] + +[cave_bug_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 6576 }, + { id = "green_charm", chance = 36614 }, + { id = "crimson_charm", chance = 3521 }, + { id = "blue_charm", chance = 806 }, +] diff --git a/data/entity/npc/monster/cave/cave_crawler/cave_crawler.drops.toml b/data/entity/npc/monster/cave/cave_crawler/cave_crawler.drops.toml index 2a5c734509..b8c72d6e4d 100644 --- a/data/entity/npc/monster/cave/cave_crawler/cave_crawler.drops.toml +++ b/data/entity/npc/monster/cave/cave_crawler/cave_crawler.drops.toml @@ -2,6 +2,7 @@ type = "all" drops = [ { table = "cave_crawler_secondary" }, + { table = "cave_crawler_charms", members = true }, ] [cave_crawler_secondary] @@ -32,6 +33,7 @@ drops = [ type = "all" drops = [ { table = "cave_crawler_pollnivneach_secondary" }, + { table = "cave_crawler_charms", members = true }, ] [cave_crawler_pollnivneach_secondary] @@ -56,4 +58,13 @@ drops = [ { id = "nothing", amount = 0, chance = 55 }, { table = "gem_drop_table", chance = 2 }, { table = "rare_drop_table" }, -] \ No newline at end of file +] + +[cave_crawler_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 9269 }, + { id = "green_charm", chance = 2863 }, + { id = "crimson_charm", chance = 1071 }, + { id = "blue_charm", chance = 446 }, +] diff --git a/data/entity/npc/monster/cave/cave_slime/cave_slime.drops.toml b/data/entity/npc/monster/cave/cave_slime/cave_slime.drops.toml index 11089c6adf..ae92830b14 100644 --- a/data/entity/npc/monster/cave/cave_slime/cave_slime.drops.toml +++ b/data/entity/npc/monster/cave/cave_slime/cave_slime.drops.toml @@ -4,6 +4,7 @@ drops = [ { table = "cave_slime_primary" }, { table = "cave_slime_secondary" }, { table = "easy_clue_scroll", roll = 128 }, + { table = "cave_slime_charms", members = true }, ] [cave_slime_primary] @@ -32,3 +33,12 @@ drops = [ { table = "gem_drop_table", chance = 4 }, ] + +[cave_slime_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 9000 }, + { id = "green_charm", chance = 2000 }, + { id = "crimson_charm", chance = 1000 }, + { id = "blue_charm", chance = 500 }, +] diff --git a/data/entity/npc/monster/demon/demon.drops.toml b/data/entity/npc/monster/demon/demon.drops.toml index 8a0adc7f9c..0448996585 100644 --- a/data/entity/npc/monster/demon/demon.drops.toml +++ b/data/entity/npc/monster/demon/demon.drops.toml @@ -4,6 +4,7 @@ drops = [ { id = "ashes" }, { table = "lesser_demon_secondary" }, { table = "lesser_demon_tertiary" }, + { table = "lesser_demon_charms", members = true }, ] [lesser_demon_secondary] @@ -42,6 +43,7 @@ type = "all" drops = [ { table = "greater_demon_secondary" }, { table = "hard_clue_scroll", roll = 128 }, + { table = "greater_demon_charms", members = true }, ] [greater_demon_secondary] @@ -110,4 +112,22 @@ drops = [ { id = "green_charm", chance = 11161 }, { id = "crimson_charm", chance = 44644 }, { id = "blue_charm", chance = 1488 }, -] \ No newline at end of file +] + +[lesser_demon_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 1808 }, + { id = "green_charm", chance = 771 }, + { id = "crimson_charm", chance = 2866 }, + { id = "blue_charm", chance = 612 }, +] + +[greater_demon_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 6932 }, + { id = "green_charm", chance = 3785 }, + { id = "crimson_charm", chance = 26191 }, + { id = "blue_charm", chance = 924 }, +] diff --git a/data/entity/npc/monster/giant/hill_giant/hill_giant.drops.toml b/data/entity/npc/monster/giant/hill_giant/hill_giant.drops.toml index 969dca86ea..dc840cad1d 100644 --- a/data/entity/npc/monster/giant/hill_giant/hill_giant.drops.toml +++ b/data/entity/npc/monster/giant/hill_giant/hill_giant.drops.toml @@ -4,6 +4,7 @@ drops = [ { id = "big_bones" }, { table = "hill_giant_secondary" }, { table = "hill_giant_tertiary" }, + { table = "hill_giant_charms", members = true }, ] [hill_giant_secondary] @@ -46,3 +47,12 @@ drops = [ { id = "giant_champions_scroll", members = true }, { id = "curved_bone", members = true }, ] + +[hill_giant_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 14387 }, + { id = "green_charm", chance = 907 }, + { id = "crimson_charm", chance = 1195 }, + { id = "blue_charm", chance = 164 }, +] diff --git a/data/entity/npc/monster/giant/moss_giant/moss_giant.drops.toml b/data/entity/npc/monster/giant/moss_giant/moss_giant.drops.toml index 4f5c5a853e..a2ce30f4cb 100644 --- a/data/entity/npc/monster/giant/moss_giant/moss_giant.drops.toml +++ b/data/entity/npc/monster/giant/moss_giant/moss_giant.drops.toml @@ -4,6 +4,7 @@ drops = [ { id = "big_bones" }, { table = "moss_giant_secondary" }, { table = "moss_giant_tertiary", members = true }, + { table = "moss_giant_charms", members = true }, ] [moss_giant_secondary] @@ -52,5 +53,15 @@ drops = [ type = "all" drops = [ { id = "big_bones" }, - { id = "consecration_seed" } -] \ No newline at end of file + { id = "consecration_seed" }, + { table = "moss_giant_charms", members = true }, +] + +[moss_giant_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 33254 }, + { id = "green_charm", chance = 2780 }, + { id = "crimson_charm", chance = 2495 }, + { id = "blue_charm", chance = 524 }, +] diff --git a/data/entity/npc/monster/goblin/goblin.drops.toml b/data/entity/npc/monster/goblin/goblin.drops.toml index 1715750e43..81b40782b3 100644 --- a/data/entity/npc/monster/goblin/goblin.drops.toml +++ b/data/entity/npc/monster/goblin/goblin.drops.toml @@ -2,7 +2,8 @@ type = "all" drops = [ { table = "bones" }, - { table = "goblin_secondary" } + { table = "goblin_secondary" }, + { table = "goblin_charms", members = true }, ] [goblin_secondary] @@ -35,6 +36,7 @@ drops = [ { table = "bones" }, { table = "stronghold_goblin_secondary" }, { table = "stronghold_goblin_tertiary" }, + { table = "goblin_charms", members = true }, ] [stronghold_goblin_secondary] @@ -70,4 +72,13 @@ roll = 5000 drops = [ { id = "clue_scroll_easy", lacks = "clue_scroll_easy*", chance = 39 }, { id = "goblin_champions_scroll", members = true, lacks = "goblin_champions_scroll" }, -] \ No newline at end of file +] + +[goblin_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 9657 }, + { id = "green_charm", chance = 378 }, + { id = "crimson_charm", chance = 930 }, + { id = "blue_charm", chance = 142 }, +] diff --git a/data/entity/npc/monster/goblin/hobgoblin/hobgoblin.drops.toml b/data/entity/npc/monster/goblin/hobgoblin/hobgoblin.drops.toml index 1fd73991a9..18ebc99cda 100644 --- a/data/entity/npc/monster/goblin/hobgoblin/hobgoblin.drops.toml +++ b/data/entity/npc/monster/goblin/hobgoblin/hobgoblin.drops.toml @@ -4,6 +4,7 @@ drops = [ { id = "bones" }, { table = "hobgoblin_secondary" }, { table = "hobgoblin_tertiary" }, + { table = "hobgoblin_charms", members = true }, ] [hobgoblin_secondary] @@ -56,6 +57,7 @@ drops = [ { id = "bones" }, { table = "hobgoblin_armed_secondary" }, { table = "hobgoblin_tertiary" }, + { table = "hobgoblin_charms", members = true }, ] [hobgoblin_armed_secondary] @@ -86,4 +88,13 @@ drops = [ { id = "goblin_mail", chance = 5 }, { id = "nothing", amount = 0, chance = 2 }, { table = "gem_drop_table", chance = 2 }, -] \ No newline at end of file +] + +[hobgoblin_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 15988 }, + { id = "green_charm", chance = 493 }, + { id = "crimson_charm", chance = 966 }, + { id = "blue_charm", chance = 150 }, +] diff --git a/data/entity/npc/monster/goblin/hobgoblins.drops.toml b/data/entity/npc/monster/goblin/hobgoblins.drops.toml deleted file mode 100644 index d0ce12fe1e..0000000000 --- a/data/entity/npc/monster/goblin/hobgoblins.drops.toml +++ /dev/null @@ -1,51 +0,0 @@ -[hobgoblin_drop_table] -type = "all" -drops = [ - { table = "bones" }, - { table = "hobgoblin_secondary" }, - { table = "hobgoblin_tertiary" }, -] - -[hobgoblin_secondary] -roll = 128 -drops = [ - { id = "bronze_spear", chance = 3, members = true }, - { id = "iron_sword", chance = 3 }, - { id = "steel_dagger", chance = 3 }, - { id = "iron_spear", chance = 2, members = true }, - { id = "steel_spear", chance = 2, members = true }, - { id = "steel_longsword" }, - { id = "law_rune", amount = 2, chance = 3 }, - { id = "water_rune", amount = 2, chance = 2 }, - { id = "fire_rune", amount = 7, chance = 2 }, - { id = "body_rune", amount = 6, chance = 2 }, - { id = "chaos_rune", amount = 3, chance = 2 }, - { id = "nature_rune", amount = 4, chance = 2 }, - { id = "cosmic_rune", amount = 2 }, - { table = "herb_drop_table", chance = 7 }, - { table = "allotment_seed_drop_table", chance = 18 }, - { id = "coins", amount = 5, chance = 18, members = false }, - { id = "coins", amount = 15, chance = 16 }, - { id = "coins", amount = 28, chance = 16 }, - { id = "coins", amount = 5, chance = 12 }, - { id = "coins", amount = 10, chance = 7, members = false }, - { id = "coins", amount = 62, chance = 4 }, - { id = "coins", amount = 42, chance = 3 }, - { id = "coins" }, - { id = "trading_sticks" }, - { id = "trading_sticks", amount = 5, chance = 12 }, - { id = "trading_sticks", amount = 15, chance = 16 }, - { id = "trading_sticks", amount = 28, chance = 16 }, - { id = "trading_sticks", amount = 42, chance = 3 }, - { id = "trading_sticks", amount = 62, chance = 4 }, - { id = "limpwurt_root", chance = 22 }, - { id = "goblin_mail", chance = 5 }, - { id = "nothing", amount = 0 }, - { table = "gem_drop_table", chance = 2 }, -] - -[hobgoblin_tertiary] -roll = 5000 -drops = [ - { id = "hobgoblin_champions_scroll", members = true }, -] \ No newline at end of file diff --git a/data/entity/npc/monster/reptile/spider/spider.drops.toml b/data/entity/npc/monster/reptile/spider/spider.drops.toml index c5ae7f1137..25f1475cd2 100644 --- a/data/entity/npc/monster/reptile/spider/spider.drops.toml +++ b/data/entity/npc/monster/reptile/spider/spider.drops.toml @@ -1,7 +1,8 @@ [giant_spider_drop_table] type = "all" drops = [ - { table = "giant_spider_secondary"} + { table = "giant_spider_secondary"}, + { table = "giant_spider_charms", members = true }, ] [giant_spider_secondary] @@ -28,4 +29,42 @@ drops = [ { id = "coins", amount = 5, chance = 28 }, { id = "coins", amount = 15, chance = 3 }, { id = "coins", amount = 20, chance = 2 }, -] \ No newline at end of file +] +[spider_drop_table] +type = "all" +drops = [ + { table = "spider_charms", members = true }, +] + +[spider_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 2065 }, + { id = "green_charm", chance = 3252 }, + { id = "crimson_charm", chance = 1342 }, + { id = "blue_charm", chance = 1446 }, +] + +[deadly_red_spider_drop_table] +type = "all" +drops = [ + { table = "deadly_red_spider_charms", members = true }, +] + +[deadly_red_spider_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 25063 }, + { id = "green_charm", chance = 932 }, + { id = "crimson_charm", chance = 1605 }, + { id = "blue_charm", chance = 149 }, +] + +[giant_spider_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 8549 }, + { id = "green_charm", chance = 819 }, + { id = "crimson_charm", chance = 2391 }, + { id = "blue_charm", chance = 655 }, +] diff --git a/data/entity/npc/monster/reptile/spider/spider.npcs.toml b/data/entity/npc/monster/reptile/spider/spider.npcs.toml index 64409eedaf..7e74ab2749 100644 --- a/data/entity/npc/monster/reptile/spider/spider.npcs.toml +++ b/data/entity/npc/monster/reptile/spider/spider.npcs.toml @@ -5,6 +5,7 @@ attack_bonus = -35 respawn_delay = 35 slayer_xp = 2.0 combat_def = "spider" +drop_table = "spider" max_hit_stab = 1 categories = ["spiders"] height = 10 @@ -64,6 +65,7 @@ att = 30 str = 25 def = 30 combat_def = "giant_spider_hard" +drop_table = "deadly_red_spider" respawn_delay = 30 slayer_xp = 35.0 categories = ["giant_spiders", "spiders"] @@ -95,6 +97,7 @@ str = 21 def = 21 attack_bonus = 35 combat_def = "spider_stronghold_of_security" +drop_table = "spider" hunt_mode = "cowardly" respawn_delay = 27 slayer_xp = 22.0 diff --git a/data/entity/npc/monster/undead/crawling_hand/crawling_hand.drops.toml b/data/entity/npc/monster/undead/crawling_hand/crawling_hand.drops.toml index 11bbc76ecb..fae24d9925 100644 --- a/data/entity/npc/monster/undead/crawling_hand/crawling_hand.drops.toml +++ b/data/entity/npc/monster/undead/crawling_hand/crawling_hand.drops.toml @@ -4,6 +4,7 @@ drops = [ { table = "bones" }, { table = "crawling_hand_secondary" }, { table = "crawling_hand_tertiary" }, + { table = "crawling_hand_charms", members = true }, ] [crawling_hand_secondary] @@ -27,3 +28,12 @@ roll = 500 drops = [ { id = "crawling_hand", chance = 1 }, ] + +[crawling_hand_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 9450 }, + { id = "green_charm", chance = 624 }, + { id = "crimson_charm", chance = 660 }, + { id = "blue_charm", chance = 128 }, +] diff --git a/data/entity/npc/monster/undead/skeleton/skeleton.drops.toml b/data/entity/npc/monster/undead/skeleton/skeleton.drops.toml index e56a7bb48d..c880d9b9bc 100644 --- a/data/entity/npc/monster/undead/skeleton/skeleton.drops.toml +++ b/data/entity/npc/monster/undead/skeleton/skeleton.drops.toml @@ -1,7 +1,8 @@ [skeleton_drop_table] type = "all" drops = [ - { table = "bones" } + { table = "bones" }, + { table = "skeleton_charms", members = true }, ] [skeleton_unarmed_drop_table] @@ -10,6 +11,7 @@ drops = [ { id = "bones" }, { table = "skeleton_unarmed_secondary" }, { table = "skeleton_tertiary" }, + { table = "skeleton_charms", members = true }, ] [skeleton_unarmed_secondary] @@ -46,6 +48,7 @@ drops = [ { id = "bones" }, { table = "skeleton_armed_secondary" }, { table = "skeleton_tertiary" }, + { table = "skeleton_charms", members = true }, ] [skeleton_armed_secondary] @@ -78,6 +81,7 @@ type = "all" drops = [ { id = "bones"}, { table = "skeleton_catacombs_secondary" }, + { table = "skeleton_charms", members = true }, ] [skeleton_catacombs_secondary] @@ -125,4 +129,13 @@ drops = [ roll = 5000 drops = [ { id = "skeleton_champions_scroll", members = true, lacks = "skeleton_champions_scroll" }, -] \ No newline at end of file +] + +[skeleton_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 5286 }, + { id = "green_charm", chance = 853 }, + { id = "crimson_charm", chance = 2472 }, + { id = "blue_charm", chance = 1023 }, +] diff --git a/data/entity/npc/monster/undead/zombie/zombie.drops.toml b/data/entity/npc/monster/undead/zombie/zombie.drops.toml index 992f0b5b59..f2250228bb 100644 --- a/data/entity/npc/monster/undead/zombie/zombie.drops.toml +++ b/data/entity/npc/monster/undead/zombie/zombie.drops.toml @@ -26,6 +26,7 @@ type = "all" drops = [ { table = "bones" }, { table = "zombie_secondary", roll = 128 }, + { table = "zombie_charms", members = true }, ] [zombie_secondary] @@ -63,6 +64,7 @@ type = "all" drops = [ { table = "bones" }, { table = "zombie_armed_secondary" }, + { table = "zombie_charms", members = true }, ] [zombie_armed_secondary] @@ -97,6 +99,7 @@ type = "all" drops = [ { table = "bones" }, { id = "key_blue" }, + { table = "zombie_charms", members = true }, ] [zombie_tarns_lair_low_drop_table] @@ -251,4 +254,13 @@ drops = [ { id = "adamant_bar" }, { id = "pot_of_cream" }, { table = "gem_drop_table" }, -] \ No newline at end of file +] + +[zombie_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 2875 }, + { id = "green_charm", chance = 1285 }, + { id = "crimson_charm", chance = 1040 }, + { id = "blue_charm", chance = 1285 }, +] diff --git a/data/entity/npc/monster/warrior/earth_warrior/earth_warrior.drops.toml b/data/entity/npc/monster/warrior/earth_warrior/earth_warrior.drops.toml index f52249a682..c208c7255f 100644 --- a/data/entity/npc/monster/warrior/earth_warrior/earth_warrior.drops.toml +++ b/data/entity/npc/monster/warrior/earth_warrior/earth_warrior.drops.toml @@ -3,6 +3,7 @@ type = "all" drops = [ { table = "earth_warrior_secondary" }, { table = "earth_warrior_tertiary" }, + { table = "earth_warrior_charms", members = true }, ] [earth_warrior_secondary] @@ -28,4 +29,13 @@ drops = [ roll = 5000 drops = [ { id = "earth_warrior_champions_scroll", lacks = "earth_warrior_champions_scroll" }, -] \ No newline at end of file +] + +[earth_warrior_charms] +roll = 100000 +drops = [ + { id = "gold_charm", chance = 9037 }, + { id = "green_charm", chance = 4475 }, + { id = "crimson_charm", chance = 11000 }, + { id = "blue_charm", chance = 675 }, +] From 39578b9de3542d0bdc912e83765caad4791066e0 Mon Sep 17 00:00:00 2001 From: Harley Gilpin Date: Thu, 6 Aug 2026 12:50:40 -0700 Subject: [PATCH 03/13] Wire NPC variants to existing drop tables Clones don't inherit the implicit string-id drop table match, so numbered variants like green_dragon_1-4 dropped nothing despite the base table existing. Also wire bones-only droppers matched against the rsmod reference (entrana/monastery monks, skeleton warlock, Kolodion). --- data/area/asgarnia/burthorpe/burthorpe.npcs.toml | 2 ++ data/area/asgarnia/entrana/entrana.npcs.toml | 1 + .../kandarin/ardougne/monastery/ardougne_monastery.npcs.toml | 1 + data/area/kharidian_desert/bandit_camp/bandit_camp.npcs.toml | 1 + data/area/morytania/mort_myre_swamp/mort_myre_swamp.npcs.toml | 1 + data/area/wilderness/mage_arena/mage_arena.npcs.toml | 1 + data/entity/npc/animal/crab/crab.npcs.toml | 1 + data/entity/npc/monster/draconic/dragons.npcs.toml | 4 ++++ data/entity/npc/monster/undead/skeleton/skeletons.npcs.toml | 1 + data/entity/npc/monster/wallasalki/wallasalki.npcs.toml | 1 + .../tai_bwo_wannai_cleanup/tai_bwo_wannai_cleanup.npcs.toml | 3 ++- 11 files changed, 16 insertions(+), 1 deletion(-) diff --git a/data/area/asgarnia/burthorpe/burthorpe.npcs.toml b/data/area/asgarnia/burthorpe/burthorpe.npcs.toml index b42f066ec2..cc079efd35 100644 --- a/data/area/asgarnia/burthorpe/burthorpe.npcs.toml +++ b/data/area/asgarnia/burthorpe/burthorpe.npcs.toml @@ -143,10 +143,12 @@ examine = "Commander of the Imperial Guard." [archer_burthorpe_clean] id = 1073 clone = "archer_burthorpe" +drop_table = "archer_burthorpe" [archer_burthorpe_beard] id = 1074 clone = "archer_burthorpe" +drop_table = "archer_burthorpe" [archer_burthorpe] id = 1075 diff --git a/data/area/asgarnia/entrana/entrana.npcs.toml b/data/area/asgarnia/entrana/entrana.npcs.toml index abb711b6af..cd39a9bb4f 100644 --- a/data/area/asgarnia/entrana/entrana.npcs.toml +++ b/data/area/asgarnia/entrana/entrana.npcs.toml @@ -11,6 +11,7 @@ def = 3 combat_def = "man" respawn_delay = 25 examine = "A holy man." +drop_table = "bones" [francis] id = 2327 diff --git a/data/area/kandarin/ardougne/monastery/ardougne_monastery.npcs.toml b/data/area/kandarin/ardougne/monastery/ardougne_monastery.npcs.toml index fd744a0fe3..9c85281ec4 100644 --- a/data/area/kandarin/ardougne/monastery/ardougne_monastery.npcs.toml +++ b/data/area/kandarin/ardougne/monastery/ardougne_monastery.npcs.toml @@ -32,6 +32,7 @@ style = "crush" max_hit_melee = 10 respawn_delay = 25 examine = "An Ardougne Monk." +drop_table = "bones" [ferret_monastery] id = 5139 diff --git a/data/area/kharidian_desert/bandit_camp/bandit_camp.npcs.toml b/data/area/kharidian_desert/bandit_camp/bandit_camp.npcs.toml index 0ebe857a56..530f3691de 100644 --- a/data/area/kharidian_desert/bandit_camp/bandit_camp.npcs.toml +++ b/data/area/kharidian_desert/bandit_camp/bandit_camp.npcs.toml @@ -46,6 +46,7 @@ max_hit_melee = 60 immune_poison = true respawn_delay = 15 examine = "A tough-looking criminal." +drop_table = "bandit_bandit_camp" [mysterious_ghost_bandit_camp] id = 2384 diff --git a/data/area/morytania/mort_myre_swamp/mort_myre_swamp.npcs.toml b/data/area/morytania/mort_myre_swamp/mort_myre_swamp.npcs.toml index f12196e2ee..02e957fc12 100644 --- a/data/area/morytania/mort_myre_swamp/mort_myre_swamp.npcs.toml +++ b/data/area/morytania/mort_myre_swamp/mort_myre_swamp.npcs.toml @@ -150,6 +150,7 @@ clone = "blood_blamish_snail" [ochre_blamish_snail_2] id = 1234 clone = "ochre_blamish_snail" +drop_table = "ochre_blamish_snail" [bruise_blamish_snail_2] id = 1235 diff --git a/data/area/wilderness/mage_arena/mage_arena.npcs.toml b/data/area/wilderness/mage_arena/mage_arena.npcs.toml index 93256c03c1..1416c71116 100644 --- a/data/area/wilderness/mage_arena/mage_arena.npcs.toml +++ b/data/area/wilderness/mage_arena/mage_arena.npcs.toml @@ -26,6 +26,7 @@ max_hit_melee = 200 categories = ["no"] immune_poison = true examine = "'''In the Mage Arena cave:''' Runs the Mage Arena.
'''In battle:''' He's a shape-shifter." +drop_table = "bones" [kolodion_ogre] id = 908 diff --git a/data/entity/npc/animal/crab/crab.npcs.toml b/data/entity/npc/animal/crab/crab.npcs.toml index ca922065af..aff9dadde2 100644 --- a/data/entity/npc/animal/crab/crab.npcs.toml +++ b/data/entity/npc/animal/crab/crab.npcs.toml @@ -50,6 +50,7 @@ examine = "No one likes crabs... especially really big ones!" [giant_rock_crab_light] clone = "giant_rock_crab" id = 2885 +drop_table = "giant_rock_crab" [boulder] clone = "giant_rock_crab" diff --git a/data/entity/npc/monster/draconic/dragons.npcs.toml b/data/entity/npc/monster/draconic/dragons.npcs.toml index c3d02bd00c..6aed981a2a 100644 --- a/data/entity/npc/monster/draconic/dragons.npcs.toml +++ b/data/entity/npc/monster/draconic/dragons.npcs.toml @@ -83,18 +83,22 @@ examine = "Must be related to Elvarg." [green_dragon_1] id = 4677 clone = "green_dragon" +drop_table = "green_dragon" [green_dragon_2] id = 4678 clone = "green_dragon" +drop_table = "green_dragon" [green_dragon_3] id = 4679 clone = "green_dragon" +drop_table = "green_dragon" [green_dragon_4] id = 4680 clone = "green_dragon" +drop_table = "green_dragon" [iron_dragon] id = 1591 diff --git a/data/entity/npc/monster/undead/skeleton/skeletons.npcs.toml b/data/entity/npc/monster/undead/skeleton/skeletons.npcs.toml index d3c0d8600e..0ea6f5f233 100644 --- a/data/entity/npc/monster/undead/skeleton/skeletons.npcs.toml +++ b/data/entity/npc/monster/undead/skeleton/skeletons.npcs.toml @@ -7,6 +7,7 @@ combat_def = "skeleton_warlock" slayer_xp = 13.8 categories = ["skeletons", "undead"] examine = "It rattles when it moves." +drop_table = "bones" [skeleton_mace_shield] id = 92 diff --git a/data/entity/npc/monster/wallasalki/wallasalki.npcs.toml b/data/entity/npc/monster/wallasalki/wallasalki.npcs.toml index d80b20ff0d..3e5bffe07d 100644 --- a/data/entity/npc/monster/wallasalki/wallasalki.npcs.toml +++ b/data/entity/npc/monster/wallasalki/wallasalki.npcs.toml @@ -15,3 +15,4 @@ examine = "A fearsome magical water creature." [wallasalki_1] clone = "wallasalki" id = 2884 +drop_table = "wallasalki" diff --git a/data/minigame/tai_bwo_wannai_cleanup/tai_bwo_wannai_cleanup.npcs.toml b/data/minigame/tai_bwo_wannai_cleanup/tai_bwo_wannai_cleanup.npcs.toml index b3484317e4..b69f002b60 100644 --- a/data/minigame/tai_bwo_wannai_cleanup/tai_bwo_wannai_cleanup.npcs.toml +++ b/data/minigame/tai_bwo_wannai_cleanup/tai_bwo_wannai_cleanup.npcs.toml @@ -71,4 +71,5 @@ examine = "A slithering serpent that likes to hide in the bush." [bush_snake_2] id = 2490 -clone = "bush_snake" \ No newline at end of file +clone = "bush_snake" +drop_table = "bush_snake" \ No newline at end of file From 9b88036aee68c0d6c6eca008e0b5a34417371b5b Mon Sep 17 00:00:00 2001 From: Harley Gilpin Date: Thu, 6 Aug 2026 14:39:15 -0700 Subject: [PATCH 04/13] Add missing drop tables for all spawned NPCs. --- .../freaky_forester.drops.toml | 5 + .../freaky_forester/freaky_forester.npcs.toml | 8 + .../black_knights_fortress_basement.npcs.toml | 1 + .../kinshra_workshop.npcs.toml | 2 + .../asgarnia/burthorpe/burthorpe.npcs.toml | 2 + .../dwarven_mines/dwarven_mine.drops.toml | 5 + .../dwarven_mines/dwarven_mine.npcs.toml | 3 + data/area/asgarnia/falador/falador.drops.toml | 92 +++++++ data/area/asgarnia/falador/falador.npcs.toml | 9 +- .../goblin_village/goblin_village.npcs.toml | 1 + .../mudskipper_point.npcs.toml | 2 + .../asgarnia/port_sarim/port_sarim.npcs.toml | 4 + .../melzars_maze/melzars_maze.drops.toml | 5 + .../melzars_maze/melzars_maze.npcs.toml | 1 + .../asgarnia/rimmington/rimmington.drops.toml | 5 + .../asgarnia/rimmington/rimmington.npcs.toml | 11 + .../mouse_hole/mouse_hole.drops.toml | 5 + .../mouse_hole/mouse_hole.npcs.toml | 2 + .../ice_queens_lair/ice_queens_lair.npcs.toml | 1 + .../fremennik_isles/fremennik_isle.npcs.toml | 1 + .../ice_troll_caves.drops.toml | 67 ++++++ .../ice_troll_caves/ice_troll_caves.npcs.toml | 1 + .../neitiznot/neitiznot.npcs.toml | 1 + .../chaos_dwarf_battlefield.drops.toml | 178 ++++++++++++++ .../chaos_dwarf_battlefield.npcs.toml | 12 + .../keldagrim/keldagrim.drops.toml | 26 +- .../keldagrim/keldagrim.npcs.toml | 1 + .../miscellania/miscellania.drops.toml | 6 + .../miscellania/miscellania.npcs.toml | 10 + .../pirates_cove/pirates_cove.drops.toml | 24 ++ .../pirates_cove/pirates_cove.npcs.toml | 4 + .../brine_rat_cavern.drops.toml | 53 +++++ .../brine_rat_cavern.npcs.toml | 8 + .../rellekka_hunter_area.drops.toml | 113 +++++++++ .../rellekka_hunter_area.npcs.toml | 4 + .../rellekka/rellekka.drops.toml | 21 ++ .../rellekka/rellekka.npcs.toml | 3 + .../waterbirth_island.drops.toml | 68 ++++++ .../waterbirth_island.npcs.toml | 2 + .../kandarin/ape_atoll/ape_atoll.drops.toml | 26 ++ .../kandarin/ape_atoll/ape_atoll.npcs.toml | 9 + .../tunnels/ape_atoll_tunnels.npcs.toml | 1 + .../ardougne/east_ardougne.drops.toml | 154 +++++++++++- .../kandarin/ardougne/east_ardougne.npcs.toml | 9 + .../ardougne/ibans_lair/ibans_lair.drops.toml | 7 +- .../ardougne/ibans_lair/ibans_lair.npcs.toml | 1 + .../sewers/ardougne_sewers.drops.toml | 5 + .../ardougne/sewers/ardougne_sewers.npcs.toml | 4 + .../underground_pass_dungeon.drops.toml | 5 + .../underground_pass_dungeon.npcs.toml | 2 + .../underground_pass.drops.toml | 21 ++ .../underground_pass.npcs.toml | 15 ++ .../ardougne/west/west_ardougne.drops.toml | 11 + .../ardougne/west/west_ardougne.npcs.toml | 6 + .../battlefield/battlefield.drops.toml | 14 ++ .../battlefield/battlefield.npcs.toml | 5 + .../baxtorian_falls/baxtorian_falls.npcs.toml | 2 + .../waterfall_dungeon.drops.toml | 36 +++ .../waterfall_dungeon.npcs.toml | 2 + .../feldip_hills/feldip_hills.drops.toml | 45 +++- .../feldip_hills/feldip_hills.npcs.toml | 8 + .../feldip_hills/jiggig/jiggig.npcs.toml | 3 + .../fishing_guild/fishing_guild.npcs.toml | 5 + .../goblin_cave/goblin_cave.npcs.toml | 1 + .../hazelmeres_island.npcs.toml | 1 + data/area/kandarin/ourania/ourania.drops.toml | 6 + data/area/kandarin/ourania/ourania.npcs.toml | 2 + .../piscatoris_hunter_area.npcs.toml | 1 + .../kandarin/piscatoris/piscatoris.npcs.toml | 1 + .../khazard_fight_arena.drops.toml | 5 + .../fight_arena/khazard_fight_arena.npcs.toml | 3 + .../morge_camp/mogre_camp.npcs.toml | 1 + .../underwater_cave.drops.toml | 14 ++ .../underwater_cave/underwater_cave.npcs.toml | 1 + .../movarios_base/movarios_base.drops.toml | 42 ++++ .../movarios_base/movarios_base.npcs.toml | 4 + .../ranging_guild/ranging_guild.npcs.toml | 1 + .../temple_of_ikov/temple_of_ikov.drops.toml | 7 +- .../temple_of_ikov/temple_of_ikov.npcs.toml | 2 + .../tower_of_life/tower_of_life.drops.toml | 15 +- .../tower_of_life/tower_of_life.npcs.toml | 1 + .../combat_training_camp.npcs.toml | 1 + .../tree_gnome_stronghold.drops.toml | 27 ++- .../tree_gnome_stronghold.npcs.toml | 3 + .../troll_stronghold_tunnels.drops.toml | 34 +++ .../troll_stronghold_tunnels.npcs.toml | 3 + data/area/kandarin/yanille/yanille.drops.toml | 6 + data/area/kandarin/yanille/yanille.npcs.toml | 1 + .../karamja/brimhaven/brimhaven.drops.toml | 28 +++ .../karamja/brimhaven/brimhaven.npcs.toml | 7 + .../dungeon/brimhaven_dungeon.npcs.toml | 1 + data/area/karamja/crandor/crandor.npcs.toml | 3 +- data/area/karamja/karamja.drops.toml | 224 ++++++++++++++++++ data/area/karamja/karamja.npcs.toml | 8 + .../caves/kharazi_caves.drops.toml | 15 ++ .../caves/kharazi_caves.npcs.toml | 9 + .../karamja/musa_point/musa_point.npcs.toml | 1 + .../pothole_dungeon/pothole_dungeon.npcs.toml | 2 + .../tzhaar_city/tzhaar_city.drops.toml | 6 + .../karamja/tzhaar_city/tzhaar_city.npcs.toml | 5 + .../agility_pyramid/agility_pyramid.npcs.toml | 4 + .../bandit_camp/bandit_camp.drops.toml | 31 ++- .../bandit_camp/bandit_camp.npcs.toml | 1 + .../harmony_island/harmony.drops.toml | 41 ++++ .../harmony_island/harmony.npcs.toml | 20 ++ .../windmill_cellar/windmill_cellar.npcs.toml | 11 + .../kalphite_hive/kalphite_hive.drops.toml | 8 +- .../kalphite_hive/kalphite_hive.npcs.toml | 4 +- .../kharidian_desert.drops.toml | 6 + .../kharidian_desert.npcs.toml | 2 + .../klenters_pyramid.npcs.toml | 5 + .../mining_camp/desert_mining_camp.drops.toml | 13 +- .../mining_camp/desert_mining_camp.npcs.toml | 15 ++ .../kharidian_desert/nardah/nardah.npcs.toml | 1 + .../dungeon/pollninveach_dungeon.npcs.toml | 1 + .../rock_island_prison.npcs.toml | 3 + .../sophanem/sophanem.npcs.toml | 1 + .../sophanem_dungeon.drops.toml | 32 +++ .../sophanem_dungeon.npcs.toml | 1 + .../scabaras_dungeon.drops.toml | 34 +++ .../scabaras_dungeon.npcs.toml | 5 + .../kharidian_desert/ullek/ullek.drops.toml | 144 +++++++++++ .../kharidian_desert/ullek/ullek.npcs.toml | 12 + .../uzer/mastaba/uzer_mastaba.drops.toml | 12 + .../uzer/mastaba/uzer_mastaba.npcs.toml | 2 + .../kharidian_desert/uzer/uzer.drops.toml | 35 +++ .../area/kharidian_desert/uzer/uzer.npcs.toml | 5 + .../dorgesh_kaan_agility_course.drops.toml | 44 ++++ .../dorgesh_kaan_agility_course.npcs.toml | 2 + .../dorgesh_kaan/dorgesh_kaan.npcs.toml | 2 + .../area/misthalin/draynor/draynor.drops.toml | 13 +- data/area/misthalin/draynor/draynor.npcs.toml | 3 + .../misthalin/edgeville/edgeville.npcs.toml | 2 + .../ham_hideout/ham_hideout.drops.toml | 56 +++++ .../ham_hideout/ham_hideout.npcs.toml | 2 + .../store_rooms/ham_store_rooms.npcs.toml | 5 + .../combat_hall/combat_hall.npcs.toml | 2 + .../caves/lumbridge_swamp_caves.drops.toml | 30 ++- .../caves/lumbridge_swamp_caves.npcs.toml | 4 + .../lumbridge/swamp/lumbridge_swamp.npcs.toml | 1 + .../air_rune_temple/air_rune_temple.npcs.toml | 1 + .../varrock/tolnas_rift/tolnas_rift.npcs.toml | 6 + data/area/misthalin/varrock/varrock.npcs.toml | 11 + .../evil_chicken_lair.npcs.toml | 3 + .../burgh_de_rott/burgh_de_rott.drops.toml | 41 ++++ .../burgh_de_rott/burgh_de_rott.npcs.toml | 15 ++ .../morytania/darkmeyer/darkmeyer.drops.toml | 5 + .../morytania/darkmeyer/darkmeyer.npcs.toml | 7 + .../dragontooth_shipwreck.npcs.toml | 2 + .../lair_of_tarn_razorlor.npcs.toml | 6 + .../meiyerditch/meiyerditch.npcs.toml | 15 ++ .../tunnels/meiyerditch_tunnels.drops.toml | 165 +++++++++++++ .../tunnels/meiyerditch_tunnels.npcs.toml | 4 + .../mos_le_harmless.drops.toml | 12 + .../mos_le_harmless/mos_le_harmless.npcs.toml | 3 + .../enchanted_valley.npcs.toml | 3 + .../spirit_realm/spirit_realm.drops.toml | 72 ++++++ .../realm/spirit_realm/spirit_realm.npcs.toml | 2 + data/area/tirannwn/isafdar/isafdar.npcs.toml | 2 + data/area/tirannwn/lletya/lletya.npcs.toml | 4 + .../poison_waste_slayer_dungeon.drops.toml | 94 ++++++++ .../poison_waste_slayer_dungeon.npcs.toml | 12 + .../ghorrock_fortress_dungeon.drops.toml | 5 + .../ghorrock_fortress_dungeon.npcs.toml | 2 + .../jhallans_resting_place.npcs.toml | 2 + .../god_wars_dungeon/god_wars.drops.toml | 135 +++++++++++ .../god_wars_dungeon/god_wars.npcs.toml | 4 + .../knight_of_saradomin.npcs.toml | 1 + .../spiritual_warrior.npcs.toml | 1 + .../caves/mountain_camp_caves.npcs.toml | 1 + .../mountain_camp/mountain_camp.drops.toml | 5 + .../mountain_camp/mountain_camp.npcs.toml | 1 + .../troll_tunnels/troll_tunnels.npcs.toml | 7 + .../wilderness_bandit_camp.drops.toml | 42 ++++ .../wilderness_bandit_camp.npcs.toml | 2 + .../chaos_temple_dungeon.drops.toml | 51 ++++ .../chaos_temple_dungeon.npcs.toml | 5 + .../chaos_tunnels/chaos_tunnels.drops.toml | 12 + .../chaos_tunnels/chaos_tunnels.npcs.toml | 4 + data/area/wilderness/wilderness.drops.toml | 96 ++++++++ data/area/wilderness/wilderness.npcs.toml | 13 +- data/entity/npc/animal/birds/birds.drops.toml | 5 + data/entity/npc/animal/birds/birds.npcs.toml | 3 + data/entity/npc/animal/crab/crab.npcs.toml | 1 + data/entity/npc/monster/imp/imp.npcs.toml | 1 + .../monster/reptile/lizard/lizard.drops.toml | 1 - .../monster/reptile/spider/spider.drops.toml | 15 ++ .../monster/reptile/spider/spider.npcs.toml | 2 + .../npc/monster/undead/ghost/ghost.npcs.toml | 18 ++ .../undead/skeleton/skeletons.npcs.toml | 4 + .../barrows_brothers/barrows.npcs.toml | 1 + .../shade_catacombs.drops.toml | 6 + .../shade_catacombs/shade_catacombs.npcs.toml | 2 + .../nomads_temple/nomads_temple.drops.toml | 14 ++ .../nomads_temple/nomads_temple.npcs.toml | 1 + data/minigame/soul_wars/soul_wars.npcs.toml | 4 + .../temple_trekking/temple_trekking.npcs.toml | 1 + .../warriors_guild/warriors_guild.drops.toml | 91 +++++++ .../warriors_guild/warriors_guild.npcs.toml | 6 + .../members/cabin_fever/cabin_fever.npcs.toml | 9 + .../clock_tower_dungeon.drops.toml | 12 + .../clock_tower/clock_tower_dungeon.npcs.toml | 6 + .../defender_of_varrock.drops.toml | 36 +++ .../defender_of_varrock.npcs.toml | 8 + .../dream_mentor/dream_mentor.npcs.toml | 1 + .../dwarf_cannon/dwarven_outpost.npcs.toml | 3 + .../orks_rift/orks_rift.drops.toml | 124 ++++++++++ .../orks_rift/orks_rift.npcs.toml | 3 + .../haunted_mine/haunted_mine.npcs.toml | 1 + .../mournings_end_part_2.npcs.toml | 1 + .../members/plague_city/plague_city.npcs.toml | 1 + .../priest_in_peril.drops.toml | 7 +- .../priest_in_peril/priest_in_peril.npcs.toml | 1 + .../battle_of_the_archipelago.npcs.toml | 2 + .../black_knights_catacombs.drops.toml | 71 ++++++ .../black_knights_catacombs.npcs.toml | 3 + .../luciens_camp/luciens_camp.drops.toml | 99 ++++++++ .../luciens_camp/luciens_camp.npcs.toml | 17 ++ .../dungeoneering/dungeoneering.drops.toml | 21 ++ .../dungeoneering/dungeoneering.npcs.toml | 1 + 220 files changed, 3729 insertions(+), 18 deletions(-) create mode 100644 data/activity/event/random/freaky_forester/freaky_forester.drops.toml create mode 100644 data/area/asgarnia/dwarven_mines/dwarven_mine.drops.toml create mode 100644 data/area/asgarnia/rimmington/melzars_maze/melzars_maze.drops.toml create mode 100644 data/area/asgarnia/rimmington/rimmington.drops.toml create mode 100644 data/area/asgarnia/taverley/witches_house/mouse_hole/mouse_hole.drops.toml create mode 100644 data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.drops.toml create mode 100644 data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.drops.toml create mode 100644 data/area/fremennik_province/pirates_cove/pirates_cove.drops.toml create mode 100644 data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.drops.toml create mode 100644 data/area/kandarin/ardougne/sewers/ardougne_sewers.drops.toml create mode 100644 data/area/kandarin/ardougne/underground_pass/dungeon/underground_pass_dungeon.drops.toml create mode 100644 data/area/kandarin/ardougne/west/west_ardougne.drops.toml create mode 100644 data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.drops.toml create mode 100644 data/area/kandarin/port_khazard/fight_arena/khazard_fight_arena.drops.toml create mode 100644 data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.drops.toml create mode 100644 data/area/kandarin/port_khazard/movarios_base/movarios_base.drops.toml create mode 100644 data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.drops.toml create mode 100644 data/area/karamja/brimhaven/brimhaven.drops.toml create mode 100644 data/area/karamja/kharazi_jungle/caves/kharazi_caves.drops.toml create mode 100644 data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.drops.toml create mode 100644 data/area/kharidian_desert/ullek/ullek.drops.toml create mode 100644 data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.drops.toml create mode 100644 data/area/kharidian_desert/uzer/uzer.drops.toml create mode 100644 data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.drops.toml create mode 100644 data/area/morytania/burgh_de_rott/burgh_de_rott.drops.toml create mode 100644 data/area/morytania/darkmeyer/darkmeyer.drops.toml create mode 100644 data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.drops.toml create mode 100644 data/area/realm/spirit_realm/spirit_realm.drops.toml create mode 100644 data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.drops.toml create mode 100644 data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.drops.toml create mode 100644 data/area/troll_country/god_wars_dungeon/god_wars.drops.toml create mode 100644 data/area/troll_country/mountain_camp/mountain_camp.drops.toml create mode 100644 data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.drops.toml create mode 100644 data/entity/npc/animal/birds/birds.drops.toml create mode 100644 data/minigame/soul_wars/nomads_temple/nomads_temple.drops.toml create mode 100644 data/quest/members/clock_tower/clock_tower_dungeon.drops.toml create mode 100644 data/quest/members/defender_of_varrock/defender_of_varrock.drops.toml create mode 100644 data/quest/members/fairy_tale_iii/orks_rift/orks_rift.drops.toml create mode 100644 data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.drops.toml create mode 100644 data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.drops.toml create mode 100644 data/skill/dungeoneering/dungeoneering.drops.toml diff --git a/data/activity/event/random/freaky_forester/freaky_forester.drops.toml b/data/activity/event/random/freaky_forester/freaky_forester.drops.toml new file mode 100644 index 0000000000..710d8e793c --- /dev/null +++ b/data/activity/event/random/freaky_forester/freaky_forester.drops.toml @@ -0,0 +1,5 @@ +[pheasant_drop_table] +type = "all" +drops = [ + { id = "raw_pheasant" }, +] diff --git a/data/activity/event/random/freaky_forester/freaky_forester.npcs.toml b/data/activity/event/random/freaky_forester/freaky_forester.npcs.toml index 0c22669608..eec151e58b 100644 --- a/data/activity/event/random/freaky_forester/freaky_forester.npcs.toml +++ b/data/activity/event/random/freaky_forester/freaky_forester.npcs.toml @@ -13,31 +13,39 @@ max_hit_melee = 10 respawn_delay = 5 combat_exp = false examine = "A brightly coloured game bird." +drop_table = "pheasant" [pheasant_1_tail_2] id = 7445 clone = "pheasant_1_tail" +drop_table = "pheasant" [pheasant_2_tails] id = 7446 clone = "pheasant_1_tail" +drop_table = "pheasant" [pheasant_2_tails_2] id = 13246 clone = "pheasant_1_tail" +drop_table = "pheasant" [pheasant_3_tails] id = 13247 clone = "pheasant_1_tail" +drop_table = "pheasant" [pheasant_3_tails_2] id = 13248 clone = "pheasant_1_tail" +drop_table = "pheasant" [pheasant_4_tails] id = 13249 clone = "pheasant_1_tail" +drop_table = "pheasant" [pheasant_4_tails_2] id = 13250 clone = "pheasant_1_tail" +drop_table = "pheasant" diff --git a/data/area/asgarnia/black_knights_fortress/basement/black_knights_fortress_basement.npcs.toml b/data/area/asgarnia/black_knights_fortress/basement/black_knights_fortress_basement.npcs.toml index 98d2cd8405..ee91903e28 100644 --- a/data/area/asgarnia/black_knights_fortress/basement/black_knights_fortress_basement.npcs.toml +++ b/data/area/asgarnia/black_knights_fortress/basement/black_knights_fortress_basement.npcs.toml @@ -36,6 +36,7 @@ id = 12336 [rat_black_knights_fortress] id = 2682 +drop_table = "rat" [arthur_black_knights_fortress_basement] id = 3778 diff --git a/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml b/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml index 9a2b9b619c..46e4da3a4e 100644 --- a/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml +++ b/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml @@ -20,9 +20,11 @@ id = 11695 [black_knight_guardian_kinshra_workshop] id = 11696 examine = "A Black Knight with lots of combat experience." +drop_table = "empty" [black_knight_guardian_kinshra_workshop_2] id = 11697 +drop_table = "empty" [black_knight_doorkeeper_2] id = 11690 diff --git a/data/area/asgarnia/burthorpe/burthorpe.npcs.toml b/data/area/asgarnia/burthorpe/burthorpe.npcs.toml index cc079efd35..a217e478db 100644 --- a/data/area/asgarnia/burthorpe/burthorpe.npcs.toml +++ b/data/area/asgarnia/burthorpe/burthorpe.npcs.toml @@ -98,6 +98,7 @@ def = 3 combat_def = "man" respawn_delay = 25 examine = "A servant for Prince Anlaf." +drop_table = "bones" [eohric] id = 1080 @@ -219,6 +220,7 @@ combat_def = "white_knight" attack_bonus = 30 respawn_delay = 50 examine = "The knight seems to be watching something." +drop_table = "white_knight" [helemos] id = 797 diff --git a/data/area/asgarnia/dwarven_mines/dwarven_mine.drops.toml b/data/area/asgarnia/dwarven_mines/dwarven_mine.drops.toml new file mode 100644 index 0000000000..702cfb8874 --- /dev/null +++ b/data/area/asgarnia/dwarven_mines/dwarven_mine.drops.toml @@ -0,0 +1,5 @@ +[dwarf_gang_member_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] diff --git a/data/area/asgarnia/dwarven_mines/dwarven_mine.npcs.toml b/data/area/asgarnia/dwarven_mines/dwarven_mine.npcs.toml index 95e52913c8..a830f3f19e 100644 --- a/data/area/asgarnia/dwarven_mines/dwarven_mine.npcs.toml +++ b/data/area/asgarnia/dwarven_mines/dwarven_mine.npcs.toml @@ -6,14 +6,17 @@ examine = "He looks quite independent in an aggressive and business like way." id = 1795 categories = ["dwarves"] examine = "A short stout menacing fellow." +drop_table = "dwarf_gang_member" [dwarf_gang_member_2] id = 1796 categories = ["dwarves"] examine = "A short stout menacing fellow." +drop_table = "dwarf_gang_member" [dwarf_gang_member_3] id = 1797 +drop_table = "dwarf_gang_member" [cart_conductor] id = 2186 diff --git a/data/area/asgarnia/falador/falador.drops.toml b/data/area/asgarnia/falador/falador.drops.toml index ce35d1e647..be9d406baf 100644 --- a/data/area/asgarnia/falador/falador.drops.toml +++ b/data/area/asgarnia/falador/falador.drops.toml @@ -215,3 +215,95 @@ drops = [ { id = "crimson_charm", chance = 437 }, { id = "blue_charm", chance = 163 }, ] + +[white_knight_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "white_knight_secondary" }, +] + +[white_knight_secondary] +roll = 1246 +drops = [ + { id = "coins", min = 1, max = 200, chance = 64 }, + { id = "iron_bar", min = 1, max = 2, chance = 64 }, + { id = "water_rune", min = 20, max = 47, chance = 32 }, + { id = "body_rune", min = 9, max = 24, chance = 32 }, + { id = "mind_rune", amount = 5, chance = 32 }, + { id = "chaos_rune", min = 2, max = 5, chance = 32 }, + { id = "nature_rune", min = 4, max = 7, chance = 32 }, + { id = "blood_rune", min = 2, max = 3, chance = 32 }, + { id = "cosmic_rune", amount = 2, chance = 32 }, + { id = "iron_longsword", chance = 32 }, + { id = "steel_sword", chance = 32 }, + { id = "mithril_arrow", amount = 5, chance = 32 }, + { id = "adamant_arrow", amount = 2, chance = 32 }, + { id = "steel_med_helm", chance = 32 }, + { id = "rune_javelin", amount = 5, chance = 32 }, + { id = "grimy_guam", chance = 32 }, + { id = "grimy_marrentill", chance = 32 }, + { id = "grimy_tarromin", chance = 32 }, + { id = "grimy_harralander", chance = 32 }, + { id = "grimy_ranarr", chance = 32 }, + { id = "grimy_irit", chance = 32 }, + { id = "grimy_avantoe", chance = 32 }, + { id = "grimy_kwuarm", chance = 32 }, + { id = "grimy_cadantine", chance = 32 }, + { id = "grimy_lantadyme", chance = 32 }, + { id = "grimy_dwarf_weed", chance = 32 }, + { id = "potato_seed", amount = 4, chance = 32 }, + { id = "tomato_seed", amount = 2, chance = 32 }, + { id = "cabbage_seed", amount = 3, chance = 32 }, + { id = "onion_seed", amount = 3, chance = 32 }, + { id = "sweetcorn_seed", chance = 32 }, + { id = "watermelon_seed", amount = 2, chance = 32 }, + { id = "pot_of_flour", chance = 32 }, + { id = "iron_ore", chance = 32 }, + { id = "law_rune", min = 2, max = 3, chance = 6 }, + { id = "uncut_sapphire", chance = 6 }, + { id = "uncut_emerald", chance = 2 }, + { id = "uncut_ruby", chance = 2 }, + { id = "uncut_diamond", chance = 2 }, + { id = "nature_talisman", chance = 2 }, + { id = "loop_half_of_a_key", chance = 2 }, + { id = "tooth_half_of_a_key", chance = 2 }, +] + +[jeff_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "jeff_secondary" }, + { table = "easy_clue_scroll", roll = 170 }, +] + +[jeff_secondary] +roll = 1024 +drops = [ + { id = "bronze_arrow", amount = 7, chance = 32 }, + { id = "bronze_bolts", min = 2, max = 12, chance = 32 }, + { id = "chaos_rune", amount = 2, chance = 32 }, + { id = "earth_rune", amount = 4, chance = 32 }, + { id = "fire_rune", amount = 6, chance = 32 }, + { id = "mind_rune", amount = 9, chance = 32 }, + { id = "grimy_guam", chance = 32 }, + { id = "grimy_marrentill", chance = 32 }, + { id = "grimy_tarromin", chance = 32 }, + { id = "grimy_harralander", chance = 32 }, + { id = "grimy_ranarr", chance = 32 }, + { id = "grimy_irit", chance = 32 }, + { id = "grimy_avantoe", chance = 32 }, + { id = "grimy_kwuarm", chance = 32 }, + { id = "grimy_cadantine", chance = 32 }, + { id = "grimy_lantadyme", chance = 32 }, + { id = "grimy_dwarf_weed", chance = 32 }, + { id = "coins", amount = 3, chance = 32 }, + { id = "earth_talisman", chance = 32 }, + { id = "bronze_med_helm", chance = 32 }, + { id = "copper_ore", chance = 32 }, + { id = "iron_dagger", chance = 32 }, + { id = "sling", chance = 32 }, + { id = "cabbage", chance = 32 }, + { id = "fishing_bait", chance = 32 }, +] diff --git a/data/area/asgarnia/falador/falador.npcs.toml b/data/area/asgarnia/falador/falador.npcs.toml index 5cb2f203b2..5ce4babee3 100644 --- a/data/area/asgarnia/falador/falador.npcs.toml +++ b/data/area/asgarnia/falador/falador.npcs.toml @@ -144,14 +144,17 @@ examine = "He rules the, er, roost." [chicken_falador] id = 2313 +drop_table = "chicken" [chicken_falador_2] id = 2314 +drop_table = "chicken" [chicken_falador_3] id = 2315 categories = ["birds"] examine = "Yep. Definitely a chicken." +drop_table = "chicken" [elstan] id = 2323 @@ -212,6 +215,7 @@ examine = "One of Gielinor's many citizens, currently incapacitated by alcohol." [man_falador] id = 3223 examine = "One of Gielinor's many citizens." +drop_table = "man" [man_falador_2] id = 1086 @@ -219,6 +223,7 @@ id = 1086 [woman_falador] id = 3226 examine = "One of Gielinor's many citizens." +drop_table = "woman" [guard_falador] id = 3228 @@ -292,6 +297,7 @@ hitpoints = 70 combat_def = "man" respawn_delay = 25 examine = "Untrustworthy." +drop_table = "jeff" [guard_falador_7] id = 3241 @@ -647,4 +653,5 @@ def = 21 attack_bonus = 30 combat_def = "white_knight" respawn_delay = 50 -examine = "The knight seems to be watching something." \ No newline at end of file +examine = "The knight seems to be watching something." +drop_table = "white_knight" \ No newline at end of file diff --git a/data/area/asgarnia/goblin_village/goblin_village.npcs.toml b/data/area/asgarnia/goblin_village/goblin_village.npcs.toml index 20ec32667d..5ff9372cae 100644 --- a/data/area/asgarnia/goblin_village/goblin_village.npcs.toml +++ b/data/area/asgarnia/goblin_village/goblin_village.npcs.toml @@ -10,6 +10,7 @@ max_hit_crush = 30 max_hit_magic = 100 hunt_mode = "cowardly" examine = "A Zamorakian human cleric." +drop_table = "monk_of_zamorak" [general_bentnoze_goblin_village] id = 4493 diff --git a/data/area/asgarnia/mudskipper_point/mudskipper_point.npcs.toml b/data/area/asgarnia/mudskipper_point/mudskipper_point.npcs.toml index c066303d02..ba949e459e 100644 --- a/data/area/asgarnia/mudskipper_point/mudskipper_point.npcs.toml +++ b/data/area/asgarnia/mudskipper_point/mudskipper_point.npcs.toml @@ -17,10 +17,12 @@ id = 325 [giant_rat_mudskipper_point] id = 446 clone = "giant_rat_lumbridge_swamp" +drop_table = "giant_rat" [giant_rat_mudskipper_point_2] id = 4924 clone = "giant_rat_lumbridge_swamp" +drop_table = "giant_rat" [mogre] id = 114 diff --git a/data/area/asgarnia/port_sarim/port_sarim.npcs.toml b/data/area/asgarnia/port_sarim/port_sarim.npcs.toml index fe0d06c81c..1ca908bfcf 100644 --- a/data/area/asgarnia/port_sarim/port_sarim.npcs.toml +++ b/data/area/asgarnia/port_sarim/port_sarim.npcs.toml @@ -97,6 +97,7 @@ combat_def = "man" max_hit_crush = 20 respawn_delay = 25 examine = "Known for his light-fingered qualities." +drop_table = "thief" [jack_seagull] id = 2690 @@ -122,10 +123,12 @@ slayer_xp = 20.0 categories = ["pirates"] respawn_delay = 25 examine = "Yar! Shiver me timbers!" +drop_table = "pirate" [thief_port_sarim_2] id = 2696 clone = "thief_port_sarim" +drop_table = "thief" [mugger_port_sarim] id = 2697 @@ -282,6 +285,7 @@ combat_def = "goblin" slayer_xp = 5.0 categories = ["goblins"] examine = "A badly-behaved goblin." +drop_table = "empty" [ned_port_sarim_2] id = 4475 diff --git a/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.drops.toml b/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.drops.toml new file mode 100644 index 0000000000..9cc4c068f3 --- /dev/null +++ b/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.drops.toml @@ -0,0 +1,5 @@ +[melzar_the_mad_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] diff --git a/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.npcs.toml b/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.npcs.toml index 5c006a5dc4..a73745ebf5 100644 --- a/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.npcs.toml +++ b/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.npcs.toml @@ -11,4 +11,5 @@ max_hit_melee = 50 hunt_mode = "cowardly" respawn_delay = 30 examine = "He looks totally insane!" +drop_table = "melzar_the_mad" diff --git a/data/area/asgarnia/rimmington/rimmington.drops.toml b/data/area/asgarnia/rimmington/rimmington.drops.toml new file mode 100644 index 0000000000..c49f2a5d99 --- /dev/null +++ b/data/area/asgarnia/rimmington/rimmington.drops.toml @@ -0,0 +1,5 @@ +[zombie_rat_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] diff --git a/data/area/asgarnia/rimmington/rimmington.npcs.toml b/data/area/asgarnia/rimmington/rimmington.npcs.toml index 4470ddcb42..cf0e4bd3f9 100644 --- a/data/area/asgarnia/rimmington/rimmington.npcs.toml +++ b/data/area/asgarnia/rimmington/rimmington.npcs.toml @@ -60,44 +60,55 @@ slayer_xp = 2.0 categories = ["rats", "zombies"] respawn_delay = 30 examine = "Overgrown undead vermin." +drop_table = "zombie_rat" [zombie_rat_rimmington_2] id = 6089 clone = "zombie_rat_rimmington" +drop_table = "zombie_rat" [zombie_rat_rimmington_3] id = 6090 clone = "zombie_rat_rimmington" +drop_table = "zombie_rat" [skeleton_rimmington] id = 6091 +drop_table = "skeleton" [skeleton_rimmington_2] id = 6092 categories = ["skeletons"] examine = "Could do with gaining a few pounds." +drop_table = "skeleton" [skeleton_rimmington_3] id = 6093 categories = ["skeletons"] examine = "Could do with gaining a few pounds." +drop_table = "skeleton" [ghost_rimmington] id = 6094 +drop_table = "empty" [ghost_rimmington_2] id = 6095 +drop_table = "empty" [ghost_rimmington_3] id = 6096 +drop_table = "empty" [ghost_rimmington_4] id = 6097 categories = ["ghosts"] examine = "Eeek! A ghost!" +drop_table = "empty" [ghost_rimmington_5] id = 6098 +drop_table = "empty" [tool_leprechaun_rimmington] id = 7559 diff --git a/data/area/asgarnia/taverley/witches_house/mouse_hole/mouse_hole.drops.toml b/data/area/asgarnia/taverley/witches_house/mouse_hole/mouse_hole.drops.toml new file mode 100644 index 0000000000..a086858f16 --- /dev/null +++ b/data/area/asgarnia/taverley/witches_house/mouse_hole/mouse_hole.drops.toml @@ -0,0 +1,5 @@ +[mouse_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] diff --git a/data/area/asgarnia/taverley/witches_house/mouse_hole/mouse_hole.npcs.toml b/data/area/asgarnia/taverley/witches_house/mouse_hole/mouse_hole.npcs.toml index 4bfd285b4e..c7b6a77404 100644 --- a/data/area/asgarnia/taverley/witches_house/mouse_hole/mouse_hole.npcs.toml +++ b/data/area/asgarnia/taverley/witches_house/mouse_hole/mouse_hole.npcs.toml @@ -9,8 +9,10 @@ max_hit_melee = 90 hunt_mode = "cowardly" respawn_delay = 35 examine = "A huge mouse. It looks hungry..." +drop_table = "mouse" [mouse_mouse_hole_dark] id = 5995 clone = "mouse_mouse_hole" +drop_table = "mouse" diff --git a/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml index d3a584a6a7..c42673cc97 100644 --- a/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml +++ b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml @@ -1,5 +1,6 @@ [ice_warrior_ice_queens_lair] id = 145 +drop_table = "ice_warrior" [ice_queen] id = 795 diff --git a/data/area/fremennik_province/fremennik_isles/fremennik_isle.npcs.toml b/data/area/fremennik_province/fremennik_isles/fremennik_isle.npcs.toml index 5e292236a1..541404122f 100644 --- a/data/area/fremennik_province/fremennik_isles/fremennik_isle.npcs.toml +++ b/data/area/fremennik_province/fremennik_isles/fremennik_isle.npcs.toml @@ -21,6 +21,7 @@ slayer_xp = 63.0 categories = ["trolls"] respawn_delay = 50 examine = "An ice troll youngling." +drop_table = "ice_troll_runt" [ice_troll_male_fremennik_isle] id = 5526 diff --git a/data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.drops.toml b/data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.drops.toml new file mode 100644 index 0000000000..7de0cdedf0 --- /dev/null +++ b/data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.drops.toml @@ -0,0 +1,67 @@ +[ice_troll_runt_drop_table] +type = "all" +drops = [ + { table = "ice_troll_runt_secondary" }, +] + +[ice_troll_runt_secondary] +roll = 2062 +drops = [ + { id = "grimy_guam", chance = 64 }, + { id = "grimy_marrentill", chance = 64 }, + { id = "grimy_tarromin", chance = 64 }, + { id = "grimy_harralander", chance = 64 }, + { id = "jangerberry_seed", chance = 64 }, + { id = "wildblood_seed", chance = 64 }, + { id = "watermelon_seed", chance = 64 }, + { id = "strawberry_seed", chance = 64 }, + { id = "limpwurt_seed", min = 1, max = 2, chance = 64 }, + { id = "whiteberry_seed", chance = 64 }, + { id = "cactus_seed", chance = 64 }, + { id = "belladonna_seed", chance = 64 }, + { id = "poison_ivy_seed", chance = 64 }, + { id = "harralander_seed", chance = 64 }, + { id = "earth_rune", min = 10, max = 60, chance = 64 }, + { id = "coins", min = 35, max = 352, chance = 64 }, + { id = "grimy_avantoe", chance = 32 }, + { id = "grimy_cadantine", chance = 32 }, + { id = "grimy_ranarr", chance = 32 }, + { id = "grimy_kwuarm", chance = 32 }, + { id = "grimy_irit", chance = 32 }, + { id = "grimy_lantadyme", chance = 32 }, + { id = "grimy_dwarf_weed", chance = 32 }, + { id = "ranarr_seed", chance = 32 }, + { id = "steel_platebody", chance = 32 }, + { id = "steel_med_helm", chance = 32 }, + { id = "steel_warhammer", chance = 32 }, + { id = "black_warhammer", chance = 32 }, + { id = "mithril_warhammer", chance = 32 }, + { id = "adamant_warhammer", chance = 32 }, + { id = "mithril_sq_shield", chance = 32 }, + { id = "nature_rune", min = 1, max = 8, chance = 32 }, + { id = "law_rune", min = 2, max = 7, chance = 32 }, + { id = "raw_shark", min = 1, max = 8, chance = 32 }, + { id = "raw_mackerel", amount = 3, chance = 32 }, + { id = "coal", amount = 3, chance = 32 }, + { id = "seaweed", min = 4, max = 10, chance = 32 }, + { id = "ball_of_wool", min = 1, max = 42, chance = 32 }, + { id = "uncut_sapphire", chance = 32 }, + { id = "uncut_emerald", chance = 32 }, + { id = "uncut_ruby", chance = 32 }, + { id = "uncut_diamond", chance = 32 }, + { id = "spirit_weed_seed", chance = 6 }, + { id = "snapdragon_seed", chance = 6 }, + { id = "torstol_seed", chance = 6 }, + { id = "dwarf_weed_seed", chance = 6 }, + { id = "adamant_med_helm", chance = 6 }, + { id = "adamant_full_helm", chance = 6 }, + { id = "granite_shield", chance = 6 }, + { id = "rune_javelin", amount = 5, chance = 6 }, + { id = "rune_warhammer", chance = 6 }, + { id = "rune_kiteshield", chance = 6 }, + { id = "uncut_dragonstone", chance = 6 }, + { id = "loop_half_of_a_key", chance = 6 }, + { id = "tooth_half_of_a_key", chance = 6 }, + { id = "long_bone", chance = 6 }, + { id = "curved_bone", chance = 6 }, +] diff --git a/data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.npcs.toml b/data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.npcs.toml index 60773f3d96..98641896fb 100644 --- a/data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.npcs.toml +++ b/data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.npcs.toml @@ -13,6 +13,7 @@ slayer_xp = 63.0 categories = ["trolls"] respawn_delay = 50 examine = "An ice troll youngling." +drop_table = "ice_troll_runt" [ice_troll_male_ice_troll_caves] id = 5474 diff --git a/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.npcs.toml b/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.npcs.toml index df17a278ef..2392d4108f 100644 --- a/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.npcs.toml +++ b/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.npcs.toml @@ -68,6 +68,7 @@ slayer_xp = 63.0 categories = ["trolls"] respawn_delay = 50 examine = "An ice troll youngling." +drop_table = "ice_troll_runt" [ice_troll_male_neitiznot] id = 5522 diff --git a/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.drops.toml b/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.drops.toml new file mode 100644 index 0000000000..f0c5f2e63a --- /dev/null +++ b/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.drops.toml @@ -0,0 +1,178 @@ +[black_guard_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "black_guard_secondary" }, + { table = "medium_clue_scroll", roll = 170 }, +] + +[black_guard_secondary] +roll = 1024 +drops = [ + { id = "bronze_med_helm", chance = 64 }, + { id = "coins", min = 4, max = 42, chance = 64 }, + { id = "chaos_rune", amount = 2, chance = 32 }, + { id = "nature_rune", amount = 2, chance = 32 }, + { id = "bronze_battleaxe", chance = 32 }, + { id = "bronze_bolts", amount = 6, chance = 32 }, + { id = "bronze_warhammer", chance = 32 }, + { id = "bronze_pickaxe", chance = 32 }, + { id = "iron_battleaxe", chance = 32 }, + { id = "black_warhammer", chance = 32 }, + { id = "uncut_sapphire", chance = 32 }, + { id = "uncut_emerald", chance = 32 }, + { id = "uncut_ruby", chance = 32 }, + { id = "copper_ore", chance = 32 }, + { id = "bronze_bar", chance = 32 }, + { id = "iron_bar", chance = 32 }, + { id = "hammer", chance = 32 }, + { id = "coal", chance = 32 }, + { id = "keg_of_beer", chance = 32 }, + { id = "uncut_diamond", chance = 6 }, + { id = "loop_half_of_a_key", chance = 6 }, +] + +[chaos_dwarf_hand_cannoneer_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "chaos_dwarf_hand_cannoneer_secondary" }, +] + +[chaos_dwarf_hand_cannoneer_secondary] +roll = 1100 +drops = [ + { id = "air_rune", amount = 24, chance = 64 }, + { id = "chaos_rune", amount = 10, chance = 64 }, + { id = "cosmic_rune", amount = 3, chance = 64 }, + { id = "mind_rune", amount = 37, chance = 64 }, + { id = "water_rune", amount = 10, chance = 64 }, + { id = "coins", chance = 64 }, + { id = "muddy_key", chance = 64 }, + { id = "steel_full_helm", chance = 64 }, + { id = "hand_cannon", chance = 32 }, + { id = "hand_cannon_shot", chance = 32 }, + { id = "mithril_longsword", chance = 32 }, + { id = "mithril_sq_shield", chance = 32 }, + { id = "rune_javelin", chance = 32 }, + { id = "rune_spear", chance = 32 }, + { id = "death_rune", amount = 3, chance = 32 }, + { id = "law_rune", amount = 3, chance = 32 }, + { id = "nature_rune", amount = 9, chance = 32 }, + { id = "uncut_sapphire", chance = 32 }, + { id = "uncut_emerald", chance = 32 }, + { id = "uncut_ruby", chance = 32 }, + { id = "tomato", chance = 32 }, + { id = "cheese", chance = 32 }, + { id = "mithril_bar", chance = 32 }, + { id = "coal", chance = 32 }, + { id = "nature_talisman", chance = 6 }, + { id = "dragon_spear", chance = 2 }, + { id = "dragon_pickaxe", chance = 2 }, + { id = "shield_left_half", chance = 2 }, + { id = "starved_ancient_effigy", chance = 2 }, +] + +[black_guard_crossbowdwarf_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "black_guard_crossbowdwarf_secondary" }, + { table = "medium_clue_scroll", roll = 170 }, +] + +[black_guard_crossbowdwarf_secondary] +roll = 1024 +drops = [ + { id = "coins", min = 25, max = 37, chance = 64 }, + { id = "bronze_crossbow", chance = 32 }, + { id = "iron_crossbow", chance = 32 }, + { id = "steel_crossbow", chance = 32 }, + { id = "grimy_guam", chance = 32 }, + { id = "grimy_tarromin", chance = 32 }, + { id = "grimy_ranarr", chance = 32 }, + { id = "cake", chance = 32 }, + { id = "keg_of_beer", chance = 32 }, + { id = "ring_mould", chance = 32 }, + { id = "copper_ore", amount = 5, chance = 32 }, + { id = "tin_ore", chance = 32 }, +] + +[black_guard_berserker_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "black_guard_berserker_secondary" }, + { table = "medium_clue_scroll", roll = 170 }, +] + +[black_guard_berserker_secondary] +roll = 1024 +drops = [ + { id = "coins", min = 35, max = 57, chance = 64 }, + { id = "bronze_warhammer", chance = 32 }, + { id = "iron_warhammer", chance = 32 }, + { id = "steel_warhammer", chance = 32 }, + { id = "black_warhammer", chance = 32 }, + { id = "uncut_sapphire", chance = 32 }, + { id = "uncut_emerald", chance = 32 }, + { id = "uncut_ruby", chance = 32 }, + { id = "iron_ore", chance = 32 }, + { id = "tin_ore", chance = 32 }, + { id = "beer", chance = 32 }, + { id = "keg_of_beer", chance = 32 }, + { id = "ring_mould", chance = 32 }, + { id = "bucket_of_water", chance = 32 }, + { id = "rune_javelin", amount = 5, chance = 6 }, + { id = "uncut_diamond", chance = 6 }, + { id = "tooth_half_of_a_key", chance = 6 }, + { id = "loop_half_of_a_key", chance = 6 }, + { id = "shield_left_half", chance = 2 }, +] + +[chaos_dwogre_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "chaos_dwogre_secondary" }, +] + +[chaos_dwogre_secondary] +roll = 1045 +drops = [ + { id = "chaos_rune", amount = 20, chance = 64 }, + { id = "strawberry_seed", chance = 64 }, + { id = "limpwurt_seed", chance = 64 }, + { id = "belladonna_seed", chance = 64 }, + { id = "watermelon_seed", chance = 64 }, + { id = "toadflax_seed", chance = 64 }, + { id = "jangerberry_seed", chance = 64 }, + { id = "marrentill_seed", chance = 64 }, + { id = "tarromin_seed", chance = 64 }, + { id = "harralander_seed", chance = 64 }, + { id = "muddy_key", chance = 64 }, + { id = "mithril_bar", chance = 64 }, + { id = "mithril_longsword", chance = 32 }, + { id = "mithril_sq_shield", chance = 32 }, + { id = "poison_ivy_seed", chance = 32 }, + { id = "lantadyme_seed", chance = 32 }, + { id = "rune_javelin", amount = 5, chance = 6 }, + { id = "ranarr_seed", chance = 6 }, + { id = "spirit_weed_seed", chance = 6 }, + { id = "kwuarm_seed", chance = 6 }, + { id = "avantoe_seed", chance = 6 }, + { id = "snapdragon_seed", chance = 6 }, + { id = "torstol_seed", chance = 6 }, + { id = "uncut_sapphire", chance = 6 }, + { id = "uncut_emerald", chance = 6 }, + { id = "uncut_ruby", chance = 6 }, + { id = "uncut_diamond", chance = 6 }, + { id = "nature_talisman", chance = 6 }, + { id = "starved_ancient_effigy", chance = 6 }, + { id = "dragon_pickaxe", chance = 2 }, + { id = "dragon_spear", chance = 2 }, + { id = "rune_spear", chance = 2 }, + { id = "shield_left_half", chance = 2 }, + { id = "loop_half_of_a_key", chance = 2 }, + { id = "tooth_half_of_a_key", chance = 2 }, +] diff --git a/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml b/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml index dcd0318479..73c614eda0 100644 --- a/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml +++ b/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml @@ -1,6 +1,7 @@ [chaos_dwogre_chaos_dwarf_battlefield] id = 8771 examine = "A magical cross between an ogre and a dwarf." +drop_table = "chaos_dwogre" [black_guard_chaos_dwarf_battlefield] id = 8772 @@ -16,42 +17,51 @@ slayer_xp = 40.0 categories = ["dwarves"] respawn_delay = 30 examine = "A member of the Black Guard, a special division of the dwarven army." +drop_table = "black_guard" [black_guard_chaos_dwarf_battlefield_2] id = 8773 clone = "black_guard_chaos_dwarf_battlefield" +drop_table = "black_guard" [black_guard_chaos_dwarf_battlefield_3] id = 8774 clone = "black_guard_chaos_dwarf_battlefield" +drop_table = "black_guard" [chaos_dwarf_hand_cannoneer_chaos_dwarf_battlefield] id = 8776 categories = ["dwarves"] examine = "A dwarf gone bad." +drop_table = "chaos_dwarf_hand_cannoneer" [chaos_dwarf_hand_cannoneer_chaos_dwarf_battlefield_2] id = 8777 categories = ["dwarves"] examine = "A dwarf gone bad." +drop_table = "chaos_dwarf_hand_cannoneer" [chaos_dwarf_chaos_dwarf_battlefield] id = 8778 +drop_table = "chaos_dwarf" [chaos_dwarf_chaos_dwarf_battlefield_2] id = 8779 categories = ["dwarves"] examine = "A dwarf gone bad." +drop_table = "chaos_dwarf" [black_guard_crossbowdwarf_chaos_dwarf_battlefield] id = 8781 categories = ["dwarves"] examine = "A member of the Black Guard with a crossbow." +drop_table = "black_guard_crossbowdwarf" [black_guard_crossbowdwarf_chaos_dwarf_battlefield_2] id = 8782 categories = ["dwarves"] examine = "A member of the Black Guard with a crossbow." +drop_table = "black_guard_crossbowdwarf" [black_guard_berserker_chaos_dwarf_battlefield] id = 8783 @@ -68,10 +78,12 @@ slayer_xp = 50.0 categories = ["dwarves"] respawn_delay = 30 examine = "An elite member of the Black Guard." +drop_table = "black_guard_berserker" [black_guard_berserker_chaos_dwarf_battlefield_2] id = 8784 clone = "black_guard_berserker_chaos_dwarf_battlefield" +drop_table = "black_guard_berserker" [colonel_grenda_chaos_dwarf_battlefield] id = 8818 diff --git a/data/area/fremennik_province/keldagrim/keldagrim.drops.toml b/data/area/fremennik_province/keldagrim/keldagrim.drops.toml index c71bf30b8e..6ba04a0ae8 100644 --- a/data/area/fremennik_province/keldagrim/keldagrim.drops.toml +++ b/data/area/fremennik_province/keldagrim/keldagrim.drops.toml @@ -76,4 +76,28 @@ drops = [ roll = 128 drops = [ { table = "medium_clue_scroll" }, -] \ No newline at end of file +] +[trade_floor_guard_drop_table] +type = "all" +drops = [ + { table = "trade_floor_guard_secondary" }, + { table = "easy_clue_scroll", roll = 16 }, +] + +[trade_floor_guard_secondary] +roll = 1024 +drops = [ + { id = "bones", chance = 64 }, + { id = "bronze_warhammer", chance = 64 }, + { id = "iron_warhammer", chance = 64 }, + { id = "steel_warhammer", chance = 64 }, + { id = "black_warhammer", chance = 64 }, + { id = "coins", chance = 64 }, + { id = "iron_ore", chance = 64 }, + { id = "tin_ore", chance = 64 }, + { id = "grimy_guam", chance = 64 }, + { id = "cake", chance = 64 }, + { id = "keg_of_beer", chance = 64 }, + { id = "bucket_of_water", chance = 64 }, + { id = "nature_talisman", chance = 64 }, +] diff --git a/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml b/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml index d588e471e1..88fe9fcf62 100644 --- a/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml +++ b/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml @@ -626,6 +626,7 @@ examine = "A private dwarven guard." id = 8813 categories = ["dwarves"] examine = "An elite Black Guard soldier assigned to protect the trade floor." +drop_table = "trade_floor_guard" [colonel_grenda_keldagrim] id = 8817 diff --git a/data/area/fremennik_province/miscellania/miscellania.drops.toml b/data/area/fremennik_province/miscellania/miscellania.drops.toml index 785ba12081..5ff4a85a83 100644 --- a/data/area/fremennik_province/miscellania/miscellania.drops.toml +++ b/data/area/fremennik_province/miscellania/miscellania.drops.toml @@ -53,3 +53,9 @@ drops = [ { id = "casket" }, { table = "gem_drop_table" }, ] + +[alrik_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] diff --git a/data/area/fremennik_province/miscellania/miscellania.npcs.toml b/data/area/fremennik_province/miscellania/miscellania.npcs.toml index 58862d894c..deddc52cf8 100644 --- a/data/area/fremennik_province/miscellania/miscellania.npcs.toml +++ b/data/area/fremennik_province/miscellania/miscellania.npcs.toml @@ -9,6 +9,7 @@ slayer_xp = 4.0 categories = ["birds"] respawn_delay = 30 examine = "An inhabitant of icy regions." +drop_table = "bones" [gull_miscellania] id = 1325 @@ -130,6 +131,7 @@ style = "crush" max_hit_melee = 10 respawn_delay = 50 examine = "A subject of Miscellania." +drop_table = "bones" [einar] id = 1380 @@ -143,6 +145,7 @@ examine = "A subject of Miscellania." [alrik] id = 1381 examine = "A subject of Miscellania." +drop_table = "alrik" [thorhild] id = 1382 @@ -161,6 +164,7 @@ max_hit_melee = 10 respawn_delay = 50 shop = "miscellanian_clothes_shop" examine = "A subject of Miscellania." +drop_table = "bones" [sailor_miscellania] id = 1385 @@ -180,6 +184,7 @@ examine = "A subject of Miscellania." [thora] id = 1387 examine = "A subject of Miscellania." +drop_table = "bones" [valgerd] id = 1388 @@ -191,6 +196,7 @@ style = "crush" max_hit_melee = 10 respawn_delay = 25 examine = "A subject of Miscellania." +drop_table = "bones" [broddi] id = 1390 @@ -249,9 +255,11 @@ id = 1399 id = 1401 categories = ["birds"] examine = "Yep. Definitely a chicken." +drop_table = "chicken" [chicken_miscellania_2] id = 1402 +drop_table = "chicken" [rooster_miscellania] id = 1403 @@ -263,6 +271,7 @@ categories = ["birds"] immune_poison = true respawn_delay = 25 examine = "He rules the, er, roost." +drop_table = "rooster" [rabbit_miscellania] id = 1404 @@ -407,6 +416,7 @@ examine = "Perhaps this gardener might look after your crops for you." [rabbit_miscellania_2] id = 5829 +drop_table = "rabbit" [king_vargas_2] id = 7403 diff --git a/data/area/fremennik_province/pirates_cove/pirates_cove.drops.toml b/data/area/fremennik_province/pirates_cove/pirates_cove.drops.toml new file mode 100644 index 0000000000..b5af4d1c01 --- /dev/null +++ b/data/area/fremennik_province/pirates_cove/pirates_cove.drops.toml @@ -0,0 +1,24 @@ +[jake_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "jake_secondary" }, +] + +[jake_secondary] +roll = 1024 +drops = [ + { id = "eye_patch", chance = 32 }, +] + +[wilson_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] + +[palmer_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] diff --git a/data/area/fremennik_province/pirates_cove/pirates_cove.npcs.toml b/data/area/fremennik_province/pirates_cove/pirates_cove.npcs.toml index 69bbd3d614..5494916492 100644 --- a/data/area/fremennik_province/pirates_cove/pirates_cove.npcs.toml +++ b/data/area/fremennik_province/pirates_cove/pirates_cove.npcs.toml @@ -12,6 +12,7 @@ slayer_xp = 20.0 categories = ["pirates"] respawn_delay = 25 examine = "Avast ye scurvy land lubbers!" +drop_table = "pirate" [lokar_searunner_after] id = 4537 @@ -27,6 +28,7 @@ style = "crush" max_hit_melee = 40 respawn_delay = 25 examine = "A deadly pirate." +drop_table = "jake" [wilson_pirates_cove] id = 4548 @@ -38,6 +40,7 @@ style = "crush" max_hit_melee = 40 respawn_delay = 25 examine = "A pirate." +drop_table = "wilson" [palmer_pirates_cove] id = 4552 @@ -49,6 +52,7 @@ style = "crush" max_hit_melee = 40 respawn_delay = 25 examine = "Nice shave." +drop_table = "palmer" [sticky_sanders_pirates_cove] id = 4557 diff --git a/data/area/fremennik_province/rellekka/brine_rat_cavern/brine_rat_cavern.drops.toml b/data/area/fremennik_province/rellekka/brine_rat_cavern/brine_rat_cavern.drops.toml index 68b75e6e4e..fad9b5f9a8 100644 --- a/data/area/fremennik_province/rellekka/brine_rat_cavern/brine_rat_cavern.drops.toml +++ b/data/area/fremennik_province/rellekka/brine_rat_cavern/brine_rat_cavern.drops.toml @@ -33,3 +33,56 @@ drops = [ { id = "nothing", amount = 0, chance = 64 }, { id = "water_talisman", chance = 12 }, ] + +[skeleton_fremennik_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "skeleton_fremennik_secondary" }, +] + +[skeleton_fremennik_secondary] +roll = 1431 +drops = [ + { id = "black_hatchet", chance = 64 }, + { id = "coins", amount = 20, chance = 64 }, + { id = "guam_seed", chance = 32 }, + { id = "marrentill_seed", chance = 32 }, + { id = "tarromin_seed", chance = 32 }, + { id = "harralander_seed", chance = 32 }, + { id = "toadflax_seed", chance = 32 }, + { id = "spirit_weed_seed", chance = 32 }, + { id = "ranarr_seed", chance = 32 }, + { id = "irit_seed", chance = 32 }, + { id = "avantoe_seed", chance = 32 }, + { id = "kwuarm_seed", chance = 32 }, + { id = "snapdragon_seed", chance = 32 }, + { id = "cadantine_seed", chance = 32 }, + { id = "lantadyme_seed", chance = 32 }, + { id = "dwarf_weed_seed", chance = 32 }, + { id = "torstol_seed", chance = 32 }, + { id = "jangerberry_seed", chance = 32 }, + { id = "poison_ivy_seed", chance = 32 }, + { id = "cactus_seed", chance = 32 }, + { id = "watermelon_seed", chance = 32 }, + { id = "whiteberry_seed", chance = 32 }, + { id = "limpwurt_seed", chance = 32 }, + { id = "strawberry_seed", chance = 32 }, + { id = "wildblood_seed", chance = 32 }, + { id = "air_rune", amount = 60, chance = 32 }, + { id = "chaos_rune", amount = 9, chance = 32 }, + { id = "cosmic_rune", amount = 4, chance = 32 }, + { id = "water_rune", amount = 20, chance = 32 }, + { id = "law_rune", amount = 2, chance = 32 }, + { id = "chaos_talisman", chance = 32 }, + { id = "steel_med_helm", chance = 32 }, + { id = "steel_sword", chance = 32 }, + { id = "mithril_arrow", amount = 8, chance = 32 }, + { id = "mithril_scimitar", chance = 32 }, + { id = "bronze_pickaxe", chance = 32 }, + { id = "mithril_bar", chance = 32 }, + { id = "loop_half_of_a_key", chance = 32 }, + { id = "tooth_half_of_a_key", chance = 32 }, + { id = "uncut_diamond", chance = 32 }, + { id = "uncut_emerald", chance = 6 }, +] diff --git a/data/area/fremennik_province/rellekka/brine_rat_cavern/brine_rat_cavern.npcs.toml b/data/area/fremennik_province/rellekka/brine_rat_cavern/brine_rat_cavern.npcs.toml index de56a47aac..a5fa5e39a5 100644 --- a/data/area/fremennik_province/rellekka/brine_rat_cavern/brine_rat_cavern.npcs.toml +++ b/data/area/fremennik_province/rellekka/brine_rat_cavern/brine_rat_cavern.npcs.toml @@ -12,14 +12,17 @@ slayer_xp = 25.0 categories = ["skeletons"] respawn_delay = 50 examine = "Could use a good meal." +drop_table = "skeleton_fremennik" [skeleton_fremennik_2] id = 3698 clone = "skeleton_fremennik" +drop_table = "skeleton_fremennik" [skeleton_fremennik_3] id = 3699 clone = "skeleton_fremennik" +drop_table = "skeleton_fremennik" [skeleton_fremennik_4] id = 3700 @@ -35,14 +38,17 @@ slayer_xp = 35.0 categories = ["skeletons"] respawn_delay = 50 examine = "He seems a little underweight." +drop_table = "skeleton_fremennik" [skeleton_fremennik_5] id = 3701 clone = "skeleton_fremennik_4" +drop_table = "skeleton_fremennik" [skeleton_fremennik_6] id = 3702 clone = "skeleton_fremennik_4" +drop_table = "skeleton_fremennik" [skeleton_fremennik_7] id = 3703 @@ -58,10 +64,12 @@ slayer_xp = 40.0 categories = ["skeletons"] respawn_delay = 50 examine = "He seems a little underweight." +drop_table = "skeleton_fremennik" [skeleton_fremennik_8] id = 3704 clone = "skeleton_fremennik_7" +drop_table = "skeleton_fremennik" [brine_rat] id = 3707 diff --git a/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.drops.toml b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.drops.toml new file mode 100644 index 0000000000..1bb9de2781 --- /dev/null +++ b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.drops.toml @@ -0,0 +1,113 @@ +[yeti_drop_table] +type = "all" +drops = [ + { id = "big_bones" }, + { table = "yeti_secondary" }, + { table = "medium_clue_scroll", roll = 170 }, +] + +[yeti_secondary] +roll = 1043 +drops = [ + { id = "iron_arrow_p", min = 8, max = 10, chance = 64 }, + { id = "steel_arrow", min = 15, max = 26, chance = 64 }, + { id = "earth_rune", amount = 21, chance = 64 }, + { id = "blood_rune", chance = 64 }, + { id = "chaos_rune", amount = 15, chance = 64 }, + { id = "super_attack_2", chance = 64 }, + { id = "super_defence_2", chance = 64 }, + { id = "silver_ore", chance = 64 }, + { id = "gold_ore", chance = 64 }, + { id = "swordfish", chance = 64 }, + { id = "chilli_potato", chance = 64 }, + { id = "steel_throwing_axe", min = 12, max = 21, chance = 32 }, + { id = "law_rune", min = 10, max = 13, chance = 32 }, + { id = "nature_rune", amount = 4, chance = 32 }, + { id = "earth_talisman", chance = 32 }, + { id = "mithril_sq_shield", chance = 32 }, + { id = "uncut_sapphire", chance = 32 }, + { id = "super_restore_1", chance = 32 }, + { id = "fire_talisman", chance = 6 }, + { id = "adamant_med_helm", chance = 6 }, + { id = "uncut_emerald", chance = 6 }, + { id = "uncut_ruby", chance = 6 }, + { id = "antipoison_1", chance = 6 }, + { id = "prayer_potion_1", chance = 6 }, + { id = "coins", amount = 525, chance = 6 }, + { id = "starved_ancient_effigy", chance = 6 }, + { id = "chaos_rune", amount = 99, chance = 2 }, + { id = "uncut_diamond", chance = 2 }, + { id = "long_bone", chance = 2 }, + { id = "curved_bone", chance = 2 }, +] + +[gnoeals_drop_table] +type = "all" +drops = [ + { id = "big_bones" }, + { table = "gnoeals_secondary" }, + { table = "medium_clue_scroll", roll = 170 }, +] + +[gnoeals_secondary] +roll = 1257 +drops = [ + { id = "chaos_rune", chance = 64 }, + { id = "death_rune", min = 1, max = 4, chance = 64 }, + { id = "water_rune", chance = 64 }, + { id = "bass", chance = 64 }, + { id = "swordfish", chance = 64 }, + { id = "chilli_potato", chance = 64 }, + { id = "super_defence_2", chance = 64 }, + { id = "super_attack_2", chance = 64 }, + { id = "silver_ore", chance = 64 }, + { id = "silver_bar", chance = 64 }, + { id = "gold_bar", chance = 64 }, + { id = "blood_rune", chance = 32 }, + { id = "lava_rune", min = 12, max = 13, chance = 32 }, + { id = "prayer_potion_1", chance = 32 }, + { id = "steel_throwing_axe", min = 1, max = 18, chance = 32 }, + { id = "grimy_guam", chance = 32 }, + { id = "grimy_marrentill", chance = 32 }, + { id = "grimy_tarromin", chance = 32 }, + { id = "gold_ore", chance = 32 }, + { id = "uncut_sapphire", chance = 32 }, + { id = "uncut_emerald", chance = 32 }, + { id = "nature_rune", min = 2, max = 3, chance = 6 }, + { id = "antipoison_1", chance = 6 }, + { id = "super_restore_1", chance = 6 }, + { id = "mithril_warhammer", chance = 6 }, + { id = "adamant_med_helm", chance = 6 }, + { id = "grimy_harralander", chance = 6 }, + { id = "grimy_ranarr", chance = 6 }, + { id = "grimy_irit", chance = 6 }, + { id = "grimy_avantoe", chance = 6 }, + { id = "grimy_kwuarm", chance = 6 }, + { id = "grimy_cadantine", chance = 6 }, + { id = "guam_seed", chance = 6 }, + { id = "marrentill_seed", chance = 6 }, + { id = "tarromin_seed", chance = 6 }, + { id = "harralander_seed", chance = 6 }, + { id = "toadflax_seed", chance = 6 }, + { id = "spirit_weed_seed", chance = 6 }, + { id = "irit_seed", chance = 6 }, + { id = "avantoe_seed", chance = 6 }, + { id = "cadantine_seed", chance = 6 }, + { id = "kwuarm_seed", chance = 6 }, + { id = "uncut_ruby", chance = 6 }, + { id = "dragon_spear", chance = 2 }, + { id = "dragon_med_helm", chance = 2 }, + { id = "shield_left_half", chance = 2 }, + { id = "rune_javelin", amount = 5, chance = 2 }, + { id = "grimy_lantadyme", chance = 2 }, + { id = "grimy_dwarf_weed", chance = 2 }, + { id = "ranarr_seed", chance = 2 }, + { id = "snapdragon_seed", chance = 2 }, + { id = "lantadyme_seed", chance = 2 }, + { id = "dwarf_weed_seed", chance = 2 }, + { id = "torstol_seed", chance = 2 }, + { id = "uncut_diamond", chance = 2 }, + { id = "loop_half_of_a_key", chance = 2 }, + { id = "tooth_half_of_a_key", chance = 2 }, + { id = "starved_ancient_effigy", chance = 2 }, +] diff --git a/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml index 341e88a8d8..40f67df0b4 100644 --- a/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml +++ b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml @@ -24,16 +24,20 @@ examine = "He must be good at hunting; even his hair blends in with the surround [yeti] id = 7379 examine = "Aww, aren't the little ones cute?" +drop_table = "yeti" [yeti_2] id = 7380 +drop_table = "yeti" [gnoeals] id = 7381 examine = "A strange, magical beast." +drop_table = "gnoeals" [gnoeals_2] id = 7382 +drop_table = "gnoeals" [erjolf_base] id = 7405 diff --git a/data/area/fremennik_province/rellekka/rellekka.drops.toml b/data/area/fremennik_province/rellekka/rellekka.drops.toml index 71a32025cc..321b86b7f2 100644 --- a/data/area/fremennik_province/rellekka/rellekka.drops.toml +++ b/data/area/fremennik_province/rellekka/rellekka.drops.toml @@ -105,3 +105,24 @@ drops = [ { id = "ring_mould" }, { table = "gem_drop_table" }, ] + +[unicorn_foal_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] + +[fenris_wolf_drop_table] +type = "all" +drops = [ + { id = "wolf_bones" }, + { id = "fenris_wolf_pelt" }, + { table = "fenris_wolf_secondary" }, +] + +[fenris_wolf_secondary] +roll = 1024 +drops = [ + { id = "wolf_bone", chance = 32 }, + { id = "starved_ancient_effigy", chance = 6 }, +] diff --git a/data/area/fremennik_province/rellekka/rellekka.npcs.toml b/data/area/fremennik_province/rellekka/rellekka.npcs.toml index 8aa060ecc4..5321191642 100644 --- a/data/area/fremennik_province/rellekka/rellekka.npcs.toml +++ b/data/area/fremennik_province/rellekka/rellekka.npcs.toml @@ -142,6 +142,7 @@ clone = "agnar_rellekka" [freygerd_rellekka] id = 1310 clone = "agnar_rellekka" +drop_table = "bones" [lensa_rellekka] id = 1311 @@ -238,11 +239,13 @@ style = "stab" max_hit_melee = 20 respawn_delay = 90 examine = "Horned Horsey." +drop_table = "unicorn_foal" [fenris_wolf_rellekka] id = 1330 categories = ["wolves"] examine = "Fearsome predator found only in the Fremennik Province, renowned for its fur." +drop_table = "fenris_wolf" [fishing_spot_rellekka] id = 1331 diff --git a/data/area/fremennik_province/waterbirth_island/waterbirth_island.drops.toml b/data/area/fremennik_province/waterbirth_island/waterbirth_island.drops.toml index 5e03c69878..f88b711145 100644 --- a/data/area/fremennik_province/waterbirth_island/waterbirth_island.drops.toml +++ b/data/area/fremennik_province/waterbirth_island/waterbirth_island.drops.toml @@ -164,3 +164,71 @@ drops = [ { table = "hard_clue_scroll", chance = 119 }, { table = "elite_clue_scroll", chance = 6 }, ] + +[dagannoth_guardian_drop_table] +type = "all" +drops = [ + { id = "big_bones" }, + { table = "dagannoth_guardian_secondary" }, + { table = "medium_clue_scroll", roll = 32 }, +] + +[dagannoth_guardian_secondary] +roll = 1814 +drops = [ + { id = "super_attack_3", chance = 64 }, + { id = "super_defence_3", chance = 64 }, + { id = "swordfish", chance = 64 }, + { id = "keg_of_beer", chance = 64 }, + { id = "pure_essence", amount = 2, chance = 64 }, + { id = "rune_javelin", amount = 5, chance = 32 }, + { id = "iron_arrow_p", min = 7, max = 18, chance = 32 }, + { id = "steel_arrow", min = 11, max = 33, chance = 32 }, + { id = "grimy_guam", chance = 32 }, + { id = "grimy_marrentill", chance = 32 }, + { id = "grimy_tarromin", chance = 32 }, + { id = "grimy_harralander", chance = 32 }, + { id = "grimy_ranarr", chance = 32 }, + { id = "grimy_irit", chance = 32 }, + { id = "grimy_avantoe", chance = 32 }, + { id = "grimy_cadantine", chance = 32 }, + { id = "grimy_lantadyme", chance = 32 }, + { id = "grimy_dwarf_weed", chance = 32 }, + { id = "strawberry_seed", chance = 32 }, + { id = "whiteberry_seed", chance = 32 }, + { id = "lantadyme_seed", chance = 32 }, + { id = "jangerberry_seed", chance = 32 }, + { id = "limpwurt_seed", chance = 32 }, + { id = "cactus_seed", chance = 32 }, + { id = "kwuarm_seed", chance = 32 }, + { id = "snapdragon_seed", chance = 32 }, + { id = "ranarr_seed", chance = 32 }, + { id = "harralander_seed", chance = 32 }, + { id = "marrentill_seed", chance = 32 }, + { id = "wildblood_seed", chance = 32 }, + { id = "tarromin_seed", chance = 32 }, + { id = "spirit_weed_seed", chance = 32 }, + { id = "watermelon_seed", chance = 32 }, + { id = "super_antipoison_1", chance = 32 }, + { id = "super_restore_1", chance = 32 }, + { id = "prayer_potion_1", chance = 32 }, + { id = "coins", min = 420, max = 1139, chance = 32 }, + { id = "water_rune", min = 10, max = 36, chance = 32 }, + { id = "water_talisman", chance = 32 }, + { id = "nature_talisman", chance = 32 }, + { id = "uncut_sapphire", chance = 32 }, + { id = "uncut_emerald", chance = 32 }, + { id = "uncut_ruby", chance = 32 }, + { id = "uncut_diamond", chance = 32 }, + { id = "dagannoth_hide", chance = 32 }, + { id = "loop_half_of_a_key", chance = 32 }, + { id = "tooth_half_of_a_key", chance = 32 }, + { id = "warrior_helm", chance = 6 }, + { id = "berserker_helm", chance = 6 }, + { id = "farseer_helm", chance = 6 }, + { id = "archer_helm", chance = 6 }, + { id = "dragon_spear", chance = 6 }, + { id = "torstol_seed", chance = 6 }, + { id = "long_bone", chance = 6 }, + { id = "curved_bone", chance = 6 }, +] diff --git a/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml b/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml index 284dc79a88..97d522d352 100644 --- a/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml +++ b/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml @@ -48,10 +48,12 @@ id = 9104 id = 9092 categories = ["dagannoth"] examine = "The Dagannoth Mother's guardians." +drop_table = "dagannoth_guardian" [bardur] id = 2879 examine = "A Fremennik warrior, hard at work." +drop_table = "bones" [dagannoth_fledgeling] id = 2880 diff --git a/data/area/kandarin/ape_atoll/ape_atoll.drops.toml b/data/area/kandarin/ape_atoll/ape_atoll.drops.toml index 88838c7e6d..8c899b78e9 100644 --- a/data/area/kandarin/ape_atoll/ape_atoll.drops.toml +++ b/data/area/kandarin/ape_atoll/ape_atoll.drops.toml @@ -75,3 +75,29 @@ type = "all" drops = [ { id = "medium_ninja_monkey_bones" }, ] + +[monkey_guard_drop_table] +type = "all" +drops = [ + { id = "monkey_bones" }, + { table = "monkey_guard_secondary" }, +] + +[monkey_guard_secondary] +roll = 1024 +drops = [ + { id = "foot_bone", chance = 64 }, +] + +[snake_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "snake_secondary" }, +] + +[snake_secondary] +roll = 1024 +drops = [ + { id = "snake_spine", chance = 32 }, +] diff --git a/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml b/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml index 337923ff34..017c3b8230 100644 --- a/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml +++ b/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml @@ -24,6 +24,7 @@ height = 10 respawn_delay = 2 hunt_mode = "cowardly" examine = "It's an extremely small brown spider, probably very poisonous." +drop_table = "spider" [pedestal_ape_atoll] id = 13176 @@ -221,10 +222,12 @@ slayer_xp = 130.0 categories = ["monkeys"] respawn_delay = 50 examine = "A huge brutish gorilla armoured with dangerous looking vambraces." +drop_table = "monkey_guard" [monkey_guard_ape_atoll_4] id = 1460 clone = "monkey_guard_ape_atoll_3" +drop_table = "monkey_guard" [elder_guard_ape_atoll] id = 1461 @@ -283,6 +286,7 @@ slayer_xp = 60.0 categories = ["monkeys", "zombies"] respawn_delay = 50 examine = "A recently deceased monkey. Its flesh seems to be worse for the wear." +drop_table = "monkey_zombie" [scorpion_ape_atoll] id = 1477 @@ -297,6 +301,7 @@ respawn_delay = 50 slayer_xp = 15.0 categories = ["scorpions"] examine = "It's an extremely dangerous looking scorpion." +drop_table = "scorpion" [jungle_spider_ape_atoll] id = 1478 @@ -311,9 +316,11 @@ xp_bonus = 2.5 respawn_delay = 50 categories = ["spiders"] examine = "A very dangerous looking spider, with its fangs unsheathed." +drop_table = "jungle_spider" [snake_ape_atoll] id = 1479 +drop_table = "snake" [bird_black] id = 1475 @@ -327,6 +334,7 @@ slayer_xp = 10.0 categories = ["birds"] respawn_delay = 5 examine = "It's a brightly coloured bird of the jungle." +drop_table = "bones" [bird_green] id = 1476 @@ -341,6 +349,7 @@ slayer_xp = 5.0 respawn_delay = 5 categories = ["birds"] examine = "It's a brightly coloured bird of the jungle. It flies very quickly." +drop_table = "bones" [daero] id = 1407 diff --git a/data/area/kandarin/ape_atoll/tunnels/ape_atoll_tunnels.npcs.toml b/data/area/kandarin/ape_atoll/tunnels/ape_atoll_tunnels.npcs.toml index 6a03987740..af03487e3c 100644 --- a/data/area/kandarin/ape_atoll/tunnels/ape_atoll_tunnels.npcs.toml +++ b/data/area/kandarin/ape_atoll/tunnels/ape_atoll_tunnels.npcs.toml @@ -14,4 +14,5 @@ examine = "A wizened little Gnome dressed in brightly coloured clothes." id = 1471 categories = ["skeletons"] examine = "It looks just a bit... underfed." +drop_table = "skeleton" diff --git a/data/area/kandarin/ardougne/east_ardougne.drops.toml b/data/area/kandarin/ardougne/east_ardougne.drops.toml index 79bc5b9b3e..baef7f4814 100644 --- a/data/area/kandarin/ardougne/east_ardougne.drops.toml +++ b/data/area/kandarin/ardougne/east_ardougne.drops.toml @@ -103,4 +103,156 @@ drops = [ { id = "fire_orb", chance = 20 }, { id = "gold_ore", chance = 10 }, { table = "elite_clue_scroll" }, -] \ No newline at end of file +] +[woman_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "woman_secondary" }, + { table = "easy_clue_scroll", roll = 170 }, +] + +[woman_secondary] +roll = 1024 +drops = [ + { id = "coins", min = 1, max = 25, chance = 64 }, + { id = "bronze_arrow", amount = 7, chance = 32 }, + { id = "iron_dagger", chance = 32 }, + { id = "bronze_bolts", min = 2, max = 12, chance = 32 }, + { id = "bronze_med_helm", chance = 32 }, + { id = "earth_rune", amount = 4, chance = 32 }, + { id = "fire_rune", amount = 6, chance = 32 }, + { id = "mind_rune", amount = 9, chance = 32 }, + { id = "water_rune", amount = 7, chance = 32 }, + { id = "grimy_guam", chance = 32 }, + { id = "grimy_marrentill", chance = 32 }, + { id = "grimy_tarromin", chance = 32 }, + { id = "grimy_harralander", chance = 32 }, + { id = "grimy_kwuarm", chance = 32 }, + { id = "grimy_irit", chance = 32 }, + { id = "air_talisman", chance = 32 }, + { id = "earth_talisman", chance = 32 }, + { id = "cabbage", chance = 32 }, + { id = "fishing_bait", chance = 32 }, + { id = "copper_ore", chance = 32 }, + { id = "tin_ore", chance = 32 }, + { id = "staff_of_air", chance = 6 }, + { id = "chaos_rune", amount = 2, chance = 6 }, + { id = "grimy_avantoe", chance = 6 }, + { id = "grimy_cadantine", chance = 6 }, + { id = "grimy_ranarr", chance = 6 }, + { id = "grimy_lantadyme", chance = 6 }, + { id = "grimy_dwarf_weed", chance = 6 }, + { id = "body_rune", amount = 7, chance = 2 }, +] + +[man_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "man_secondary" }, + { table = "easy_clue_scroll", roll = 170 }, +] + +[man_secondary] +roll = 1024 +drops = [ + { id = "grimy_guam", chance = 64 }, + { id = "sling", chance = 64 }, + { id = "bronze_bolts", min = 2, max = 12, chance = 64 }, + { id = "coins", min = 1, max = 40, chance = 64 }, + { id = "earth_rune", amount = 4, chance = 32 }, + { id = "fire_rune", amount = 6, chance = 32 }, + { id = "mind_rune", amount = 9, chance = 32 }, + { id = "water_rune", amount = 7, chance = 32 }, + { id = "grimy_marrentill", chance = 32 }, + { id = "grimy_tarromin", chance = 32 }, + { id = "grimy_harralander", chance = 32 }, + { id = "grimy_ranarr", chance = 32 }, + { id = "grimy_kwuarm", chance = 32 }, + { id = "grimy_irit", chance = 32 }, + { id = "bronze_arrow", amount = 7, chance = 32 }, + { id = "iron_dagger", chance = 32 }, + { id = "bronze_med_helm", chance = 32 }, + { id = "air_talisman", chance = 32 }, + { id = "earth_talisman", chance = 32 }, + { id = "cabbage", chance = 32 }, + { id = "fishing_bait", chance = 32 }, + { id = "copper_ore", chance = 32 }, + { id = "tin_ore", chance = 32 }, + { id = "chaos_rune", amount = 2, chance = 6 }, + { id = "grimy_avantoe", chance = 6 }, + { id = "grimy_cadantine", chance = 6 }, + { id = "grimy_dwarf_weed", chance = 6 }, + { id = "staff_of_air", chance = 6 }, + { id = "body_rune", amount = 7, chance = 2 }, +] + +[paladin_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "paladin_secondary" }, + { table = "easy_clue_scroll", roll = 32 }, +] + +[paladin_secondary] +roll = 1024 +drops = [ + { id = "grimy_marrentill", chance = 64 }, + { id = "grimy_guam", chance = 64 }, + { id = "steel_sword", chance = 64 }, + { id = "water_rune", amount = 30, chance = 64 }, + { id = "iron_bar", chance = 64 }, + { id = "coins", amount = 2, chance = 64 }, + { id = "grimy_harralander", chance = 32 }, + { id = "grimy_tarromin", chance = 32 }, + { id = "steel_longsword", chance = 32 }, + { id = "steel_full_helm", chance = 32 }, + { id = "mithril_bar", chance = 32 }, + { id = "steel_bar", chance = 32 }, + { id = "law_talisman", chance = 32 }, + { id = "uncut_sapphire", chance = 32 }, + { id = "uncut_emerald", chance = 32 }, + { id = "uncut_ruby", chance = 32 }, + { id = "grimy_dwarf_weed", chance = 6 }, + { id = "grimy_irit", chance = 6 }, + { id = "grimy_ranarr", chance = 6 }, + { id = "blood_rune", chance = 6 }, + { id = "rune_javelin", amount = 5, chance = 6 }, + { id = "nature_talisman", chance = 6 }, + { id = "loop_half_of_a_key", chance = 6 }, + { id = "tooth_half_of_a_key", chance = 6 }, + { id = "court_summons", chance = 6 }, + { id = "grimy_lantadyme", chance = 2 }, + { id = "grimy_cadantine", chance = 2 }, + { id = "grimy_kwuarm", chance = 2 }, + { id = "grimy_avantoe", chance = 2 }, + { id = "shield_left_half", chance = 2 }, +] + +[warrior_woman_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] + +[hero_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] + +[knight_of_ardougne_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "knight_of_ardougne_secondary" }, + { table = "easy_clue_scroll", roll = 32 }, +] + +[knight_of_ardougne_secondary] +roll = 1024 +drops = [ + { id = "court_summons", chance = 32 }, +] diff --git a/data/area/kandarin/ardougne/east_ardougne.npcs.toml b/data/area/kandarin/ardougne/east_ardougne.npcs.toml index bed2e46c1f..5cbc8dd295 100644 --- a/data/area/kandarin/ardougne/east_ardougne.npcs.toml +++ b/data/area/kandarin/ardougne/east_ardougne.npcs.toml @@ -17,6 +17,7 @@ combat_def = "jogre_ardougne" hunt_mode = "cowardly" respawn_delay = 30 examine = "An aggressive humanoid." +drop_table = "jogre" [cyclops_ardougne] id = 116 @@ -50,6 +51,7 @@ examine = "He looks like the type of guy who would mind monkeys." [warrior_woman] id = 15 examine = "A woman, who is a warrior." +drop_table = "warrior_woman" [milton_the_miller] id = 1739 @@ -68,6 +70,7 @@ attack_bonus = 20 xp_bonus = 2.5 respawn_delay = 50 examine = "A holy warrior." +drop_table = "paladin" [hero] id = 21 @@ -82,10 +85,12 @@ attack_bonus = 20 xp_bonus = 2.5 respawn_delay = 50 examine = "Heroic!" +drop_table = "hero" [paladin_2] id = 2256 clone = "paladin" +drop_table = "paladin" [knight_of_ardougne] id = 23 @@ -100,6 +105,7 @@ attack_bonus = 8 respawn_delay = 25 hunt_mode = "guarding" examine = "A member of Ardougne's militia." +drop_table = "knight_of_ardougne" [richard_ardougne] id = 2306 @@ -116,10 +122,12 @@ examine = "Perhaps this gardener might look after your crops for you." [man_ardougne] id = 24 examine = "One of Gielinor's many citizens." +drop_table = "man" [woman_ardougne] id = 25 examine = "One of Gielinor's many citizens." +drop_table = "woman" [archer_ardougne] id = 27 @@ -182,6 +190,7 @@ attack_bonus = 4 respawn_delay = 50 attack_speed = 5 examine = "Keeps the peace... kind of." +drop_table = "guard" [edmond_ardougne] id = 3213 diff --git a/data/area/kandarin/ardougne/ibans_lair/ibans_lair.drops.toml b/data/area/kandarin/ardougne/ibans_lair/ibans_lair.drops.toml index 642422d082..2304289cf2 100644 --- a/data/area/kandarin/ardougne/ibans_lair/ibans_lair.drops.toml +++ b/data/area/kandarin/ardougne/ibans_lair/ibans_lair.drops.toml @@ -57,4 +57,9 @@ drops = [ { id = "coins", amount = 18, chance = 7 }, { id = "coins", amount = 30 }, { id = "nothing", amount = 0, chance = 16 }, -] \ No newline at end of file +] +[holthion_drop_table] +type = "all" +drops = [ + { id = "amulet_of_holthion" }, +] diff --git a/data/area/kandarin/ardougne/ibans_lair/ibans_lair.npcs.toml b/data/area/kandarin/ardougne/ibans_lair/ibans_lair.npcs.toml index 9947729c7a..fa82ff9d49 100644 --- a/data/area/kandarin/ardougne/ibans_lair/ibans_lair.npcs.toml +++ b/data/area/kandarin/ardougne/ibans_lair/ibans_lair.npcs.toml @@ -11,6 +11,7 @@ hunt_mode = "cowardly" immune_cannon = true respawn_delay = 30 examine = "One of the guardians of Iban." +drop_table = "holthion" [disciple_of_iban_ibans_lair] id = 1002 diff --git a/data/area/kandarin/ardougne/sewers/ardougne_sewers.drops.toml b/data/area/kandarin/ardougne/sewers/ardougne_sewers.drops.toml new file mode 100644 index 0000000000..8ca47e9010 --- /dev/null +++ b/data/area/kandarin/ardougne/sewers/ardougne_sewers.drops.toml @@ -0,0 +1,5 @@ +[hazeel_cultist_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] diff --git a/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml b/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml index eab3548868..af71135e8f 100644 --- a/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml +++ b/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml @@ -1,5 +1,6 @@ [dungeon_rat_ardougne_sewers] id = 4928 +drop_table = "dungeon_rat" [claus_the_chef_ardougne_sewers] id = 886 @@ -38,6 +39,7 @@ style = "crush" max_hit_melee = 20 respawn_delay = 50 examine = "A member of the Hazeel cult." +drop_table = "hazeel_cultist" [elena_southern_ardougne_sewer_normal] id = 3215 @@ -45,8 +47,10 @@ id = 3215 [giant_rat_ardounge_sewer] id = 4922 clone = "giant_rat_lumbridge_swamp" +drop_table = "giant_rat" [giant_rat_ardounge_sewer_stubby] id = 4923 clone = "giant_rat_lumbridge_swamp" +drop_table = "giant_rat" diff --git a/data/area/kandarin/ardougne/underground_pass/dungeon/underground_pass_dungeon.drops.toml b/data/area/kandarin/ardougne/underground_pass/dungeon/underground_pass_dungeon.drops.toml new file mode 100644 index 0000000000..a7989351d4 --- /dev/null +++ b/data/area/kandarin/ardougne/underground_pass/dungeon/underground_pass_dungeon.drops.toml @@ -0,0 +1,5 @@ +[blessed_giant_rat_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] diff --git a/data/area/kandarin/ardougne/underground_pass/dungeon/underground_pass_dungeon.npcs.toml b/data/area/kandarin/ardougne/underground_pass/dungeon/underground_pass_dungeon.npcs.toml index 73ca83bef8..b6a18ea7ae 100644 --- a/data/area/kandarin/ardougne/underground_pass/dungeon/underground_pass_dungeon.npcs.toml +++ b/data/area/kandarin/ardougne/underground_pass/dungeon/underground_pass_dungeon.npcs.toml @@ -8,10 +8,12 @@ slayer_xp = 30.0 categories = ["rats"] respawn_delay = 300 examine = "Some oversized vermin, blessed by Zamorak." +drop_table = "blessed_giant_rat" [blessed_giant_rat_underground_pass_dungeon_2] id = 978 clone = "blessed_giant_rat_underground_pass_dungeon" +drop_table = "blessed_giant_rat" [slave_underground_pass_dungeon] id = 979 diff --git a/data/area/kandarin/ardougne/underground_pass/underground_pass.drops.toml b/data/area/kandarin/ardougne/underground_pass/underground_pass.drops.toml index d93dbbfa90..0c04710585 100644 --- a/data/area/kandarin/ardougne/underground_pass/underground_pass.drops.toml +++ b/data/area/kandarin/ardougne/underground_pass/underground_pass.drops.toml @@ -46,3 +46,24 @@ drops = [ { table = "medium_clue_scroll", roll = 128 }, ] + +[khazard_trooper_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "khazard_trooper_secondary" }, +] + +[khazard_trooper_secondary] +roll = 1024 +drops = [ + { id = "bones", chance = 64 }, + { id = "iron_arrow", chance = 6 }, + { id = "starved_ancient_effigy", chance = 6 }, +] + +[khazard_warlord_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] diff --git a/data/area/kandarin/ardougne/underground_pass/underground_pass.npcs.toml b/data/area/kandarin/ardougne/underground_pass/underground_pass.npcs.toml index b1a8703821..1364a0e620 100644 --- a/data/area/kandarin/ardougne/underground_pass/underground_pass.npcs.toml +++ b/data/area/kandarin/ardougne/underground_pass/underground_pass.npcs.toml @@ -16,22 +16,27 @@ slayer_xp = 60.0 categories = ["ogres"] respawn_delay = 30 examine = "A large dim looking humanoid." +drop_table = "ogre" [man_underground_pass] id = 351 examine = "One of Ardougne's many citizens." +drop_table = "man" [woman_underground_pass] id = 352 examine = "One of Ardougne's many citizens." +drop_table = "woman" [woman_underground_pass_2] id = 353 examine = "One of Ardougne's many citizens." +drop_table = "woman" [woman_underground_pass_3] id = 354 examine = "One of Ardougne's many citizens." +drop_table = "woman" [child_underground_pass] id = 355 @@ -43,23 +48,28 @@ id = 356 [woman_underground_pass_4] id = 360 examine = "One of Ardougne's many citizens." +drop_table = "woman" [woman_underground_pass_5] id = 361 examine = "One of Ardougne's many citizens." +drop_table = "woman" [woman_underground_pass_6] id = 362 examine = "One of Ardougne's many citizens." +drop_table = "woman" [woman_underground_pass_7] id = 363 examine = "One of Ardougne's many citizens." +drop_table = "woman" [goblin_underground_pass] id = 4499 categories = ["goblins"] examine = "An ugly goblin... bleurgh!" +drop_table = "goblin" [khazard_trooper_underground_pass] id = 475 @@ -73,6 +83,7 @@ max_hit_melee = 30 attack_bonus = 8 respawn_delay = 100 examine = "It's one of General Khazard's warriors." +drop_table = "khazard_trooper" [khazard_warlord_underground_pass] id = 477 @@ -83,6 +94,7 @@ def = 80 style = "crush" max_hit_melee = 100 examine = "He looks real nasty, smells bad too." +drop_table = "khazard_warlord" [child_underground_pass_3] id = 6334 @@ -139,6 +151,7 @@ examine = "A citizen of Ardougne." id = 8658 categories = ["ogres"] examine = "A large dim looking humanoid." +drop_table = "ogre" [chadwell_underground_pass] id = 971 @@ -172,6 +185,7 @@ slayer_xp = 32.0 categories = ["spiders"] respawn_delay = 300 examine = "A nasty spider, blessed by Zamorak." +drop_table = "empty" [sir_jerro_underground_pass] id = 988 @@ -245,6 +259,7 @@ xp_bonus = -7.5 hunt_mode = "cowardly" respawn_delay = 50 examine = "A giant spider." +drop_table = "empty" [boulder_underground_pass] id = 986 diff --git a/data/area/kandarin/ardougne/west/west_ardougne.drops.toml b/data/area/kandarin/ardougne/west/west_ardougne.drops.toml new file mode 100644 index 0000000000..7139e299da --- /dev/null +++ b/data/area/kandarin/ardougne/west/west_ardougne.drops.toml @@ -0,0 +1,11 @@ +[mourner_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { id = "gas_mask" }, + { id = "mourner_top" }, + { id = "mourner_trousers" }, + { id = "mourner_boots" }, + { id = "mourner_gloves" }, + { id = "mourner_cloak" }, +] diff --git a/data/area/kandarin/ardougne/west/west_ardougne.npcs.toml b/data/area/kandarin/ardougne/west/west_ardougne.npcs.toml index 24c201420c..1ae714a1cd 100644 --- a/data/area/kandarin/ardougne/west/west_ardougne.npcs.toml +++ b/data/area/kandarin/ardougne/west/west_ardougne.npcs.toml @@ -34,14 +34,17 @@ examine = "A mourner, or plague healer." [mourner_1] id = 369 examine = "A mourner, or plague healer." +drop_table = "mourner" [mourner_2] id = 370 examine = "A mourner, or plague healer." +drop_table = "mourner" [mourner_3] id = 371 examine = "A mourner, or plague healer." +drop_table = "mourner" [mourner_vial_4] id = 372 @@ -57,6 +60,7 @@ style = "crush" max_hit_melee = 20 attack_bonus = 6 examine = "A mourner, or plague healer." +drop_table = "mourner" [mourner_5] id = 348 @@ -67,6 +71,7 @@ def = 12 style = "crush" max_hit_melee = 30 examine = "A mourner, or plague healer." +drop_table = "mourner" [mourner_staff] id = 357 @@ -87,6 +92,7 @@ def = 80 style = "stab" max_hit_melee = 100 examine = "A mourner, or plague healer." +drop_table = "mourner" [head_mourner] id = 2372 diff --git a/data/area/kandarin/battlefield/battlefield.drops.toml b/data/area/kandarin/battlefield/battlefield.drops.toml index 5cc23eca0b..830d52abc8 100644 --- a/data/area/kandarin/battlefield/battlefield.drops.toml +++ b/data/area/kandarin/battlefield/battlefield.drops.toml @@ -9,3 +9,17 @@ drops = [ drops = [ { id = "orb_of_protection" }, ] + +[gnome_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "gnome_secondary" }, +] + +[gnome_secondary] +roll = 1024 +drops = [ + { id = "lemon", chance = 32 }, + { id = "lime", chance = 32 }, +] diff --git a/data/area/kandarin/battlefield/battlefield.npcs.toml b/data/area/kandarin/battlefield/battlefield.npcs.toml index d6fcdc510c..c6f04d2db2 100644 --- a/data/area/kandarin/battlefield/battlefield.npcs.toml +++ b/data/area/kandarin/battlefield/battlefield.npcs.toml @@ -29,21 +29,26 @@ attack_bonus = -42 ranged_strength = 2 respawn_delay = 60 examine = "Like a mini man!" +drop_table = "gnome_troop" [gnome_troop_battlefield_2] id = 2248 clone = "gnome_troop_battlefield" +drop_table = "gnome_troop" [gnome_battlefield] id = 2249 clone = "gnome_troop_battlefield" +drop_table = "gnome" [gnome_battlefield_2] id = 2250 +drop_table = "gnome" [gnome_battlefield_3] id = 2251 clone = "gnome_troop_battlefield" +drop_table = "gnome" [gnome_archer] id = 3814 diff --git a/data/area/kandarin/baxtorian_falls/baxtorian_falls.npcs.toml b/data/area/kandarin/baxtorian_falls/baxtorian_falls.npcs.toml index 65f93d8a50..89f1028e60 100644 --- a/data/area/kandarin/baxtorian_falls/baxtorian_falls.npcs.toml +++ b/data/area/kandarin/baxtorian_falls/baxtorian_falls.npcs.toml @@ -35,11 +35,13 @@ id = 310 id = 4259 categories = ["dwarves"] examine = "A dwarven guard." +drop_table = "guard" [guard_baxtorian_falls_2] id = 4260 categories = ["dwarves"] examine = "A dwarven guard." +drop_table = "guard" [mysterious_ghost_baxtorian_falls_2] id = 2399 diff --git a/data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.drops.toml b/data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.drops.toml new file mode 100644 index 0000000000..1c892c7d8c --- /dev/null +++ b/data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.drops.toml @@ -0,0 +1,36 @@ +[skeleton_mage_drop_table] +type = "all" +drops = [ + { id = "ashes" }, + { table = "skeleton_mage_secondary" }, +] + +[skeleton_mage_secondary] +roll = 1024 +drops = [ + { id = "battlestaff", chance = 32 }, + { id = "pink_skirt", chance = 32 }, + { id = "mind_rune", min = 7, max = 9, chance = 32 }, + { id = "chaos_rune", min = 2, max = 4, chance = 32 }, + { id = "nature_rune", min = 1, max = 3, chance = 32 }, + { id = "law_rune", min = 2, max = 3, chance = 32 }, + { id = "uncut_sapphire", chance = 32 }, + { id = "uncut_opal", chance = 32 }, + { id = "uncut_ruby", chance = 32 }, + { id = "uncut_emerald", chance = 32 }, + { id = "grimy_guam", chance = 32 }, + { id = "grimy_marrentill", chance = 32 }, + { id = "grimy_harralander", chance = 32 }, + { id = "grimy_tarromin", chance = 32 }, + { id = "grimy_irit", chance = 32 }, + { id = "grimy_avantoe", chance = 32 }, + { id = "grimy_kwuarm", chance = 32 }, + { id = "grimy_cadantine", chance = 32 }, + { id = "grimy_lantadyme", chance = 32 }, + { id = "grimy_ranarr", chance = 32 }, + { id = "grimy_dwarf_weed", chance = 32 }, + { id = "coins", min = 29, max = 50, chance = 32 }, + { id = "pot_of_flour", chance = 32 }, + { id = "iron_bar", min = 1, max = 2, chance = 32 }, + { id = "big_bones", min = 2, max = 4, chance = 32 }, +] diff --git a/data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.npcs.toml b/data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.npcs.toml index b54fd4c171..20c597a3af 100644 --- a/data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.npcs.toml +++ b/data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.npcs.toml @@ -10,6 +10,7 @@ slayer_xp = 55.0 categories = ["spiders"] respawn_delay = 30 examine = "Is it a spider or is it a shadow?" +drop_table = "empty" [skeleton_mage_waterfall_dungeon] id = 94 @@ -24,3 +25,4 @@ slayer_xp = 17.0 categories = ["skeletons"] respawn_delay = 25 examine = "An undead worker of dark magic." +drop_table = "skeleton_mage" diff --git a/data/area/kandarin/feldip_hills/feldip_hills.drops.toml b/data/area/kandarin/feldip_hills/feldip_hills.drops.toml index 729aa573f1..144af0696a 100644 --- a/data/area/kandarin/feldip_hills/feldip_hills.drops.toml +++ b/data/area/kandarin/feldip_hills/feldip_hills.drops.toml @@ -84,4 +84,47 @@ drops = [ { id = "green_charm", chance = 140 }, { id = "crimson_charm", chance = 22 }, { id = "blue_charm", chance = 11 }, -] \ No newline at end of file +] +[ogress_warrior_drop_table] +type = "all" +drops = [ + { id = "big_bones" }, + { table = "ogress_warrior_secondary" }, +] + +[ogress_warrior_secondary] +roll = 1024 +drops = [ + { id = "iron_spear", chance = 64 }, + { id = "ogre_club", chance = 64 }, +] + +[ogress_drop_table] +type = "all" +drops = [ + { id = "big_bones" }, + { table = "ogress_secondary" }, +] + +[ogress_secondary] +roll = 1024 +drops = [ + { id = "ogre_club", chance = 32 }, + { id = "iron_spear", chance = 32 }, + { id = "long_bone", chance = 6 }, +] + +[ogress_champion_drop_table] +type = "all" +drops = [ + { id = "big_bones" }, + { table = "ogress_champion_secondary" }, +] + +[ogress_champion_secondary] +roll = 1024 +drops = [ + { id = "ogre_club", chance = 64 }, + { id = "iron_spear", chance = 64 }, + { id = "starved_ancient_effigy", chance = 6 }, +] diff --git a/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml b/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml index 1e648d1b49..708da572bb 100644 --- a/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml +++ b/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml @@ -12,10 +12,12 @@ slayer_xp = 60.0 categories = ["ogres"] respawn_delay = 30 examine = "A large dim looking humanoid." +drop_table = "ogre" [ogre_feldip_hills_2] id = 3451 clone = "ogre_feldip_hills" +drop_table = "ogre" [ogre_boat_feldip_hills] id = 3469 @@ -35,6 +37,7 @@ style = "crush" max_hit_melee = 10 respawn_delay = 7 examine = "It looks fluffy and cute; it's probably deadly." +drop_table = "empty" [black_warlock_feldip_hills] id = 5082 @@ -62,26 +65,31 @@ examine = "With all the furs, I almost mistook her for a wild animal." id = 7078 categories = ["ogres"] examine = "A fearsome adversary with no sense of humour." +drop_table = "ogress_champion" [ogress_warrior] id = 7079 categories = ["ogres"] examine = "Irascible, belligerent and stupefyingly impolite." +drop_table = "ogress_warrior" [ogress_warrior_2] id = 7080 categories = ["ogres"] examine = "Irascible, belligerent and stupefyingly impolite." +drop_table = "ogress_warrior" [ogress_feldip_hills] id = 7081 categories = ["ogres"] examine = "A large and contentious lady ogre." +drop_table = "ogress" [ogress_feldip_hills_2] id = 7082 categories = ["ogres"] examine = "A large and contentious lady ogre." +drop_table = "ogress" [rantz_feldip_hills_2] id = 8659 diff --git a/data/area/kandarin/feldip_hills/jiggig/jiggig.npcs.toml b/data/area/kandarin/feldip_hills/jiggig/jiggig.npcs.toml index 4833dd0efd..84e671ebfa 100644 --- a/data/area/kandarin/feldip_hills/jiggig/jiggig.npcs.toml +++ b/data/area/kandarin/feldip_hills/jiggig/jiggig.npcs.toml @@ -61,15 +61,18 @@ categories = ["ogres"] categories = ["skeletons"] respawn_delay = 50 examine = "An undead skeletal ogre." +drop_table = "skogre" [skogre_jiggig_2] id = 2056 retaliates = false clone = "skogre_jiggig" +drop_table = "skogre" [skogre_jiggig_3] id = 2057 clone = "skogre_jiggig" +drop_table = "skogre" [zogre_jiggig_3] id = 2051 diff --git a/data/area/kandarin/fishing_guild/fishing_guild.npcs.toml b/data/area/kandarin/fishing_guild/fishing_guild.npcs.toml index 17cb3784d5..f2adbc0e6f 100644 --- a/data/area/kandarin/fishing_guild/fishing_guild.npcs.toml +++ b/data/area/kandarin/fishing_guild/fishing_guild.npcs.toml @@ -6,26 +6,31 @@ examine = "The man in charge of the fishing guild." id = 4272 categories = ["goblins"] examine = "An ugly green creature." +drop_table = "goblin" [goblin_fishing_guild_2] id = 4273 categories = ["goblins"] examine = "An ugly green creature." +drop_table = "goblin" [goblin_fishing_guild_3] id = 4274 categories = ["goblins"] examine = "An ugly green creature." +drop_table = "goblin" [goblin_fishing_guild_4] id = 4275 categories = ["goblins"] examine = "An ugly green creature." +drop_table = "goblin" [goblin_fishing_guild_5] id = 4276 categories = ["goblins"] examine = "An ugly green creature." +drop_table = "goblin" [roachey] id = 592 diff --git a/data/area/kandarin/goblin_cave/goblin_cave.npcs.toml b/data/area/kandarin/goblin_cave/goblin_cave.npcs.toml index a9254be79d..1c9c01050a 100644 --- a/data/area/kandarin/goblin_cave/goblin_cave.npcs.toml +++ b/data/area/kandarin/goblin_cave/goblin_cave.npcs.toml @@ -6,6 +6,7 @@ examine = "A pile of boulders." id = 4929 categories = ["rats"] examine = "Overgrown vermin." +drop_table = "dungeon_rat" [goblin_guard_goblin_cave] id = 6496 diff --git a/data/area/kandarin/hazelmeres_island/hazelmeres_island.npcs.toml b/data/area/kandarin/hazelmeres_island/hazelmeres_island.npcs.toml index fc59eb8189..0b11446159 100644 --- a/data/area/kandarin/hazelmeres_island/hazelmeres_island.npcs.toml +++ b/data/area/kandarin/hazelmeres_island/hazelmeres_island.npcs.toml @@ -11,6 +11,7 @@ slayer_xp = 50.0 categories = ["spiders"] respawn_delay = 30 examine = "A barely visible deadly jungle spider." +drop_table = "jungle_spider" [larry_hazelmeres_island] id = 7576 diff --git a/data/area/kandarin/ourania/ourania.drops.toml b/data/area/kandarin/ourania/ourania.drops.toml index 70b839282f..b125ae1696 100644 --- a/data/area/kandarin/ourania/ourania.drops.toml +++ b/data/area/kandarin/ourania/ourania.drops.toml @@ -116,3 +116,9 @@ drops = [ { id = "crimson_charm", chance = 1650 }, { id = "blue_charm", chance = 525 }, ] + +[cave_lizard_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] diff --git a/data/area/kandarin/ourania/ourania.npcs.toml b/data/area/kandarin/ourania/ourania.npcs.toml index 1d07d0c946..27c3fedc3f 100644 --- a/data/area/kandarin/ourania/ourania.npcs.toml +++ b/data/area/kandarin/ourania/ourania.npcs.toml @@ -11,6 +11,7 @@ respawn_delay = 50 hunt_mode = "aggressive" hunt_range = 2 examine = "A cave dweller." +drop_table = "cave_lizard" [zamorak_warrior_kite] id = 6363 @@ -111,6 +112,7 @@ examine = "An evil human cleric." id = 491 categories = ["ghosts"] examine = "Spooky." +drop_table = "empty" [spirit_of_scorpius_ourania] id = 492 diff --git a/data/area/kandarin/piscatoris/hunter_area/piscatoris_hunter_area.npcs.toml b/data/area/kandarin/piscatoris/hunter_area/piscatoris_hunter_area.npcs.toml index c7fe8ffa6f..a7f4552acb 100644 --- a/data/area/kandarin/piscatoris/hunter_area/piscatoris_hunter_area.npcs.toml +++ b/data/area/kandarin/piscatoris/hunter_area/piscatoris_hunter_area.npcs.toml @@ -9,6 +9,7 @@ style = "crush" max_hit_melee = 10 respawn_delay = 7 examine = "It looks fluffy and cute; it's probably deadly." +drop_table = "empty" [ruby_harvest] id = 5085 diff --git a/data/area/kandarin/piscatoris/piscatoris.npcs.toml b/data/area/kandarin/piscatoris/piscatoris.npcs.toml index 9e0b598656..b03a87cf4a 100644 --- a/data/area/kandarin/piscatoris/piscatoris.npcs.toml +++ b/data/area/kandarin/piscatoris/piscatoris.npcs.toml @@ -43,6 +43,7 @@ slayer_xp = 80.0 categories = ["skeletons"] respawn_delay = 50 examine = "Doesn't seem to want to go away." +drop_table = "skeleton_mage" [brian_twitcher] id = 8579 diff --git a/data/area/kandarin/port_khazard/fight_arena/khazard_fight_arena.drops.toml b/data/area/kandarin/port_khazard/fight_arena/khazard_fight_arena.drops.toml new file mode 100644 index 0000000000..4ddd04b6ee --- /dev/null +++ b/data/area/kandarin/port_khazard/fight_arena/khazard_fight_arena.drops.toml @@ -0,0 +1,5 @@ +[khazard_guard_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] diff --git a/data/area/kandarin/port_khazard/fight_arena/khazard_fight_arena.npcs.toml b/data/area/kandarin/port_khazard/fight_arena/khazard_fight_arena.npcs.toml index d775a04216..b016ec8d45 100644 --- a/data/area/kandarin/port_khazard/fight_arena/khazard_fight_arena.npcs.toml +++ b/data/area/kandarin/port_khazard/fight_arena/khazard_fight_arena.npcs.toml @@ -17,10 +17,12 @@ max_hit_melee = 30 attack_bonus = 10 respawn_delay = 50 examine = "His armour indicates he's a Khazard Guard." +drop_table = "khazard_guard" [khazard_4] id = 256 clone = "khazard_3" +drop_table = "khazard_guard" [angor] id = 259 @@ -111,6 +113,7 @@ examine = "He demands to have some booze." [khazard_20] id = 7528 clone = "khazard_3" +drop_table = "khazard_guard" [lazy_khazard] id = 7550 diff --git a/data/area/kandarin/port_khazard/morge_camp/mogre_camp.npcs.toml b/data/area/kandarin/port_khazard/morge_camp/mogre_camp.npcs.toml index 2d451c5225..75404a7818 100644 --- a/data/area/kandarin/port_khazard/morge_camp/mogre_camp.npcs.toml +++ b/data/area/kandarin/port_khazard/morge_camp/mogre_camp.npcs.toml @@ -27,3 +27,4 @@ def = 22 combat_def = "crab_underwater" respawn_delay = 5 examine = "Nice claw!" +drop_table = "crab" diff --git a/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.drops.toml b/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.drops.toml new file mode 100644 index 0000000000..7dbb5397d4 --- /dev/null +++ b/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.drops.toml @@ -0,0 +1,14 @@ +[crab_drop_table] +type = "all" +drops = [ + { id = "crab_meat" }, + { table = "crab_secondary" }, +] + +[crab_secondary] +roll = 1024 +drops = [ + { id = "fresh_crab_claw", chance = 32 }, + { id = "fresh_crab_shell", chance = 32 }, + { id = "oyster", chance = 32 }, +] diff --git a/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.npcs.toml b/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.npcs.toml index e5a3e9581f..5d21c5b474 100644 --- a/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.npcs.toml +++ b/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.npcs.toml @@ -8,6 +8,7 @@ style = "crush" max_hit_melee = 30 respawn_delay = 10 examine = "Nice claw!" +drop_table = "crab" [fish_underwater_cave] id = 3425 diff --git a/data/area/kandarin/port_khazard/movarios_base/movarios_base.drops.toml b/data/area/kandarin/port_khazard/movarios_base/movarios_base.drops.toml new file mode 100644 index 0000000000..296e3d353c --- /dev/null +++ b/data/area/kandarin/port_khazard/movarios_base/movarios_base.drops.toml @@ -0,0 +1,42 @@ +[elite_khazard_guard_drop_table] +type = "all" +drops = [ + { table = "elite_khazard_guard_secondary" }, + { table = "medium_clue_scroll", roll = 32 }, +] + +[elite_khazard_guard_secondary] +roll = 1024 +drops = [ + { id = "steel_full_helm", chance = 32 }, + { id = "steel_sword", chance = 32 }, + { id = "steel_longsword", chance = 32 }, + { id = "blood_rune", chance = 32 }, + { id = "fire_rune", min = 4, max = 10, chance = 32 }, + { id = "earth_rune", min = 4, max = 10, chance = 32 }, + { id = "air_rune", min = 4, max = 10, chance = 32 }, + { id = "water_rune", min = 4, max = 10, chance = 32 }, + { id = "mithril_bar", chance = 32 }, + { id = "iron_bar", chance = 32 }, + { id = "steel_bar", chance = 32 }, + { id = "grimy_guam", chance = 32 }, + { id = "grimy_marrentill", chance = 32 }, + { id = "grimy_tarromin", chance = 32 }, + { id = "grimy_harralander", chance = 32 }, + { id = "grimy_irit", chance = 32 }, + { id = "grimy_avantoe", chance = 32 }, + { id = "grimy_kwuarm", chance = 32 }, + { id = "grimy_cadantine", chance = 32 }, + { id = "grimy_lantadyme", chance = 32 }, + { id = "grimy_dwarf_weed", chance = 32 }, + { id = "uncut_sapphire", chance = 32 }, + { id = "uncut_emerald", chance = 32 }, + { id = "uncut_ruby", chance = 32 }, + { id = "uncut_diamond", chance = 32 }, + { id = "coins", min = 31, max = 224, chance = 32 }, + { id = "law_talisman", chance = 32 }, + { id = "nature_talisman", chance = 32 }, + { id = "waterskin_4", chance = 32 }, + { id = "grimy_ranarr", chance = 6 }, + { id = "dwarf_weed_seed", chance = 2 }, +] diff --git a/data/area/kandarin/port_khazard/movarios_base/movarios_base.npcs.toml b/data/area/kandarin/port_khazard/movarios_base/movarios_base.npcs.toml index f30bfe7610..e26a728945 100644 --- a/data/area/kandarin/port_khazard/movarios_base/movarios_base.npcs.toml +++ b/data/area/kandarin/port_khazard/movarios_base/movarios_base.npcs.toml @@ -13,16 +13,20 @@ max_hit_melee = 120 attack_bonus = 10 respawn_delay = 50 examine = "A well-trained Khazard warrior, on orders to guard this area." +drop_table = "elite_khazard_guard" [elite_khazard_guard_movarios_base_2] id = 8438 clone = "elite_khazard_guard_movarios_base" +drop_table = "elite_khazard_guard" [elite_khazard_guard_movarios_base_3] id = 8439 clone = "elite_khazard_guard_movarios_base" +drop_table = "elite_khazard_guard" [elite_khazard_guard_movarios_base_4] id = 8440 clone = "elite_khazard_guard_movarios_base" +drop_table = "elite_khazard_guard" diff --git a/data/area/kandarin/ranging_guild/ranging_guild.npcs.toml b/data/area/kandarin/ranging_guild/ranging_guild.npcs.toml index 1bc984a7c7..12793e05ac 100644 --- a/data/area/kandarin/ranging_guild/ranging_guild.npcs.toml +++ b/data/area/kandarin/ranging_guild/ranging_guild.npcs.toml @@ -1,6 +1,7 @@ [guard_ranging_guild] id = 678 examine = "Keeps order in the ranging guild." +drop_table = "guard" [ranging_guild_doorman] id = 679 diff --git a/data/area/kandarin/temple_of_ikov/temple_of_ikov.drops.toml b/data/area/kandarin/temple_of_ikov/temple_of_ikov.drops.toml index 8c3b6dbcb1..829813504f 100644 --- a/data/area/kandarin/temple_of_ikov/temple_of_ikov.drops.toml +++ b/data/area/kandarin/temple_of_ikov/temple_of_ikov.drops.toml @@ -9,4 +9,9 @@ drops = [ roll = 16 drops = [ { id = "armadyl_pendant" }, -] \ No newline at end of file +] +[ice_spider_drop_table] +type = "all" +drops = [ + { id = "ice_arrows" }, +] diff --git a/data/area/kandarin/temple_of_ikov/temple_of_ikov.npcs.toml b/data/area/kandarin/temple_of_ikov/temple_of_ikov.npcs.toml index eba474e8d2..6b45458914 100644 --- a/data/area/kandarin/temple_of_ikov/temple_of_ikov.npcs.toml +++ b/data/area/kandarin/temple_of_ikov/temple_of_ikov.npcs.toml @@ -24,6 +24,7 @@ examine = "A witch." id = 5341 categories = ["skeletons"] examine = "Could do with gaining a few pounds." +drop_table = "skeleton" [ice_spider] id = 64 @@ -38,6 +39,7 @@ slayer_xp = 65.0 categories = ["spiders"] respawn_delay = 30 examine = "I think this spider has been magically modified." +drop_table = "ice_spider" [fire_warrior_of_lesarkus] id = 277 diff --git a/data/area/kandarin/tower_of_life/tower_of_life.drops.toml b/data/area/kandarin/tower_of_life/tower_of_life.drops.toml index 3463826940..51b2ab9690 100644 --- a/data/area/kandarin/tower_of_life/tower_of_life.drops.toml +++ b/data/area/kandarin/tower_of_life/tower_of_life.drops.toml @@ -50,4 +50,17 @@ roll = 20 drops = [ { id = "tea_flask", chance = 2 }, { id = "rune_satchel", chance = 3 }, -] \ No newline at end of file +] +[invrigar_the_necromancer_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "invrigar_the_necromancer_secondary" }, +] + +[invrigar_the_necromancer_secondary] +roll = 1024 +drops = [ + { id = "zamorak_robe_top", chance = 6 }, + { id = "zamorak_robe_bottom", chance = 6 }, +] diff --git a/data/area/kandarin/tower_of_life/tower_of_life.npcs.toml b/data/area/kandarin/tower_of_life/tower_of_life.npcs.toml index 4e52cf4a75..b66d89dec3 100644 --- a/data/area/kandarin/tower_of_life/tower_of_life.npcs.toml +++ b/data/area/kandarin/tower_of_life/tower_of_life.npcs.toml @@ -9,6 +9,7 @@ style = "magic" max_hit_magic = 30 respawn_delay = 50 examine = "An evil user of Magic powers." +drop_table = "invrigar_the_necromancer" [necromancer] id = 194 diff --git a/data/area/kandarin/tree_gnome_stronghold/training_camp/combat_training_camp.npcs.toml b/data/area/kandarin/tree_gnome_stronghold/training_camp/combat_training_camp.npcs.toml index c9c4c20db9..b08e4a9123 100644 --- a/data/area/kandarin/tree_gnome_stronghold/training_camp/combat_training_camp.npcs.toml +++ b/data/area/kandarin/tree_gnome_stronghold/training_camp/combat_training_camp.npcs.toml @@ -12,6 +12,7 @@ slayer_xp = 60.0 categories = ["ogres"] respawn_delay = 50 examine = "Big, ugly, and smelly." +drop_table = "ogre" [guard_combat_training_camp] id = 344 diff --git a/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.drops.toml b/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.drops.toml index d01cb2b52c..1dab464c3e 100644 --- a/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.drops.toml +++ b/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.drops.toml @@ -104,4 +104,29 @@ drops = [ { id = "perfect_shell", min = 1, max = 3, chance = 2 }, { id = "teak_logs", amount = 2, chance = 2 }, { id = "teak_logs", amount = 4 }, -] \ No newline at end of file +] +[gnome_troop_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] + +[mounted_terrorbird_gnome_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "mounted_terrorbird_gnome_secondary" }, +] + +[mounted_terrorbird_gnome_secondary] +roll = 1024 +drops = [ + { id = "equa_leaves", chance = 32 }, + { id = "lemon", chance = 32 }, + { id = "gianne_dough", chance = 32 }, + { id = "lime", chance = 32 }, + { id = "crunchy_tray", chance = 32 }, + { id = "gnomebowl_mould", chance = 32 }, + { id = "gnome_spice", chance = 32 }, + { id = "terrorbird_wing", chance = 6 }, +] diff --git a/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.npcs.toml b/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.npcs.toml index ff36f2182f..5060471b29 100644 --- a/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.npcs.toml +++ b/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.npcs.toml @@ -90,6 +90,7 @@ slayer_xp = 36.0 categories = ["birds"] respawn_delay = 30 examine = "These gnomes know how to get around!" +drop_table = "mounted_terrorbird_gnome" [bolongo] id = 2343 @@ -156,9 +157,11 @@ ranged_strength = 2 combat_def = "gnome" respawn_delay = 30 examine = "It's a tree gnome trooper." +drop_table = "gnome_troop" [gnome_troop_2] id = 480 +drop_table = "gnome_troop" [gnome_baller] id = 621 diff --git a/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.drops.toml b/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.drops.toml new file mode 100644 index 0000000000..94b69b9ad3 --- /dev/null +++ b/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.drops.toml @@ -0,0 +1,34 @@ +[troll_general_drop_table] +type = "all" +drops = [ + { id = "big_bones" }, + { table = "troll_general_secondary" }, +] + +[troll_general_secondary] +roll = 1024 +drops = [ + { id = "nature_rune", amount = 16, chance = 64 }, + { id = "law_rune", amount = 4, chance = 64 }, + { id = "steel_platebody", chance = 32 }, + { id = "steel_warhammer", chance = 32 }, + { id = "black_warhammer", chance = 32 }, + { id = "mithril_platebody", chance = 32 }, + { id = "adamant_hatchet", chance = 32 }, + { id = "adamant_sq_shield", chance = 32 }, + { id = "rune_warhammer", chance = 32 }, + { id = "earth_rune", amount = 25, chance = 32 }, + { id = "nature_talisman", chance = 32 }, + { id = "raw_tuna", amount = 4, chance = 32 }, + { id = "uncut_sapphire", chance = 32 }, + { id = "uncut_emerald", chance = 32 }, + { id = "uncut_ruby", chance = 32 }, + { id = "coal", amount = 6, chance = 32 }, + { id = "coins", amount = 20, chance = 32 }, + { id = "long_bone", chance = 32 }, + { id = "curved_bone", chance = 32 }, + { id = "tooth_half_of_a_key", chance = 32 }, + { id = "court_summons", chance = 32 }, + { id = "rune_javelin", chance = 6 }, + { id = "granite_shield", chance = 6 }, +] diff --git a/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.npcs.toml b/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.npcs.toml index b5922248ac..0dafe294c8 100644 --- a/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.npcs.toml +++ b/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.npcs.toml @@ -70,11 +70,13 @@ examine = "One of the troll generals." id = 1116 categories = ["trolls"] examine = "One of the troll generals." +drop_table = "troll_general" [troll_general_troll_stronghold_tunnels_3] id = 1117 categories = ["trolls"] examine = "One of the troll generals." +drop_table = "troll_general" [twig_troll_stronghold_tunnels] id = 1128 @@ -141,6 +143,7 @@ slayer_xp = 90.0 categories = ["trolls"] respawn_delay = 50 examine = "Small for a troll, but mean and ugly." +drop_table = "mountain_troll" [guard_troll_stronghold_tunnels] id = 1142 diff --git a/data/area/kandarin/yanille/yanille.drops.toml b/data/area/kandarin/yanille/yanille.drops.toml index c2eae96f79..3f3c751e2f 100644 --- a/data/area/kandarin/yanille/yanille.drops.toml +++ b/data/area/kandarin/yanille/yanille.drops.toml @@ -37,3 +37,9 @@ drops = [ { id = "mind_talisman", chance = 3 }, { id = "iron_ore" }, ] + +[watchman_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] diff --git a/data/area/kandarin/yanille/yanille.npcs.toml b/data/area/kandarin/yanille/yanille.npcs.toml index 8c284ec92e..5a101df80c 100644 --- a/data/area/kandarin/yanille/yanille.npcs.toml +++ b/data/area/kandarin/yanille/yanille.npcs.toml @@ -31,6 +31,7 @@ style = "crush" max_hit_melee = 40 respawn_delay = 50 examine = "Watches stuff. But who watches him?" +drop_table = "watchman" [soldier_yanille] id = 35 diff --git a/data/area/karamja/brimhaven/brimhaven.drops.toml b/data/area/karamja/brimhaven/brimhaven.drops.toml new file mode 100644 index 0000000000..996fcbde82 --- /dev/null +++ b/data/area/karamja/brimhaven/brimhaven.drops.toml @@ -0,0 +1,28 @@ +[thief_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "thief_secondary" }, +] + +[thief_secondary] +roll = 1024 +drops = [ + { id = "bronze_arrow", chance = 64 }, + { id = "cabbage", chance = 64 }, + { id = "chaos_rune", chance = 64 }, + { id = "copper_ore", chance = 64 }, + { id = "earth_rune", chance = 64 }, + { id = "earth_talisman", chance = 64 }, + { id = "fire_rune", chance = 64 }, + { id = "fishing_bait", chance = 64 }, + { id = "iron_dagger", chance = 64 }, + { id = "mind_rune", chance = 64 }, + { id = "sling", chance = 64 }, +] + +[grip_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] diff --git a/data/area/karamja/brimhaven/brimhaven.npcs.toml b/data/area/karamja/brimhaven/brimhaven.npcs.toml index f7efacacf5..7298062b9e 100644 --- a/data/area/karamja/brimhaven/brimhaven.npcs.toml +++ b/data/area/karamja/brimhaven/brimhaven.npcs.toml @@ -69,22 +69,27 @@ examine = "An amulet trader." [pirate_brimhaven] id = 6346 examine = "Avast ye scurvy land lubbers!" +drop_table = "pirate" [pirate_brimhaven_2] id = 6347 examine = "Avast ye scurvy land lubbers!" +drop_table = "pirate" [pirate_brimhaven_3] id = 6348 examine = "Avast ye scurvy land lubbers!" +drop_table = "pirate" [pirate_brimhaven_4] id = 6349 examine = "Avast ye scurvy land lubbers!" +drop_table = "pirate" [pirate_brimhaven_5] id = 6350 examine = "Avast ye scurvy land lubbers!" +drop_table = "pirate" [tool_leprechaun_brimhaven] id = 7558 @@ -109,6 +114,7 @@ max_hit_melee = 30 attack_bonus = 5 respawn_delay = 50 examine = "Looks like he's been in the wars..." +drop_table = "grip" [alfonse_the_waiter_brimhaven] id = 793 @@ -142,6 +148,7 @@ style = "crush" max_hit_melee = 20 respawn_delay = 25 examine = "Known for his light-fingered qualities." +drop_table = "thief" [kangai_mau_brimhaven] id = 846 diff --git a/data/area/karamja/brimhaven/dungeon/brimhaven_dungeon.npcs.toml b/data/area/karamja/brimhaven/dungeon/brimhaven_dungeon.npcs.toml index 23f8fc13eb..21eb0dd714 100644 --- a/data/area/karamja/brimhaven/dungeon/brimhaven_dungeon.npcs.toml +++ b/data/area/karamja/brimhaven/dungeon/brimhaven_dungeon.npcs.toml @@ -2,3 +2,4 @@ id = 4671 categories = ["red_dragons"] examine = "A big powerful dragon." +drop_table = "red_dragon" diff --git a/data/area/karamja/crandor/crandor.npcs.toml b/data/area/karamja/crandor/crandor.npcs.toml index 9454dda489..54b5c26ef7 100644 --- a/data/area/karamja/crandor/crandor.npcs.toml +++ b/data/area/karamja/crandor/crandor.npcs.toml @@ -16,4 +16,5 @@ hunt_mode = "cowardly" slayer_xp = 80.0 categories = ["green_dragons"] respawn_delay = 50 -examine = "Roar! A dragon!" \ No newline at end of file +examine = "Roar! A dragon!" +drop_table = "empty" \ No newline at end of file diff --git a/data/area/karamja/karamja.drops.toml b/data/area/karamja/karamja.drops.toml index 8176849869..0bafe21266 100644 --- a/data/area/karamja/karamja.drops.toml +++ b/data/area/karamja/karamja.drops.toml @@ -39,3 +39,227 @@ type = "all" drops = [ { id = "shaikahan_bones" }, ] + +[giant_wasp_drop_table] +type = "all" +drops = [ + { table = "giant_wasp_secondary" }, + { table = "medium_clue_scroll", roll = 170 }, +] + +[giant_wasp_secondary] +roll = 1024 +drops = [ + { id = "wergali_seed", chance = 32 }, + { id = "grimy_guam", chance = 32 }, + { id = "grimy_marrentill", chance = 32 }, + { id = "grimy_tarromin", chance = 32 }, + { id = "grimy_harralander", chance = 32 }, + { id = "grimy_ranarr", chance = 32 }, + { id = "grimy_irit", chance = 32 }, + { id = "grimy_wergali", chance = 32 }, + { id = "grimy_avantoe", chance = 32 }, + { id = "grimy_kwuarm", chance = 32 }, + { id = "grimy_cadantine", chance = 32 }, + { id = "grimy_lantadyme", chance = 32 }, + { id = "grimy_dwarf_weed", chance = 32 }, + { id = "chaos_rune", amount = 2, chance = 32 }, + { id = "water_rune", amount = 37, chance = 32 }, + { id = "soul_rune", min = 1, max = 3, chance = 32 }, + { id = "jangerberries", min = 1, max = 3, chance = 32 }, + { id = "uncut_sapphire", chance = 6 }, +] + +[tribesman_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "tribesman_secondary" }, + { table = "medium_clue_scroll", roll = 170 }, +] + +[tribesman_secondary] +roll = 1144 +drops = [ + { id = "cleaning_cloth", chance = 64 }, + { id = "trading_sticks", min = 15, max = 62, chance = 64 }, + { id = "antipoison_3", chance = 32 }, + { id = "iron_dagger_p", chance = 32 }, + { id = "bronze_bolts_p", amount = 4, chance = 32 }, + { id = "steel_arrow_p", amount = 5, chance = 32 }, + { id = "mithril_javelin", amount = 10, chance = 32 }, + { id = "bronze_spear", chance = 32 }, + { id = "iron_spear", chance = 32 }, + { id = "steel_spear", chance = 32 }, + { id = "mithril_spear", chance = 32 }, + { id = "steel_javelin", amount = 10, chance = 32 }, + { id = "snape_grass", chance = 32 }, + { id = "grimy_guam", chance = 32 }, + { id = "grimy_marrentill", chance = 32 }, + { id = "grimy_tarromin", chance = 32 }, + { id = "grimy_harralander", chance = 32 }, + { id = "grimy_irit", chance = 32 }, + { id = "grimy_avantoe", chance = 32 }, + { id = "grimy_kwuarm", chance = 32 }, + { id = "grimy_cadantine", chance = 32 }, + { id = "grimy_lantadyme", chance = 32 }, + { id = "grimy_dwarf_weed", chance = 32 }, + { id = "grimy_snake_weed", chance = 32 }, + { id = "uncut_sapphire", chance = 32 }, + { id = "uncut_emerald", chance = 32 }, + { id = "uncut_ruby", chance = 32 }, + { id = "gold_ore", chance = 32 }, + { id = "pot_of_flour", chance = 32 }, + { id = "tin_ore", chance = 32 }, + { id = "nature_rune", amount = 3, chance = 32 }, + { id = "super_antipoison_2", chance = 6 }, + { id = "super_antipoison_3", chance = 6 }, + { id = "limpwurt_root", chance = 6 }, + { id = "grimy_ranarr", chance = 2 }, + { id = "tooth_half_of_a_key", chance = 2 }, + { id = "loop_half_of_a_key", chance = 2 }, +] + +[frog_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { id = "giant_frog_legs" }, + { table = "frog_secondary" }, +] + +[frog_secondary] +roll = 1024 +drops = [ + { id = "grimy_guam", chance = 32 }, + { id = "grimy_marrentill", chance = 32 }, + { id = "grimy_tarromin", chance = 32 }, + { id = "grimy_harralander", chance = 32 }, + { id = "grimy_ranarr", chance = 32 }, + { id = "grimy_irit", chance = 32 }, + { id = "grimy_avantoe", chance = 32 }, + { id = "grimy_kwuarm", chance = 32 }, + { id = "grimy_lantadyme", chance = 32 }, + { id = "grimy_cadantine", chance = 32 }, + { id = "grimy_dwarf_weed", chance = 32 }, + { id = "frog_spawn", chance = 32 }, + { id = "uncut_diamond", chance = 32 }, + { id = "water_rune", amount = 6, chance = 32 }, +] + +[tenacious_toucan_drop_table] +type = "all" +drops = [ + { id = "feather" }, + { table = "tenacious_toucan_secondary" }, + { table = "hard_clue_scroll", roll = 32 }, +] + +[tenacious_toucan_secondary] +roll = 1024 +drops = [ + { id = "potato_seed", min = 1, max = 4, chance = 32 }, + { id = "onion_seed", min = 1, max = 3, chance = 32 }, + { id = "sweetcorn_seed", chance = 32 }, + { id = "strawberry_seed", chance = 32 }, + { id = "orange", chance = 32 }, + { id = "raw_karambwan", chance = 32 }, + { id = "papaya_fruit", chance = 32 }, + { id = "watermelon_slice", chance = 32 }, + { id = "feather", amount = 10, chance = 32 }, + { id = "yew_logs", chance = 32 }, + { id = "vial_of_water", chance = 32 }, + { id = "trading_sticks", min = 12, max = 18, chance = 32 }, +] + +[giant_ant_worker_drop_table] +type = "all" +drops = [ + { table = "giant_ant_worker_secondary" }, + { table = "medium_clue_scroll", roll = 32 }, +] + +[giant_ant_worker_secondary] +roll = 1119 +drops = [ + { id = "strawberry", amount = 2, chance = 64 }, + { id = "potato_seed", chance = 32 }, + { id = "onion_seed", chance = 32 }, + { id = "tomato_seed", chance = 32 }, + { id = "sweetcorn_seed", amount = 2, chance = 32 }, + { id = "strawberry_seed", amount = 2, chance = 32 }, + { id = "watermelon_seed", chance = 32 }, + { id = "papaya_tree_seed", chance = 32 }, + { id = "air_rune", min = 3, max = 48, chance = 32 }, + { id = "water_rune", amount = 28, chance = 32 }, + { id = "earth_rune", min = 1, max = 9, chance = 32 }, + { id = "nature_rune", min = 1, max = 15, chance = 32 }, + { id = "death_rune", min = 3, max = 10, chance = 32 }, + { id = "blood_rune", min = 1, max = 4, chance = 32 }, + { id = "uncut_sapphire", chance = 32 }, + { id = "uncut_emerald", chance = 32 }, + { id = "uncut_ruby", chance = 32 }, + { id = "uncut_diamond", chance = 32 }, + { id = "grimy_guam", chance = 32 }, + { id = "grimy_marrentill", chance = 32 }, + { id = "grimy_tarromin", chance = 32 }, + { id = "grimy_harralander", chance = 32 }, + { id = "grimy_ranarr", chance = 32 }, + { id = "grimy_irit", chance = 32 }, + { id = "grimy_avantoe", chance = 32 }, + { id = "grimy_kwuarm", chance = 32 }, + { id = "grimy_cadantine", chance = 32 }, + { id = "grimy_lantadyme", chance = 32 }, + { id = "grimy_dwarf_weed", chance = 32 }, + { id = "unicorn_horn_dust", chance = 32 }, + { id = "coal", min = 2, max = 10, chance = 32 }, + { id = "trading_sticks", chance = 32 }, +] + +[giant_ant_soldier_drop_table] +type = "all" +drops = [ + { table = "giant_ant_soldier_secondary" }, + { table = "medium_clue_scroll", roll = 170 }, +] + +[giant_ant_soldier_secondary] +roll = 1176 +drops = [ + { id = "nature_rune", amount = 14, chance = 64 }, + { id = "grimy_guam", chance = 64 }, + { id = "grimy_marrentill", chance = 64 }, + { id = "grimy_tarromin", chance = 64 }, + { id = "grimy_wergali", chance = 64 }, + { id = "steel_arrow_p", chance = 32 }, + { id = "mithril_arrow", amount = 3, chance = 32 }, + { id = "pearl_bolts", min = 10, max = 15, chance = 32 }, + { id = "mithril_bolts", min = 1, max = 10, chance = 32 }, + { id = "steel_bolts_p", min = 1, max = 20, chance = 32 }, + { id = "mithril_chainbody", chance = 32 }, + { id = "fire_rune", amount = 5, chance = 32 }, + { id = "dust_rune", chance = 32 }, + { id = "law_rune", chance = 32 }, + { id = "soul_rune", chance = 32 }, + { id = "blood_rune", chance = 32 }, + { id = "earth_rune", amount = 10, chance = 32 }, + { id = "grimy_harralander", chance = 32 }, + { id = "grimy_irit", chance = 32 }, + { id = "grimy_avantoe", chance = 32 }, + { id = "iron_ore", chance = 32 }, + { id = "coal", chance = 32 }, + { id = "trading_sticks", amount = 23, chance = 32 }, + { id = "nature_talisman", chance = 32 }, + { id = "left_arm", chance = 32 }, + { id = "right_arm", chance = 32 }, + { id = "left_leg", chance = 32 }, + { id = "right_leg", chance = 32 }, + { id = "foot", chance = 32 }, + { id = "grimy_ranarr", chance = 6 }, + { id = "grimy_kwuarm", chance = 6 }, + { id = "rune_javelin", amount = 5, chance = 2 }, + { id = "grimy_cadantine", chance = 2 }, + { id = "grimy_lantadyme", chance = 2 }, + { id = "grimy_dwarf_weed", chance = 2 }, + { id = "starved_ancient_effigy", chance = 2 }, +] diff --git a/data/area/karamja/karamja.npcs.toml b/data/area/karamja/karamja.npcs.toml index b8c708aad3..b4b55061c5 100644 --- a/data/area/karamja/karamja.npcs.toml +++ b/data/area/karamja/karamja.npcs.toml @@ -53,6 +53,7 @@ examine = "A swarm of bugs." id = 3783 categories = ["frogs"] examine = "Long legged licker." +drop_table = "frog" [jungle_forester] id = 401 @@ -106,6 +107,7 @@ clone = "jungle_spider_karamja" id = 6378 categories = ["birds"] examine = "I wouldn't want to be footing that bill." +drop_table = "tenacious_toucan" [giant_ant_worker] id = 6379 @@ -116,6 +118,7 @@ str = 40 def = 50 combat_def = "giant_ant" examine = "I wonder how much he can lift." +drop_table = "giant_ant_worker" [giant_ant_soldier] id = 6380 @@ -128,18 +131,22 @@ hunt_mode = "aggressive" combat_def = "giant_ant" max_hit_crush = 130 examine = "Gi-ant-ant-ant-ant..." +drop_table = "giant_ant_soldier" [giant_wasp] id = 6381 examine = "That stinger has to hurt..." +drop_table = "giant_wasp" [pernicious_parrot] id = 6382 categories = ["birds"] examine = "Polynomial - a parrot that goes without breakfast, lunch or dinner." +drop_table = "empty" [giant_wasp_2] id = 6383 +drop_table = "giant_wasp" [karamjan_jungle_eagle] id = 6387 @@ -217,6 +224,7 @@ attack_bonus = 8 hunt_mode = "cowardly" respawn_delay = 50 examine = "A vicious warrior." +drop_table = "tribesman" [tinsay_karamja_2] id = 1165 diff --git a/data/area/karamja/kharazi_jungle/caves/kharazi_caves.drops.toml b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.drops.toml new file mode 100644 index 0000000000..f05a9264a3 --- /dev/null +++ b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.drops.toml @@ -0,0 +1,15 @@ +[san_tojalon_drop_table] +type = "all" +drops = [ + { id = "hunk_of_crystal" }, + { id = "chunk_of_crystal" }, + { id = "lump_of_crystal" }, +] + +[irvig_senay_drop_table] +type = "all" +drops = [ + { id = "hunk_of_crystal" }, + { id = "chunk_of_crystal" }, + { id = "lump_of_crystal" }, +] diff --git a/data/area/karamja/kharazi_jungle/caves/kharazi_caves.npcs.toml b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.npcs.toml index cf84e89088..d7ece8cd51 100644 --- a/data/area/karamja/kharazi_jungle/caves/kharazi_caves.npcs.toml +++ b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.npcs.toml @@ -13,6 +13,7 @@ slayer_xp = 50.0 categories = ["skeletons"] respawn_delay = 50 examine = "A minion of Rashiliyia." +drop_table = "undead_one" [undead_one_kharazi_caves_2] id = 503 @@ -30,14 +31,17 @@ slayer_xp = 73.0 categories = ["skeletons"] respawn_delay = 50 examine = "A minion of Rashiliyia." +drop_table = "undead_one" [undead_one_kharazi_caves_3] id = 5353 clone = "undead_one_kharazi_caves" +drop_table = "undead_one" [undead_one_kharazi_caves_4] id = 5354 clone = "undead_one_kharazi_caves_2" +drop_table = "undead_one" [death_wing_kharazi_caves] id = 79 @@ -53,6 +57,7 @@ categories = ["bats"] categories = ["ghosts"] respawn_delay = 35 examine = "A shadowy, barely visible flying entity from some evil place." +drop_table = "empty" [ungadulu_kharazi_caves] id = 929 @@ -68,6 +73,7 @@ max_hit_melee = 70 attack_bonus = 7 ranged_strength = 7 examine = "The Kharazi tribe's elusive shaman." +drop_table = "empty" [ungadulu_possessed] id = 930 @@ -97,6 +103,7 @@ attack_bonus = 16 respawn_delay = 26 categories = ["skeletons"] examine = "The spirit of a long-dead warrior." +drop_table = "san_tojalon" [irvig_senay_kharazi_caves] id = 937 @@ -111,6 +118,7 @@ xp_bonus = 2.5 respawn_delay = 51 categories = ["skeletons"] examine = "The spirit of a long-dead warrior." +drop_table = "irvig_senay" [ranalph_devere] id = 938 @@ -127,6 +135,7 @@ xp_bonus = 0.5 respawn_delay = 51 categories = ["skeletons"] examine = "The spirit of a long-dead warrior." +drop_table = "empty" [boulder_kharazi_caves] id = 939 diff --git a/data/area/karamja/musa_point/musa_point.npcs.toml b/data/area/karamja/musa_point/musa_point.npcs.toml index 60c46952de..4a0ba9d413 100644 --- a/data/area/karamja/musa_point/musa_point.npcs.toml +++ b/data/area/karamja/musa_point/musa_point.npcs.toml @@ -31,6 +31,7 @@ id = 11666 [man_musa_point] id = 170 examine = "One of Gielinor's many citizens, apparently trying to be an explorer." +drop_table = "man" [fishing_spot_musa_point] id = 323 diff --git a/data/area/karamja/pothole_dungeon/pothole_dungeon.npcs.toml b/data/area/karamja/pothole_dungeon/pothole_dungeon.npcs.toml index d0e991e944..9fee41aa0e 100644 --- a/data/area/karamja/pothole_dungeon/pothole_dungeon.npcs.toml +++ b/data/area/karamja/pothole_dungeon/pothole_dungeon.npcs.toml @@ -1,8 +1,10 @@ [jogre_pothole_dungeon] id = 3449 examine = "An aggressive humanoid." +drop_table = "jogre" [jogre_pothole_dungeon_2] id = 3450 examine = "An aggressive humanoid." +drop_table = "jogre" diff --git a/data/area/karamja/tzhaar_city/tzhaar_city.drops.toml b/data/area/karamja/tzhaar_city/tzhaar_city.drops.toml index c1efbc086b..9e0e651edd 100644 --- a/data/area/karamja/tzhaar_city/tzhaar_city.drops.toml +++ b/data/area/karamja/tzhaar_city/tzhaar_city.drops.toml @@ -117,3 +117,9 @@ drops = [ { id = "obsidian_charm", chance = 36000 }, { id = "obsidian_charm", amount = 2, chance = 36000 }, ] + +[fire_monster_drop_table] +type = "all" +drops = [ + { id = "ashes" }, +] diff --git a/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml b/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml index 627b263ad7..ed397b6df5 100644 --- a/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml +++ b/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml @@ -254,20 +254,25 @@ examine = "A senior citizen TzHaar-Hur." [tzhaar_hur_tzhaar_caves_2] id = 7767 +drop_table = "tzhaar_hur" [tzhaar_hur_tzhaar_caves_3] id = 7768 +drop_table = "tzhaar_hur" [tzhaar_hur_tzhaar_caves_4] id = 7769 +drop_table = "tzhaar_hur" [lava_monster_tzhaar_caves] id = 7772 examine = "A monster made of magma." +drop_table = "empty" [fire_monster_tzhaar_caves] id = 7773 examine = "A monster like many others, but on fire." +drop_table = "fire_monster" [tzhaar_mej_roh] id = 2623 diff --git a/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml index 408d85dab0..85a5cd7421 100644 --- a/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml +++ b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml @@ -24,15 +24,19 @@ examine = "If you see them circling, run." [mummy_agility_pyramid] id = 6753 +drop_table = "mummy" [mummy_agility_pyramid_2] id = 6754 +drop_table = "mummy" [mummy_agility_pyramid_3] id = 6755 +drop_table = "mummy" [mummy_agility_pyramid_4] id = 6756 +drop_table = "mummy" [agility_pyramid_block] id = 3124 diff --git a/data/area/kharidian_desert/bandit_camp/bandit_camp.drops.toml b/data/area/kharidian_desert/bandit_camp/bandit_camp.drops.toml index b5c997bc21..cc7d942618 100644 --- a/data/area/kharidian_desert/bandit_camp/bandit_camp.drops.toml +++ b/data/area/kharidian_desert/bandit_camp/bandit_camp.drops.toml @@ -22,4 +22,33 @@ drops = [ { id = "coins", amount = 45, chance = 6 }, { id = "coal", chance = 4 }, { id = "steel_bar", chance = 5 }, -] \ No newline at end of file +] +[bandit_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "bandit_secondary" }, +] + +[bandit_secondary] +roll = 1024 +drops = [ + { id = "chaos_rune", amount = 2, chance = 64 }, + { id = "cosmic_rune", amount = 2, chance = 64 }, + { id = "steel_hatchet", chance = 64 }, + { id = "uncut_sapphire", chance = 64 }, + { id = "uncut_emerald", chance = 64 }, + { id = "coins", min = 12, max = 50, chance = 64 }, + { id = "coal", chance = 64 }, + { id = "death_rune", amount = 2, chance = 32 }, + { id = "nature_rune", amount = 2, chance = 32 }, + { id = "law_rune", amount = 2, chance = 32 }, + { id = "iron_battleaxe", chance = 32 }, + { id = "iron_scimitar", chance = 32 }, + { id = "steel_sq_shield", chance = 32 }, + { id = "uncut_ruby", chance = 32 }, + { id = "steel_bar", chance = 32 }, + { id = "grimy_dwarf_weed", chance = 6 }, + { id = "uncut_diamond", chance = 6 }, + { id = "court_summons", chance = 2 }, +] diff --git a/data/area/kharidian_desert/bandit_camp/bandit_camp.npcs.toml b/data/area/kharidian_desert/bandit_camp/bandit_camp.npcs.toml index 530f3691de..db1846f50b 100644 --- a/data/area/kharidian_desert/bandit_camp/bandit_camp.npcs.toml +++ b/data/area/kharidian_desert/bandit_camp/bandit_camp.npcs.toml @@ -53,6 +53,7 @@ id = 2384 [bandit_bandit_camp_7] id = 195 +drop_table = "bandit" [eblis_bandit_camp_2] id = 1923 diff --git a/data/area/kharidian_desert/harmony_island/harmony.drops.toml b/data/area/kharidian_desert/harmony_island/harmony.drops.toml index f78b897ff6..202bccc97b 100644 --- a/data/area/kharidian_desert/harmony_island/harmony.drops.toml +++ b/data/area/kharidian_desert/harmony_island/harmony.drops.toml @@ -42,3 +42,44 @@ drops = [ { id = "zombie_bone", chance = 1250, variable = "rag_and_bone_man_wish_list", equals = "started", default = "unstarted" }, { id = "zombie_champions_scroll", members = true, lacks = "zombie_champions_scroll" }, ] + +[zombie_pirate_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "zombie_pirate_secondary" }, +] + +[zombie_pirate_secondary] +roll = 1024 +drops = [ + { id = "grimy_guam", chance = 32 }, + { id = "grimy_marrentill", chance = 32 }, + { id = "grimy_tarromin", chance = 32 }, + { id = "grimy_harralander", chance = 32 }, + { id = "grimy_ranarr", chance = 32 }, + { id = "grimy_irit", chance = 32 }, + { id = "grimy_avantoe", chance = 32 }, + { id = "grimy_kwuarm", chance = 32 }, + { id = "grimy_cadantine", chance = 32 }, + { id = "grimy_lantadyme", chance = 32 }, + { id = "grimy_dwarf_weed", chance = 32 }, + { id = "mithril_scimitar", chance = 32 }, + { id = "mithril_dagger", chance = 32 }, + { id = "steel_bolts", amount = 2, chance = 32 }, + { id = "bandana_and_eyepatch_red", chance = 32 }, + { id = "bandana_and_eyepatch_blue", chance = 32 }, + { id = "air_rune", amount = 3, chance = 32 }, + { id = "water_rune", amount = 23, chance = 32 }, + { id = "body_rune", amount = 6, chance = 32 }, + { id = "chaos_rune", amount = 7, chance = 32 }, + { id = "cosmic_rune", amount = 5, chance = 32 }, + { id = "law_rune", amount = 2, chance = 32 }, + { id = "coins", min = 38, max = 46, chance = 32 }, + { id = "karamthulhu", chance = 32 }, + { id = "fishing_bait", amount = 10, chance = 32 }, + { id = "braindeath_rum", chance = 32 }, + { id = "iron_ore", chance = 32 }, + { id = "rusty_scimitar", chance = 32 }, + { id = "zombie_bone", chance = 32 }, +] diff --git a/data/area/kharidian_desert/harmony_island/harmony.npcs.toml b/data/area/kharidian_desert/harmony_island/harmony.npcs.toml index b811c7c6c3..7e4a5d410e 100644 --- a/data/area/kharidian_desert/harmony_island/harmony.npcs.toml +++ b/data/area/kharidian_desert/harmony_island/harmony.npcs.toml @@ -45,82 +45,102 @@ slayer_xp = 52.0 categories = ["zombies"] respawn_delay = 50 examine = "Aaaarg, me hearty!" +drop_table = "zombie_pirate" [zombie_pirate_harmony_2] id = 5631 clone = "zombie_pirate_harmony" +drop_table = "zombie_pirate" [zombie_pirate_harmony_3] id = 5633 clone = "zombie_pirate_harmony" +drop_table = "zombie_pirate" [zombie_pirate_harmony_4] id = 5634 clone = "zombie_pirate_harmony" +drop_table = "zombie_pirate" [zombie_pirate_harmony_5] id = 5635 clone = "zombie_pirate_harmony" +drop_table = "zombie_pirate" [zombie_pirate_harmony_6] id = 5637 clone = "zombie_pirate_harmony" +drop_table = "zombie_pirate" [zombie_pirate_harmony_7] id = 5638 clone = "zombie_pirate_harmony" +drop_table = "zombie_pirate" [zombie_pirate_harmony_8] id = 5639 clone = "zombie_pirate_harmony" +drop_table = "zombie_pirate" [zombie_pirate_harmony_9] id = 5640 clone = "zombie_pirate_harmony" +drop_table = "zombie_pirate" [zombie_pirate_harmony_10] id = 5641 clone = "zombie_pirate_harmony" +drop_table = "zombie_pirate" [zombie_pirate_harmony_11] id = 5642 clone = "zombie_pirate_harmony" +drop_table = "zombie_pirate" [zombie_pirate_harmony_12] id = 5644 clone = "zombie_pirate_harmony" +drop_table = "zombie_pirate" [zombie_pirate_harmony_13] id = 5646 clone = "zombie_pirate_harmony" +drop_table = "zombie_pirate" [zombie_pirate_harmony_14] id = 5647 clone = "zombie_pirate_harmony" +drop_table = "zombie_pirate" [zombie_pirate_harmony_15] id = 5650 clone = "zombie_pirate_harmony" +drop_table = "zombie_pirate" [zombie_pirate_harmony_16] id = 5656 clone = "zombie_pirate_harmony" +drop_table = "zombie_pirate" [zombie_pirate_harmony_17] id = 5658 clone = "zombie_pirate_harmony" +drop_table = "zombie_pirate" [zombie_pirate_harmony_18] id = 5659 clone = "zombie_pirate_harmony" +drop_table = "zombie_pirate" [zombie_pirate_harmony_19] id = 5661 clone = "zombie_pirate_harmony" +drop_table = "zombie_pirate" [zombie_pirate_harmony_20] id = 5665 clone = "zombie_pirate_harmony" +drop_table = "zombie_pirate" [monk_harmony_5] id = 5669 diff --git a/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml b/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml index b052b378df..4809e55a98 100644 --- a/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml +++ b/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml @@ -3,36 +3,47 @@ id = 5606 [zombie_pirate_windmill_cellar] id = 5630 +drop_table = "zombie_pirate" [zombie_pirate_windmill_cellar_2] id = 5632 +drop_table = "zombie_pirate" [zombie_pirate_windmill_cellar_3] id = 5636 +drop_table = "zombie_pirate" [zombie_pirate_windmill_cellar_4] id = 5649 +drop_table = "zombie_pirate" [zombie_pirate_windmill_cellar_5] id = 5651 +drop_table = "zombie_pirate" [zombie_pirate_windmill_cellar_6] id = 5653 +drop_table = "zombie_pirate" [zombie_pirate_windmill_cellar_7] id = 5655 +drop_table = "zombie_pirate" [zombie_pirate_windmill_cellar_8] id = 5657 +drop_table = "zombie_pirate" [zombie_pirate_windmill_cellar_9] id = 5660 +drop_table = "zombie_pirate" [zombie_pirate_windmill_cellar_10] id = 5662 +drop_table = "zombie_pirate" [zombie_pirate_windmill_cellar_11] id = 5664 +drop_table = "zombie_pirate" [monk_windmill_cellar] id = 5673 diff --git a/data/area/kharidian_desert/kalphite_hive/kalphite_hive.drops.toml b/data/area/kharidian_desert/kalphite_hive/kalphite_hive.drops.toml index 9af31eb5df..5e5012b1a7 100644 --- a/data/area/kharidian_desert/kalphite_hive/kalphite_hive.drops.toml +++ b/data/area/kharidian_desert/kalphite_hive/kalphite_hive.drops.toml @@ -58,4 +58,10 @@ drops = [ { id = "dragon_chainbody", chance = 23 }, { id = "dragon_2h_sword", chance = 11 }, { id = "dragon_pickaxe", chance = 7 }, -] \ No newline at end of file +] +[goat_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { id = "desert_goat_horn" }, +] diff --git a/data/area/kharidian_desert/kalphite_hive/kalphite_hive.npcs.toml b/data/area/kharidian_desert/kalphite_hive/kalphite_hive.npcs.toml index 0402670e88..c0a5736925 100644 --- a/data/area/kharidian_desert/kalphite_hive/kalphite_hive.npcs.toml +++ b/data/area/kharidian_desert/kalphite_hive/kalphite_hive.npcs.toml @@ -80,6 +80,8 @@ examine = "I don't think insect repellent will work..." [goat] id = 4933 +drop_table = "goat" [goat_2] -id = 4934 \ No newline at end of file +id = 4934 +drop_table = "goat" \ No newline at end of file diff --git a/data/area/kharidian_desert/kharidian_desert.drops.toml b/data/area/kharidian_desert/kharidian_desert.drops.toml index 10cf9cd88a..ead64dca75 100644 --- a/data/area/kharidian_desert/kharidian_desert.drops.toml +++ b/data/area/kharidian_desert/kharidian_desert.drops.toml @@ -12,3 +12,9 @@ drops = [ { table = "herb_drop_table", roll = 20 }, { table = "elite_clue_scroll" }, ] + +[desert_snake_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] diff --git a/data/area/kharidian_desert/kharidian_desert.npcs.toml b/data/area/kharidian_desert/kharidian_desert.npcs.toml index 5052305d9a..63782fc0df 100644 --- a/data/area/kharidian_desert/kharidian_desert.npcs.toml +++ b/data/area/kharidian_desert/kharidian_desert.npcs.toml @@ -42,6 +42,7 @@ str = 5 def = 3 combat_def = "snake" examine = "A slithering serpent." +drop_table = "desert_snake" [desert_phoenix_kharidian_desert] id = 1911 @@ -66,6 +67,7 @@ slayer_xp = 62.0 categories = ["crocodiles"] respawn_delay = 40 examine = "Never smile at a..." +drop_table = "crocodile" [wanderer_kharidian_desert] id = 2002 diff --git a/data/area/kharidian_desert/klenters_pyramid/klenters_pyramid.npcs.toml b/data/area/kharidian_desert/klenters_pyramid/klenters_pyramid.npcs.toml index 5718181af1..cf905aa783 100644 --- a/data/area/kharidian_desert/klenters_pyramid/klenters_pyramid.npcs.toml +++ b/data/area/kharidian_desert/klenters_pyramid/klenters_pyramid.npcs.toml @@ -24,22 +24,27 @@ max_hit_melee = 60 respawn_delay = 10 categories = ["zombies"] examine = "This mummy looks like it means business!" +drop_table = "mummy" [mummy_klenters_pyramid_2] id = 2016 clone = "mummy_klenters_pyramid" +drop_table = "mummy" [mummy_klenters_pyramid_3] id = 2017 clone = "mummy_klenters_pyramid" +drop_table = "mummy" [mummy_klenters_pyramid_4] id = 2018 clone = "mummy_klenters_pyramid" +drop_table = "mummy" [mummy_klenters_pyramid_5] id = 2019 clone = "mummy_klenters_pyramid" +drop_table = "mummy" [high_priest_klenters_pyramid_2] id = 1986 diff --git a/data/area/kharidian_desert/mining_camp/desert_mining_camp.drops.toml b/data/area/kharidian_desert/mining_camp/desert_mining_camp.drops.toml index 603c8cf35a..59c98168da 100644 --- a/data/area/kharidian_desert/mining_camp/desert_mining_camp.drops.toml +++ b/data/area/kharidian_desert/mining_camp/desert_mining_camp.drops.toml @@ -8,4 +8,15 @@ drops = [ drops = [ { id = "bones" }, { id = "metal_key" }, -] \ No newline at end of file +] +[mercenary_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] + +[rowdy_slave_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] diff --git a/data/area/kharidian_desert/mining_camp/desert_mining_camp.npcs.toml b/data/area/kharidian_desert/mining_camp/desert_mining_camp.npcs.toml index 11f53b5970..15e1e9bcd1 100644 --- a/data/area/kharidian_desert/mining_camp/desert_mining_camp.npcs.toml +++ b/data/area/kharidian_desert/mining_camp/desert_mining_camp.npcs.toml @@ -31,54 +31,68 @@ max_hit_melee = 50 attack_bonus = 9 respawn_delay = 50 examine = "He looks a bit aggressive." +drop_table = "mercenary" [mercenary_desert_mining_camp_2] id = 4990 clone = "mercenary_desert_mining_camp" +drop_table = "mercenary" [mercenary_desert_mining_camp_3] id = 4991 clone = "mercenary_desert_mining_camp" +drop_table = "mercenary" [mercenary_desert_mining_camp_4] id = 4992 clone = "mercenary_desert_mining_camp" +drop_table = "mercenary" [guard_desert_mining_camp] id = 4993 examine = "He looks a bit aggressive." +drop_table = "guard" [guard_desert_mining_camp_2] id = 4994 examine = "He looks a bit aggressive." +drop_table = "guard" [guard_desert_mining_camp_3] id = 4995 examine = "He looks a bit aggressive." +drop_table = "guard" [guard_desert_mining_camp_4] id = 4996 examine = "He looks a bit aggressive." +drop_table = "guard" [guard_desert_mining_camp_5] id = 4997 examine = "He looks a bit aggressive." +drop_table = "guard" [guard_desert_mining_camp_6] id = 4998 examine = "He looks a bit aggressive." +drop_table = "guard" [guard_desert_mining_camp_7] id = 4999 +drop_table = "guard" [guard_desert_mining_camp_8] id = 5000 +drop_table = "guard" [guard_desert_mining_camp_9] id = 5001 +drop_table = "guard" [guard_desert_mining_camp_10] id = 5002 +drop_table = "guard" [male_slave_desert_mining_camp_3] id = 825 @@ -96,6 +110,7 @@ style = "crush" max_hit_melee = 20 respawn_delay = 50 examine = "He looks a bit aggressive." +drop_table = "rowdy_slave" [mercenary_captain] id = 830 diff --git a/data/area/kharidian_desert/nardah/nardah.npcs.toml b/data/area/kharidian_desert/nardah/nardah.npcs.toml index 6bc8fc0963..3ff617754d 100644 --- a/data/area/kharidian_desert/nardah/nardah.npcs.toml +++ b/data/area/kharidian_desert/nardah/nardah.npcs.toml @@ -106,6 +106,7 @@ max_hit_melee = 60 attack_bonus = 30 respawn_delay = 50 examine = "They'll eat anything!" +drop_table = "billy_goat" [artimeus] id = 5109 diff --git a/data/area/kharidian_desert/pollnivneach/dungeon/pollninveach_dungeon.npcs.toml b/data/area/kharidian_desert/pollnivneach/dungeon/pollninveach_dungeon.npcs.toml index c0e2f501a0..80c2443889 100644 --- a/data/area/kharidian_desert/pollnivneach/dungeon/pollninveach_dungeon.npcs.toml +++ b/data/area/kharidian_desert/pollnivneach/dungeon/pollninveach_dungeon.npcs.toml @@ -16,6 +16,7 @@ slayer_xp = 75.0 categories = ["basilisks"] respawn_delay = 15 examine = "The eyes of evil." +drop_table = "basilisk" [catolax_pollninveach_dungeon] id = 7783 diff --git a/data/area/kharidian_desert/rock_island_prison/rock_island_prison.npcs.toml b/data/area/kharidian_desert/rock_island_prison/rock_island_prison.npcs.toml index 4723b52072..864734fa4b 100644 --- a/data/area/kharidian_desert/rock_island_prison/rock_island_prison.npcs.toml +++ b/data/area/kharidian_desert/rock_island_prison/rock_island_prison.npcs.toml @@ -4,14 +4,17 @@ examine = "He's going for that 'stripy' look." [gull_rock_island] id = 1400 +drop_table = "bones" [customs_officer] id = 7837 examine = "Inspects people's packages." +drop_table = "bones" [customs_officer_2] id = 7838 examine = "Inspects people's packages." +drop_table = "bones" [locker_officer] id = 7842 diff --git a/data/area/kharidian_desert/sophanem/sophanem.npcs.toml b/data/area/kharidian_desert/sophanem/sophanem.npcs.toml index ead664bf0f..3df19d0ba8 100644 --- a/data/area/kharidian_desert/sophanem/sophanem.npcs.toml +++ b/data/area/kharidian_desert/sophanem/sophanem.npcs.toml @@ -52,6 +52,7 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["frogs"] examine = "A very smelly frog." +drop_table = "bones" [plague_cow] id = 1998 diff --git a/data/area/kharidian_desert/sophanem/sophanem_dungeon/sophanem_dungeon.drops.toml b/data/area/kharidian_desert/sophanem/sophanem_dungeon/sophanem_dungeon.drops.toml index d0bfe5c569..52d8d59712 100644 --- a/data/area/kharidian_desert/sophanem/sophanem_dungeon/sophanem_dungeon.drops.toml +++ b/data/area/kharidian_desert/sophanem/sophanem_dungeon/sophanem_dungeon.drops.toml @@ -35,3 +35,35 @@ drops = [ { id = "marrentill_tar", amount = 80 }, { table = "rare_drop_table", chance = 15 }, ] + +[scarab_mage_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "scarab_mage_secondary" }, +] + +[scarab_mage_secondary] +roll = 1356 +drops = [ + { id = "herb", chance = 64 }, + { id = "marrentill_tar", chance = 64 }, + { id = "sapphire", chance = 64 }, + { id = "emerald", chance = 64 }, + { id = "ruby", chance = 64 }, + { id = "battlestaff", chance = 64 }, + { id = "desert_goat_horn", chance = 64 }, + { id = "adamant_arrow", chance = 64 }, + { id = "rune_mace", chance = 64 }, + { id = "rune_2h_sword", chance = 64 }, + { id = "rune_sq_shield", chance = 64 }, + { id = "rune_arrow", chance = 64 }, + { id = "mithril_kiteshield", chance = 64 }, + { id = "lobster", chance = 64 }, + { id = "bass", chance = 64 }, + { id = "lava_rune", chance = 64 }, + { id = "cosmic_rune", chance = 64 }, + { id = "blood_rune", chance = 64 }, + { id = "nature_talisman", chance = 64 }, + { id = "dragon_spear", chance = 64 }, +] diff --git a/data/area/kharidian_desert/sophanem/sophanem_dungeon/sophanem_dungeon.npcs.toml b/data/area/kharidian_desert/sophanem/sophanem_dungeon/sophanem_dungeon.npcs.toml index 0e285c5199..38304c9837 100644 --- a/data/area/kharidian_desert/sophanem/sophanem_dungeon/sophanem_dungeon.npcs.toml +++ b/data/area/kharidian_desert/sophanem/sophanem_dungeon/sophanem_dungeon.npcs.toml @@ -35,6 +35,7 @@ slayer_xp = 51.2 categories = ["scabarites"] respawn_delay = 50 examine = "Part scarab, part human." +drop_table = "scarab_mage" [locust_rider_sophanem_dungeon] id = 5251 diff --git a/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.drops.toml b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.drops.toml new file mode 100644 index 0000000000..848da83fb3 --- /dev/null +++ b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.drops.toml @@ -0,0 +1,34 @@ +[scabaras_lancer_drop_table] +type = "all" +drops = [ + { table = "scabaras_lancer_secondary" }, + { table = "easy_clue_scroll", roll = 16 }, +] + +[scabaras_lancer_secondary] +roll = 1498 +drops = [ + { id = "bones", chance = 64 }, + { id = "rune_battleaxe", chance = 64 }, + { id = "dragon_spear", chance = 64 }, + { id = "battlestaff", chance = 64 }, + { id = "dragon_med_helm", chance = 64 }, + { id = "adamant_kiteshield", chance = 64 }, + { id = "blood_rune", amount = 7, chance = 64 }, + { id = "lava_rune", chance = 64 }, + { id = "coins", chance = 64 }, + { id = "rune_arrow", amount = 9, chance = 64 }, + { id = "adamant_arrow", chance = 64 }, + { id = "swordfish", chance = 64 }, + { id = "sapphire", chance = 64 }, + { id = "uncut_emerald", chance = 64 }, + { id = "emerald", min = 1, max = 2, chance = 64 }, + { id = "ruby", chance = 64 }, + { id = "raw_swordfish", chance = 64 }, + { id = "herb", min = 1, max = 2, chance = 64 }, + { id = "desert_goat_horn", amount = 3, chance = 64 }, + { id = "marrentill_tar", chance = 64 }, + { id = "cactus_seed", chance = 64 }, + { id = "court_summons", chance = 64 }, + { id = "rune_warhammer", chance = 6 }, +] diff --git a/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml index 371c1c6c97..42beb14fe8 100644 --- a/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml +++ b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml @@ -1,24 +1,29 @@ [scarab_larva_scabaras_dungeon] id = 6772 examine = "It's not quite small enough to stamp upon." +drop_table = "empty" [scabaras_ranger] id = 6773 categories = ["scabarites"] examine = "Bred to shoot you down." +drop_table = "locust_rider" [scabaras_lancer] id = 6774 categories = ["scabarites"] examine = "It might be angry...it's hard to tell." +drop_table = "scabaras_lancer" [scabaras_mage_scabaras_dungeon] id = 6780 categories = ["scabarites"] examine = "Part scarab, part man." +drop_table = "locust_rider" [scabaras_mage_scabaras_dungeon_2] id = 6781 +drop_table = "locust_rider" [clay_golem_scabaras_dungeon] id = 6785 diff --git a/data/area/kharidian_desert/ullek/ullek.drops.toml b/data/area/kharidian_desert/ullek/ullek.drops.toml new file mode 100644 index 0000000000..448df7baec --- /dev/null +++ b/data/area/kharidian_desert/ullek/ullek.drops.toml @@ -0,0 +1,144 @@ +[dried_zombie_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "dried_zombie_secondary" }, + { table = "medium_clue_scroll", roll = 170 }, +] + +[dried_zombie_secondary] +roll = 1656 +drops = [ + { id = "coins", chance = 205 }, + { id = "desert_robe", chance = 64 }, + { id = "ruby_ring", chance = 64 }, + { id = "steel_bar", amount = 3, chance = 64 }, + { id = "super_strength_1", chance = 64 }, + { id = "steel_arrow", min = 1, max = 23, chance = 32 }, + { id = "adamant_arrow", min = 1, max = 14, chance = 32 }, + { id = "mithril_bolts", min = 1, max = 14, chance = 32 }, + { id = "bronze_scimitar", chance = 32 }, + { id = "iron_scimitar", chance = 32 }, + { id = "steel_scimitar", chance = 32 }, + { id = "adamant_battleaxe", chance = 32 }, + { id = "steel_dart", min = 1, max = 25, chance = 32 }, + { id = "steel_spear", chance = 32 }, + { id = "yew_shortbow", chance = 32 }, + { id = "blood_rune", amount = 3, chance = 32 }, + { id = "death_rune", min = 1, max = 10, chance = 32 }, + { id = "fire_rune", amount = 75, chance = 32 }, + { id = "lava_rune", amount = 25, chance = 32 }, + { id = "grimy_guam", chance = 32 }, + { id = "grimy_marrentill", chance = 32 }, + { id = "grimy_tarromin", chance = 32 }, + { id = "grimy_harralander", chance = 32 }, + { id = "grimy_ranarr", chance = 32 }, + { id = "grimy_irit", chance = 32 }, + { id = "grimy_avantoe", chance = 32 }, + { id = "grimy_kwuarm", chance = 32 }, + { id = "grimy_cadantine", chance = 32 }, + { id = "grimy_lantadyme", chance = 32 }, + { id = "grimy_dwarf_weed", chance = 32 }, + { id = "desert_shirt", chance = 32 }, + { id = "desert_top_overcoat", chance = 32 }, + { id = "goat_horn_dust", amount = 3, chance = 32 }, + { id = "gold_bar", chance = 32 }, + { id = "knife", chance = 32 }, + { id = "loop_half_of_a_key", chance = 32 }, + { id = "rope", amount = 3, chance = 32 }, + { id = "silver_ore", chance = 32 }, + { id = "silver_bar", amount = 3, chance = 32 }, + { id = "combat_potion_1", chance = 6 }, + { id = "mithril_bar", chance = 6 }, + { id = "starved_ancient_effigy", chance = 2 }, +] + +[locust_lancer_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "locust_lancer_secondary" }, + { table = "easy_clue_scroll", roll = 16 }, +] + +[locust_lancer_secondary] +roll = 1566 +drops = [ + { id = "bones", chance = 64 }, + { id = "coins", chance = 64 }, + { id = "desert_goat_horn", chance = 64 }, + { id = "rune_2h_sword", chance = 64 }, + { id = "cactus_seed", chance = 64 }, + { id = "adamant_arrow", chance = 64 }, + { id = "adamant_kiteshield", chance = 64 }, + { id = "rune_arrow", chance = 64 }, + { id = "rune_javelin", chance = 64 }, + { id = "rune_sq_shield", chance = 64 }, + { id = "rune_warhammer", chance = 64 }, + { id = "rune_battleaxe", chance = 64 }, + { id = "battlestaff", chance = 64 }, + { id = "blood_rune", chance = 64 }, + { id = "lava_rune", chance = 64 }, + { id = "cosmic_rune", chance = 64 }, + { id = "loop_half_of_a_key", chance = 64 }, + { id = "meat_pizza", chance = 64 }, + { id = "raw_swordfish", chance = 64 }, + { id = "swordfish", chance = 64 }, + { id = "emerald", chance = 64 }, + { id = "sapphire", chance = 64 }, + { id = "dragonstone", chance = 64 }, + { id = "dragon_spear", chance = 6 }, +] + +[locust_ranger_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "locust_ranger_secondary" }, + { table = "hard_clue_scroll", roll = 32 }, +] + +[locust_ranger_secondary] +roll = 1356 +drops = [ + { id = "mystic_gloves_dark", chance = 32 }, + { id = "splitbark_helm", chance = 32 }, + { id = "splitbark_body", chance = 32 }, + { id = "splitbark_legs", chance = 32 }, + { id = "splitbark_boots", chance = 32 }, + { id = "splitbark_gauntlets", chance = 32 }, + { id = "adamant_kiteshield", chance = 32 }, + { id = "grimy_guam", chance = 32 }, + { id = "grimy_marrentill", chance = 32 }, + { id = "grimy_tarromin", chance = 32 }, + { id = "grimy_harralander", chance = 32 }, + { id = "grimy_ranarr", chance = 32 }, + { id = "grimy_irit", chance = 32 }, + { id = "grimy_avantoe", chance = 32 }, + { id = "grimy_kwuarm", chance = 32 }, + { id = "grimy_cadantine", chance = 32 }, + { id = "grimy_lantadyme", chance = 32 }, + { id = "grimy_dwarf_weed", chance = 32 }, + { id = "nature_rune", amount = 30, chance = 32 }, + { id = "lava_rune", amount = 20, chance = 32 }, + { id = "blood_rune", min = 1, max = 7, chance = 32 }, + { id = "cosmic_rune", amount = 5, chance = 32 }, + { id = "battlestaff", chance = 32 }, + { id = "rune_warhammer", chance = 32 }, + { id = "rune_battleaxe", chance = 32 }, + { id = "rune_2h_sword", chance = 32 }, + { id = "adamant_arrow", amount = 24, chance = 32 }, + { id = "rune_arrow", amount = 9, chance = 32 }, + { id = "raw_swordfish", chance = 32 }, + { id = "swordfish", chance = 32 }, + { id = "bass", chance = 32 }, + { id = "meat_pizza", chance = 32 }, + { id = "locust_meat", chance = 32 }, + { id = "coins", min = 60, max = 500, chance = 32 }, + { id = "uncut_sapphire", min = 1, max = 2, chance = 32 }, + { id = "uncut_emerald", min = 1, max = 2, chance = 32 }, + { id = "dragonstone", chance = 32 }, + { id = "desert_goat_horn", amount = 3, chance = 32 }, + { id = "shield_left_half", chance = 32 }, + { id = "starved_ancient_effigy", chance = 32 }, +] diff --git a/data/area/kharidian_desert/ullek/ullek.npcs.toml b/data/area/kharidian_desert/ullek/ullek.npcs.toml index 1be7534d5f..5982e4c494 100644 --- a/data/area/kharidian_desert/ullek/ullek.npcs.toml +++ b/data/area/kharidian_desert/ullek/ullek.npcs.toml @@ -2,50 +2,62 @@ id = 6761 categories = ["zombies"] examine = "Cut-down and dried." +drop_table = "dried_zombie" [dried_zombie_ullek_2] id = 6762 categories = ["zombies"] examine = "Needs moisturising." +drop_table = "dried_zombie" [dried_zombie_ullek_3] id = 6763 categories = ["zombies"] examine = "I bet it's parched." +drop_table = "dried_zombie" [skeleton_ullek] id = 6764 +drop_table = "skeleton" [skeleton_ullek_2] id = 6765 +drop_table = "skeleton" [skeleton_ullek_3] id = 6766 +drop_table = "skeleton" [skeleton_ullek_4] id = 6767 +drop_table = "skeleton" [skeleton_ullek_5] id = 6768 categories = ["skeletons"] examine = "Heartless, in every sense of the word." +drop_table = "skeleton" [scabaras_locust_ullek] id = 6776 examine = "A giant, mountable locust." +drop_table = "locust" [locust_lancer_ullek] id = 6777 categories = ["scabarites"] examine = "Bouncy, but not fun." +drop_table = "locust_lancer" [locust_ranger_ullek] id = 6778 categories = ["scabarites"] examine = "He'll have someone's eye out with that." +drop_table = "locust_ranger" [crocodile_ullek] id = 6779 +drop_table = "crocodile" [lead_archaeologist_abigail] id = 6786 diff --git a/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.drops.toml b/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.drops.toml new file mode 100644 index 0000000000..81e0ebb9aa --- /dev/null +++ b/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.drops.toml @@ -0,0 +1,12 @@ +[small_scarab_drop_table] +type = "all" +drops = [ + { table = "small_scarab_secondary" }, + { table = "easy_clue_scroll", roll = 16 }, +] + +[small_scarab_secondary] +roll = 1024 +drops = [ + { id = "coins", chance = 64 }, +] diff --git a/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml b/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml index f39a8c379b..f6986facc3 100644 --- a/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml +++ b/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml @@ -1,6 +1,7 @@ [golem_guard_uzer_mastaba] id = 7497 examine = "A rocky horror." +drop_table = "empty" [golems_remains_uzer_mastaba] id = 7498 @@ -9,4 +10,5 @@ id = 7498 id = 7500 categories = ["scabarites"] examine = "This dung beetle has mistaken you for its staple diet." +drop_table = "small_scarab" diff --git a/data/area/kharidian_desert/uzer/uzer.drops.toml b/data/area/kharidian_desert/uzer/uzer.drops.toml new file mode 100644 index 0000000000..8e54135bcf --- /dev/null +++ b/data/area/kharidian_desert/uzer/uzer.drops.toml @@ -0,0 +1,35 @@ +[bandit_looter_drop_table] +type = "all" +drops = [ + { table = "bandit_looter_secondary" }, +] + +[bandit_looter_secondary] +roll = 1117 +drops = [ + { id = "coins", min = 67, max = 882, chance = 64 }, + { id = "water_rune", min = 3, max = 17, chance = 64 }, + { id = "fire_rune", min = 4, max = 26, chance = 64 }, + { id = "cosmic_rune", min = 1, max = 6, chance = 64 }, + { id = "chaos_rune", min = 8, max = 10, chance = 64 }, + { id = "grimy_guam", chance = 64 }, + { id = "grimy_marrentill", chance = 64 }, + { id = "hammer", chance = 64 }, + { id = "knife", chance = 64 }, + { id = "waterskin_4", chance = 64 }, + { id = "desert_shirt", chance = 64 }, + { id = "silk", amount = 10, chance = 64 }, + { id = "nature_rune", min = 1, max = 5, chance = 32 }, + { id = "law_rune", min = 1, max = 5, chance = 32 }, + { id = "grimy_tarromin", chance = 32 }, + { id = "saw", chance = 32 }, + { id = "papyrus", amount = 4, chance = 32 }, + { id = "steel_battleaxe", chance = 32 }, + { id = "mithril_med_helm", chance = 32 }, + { id = "granite_500g", chance = 32 }, + { id = "grimy_ranarr", chance = 6 }, + { id = "grimy_irit", chance = 6 }, + { id = "grimy_avantoe", chance = 6 }, + { id = "grimy_cadantine", chance = 6 }, + { id = "grimy_lantadyme", chance = 6 }, +] diff --git a/data/area/kharidian_desert/uzer/uzer.npcs.toml b/data/area/kharidian_desert/uzer/uzer.npcs.toml index e1c2470eb8..cdd8c2dcf2 100644 --- a/data/area/kharidian_desert/uzer/uzer.npcs.toml +++ b/data/area/kharidian_desert/uzer/uzer.npcs.toml @@ -1,20 +1,25 @@ [bandit_looter_uzer] id = 7492 examine = "A desert dweller taken to banditry." +drop_table = "bandit_looter" [bandit_looter_uzer_2] id = 7493 examine = "Calls himself an archaeologist." +drop_table = "bandit_looter" [bandit_looter_uzer_3] id = 7494 examine = "He hasn't found much of use, clearly." +drop_table = "bandit_looter" [bandit_looter_uzer_4] id = 7495 examine = "An amateur historian with added greed." +drop_table = "bandit_looter" [bandit_looter_uzer_5] id = 7496 examine = "It all started with her love of genealogy." +drop_table = "bandit_looter" diff --git a/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.drops.toml b/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.drops.toml new file mode 100644 index 0000000000..dfba2143ff --- /dev/null +++ b/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.drops.toml @@ -0,0 +1,44 @@ +[giant_frog_drop_table] +type = "all" +drops = [ + { id = "big_bones" }, + { table = "giant_frog_secondary" }, +] + +[giant_frog_secondary] +roll = 1024 +drops = [ + { id = "giant_frog_legs", chance = 64 }, + { id = "nature_rune", chance = 64 }, + { id = "coins", amount = 2, chance = 64 }, + { id = "iron_arrow", amount = 22, chance = 32 }, + { id = "steel_arrow", amount = 45, chance = 32 }, + { id = "blood_rune", chance = 32 }, + { id = "cosmic_rune", min = 1, max = 10, chance = 32 }, + { id = "coal", chance = 32 }, + { id = "mithril_spear", chance = 32 }, + { id = "spinach_roll", chance = 32 }, + { id = "long_bone", chance = 6 }, + { id = "adamant_boots", chance = 2 }, + { id = "curved_bone", chance = 2 }, +] + +[big_frog_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "big_frog_secondary" }, +] + +[big_frog_secondary] +roll = 1024 +drops = [ + { id = "coins", amount = 5, chance = 64 }, + { id = "water_rune", amount = 12, chance = 32 }, + { id = "earth_rune", amount = 12, chance = 32 }, + { id = "cosmic_rune", amount = 2, chance = 32 }, + { id = "nature_rune", amount = 4, chance = 32 }, + { id = "water_talisman", chance = 32 }, + { id = "earth_talisman", chance = 32 }, + { id = "big_frog_leg", chance = 32 }, +] diff --git a/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.npcs.toml b/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.npcs.toml index 634bf2c731..ff6e91ece5 100644 --- a/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.npcs.toml +++ b/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.npcs.toml @@ -9,6 +9,7 @@ max_hit_melee = 90 respawn_delay = 50 categories = ["frogs"] examine = "It didn't get that big eating flies." +drop_table = "giant_frog" [big_frog] id = 1829 @@ -21,6 +22,7 @@ max_hit_melee = 30 respawn_delay = 50 categories = ["frogs"] examine = "It didn't get that big eating flies." +drop_table = "big_frog" [cave_bug_larva] id = 1833 diff --git a/data/area/misthalin/dorgesh_kaan/dorgesh_kaan.npcs.toml b/data/area/misthalin/dorgesh_kaan/dorgesh_kaan.npcs.toml index c02b5fde27..17d8cfb848 100644 --- a/data/area/misthalin/dorgesh_kaan/dorgesh_kaan.npcs.toml +++ b/data/area/misthalin/dorgesh_kaan/dorgesh_kaan.npcs.toml @@ -221,11 +221,13 @@ examine = "He's the head of the Dorgeshuun Council." id = 5800 categories = ["goblins"] examine = "He keeps order in the city." +drop_table = "guard" [guard_dorgesh_kaan_2] id = 5801 categories = ["goblins"] examine = "He keeps order in the city." +drop_table = "guard" [zanik_dorgesh_kaan_2] id = 5802 diff --git a/data/area/misthalin/draynor/draynor.drops.toml b/data/area/misthalin/draynor/draynor.drops.toml index c3ee66c0d8..840fbeaa20 100644 --- a/data/area/misthalin/draynor/draynor.drops.toml +++ b/data/area/misthalin/draynor/draynor.drops.toml @@ -75,4 +75,15 @@ drops = [ { id = "lantadyme_seed", chance = 2 }, { id = "dwarf_weed_seed" }, { id = "torstol_seed" }, -] \ No newline at end of file +] +[shady_stranger_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] + +[suspicious_outsider_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] diff --git a/data/area/misthalin/draynor/draynor.npcs.toml b/data/area/misthalin/draynor/draynor.npcs.toml index a8ee2afc9a..271e7e20da 100644 --- a/data/area/misthalin/draynor/draynor.npcs.toml +++ b/data/area/misthalin/draynor/draynor.npcs.toml @@ -141,6 +141,7 @@ combat_def = "draynor_market_guard" hunt_mode = "guarding" respawn_delay = 50 examine = "He guards the Draynor Market stalls from thieves." +drop_table = "market_guard" [bank_guard_draynor] id = 2574 @@ -192,6 +193,7 @@ hitpoints = 300 combat_def = "man" max_hit_crush = 60 examine = "He seems to be trying to watch everyone at once." +drop_table = "shady_stranger" [suspicious_outsider] id = 8436 @@ -199,6 +201,7 @@ hitpoints = 440 combat_def = "man" max_hit_crush = 60 examine = "Haven't seen his sort around here before; what's he doing here?" +drop_table = "suspicious_outsider" [ruantun_draynor_sewers] id = 1916 diff --git a/data/area/misthalin/edgeville/edgeville.npcs.toml b/data/area/misthalin/edgeville/edgeville.npcs.toml index 154b084c60..f59e509881 100644 --- a/data/area/misthalin/edgeville/edgeville.npcs.toml +++ b/data/area/misthalin/edgeville/edgeville.npcs.toml @@ -31,6 +31,7 @@ examine = "A very brave merchant." id = 206 categories = ["dwarves"] examine = "A dwarven guard." +drop_table = "guard" [mysterious_ghost_edgeville] id = 2386 @@ -186,6 +187,7 @@ combat_def = "man" respawn_delay = 25 combat_def = "man" examine = "A holy man." +drop_table = "bones" [brother_bordiss] id = 7730 diff --git a/data/area/misthalin/ham_hideout/ham_hideout.drops.toml b/data/area/misthalin/ham_hideout/ham_hideout.drops.toml index a96e2b41fc..ea54a13c3d 100644 --- a/data/area/misthalin/ham_hideout/ham_hideout.drops.toml +++ b/data/area/misthalin/ham_hideout/ham_hideout.drops.toml @@ -98,3 +98,59 @@ drops = [ { id = "needle", chance = 2 }, { id = "tinderbox", chance = 2 }, ] + +[h_a_m_guard_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "h_a_m_guard_secondary" }, + { table = "easy_clue_scroll", roll = 32 }, +] + +[h_a_m_guard_secondary] +roll = 1475 +drops = [ + { id = "rusty_sword", chance = 64 }, + { id = "ham_gloves", chance = 64 }, + { id = "coins", min = 5, max = 19, chance = 64 }, + { id = "tinderbox", chance = 64 }, + { id = "logs", min = 1, max = 3, chance = 64 }, + { id = "steel_key_ham", min = 1, max = 2, chance = 64 }, + { id = "silver_key_ham", chance = 64 }, + { id = "steel_dagger", chance = 32 }, + { id = "bronze_dagger", chance = 32 }, + { id = "bronze_arrow", min = 1, max = 8, chance = 32 }, + { id = "steel_arrow", amount = 4, chance = 32 }, + { id = "bronze_hatchet", chance = 32 }, + { id = "iron_hatchet", chance = 32 }, + { id = "steel_hatchet", chance = 32 }, + { id = "bronze_pickaxe", chance = 32 }, + { id = "iron_pickaxe", chance = 32 }, + { id = "steel_pickaxe", chance = 32 }, + { id = "knife", chance = 32 }, + { id = "ham_boots", chance = 32 }, + { id = "ham_shirt", chance = 32 }, + { id = "ham_robe", chance = 32 }, + { id = "ham_logo", chance = 32 }, + { id = "uncut_opal", chance = 32 }, + { id = "uncut_jade", chance = 32 }, + { id = "raw_anchovies", chance = 32 }, + { id = "raw_chicken", chance = 32 }, + { id = "cowhide", min = 1, max = 3, chance = 32 }, + { id = "iron_ore", chance = 32 }, + { id = "coal", chance = 32 }, + { id = "buttons", chance = 32 }, + { id = "needle", chance = 32 }, + { id = "iron_key_ham", min = 1, max = 2, chance = 32 }, + { id = "feather", min = 1, max = 7, chance = 32 }, + { id = "thread", chance = 32 }, + { id = "grimy_guam", chance = 32 }, + { id = "leather_body", chance = 6 }, + { id = "damaged_armour", chance = 6 }, + { id = "ham_hood", chance = 6 }, + { id = "ham_cloak", chance = 6 }, + { id = "bronze_key_ham", chance = 6 }, + { id = "grimy_marrentill", chance = 6 }, + { id = "grimy_tarromin", chance = 6 }, + { id = "watermelon_seed", min = 1, max = 4, chance = 6 }, +] diff --git a/data/area/misthalin/ham_hideout/ham_hideout.npcs.toml b/data/area/misthalin/ham_hideout/ham_hideout.npcs.toml index 429a1cdb4f..272f28865f 100644 --- a/data/area/misthalin/ham_hideout/ham_hideout.npcs.toml +++ b/data/area/misthalin/ham_hideout/ham_hideout.npcs.toml @@ -26,6 +26,7 @@ style = "crush" max_hit_melee = 30 respawn_delay = 25 examine = "A guard for the humans against monster group." +drop_table = "h_a_m_guard" [ham_guard_ham_cave_3] id = 1712 @@ -38,6 +39,7 @@ style = "crush" max_hit_melee = 30 respawn_delay = 25 examine = "A guard for the humans against monster group." +drop_table = "h_a_m_guard" [ham_deacon_ham_cave] id = 1713 diff --git a/data/area/misthalin/ham_hideout/store_rooms/ham_store_rooms.npcs.toml b/data/area/misthalin/ham_hideout/store_rooms/ham_store_rooms.npcs.toml index d857db787b..61c24136dc 100644 --- a/data/area/misthalin/ham_hideout/store_rooms/ham_store_rooms.npcs.toml +++ b/data/area/misthalin/ham_hideout/store_rooms/ham_store_rooms.npcs.toml @@ -1,20 +1,25 @@ [guard_ham_store_rooms] id = 4307 examine = "A guard for the humans against monster group." +drop_table = "guard" [guard_ham_store_rooms_2] id = 4308 clone = "guard_ham_store_rooms" +drop_table = "guard" [guard_ham_store_rooms_3] id = 4309 clone = "guard_ham_store_rooms" +drop_table = "guard" [guard_ham_store_rooms_4] id = 4310 clone = "guard_ham_store_rooms" +drop_table = "guard" [guard_ham_store_rooms_5] id = 4311 clone = "guard_ham_store_rooms" +drop_table = "guard" diff --git a/data/area/misthalin/lumbridge/combat_hall/combat_hall.npcs.toml b/data/area/misthalin/lumbridge/combat_hall/combat_hall.npcs.toml index e4d70dec88..48b952d1e8 100644 --- a/data/area/misthalin/lumbridge/combat_hall/combat_hall.npcs.toml +++ b/data/area/misthalin/lumbridge/combat_hall/combat_hall.npcs.toml @@ -8,6 +8,7 @@ immune_stun = true immune_drain = true retaliates = false examine = "This is ready for you to cast magic at it." +drop_table = "empty" [melee_dummy] id = 7891 @@ -19,6 +20,7 @@ immune_stun = true immune_drain = true retaliates = false examine = "Ready for all you can swing at it." +drop_table = "empty" [mikasi] id = 4707 diff --git a/data/area/misthalin/lumbridge/swamp/caves/lumbridge_swamp_caves.drops.toml b/data/area/misthalin/lumbridge/swamp/caves/lumbridge_swamp_caves.drops.toml index 6f6aafc9aa..6ce40ae9fd 100644 --- a/data/area/misthalin/lumbridge/swamp/caves/lumbridge_swamp_caves.drops.toml +++ b/data/area/misthalin/lumbridge/swamp/caves/lumbridge_swamp_caves.drops.toml @@ -56,4 +56,32 @@ drops = [ { id = "eye_of_newt", chance = 4 }, { id = "bullseye_lantern_empty", chance = 20 }, { id = "nothing", amount = 0, chance = 12 }, -] \ No newline at end of file +] +[cave_goblin_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "cave_goblin_secondary" }, + { table = "easy_clue_scroll", roll = 32 }, +] + +[cave_goblin_secondary] +roll = 1024 +drops = [ + { id = "water_rune", amount = 6, chance = 64 }, + { id = "coins", min = 13, max = 49, chance = 64 }, + { id = "body_rune", amount = 7, chance = 32 }, + { id = "earth_rune", amount = 4, chance = 32 }, + { id = "air_talisman", chance = 32 }, + { id = "bone_spear", chance = 32 }, + { id = "bone_club", chance = 32 }, + { id = "brass_necklace", chance = 32 }, + { id = "bronze_spear", chance = 32 }, + { id = "bronze_sq_shield", chance = 32 }, + { id = "beer", chance = 32 }, + { id = "goblin_book", chance = 32 }, + { id = "goblin_mail", chance = 32 }, + { id = "iron_chainbody", chance = 32 }, + { id = "oil_lantern", chance = 32 }, + { id = "tinderbox", chance = 32 }, +] diff --git a/data/area/misthalin/lumbridge/swamp/caves/lumbridge_swamp_caves.npcs.toml b/data/area/misthalin/lumbridge/swamp/caves/lumbridge_swamp_caves.npcs.toml index 2611f4493b..bc089f4c7a 100644 --- a/data/area/misthalin/lumbridge/swamp/caves/lumbridge_swamp_caves.npcs.toml +++ b/data/area/misthalin/lumbridge/swamp/caves/lumbridge_swamp_caves.npcs.toml @@ -6,18 +6,22 @@ slayer_xp = 10.0 categories = ["goblins"] respawn_delay = 50 examine = "A goblin with big bulging eyes." +drop_table = "cave_goblin" [cave_goblin_lumbridge_swamp_caves_2] id = 1823 clone = "cave_goblin_lumbridge_swamp_caves" +drop_table = "cave_goblin" [cave_goblin_lumbridge_swamp_caves_3] id = 1824 clone = "cave_goblin_lumbridge_swamp_caves" +drop_table = "cave_goblin" [cave_goblin_lumbridge_swamp_caves_4] id = 1825 clone = "cave_goblin_lumbridge_swamp_caves" +drop_table = "cave_goblin" [hole_in_the_wall] id = 2058 diff --git a/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml b/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml index 295cd7800b..ff6d8a45cd 100644 --- a/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml +++ b/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml @@ -16,6 +16,7 @@ id = 9708 [giant_spider_lumbridge] id = 12352 +drop_table = "giant_spider" [sergeant_mossfists] id = 5889 diff --git a/data/area/misthalin/varrock/air_rune_temple/air_rune_temple.npcs.toml b/data/area/misthalin/varrock/air_rune_temple/air_rune_temple.npcs.toml index f60dae2819..bdabfde158 100644 --- a/data/area/misthalin/varrock/air_rune_temple/air_rune_temple.npcs.toml +++ b/data/area/misthalin/varrock/air_rune_temple/air_rune_temple.npcs.toml @@ -6,4 +6,5 @@ max_hit_melee = 10 attack_bonus = -47 respawn_delay = 25 examine = "A cute bunny rabbit." +drop_table = "rabbit" diff --git a/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.npcs.toml b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.npcs.toml index 7b335fbf2f..80c8a559fa 100644 --- a/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.npcs.toml +++ b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.npcs.toml @@ -7,6 +7,7 @@ def = 38 style = "stab" max_hit_melee = 50 examine = "He looks a little on the cross side!" +drop_table = "empty" [angry_giant_rat_tolnas_rift] id = 3662 @@ -30,6 +31,7 @@ style = "stab" max_hit_melee = 50 categories = ["goblins"] examine = "He looks a little on the cross side!" +drop_table = "empty" [angry_bear_tolnas_rift] id = 3664 @@ -40,6 +42,7 @@ def = 38 style = "stab" max_hit_melee = 50 examine = "He looks a little on the cross side!" +drop_table = "empty" [fear_reaper_tolnas_rift] id = 3665 @@ -51,6 +54,7 @@ style = "slash" max_hit_melee = 60 hunt_mode = "cowardly" examine = "AHHHH!" +drop_table = "empty" [confusion_beast_tolnas_rift] id = 3666 @@ -63,6 +67,7 @@ max_hit_melee = 60 hunt_mode = "cowardly" respawn_delay = 25 examine = "What on Gielinor is that?!?" +drop_table = "empty" [hopeless_creature_tolnas_rift] id = 3667 @@ -75,6 +80,7 @@ max_hit_melee = 70 hunt_mode = "cowardly" respawn_delay = 25 examine = "A hopeless poor creature." +drop_table = "empty" [angry_giant_rat_tolnas_rift_2] id = 4940 diff --git a/data/area/misthalin/varrock/varrock.npcs.toml b/data/area/misthalin/varrock/varrock.npcs.toml index eb730f8daf..72e7c13580 100644 --- a/data/area/misthalin/varrock/varrock.npcs.toml +++ b/data/area/misthalin/varrock/varrock.npcs.toml @@ -322,6 +322,7 @@ combat_def = "man" max_hit_crush = 20 respawn_delay = 25 examine = "Known for his light-fingered qualities." +drop_table = "thief" [art_critic_jacques] id = 5930 @@ -552,6 +553,7 @@ id = 8906 [man_varrock_4] id = 12346 +drop_table = "man" [orlando_smith] id = 5965 @@ -576,9 +578,11 @@ examine = "A crafter at the pinnacle of his art." [man_varrock] id = 12345 +drop_table = "man" [man_varrock_2] id = 12347 +drop_table = "man" [tramp_varrock_2] id = 2792 @@ -630,14 +634,17 @@ attack_bonus = 4 combat_def = "guard_varrock" respawn_delay = 50 examine = "He tries to keep order around here. His bizarre uniform isn't helping." +drop_table = "guard" [man_varrock_3] id = 5923 examine = "One of Gielinor's many citizens." +drop_table = "man" [woman_varrock] id = 5924 examine = "One of Gielinor's many citizens." +drop_table = "woman" [benny] id = 5925 @@ -646,14 +653,17 @@ examine = "Newspaper seller." [thief_black_arm_gang] id = 5926 clone = "thief_phoenix_gang" +drop_table = "thief" [thief_black_arm_gang_red] id = 5928 clone = "thief_phoenix_gang" +drop_table = "thief" [thief_black_arm_gang_blonde] id = 5929 clone = "thief_phoenix_gang" +drop_table = "thief" [apothecary] id = 638 @@ -696,6 +706,7 @@ examine = "Peaceful man!" [guard_varrock_2] id = 5920 clone = "guard_varrock" +drop_table = "guard" [trainee_guard] id = 5921 diff --git a/data/area/misthalin/zanaris/evil_chicken_lair/evil_chicken_lair.npcs.toml b/data/area/misthalin/zanaris/evil_chicken_lair/evil_chicken_lair.npcs.toml index a1fb42699f..42be648938 100644 --- a/data/area/misthalin/zanaris/evil_chicken_lair/evil_chicken_lair.npcs.toml +++ b/data/area/misthalin/zanaris/evil_chicken_lair/evil_chicken_lair.npcs.toml @@ -14,14 +14,17 @@ examine = "A fowl beast." id = 4674 categories = ["black_dragons"] examine = "A fierce dragon with black scales!" +drop_table = "black_dragon" [black_dragon_evil_chicken_lair_2] id = 4675 categories = ["black_dragons"] examine = "A fierce dragon with black scales!" +drop_table = "black_dragon" [black_dragon_evil_chicken_lair_3] id = 4676 categories = ["black_dragons"] examine = "A fierce dragon with black scales!" +drop_table = "black_dragon" diff --git a/data/area/morytania/burgh_de_rott/burgh_de_rott.drops.toml b/data/area/morytania/burgh_de_rott/burgh_de_rott.drops.toml new file mode 100644 index 0000000000..3843a3621a --- /dev/null +++ b/data/area/morytania/burgh_de_rott/burgh_de_rott.drops.toml @@ -0,0 +1,41 @@ +[vampyre_juvinate_drop_table] +type = "all" +drops = [ + { table = "vampyre_juvinate_secondary" }, + { table = "medium_clue_scroll", roll = 32 }, +] + +[vampyre_juvinate_secondary] +roll = 1024 +drops = [ + { id = "staff_of_air", chance = 32 }, + { id = "staff_of_fire", chance = 32 }, + { id = "black_spear", chance = 32 }, + { id = "black_battleaxe", chance = 32 }, + { id = "black_2h_sword", chance = 32 }, + { id = "mithril_battleaxe", chance = 32 }, + { id = "mithril_2h_sword", chance = 32 }, + { id = "mithril_scimitar", chance = 32 }, + { id = "mithril_longsword", chance = 32 }, + { id = "mithril_warhammer", chance = 32 }, + { id = "adamant_hatchet", chance = 32 }, + { id = "adamant_sword", chance = 32 }, + { id = "adamant_mace", chance = 32 }, + { id = "adamant_scimitar", chance = 32 }, + { id = "steel_plateskirt", chance = 32 }, + { id = "black_full_helm", chance = 32 }, + { id = "black_chainbody", chance = 32 }, + { id = "black_platelegs", chance = 32 }, + { id = "black_kiteshield", chance = 32 }, + { id = "black_sq_shield", chance = 32 }, + { id = "mithril_full_helm", chance = 32 }, + { id = "mithril_chainbody", chance = 32 }, + { id = "mithril_platelegs", chance = 32 }, + { id = "mithril_sq_shield", chance = 32 }, + { id = "adamant_med_helm", chance = 32 }, + { id = "nature_rune", amount = 10, chance = 32 }, + { id = "death_rune", amount = 10, chance = 32 }, + { id = "willow_logs", amount = 5, chance = 32 }, + { id = "yew_logs", amount = 5, chance = 32 }, + { id = "ruby_ring", chance = 32 }, +] diff --git a/data/area/morytania/burgh_de_rott/burgh_de_rott.npcs.toml b/data/area/morytania/burgh_de_rott/burgh_de_rott.npcs.toml index b798764417..83bc0cb61f 100644 --- a/data/area/morytania/burgh_de_rott/burgh_de_rott.npcs.toml +++ b/data/area/morytania/burgh_de_rott/burgh_de_rott.npcs.toml @@ -9,28 +9,35 @@ id = 3513 [vampyre_juvinate_3] id = 3522 +drop_table = "vampyre_juvinate" [vampyre_juvinate_4] id = 3523 +drop_table = "vampyre_juvinate" [vampyre_juvinate_5] id = 3524 +drop_table = "vampyre_juvinate" [vampyre_juvinate_6] id = 3525 +drop_table = "vampyre_juvinate" [vampyre_juvenile] id = 3531 categories = ["vampyres"] examine = "He looks really hungry!" +drop_table = "empty" [vampyre_juvenile_2] id = 3532 categories = ["vampyres"] examine = "She looks really hungry!" +drop_table = "empty" [vampyre_juvenile_3] id = 3533 +drop_table = "empty" [elisabeta] id = 3540 @@ -113,27 +120,35 @@ id = 3575 [vyrewatch] id = 7691 +drop_table = "vyrewatch" [vyrewatch_2] id = 7692 +drop_table = "vyrewatch" [vyrewatch_3] id = 7693 +drop_table = "vyrewatch" [vyrewatch_4] id = 7694 +drop_table = "vyrewatch" [vyrewatch_5] id = 7699 +drop_table = "vyrewatch" [vyrewatch_6] id = 7700 +drop_table = "vyrewatch" [vyrewatch_7] id = 7701 +drop_table = "vyrewatch" [vyrewatch_8] id = 7702 +drop_table = "vyrewatch" [ivan_strom] id = 7708 diff --git a/data/area/morytania/darkmeyer/darkmeyer.drops.toml b/data/area/morytania/darkmeyer/darkmeyer.drops.toml new file mode 100644 index 0000000000..994f64b693 --- /dev/null +++ b/data/area/morytania/darkmeyer/darkmeyer.drops.toml @@ -0,0 +1,5 @@ +[vyrewatch_drop_table] +type = "all" +drops = [ + { id = "vyre_corpse" }, +] diff --git a/data/area/morytania/darkmeyer/darkmeyer.npcs.toml b/data/area/morytania/darkmeyer/darkmeyer.npcs.toml index cd725d752b..bf1f906be5 100644 --- a/data/area/morytania/darkmeyer/darkmeyer.npcs.toml +++ b/data/area/morytania/darkmeyer/darkmeyer.npcs.toml @@ -22,18 +22,22 @@ immune_poison = true immune_cannon = true respawn_delay = 25 examine = "An evil, bloodsucking vampyre." +drop_table = "vyrewatch" [vyrewatch_darkmeyer_2] id = 4807 clone = "vyrewatch_darkmeyer" +drop_table = "vyrewatch" [vyrewatch_darkmeyer_3] id = 4819 clone = "vyrewatch_darkmeyer" +drop_table = "vyrewatch" [vyrewatch_darkmeyer_4] id = 4832 clone = "vyrewatch_darkmeyer" +drop_table = "vyrewatch" [vyrewatch_darkmeyer_5] id = 4834 @@ -53,14 +57,17 @@ immune_poison = true immune_cannon = true respawn_delay = 25 examine = "A thirsty-looking, airborne bloodsucker!" +drop_table = "vyrewatch" [vyrewatch_darkmeyer_6] id = 4835 clone = "vyrewatch_darkmeyer" +drop_table = "vyrewatch" [vyrewatch_darkmeyer_7] id = 4836 clone = "vyrewatch_darkmeyer" +drop_table = "vyrewatch" [safalaan_darkmeyer_2] id = 4713 diff --git a/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.npcs.toml b/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.npcs.toml index 990ae240f7..7c06851b37 100644 --- a/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.npcs.toml +++ b/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.npcs.toml @@ -1,10 +1,12 @@ [giant_lobster_dragontooth_shipwreck] id = 7828 examine = "An extremely vicious lobster." +drop_table = "giant_lobster" [giant_crab_dragontooth_shipwreck] id = 7829 examine = "Nice claw." +drop_table = "empty" [karamthulhu_dragontooth_shipwreck] id = 7858 diff --git a/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.npcs.toml b/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.npcs.toml index 2b7957ecd4..952c3aefdc 100644 --- a/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.npcs.toml +++ b/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.npcs.toml @@ -21,31 +21,37 @@ examine = "A giant skeleton." id = 5385 categories = ["skeletons"] examine = "A magic skeleton!" +drop_table = "skeleton" [skeleton_lair_of_tarn_razorlor_2] id = 5387 categories = ["skeletons"] examine = "Look: another skeleton." +drop_table = "skeleton" [skeleton_lair_of_tarn_razorlor_3] id = 5388 categories = ["skeletons"] examine = "That skeleton's grinning at me." +drop_table = "skeleton" [skeleton_lair_of_tarn_razorlor_4] id = 5389 categories = ["skeletons"] examine = "He needs a tan." +drop_table = "skeleton" [skeleton_lair_of_tarn_razorlor_5] id = 5390 categories = ["skeletons"] examine = "How do you know if a skeleton's male or female?" +drop_table = "skeleton" [skeleton_lair_of_tarn_razorlor_6] id = 5391 categories = ["skeletons"] examine = "He obviously hasn't realised he's dead." +drop_table = "skeleton" [terror_dog] id = 5417 diff --git a/data/area/morytania/meiyerditch/meiyerditch.npcs.toml b/data/area/morytania/meiyerditch/meiyerditch.npcs.toml index 32008982c3..2355dcb004 100644 --- a/data/area/morytania/meiyerditch/meiyerditch.npcs.toml +++ b/data/area/morytania/meiyerditch/meiyerditch.npcs.toml @@ -176,6 +176,7 @@ immune_poison = true immune_cannon = true respawn_delay = 25 examine = "An evil, bloodsucking vampyre." +drop_table = "vyrewatch" [vyrewatch_meiyerditch_level_120] id = 4814 @@ -195,48 +196,60 @@ immune_poison = true immune_cannon = true respawn_delay = 25 examine = "A thirsty-looking, airborne bloodsucker!" +drop_table = "vyrewatch" [vyrewatch_meiyerditch_3] id = 4815 clone = "vyrewatch_meiyerditch" +drop_table = "vyrewatch" [vyrewatch_meiyerditch_4] id = 4825 clone = "vyrewatch_meiyerditch" +drop_table = "vyrewatch" [vyrewatch_meiyerditch_5] id = 4826 clone = "vyrewatch_meiyerditch_level_120" +drop_table = "vyrewatch" [vyrewatch_meiyerditch_6] id = 4827 clone = "vyrewatch_meiyerditch" +drop_table = "vyrewatch" [vyrewatch_meiyerditch_7] id = 4828 clone = "vyrewatch_meiyerditch" +drop_table = "vyrewatch" [vyrewatch_meiyerditch_8] id = 4829 clone = "vyrewatch_meiyerditch" +drop_table = "vyrewatch" [vyrewatch_meiyerditch_9] id = 4830 clone = "vyrewatch_meiyerditch_level_120" +drop_table = "vyrewatch" [vyrewatch_meiyerditch_10] id = 4831 clone = "vyrewatch_meiyerditch" +drop_table = "vyrewatch" [vyrewatch_meiyerditch_11] id = 4833 clone = "vyrewatch_meiyerditch" +drop_table = "vyrewatch" [flying_female_vampire] id = 7613 +drop_table = "empty" [vyrewatch_meiyerditch_12] id = 7622 +drop_table = "vyrewatch" [vampyre_juvenile_male] id = 4774 @@ -251,9 +264,11 @@ categories = ["vampyres"] immune_poison = true respawn_delay = 51 examine = "A juvenile vampyre. It looks really hungry!" +drop_table = "empty" [vampyre_juvenile_female] id = 4775 +drop_table = "empty" [papers_meiyerditch] id = 4765 diff --git a/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.drops.toml b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.drops.toml new file mode 100644 index 0000000000..1c0d634512 --- /dev/null +++ b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.drops.toml @@ -0,0 +1,165 @@ +[mutated_bloodveld_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "mutated_bloodveld_secondary" }, +] + +[mutated_bloodveld_secondary] +roll = 1615 +drops = [ + { id = "rune_arrow", amount = 6, chance = 64 }, + { id = "adamant_knife", amount = 10, chance = 64 }, + { id = "air_rune", amount = 50, chance = 64 }, + { id = "earth_rune", amount = 50, chance = 64 }, + { id = "fire_rune", amount = 50, chance = 64 }, + { id = "pure_essence", amount = 10, chance = 64 }, + { id = "chaos_rune", amount = 20, chance = 64 }, + { id = "coins", amount = 750, chance = 64 }, + { id = "adamant_hatchet", chance = 32 }, + { id = "adamant_scimitar", chance = 32 }, + { id = "rune_knife", amount = 2, chance = 32 }, + { id = "black_boots", chance = 32 }, + { id = "mithril_sq_shield", chance = 32 }, + { id = "mithril_chainbody", chance = 32 }, + { id = "adamant_chainbody", chance = 32 }, + { id = "adamant_sq_shield", chance = 32 }, + { id = "death_rune", amount = 5, chance = 32 }, + { id = "blood_rune", amount = 6, chance = 32 }, + { id = "coal", amount = 3, chance = 32 }, + { id = "gold_ore", amount = 3, chance = 32 }, + { id = "mithril_ore", amount = 3, chance = 32 }, + { id = "adamantite_ore", chance = 32 }, + { id = "raw_cave_eel", amount = 3, chance = 32 }, + { id = "grimy_guam", chance = 32 }, + { id = "grimy_marrentill", chance = 32 }, + { id = "grimy_harralander", chance = 32 }, + { id = "grimy_ranarr", chance = 32 }, + { id = "grimy_irit", chance = 32 }, + { id = "grimy_kwuarm", chance = 32 }, + { id = "grimy_lantadyme", chance = 32 }, + { id = "grimy_dwarf_weed", chance = 32 }, + { id = "grimy_avantoe", chance = 32 }, + { id = "uncut_sapphire", chance = 32 }, + { id = "uncut_emerald", chance = 32 }, + { id = "uncut_ruby", chance = 32 }, + { id = "uncut_diamond", chance = 32 }, + { id = "super_defence_3", chance = 32 }, + { id = "chaos_talisman", chance = 32 }, + { id = "rune_javelin", amount = 5, chance = 6 }, + { id = "rune_scimitar", chance = 6 }, + { id = "adamant_boots", chance = 6 }, + { id = "rune_med_helm", chance = 6 }, + { id = "dragon_med_helm", chance = 6 }, + { id = "knife", chance = 6 }, + { id = "starved_ancient_effigy", chance = 6 }, + { id = "rune_spear", chance = 2 }, + { id = "dragon_spear", chance = 2 }, + { id = "shield_left_half", chance = 2 }, + { id = "loop_half_of_a_key", chance = 2 }, + { id = "tooth_half_of_a_key", chance = 2 }, +] + +[skeletal_hand_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "skeletal_hand_secondary" }, +] + +[skeletal_hand_secondary] +roll = 1278 +drops = [ + { id = "black_sq_shield", chance = 64 }, + { id = "black_kiteshield", chance = 64 }, + { id = "tomato_seed", amount = 3, chance = 64 }, + { id = "limpwurt_seed", amount = 3, chance = 64 }, + { id = "sweetcorn_seed", amount = 3, chance = 64 }, + { id = "cosmic_rune", amount = 3, chance = 64 }, + { id = "gold_bracelet", chance = 64 }, + { id = "sapphire_bracelet", chance = 64 }, + { id = "fishing_bait", amount = 10, chance = 64 }, + { id = "steel_nails", amount = 20, chance = 64 }, + { id = "black_nails", amount = 10, chance = 64 }, + { id = "steel_scimitar", chance = 32 }, + { id = "whiteberry_seed", chance = 32 }, + { id = "poison_ivy_seed", chance = 32 }, + { id = "jangerberry_seed", amount = 3, chance = 32 }, + { id = "strawberry_seed", amount = 3, chance = 32 }, + { id = "death_rune", amount = 3, chance = 32 }, + { id = "ruby_ring", chance = 32 }, + { id = "bracelet_of_clay", chance = 32 }, + { id = "castle_wars_brace_3", chance = 32 }, + { id = "emerald_bracelet", chance = 32 }, + { id = "grimy_ranarr", chance = 32 }, + { id = "grimy_toadflax", chance = 32 }, + { id = "grimy_kwuarm", chance = 32 }, + { id = "mystic_gloves_light", chance = 6 }, + { id = "belladonna_seed", amount = 3, chance = 6 }, + { id = "blood_rune", chance = 6 }, + { id = "mist_rune", amount = 3, chance = 6 }, + { id = "smoke_rune", amount = 3, chance = 6 }, + { id = "dust_rune", amount = 3, chance = 6 }, + { id = "steam_rune", amount = 3, chance = 6 }, + { id = "ruby_bracelet", chance = 6 }, + { id = "diamond_bracelet", chance = 6 }, + { id = "diamond_ring", chance = 6 }, + { id = "grimy_irit", chance = 6 }, + { id = "grimy_avantoe", chance = 6 }, + { id = "coins", amount = 750, chance = 6 }, + { id = "mithril_bar", chance = 6 }, + { id = "grimy_dwarf_weed", chance = 2 }, +] + +[zombie_hand_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "zombie_hand_secondary" }, +] + +[zombie_hand_secondary] +roll = 1291 +drops = [ + { id = "black_sq_shield", chance = 64 }, + { id = "black_kiteshield", chance = 64 }, + { id = "gold_bracelet", chance = 64 }, + { id = "sapphire_bracelet", chance = 64 }, + { id = "cosmic_rune", amount = 3, chance = 64 }, + { id = "tomato_seed", amount = 3, chance = 64 }, + { id = "limpwurt_seed", amount = 3, chance = 64 }, + { id = "sweetcorn_seed", amount = 3, chance = 64 }, + { id = "fishing_bait", amount = 10, chance = 64 }, + { id = "steel_nails", amount = 20, chance = 64 }, + { id = "black_nails", amount = 10, chance = 64 }, + { id = "steel_scimitar", chance = 32 }, + { id = "ruby_ring", chance = 32 }, + { id = "emerald_bracelet", chance = 32 }, + { id = "bracelet_of_clay", chance = 32 }, + { id = "castle_wars_brace_3", chance = 32 }, + { id = "death_rune", amount = 3, chance = 32 }, + { id = "strawberry_seed", amount = 3, chance = 32 }, + { id = "whiteberry_seed", chance = 32 }, + { id = "poison_ivy_seed", chance = 32 }, + { id = "jangerberry_seed", amount = 3, chance = 32 }, + { id = "grimy_ranarr", chance = 32 }, + { id = "grimy_toadflax", chance = 32 }, + { id = "grimy_kwuarm", chance = 32 }, + { id = "mystic_gloves_light", chance = 6 }, + { id = "ruby_bracelet", chance = 6 }, + { id = "diamond_bracelet", chance = 6 }, + { id = "inoculation_brace", chance = 6 }, + { id = "diamond_ring", chance = 6 }, + { id = "blood_rune", chance = 6 }, + { id = "mist_rune", amount = 3, chance = 6 }, + { id = "smoke_rune", amount = 3, chance = 6 }, + { id = "dust_rune", amount = 3, chance = 6 }, + { id = "steam_rune", amount = 3, chance = 6 }, + { id = "whiteberry_seed", amount = 3, chance = 6 }, + { id = "belladonna_seed", amount = 3, chance = 6 }, + { id = "grimy_irit", chance = 6 }, + { id = "grimy_avantoe", chance = 6 }, + { id = "coins", amount = 750, chance = 6 }, + { id = "mithril_bar", chance = 6 }, + { id = "grimy_dwarf_weed", chance = 2 }, +] diff --git a/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml index 89a5e3da74..e251f89fb4 100644 --- a/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml +++ b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml @@ -21,19 +21,23 @@ id = 7636 id = 7640 categories = ["crawling_hands"] examine = "A giant, skeletal hand. I don't think I should offer to shake hands." +drop_table = "skeletal_hand" [zombie_hand_meiyerditch_tunnels] id = 7641 categories = ["crawling_hands"] examine = "A giant, zombified hand. I don't think I should offer to shake hands." +drop_table = "zombie_hand" [mutated_bloodveld_meiyerditch_tunnels] id = 7642 categories = ["bloodveld"] examine = "A bloodveld with a very mixed heritage." +drop_table = "mutated_bloodveld" [mutated_bloodveld_meiyerditch_tunnels_2] id = 7643 categories = ["bloodveld"] examine = "A bloodveld with a very mixed heritage." +drop_table = "mutated_bloodveld" diff --git a/data/area/morytania/mos_le_harmless/mos_le_harmless.drops.toml b/data/area/morytania/mos_le_harmless/mos_le_harmless.drops.toml index 89611b330c..f30afa39b4 100644 --- a/data/area/morytania/mos_le_harmless/mos_le_harmless.drops.toml +++ b/data/area/morytania/mos_le_harmless/mos_le_harmless.drops.toml @@ -27,3 +27,15 @@ drops = [ { id = "nothing", amount = 0, chance = 2 }, { table = "gem_drop_table" }, ] + +[giant_mosquito_drop_table] +type = "all" +drops = [ + { table = "giant_mosquito_secondary" }, +] + +[giant_mosquito_secondary] +roll = 1024 +drops = [ + { id = "proboscis", chance = 64 }, +] diff --git a/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml b/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml index a872149b96..06d0262e7f 100644 --- a/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml +++ b/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml @@ -102,9 +102,11 @@ id = 3186 [snake_mos_le_harmless] id = 4343 +drop_table = "snake" [monkey_mos_le_harmless] id = 4344 +drop_table = "monkey" [crab_mos_le_harmless] id = 4346 @@ -117,6 +119,7 @@ def = 45 combat_def = "giant_mosquito" respawn_delay = 50 examine = "A flying blood sucker." +drop_table = "giant_mosquito" [jungle_horror] id = 4352 diff --git a/data/area/realm/enchanted_valley/enchanted_valley.npcs.toml b/data/area/realm/enchanted_valley/enchanted_valley.npcs.toml index 3e477a6a8a..14c156c9f4 100644 --- a/data/area/realm/enchanted_valley/enchanted_valley.npcs.toml +++ b/data/area/realm/enchanted_valley/enchanted_valley.npcs.toml @@ -19,6 +19,7 @@ style = "stab" max_hit_melee = 20 respawn_delay = 90 examine = "A noble creature!" +drop_table = "bones" [wood_dryad_enchanted_valley] id = 4441 @@ -32,10 +33,12 @@ max_hit_melee = 10 attack_bonus = -47 respawn_delay = 50 examine = "Aww, how cute." +drop_table = "rabbit" [rabbit_enchanted_valley_2] id = 4448 clone = "rabbit_enchanted_valley" +drop_table = "rabbit" [butterfly_enchanted_valley] id = 4449 diff --git a/data/area/realm/spirit_realm/spirit_realm.drops.toml b/data/area/realm/spirit_realm/spirit_realm.drops.toml new file mode 100644 index 0000000000..22c936cfce --- /dev/null +++ b/data/area/realm/spirit_realm/spirit_realm.drops.toml @@ -0,0 +1,72 @@ +[ghostly_warrior_drop_table] +type = "all" +drops = [ + { table = "ghostly_warrior_secondary" }, +] + +[ghostly_warrior_secondary] +roll = 1024 +drops = [ + { id = "mind_rune", min = 10, max = 40, chance = 64 }, + { id = "chaos_rune", min = 10, max = 20, chance = 64 }, + { id = "cosmic_rune", min = 10, max = 20, chance = 64 }, + { id = "steel_full_helm", chance = 64 }, + { id = "steel_platebody", chance = 64 }, + { id = "steel_platelegs", chance = 64 }, + { id = "coins", min = 20, max = 87, chance = 64 }, + { id = "soul_rune", min = 1, max = 5, chance = 32 }, + { id = "uncut_sapphire", chance = 32 }, + { id = "uncut_emerald", chance = 32 }, + { id = "uncut_ruby", chance = 6 }, + { id = "rune_javelin", amount = 5, chance = 6 }, + { id = "rune_spear", chance = 6 }, + { id = "nature_talisman", chance = 6 }, + { id = "uncut_diamond", chance = 2 }, + { id = "dragon_spear", chance = 2 }, + { id = "spirit_shield", chance = 2 }, + { id = "loop_half_of_a_key", chance = 2 }, + { id = "tooth_half_of_a_key", chance = 2 }, + { id = "shield_left_half", chance = 2 }, +] + +[tormented_wraith_drop_table] +type = "all" +drops = [ + { table = "tormented_wraith_secondary" }, +] + +[tormented_wraith_secondary] +roll = 1028 +drops = [ + { id = "black_kiteshield", chance = 64 }, + { id = "black_longsword", chance = 64 }, + { id = "black_platebody", chance = 32 }, + { id = "black_platelegs", chance = 32 }, + { id = "black_chainbody", chance = 32 }, + { id = "black_full_helm", chance = 32 }, + { id = "black_med_helm", chance = 32 }, + { id = "mithril_dart_p", amount = 23, chance = 32 }, + { id = "death_rune", amount = 10, chance = 32 }, + { id = "blood_rune", amount = 7, chance = 32 }, + { id = "chaos_rune", amount = 15, chance = 32 }, + { id = "grimy_guam", min = 1, max = 2, chance = 32 }, + { id = "grimy_marrentill", min = 1, max = 2, chance = 32 }, + { id = "grimy_tarromin", min = 1, max = 2, chance = 32 }, + { id = "grimy_harralander", min = 1, max = 2, chance = 32 }, + { id = "grimy_ranarr", min = 1, max = 2, chance = 32 }, + { id = "grimy_irit", min = 1, max = 2, chance = 32 }, + { id = "grimy_avantoe", min = 1, max = 2, chance = 32 }, + { id = "grimy_kwuarm", min = 1, max = 2, chance = 32 }, + { id = "grimy_cadantine", min = 1, max = 2, chance = 32 }, + { id = "grimy_lantadyme", min = 1, max = 2, chance = 32 }, + { id = "grimy_dwarf_weed", min = 1, max = 2, chance = 32 }, + { id = "coins", min = 75, max = 993, chance = 32 }, + { id = "iron_ore", amount = 50, chance = 32 }, + { id = "adamant_bar", amount = 3, chance = 32 }, + { id = "oak_plank", amount = 80, chance = 32 }, + { id = "prayer_potion_3", amount = 2, chance = 32 }, + { id = "big_bones", amount = 5, chance = 32 }, + { id = "spirit_shield", chance = 6 }, + { id = "holy_elixir", chance = 2 }, + { id = "starved_ancient_effigy", chance = 2 }, +] diff --git a/data/area/realm/spirit_realm/spirit_realm.npcs.toml b/data/area/realm/spirit_realm/spirit_realm.npcs.toml index 5fdad427da..ca6d3c23be 100644 --- a/data/area/realm/spirit_realm/spirit_realm.npcs.toml +++ b/data/area/realm/spirit_realm/spirit_realm.npcs.toml @@ -2,11 +2,13 @@ id = 7994 categories = ["ghosts"] examine = "A spectral warrior with no axe." +drop_table = "ghostly_warrior" [tormented_wraith_spirit_realm] id = 8125 categories = ["ghosts"] examine = "The wraith of a long-dead prisoner." +drop_table = "tormented_wraith" [edward] id = 1782 diff --git a/data/area/tirannwn/isafdar/isafdar.npcs.toml b/data/area/tirannwn/isafdar/isafdar.npcs.toml index 6ec360dd24..b11642085a 100644 --- a/data/area/tirannwn/isafdar/isafdar.npcs.toml +++ b/data/area/tirannwn/isafdar/isafdar.npcs.toml @@ -26,10 +26,12 @@ max_hit_melee = 10 attack_bonus = -47 respawn_delay = 25 examine = "Aww, how cute." +drop_table = "rabbit" [rabbit_isafdar_2] id = 1194 clone = "rabbit_isafdar" +drop_table = "rabbit" [grenwall] id = 7010 diff --git a/data/area/tirannwn/lletya/lletya.npcs.toml b/data/area/tirannwn/lletya/lletya.npcs.toml index 28227a7d2c..db5dcbd18a 100644 --- a/data/area/tirannwn/lletya/lletya.npcs.toml +++ b/data/area/tirannwn/lletya/lletya.npcs.toml @@ -35,10 +35,12 @@ slayer_xp = 107.5 categories = ["elves"] respawn_delay = 30 examine = "I don't want to get on the wrong side of him." +drop_table = "elf_warrior" [elf_warrior_lletya_2] id = 2360 clone = "elf_warrior_lletya" +drop_table = "elf_warrior" [elf_warrior_lletya_3] id = 2361 @@ -54,10 +56,12 @@ slayer_xp = 105.0 categories = ["elves"] respawn_delay = 30 examine = "She looks pretty handy with that bow." +drop_table = "elf_warrior" [elf_warrior_lletya_4] id = 2362 clone = "elf_warrior_lletya_3" +drop_table = "elf_warrior" [goreu] id = 2363 diff --git a/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.drops.toml b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.drops.toml new file mode 100644 index 0000000000..61357709ee --- /dev/null +++ b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.drops.toml @@ -0,0 +1,94 @@ +[warped_terrorbird_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "warped_terrorbird_secondary" }, +] + +[warped_terrorbird_secondary] +roll = 1286 +drops = [ + { id = "air_rune", min = 24, max = 60, chance = 64 }, + { id = "earth_rune", min = 14, max = 31, chance = 64 }, + { id = "death_rune", min = 4, max = 28, chance = 64 }, + { id = "emerald_bolt_tips", min = 16, max = 24, chance = 64 }, + { id = "ruby_bolt_tips", min = 16, max = 24, chance = 64 }, + { id = "diamond_bolt_tips", min = 16, max = 24, chance = 64 }, + { id = "adamant_bolts", min = 6, max = 15, chance = 64 }, + { id = "runite_bolts", min = 3, max = 12, chance = 64 }, + { id = "coins", min = 15, max = 325, chance = 64 }, + { id = "feather", min = 23, max = 95, chance = 64 }, + { id = "swamp_tar", min = 10, max = 52, chance = 64 }, + { id = "adamantite_ore", chance = 64 }, + { id = "wergali_seed", chance = 64 }, + { id = "law_rune", min = 1, max = 10, chance = 32 }, + { id = "soul_rune", min = 1, max = 10, chance = 32 }, + { id = "mithril_platebody", chance = 32 }, + { id = "mithril_warhammer", chance = 32 }, + { id = "weapon_poison", chance = 32 }, + { id = "chocolate_bomb", min = 1, max = 3, chance = 32 }, + { id = "tangled_toads_legs", min = 1, max = 3, chance = 32 }, + { id = "law_talisman", chance = 32 }, + { id = "uncut_sapphire", chance = 32 }, + { id = "sulphur", chance = 32 }, + { id = "rune_kiteshield", chance = 6 }, + { id = "rune_warhammer", chance = 6 }, + { id = "nature_talisman", chance = 6 }, + { id = "uncut_emerald", chance = 6 }, + { id = "uncut_ruby", chance = 6 }, + { id = "uncut_diamond", chance = 6 }, + { id = "tooth_half_of_a_key", chance = 6 }, + { id = "loop_half_of_a_key", chance = 6 }, + { id = "raw_shark", min = 1, max = 6, chance = 6 }, + { id = "rune_javelin", amount = 5, chance = 2 }, + { id = "dragon_spear", chance = 2 }, + { id = "rune_pickaxe", chance = 2 }, + { id = "shield_left_half", chance = 2 }, +] + +[warped_tortoise_drop_table] +type = "all" +drops = [ + { id = "big_bones" }, + { table = "warped_tortoise_secondary" }, +] + +[warped_tortoise_secondary] +roll = 1074 +drops = [ + { id = "adamant_hatchet", chance = 64 }, + { id = "law_talisman", chance = 64 }, + { id = "sulphur", chance = 64 }, + { id = "coins", min = 33, max = 177, chance = 64 }, + { id = "tangled_toads_legs", min = 1, max = 4, chance = 64 }, + { id = "weapon_poison", chance = 64 }, + { id = "mithril_platebody", chance = 32 }, + { id = "mithril_warhammer", chance = 32 }, + { id = "rune_pickaxe", chance = 32 }, + { id = "adamantite_ore", chance = 32 }, + { id = "mithril_ore", min = 3, max = 9, chance = 32 }, + { id = "coal", min = 6, max = 16, chance = 32 }, + { id = "air_rune", amount = 49, chance = 32 }, + { id = "law_rune", min = 3, max = 6, chance = 32 }, + { id = "nature_talisman", chance = 32 }, + { id = "swamp_tar", min = 1, max = 32, chance = 32 }, + { id = "tortoise_shell", min = 1, max = 3, chance = 32 }, + { id = "uncut_sapphire", chance = 32 }, + { id = "uncut_emerald", chance = 32 }, + { id = "uncut_ruby", chance = 32 }, + { id = "perfect_shell", min = 1, max = 3, chance = 32 }, + { id = "long_bone", chance = 32 }, + { id = "humerus_bone", chance = 32 }, + { id = "cabbage", min = 2, max = 54, chance = 32 }, + { id = "rune_warhammer", chance = 6 }, + { id = "rune_javelin", amount = 5, chance = 6 }, + { id = "uncut_diamond", chance = 6 }, + { id = "curved_bone", chance = 6 }, + { id = "tooth_half_of_a_key", chance = 6 }, + { id = "loop_half_of_a_key", chance = 6 }, + { id = "starved_ancient_effigy", chance = 6 }, + { id = "court_summons", chance = 6 }, + { id = "rune_spear", chance = 2 }, + { id = "dragon_spear", chance = 2 }, + { id = "shield_left_half", chance = 2 }, +] diff --git a/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml index 817e84d5a8..ec5d1b725b 100644 --- a/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml +++ b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml @@ -2,57 +2,69 @@ id = 6285 categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." +drop_table = "warped_terrorbird" [warped_terrorbird_2] id = 6286 categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." +drop_table = "warped_terrorbird" [warped_terrorbird_3] id = 6287 categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." +drop_table = "warped_terrorbird" [warped_terrorbird_4] id = 6288 categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." +drop_table = "warped_terrorbird" [warped_terrorbird_5] id = 6289 categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." +drop_table = "warped_terrorbird" [warped_terrorbird_6] id = 6290 +drop_table = "warped_terrorbird" [warped_terrorbird_7] id = 6291 categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." +drop_table = "warped_terrorbird" [warped_terrorbird_8] id = 6292 categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." +drop_table = "warped_terrorbird" [warped_terrorbird_9] id = 6293 +drop_table = "warped_terrorbird" [warped_terrorbird_10] id = 6294 categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." +drop_table = "warped_terrorbird" [warped_terrorbird_11] id = 6295 categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." +drop_table = "warped_terrorbird" [warped_tortoise] id = 6296 categories = ["warped_creatures"] examine = "You don't think you can harm this creature." +drop_table = "warped_tortoise" [guard_no_21] id = 6314 diff --git a/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.drops.toml b/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.drops.toml new file mode 100644 index 0000000000..1ec8a8a7e4 --- /dev/null +++ b/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.drops.toml @@ -0,0 +1,5 @@ +[ice_demon_drop_table] +type = "all" +drops = [ + { id = "frostenhorn" }, +] diff --git a/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml b/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml index 5029cd5b3e..e74bb6095d 100644 --- a/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml +++ b/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml @@ -1,7 +1,9 @@ [ice_demon_ghorrock_fortress_dungeon] id = 9052 examine = "A demon made of ice." +drop_table = "ice_demon" [waterfiend_ghorrock_fortress_dungeon] id = 9054 +drop_table = "waterfiend" diff --git a/data/area/troll_country/ghorrock/jhallans_resting_place/jhallans_resting_place.npcs.toml b/data/area/troll_country/ghorrock/jhallans_resting_place/jhallans_resting_place.npcs.toml index dbb2faf217..d79d37e5e1 100644 --- a/data/area/troll_country/ghorrock/jhallans_resting_place/jhallans_resting_place.npcs.toml +++ b/data/area/troll_country/ghorrock/jhallans_resting_place/jhallans_resting_place.npcs.toml @@ -1,6 +1,8 @@ [jelly_jhallans_resting_place] id = 7459 +drop_table = "jelly" [jelly_jhallans_resting_place_2] id = 7460 +drop_table = "jelly" diff --git a/data/area/troll_country/god_wars_dungeon/god_wars.drops.toml b/data/area/troll_country/god_wars_dungeon/god_wars.drops.toml new file mode 100644 index 0000000000..3f0dab474a --- /dev/null +++ b/data/area/troll_country/god_wars_dungeon/god_wars.drops.toml @@ -0,0 +1,135 @@ +[ancient_warrior_drop_table] +type = "all" +drops = [ + { table = "ancient_warrior_secondary" }, + { table = "hard_clue_scroll", roll = 170 }, +] + +[ancient_warrior_secondary] +roll = 1024 +drops = [ + { id = "coins", amount = 500, chance = 64 }, + { id = "pure_essence", amount = 23, chance = 64 }, + { id = "mind_rune", chance = 64 }, + { id = "mithril_longsword", chance = 64 }, + { id = "super_attack_1", chance = 32 }, + { id = "adamant_bar", amount = 4, chance = 32 }, + { id = "coal", min = 1, max = 2, chance = 32 }, + { id = "nature_rune", chance = 32 }, + { id = "adamant_chainbody", chance = 32 }, + { id = "super_strength_1", chance = 32 }, + { id = "prayer_potion_2", chance = 32 }, + { id = "super_defence_1", chance = 32 }, + { id = "lobster", chance = 32 }, + { id = "uncut_ruby", chance = 6 }, + { id = "potato_cactus", chance = 6 }, +] + +[ancient_ranger_drop_table] +type = "all" +drops = [ + { table = "ancient_ranger_secondary" }, + { table = "hard_clue_scroll", roll = 32 }, +] + +[ancient_ranger_secondary] +roll = 1036 +drops = [ + { id = "pure_essence", amount = 23, chance = 64 }, + { id = "coal", amount = 3, chance = 64 }, + { id = "mud_rune", chance = 64 }, + { id = "grimy_guam", chance = 64 }, + { id = "grimy_marrentill", chance = 64 }, + { id = "grimy_tarromin", chance = 64 }, + { id = "mithril_longsword", chance = 64 }, + { id = "prayer_potion_2", chance = 64 }, + { id = "coins", amount = 1337, chance = 64 }, + { id = "rune_arrow", amount = 12, chance = 32 }, + { id = "adamant_bar", amount = 2, chance = 32 }, + { id = "grimy_cadantine", chance = 32 }, + { id = "grimy_ranarr", chance = 32 }, + { id = "grimy_harralander", chance = 32 }, + { id = "grimy_dwarf_weed", chance = 32 }, + { id = "nature_rune", chance = 32 }, + { id = "uncut_diamond", chance = 32 }, + { id = "uncut_ruby", chance = 32 }, + { id = "uncut_sapphire", chance = 32 }, + { id = "uncut_emerald", chance = 32 }, + { id = "blue_dragon_scale", amount = 2, chance = 32 }, + { id = "grimy_torstol", chance = 6 }, + { id = "adamant_bolts", amount = 15, chance = 6 }, + { id = "rune_longsword", chance = 6 }, +] + +[blood_reaver_drop_table] +type = "all" +drops = [ + { table = "blood_reaver_secondary" }, +] + +[blood_reaver_secondary] +roll = 1024 +drops = [ + { id = "mind_rune", amount = 20, chance = 32 }, + { id = "air_rune", amount = 250, chance = 32 }, + { id = "cosmic_rune", amount = 15, chance = 32 }, + { id = "astral_rune", amount = 15, chance = 32 }, + { id = "blood_rune", amount = 15, chance = 32 }, + { id = "mud_rune", amount = 15, chance = 32 }, + { id = "grimy_guam", chance = 32 }, + { id = "grimy_marrentill", chance = 32 }, + { id = "grimy_ranarr", chance = 32 }, + { id = "uncut_sapphire", chance = 32 }, + { id = "uncut_emerald", chance = 32 }, + { id = "uncut_ruby", chance = 32 }, + { id = "uncut_diamond", chance = 32 }, + { id = "coins", chance = 32 }, + { id = "pure_essence", amount = 23, chance = 32 }, + { id = "super_defence_1", chance = 32 }, + { id = "prayer_potion_2", chance = 32 }, + { id = "potato_cactus", chance = 32 }, + { id = "coal", amount = 6, chance = 32 }, + { id = "adamant_bar", chance = 32 }, + { id = "shield_left_half", chance = 2 }, +] + +[ancient_mage_drop_table] +type = "all" +drops = [ + { table = "ancient_mage_secondary" }, + { table = "hard_clue_scroll", roll = 32 }, +] + +[ancient_mage_secondary] +roll = 1210 +drops = [ + { id = "coins", amount = 500, chance = 64 }, + { id = "coal", min = 1, max = 10, chance = 64 }, + { id = "grimy_guam", chance = 64 }, + { id = "grimy_marrentill", chance = 64 }, + { id = "grimy_tarromin", chance = 64 }, + { id = "grimy_harralander", chance = 64 }, + { id = "grimy_ranarr", chance = 64 }, + { id = "grimy_irit", chance = 64 }, + { id = "death_rune", amount = 25, chance = 64 }, + { id = "soul_rune", amount = 25, chance = 64 }, + { id = "astral_rune", amount = 25, chance = 64 }, + { id = "air_rune", amount = 150, chance = 64 }, + { id = "mud_rune", amount = 15, chance = 64 }, + { id = "super_restore_3", chance = 64 }, + { id = "adamant_bar", min = 1, max = 4, chance = 32 }, + { id = "grimy_torstol", chance = 32 }, + { id = "pure_essence", amount = 46, chance = 32 }, + { id = "chaos_rune", amount = 30, chance = 32 }, + { id = "super_defence_3", chance = 32 }, + { id = "shark", chance = 32 }, + { id = "blood_rune", amount = 25, chance = 6 }, + { id = "uncut_sapphire", chance = 6 }, + { id = "uncut_emerald", chance = 6 }, + { id = "uncut_diamond", chance = 6 }, + { id = "ancient_ceremonial_mask", chance = 6 }, + { id = "ancient_ceremonial_top", chance = 6 }, + { id = "ancient_ceremonial_legs", chance = 6 }, + { id = "ancient_ceremonial_gloves", chance = 6 }, + { id = "ancient_ceremonial_boots", chance = 6 }, +] diff --git a/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml b/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml index 915cfaf2c2..e36aa1714d 100644 --- a/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml @@ -11,18 +11,22 @@ examine = "An ancient spirit of nature." [ancient_warrior] id = 13456 examine = "He looks angry and dangerous!" +drop_table = "ancient_warrior" [ancient_ranger] id = 13457 examine = "A dangerous ranger." +drop_table = "ancient_ranger" [blood_reaver] id = 13458 examine = "A strange and twisted creature." +drop_table = "blood_reaver" [ancient_mage_god_wars_dungeon] id = 13459 examine = "A mage well practised in the art of ancient spellcasting." +drop_table = "ancient_mage" [nanuq] id = 8076 diff --git a/data/area/troll_country/god_wars_dungeon/saradomin/knight_of_saradomin/knight_of_saradomin.npcs.toml b/data/area/troll_country/god_wars_dungeon/saradomin/knight_of_saradomin/knight_of_saradomin.npcs.toml index 56d16a45cc..8bdaf4d3f2 100644 --- a/data/area/troll_country/god_wars_dungeon/saradomin/knight_of_saradomin/knight_of_saradomin.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/saradomin/knight_of_saradomin/knight_of_saradomin.npcs.toml @@ -27,3 +27,4 @@ respawn_delay = 50 categories = ["human"] god = "saradomin" examine = "A valiant knight." +drop_table = "knight_of_saradomin" diff --git a/data/area/troll_country/god_wars_dungeon/spiritual_warrior/spiritual_warrior.npcs.toml b/data/area/troll_country/god_wars_dungeon/spiritual_warrior/spiritual_warrior.npcs.toml index 10f38107bc..c689ce03f3 100644 --- a/data/area/troll_country/god_wars_dungeon/spiritual_warrior/spiritual_warrior.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/spiritual_warrior/spiritual_warrior.npcs.toml @@ -12,6 +12,7 @@ slayer_level = 68 categories = ["spiritual_creatures"] god = "zamorak" examine = "Warrior of Zamorak." +drop_table = "spiritual_warrior" [spiritual_warrior_saradomin] id = 6255 diff --git a/data/area/troll_country/mountain_camp/caves/mountain_camp_caves.npcs.toml b/data/area/troll_country/mountain_camp/caves/mountain_camp_caves.npcs.toml index 7c9161866d..70b8991ab0 100644 --- a/data/area/troll_country/mountain_camp/caves/mountain_camp_caves.npcs.toml +++ b/data/area/troll_country/mountain_camp/caves/mountain_camp_caves.npcs.toml @@ -11,6 +11,7 @@ max_hit_melee = 90 attack_bonus = 5 hunt_mode = "cowardly" examine = "Is that a bear... or a man?" +drop_table = "empty" [the_kendal_mountain_camp_caves_2] id = 1812 diff --git a/data/area/troll_country/mountain_camp/mountain_camp.drops.toml b/data/area/troll_country/mountain_camp/mountain_camp.drops.toml new file mode 100644 index 0000000000..90873686bd --- /dev/null +++ b/data/area/troll_country/mountain_camp/mountain_camp.drops.toml @@ -0,0 +1,5 @@ +[camp_dweller_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] diff --git a/data/area/troll_country/mountain_camp/mountain_camp.npcs.toml b/data/area/troll_country/mountain_camp/mountain_camp.npcs.toml index 5e6d5b1adf..451c6413fc 100644 --- a/data/area/troll_country/mountain_camp/mountain_camp.npcs.toml +++ b/data/area/troll_country/mountain_camp/mountain_camp.npcs.toml @@ -52,6 +52,7 @@ style = "crush" max_hit_melee = 30 respawn_delay = 50 examine = "One of the inhabitants of the camp." +drop_table = "camp_dweller" [mountain_goat_mountain_camp] id = 1819 diff --git a/data/area/troll_country/troll_tunnels/troll_tunnels.npcs.toml b/data/area/troll_country/troll_tunnels/troll_tunnels.npcs.toml index b5b9f3ef05..e10e3f9645 100644 --- a/data/area/troll_country/troll_tunnels/troll_tunnels.npcs.toml +++ b/data/area/troll_country/troll_tunnels/troll_tunnels.npcs.toml @@ -13,6 +13,7 @@ slayer_xp = 86.0 categories = ["trolls"] respawn_delay = 50 examine = "Brrrrr...he must be cold!" +drop_table = "ice_troll" [ice_troll_troll_tunnels_2] id = 1561 @@ -29,6 +30,7 @@ slayer_xp = 86.0 categories = ["trolls"] respawn_delay = 50 examine = "Brrrrr...he must be cold!" +drop_table = "ice_troll" [ice_troll_troll_tunnels_3] id = 1562 @@ -45,6 +47,7 @@ slayer_xp = 129.0 categories = ["trolls"] respawn_delay = 50 examine = "Brrrrr...he must be cold!" +drop_table = "ice_troll" [ice_troll_troll_tunnels_4] id = 1563 @@ -61,16 +64,20 @@ slayer_xp = 97.0 categories = ["trolls"] respawn_delay = 50 examine = "Brrrrr...he must be cold!" +drop_table = "ice_troll" [ice_troll_troll_tunnels_5] id = 1564 clone = "ice_troll_troll_tunnels_3" +drop_table = "ice_troll" [ice_troll_troll_tunnels_6] id = 1565 clone = "ice_troll_troll_tunnels_3" +drop_table = "ice_troll" [ice_troll_troll_tunnels_7] id = 1566 clone = "ice_troll_troll_tunnels_4" +drop_table = "ice_troll" diff --git a/data/area/wilderness/bandit_camp/wilderness_bandit_camp.drops.toml b/data/area/wilderness/bandit_camp/wilderness_bandit_camp.drops.toml index 0480b4549f..33ceae157f 100644 --- a/data/area/wilderness/bandit_camp/wilderness_bandit_camp.drops.toml +++ b/data/area/wilderness/bandit_camp/wilderness_bandit_camp.drops.toml @@ -30,3 +30,45 @@ drops = [ { id = "swordfish_noted", amount = 5, chance = 2 }, { table = "gem_drop_table", chance = 2 }, ] + +[dark_warrior_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "dark_warrior_secondary" }, +] + +[dark_warrior_secondary] +roll = 1024 +drops = [ + { id = "bronze_med_helm", chance = 64 }, + { id = "black_med_helm", min = 1, max = 2, chance = 64 }, + { id = "iron_mace", chance = 64 }, + { id = "black_mace", chance = 64 }, + { id = "bronze_arrow", amount = 8, chance = 64 }, + { id = "mind_rune", amount = 2, chance = 64 }, + { id = "water_rune", chance = 64 }, + { id = "earth_rune", chance = 64 }, + { id = "grimy_guam", chance = 64 }, + { id = "grimy_marrentill", chance = 64 }, + { id = "coins", min = 1, max = 20, chance = 64 }, + { id = "iron_ore", chance = 64 }, + { id = "chaos_rune", amount = 2, chance = 32 }, + { id = "grimy_tarromin", chance = 32 }, + { id = "grimy_harralander", chance = 32 }, + { id = "sardine", chance = 32 }, + { id = "nature_rune", amount = 3, chance = 6 }, + { id = "grimy_ranarr", chance = 6 }, + { id = "grimy_irit", chance = 6 }, + { id = "grimy_avantoe", chance = 6 }, + { id = "grimy_kwuarm", chance = 6 }, + { id = "grimy_cadantine", chance = 6 }, + { id = "grimy_lantadyme", chance = 6 }, + { id = "grimy_dwarf_weed", chance = 6 }, +] + +[guard_bandit_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] diff --git a/data/area/wilderness/bandit_camp/wilderness_bandit_camp.npcs.toml b/data/area/wilderness/bandit_camp/wilderness_bandit_camp.npcs.toml index daef496be9..c810dd348e 100644 --- a/data/area/wilderness/bandit_camp/wilderness_bandit_camp.npcs.toml +++ b/data/area/wilderness/bandit_camp/wilderness_bandit_camp.npcs.toml @@ -23,6 +23,7 @@ slayer_xp = 17.0 categories = ["dark_warriors"] respawn_delay = 50 examine = "A warrior touched by chaos." +drop_table = "dark_warrior" [guard_bandit] id = 196 @@ -39,6 +40,7 @@ slayer_xp = 29.0 categories = ["bandits"] respawn_delay = 100 examine = "A wilderness outlaw." +drop_table = "guard_bandit" [black_heather] id = 202 diff --git a/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.drops.toml b/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.drops.toml new file mode 100644 index 0000000000..78fb5e2c41 --- /dev/null +++ b/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.drops.toml @@ -0,0 +1,51 @@ +[armoured_zombie_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "armoured_zombie_secondary" }, +] + +[armoured_zombie_secondary] +roll = 1024 +drops = [ + { id = "coins", min = 50, max = 2500, chance = 64 }, + { id = "pure_essence", min = 3, max = 16, chance = 64 }, + { id = "zombie_bone", chance = 64 }, + { id = "mithril_arrow", amount = 4, chance = 32 }, + { id = "steel_mace", chance = 32 }, + { id = "adamant_kiteshield", chance = 32 }, + { id = "cosmic_rune", amount = 6, chance = 32 }, + { id = "chaos_rune", amount = 12, chance = 32 }, + { id = "nature_rune", amount = 3, chance = 32 }, + { id = "blood_rune", amount = 3, chance = 32 }, + { id = "death_rune", amount = 3, chance = 32 }, + { id = "grimy_guam", chance = 32 }, + { id = "grimy_marrentill", chance = 32 }, + { id = "grimy_harralander", chance = 32 }, + { id = "grimy_ranarr", chance = 32 }, + { id = "grimy_irit", chance = 32 }, + { id = "grimy_avantoe", chance = 32 }, + { id = "grimy_kwuarm", chance = 32 }, + { id = "grimy_cadantine", chance = 32 }, + { id = "grimy_lantadyme", chance = 32 }, + { id = "grimy_dwarf_weed", chance = 32 }, + { id = "eye_of_newt", min = 1, max = 4, chance = 32 }, + { id = "plank", amount = 9, chance = 32 }, + { id = "oak_plank", amount = 5, chance = 32 }, + { id = "fishing_bait", amount = 7, chance = 32 }, + { id = "teak_plank", amount = 2, chance = 6 }, + { id = "uncut_sapphire", chance = 6 }, + { id = "uncut_emerald", chance = 6 }, + { id = "uncut_ruby", chance = 6 }, + { id = "uncut_diamond", chance = 6 }, + { id = "dragon_spear", chance = 2 }, + { id = "shield_left_half", chance = 2 }, + { id = "rune_spear", chance = 2 }, + { id = "rune_javelin", chance = 2 }, + { id = "rune_full_helm", chance = 2 }, + { id = "loop_half_of_a_key", chance = 2 }, + { id = "tooth_half_of_a_key", chance = 2 }, + { id = "chaos_talisman", chance = 2 }, + { id = "court_summons", chance = 2 }, + { id = "starved_ancient_effigy", chance = 2 }, +] diff --git a/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml b/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml index 697b235702..683e6081b8 100644 --- a/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml +++ b/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml @@ -5,24 +5,29 @@ id = 8147 id = 8149 categories = ["zombies"] examine = "It hasn't quite got round to dying." +drop_table = "armoured_zombie" [armoured_zombie_chaos_temple_dungeon_2] id = 8150 categories = ["zombies"] examine = "This is a rotten one." +drop_table = "armoured_zombie" [armoured_zombie_chaos_temple_dungeon_3] id = 8151 categories = ["zombies"] examine = "This is a rotten one." +drop_table = "armoured_zombie" [armoured_zombie_chaos_temple_dungeon_4] id = 8152 categories = ["zombies"] examine = "This is a rotten one." +drop_table = "armoured_zombie" [armoured_zombie_chaos_temple_dungeon_5] id = 8153 +drop_table = "armoured_zombie" [armoured_zombie_chaos_temple_dungeon_6] id = 8154 diff --git a/data/area/wilderness/chaos_tunnels/chaos_tunnels.drops.toml b/data/area/wilderness/chaos_tunnels/chaos_tunnels.drops.toml index f9eabe33df..a58c87091a 100644 --- a/data/area/wilderness/chaos_tunnels/chaos_tunnels.drops.toml +++ b/data/area/wilderness/chaos_tunnels/chaos_tunnels.drops.toml @@ -319,3 +319,15 @@ drops = [ { id = "femur_bone", chance = 32, variable = "fur_n_seek_wish_list", equals = "started", default = "unstarted" }, { table = "rare_drop_table" }, ] + +[bloodworm_drop_table] +type = "all" +drops = [ + { table = "bloodworm_secondary" }, +] + +[bloodworm_secondary] +roll = 1024 +drops = [ + { id = "starved_ancient_effigy", chance = 6 }, +] diff --git a/data/area/wilderness/chaos_tunnels/chaos_tunnels.npcs.toml b/data/area/wilderness/chaos_tunnels/chaos_tunnels.npcs.toml index 58c0d1f99a..cb98d6b43f 100644 --- a/data/area/wilderness/chaos_tunnels/chaos_tunnels.npcs.toml +++ b/data/area/wilderness/chaos_tunnels/chaos_tunnels.npcs.toml @@ -9,6 +9,7 @@ max_hit_melee = 30 hunt_mode = "cowardly" respawn_delay = 50 examine = "Yuck! It's all slimy!" +drop_table = "empty" [dust_devil] id = 1624 @@ -45,6 +46,7 @@ combat_def = "bloodworm" hunt_mode = "cowardly" respawn_delay = 50 examine = "I think I should keep my distance..." +drop_table = "bloodworm" [giant_crypt_rat_chaos_tunnels] id = 2033 @@ -73,6 +75,7 @@ slayer_xp = 45.0 categories = ["spiders"] respawn_delay = 50 examine = "Incey wincey." +drop_table = "empty" [giant_crypt_spider] id = 2035 @@ -87,6 +90,7 @@ slayer_xp = 80.0 categories = ["spiders"] respawn_delay = 50 examine = "Not very incey wincey." +drop_table = "empty" [giant_crypt_rat_chaos_tunnels_2] id = 4920 diff --git a/data/area/wilderness/wilderness.drops.toml b/data/area/wilderness/wilderness.drops.toml index 1712cf2de2..47d065e75e 100644 --- a/data/area/wilderness/wilderness.drops.toml +++ b/data/area/wilderness/wilderness.drops.toml @@ -34,3 +34,99 @@ drops = [ { id = "coins", amount = 7500, chance = 16 }, { table = "rare_drop_table", chance = 6 }, ] + +[dark_wizard_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "dark_wizard_secondary" }, +] + +[dark_wizard_secondary] +roll = 1484 +drops = [ + { id = "coins", chance = 64 }, + { id = "staff", chance = 64 }, + { id = "staff_of_air", chance = 64 }, + { id = "black_wizard_hat", chance = 64 }, + { id = "fire_talisman", chance = 64 }, + { id = "mind_rune", amount = 10, chance = 64 }, + { id = "coins", chance = 64 }, + { id = "staff", chance = 64 }, + { id = "staff_of_air", chance = 64 }, + { id = "water_talisman", chance = 64 }, + { id = "fire_talisman", chance = 64 }, + { id = "black_wizard_hat", chance = 64 }, + { id = "earth_rune", amount = 10, chance = 32 }, + { id = "air_rune", amount = 10, chance = 32 }, + { id = "water_rune", amount = 10, chance = 32 }, + { id = "fire_rune", amount = 10, chance = 32 }, + { id = "mind_rune", amount = 10, chance = 32 }, + { id = "body_rune", amount = 10, chance = 32 }, + { id = "chaos_rune", amount = 4, chance = 32 }, + { id = "nature_rune", amount = 4, chance = 32 }, + { id = "cosmic_rune", amount = 2, chance = 32 }, + { id = "sling", chance = 32 }, + { id = "earth_rune", amount = 10, chance = 32 }, + { id = "air_rune", amount = 10, chance = 32 }, + { id = "water_rune", amount = 10, chance = 32 }, + { id = "fire_rune", amount = 10, chance = 32 }, + { id = "body_rune", amount = 10, chance = 32 }, + { id = "chaos_rune", amount = 4, chance = 32 }, + { id = "nature_rune", amount = 4, chance = 32 }, + { id = "cosmic_rune", amount = 2, chance = 32 }, + { id = "sling", chance = 32 }, + { id = "law_rune", amount = 3, chance = 6 }, + { id = "mind_talisman", chance = 6 }, + { id = "law_rune", amount = 3, chance = 6 }, + { id = "mind_talisman", chance = 6 }, +] + +[rogue_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "rogue_secondary" }, + { table = "easy_clue_scroll", roll = 32 }, +] + +[rogue_secondary] +roll = 1221 +drops = [ + { id = "coins", min = 25, max = 45, chance = 32 }, + { id = "air_rune", amount = 8, chance = 32 }, + { id = "lockpick", chance = 32 }, + { id = "iron_dagger_p", chance = 32 }, + { id = "jug_of_wine", chance = 32 }, + { id = "gold_bar", chance = 32 }, + { id = "adamant_dagger_p", chance = 32 }, + { id = "bronze_arrow", amount = 7, chance = 32 }, + { id = "bronze_bolts", min = 4, max = 12, chance = 32 }, + { id = "chaos_rune", min = 1, max = 2, chance = 32 }, + { id = "fire_rune", amount = 4, chance = 32 }, + { id = "earth_rune", amount = 3, chance = 32 }, + { id = "air_rune", amount = 8, chance = 32 }, + { id = "mind_rune", amount = 6, chance = 32 }, + { id = "bronze_med_helm", chance = 32 }, + { id = "iron_dagger", chance = 32 }, + { id = "iron_platebody", chance = 32 }, + { id = "iron_dagger_p", chance = 32 }, + { id = "grimy_guam", chance = 32 }, + { id = "grimy_marrentill", chance = 32 }, + { id = "grimy_tarromin", chance = 32 }, + { id = "grimy_harralander", chance = 32 }, + { id = "grimy_ranarr", chance = 32 }, + { id = "grimy_irit", chance = 32 }, + { id = "grimy_avantoe", chance = 32 }, + { id = "grimy_kwuarm", chance = 32 }, + { id = "grimy_cadantine", chance = 32 }, + { id = "grimy_lantadyme", chance = 32 }, + { id = "grimy_dwarf_weed", chance = 32 }, + { id = "coins", chance = 32 }, + { id = "copper_ore", chance = 32 }, + { id = "earth_talisman", chance = 32 }, + { id = "fishing_bait", chance = 32 }, + { id = "cabbage", chance = 32 }, + { id = "jug_of_wine", chance = 32 }, + { id = "lockpick", chance = 32 }, +] diff --git a/data/area/wilderness/wilderness.npcs.toml b/data/area/wilderness/wilderness.npcs.toml index 25c5dc3f25..8992405a52 100644 --- a/data/area/wilderness/wilderness.npcs.toml +++ b/data/area/wilderness/wilderness.npcs.toml @@ -13,6 +13,7 @@ max_hit_magic = 60 hunt_mode = "cowardly" respawn_delay = 50 examine = "A practicer of dark arts." +drop_table = "dark_wizard" [dark_wizard_wilderness_2] id = 174 @@ -26,6 +27,7 @@ max_hit_magic = 60 hunt_mode = "cowardly" respawn_delay = 50 examine = "He works evil magic." +drop_table = "dark_wizard" [william] id = 1778 @@ -60,6 +62,7 @@ examine = "A very brave merchant." [pirate_wilderness] id = 184 examine = "This one's had too much to drink!" +drop_table = "pirate" [mysterious_ghost_wilderness] id = 2382 @@ -102,25 +105,31 @@ examine = "Slightly slimy and somewhat menacing." [pirate_wilderness_2] id = 6351 examine = "This one's had too much to drink!" +drop_table = "pirate" [pirate_wilderness_3] id = 6352 examine = "This one's had too much to drink!" +drop_table = "pirate" [pirate_wilderness_4] id = 6353 examine = "This one's had too much to drink!" +drop_table = "pirate" [pirate_wilderness_5] id = 6354 examine = "This one's had too much to drink!" +drop_table = "pirate" [pirate_wilderness_6] id = 6355 +drop_table = "pirate" [pirate_wilderness_7] id = 6356 examine = "This one's had too much to drink!" +drop_table = "pirate" [goth_leprechaun_wilderness] id = 8000 @@ -146,6 +155,7 @@ id = 8123 [giant_rat_wilderness_2] id = 87 +drop_table = "giant_rat" [battle_mage_zamorak] id = 912 @@ -247,4 +257,5 @@ attack_bonus = 5 slayer_xp = 17.0 categories = ["rogues"] respawn_delay = 50 -examine = "Rogueish." \ No newline at end of file +examine = "Rogueish." +drop_table = "rogue" \ No newline at end of file diff --git a/data/entity/npc/animal/birds/birds.drops.toml b/data/entity/npc/animal/birds/birds.drops.toml new file mode 100644 index 0000000000..3e0324e242 --- /dev/null +++ b/data/entity/npc/animal/birds/birds.drops.toml @@ -0,0 +1,5 @@ +[duck_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] diff --git a/data/entity/npc/animal/birds/birds.npcs.toml b/data/entity/npc/animal/birds/birds.npcs.toml index a5114deac9..32fb34b0ce 100644 --- a/data/entity/npc/animal/birds/birds.npcs.toml +++ b/data/entity/npc/animal/birds/birds.npcs.toml @@ -11,6 +11,7 @@ height = 10 collision = "sea" combat_def = "duck_swim" examine = "Quackers." +drop_table = "duck" [crow] id = 1754 @@ -34,11 +35,13 @@ id = 2252 clone = "duck_swim" id = 2693 examine = "She quackers." +drop_table = "duck" [duckling] clone = "duck_swim" id = 2694 examine = "Mini quackers." +drop_table = "bones" [crow_5] clone = "crow" diff --git a/data/entity/npc/animal/crab/crab.npcs.toml b/data/entity/npc/animal/crab/crab.npcs.toml index aff9dadde2..fbb7bbf906 100644 --- a/data/entity/npc/animal/crab/crab.npcs.toml +++ b/data/entity/npc/animal/crab/crab.npcs.toml @@ -13,6 +13,7 @@ examine = "No one likes crabs..." [rock_crab_1] clone = "rock_crab" id = 1267 +drop_table = "rock_crab" [rock] id = 1266 diff --git a/data/entity/npc/monster/imp/imp.npcs.toml b/data/entity/npc/monster/imp/imp.npcs.toml index 4145caf762..7a342f38fa 100644 --- a/data/entity/npc/monster/imp/imp.npcs.toml +++ b/data/entity/npc/monster/imp/imp.npcs.toml @@ -21,3 +21,4 @@ categories = ["imp"] god = "zamorak" hunt_mode = "zamorak_aggressive" examine = "Have you checked your pockets lately?" +drop_table = "imp" diff --git a/data/entity/npc/monster/reptile/lizard/lizard.drops.toml b/data/entity/npc/monster/reptile/lizard/lizard.drops.toml index 9ea320b221..4231d5c7c3 100644 --- a/data/entity/npc/monster/reptile/lizard/lizard.drops.toml +++ b/data/entity/npc/monster/reptile/lizard/lizard.drops.toml @@ -53,7 +53,6 @@ drops = [ type = "all" drops = [ { table = "gem_drop_table" }, - { table = "gem_drop_table" }, ] [small_lizard_drop_table] diff --git a/data/entity/npc/monster/reptile/spider/spider.drops.toml b/data/entity/npc/monster/reptile/spider/spider.drops.toml index 25f1475cd2..e5a29c989c 100644 --- a/data/entity/npc/monster/reptile/spider/spider.drops.toml +++ b/data/entity/npc/monster/reptile/spider/spider.drops.toml @@ -68,3 +68,18 @@ drops = [ { id = "crimson_charm", chance = 2391 }, { id = "blue_charm", chance = 655 }, ] + +[poison_spider_drop_table] +type = "all" +drops = [ + { table = "poison_spider_secondary" }, +] + +[poison_spider_secondary] +roll = 1024 +drops = [ + { id = "green_charm", chance = 64, members = true }, + { id = "gold_charm", chance = 64, members = true }, + { id = "crimson_charm", chance = 64, members = true }, + { id = "blue_charm", chance = 6, members = true }, +] diff --git a/data/entity/npc/monster/reptile/spider/spider.npcs.toml b/data/entity/npc/monster/reptile/spider/spider.npcs.toml index 7e74ab2749..b13f5ac3f1 100644 --- a/data/entity/npc/monster/reptile/spider/spider.npcs.toml +++ b/data/entity/npc/monster/reptile/spider/spider.npcs.toml @@ -57,6 +57,7 @@ slayer_xp = 50.0 categories = ["giant_spiders", "spiders"] height = 10 examine = "I think this spider has been genetically modified." +drop_table = "giant_spider" [deadly_red_spider] id = 63 @@ -84,6 +85,7 @@ slayer_xp = 35.0 categories = ["spiders"] height = 10 examine = "I think this spider has been magically modified." +drop_table = "poison_spider" [spider_underground_pass] id = 1004 diff --git a/data/entity/npc/monster/undead/ghost/ghost.npcs.toml b/data/entity/npc/monster/undead/ghost/ghost.npcs.toml index ae96b682f2..65cb0e2c6c 100644 --- a/data/entity/npc/monster/undead/ghost/ghost.npcs.toml +++ b/data/entity/npc/monster/undead/ghost/ghost.npcs.toml @@ -10,55 +10,68 @@ respawn_delay = 40 hunt_mode = "cowardly" categories = ["ghosts", "undead"] examine = "Eeek! A ghost!" +drop_table = "empty" [ghost] id = 103 clone = "ghost_draynor_manor" combat_def = "ghost_tendril" +drop_table = "empty" [ghost_2] id = 5342 clone = "ghost_draynor_manor" +drop_table = "empty" [ghost_3] id = 5343 clone = "ghost_draynor_manor" +drop_table = "empty" [ghost_4] id = 5344 clone = "ghost_draynor_manor" +drop_table = "empty" [ghost_5] id = 5345 clone = "ghost_draynor_manor" +drop_table = "empty" [ghost_6] id = 5346 clone = "ghost_draynor_manor" +drop_table = "empty" [ghost_7] id = 5347 clone = "ghost_draynor_manor" +drop_table = "empty" [ghost_8] id = 5348 clone = "ghost_draynor_manor" +drop_table = "empty" [ghost_draynor_manor_2] id = 5349 clone = "ghost_draynor_manor" +drop_table = "empty" [ghost_draynor_manor_3] id = 5350 clone = "ghost_draynor_manor" +drop_table = "empty" [ghost_draynor_manor_4] id = 5351 clone = "ghost_draynor_manor" +drop_table = "empty" [ghost_draynor_manor_5] id = 5352 clone = "ghost_draynor_manor" +drop_table = "empty" [stronghold_ghost_hair] id = 5369 @@ -73,22 +86,27 @@ respawn_delay = 40 slayer_xp = 80.0 categories = ["ghosts", "undead"] examine = "Eeek! A ghost!" +drop_table = "empty" [stronghold_ghost] id = 4387 clone = "stronghold_ghost_hair" combat_def = "stronghold_ghost_tendril" +drop_table = "empty" [stronghold_ghost_cape] id = 4388 clone = "stronghold_ghost_hair" hitpoints = 750 slayer_xp = 75.0 +drop_table = "empty" [stronghold_ghost_hood] id = 5370 clone = "stronghold_ghost_hair" +drop_table = "empty" [stronghold_ghost_mask] id = 5371 clone = "stronghold_ghost_hair" +drop_table = "empty" diff --git a/data/entity/npc/monster/undead/skeleton/skeletons.npcs.toml b/data/entity/npc/monster/undead/skeleton/skeletons.npcs.toml index 0ea6f5f233..ab9a84586a 100644 --- a/data/entity/npc/monster/undead/skeleton/skeletons.npcs.toml +++ b/data/entity/npc/monster/undead/skeleton/skeletons.npcs.toml @@ -114,14 +114,17 @@ height = 30 respawn_delay = 60 categories = ["skeletons", "undead"] examine = "Could do with gaining a few pounds." +drop_table = "skeleton" [skeleton_sword_shield_85] clone = "skeleton_axe_shield_85" id = 5368 +drop_table = "skeleton" [skeleton_sword_shield_45] clone = "skeleton_axe_shield_85" id = 93 +drop_table = "skeleton" [stronghold_skeleton_round_shield] id = 4384 @@ -155,6 +158,7 @@ examine = "Could do with gaining a few pounds." [skeleton_hammer_shield] clone = "stronghold_skeleton_helmet" id = 4386 +drop_table = "skeleton" [stronghold_skeleton_unarmed] clone = "stronghold_skeleton_helmet" diff --git a/data/minigame/barrows_brothers/barrows.npcs.toml b/data/minigame/barrows_brothers/barrows.npcs.toml index 5d8c2861e1..5788ff250e 100644 --- a/data/minigame/barrows_brothers/barrows.npcs.toml +++ b/data/minigame/barrows_brothers/barrows.npcs.toml @@ -19,6 +19,7 @@ slayer_xp = 35.0 categories = ["rats"] respawn_delay = 50 examine = "A nasty little rodent." +drop_table = "crypt_rat" [skeleton_barrows] id = 2036 diff --git a/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.drops.toml b/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.drops.toml index b14b89e9c9..b53bd1d36b 100644 --- a/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.drops.toml +++ b/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.drops.toml @@ -15,3 +15,9 @@ type = "all" drops = [ { id = "riyl_remains" }, ] + +[phrin_shadow_drop_table] +type = "all" +drops = [ + { id = "phrin_remains" }, +] diff --git a/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.npcs.toml b/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.npcs.toml index 9e3c8c0d6c..c00322a912 100644 --- a/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.npcs.toml +++ b/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.npcs.toml @@ -13,6 +13,7 @@ categories = ["shades"] immune_poison = true respawn_delay = 50 examine = "A shadowy sort of entity, kind of creepy looking." +drop_table = "phrin_shadow" [phrin_shade_shade] id = 1244 @@ -95,6 +96,7 @@ hunt_mode = "cowardly" slayer_xp = 94.0 categories = ["shades"] examine = "The shadowy remains of a long-departed soul." +drop_table = "empty" [fiyr_shadow_shade_catacombs] id = 1249 diff --git a/data/minigame/soul_wars/nomads_temple/nomads_temple.drops.toml b/data/minigame/soul_wars/nomads_temple/nomads_temple.drops.toml new file mode 100644 index 0000000000..53cb152600 --- /dev/null +++ b/data/minigame/soul_wars/nomads_temple/nomads_temple.drops.toml @@ -0,0 +1,14 @@ +[spectral_worshipper_drop_table] +type = "all" +drops = [ + { id = "ashes" }, + { table = "spectral_worshipper_secondary" }, +] + +[spectral_worshipper_secondary] +roll = 1024 +drops = [ + { id = "fire_rune", amount = 5, chance = 32 }, + { id = "air_rune", amount = 5, chance = 32 }, + { id = "blood_rune", chance = 32 }, +] diff --git a/data/minigame/soul_wars/nomads_temple/nomads_temple.npcs.toml b/data/minigame/soul_wars/nomads_temple/nomads_temple.npcs.toml index 6484404f7e..0abc273319 100644 --- a/data/minigame/soul_wars/nomads_temple/nomads_temple.npcs.toml +++ b/data/minigame/soul_wars/nomads_temple/nomads_temple.npcs.toml @@ -35,6 +35,7 @@ id = 9450 id = 9453 categories = ["ghosts"] examine = "A lingering soul." +drop_table = "spectral_worshipper" [knight_nomads_temple_2] id = 9448 diff --git a/data/minigame/soul_wars/soul_wars.npcs.toml b/data/minigame/soul_wars/soul_wars.npcs.toml index 89eb06dc0d..e88c3141f0 100644 --- a/data/minigame/soul_wars/soul_wars.npcs.toml +++ b/data/minigame/soul_wars/soul_wars.npcs.toml @@ -1,5 +1,6 @@ [soul_wars_jelly] id = 8599 +drop_table = "jelly" [nomad_soul_wars] id = 8525 @@ -7,13 +8,16 @@ id = 8525 [avatar_of_destruction_soul_wars] id = 8596 examine = "The essence of ruination." +drop_table = "empty" [avatar_of_creation_soul_wars] id = 8597 examine = "A being of unsurpassed vitality." +drop_table = "empty" [pyrefiend_soul_wars] id = 8598 +drop_table = "pyrefiend" [zimberfizz] id = 8527 diff --git a/data/minigame/temple_trekking/temple_trekking.npcs.toml b/data/minigame/temple_trekking/temple_trekking.npcs.toml index e5bf799c24..a322ba13ae 100644 --- a/data/minigame/temple_trekking/temple_trekking.npcs.toml +++ b/data/minigame/temple_trekking/temple_trekking.npcs.toml @@ -2,6 +2,7 @@ id = 3622 categories = ["zombies"] examine = "I wonder if he'd let me borrow his hatchet?" +drop_table = "zombie" [rook_temple_trekking] id = 9719 diff --git a/data/minigame/warriors_guild/warriors_guild.drops.toml b/data/minigame/warriors_guild/warriors_guild.drops.toml index b3fb3023e1..b94b054e3e 100644 --- a/data/minigame/warriors_guild/warriors_guild.drops.toml +++ b/data/minigame/warriors_guild/warriors_guild.drops.toml @@ -86,3 +86,94 @@ drops = [ { id = "rune_platebody" }, { id = "rune_platelegs" }, ] + +[cyclops_drop_table] +type = "all" +drops = [ + { id = "big_bones" }, + { table = "cyclops_secondary" }, + { table = "hard_clue_scroll", roll = 170 }, +] + +[cyclops_secondary] +roll = 2495 +drops = [ + { id = "iron_2h_sword", chance = 64 }, + { id = "steel_dagger", chance = 64 }, + { id = "steel_mace", chance = 64 }, + { id = "steel_sword", chance = 64 }, + { id = "black_sword", chance = 64 }, + { id = "black_dagger", chance = 64 }, + { id = "black_knife", min = 4, max = 19, chance = 64 }, + { id = "steel_longsword", chance = 64 }, + { id = "steel_battleaxe", chance = 64 }, + { id = "steel_2h_sword", chance = 64 }, + { id = "black_longsword", chance = 64 }, + { id = "iron_chainbody", chance = 64 }, + { id = "steel_chainbody", chance = 64 }, + { id = "coins", min = 5, max = 202, chance = 64 }, + { id = "shoulder_bone", chance = 64 }, + { id = "black_2h_sword", chance = 32 }, + { id = "mithril_dagger", chance = 32 }, + { id = "mithril_longsword", chance = 32 }, + { id = "adamant_mace", chance = 32 }, + { id = "iron_full_helm", chance = 32 }, + { id = "iron_kiteshield", chance = 32 }, + { id = "steel_med_helm", chance = 32 }, + { id = "law_rune", amount = 3, chance = 32 }, + { id = "death_rune", amount = 2, chance = 32 }, + { id = "nature_rune", chance = 32 }, + { id = "mind_rune", chance = 32 }, + { id = "cosmic_rune", chance = 32 }, + { id = "water_rune", amount = 7, chance = 32 }, + { id = "fire_rune", amount = 15, chance = 32 }, + { id = "potato_seed", chance = 32 }, + { id = "avantoe_seed", chance = 32 }, + { id = "toadflax_seed", chance = 32 }, + { id = "cactus_seed", chance = 32 }, + { id = "cadantine_seed", chance = 32 }, + { id = "marrentill_seed", chance = 32 }, + { id = "strawberry_seed", chance = 32 }, + { id = "limpwurt_seed", chance = 32 }, + { id = "wildblood_seed", chance = 32 }, + { id = "irit_seed", chance = 32 }, + { id = "snapdragon_seed", chance = 32 }, + { id = "ranarr_seed", chance = 32 }, + { id = "tarromin_seed", chance = 32 }, + { id = "harralander_seed", chance = 32 }, + { id = "whiteberry_seed", chance = 32 }, + { id = "jangerberry_seed", chance = 32 }, + { id = "belladonna_seed", chance = 32 }, + { id = "spirit_weed_seed", chance = 32 }, + { id = "long_bone", chance = 32 }, + { id = "curved_bone", chance = 32 }, + { id = "beer", chance = 32 }, + { id = "uncut_sapphire", chance = 32 }, + { id = "uncut_emerald", chance = 32 }, + { id = "uncut_ruby", chance = 32 }, + { id = "limpwurt_root", chance = 32 }, + { id = "body_talisman", chance = 32 }, + { id = "rune_javelin", amount = 5, chance = 6 }, + { id = "adamant_2h_sword", chance = 6 }, + { id = "mithril_sq_shield", chance = 6 }, + { id = "grimy_dwarf_weed", chance = 6 }, + { id = "grimy_irit", chance = 6 }, + { id = "grimy_avantoe", chance = 6 }, + { id = "grimy_guam", chance = 6 }, + { id = "grimy_ranarr", chance = 6 }, + { id = "grimy_kwuarm", chance = 6 }, + { id = "grimy_tarromin", chance = 6 }, + { id = "grimy_harralander", chance = 6 }, + { id = "grimy_lantadyme", chance = 6 }, + { id = "grimy_marrentill", chance = 6 }, + { id = "grimy_cadantine", chance = 6 }, + { id = "nature_talisman", chance = 6 }, + { id = "tooth_half_of_a_key", chance = 6 }, + { id = "loop_half_of_a_key", chance = 6 }, + { id = "rune_dagger", chance = 2 }, + { id = "rune_spear", chance = 2 }, + { id = "dragon_spear", chance = 2 }, + { id = "shield_left_half", chance = 2 }, + { id = "torstol_seed", chance = 2 }, + { id = "uncut_diamond", chance = 2 }, +] diff --git a/data/minigame/warriors_guild/warriors_guild.npcs.toml b/data/minigame/warriors_guild/warriors_guild.npcs.toml index 7b5196030f..b4425447c6 100644 --- a/data/minigame/warriors_guild/warriors_guild.npcs.toml +++ b/data/minigame/warriors_guild/warriors_guild.npcs.toml @@ -67,6 +67,7 @@ slayer_xp = 100.0 categories = ["hill_giants"] respawn_delay = 30 examine = "A one-eyed woman eater." +drop_table = "cyclops" [cyclopse_hammer_steel] id = 6078 @@ -81,22 +82,27 @@ slayer_xp = 55.0 categories = ["hill_giants"] respawn_delay = 30 examine = "A one-eyed man eater." +drop_table = "cyclops" [cyclopse_club_lepard] id = 4291 clone = "cyclopse_hammer_steel" +drop_table = "cyclops" [cyclopse_club] id = 6080 clone = "cyclopse_hammer" +drop_table = "cyclops" [cyclopse_club_mohawk] id = 6079 clone = "cyclopse_hammer" +drop_table = "cyclops" [cyclopse_knife] id = 4292 clone = "cyclopse_hammer" +drop_table = "cyclops" [harrallak_menarous_2] id = 8268 diff --git a/data/quest/members/cabin_fever/cabin_fever.npcs.toml b/data/quest/members/cabin_fever/cabin_fever.npcs.toml index e9c0ac7c0f..3362a39e56 100644 --- a/data/quest/members/cabin_fever/cabin_fever.npcs.toml +++ b/data/quest/members/cabin_fever/cabin_fever.npcs.toml @@ -15,38 +15,47 @@ slayer_xp = 20.0 categories = ["pirates"] respawn_delay = 50 examine = "An enemy pirate." +drop_table = "pirate" [pirate_cabin_fever_2] id = 3189 clone = "pirate_cabin_fever" +drop_table = "pirate" [pirate_cabin_fever_3] id = 3190 clone = "pirate_cabin_fever" +drop_table = "pirate" [pirate_cabin_fever_4] id = 3191 clone = "pirate_cabin_fever" +drop_table = "pirate" [pirate_cabin_fever_5] id = 3192 clone = "pirate_cabin_fever" +drop_table = "pirate" [pirate_cabin_fever_6] id = 3193 clone = "pirate_cabin_fever" +drop_table = "pirate" [pirate_cabin_fever_7] id = 3194 clone = "pirate_cabin_fever" +drop_table = "pirate" [pirate_cabin_fever_8] id = 3195 clone = "pirate_cabin_fever" +drop_table = "pirate" [pirate_cabin_fever_9] id = 3196 clone = "pirate_cabin_fever" +drop_table = "pirate" [gull_cabin_fever] id = 3197 diff --git a/data/quest/members/clock_tower/clock_tower_dungeon.drops.toml b/data/quest/members/clock_tower/clock_tower_dungeon.drops.toml new file mode 100644 index 0000000000..1044d12d5f --- /dev/null +++ b/data/quest/members/clock_tower/clock_tower_dungeon.drops.toml @@ -0,0 +1,12 @@ +[dungeon_rat_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { id = "raw_rat_meat" }, +] + +[head_thief_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] diff --git a/data/quest/members/clock_tower/clock_tower_dungeon.npcs.toml b/data/quest/members/clock_tower/clock_tower_dungeon.npcs.toml index cd0896e842..74a976c28c 100644 --- a/data/quest/members/clock_tower/clock_tower_dungeon.npcs.toml +++ b/data/quest/members/clock_tower/clock_tower_dungeon.npcs.toml @@ -2,10 +2,12 @@ id = 224 categories = ["rats"] examine = "A dirty rat." +drop_table = "dungeon_rat" [thief_clocktower_dungeon] id = 282 examine = "A dastardly blanket thief." +drop_table = "thief" [head_thief_clocktower_dungeon] id = 283 @@ -20,19 +22,23 @@ style = "slash" max_hit_melee = 30 respawn_delay = 25 examine = "The head of the treacherous blanket stealing gang." +drop_table = "head_thief" [dungeon_rat_clocktower_dungeon_2] id = 4936 categories = ["rats"] examine = "A dirty rat." +drop_table = "dungeon_rat" [dungeon_rat_clocktower_dungeon_3] id = 4937 categories = ["rats"] examine = "A dirty rat." +drop_table = "dungeon_rat" [dungeon_rat_clocktower_dungeon_4] id = 88 categories = ["rats"] examine = "Overgrown vermin." +drop_table = "dungeon_rat" diff --git a/data/quest/members/defender_of_varrock/defender_of_varrock.drops.toml b/data/quest/members/defender_of_varrock/defender_of_varrock.drops.toml new file mode 100644 index 0000000000..ccd3727d05 --- /dev/null +++ b/data/quest/members/defender_of_varrock/defender_of_varrock.drops.toml @@ -0,0 +1,36 @@ +[barbarian_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "barbarian_secondary" }, + { table = "easy_clue_scroll", roll = 170 }, +] + +[barbarian_secondary] +roll = 1083 +drops = [ + { id = "bronze_hatchet", chance = 64 }, + { id = "bronze_battleaxe", chance = 64 }, + { id = "bronze_arrow", amount = 10, chance = 64 }, + { id = "iron_hatchet", chance = 64 }, + { id = "iron_mace", chance = 64 }, + { id = "iron_arrow", amount = 8, chance = 64 }, + { id = "coins", amount = 5, chance = 64 }, + { id = "iron_ore", chance = 64 }, + { id = "tin_ore", chance = 64 }, + { id = "beer", chance = 64 }, + { id = "cooked_meat", chance = 64 }, + { id = "bear_fur", chance = 64 }, + { id = "earth_rune", min = 2, max = 5, chance = 32 }, + { id = "chaos_rune", min = 2, max = 6, chance = 32 }, + { id = "law_rune", amount = 2, chance = 32 }, + { id = "mind_rune", amount = 4, chance = 32 }, + { id = "fire_rune", amount = 5, chance = 32 }, + { id = "staff", chance = 32 }, + { id = "ring_mould", chance = 32 }, + { id = "uncut_sapphire", chance = 6 }, + { id = "uncut_emerald", chance = 6 }, + { id = "uncut_ruby", chance = 6 }, + { id = "uncut_diamond", chance = 6 }, + { id = "flier", chance = 6 }, +] diff --git a/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml b/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml index 76063b9178..07d5c647ea 100644 --- a/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml +++ b/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml @@ -10,6 +10,7 @@ max_hit_melee = 20 attack_bonus = 8 respawn_delay = 25 examine = "Don't let her arm-wrestle you for money." +drop_table = "barbarian" [stray_dog_defender_of_varrock] id = 5917 @@ -20,18 +21,23 @@ id = 5918 [armoured_zombie_defender_of_varrock] id = 8159 +drop_table = "armoured_zombie" [armoured_zombie_defender_of_varrock_2] id = 8160 +drop_table = "armoured_zombie" [armoured_zombie_defender_of_varrock_3] id = 8161 +drop_table = "armoured_zombie" [armoured_zombie_defender_of_varrock_4] id = 8162 +drop_table = "armoured_zombie" [armoured_zombie_defender_of_varrock_5] id = 8163 +drop_table = "armoured_zombie" [arrav_defender_of_varrock] id = 8169 @@ -39,6 +45,7 @@ examine = "He has seen better, happier days." [guard_defender_of_varrock] id = 8173 +drop_table = "guard" [ellamaria_defender_of_varrock] id = 8175 @@ -53,6 +60,7 @@ mage = 25 combat_def = "monk_of_zamorak" hunt_mode = "cowardly" examine = "A Zamorakian human cleric." +drop_table = "monk_of_zamorak" [sir_prysin_defender_of_varrock] id = 9360 diff --git a/data/quest/members/dream_mentor/dream_mentor.npcs.toml b/data/quest/members/dream_mentor/dream_mentor.npcs.toml index 64e24b11d2..a0336edc98 100644 --- a/data/quest/members/dream_mentor/dream_mentor.npcs.toml +++ b/data/quest/members/dream_mentor/dream_mentor.npcs.toml @@ -32,6 +32,7 @@ max_hit_melee = 180 max_hit_range = 20 hunt_mode = "cowardly" examine = "Are you good enough to fight?" +drop_table = "empty" [the_untouchable_normal] id = 5904 diff --git a/data/quest/members/dwarf_cannon/dwarven_outpost.npcs.toml b/data/quest/members/dwarf_cannon/dwarven_outpost.npcs.toml index 9646f88472..c4cb3fd36b 100644 --- a/data/quest/members/dwarf_cannon/dwarven_outpost.npcs.toml +++ b/data/quest/members/dwarf_cannon/dwarven_outpost.npcs.toml @@ -14,14 +14,17 @@ examine = "He's in control of the coal trucks." id = 4257 categories = ["dwarves"] examine = "A dwarven guard." +drop_table = "guard" [guard_dwarven_outpost_2] id = 4258 categories = ["dwarves"] examine = "A dwarven guard." +drop_table = "guard" [goblin_dwarven_outpost] id = 4261 categories = ["goblins"] examine = "An ugly green creature." +drop_table = "goblin" diff --git a/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.drops.toml b/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.drops.toml new file mode 100644 index 0000000000..02effc40d7 --- /dev/null +++ b/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.drops.toml @@ -0,0 +1,124 @@ +[ivory_shredflesh_cursed_drop_table] +type = "all" +drops = [ + { table = "ivory_shredflesh_cursed_secondary" }, + { table = "medium_clue_scroll", roll = 16 }, +] + +[ivory_shredflesh_cursed_secondary] +roll = 1719 +drops = [ + { id = "dragon_dagger", chance = 64 }, + { id = "rune_dagger", chance = 64 }, + { id = "rune_longsword", chance = 64 }, + { id = "ranarr_seed", chance = 64 }, + { id = "snapdragon_seed", chance = 64 }, + { id = "sweetcorn_seed", chance = 64 }, + { id = "strawberry_seed", chance = 64 }, + { id = "watermelon_seed", chance = 64 }, + { id = "death_rune", chance = 64 }, + { id = "mud_rune", chance = 64 }, + { id = "cosmic_rune", chance = 64 }, + { id = "cosmic_talisman", chance = 64 }, + { id = "earth_talisman", chance = 64 }, + { id = "sapphire", chance = 64 }, + { id = "emerald", chance = 64 }, + { id = "ruby", chance = 64 }, + { id = "diamond", chance = 64 }, + { id = "adamantite_ore", chance = 64 }, + { id = "silver_ore", chance = 64 }, + { id = "pure_essence", chance = 64 }, + { id = "gold_charm", chance = 64, members = true }, + { id = "blue_charm", chance = 64, members = true }, + { id = "molten_glass", chance = 64 }, + { id = "chocolate_bar", chance = 64 }, + { id = "bones", chance = 64 }, + { id = "irit_seed", chance = 6 }, + { id = "green_charm", chance = 6, members = true }, + { id = "crimson_charm", chance = 6, members = true }, + { id = "dragon_longsword", chance = 2 }, + { id = "dragonstone", chance = 2 }, +] + +[ivory_gromblod_cursed_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "ivory_gromblod_cursed_secondary" }, + { table = "easy_clue_scroll", roll = 512 }, + { table = "hard_clue_scroll", roll = 170 }, + { table = "medium_clue_scroll", roll = 170 }, +] + +[ivory_gromblod_cursed_secondary] +roll = 1024 +drops = [ + { id = "dragon_dagger", chance = 64 }, + { id = "dragon_longsword", chance = 64 }, + { id = "snapdragon_seed", min = 3, max = 6, chance = 64 }, + { id = "rune_dagger", chance = 32 }, + { id = "rune_longsword", chance = 32 }, + { id = "irit_seed", chance = 32 }, + { id = "ranarr_seed", chance = 32 }, + { id = "sweetcorn_seed", amount = 3, chance = 32 }, + { id = "strawberry_seed", amount = 3, chance = 32 }, + { id = "watermelon_seed", amount = 3, chance = 32 }, + { id = "death_rune", amount = 4, chance = 32 }, + { id = "mud_rune", amount = 6, chance = 32 }, + { id = "cosmic_rune", amount = 6, chance = 32 }, + { id = "cosmic_talisman", chance = 32 }, + { id = "earth_talisman", chance = 32 }, + { id = "sapphire", chance = 32 }, + { id = "emerald", chance = 32 }, + { id = "ruby", chance = 32 }, + { id = "adamantite_ore", chance = 32 }, + { id = "silver_ore", amount = 5, chance = 32 }, + { id = "pure_essence", amount = 10, chance = 32 }, + { id = "coins", amount = 2, chance = 32 }, + { id = "molten_glass", amount = 2, chance = 32 }, + { id = "chocolate_bar", amount = 12, chance = 32 }, + { id = "diamond", chance = 6 }, + { id = "dragonstone", chance = 6 }, +] + +[ivory_bre_egth_cursed_drop_table] +type = "all" +drops = [ + { table = "ivory_bre_egth_cursed_secondary" }, + { table = "medium_clue_scroll", roll = 16 }, +] + +[ivory_bre_egth_cursed_secondary] +roll = 1727 +drops = [ + { id = "dragon_dagger", chance = 64 }, + { id = "rune_dagger", chance = 64 }, + { id = "rune_longsword", chance = 64 }, + { id = "irit_seed", chance = 64 }, + { id = "ranarr_seed", chance = 64 }, + { id = "snapdragon_seed", chance = 64 }, + { id = "sweetcorn_seed", chance = 64 }, + { id = "strawberry_seed", chance = 64 }, + { id = "watermelon_seed", chance = 64 }, + { id = "death_rune", chance = 64 }, + { id = "mud_rune", chance = 64 }, + { id = "cosmic_rune", chance = 64 }, + { id = "cosmic_talisman", chance = 64 }, + { id = "earth_talisman", chance = 64 }, + { id = "sapphire", chance = 64 }, + { id = "emerald", chance = 64 }, + { id = "ruby", chance = 64 }, + { id = "adamantite_ore", chance = 64 }, + { id = "silver_ore", chance = 64 }, + { id = "pure_essence", chance = 64 }, + { id = "gold_charm", chance = 64, members = true }, + { id = "green_charm", chance = 64, members = true }, + { id = "molten_glass", chance = 64 }, + { id = "chocolate_bar", chance = 64 }, + { id = "bones", chance = 64 }, + { id = "dragon_longsword", chance = 6 }, + { id = "diamond", chance = 6 }, + { id = "dragonstone", chance = 6 }, + { id = "crimson_charm", chance = 6, members = true }, + { id = "blue_charm", chance = 6, members = true }, +] diff --git a/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.npcs.toml b/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.npcs.toml index 7a7f1b8cf2..e3d479f14d 100644 --- a/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.npcs.toml +++ b/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.npcs.toml @@ -1,14 +1,17 @@ [ivory_shredflesh_cursed] id = 11352 examine = "A cursed ivory version of General Shredflesh." +drop_table = "ivory_shredflesh_cursed" [ivory_gromblod_cursed] id = 11353 examine = "A cursed ivory version of General Gromblod." +drop_table = "ivory_gromblod_cursed" [ivory_breegth_cursed] id = 11354 examine = "A cursed ivory version of General Breegth." +drop_table = "ivory_bre_egth_cursed" [farming_patch_orks_rift] id = 11383 diff --git a/data/quest/members/haunted_mine/haunted_mine.npcs.toml b/data/quest/members/haunted_mine/haunted_mine.npcs.toml index 547b101eca..42996d7fdd 100644 --- a/data/quest/members/haunted_mine/haunted_mine.npcs.toml +++ b/data/quest/members/haunted_mine/haunted_mine.npcs.toml @@ -23,6 +23,7 @@ id = 1548 id = 5392 categories = ["skeletons"] examine = "Put some meat on those bones!" +drop_table = "skeleton" [treus_dayth] id = 1540 diff --git a/data/quest/members/mournings_end_part_2/mournings_end_part_2.npcs.toml b/data/quest/members/mournings_end_part_2/mournings_end_part_2.npcs.toml index 5b0b79ec4f..0b7c157b9b 100644 --- a/data/quest/members/mournings_end_part_2/mournings_end_part_2.npcs.toml +++ b/data/quest/members/mournings_end_part_2/mournings_end_part_2.npcs.toml @@ -2,6 +2,7 @@ id = 2782 categories = ["shadow_creatures"] examine = "A shadow." +drop_table = "empty" [arianwyn] id = 8952 diff --git a/data/quest/members/plague_city/plague_city.npcs.toml b/data/quest/members/plague_city/plague_city.npcs.toml index b7c3aadf4a..734ce7f40d 100644 --- a/data/quest/members/plague_city/plague_city.npcs.toml +++ b/data/quest/members/plague_city/plague_city.npcs.toml @@ -11,6 +11,7 @@ def = 10 max_hit_melee = 20 categories = ["human"] examine = "A mourner, or plague healer." +drop_table = "mourner" [alrena] id = 710 diff --git a/data/quest/members/priest_in_peril/priest_in_peril.drops.toml b/data/quest/members/priest_in_peril/priest_in_peril.drops.toml index 32c7556781..ea5bb16701 100644 --- a/data/quest/members/priest_in_peril/priest_in_peril.drops.toml +++ b/data/quest/members/priest_in_peril/priest_in_peril.drops.toml @@ -3,4 +3,9 @@ type = "all" drops = [ { id = "bones" }, { id = "pipkey_gold", variable = "priest_in_peril", equals = "help_drezel" }, -] \ No newline at end of file +] +[temple_guardian_drop_table] +type = "all" +drops = [ + { id = "bones" }, +] diff --git a/data/quest/members/priest_in_peril/priest_in_peril.npcs.toml b/data/quest/members/priest_in_peril/priest_in_peril.npcs.toml index 888ea4d248..f93c5e723b 100644 --- a/data/quest/members/priest_in_peril/priest_in_peril.npcs.toml +++ b/data/quest/members/priest_in_peril/priest_in_peril.npcs.toml @@ -11,6 +11,7 @@ slayer_xp = 45.0 categories = ["dogs"] immune_cannon = true examine = "Looks like a big ugly dog." +drop_table = "temple_guardian" [priestperilevilmonk1] id = 1044 diff --git a/data/quest/members/rocking_out/battle_of_the_archipelago/battle_of_the_archipelago.npcs.toml b/data/quest/members/rocking_out/battle_of_the_archipelago/battle_of_the_archipelago.npcs.toml index 31090e326a..70f35a984f 100644 --- a/data/quest/members/rocking_out/battle_of_the_archipelago/battle_of_the_archipelago.npcs.toml +++ b/data/quest/members/rocking_out/battle_of_the_archipelago/battle_of_the_archipelago.npcs.toml @@ -1,7 +1,9 @@ [gull_battle_of_the_archipelago] id = 7860 +drop_table = "bones" [jack_battle_of_the_archipelago] id = 7861 examine = "It's Rabid Jack!" +drop_table = "bones" diff --git a/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.drops.toml b/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.drops.toml new file mode 100644 index 0000000000..aaa7715142 --- /dev/null +++ b/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.drops.toml @@ -0,0 +1,71 @@ +[elite_dark_warrior_drop_table] +type = "all" +drops = [ + { table = "elite_dark_warrior_secondary" }, +] + +[elite_dark_warrior_secondary] +roll = 1024 +drops = [ + { id = "steel_battleaxe", chance = 32 }, + { id = "black_2h_sword", chance = 32 }, + { id = "coins", amount = 877, chance = 32 }, + { id = "air_rune", amount = 39, chance = 32 }, + { id = "mithril_bar", amount = 3, chance = 32 }, + { id = "gold_bar", chance = 32 }, + { id = "potato_with_butter", chance = 32 }, + { id = "prayer_potion_1", chance = 32 }, + { id = "rune_mace", chance = 6 }, +] + +[elite_dark_ranger_drop_table] +type = "all" +drops = [ + { table = "elite_dark_ranger_secondary" }, + { table = "medium_clue_scroll", roll = 32 }, +] + +[elite_dark_ranger_secondary] +roll = 1024 +drops = [ + { id = "mithril_bolts", chance = 32 }, + { id = "adamant_bolts", amount = 3, chance = 32 }, + { id = "steel_arrow", chance = 32 }, + { id = "mithril_arrow", chance = 32 }, + { id = "black_dart", min = 3, max = 4, chance = 32 }, + { id = "black_kiteshield", chance = 32 }, + { id = "apple_pie", amount = 3, chance = 32 }, + { id = "uncut_sapphire", chance = 32 }, + { id = "ruby_bolt_tips", min = 1, max = 5, chance = 32 }, + { id = "crossbow_string", amount = 3, chance = 32 }, + { id = "black_dragonhide", chance = 32 }, +] + +[elite_dark_mage_drop_table] +type = "all" +drops = [ + { table = "elite_dark_mage_secondary" }, + { table = "medium_clue_scroll", roll = 32 }, +] + +[elite_dark_mage_secondary] +roll = 1024 +drops = [ + { id = "battlestaff", chance = 32 }, + { id = "mystic_air_staff", chance = 32 }, + { id = "prayer_potion_1", chance = 32 }, + { id = "super_attack_1", amount = 2, chance = 32 }, + { id = "chaos_rune", amount = 25, chance = 32 }, + { id = "dust_rune", min = 4, max = 10, chance = 32 }, + { id = "air_rune", min = 11, max = 40, chance = 32 }, + { id = "nature_rune", min = 1, max = 6, chance = 32 }, + { id = "fire_rune", min = 5, max = 28, chance = 32 }, + { id = "blood_rune", min = 1, max = 2, chance = 32 }, + { id = "death_rune", min = 3, max = 6, chance = 32 }, + { id = "soul_rune", amount = 4, chance = 32 }, + { id = "fire_talisman", amount = 2, chance = 32 }, + { id = "coins", min = 81, max = 300, chance = 32 }, + { id = "apple_pie", chance = 32 }, + { id = "big_bones", min = 2, max = 4, chance = 32 }, + { id = "earth_orb", amount = 2, chance = 32 }, +] diff --git a/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml b/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml index 1a8f3537b4..77737e5326 100644 --- a/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml +++ b/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml @@ -1,14 +1,17 @@ [elite_dark_warrior_black_knights_catacombs] id = 8312 examine = "An elite dark warrior with lots of combat experience." +drop_table = "elite_dark_warrior" [elite_dark_ranger_black_knights_catacombs] id = 8316 examine = "An elite dark ranger with lots of combat experience." +drop_table = "elite_dark_ranger" [elite_dark_mage_black_knights_catacombs] id = 8320 examine = "An elite dark mage with lots of combat experience." +drop_table = "elite_dark_mage" [elite_black_knight_black_knights_catacombs] id = 8328 diff --git a/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.drops.toml b/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.drops.toml new file mode 100644 index 0000000000..7ac43ff033 --- /dev/null +++ b/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.drops.toml @@ -0,0 +1,99 @@ +[undead_troll_drop_table] +type = "all" +drops = [ + { id = "bones" }, + { table = "undead_troll_secondary" }, + { table = "medium_clue_scroll", roll = 170 }, +] + +[undead_troll_secondary] +roll = 1865 +drops = [ + { id = "adamant_hatchet", chance = 32 }, + { id = "black_warhammer", chance = 32 }, + { id = "mithril_platebody", chance = 32 }, + { id = "mithril_bolts", amount = 3, chance = 32 }, + { id = "mithril_arrow", amount = 3, chance = 32 }, + { id = "steel_2h_sword", chance = 32 }, + { id = "steel_battleaxe", chance = 32 }, + { id = "runite_bolts", amount = 12, chance = 32 }, + { id = "granite_shield", chance = 32 }, + { id = "rune_longsword", chance = 32 }, + { id = "blood_rune", amount = 2, chance = 32 }, + { id = "death_rune", amount = 5, chance = 32 }, + { id = "earth_rune", amount = 11, chance = 32 }, + { id = "nature_rune", amount = 12, chance = 32 }, + { id = "law_rune", amount = 4, chance = 32 }, + { id = "guam_seed", chance = 32 }, + { id = "marrentill_seed", chance = 32 }, + { id = "tarromin_seed", chance = 32 }, + { id = "harralander_seed", chance = 32 }, + { id = "toadflax_seed", chance = 32 }, + { id = "avantoe_seed", chance = 32 }, + { id = "irit_seed", chance = 32 }, + { id = "ranarr_seed", chance = 32 }, + { id = "kwuarm_seed", chance = 32 }, + { id = "snapdragon_seed", chance = 32 }, + { id = "cadantine_seed", chance = 32 }, + { id = "lantadyme_seed", chance = 32 }, + { id = "dwarf_weed_seed", chance = 32 }, + { id = "spirit_weed_seed", chance = 32 }, + { id = "watermelon_seed", chance = 32 }, + { id = "whiteberry_seed", chance = 32 }, + { id = "wildblood_seed", chance = 32 }, + { id = "torstol_seed", chance = 32 }, + { id = "grimy_guam", chance = 32 }, + { id = "grimy_marrentill", chance = 32 }, + { id = "grimy_tarromin", chance = 32 }, + { id = "grimy_harralander", chance = 32 }, + { id = "grimy_ranarr", chance = 32 }, + { id = "grimy_irit", chance = 32 }, + { id = "grimy_avantoe", chance = 32 }, + { id = "grimy_kwuarm", chance = 32 }, + { id = "grimy_cadantine", chance = 32 }, + { id = "grimy_lantadyme", chance = 32 }, + { id = "grimy_dwarf_weed", chance = 32 }, + { id = "coins", min = 270, max = 500, chance = 32 }, + { id = "pure_essence", amount = 10, chance = 32 }, + { id = "coal", amount = 7, chance = 32 }, + { id = "gold_bar", chance = 32 }, + { id = "oak_plank", amount = 6, chance = 32 }, + { id = "teak_plank", amount = 3, chance = 32 }, + { id = "uncut_emerald", chance = 32 }, + { id = "loop_half_of_a_key", chance = 32 }, + { id = "tooth_half_of_a_key", chance = 32 }, + { id = "lobster", chance = 32 }, + { id = "tuna", chance = 32 }, +] + +[elite_black_knight_drop_table] +type = "all" +drops = [ + { table = "elite_black_knight_secondary" }, + { table = "hard_clue_scroll", roll = 170 }, +] + +[elite_black_knight_secondary] +roll = 1024 +drops = [ + { id = "steel_battleaxe", chance = 32 }, + { id = "black_platelegs", chance = 32 }, + { id = "black_2h_sword", chance = 32 }, + { id = "black_kiteshield", chance = 32 }, + { id = "rune_mace", chance = 32 }, + { id = "chilli_potato", chance = 32 }, + { id = "potato_with_butter", chance = 32 }, + { id = "super_restore_1", chance = 32 }, + { id = "super_restore_2", chance = 32 }, + { id = "lobster", min = 1, max = 3, chance = 32 }, + { id = "prayer_mix_1", chance = 32 }, + { id = "prayer_potion_1", chance = 32 }, + { id = "gold_bar", min = 1, max = 4, chance = 32 }, + { id = "mithril_bar", min = 1, max = 2, chance = 32 }, + { id = "steel_bar", min = 1, max = 3, chance = 32 }, + { id = "uncut_ruby", chance = 32 }, + { id = "death_rune", min = 1, max = 3, chance = 32 }, + { id = "chaos_rune", min = 1, max = 3, chance = 32 }, + { id = "blood_rune", min = 1, max = 4, chance = 32 }, + { id = "coins", min = 406, max = 2372, chance = 32 }, +] diff --git a/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml b/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml index 3c61c3c828..58b79f15bb 100644 --- a/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml +++ b/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml @@ -1,6 +1,7 @@ [elite_black_knight_luciens_camp] id = 8324 examine = "A Black Knight with lots of combat experience." +drop_table = "elite_black_knight" [elite_black_knight_luciens_camp_2] id = 8329 @@ -13,81 +14,97 @@ id = 8330 id = 8377 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." +drop_table = "undead_troll" [undead_troll_luciens_camp_2] id = 8378 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." +drop_table = "undead_troll" [undead_troll_luciens_camp_3] id = 8379 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." +drop_table = "undead_troll" [undead_troll_luciens_camp_4] id = 8380 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." +drop_table = "undead_troll" [undead_troll_luciens_camp_5] id = 8381 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." +drop_table = "undead_troll" [undead_troll_luciens_camp_6] id = 8382 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." +drop_table = "undead_troll" [undead_troll_luciens_camp_7] id = 8383 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." +drop_table = "undead_troll" [undead_troll_luciens_camp_8] id = 8384 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." +drop_table = "undead_troll" [undead_troll_luciens_camp_9] id = 8385 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." +drop_table = "undead_troll" [undead_troll_luciens_camp_10] id = 8386 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." +drop_table = "undead_troll" [undead_troll_luciens_camp_11] id = 8387 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." +drop_table = "undead_troll" [undead_troll_luciens_camp_12] id = 8388 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." +drop_table = "undead_troll" [undead_troll_luciens_camp_13] id = 8389 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." +drop_table = "undead_troll" [undead_troll_luciens_camp_14] id = 8390 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." +drop_table = "undead_troll" [undead_troll_luciens_camp_15] id = 8391 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." +drop_table = "undead_troll" [undead_troll_luciens_camp_16] id = 8392 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." +drop_table = "undead_troll" [undead_mage_luciens_camp] id = 8486 diff --git a/data/skill/dungeoneering/dungeoneering.drops.toml b/data/skill/dungeoneering/dungeoneering.drops.toml new file mode 100644 index 0000000000..ebc420dfb3 --- /dev/null +++ b/data/skill/dungeoneering/dungeoneering.drops.toml @@ -0,0 +1,21 @@ +[luminescent_icefiend_drop_table] +type = "all" +drops = [ + { table = "luminescent_icefiend_secondary" }, +] + +[luminescent_icefiend_secondary] +roll = 1024 +drops = [ + { id = "novite_dagger", chance = 32 }, + { id = "bathus_dagger", chance = 32 }, + { id = "marmaros_dagger", chance = 32 }, + { id = "kratonite_dagger", chance = 32 }, + { id = "fractite_dagger", chance = 32 }, + { id = "zephyrium_dagger", chance = 32 }, + { id = "argonite_dagger", chance = 32 }, + { id = "katagon_dagger", chance = 32 }, + { id = "gorgonite_dagger", chance = 32 }, + { id = "promethium_dagger", chance = 32 }, + { id = "primal_dagger", chance = 32 }, +] diff --git a/data/skill/dungeoneering/dungeoneering.npcs.toml b/data/skill/dungeoneering/dungeoneering.npcs.toml index 88ec60b3ca..82d1b8b22d 100644 --- a/data/skill/dungeoneering/dungeoneering.npcs.toml +++ b/data/skill/dungeoneering/dungeoneering.npcs.toml @@ -93,4 +93,5 @@ id = 12964 [luminescent_icefiend_dungeoneering] id = 9913 +drop_table = "luminescent_icefiend" From d6f248af188ed310cb9d5fa54ea9a00985c8085b Mon Sep 17 00:00:00 2001 From: Harley Gilpin Date: Thu, 6 Aug 2026 16:02:45 -0700 Subject: [PATCH 05/13] Add combat definitions and stats for spawned NPCs 468 npcs wired to existing combat definitions by species; without one an npc never swings, retaliates or plays defend/death anims. Stats for 336 npcs (hitpoints, levels, attack_bonus, max hits at x10 lifepoints scale) taken from OSRS wiki Monster Examine data, filtered to monsters released before March 2007 so values match rev 634. 106 minimal combat definitions authored from the same data for families with no existing definition; attack anims omitted until cache anim ids are sourced. Also fixes five pre-existing dangling combat_def values (bear_cub, king_scorpion, zombie_dragging, tzhar_ket typo, gardener). Spawned npcs missing combat definitions: 681 -> 69; missing hitpoints: 304 -> 131. Remainder is post-2007 content with no OSRS source. --- .../freaky_forester/freaky_forester.npcs.toml | 8 ++ .../black_knights_fortress_basement.npcs.toml | 2 + .../kinshra_workshop.npcs.toml | 2 + .../dwarven_mines/dwarven_mine.npcs.toml | 18 +++ data/area/asgarnia/falador/falador.npcs.toml | 20 +++- .../mudskipper_point.npcs.toml | 12 ++ .../melzars_maze/melzars_maze.combat.toml | 6 + .../melzars_maze/melzars_maze.npcs.toml | 1 + .../asgarnia/rimmington/rimmington.npcs.toml | 48 ++++++++ .../mouse_hole/mouse_hole.npcs.toml | 2 + .../ice_queens_lair.combat.toml | 6 + .../ice_queens_lair/ice_queens_lair.npcs.toml | 7 ++ .../fremennik_isles/fremennik_isle.npcs.toml | 4 + .../ice_troll_caves/ice_troll_caves.npcs.toml | 4 + .../chaos_dwarf_battlefield.npcs.toml | 23 ++++ .../keldagrim/keldagrim.npcs.toml | 8 ++ .../miscellania/miscellania.combat.toml | 63 +++++++++++ .../miscellania/miscellania.npcs.toml | 22 ++++ .../penguin_outpost/penguin_outpost.npcs.toml | 4 + .../pirates_cove/pirates_cove.combat.toml | 20 ++++ .../pirates_cove/pirates_cove.npcs.toml | 8 ++ .../brine_rat_cavern.npcs.toml | 8 ++ .../rellekka_hunter_area.combat.toml | 6 + .../rellekka_hunter_area.npcs.toml | 11 ++ .../rellekka/rellekka.combat.toml | 56 ++++++++++ .../rellekka/rellekka.npcs.toml | 14 +++ .../waterbirth_island.combat.toml | 7 ++ .../waterbirth_island.npcs.toml | 1 + .../kandarin/ape_atoll/ape_atoll.combat.toml | 14 +++ .../kandarin/ape_atoll/ape_atoll.npcs.toml | 27 +++++ .../snake_pit/snake_pit.combat.toml | 6 + .../snake_pit/snake_pit.npcs.toml | 1 + .../tunnels/ape_atoll_tunnels.npcs.toml | 6 + .../ardougne/east_ardougne.combat.toml | 7 ++ .../kandarin/ardougne/east_ardougne.npcs.toml | 20 ++++ .../ibans_lair/ibans_lair.combat.toml | 34 ++++++ .../ardougne/ibans_lair/ibans_lair.npcs.toml | 10 ++ .../monastery/ardougne_monastery.combat.toml | 6 + .../monastery/ardougne_monastery.npcs.toml | 2 + .../sewers/ardougne_sewers.combat.toml | 13 +++ .../ardougne/sewers/ardougne_sewers.npcs.toml | 22 ++++ .../underground_pass_dungeon.npcs.toml | 2 + .../underground_pass.combat.toml | 34 ++++++ .../underground_pass.npcs.toml | 51 +++++++++ .../ardougne/west/west_ardougne.npcs.toml | 28 +++++ .../witchaven_dungeon.combat.toml | 6 + .../witchaven_dungeon.npcs.toml | 2 + .../battlefield/battlefield.combat.toml | 13 +++ .../battlefield/battlefield.npcs.toml | 30 ++++- .../baxtorian_falls/baxtorian_falls.npcs.toml | 14 +++ .../feldip_hills/feldip_hills.combat.toml | 8 +- .../feldip_hills/feldip_hills.npcs.toml | 12 ++ .../gu_tanoth/gu_tanoth.combat.toml | 13 +++ .../gu_tanoth/gu_tanoth.npcs.toml | 5 + .../fishing_guild/fishing_guild.npcs.toml | 15 +++ .../goblin_cave/goblin_cave.npcs.toml | 6 + .../hazelmeres_island.npcs.toml | 1 + data/area/kandarin/ourania/ourania.npcs.toml | 6 + .../kandarin/piscatoris/piscatoris.npcs.toml | 1 + .../fight_arena/khazard_fight_arena.npcs.toml | 3 + .../underwater_cave.combat.toml | 6 + .../underwater_cave/underwater_cave.npcs.toml | 2 + .../movarios_base/movarios_base.npcs.toml | 4 + .../ranging_guild/ranging_guild.npcs.toml | 7 ++ .../sinclair_mansion.npcs.toml | 1 + .../temple_of_ikov/temple_of_ikov.npcs.toml | 9 ++ .../tower_of_life/tower_of_life.combat.toml | 13 +++ .../tower_of_life/tower_of_life.npcs.toml | 2 + .../combat_training_camp.npcs.toml | 2 + .../tree_gnome_stronghold.npcs.toml | 6 + .../troll_stronghold_tunnels.combat.toml | 13 +++ .../troll_stronghold_tunnels.npcs.toml | 28 +++++ .../yanille_agility_dungeon.combat.toml | 6 + .../yanille_agility_dungeon.npcs.toml | 2 + .../area/kandarin/yanille/yanille.combat.toml | 13 +++ data/area/kandarin/yanille/yanille.npcs.toml | 3 + .../karamja/brimhaven/brimhaven.combat.toml | 6 + .../karamja/brimhaven/brimhaven.npcs.toml | 39 +++++++ .../dungeon/brimhaven_dungeon.npcs.toml | 6 + data/area/karamja/crandor/crandor.combat.toml | 6 + data/area/karamja/crandor/crandor.npcs.toml | 3 +- data/area/karamja/karamja.combat.toml | 7 ++ data/area/karamja/karamja.npcs.toml | 3 + .../caves/kharazi_caves.combat.toml | 34 ++++++ .../caves/kharazi_caves.npcs.toml | 13 +++ .../kharazi_jungle/kharazi_jungle.combat.toml | 13 +++ .../kharazi_jungle/kharazi_jungle.npcs.toml | 4 + .../karamja/musa_point/musa_point.npcs.toml | 3 + .../pothole_dungeon/pothole_dungeon.npcs.toml | 14 +++ .../shilo_village/shilo_village.npcs.toml | 6 + .../ship_yard/karamja_ship_yard.combat.toml | 6 + .../ship_yard/karamja_ship_yard.npcs.toml | 4 + .../karamja/tzhaar_city/tzhaar_city.npcs.toml | 23 +++- .../agility_pyramid.combat.toml | 6 + .../agility_pyramid/agility_pyramid.npcs.toml | 10 ++ .../al_kharid/al_kharid.npcs.toml | 1 + .../shantay_pass/shantay_pass.npcs.toml | 1 + .../bandit_camp/bandit_camp.npcs.toml | 13 +++ .../bedabin_camp/bedabin_camp.combat.toml | 6 + .../bedabin_camp/bedabin_camp.npcs.toml | 1 + .../harmony_island/harmony.npcs.toml | 20 ++++ .../windmill_cellar/windmill_cellar.npcs.toml | 11 ++ .../kalphite_hive/kalphite_hive.combat.toml | 6 + .../kalphite_hive/kalphite_hive.npcs.toml | 15 ++- .../kharidian_desert.combat.toml | 7 ++ .../kharidian_desert.npcs.toml | 8 ++ .../klenters_pyramid.npcs.toml | 5 + .../desert_mining_camp.combat.toml | 13 +++ .../mining_camp/desert_mining_camp.npcs.toml | 76 +++++++++++++ .../nardah/nardah.combat.toml | 20 ++++ .../kharidian_desert/nardah/nardah.npcs.toml | 4 + .../dungeon/pollninveach_dungeon.npcs.toml | 15 +++ .../rock_island_prison.npcs.toml | 1 + .../sophanem/sophanem.combat.toml | 7 ++ .../sophanem/sophanem.npcs.toml | 1 + .../sophanem_dungeon.npcs.toml | 1 + .../kharidian_desert/ullek/ullek.combat.toml | 6 + .../kharidian_desert/ullek/ullek.npcs.toml | 39 +++++++ .../uzer/mastaba/uzer_mastaba.npcs.toml | 1 + .../area/kharidian_desert/uzer/uzer.npcs.toml | 5 + .../dorgesh_kaan_agility_course.combat.toml | 13 +++ .../dorgesh_kaan_agility_course.npcs.toml | 2 + .../dorgesh_kaan/dorgesh_kaan.npcs.toml | 14 +++ .../misthalin/edgeville/edgeville.npcs.toml | 9 ++ .../ham_hideout/ham_hideout.npcs.toml | 3 + .../store_rooms/ham_store_rooms.npcs.toml | 35 ++++++ .../goblin_mines/goblin_mines.npcs.toml | 8 ++ .../lumbridge/swamp/lumbridge_swamp.npcs.toml | 3 + .../tutorial_island/tutorial_island.npcs.toml | 1 + .../air_rune_temple/air_rune_temple.npcs.toml | 2 + .../tolnas_rift/tolnas_rift.combat.toml | 27 +++++ .../varrock/tolnas_rift/tolnas_rift.npcs.toml | 12 ++ data/area/misthalin/varrock/varrock.npcs.toml | 15 +++ .../evil_chicken_lair.npcs.toml | 21 ++++ .../burgh_de_rott/burgh_de_rott.npcs.toml | 105 ++++++++++++++++++ .../morytania/darkmeyer/darkmeyer.combat.toml | 6 + .../morytania/darkmeyer/darkmeyer.npcs.toml | 44 ++++++++ .../dragontooth_shipwreck.combat.toml | 6 + .../dragontooth_shipwreck.npcs.toml | 11 ++ .../dungeon/fenkenstrains_dungeon.combat.toml | 6 + .../dungeon/fenkenstrains_dungeon.npcs.toml | 6 + .../lair_of_tarn_razorlor.combat.toml | 6 + .../lair_of_tarn_razorlor.npcs.toml | 40 +++++++ .../meiyerditch/meiyerditch.npcs.toml | 92 +++++++++++++++ .../tunnels/meiyerditch_tunnels.npcs.toml | 1 + .../morytania/mort_ton/mort_ton.combat.toml | 7 ++ .../morytania/mort_ton/mort_ton.npcs.toml | 1 + .../mos_le_harmless/mos_le_harmless.npcs.toml | 7 ++ .../alices_farm/alices_farm.combat.toml | 6 + .../alices_farm/alices_farm.npcs.toml | 2 + .../enchanted_valley.combat.toml | 6 + .../enchanted_valley.npcs.toml | 7 ++ .../realm/fisher_realm/fisher_realm.npcs.toml | 6 + .../realm/spirit_realm/spirit_realm.npcs.toml | 1 + .../iorwerth_camp/iorwerth_camp.npcs.toml | 2 + data/area/tirannwn/isafdar/isafdar.npcs.toml | 5 + data/area/tirannwn/lletya/lletya.npcs.toml | 6 + .../poison_waste_slayer_dungeon.npcs.toml | 11 ++ .../tirannwn/tyras_camp/tyras_camp.npcs.toml | 2 + .../death_plateau/death_plateau.combat.toml | 20 ++++ .../death_plateau/death_plateau.npcs.toml | 8 ++ .../ghorrock_fortress_dungeon.npcs.toml | 1 + .../jhallans_resting_place.npcs.toml | 14 +++ .../god_wars_dungeon/god_wars.npcs.toml | 1 + .../mountain_camp/mountain_camp.npcs.toml | 5 + .../troll_country/troll_country.npcs.toml | 7 ++ .../troll_tunnels/troll_tunnels.npcs.toml | 7 ++ .../wilderness_bandit_camp.combat.toml | 20 ++++ .../wilderness_bandit_camp.npcs.toml | 5 + .../chaos_temple_dungeon.npcs.toml | 5 + data/area/wilderness/wilderness.combat.toml | 6 + data/area/wilderness/wilderness.npcs.toml | 61 +++++++++- data/entity/npc/animal/bear/bear.npcs.toml | 5 +- data/entity/npc/animal/crab/crab.npcs.toml | 4 + data/entity/npc/animal/dog/dog.combat.toml | 7 ++ data/entity/npc/animal/dog/dog.npcs.toml | 8 +- .../boss/giant_mole/giant_mole.combat.toml | 6 + .../npc/boss/giant_mole/giant_mole.npcs.toml | 1 + .../monster/fiend/icefiend/icefiend.npcs.toml | 5 + .../reptile/scorpion/scorpion.npcs.toml | 2 +- .../monster/undead/zombie/zombie.npcs.toml | 14 ++- .../shade_catacombs.combat.toml | 27 +++++ .../shade_catacombs/shade_catacombs.npcs.toml | 8 ++ data/minigame/soul_wars/soul_wars.npcs.toml | 13 +++ .../temple_trekking/temple_trekking.npcs.toml | 6 + .../warriors_guild/warriors_guild.npcs.toml | 6 + .../members/cabin_fever/cabin_fever.npcs.toml | 50 +++++++++ .../clock_tower_dungeon.combat.toml | 6 + .../clock_tower/clock_tower_dungeon.npcs.toml | 33 ++++++ .../defender_of_varrock.combat.toml | 6 + .../defender_of_varrock.npcs.toml | 14 +++ .../desert_treasure/shadow_dungeon.npcs.toml | 2 + .../dwarf_cannon/dwarven_outpost.npcs.toml | 17 +++ .../fairy_tale_i/fairy_tale_i.combat.toml | 6 + .../fairy_tale_i/fairy_tale_i.npcs.toml | 3 + .../haunted_mine/haunted_mine.npcs.toml | 6 + .../members/plague_city/plague_city.npcs.toml | 3 + .../battle_of_the_archipelago.npcs.toml | 1 + .../waterfall_quest/waterfall_quest.npcs.toml | 1 + .../black_knights_catacombs.npcs.toml | 1 + .../luciens_camp/luciens_camp.npcs.toml | 17 +++ 201 files changed, 2396 insertions(+), 14 deletions(-) create mode 100644 data/area/asgarnia/rimmington/melzars_maze/melzars_maze.combat.toml create mode 100644 data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.combat.toml create mode 100644 data/area/fremennik_province/pirates_cove/pirates_cove.combat.toml create mode 100644 data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.combat.toml create mode 100644 data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.combat.toml create mode 100644 data/area/kandarin/ardougne/ibans_lair/ibans_lair.combat.toml create mode 100644 data/area/kandarin/ardougne/monastery/ardougne_monastery.combat.toml create mode 100644 data/area/kandarin/ardougne/sewers/ardougne_sewers.combat.toml create mode 100644 data/area/kandarin/ardougne/underground_pass/underground_pass.combat.toml create mode 100644 data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.combat.toml create mode 100644 data/area/kandarin/battlefield/battlefield.combat.toml create mode 100644 data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.combat.toml create mode 100644 data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.combat.toml create mode 100644 data/area/kandarin/tower_of_life/tower_of_life.combat.toml create mode 100644 data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.combat.toml create mode 100644 data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.combat.toml create mode 100644 data/area/kandarin/yanille/yanille.combat.toml create mode 100644 data/area/karamja/brimhaven/brimhaven.combat.toml create mode 100644 data/area/karamja/crandor/crandor.combat.toml create mode 100644 data/area/karamja/kharazi_jungle/caves/kharazi_caves.combat.toml create mode 100644 data/area/karamja/kharazi_jungle/kharazi_jungle.combat.toml create mode 100644 data/area/karamja/ship_yard/karamja_ship_yard.combat.toml create mode 100644 data/area/kharidian_desert/agility_pyramid/agility_pyramid.combat.toml create mode 100644 data/area/kharidian_desert/bedabin_camp/bedabin_camp.combat.toml create mode 100644 data/area/kharidian_desert/kalphite_hive/kalphite_hive.combat.toml create mode 100644 data/area/kharidian_desert/mining_camp/desert_mining_camp.combat.toml create mode 100644 data/area/kharidian_desert/nardah/nardah.combat.toml create mode 100644 data/area/kharidian_desert/ullek/ullek.combat.toml create mode 100644 data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.combat.toml create mode 100644 data/area/misthalin/varrock/tolnas_rift/tolnas_rift.combat.toml create mode 100644 data/area/morytania/darkmeyer/darkmeyer.combat.toml create mode 100644 data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.combat.toml create mode 100644 data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.combat.toml create mode 100644 data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.combat.toml create mode 100644 data/area/morytania/port_phasmatys/alices_farm/alices_farm.combat.toml create mode 100644 data/area/realm/enchanted_valley/enchanted_valley.combat.toml create mode 100644 data/area/troll_country/death_plateau/death_plateau.combat.toml create mode 100644 data/area/wilderness/bandit_camp/wilderness_bandit_camp.combat.toml create mode 100644 data/area/wilderness/wilderness.combat.toml create mode 100644 data/entity/npc/boss/giant_mole/giant_mole.combat.toml create mode 100644 data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.combat.toml create mode 100644 data/quest/members/clock_tower/clock_tower_dungeon.combat.toml create mode 100644 data/quest/members/defender_of_varrock/defender_of_varrock.combat.toml create mode 100644 data/quest/members/fairy_tale_i/fairy_tale_i.combat.toml diff --git a/data/activity/event/random/freaky_forester/freaky_forester.npcs.toml b/data/activity/event/random/freaky_forester/freaky_forester.npcs.toml index eec151e58b..6485aa9467 100644 --- a/data/activity/event/random/freaky_forester/freaky_forester.npcs.toml +++ b/data/activity/event/random/freaky_forester/freaky_forester.npcs.toml @@ -14,38 +14,46 @@ respawn_delay = 5 combat_exp = false examine = "A brightly coloured game bird." drop_table = "pheasant" +combat_def = "chicken" [pheasant_1_tail_2] id = 7445 clone = "pheasant_1_tail" drop_table = "pheasant" +combat_def = "chicken" [pheasant_2_tails] id = 7446 clone = "pheasant_1_tail" drop_table = "pheasant" +combat_def = "chicken" [pheasant_2_tails_2] id = 13246 clone = "pheasant_1_tail" drop_table = "pheasant" +combat_def = "chicken" [pheasant_3_tails] id = 13247 clone = "pheasant_1_tail" drop_table = "pheasant" +combat_def = "chicken" [pheasant_3_tails_2] id = 13248 clone = "pheasant_1_tail" drop_table = "pheasant" +combat_def = "chicken" [pheasant_4_tails] id = 13249 clone = "pheasant_1_tail" drop_table = "pheasant" +combat_def = "chicken" [pheasant_4_tails_2] id = 13250 clone = "pheasant_1_tail" drop_table = "pheasant" +combat_def = "chicken" diff --git a/data/area/asgarnia/black_knights_fortress/basement/black_knights_fortress_basement.npcs.toml b/data/area/asgarnia/black_knights_fortress/basement/black_knights_fortress_basement.npcs.toml index ee91903e28..7c941953c4 100644 --- a/data/area/asgarnia/black_knights_fortress/basement/black_knights_fortress_basement.npcs.toml +++ b/data/area/asgarnia/black_knights_fortress/basement/black_knights_fortress_basement.npcs.toml @@ -37,6 +37,8 @@ id = 12336 [rat_black_knights_fortress] id = 2682 drop_table = "rat" +combat_def = "rat" +hitpoints = 20 [arthur_black_knights_fortress_basement] id = 3778 diff --git a/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml b/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml index 46e4da3a4e..620dbe71e9 100644 --- a/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml +++ b/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml @@ -21,10 +21,12 @@ id = 11695 id = 11696 examine = "A Black Knight with lots of combat experience." drop_table = "empty" +combat_def = "black_knight" [black_knight_guardian_kinshra_workshop_2] id = 11697 drop_table = "empty" +combat_def = "black_knight" [black_knight_doorkeeper_2] id = 11690 diff --git a/data/area/asgarnia/dwarven_mines/dwarven_mine.npcs.toml b/data/area/asgarnia/dwarven_mines/dwarven_mine.npcs.toml index a830f3f19e..7475e1df50 100644 --- a/data/area/asgarnia/dwarven_mines/dwarven_mine.npcs.toml +++ b/data/area/asgarnia/dwarven_mines/dwarven_mine.npcs.toml @@ -7,16 +7,34 @@ id = 1795 categories = ["dwarves"] examine = "A short stout menacing fellow." drop_table = "dwarf_gang_member" +combat_def = "dwarf" +hitpoints = 400 +att = 40 +str = 40 +def = 35 +max_hit_crush = 50 [dwarf_gang_member_2] id = 1796 categories = ["dwarves"] examine = "A short stout menacing fellow." drop_table = "dwarf_gang_member" +combat_def = "dwarf" +hitpoints = 250 +att = 80 +str = 30 +def = 25 +max_hit_crush = 40 [dwarf_gang_member_3] id = 1797 drop_table = "dwarf_gang_member" +combat_def = "dwarf" +hitpoints = 250 +att = 30 +str = 60 +def = 57 +max_hit_crush = 70 [cart_conductor] id = 2186 diff --git a/data/area/asgarnia/falador/falador.npcs.toml b/data/area/asgarnia/falador/falador.npcs.toml index 5ce4babee3..983b8f45e6 100644 --- a/data/area/asgarnia/falador/falador.npcs.toml +++ b/data/area/asgarnia/falador/falador.npcs.toml @@ -145,16 +145,22 @@ examine = "He rules the, er, roost." [chicken_falador] id = 2313 drop_table = "chicken" +combat_def = "chicken" +hitpoints = 30 [chicken_falador_2] id = 2314 drop_table = "chicken" +combat_def = "chicken" +hitpoints = 30 [chicken_falador_3] id = 2315 categories = ["birds"] examine = "Yep. Definitely a chicken." drop_table = "chicken" +combat_def = "chicken" +hitpoints = 30 [elstan] id = 2323 @@ -216,6 +222,9 @@ examine = "One of Gielinor's many citizens, currently incapacitated by alcohol." id = 3223 examine = "One of Gielinor's many citizens." drop_table = "man" +combat_def = "man" +hitpoints = 70 +max_hit_crush = 10 [man_falador_2] id = 1086 @@ -224,6 +233,9 @@ id = 1086 id = 3226 examine = "One of Gielinor's many citizens." drop_table = "woman" +combat_def = "woman" +hitpoints = 70 +max_hit_crush = 10 [guard_falador] id = 3228 @@ -316,10 +328,12 @@ hunt_mode = "cowardly" respawn_delay = 50 drop_table = "dark_wizard_high" examine = "A practicer of dark arts." +combat_def = "dark_wizard_water" [dark_wizard_falador_2] id = 3243 clone = "dark_wizard_falador" +combat_def = "dark_wizard_water" [dark_wizard_falador_3] id = 3244 @@ -334,10 +348,12 @@ hunt_mode = "cowardly" respawn_delay = 50 drop_table = "dark_wizard_low" examine = "A practicer of dark arts." +combat_def = "dark_wizard_water" [dark_wizard_falador_4] id = 3245 clone = "dark_wizard_falador_3" +combat_def = "dark_wizard_water" [squirrel] id = 3283 @@ -626,7 +642,7 @@ id = 3234 hitpoints = 70 att = 2 def = 5 -combat_def = "gardener" +combat_def = "man" respawn_delay = 50 drop_table = "bones" examine = "An old gardener." @@ -635,7 +651,7 @@ examine = "An old gardener." id = 1217 hitpoints = 70 def = 7 -combat_def = "gardener" +combat_def = "man" respawn_delay = 50 drop_table = "bones" examine = "An old gardener." diff --git a/data/area/asgarnia/mudskipper_point/mudskipper_point.npcs.toml b/data/area/asgarnia/mudskipper_point/mudskipper_point.npcs.toml index ba949e459e..2f8af47388 100644 --- a/data/area/asgarnia/mudskipper_point/mudskipper_point.npcs.toml +++ b/data/area/asgarnia/mudskipper_point/mudskipper_point.npcs.toml @@ -18,11 +18,23 @@ id = 325 id = 446 clone = "giant_rat_lumbridge_swamp" drop_table = "giant_rat" +combat_def = "giant_rat" +hitpoints = 50 +att = 2 +str = 3 +def = 2 +max_hit_stab = 10 [giant_rat_mudskipper_point_2] id = 4924 clone = "giant_rat_lumbridge_swamp" drop_table = "giant_rat" +combat_def = "giant_rat" +hitpoints = 50 +att = 2 +str = 3 +def = 2 +max_hit_stab = 10 [mogre] id = 114 diff --git a/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.combat.toml b/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.combat.toml new file mode 100644 index 0000000000..918f9b579f --- /dev/null +++ b/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.combat.toml @@ -0,0 +1,6 @@ +[melzar_the_mad] +attack_speed = 4 + +[melzar_the_mad.melee] +range = 1 +target_hit = { offense = "crush", max = 50 } diff --git a/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.npcs.toml b/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.npcs.toml index a73745ebf5..04672e969e 100644 --- a/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.npcs.toml +++ b/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.npcs.toml @@ -12,4 +12,5 @@ hunt_mode = "cowardly" respawn_delay = 30 examine = "He looks totally insane!" drop_table = "melzar_the_mad" +max_hit_crush = 50 diff --git a/data/area/asgarnia/rimmington/rimmington.npcs.toml b/data/area/asgarnia/rimmington/rimmington.npcs.toml index cf0e4bd3f9..131cd67c9d 100644 --- a/data/area/asgarnia/rimmington/rimmington.npcs.toml +++ b/data/area/asgarnia/rimmington/rimmington.npcs.toml @@ -75,40 +75,88 @@ drop_table = "zombie_rat" [skeleton_rimmington] id = 6091 drop_table = "skeleton" +combat_def = "skeleton_unarmed" +hitpoints = 240 +att = 17 +str = 17 +def = 17 +max_hit_crush = 30 [skeleton_rimmington_2] id = 6092 categories = ["skeletons"] examine = "Could do with gaining a few pounds." drop_table = "skeleton" +combat_def = "skeleton_unarmed" +hitpoints = 240 +att = 17 +str = 17 +def = 17 +max_hit_crush = 30 [skeleton_rimmington_3] id = 6093 categories = ["skeletons"] examine = "Could do with gaining a few pounds." drop_table = "skeleton" +combat_def = "skeleton_unarmed" +hitpoints = 240 +att = 17 +str = 17 +def = 17 +max_hit_crush = 30 [ghost_rimmington] id = 6094 drop_table = "empty" +combat_def = "ghost" +hitpoints = 250 +att = 13 +str = 13 +def = 18 +max_hit_crush = 20 [ghost_rimmington_2] id = 6095 drop_table = "empty" +combat_def = "ghost" +hitpoints = 250 +att = 13 +str = 13 +def = 18 +max_hit_crush = 20 [ghost_rimmington_3] id = 6096 drop_table = "empty" +combat_def = "ghost" +hitpoints = 250 +att = 13 +str = 13 +def = 18 +max_hit_crush = 20 [ghost_rimmington_4] id = 6097 categories = ["ghosts"] examine = "Eeek! A ghost!" drop_table = "empty" +combat_def = "ghost" +hitpoints = 250 +att = 13 +str = 13 +def = 18 +max_hit_crush = 20 [ghost_rimmington_5] id = 6098 drop_table = "empty" +combat_def = "ghost" +hitpoints = 250 +att = 13 +str = 13 +def = 18 +max_hit_crush = 20 [tool_leprechaun_rimmington] id = 7559 diff --git a/data/area/asgarnia/taverley/witches_house/mouse_hole/mouse_hole.npcs.toml b/data/area/asgarnia/taverley/witches_house/mouse_hole/mouse_hole.npcs.toml index c7b6a77404..0a06d17375 100644 --- a/data/area/asgarnia/taverley/witches_house/mouse_hole/mouse_hole.npcs.toml +++ b/data/area/asgarnia/taverley/witches_house/mouse_hole/mouse_hole.npcs.toml @@ -10,9 +10,11 @@ hunt_mode = "cowardly" respawn_delay = 35 examine = "A huge mouse. It looks hungry..." drop_table = "mouse" +combat_def = "rat" [mouse_mouse_hole_dark] id = 5995 clone = "mouse_mouse_hole" drop_table = "mouse" +combat_def = "rat" diff --git a/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.combat.toml b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.combat.toml new file mode 100644 index 0000000000..d4cf2a9c85 --- /dev/null +++ b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.combat.toml @@ -0,0 +1,6 @@ +[ice_queen] +attack_speed = 4 + +[ice_queen.melee] +range = 1 +target_hit = { offense = "crush", max = 100 } diff --git a/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml index c42673cc97..8118d03bdb 100644 --- a/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml +++ b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml @@ -1,6 +1,12 @@ [ice_warrior_ice_queens_lair] id = 145 drop_table = "ice_warrior" +combat_def = "ice_warrior" +hitpoints = 590 +att = 47 +str = 47 +def = 47 +max_hit_slash = 60 [ice_queen] id = 795 @@ -13,4 +19,5 @@ max_hit_melee = 100 respawn_delay = 50 drop_table = "ice_queen" examine = "A cold hearted lady." +max_hit_crush = 100 diff --git a/data/area/fremennik_province/fremennik_isles/fremennik_isle.npcs.toml b/data/area/fremennik_province/fremennik_isles/fremennik_isle.npcs.toml index 541404122f..a90233c67c 100644 --- a/data/area/fremennik_province/fremennik_isles/fremennik_isle.npcs.toml +++ b/data/area/fremennik_province/fremennik_isles/fremennik_isle.npcs.toml @@ -22,6 +22,7 @@ categories = ["trolls"] respawn_delay = 50 examine = "An ice troll youngling." drop_table = "ice_troll_runt" +combat_def = "ice_troll" [ice_troll_male_fremennik_isle] id = 5526 @@ -38,6 +39,7 @@ slayer_xp = 84.0 categories = ["trolls"] drop_table = "ice_troll_male" examine = "A male troll wielding a large club." +combat_def = "ice_troll" [ice_troll_female_fremennik_isle] id = 5527 @@ -55,6 +57,7 @@ slayer_xp = 84.0 categories = ["trolls"] drop_table = "ice_troll_female" examine = "An ice troll with a bag of rocks." +combat_def = "ice_troll_female" [ice_troll_grunt_fremennik_isle] id = 5528 @@ -72,3 +75,4 @@ categories = ["trolls"] respawn_delay = 50 drop_table = "ice_troll_grunt" examine = "A large ice troll." +combat_def = "ice_troll" diff --git a/data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.npcs.toml b/data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.npcs.toml index 98641896fb..a9b908ac70 100644 --- a/data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.npcs.toml +++ b/data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.npcs.toml @@ -14,6 +14,7 @@ categories = ["trolls"] respawn_delay = 50 examine = "An ice troll youngling." drop_table = "ice_troll_runt" +combat_def = "ice_troll" [ice_troll_male_ice_troll_caves] id = 5474 @@ -30,6 +31,7 @@ slayer_xp = 84.0 categories = ["trolls"] drop_table = "ice_troll_male" examine = "A male troll wielding a large club." +combat_def = "ice_troll" [ice_troll_female_ice_troll_caves] id = 5475 @@ -48,6 +50,7 @@ slayer_xp = 84.0 categories = ["trolls"] drop_table = "ice_troll_female" examine = "An ice troll with a bag of rocks." +combat_def = "ice_troll_female" [ice_troll_grunt_ice_troll_caves] id = 5476 @@ -65,6 +68,7 @@ categories = ["trolls"] respawn_delay = 50 drop_table = "ice_troll_grunt" examine = "A large ice troll." +combat_def = "ice_troll" [bork_sigmundson_ice_troll_caves] id = 5477 diff --git a/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml b/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml index 73c614eda0..28a3cb7e5e 100644 --- a/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml +++ b/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml @@ -18,50 +18,71 @@ categories = ["dwarves"] respawn_delay = 30 examine = "A member of the Black Guard, a special division of the dwarven army." drop_table = "black_guard" +combat_def = "dwarf" [black_guard_chaos_dwarf_battlefield_2] id = 8773 clone = "black_guard_chaos_dwarf_battlefield" drop_table = "black_guard" +combat_def = "dwarf" [black_guard_chaos_dwarf_battlefield_3] id = 8774 clone = "black_guard_chaos_dwarf_battlefield" drop_table = "black_guard" +combat_def = "dwarf" [chaos_dwarf_hand_cannoneer_chaos_dwarf_battlefield] id = 8776 categories = ["dwarves"] examine = "A dwarf gone bad." drop_table = "chaos_dwarf_hand_cannoneer" +combat_def = "dwarf" [chaos_dwarf_hand_cannoneer_chaos_dwarf_battlefield_2] id = 8777 categories = ["dwarves"] examine = "A dwarf gone bad." drop_table = "chaos_dwarf_hand_cannoneer" +combat_def = "dwarf" [chaos_dwarf_chaos_dwarf_battlefield] id = 8778 drop_table = "chaos_dwarf" +combat_def = "chaos_dwarf" +hitpoints = 610 +att = 38 +str = 42 +def = 28 +attack_bonus = 13 +max_hit_crush = 60 [chaos_dwarf_chaos_dwarf_battlefield_2] id = 8779 categories = ["dwarves"] examine = "A dwarf gone bad." drop_table = "chaos_dwarf" +combat_def = "chaos_dwarf" +hitpoints = 610 +att = 38 +str = 42 +def = 28 +attack_bonus = 13 +max_hit_crush = 60 [black_guard_crossbowdwarf_chaos_dwarf_battlefield] id = 8781 categories = ["dwarves"] examine = "A member of the Black Guard with a crossbow." drop_table = "black_guard_crossbowdwarf" +combat_def = "guard" [black_guard_crossbowdwarf_chaos_dwarf_battlefield_2] id = 8782 categories = ["dwarves"] examine = "A member of the Black Guard with a crossbow." drop_table = "black_guard_crossbowdwarf" +combat_def = "guard" [black_guard_berserker_chaos_dwarf_battlefield] id = 8783 @@ -79,11 +100,13 @@ categories = ["dwarves"] respawn_delay = 30 examine = "An elite member of the Black Guard." drop_table = "black_guard_berserker" +combat_def = "guard" [black_guard_berserker_chaos_dwarf_battlefield_2] id = 8784 clone = "black_guard_berserker_chaos_dwarf_battlefield" drop_table = "black_guard_berserker" +combat_def = "guard" [colonel_grenda_chaos_dwarf_battlefield] id = 8818 diff --git a/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml b/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml index 88fe9fcf62..3b27890cf1 100644 --- a/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml +++ b/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml @@ -283,18 +283,22 @@ respawn_delay = 30 hunt_mode = "guarding" drop_table = "black_guard_high" examine = "A member of the Black Guard, a special division of the dwarven army." +combat_def = "dwarf" [black_guard_keldagrim_market_2] id = 2131 clone = "black_guard_keldagrim_market" +combat_def = "dwarf" [black_guard_keldagrim_market_3] id = 2132 clone = "black_guard_keldagrim_market" +combat_def = "dwarf" [black_guard_keldagrim_5] id = 2133 clone = "black_guard_keldagrim_market" +combat_def = "dwarf" [black_guard_berserker_keldagrim] id = 2134 @@ -312,14 +316,17 @@ categories = ["dwarves"] respawn_delay = 30 drop_table = "black_guard_high" examine = "An elite member of the Black Guard." +combat_def = "dwarf" [black_guard_berserker_keldagrim_2] id = 2135 clone = "black_guard_berserker_keldagrim" +combat_def = "dwarf" [black_guard_berserker_keldagrim_3] id = 2136 clone = "black_guard_berserker_keldagrim" +combat_def = "dwarf" [dromunds_cat_keldagrim] id = 2140 @@ -627,6 +634,7 @@ id = 8813 categories = ["dwarves"] examine = "An elite Black Guard soldier assigned to protect the trade floor." drop_table = "trade_floor_guard" +combat_def = "guard" [colonel_grenda_keldagrim] id = 8817 diff --git a/data/area/fremennik_province/miscellania/miscellania.combat.toml b/data/area/fremennik_province/miscellania/miscellania.combat.toml index 86efd787cd..b7019642d1 100644 --- a/data/area/fremennik_province/miscellania/miscellania.combat.toml +++ b/data/area/fremennik_province/miscellania/miscellania.combat.toml @@ -11,3 +11,66 @@ anim = "rabbit_attack" target_sound = "rabbit_attack" target_hit = { offense = "crush", max = 10 } + +[einar] +attack_speed = 4 + +[einar.melee] +range = 1 +target_hit = { offense = "crush", max = 10 } + +[alrik] +attack_speed = 4 + +[alrik.melee] +range = 1 +target_hit = { offense = "crush", max = 10 } + +[thorhild] +attack_speed = 4 + +[thorhild.melee] +range = 1 +target_hit = { offense = "crush", max = 10 } + +[rannveig] +attack_speed = 4 + +[rannveig.melee] +range = 1 +target_hit = { offense = "crush", max = 10 } + +[valgerd] +attack_speed = 4 + +[valgerd.melee] +range = 1 +target_hit = { offense = "crush", max = 10 } + +[broddi] +attack_speed = 4 + +[broddi.melee] +range = 1 +target_hit = { offense = "crush", max = 10 } + +[ragnvald] +attack_speed = 4 + +[ragnvald.melee] +range = 1 +target_hit = { offense = "crush", max = 10 } + +[sea_snake_young] +attack_speed = 4 + +[sea_snake_young.melee] +range = 1 +target_hit = { offense = "crush", max = 80 } + +[sea_snake_hatchling] +attack_speed = 4 + +[sea_snake_hatchling.melee] +range = 1 +target_hit = { offense = "crush", max = 60 } diff --git a/data/area/fremennik_province/miscellania/miscellania.npcs.toml b/data/area/fremennik_province/miscellania/miscellania.npcs.toml index deddc52cf8..b14e140dcd 100644 --- a/data/area/fremennik_province/miscellania/miscellania.npcs.toml +++ b/data/area/fremennik_province/miscellania/miscellania.npcs.toml @@ -58,18 +58,22 @@ max_hit_melee = 10 respawn_delay = 25 drop_table = "bones" examine = "A warrior of Etceteria." +combat_def = "guard" [skraeling_battleaxe] id = 1368 clone = "skraeling" +combat_def = "guard" [skraeling_brown_shirt] id = 1389 clone = "skraeling" +combat_def = "guard" [skraeling_green_shirt] id = 1391 clone = "skraeling" +combat_def = "guard" [fishmonger_etceteria] id = 1369 @@ -141,11 +145,14 @@ max_hit_melee = 10 respawn_delay = 50 drop_table = "bones" examine = "A subject of Miscellania." +max_hit_crush = 10 [alrik] id = 1381 examine = "A subject of Miscellania." drop_table = "alrik" +hitpoints = 10 +max_hit_crush = 10 [thorhild] id = 1382 @@ -155,6 +162,7 @@ max_hit_melee = 10 respawn_delay = 50 drop_table = "bones" examine = "A subject of Miscellania." +max_hit_crush = 10 [halla] id = 1383 @@ -180,6 +188,7 @@ max_hit_melee = 10 respawn_delay = 25 drop_table = "bones" examine = "A subject of Miscellania." +max_hit_crush = 10 [thora] id = 1387 @@ -197,6 +206,7 @@ max_hit_melee = 10 respawn_delay = 25 examine = "A subject of Miscellania." drop_table = "bones" +max_hit_crush = 10 [broddi] id = 1390 @@ -209,6 +219,7 @@ max_hit_melee = 10 respawn_delay = 25 drop_table = "bones" examine = "A subject of Miscellania." +max_hit_crush = 10 [ragnvald] id = 1392 @@ -221,6 +232,7 @@ max_hit_melee = 10 respawn_delay = 25 drop_table = "bones" examine = "A subject of Miscellania." +max_hit_crush = 10 [fishmonger_miscellania] id = 1393 @@ -256,10 +268,14 @@ id = 1401 categories = ["birds"] examine = "Yep. Definitely a chicken." drop_table = "chicken" +combat_def = "chicken" +hitpoints = 30 [chicken_miscellania_2] id = 1402 drop_table = "chicken" +combat_def = "chicken" +hitpoints = 30 [rooster_miscellania] id = 1403 @@ -272,6 +288,7 @@ immune_poison = true respawn_delay = 25 examine = "He rules the, er, roost." drop_table = "rooster" +combat_def = "chicken" [rabbit_miscellania] id = 1404 @@ -387,6 +404,7 @@ categories = ["sea_snakes"] respawn_delay = 50 drop_table = "sea_snake_hatchling" examine = "Snake, snake, oh, it's a young snake..." +max_hit_crush = 80 [sea_snake_hatchling] id = 3940 @@ -401,6 +419,7 @@ categories = ["sea_snakes"] respawn_delay = 50 drop_table = "sea_snake_hatchling" examine = "A baby sea snake. Snaaaaaaake!" +max_hit_crush = 60 [guard_miscellania_2] id = 3941 @@ -417,6 +436,9 @@ examine = "Perhaps this gardener might look after your crops for you." [rabbit_miscellania_2] id = 5829 drop_table = "rabbit" +combat_def = "rabbit_miscellania" +hitpoints = 50 +max_hit_crush = 10 [king_vargas_2] id = 7403 diff --git a/data/area/fremennik_province/miscellania/penguin_outpost/penguin_outpost.npcs.toml b/data/area/fremennik_province/miscellania/penguin_outpost/penguin_outpost.npcs.toml index 691b52cb7f..f98ab45b41 100644 --- a/data/area/fremennik_province/miscellania/penguin_outpost/penguin_outpost.npcs.toml +++ b/data/area/fremennik_province/miscellania/penguin_outpost/penguin_outpost.npcs.toml @@ -18,18 +18,22 @@ categories = ["ice_warriors"] respawn_delay = 50 drop_table = "icelord" examine = "Sturdy cold being." +combat_def = "ice_warrior" [icelord_penguin_outpost_2] id = 5453 clone = "icelord_penguin_outpost" +combat_def = "ice_warrior" [icelord_penguin_outpost_3] id = 5454 clone = "icelord_penguin_outpost" +combat_def = "ice_warrior" [icelord_penguin_outpost_4] id = 5455 clone = "icelord_penguin_outpost" +combat_def = "ice_warrior" [kgp_interrogator_penguin_outpost] id = 7582 diff --git a/data/area/fremennik_province/pirates_cove/pirates_cove.combat.toml b/data/area/fremennik_province/pirates_cove/pirates_cove.combat.toml new file mode 100644 index 0000000000..63063720bc --- /dev/null +++ b/data/area/fremennik_province/pirates_cove/pirates_cove.combat.toml @@ -0,0 +1,20 @@ +[jake] +attack_speed = 4 + +[jake.melee] +range = 1 +target_hit = { offense = "crush", max = 40 } + +[wilson] +attack_speed = 4 + +[wilson.melee] +range = 1 +target_hit = { offense = "crush", max = 40 } + +[palmer] +attack_speed = 4 + +[palmer.melee] +range = 1 +target_hit = { offense = "crush", max = 40 } diff --git a/data/area/fremennik_province/pirates_cove/pirates_cove.npcs.toml b/data/area/fremennik_province/pirates_cove/pirates_cove.npcs.toml index 5494916492..02434124c2 100644 --- a/data/area/fremennik_province/pirates_cove/pirates_cove.npcs.toml +++ b/data/area/fremennik_province/pirates_cove/pirates_cove.npcs.toml @@ -13,6 +13,8 @@ categories = ["pirates"] respawn_delay = 25 examine = "Avast ye scurvy land lubbers!" drop_table = "pirate" +combat_def = "pirate" +max_hit_slash = 30 [lokar_searunner_after] id = 4537 @@ -29,6 +31,8 @@ max_hit_melee = 40 respawn_delay = 25 examine = "A deadly pirate." drop_table = "jake" +max_hit_crush = 40 +combat_def = "jake" [wilson_pirates_cove] id = 4548 @@ -41,6 +45,8 @@ max_hit_melee = 40 respawn_delay = 25 examine = "A pirate." drop_table = "wilson" +max_hit_crush = 40 +combat_def = "wilson" [palmer_pirates_cove] id = 4552 @@ -53,6 +59,8 @@ max_hit_melee = 40 respawn_delay = 25 examine = "Nice shave." drop_table = "palmer" +max_hit_crush = 40 +combat_def = "palmer" [sticky_sanders_pirates_cove] id = 4557 diff --git a/data/area/fremennik_province/rellekka/brine_rat_cavern/brine_rat_cavern.npcs.toml b/data/area/fremennik_province/rellekka/brine_rat_cavern/brine_rat_cavern.npcs.toml index a5fa5e39a5..f38c9019f1 100644 --- a/data/area/fremennik_province/rellekka/brine_rat_cavern/brine_rat_cavern.npcs.toml +++ b/data/area/fremennik_province/rellekka/brine_rat_cavern/brine_rat_cavern.npcs.toml @@ -13,16 +13,19 @@ categories = ["skeletons"] respawn_delay = 50 examine = "Could use a good meal." drop_table = "skeleton_fremennik" +combat_def = "skeleton_barbarian" [skeleton_fremennik_2] id = 3698 clone = "skeleton_fremennik" drop_table = "skeleton_fremennik" +combat_def = "skeleton_barbarian" [skeleton_fremennik_3] id = 3699 clone = "skeleton_fremennik" drop_table = "skeleton_fremennik" +combat_def = "skeleton_barbarian" [skeleton_fremennik_4] id = 3700 @@ -39,16 +42,19 @@ categories = ["skeletons"] respawn_delay = 50 examine = "He seems a little underweight." drop_table = "skeleton_fremennik" +combat_def = "skeleton_barbarian" [skeleton_fremennik_5] id = 3701 clone = "skeleton_fremennik_4" drop_table = "skeleton_fremennik" +combat_def = "skeleton_barbarian" [skeleton_fremennik_6] id = 3702 clone = "skeleton_fremennik_4" drop_table = "skeleton_fremennik" +combat_def = "skeleton_barbarian" [skeleton_fremennik_7] id = 3703 @@ -65,11 +71,13 @@ categories = ["skeletons"] respawn_delay = 50 examine = "He seems a little underweight." drop_table = "skeleton_fremennik" +combat_def = "skeleton_barbarian" [skeleton_fremennik_8] id = 3704 clone = "skeleton_fremennik_7" drop_table = "skeleton_fremennik" +combat_def = "skeleton_barbarian" [brine_rat] id = 3707 diff --git a/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.combat.toml b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.combat.toml new file mode 100644 index 0000000000..a762e88d96 --- /dev/null +++ b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.combat.toml @@ -0,0 +1,6 @@ +[yeti] +attack_speed = 4 + +[yeti.melee] +range = 1 +target_hit = { offense = "crush", max = 70 } diff --git a/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml index 40f67df0b4..b6b4632060 100644 --- a/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml +++ b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml @@ -25,10 +25,21 @@ examine = "He must be good at hunting; even his hair blends in with the surround id = 7379 examine = "Aww, aren't the little ones cute?" drop_table = "yeti" +hitpoints = 550 +att = 48 +str = 60 +def = 39 +max_hit_crush = 70 [yeti_2] id = 7380 drop_table = "yeti" +hitpoints = 550 +att = 48 +str = 60 +def = 39 +max_hit_crush = 70 +combat_def = "yeti" [gnoeals] id = 7381 diff --git a/data/area/fremennik_province/rellekka/rellekka.combat.toml b/data/area/fremennik_province/rellekka/rellekka.combat.toml index dab9857528..cd87174358 100644 --- a/data/area/fremennik_province/rellekka/rellekka.combat.toml +++ b/data/area/fremennik_province/rellekka/rellekka.combat.toml @@ -17,3 +17,59 @@ death_anim = "bunny_death" range = 1 anim = "bunny_attack" target_hit = { offense = "crush", max = 0 } + +[black_unicorn] +attack_speed = 4 + +[black_unicorn.melee] +range = 1 +target_hit = { offense = "stab", max = 30 } + +[freidir] +attack_speed = 4 + +[freidir.melee] +range = 1 +target_hit = { offense = "crush", max = 60 } + +[borrokar] +attack_speed = 4 + +[borrokar.melee] +range = 1 +target_hit = { offense = "crush", max = 60 } + +[lanzig] +attack_speed = 4 + +[lanzig.melee] +range = 1 +target_hit = { offense = "crush", max = 60 } + +[lensa] +attack_speed = 4 + +[lensa.melee] +range = 1 +target_hit = { offense = "crush", max = 60 } + +[jennella] +attack_speed = 4 + +[jennella.melee] +range = 1 +target_hit = { offense = "crush", max = 60 } + +[unicorn_foal] +attack_speed = 4 + +[unicorn_foal.melee] +range = 1 +target_hit = { offense = "stab", max = 20 } + +[black_unicorn_foal] +attack_speed = 4 + +[black_unicorn_foal.melee] +range = 1 +target_hit = { offense = "stab", max = 30 } diff --git a/data/area/fremennik_province/rellekka/rellekka.npcs.toml b/data/area/fremennik_province/rellekka/rellekka.npcs.toml index 5321191642..81c1e13a32 100644 --- a/data/area/fremennik_province/rellekka/rellekka.npcs.toml +++ b/data/area/fremennik_province/rellekka/rellekka.npcs.toml @@ -19,6 +19,7 @@ immune_poison = true respawn_delay = 25 drop_table = "rooster" examine = "He rules the, er, roost." +combat_def = "chicken" [lalli_rellekka] id = 1270 @@ -155,6 +156,8 @@ max_hit_melee = 60 respawn_delay = 30 drop_table = "rellekka_citizen" examine = "One of Rellekka's many citizens." +max_hit_crush = 60 +combat_def = "lensa" [jennella_rellekka] id = 1312 @@ -167,6 +170,8 @@ max_hit_melee = 60 respawn_delay = 30 drop_table = "rellekka_citizen" examine = "One of Rellekka's many citizens." +max_hit_crush = 60 +combat_def = "jennella" [sassilik_rellekka] id = 1313 @@ -192,6 +197,7 @@ xp_bonus = 2.5 respawn_delay = 30 drop_table = "market_guard" examine = "Keeps the stalls secure." +combat_def = "guard" [peter_rellekka] id = 13175 @@ -240,6 +246,8 @@ max_hit_melee = 20 respawn_delay = 90 examine = "Horned Horsey." drop_table = "unicorn_foal" +max_hit_stab = 20 +combat_def = "unicorn_foal" [fenris_wolf_rellekka] id = 1330 @@ -337,6 +345,7 @@ max_hit_melee = 60 respawn_delay = 30 clone = "agnar_rellekka" drop_table = "rellekka_citizen" +max_hit_crush = 60 [borrokar] id = 1307 @@ -349,6 +358,7 @@ style = "crush" max_hit_melee = 60 respawn_delay = 30 drop_table = "rellekka_citizen" +max_hit_crush = 60 [lanzig] id = 1308 @@ -361,6 +371,7 @@ max_hit_melee = 60 respawn_delay = 30 drop_table = "rellekka_citizen" examine = "One of Rellekka's many citizens." +max_hit_crush = 60 [inga] id = 1314 @@ -380,6 +391,7 @@ xp_bonus = 2.5 respawn_delay = 30 drop_table = "market_guard" examine = "A hardened Fremennik warrior." +combat_def = "guard" [black_unicorn_foal] id = 1329 @@ -392,6 +404,7 @@ max_hit_melee = 30 respawn_delay = 20 drop_table = "bones" examine = "Cute but evil." +max_hit_stab = 30 [black_unicorn] id = 133 @@ -404,6 +417,7 @@ max_hit_melee = 30 respawn_delay = 90 drop_table = "black_unicorn" examine = "A unicorn with a blackened heart." +max_hit_stab = 30 [svidi] id = 1809 diff --git a/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml b/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml index c8120e704e..4c1f4713d8 100644 --- a/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml +++ b/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml @@ -45,3 +45,10 @@ projectile = "water_strike" target_hit = { offense = "magic", defence = "range", max = 100 } impact_gfx = "water_strike_impact" impact_sound = "water_strike_impact" + +[dagannoth_fledgeling] +attack_speed = 4 + +[dagannoth_fledgeling.melee] +range = 1 +target_hit = { offense = "stab", max = 60 } diff --git a/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml b/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml index 97d522d352..de42d5bd42 100644 --- a/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml +++ b/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml @@ -69,6 +69,7 @@ categories = ["dagannoth"] respawn_delay = 30 drop_table = "bones" examine = "A knee-high horror from the ocean depths..." +max_hit_stab = 60 [dagannoth_supreme] id = 2881 diff --git a/data/area/kandarin/ape_atoll/ape_atoll.combat.toml b/data/area/kandarin/ape_atoll/ape_atoll.combat.toml index 6a2d2817c6..63f14d9603 100644 --- a/data/area/kandarin/ape_atoll/ape_atoll.combat.toml +++ b/data/area/kandarin/ape_atoll/ape_atoll.combat.toml @@ -43,3 +43,17 @@ death_sound = "monkey_death" [ninja_monkey.melee] anim = "ninja_monkey_attack_double_scimitar" target_hit = { offense = "slash", max = 140 } + +[padulah] +attack_speed = 4 + +[padulah.melee] +range = 1 +target_hit = { offense = "slash", max = 200 } + +[monkey_archer] +attack_speed = 4 + +[monkey_archer.range] +range = 6 +target_hit = { offense = "range", max = 200 } diff --git a/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml b/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml index 017c3b8230..fc7ba6cace 100644 --- a/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml +++ b/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml @@ -156,6 +156,7 @@ hunt_mode = "cowardly" respawn_delay = 50 drop_table = "medium_ninja_monkey" examine = "A scimitar wielding ninja monkey. He looks like he is guarding something." +max_hit_slash = 200 [uwogo] id = 1449 @@ -198,14 +199,29 @@ categories = ["monkeys"] respawn_delay = 50 drop_table = "monkey_archer" examine = "A bow wielding ninja monkey. It looks particularly dangerous." +combat_def = "monkey_archer" [monkey_archer_ape_atoll_2] id = 1457 clone = "monkey_archer_ape_atoll" +hitpoints = 500 +att = 80 +str = 80 +def = 80 +range = 110 +max_hit_range = 200 +combat_def = "monkey_archer" [monkey_archer_ape_atoll_3] id = 1458 clone = "monkey_archer_ape_atoll" +hitpoints = 500 +att = 80 +str = 80 +def = 80 +range = 110 +max_hit_range = 200 +combat_def = "monkey_archer" [monkey_guard_ape_atoll_3] id = 1459 @@ -223,11 +239,13 @@ categories = ["monkeys"] respawn_delay = 50 examine = "A huge brutish gorilla armoured with dangerous looking vambraces." drop_table = "monkey_guard" +combat_def = "guard" [monkey_guard_ape_atoll_4] id = 1460 clone = "monkey_guard_ape_atoll_3" drop_table = "monkey_guard" +combat_def = "guard" [elder_guard_ape_atoll] id = 1461 @@ -253,6 +271,7 @@ categories = ["monkeys", "zombies"] respawn_delay = 50 drop_table = "monkey_zombie" examine = "A large and lumbering undead monkey." +combat_def = "zombie" [monkey_zombie_large] id = 1466 @@ -270,6 +289,7 @@ categories = ["monkeys", "zombies"] respawn_delay = 12 drop_table = "monkey_zombie" examine = "A large and lumbering undead monkey stands here, blocking the way." +combat_def = "zombie" [monkey_zombie_small] id = 1467 @@ -287,6 +307,7 @@ categories = ["monkeys", "zombies"] respawn_delay = 50 examine = "A recently deceased monkey. Its flesh seems to be worse for the wear." drop_table = "monkey_zombie" +combat_def = "zombie" [scorpion_ape_atoll] id = 1477 @@ -321,6 +342,12 @@ drop_table = "jungle_spider" [snake_ape_atoll] id = 1479 drop_table = "snake" +combat_def = "snake" +hitpoints = 60 +att = 4 +str = 5 +def = 3 +max_hit_stab = 10 [bird_black] id = 1475 diff --git a/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.combat.toml b/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.combat.toml new file mode 100644 index 0000000000..ae00e31f90 --- /dev/null +++ b/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.combat.toml @@ -0,0 +1,6 @@ +[big_snake] +attack_speed = 6 + +[big_snake.melee] +range = 1 +target_hit = { offense = "stab", max = 140 } diff --git a/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.npcs.toml b/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.npcs.toml index ad4470e85c..03b6c796d3 100644 --- a/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.npcs.toml +++ b/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.npcs.toml @@ -12,4 +12,5 @@ xp_bonus = 2.5 hunt_mode = "cowardly" drop_table = "big_snake" examine = "A big snake." +max_hit_stab = 140 diff --git a/data/area/kandarin/ape_atoll/tunnels/ape_atoll_tunnels.npcs.toml b/data/area/kandarin/ape_atoll/tunnels/ape_atoll_tunnels.npcs.toml index af03487e3c..517df0eb63 100644 --- a/data/area/kandarin/ape_atoll/tunnels/ape_atoll_tunnels.npcs.toml +++ b/data/area/kandarin/ape_atoll/tunnels/ape_atoll_tunnels.npcs.toml @@ -15,4 +15,10 @@ id = 1471 categories = ["skeletons"] examine = "It looks just a bit... underfed." drop_table = "skeleton" +combat_def = "skeleton_unarmed" +hitpoints = 240 +att = 17 +str = 17 +def = 17 +max_hit_crush = 30 diff --git a/data/area/kandarin/ardougne/east_ardougne.combat.toml b/data/area/kandarin/ardougne/east_ardougne.combat.toml index 4653911938..a2537cce16 100644 --- a/data/area/kandarin/ardougne/east_ardougne.combat.toml +++ b/data/area/kandarin/ardougne/east_ardougne.combat.toml @@ -8,3 +8,10 @@ range = 1 anim = "jogre_attack" target_hit = { offense = "crush", max = 70 } + +[hero] +attack_speed = 5 + +[hero.melee] +range = 1 +target_hit = { offense = "slash", max = 90 } diff --git a/data/area/kandarin/ardougne/east_ardougne.npcs.toml b/data/area/kandarin/ardougne/east_ardougne.npcs.toml index 5cbc8dd295..f8edee5769 100644 --- a/data/area/kandarin/ardougne/east_ardougne.npcs.toml +++ b/data/area/kandarin/ardougne/east_ardougne.npcs.toml @@ -33,6 +33,7 @@ categories = ["cyclopes"] respawn_delay = 30 drop_table = "hill_giant" examine = "A one-eyed man eater." +combat_def = "cyclops" [parrots_ardougne] id = 1215 @@ -52,6 +53,13 @@ examine = "He looks like the type of guy who would mind monkeys." id = 15 examine = "A woman, who is a warrior." drop_table = "warrior_woman" +combat_def = "guard" +hitpoints = 200 +att = 22 +str = 22 +def = 22 +attack_bonus = 6 +max_hit_stab = 30 [milton_the_miller] id = 1739 @@ -71,6 +79,7 @@ xp_bonus = 2.5 respawn_delay = 50 examine = "A holy warrior." drop_table = "paladin" +combat_def = "guard" [hero] id = 21 @@ -86,11 +95,13 @@ xp_bonus = 2.5 respawn_delay = 50 examine = "Heroic!" drop_table = "hero" +max_hit_slash = 90 [paladin_2] id = 2256 clone = "paladin" drop_table = "paladin" +combat_def = "guard" [knight_of_ardougne] id = 23 @@ -106,6 +117,7 @@ respawn_delay = 25 hunt_mode = "guarding" examine = "A member of Ardougne's militia." drop_table = "knight_of_ardougne" +combat_def = "black_knight" [richard_ardougne] id = 2306 @@ -123,11 +135,17 @@ examine = "Perhaps this gardener might look after your crops for you." id = 24 examine = "One of Gielinor's many citizens." drop_table = "man" +combat_def = "man" +hitpoints = 70 +max_hit_crush = 10 [woman_ardougne] id = 25 examine = "One of Gielinor's many citizens." drop_table = "woman" +combat_def = "woman" +hitpoints = 70 +max_hit_crush = 10 [archer_ardougne] id = 27 @@ -191,6 +209,8 @@ respawn_delay = 50 attack_speed = 5 examine = "Keeps the peace... kind of." drop_table = "guard" +combat_def = "guard" +max_hit_stab = 30 [edmond_ardougne] id = 3213 diff --git a/data/area/kandarin/ardougne/ibans_lair/ibans_lair.combat.toml b/data/area/kandarin/ardougne/ibans_lair/ibans_lair.combat.toml new file mode 100644 index 0000000000..d1fafd70a6 --- /dev/null +++ b/data/area/kandarin/ardougne/ibans_lair/ibans_lair.combat.toml @@ -0,0 +1,34 @@ +[soulless] +attack_speed = 4 + +[soulless.melee] +range = 1 +target_hit = { offense = "crush", max = 20 } + +[othainian] +attack_speed = 4 + +[othainian.melee] +range = 1 +target_hit = { offense = "slash", max = 90 } + +[doomion] +attack_speed = 4 + +[doomion.melee] +range = 1 +target_hit = { offense = "slash", max = 90 } + +[holthion] +attack_speed = 4 + +[holthion.melee] +range = 1 +target_hit = { offense = "slash", max = 90 } + +[disciple_of_iban] +attack_speed = 4 + +[disciple_of_iban.melee] +range = 1 +target_hit = { offense = "crush", max = 20 } diff --git a/data/area/kandarin/ardougne/ibans_lair/ibans_lair.npcs.toml b/data/area/kandarin/ardougne/ibans_lair/ibans_lair.npcs.toml index fa82ff9d49..d3d23bac19 100644 --- a/data/area/kandarin/ardougne/ibans_lair/ibans_lair.npcs.toml +++ b/data/area/kandarin/ardougne/ibans_lair/ibans_lair.npcs.toml @@ -12,6 +12,8 @@ immune_cannon = true respawn_delay = 30 examine = "One of the guardians of Iban." drop_table = "holthion" +max_hit_slash = 90 +combat_def = "holthion" [disciple_of_iban_ibans_lair] id = 1002 @@ -24,6 +26,8 @@ max_hit_melee = 20 respawn_delay = 250 drop_table = "disciple_of_iban" examine = "A dark magic user." +max_hit_crush = 20 +combat_def = "disciple_of_iban" [lord_iban_ibans_lair] id = 1003 @@ -48,6 +52,8 @@ respawn_delay = 35 categories = ["undead"] drop_table = "bones" examine = "A servant to Iban." +max_hit_crush = 20 +combat_def = "soulless" [half_soulless_ibans_lair] id = 991 @@ -74,6 +80,8 @@ hunt_mode = "cowardly" respawn_delay = 30 drop_table = "othainian" examine = "One of the guardians of Iban." +max_hit_slash = 90 +combat_def = "othainian" [doomion_ibans_lair] id = 999 @@ -88,3 +96,5 @@ hunt_mode = "cowardly" respawn_delay = 30 drop_table = "disciple_of_iban" examine = "One of the guardians of Iban." +max_hit_slash = 90 +combat_def = "doomion" diff --git a/data/area/kandarin/ardougne/monastery/ardougne_monastery.combat.toml b/data/area/kandarin/ardougne/monastery/ardougne_monastery.combat.toml new file mode 100644 index 0000000000..4550f9f918 --- /dev/null +++ b/data/area/kandarin/ardougne/monastery/ardougne_monastery.combat.toml @@ -0,0 +1,6 @@ +[monk] +attack_speed = 4 + +[monk.melee] +range = 1 +target_hit = { offense = "crush", max = 10 } diff --git a/data/area/kandarin/ardougne/monastery/ardougne_monastery.npcs.toml b/data/area/kandarin/ardougne/monastery/ardougne_monastery.npcs.toml index 9c85281ec4..8ba9c57444 100644 --- a/data/area/kandarin/ardougne/monastery/ardougne_monastery.npcs.toml +++ b/data/area/kandarin/ardougne/monastery/ardougne_monastery.npcs.toml @@ -33,6 +33,8 @@ max_hit_melee = 10 respawn_delay = 25 examine = "An Ardougne Monk." drop_table = "bones" +max_hit_crush = 10 +combat_def = "monk" [ferret_monastery] id = 5139 diff --git a/data/area/kandarin/ardougne/sewers/ardougne_sewers.combat.toml b/data/area/kandarin/ardougne/sewers/ardougne_sewers.combat.toml new file mode 100644 index 0000000000..b6148c7733 --- /dev/null +++ b/data/area/kandarin/ardougne/sewers/ardougne_sewers.combat.toml @@ -0,0 +1,13 @@ +[alomone] +attack_speed = 4 + +[alomone.melee] +range = 1 +target_hit = { offense = "crush", max = 20 } + +[clivet] +attack_speed = 4 + +[clivet.melee] +range = 1 +target_hit = { offense = "crush", max = 20 } diff --git a/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml b/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml index af71135e8f..c04fe5d7a5 100644 --- a/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml +++ b/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml @@ -1,6 +1,12 @@ [dungeon_rat_ardougne_sewers] id = 4928 drop_table = "dungeon_rat" +combat_def = "giant_rat" +hitpoints = 120 +att = 10 +str = 10 +def = 10 +max_hit_stab = 20 [claus_the_chef_ardougne_sewers] id = 886 @@ -16,6 +22,8 @@ max_hit_melee = 20 respawn_delay = 50 drop_table = "bones" examine = "Leader of the Hazeel Cult." +max_hit_crush = 20 +combat_def = "alomone" [clivet_ardougne_sewers] id = 893 @@ -28,6 +36,8 @@ max_hit_melee = 20 respawn_delay = 50 drop_table = "bones" examine = "A member of the Hazeel cult." +max_hit_crush = 20 +combat_def = "clivet" [hazeel_cultist_ardougne_sewers] id = 894 @@ -48,9 +58,21 @@ id = 3215 id = 4922 clone = "giant_rat_lumbridge_swamp" drop_table = "giant_rat" +combat_def = "giant_rat" +hitpoints = 50 +att = 2 +str = 3 +def = 2 +max_hit_stab = 10 [giant_rat_ardounge_sewer_stubby] id = 4923 clone = "giant_rat_lumbridge_swamp" drop_table = "giant_rat" +combat_def = "giant_rat" +hitpoints = 50 +att = 2 +str = 3 +def = 2 +max_hit_stab = 10 diff --git a/data/area/kandarin/ardougne/underground_pass/dungeon/underground_pass_dungeon.npcs.toml b/data/area/kandarin/ardougne/underground_pass/dungeon/underground_pass_dungeon.npcs.toml index b6a18ea7ae..a3b46d356c 100644 --- a/data/area/kandarin/ardougne/underground_pass/dungeon/underground_pass_dungeon.npcs.toml +++ b/data/area/kandarin/ardougne/underground_pass/dungeon/underground_pass_dungeon.npcs.toml @@ -9,11 +9,13 @@ categories = ["rats"] respawn_delay = 300 examine = "Some oversized vermin, blessed by Zamorak." drop_table = "blessed_giant_rat" +combat_def = "giant_rat" [blessed_giant_rat_underground_pass_dungeon_2] id = 978 clone = "blessed_giant_rat_underground_pass_dungeon" drop_table = "blessed_giant_rat" +combat_def = "giant_rat" [slave_underground_pass_dungeon] id = 979 diff --git a/data/area/kandarin/ardougne/underground_pass/underground_pass.combat.toml b/data/area/kandarin/ardougne/underground_pass/underground_pass.combat.toml new file mode 100644 index 0000000000..a935b516ac --- /dev/null +++ b/data/area/kandarin/ardougne/underground_pass/underground_pass.combat.toml @@ -0,0 +1,34 @@ +[khazard_warlord] +attack_speed = 4 + +[khazard_warlord.melee] +range = 1 +target_hit = { offense = "crush", max = 100 } + +[sir_jerro] +attack_speed = 5 + +[sir_jerro.melee] +range = 1 +target_hit = { offense = "slash", max = 80 } + +[sir_carl] +attack_speed = 5 + +[sir_carl.melee] +range = 1 +target_hit = { offense = "slash", max = 80 } + +[sir_harry] +attack_speed = 5 + +[sir_harry.melee] +range = 1 +target_hit = { offense = "slash", max = 80 } + +[kalrag] +attack_speed = 4 + +[kalrag.melee] +range = 1 +target_hit = { offense = "stab", max = 90 } diff --git a/data/area/kandarin/ardougne/underground_pass/underground_pass.npcs.toml b/data/area/kandarin/ardougne/underground_pass/underground_pass.npcs.toml index 1364a0e620..5979527105 100644 --- a/data/area/kandarin/ardougne/underground_pass/underground_pass.npcs.toml +++ b/data/area/kandarin/ardougne/underground_pass/underground_pass.npcs.toml @@ -17,26 +17,40 @@ categories = ["ogres"] respawn_delay = 30 examine = "A large dim looking humanoid." drop_table = "ogre" +combat_def = "ogre" +max_hit_crush = 70 [man_underground_pass] id = 351 examine = "One of Ardougne's many citizens." drop_table = "man" +combat_def = "man" +hitpoints = 70 +max_hit_crush = 10 [woman_underground_pass] id = 352 examine = "One of Ardougne's many citizens." drop_table = "woman" +combat_def = "woman" +hitpoints = 70 +max_hit_crush = 10 [woman_underground_pass_2] id = 353 examine = "One of Ardougne's many citizens." drop_table = "woman" +combat_def = "woman" +hitpoints = 70 +max_hit_crush = 10 [woman_underground_pass_3] id = 354 examine = "One of Ardougne's many citizens." drop_table = "woman" +combat_def = "woman" +hitpoints = 70 +max_hit_crush = 10 [child_underground_pass] id = 355 @@ -49,27 +63,45 @@ id = 356 id = 360 examine = "One of Ardougne's many citizens." drop_table = "woman" +combat_def = "woman" +hitpoints = 70 +max_hit_crush = 10 [woman_underground_pass_5] id = 361 examine = "One of Ardougne's many citizens." drop_table = "woman" +combat_def = "woman" +hitpoints = 70 +max_hit_crush = 10 [woman_underground_pass_6] id = 362 examine = "One of Ardougne's many citizens." drop_table = "woman" +combat_def = "woman" +hitpoints = 70 +max_hit_crush = 10 [woman_underground_pass_7] id = 363 examine = "One of Ardougne's many citizens." drop_table = "woman" +combat_def = "woman" +hitpoints = 70 +max_hit_crush = 10 [goblin_underground_pass] id = 4499 categories = ["goblins"] examine = "An ugly goblin... bleurgh!" drop_table = "goblin" +combat_def = "goblin" +hitpoints = 120 +att = 3 +def = 4 +attack_bonus = 12 +max_hit_stab = 10 [khazard_trooper_underground_pass] id = 475 @@ -84,6 +116,7 @@ attack_bonus = 8 respawn_delay = 100 examine = "It's one of General Khazard's warriors." drop_table = "khazard_trooper" +combat_def = "guard" [khazard_warlord_underground_pass] id = 477 @@ -95,6 +128,8 @@ style = "crush" max_hit_melee = 100 examine = "He looks real nasty, smells bad too." drop_table = "khazard_warlord" +max_hit_crush = 100 +combat_def = "khazard_warlord" [child_underground_pass_3] id = 6334 @@ -152,6 +187,13 @@ id = 8658 categories = ["ogres"] examine = "A large dim looking humanoid." drop_table = "ogre" +combat_def = "ogre" +hitpoints = 600 +att = 43 +str = 43 +def = 43 +attack_bonus = 22 +max_hit_crush = 70 [chadwell_underground_pass] id = 971 @@ -186,6 +228,7 @@ categories = ["spiders"] respawn_delay = 300 examine = "A nasty spider, blessed by Zamorak." drop_table = "empty" +combat_def = "giant_spider" [sir_jerro_underground_pass] id = 988 @@ -202,6 +245,8 @@ immune_cannon = true respawn_delay = 100 drop_table = "sir_jerro" examine = "A mighty-looking warrior." +max_hit_slash = 80 +combat_def = "sir_jerro" [sir_carl_underground_pass] id = 989 @@ -218,6 +263,8 @@ immune_cannon = true respawn_delay = 100 drop_table = "sir_carl" examine = "A mighty-looking warrior." +max_hit_slash = 80 +combat_def = "sir_carl" [sir_harry_underground_pass] id = 990 @@ -234,6 +281,8 @@ immune_cannon = true respawn_delay = 100 drop_table = "sir_harry" examine = "A mighty-looking warrior." +max_hit_slash = 80 +combat_def = "sir_harry" [niloof_underground_pass] id = 994 @@ -260,6 +309,8 @@ hunt_mode = "cowardly" respawn_delay = 50 examine = "A giant spider." drop_table = "empty" +max_hit_stab = 90 +combat_def = "kalrag" [boulder_underground_pass] id = 986 diff --git a/data/area/kandarin/ardougne/west/west_ardougne.npcs.toml b/data/area/kandarin/ardougne/west/west_ardougne.npcs.toml index 1ae714a1cd..565128831f 100644 --- a/data/area/kandarin/ardougne/west/west_ardougne.npcs.toml +++ b/data/area/kandarin/ardougne/west/west_ardougne.npcs.toml @@ -35,16 +35,37 @@ examine = "A mourner, or plague healer." id = 369 examine = "A mourner, or plague healer." drop_table = "mourner" +combat_def = "guard" +hitpoints = 190 +att = 8 +str = 8 +def = 8 +attack_bonus = 6 +max_hit_crush = 20 [mourner_2] id = 370 examine = "A mourner, or plague healer." drop_table = "mourner" +combat_def = "guard" +hitpoints = 190 +att = 8 +str = 8 +def = 8 +attack_bonus = 6 +max_hit_crush = 20 [mourner_3] id = 371 examine = "A mourner, or plague healer." drop_table = "mourner" +combat_def = "guard" +hitpoints = 190 +att = 8 +str = 8 +def = 8 +attack_bonus = 6 +max_hit_crush = 20 [mourner_vial_4] id = 372 @@ -61,6 +82,8 @@ max_hit_melee = 20 attack_bonus = 6 examine = "A mourner, or plague healer." drop_table = "mourner" +combat_def = "guard" +max_hit_crush = 20 [mourner_5] id = 348 @@ -72,6 +95,9 @@ style = "crush" max_hit_melee = 30 examine = "A mourner, or plague healer." drop_table = "mourner" +combat_def = "guard" +attack_bonus = 6 +max_hit_crush = 20 [mourner_staff] id = 357 @@ -93,6 +119,8 @@ style = "stab" max_hit_melee = 100 examine = "A mourner, or plague healer." drop_table = "mourner" +combat_def = "guard" +max_hit_stab = 100 [head_mourner] id = 2372 diff --git a/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.combat.toml b/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.combat.toml new file mode 100644 index 0000000000..af9e2453d1 --- /dev/null +++ b/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.combat.toml @@ -0,0 +1,6 @@ +[giant_lobster] +attack_speed = 4 + +[giant_lobster.melee] +range = 1 +target_hit = { offense = "stab", max = 40 } diff --git a/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.npcs.toml b/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.npcs.toml index 18e381ae9d..a1c73fc4de 100644 --- a/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.npcs.toml +++ b/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.npcs.toml @@ -12,6 +12,8 @@ categories = ["scorpions"] respawn_delay = 25 drop_table = "giant_lobster" examine = "An extremely vicious lobster." +max_hit_stab = 40 +combat_def = "giant_lobster" [sea_slug_witchaven_dungeon] id = 4894 diff --git a/data/area/kandarin/battlefield/battlefield.combat.toml b/data/area/kandarin/battlefield/battlefield.combat.toml new file mode 100644 index 0000000000..b1e7069217 --- /dev/null +++ b/data/area/kandarin/battlefield/battlefield.combat.toml @@ -0,0 +1,13 @@ +[khazard_commander] +attack_speed = 4 + +[khazard_commander.melee] +range = 1 +target_hit = { offense = "stab", max = 50 } + +[tortoise] +attack_speed = 4 + +[tortoise.melee] +range = 1 +target_hit = { offense = "crush", max = 110 } diff --git a/data/area/kandarin/battlefield/battlefield.npcs.toml b/data/area/kandarin/battlefield/battlefield.npcs.toml index c6f04d2db2..bec815e499 100644 --- a/data/area/kandarin/battlefield/battlefield.npcs.toml +++ b/data/area/kandarin/battlefield/battlefield.npcs.toml @@ -11,10 +11,12 @@ attack_bonus = 8 respawn_delay = 100 drop_table = "bones" examine = "It's one of General Khazard's warriors." +combat_def = "guard" [khazard_trooper_battlefield_2] id = 2246 clone = "khazard_trooper_battlefield" +combat_def = "guard" [gnome_troop_battlefield] id = 2247 @@ -30,25 +32,40 @@ ranged_strength = 2 respawn_delay = 60 examine = "Like a mini man!" drop_table = "gnome_troop" +combat_def = "gnome_guard" [gnome_troop_battlefield_2] id = 2248 clone = "gnome_troop_battlefield" drop_table = "gnome_troop" +combat_def = "gnome_guard" +hitpoints = 30 +range = 5 +attack_bonus = 2 +max_hit_range = 10 [gnome_battlefield] id = 2249 clone = "gnome_troop_battlefield" drop_table = "gnome" +combat_def = "gnome" +hitpoints = 30 +max_hit_crush = 10 [gnome_battlefield_2] id = 2250 drop_table = "gnome" +combat_def = "gnome" +hitpoints = 30 +max_hit_crush = 10 [gnome_battlefield_3] id = 2251 clone = "gnome_troop_battlefield" drop_table = "gnome" +combat_def = "gnome" +hitpoints = 30 +max_hit_crush = 10 [gnome_archer] id = 3814 @@ -99,6 +116,12 @@ examine = "It's a tree gnome." id = 478 drop_table = "khazard_commander" examine = "It's one of General Khazard's commanders." +hitpoints = 220 +att = 50 +str = 45 +def = 50 +max_hit_stab = 50 +combat_def = "khazard_commander" [tracker_gnome_1_battlefield] id = 481 @@ -126,14 +149,17 @@ categories = ["birds"] respawn_delay = 30 drop_table = "bones" examine = "These gnomes know how to get around!" +combat_def = "gnome" [mounted_terrorbird_gnome_battlefield_2] id = 6110 clone = "mounted_terrorbird_gnome_battlefield" +combat_def = "gnome" [mounted_terrorbird_gnome_battlefield_3] id = 6111 clone = "mounted_terrorbird_gnome_battlefield" +combat_def = "gnome" [tortoise_battlefield] id = 3808 @@ -148,4 +174,6 @@ max_hit_magic = 110 max_hit_range = 110 respawn_delay = 50 drop_table = "tortoise_rider" -examine = "Massive beast of War with extra Gnome." \ No newline at end of file +examine = "Massive beast of War with extra Gnome." +max_hit_crush = 110 +combat_def = "tortoise" \ No newline at end of file diff --git a/data/area/kandarin/baxtorian_falls/baxtorian_falls.npcs.toml b/data/area/kandarin/baxtorian_falls/baxtorian_falls.npcs.toml index 89f1028e60..d8d164f060 100644 --- a/data/area/kandarin/baxtorian_falls/baxtorian_falls.npcs.toml +++ b/data/area/kandarin/baxtorian_falls/baxtorian_falls.npcs.toml @@ -36,12 +36,26 @@ id = 4259 categories = ["dwarves"] examine = "A dwarven guard." drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 [guard_baxtorian_falls_2] id = 4260 categories = ["dwarves"] examine = "A dwarven guard." drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 [mysterious_ghost_baxtorian_falls_2] id = 2399 diff --git a/data/area/kandarin/feldip_hills/feldip_hills.combat.toml b/data/area/kandarin/feldip_hills/feldip_hills.combat.toml index 0de032f9e5..b02f730a6f 100644 --- a/data/area/kandarin/feldip_hills/feldip_hills.combat.toml +++ b/data/area/kandarin/feldip_hills/feldip_hills.combat.toml @@ -32,4 +32,10 @@ impact_poison = 88 target_hit = { offense = "magic", max = 0 } [jungle_strykewyrm.dig] -range = 8 \ No newline at end of file +range = 8 +[carnivorous_chinchompa] +attack_speed = 4 + +[carnivorous_chinchompa.melee] +range = 1 +target_hit = { offense = "crush", max = 10 } diff --git a/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml b/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml index 708da572bb..a0f566e5ce 100644 --- a/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml +++ b/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml @@ -13,11 +13,20 @@ categories = ["ogres"] respawn_delay = 30 examine = "A large dim looking humanoid." drop_table = "ogre" +combat_def = "ogre" +max_hit_crush = 70 [ogre_feldip_hills_2] id = 3451 clone = "ogre_feldip_hills" drop_table = "ogre" +combat_def = "ogre" +hitpoints = 600 +att = 43 +str = 43 +def = 43 +attack_bonus = 22 +max_hit_crush = 70 [ogre_boat_feldip_hills] id = 3469 @@ -38,6 +47,7 @@ max_hit_melee = 10 respawn_delay = 7 examine = "It looks fluffy and cute; it's probably deadly." drop_table = "empty" +max_hit_crush = 10 [black_warlock_feldip_hills] id = 5082 @@ -72,12 +82,14 @@ id = 7079 categories = ["ogres"] examine = "Irascible, belligerent and stupefyingly impolite." drop_table = "ogress_warrior" +combat_def = "guard" [ogress_warrior_2] id = 7080 categories = ["ogres"] examine = "Irascible, belligerent and stupefyingly impolite." drop_table = "ogress_warrior" +combat_def = "guard" [ogress_feldip_hills] id = 7081 diff --git a/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.combat.toml b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.combat.toml new file mode 100644 index 0000000000..aa811fb05c --- /dev/null +++ b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.combat.toml @@ -0,0 +1,13 @@ +[ogre_chieftain] +attack_speed = 4 + +[ogre_chieftain.melee] +range = 1 +target_hit = { offense = "crush", max = 90 } + +[gorad] +attack_speed = 4 + +[gorad.melee] +range = 1 +target_hit = { offense = "crush", max = 70 } diff --git a/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.npcs.toml b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.npcs.toml index d87c0372f9..ef47218400 100644 --- a/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.npcs.toml +++ b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.npcs.toml @@ -35,6 +35,7 @@ categories = ["ogres"] respawn_delay = 300 drop_table = "city_guard" examine = "Tough-looking." +max_hit_crush = 90 [toban_gu_tanoth] id = 855 @@ -55,6 +56,8 @@ categories = ["ogres"] respawn_delay = 30 drop_table = "gorad" examine = "Big, dumb and ugly." +max_hit_crush = 70 +combat_def = "gorad" [ogre_guard_gu_tanoth] id = 858 @@ -86,6 +89,7 @@ categories = ["ogres"] respawn_delay = 50 drop_table = "city_guard" examine = "Tries to keep the peace." +combat_def = "guard" [scared_skavid_gu_tanoth] id = 863 @@ -122,6 +126,7 @@ categories = ["ogres"] respawn_delay = 12 drop_table = "city_guard" examine = "Big and ugly looking." +combat_def = "guard" [ogre_trader_gu_tanoth] id = 873 diff --git a/data/area/kandarin/fishing_guild/fishing_guild.npcs.toml b/data/area/kandarin/fishing_guild/fishing_guild.npcs.toml index f2adbc0e6f..fb89e341e1 100644 --- a/data/area/kandarin/fishing_guild/fishing_guild.npcs.toml +++ b/data/area/kandarin/fishing_guild/fishing_guild.npcs.toml @@ -7,30 +7,45 @@ id = 4272 categories = ["goblins"] examine = "An ugly green creature." drop_table = "goblin" +combat_def = "goblin" +hitpoints = 50 +max_hit_crush = 10 [goblin_fishing_guild_2] id = 4273 categories = ["goblins"] examine = "An ugly green creature." drop_table = "goblin" +combat_def = "goblin" +hitpoints = 50 +max_hit_crush = 10 [goblin_fishing_guild_3] id = 4274 categories = ["goblins"] examine = "An ugly green creature." drop_table = "goblin" +combat_def = "goblin" +hitpoints = 50 +max_hit_crush = 10 [goblin_fishing_guild_4] id = 4275 categories = ["goblins"] examine = "An ugly green creature." drop_table = "goblin" +combat_def = "goblin" +hitpoints = 50 +max_hit_crush = 10 [goblin_fishing_guild_5] id = 4276 categories = ["goblins"] examine = "An ugly green creature." drop_table = "goblin" +combat_def = "goblin" +hitpoints = 50 +max_hit_crush = 10 [roachey] id = 592 diff --git a/data/area/kandarin/goblin_cave/goblin_cave.npcs.toml b/data/area/kandarin/goblin_cave/goblin_cave.npcs.toml index 1c9c01050a..f49a91a668 100644 --- a/data/area/kandarin/goblin_cave/goblin_cave.npcs.toml +++ b/data/area/kandarin/goblin_cave/goblin_cave.npcs.toml @@ -7,6 +7,12 @@ id = 4929 categories = ["rats"] examine = "Overgrown vermin." drop_table = "dungeon_rat" +combat_def = "giant_rat" +hitpoints = 120 +att = 10 +str = 10 +def = 10 +max_hit_stab = 20 [goblin_guard_goblin_cave] id = 6496 diff --git a/data/area/kandarin/hazelmeres_island/hazelmeres_island.npcs.toml b/data/area/kandarin/hazelmeres_island/hazelmeres_island.npcs.toml index 0b11446159..1311ef60d7 100644 --- a/data/area/kandarin/hazelmeres_island/hazelmeres_island.npcs.toml +++ b/data/area/kandarin/hazelmeres_island/hazelmeres_island.npcs.toml @@ -12,6 +12,7 @@ categories = ["spiders"] respawn_delay = 30 examine = "A barely visible deadly jungle spider." drop_table = "jungle_spider" +combat_def = "jungle_spider_ape_atoll" [larry_hazelmeres_island] id = 7576 diff --git a/data/area/kandarin/ourania/ourania.npcs.toml b/data/area/kandarin/ourania/ourania.npcs.toml index 27c3fedc3f..06b6407085 100644 --- a/data/area/kandarin/ourania/ourania.npcs.toml +++ b/data/area/kandarin/ourania/ourania.npcs.toml @@ -113,6 +113,12 @@ id = 491 categories = ["ghosts"] examine = "Spooky." drop_table = "empty" +combat_def = "ghost" +hitpoints = 250 +att = 13 +str = 13 +def = 18 +max_hit_crush = 20 [spirit_of_scorpius_ourania] id = 492 diff --git a/data/area/kandarin/piscatoris/piscatoris.npcs.toml b/data/area/kandarin/piscatoris/piscatoris.npcs.toml index b03a87cf4a..691d9c6729 100644 --- a/data/area/kandarin/piscatoris/piscatoris.npcs.toml +++ b/data/area/kandarin/piscatoris/piscatoris.npcs.toml @@ -44,6 +44,7 @@ categories = ["skeletons"] respawn_delay = 50 examine = "Doesn't seem to want to go away." drop_table = "skeleton_mage" +combat_def = "skeleton_mage" [brian_twitcher] id = 8579 diff --git a/data/area/kandarin/port_khazard/fight_arena/khazard_fight_arena.npcs.toml b/data/area/kandarin/port_khazard/fight_arena/khazard_fight_arena.npcs.toml index b016ec8d45..2208317ac0 100644 --- a/data/area/kandarin/port_khazard/fight_arena/khazard_fight_arena.npcs.toml +++ b/data/area/kandarin/port_khazard/fight_arena/khazard_fight_arena.npcs.toml @@ -18,11 +18,13 @@ attack_bonus = 10 respawn_delay = 50 examine = "His armour indicates he's a Khazard Guard." drop_table = "khazard_guard" +combat_def = "guard" [khazard_4] id = 256 clone = "khazard_3" drop_table = "khazard_guard" +combat_def = "guard" [angor] id = 259 @@ -114,6 +116,7 @@ examine = "He demands to have some booze." id = 7528 clone = "khazard_3" drop_table = "khazard_guard" +combat_def = "guard" [lazy_khazard] id = 7550 diff --git a/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.combat.toml b/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.combat.toml new file mode 100644 index 0000000000..6473ac68b8 --- /dev/null +++ b/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.combat.toml @@ -0,0 +1,6 @@ +[crab] +attack_speed = 4 + +[crab.melee] +range = 1 +target_hit = { offense = "crush", max = 30 } diff --git a/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.npcs.toml b/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.npcs.toml index 5d21c5b474..52fb0c8c52 100644 --- a/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.npcs.toml +++ b/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.npcs.toml @@ -9,6 +9,8 @@ max_hit_melee = 30 respawn_delay = 10 examine = "Nice claw!" drop_table = "crab" +max_hit_crush = 30 +combat_def = "crab" [fish_underwater_cave] id = 3425 diff --git a/data/area/kandarin/port_khazard/movarios_base/movarios_base.npcs.toml b/data/area/kandarin/port_khazard/movarios_base/movarios_base.npcs.toml index e26a728945..b27275978d 100644 --- a/data/area/kandarin/port_khazard/movarios_base/movarios_base.npcs.toml +++ b/data/area/kandarin/port_khazard/movarios_base/movarios_base.npcs.toml @@ -14,19 +14,23 @@ attack_bonus = 10 respawn_delay = 50 examine = "A well-trained Khazard warrior, on orders to guard this area." drop_table = "elite_khazard_guard" +combat_def = "guard" [elite_khazard_guard_movarios_base_2] id = 8438 clone = "elite_khazard_guard_movarios_base" drop_table = "elite_khazard_guard" +combat_def = "guard" [elite_khazard_guard_movarios_base_3] id = 8439 clone = "elite_khazard_guard_movarios_base" drop_table = "elite_khazard_guard" +combat_def = "guard" [elite_khazard_guard_movarios_base_4] id = 8440 clone = "elite_khazard_guard_movarios_base" drop_table = "elite_khazard_guard" +combat_def = "guard" diff --git a/data/area/kandarin/ranging_guild/ranging_guild.npcs.toml b/data/area/kandarin/ranging_guild/ranging_guild.npcs.toml index 12793e05ac..11573e364f 100644 --- a/data/area/kandarin/ranging_guild/ranging_guild.npcs.toml +++ b/data/area/kandarin/ranging_guild/ranging_guild.npcs.toml @@ -2,6 +2,13 @@ id = 678 examine = "Keeps order in the ranging guild." drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 [ranging_guild_doorman] id = 679 diff --git a/data/area/kandarin/sinclair_mansion/sinclair_mansion.npcs.toml b/data/area/kandarin/sinclair_mansion/sinclair_mansion.npcs.toml index 281026d761..c321b30345 100644 --- a/data/area/kandarin/sinclair_mansion/sinclair_mansion.npcs.toml +++ b/data/area/kandarin/sinclair_mansion/sinclair_mansion.npcs.toml @@ -16,6 +16,7 @@ hunt_mode = "cowardly" respawn_delay = 100 drop_table = "highwayman" examine = "He holds up passers by." +combat_def = "highwayman" [highwayman_no_hood] id = 2677 diff --git a/data/area/kandarin/temple_of_ikov/temple_of_ikov.npcs.toml b/data/area/kandarin/temple_of_ikov/temple_of_ikov.npcs.toml index 6b45458914..05a9a79fc5 100644 --- a/data/area/kandarin/temple_of_ikov/temple_of_ikov.npcs.toml +++ b/data/area/kandarin/temple_of_ikov/temple_of_ikov.npcs.toml @@ -11,10 +11,12 @@ attack_bonus = 14 respawn_delay = 50 drop_table = "guardian_of_armadyl" examine = "A guard who has devoted their life to Armadyl." +combat_def = "guard" [guardian_of_armadyl_temple_of_ikov_2] id = 275 clone = "guardian_of_armadyl_temple_of_ikov" +combat_def = "guard" [winelda_temple_of_ikov] id = 276 @@ -25,6 +27,12 @@ id = 5341 categories = ["skeletons"] examine = "Could do with gaining a few pounds." drop_table = "skeleton" +combat_def = "skeleton_unarmed" +hitpoints = 240 +att = 17 +str = 17 +def = 17 +max_hit_crush = 30 [ice_spider] id = 64 @@ -40,6 +48,7 @@ categories = ["spiders"] respawn_delay = 30 examine = "I think this spider has been magically modified." drop_table = "ice_spider" +combat_def = "giant_spider" [fire_warrior_of_lesarkus] id = 277 diff --git a/data/area/kandarin/tower_of_life/tower_of_life.combat.toml b/data/area/kandarin/tower_of_life/tower_of_life.combat.toml new file mode 100644 index 0000000000..14cee01eec --- /dev/null +++ b/data/area/kandarin/tower_of_life/tower_of_life.combat.toml @@ -0,0 +1,13 @@ +[invrigar_the_necromancer] +attack_speed = 4 + +[invrigar_the_necromancer.melee] +range = 1 +target_hit = { offense = "crush", max = 30 } + +[necromancer] +attack_speed = 4 + +[necromancer.melee] +range = 1 +target_hit = { offense = "crush", max = 30 } diff --git a/data/area/kandarin/tower_of_life/tower_of_life.npcs.toml b/data/area/kandarin/tower_of_life/tower_of_life.npcs.toml index b66d89dec3..e67d9f26fb 100644 --- a/data/area/kandarin/tower_of_life/tower_of_life.npcs.toml +++ b/data/area/kandarin/tower_of_life/tower_of_life.npcs.toml @@ -10,6 +10,7 @@ max_hit_magic = 30 respawn_delay = 50 examine = "An evil user of Magic powers." drop_table = "invrigar_the_necromancer" +max_hit_crush = 30 [necromancer] id = 194 @@ -24,6 +25,7 @@ hunt_mode = "cowardly" respawn_delay = 250 drop_table = "necromancer" examine = "A crazy evil necromancer." +max_hit_crush = 30 [summoned_zombie] id = 77 diff --git a/data/area/kandarin/tree_gnome_stronghold/training_camp/combat_training_camp.npcs.toml b/data/area/kandarin/tree_gnome_stronghold/training_camp/combat_training_camp.npcs.toml index b08e4a9123..22106e049d 100644 --- a/data/area/kandarin/tree_gnome_stronghold/training_camp/combat_training_camp.npcs.toml +++ b/data/area/kandarin/tree_gnome_stronghold/training_camp/combat_training_camp.npcs.toml @@ -13,6 +13,8 @@ categories = ["ogres"] respawn_delay = 50 examine = "Big, ugly, and smelly." drop_table = "ogre" +combat_def = "ogre" +max_hit_crush = 70 [guard_combat_training_camp] id = 344 diff --git a/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.npcs.toml b/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.npcs.toml index 5060471b29..045741c389 100644 --- a/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.npcs.toml +++ b/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.npcs.toml @@ -162,6 +162,10 @@ drop_table = "gnome_troop" [gnome_troop_2] id = 480 drop_table = "gnome_troop" +combat_def = "gnome_guard" +hitpoints = 30 +attack_bonus = 2 +max_hit_range = 10 [gnome_baller] id = 621 @@ -208,6 +212,8 @@ max_hit_melee = 100 respawn_delay = 50 drop_table = "tortoise_riderless" examine = "A large tortoise." +max_hit_crush = 100 +combat_def = "tortoise" [terrorchick_gnome] id = 137 diff --git a/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.combat.toml b/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.combat.toml new file mode 100644 index 0000000000..2b5262f2b6 --- /dev/null +++ b/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.combat.toml @@ -0,0 +1,13 @@ +[twig] +attack_speed = 6 + +[twig.melee] +range = 1 +target_hit = { offense = "crush", max = 130 } + +[berry] +attack_speed = 6 + +[berry.melee] +range = 1 +target_hit = { offense = "crush", max = 130 } diff --git a/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.npcs.toml b/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.npcs.toml index 0dafe294c8..b694390251 100644 --- a/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.npcs.toml +++ b/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.npcs.toml @@ -16,30 +16,37 @@ categories = ["trolls"] respawn_delay = 50 drop_table = "mountain_troll" examine = "Small for a troll but mean and ugly." +combat_def = "ice_troll" [mountain_troll_troll_stronghold_tunnels_2] id = 1107 clone = "mountain_troll_troll_stronghold_tunnels" +combat_def = "ice_troll" [mountain_troll_troll_stronghold_tunnels_3] id = 1108 clone = "mountain_troll_troll_stronghold_tunnels" +combat_def = "ice_troll" [mountain_troll_troll_stronghold_tunnels_4] id = 1109 clone = "mountain_troll_troll_stronghold_tunnels" +combat_def = "ice_troll" [mountain_troll_troll_stronghold_tunnels_5] id = 1110 clone = "mountain_troll_troll_stronghold_tunnels" +combat_def = "ice_troll" [mountain_troll_troll_stronghold_tunnels_6] id = 1111 clone = "mountain_troll_troll_stronghold_tunnels" +combat_def = "ice_troll" [mountain_troll_troll_stronghold_tunnels_7] id = 1112 clone = "mountain_troll_troll_stronghold_tunnels" +combat_def = "ice_troll" [eadgar_troll_stronghold_tunnels] id = 1113 @@ -65,18 +72,34 @@ categories = ["trolls"] respawn_delay = 50 drop_table = "rock_troll" examine = "One of the troll generals." +combat_def = "ice_troll" +max_hit_slash = 380 [troll_general_troll_stronghold_tunnels_2] id = 1116 categories = ["trolls"] examine = "One of the troll generals." drop_table = "troll_general" +combat_def = "ice_troll" +hitpoints = 1400 +att = 70 +str = 140 +def = 40 +attack_bonus = 60 +max_hit_slash = 380 [troll_general_troll_stronghold_tunnels_3] id = 1117 categories = ["trolls"] examine = "One of the troll generals." drop_table = "troll_general" +combat_def = "ice_troll" +hitpoints = 1400 +att = 70 +str = 140 +def = 40 +attack_bonus = 60 +max_hit_slash = 380 [twig_troll_stronghold_tunnels] id = 1128 @@ -94,6 +117,8 @@ slayer_xp = 90.0 categories = ["trolls"] drop_table = "mountain_troll" examine = "He's guarding the cells." +max_hit_crush = 130 +combat_def = "twig" [berry_troll_awake] id = 1127 @@ -113,6 +138,8 @@ slayer_xp = 90.0 categories = ["trolls"] drop_table = "mountain_troll" examine = "He's guarding the cells." +max_hit_crush = 130 +combat_def = "berry" [cook_troll_stronghold_tunnels] id = 1135 @@ -144,6 +171,7 @@ categories = ["trolls"] respawn_delay = 50 examine = "Small for a troll, but mean and ugly." drop_table = "mountain_troll" +combat_def = "ice_troll" [guard_troll_stronghold_tunnels] id = 1142 diff --git a/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.combat.toml b/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.combat.toml new file mode 100644 index 0000000000..be6104b9f3 --- /dev/null +++ b/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.combat.toml @@ -0,0 +1,6 @@ +[salarin_the_twisted] +attack_speed = 4 + +[salarin_the_twisted.melee] +range = 1 +target_hit = { offense = "crush", max = 70 } diff --git a/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.npcs.toml b/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.npcs.toml index e69336d67c..d2f1116231 100644 --- a/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.npcs.toml +++ b/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.npcs.toml @@ -13,6 +13,7 @@ slayer_xp = 40.0 categories = ["chaos_druids"] respawn_delay = 50 examine = "A crazy evil druid." +combat_def = "guard" [salarin_the_twisted] id = 205 @@ -28,6 +29,7 @@ categories = ["chaos_druids"] respawn_delay = 50 drop_table = "salarin_the_twisted" examine = "Twisted by name, twisted by nature." +max_hit_crush = 70 [sigbert_the_adventurer] id = 37 diff --git a/data/area/kandarin/yanille/yanille.combat.toml b/data/area/kandarin/yanille/yanille.combat.toml new file mode 100644 index 0000000000..fa689b077a --- /dev/null +++ b/data/area/kandarin/yanille/yanille.combat.toml @@ -0,0 +1,13 @@ +[watchman] +attack_speed = 4 + +[watchman.melee] +range = 1 +target_hit = { offense = "crush", max = 40 } + +[colonel_radick] +attack_speed = 4 + +[colonel_radick.melee] +range = 1 +target_hit = { offense = "slash", max = 40 } diff --git a/data/area/kandarin/yanille/yanille.npcs.toml b/data/area/kandarin/yanille/yanille.npcs.toml index 5a101df80c..5f2982ca9e 100644 --- a/data/area/kandarin/yanille/yanille.npcs.toml +++ b/data/area/kandarin/yanille/yanille.npcs.toml @@ -32,6 +32,7 @@ max_hit_melee = 40 respawn_delay = 50 examine = "Watches stuff. But who watches him?" drop_table = "watchman" +max_hit_crush = 40 [soldier_yanille] id = 35 @@ -123,6 +124,7 @@ attack_bonus = 8 respawn_delay = 50 drop_table = "soldier_yanille" examine = "Tries to keep the peace." +combat_def = "guard" [colonel_radick] id = 878 @@ -136,4 +138,5 @@ attack_bonus = 9 respawn_delay = 50 drop_table = "soldier_yanille" examine = "A military man." +max_hit_slash = 40 diff --git a/data/area/karamja/brimhaven/brimhaven.combat.toml b/data/area/karamja/brimhaven/brimhaven.combat.toml new file mode 100644 index 0000000000..c11150df12 --- /dev/null +++ b/data/area/karamja/brimhaven/brimhaven.combat.toml @@ -0,0 +1,6 @@ +[grip] +attack_speed = 4 + +[grip.melee] +range = 1 +target_hit = { offense = "slash", max = 30 } diff --git a/data/area/karamja/brimhaven/brimhaven.npcs.toml b/data/area/karamja/brimhaven/brimhaven.npcs.toml index 7298062b9e..3ebfbf7c98 100644 --- a/data/area/karamja/brimhaven/brimhaven.npcs.toml +++ b/data/area/karamja/brimhaven/brimhaven.npcs.toml @@ -70,26 +70,61 @@ examine = "An amulet trader." id = 6346 examine = "Avast ye scurvy land lubbers!" drop_table = "pirate" +combat_def = "pirate" +hitpoints = 200 +att = 21 +str = 21 +def = 21 +attack_bonus = 8 +max_hit_slash = 30 [pirate_brimhaven_2] id = 6347 examine = "Avast ye scurvy land lubbers!" drop_table = "pirate" +combat_def = "pirate" +hitpoints = 200 +att = 21 +str = 21 +def = 21 +attack_bonus = 8 +max_hit_slash = 30 [pirate_brimhaven_3] id = 6348 examine = "Avast ye scurvy land lubbers!" drop_table = "pirate" +combat_def = "pirate" +hitpoints = 200 +att = 21 +str = 21 +def = 21 +attack_bonus = 8 +max_hit_slash = 30 [pirate_brimhaven_4] id = 6349 examine = "Avast ye scurvy land lubbers!" drop_table = "pirate" +combat_def = "pirate" +hitpoints = 200 +att = 21 +str = 21 +def = 21 +attack_bonus = 8 +max_hit_slash = 30 [pirate_brimhaven_5] id = 6350 examine = "Avast ye scurvy land lubbers!" drop_table = "pirate" +combat_def = "pirate" +hitpoints = 200 +att = 21 +str = 21 +def = 21 +attack_bonus = 8 +max_hit_slash = 30 [tool_leprechaun_brimhaven] id = 7558 @@ -115,6 +150,7 @@ attack_bonus = 5 respawn_delay = 50 examine = "Looks like he's been in the wars..." drop_table = "grip" +max_hit_slash = 30 [alfonse_the_waiter_brimhaven] id = 793 @@ -136,6 +172,7 @@ attack_bonus = 20 respawn_delay = 50 drop_table = "bones" examine = "A morally ambiguous guard." +combat_def = "guard" [thief_brimhaven] id = 8 @@ -149,6 +186,8 @@ max_hit_melee = 20 respawn_delay = 25 examine = "Known for his light-fingered qualities." drop_table = "thief" +combat_def = "man" +max_hit_crush = 20 [kangai_mau_brimhaven] id = 846 diff --git a/data/area/karamja/brimhaven/dungeon/brimhaven_dungeon.npcs.toml b/data/area/karamja/brimhaven/dungeon/brimhaven_dungeon.npcs.toml index 21eb0dd714..72388907d8 100644 --- a/data/area/karamja/brimhaven/dungeon/brimhaven_dungeon.npcs.toml +++ b/data/area/karamja/brimhaven/dungeon/brimhaven_dungeon.npcs.toml @@ -3,3 +3,9 @@ id = 4671 categories = ["red_dragons"] examine = "A big powerful dragon." drop_table = "red_dragon" +combat_def = "red_dragon" +hitpoints = 1400 +att = 130 +str = 130 +def = 130 +max_hit_slash = 140 diff --git a/data/area/karamja/crandor/crandor.combat.toml b/data/area/karamja/crandor/crandor.combat.toml new file mode 100644 index 0000000000..af87212b46 --- /dev/null +++ b/data/area/karamja/crandor/crandor.combat.toml @@ -0,0 +1,6 @@ +[elvarg] +attack_speed = 4 + +[elvarg.melee] +range = 1 +target_hit = { offense = "slash", max = 80 } diff --git a/data/area/karamja/crandor/crandor.npcs.toml b/data/area/karamja/crandor/crandor.npcs.toml index 54b5c26ef7..fe8901f624 100644 --- a/data/area/karamja/crandor/crandor.npcs.toml +++ b/data/area/karamja/crandor/crandor.npcs.toml @@ -17,4 +17,5 @@ slayer_xp = 80.0 categories = ["green_dragons"] respawn_delay = 50 examine = "Roar! A dragon!" -drop_table = "empty" \ No newline at end of file +drop_table = "empty" +max_hit_slash = 80 \ No newline at end of file diff --git a/data/area/karamja/karamja.combat.toml b/data/area/karamja/karamja.combat.toml index 1f6e07e49f..a8a3a2b57e 100644 --- a/data/area/karamja/karamja.combat.toml +++ b/data/area/karamja/karamja.combat.toml @@ -36,3 +36,10 @@ range = 1 anim = "giant_ant_attack" target_sound = "giant_ant_attack" target_hit = { offense = "crush", max = 60 } + +[tribesman] +attack_speed = 4 + +[tribesman.melee] +range = 1 +target_hit = { offense = "stab", max = 40 } diff --git a/data/area/karamja/karamja.npcs.toml b/data/area/karamja/karamja.npcs.toml index b4b55061c5..efb7f1054d 100644 --- a/data/area/karamja/karamja.npcs.toml +++ b/data/area/karamja/karamja.npcs.toml @@ -98,10 +98,12 @@ categories = ["spiders"] respawn_delay = 30 drop_table = "jungle_spider" examine = "A barely visible deadly jungle spider." +combat_def = "jungle_spider_ape_atoll" [jungle_spider_karamja_2] id = 6377 clone = "jungle_spider_karamja" +combat_def = "jungle_spider_ape_atoll" [tenacious_toucan] id = 6378 @@ -225,6 +227,7 @@ hunt_mode = "cowardly" respawn_delay = 50 examine = "A vicious warrior." drop_table = "tribesman" +max_hit_stab = 40 [tinsay_karamja_2] id = 1165 diff --git a/data/area/karamja/kharazi_jungle/caves/kharazi_caves.combat.toml b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.combat.toml new file mode 100644 index 0000000000..55977fa7d6 --- /dev/null +++ b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.combat.toml @@ -0,0 +1,34 @@ +[death_wing] +attack_speed = 4 + +[death_wing.melee] +range = 1 +target_hit = { offense = "stab", max = 80 } + +[ungadulu] +attack_speed = 4 + +[ungadulu.melee] +range = 1 +target_hit = { offense = "crush", max = 70 } + +[san_tojalon] +attack_speed = 4 + +[san_tojalon.melee] +range = 1 +target_hit = { offense = "stab", max = 120 } + +[irvig_senay] +attack_speed = 4 + +[irvig_senay.melee] +range = 1 +target_hit = { offense = "slash", max = 120 } + +[ranalph_devere] +attack_speed = 4 + +[ranalph_devere.melee] +range = 1 +target_hit = { offense = "slash", max = 130 } diff --git a/data/area/karamja/kharazi_jungle/caves/kharazi_caves.npcs.toml b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.npcs.toml index d7ece8cd51..82187efc31 100644 --- a/data/area/karamja/kharazi_jungle/caves/kharazi_caves.npcs.toml +++ b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.npcs.toml @@ -14,6 +14,7 @@ categories = ["skeletons"] respawn_delay = 50 examine = "A minion of Rashiliyia." drop_table = "undead_one" +combat_def = "zombie" [undead_one_kharazi_caves_2] id = 503 @@ -32,16 +33,19 @@ categories = ["skeletons"] respawn_delay = 50 examine = "A minion of Rashiliyia." drop_table = "undead_one" +combat_def = "zombie" [undead_one_kharazi_caves_3] id = 5353 clone = "undead_one_kharazi_caves" drop_table = "undead_one" +combat_def = "zombie" [undead_one_kharazi_caves_4] id = 5354 clone = "undead_one_kharazi_caves_2" drop_table = "undead_one" +combat_def = "zombie" [death_wing_kharazi_caves] id = 79 @@ -58,6 +62,8 @@ categories = ["ghosts"] respawn_delay = 35 examine = "A shadowy, barely visible flying entity from some evil place." drop_table = "empty" +max_hit_stab = 80 +combat_def = "death_wing" [ungadulu_kharazi_caves] id = 929 @@ -74,6 +80,8 @@ attack_bonus = 7 ranged_strength = 7 examine = "The Kharazi tribe's elusive shaman." drop_table = "empty" +max_hit_crush = 70 +combat_def = "ungadulu" [ungadulu_possessed] id = 930 @@ -104,6 +112,8 @@ respawn_delay = 26 categories = ["skeletons"] examine = "The spirit of a long-dead warrior." drop_table = "san_tojalon" +max_hit_stab = 120 +combat_def = "san_tojalon" [irvig_senay_kharazi_caves] id = 937 @@ -119,6 +129,8 @@ respawn_delay = 51 categories = ["skeletons"] examine = "The spirit of a long-dead warrior." drop_table = "irvig_senay" +max_hit_slash = 120 +combat_def = "irvig_senay" [ranalph_devere] id = 938 @@ -136,6 +148,7 @@ respawn_delay = 51 categories = ["skeletons"] examine = "The spirit of a long-dead warrior." drop_table = "empty" +max_hit_slash = 130 [boulder_kharazi_caves] id = 939 diff --git a/data/area/karamja/kharazi_jungle/kharazi_jungle.combat.toml b/data/area/karamja/kharazi_jungle/kharazi_jungle.combat.toml new file mode 100644 index 0000000000..b6897b471f --- /dev/null +++ b/data/area/karamja/kharazi_jungle/kharazi_jungle.combat.toml @@ -0,0 +1,13 @@ +[oomlie_bird] +attack_speed = 4 + +[oomlie_bird.melee] +range = 1 +target_hit = { offense = "stab", max = 50 } + +[jungle_wolf] +attack_speed = 4 + +[jungle_wolf.melee] +range = 1 +target_hit = { offense = "stab", max = 60 } diff --git a/data/area/karamja/kharazi_jungle/kharazi_jungle.npcs.toml b/data/area/karamja/kharazi_jungle/kharazi_jungle.npcs.toml index 9bfa53b4cc..de307fff7e 100644 --- a/data/area/karamja/kharazi_jungle/kharazi_jungle.npcs.toml +++ b/data/area/karamja/kharazi_jungle/kharazi_jungle.npcs.toml @@ -149,6 +149,8 @@ categories = ["wolves"] respawn_delay = 90 drop_table = "ice_wolf" examine = "A rare jungle wolf - specific to the Kharazi jungle." +max_hit_stab = 60 +combat_def = "jungle_wolf" [tool_leprechaun_kharazi_jungle] id = 3121 @@ -171,6 +173,8 @@ categories = ["birds"] respawn_delay = 25 drop_table = "oomlie_bird" examine = "A jungle version of the chicken, but more vicious." +max_hit_stab = 50 +combat_def = "oomlie_bird" [baby_gecko_kharazi_jungle] id = 7287 diff --git a/data/area/karamja/musa_point/musa_point.npcs.toml b/data/area/karamja/musa_point/musa_point.npcs.toml index 4a0ba9d413..3d992db3ad 100644 --- a/data/area/karamja/musa_point/musa_point.npcs.toml +++ b/data/area/karamja/musa_point/musa_point.npcs.toml @@ -32,6 +32,9 @@ id = 11666 id = 170 examine = "One of Gielinor's many citizens, apparently trying to be an explorer." drop_table = "man" +combat_def = "man" +hitpoints = 70 +max_hit_crush = 10 [fishing_spot_musa_point] id = 323 diff --git a/data/area/karamja/pothole_dungeon/pothole_dungeon.npcs.toml b/data/area/karamja/pothole_dungeon/pothole_dungeon.npcs.toml index 9fee41aa0e..8b64a56421 100644 --- a/data/area/karamja/pothole_dungeon/pothole_dungeon.npcs.toml +++ b/data/area/karamja/pothole_dungeon/pothole_dungeon.npcs.toml @@ -2,9 +2,23 @@ id = 3449 examine = "An aggressive humanoid." drop_table = "jogre" +combat_def = "jogre" +hitpoints = 600 +att = 43 +str = 43 +def = 43 +attack_bonus = 22 +max_hit_crush = 70 [jogre_pothole_dungeon_2] id = 3450 examine = "An aggressive humanoid." drop_table = "jogre" +combat_def = "jogre" +hitpoints = 600 +att = 43 +str = 43 +def = 43 +attack_bonus = 22 +max_hit_crush = 70 diff --git a/data/area/karamja/shilo_village/shilo_village.npcs.toml b/data/area/karamja/shilo_village/shilo_village.npcs.toml index 69ac59d416..219263b03e 100644 --- a/data/area/karamja/shilo_village/shilo_village.npcs.toml +++ b/data/area/karamja/shilo_village/shilo_village.npcs.toml @@ -17,6 +17,7 @@ categories = ["skeletons"] respawn_delay = 50 drop_table = "undead_one" examine = "A minion of Rashiliyia." +combat_def = "zombie" [undead_one_shilo_village_2] id = 505 @@ -35,6 +36,7 @@ categories = ["zombies"] respawn_delay = 50 drop_table = "undead_one" examine = "The animated dead; one of Rashiliyia's minions." +combat_def = "zombie" [vigroy_shilo_village] id = 511 @@ -67,18 +69,22 @@ examine = "This is Fernahei; he owns the local fishing tackle shop." [undead_one_shilo_village_3] id = 5355 clone = "undead_one_shilo_village" +combat_def = "zombie" [undead_one_shilo_village_4] id = 5356 clone = "undead_one_shilo_village" +combat_def = "zombie" [undead_one_shilo_village_5] id = 5357 clone = "undead_one_shilo_village_2" +combat_def = "zombie" [undead_one_shilo_village_6] id = 5358 clone = "undead_one_shilo_village_2" +combat_def = "zombie" [lapalok_shilo_village] id = 8483 diff --git a/data/area/karamja/ship_yard/karamja_ship_yard.combat.toml b/data/area/karamja/ship_yard/karamja_ship_yard.combat.toml new file mode 100644 index 0000000000..22635c008e --- /dev/null +++ b/data/area/karamja/ship_yard/karamja_ship_yard.combat.toml @@ -0,0 +1,6 @@ +[foreman] +attack_speed = 4 + +[foreman.melee] +range = 1 +target_hit = { offense = "crush", max = 30 } diff --git a/data/area/karamja/ship_yard/karamja_ship_yard.npcs.toml b/data/area/karamja/ship_yard/karamja_ship_yard.npcs.toml index 81fccbb793..4999c0de62 100644 --- a/data/area/karamja/ship_yard/karamja_ship_yard.npcs.toml +++ b/data/area/karamja/ship_yard/karamja_ship_yard.npcs.toml @@ -16,10 +16,12 @@ attack_bonus = 6 respawn_delay = 50 drop_table = "bones" examine = "Builds ships for a living." +combat_def = "man" [shipyard_worker_karamja_ship_yard_2] id = 39 clone = "shipyard_worker_karamja_ship_yard" +combat_def = "man" [shark_karamja_ship_yard] id = 40 @@ -36,4 +38,6 @@ max_hit_melee = 30 respawn_delay = 5 drop_table = "bones" examine = "The boss!" +max_hit_crush = 30 +combat_def = "foreman" diff --git a/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml b/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml index ed397b6df5..915c33bfaa 100644 --- a/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml +++ b/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml @@ -255,14 +255,35 @@ examine = "A senior citizen TzHaar-Hur." [tzhaar_hur_tzhaar_caves_2] id = 7767 drop_table = "tzhaar_hur" +combat_def = "tzhaar_hur" +hitpoints = 800 +att = 60 +str = 60 +def = 60 +mage = 80 +max_hit_crush = 70 [tzhaar_hur_tzhaar_caves_3] id = 7768 drop_table = "tzhaar_hur" +combat_def = "tzhaar_hur" +hitpoints = 800 +att = 60 +str = 60 +def = 60 +mage = 80 +max_hit_crush = 70 [tzhaar_hur_tzhaar_caves_4] id = 7769 drop_table = "tzhaar_hur" +combat_def = "tzhaar_hur" +hitpoints = 800 +att = 60 +str = 60 +def = 60 +mage = 80 +max_hit_crush = 70 [lava_monster_tzhaar_caves] id = 7772 @@ -290,7 +311,7 @@ att = 120 str = 140 def = 120 mage = 40 -combat_def = "tzhar_ket" +combat_def = "tzhaar_ket" max_hit_crush = 150 slayer_xp = 140.0 categories = ["tzhaar"] diff --git a/data/area/kharidian_desert/agility_pyramid/agility_pyramid.combat.toml b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.combat.toml new file mode 100644 index 0000000000..c4384e0bf5 --- /dev/null +++ b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.combat.toml @@ -0,0 +1,6 @@ +[vulture] +attack_speed = 4 + +[vulture.melee] +range = 1 +target_hit = { offense = "crush", max = 50 } diff --git a/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml index 85a5cd7421..ba6d3518fd 100644 --- a/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml +++ b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml @@ -21,22 +21,32 @@ examine = "If you see them circling: run." id = 3675 drop_table = "vulture" examine = "If you see them circling, run." +hitpoints = 100 +att = 40 +str = 40 +def = 10 +max_hit_crush = 50 +combat_def = "vulture" [mummy_agility_pyramid] id = 6753 drop_table = "mummy" +combat_def = "mummy" [mummy_agility_pyramid_2] id = 6754 drop_table = "mummy" +combat_def = "mummy" [mummy_agility_pyramid_3] id = 6755 drop_table = "mummy" +combat_def = "mummy" [mummy_agility_pyramid_4] id = 6756 drop_table = "mummy" +combat_def = "mummy" [agility_pyramid_block] id = 3124 diff --git a/data/area/kharidian_desert/al_kharid/al_kharid.npcs.toml b/data/area/kharidian_desert/al_kharid/al_kharid.npcs.toml index e2730ec387..6a367fecfe 100644 --- a/data/area/kharidian_desert/al_kharid/al_kharid.npcs.toml +++ b/data/area/kharidian_desert/al_kharid/al_kharid.npcs.toml @@ -102,6 +102,7 @@ attack_bonus = 10 respawn_delay = 25 drop_table = "citizen" examine = "Part of Al Kharid's elite fighting force." +combat_def = "guard" [man_al_kharid] id = 16 diff --git a/data/area/kharidian_desert/al_kharid/shantay_pass/shantay_pass.npcs.toml b/data/area/kharidian_desert/al_kharid/shantay_pass/shantay_pass.npcs.toml index 5f32643077..31e4efd118 100644 --- a/data/area/kharidian_desert/al_kharid/shantay_pass/shantay_pass.npcs.toml +++ b/data/area/kharidian_desert/al_kharid/shantay_pass/shantay_pass.npcs.toml @@ -43,6 +43,7 @@ hunt_mode = "cowardly" respawn_delay = 50 drop_table = "bones" examine = "He patrols the Shantay Pass." +combat_def = "guard" [shantay_guard_still] id = 838 diff --git a/data/area/kharidian_desert/bandit_camp/bandit_camp.npcs.toml b/data/area/kharidian_desert/bandit_camp/bandit_camp.npcs.toml index db1846f50b..4a7ca90f07 100644 --- a/data/area/kharidian_desert/bandit_camp/bandit_camp.npcs.toml +++ b/data/area/kharidian_desert/bandit_camp/bandit_camp.npcs.toml @@ -21,6 +21,9 @@ immune_poison = true respawn_delay = 15 drop_table = "bandit_bandit_camp" examine = "A tough-looking criminal." +combat_def = "guard" +attack_bonus = 11 +max_hit_stab = 30 [bandit_bandit_camp_2] id = 1927 @@ -47,6 +50,9 @@ immune_poison = true respawn_delay = 15 examine = "A tough-looking criminal." drop_table = "bandit_bandit_camp" +combat_def = "guard" +attack_bonus = 11 +max_hit_stab = 30 [mysterious_ghost_bandit_camp] id = 2384 @@ -54,6 +60,13 @@ id = 2384 [bandit_bandit_camp_7] id = 195 drop_table = "bandit" +combat_def = "guard" +hitpoints = 270 +att = 17 +str = 17 +def = 17 +attack_bonus = 11 +max_hit_stab = 30 [eblis_bandit_camp_2] id = 1923 diff --git a/data/area/kharidian_desert/bedabin_camp/bedabin_camp.combat.toml b/data/area/kharidian_desert/bedabin_camp/bedabin_camp.combat.toml new file mode 100644 index 0000000000..c630b5104a --- /dev/null +++ b/data/area/kharidian_desert/bedabin_camp/bedabin_camp.combat.toml @@ -0,0 +1,6 @@ +[bedabin_nomad_fighter] +attack_speed = 4 + +[bedabin_nomad_fighter.melee] +range = 1 +target_hit = { offense = "slash", max = 70 } diff --git a/data/area/kharidian_desert/bedabin_camp/bedabin_camp.npcs.toml b/data/area/kharidian_desert/bedabin_camp/bedabin_camp.npcs.toml index 3a19989c9a..089b2f16f6 100644 --- a/data/area/kharidian_desert/bedabin_camp/bedabin_camp.npcs.toml +++ b/data/area/kharidian_desert/bedabin_camp/bedabin_camp.npcs.toml @@ -26,6 +26,7 @@ attack_bonus = 9 respawn_delay = 50 drop_table = "bones" examine = "A bedabin nomad fighter - a sandy swordsman." +max_hit_slash = 70 [rug_merchant_bedabin_camp] id = 2292 diff --git a/data/area/kharidian_desert/harmony_island/harmony.npcs.toml b/data/area/kharidian_desert/harmony_island/harmony.npcs.toml index 7e4a5d410e..1ec7f2bdfa 100644 --- a/data/area/kharidian_desert/harmony_island/harmony.npcs.toml +++ b/data/area/kharidian_desert/harmony_island/harmony.npcs.toml @@ -46,101 +46,121 @@ categories = ["zombies"] respawn_delay = 50 examine = "Aaaarg, me hearty!" drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_harmony_2] id = 5631 clone = "zombie_pirate_harmony" drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_harmony_3] id = 5633 clone = "zombie_pirate_harmony" drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_harmony_4] id = 5634 clone = "zombie_pirate_harmony" drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_harmony_5] id = 5635 clone = "zombie_pirate_harmony" drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_harmony_6] id = 5637 clone = "zombie_pirate_harmony" drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_harmony_7] id = 5638 clone = "zombie_pirate_harmony" drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_harmony_8] id = 5639 clone = "zombie_pirate_harmony" drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_harmony_9] id = 5640 clone = "zombie_pirate_harmony" drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_harmony_10] id = 5641 clone = "zombie_pirate_harmony" drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_harmony_11] id = 5642 clone = "zombie_pirate_harmony" drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_harmony_12] id = 5644 clone = "zombie_pirate_harmony" drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_harmony_13] id = 5646 clone = "zombie_pirate_harmony" drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_harmony_14] id = 5647 clone = "zombie_pirate_harmony" drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_harmony_15] id = 5650 clone = "zombie_pirate_harmony" drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_harmony_16] id = 5656 clone = "zombie_pirate_harmony" drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_harmony_17] id = 5658 clone = "zombie_pirate_harmony" drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_harmony_18] id = 5659 clone = "zombie_pirate_harmony" drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_harmony_19] id = 5661 clone = "zombie_pirate_harmony" drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_harmony_20] id = 5665 clone = "zombie_pirate_harmony" drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [monk_harmony_5] id = 5669 diff --git a/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml b/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml index 4809e55a98..43fb4d716e 100644 --- a/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml +++ b/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml @@ -4,46 +4,57 @@ id = 5606 [zombie_pirate_windmill_cellar] id = 5630 drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_windmill_cellar_2] id = 5632 drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_windmill_cellar_3] id = 5636 drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_windmill_cellar_4] id = 5649 drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_windmill_cellar_5] id = 5651 drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_windmill_cellar_6] id = 5653 drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_windmill_cellar_7] id = 5655 drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_windmill_cellar_8] id = 5657 drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_windmill_cellar_9] id = 5660 drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_windmill_cellar_10] id = 5662 drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [zombie_pirate_windmill_cellar_11] id = 5664 drop_table = "zombie_pirate" +combat_def = "zombie_pirate" [monk_windmill_cellar] id = 5673 diff --git a/data/area/kharidian_desert/kalphite_hive/kalphite_hive.combat.toml b/data/area/kharidian_desert/kalphite_hive/kalphite_hive.combat.toml new file mode 100644 index 0000000000..393ea90355 --- /dev/null +++ b/data/area/kharidian_desert/kalphite_hive/kalphite_hive.combat.toml @@ -0,0 +1,6 @@ +[goat] +attack_speed = 4 + +[goat.melee] +range = 1 +target_hit = { offense = "crush", max = 40 } diff --git a/data/area/kharidian_desert/kalphite_hive/kalphite_hive.npcs.toml b/data/area/kharidian_desert/kalphite_hive/kalphite_hive.npcs.toml index c0a5736925..06a6bd7150 100644 --- a/data/area/kharidian_desert/kalphite_hive/kalphite_hive.npcs.toml +++ b/data/area/kharidian_desert/kalphite_hive/kalphite_hive.npcs.toml @@ -81,7 +81,20 @@ examine = "I don't think insect repellent will work..." [goat] id = 4933 drop_table = "goat" +hitpoints = 210 +att = 20 +str = 20 +def = 20 +attack_bonus = 10 +max_hit_crush = 40 [goat_2] id = 4934 -drop_table = "goat" \ No newline at end of file +drop_table = "goat" +hitpoints = 210 +att = 20 +str = 20 +def = 20 +attack_bonus = 10 +max_hit_crush = 40 +combat_def = "goat" \ No newline at end of file diff --git a/data/area/kharidian_desert/kharidian_desert.combat.toml b/data/area/kharidian_desert/kharidian_desert.combat.toml index 2186f91147..e8cea297c5 100644 --- a/data/area/kharidian_desert/kharidian_desert.combat.toml +++ b/data/area/kharidian_desert/kharidian_desert.combat.toml @@ -26,3 +26,10 @@ clone = "goat_kharidian_desert" [goat_kharidian_desert_2.melee] clone = "goat_kharidian_desert.melee" + +[desert_wolf] +attack_speed = 4 + +[desert_wolf.melee] +range = 1 +target_hit = { offense = "slash", max = 30 } diff --git a/data/area/kharidian_desert/kharidian_desert.npcs.toml b/data/area/kharidian_desert/kharidian_desert.npcs.toml index 63782fc0df..74d5e15e56 100644 --- a/data/area/kharidian_desert/kharidian_desert.npcs.toml +++ b/data/area/kharidian_desert/kharidian_desert.npcs.toml @@ -110,6 +110,7 @@ attack_bonus = 30 respawn_delay = 50 drop_table = "billy_goat" examine = "They'll eat anything!" +max_hit_crush = 60 [osman_kharidian_desert] id = 5283 @@ -131,6 +132,7 @@ categories = ["wolves"] respawn_delay = 50 drop_table = "wolf_bones" examine = "A vicious desert wolf." +max_hit_slash = 30 [desert_wolf_dark] id = 6050 @@ -139,6 +141,12 @@ clone = "desert_wolf" [desert_wolf_brown] id = 6051 clone = "desert_wolf" +hitpoints = 340 +att = 20 +str = 21 +def = 22 +max_hit_slash = 30 +combat_def = "desert_wolf" [eblis_kharidian_desert_2] id = 1925 diff --git a/data/area/kharidian_desert/klenters_pyramid/klenters_pyramid.npcs.toml b/data/area/kharidian_desert/klenters_pyramid/klenters_pyramid.npcs.toml index cf905aa783..a0d90deb12 100644 --- a/data/area/kharidian_desert/klenters_pyramid/klenters_pyramid.npcs.toml +++ b/data/area/kharidian_desert/klenters_pyramid/klenters_pyramid.npcs.toml @@ -25,26 +25,31 @@ respawn_delay = 10 categories = ["zombies"] examine = "This mummy looks like it means business!" drop_table = "mummy" +combat_def = "mummy" [mummy_klenters_pyramid_2] id = 2016 clone = "mummy_klenters_pyramid" drop_table = "mummy" +combat_def = "mummy" [mummy_klenters_pyramid_3] id = 2017 clone = "mummy_klenters_pyramid" drop_table = "mummy" +combat_def = "mummy" [mummy_klenters_pyramid_4] id = 2018 clone = "mummy_klenters_pyramid" drop_table = "mummy" +combat_def = "mummy" [mummy_klenters_pyramid_5] id = 2019 clone = "mummy_klenters_pyramid" drop_table = "mummy" +combat_def = "mummy" [high_priest_klenters_pyramid_2] id = 1986 diff --git a/data/area/kharidian_desert/mining_camp/desert_mining_camp.combat.toml b/data/area/kharidian_desert/mining_camp/desert_mining_camp.combat.toml new file mode 100644 index 0000000000..906a4c2809 --- /dev/null +++ b/data/area/kharidian_desert/mining_camp/desert_mining_camp.combat.toml @@ -0,0 +1,13 @@ +[rowdy_slave] +attack_speed = 4 + +[rowdy_slave.melee] +range = 1 +target_hit = { offense = "crush", max = 20 } + +[mercenary_captain] +attack_speed = 4 + +[mercenary_captain.melee] +range = 1 +target_hit = { offense = "slash", max = 50 } diff --git a/data/area/kharidian_desert/mining_camp/desert_mining_camp.npcs.toml b/data/area/kharidian_desert/mining_camp/desert_mining_camp.npcs.toml index 15e1e9bcd1..8bcf2fa402 100644 --- a/data/area/kharidian_desert/mining_camp/desert_mining_camp.npcs.toml +++ b/data/area/kharidian_desert/mining_camp/desert_mining_camp.npcs.toml @@ -32,67 +32,141 @@ attack_bonus = 9 respawn_delay = 50 examine = "He looks a bit aggressive." drop_table = "mercenary" +combat_def = "guard" [mercenary_desert_mining_camp_2] id = 4990 clone = "mercenary_desert_mining_camp" drop_table = "mercenary" +combat_def = "guard" [mercenary_desert_mining_camp_3] id = 4991 clone = "mercenary_desert_mining_camp" drop_table = "mercenary" +combat_def = "guard" [mercenary_desert_mining_camp_4] id = 4992 clone = "mercenary_desert_mining_camp" drop_table = "mercenary" +combat_def = "guard" [guard_desert_mining_camp] id = 4993 examine = "He looks a bit aggressive." drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 [guard_desert_mining_camp_2] id = 4994 examine = "He looks a bit aggressive." drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 [guard_desert_mining_camp_3] id = 4995 examine = "He looks a bit aggressive." drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 [guard_desert_mining_camp_4] id = 4996 examine = "He looks a bit aggressive." drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 [guard_desert_mining_camp_5] id = 4997 examine = "He looks a bit aggressive." drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 [guard_desert_mining_camp_6] id = 4998 examine = "He looks a bit aggressive." drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 [guard_desert_mining_camp_7] id = 4999 drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 [guard_desert_mining_camp_8] id = 5000 drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 [guard_desert_mining_camp_9] id = 5001 drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 [guard_desert_mining_camp_10] id = 5002 drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 [male_slave_desert_mining_camp_3] id = 825 @@ -111,6 +185,7 @@ max_hit_melee = 20 respawn_delay = 50 examine = "He looks a bit aggressive." drop_table = "rowdy_slave" +max_hit_crush = 20 [mercenary_captain] id = 830 @@ -126,6 +201,7 @@ attack_bonus = 9 respawn_delay = 50 drop_table = "mercenary_captain" examine = "He looks a bit aggressive." +max_hit_slash = 50 [captain_siad_desert_mining_camp] id = 831 diff --git a/data/area/kharidian_desert/nardah/nardah.combat.toml b/data/area/kharidian_desert/nardah/nardah.combat.toml new file mode 100644 index 0000000000..ef10a5b3d1 --- /dev/null +++ b/data/area/kharidian_desert/nardah/nardah.combat.toml @@ -0,0 +1,20 @@ +[poltenip] +attack_speed = 4 + +[poltenip.melee] +range = 1 +target_hit = { offense = "stab", max = 30 } + +[radat] +attack_speed = 4 + +[radat.melee] +range = 1 +target_hit = { offense = "stab", max = 30 } + +[billy_goat] +attack_speed = 4 + +[billy_goat.melee] +range = 1 +target_hit = { offense = "crush", max = 60 } diff --git a/data/area/kharidian_desert/nardah/nardah.npcs.toml b/data/area/kharidian_desert/nardah/nardah.npcs.toml index 3ff617754d..1232147174 100644 --- a/data/area/kharidian_desert/nardah/nardah.npcs.toml +++ b/data/area/kharidian_desert/nardah/nardah.npcs.toml @@ -73,6 +73,7 @@ attack_bonus = 4 respawn_delay = 50 drop_table = "bones" examine = "The mayor's guard." +max_hit_stab = 30 [radat] id = 3043 @@ -86,6 +87,7 @@ attack_bonus = 4 respawn_delay = 50 drop_table = "bones" examine = "The mayor's guard." +max_hit_stab = 30 [shiratti_the_custodian] id = 3044 @@ -107,6 +109,8 @@ attack_bonus = 30 respawn_delay = 50 examine = "They'll eat anything!" drop_table = "billy_goat" +max_hit_crush = 60 +combat_def = "billy_goat" [artimeus] id = 5109 diff --git a/data/area/kharidian_desert/pollnivneach/dungeon/pollninveach_dungeon.npcs.toml b/data/area/kharidian_desert/pollnivneach/dungeon/pollninveach_dungeon.npcs.toml index 80c2443889..4919866748 100644 --- a/data/area/kharidian_desert/pollnivneach/dungeon/pollninveach_dungeon.npcs.toml +++ b/data/area/kharidian_desert/pollnivneach/dungeon/pollninveach_dungeon.npcs.toml @@ -17,6 +17,7 @@ categories = ["basilisks"] respawn_delay = 15 examine = "The eyes of evil." drop_table = "basilisk" +combat_def = "basilisk" [catolax_pollninveach_dungeon] id = 7783 @@ -34,18 +35,32 @@ slayer_level = 60 drop_table = "aberrant_spectre" categories = ["aberrant_spectre"] examine = "A very smelly ghost." +hitpoints = 900 +max_hit_magic = 80 [aberrant_spectre_pollninveach_2] id = 7802 clone = "aberrant_spectre_pollninveach" +hitpoints = 900 +def = 90 +mage = 105 +max_hit_magic = 80 [aberrant_spectre_pollninveach_3] id = 7803 clone = "aberrant_spectre_pollninveach" +hitpoints = 900 +def = 90 +mage = 105 +max_hit_magic = 80 [aberrant_spectre_pollninveach_4] id = 7804 clone = "aberrant_spectre_pollninveach" +hitpoints = 900 +def = 90 +mage = 105 +max_hit_magic = 80 [catolax_pollninveach_dungeon_2] id = 7782 diff --git a/data/area/kharidian_desert/rock_island_prison/rock_island_prison.npcs.toml b/data/area/kharidian_desert/rock_island_prison/rock_island_prison.npcs.toml index 864734fa4b..a5cefe4c09 100644 --- a/data/area/kharidian_desert/rock_island_prison/rock_island_prison.npcs.toml +++ b/data/area/kharidian_desert/rock_island_prison/rock_island_prison.npcs.toml @@ -5,6 +5,7 @@ examine = "He's going for that 'stripy' look." [gull_rock_island] id = 1400 drop_table = "bones" +combat_def = "seagull" [customs_officer] id = 7837 diff --git a/data/area/kharidian_desert/sophanem/sophanem.combat.toml b/data/area/kharidian_desert/sophanem/sophanem.combat.toml index f969b7b6e9..b0b45f1c1a 100644 --- a/data/area/kharidian_desert/sophanem/sophanem.combat.toml +++ b/data/area/kharidian_desert/sophanem/sophanem.combat.toml @@ -9,3 +9,10 @@ range = 1 anim = "locust_attack" target_sound = "locust_attack" target_hit = { offense = "crush", max = 30 } + +[plague_frog] +attack_speed = 4 + +[plague_frog.melee] +range = 1 +target_hit = { offense = "crush", max = 20 } diff --git a/data/area/kharidian_desert/sophanem/sophanem.npcs.toml b/data/area/kharidian_desert/sophanem/sophanem.npcs.toml index 3df19d0ba8..f88fb23c49 100644 --- a/data/area/kharidian_desert/sophanem/sophanem.npcs.toml +++ b/data/area/kharidian_desert/sophanem/sophanem.npcs.toml @@ -53,6 +53,7 @@ respawn_delay = 50 categories = ["frogs"] examine = "A very smelly frog." drop_table = "bones" +max_hit_crush = 20 [plague_cow] id = 1998 diff --git a/data/area/kharidian_desert/sophanem/sophanem_dungeon/sophanem_dungeon.npcs.toml b/data/area/kharidian_desert/sophanem/sophanem_dungeon/sophanem_dungeon.npcs.toml index 38304c9837..39340a281f 100644 --- a/data/area/kharidian_desert/sophanem/sophanem_dungeon/sophanem_dungeon.npcs.toml +++ b/data/area/kharidian_desert/sophanem/sophanem_dungeon/sophanem_dungeon.npcs.toml @@ -72,6 +72,7 @@ slayer_xp = 92.5 categories = ["scabarites"] drop_table = "locust_rider" examine = "A mounted archer." +combat_def = "locust_rider" [maisa_sophanem_dungeon] id = 5280 diff --git a/data/area/kharidian_desert/ullek/ullek.combat.toml b/data/area/kharidian_desert/ullek/ullek.combat.toml new file mode 100644 index 0000000000..8c3aad5cf7 --- /dev/null +++ b/data/area/kharidian_desert/ullek/ullek.combat.toml @@ -0,0 +1,6 @@ +[crocodile] +attack_speed = 4 + +[crocodile.melee] +range = 1 +target_hit = { offense = "slash", max = 60 } diff --git a/data/area/kharidian_desert/ullek/ullek.npcs.toml b/data/area/kharidian_desert/ullek/ullek.npcs.toml index 5982e4c494..cae8a66ef6 100644 --- a/data/area/kharidian_desert/ullek/ullek.npcs.toml +++ b/data/area/kharidian_desert/ullek/ullek.npcs.toml @@ -3,40 +3,73 @@ id = 6761 categories = ["zombies"] examine = "Cut-down and dried." drop_table = "dried_zombie" +combat_def = "zombie" [dried_zombie_ullek_2] id = 6762 categories = ["zombies"] examine = "Needs moisturising." drop_table = "dried_zombie" +combat_def = "zombie" [dried_zombie_ullek_3] id = 6763 categories = ["zombies"] examine = "I bet it's parched." drop_table = "dried_zombie" +combat_def = "zombie" [skeleton_ullek] id = 6764 drop_table = "skeleton" +combat_def = "skeleton_unarmed" +hitpoints = 240 +att = 17 +str = 17 +def = 17 +max_hit_crush = 30 [skeleton_ullek_2] id = 6765 drop_table = "skeleton" +combat_def = "skeleton_unarmed" +hitpoints = 240 +att = 17 +str = 17 +def = 17 +max_hit_crush = 30 [skeleton_ullek_3] id = 6766 drop_table = "skeleton" +combat_def = "skeleton_unarmed" +hitpoints = 240 +att = 17 +str = 17 +def = 17 +max_hit_crush = 30 [skeleton_ullek_4] id = 6767 drop_table = "skeleton" +combat_def = "skeleton_unarmed" +hitpoints = 240 +att = 17 +str = 17 +def = 17 +max_hit_crush = 30 [skeleton_ullek_5] id = 6768 categories = ["skeletons"] examine = "Heartless, in every sense of the word." drop_table = "skeleton" +combat_def = "skeleton_unarmed" +hitpoints = 240 +att = 17 +str = 17 +def = 17 +max_hit_crush = 30 [scabaras_locust_ullek] id = 6776 @@ -58,6 +91,12 @@ drop_table = "locust_ranger" [crocodile_ullek] id = 6779 drop_table = "crocodile" +hitpoints = 620 +att = 53 +str = 54 +def = 54 +max_hit_slash = 60 +combat_def = "crocodile" [lead_archaeologist_abigail] id = 6786 diff --git a/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml b/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml index f6986facc3..5a2676eda7 100644 --- a/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml +++ b/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml @@ -2,6 +2,7 @@ id = 7497 examine = "A rocky horror." drop_table = "empty" +combat_def = "guard" [golems_remains_uzer_mastaba] id = 7498 diff --git a/data/area/kharidian_desert/uzer/uzer.npcs.toml b/data/area/kharidian_desert/uzer/uzer.npcs.toml index cdd8c2dcf2..d39ad83ab9 100644 --- a/data/area/kharidian_desert/uzer/uzer.npcs.toml +++ b/data/area/kharidian_desert/uzer/uzer.npcs.toml @@ -2,24 +2,29 @@ id = 7492 examine = "A desert dweller taken to banditry." drop_table = "bandit_looter" +combat_def = "guard" [bandit_looter_uzer_2] id = 7493 examine = "Calls himself an archaeologist." drop_table = "bandit_looter" +combat_def = "guard" [bandit_looter_uzer_3] id = 7494 examine = "He hasn't found much of use, clearly." drop_table = "bandit_looter" +combat_def = "guard" [bandit_looter_uzer_4] id = 7495 examine = "An amateur historian with added greed." drop_table = "bandit_looter" +combat_def = "guard" [bandit_looter_uzer_5] id = 7496 examine = "It all started with her love of genealogy." drop_table = "bandit_looter" +combat_def = "guard" diff --git a/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.combat.toml b/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.combat.toml new file mode 100644 index 0000000000..bf8ad7e4e3 --- /dev/null +++ b/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.combat.toml @@ -0,0 +1,13 @@ +[giant_frog] +attack_speed = 4 + +[giant_frog.melee] +range = 1 +target_hit = { offense = "crush", max = 90 } + +[big_frog] +attack_speed = 4 + +[big_frog.melee] +range = 1 +target_hit = { offense = "crush", max = 30 } diff --git a/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.npcs.toml b/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.npcs.toml index ff6e91ece5..41f1d86821 100644 --- a/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.npcs.toml +++ b/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.npcs.toml @@ -10,6 +10,7 @@ respawn_delay = 50 categories = ["frogs"] examine = "It didn't get that big eating flies." drop_table = "giant_frog" +max_hit_crush = 90 [big_frog] id = 1829 @@ -23,6 +24,7 @@ respawn_delay = 50 categories = ["frogs"] examine = "It didn't get that big eating flies." drop_table = "big_frog" +max_hit_crush = 30 [cave_bug_larva] id = 1833 diff --git a/data/area/misthalin/dorgesh_kaan/dorgesh_kaan.npcs.toml b/data/area/misthalin/dorgesh_kaan/dorgesh_kaan.npcs.toml index 17d8cfb848..126ecd613e 100644 --- a/data/area/misthalin/dorgesh_kaan/dorgesh_kaan.npcs.toml +++ b/data/area/misthalin/dorgesh_kaan/dorgesh_kaan.npcs.toml @@ -222,12 +222,26 @@ id = 5800 categories = ["goblins"] examine = "He keeps order in the city." drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 [guard_dorgesh_kaan_2] id = 5801 categories = ["goblins"] examine = "He keeps order in the city." drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 [zanik_dorgesh_kaan_2] id = 5802 diff --git a/data/area/misthalin/edgeville/edgeville.npcs.toml b/data/area/misthalin/edgeville/edgeville.npcs.toml index f59e509881..cf3fbf2f9f 100644 --- a/data/area/misthalin/edgeville/edgeville.npcs.toml +++ b/data/area/misthalin/edgeville/edgeville.npcs.toml @@ -32,6 +32,13 @@ id = 206 categories = ["dwarves"] examine = "A dwarven guard." drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 [mysterious_ghost_edgeville] id = 2386 @@ -91,6 +98,8 @@ attack_bonus = -15 respawn_delay = 45 drop_table = "ram" examine = "White and fluffy." +combat_def = "ram_freds_farm" +max_hit_crush = 10 [outlaw_edgeville] id = 5842 diff --git a/data/area/misthalin/ham_hideout/ham_hideout.npcs.toml b/data/area/misthalin/ham_hideout/ham_hideout.npcs.toml index 272f28865f..3368d5dd22 100644 --- a/data/area/misthalin/ham_hideout/ham_hideout.npcs.toml +++ b/data/area/misthalin/ham_hideout/ham_hideout.npcs.toml @@ -14,6 +14,7 @@ max_hit_melee = 20 respawn_delay = 25 drop_table = "ham_guard" examine = "A guard for the humans against monster group." +combat_def = "guard" [ham_guard_ham_cave_2] id = 1711 @@ -27,6 +28,7 @@ max_hit_melee = 30 respawn_delay = 25 examine = "A guard for the humans against monster group." drop_table = "h_a_m_guard" +combat_def = "guard" [ham_guard_ham_cave_3] id = 1712 @@ -40,6 +42,7 @@ max_hit_melee = 30 respawn_delay = 25 examine = "A guard for the humans against monster group." drop_table = "h_a_m_guard" +combat_def = "guard" [ham_deacon_ham_cave] id = 1713 diff --git a/data/area/misthalin/ham_hideout/store_rooms/ham_store_rooms.npcs.toml b/data/area/misthalin/ham_hideout/store_rooms/ham_store_rooms.npcs.toml index 61c24136dc..84bfe66a03 100644 --- a/data/area/misthalin/ham_hideout/store_rooms/ham_store_rooms.npcs.toml +++ b/data/area/misthalin/ham_hideout/store_rooms/ham_store_rooms.npcs.toml @@ -2,24 +2,59 @@ id = 4307 examine = "A guard for the humans against monster group." drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 [guard_ham_store_rooms_2] id = 4308 clone = "guard_ham_store_rooms" drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 [guard_ham_store_rooms_3] id = 4309 clone = "guard_ham_store_rooms" drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 [guard_ham_store_rooms_4] id = 4310 clone = "guard_ham_store_rooms" drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 [guard_ham_store_rooms_5] id = 4311 clone = "guard_ham_store_rooms" drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 diff --git a/data/area/misthalin/lumbridge/cellar/goblin_mines/goblin_mines.npcs.toml b/data/area/misthalin/lumbridge/cellar/goblin_mines/goblin_mines.npcs.toml index 3417bd0b4f..10461682be 100644 --- a/data/area/misthalin/lumbridge/cellar/goblin_mines/goblin_mines.npcs.toml +++ b/data/area/misthalin/lumbridge/cellar/goblin_mines/goblin_mines.npcs.toml @@ -11,18 +11,22 @@ categories = ["goblins"] respawn_delay = 50 drop_table = "cave_goblin_miner" examine = "This one is slacking off." +combat_def = "cave_goblin" [cave_goblin_miner_2] id = 2070 clone = "cave_goblin_miner" +combat_def = "cave_goblin" [cave_goblin_miner_3] id = 2071 clone = "cave_goblin_miner" +combat_def = "cave_goblin" [cave_goblin_miner_4] id = 2072 clone = "cave_goblin_miner" +combat_def = "cave_goblin" [cave_goblin_guard] id = 2073 @@ -38,6 +42,7 @@ categories = ["goblins"] respawn_delay = 50 drop_table = "cave_goblin_guard" examine = "He protects the miners." +combat_def = "cave_goblin" [cave_goblin_guard_2] id = 2074 @@ -45,6 +50,7 @@ clone = "cave_goblin_guard" att = 22 str = 16 def = 22 +combat_def = "cave_goblin" [goblin_guard] id = 489 @@ -64,10 +70,12 @@ examine = "He doesn't look like he'd trust his own mother." [cave_goblin_miner_5] id = 2075 clone = "cave_goblin_miner" +combat_def = "cave_goblin" [cave_goblin_miner_6] id = 2076 clone = "cave_goblin_miner" +combat_def = "cave_goblin" [mistag] id = 2084 diff --git a/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml b/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml index ff6d8a45cd..5d6b9ccc67 100644 --- a/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml +++ b/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml @@ -17,6 +17,9 @@ id = 9708 [giant_spider_lumbridge] id = 12352 drop_table = "giant_spider" +combat_def = "giant_spider" +hitpoints = 50 +max_hit_stab = 10 [sergeant_mossfists] id = 5889 diff --git a/data/area/misthalin/tutorial_island/tutorial_island.npcs.toml b/data/area/misthalin/tutorial_island/tutorial_island.npcs.toml index e2c26f16e0..7857242498 100644 --- a/data/area/misthalin/tutorial_island/tutorial_island.npcs.toml +++ b/data/area/misthalin/tutorial_island/tutorial_island.npcs.toml @@ -64,6 +64,7 @@ combat_def = "chicken_tutorial_island" categories = ["chickens", "birds"] drop_table = "chicken" examine = "Yep. Definitely a chicken." +hitpoints = 30 [fishing_spot_tutorial_island] id = 952 diff --git a/data/area/misthalin/varrock/air_rune_temple/air_rune_temple.npcs.toml b/data/area/misthalin/varrock/air_rune_temple/air_rune_temple.npcs.toml index bdabfde158..2d5c0f2681 100644 --- a/data/area/misthalin/varrock/air_rune_temple/air_rune_temple.npcs.toml +++ b/data/area/misthalin/varrock/air_rune_temple/air_rune_temple.npcs.toml @@ -7,4 +7,6 @@ attack_bonus = -47 respawn_delay = 25 examine = "A cute bunny rabbit." drop_table = "rabbit" +combat_def = "rabbit_miscellania" +max_hit_crush = 10 diff --git a/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.combat.toml b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.combat.toml new file mode 100644 index 0000000000..8fe2c50a6e --- /dev/null +++ b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.combat.toml @@ -0,0 +1,27 @@ +[angry_unicorn] +attack_speed = 4 + +[angry_unicorn.melee] +range = 1 +target_hit = { offense = "stab", max = 50 } + +[fear_reaper] +attack_speed = 4 + +[fear_reaper.melee] +range = 1 +target_hit = { offense = "slash", max = 60 } + +[confusion_beast] +attack_speed = 4 + +[confusion_beast.melee] +range = 1 +target_hit = { offense = "slash", max = 60 } + +[hopeless_creature] +attack_speed = 4 + +[hopeless_creature.melee] +range = 1 +target_hit = { offense = "slash", max = 70 } diff --git a/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.npcs.toml b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.npcs.toml index 80c8a559fa..e14864044d 100644 --- a/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.npcs.toml +++ b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.npcs.toml @@ -8,6 +8,8 @@ style = "stab" max_hit_melee = 50 examine = "He looks a little on the cross side!" drop_table = "empty" +max_hit_stab = 50 +combat_def = "angry_unicorn" [angry_giant_rat_tolnas_rift] id = 3662 @@ -20,6 +22,7 @@ max_hit_melee = 50 categories = ["rats"] drop_table = "bones" examine = "He looks a little on the cross side!" +combat_def = "giant_rat" [angry_goblin_tolnas_rift] id = 3663 @@ -32,6 +35,7 @@ max_hit_melee = 50 categories = ["goblins"] examine = "He looks a little on the cross side!" drop_table = "empty" +combat_def = "goblin" [angry_bear_tolnas_rift] id = 3664 @@ -43,6 +47,7 @@ style = "stab" max_hit_melee = 50 examine = "He looks a little on the cross side!" drop_table = "empty" +combat_def = "bear" [fear_reaper_tolnas_rift] id = 3665 @@ -55,6 +60,8 @@ max_hit_melee = 60 hunt_mode = "cowardly" examine = "AHHHH!" drop_table = "empty" +max_hit_slash = 60 +combat_def = "fear_reaper" [confusion_beast_tolnas_rift] id = 3666 @@ -68,6 +75,8 @@ hunt_mode = "cowardly" respawn_delay = 25 examine = "What on Gielinor is that?!?" drop_table = "empty" +max_hit_slash = 60 +combat_def = "confusion_beast" [hopeless_creature_tolnas_rift] id = 3667 @@ -81,10 +90,13 @@ hunt_mode = "cowardly" respawn_delay = 25 examine = "A hopeless poor creature." drop_table = "empty" +max_hit_slash = 70 +combat_def = "hopeless_creature" [angry_giant_rat_tolnas_rift_2] id = 4940 clone = "angry_giant_rat_tolnas_rift" +combat_def = "giant_rat" [tolna_south] id = 3658 diff --git a/data/area/misthalin/varrock/varrock.npcs.toml b/data/area/misthalin/varrock/varrock.npcs.toml index 72e7c13580..4072e34652 100644 --- a/data/area/misthalin/varrock/varrock.npcs.toml +++ b/data/area/misthalin/varrock/varrock.npcs.toml @@ -554,6 +554,9 @@ id = 8906 [man_varrock_4] id = 12346 drop_table = "man" +combat_def = "man" +hitpoints = 70 +max_hit_crush = 10 [orlando_smith] id = 5965 @@ -579,10 +582,16 @@ examine = "A crafter at the pinnacle of his art." [man_varrock] id = 12345 drop_table = "man" +combat_def = "man" +hitpoints = 70 +max_hit_crush = 10 [man_varrock_2] id = 12347 drop_table = "man" +combat_def = "man" +hitpoints = 70 +max_hit_crush = 10 [tramp_varrock_2] id = 2792 @@ -640,11 +649,17 @@ drop_table = "guard" id = 5923 examine = "One of Gielinor's many citizens." drop_table = "man" +combat_def = "man" +hitpoints = 70 +max_hit_crush = 10 [woman_varrock] id = 5924 examine = "One of Gielinor's many citizens." drop_table = "woman" +combat_def = "woman" +hitpoints = 70 +max_hit_crush = 10 [benny] id = 5925 diff --git a/data/area/misthalin/zanaris/evil_chicken_lair/evil_chicken_lair.npcs.toml b/data/area/misthalin/zanaris/evil_chicken_lair/evil_chicken_lair.npcs.toml index 42be648938..97f1ecc298 100644 --- a/data/area/misthalin/zanaris/evil_chicken_lair/evil_chicken_lair.npcs.toml +++ b/data/area/misthalin/zanaris/evil_chicken_lair/evil_chicken_lair.npcs.toml @@ -15,16 +15,37 @@ id = 4674 categories = ["black_dragons"] examine = "A fierce dragon with black scales!" drop_table = "black_dragon" +combat_def = "black_dragon" +hitpoints = 1900 +att = 200 +str = 200 +def = 200 +mage = 100 +max_hit_slash = 210 [black_dragon_evil_chicken_lair_2] id = 4675 categories = ["black_dragons"] examine = "A fierce dragon with black scales!" drop_table = "black_dragon" +combat_def = "black_dragon" +hitpoints = 1900 +att = 200 +str = 200 +def = 200 +mage = 100 +max_hit_slash = 210 [black_dragon_evil_chicken_lair_3] id = 4676 categories = ["black_dragons"] examine = "A fierce dragon with black scales!" drop_table = "black_dragon" +combat_def = "black_dragon" +hitpoints = 1900 +att = 200 +str = 200 +def = 200 +mage = 100 +max_hit_slash = 210 diff --git a/data/area/morytania/burgh_de_rott/burgh_de_rott.npcs.toml b/data/area/morytania/burgh_de_rott/burgh_de_rott.npcs.toml index 83bc0cb61f..b84a3604ee 100644 --- a/data/area/morytania/burgh_de_rott/burgh_de_rott.npcs.toml +++ b/data/area/morytania/burgh_de_rott/burgh_de_rott.npcs.toml @@ -10,34 +10,76 @@ id = 3513 [vampyre_juvinate_3] id = 3522 drop_table = "vampyre_juvinate" +combat_def = "vampyre" +hitpoints = 850 +att = 40 +str = 40 +def = 30 +max_hit_crush = 50 [vampyre_juvinate_4] id = 3523 drop_table = "vampyre_juvinate" +combat_def = "vampyre" +hitpoints = 850 +att = 40 +str = 40 +def = 30 +max_hit_crush = 50 [vampyre_juvinate_5] id = 3524 drop_table = "vampyre_juvinate" +combat_def = "vampyre" +hitpoints = 850 +att = 40 +str = 40 +def = 30 +max_hit_crush = 50 [vampyre_juvinate_6] id = 3525 drop_table = "vampyre_juvinate" +combat_def = "vampyre" +hitpoints = 850 +att = 40 +str = 40 +def = 30 +max_hit_crush = 50 [vampyre_juvenile] id = 3531 categories = ["vampyres"] examine = "He looks really hungry!" drop_table = "empty" +combat_def = "vampyre" +hitpoints = 600 +att = 40 +str = 30 +def = 30 +max_hit_crush = 40 [vampyre_juvenile_2] id = 3532 categories = ["vampyres"] examine = "She looks really hungry!" drop_table = "empty" +combat_def = "vampyre" +hitpoints = 600 +att = 40 +str = 30 +def = 30 +max_hit_crush = 40 [vampyre_juvenile_3] id = 3533 drop_table = "empty" +combat_def = "vampyre" +hitpoints = 600 +att = 40 +str = 30 +def = 30 +max_hit_crush = 40 [elisabeta] id = 3540 @@ -121,34 +163,97 @@ id = 3575 [vyrewatch] id = 7691 drop_table = "vyrewatch" +hitpoints = 900 +att = 110 +str = 96 +def = 85 +mage = 110 +range = 110 +max_hit_crush = 110 [vyrewatch_2] id = 7692 drop_table = "vyrewatch" +hitpoints = 1050 +att = 120 +str = 106 +def = 85 +mage = 120 +range = 120 +max_hit_crush = 120 +combat_def = "vyrewatch" [vyrewatch_3] id = 7693 drop_table = "vyrewatch" +hitpoints = 1100 +att = 120 +str = 116 +def = 85 +mage = 120 +range = 120 +max_hit_crush = 130 +combat_def = "vyrewatch" [vyrewatch_4] id = 7694 drop_table = "vyrewatch" +hitpoints = 1100 +att = 120 +str = 116 +def = 85 +mage = 120 +range = 120 +max_hit_crush = 130 +combat_def = "vyrewatch" [vyrewatch_5] id = 7699 drop_table = "vyrewatch" +hitpoints = 900 +att = 110 +str = 96 +def = 85 +mage = 110 +range = 110 +max_hit_crush = 110 +combat_def = "vyrewatch" [vyrewatch_6] id = 7700 drop_table = "vyrewatch" +hitpoints = 1050 +att = 120 +str = 106 +def = 85 +mage = 120 +range = 120 +max_hit_crush = 120 +combat_def = "vyrewatch" [vyrewatch_7] id = 7701 drop_table = "vyrewatch" +hitpoints = 1100 +att = 120 +str = 116 +def = 85 +mage = 120 +range = 120 +max_hit_crush = 130 +combat_def = "vyrewatch" [vyrewatch_8] id = 7702 drop_table = "vyrewatch" +hitpoints = 1100 +att = 120 +str = 116 +def = 85 +mage = 120 +range = 120 +max_hit_crush = 130 +combat_def = "vyrewatch" [ivan_strom] id = 7708 diff --git a/data/area/morytania/darkmeyer/darkmeyer.combat.toml b/data/area/morytania/darkmeyer/darkmeyer.combat.toml new file mode 100644 index 0000000000..c259e2bc3a --- /dev/null +++ b/data/area/morytania/darkmeyer/darkmeyer.combat.toml @@ -0,0 +1,6 @@ +[vyrewatch] +attack_speed = 8 + +[vyrewatch.melee] +range = 1 +target_hit = { offense = "crush", max = 110 } diff --git a/data/area/morytania/darkmeyer/darkmeyer.npcs.toml b/data/area/morytania/darkmeyer/darkmeyer.npcs.toml index bf1f906be5..48bd5f5cb1 100644 --- a/data/area/morytania/darkmeyer/darkmeyer.npcs.toml +++ b/data/area/morytania/darkmeyer/darkmeyer.npcs.toml @@ -23,21 +23,47 @@ immune_cannon = true respawn_delay = 25 examine = "An evil, bloodsucking vampyre." drop_table = "vyrewatch" +max_hit_crush = 110 +combat_def = "vyrewatch" [vyrewatch_darkmeyer_2] id = 4807 clone = "vyrewatch_darkmeyer" drop_table = "vyrewatch" +hitpoints = 1100 +att = 120 +str = 116 +def = 85 +mage = 120 +range = 120 +max_hit_crush = 130 +combat_def = "vyrewatch" [vyrewatch_darkmeyer_3] id = 4819 clone = "vyrewatch_darkmeyer" drop_table = "vyrewatch" +hitpoints = 1100 +att = 120 +str = 116 +def = 85 +mage = 120 +range = 120 +max_hit_crush = 130 +combat_def = "vyrewatch" [vyrewatch_darkmeyer_4] id = 4832 clone = "vyrewatch_darkmeyer" drop_table = "vyrewatch" +hitpoints = 1100 +att = 120 +str = 116 +def = 85 +mage = 120 +range = 120 +max_hit_crush = 130 +combat_def = "vyrewatch" [vyrewatch_darkmeyer_5] id = 4834 @@ -58,16 +84,34 @@ immune_cannon = true respawn_delay = 25 examine = "A thirsty-looking, airborne bloodsucker!" drop_table = "vyrewatch" +max_hit_crush = 120 +combat_def = "vyrewatch" [vyrewatch_darkmeyer_6] id = 4835 clone = "vyrewatch_darkmeyer" drop_table = "vyrewatch" +hitpoints = 1100 +att = 120 +str = 116 +def = 85 +mage = 120 +range = 120 +max_hit_crush = 130 +combat_def = "vyrewatch" [vyrewatch_darkmeyer_7] id = 4836 clone = "vyrewatch_darkmeyer" drop_table = "vyrewatch" +hitpoints = 1100 +att = 120 +str = 116 +def = 85 +mage = 120 +range = 120 +max_hit_crush = 130 +combat_def = "vyrewatch" [safalaan_darkmeyer_2] id = 4713 diff --git a/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.combat.toml b/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.combat.toml new file mode 100644 index 0000000000..74c9fe27a9 --- /dev/null +++ b/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.combat.toml @@ -0,0 +1,6 @@ +[giant_crab] +attack_speed = 4 + +[giant_crab.melee] +range = 1 +target_hit = { offense = "crush", max = 90 } diff --git a/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.npcs.toml b/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.npcs.toml index 7c06851b37..af9ae4fe75 100644 --- a/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.npcs.toml +++ b/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.npcs.toml @@ -2,11 +2,22 @@ id = 7828 examine = "An extremely vicious lobster." drop_table = "giant_lobster" +hitpoints = 500 +att = 40 +str = 30 +def = 40 +max_hit_stab = 40 [giant_crab_dragontooth_shipwreck] id = 7829 examine = "Nice claw." drop_table = "empty" +hitpoints = 1800 +att = 50 +str = 80 +def = 200 +max_hit_crush = 90 +combat_def = "giant_crab" [karamthulhu_dragontooth_shipwreck] id = 7858 diff --git a/data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.combat.toml b/data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.combat.toml new file mode 100644 index 0000000000..df63421e5a --- /dev/null +++ b/data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.combat.toml @@ -0,0 +1,6 @@ +[experiment] +attack_speed = 4 + +[experiment.melee] +range = 1 +target_hit = { offense = "stab", max = 60 } diff --git a/data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.npcs.toml b/data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.npcs.toml index 51efab0765..a00eaa058b 100644 --- a/data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.npcs.toml +++ b/data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.npcs.toml @@ -9,6 +9,8 @@ max_hit_melee = 60 respawn_delay = 8 drop_table = "experiment" examine = "It has a key hanging from its collar." +max_hit_stab = 60 +combat_def = "experiment" [experiment_spider] id = 1677 @@ -19,6 +21,8 @@ max_hit_melee = 10 respawn_delay = 50 drop_table = "experiment" examine = "One of Fenkenstrain's failed experiments." +max_hit_crush = 10 +combat_def = "experiment" [experiment_sheep] id = 1678 @@ -29,4 +33,6 @@ max_hit_melee = 10 respawn_delay = 50 drop_table = "experiment" examine = "One of Fenkenstrain's failed experiments." +max_hit_crush = 10 +combat_def = "experiment" diff --git a/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.combat.toml b/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.combat.toml new file mode 100644 index 0000000000..9fd5e8bbcd --- /dev/null +++ b/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.combat.toml @@ -0,0 +1,6 @@ +[terror_dog] +attack_speed = 4 + +[terror_dog.melee] +range = 1 +target_hit = { offense = "crush", max = 150 } diff --git a/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.npcs.toml b/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.npcs.toml index 952c3aefdc..a99f8a50eb 100644 --- a/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.npcs.toml +++ b/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.npcs.toml @@ -16,42 +16,79 @@ categories = ["skeletons"] respawn_delay = 15 drop_table = "giant_skeleton_tarns_lair" examine = "A giant skeleton." +combat_def = "skeleton_unarmed" [skeleton_lair_of_tarn_razorlor] id = 5385 categories = ["skeletons"] examine = "A magic skeleton!" drop_table = "skeleton" +combat_def = "skeleton_unarmed" +hitpoints = 240 +att = 17 +str = 17 +def = 17 +max_hit_crush = 30 [skeleton_lair_of_tarn_razorlor_2] id = 5387 categories = ["skeletons"] examine = "Look: another skeleton." drop_table = "skeleton" +combat_def = "skeleton_unarmed" +hitpoints = 240 +att = 17 +str = 17 +def = 17 +max_hit_crush = 30 [skeleton_lair_of_tarn_razorlor_3] id = 5388 categories = ["skeletons"] examine = "That skeleton's grinning at me." drop_table = "skeleton" +combat_def = "skeleton_unarmed" +hitpoints = 240 +att = 17 +str = 17 +def = 17 +max_hit_crush = 30 [skeleton_lair_of_tarn_razorlor_4] id = 5389 categories = ["skeletons"] examine = "He needs a tan." drop_table = "skeleton" +combat_def = "skeleton_unarmed" +hitpoints = 240 +att = 17 +str = 17 +def = 17 +max_hit_crush = 30 [skeleton_lair_of_tarn_razorlor_5] id = 5390 categories = ["skeletons"] examine = "How do you know if a skeleton's male or female?" drop_table = "skeleton" +combat_def = "skeleton_unarmed" +hitpoints = 240 +att = 17 +str = 17 +def = 17 +max_hit_crush = 30 [skeleton_lair_of_tarn_razorlor_6] id = 5391 categories = ["skeletons"] examine = "He obviously hasn't realised he's dead." drop_table = "skeleton" +combat_def = "skeleton_unarmed" +hitpoints = 240 +att = 17 +str = 17 +def = 17 +max_hit_crush = 30 [terror_dog] id = 5417 @@ -67,6 +104,7 @@ categories = ["terror_dogs"] respawn_delay = 50 drop_table = "terror_dog" examine = "A terrifying dog beast." +max_hit_crush = 150 [terror_dog_2] id = 5418 @@ -82,6 +120,8 @@ categories = ["terror_dogs"] respawn_delay = 50 drop_table = "terror_dog_2" examine = "A terrifying dog beast." +max_hit_crush = 110 +combat_def = "terror_dog" [mutant_tarn] id = 5421 diff --git a/data/area/morytania/meiyerditch/meiyerditch.npcs.toml b/data/area/morytania/meiyerditch/meiyerditch.npcs.toml index 2355dcb004..75b7d2bdc4 100644 --- a/data/area/morytania/meiyerditch/meiyerditch.npcs.toml +++ b/data/area/morytania/meiyerditch/meiyerditch.npcs.toml @@ -177,6 +177,8 @@ immune_cannon = true respawn_delay = 25 examine = "An evil, bloodsucking vampyre." drop_table = "vyrewatch" +max_hit_crush = 110 +combat_def = "vyrewatch" [vyrewatch_meiyerditch_level_120] id = 4814 @@ -197,51 +199,125 @@ immune_cannon = true respawn_delay = 25 examine = "A thirsty-looking, airborne bloodsucker!" drop_table = "vyrewatch" +max_hit_crush = 120 +combat_def = "vyrewatch" [vyrewatch_meiyerditch_3] id = 4815 clone = "vyrewatch_meiyerditch" drop_table = "vyrewatch" +hitpoints = 1100 +att = 120 +str = 116 +def = 85 +mage = 120 +range = 120 +max_hit_crush = 130 +combat_def = "vyrewatch" [vyrewatch_meiyerditch_4] id = 4825 clone = "vyrewatch_meiyerditch" drop_table = "vyrewatch" +hitpoints = 900 +att = 110 +str = 96 +def = 85 +mage = 110 +range = 110 +max_hit_crush = 110 +combat_def = "vyrewatch" [vyrewatch_meiyerditch_5] id = 4826 clone = "vyrewatch_meiyerditch_level_120" drop_table = "vyrewatch" +hitpoints = 1050 +att = 120 +str = 106 +def = 85 +mage = 120 +range = 120 +max_hit_crush = 120 +combat_def = "vyrewatch" [vyrewatch_meiyerditch_6] id = 4827 clone = "vyrewatch_meiyerditch" drop_table = "vyrewatch" +hitpoints = 1100 +att = 120 +str = 116 +def = 85 +mage = 120 +range = 120 +max_hit_crush = 130 +combat_def = "vyrewatch" [vyrewatch_meiyerditch_7] id = 4828 clone = "vyrewatch_meiyerditch" drop_table = "vyrewatch" +hitpoints = 1100 +att = 120 +str = 116 +def = 85 +mage = 120 +range = 120 +max_hit_crush = 130 +combat_def = "vyrewatch" [vyrewatch_meiyerditch_8] id = 4829 clone = "vyrewatch_meiyerditch" drop_table = "vyrewatch" +hitpoints = 900 +att = 110 +str = 96 +def = 85 +mage = 110 +range = 110 +max_hit_crush = 110 +combat_def = "vyrewatch" [vyrewatch_meiyerditch_9] id = 4830 clone = "vyrewatch_meiyerditch_level_120" drop_table = "vyrewatch" +hitpoints = 1050 +att = 120 +str = 106 +def = 85 +mage = 120 +range = 120 +max_hit_crush = 120 +combat_def = "vyrewatch" [vyrewatch_meiyerditch_10] id = 4831 clone = "vyrewatch_meiyerditch" drop_table = "vyrewatch" +hitpoints = 1100 +att = 120 +str = 116 +def = 85 +mage = 120 +range = 120 +max_hit_crush = 130 +combat_def = "vyrewatch" [vyrewatch_meiyerditch_11] id = 4833 clone = "vyrewatch_meiyerditch" drop_table = "vyrewatch" +hitpoints = 900 +att = 110 +str = 96 +def = 85 +mage = 110 +range = 110 +max_hit_crush = 110 +combat_def = "vyrewatch" [flying_female_vampire] id = 7613 @@ -250,6 +326,14 @@ drop_table = "empty" [vyrewatch_meiyerditch_12] id = 7622 drop_table = "vyrewatch" +hitpoints = 900 +att = 110 +str = 96 +def = 85 +mage = 110 +range = 110 +max_hit_crush = 110 +combat_def = "vyrewatch" [vampyre_juvenile_male] id = 4774 @@ -265,10 +349,18 @@ immune_poison = true respawn_delay = 51 examine = "A juvenile vampyre. It looks really hungry!" drop_table = "empty" +combat_def = "vampyre" +max_hit_crush = 40 [vampyre_juvenile_female] id = 4775 drop_table = "empty" +combat_def = "vampyre" +hitpoints = 600 +att = 40 +str = 30 +def = 30 +max_hit_crush = 40 [papers_meiyerditch] id = 4765 diff --git a/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml index e251f89fb4..3117e68f77 100644 --- a/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml +++ b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml @@ -28,6 +28,7 @@ id = 7641 categories = ["crawling_hands"] examine = "A giant, zombified hand. I don't think I should offer to shake hands." drop_table = "zombie_hand" +combat_def = "zombie" [mutated_bloodveld_meiyerditch_tunnels] id = 7642 diff --git a/data/area/morytania/mort_ton/mort_ton.combat.toml b/data/area/morytania/mort_ton/mort_ton.combat.toml index 60dac8de33..71aab09e8c 100644 --- a/data/area/morytania/mort_ton/mort_ton.combat.toml +++ b/data/area/morytania/mort_ton/mort_ton.combat.toml @@ -23,3 +23,10 @@ range = 1 anim = "shade_attack" target_sound = "shade_attack" target_hit = { offense = "crush", max = 40 } + +[loar_shadow] +attack_speed = 4 + +[loar_shadow.melee] +range = 1 +target_hit = { offense = "crush", max = 40 } diff --git a/data/area/morytania/mort_ton/mort_ton.npcs.toml b/data/area/morytania/mort_ton/mort_ton.npcs.toml index afe059eb67..c08c26ddbe 100644 --- a/data/area/morytania/mort_ton/mort_ton.npcs.toml +++ b/data/area/morytania/mort_ton/mort_ton.npcs.toml @@ -11,6 +11,7 @@ immune_poison = true respawn_delay = 35 drop_table = "loar_shade" examine = "A shadowy sort of entity, kind of creepy looking." +max_hit_crush = 40 [loar_shade] id = 1241 diff --git a/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml b/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml index 06d0262e7f..5c90e4205e 100644 --- a/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml +++ b/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml @@ -103,10 +103,17 @@ id = 3186 [snake_mos_le_harmless] id = 4343 drop_table = "snake" +combat_def = "snake" +hitpoints = 60 +att = 4 +str = 5 +def = 3 +max_hit_stab = 10 [monkey_mos_le_harmless] id = 4344 drop_table = "monkey" +combat_def = "monkey" [crab_mos_le_harmless] id = 4346 diff --git a/data/area/morytania/port_phasmatys/alices_farm/alices_farm.combat.toml b/data/area/morytania/port_phasmatys/alices_farm/alices_farm.combat.toml new file mode 100644 index 0000000000..e5f75aa5db --- /dev/null +++ b/data/area/morytania/port_phasmatys/alices_farm/alices_farm.combat.toml @@ -0,0 +1,6 @@ +[undead_cow] +attack_speed = 4 + +[undead_cow.melee] +range = 1 +target_hit = { offense = "crush", max = 10 } diff --git a/data/area/morytania/port_phasmatys/alices_farm/alices_farm.npcs.toml b/data/area/morytania/port_phasmatys/alices_farm/alices_farm.npcs.toml index 9a9c92d690..6a59a05d4a 100644 --- a/data/area/morytania/port_phasmatys/alices_farm/alices_farm.npcs.toml +++ b/data/area/morytania/port_phasmatys/alices_farm/alices_farm.npcs.toml @@ -9,6 +9,7 @@ categories = ["cows", "zombies"] respawn_delay = 5 drop_table = "undead_cow" examine = "It's an undead cow." +max_hit_crush = 10 [undead_chicken] id = 1692 @@ -21,6 +22,7 @@ categories = ["birds", "zombies"] respawn_delay = 25 drop_table = "undead_chicken" examine = "Yep, definitely a chicken... an undead chicken." +combat_def = "chicken" [old_man_alices_farm] id = 1696 diff --git a/data/area/realm/enchanted_valley/enchanted_valley.combat.toml b/data/area/realm/enchanted_valley/enchanted_valley.combat.toml new file mode 100644 index 0000000000..596137e07f --- /dev/null +++ b/data/area/realm/enchanted_valley/enchanted_valley.combat.toml @@ -0,0 +1,6 @@ +[stag] +attack_speed = 4 + +[stag.melee] +range = 1 +target_hit = { offense = "stab", max = 20 } diff --git a/data/area/realm/enchanted_valley/enchanted_valley.npcs.toml b/data/area/realm/enchanted_valley/enchanted_valley.npcs.toml index 14c156c9f4..393eab2227 100644 --- a/data/area/realm/enchanted_valley/enchanted_valley.npcs.toml +++ b/data/area/realm/enchanted_valley/enchanted_valley.npcs.toml @@ -20,6 +20,8 @@ max_hit_melee = 20 respawn_delay = 90 examine = "A noble creature!" drop_table = "bones" +max_hit_stab = 20 +combat_def = "stag" [wood_dryad_enchanted_valley] id = 4441 @@ -34,11 +36,16 @@ attack_bonus = -47 respawn_delay = 50 examine = "Aww, how cute." drop_table = "rabbit" +combat_def = "rabbit_miscellania" +max_hit_crush = 10 [rabbit_enchanted_valley_2] id = 4448 clone = "rabbit_enchanted_valley" drop_table = "rabbit" +combat_def = "rabbit_miscellania" +hitpoints = 10 +max_hit_crush = 10 [butterfly_enchanted_valley] id = 4449 diff --git a/data/area/realm/fisher_realm/fisher_realm.npcs.toml b/data/area/realm/fisher_realm/fisher_realm.npcs.toml index 62147630d4..d57fd6fb37 100644 --- a/data/area/realm/fisher_realm/fisher_realm.npcs.toml +++ b/data/area/realm/fisher_realm/fisher_realm.npcs.toml @@ -27,8 +27,14 @@ id = 314 [ram_fisher_realm] id = 5168 drop_table = "ram" +combat_def = "ram_freds_farm" +hitpoints = 80 +max_hit_crush = 10 [ram_fisher_realm_2] id = 5169 drop_table = "ram" +combat_def = "ram_freds_farm" +hitpoints = 80 +max_hit_crush = 10 diff --git a/data/area/realm/spirit_realm/spirit_realm.npcs.toml b/data/area/realm/spirit_realm/spirit_realm.npcs.toml index ca6d3c23be..6e4ee12d2d 100644 --- a/data/area/realm/spirit_realm/spirit_realm.npcs.toml +++ b/data/area/realm/spirit_realm/spirit_realm.npcs.toml @@ -3,6 +3,7 @@ id = 7994 categories = ["ghosts"] examine = "A spectral warrior with no axe." drop_table = "ghostly_warrior" +combat_def = "guard" [tormented_wraith_spirit_realm] id = 8125 diff --git a/data/area/tirannwn/iorwerth_camp/iorwerth_camp.npcs.toml b/data/area/tirannwn/iorwerth_camp/iorwerth_camp.npcs.toml index 15a93a2698..57494355ed 100644 --- a/data/area/tirannwn/iorwerth_camp/iorwerth_camp.npcs.toml +++ b/data/area/tirannwn/iorwerth_camp/iorwerth_camp.npcs.toml @@ -16,6 +16,7 @@ categories = ["elves"] respawn_delay = 30 drop_table = "elf_warrior" examine = "He looks pretty handy with that bow." +combat_def = "guard" [elf_warrior_2] id = 1184 @@ -32,6 +33,7 @@ categories = ["elves"] respawn_delay = 30 drop_table = "elf_warrior" examine = "I don't want to get on the wrong side of him." +combat_def = "guard" [fishing_spot_iorwerth_camp] id = 1189 diff --git a/data/area/tirannwn/isafdar/isafdar.npcs.toml b/data/area/tirannwn/isafdar/isafdar.npcs.toml index b11642085a..0e8db0cecc 100644 --- a/data/area/tirannwn/isafdar/isafdar.npcs.toml +++ b/data/area/tirannwn/isafdar/isafdar.npcs.toml @@ -27,11 +27,16 @@ attack_bonus = -47 respawn_delay = 25 examine = "Aww, how cute." drop_table = "rabbit" +combat_def = "rabbit_miscellania" +max_hit_crush = 10 [rabbit_isafdar_2] id = 1194 clone = "rabbit_isafdar" drop_table = "rabbit" +combat_def = "rabbit_miscellania" +hitpoints = 50 +max_hit_crush = 10 [grenwall] id = 7010 diff --git a/data/area/tirannwn/lletya/lletya.npcs.toml b/data/area/tirannwn/lletya/lletya.npcs.toml index db5dcbd18a..8afd73e094 100644 --- a/data/area/tirannwn/lletya/lletya.npcs.toml +++ b/data/area/tirannwn/lletya/lletya.npcs.toml @@ -36,11 +36,13 @@ categories = ["elves"] respawn_delay = 30 examine = "I don't want to get on the wrong side of him." drop_table = "elf_warrior" +combat_def = "guard" [elf_warrior_lletya_2] id = 2360 clone = "elf_warrior_lletya" drop_table = "elf_warrior" +combat_def = "guard" [elf_warrior_lletya_3] id = 2361 @@ -57,11 +59,13 @@ categories = ["elves"] respawn_delay = 30 examine = "She looks pretty handy with that bow." drop_table = "elf_warrior" +combat_def = "guard" [elf_warrior_lletya_4] id = 2362 clone = "elf_warrior_lletya_3" drop_table = "elf_warrior" +combat_def = "guard" [goreu] id = 2363 @@ -108,6 +112,8 @@ attack_bonus = -15 respawn_delay = 45 drop_table = "ram" examine = "White and fluffy." +combat_def = "ram_freds_farm" +max_hit_crush = 10 [gwir] id = 8894 diff --git a/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml index ec5d1b725b..ca5df16df5 100644 --- a/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml +++ b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml @@ -3,62 +3,73 @@ id = 6285 categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" +combat_def = "terrorbird" [warped_terrorbird_2] id = 6286 categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" +combat_def = "terrorbird" [warped_terrorbird_3] id = 6287 categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" +combat_def = "terrorbird" [warped_terrorbird_4] id = 6288 categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" +combat_def = "terrorbird" [warped_terrorbird_5] id = 6289 categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" +combat_def = "terrorbird" [warped_terrorbird_6] id = 6290 drop_table = "warped_terrorbird" +combat_def = "terrorbird" [warped_terrorbird_7] id = 6291 categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" +combat_def = "terrorbird" [warped_terrorbird_8] id = 6292 categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" +combat_def = "terrorbird" [warped_terrorbird_9] id = 6293 drop_table = "warped_terrorbird" +combat_def = "terrorbird" [warped_terrorbird_10] id = 6294 categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" +combat_def = "terrorbird" [warped_terrorbird_11] id = 6295 categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" +combat_def = "terrorbird" [warped_tortoise] id = 6296 diff --git a/data/area/tirannwn/tyras_camp/tyras_camp.npcs.toml b/data/area/tirannwn/tyras_camp/tyras_camp.npcs.toml index ed8b3d3893..686a93b0e3 100644 --- a/data/area/tirannwn/tyras_camp/tyras_camp.npcs.toml +++ b/data/area/tirannwn/tyras_camp/tyras_camp.npcs.toml @@ -13,6 +13,7 @@ xp_bonus = 0.5 respawn_delay = 50 drop_table = "tyras_guard" examine = "One of King Tyras's men." +combat_def = "guard" [tyras_guard_port_tyras] id = 4649 @@ -21,6 +22,7 @@ clone = "tyras_guard" [tyras_guard_2] id = 1204 clone = "tyras_guard" +combat_def = "guard" [tyras_guard_3] id = 1206 diff --git a/data/area/troll_country/death_plateau/death_plateau.combat.toml b/data/area/troll_country/death_plateau/death_plateau.combat.toml new file mode 100644 index 0000000000..79ad014aea --- /dev/null +++ b/data/area/troll_country/death_plateau/death_plateau.combat.toml @@ -0,0 +1,20 @@ +[stick] +attack_speed = 6 + +[stick.melee] +range = 1 +target_hit = { offense = "crush", max = 270 } + +[pee_hat] +attack_speed = 6 + +[pee_hat.melee] +range = 1 +target_hit = { offense = "crush", max = 230 } + +[kraka] +attack_speed = 6 + +[kraka.melee] +range = 1 +target_hit = { offense = "crush", max = 230 } diff --git a/data/area/troll_country/death_plateau/death_plateau.npcs.toml b/data/area/troll_country/death_plateau/death_plateau.npcs.toml index 25520c6a41..477298f0dd 100644 --- a/data/area/troll_country/death_plateau/death_plateau.npcs.toml +++ b/data/area/troll_country/death_plateau/death_plateau.npcs.toml @@ -27,10 +27,17 @@ categories = ["trolls"] respawn_delay = 50 drop_table = "rock_troll" examine = "A nasty looking troll." +max_hit_crush = 230 [pee_hat] id = 1097 clone = "kraka" +hitpoints = 1200 +att = 50 +str = 100 +def = 50 +attack_bonus = 40 +max_hit_crush = 230 [stick] id = 1096 @@ -51,6 +58,7 @@ categories = ["trolls"] respawn_delay = 50 drop_table = "rock_troll" examine = "A big, bad troll." +max_hit_crush = 270 [rock_troll] id = 1095 diff --git a/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml b/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml index e74bb6095d..9a41ee9e08 100644 --- a/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml +++ b/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml @@ -6,4 +6,5 @@ drop_table = "ice_demon" [waterfiend_ghorrock_fortress_dungeon] id = 9054 drop_table = "waterfiend" +combat_def = "waterfiend" diff --git a/data/area/troll_country/ghorrock/jhallans_resting_place/jhallans_resting_place.npcs.toml b/data/area/troll_country/ghorrock/jhallans_resting_place/jhallans_resting_place.npcs.toml index d79d37e5e1..a5ab0c68ac 100644 --- a/data/area/troll_country/ghorrock/jhallans_resting_place/jhallans_resting_place.npcs.toml +++ b/data/area/troll_country/ghorrock/jhallans_resting_place/jhallans_resting_place.npcs.toml @@ -1,8 +1,22 @@ [jelly_jhallans_resting_place] id = 7459 drop_table = "jelly" +combat_def = "jelly" +hitpoints = 750 +att = 45 +str = 45 +def = 120 +mage = 45 +max_hit_magic = 50 [jelly_jhallans_resting_place_2] id = 7460 drop_table = "jelly" +combat_def = "jelly" +hitpoints = 750 +att = 45 +str = 45 +def = 120 +mage = 45 +max_hit_magic = 50 diff --git a/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml b/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml index e36aa1714d..9742247ae9 100644 --- a/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml @@ -12,6 +12,7 @@ examine = "An ancient spirit of nature." id = 13456 examine = "He looks angry and dangerous!" drop_table = "ancient_warrior" +combat_def = "guard" [ancient_ranger] id = 13457 diff --git a/data/area/troll_country/mountain_camp/mountain_camp.npcs.toml b/data/area/troll_country/mountain_camp/mountain_camp.npcs.toml index 451c6413fc..450333c027 100644 --- a/data/area/troll_country/mountain_camp/mountain_camp.npcs.toml +++ b/data/area/troll_country/mountain_camp/mountain_camp.npcs.toml @@ -29,18 +29,22 @@ max_hit_melee = 50 respawn_delay = 50 drop_table = "bones" examine = "One of the inhabitants of the camp." +combat_def = "guard" [camp_dweller_mountain_camp_2] id = 1815 clone = "camp_dweller_mountain_camp" +combat_def = "guard" [camp_dweller_mountain_camp_3] id = 1816 clone = "camp_dweller_mountain_camp" +combat_def = "guard" [camp_dweller_mountain_camp_4] id = 1817 clone = "camp_dweller_mountain_camp" +combat_def = "guard" [camp_dweller_mountain_camp_5] id = 1818 @@ -53,6 +57,7 @@ max_hit_melee = 30 respawn_delay = 50 examine = "One of the inhabitants of the camp." drop_table = "camp_dweller" +combat_def = "guard" [mountain_goat_mountain_camp] id = 1819 diff --git a/data/area/troll_country/troll_country.npcs.toml b/data/area/troll_country/troll_country.npcs.toml index e26a0527bf..25e66467cc 100644 --- a/data/area/troll_country/troll_country.npcs.toml +++ b/data/area/troll_country/troll_country.npcs.toml @@ -21,6 +21,7 @@ categories = ["trolls"] respawn_delay = 50 drop_table = "ice_troll" examine = "Brrrrr...he must be cold!" +combat_def = "ice_troll" [ice_troll_troll_country_3] id = 1937 @@ -38,6 +39,7 @@ categories = ["trolls"] respawn_delay = 50 drop_table = "ice_troll" examine = "Brrrrr...he must be cold!" +combat_def = "ice_troll" [ice_troll_troll_country_4] id = 1938 @@ -55,6 +57,7 @@ categories = ["trolls"] respawn_delay = 50 drop_table = "ice_troll" examine = "Brrrrr...he must be cold!" +combat_def = "ice_troll" [ice_troll_troll_country_5] id = 1939 @@ -72,18 +75,22 @@ categories = ["trolls"] respawn_delay = 50 drop_table = "ice_troll" examine = "Brrrrr...he must be cold!" +combat_def = "ice_troll" [ice_troll_troll_country_6] id = 1940 clone = "ice_troll_troll_country_4" +combat_def = "ice_troll" [ice_troll_troll_country_7] id = 1941 clone = "ice_troll_troll_country_4" +combat_def = "ice_troll" [ice_troll_troll_country_8] id = 1942 clone = "ice_troll_troll_country_5" +combat_def = "ice_troll" [troll_father_troll_country] id = 1947 diff --git a/data/area/troll_country/troll_tunnels/troll_tunnels.npcs.toml b/data/area/troll_country/troll_tunnels/troll_tunnels.npcs.toml index e10e3f9645..e794dc0af3 100644 --- a/data/area/troll_country/troll_tunnels/troll_tunnels.npcs.toml +++ b/data/area/troll_country/troll_tunnels/troll_tunnels.npcs.toml @@ -14,6 +14,7 @@ categories = ["trolls"] respawn_delay = 50 examine = "Brrrrr...he must be cold!" drop_table = "ice_troll" +combat_def = "ice_troll" [ice_troll_troll_tunnels_2] id = 1561 @@ -31,6 +32,7 @@ categories = ["trolls"] respawn_delay = 50 examine = "Brrrrr...he must be cold!" drop_table = "ice_troll" +combat_def = "ice_troll" [ice_troll_troll_tunnels_3] id = 1562 @@ -48,6 +50,7 @@ categories = ["trolls"] respawn_delay = 50 examine = "Brrrrr...he must be cold!" drop_table = "ice_troll" +combat_def = "ice_troll" [ice_troll_troll_tunnels_4] id = 1563 @@ -65,19 +68,23 @@ categories = ["trolls"] respawn_delay = 50 examine = "Brrrrr...he must be cold!" drop_table = "ice_troll" +combat_def = "ice_troll" [ice_troll_troll_tunnels_5] id = 1564 clone = "ice_troll_troll_tunnels_3" drop_table = "ice_troll" +combat_def = "ice_troll" [ice_troll_troll_tunnels_6] id = 1565 clone = "ice_troll_troll_tunnels_3" drop_table = "ice_troll" +combat_def = "ice_troll" [ice_troll_troll_tunnels_7] id = 1566 clone = "ice_troll_troll_tunnels_4" drop_table = "ice_troll" +combat_def = "ice_troll" diff --git a/data/area/wilderness/bandit_camp/wilderness_bandit_camp.combat.toml b/data/area/wilderness/bandit_camp/wilderness_bandit_camp.combat.toml new file mode 100644 index 0000000000..7fd45b8281 --- /dev/null +++ b/data/area/wilderness/bandit_camp/wilderness_bandit_camp.combat.toml @@ -0,0 +1,20 @@ +[black_heather] +attack_speed = 4 + +[black_heather.melee] +range = 1 +target_hit = { offense = "slash", max = 40 } + +[donny_the_lad] +attack_speed = 4 + +[donny_the_lad.melee] +range = 1 +target_hit = { offense = "slash", max = 40 } + +[speedy_keith] +attack_speed = 4 + +[speedy_keith.melee] +range = 1 +target_hit = { offense = "slash", max = 40 } diff --git a/data/area/wilderness/bandit_camp/wilderness_bandit_camp.npcs.toml b/data/area/wilderness/bandit_camp/wilderness_bandit_camp.npcs.toml index c810dd348e..c1eb472115 100644 --- a/data/area/wilderness/bandit_camp/wilderness_bandit_camp.npcs.toml +++ b/data/area/wilderness/bandit_camp/wilderness_bandit_camp.npcs.toml @@ -24,6 +24,7 @@ categories = ["dark_warriors"] respawn_delay = 50 examine = "A warrior touched by chaos." drop_table = "dark_warrior" +combat_def = "guard" [guard_bandit] id = 196 @@ -41,6 +42,7 @@ categories = ["bandits"] respawn_delay = 100 examine = "A wilderness outlaw." drop_table = "guard_bandit" +combat_def = "guard" [black_heather] id = 202 @@ -56,6 +58,7 @@ categories = ["bandits"] respawn_delay = 50 drop_table = "wilderness_bandit" examine = "Has a fearsome scowl. Moreso, after being told to smile once in a while." +max_hit_slash = 40 [donny_the_lad] id = 203 @@ -71,6 +74,7 @@ categories = ["bandits"] respawn_delay = 50 drop_table = "wilderness_bandit" examine = "Has a fearsome posture, and a fearsome pair of weapons!" +max_hit_slash = 40 [speedy_keith] id = 204 @@ -86,6 +90,7 @@ categories = ["bandits"] respawn_delay = 50 drop_table = "wilderness_bandit" examine = "Refuses to accept his hairstyle has gone out of fashion." +max_hit_slash = 40 [mysterious_ghost_wilderness_bandit_camp] id = 2383 diff --git a/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml b/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml index 683e6081b8..bc32614c4c 100644 --- a/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml +++ b/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml @@ -6,28 +6,33 @@ id = 8149 categories = ["zombies"] examine = "It hasn't quite got round to dying." drop_table = "armoured_zombie" +combat_def = "zombie_sword" [armoured_zombie_chaos_temple_dungeon_2] id = 8150 categories = ["zombies"] examine = "This is a rotten one." drop_table = "armoured_zombie" +combat_def = "zombie_sword" [armoured_zombie_chaos_temple_dungeon_3] id = 8151 categories = ["zombies"] examine = "This is a rotten one." drop_table = "armoured_zombie" +combat_def = "zombie_sword" [armoured_zombie_chaos_temple_dungeon_4] id = 8152 categories = ["zombies"] examine = "This is a rotten one." drop_table = "armoured_zombie" +combat_def = "zombie_sword" [armoured_zombie_chaos_temple_dungeon_5] id = 8153 drop_table = "armoured_zombie" +combat_def = "zombie_sword" [armoured_zombie_chaos_temple_dungeon_6] id = 8154 diff --git a/data/area/wilderness/wilderness.combat.toml b/data/area/wilderness/wilderness.combat.toml new file mode 100644 index 0000000000..a4b728c5d7 --- /dev/null +++ b/data/area/wilderness/wilderness.combat.toml @@ -0,0 +1,6 @@ +[rogue] +attack_speed = 4 + +[rogue.melee] +range = 1 +target_hit = { offense = "stab", max = 20 } diff --git a/data/area/wilderness/wilderness.npcs.toml b/data/area/wilderness/wilderness.npcs.toml index 8992405a52..5536397133 100644 --- a/data/area/wilderness/wilderness.npcs.toml +++ b/data/area/wilderness/wilderness.npcs.toml @@ -14,6 +14,7 @@ hunt_mode = "cowardly" respawn_delay = 50 examine = "A practicer of dark arts." drop_table = "dark_wizard" +combat_def = "dark_wizard_water" [dark_wizard_wilderness_2] id = 174 @@ -28,6 +29,7 @@ hunt_mode = "cowardly" respawn_delay = 50 examine = "He works evil magic." drop_table = "dark_wizard" +combat_def = "dark_wizard_water" [william] id = 1778 @@ -63,6 +65,13 @@ examine = "A very brave merchant." id = 184 examine = "This one's had too much to drink!" drop_table = "pirate" +combat_def = "pirate" +hitpoints = 230 +att = 23 +str = 23 +def = 23 +attack_bonus = 8 +max_hit_slash = 40 [mysterious_ghost_wilderness] id = 2382 @@ -106,30 +115,72 @@ examine = "Slightly slimy and somewhat menacing." id = 6351 examine = "This one's had too much to drink!" drop_table = "pirate" +combat_def = "pirate" +hitpoints = 230 +att = 23 +str = 23 +def = 23 +attack_bonus = 8 +max_hit_slash = 40 [pirate_wilderness_3] id = 6352 examine = "This one's had too much to drink!" drop_table = "pirate" +combat_def = "pirate" +hitpoints = 230 +att = 23 +str = 23 +def = 23 +attack_bonus = 8 +max_hit_slash = 40 [pirate_wilderness_4] id = 6353 examine = "This one's had too much to drink!" drop_table = "pirate" +combat_def = "pirate" +hitpoints = 230 +att = 23 +str = 23 +def = 23 +attack_bonus = 8 +max_hit_slash = 40 [pirate_wilderness_5] id = 6354 examine = "This one's had too much to drink!" drop_table = "pirate" +combat_def = "pirate" +hitpoints = 230 +att = 23 +str = 23 +def = 23 +attack_bonus = 8 +max_hit_slash = 40 [pirate_wilderness_6] id = 6355 drop_table = "pirate" +combat_def = "pirate" +hitpoints = 230 +att = 23 +str = 23 +def = 23 +attack_bonus = 8 +max_hit_slash = 40 [pirate_wilderness_7] id = 6356 examine = "This one's had too much to drink!" drop_table = "pirate" +combat_def = "pirate" +hitpoints = 230 +att = 23 +str = 23 +def = 23 +attack_bonus = 8 +max_hit_slash = 40 [goth_leprechaun_wilderness] id = 8000 @@ -156,6 +207,12 @@ id = 8123 [giant_rat_wilderness_2] id = 87 drop_table = "giant_rat" +combat_def = "giant_rat" +hitpoints = 100 +att = 6 +str = 5 +def = 2 +max_hit_stab = 10 [battle_mage_zamorak] id = 912 @@ -258,4 +315,6 @@ slayer_xp = 17.0 categories = ["rogues"] respawn_delay = 50 examine = "Rogueish." -drop_table = "rogue" \ No newline at end of file +drop_table = "rogue" +max_hit_stab = 20 +combat_def = "rogue" \ No newline at end of file diff --git a/data/entity/npc/animal/bear/bear.npcs.toml b/data/entity/npc/animal/bear/bear.npcs.toml index 427e47d7d5..b62cae175c 100644 --- a/data/entity/npc/animal/bear/bear.npcs.toml +++ b/data/entity/npc/animal/bear/bear.npcs.toml @@ -47,7 +47,7 @@ att = 32 str = 32 def = 28 slayer_xp = 35.0 -combat_def = "bear_cub" +combat_def = "bear" respawn_delay = 50 drop_table = "bear" categories = ["bears"] @@ -74,7 +74,7 @@ att = 10 str = 15 def = 10 slayer_xp = 20.0 -combat_def = "bear_cub" +combat_def = "bear" max_hit_slash = 20 respawn_delay = 50 drop_table = "bear" @@ -84,3 +84,4 @@ examine = " Cute. But deadly." [bear_cub_black] id = 1327 clone = "bear_cub" +combat_def = "bear" diff --git a/data/entity/npc/animal/crab/crab.npcs.toml b/data/entity/npc/animal/crab/crab.npcs.toml index fbb7bbf906..1715e6cb70 100644 --- a/data/entity/npc/animal/crab/crab.npcs.toml +++ b/data/entity/npc/animal/crab/crab.npcs.toml @@ -9,11 +9,15 @@ hunt_mode = "aggressive" categories = ["crabs"] combat_def = "rock_crab" examine = "No one likes crabs..." +hitpoints = 500 +max_hit_crush = 10 [rock_crab_1] clone = "rock_crab" id = 1267 drop_table = "rock_crab" +hitpoints = 500 +max_hit_crush = 10 [rock] id = 1266 diff --git a/data/entity/npc/animal/dog/dog.combat.toml b/data/entity/npc/animal/dog/dog.combat.toml index a8564b8a42..bf90e4644d 100644 --- a/data/entity/npc/animal/dog/dog.combat.toml +++ b/data/entity/npc/animal/dog/dog.combat.toml @@ -19,3 +19,10 @@ death_anim = "medium_dog_death" [guard_dog.melee] clone = "jackal.melee" anim = "medium_dog_attack" + +[wild_dog] +attack_speed = 4 + +[wild_dog.melee] +range = 1 +target_hit = { offense = "stab", max = 60 } diff --git a/data/entity/npc/animal/dog/dog.npcs.toml b/data/entity/npc/animal/dog/dog.npcs.toml index ddede6491b..f4ad5f420c 100644 --- a/data/entity/npc/animal/dog/dog.npcs.toml +++ b/data/entity/npc/animal/dog/dog.npcs.toml @@ -43,4 +43,10 @@ examine = "Looks like it's got Rabies!" [wild_dog_1] id = 1594 -clone = "wild_dog" \ No newline at end of file +clone = "wild_dog" +hitpoints = 620 +att = 53 +str = 54 +def = 54 +max_hit_stab = 60 +combat_def = "wild_dog" \ No newline at end of file diff --git a/data/entity/npc/boss/giant_mole/giant_mole.combat.toml b/data/entity/npc/boss/giant_mole/giant_mole.combat.toml new file mode 100644 index 0000000000..83ad8b905d --- /dev/null +++ b/data/entity/npc/boss/giant_mole/giant_mole.combat.toml @@ -0,0 +1,6 @@ +[giant_mole] +attack_speed = 4 + +[giant_mole.melee] +range = 1 +target_hit = { offense = "crush", max = 210 } diff --git a/data/entity/npc/boss/giant_mole/giant_mole.npcs.toml b/data/entity/npc/boss/giant_mole/giant_mole.npcs.toml index 8803b95f80..dc007d5e43 100644 --- a/data/entity/npc/boss/giant_mole/giant_mole.npcs.toml +++ b/data/entity/npc/boss/giant_mole/giant_mole.npcs.toml @@ -12,6 +12,7 @@ style = "crush" categories = ["mole"] respawn_delay = 16 examine = "Holy Mole-y!" +max_hit_crush = 210 [baby_mole] id = 3341 diff --git a/data/entity/npc/monster/fiend/icefiend/icefiend.npcs.toml b/data/entity/npc/monster/fiend/icefiend/icefiend.npcs.toml index e09e387cf4..1388efd2e2 100644 --- a/data/entity/npc/monster/fiend/icefiend/icefiend.npcs.toml +++ b/data/entity/npc/monster/fiend/icefiend/icefiend.npcs.toml @@ -24,6 +24,11 @@ combat_def = "icefiend" drop_table = "icefiend" categories = ["icefiends"] examine = "A robust ice demon." +hitpoints = 150 +att = 10 +str = 10 +def = 12 +max_hit_magic = 20 [icefiend_god_wars] id = 3406 diff --git a/data/entity/npc/monster/reptile/scorpion/scorpion.npcs.toml b/data/entity/npc/monster/reptile/scorpion/scorpion.npcs.toml index d438a683a4..7a624695ff 100644 --- a/data/entity/npc/monster/reptile/scorpion/scorpion.npcs.toml +++ b/data/entity/npc/monster/reptile/scorpion/scorpion.npcs.toml @@ -46,7 +46,7 @@ hitpoints = 300 att = 30 str = 29 def = 23 -combat_def = "king_scorpion" +combat_def = "scorpion" max_hit_stab = 40 hunt_mode = "aggressive" respawn_delay = 25 diff --git a/data/entity/npc/monster/undead/zombie/zombie.npcs.toml b/data/entity/npc/monster/undead/zombie/zombie.npcs.toml index b225410d92..c9202a7710 100644 --- a/data/entity/npc/monster/undead/zombie/zombie.npcs.toml +++ b/data/entity/npc/monster/undead/zombie/zombie.npcs.toml @@ -118,7 +118,12 @@ combat_def = "zombie_sword" [zombie_armour_grey_shorts_sword] id = 5315 clone = "zombie_yellow_shirt" -combat_def = "zombie_dragging" +combat_def = "zombie_sword" +hitpoints = 220 +att = 8 +str = 9 +def = 10 +max_hit_crush = 20 [zombie_red_outfit] id = 5311 @@ -160,7 +165,12 @@ combat_def = "zombie_sword" [zombie_blue_skirt_sword_2] id = 5322 clone = "zombie_yellow_shirt" -combat_def = "zombie_dragging" +combat_def = "zombie_sword" +hitpoints = 220 +att = 8 +str = 9 +def = 10 +max_hit_crush = 20 [zombie_yellow_shirt_sword] id = 5323 diff --git a/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.combat.toml b/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.combat.toml new file mode 100644 index 0000000000..77e7898047 --- /dev/null +++ b/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.combat.toml @@ -0,0 +1,27 @@ +[phrin_shadow] +attack_speed = 4 + +[phrin_shadow.melee] +range = 1 +target_hit = { offense = "crush", max = 60 } + +[riyl_shadow] +attack_speed = 4 + +[riyl_shadow.melee] +range = 1 +target_hit = { offense = "crush", max = 60 } + +[asyn_shadow] +attack_speed = 4 + +[asyn_shadow.melee] +range = 1 +target_hit = { offense = "crush", max = 90 } + +[fiyr_shadow] +attack_speed = 4 + +[fiyr_shadow.melee] +range = 1 +target_hit = { offense = "crush", max = 110 } diff --git a/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.npcs.toml b/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.npcs.toml index c00322a912..508e406e02 100644 --- a/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.npcs.toml +++ b/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.npcs.toml @@ -14,6 +14,8 @@ immune_poison = true respawn_delay = 50 examine = "A shadowy sort of entity, kind of creepy looking." drop_table = "phrin_shadow" +max_hit_crush = 60 +combat_def = "phrin_shadow" [phrin_shade_shade] id = 1244 @@ -65,6 +67,8 @@ immune_poison = true respawn_delay = 50 drop_table = "riyl_shade" examine = "A shadowy sort of entity, kind of creepy looking." +max_hit_crush = 60 +combat_def = "riyl_shadow" [riyl_shadow] @@ -97,6 +101,8 @@ slayer_xp = 94.0 categories = ["shades"] examine = "The shadowy remains of a long-departed soul." drop_table = "empty" +max_hit_crush = 90 +combat_def = "asyn_shadow" [fiyr_shadow_shade_catacombs] id = 1249 @@ -112,6 +118,8 @@ immune_poison = true respawn_delay = 50 drop_table = "fiyr_shade" examine = "A shadowy sort of entity, kind of creepy looking." +max_hit_crush = 110 +combat_def = "fiyr_shadow" [asyn_shade] id = 1248 diff --git a/data/minigame/soul_wars/soul_wars.npcs.toml b/data/minigame/soul_wars/soul_wars.npcs.toml index e88c3141f0..3e8a5c2757 100644 --- a/data/minigame/soul_wars/soul_wars.npcs.toml +++ b/data/minigame/soul_wars/soul_wars.npcs.toml @@ -1,6 +1,13 @@ [soul_wars_jelly] id = 8599 drop_table = "jelly" +combat_def = "jelly" +hitpoints = 750 +att = 45 +str = 45 +def = 120 +mage = 45 +max_hit_magic = 50 [nomad_soul_wars] id = 8525 @@ -18,6 +25,12 @@ drop_table = "empty" [pyrefiend_soul_wars] id = 8598 drop_table = "pyrefiend" +combat_def = "pyrefiend" +hitpoints = 450 +att = 52 +str = 30 +def = 22 +max_hit_magic = 40 [zimberfizz] id = 8527 diff --git a/data/minigame/temple_trekking/temple_trekking.npcs.toml b/data/minigame/temple_trekking/temple_trekking.npcs.toml index a322ba13ae..678af69e52 100644 --- a/data/minigame/temple_trekking/temple_trekking.npcs.toml +++ b/data/minigame/temple_trekking/temple_trekking.npcs.toml @@ -3,6 +3,12 @@ id = 3622 categories = ["zombies"] examine = "I wonder if he'd let me borrow his hatchet?" drop_table = "zombie" +combat_def = "zombie" +hitpoints = 220 +att = 8 +str = 9 +def = 10 +max_hit_crush = 20 [rook_temple_trekking] id = 9719 diff --git a/data/minigame/warriors_guild/warriors_guild.npcs.toml b/data/minigame/warriors_guild/warriors_guild.npcs.toml index b4425447c6..5c66b15dc0 100644 --- a/data/minigame/warriors_guild/warriors_guild.npcs.toml +++ b/data/minigame/warriors_guild/warriors_guild.npcs.toml @@ -68,6 +68,7 @@ categories = ["hill_giants"] respawn_delay = 30 examine = "A one-eyed woman eater." drop_table = "cyclops" +combat_def = "cyclops" [cyclopse_hammer_steel] id = 6078 @@ -83,26 +84,31 @@ categories = ["hill_giants"] respawn_delay = 30 examine = "A one-eyed man eater." drop_table = "cyclops" +combat_def = "cyclops" [cyclopse_club_lepard] id = 4291 clone = "cyclopse_hammer_steel" drop_table = "cyclops" +combat_def = "cyclops" [cyclopse_club] id = 6080 clone = "cyclopse_hammer" drop_table = "cyclops" +combat_def = "cyclops" [cyclopse_club_mohawk] id = 6079 clone = "cyclopse_hammer" drop_table = "cyclops" +combat_def = "cyclops" [cyclopse_knife] id = 4292 clone = "cyclopse_hammer" drop_table = "cyclops" +combat_def = "cyclops" [harrallak_menarous_2] id = 8268 diff --git a/data/quest/members/cabin_fever/cabin_fever.npcs.toml b/data/quest/members/cabin_fever/cabin_fever.npcs.toml index 3362a39e56..d9ff446dad 100644 --- a/data/quest/members/cabin_fever/cabin_fever.npcs.toml +++ b/data/quest/members/cabin_fever/cabin_fever.npcs.toml @@ -16,46 +16,96 @@ categories = ["pirates"] respawn_delay = 50 examine = "An enemy pirate." drop_table = "pirate" +combat_def = "pirate" +max_hit_slash = 60 [pirate_cabin_fever_2] id = 3189 clone = "pirate_cabin_fever" drop_table = "pirate" +combat_def = "pirate" +hitpoints = 520 +att = 49 +str = 50 +def = 50 +max_hit_slash = 60 [pirate_cabin_fever_3] id = 3190 clone = "pirate_cabin_fever" drop_table = "pirate" +combat_def = "pirate" +hitpoints = 520 +att = 49 +str = 50 +def = 50 +max_hit_slash = 60 [pirate_cabin_fever_4] id = 3191 clone = "pirate_cabin_fever" drop_table = "pirate" +combat_def = "pirate" +hitpoints = 520 +att = 49 +str = 50 +def = 50 +max_hit_slash = 60 [pirate_cabin_fever_5] id = 3192 clone = "pirate_cabin_fever" drop_table = "pirate" +combat_def = "pirate" +hitpoints = 520 +att = 49 +str = 50 +def = 50 +max_hit_slash = 60 [pirate_cabin_fever_6] id = 3193 clone = "pirate_cabin_fever" drop_table = "pirate" +combat_def = "pirate" +hitpoints = 520 +att = 49 +str = 50 +def = 50 +max_hit_slash = 60 [pirate_cabin_fever_7] id = 3194 clone = "pirate_cabin_fever" drop_table = "pirate" +combat_def = "pirate" +hitpoints = 520 +att = 49 +str = 50 +def = 50 +max_hit_slash = 60 [pirate_cabin_fever_8] id = 3195 clone = "pirate_cabin_fever" drop_table = "pirate" +combat_def = "pirate" +hitpoints = 520 +att = 49 +str = 50 +def = 50 +max_hit_slash = 60 [pirate_cabin_fever_9] id = 3196 clone = "pirate_cabin_fever" drop_table = "pirate" +combat_def = "pirate" +hitpoints = 520 +att = 49 +str = 50 +def = 50 +max_hit_slash = 60 [gull_cabin_fever] id = 3197 diff --git a/data/quest/members/clock_tower/clock_tower_dungeon.combat.toml b/data/quest/members/clock_tower/clock_tower_dungeon.combat.toml new file mode 100644 index 0000000000..34a2342cb6 --- /dev/null +++ b/data/quest/members/clock_tower/clock_tower_dungeon.combat.toml @@ -0,0 +1,6 @@ +[head_thief] +attack_speed = 5 + +[head_thief.melee] +range = 1 +target_hit = { offense = "slash", max = 30 } diff --git a/data/quest/members/clock_tower/clock_tower_dungeon.npcs.toml b/data/quest/members/clock_tower/clock_tower_dungeon.npcs.toml index 74a976c28c..dc762bfae2 100644 --- a/data/quest/members/clock_tower/clock_tower_dungeon.npcs.toml +++ b/data/quest/members/clock_tower/clock_tower_dungeon.npcs.toml @@ -3,11 +3,24 @@ id = 224 categories = ["rats"] examine = "A dirty rat." drop_table = "dungeon_rat" +combat_def = "giant_rat" +hitpoints = 120 +att = 10 +str = 10 +def = 10 +max_hit_stab = 20 [thief_clocktower_dungeon] id = 282 examine = "A dastardly blanket thief." drop_table = "thief" +combat_def = "man" +hitpoints = 170 +att = 14 +str = 10 +def = 9 +attack_bonus = 6 +max_hit_stab = 20 [head_thief_clocktower_dungeon] id = 283 @@ -23,22 +36,42 @@ max_hit_melee = 30 respawn_delay = 25 examine = "The head of the treacherous blanket stealing gang." drop_table = "head_thief" +max_hit_slash = 30 +combat_def = "head_thief" [dungeon_rat_clocktower_dungeon_2] id = 4936 categories = ["rats"] examine = "A dirty rat." drop_table = "dungeon_rat" +combat_def = "giant_rat" +hitpoints = 120 +att = 10 +str = 10 +def = 10 +max_hit_stab = 20 [dungeon_rat_clocktower_dungeon_3] id = 4937 categories = ["rats"] examine = "A dirty rat." drop_table = "dungeon_rat" +combat_def = "giant_rat" +hitpoints = 120 +att = 10 +str = 10 +def = 10 +max_hit_stab = 20 [dungeon_rat_clocktower_dungeon_4] id = 88 categories = ["rats"] examine = "Overgrown vermin." drop_table = "dungeon_rat" +combat_def = "giant_rat" +hitpoints = 120 +att = 10 +str = 10 +def = 10 +max_hit_stab = 20 diff --git a/data/quest/members/defender_of_varrock/defender_of_varrock.combat.toml b/data/quest/members/defender_of_varrock/defender_of_varrock.combat.toml new file mode 100644 index 0000000000..edecb1d908 --- /dev/null +++ b/data/quest/members/defender_of_varrock/defender_of_varrock.combat.toml @@ -0,0 +1,6 @@ +[barbarian] +attack_speed = 4 + +[barbarian.melee] +range = 1 +target_hit = { offense = "crush", max = 20 } diff --git a/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml b/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml index 07d5c647ea..1c31ab811b 100644 --- a/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml +++ b/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml @@ -11,6 +11,8 @@ attack_bonus = 8 respawn_delay = 25 examine = "Don't let her arm-wrestle you for money." drop_table = "barbarian" +max_hit_crush = 20 +combat_def = "barbarian" [stray_dog_defender_of_varrock] id = 5917 @@ -22,22 +24,27 @@ id = 5918 [armoured_zombie_defender_of_varrock] id = 8159 drop_table = "armoured_zombie" +combat_def = "zombie_sword" [armoured_zombie_defender_of_varrock_2] id = 8160 drop_table = "armoured_zombie" +combat_def = "zombie_sword" [armoured_zombie_defender_of_varrock_3] id = 8161 drop_table = "armoured_zombie" +combat_def = "zombie_sword" [armoured_zombie_defender_of_varrock_4] id = 8162 drop_table = "armoured_zombie" +combat_def = "zombie_sword" [armoured_zombie_defender_of_varrock_5] id = 8163 drop_table = "armoured_zombie" +combat_def = "zombie_sword" [arrav_defender_of_varrock] id = 8169 @@ -46,6 +53,13 @@ examine = "He has seen better, happier days." [guard_defender_of_varrock] id = 8173 drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 [ellamaria_defender_of_varrock] id = 8175 diff --git a/data/quest/members/desert_treasure/shadow_dungeon.npcs.toml b/data/quest/members/desert_treasure/shadow_dungeon.npcs.toml index b17caa463c..6f1fd51d26 100644 --- a/data/quest/members/desert_treasure/shadow_dungeon.npcs.toml +++ b/data/quest/members/desert_treasure/shadow_dungeon.npcs.toml @@ -12,6 +12,7 @@ categories = ["skeletons"] respawn_delay = 15 drop_table = "giant_skeleton_shadow_dungeon" examine = "A giant skeleton." +combat_def = "skeleton_unarmed" [shadow_hound] id = 1976 @@ -31,4 +32,5 @@ examine = "Looks hungry!" [giant_skeleton_shadow_dungeon_2] id = 5359 clone = "giant_skeleton_shadow_dungeon" +combat_def = "skeleton_unarmed" diff --git a/data/quest/members/dwarf_cannon/dwarven_outpost.npcs.toml b/data/quest/members/dwarf_cannon/dwarven_outpost.npcs.toml index c4cb3fd36b..cfb010f3a9 100644 --- a/data/quest/members/dwarf_cannon/dwarven_outpost.npcs.toml +++ b/data/quest/members/dwarf_cannon/dwarven_outpost.npcs.toml @@ -15,16 +15,33 @@ id = 4257 categories = ["dwarves"] examine = "A dwarven guard." drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 [guard_dwarven_outpost_2] id = 4258 categories = ["dwarves"] examine = "A dwarven guard." drop_table = "guard" +combat_def = "guard" +hitpoints = 220 +att = 19 +str = 18 +def = 14 +attack_bonus = 4 +max_hit_stab = 30 [goblin_dwarven_outpost] id = 4261 categories = ["goblins"] examine = "An ugly green creature." drop_table = "goblin" +combat_def = "goblin" +hitpoints = 50 +max_hit_crush = 10 diff --git a/data/quest/members/fairy_tale_i/fairy_tale_i.combat.toml b/data/quest/members/fairy_tale_i/fairy_tale_i.combat.toml new file mode 100644 index 0000000000..3bc6995a5a --- /dev/null +++ b/data/quest/members/fairy_tale_i/fairy_tale_i.combat.toml @@ -0,0 +1,6 @@ +[baby_tanglefoot] +attack_speed = 4 + +[baby_tanglefoot.melee] +range = 1 +target_hit = { offense = "slash", max = 50 } diff --git a/data/quest/members/fairy_tale_i/fairy_tale_i.npcs.toml b/data/quest/members/fairy_tale_i/fairy_tale_i.npcs.toml index ff148adc98..93b99949cf 100644 --- a/data/quest/members/fairy_tale_i/fairy_tale_i.npcs.toml +++ b/data/quest/members/fairy_tale_i/fairy_tale_i.npcs.toml @@ -19,6 +19,7 @@ style = "slash" max_hit_melee = 50 drop_table = "baby_tanglefoot" examine = "An animated shrub." +max_hit_slash = 50 [baby_tanglefoot_bush] id = 3320 @@ -30,4 +31,6 @@ style = "slash" max_hit_melee = 50 drop_table = "baby_tanglefoot" examine = "An aggressive bush." +max_hit_slash = 50 +combat_def = "baby_tanglefoot" diff --git a/data/quest/members/haunted_mine/haunted_mine.npcs.toml b/data/quest/members/haunted_mine/haunted_mine.npcs.toml index 42996d7fdd..21f427e973 100644 --- a/data/quest/members/haunted_mine/haunted_mine.npcs.toml +++ b/data/quest/members/haunted_mine/haunted_mine.npcs.toml @@ -24,6 +24,12 @@ id = 5392 categories = ["skeletons"] examine = "Put some meat on those bones!" drop_table = "skeleton" +combat_def = "skeleton_unarmed" +hitpoints = 240 +att = 17 +str = 17 +def = 17 +max_hit_crush = 30 [treus_dayth] id = 1540 diff --git a/data/quest/members/plague_city/plague_city.npcs.toml b/data/quest/members/plague_city/plague_city.npcs.toml index 734ce7f40d..3a25cd5d08 100644 --- a/data/quest/members/plague_city/plague_city.npcs.toml +++ b/data/quest/members/plague_city/plague_city.npcs.toml @@ -12,6 +12,9 @@ max_hit_melee = 20 categories = ["human"] examine = "A mourner, or plague healer." drop_table = "mourner" +combat_def = "guard" +attack_bonus = 6 +max_hit_crush = 20 [alrena] id = 710 diff --git a/data/quest/members/rocking_out/battle_of_the_archipelago/battle_of_the_archipelago.npcs.toml b/data/quest/members/rocking_out/battle_of_the_archipelago/battle_of_the_archipelago.npcs.toml index 70f35a984f..b1b0d2ac2d 100644 --- a/data/quest/members/rocking_out/battle_of_the_archipelago/battle_of_the_archipelago.npcs.toml +++ b/data/quest/members/rocking_out/battle_of_the_archipelago/battle_of_the_archipelago.npcs.toml @@ -1,6 +1,7 @@ [gull_battle_of_the_archipelago] id = 7860 drop_table = "bones" +combat_def = "seagull" [jack_battle_of_the_archipelago] id = 7861 diff --git a/data/quest/members/waterfall_quest/waterfall_quest.npcs.toml b/data/quest/members/waterfall_quest/waterfall_quest.npcs.toml index 5a63951cdf..21855b250a 100644 --- a/data/quest/members/waterfall_quest/waterfall_quest.npcs.toml +++ b/data/quest/members/waterfall_quest/waterfall_quest.npcs.toml @@ -14,3 +14,4 @@ hunt_mode = "cowardly" slayer_xp = 120.0 respawn_delay = 10 examine = "Bigger than your average moss giant." +combat_def = "moss_giant" diff --git a/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml b/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml index 77737e5326..c47239e9f1 100644 --- a/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml +++ b/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml @@ -2,6 +2,7 @@ id = 8312 examine = "An elite dark warrior with lots of combat experience." drop_table = "elite_dark_warrior" +combat_def = "guard" [elite_dark_ranger_black_knights_catacombs] id = 8316 diff --git a/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml b/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml index 58b79f15bb..046bcf3ce4 100644 --- a/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml +++ b/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml @@ -2,6 +2,7 @@ id = 8324 examine = "A Black Knight with lots of combat experience." drop_table = "elite_black_knight" +combat_def = "black_knight" [elite_black_knight_luciens_camp_2] id = 8329 @@ -15,96 +16,112 @@ id = 8377 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" +combat_def = "ice_troll" [undead_troll_luciens_camp_2] id = 8378 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" +combat_def = "ice_troll" [undead_troll_luciens_camp_3] id = 8379 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" +combat_def = "ice_troll" [undead_troll_luciens_camp_4] id = 8380 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" +combat_def = "ice_troll" [undead_troll_luciens_camp_5] id = 8381 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" +combat_def = "ice_troll" [undead_troll_luciens_camp_6] id = 8382 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" +combat_def = "ice_troll" [undead_troll_luciens_camp_7] id = 8383 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" +combat_def = "ice_troll" [undead_troll_luciens_camp_8] id = 8384 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" +combat_def = "ice_troll" [undead_troll_luciens_camp_9] id = 8385 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" +combat_def = "ice_troll" [undead_troll_luciens_camp_10] id = 8386 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" +combat_def = "ice_troll" [undead_troll_luciens_camp_11] id = 8387 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" +combat_def = "ice_troll" [undead_troll_luciens_camp_12] id = 8388 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" +combat_def = "ice_troll" [undead_troll_luciens_camp_13] id = 8389 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" +combat_def = "ice_troll" [undead_troll_luciens_camp_14] id = 8390 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" +combat_def = "ice_troll" [undead_troll_luciens_camp_15] id = 8391 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" +combat_def = "ice_troll" [undead_troll_luciens_camp_16] id = 8392 categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" +combat_def = "ice_troll" [undead_mage_luciens_camp] id = 8486 From 6bbf046acfa8ec24d5cb34cf03e06480da49c311 Mon Sep 17 00:00:00 2001 From: Harley Gilpin Date: Thu, 6 Aug 2026 17:42:08 -0700 Subject: [PATCH 06/13] Add combat definitions and stats for remaining spawned NPCs Second pass using runescape.wiki December 2011 revisions for post-2007 content the OSRS wiki can't cover (Scabaras dungeon, gnoeals, mutated bloodveld, ancient warriors, warped creatures, cursed ivory bosses). 2011 infoboxes carry LP, attack style, speed and max hit directly on the lifepoints scale; att/str/def are estimated from the combat level formula (x = (cb - 0.25*hp) / 0.9) as pre-EoC stat levels were never published. 41 combat definitions authored, ~65 npcs given stats, plus manual wires for stragglers: new archer ranged definition, fremennik citizens and customs officers to man, rock troll to ice_troll, The Kendal to bear, lava monster to fire_elemental. Spawned npcs missing combat definitions: 681 -> 0; missing hitpoints: 304 -> 0. --- .../kinshra_workshop.npcs.toml | 10 +++ .../asgarnia/burthorpe/burthorpe.combat.toml | 7 ++ .../asgarnia/burthorpe/burthorpe.npcs.toml | 3 + .../chaos_dwarf_battlefield.combat.toml | 6 ++ .../chaos_dwarf_battlefield.npcs.toml | 31 +++++++ .../keldagrim/keldagrim.npcs.toml | 5 ++ .../miscellania/miscellania.npcs.toml | 14 +++ .../rellekka_hunter_area.combat.toml | 7 ++ .../rellekka_hunter_area.npcs.toml | 13 +++ .../rellekka/rellekka.combat.toml | 7 ++ .../rellekka/rellekka.npcs.toml | 11 +++ .../waterbirth_island.combat.toml | 7 ++ .../waterbirth_island.npcs.toml | 12 +++ .../kandarin/ardougne/east_ardougne.npcs.toml | 7 ++ .../sewers/ardougne_sewers.combat.toml | 7 ++ .../ardougne/sewers/ardougne_sewers.npcs.toml | 2 + .../feldip_hills/feldip_hills.combat.toml | 14 +++ .../feldip_hills/feldip_hills.npcs.toml | 27 ++++++ .../piscatoris_hunter_area.npcs.toml | 1 + data/area/kandarin/yanille/yanille.npcs.toml | 1 + data/area/karamja/karamja.combat.toml | 28 ++++++ data/area/karamja/karamja.npcs.toml | 27 ++++++ .../tzhaar_city/tzhaar_city.combat.toml | 7 ++ .../karamja/tzhaar_city/tzhaar_city.npcs.toml | 12 +++ .../agility_pyramid/agility_pyramid.npcs.toml | 20 +++++ .../harmony_island/harmony.combat.toml | 6 ++ .../harmony_island/harmony.npcs.toml | 6 ++ .../windmill_cellar/windmill_cellar.npcs.toml | 55 ++++++++++++ .../kharidian_desert/nardah/nardah.npcs.toml | 1 + .../rock_island_prison.npcs.toml | 11 +++ .../scabaras_dungeon.combat.toml | 27 ++++++ .../scabaras_dungeon.npcs.toml | 30 +++++++ .../kharidian_desert/ullek/ullek.combat.toml | 21 +++++ .../kharidian_desert/ullek/ullek.npcs.toml | 33 +++++++ .../uzer/mastaba/uzer_mastaba.combat.toml | 6 ++ .../uzer/mastaba/uzer_mastaba.npcs.toml | 11 +++ .../area/kharidian_desert/uzer/uzer.npcs.toml | 20 +++++ .../combat_hall/combat_hall.combat.toml | 13 +++ .../combat_hall/combat_hall.npcs.toml | 6 ++ .../dragontooth_shipwreck.npcs.toml | 2 + .../meiyerditch/meiyerditch.npcs.toml | 5 ++ .../tunnels/meiyerditch_tunnels.combat.toml | 13 +++ .../tunnels/meiyerditch_tunnels.npcs.toml | 25 ++++++ .../mos_le_harmless/mos_le_harmless.npcs.toml | 5 ++ .../spirit_realm/spirit_realm.combat.toml | 6 ++ .../realm/spirit_realm/spirit_realm.npcs.toml | 11 +++ .../poison_waste_slayer_dungeon.combat.toml | 6 ++ .../poison_waste_slayer_dungeon.npcs.toml | 71 ++++++++++++++++ .../death_plateau/death_plateau.npcs.toml | 5 ++ .../ghorrock_fortress_dungeon.combat.toml | 6 ++ .../ghorrock_fortress_dungeon.npcs.toml | 13 +++ .../god_wars_dungeon/god_wars.combat.toml | 20 +++++ .../god_wars_dungeon/god_wars.npcs.toml | 24 ++++++ .../caves/mountain_camp_caves.npcs.toml | 1 + .../chaos_temple_dungeon.npcs.toml | 30 +++++++ .../nomads_temple/nomads_temple.combat.toml | 6 ++ .../nomads_temple/nomads_temple.npcs.toml | 5 ++ data/minigame/soul_wars/soul_wars.combat.toml | 13 +++ data/minigame/soul_wars/soul_wars.npcs.toml | 12 +++ .../defender_of_varrock.npcs.toml | 30 +++++++ .../dream_mentor/dream_mentor.combat.toml | 6 ++ .../dream_mentor/dream_mentor.npcs.toml | 1 + .../orks_rift/orks_rift.combat.toml | 20 +++++ .../orks_rift/orks_rift.npcs.toml | 17 ++++ .../mournings_end_part_2.combat.toml | 7 ++ .../mournings_end_part_2.npcs.toml | 1 + .../battle_of_the_archipelago.npcs.toml | 3 + .../black_knights_catacombs.combat.toml | 13 +++ .../black_knights_catacombs.npcs.toml | 19 +++++ .../luciens_camp/luciens_camp.npcs.toml | 85 +++++++++++++++++++ .../dungeoneering/dungeoneering.combat.toml | 6 ++ .../dungeoneering/dungeoneering.npcs.toml | 7 ++ 72 files changed, 1026 insertions(+) create mode 100644 data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.combat.toml create mode 100644 data/area/kharidian_desert/harmony_island/harmony.combat.toml create mode 100644 data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.combat.toml create mode 100644 data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.combat.toml create mode 100644 data/area/misthalin/lumbridge/combat_hall/combat_hall.combat.toml create mode 100644 data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.combat.toml create mode 100644 data/area/realm/spirit_realm/spirit_realm.combat.toml create mode 100644 data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.combat.toml create mode 100644 data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.combat.toml create mode 100644 data/area/troll_country/god_wars_dungeon/god_wars.combat.toml create mode 100644 data/minigame/soul_wars/nomads_temple/nomads_temple.combat.toml create mode 100644 data/minigame/soul_wars/soul_wars.combat.toml create mode 100644 data/quest/members/dream_mentor/dream_mentor.combat.toml create mode 100644 data/quest/members/fairy_tale_iii/orks_rift/orks_rift.combat.toml create mode 100644 data/quest/members/mournings_end_part_2/mournings_end_part_2.combat.toml create mode 100644 data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.combat.toml create mode 100644 data/skill/dungeoneering/dungeoneering.combat.toml diff --git a/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml b/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml index 620dbe71e9..672a651f5e 100644 --- a/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml +++ b/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml @@ -22,11 +22,21 @@ id = 11696 examine = "A Black Knight with lots of combat experience." drop_table = "empty" combat_def = "black_knight" +hitpoints = 750 +att = 99 +str = 99 +def = 99 +max_hit_crush = 370 [black_knight_guardian_kinshra_workshop_2] id = 11697 drop_table = "empty" combat_def = "black_knight" +hitpoints = 750 +att = 99 +str = 99 +def = 99 +max_hit_crush = 370 [black_knight_doorkeeper_2] id = 11690 diff --git a/data/area/asgarnia/burthorpe/burthorpe.combat.toml b/data/area/asgarnia/burthorpe/burthorpe.combat.toml index 4a85e0b41b..5b5dd6ca09 100644 --- a/data/area/asgarnia/burthorpe/burthorpe.combat.toml +++ b/data/area/asgarnia/burthorpe/burthorpe.combat.toml @@ -7,3 +7,10 @@ death_anim = "human_death" range = 1 anim = "claws_chop" target_hit = { offense = "slash", max = 60 } + +[archer] +attack_speed = 4 + +[archer.range] +range = 7 +target_hit = { offense = "range", max = 40 } diff --git a/data/area/asgarnia/burthorpe/burthorpe.npcs.toml b/data/area/asgarnia/burthorpe/burthorpe.npcs.toml index a217e478db..3601b527a8 100644 --- a/data/area/asgarnia/burthorpe/burthorpe.npcs.toml +++ b/data/area/asgarnia/burthorpe/burthorpe.npcs.toml @@ -145,11 +145,13 @@ examine = "Commander of the Imperial Guard." id = 1073 clone = "archer_burthorpe" drop_table = "archer_burthorpe" +combat_def = "archer" [archer_burthorpe_beard] id = 1074 clone = "archer_burthorpe" drop_table = "archer_burthorpe" +combat_def = "archer" [archer_burthorpe] id = 1075 @@ -157,6 +159,7 @@ hitpoints = 500 def = 40 range = 40 examine = "A Burthorpe Castle Archer." +combat_def = "archer" [imperial_soldier] id = 1063 diff --git a/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.combat.toml b/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.combat.toml new file mode 100644 index 0000000000..80b561d614 --- /dev/null +++ b/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.combat.toml @@ -0,0 +1,6 @@ +[chaos_dwogre] +attack_speed = 6 + +[chaos_dwogre.magic] +range = 6 +target_hit = { offense = "magic", max = 121 } diff --git a/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml b/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml index 28a3cb7e5e..d5b42cc414 100644 --- a/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml +++ b/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml @@ -2,6 +2,13 @@ id = 8771 examine = "A magical cross between an ogre and a dwarf." drop_table = "chaos_dwogre" +hitpoints = 1000 +att = 99 +str = 99 +def = 99 +mage = 99 +max_hit_magic = 121 +combat_def = "chaos_dwogre" [black_guard_chaos_dwarf_battlefield] id = 8772 @@ -38,6 +45,12 @@ categories = ["dwarves"] examine = "A dwarf gone bad." drop_table = "chaos_dwarf_hand_cannoneer" combat_def = "dwarf" +hitpoints = 1220 +att = 77 +str = 77 +def = 77 +range = 77 +max_hit_range = 110 [chaos_dwarf_hand_cannoneer_chaos_dwarf_battlefield_2] id = 8777 @@ -45,6 +58,12 @@ categories = ["dwarves"] examine = "A dwarf gone bad." drop_table = "chaos_dwarf_hand_cannoneer" combat_def = "dwarf" +hitpoints = 1220 +att = 77 +str = 77 +def = 77 +range = 77 +max_hit_range = 110 [chaos_dwarf_chaos_dwarf_battlefield] id = 8778 @@ -76,6 +95,12 @@ categories = ["dwarves"] examine = "A member of the Black Guard with a crossbow." drop_table = "black_guard_crossbowdwarf" combat_def = "guard" +hitpoints = 800 +att = 70 +str = 70 +def = 70 +range = 70 +max_hit_range = 100 [black_guard_crossbowdwarf_chaos_dwarf_battlefield_2] id = 8782 @@ -83,6 +108,12 @@ categories = ["dwarves"] examine = "A member of the Black Guard with a crossbow." drop_table = "black_guard_crossbowdwarf" combat_def = "guard" +hitpoints = 800 +att = 70 +str = 70 +def = 70 +range = 70 +max_hit_range = 100 [black_guard_berserker_chaos_dwarf_battlefield] id = 8783 diff --git a/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml b/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml index 3b27890cf1..648f2a6b1d 100644 --- a/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml +++ b/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml @@ -635,6 +635,11 @@ categories = ["dwarves"] examine = "An elite Black Guard soldier assigned to protect the trade floor." drop_table = "trade_floor_guard" combat_def = "guard" +hitpoints = 700 +att = 76 +str = 76 +def = 76 +max_hit_crush = 164 [colonel_grenda_keldagrim] id = 8817 diff --git a/data/area/fremennik_province/miscellania/miscellania.npcs.toml b/data/area/fremennik_province/miscellania/miscellania.npcs.toml index b14e140dcd..1669d93160 100644 --- a/data/area/fremennik_province/miscellania/miscellania.npcs.toml +++ b/data/area/fremennik_province/miscellania/miscellania.npcs.toml @@ -10,6 +10,7 @@ categories = ["birds"] respawn_delay = 30 examine = "An inhabitant of icy regions." drop_table = "bones" +combat_def = "chicken" [gull_miscellania] id = 1325 @@ -136,6 +137,10 @@ max_hit_melee = 10 respawn_delay = 50 examine = "A subject of Miscellania." drop_table = "bones" +att = 1 +str = 1 +def = 1 +combat_def = "man" [einar] id = 1380 @@ -173,6 +178,10 @@ respawn_delay = 50 shop = "miscellanian_clothes_shop" examine = "A subject of Miscellania." drop_table = "bones" +att = 1 +str = 1 +def = 1 +combat_def = "man" [sailor_miscellania] id = 1385 @@ -194,6 +203,11 @@ max_hit_crush = 10 id = 1387 examine = "A subject of Miscellania." drop_table = "bones" +hitpoints = 70 +att = 1 +str = 1 +def = 1 +combat_def = "man" [valgerd] id = 1388 diff --git a/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.combat.toml b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.combat.toml index a762e88d96..2cbdfd2f91 100644 --- a/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.combat.toml +++ b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.combat.toml @@ -4,3 +4,10 @@ attack_speed = 4 [yeti.melee] range = 1 target_hit = { offense = "crush", max = 70 } + +[gnoeals] +attack_speed = 6 + +[gnoeals.magic] +range = 6 +target_hit = { offense = "magic", max = 120 } diff --git a/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml index b6b4632060..6494cda808 100644 --- a/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml +++ b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml @@ -45,10 +45,23 @@ combat_def = "yeti" id = 7381 examine = "A strange, magical beast." drop_table = "gnoeals" +hitpoints = 750 +att = 82 +str = 82 +def = 82 +mage = 82 +max_hit_magic = 120 [gnoeals_2] id = 7382 drop_table = "gnoeals" +hitpoints = 750 +att = 72 +str = 72 +def = 72 +mage = 72 +max_hit_magic = 120 +combat_def = "gnoeals" [erjolf_base] id = 7405 diff --git a/data/area/fremennik_province/rellekka/rellekka.combat.toml b/data/area/fremennik_province/rellekka/rellekka.combat.toml index cd87174358..0755f86675 100644 --- a/data/area/fremennik_province/rellekka/rellekka.combat.toml +++ b/data/area/fremennik_province/rellekka/rellekka.combat.toml @@ -73,3 +73,10 @@ attack_speed = 4 [black_unicorn_foal.melee] range = 1 target_hit = { offense = "stab", max = 30 } + +[fenris_wolf] +attack_speed = 4 + +[fenris_wolf.melee] +range = 1 +target_hit = { offense = "crush", max = 69 } diff --git a/data/area/fremennik_province/rellekka/rellekka.npcs.toml b/data/area/fremennik_province/rellekka/rellekka.npcs.toml index 81c1e13a32..f9b5cfff82 100644 --- a/data/area/fremennik_province/rellekka/rellekka.npcs.toml +++ b/data/area/fremennik_province/rellekka/rellekka.npcs.toml @@ -144,6 +144,11 @@ clone = "agnar_rellekka" id = 1310 clone = "agnar_rellekka" drop_table = "bones" +hitpoints = 480 +att = 40 +str = 40 +def = 40 +combat_def = "man" [lensa_rellekka] id = 1311 @@ -254,6 +259,12 @@ id = 1330 categories = ["wolves"] examine = "Fearsome predator found only in the Fremennik Province, renowned for its fur." drop_table = "fenris_wolf" +hitpoints = 690 +att = 52 +str = 52 +def = 52 +max_hit_crush = 69 +combat_def = "fenris_wolf" [fishing_spot_rellekka] id = 1331 diff --git a/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml b/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml index 4c1f4713d8..d1fdbe0bd8 100644 --- a/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml +++ b/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml @@ -52,3 +52,10 @@ attack_speed = 4 [dagannoth_fledgeling.melee] range = 1 target_hit = { offense = "stab", max = 60 } + +[dagannoth_guardian] +attack_speed = 4 + +[dagannoth_guardian.range] +range = 6 +target_hit = { offense = "range", max = 114 } diff --git a/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml b/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml index de42d5bd42..67e148e5c3 100644 --- a/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml +++ b/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml @@ -49,11 +49,23 @@ id = 9092 categories = ["dagannoth"] examine = "The Dagannoth Mother's guardians." drop_table = "dagannoth_guardian" +hitpoints = 2100 +att = 99 +str = 99 +def = 99 +range = 99 +max_hit_range = 114 +combat_def = "dagannoth_guardian" [bardur] id = 2879 examine = "A Fremennik warrior, hard at work." drop_table = "bones" +hitpoints = 940 +att = 80 +str = 80 +def = 80 +combat_def = "man" [dagannoth_fledgeling] id = 2880 diff --git a/data/area/kandarin/ardougne/east_ardougne.npcs.toml b/data/area/kandarin/ardougne/east_ardougne.npcs.toml index f8edee5769..b6e61479e6 100644 --- a/data/area/kandarin/ardougne/east_ardougne.npcs.toml +++ b/data/area/kandarin/ardougne/east_ardougne.npcs.toml @@ -151,6 +151,13 @@ max_hit_crush = 10 id = 27 drop_table = "bones" examine = "Good with arrows." +combat_def = "archer" +hitpoints = 370 +att = 30 +str = 30 +def = 30 +range = 30 +max_hit_range = 40 [zookeeper] id = 28 diff --git a/data/area/kandarin/ardougne/sewers/ardougne_sewers.combat.toml b/data/area/kandarin/ardougne/sewers/ardougne_sewers.combat.toml index b6148c7733..8611162906 100644 --- a/data/area/kandarin/ardougne/sewers/ardougne_sewers.combat.toml +++ b/data/area/kandarin/ardougne/sewers/ardougne_sewers.combat.toml @@ -11,3 +11,10 @@ attack_speed = 4 [clivet.melee] range = 1 target_hit = { offense = "crush", max = 20 } + +[hazeel_cultist] +attack_speed = 4 + +[hazeel_cultist.melee] +range = 1 +target_hit = { offense = "crush", max = 20 } diff --git a/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml b/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml index c04fe5d7a5..5ae372b571 100644 --- a/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml +++ b/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml @@ -50,6 +50,8 @@ max_hit_melee = 20 respawn_delay = 50 examine = "A member of the Hazeel cult." drop_table = "hazeel_cultist" +max_hit_crush = 20 +combat_def = "hazeel_cultist" [elena_southern_ardougne_sewer_normal] id = 3215 diff --git a/data/area/kandarin/feldip_hills/feldip_hills.combat.toml b/data/area/kandarin/feldip_hills/feldip_hills.combat.toml index b02f730a6f..c9460ffa79 100644 --- a/data/area/kandarin/feldip_hills/feldip_hills.combat.toml +++ b/data/area/kandarin/feldip_hills/feldip_hills.combat.toml @@ -39,3 +39,17 @@ attack_speed = 4 [carnivorous_chinchompa.melee] range = 1 target_hit = { offense = "crush", max = 10 } + +[ogress_champion] +attack_speed = 4 + +[ogress_champion.melee] +range = 1 +target_hit = { offense = "crush", max = 100 } + +[ogress] +attack_speed = 6 + +[ogress.melee] +range = 1 +target_hit = { offense = "crush", max = 80 } diff --git a/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml b/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml index a0f566e5ce..20656d3540 100644 --- a/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml +++ b/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml @@ -76,6 +76,11 @@ id = 7078 categories = ["ogres"] examine = "A fearsome adversary with no sense of humour." drop_table = "ogress_champion" +hitpoints = 880 +att = 86 +str = 86 +def = 86 +max_hit_crush = 100 [ogress_warrior] id = 7079 @@ -83,6 +88,11 @@ categories = ["ogres"] examine = "Irascible, belligerent and stupefyingly impolite." drop_table = "ogress_warrior" combat_def = "guard" +hitpoints = 800 +att = 73 +str = 73 +def = 73 +max_hit_crush = 120 [ogress_warrior_2] id = 7080 @@ -90,18 +100,35 @@ categories = ["ogres"] examine = "Irascible, belligerent and stupefyingly impolite." drop_table = "ogress_warrior" combat_def = "guard" +hitpoints = 800 +att = 73 +str = 73 +def = 73 +max_hit_crush = 120 [ogress_feldip_hills] id = 7081 categories = ["ogres"] examine = "A large and contentious lady ogre." drop_table = "ogress" +hitpoints = 710 +att = 57 +str = 57 +def = 57 +max_hit_crush = 80 +combat_def = "ogress" [ogress_feldip_hills_2] id = 7082 categories = ["ogres"] examine = "A large and contentious lady ogre." drop_table = "ogress" +hitpoints = 710 +att = 57 +str = 57 +def = 57 +max_hit_crush = 80 +combat_def = "ogress" [rantz_feldip_hills_2] id = 8659 diff --git a/data/area/kandarin/piscatoris/hunter_area/piscatoris_hunter_area.npcs.toml b/data/area/kandarin/piscatoris/hunter_area/piscatoris_hunter_area.npcs.toml index a7f4552acb..d6f7d031f4 100644 --- a/data/area/kandarin/piscatoris/hunter_area/piscatoris_hunter_area.npcs.toml +++ b/data/area/kandarin/piscatoris/hunter_area/piscatoris_hunter_area.npcs.toml @@ -10,6 +10,7 @@ max_hit_melee = 10 respawn_delay = 7 examine = "It looks fluffy and cute; it's probably deadly." drop_table = "empty" +combat_def = "rat" [ruby_harvest] id = 5085 diff --git a/data/area/kandarin/yanille/yanille.npcs.toml b/data/area/kandarin/yanille/yanille.npcs.toml index 5f2982ca9e..7f3a064ae3 100644 --- a/data/area/kandarin/yanille/yanille.npcs.toml +++ b/data/area/kandarin/yanille/yanille.npcs.toml @@ -47,6 +47,7 @@ attack_bonus = 8 respawn_delay = 50 drop_table = "soldier_yanille" examine = "A soldier of the town of Yanille." +combat_def = "guard" [professor_imblewyn] id = 4586 diff --git a/data/area/karamja/karamja.combat.toml b/data/area/karamja/karamja.combat.toml index a8a3a2b57e..d5ebf5693c 100644 --- a/data/area/karamja/karamja.combat.toml +++ b/data/area/karamja/karamja.combat.toml @@ -43,3 +43,31 @@ attack_speed = 4 [tribesman.melee] range = 1 target_hit = { offense = "stab", max = 40 } + +[frog] +attack_speed = 4 + +[frog.melee] +range = 1 +target_hit = { offense = "crush", max = 61 } + +[tenacious_toucan] +attack_speed = 6 + +[tenacious_toucan.melee] +range = 1 +target_hit = { offense = "stab", max = 119 } + +[giant_wasp] +attack_speed = 6 + +[giant_wasp.melee] +range = 1 +target_hit = { offense = "crush", max = 50 } + +[pernicious_parrot] +attack_speed = 6 + +[pernicious_parrot.melee] +range = 1 +target_hit = { offense = "stab", max = 119 } diff --git a/data/area/karamja/karamja.npcs.toml b/data/area/karamja/karamja.npcs.toml index efb7f1054d..f9f9074e74 100644 --- a/data/area/karamja/karamja.npcs.toml +++ b/data/area/karamja/karamja.npcs.toml @@ -54,6 +54,12 @@ id = 3783 categories = ["frogs"] examine = "Long legged licker." drop_table = "frog" +hitpoints = 500 +att = 59 +str = 59 +def = 59 +max_hit_crush = 61 +combat_def = "frog" [jungle_forester] id = 401 @@ -110,6 +116,11 @@ id = 6378 categories = ["birds"] examine = "I wouldn't want to be footing that bill." drop_table = "tenacious_toucan" +hitpoints = 500 +att = 64 +str = 64 +def = 64 +max_hit_stab = 119 [giant_ant_worker] id = 6379 @@ -139,16 +150,32 @@ drop_table = "giant_ant_soldier" id = 6381 examine = "That stinger has to hurt..." drop_table = "giant_wasp" +hitpoints = 370 +att = 63 +str = 63 +def = 63 +max_hit_crush = 50 [pernicious_parrot] id = 6382 categories = ["birds"] examine = "Polynomial - a parrot that goes without breakfast, lunch or dinner." drop_table = "empty" +hitpoints = 500 +att = 59 +str = 59 +def = 59 +max_hit_stab = 119 [giant_wasp_2] id = 6383 drop_table = "giant_wasp" +hitpoints = 370 +att = 63 +str = 63 +def = 63 +max_hit_crush = 50 +combat_def = "giant_wasp" [karamjan_jungle_eagle] id = 6387 diff --git a/data/area/karamja/tzhaar_city/tzhaar_city.combat.toml b/data/area/karamja/tzhaar_city/tzhaar_city.combat.toml index 0061bb6832..deca1ff977 100644 --- a/data/area/karamja/tzhaar_city/tzhaar_city.combat.toml +++ b/data/area/karamja/tzhaar_city/tzhaar_city.combat.toml @@ -62,3 +62,10 @@ target_hit = { offense = "magic", max = 130 } impact_gfx = "tzhaar_magic_hit" miss_gfx = "giant_splash" miss_sound = "spell_splash" + +[fire_monster] +attack_speed = 4 + +[fire_monster.magic] +range = 6 +target_hit = { offense = "magic", max = 8 } diff --git a/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml b/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml index 915c33bfaa..7823faf216 100644 --- a/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml +++ b/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml @@ -289,11 +289,23 @@ max_hit_crush = 70 id = 7772 examine = "A monster made of magma." drop_table = "empty" +hitpoints = 470 +att = 40 +str = 40 +def = 40 +combat_def = "fire_elemental" [fire_monster_tzhaar_caves] id = 7773 examine = "A monster like many others, but on fire." drop_table = "fire_monster" +hitpoints = 260 +att = 45 +str = 45 +def = 45 +mage = 45 +max_hit_magic = 8 +combat_def = "fire_monster" [tzhaar_mej_roh] id = 2623 diff --git a/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml index ba6d3518fd..a6361ca620 100644 --- a/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml +++ b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml @@ -32,21 +32,41 @@ combat_def = "vulture" id = 6753 drop_table = "mummy" combat_def = "mummy" +hitpoints = 910 +att = 99 +str = 99 +def = 99 +max_hit_crush = 60 [mummy_agility_pyramid_2] id = 6754 drop_table = "mummy" combat_def = "mummy" +hitpoints = 910 +att = 99 +str = 99 +def = 99 +max_hit_crush = 60 [mummy_agility_pyramid_3] id = 6755 drop_table = "mummy" combat_def = "mummy" +hitpoints = 910 +att = 99 +str = 99 +def = 99 +max_hit_crush = 60 [mummy_agility_pyramid_4] id = 6756 drop_table = "mummy" combat_def = "mummy" +hitpoints = 910 +att = 99 +str = 99 +def = 99 +max_hit_crush = 60 [agility_pyramid_block] id = 3124 diff --git a/data/area/kharidian_desert/harmony_island/harmony.combat.toml b/data/area/kharidian_desert/harmony_island/harmony.combat.toml new file mode 100644 index 0000000000..4d0af8d806 --- /dev/null +++ b/data/area/kharidian_desert/harmony_island/harmony.combat.toml @@ -0,0 +1,6 @@ +[sorebones] +attack_speed = 4 + +[sorebones.melee] +range = 1 +target_hit = { offense = "crush", max = 10 } diff --git a/data/area/kharidian_desert/harmony_island/harmony.npcs.toml b/data/area/kharidian_desert/harmony_island/harmony.npcs.toml index 1ec7f2bdfa..e9b92c3a8c 100644 --- a/data/area/kharidian_desert/harmony_island/harmony.npcs.toml +++ b/data/area/kharidian_desert/harmony_island/harmony.npcs.toml @@ -27,10 +27,16 @@ categories = ["zombies"] respawn_delay = 25 drop_table = "sorebones" examine = "Bedside manner is a little lacking, I think." +combat_def = "sorebones" [sorebones_harmony_apron] id = 5628 clone = "sorebones_harmony" +hitpoints = 520 +att = 49 +str = 49 +def = 49 +combat_def = "sorebones" [zombie_pirate_harmony] id = 5629 diff --git a/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml b/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml index 43fb4d716e..5598920e77 100644 --- a/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml +++ b/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml @@ -5,56 +5,111 @@ id = 5606 id = 5630 drop_table = "zombie_pirate" combat_def = "zombie_pirate" +hitpoints = 520 +att = 49 +str = 49 +def = 49 +max_hit_crush = 60 [zombie_pirate_windmill_cellar_2] id = 5632 drop_table = "zombie_pirate" combat_def = "zombie_pirate" +hitpoints = 520 +att = 49 +str = 49 +def = 49 +max_hit_crush = 60 [zombie_pirate_windmill_cellar_3] id = 5636 drop_table = "zombie_pirate" combat_def = "zombie_pirate" +hitpoints = 520 +att = 49 +str = 49 +def = 49 +max_hit_crush = 60 [zombie_pirate_windmill_cellar_4] id = 5649 drop_table = "zombie_pirate" combat_def = "zombie_pirate" +hitpoints = 520 +att = 49 +str = 49 +def = 49 +max_hit_crush = 60 [zombie_pirate_windmill_cellar_5] id = 5651 drop_table = "zombie_pirate" combat_def = "zombie_pirate" +hitpoints = 520 +att = 49 +str = 49 +def = 49 +max_hit_crush = 60 [zombie_pirate_windmill_cellar_6] id = 5653 drop_table = "zombie_pirate" combat_def = "zombie_pirate" +hitpoints = 520 +att = 49 +str = 49 +def = 49 +max_hit_crush = 60 [zombie_pirate_windmill_cellar_7] id = 5655 drop_table = "zombie_pirate" combat_def = "zombie_pirate" +hitpoints = 520 +att = 49 +str = 49 +def = 49 +max_hit_crush = 60 [zombie_pirate_windmill_cellar_8] id = 5657 drop_table = "zombie_pirate" combat_def = "zombie_pirate" +hitpoints = 520 +att = 49 +str = 49 +def = 49 +max_hit_crush = 60 [zombie_pirate_windmill_cellar_9] id = 5660 drop_table = "zombie_pirate" combat_def = "zombie_pirate" +hitpoints = 520 +att = 49 +str = 49 +def = 49 +max_hit_crush = 60 [zombie_pirate_windmill_cellar_10] id = 5662 drop_table = "zombie_pirate" combat_def = "zombie_pirate" +hitpoints = 520 +att = 49 +str = 49 +def = 49 +max_hit_crush = 60 [zombie_pirate_windmill_cellar_11] id = 5664 drop_table = "zombie_pirate" combat_def = "zombie_pirate" +hitpoints = 520 +att = 49 +str = 49 +def = 49 +max_hit_crush = 60 [monk_windmill_cellar] id = 5673 diff --git a/data/area/kharidian_desert/nardah/nardah.npcs.toml b/data/area/kharidian_desert/nardah/nardah.npcs.toml index 1232147174..e89874a5e8 100644 --- a/data/area/kharidian_desert/nardah/nardah.npcs.toml +++ b/data/area/kharidian_desert/nardah/nardah.npcs.toml @@ -60,6 +60,7 @@ attack_bonus = 4 respawn_delay = 50 drop_table = "bones" examine = "The mayor's guard." +combat_def = "man" [poltenip] id = 3042 diff --git a/data/area/kharidian_desert/rock_island_prison/rock_island_prison.npcs.toml b/data/area/kharidian_desert/rock_island_prison/rock_island_prison.npcs.toml index a5cefe4c09..4aa95d0713 100644 --- a/data/area/kharidian_desert/rock_island_prison/rock_island_prison.npcs.toml +++ b/data/area/kharidian_desert/rock_island_prison/rock_island_prison.npcs.toml @@ -6,16 +6,27 @@ examine = "He's going for that 'stripy' look." id = 1400 drop_table = "bones" combat_def = "seagull" +hitpoints = 30 [customs_officer] id = 7837 examine = "Inspects people's packages." drop_table = "bones" +hitpoints = 350 +att = 29 +str = 29 +def = 29 +combat_def = "man" [customs_officer_2] id = 7838 examine = "Inspects people's packages." drop_table = "bones" +hitpoints = 350 +att = 29 +str = 29 +def = 29 +combat_def = "man" [locker_officer] id = 7842 diff --git a/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.combat.toml b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.combat.toml new file mode 100644 index 0000000000..942f4cf90e --- /dev/null +++ b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.combat.toml @@ -0,0 +1,27 @@ +[scarab_larva] +attack_speed = 4 + +[scarab_larva.melee] +range = 1 +target_hit = { offense = "crush", max = 10 } + +[scabaras_ranger] +attack_speed = 4 + +[scabaras_ranger.range] +range = 6 +target_hit = { offense = "range", max = 130 } + +[scabaras_lancer] +attack_speed = 4 + +[scabaras_lancer.melee] +range = 1 +target_hit = { offense = "crush", max = 130 } + +[scabaras_mage] +attack_speed = 4 + +[scabaras_mage.magic] +range = 6 +target_hit = { offense = "magic", max = 104 } diff --git a/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml index 42beb14fe8..86fe653c16 100644 --- a/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml +++ b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml @@ -2,28 +2,58 @@ id = 6772 examine = "It's not quite small enough to stamp upon." drop_table = "empty" +att = 15 +str = 15 +def = 15 +combat_def = "scarab_larva" +hitpoints = 140 [scabaras_ranger] id = 6773 categories = ["scabarites"] examine = "Bred to shoot you down." drop_table = "locust_rider" +hitpoints = 900 +att = 89 +str = 89 +def = 89 +range = 89 +max_hit_range = 130 [scabaras_lancer] id = 6774 categories = ["scabarites"] examine = "It might be angry...it's hard to tell." drop_table = "scabaras_lancer" +hitpoints = 900 +att = 99 +str = 99 +def = 99 +max_hit_crush = 130 [scabaras_mage_scabaras_dungeon] id = 6780 categories = ["scabarites"] examine = "Part scarab, part man." drop_table = "locust_rider" +hitpoints = 700 +att = 89 +str = 89 +def = 89 +mage = 89 +max_hit_magic = 104 +combat_def = "scabaras_mage" [scabaras_mage_scabaras_dungeon_2] id = 6781 drop_table = "locust_rider" +hitpoints = 700 +att = 78 +str = 78 +def = 78 +mage = 78 +max_hit_magic = 104 +combat_def = "scabaras_mage" [clay_golem_scabaras_dungeon] id = 6785 diff --git a/data/area/kharidian_desert/ullek/ullek.combat.toml b/data/area/kharidian_desert/ullek/ullek.combat.toml index 8c3aad5cf7..8e4a1b15c0 100644 --- a/data/area/kharidian_desert/ullek/ullek.combat.toml +++ b/data/area/kharidian_desert/ullek/ullek.combat.toml @@ -4,3 +4,24 @@ attack_speed = 4 [crocodile.melee] range = 1 target_hit = { offense = "slash", max = 60 } + +[scabaras_locust] +attack_speed = 4 + +[scabaras_locust.melee] +range = 1 +target_hit = { offense = "crush", max = 10 } + +[locust_lancer] +attack_speed = 4 + +[locust_lancer.melee] +range = 1 +target_hit = { offense = "crush", max = 120 } + +[locust_ranger] +attack_speed = 4 + +[locust_ranger.range] +range = 6 +target_hit = { offense = "range", max = 210 } diff --git a/data/area/kharidian_desert/ullek/ullek.npcs.toml b/data/area/kharidian_desert/ullek/ullek.npcs.toml index cae8a66ef6..9399d987a1 100644 --- a/data/area/kharidian_desert/ullek/ullek.npcs.toml +++ b/data/area/kharidian_desert/ullek/ullek.npcs.toml @@ -4,6 +4,11 @@ categories = ["zombies"] examine = "Cut-down and dried." drop_table = "dried_zombie" combat_def = "zombie" +hitpoints = 850 +att = 75 +str = 75 +def = 75 +max_hit_crush = 110 [dried_zombie_ullek_2] id = 6762 @@ -11,6 +16,11 @@ categories = ["zombies"] examine = "Needs moisturising." drop_table = "dried_zombie" combat_def = "zombie" +hitpoints = 850 +att = 81 +str = 81 +def = 81 +max_hit_crush = 110 [dried_zombie_ullek_3] id = 6763 @@ -18,6 +28,11 @@ categories = ["zombies"] examine = "I bet it's parched." drop_table = "dried_zombie" combat_def = "zombie" +hitpoints = 850 +att = 99 +str = 99 +def = 99 +max_hit_crush = 110 [skeleton_ullek] id = 6764 @@ -75,18 +90,36 @@ max_hit_crush = 30 id = 6776 examine = "A giant, mountable locust." drop_table = "locust" +att = 99 +str = 99 +def = 99 +combat_def = "scabaras_locust" +hitpoints = 1060 [locust_lancer_ullek] id = 6777 categories = ["scabarites"] examine = "Bouncy, but not fun." drop_table = "locust_lancer" +hitpoints = 910 +att = 96 +str = 96 +def = 96 +max_hit_crush = 120 +combat_def = "locust_lancer" [locust_ranger_ullek] id = 6778 categories = ["scabarites"] examine = "He'll have someone's eye out with that." drop_table = "locust_ranger" +hitpoints = 1000 +att = 81 +str = 81 +def = 81 +range = 81 +max_hit_range = 210 +combat_def = "locust_ranger" [crocodile_ullek] id = 6779 diff --git a/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.combat.toml b/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.combat.toml new file mode 100644 index 0000000000..71cee56799 --- /dev/null +++ b/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.combat.toml @@ -0,0 +1,6 @@ +[small_scarab] +attack_speed = 4 + +[small_scarab.melee] +range = 1 +target_hit = { offense = "crush", max = 15 } diff --git a/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml b/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml index 5a2676eda7..ce44a09ee8 100644 --- a/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml +++ b/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml @@ -3,6 +3,11 @@ id = 7497 examine = "A rocky horror." drop_table = "empty" combat_def = "guard" +hitpoints = 750 +att = 31 +str = 31 +def = 31 +max_hit_crush = 50 [golems_remains_uzer_mastaba] id = 7498 @@ -12,4 +17,10 @@ id = 7500 categories = ["scabarites"] examine = "This dung beetle has mistaken you for its staple diet." drop_table = "small_scarab" +hitpoints = 400 +att = 34 +str = 34 +def = 34 +max_hit_crush = 15 +combat_def = "small_scarab" diff --git a/data/area/kharidian_desert/uzer/uzer.npcs.toml b/data/area/kharidian_desert/uzer/uzer.npcs.toml index d39ad83ab9..f0c5e7dde5 100644 --- a/data/area/kharidian_desert/uzer/uzer.npcs.toml +++ b/data/area/kharidian_desert/uzer/uzer.npcs.toml @@ -3,28 +3,48 @@ id = 7492 examine = "A desert dweller taken to banditry." drop_table = "bandit_looter" combat_def = "guard" +hitpoints = 400 +att = 34 +str = 34 +def = 34 [bandit_looter_uzer_2] id = 7493 examine = "Calls himself an archaeologist." drop_table = "bandit_looter" combat_def = "guard" +hitpoints = 400 +att = 34 +str = 34 +def = 34 [bandit_looter_uzer_3] id = 7494 examine = "He hasn't found much of use, clearly." drop_table = "bandit_looter" combat_def = "guard" +hitpoints = 400 +att = 34 +str = 34 +def = 34 [bandit_looter_uzer_4] id = 7495 examine = "An amateur historian with added greed." drop_table = "bandit_looter" combat_def = "guard" +hitpoints = 400 +att = 34 +str = 34 +def = 34 [bandit_looter_uzer_5] id = 7496 examine = "It all started with her love of genealogy." drop_table = "bandit_looter" combat_def = "guard" +hitpoints = 400 +att = 34 +str = 34 +def = 34 diff --git a/data/area/misthalin/lumbridge/combat_hall/combat_hall.combat.toml b/data/area/misthalin/lumbridge/combat_hall/combat_hall.combat.toml new file mode 100644 index 0000000000..4bff1ac8c3 --- /dev/null +++ b/data/area/misthalin/lumbridge/combat_hall/combat_hall.combat.toml @@ -0,0 +1,13 @@ +[magic_dummy] +attack_speed = 4 + +[magic_dummy.melee] +range = 1 +target_hit = { offense = "crush", max = 10 } + +[melee_dummy] +attack_speed = 4 + +[melee_dummy.melee] +range = 1 +target_hit = { offense = "crush", max = 10 } diff --git a/data/area/misthalin/lumbridge/combat_hall/combat_hall.npcs.toml b/data/area/misthalin/lumbridge/combat_hall/combat_hall.npcs.toml index 48b952d1e8..396127cf8b 100644 --- a/data/area/misthalin/lumbridge/combat_hall/combat_hall.npcs.toml +++ b/data/area/misthalin/lumbridge/combat_hall/combat_hall.npcs.toml @@ -9,6 +9,9 @@ immune_drain = true retaliates = false examine = "This is ready for you to cast magic at it." drop_table = "empty" +att = 1 +str = 1 +def = 1 [melee_dummy] id = 7891 @@ -21,6 +24,9 @@ immune_drain = true retaliates = false examine = "Ready for all you can swing at it." drop_table = "empty" +att = 1 +str = 1 +def = 1 [mikasi] id = 4707 diff --git a/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.npcs.toml b/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.npcs.toml index af9ae4fe75..7e3472304c 100644 --- a/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.npcs.toml +++ b/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.npcs.toml @@ -7,6 +7,8 @@ att = 40 str = 30 def = 40 max_hit_stab = 40 +max_hit_crush = 90 +combat_def = "giant_lobster" [giant_crab_dragontooth_shipwreck] id = 7829 diff --git a/data/area/morytania/meiyerditch/meiyerditch.npcs.toml b/data/area/morytania/meiyerditch/meiyerditch.npcs.toml index 75b7d2bdc4..f851debba4 100644 --- a/data/area/morytania/meiyerditch/meiyerditch.npcs.toml +++ b/data/area/morytania/meiyerditch/meiyerditch.npcs.toml @@ -322,6 +322,11 @@ combat_def = "vyrewatch" [flying_female_vampire] id = 7613 drop_table = "empty" +hitpoints = 1400 +att = 110 +str = 110 +def = 110 +combat_def = "vampyre" [vyrewatch_meiyerditch_12] id = 7622 diff --git a/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.combat.toml b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.combat.toml new file mode 100644 index 0000000000..dd910054ce --- /dev/null +++ b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.combat.toml @@ -0,0 +1,13 @@ +[skeletal_hand] +attack_speed = 6 + +[skeletal_hand.melee] +range = 1 +target_hit = { offense = "crush", max = 130 } + +[mutated_bloodveld] +attack_speed = 6 + +[mutated_bloodveld.magic] +range = 6 +target_hit = { offense = "magic", max = 90 } diff --git a/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml index 3117e68f77..96a07f826b 100644 --- a/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml +++ b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml @@ -22,6 +22,12 @@ id = 7640 categories = ["crawling_hands"] examine = "A giant, skeletal hand. I don't think I should offer to shake hands." drop_table = "skeletal_hand" +hitpoints = 1000 +att = 61 +str = 61 +def = 61 +max_hit_crush = 130 +combat_def = "skeletal_hand" [zombie_hand_meiyerditch_tunnels] id = 7641 @@ -29,16 +35,35 @@ categories = ["crawling_hands"] examine = "A giant, zombified hand. I don't think I should offer to shake hands." drop_table = "zombie_hand" combat_def = "zombie" +hitpoints = 1000 +att = 72 +str = 72 +def = 72 +max_hit_crush = 150 [mutated_bloodveld_meiyerditch_tunnels] id = 7642 categories = ["bloodveld"] examine = "A bloodveld with a very mixed heritage." drop_table = "mutated_bloodveld" +hitpoints = 1780 +att = 91 +str = 91 +def = 91 +mage = 91 +max_hit_magic = 90 +combat_def = "mutated_bloodveld" [mutated_bloodveld_meiyerditch_tunnels_2] id = 7643 categories = ["bloodveld"] examine = "A bloodveld with a very mixed heritage." drop_table = "mutated_bloodveld" +hitpoints = 1780 +att = 99 +str = 99 +def = 99 +mage = 99 +max_hit_magic = 90 +combat_def = "mutated_bloodveld" diff --git a/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml b/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml index 5c90e4205e..fed38d62f4 100644 --- a/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml +++ b/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml @@ -114,6 +114,11 @@ max_hit_stab = 10 id = 4344 drop_table = "monkey" combat_def = "monkey" +hitpoints = 60 +att = 2 +str = 2 +def = 2 +max_hit_crush = 20 [crab_mos_le_harmless] id = 4346 diff --git a/data/area/realm/spirit_realm/spirit_realm.combat.toml b/data/area/realm/spirit_realm/spirit_realm.combat.toml new file mode 100644 index 0000000000..ff6ee3956a --- /dev/null +++ b/data/area/realm/spirit_realm/spirit_realm.combat.toml @@ -0,0 +1,6 @@ +[tormented_wraith] +attack_speed = 6 + +[tormented_wraith.melee] +range = 1 +target_hit = { offense = "crush", max = 220 } diff --git a/data/area/realm/spirit_realm/spirit_realm.npcs.toml b/data/area/realm/spirit_realm/spirit_realm.npcs.toml index 6e4ee12d2d..b9ec973dea 100644 --- a/data/area/realm/spirit_realm/spirit_realm.npcs.toml +++ b/data/area/realm/spirit_realm/spirit_realm.npcs.toml @@ -4,12 +4,23 @@ categories = ["ghosts"] examine = "A spectral warrior with no axe." drop_table = "ghostly_warrior" combat_def = "guard" +hitpoints = 440 +att = 34 +str = 34 +def = 34 +max_hit_crush = 50 [tormented_wraith_spirit_realm] id = 8125 categories = ["ghosts"] examine = "The wraith of a long-dead prisoner." drop_table = "tormented_wraith" +hitpoints = 1500 +att = 99 +str = 99 +def = 99 +max_hit_crush = 220 +combat_def = "tormented_wraith" [edward] id = 1782 diff --git a/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.combat.toml b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.combat.toml new file mode 100644 index 0000000000..3e6b5086ec --- /dev/null +++ b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.combat.toml @@ -0,0 +1,6 @@ +[warped_tortoise] +attack_speed = 6 + +[warped_tortoise.melee] +range = 1 +target_hit = { offense = "crush", max = 120 } diff --git a/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml index ca5df16df5..1235620a14 100644 --- a/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml +++ b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml @@ -4,6 +4,12 @@ categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" combat_def = "terrorbird" +hitpoints = 1549 +att = 47 +str = 47 +def = 47 +range = 47 +max_hit_range = 140 [warped_terrorbird_2] id = 6286 @@ -11,6 +17,12 @@ categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" combat_def = "terrorbird" +hitpoints = 1549 +att = 47 +str = 47 +def = 47 +range = 47 +max_hit_range = 140 [warped_terrorbird_3] id = 6287 @@ -18,6 +30,12 @@ categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" combat_def = "terrorbird" +hitpoints = 1549 +att = 47 +str = 47 +def = 47 +range = 47 +max_hit_range = 140 [warped_terrorbird_4] id = 6288 @@ -25,6 +43,12 @@ categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" combat_def = "terrorbird" +hitpoints = 1549 +att = 47 +str = 47 +def = 47 +range = 47 +max_hit_range = 140 [warped_terrorbird_5] id = 6289 @@ -32,11 +56,23 @@ categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" combat_def = "terrorbird" +hitpoints = 1549 +att = 47 +str = 47 +def = 47 +range = 47 +max_hit_range = 140 [warped_terrorbird_6] id = 6290 drop_table = "warped_terrorbird" combat_def = "terrorbird" +hitpoints = 1549 +att = 47 +str = 47 +def = 47 +range = 47 +max_hit_range = 140 [warped_terrorbird_7] id = 6291 @@ -44,6 +80,12 @@ categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" combat_def = "terrorbird" +hitpoints = 1549 +att = 47 +str = 47 +def = 47 +range = 47 +max_hit_range = 140 [warped_terrorbird_8] id = 6292 @@ -51,11 +93,23 @@ categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" combat_def = "terrorbird" +hitpoints = 1549 +att = 47 +str = 47 +def = 47 +range = 47 +max_hit_range = 140 [warped_terrorbird_9] id = 6293 drop_table = "warped_terrorbird" combat_def = "terrorbird" +hitpoints = 1549 +att = 99 +str = 99 +def = 99 +range = 99 +max_hit_range = 140 [warped_terrorbird_10] id = 6294 @@ -63,6 +117,12 @@ categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" combat_def = "terrorbird" +hitpoints = 1549 +att = 99 +str = 99 +def = 99 +range = 99 +max_hit_range = 140 [warped_terrorbird_11] id = 6295 @@ -70,12 +130,23 @@ categories = ["warped_creatures"] examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" combat_def = "terrorbird" +hitpoints = 1549 +att = 99 +str = 99 +def = 99 +range = 99 +max_hit_range = 140 [warped_tortoise] id = 6296 categories = ["warped_creatures"] examine = "You don't think you can harm this creature." drop_table = "warped_tortoise" +hitpoints = 870 +att = 82 +str = 82 +def = 82 +max_hit_crush = 120 [guard_no_21] id = 6314 diff --git a/data/area/troll_country/death_plateau/death_plateau.npcs.toml b/data/area/troll_country/death_plateau/death_plateau.npcs.toml index 477298f0dd..b5bb9c36e6 100644 --- a/data/area/troll_country/death_plateau/death_plateau.npcs.toml +++ b/data/area/troll_country/death_plateau/death_plateau.npcs.toml @@ -65,6 +65,11 @@ id = 1095 categories = ["trolls"] drop_table = "rock_troll" examine = "The biggest and baddest troll." +hitpoints = 1050 +att = 94 +str = 94 +def = 94 +combat_def = "ice_troll" [billy] id = 1093 diff --git a/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.combat.toml b/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.combat.toml new file mode 100644 index 0000000000..a4ae4135b7 --- /dev/null +++ b/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.combat.toml @@ -0,0 +1,6 @@ +[ice_demon] +attack_speed = 4 + +[ice_demon.magic] +range = 6 +target_hit = { offense = "magic", max = 230 } diff --git a/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml b/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml index 9a41ee9e08..227e8652b4 100644 --- a/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml +++ b/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml @@ -2,9 +2,22 @@ id = 9052 examine = "A demon made of ice." drop_table = "ice_demon" +hitpoints = 1500 +att = 99 +str = 99 +def = 99 +mage = 99 +max_hit_magic = 230 +combat_def = "ice_demon" [waterfiend_ghorrock_fortress_dungeon] id = 9054 drop_table = "waterfiend" combat_def = "waterfiend" +hitpoints = 1260 +att = 93 +str = 93 +def = 93 +mage = 93 +max_hit_magic = 119 diff --git a/data/area/troll_country/god_wars_dungeon/god_wars.combat.toml b/data/area/troll_country/god_wars_dungeon/god_wars.combat.toml new file mode 100644 index 0000000000..67eba1d53e --- /dev/null +++ b/data/area/troll_country/god_wars_dungeon/god_wars.combat.toml @@ -0,0 +1,20 @@ +[ancient_ranger] +attack_speed = 4 + +[ancient_ranger.range] +range = 6 +target_hit = { offense = "range", max = 650 } + +[blood_reaver] +attack_speed = 4 + +[blood_reaver.magic] +range = 6 +target_hit = { offense = "magic", max = 146 } + +[ancient_mage] +attack_speed = 4 + +[ancient_mage.magic] +range = 6 +target_hit = { offense = "magic", max = 207 } diff --git a/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml b/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml index 9742247ae9..e29e0be65b 100644 --- a/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml @@ -13,21 +13,45 @@ id = 13456 examine = "He looks angry and dangerous!" drop_table = "ancient_warrior" combat_def = "guard" +hitpoints = 1500 +att = 99 +str = 99 +def = 99 +max_hit_crush = 402 [ancient_ranger] id = 13457 examine = "A dangerous ranger." drop_table = "ancient_ranger" +hitpoints = 1300 +att = 99 +str = 99 +def = 99 +range = 99 +max_hit_range = 650 [blood_reaver] id = 13458 examine = "A strange and twisted creature." drop_table = "blood_reaver" +att = 99 +str = 99 +def = 99 +mage = 99 +max_hit_magic = 146 +hitpoints = 1470 [ancient_mage_god_wars_dungeon] id = 13459 examine = "A mage well practised in the art of ancient spellcasting." drop_table = "ancient_mage" +hitpoints = 1200 +att = 99 +str = 99 +def = 99 +mage = 99 +max_hit_magic = 207 +combat_def = "ancient_mage" [nanuq] id = 8076 diff --git a/data/area/troll_country/mountain_camp/caves/mountain_camp_caves.npcs.toml b/data/area/troll_country/mountain_camp/caves/mountain_camp_caves.npcs.toml index 70b8991ab0..7f5c75fa34 100644 --- a/data/area/troll_country/mountain_camp/caves/mountain_camp_caves.npcs.toml +++ b/data/area/troll_country/mountain_camp/caves/mountain_camp_caves.npcs.toml @@ -12,6 +12,7 @@ attack_bonus = 5 hunt_mode = "cowardly" examine = "Is that a bear... or a man?" drop_table = "empty" +combat_def = "bear" [the_kendal_mountain_camp_caves_2] id = 1812 diff --git a/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml b/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml index bc32614c4c..5a589f7fe5 100644 --- a/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml +++ b/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml @@ -7,6 +7,12 @@ categories = ["zombies"] examine = "It hasn't quite got round to dying." drop_table = "armoured_zombie" combat_def = "zombie_sword" +hitpoints = 850 +att = 71 +str = 71 +def = 71 +range = 71 +max_hit_range = 86 [armoured_zombie_chaos_temple_dungeon_2] id = 8150 @@ -14,6 +20,12 @@ categories = ["zombies"] examine = "This is a rotten one." drop_table = "armoured_zombie" combat_def = "zombie_sword" +hitpoints = 850 +att = 71 +str = 71 +def = 71 +range = 71 +max_hit_range = 86 [armoured_zombie_chaos_temple_dungeon_3] id = 8151 @@ -21,6 +33,12 @@ categories = ["zombies"] examine = "This is a rotten one." drop_table = "armoured_zombie" combat_def = "zombie_sword" +hitpoints = 850 +att = 71 +str = 71 +def = 71 +range = 71 +max_hit_range = 86 [armoured_zombie_chaos_temple_dungeon_4] id = 8152 @@ -28,11 +46,23 @@ categories = ["zombies"] examine = "This is a rotten one." drop_table = "armoured_zombie" combat_def = "zombie_sword" +hitpoints = 850 +att = 71 +str = 71 +def = 71 +range = 71 +max_hit_range = 86 [armoured_zombie_chaos_temple_dungeon_5] id = 8153 drop_table = "armoured_zombie" combat_def = "zombie_sword" +hitpoints = 850 +att = 71 +str = 71 +def = 71 +range = 71 +max_hit_range = 86 [armoured_zombie_chaos_temple_dungeon_6] id = 8154 diff --git a/data/minigame/soul_wars/nomads_temple/nomads_temple.combat.toml b/data/minigame/soul_wars/nomads_temple/nomads_temple.combat.toml new file mode 100644 index 0000000000..77f90a9864 --- /dev/null +++ b/data/minigame/soul_wars/nomads_temple/nomads_temple.combat.toml @@ -0,0 +1,6 @@ +[spectral_worshipper] +attack_speed = 4 + +[spectral_worshipper.melee] +range = 1 +target_hit = { offense = "crush", max = 10 } diff --git a/data/minigame/soul_wars/nomads_temple/nomads_temple.npcs.toml b/data/minigame/soul_wars/nomads_temple/nomads_temple.npcs.toml index 0abc273319..7d6d7abf00 100644 --- a/data/minigame/soul_wars/nomads_temple/nomads_temple.npcs.toml +++ b/data/minigame/soul_wars/nomads_temple/nomads_temple.npcs.toml @@ -36,6 +36,11 @@ id = 9453 categories = ["ghosts"] examine = "A lingering soul." drop_table = "spectral_worshipper" +hitpoints = 1500 +att = 99 +str = 99 +def = 99 +combat_def = "spectral_worshipper" [knight_nomads_temple_2] id = 9448 diff --git a/data/minigame/soul_wars/soul_wars.combat.toml b/data/minigame/soul_wars/soul_wars.combat.toml new file mode 100644 index 0000000000..ddab71f077 --- /dev/null +++ b/data/minigame/soul_wars/soul_wars.combat.toml @@ -0,0 +1,13 @@ +[avatar_of_destruction] +attack_speed = 4 + +[avatar_of_destruction.melee] +range = 1 +target_hit = { offense = "crush", max = 500 } + +[avatar_of_creation] +attack_speed = 4 + +[avatar_of_creation.melee] +range = 1 +target_hit = { offense = "crush", max = 460 } diff --git a/data/minigame/soul_wars/soul_wars.npcs.toml b/data/minigame/soul_wars/soul_wars.npcs.toml index 3e8a5c2757..d8b7710c90 100644 --- a/data/minigame/soul_wars/soul_wars.npcs.toml +++ b/data/minigame/soul_wars/soul_wars.npcs.toml @@ -16,11 +16,23 @@ id = 8525 id = 8596 examine = "The essence of ruination." drop_table = "empty" +hitpoints = 10 +att = 99 +str = 99 +def = 99 +max_hit_crush = 500 +combat_def = "avatar_of_destruction" [avatar_of_creation_soul_wars] id = 8597 examine = "A being of unsurpassed vitality." drop_table = "empty" +hitpoints = 10 +att = 99 +str = 99 +def = 99 +max_hit_crush = 460 +combat_def = "avatar_of_creation" [pyrefiend_soul_wars] id = 8598 diff --git a/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml b/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml index 1c31ab811b..1d5efd7049 100644 --- a/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml +++ b/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml @@ -25,26 +25,56 @@ id = 5918 id = 8159 drop_table = "armoured_zombie" combat_def = "zombie_sword" +hitpoints = 850 +att = 71 +str = 71 +def = 71 +range = 71 +max_hit_range = 86 [armoured_zombie_defender_of_varrock_2] id = 8160 drop_table = "armoured_zombie" combat_def = "zombie_sword" +hitpoints = 850 +att = 71 +str = 71 +def = 71 +range = 71 +max_hit_range = 86 [armoured_zombie_defender_of_varrock_3] id = 8161 drop_table = "armoured_zombie" combat_def = "zombie_sword" +hitpoints = 850 +att = 71 +str = 71 +def = 71 +range = 71 +max_hit_range = 86 [armoured_zombie_defender_of_varrock_4] id = 8162 drop_table = "armoured_zombie" combat_def = "zombie_sword" +hitpoints = 850 +att = 71 +str = 71 +def = 71 +range = 71 +max_hit_range = 86 [armoured_zombie_defender_of_varrock_5] id = 8163 drop_table = "armoured_zombie" combat_def = "zombie_sword" +hitpoints = 850 +att = 71 +str = 71 +def = 71 +range = 71 +max_hit_range = 86 [arrav_defender_of_varrock] id = 8169 diff --git a/data/quest/members/dream_mentor/dream_mentor.combat.toml b/data/quest/members/dream_mentor/dream_mentor.combat.toml new file mode 100644 index 0000000000..fb006726cd --- /dev/null +++ b/data/quest/members/dream_mentor/dream_mentor.combat.toml @@ -0,0 +1,6 @@ +[the_inadequacy] +attack_speed = 4 + +[the_inadequacy.range] +range = 6 +target_hit = { offense = "range", max = 200 } diff --git a/data/quest/members/dream_mentor/dream_mentor.npcs.toml b/data/quest/members/dream_mentor/dream_mentor.npcs.toml index a0336edc98..6feb58a0d0 100644 --- a/data/quest/members/dream_mentor/dream_mentor.npcs.toml +++ b/data/quest/members/dream_mentor/dream_mentor.npcs.toml @@ -33,6 +33,7 @@ max_hit_range = 20 hunt_mode = "cowardly" examine = "Are you good enough to fight?" drop_table = "empty" +combat_def = "the_inadequacy" [the_untouchable_normal] id = 5904 diff --git a/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.combat.toml b/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.combat.toml new file mode 100644 index 0000000000..419336f4f4 --- /dev/null +++ b/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.combat.toml @@ -0,0 +1,20 @@ +[ivory_shredflesh_cursed] +attack_speed = 4 + +[ivory_shredflesh_cursed.melee] +range = 1 +target_hit = { offense = "crush", max = 112 } + +[ivory_gromblod_cursed] +attack_speed = 4 + +[ivory_gromblod_cursed.range] +range = 6 +target_hit = { offense = "range", max = 10 } + +[ivory_bre_egth_cursed] +attack_speed = 4 + +[ivory_bre_egth_cursed.magic] +range = 6 +target_hit = { offense = "magic", max = 114 } diff --git a/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.npcs.toml b/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.npcs.toml index e3d479f14d..d0bc5bae97 100644 --- a/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.npcs.toml +++ b/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.npcs.toml @@ -2,16 +2,33 @@ id = 11352 examine = "A cursed ivory version of General Shredflesh." drop_table = "ivory_shredflesh_cursed" +hitpoints = 1000 +att = 92 +str = 92 +def = 92 +max_hit_crush = 112 [ivory_gromblod_cursed] id = 11353 examine = "A cursed ivory version of General Gromblod." drop_table = "ivory_gromblod_cursed" +hitpoints = 1000 +att = 92 +str = 92 +def = 92 +range = 92 [ivory_breegth_cursed] id = 11354 examine = "A cursed ivory version of General Breegth." drop_table = "ivory_bre_egth_cursed" +hitpoints = 1000 +att = 92 +str = 92 +def = 92 +mage = 92 +max_hit_magic = 114 +combat_def = "ivory_bre_egth_cursed" [farming_patch_orks_rift] id = 11383 diff --git a/data/quest/members/mournings_end_part_2/mournings_end_part_2.combat.toml b/data/quest/members/mournings_end_part_2/mournings_end_part_2.combat.toml new file mode 100644 index 0000000000..ef88021715 --- /dev/null +++ b/data/quest/members/mournings_end_part_2/mournings_end_part_2.combat.toml @@ -0,0 +1,7 @@ + +[shadow_mournings_end_part_2] +attack_speed = 4 + +[shadow_mournings_end_part_2.melee] +range = 1 +target_hit = { offense = "crush", max = 80 } diff --git a/data/quest/members/mournings_end_part_2/mournings_end_part_2.npcs.toml b/data/quest/members/mournings_end_part_2/mournings_end_part_2.npcs.toml index 0b7c157b9b..464f25b765 100644 --- a/data/quest/members/mournings_end_part_2/mournings_end_part_2.npcs.toml +++ b/data/quest/members/mournings_end_part_2/mournings_end_part_2.npcs.toml @@ -3,6 +3,7 @@ id = 2782 categories = ["shadow_creatures"] examine = "A shadow." drop_table = "empty" +hitpoints = 730 [arianwyn] id = 8952 diff --git a/data/quest/members/rocking_out/battle_of_the_archipelago/battle_of_the_archipelago.npcs.toml b/data/quest/members/rocking_out/battle_of_the_archipelago/battle_of_the_archipelago.npcs.toml index b1b0d2ac2d..dd974097e0 100644 --- a/data/quest/members/rocking_out/battle_of_the_archipelago/battle_of_the_archipelago.npcs.toml +++ b/data/quest/members/rocking_out/battle_of_the_archipelago/battle_of_the_archipelago.npcs.toml @@ -2,9 +2,12 @@ id = 7860 drop_table = "bones" combat_def = "seagull" +hitpoints = 30 [jack_battle_of_the_archipelago] id = 7861 examine = "It's Rabid Jack!" drop_table = "bones" +hitpoints = 200 +combat_def = "man" diff --git a/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.combat.toml b/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.combat.toml new file mode 100644 index 0000000000..b0beb953ee --- /dev/null +++ b/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.combat.toml @@ -0,0 +1,13 @@ +[elite_dark_ranger] +attack_speed = 4 + +[elite_dark_ranger.range] +range = 6 +target_hit = { offense = "range", max = 90 } + +[elite_dark_mage] +attack_speed = 4 + +[elite_dark_mage.magic] +range = 6 +target_hit = { offense = "magic", max = 190 } diff --git a/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml b/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml index c47239e9f1..a5a8e55453 100644 --- a/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml +++ b/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml @@ -3,16 +3,35 @@ id = 8312 examine = "An elite dark warrior with lots of combat experience." drop_table = "elite_dark_warrior" combat_def = "guard" +hitpoints = 1050 +att = 99 +str = 99 +def = 99 +max_hit_crush = 94 [elite_dark_ranger_black_knights_catacombs] id = 8316 examine = "An elite dark ranger with lots of combat experience." drop_table = "elite_dark_ranger" +hitpoints = 800 +att = 66 +str = 66 +def = 66 +range = 66 +max_hit_range = 90 +combat_def = "elite_dark_ranger" [elite_dark_mage_black_knights_catacombs] id = 8320 examine = "An elite dark mage with lots of combat experience." drop_table = "elite_dark_mage" +hitpoints = 800 +att = 66 +str = 66 +def = 66 +mage = 66 +max_hit_magic = 190 +combat_def = "elite_dark_mage" [elite_black_knight_black_knights_catacombs] id = 8328 diff --git a/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml b/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml index 046bcf3ce4..db2e217fca 100644 --- a/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml +++ b/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml @@ -3,6 +3,11 @@ id = 8324 examine = "A Black Knight with lots of combat experience." drop_table = "elite_black_knight" combat_def = "black_knight" +hitpoints = 1200 +att = 99 +str = 99 +def = 99 +max_hit_crush = 134 [elite_black_knight_luciens_camp_2] id = 8329 @@ -17,6 +22,11 @@ categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" combat_def = "ice_troll" +hitpoints = 710 +att = 99 +str = 99 +def = 99 +max_hit_crush = 74 [undead_troll_luciens_camp_2] id = 8378 @@ -24,6 +34,11 @@ categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" combat_def = "ice_troll" +hitpoints = 710 +att = 62 +str = 62 +def = 62 +max_hit_crush = 74 [undead_troll_luciens_camp_3] id = 8379 @@ -31,6 +46,11 @@ categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" combat_def = "ice_troll" +hitpoints = 710 +att = 91 +str = 91 +def = 91 +max_hit_crush = 74 [undead_troll_luciens_camp_4] id = 8380 @@ -38,6 +58,11 @@ categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" combat_def = "ice_troll" +hitpoints = 710 +att = 62 +str = 62 +def = 62 +max_hit_crush = 74 [undead_troll_luciens_camp_5] id = 8381 @@ -45,6 +70,11 @@ categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" combat_def = "ice_troll" +hitpoints = 710 +att = 91 +str = 91 +def = 91 +max_hit_crush = 74 [undead_troll_luciens_camp_6] id = 8382 @@ -52,6 +82,11 @@ categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" combat_def = "ice_troll" +hitpoints = 710 +att = 99 +str = 99 +def = 99 +max_hit_crush = 74 [undead_troll_luciens_camp_7] id = 8383 @@ -59,6 +94,11 @@ categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" combat_def = "ice_troll" +hitpoints = 710 +att = 99 +str = 99 +def = 99 +max_hit_crush = 74 [undead_troll_luciens_camp_8] id = 8384 @@ -66,6 +106,11 @@ categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" combat_def = "ice_troll" +hitpoints = 710 +att = 62 +str = 62 +def = 62 +max_hit_crush = 74 [undead_troll_luciens_camp_9] id = 8385 @@ -73,6 +118,11 @@ categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" combat_def = "ice_troll" +hitpoints = 710 +att = 62 +str = 62 +def = 62 +max_hit_crush = 74 [undead_troll_luciens_camp_10] id = 8386 @@ -80,6 +130,11 @@ categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" combat_def = "ice_troll" +hitpoints = 710 +att = 91 +str = 91 +def = 91 +max_hit_crush = 74 [undead_troll_luciens_camp_11] id = 8387 @@ -87,6 +142,11 @@ categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" combat_def = "ice_troll" +hitpoints = 710 +att = 99 +str = 99 +def = 99 +max_hit_crush = 74 [undead_troll_luciens_camp_12] id = 8388 @@ -94,6 +154,11 @@ categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" combat_def = "ice_troll" +hitpoints = 710 +att = 62 +str = 62 +def = 62 +max_hit_crush = 74 [undead_troll_luciens_camp_13] id = 8389 @@ -101,6 +166,11 @@ categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" combat_def = "ice_troll" +hitpoints = 710 +att = 62 +str = 62 +def = 62 +max_hit_crush = 74 [undead_troll_luciens_camp_14] id = 8390 @@ -108,6 +178,11 @@ categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" combat_def = "ice_troll" +hitpoints = 710 +att = 91 +str = 91 +def = 91 +max_hit_crush = 74 [undead_troll_luciens_camp_15] id = 8391 @@ -115,6 +190,11 @@ categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" combat_def = "ice_troll" +hitpoints = 710 +att = 99 +str = 99 +def = 99 +max_hit_crush = 74 [undead_troll_luciens_camp_16] id = 8392 @@ -122,6 +202,11 @@ categories = ["trolls"] examine = "Going by how trolls are named, this one's probably changed its name to 'Braiiins'." drop_table = "undead_troll" combat_def = "ice_troll" +hitpoints = 710 +att = 99 +str = 99 +def = 99 +max_hit_crush = 74 [undead_mage_luciens_camp] id = 8486 diff --git a/data/skill/dungeoneering/dungeoneering.combat.toml b/data/skill/dungeoneering/dungeoneering.combat.toml new file mode 100644 index 0000000000..7ae97025d6 --- /dev/null +++ b/data/skill/dungeoneering/dungeoneering.combat.toml @@ -0,0 +1,6 @@ +[luminescent_icefiend] +attack_speed = 6 + +[luminescent_icefiend.magic] +range = 6 +target_hit = { offense = "magic", max = 40 } diff --git a/data/skill/dungeoneering/dungeoneering.npcs.toml b/data/skill/dungeoneering/dungeoneering.npcs.toml index 82d1b8b22d..1053fe20e9 100644 --- a/data/skill/dungeoneering/dungeoneering.npcs.toml +++ b/data/skill/dungeoneering/dungeoneering.npcs.toml @@ -94,4 +94,11 @@ id = 12964 [luminescent_icefiend_dungeoneering] id = 9913 drop_table = "luminescent_icefiend" +hitpoints = 40 +att = 7 +str = 7 +def = 7 +mage = 7 +max_hit_magic = 40 +combat_def = "luminescent_icefiend" From 427b85d2a4ed3d8dcc5be3abef2a27c63e4b497d Mon Sep 17 00:00:00 2001 From: Harley Gilpin Date: Thu, 6 Aug 2026 19:44:16 -0700 Subject: [PATCH 07/13] Derive npc levels from reversed max hit and combat formulas Replaces the uniform att=str=def estimate with the standard reversal: strength from max hit (P = (max/10 - 0.5) * 10 - 9, zero equipment bonus since rev 634 lacks npc equipment stats in the cache), then defence from combat level (DEF = 4 * (CB - S) - HP with S = 0.325 * (att + str) for melee, 0.4875 * level for ranged/magic; magic attackers assume def = mage). Verified against existing guard data (str 18, max hit 30, level 21). NPCs with no published max hit keep the previous combined estimate. Ref: rune-server.org/threads/698651 (503+) NPC Combat Numbers --- .../kinshra_workshop.npcs.toml | 12 +-- .../chaos_dwarf_battlefield.npcs.toml | 40 +++---- .../keldagrim/keldagrim.npcs.toml | 6 +- .../rellekka_hunter_area.npcs.toml | 16 +-- .../rellekka/rellekka.npcs.toml | 6 +- .../waterbirth_island.npcs.toml | 8 +- .../kandarin/ardougne/east_ardougne.npcs.toml | 8 +- .../feldip_hills/feldip_hills.npcs.toml | 26 ++--- data/area/karamja/karamja.npcs.toml | 30 +++--- .../karamja/tzhaar_city/tzhaar_city.npcs.toml | 8 +- .../agility_pyramid/agility_pyramid.npcs.toml | 24 ++--- .../windmill_cellar/windmill_cellar.npcs.toml | 66 ++++++------ .../scabaras_dungeon.npcs.toml | 30 +++--- .../kharidian_desert/ullek/ullek.npcs.toml | 32 +++--- .../uzer/mastaba/uzer_mastaba.npcs.toml | 12 +-- .../tunnels/meiyerditch_tunnels.npcs.toml | 28 ++--- .../mos_le_harmless/mos_le_harmless.npcs.toml | 6 +- .../realm/spirit_realm/spirit_realm.npcs.toml | 12 +-- .../poison_waste_slayer_dungeon.npcs.toml | 94 ++++++++-------- .../ghorrock_fortress_dungeon.npcs.toml | 16 +-- .../god_wars_dungeon/god_wars.npcs.toml | 30 +++--- .../chaos_temple_dungeon.npcs.toml | 40 +++---- data/minigame/soul_wars/soul_wars.npcs.toml | 12 +-- .../defender_of_varrock.npcs.toml | 40 +++---- .../orks_rift/orks_rift.npcs.toml | 14 +-- .../black_knights_catacombs.npcs.toml | 22 ++-- .../luciens_camp/luciens_camp.npcs.toml | 102 +++++++++--------- .../dungeoneering/dungeoneering.npcs.toml | 8 +- 28 files changed, 374 insertions(+), 374 deletions(-) diff --git a/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml b/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml index 672a651f5e..6740a535b3 100644 --- a/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml +++ b/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml @@ -23,9 +23,9 @@ examine = "A Black Knight with lots of combat experience." drop_table = "empty" combat_def = "black_knight" hitpoints = 750 -att = 99 -str = 99 -def = 99 +att = 356 +str = 356 +def = 1 max_hit_crush = 370 [black_knight_guardian_kinshra_workshop_2] @@ -33,9 +33,9 @@ id = 11697 drop_table = "empty" combat_def = "black_knight" hitpoints = 750 -att = 99 -str = 99 -def = 99 +att = 356 +str = 356 +def = 1 max_hit_crush = 370 [black_knight_doorkeeper_2] diff --git a/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml b/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml index d5b42cc414..6722cedbde 100644 --- a/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml +++ b/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml @@ -3,10 +3,10 @@ id = 8771 examine = "A magical cross between an ogre and a dwarf." drop_table = "chaos_dwogre" hitpoints = 1000 -att = 99 -str = 99 -def = 99 -mage = 99 +att = 1 +str = 1 +def = 125 +mage = 125 max_hit_magic = 121 combat_def = "chaos_dwogre" @@ -46,10 +46,10 @@ examine = "A dwarf gone bad." drop_table = "chaos_dwarf_hand_cannoneer" combat_def = "dwarf" hitpoints = 1220 -att = 77 -str = 77 -def = 77 -range = 77 +att = 1 +str = 1 +def = 91 +range = 96 max_hit_range = 110 [chaos_dwarf_hand_cannoneer_chaos_dwarf_battlefield_2] @@ -59,10 +59,10 @@ examine = "A dwarf gone bad." drop_table = "chaos_dwarf_hand_cannoneer" combat_def = "dwarf" hitpoints = 1220 -att = 77 -str = 77 -def = 77 -range = 77 +att = 1 +str = 1 +def = 91 +range = 96 max_hit_range = 110 [chaos_dwarf_chaos_dwarf_battlefield] @@ -96,10 +96,10 @@ examine = "A member of the Black Guard with a crossbow." drop_table = "black_guard_crossbowdwarf" combat_def = "guard" hitpoints = 800 -att = 70 -str = 70 -def = 70 -range = 70 +att = 1 +str = 1 +def = 84 +range = 86 max_hit_range = 100 [black_guard_crossbowdwarf_chaos_dwarf_battlefield_2] @@ -109,10 +109,10 @@ examine = "A member of the Black Guard with a crossbow." drop_table = "black_guard_crossbowdwarf" combat_def = "guard" hitpoints = 800 -att = 70 -str = 70 -def = 70 -range = 70 +att = 1 +str = 1 +def = 84 +range = 86 max_hit_range = 100 [black_guard_berserker_chaos_dwarf_battlefield] diff --git a/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml b/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml index 648f2a6b1d..520148e625 100644 --- a/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml +++ b/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml @@ -636,9 +636,9 @@ examine = "An elite Black Guard soldier assigned to protect the trade floor." drop_table = "trade_floor_guard" combat_def = "guard" hitpoints = 700 -att = 76 -str = 76 -def = 76 +att = 150 +str = 150 +def = 1 max_hit_crush = 164 [colonel_grenda_keldagrim] diff --git a/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml index 6494cda808..40e36727a7 100644 --- a/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml +++ b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml @@ -46,20 +46,20 @@ id = 7381 examine = "A strange, magical beast." drop_table = "gnoeals" hitpoints = 750 -att = 82 -str = 82 -def = 82 -mage = 82 +att = 1 +str = 1 +def = 101 +mage = 101 max_hit_magic = 120 [gnoeals_2] id = 7382 drop_table = "gnoeals" hitpoints = 750 -att = 72 -str = 72 -def = 72 -mage = 72 +att = 1 +str = 1 +def = 88 +mage = 88 max_hit_magic = 120 combat_def = "gnoeals" diff --git a/data/area/fremennik_province/rellekka/rellekka.npcs.toml b/data/area/fremennik_province/rellekka/rellekka.npcs.toml index f9b5cfff82..956e352b23 100644 --- a/data/area/fremennik_province/rellekka/rellekka.npcs.toml +++ b/data/area/fremennik_province/rellekka/rellekka.npcs.toml @@ -260,9 +260,9 @@ categories = ["wolves"] examine = "Fearsome predator found only in the Fremennik Province, renowned for its fur." drop_table = "fenris_wolf" hitpoints = 690 -att = 52 -str = 52 -def = 52 +att = 55 +str = 55 +def = 44 max_hit_crush = 69 combat_def = "fenris_wolf" diff --git a/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml b/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml index 67e148e5c3..bcc8adf192 100644 --- a/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml +++ b/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml @@ -50,10 +50,10 @@ categories = ["dagannoth"] examine = "The Dagannoth Mother's guardians." drop_table = "dagannoth_guardian" hitpoints = 2100 -att = 99 -str = 99 -def = 99 -range = 99 +att = 1 +str = 1 +def = 187 +range = 100 max_hit_range = 114 combat_def = "dagannoth_guardian" diff --git a/data/area/kandarin/ardougne/east_ardougne.npcs.toml b/data/area/kandarin/ardougne/east_ardougne.npcs.toml index b6e61479e6..3d993e13a4 100644 --- a/data/area/kandarin/ardougne/east_ardougne.npcs.toml +++ b/data/area/kandarin/ardougne/east_ardougne.npcs.toml @@ -153,10 +153,10 @@ drop_table = "bones" examine = "Good with arrows." combat_def = "archer" hitpoints = 370 -att = 30 -str = 30 -def = 30 -range = 30 +att = 1 +str = 1 +def = 60 +range = 26 max_hit_range = 40 [zookeeper] diff --git a/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml b/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml index 20656d3540..af273adc6c 100644 --- a/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml +++ b/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml @@ -79,7 +79,7 @@ drop_table = "ogress_champion" hitpoints = 880 att = 86 str = 86 -def = 86 +def = 84 max_hit_crush = 100 [ogress_warrior] @@ -89,9 +89,9 @@ examine = "Irascible, belligerent and stupefyingly impolite." drop_table = "ogress_warrior" combat_def = "guard" hitpoints = 800 -att = 73 -str = 73 -def = 73 +att = 106 +str = 106 +def = 1 max_hit_crush = 120 [ogress_warrior_2] @@ -101,9 +101,9 @@ examine = "Irascible, belligerent and stupefyingly impolite." drop_table = "ogress_warrior" combat_def = "guard" hitpoints = 800 -att = 73 -str = 73 -def = 73 +att = 106 +str = 106 +def = 1 max_hit_crush = 120 [ogress_feldip_hills] @@ -112,9 +112,9 @@ categories = ["ogres"] examine = "A large and contentious lady ogre." drop_table = "ogress" hitpoints = 710 -att = 57 -str = 57 -def = 57 +att = 66 +str = 66 +def = 33 max_hit_crush = 80 combat_def = "ogress" @@ -124,9 +124,9 @@ categories = ["ogres"] examine = "A large and contentious lady ogre." drop_table = "ogress" hitpoints = 710 -att = 57 -str = 57 -def = 57 +att = 66 +str = 66 +def = 33 max_hit_crush = 80 combat_def = "ogress" diff --git a/data/area/karamja/karamja.npcs.toml b/data/area/karamja/karamja.npcs.toml index f9f9074e74..24d1f9be3d 100644 --- a/data/area/karamja/karamja.npcs.toml +++ b/data/area/karamja/karamja.npcs.toml @@ -55,9 +55,9 @@ categories = ["frogs"] examine = "Long legged licker." drop_table = "frog" hitpoints = 500 -att = 59 -str = 59 -def = 59 +att = 47 +str = 47 +def = 92 max_hit_crush = 61 combat_def = "frog" @@ -117,9 +117,9 @@ categories = ["birds"] examine = "I wouldn't want to be footing that bill." drop_table = "tenacious_toucan" hitpoints = 500 -att = 64 -str = 64 -def = 64 +att = 105 +str = 105 +def = 1 max_hit_stab = 119 [giant_ant_worker] @@ -151,9 +151,9 @@ id = 6381 examine = "That stinger has to hurt..." drop_table = "giant_wasp" hitpoints = 370 -att = 63 -str = 63 -def = 63 +att = 36 +str = 36 +def = 132 max_hit_crush = 50 [pernicious_parrot] @@ -162,18 +162,18 @@ categories = ["birds"] examine = "Polynomial - a parrot that goes without breakfast, lunch or dinner." drop_table = "empty" hitpoints = 500 -att = 59 -str = 59 -def = 59 +att = 105 +str = 105 +def = 1 max_hit_stab = 119 [giant_wasp_2] id = 6383 drop_table = "giant_wasp" hitpoints = 370 -att = 63 -str = 63 -def = 63 +att = 36 +str = 36 +def = 132 max_hit_crush = 50 combat_def = "giant_wasp" diff --git a/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml b/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml index 7823faf216..33d760e4d8 100644 --- a/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml +++ b/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml @@ -300,10 +300,10 @@ id = 7773 examine = "A monster like many others, but on fire." drop_table = "fire_monster" hitpoints = 260 -att = 45 -str = 45 -def = 45 -mage = 45 +att = 1 +str = 1 +def = 55 +mage = 55 max_hit_magic = 8 combat_def = "fire_monster" diff --git a/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml index a6361ca620..929095a58a 100644 --- a/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml +++ b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml @@ -33,9 +33,9 @@ id = 6753 drop_table = "mummy" combat_def = "mummy" hitpoints = 910 -att = 99 -str = 99 -def = 99 +att = 46 +str = 46 +def = 250 max_hit_crush = 60 [mummy_agility_pyramid_2] @@ -43,9 +43,9 @@ id = 6754 drop_table = "mummy" combat_def = "mummy" hitpoints = 910 -att = 99 -str = 99 -def = 99 +att = 46 +str = 46 +def = 250 max_hit_crush = 60 [mummy_agility_pyramid_3] @@ -53,9 +53,9 @@ id = 6755 drop_table = "mummy" combat_def = "mummy" hitpoints = 910 -att = 99 -str = 99 -def = 99 +att = 46 +str = 46 +def = 250 max_hit_crush = 60 [mummy_agility_pyramid_4] @@ -63,9 +63,9 @@ id = 6756 drop_table = "mummy" combat_def = "mummy" hitpoints = 910 -att = 99 -str = 99 -def = 99 +att = 46 +str = 46 +def = 250 max_hit_crush = 60 [agility_pyramid_block] diff --git a/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml b/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml index 5598920e77..fae33bd6be 100644 --- a/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml +++ b/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml @@ -6,9 +6,9 @@ id = 5630 drop_table = "zombie_pirate" combat_def = "zombie_pirate" hitpoints = 520 -att = 49 -str = 49 -def = 49 +att = 46 +str = 46 +def = 56 max_hit_crush = 60 [zombie_pirate_windmill_cellar_2] @@ -16,9 +16,9 @@ id = 5632 drop_table = "zombie_pirate" combat_def = "zombie_pirate" hitpoints = 520 -att = 49 -str = 49 -def = 49 +att = 46 +str = 46 +def = 56 max_hit_crush = 60 [zombie_pirate_windmill_cellar_3] @@ -26,9 +26,9 @@ id = 5636 drop_table = "zombie_pirate" combat_def = "zombie_pirate" hitpoints = 520 -att = 49 -str = 49 -def = 49 +att = 46 +str = 46 +def = 56 max_hit_crush = 60 [zombie_pirate_windmill_cellar_4] @@ -36,9 +36,9 @@ id = 5649 drop_table = "zombie_pirate" combat_def = "zombie_pirate" hitpoints = 520 -att = 49 -str = 49 -def = 49 +att = 46 +str = 46 +def = 56 max_hit_crush = 60 [zombie_pirate_windmill_cellar_5] @@ -46,9 +46,9 @@ id = 5651 drop_table = "zombie_pirate" combat_def = "zombie_pirate" hitpoints = 520 -att = 49 -str = 49 -def = 49 +att = 46 +str = 46 +def = 56 max_hit_crush = 60 [zombie_pirate_windmill_cellar_6] @@ -56,9 +56,9 @@ id = 5653 drop_table = "zombie_pirate" combat_def = "zombie_pirate" hitpoints = 520 -att = 49 -str = 49 -def = 49 +att = 46 +str = 46 +def = 56 max_hit_crush = 60 [zombie_pirate_windmill_cellar_7] @@ -66,9 +66,9 @@ id = 5655 drop_table = "zombie_pirate" combat_def = "zombie_pirate" hitpoints = 520 -att = 49 -str = 49 -def = 49 +att = 46 +str = 46 +def = 56 max_hit_crush = 60 [zombie_pirate_windmill_cellar_8] @@ -76,9 +76,9 @@ id = 5657 drop_table = "zombie_pirate" combat_def = "zombie_pirate" hitpoints = 520 -att = 49 -str = 49 -def = 49 +att = 46 +str = 46 +def = 56 max_hit_crush = 60 [zombie_pirate_windmill_cellar_9] @@ -86,9 +86,9 @@ id = 5660 drop_table = "zombie_pirate" combat_def = "zombie_pirate" hitpoints = 520 -att = 49 -str = 49 -def = 49 +att = 46 +str = 46 +def = 56 max_hit_crush = 60 [zombie_pirate_windmill_cellar_10] @@ -96,9 +96,9 @@ id = 5662 drop_table = "zombie_pirate" combat_def = "zombie_pirate" hitpoints = 520 -att = 49 -str = 49 -def = 49 +att = 46 +str = 46 +def = 56 max_hit_crush = 60 [zombie_pirate_windmill_cellar_11] @@ -106,9 +106,9 @@ id = 5664 drop_table = "zombie_pirate" combat_def = "zombie_pirate" hitpoints = 520 -att = 49 -str = 49 -def = 49 +att = 46 +str = 46 +def = 56 max_hit_crush = 60 [monk_windmill_cellar] diff --git a/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml index 86fe653c16..7150b48e1e 100644 --- a/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml +++ b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml @@ -14,10 +14,10 @@ categories = ["scabarites"] examine = "Bred to shoot you down." drop_table = "locust_rider" hitpoints = 900 -att = 89 -str = 89 -def = 89 -range = 89 +att = 1 +str = 1 +def = 96 +range = 116 max_hit_range = 130 [scabaras_lancer] @@ -26,9 +26,9 @@ categories = ["scabarites"] examine = "It might be angry...it's hard to tell." drop_table = "scabaras_lancer" hitpoints = 900 -att = 99 -str = 99 -def = 99 +att = 116 +str = 116 +def = 56 max_hit_crush = 130 [scabaras_mage_scabaras_dungeon] @@ -37,10 +37,10 @@ categories = ["scabarites"] examine = "Part scarab, part man." drop_table = "locust_rider" hitpoints = 700 -att = 89 -str = 89 -def = 89 -mage = 89 +att = 1 +str = 1 +def = 109 +mage = 109 max_hit_magic = 104 combat_def = "scabaras_mage" @@ -48,10 +48,10 @@ combat_def = "scabaras_mage" id = 6781 drop_table = "locust_rider" hitpoints = 700 -att = 78 -str = 78 -def = 78 -mage = 78 +att = 1 +str = 1 +def = 96 +mage = 96 max_hit_magic = 104 combat_def = "scabaras_mage" diff --git a/data/area/kharidian_desert/ullek/ullek.npcs.toml b/data/area/kharidian_desert/ullek/ullek.npcs.toml index 9399d987a1..b25ec3ece2 100644 --- a/data/area/kharidian_desert/ullek/ullek.npcs.toml +++ b/data/area/kharidian_desert/ullek/ullek.npcs.toml @@ -5,9 +5,9 @@ examine = "Cut-down and dried." drop_table = "dried_zombie" combat_def = "zombie" hitpoints = 850 -att = 75 -str = 75 -def = 75 +att = 96 +str = 96 +def = 21 max_hit_crush = 110 [dried_zombie_ullek_2] @@ -17,9 +17,9 @@ examine = "Needs moisturising." drop_table = "dried_zombie" combat_def = "zombie" hitpoints = 850 -att = 81 -str = 81 -def = 81 +att = 96 +str = 96 +def = 41 max_hit_crush = 110 [dried_zombie_ullek_3] @@ -29,9 +29,9 @@ examine = "I bet it's parched." drop_table = "dried_zombie" combat_def = "zombie" hitpoints = 850 -att = 99 -str = 99 -def = 99 +att = 96 +str = 96 +def = 105 max_hit_crush = 110 [skeleton_ullek] @@ -102,9 +102,9 @@ categories = ["scabarites"] examine = "Bouncy, but not fun." drop_table = "locust_lancer" hitpoints = 910 -att = 96 -str = 96 -def = 96 +att = 106 +str = 106 +def = 69 max_hit_crush = 120 combat_def = "locust_lancer" @@ -114,10 +114,10 @@ categories = ["scabarites"] examine = "He'll have someone's eye out with that." drop_table = "locust_ranger" hitpoints = 1000 -att = 81 -str = 81 -def = 81 -range = 81 +att = 1 +str = 1 +def = 1 +range = 196 max_hit_range = 210 combat_def = "locust_ranger" diff --git a/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml b/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml index ce44a09ee8..2918959da8 100644 --- a/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml +++ b/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml @@ -4,9 +4,9 @@ examine = "A rocky horror." drop_table = "empty" combat_def = "guard" hitpoints = 750 -att = 31 -str = 31 -def = 31 +att = 36 +str = 36 +def = 19 max_hit_crush = 50 [golems_remains_uzer_mastaba] @@ -18,9 +18,9 @@ categories = ["scabarites"] examine = "This dung beetle has mistaken you for its staple diet." drop_table = "small_scarab" hitpoints = 400 -att = 34 -str = 34 -def = 34 +att = 1 +str = 1 +def = 82 max_hit_crush = 15 combat_def = "small_scarab" diff --git a/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml index 96a07f826b..33ff1d6a9e 100644 --- a/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml +++ b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml @@ -23,9 +23,9 @@ categories = ["crawling_hands"] examine = "A giant, skeletal hand. I don't think I should offer to shake hands." drop_table = "skeletal_hand" hitpoints = 1000 -att = 61 -str = 61 -def = 61 +att = 116 +str = 116 +def = 1 max_hit_crush = 130 combat_def = "skeletal_hand" @@ -36,9 +36,9 @@ examine = "A giant, zombified hand. I don't think I should offer to shake hands. drop_table = "zombie_hand" combat_def = "zombie" hitpoints = 1000 -att = 72 -str = 72 -def = 72 +att = 136 +str = 136 +def = 1 max_hit_crush = 150 [mutated_bloodveld_meiyerditch_tunnels] @@ -47,10 +47,10 @@ categories = ["bloodveld"] examine = "A bloodveld with a very mixed heritage." drop_table = "mutated_bloodveld" hitpoints = 1780 -att = 91 -str = 91 -def = 91 -mage = 91 +att = 1 +str = 1 +def = 111 +mage = 111 max_hit_magic = 90 combat_def = "mutated_bloodveld" @@ -60,10 +60,10 @@ categories = ["bloodveld"] examine = "A bloodveld with a very mixed heritage." drop_table = "mutated_bloodveld" hitpoints = 1780 -att = 99 -str = 99 -def = 99 -mage = 99 +att = 1 +str = 1 +def = 138 +mage = 138 max_hit_magic = 90 combat_def = "mutated_bloodveld" diff --git a/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml b/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml index fed38d62f4..23cc0dcff8 100644 --- a/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml +++ b/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml @@ -115,9 +115,9 @@ id = 4344 drop_table = "monkey" combat_def = "monkey" hitpoints = 60 -att = 2 -str = 2 -def = 2 +att = 6 +str = 6 +def = 1 max_hit_crush = 20 [crab_mos_le_harmless] diff --git a/data/area/realm/spirit_realm/spirit_realm.npcs.toml b/data/area/realm/spirit_realm/spirit_realm.npcs.toml index b9ec973dea..ced2e3ef45 100644 --- a/data/area/realm/spirit_realm/spirit_realm.npcs.toml +++ b/data/area/realm/spirit_realm/spirit_realm.npcs.toml @@ -5,9 +5,9 @@ examine = "A spectral warrior with no axe." drop_table = "ghostly_warrior" combat_def = "guard" hitpoints = 440 -att = 34 -str = 34 -def = 34 +att = 36 +str = 36 +def = 30 max_hit_crush = 50 [tormented_wraith_spirit_realm] @@ -16,9 +16,9 @@ categories = ["ghosts"] examine = "The wraith of a long-dead prisoner." drop_table = "tormented_wraith" hitpoints = 1500 -att = 99 -str = 99 -def = 99 +att = 206 +str = 206 +def = 1 max_hit_crush = 220 combat_def = "tormented_wraith" diff --git a/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml index 1235620a14..a6d1ae417b 100644 --- a/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml +++ b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml @@ -5,10 +5,10 @@ examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" combat_def = "terrorbird" hitpoints = 1549 -att = 47 -str = 47 -def = 47 -range = 47 +att = 1 +str = 1 +def = 1 +range = 126 max_hit_range = 140 [warped_terrorbird_2] @@ -18,10 +18,10 @@ examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" combat_def = "terrorbird" hitpoints = 1549 -att = 47 -str = 47 -def = 47 -range = 47 +att = 1 +str = 1 +def = 1 +range = 126 max_hit_range = 140 [warped_terrorbird_3] @@ -31,10 +31,10 @@ examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" combat_def = "terrorbird" hitpoints = 1549 -att = 47 -str = 47 -def = 47 -range = 47 +att = 1 +str = 1 +def = 1 +range = 126 max_hit_range = 140 [warped_terrorbird_4] @@ -44,10 +44,10 @@ examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" combat_def = "terrorbird" hitpoints = 1549 -att = 47 -str = 47 -def = 47 -range = 47 +att = 1 +str = 1 +def = 1 +range = 126 max_hit_range = 140 [warped_terrorbird_5] @@ -57,10 +57,10 @@ examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" combat_def = "terrorbird" hitpoints = 1549 -att = 47 -str = 47 -def = 47 -range = 47 +att = 1 +str = 1 +def = 1 +range = 126 max_hit_range = 140 [warped_terrorbird_6] @@ -68,10 +68,10 @@ id = 6290 drop_table = "warped_terrorbird" combat_def = "terrorbird" hitpoints = 1549 -att = 47 -str = 47 -def = 47 -range = 47 +att = 1 +str = 1 +def = 1 +range = 126 max_hit_range = 140 [warped_terrorbird_7] @@ -81,10 +81,10 @@ examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" combat_def = "terrorbird" hitpoints = 1549 -att = 47 -str = 47 -def = 47 -range = 47 +att = 1 +str = 1 +def = 1 +range = 126 max_hit_range = 140 [warped_terrorbird_8] @@ -94,10 +94,10 @@ examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" combat_def = "terrorbird" hitpoints = 1549 -att = 47 -str = 47 -def = 47 -range = 47 +att = 1 +str = 1 +def = 1 +range = 126 max_hit_range = 140 [warped_terrorbird_9] @@ -105,10 +105,10 @@ id = 6293 drop_table = "warped_terrorbird" combat_def = "terrorbird" hitpoints = 1549 -att = 99 -str = 99 -def = 99 -range = 99 +att = 1 +str = 1 +def = 171 +range = 126 max_hit_range = 140 [warped_terrorbird_10] @@ -118,10 +118,10 @@ examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" combat_def = "terrorbird" hitpoints = 1549 -att = 99 -str = 99 -def = 99 -range = 99 +att = 1 +str = 1 +def = 171 +range = 126 max_hit_range = 140 [warped_terrorbird_11] @@ -131,10 +131,10 @@ examine = "You don't think you can harm this terrorbird." drop_table = "warped_terrorbird" combat_def = "terrorbird" hitpoints = 1549 -att = 99 -str = 99 -def = 99 -range = 99 +att = 1 +str = 1 +def = 171 +range = 126 max_hit_range = 140 [warped_tortoise] @@ -143,9 +143,9 @@ categories = ["warped_creatures"] examine = "You don't think you can harm this creature." drop_table = "warped_tortoise" hitpoints = 870 -att = 82 -str = 82 -def = 82 +att = 106 +str = 106 +def = 21 max_hit_crush = 120 [guard_no_21] diff --git a/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml b/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml index 227e8652b4..a34ebc68c5 100644 --- a/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml +++ b/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml @@ -3,10 +3,10 @@ id = 9052 examine = "A demon made of ice." drop_table = "ice_demon" hitpoints = 1500 -att = 99 -str = 99 -def = 99 -mage = 99 +att = 1 +str = 1 +def = 189 +mage = 189 max_hit_magic = 230 combat_def = "ice_demon" @@ -15,9 +15,9 @@ id = 9054 drop_table = "waterfiend" combat_def = "waterfiend" hitpoints = 1260 -att = 93 -str = 93 -def = 93 -mage = 93 +att = 1 +str = 1 +def = 113 +mage = 113 max_hit_magic = 119 diff --git a/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml b/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml index e29e0be65b..b12869347c 100644 --- a/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml @@ -14,9 +14,9 @@ examine = "He looks angry and dangerous!" drop_table = "ancient_warrior" combat_def = "guard" hitpoints = 1500 -att = 99 -str = 99 -def = 99 +att = 388 +str = 388 +def = 1 max_hit_crush = 402 [ancient_ranger] @@ -24,20 +24,20 @@ id = 13457 examine = "A dangerous ranger." drop_table = "ancient_ranger" hitpoints = 1300 -att = 99 -str = 99 -def = 99 -range = 99 +att = 1 +str = 1 +def = 1 +range = 636 max_hit_range = 650 [blood_reaver] id = 13458 examine = "A strange and twisted creature." drop_table = "blood_reaver" -att = 99 -str = 99 -def = 99 -mage = 99 +att = 1 +str = 1 +def = 199 +mage = 199 max_hit_magic = 146 hitpoints = 1470 @@ -46,10 +46,10 @@ id = 13459 examine = "A mage well practised in the art of ancient spellcasting." drop_table = "ancient_mage" hitpoints = 1200 -att = 99 -str = 99 -def = 99 -mage = 99 +att = 1 +str = 1 +def = 183 +mage = 183 max_hit_magic = 207 combat_def = "ancient_mage" diff --git a/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml b/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml index 5a589f7fe5..e363a909e1 100644 --- a/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml +++ b/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml @@ -8,10 +8,10 @@ examine = "It hasn't quite got round to dying." drop_table = "armoured_zombie" combat_def = "zombie_sword" hitpoints = 850 -att = 71 -str = 71 -def = 71 -range = 71 +att = 1 +str = 1 +def = 115 +range = 72 max_hit_range = 86 [armoured_zombie_chaos_temple_dungeon_2] @@ -21,10 +21,10 @@ examine = "This is a rotten one." drop_table = "armoured_zombie" combat_def = "zombie_sword" hitpoints = 850 -att = 71 -str = 71 -def = 71 -range = 71 +att = 1 +str = 1 +def = 115 +range = 72 max_hit_range = 86 [armoured_zombie_chaos_temple_dungeon_3] @@ -34,10 +34,10 @@ examine = "This is a rotten one." drop_table = "armoured_zombie" combat_def = "zombie_sword" hitpoints = 850 -att = 71 -str = 71 -def = 71 -range = 71 +att = 1 +str = 1 +def = 115 +range = 72 max_hit_range = 86 [armoured_zombie_chaos_temple_dungeon_4] @@ -47,10 +47,10 @@ examine = "This is a rotten one." drop_table = "armoured_zombie" combat_def = "zombie_sword" hitpoints = 850 -att = 71 -str = 71 -def = 71 -range = 71 +att = 1 +str = 1 +def = 115 +range = 72 max_hit_range = 86 [armoured_zombie_chaos_temple_dungeon_5] @@ -58,10 +58,10 @@ id = 8153 drop_table = "armoured_zombie" combat_def = "zombie_sword" hitpoints = 850 -att = 71 -str = 71 -def = 71 -range = 71 +att = 1 +str = 1 +def = 115 +range = 72 max_hit_range = 86 [armoured_zombie_chaos_temple_dungeon_6] diff --git a/data/minigame/soul_wars/soul_wars.npcs.toml b/data/minigame/soul_wars/soul_wars.npcs.toml index d8b7710c90..5a93a16caf 100644 --- a/data/minigame/soul_wars/soul_wars.npcs.toml +++ b/data/minigame/soul_wars/soul_wars.npcs.toml @@ -17,9 +17,9 @@ id = 8596 examine = "The essence of ruination." drop_table = "empty" hitpoints = 10 -att = 99 -str = 99 -def = 99 +att = 486 +str = 486 +def = 835 max_hit_crush = 500 combat_def = "avatar_of_destruction" @@ -28,9 +28,9 @@ id = 8597 examine = "A being of unsurpassed vitality." drop_table = "empty" hitpoints = 10 -att = 99 -str = 99 -def = 99 +att = 446 +str = 446 +def = 939 max_hit_crush = 460 combat_def = "avatar_of_creation" diff --git a/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml b/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml index 1d5efd7049..304926e617 100644 --- a/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml +++ b/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml @@ -26,10 +26,10 @@ id = 8159 drop_table = "armoured_zombie" combat_def = "zombie_sword" hitpoints = 850 -att = 71 -str = 71 -def = 71 -range = 71 +att = 1 +str = 1 +def = 115 +range = 72 max_hit_range = 86 [armoured_zombie_defender_of_varrock_2] @@ -37,10 +37,10 @@ id = 8160 drop_table = "armoured_zombie" combat_def = "zombie_sword" hitpoints = 850 -att = 71 -str = 71 -def = 71 -range = 71 +att = 1 +str = 1 +def = 115 +range = 72 max_hit_range = 86 [armoured_zombie_defender_of_varrock_3] @@ -48,10 +48,10 @@ id = 8161 drop_table = "armoured_zombie" combat_def = "zombie_sword" hitpoints = 850 -att = 71 -str = 71 -def = 71 -range = 71 +att = 1 +str = 1 +def = 115 +range = 72 max_hit_range = 86 [armoured_zombie_defender_of_varrock_4] @@ -59,10 +59,10 @@ id = 8162 drop_table = "armoured_zombie" combat_def = "zombie_sword" hitpoints = 850 -att = 71 -str = 71 -def = 71 -range = 71 +att = 1 +str = 1 +def = 115 +range = 72 max_hit_range = 86 [armoured_zombie_defender_of_varrock_5] @@ -70,10 +70,10 @@ id = 8163 drop_table = "armoured_zombie" combat_def = "zombie_sword" hitpoints = 850 -att = 71 -str = 71 -def = 71 -range = 71 +att = 1 +str = 1 +def = 115 +range = 72 max_hit_range = 86 [arrav_defender_of_varrock] diff --git a/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.npcs.toml b/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.npcs.toml index d0bc5bae97..7cf19cc508 100644 --- a/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.npcs.toml +++ b/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.npcs.toml @@ -3,9 +3,9 @@ id = 11352 examine = "A cursed ivory version of General Shredflesh." drop_table = "ivory_shredflesh_cursed" hitpoints = 1000 -att = 92 -str = 92 -def = 92 +att = 98 +str = 98 +def = 77 max_hit_crush = 112 [ivory_gromblod_cursed] @@ -23,10 +23,10 @@ id = 11354 examine = "A cursed ivory version of General Breegth." drop_table = "ivory_bre_egth_cursed" hitpoints = 1000 -att = 92 -str = 92 -def = 92 -mage = 92 +att = 1 +str = 1 +def = 113 +mage = 113 max_hit_magic = 114 combat_def = "ivory_bre_egth_cursed" diff --git a/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml b/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml index a5a8e55453..6e05b96a07 100644 --- a/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml +++ b/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml @@ -4,9 +4,9 @@ examine = "An elite dark warrior with lots of combat experience." drop_table = "elite_dark_warrior" combat_def = "guard" hitpoints = 1050 -att = 99 -str = 99 -def = 99 +att = 80 +str = 80 +def = 175 max_hit_crush = 94 [elite_dark_ranger_black_knights_catacombs] @@ -14,10 +14,10 @@ id = 8316 examine = "An elite dark ranger with lots of combat experience." drop_table = "elite_dark_ranger" hitpoints = 800 -att = 66 -str = 66 -def = 66 -range = 66 +att = 1 +str = 1 +def = 88 +range = 76 max_hit_range = 90 combat_def = "elite_dark_ranger" @@ -26,10 +26,10 @@ id = 8320 examine = "An elite dark mage with lots of combat experience." drop_table = "elite_dark_mage" hitpoints = 800 -att = 66 -str = 66 -def = 66 -mage = 66 +att = 1 +str = 1 +def = 80 +mage = 80 max_hit_magic = 190 combat_def = "elite_dark_mage" diff --git a/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml b/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml index db2e217fca..045542af25 100644 --- a/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml +++ b/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml @@ -4,9 +4,9 @@ examine = "A Black Knight with lots of combat experience." drop_table = "elite_black_knight" combat_def = "black_knight" hitpoints = 1200 -att = 99 -str = 99 -def = 99 +att = 120 +str = 120 +def = 120 max_hit_crush = 134 [elite_black_knight_luciens_camp_2] @@ -23,9 +23,9 @@ examine = "Going by how trolls are named, this one's probably changed its name t drop_table = "undead_troll" combat_def = "ice_troll" hitpoints = 710 -att = 99 -str = 99 -def = 99 +att = 60 +str = 60 +def = 250 max_hit_crush = 74 [undead_troll_luciens_camp_2] @@ -35,9 +35,9 @@ examine = "Going by how trolls are named, this one's probably changed its name t drop_table = "undead_troll" combat_def = "ice_troll" hitpoints = 710 -att = 62 -str = 62 -def = 62 +att = 60 +str = 60 +def = 69 max_hit_crush = 74 [undead_troll_luciens_camp_3] @@ -47,9 +47,9 @@ examine = "Going by how trolls are named, this one's probably changed its name t drop_table = "undead_troll" combat_def = "ice_troll" hitpoints = 710 -att = 91 -str = 91 -def = 91 +att = 60 +str = 60 +def = 173 max_hit_crush = 74 [undead_troll_luciens_camp_4] @@ -59,9 +59,9 @@ examine = "Going by how trolls are named, this one's probably changed its name t drop_table = "undead_troll" combat_def = "ice_troll" hitpoints = 710 -att = 62 -str = 62 -def = 62 +att = 60 +str = 60 +def = 69 max_hit_crush = 74 [undead_troll_luciens_camp_5] @@ -71,9 +71,9 @@ examine = "Going by how trolls are named, this one's probably changed its name t drop_table = "undead_troll" combat_def = "ice_troll" hitpoints = 710 -att = 91 -str = 91 -def = 91 +att = 60 +str = 60 +def = 173 max_hit_crush = 74 [undead_troll_luciens_camp_6] @@ -83,9 +83,9 @@ examine = "Going by how trolls are named, this one's probably changed its name t drop_table = "undead_troll" combat_def = "ice_troll" hitpoints = 710 -att = 99 -str = 99 -def = 99 +att = 60 +str = 60 +def = 250 max_hit_crush = 74 [undead_troll_luciens_camp_7] @@ -95,9 +95,9 @@ examine = "Going by how trolls are named, this one's probably changed its name t drop_table = "undead_troll" combat_def = "ice_troll" hitpoints = 710 -att = 99 -str = 99 -def = 99 +att = 60 +str = 60 +def = 250 max_hit_crush = 74 [undead_troll_luciens_camp_8] @@ -107,9 +107,9 @@ examine = "Going by how trolls are named, this one's probably changed its name t drop_table = "undead_troll" combat_def = "ice_troll" hitpoints = 710 -att = 62 -str = 62 -def = 62 +att = 60 +str = 60 +def = 69 max_hit_crush = 74 [undead_troll_luciens_camp_9] @@ -119,9 +119,9 @@ examine = "Going by how trolls are named, this one's probably changed its name t drop_table = "undead_troll" combat_def = "ice_troll" hitpoints = 710 -att = 62 -str = 62 -def = 62 +att = 60 +str = 60 +def = 69 max_hit_crush = 74 [undead_troll_luciens_camp_10] @@ -131,9 +131,9 @@ examine = "Going by how trolls are named, this one's probably changed its name t drop_table = "undead_troll" combat_def = "ice_troll" hitpoints = 710 -att = 91 -str = 91 -def = 91 +att = 60 +str = 60 +def = 173 max_hit_crush = 74 [undead_troll_luciens_camp_11] @@ -143,9 +143,9 @@ examine = "Going by how trolls are named, this one's probably changed its name t drop_table = "undead_troll" combat_def = "ice_troll" hitpoints = 710 -att = 99 -str = 99 -def = 99 +att = 60 +str = 60 +def = 250 max_hit_crush = 74 [undead_troll_luciens_camp_12] @@ -155,9 +155,9 @@ examine = "Going by how trolls are named, this one's probably changed its name t drop_table = "undead_troll" combat_def = "ice_troll" hitpoints = 710 -att = 62 -str = 62 -def = 62 +att = 60 +str = 60 +def = 69 max_hit_crush = 74 [undead_troll_luciens_camp_13] @@ -167,9 +167,9 @@ examine = "Going by how trolls are named, this one's probably changed its name t drop_table = "undead_troll" combat_def = "ice_troll" hitpoints = 710 -att = 62 -str = 62 -def = 62 +att = 60 +str = 60 +def = 69 max_hit_crush = 74 [undead_troll_luciens_camp_14] @@ -179,9 +179,9 @@ examine = "Going by how trolls are named, this one's probably changed its name t drop_table = "undead_troll" combat_def = "ice_troll" hitpoints = 710 -att = 91 -str = 91 -def = 91 +att = 60 +str = 60 +def = 173 max_hit_crush = 74 [undead_troll_luciens_camp_15] @@ -191,9 +191,9 @@ examine = "Going by how trolls are named, this one's probably changed its name t drop_table = "undead_troll" combat_def = "ice_troll" hitpoints = 710 -att = 99 -str = 99 -def = 99 +att = 60 +str = 60 +def = 250 max_hit_crush = 74 [undead_troll_luciens_camp_16] @@ -203,9 +203,9 @@ examine = "Going by how trolls are named, this one's probably changed its name t drop_table = "undead_troll" combat_def = "ice_troll" hitpoints = 710 -att = 99 -str = 99 -def = 99 +att = 60 +str = 60 +def = 250 max_hit_crush = 74 [undead_mage_luciens_camp] diff --git a/data/skill/dungeoneering/dungeoneering.npcs.toml b/data/skill/dungeoneering/dungeoneering.npcs.toml index 1053fe20e9..8e8de86465 100644 --- a/data/skill/dungeoneering/dungeoneering.npcs.toml +++ b/data/skill/dungeoneering/dungeoneering.npcs.toml @@ -95,10 +95,10 @@ id = 12964 id = 9913 drop_table = "luminescent_icefiend" hitpoints = 40 -att = 7 -str = 7 -def = 7 -mage = 7 +att = 1 +str = 1 +def = 8 +mage = 8 max_hit_magic = 40 combat_def = "luminescent_icefiend" From 28c51ac60c6ed42f3026a9d59474f9b8ffdf2ee9 Mon Sep 17 00:00:00 2001 From: Harley Gilpin Date: Thu, 6 Aug 2026 20:13:55 -0700 Subject: [PATCH 08/13] Add npc equipment stats from 718 cache The 718 cache stores npc equipment stats in definition params (keys 0-9: attack and defence bonuses per style) which rev 634 definitions lack. Ids are stable between revisions for pre-718 content, so the bonuses apply directly: per-style defences (stab/slash/crush/magic/range_defence, read by accuracy rolls in Equipment.kt) and attack_bonus for 848 combat npcs. Previously every npc defence bonus was implicitly zero, so monsters had no style weaknesses. Only absent keys are added; clone variants inherit from their base rather than repeating values. Verified against known values: cow -21 all styles, guard 24/14/19/4/16. --- .../freaky_forester/freaky_forester.npcs.toml | 22 ++++ .../treasure_trails/treasure_trails.npcs.toml | 3 +- .../black_knights_fortress_basement.npcs.toml | 5 + .../black_knight.npcs.toml | 3 + .../asgarnia/burthorpe/burthorpe.npcs.toml | 25 ++++ .../dwarven_mines/dwarven_mine.npcs.toml | 9 ++ .../living_rock_caverns.npcs.toml | 15 +++ data/area/asgarnia/entrana/entrana.npcs.toml | 5 + data/area/asgarnia/falador/falador.npcs.toml | 53 +++++++- .../asgarnian_ice_resource_dungeon.npcs.toml | 6 + .../skeletal_wyvern/skeletal_wyvern.npcs.toml | 5 + .../asgarnia/port_sarim/port_sarim.npcs.toml | 15 +++ .../asgarnia/rimmington/rimmington.npcs.toml | 25 ++++ .../mouse_hole/mouse_hole.npcs.toml | 5 + .../ice_queens_lair/ice_queens_lair.npcs.toml | 5 + .../fremennik_isles/fremennik_isle.npcs.toml | 12 ++ .../ice_troll_caves/ice_troll_caves.npcs.toml | 12 ++ .../neitiznot/neitiznot.npcs.toml | 9 ++ .../chaos_dwarf_battlefield.npcs.toml | 36 ++++++ .../keldagrim/keldagrim.npcs.toml | 12 ++ .../lunar_isle/lunar_isle.npcs.toml | 5 + .../miscellania/miscellania.npcs.toml | 40 ++++++ .../pirates_cove/pirates_cove.npcs.toml | 2 + .../brine_rat_cavern.npcs.toml | 15 +++ .../aquanite/aquanite.npcs.toml | 4 + .../rellekka/rellekka.npcs.toml | 20 +++ .../waterbirth_island.npcs.toml | 26 ++++ .../ancient_cavern/ancient_cavern.npcs.toml | 37 ++++++ .../kuradals_dungeon.npcs.toml | 5 + .../kandarin/ape_atoll/ape_atoll.npcs.toml | 2 + .../kandarin/ardougne/east_ardougne.npcs.toml | 25 ++++ .../ardougne/ibans_lair/ibans_lair.npcs.toml | 3 + .../ardougne/sewers/ardougne_sewers.npcs.toml | 3 + .../underground_pass_dungeon.npcs.toml | 5 + .../underground_pass.npcs.toml | 15 +++ .../ardougne/west/west_ardougne.npcs.toml | 6 + .../witchaven_dungeon.npcs.toml | 5 + .../barbarian_outpost.npcs.toml | 4 + .../battlefield/battlefield.npcs.toml | 44 +++++++ .../baxtorian_falls/baxtorian_falls.npcs.toml | 14 +++ .../waterfall_dungeon.npcs.toml | 5 + .../camelot/castle/camelot_castle.npcs.toml | 2 + .../feldip_hills/feldip_hills.npcs.toml | 4 +- .../gu_tanoth/gu_tanoth.npcs.toml | 12 ++ .../fishing_guild/fishing_guild.npcs.toml | 25 ++++ .../hazelmeres_island.npcs.toml | 5 + .../dungeon/legends_guild_dungeon.npcs.toml | 5 + data/area/kandarin/ourania/ourania.npcs.toml | 4 + .../kandarin/piscatoris/piscatoris.npcs.toml | 1 + .../fight_arena/khazard_fight_arena.npcs.toml | 3 + .../movarios_base/movarios_base.npcs.toml | 3 + .../ranging_guild/ranging_guild.npcs.toml | 8 ++ .../temple_of_ikov/temple_of_ikov.npcs.toml | 10 ++ .../tower_of_life/tower_of_life.npcs.toml | 1 + .../combat_training_camp.npcs.toml | 3 + .../tree_gnome_stronghold.npcs.toml | 29 +++++ .../troll_stronghold_tunnels.npcs.toml | 32 +++++ .../yanille_agility_dungeon.npcs.toml | 5 + data/area/kandarin/yanille/yanille.npcs.toml | 10 ++ .../karamja/brimhaven/brimhaven.npcs.toml | 5 + data/area/karamja/crandor/crandor.npcs.toml | 7 +- data/area/karamja/karamja.npcs.toml | 48 +++++++ .../caves/kharazi_caves.npcs.toml | 19 +++ .../shilo_village/shilo_village.npcs.toml | 5 + .../karamja/tzhaar_city/tzhaar_city.npcs.toml | 12 ++ .../agility_pyramid/agility_pyramid.npcs.toml | 12 ++ .../bandit_camp/bandit_camp.npcs.toml | 2 + .../kalphite_hive/kalphite_hive.npcs.toml | 37 +++++- .../kharidian_desert.npcs.toml | 15 +++ .../klenters_pyramid.npcs.toml | 16 +++ .../mining_camp/desert_mining_camp.npcs.toml | 5 + .../kharidian_desert/nardah/nardah.npcs.toml | 5 + .../pollnivneach/pollnivneach.npcs.toml | 6 + .../rock_island_prison.npcs.toml | 5 + .../sophanem_dungeon.npcs.toml | 28 +++++ .../scabaras_dungeon.npcs.toml | 12 ++ .../kharidian_desert/ullek/ullek.npcs.toml | 29 +++++ .../uzer/mastaba/uzer_mastaba.npcs.toml | 1 + .../barbarian_village.npcs.toml | 8 ++ .../stronghold_of_player_safety.npcs.toml | 10 ++ .../catablepon/catablepon.npcs.toml | 15 +++ .../flesh_crawler/flesh_crawler.npcs.toml | 5 + .../minotaur/minotaur.npcs.toml | 12 +- .../dorgesh_kaan/dorgesh_kaan.npcs.toml | 14 +++ data/area/misthalin/draynor/draynor.npcs.toml | 5 + .../misthalin/edgeville/edgeville.npcs.toml | 15 +++ .../ham_hideout/ham_hideout.npcs.toml | 12 +- .../store_rooms/ham_store_rooms.npcs.toml | 4 - .../ice_mountain/ice_mountain.npcs.toml | 5 + .../goblin_mines/goblin_mines.npcs.toml | 11 ++ .../lumbridge/freds_farm/freds_farm.npcs.toml | 5 + .../misthalin/lumbridge/lumbridge.npcs.toml | 10 ++ .../lumbridge/swamp/lumbridge_swamp.npcs.toml | 10 ++ .../air_rune_temple/air_rune_temple.npcs.toml | 5 + .../varrock/tolnas_rift/tolnas_rift.npcs.toml | 6 + data/area/misthalin/varrock/varrock.npcs.toml | 11 ++ .../evil_chicken_lair.npcs.toml | 5 + data/area/misthalin/zanaris/zanaris.npcs.toml | 15 +++ .../braindeath_island.npcs.toml | 5 + data/area/morytania/canifis/canifis.npcs.toml | 15 +++ .../lair_of_tarn_razorlor.npcs.toml | 26 ++++ .../mort_myre_swamp/mort_myre_swamp.npcs.toml | 25 ++++ .../mos_le_harmless/mos_le_harmless.npcs.toml | 4 + .../alices_farm/alices_farm.npcs.toml | 10 ++ .../nechryael/nechryael.npcs.toml | 4 + .../corporeal_beasts_lair.npcs.toml | 10 ++ .../enchanted_valley.npcs.toml | 7 +- .../realm/fisher_realm/fisher_realm.npcs.toml | 10 ++ .../killerwatt_plane.npcs.toml | 5 + .../realm/spirit_realm/spirit_realm.npcs.toml | 5 + .../iorwerth_camp/iorwerth_camp.npcs.toml | 10 ++ data/area/tirannwn/isafdar/isafdar.npcs.toml | 5 + data/area/tirannwn/lletya/lletya.npcs.toml | 15 +++ .../poison_waste_slayer_dungeon.npcs.toml | 44 +++++++ .../death_plateau/death_plateau.npcs.toml | 16 ++- .../ghorrock_fortress_dungeon.npcs.toml | 5 + .../armadyl/armadyl.npcs.toml | 6 + .../god_wars_dungeon/bandos/bandos.npcs.toml | 6 + .../god_wars_dungeon/bandos/ork/ork.npcs.toml | 5 + .../god_wars_dungeon/god_wars.npcs.toml | 10 ++ .../knight_of_saradomin.npcs.toml | 8 ++ .../saradomin/saradomin.npcs.toml | 20 +++ .../saradomin_priest.npcs.toml | 5 + .../spiritual_mage/spiritual_mage.npcs.toml | 15 +++ .../spiritual_ranger.npcs.toml | 15 +++ .../spiritual_warrior.npcs.toml | 15 +++ .../zamorak/zamorak.npcs.toml | 9 ++ .../troll_country/troll_country.npcs.toml | 12 ++ .../troll_tunnels/troll_tunnels.npcs.toml | 12 ++ .../trollheim/trollheim.npcs.toml | 7 ++ data/area/wilderness/abyss/abyss.npcs.toml | 15 +++ .../abyssal_demon/abyssal_demon.npcs.toml | 4 + .../wilderness_bandit_camp.npcs.toml | 17 +++ .../chaos_temple_dungeon.npcs.toml | 15 +++ .../chaos_tunnels/chaos_tunnels.npcs.toml | 23 ++++ data/area/wilderness/wilderness.npcs.toml | 9 +- data/entity/npc/animal/bat/bat.npcs.toml | 9 ++ data/entity/npc/animal/birds/birds.npcs.toml | 10 ++ .../npc/animal/chicken/chicken.npcs.toml | 5 + data/entity/npc/animal/cow/cow.npcs.toml | 37 +++++- data/entity/npc/animal/crab/crab.npcs.toml | 6 + data/entity/npc/animal/rat/rat.npcs.toml | 10 ++ .../npc/boss/giant_mole/giant_mole.npcs.toml | 5 + .../king_black_dragon.npcs.toml | 5 + .../entity/npc/humanoid/dwarf/dwarf.npcs.toml | 21 ++++ data/entity/npc/humanoid/thug/thug.npcs.toml | 3 + .../monster/cave/cave_bug/cave_bug.npcs.toml | 12 +- .../npc/monster/dagannoth/dagannoth.npcs.toml | 13 ++ .../entity/npc/monster/demon/demons.npcs.toml | 3 + .../npc/monster/draconic/dragons.npcs.toml | 50 ++++++++ .../monster/fiend/icefiend/icefiend.npcs.toml | 5 + .../giant/fire_giant/fire_giant.npcs.toml | 2 + .../giant/ice_giant/ice_giant.npcs.toml | 2 + .../npc/monster/goblin/goblin.npcs.toml | 40 ++++++ .../goblin/hobgoblin/hobgoblin.npcs.toml | 2 + data/entity/npc/monster/imp/imp.npcs.toml | 10 ++ .../monster/reptile/lizard/lizard.npcs.toml | 10 ++ .../reptile/scorpion/scorpion.npcs.toml | 31 ++++- .../monster/reptile/spider/spider.npcs.toml | 30 +++++ .../npc/monster/turoth/turoth.npcs.toml | 2 + .../monster/undead/corpse/corpse.npcs.toml | 5 + .../npc/monster/undead/ghost/ghost.npcs.toml | 14 +++ .../undead/magic_axe/magic_axe.npcs.toml | 7 +- .../undead/skeleton/skeletons.npcs.toml | 45 +++++++ .../monster/undead/warped/warped.npcs.toml | 5 + .../monster/undead/zombie/zombie.npcs.toml | 119 ++++++++++++++++++ .../monster/wallasalki/wallasalki.npcs.toml | 6 + .../earth_warrior/earth_warrior.npcs.toml | 7 +- .../warrior/ice_warrior/ice_warrior.npcs.toml | 5 + .../npc/monster/werewolf/werewolf.npcs.toml | 5 + .../barrows_brothers/barrows.npcs.toml | 33 +++++ data/minigame/soul_wars/soul_wars.npcs.toml | 10 ++ .../tai_bwo_wannai_cleanup.npcs.toml | 12 ++ .../warriors_guild/warriors_guild.npcs.toml | 35 ++++++ .../free/blood_pact/blood_pact.npcs.toml | 2 + .../between_a_rock/between_a_rock.npcs.toml | 30 +++++ .../clock_tower/clock_tower_dungeon.npcs.toml | 10 ++ data/quest/members/contact/contact.npcs.toml | 5 + .../defender_of_varrock.npcs.toml | 15 +++ .../desert_treasure/desert_treasure.npcs.toml | 11 ++ .../dwarf_cannon/dwarven_outpost.npcs.toml | 15 +++ .../fremennik_isles/fremennik_isles.npcs.toml | 5 + .../fremennik_trials.npcs.toml | 10 ++ .../members/ghosts_ahoy/ghosts_ahoy.npcs.toml | 4 + .../members/grim_tales/grim_tales.npcs.toml | 10 ++ .../haunted_mine/abandoned_mine.npcs.toml | 10 ++ .../haunted_mine/haunted_mine.npcs.toml | 8 ++ .../monkey_madness/monkey_madness.npcs.toml | 2 + .../mournings_end_part_2.npcs.toml | 5 + .../my_arms_big_adventure.npcs.toml | 2 + .../one_small_favour.npcs.toml | 5 + .../members/plague_city/plague_city.npcs.toml | 3 + .../recipe_for_disaster.npcs.toml | 19 ++- .../battle_of_the_archipelago.npcs.toml | 5 + .../members/slug_menace/slug_menace.npcs.toml | 5 + .../spirits_of_the_elid.npcs.toml | 15 +++ .../members/swan_song/swan_song.npcs.toml | 4 + .../troll_stronghold.npcs.toml | 5 + .../luciens_camp/luciens_camp.npcs.toml | 24 ++++ .../zogre_flesh_eaters.npcs.toml | 3 + .../dungeoneering/dungeoneering.npcs.toml | 6 + data/skill/summoning/summoning.npcs.toml | 27 ++++ 202 files changed, 2506 insertions(+), 20 deletions(-) diff --git a/data/activity/event/random/freaky_forester/freaky_forester.npcs.toml b/data/activity/event/random/freaky_forester/freaky_forester.npcs.toml index 6485aa9467..e1e4483e5f 100644 --- a/data/activity/event/random/freaky_forester/freaky_forester.npcs.toml +++ b/data/activity/event/random/freaky_forester/freaky_forester.npcs.toml @@ -33,27 +33,49 @@ id = 13246 clone = "pheasant_1_tail" drop_table = "pheasant" combat_def = "chicken" +stab_defence = 1 +slash_defence = 1 [pheasant_3_tails] id = 13247 clone = "pheasant_1_tail" drop_table = "pheasant" combat_def = "chicken" +stab_defence = -15 +slash_defence = -15 +crush_defence = -15 +magic_defence = -15 +range_defence = -15 [pheasant_3_tails_2] id = 13248 clone = "pheasant_1_tail" drop_table = "pheasant" combat_def = "chicken" +stab_defence = -15 +slash_defence = -15 +crush_defence = -15 +magic_defence = -15 +range_defence = -15 [pheasant_4_tails] id = 13249 clone = "pheasant_1_tail" drop_table = "pheasant" combat_def = "chicken" +stab_defence = -15 +slash_defence = -15 +crush_defence = -15 +magic_defence = -15 +range_defence = -15 [pheasant_4_tails_2] id = 13250 clone = "pheasant_1_tail" drop_table = "pheasant" combat_def = "chicken" +stab_defence = -15 +slash_defence = -15 +crush_defence = -15 +magic_defence = -15 +range_defence = -15 diff --git a/data/activity/treasure_trails/treasure_trails.npcs.toml b/data/activity/treasure_trails/treasure_trails.npcs.toml index e064437d68..4e47a522bf 100644 --- a/data/activity/treasure_trails/treasure_trails.npcs.toml +++ b/data/activity/treasure_trails/treasure_trails.npcs.toml @@ -36,4 +36,5 @@ max_hit_melee = 200 hunt_mode = "cowardly" immune_poison = true drop_table = "zamorak_wizard" -examine = "A servant of Zamorak." \ No newline at end of file +examine = "A servant of Zamorak." +magic_defence = 3 \ No newline at end of file diff --git a/data/area/asgarnia/black_knights_fortress/basement/black_knights_fortress_basement.npcs.toml b/data/area/asgarnia/black_knights_fortress/basement/black_knights_fortress_basement.npcs.toml index 7c941953c4..cc6a60dca4 100644 --- a/data/area/asgarnia/black_knights_fortress/basement/black_knights_fortress_basement.npcs.toml +++ b/data/area/asgarnia/black_knights_fortress/basement/black_knights_fortress_basement.npcs.toml @@ -39,6 +39,11 @@ id = 2682 drop_table = "rat" combat_def = "rat" hitpoints = 20 +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [arthur_black_knights_fortress_basement] id = 3778 diff --git a/data/area/asgarnia/black_knights_fortress/black_knight.npcs.toml b/data/area/asgarnia/black_knights_fortress/black_knight.npcs.toml index 91cd7b1800..1ad81a0278 100644 --- a/data/area/asgarnia/black_knights_fortress/black_knight.npcs.toml +++ b/data/area/asgarnia/black_knights_fortress/black_knight.npcs.toml @@ -21,6 +21,9 @@ combat_def = "man" max_hit_crush = 50 respawn_delay = 50 examine = "Guards prisoners for the black knights." +stab_defence = 79 +slash_defence = 63 +crush_defence = 47 [black_knight_void_stares_back] id = 12317 diff --git a/data/area/asgarnia/burthorpe/burthorpe.npcs.toml b/data/area/asgarnia/burthorpe/burthorpe.npcs.toml index 3601b527a8..958480f6ea 100644 --- a/data/area/asgarnia/burthorpe/burthorpe.npcs.toml +++ b/data/area/asgarnia/burthorpe/burthorpe.npcs.toml @@ -38,6 +38,11 @@ combat_def = "woman" respawn_delay = 25 drop_table = "citizen" examine = "A citizen of Burthorpe." +stab_defence = -12 +slash_defence = -12 +crush_defence = -12 +magic_defence = -12 +range_defence = -12 [penda] id = 1087 @@ -72,6 +77,11 @@ respawn_delay = 25 collision = "outdoors" drop_table = "citizen" examine = "A citizen of Burthorpe." +stab_defence = -12 +slash_defence = -12 +crush_defence = -12 +magic_defence = -12 +range_defence = -12 [hygd] id = 1088 @@ -84,6 +94,11 @@ combat_def = "woman" respawn_delay = 25 drop_table = "citizen" examine = "A citizen of Burthorpe." +stab_defence = -12 +slash_defence = -12 +crush_defence = -12 +magic_defence = -12 +range_defence = -12 [dunstan] id = 1082 @@ -136,6 +151,11 @@ combat_def = "woman" respawn_delay = 25 drop_table = "bones" examine = "The Burthorpe Castle cook." +stab_defence = -12 +slash_defence = -12 +crush_defence = -12 +magic_defence = -12 +range_defence = -12 [denulth] id = 1060 @@ -224,6 +244,11 @@ attack_bonus = 30 respawn_delay = 50 examine = "The knight seems to be watching something." drop_table = "white_knight" +stab_defence = 83 +slash_defence = 76 +crush_defence = 70 +magic_defence = -11 +range_defence = 74 [helemos] id = 797 diff --git a/data/area/asgarnia/dwarven_mines/dwarven_mine.npcs.toml b/data/area/asgarnia/dwarven_mines/dwarven_mine.npcs.toml index 7475e1df50..26e86f5fe8 100644 --- a/data/area/asgarnia/dwarven_mines/dwarven_mine.npcs.toml +++ b/data/area/asgarnia/dwarven_mines/dwarven_mine.npcs.toml @@ -13,6 +13,9 @@ att = 40 str = 40 def = 35 max_hit_crush = 50 +stab_defence = 7 +slash_defence = 7 +range_defence = 7 [dwarf_gang_member_2] id = 1796 @@ -25,6 +28,9 @@ att = 80 str = 30 def = 25 max_hit_crush = 40 +stab_defence = 7 +slash_defence = 7 +range_defence = 7 [dwarf_gang_member_3] id = 1797 @@ -35,6 +41,9 @@ att = 30 str = 60 def = 57 max_hit_crush = 70 +stab_defence = 7 +slash_defence = 7 +range_defence = 7 [cart_conductor] id = 2186 diff --git a/data/area/asgarnia/dwarven_mines/living_rock_caverns/living_rock_caverns.npcs.toml b/data/area/asgarnia/dwarven_mines/living_rock_caverns/living_rock_caverns.npcs.toml index 1d25ddb5f3..b0d01cb08b 100644 --- a/data/area/asgarnia/dwarven_mines/living_rock_caverns/living_rock_caverns.npcs.toml +++ b/data/area/asgarnia/dwarven_mines/living_rock_caverns/living_rock_caverns.npcs.toml @@ -13,6 +13,11 @@ att = 130 str = 130 def = 80 examine = "A being of ore and minerals." +stab_defence = 345 +slash_defence = 345 +crush_defence = 245 +magic_defence = 345 +range_defence = 345 [living_rock_protector_remains] id = 8837 @@ -33,6 +38,11 @@ str = 150 def = 80 range = 100 examine = "A being of ore and minerals." +stab_defence = 345 +slash_defence = 345 +crush_defence = 245 +magic_defence = 345 +range_defence = 345 [living_rock_striker_remains] id = 8838 @@ -48,6 +58,11 @@ combat_def = "living_rock_patriarch" categories = ["living_rock_creatures"] drop_table = "living_rock_patriarch" examine = "A being of ore and minerals." +stab_defence = 475 +slash_defence = 475 +crush_defence = 340 +magic_defence = 475 +range_defence = 475 [living_rock_patriarch_remains] id = 8839 diff --git a/data/area/asgarnia/entrana/entrana.npcs.toml b/data/area/asgarnia/entrana/entrana.npcs.toml index cd39a9bb4f..187aebf8ca 100644 --- a/data/area/asgarnia/entrana/entrana.npcs.toml +++ b/data/area/asgarnia/entrana/entrana.npcs.toml @@ -70,6 +70,11 @@ categories = ["birds"] respawn_delay = 35 drop_table = "firebird" examine = "Probably not a chicken." +stab_defence = -26 +slash_defence = -26 +crush_defence = -26 +magic_defence = -26 +range_defence = -26 [mysterious_ghost_entrana_2] id = 2401 diff --git a/data/area/asgarnia/falador/falador.npcs.toml b/data/area/asgarnia/falador/falador.npcs.toml index 983b8f45e6..448cd5a7dc 100644 --- a/data/area/asgarnia/falador/falador.npcs.toml +++ b/data/area/asgarnia/falador/falador.npcs.toml @@ -147,12 +147,22 @@ id = 2313 drop_table = "chicken" combat_def = "chicken" hitpoints = 30 +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [chicken_falador_2] id = 2314 drop_table = "chicken" combat_def = "chicken" hitpoints = 30 +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [chicken_falador_3] id = 2315 @@ -161,6 +171,11 @@ examine = "Yep. Definitely a chicken." drop_table = "chicken" combat_def = "chicken" hitpoints = 30 +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [elstan] id = 2323 @@ -204,6 +219,7 @@ combat_def = "air_wizard" respawn_delay = 50 drop_table = "air_wizard" examine = "At least he looks solid enough to fight." +magic_defence = 15 [malignius_mortifer] id = 2713 @@ -253,22 +269,47 @@ examine = "He tries to keep order around here." id = 3229 clone = "guard_falador" combat_def = "guard_xbow" +stab_defence = 13 +slash_defence = 17 +crush_defence = 14 +magic_defence = -4 +range_defence = 15 [guard_falador_3] id = 3230 clone = "guard_falador" +stab_defence = 5 +slash_defence = 5 +crush_defence = 5 +magic_defence = -4 +range_defence = 5 [guard_falador_4] id = 3231 clone = "guard_falador" +stab_defence = 5 +slash_defence = 5 +crush_defence = 5 +magic_defence = -4 +range_defence = 5 [guard_falador_5] id = 3232 clone = "guard_falador" +stab_defence = 5 +slash_defence = 5 +crush_defence = 5 +magic_defence = -4 +range_defence = 5 [guard_falador_6] id = 3233 clone = "guard_falador" +stab_defence = 5 +slash_defence = 5 +crush_defence = 5 +magic_defence = -4 +range_defence = 5 [apprentice_workman] id = 3235 @@ -329,6 +370,7 @@ respawn_delay = 50 drop_table = "dark_wizard_high" examine = "A practicer of dark arts." combat_def = "dark_wizard_water" +magic_defence = 5 [dark_wizard_falador_2] id = 3243 @@ -349,6 +391,7 @@ respawn_delay = 50 drop_table = "dark_wizard_low" examine = "A practicer of dark arts." combat_def = "dark_wizard_water" +magic_defence = 5 [dark_wizard_falador_4] id = 3245 @@ -478,6 +521,9 @@ hunt_mode = "cowardly" respawn_delay = 100 drop_table = "highwayman" examine = "He holds up passers by." +slash_defence = 3 +crush_defence = 2 +range_defence = 2 [assistant_falador] id = 7726 @@ -670,4 +716,9 @@ attack_bonus = 30 combat_def = "white_knight" respawn_delay = 50 examine = "The knight seems to be watching something." -drop_table = "white_knight" \ No newline at end of file +drop_table = "white_knight" +stab_defence = 83 +slash_defence = 76 +crush_defence = 70 +magic_defence = -11 +range_defence = 74 \ No newline at end of file diff --git a/data/area/asgarnia/mudskipper_point/asgarnian_ice_dungeon/resource_dungeon/asgarnian_ice_resource_dungeon.npcs.toml b/data/area/asgarnia/mudskipper_point/asgarnian_ice_dungeon/resource_dungeon/asgarnian_ice_resource_dungeon.npcs.toml index 3294f73f01..81897b494b 100644 --- a/data/area/asgarnia/mudskipper_point/asgarnian_ice_dungeon/resource_dungeon/asgarnian_ice_resource_dungeon.npcs.toml +++ b/data/area/asgarnia/mudskipper_point/asgarnian_ice_dungeon/resource_dungeon/asgarnian_ice_resource_dungeon.npcs.toml @@ -14,6 +14,12 @@ slayer_xp = 235.5 categories = ["dragons", "frost_dragons"] respawn_delay = 30 examine = "A dragon covered in frost and ice." +attack_bonus = 40 +stab_defence = 24 +slash_defence = 140 +crush_defence = 140 +magic_defence = 60 +range_defence = 24 [frost_dragon_2] id = 11634 diff --git a/data/area/asgarnia/mudskipper_point/asgarnian_ice_dungeon/skeletal_wyvern/skeletal_wyvern.npcs.toml b/data/area/asgarnia/mudskipper_point/asgarnian_ice_dungeon/skeletal_wyvern/skeletal_wyvern.npcs.toml index fe41a860c9..94a993f9b7 100644 --- a/data/area/asgarnia/mudskipper_point/asgarnian_ice_dungeon/skeletal_wyvern/skeletal_wyvern.npcs.toml +++ b/data/area/asgarnia/mudskipper_point/asgarnian_ice_dungeon/skeletal_wyvern/skeletal_wyvern.npcs.toml @@ -16,6 +16,11 @@ xp_bonus = 0.5 combat_def = "skeletal_wyvern" drop_table = "skeletal_wyvern" examine = "A very dangerous pile of animated wyvern bones." +stab_defence = 140 +slash_defence = 90 +crush_defence = 90 +magic_defence = 80 +range_defence = 140 [skeletal_wyvern_horns] id = 3069 diff --git a/data/area/asgarnia/port_sarim/port_sarim.npcs.toml b/data/area/asgarnia/port_sarim/port_sarim.npcs.toml index 1ca908bfcf..0d273db591 100644 --- a/data/area/asgarnia/port_sarim/port_sarim.npcs.toml +++ b/data/area/asgarnia/port_sarim/port_sarim.npcs.toml @@ -15,6 +15,11 @@ combat_def = "guard" attack_bonus = 4 respawn_delay = 50 examine = "Keeping an eye out for suspicious activity." +stab_defence = 18 +slash_defence = 25 +crush_defence = 19 +magic_defence = -4 +range_defence = 20 [port_sarim_guard_1] id = 2700 @@ -258,6 +263,11 @@ respawn_delay = 25 combat_def = "seagull" drop_table = "seagull" examine = "A messy bird." +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [seagull_port_sarim_2] id = 6116 @@ -269,6 +279,11 @@ respawn_delay = 25 combat_def = "seagull" drop_table = "seagull" examine = "Smells of rotten fish." +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [thaki_the_delivery_dwarf] id = 7115 diff --git a/data/area/asgarnia/rimmington/rimmington.npcs.toml b/data/area/asgarnia/rimmington/rimmington.npcs.toml index 131cd67c9d..fc64e81877 100644 --- a/data/area/asgarnia/rimmington/rimmington.npcs.toml +++ b/data/area/asgarnia/rimmington/rimmington.npcs.toml @@ -81,6 +81,11 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 +stab_defence = 9 +slash_defence = 11 +crush_defence = -2 +magic_defence = 1 +range_defence = 4 [skeleton_rimmington_2] id = 6092 @@ -93,6 +98,11 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 +stab_defence = 9 +slash_defence = 11 +crush_defence = -2 +magic_defence = 1 +range_defence = 4 [skeleton_rimmington_3] id = 6093 @@ -105,6 +115,11 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 +stab_defence = 9 +slash_defence = 11 +crush_defence = -2 +magic_defence = 1 +range_defence = 4 [ghost_rimmington] id = 6094 @@ -115,6 +130,11 @@ att = 13 str = 13 def = 18 max_hit_crush = 20 +stab_defence = 5 +slash_defence = 5 +crush_defence = 5 +magic_defence = -5 +range_defence = 5 [ghost_rimmington_2] id = 6095 @@ -125,6 +145,11 @@ att = 13 str = 13 def = 18 max_hit_crush = 20 +stab_defence = 5 +slash_defence = 5 +crush_defence = 5 +magic_defence = -5 +range_defence = 5 [ghost_rimmington_3] id = 6096 diff --git a/data/area/asgarnia/taverley/witches_house/mouse_hole/mouse_hole.npcs.toml b/data/area/asgarnia/taverley/witches_house/mouse_hole/mouse_hole.npcs.toml index 0a06d17375..c8e576db38 100644 --- a/data/area/asgarnia/taverley/witches_house/mouse_hole/mouse_hole.npcs.toml +++ b/data/area/asgarnia/taverley/witches_house/mouse_hole/mouse_hole.npcs.toml @@ -11,6 +11,11 @@ respawn_delay = 35 examine = "A huge mouse. It looks hungry..." drop_table = "mouse" combat_def = "rat" +stab_defence = 30 +slash_defence = 55 +crush_defence = 65 +magic_defence = 50 +range_defence = 60 [mouse_mouse_hole_dark] id = 5995 diff --git a/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml index 8118d03bdb..7e969ccd58 100644 --- a/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml +++ b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml @@ -7,6 +7,11 @@ att = 47 str = 47 def = 47 max_hit_slash = 60 +stab_defence = 30 +slash_defence = 40 +crush_defence = 20 +magic_defence = 10 +range_defence = 30 [ice_queen] id = 795 diff --git a/data/area/fremennik_province/fremennik_isles/fremennik_isle.npcs.toml b/data/area/fremennik_province/fremennik_isles/fremennik_isle.npcs.toml index a90233c67c..3c87f39173 100644 --- a/data/area/fremennik_province/fremennik_isles/fremennik_isle.npcs.toml +++ b/data/area/fremennik_province/fremennik_isles/fremennik_isle.npcs.toml @@ -23,6 +23,9 @@ respawn_delay = 50 examine = "An ice troll youngling." drop_table = "ice_troll_runt" combat_def = "ice_troll" +stab_defence = 30 +slash_defence = 60 +crush_defence = 30 [ice_troll_male_fremennik_isle] id = 5526 @@ -40,6 +43,9 @@ categories = ["trolls"] drop_table = "ice_troll_male" examine = "A male troll wielding a large club." combat_def = "ice_troll" +stab_defence = 30 +slash_defence = 60 +crush_defence = 30 [ice_troll_female_fremennik_isle] id = 5527 @@ -58,6 +64,9 @@ categories = ["trolls"] drop_table = "ice_troll_female" examine = "An ice troll with a bag of rocks." combat_def = "ice_troll_female" +stab_defence = 30 +slash_defence = 60 +crush_defence = 30 [ice_troll_grunt_fremennik_isle] id = 5528 @@ -76,3 +85,6 @@ respawn_delay = 50 drop_table = "ice_troll_grunt" examine = "A large ice troll." combat_def = "ice_troll" +stab_defence = 30 +slash_defence = 60 +crush_defence = 30 diff --git a/data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.npcs.toml b/data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.npcs.toml index a9b908ac70..c449dd9db1 100644 --- a/data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.npcs.toml +++ b/data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.npcs.toml @@ -15,6 +15,9 @@ respawn_delay = 50 examine = "An ice troll youngling." drop_table = "ice_troll_runt" combat_def = "ice_troll" +stab_defence = 30 +slash_defence = 60 +crush_defence = 30 [ice_troll_male_ice_troll_caves] id = 5474 @@ -32,6 +35,9 @@ categories = ["trolls"] drop_table = "ice_troll_male" examine = "A male troll wielding a large club." combat_def = "ice_troll" +stab_defence = 30 +slash_defence = 60 +crush_defence = 30 [ice_troll_female_ice_troll_caves] id = 5475 @@ -51,6 +57,9 @@ categories = ["trolls"] drop_table = "ice_troll_female" examine = "An ice troll with a bag of rocks." combat_def = "ice_troll_female" +stab_defence = 30 +slash_defence = 60 +crush_defence = 30 [ice_troll_grunt_ice_troll_caves] id = 5476 @@ -69,6 +78,9 @@ respawn_delay = 50 drop_table = "ice_troll_grunt" examine = "A large ice troll." combat_def = "ice_troll" +stab_defence = 30 +slash_defence = 60 +crush_defence = 30 [bork_sigmundson_ice_troll_caves] id = 5477 diff --git a/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.npcs.toml b/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.npcs.toml index 2392d4108f..44ce52d1cb 100644 --- a/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.npcs.toml +++ b/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.npcs.toml @@ -69,6 +69,9 @@ categories = ["trolls"] respawn_delay = 50 examine = "An ice troll youngling." drop_table = "ice_troll_runt" +stab_defence = 30 +slash_defence = 60 +crush_defence = 30 [ice_troll_male_neitiznot] id = 5522 @@ -84,6 +87,9 @@ slayer_xp = 84.0 categories = ["trolls"] drop_table = "ice_troll_male" examine = "A male troll wielding a large club." +stab_defence = 30 +slash_defence = 60 +crush_defence = 30 [ice_troll_female_neitiznot] id = 5523 @@ -99,6 +105,9 @@ slayer_xp = 84.0 categories = ["trolls"] drop_table = "ice_troll_female" examine = "An ice troll with a bag of rocks." +stab_defence = 30 +slash_defence = 60 +crush_defence = 30 [yak] id = 5529 diff --git a/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml b/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml index 6722cedbde..0562f0dfca 100644 --- a/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml +++ b/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml @@ -26,6 +26,10 @@ respawn_delay = 30 examine = "A member of the Black Guard, a special division of the dwarven army." drop_table = "black_guard" combat_def = "dwarf" +stab_defence = 40 +slash_defence = 40 +crush_defence = 40 +range_defence = 40 [black_guard_chaos_dwarf_battlefield_2] id = 8773 @@ -51,6 +55,11 @@ str = 1 def = 91 range = 96 max_hit_range = 110 +stab_defence = 40 +slash_defence = 34 +crush_defence = 25 +magic_defence = 10 +range_defence = 35 [chaos_dwarf_hand_cannoneer_chaos_dwarf_battlefield_2] id = 8777 @@ -64,6 +73,11 @@ str = 1 def = 91 range = 96 max_hit_range = 110 +stab_defence = 40 +slash_defence = 34 +crush_defence = 25 +magic_defence = 10 +range_defence = 35 [chaos_dwarf_chaos_dwarf_battlefield] id = 8778 @@ -75,6 +89,11 @@ str = 42 def = 28 attack_bonus = 13 max_hit_crush = 60 +stab_defence = 40 +slash_defence = 34 +crush_defence = 25 +magic_defence = 10 +range_defence = 35 [chaos_dwarf_chaos_dwarf_battlefield_2] id = 8779 @@ -88,6 +107,11 @@ str = 42 def = 28 attack_bonus = 13 max_hit_crush = 60 +stab_defence = 40 +slash_defence = 34 +crush_defence = 25 +magic_defence = 10 +range_defence = 35 [black_guard_crossbowdwarf_chaos_dwarf_battlefield] id = 8781 @@ -101,6 +125,10 @@ str = 1 def = 84 range = 86 max_hit_range = 100 +stab_defence = 40 +slash_defence = 40 +crush_defence = 40 +range_defence = 40 [black_guard_crossbowdwarf_chaos_dwarf_battlefield_2] id = 8782 @@ -114,6 +142,10 @@ str = 1 def = 84 range = 86 max_hit_range = 100 +stab_defence = 40 +slash_defence = 40 +crush_defence = 40 +range_defence = 40 [black_guard_berserker_chaos_dwarf_battlefield] id = 8783 @@ -132,6 +164,10 @@ respawn_delay = 30 examine = "An elite member of the Black Guard." drop_table = "black_guard_berserker" combat_def = "guard" +stab_defence = 60 +slash_defence = 60 +crush_defence = 60 +range_defence = 60 [black_guard_berserker_chaos_dwarf_battlefield_2] id = 8784 diff --git a/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml b/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml index 520148e625..54546fa11e 100644 --- a/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml +++ b/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml @@ -284,6 +284,10 @@ hunt_mode = "guarding" drop_table = "black_guard_high" examine = "A member of the Black Guard, a special division of the dwarven army." combat_def = "dwarf" +stab_defence = 40 +slash_defence = 40 +crush_defence = 40 +range_defence = 40 [black_guard_keldagrim_market_2] id = 2131 @@ -317,6 +321,10 @@ respawn_delay = 30 drop_table = "black_guard_high" examine = "An elite member of the Black Guard." combat_def = "dwarf" +stab_defence = 60 +slash_defence = 60 +crush_defence = 60 +range_defence = 60 [black_guard_berserker_keldagrim_2] id = 2135 @@ -640,6 +648,10 @@ att = 150 str = 150 def = 1 max_hit_crush = 164 +stab_defence = 60 +slash_defence = 60 +crush_defence = 60 +range_defence = 60 [colonel_grenda_keldagrim] id = 8817 diff --git a/data/area/fremennik_province/lunar_isle/lunar_isle.npcs.toml b/data/area/fremennik_province/lunar_isle/lunar_isle.npcs.toml index 80d7b1ece2..4d04dc2f4a 100644 --- a/data/area/fremennik_province/lunar_isle/lunar_isle.npcs.toml +++ b/data/area/fremennik_province/lunar_isle/lunar_isle.npcs.toml @@ -82,6 +82,11 @@ slayer_xp = 107.6 categories = ["suqahs"] drop_table = "suqah" examine = "A strange creature unique to Lunar Isle." +stab_defence = 50 +slash_defence = 70 +crush_defence = 70 +magic_defence = 90 +range_defence = 50 [suqah_2] id = 4528 diff --git a/data/area/fremennik_province/miscellania/miscellania.npcs.toml b/data/area/fremennik_province/miscellania/miscellania.npcs.toml index 1669d93160..804719c623 100644 --- a/data/area/fremennik_province/miscellania/miscellania.npcs.toml +++ b/data/area/fremennik_province/miscellania/miscellania.npcs.toml @@ -60,6 +60,11 @@ respawn_delay = 25 drop_table = "bones" examine = "A warrior of Etceteria." combat_def = "guard" +stab_defence = -12 +slash_defence = -12 +crush_defence = -12 +magic_defence = -12 +range_defence = -12 [skraeling_battleaxe] id = 1368 @@ -234,6 +239,11 @@ respawn_delay = 25 drop_table = "bones" examine = "A subject of Miscellania." max_hit_crush = 10 +stab_defence = -12 +slash_defence = -12 +crush_defence = -12 +magic_defence = -12 +range_defence = -12 [ragnvald] id = 1392 @@ -247,6 +257,11 @@ respawn_delay = 25 drop_table = "bones" examine = "A subject of Miscellania." max_hit_crush = 10 +stab_defence = -12 +slash_defence = -12 +crush_defence = -12 +magic_defence = -12 +range_defence = -12 [fishmonger_miscellania] id = 1393 @@ -284,12 +299,22 @@ examine = "Yep. Definitely a chicken." drop_table = "chicken" combat_def = "chicken" hitpoints = 30 +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [chicken_miscellania_2] id = 1402 drop_table = "chicken" combat_def = "chicken" hitpoints = 30 +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [rooster_miscellania] id = 1403 @@ -303,6 +328,11 @@ respawn_delay = 25 examine = "He rules the, er, roost." drop_table = "rooster" combat_def = "chicken" +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [rabbit_miscellania] id = 1404 @@ -312,6 +342,11 @@ attack_bonus = -47 respawn_delay = 25 drop_table = "rabbit" examine = "A cute bunny rabbit." +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [rhazien] id = 2337 @@ -453,6 +488,11 @@ drop_table = "rabbit" combat_def = "rabbit_miscellania" hitpoints = 50 max_hit_crush = 10 +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [king_vargas_2] id = 7403 diff --git a/data/area/fremennik_province/pirates_cove/pirates_cove.npcs.toml b/data/area/fremennik_province/pirates_cove/pirates_cove.npcs.toml index 02434124c2..6c05cf53a2 100644 --- a/data/area/fremennik_province/pirates_cove/pirates_cove.npcs.toml +++ b/data/area/fremennik_province/pirates_cove/pirates_cove.npcs.toml @@ -15,6 +15,8 @@ examine = "Avast ye scurvy land lubbers!" drop_table = "pirate" combat_def = "pirate" max_hit_slash = 30 +stab_defence = 3 +slash_defence = 2 [lokar_searunner_after] id = 4537 diff --git a/data/area/fremennik_province/rellekka/brine_rat_cavern/brine_rat_cavern.npcs.toml b/data/area/fremennik_province/rellekka/brine_rat_cavern/brine_rat_cavern.npcs.toml index f38c9019f1..dd7e657742 100644 --- a/data/area/fremennik_province/rellekka/brine_rat_cavern/brine_rat_cavern.npcs.toml +++ b/data/area/fremennik_province/rellekka/brine_rat_cavern/brine_rat_cavern.npcs.toml @@ -14,6 +14,11 @@ respawn_delay = 50 examine = "Could use a good meal." drop_table = "skeleton_fremennik" combat_def = "skeleton_barbarian" +stab_defence = 14 +slash_defence = 18 +crush_defence = 15 +magic_defence = -4 +range_defence = 15 [skeleton_fremennik_2] id = 3698 @@ -43,6 +48,11 @@ respawn_delay = 50 examine = "He seems a little underweight." drop_table = "skeleton_fremennik" combat_def = "skeleton_barbarian" +stab_defence = 14 +slash_defence = 18 +crush_defence = 15 +magic_defence = -4 +range_defence = 15 [skeleton_fremennik_5] id = 3701 @@ -72,6 +82,11 @@ respawn_delay = 50 examine = "He seems a little underweight." drop_table = "skeleton_fremennik" combat_def = "skeleton_barbarian" +stab_defence = 14 +slash_defence = 18 +crush_defence = 15 +magic_defence = -4 +range_defence = 15 [skeleton_fremennik_8] id = 3704 diff --git a/data/area/fremennik_province/rellekka/fremennik_dungeon/aquanite/aquanite.npcs.toml b/data/area/fremennik_province/rellekka/fremennik_dungeon/aquanite/aquanite.npcs.toml index fcb5413217..1969107fca 100644 --- a/data/area/fremennik_province/rellekka/fremennik_dungeon/aquanite/aquanite.npcs.toml +++ b/data/area/fremennik_province/rellekka/fremennik_dungeon/aquanite/aquanite.npcs.toml @@ -11,3 +11,7 @@ slayer_level = 78 slayer_xp = 125.0 drop_table = "aquanite" examine = "It has a light on its forehead. What a pretty light... So shiny!" +stab_defence = 30 +slash_defence = 90 +crush_defence = 90 +magic_defence = 90 diff --git a/data/area/fremennik_province/rellekka/rellekka.npcs.toml b/data/area/fremennik_province/rellekka/rellekka.npcs.toml index 956e352b23..780c48871f 100644 --- a/data/area/fremennik_province/rellekka/rellekka.npcs.toml +++ b/data/area/fremennik_province/rellekka/rellekka.npcs.toml @@ -20,6 +20,11 @@ respawn_delay = 25 drop_table = "rooster" examine = "He rules the, er, roost." combat_def = "chicken" +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [lalli_rellekka] id = 1270 @@ -203,6 +208,11 @@ respawn_delay = 30 drop_table = "market_guard" examine = "Keeps the stalls secure." combat_def = "guard" +stab_defence = 50 +slash_defence = 50 +crush_defence = 50 +magic_defence = 50 +range_defence = 50 [peter_rellekka] id = 13175 @@ -226,6 +236,11 @@ respawn_delay = 25 combat_def = "bunny" drop_table = "bunny" examine = "Hoppity, hoppity." +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [bunny_rellekka_2] id = 1321 @@ -403,6 +418,11 @@ respawn_delay = 30 drop_table = "market_guard" examine = "A hardened Fremennik warrior." combat_def = "guard" +stab_defence = 50 +slash_defence = 50 +crush_defence = 50 +magic_defence = 50 +range_defence = 50 [black_unicorn_foal] id = 1329 diff --git a/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml b/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml index bcc8adf192..927849279c 100644 --- a/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml +++ b/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml @@ -56,6 +56,7 @@ def = 187 range = 100 max_hit_range = 114 combat_def = "dagannoth_guardian" +magic_defence = 120 [bardur] id = 2879 @@ -66,6 +67,11 @@ att = 80 str = 80 def = 80 combat_def = "man" +stab_defence = 150 +slash_defence = 150 +crush_defence = 150 +magic_defence = 150 +range_defence = 150 [dagannoth_fledgeling] id = 2880 @@ -99,6 +105,11 @@ slayer_xp = 255.0 categories = ["dagannoth"] xp_bonus = 3.0 examine = "The dagannoth king responsible for the death of the Bukalla." +stab_defence = 10 +slash_defence = 10 +crush_defence = 10 +magic_defence = 255 +range_defence = 255 [dagannoth_prime] id = 2882 @@ -115,6 +126,11 @@ slayer_xp = 331.4 categories = ["dagannoth"] xp_bonus = 3.0 examine = "A legendary dagannoth king, rumoured to fly on the North winds." +stab_defence = 255 +slash_defence = 255 +crush_defence = 255 +magic_defence = 255 +range_defence = 10 [dagannoth_rex] id = 2883 @@ -131,6 +147,11 @@ slayer_xp = 331.4 categories = ["dagannoth"] xp_bonus = 3.0 examine = "Firstborn of the legendary dagannoth kings." +stab_defence = 255 +slash_defence = 255 +crush_defence = 255 +magic_defence = 10 +range_defence = 255 [suspicious_water] id = 2891 @@ -148,6 +169,11 @@ hunt_range = 10 respawn_delay = 10 drop_table = "bones" examine = "A sneaky, spiny, subterranean sea-dwelling scamp." +stab_defence = 100 +slash_defence = 100 +crush_defence = 100 +magic_defence = 50 +range_defence = 50 [suspicious_water_2] id = 2893 diff --git a/data/area/kandarin/ancient_cavern/ancient_cavern.npcs.toml b/data/area/kandarin/ancient_cavern/ancient_cavern.npcs.toml index c81dccb13d..7e1205d4df 100644 --- a/data/area/kandarin/ancient_cavern/ancient_cavern.npcs.toml +++ b/data/area/kandarin/ancient_cavern/ancient_cavern.npcs.toml @@ -26,6 +26,10 @@ attack_bonus = 9 respawn_delay = 50 drop_table = "mangled_bones" examine = "He looks about, blankly." +slash_defence = 3 +crush_defence = 2 +magic_defence = -3 +range_defence = 2 [lost_barbarian] id = 6102 @@ -54,6 +58,10 @@ categories = ["skeletons"] respawn_delay = 50 drop_table = "barbarian_spirit" examine = "An ex-barbarian, willing to make you ex too." +slash_defence = 3 +crush_defence = 2 +magic_defence = -3 +range_defence = 2 [skeleton_warlord] id = 6105 @@ -69,6 +77,10 @@ categories = ["skeletons"] respawn_delay = 50 drop_table = "barbarian_spirit" examine = "He's heartless." +slash_defence = 3 +crush_defence = 2 +magic_defence = -3 +range_defence = 2 [skeleton_thug] id = 6107 @@ -84,6 +96,10 @@ categories = ["skeletons"] respawn_delay = 50 drop_table = "barbarian_spirit" examine = "Floats like an anvil, hits like a hammer." +slash_defence = 3 +crush_defence = 2 +magic_defence = -3 +range_defence = 2 [skeleton_hero] id = 6103 @@ -99,6 +115,10 @@ slayer_xp = 124.0 categories = ["skeletons"] drop_table = "barbarian_spirit" examine = "An opponent from the grave. He seems unimpressed by your bone rummaging." +slash_defence = 3 +crush_defence = 2 +magic_defence = -3 +range_defence = 2 [angry_barbarian] id = 749 @@ -112,6 +132,10 @@ hunt_mode = "cowardly" respawn_delay = 50 drop_table = "barbarian_spirit" examine = "He looks a tad upset." +slash_defence = 3 +crush_defence = 2 +magic_defence = -3 +range_defence = 2 [enraged_barbarian_spirit] id = 750 @@ -125,6 +149,10 @@ hunt_mode = "cowardly" respawn_delay = 50 drop_table = "barbarian_spirit" examine = "He looks a tad upset." +slash_defence = 3 +crush_defence = 2 +magic_defence = -3 +range_defence = 2 [berserk_barbarian_spirit] id = 751 @@ -138,6 +166,10 @@ hunt_mode = "cowardly" respawn_delay = 50 drop_table = "barbarian_spirit" examine = "He looks a tad upset." +slash_defence = 3 +crush_defence = 2 +magic_defence = -3 +range_defence = 2 [gargoyle_ancient_cavern] id = 9087 @@ -159,3 +191,8 @@ categories = ["mithril_dragons"] respawn_delay = 30 drop_table = "mithril_dragon" examine = "Experimenting with mithril gone bad!" +stab_defence = 50 +slash_defence = 100 +crush_defence = 70 +magic_defence = 30 +range_defence = 90 diff --git a/data/area/kandarin/ancient_cavern/kuradals_dungeon/kuradals_dungeon.npcs.toml b/data/area/kandarin/ancient_cavern/kuradals_dungeon/kuradals_dungeon.npcs.toml index b1e9577b0e..889cab35a9 100644 --- a/data/area/kandarin/ancient_cavern/kuradals_dungeon/kuradals_dungeon.npcs.toml +++ b/data/area/kandarin/ancient_cavern/kuradals_dungeon/kuradals_dungeon.npcs.toml @@ -13,3 +13,8 @@ categories = ["dark_beasts"] respawn_delay = 50 drop_table = "dark_beast" examine = "From a darker dimension." +stab_defence = 30 +slash_defence = 40 +crush_defence = 100 +magic_defence = 90 +range_defence = 100 diff --git a/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml b/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml index fc7ba6cace..aecda99af3 100644 --- a/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml +++ b/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml @@ -25,6 +25,8 @@ respawn_delay = 2 hunt_mode = "cowardly" examine = "It's an extremely small brown spider, probably very poisonous." drop_table = "spider" +slash_defence = 1 +magic_defence = 1 [pedestal_ape_atoll] id = 13176 diff --git a/data/area/kandarin/ardougne/east_ardougne.npcs.toml b/data/area/kandarin/ardougne/east_ardougne.npcs.toml index 3d993e13a4..193cb9f6e0 100644 --- a/data/area/kandarin/ardougne/east_ardougne.npcs.toml +++ b/data/area/kandarin/ardougne/east_ardougne.npcs.toml @@ -60,6 +60,11 @@ str = 22 def = 22 attack_bonus = 6 max_hit_stab = 30 +stab_defence = 40 +slash_defence = 41 +crush_defence = 37 +magic_defence = -10 +range_defence = 38 [milton_the_miller] id = 1739 @@ -80,6 +85,11 @@ respawn_delay = 50 examine = "A holy warrior." drop_table = "paladin" combat_def = "guard" +stab_defence = 87 +slash_defence = 84 +crush_defence = 76 +magic_defence = -10 +range_defence = 79 [hero] id = 21 @@ -118,6 +128,11 @@ hunt_mode = "guarding" examine = "A member of Ardougne's militia." drop_table = "knight_of_ardougne" combat_def = "black_knight" +stab_defence = 39 +slash_defence = 40 +crush_defence = 36 +magic_defence = -11 +range_defence = 36 [richard_ardougne] id = 2306 @@ -158,6 +173,11 @@ str = 1 def = 60 range = 26 max_hit_range = 40 +stab_defence = 18 +slash_defence = 23 +crush_defence = 27 +magic_defence = 10 +range_defence = 19 [zookeeper] id = 28 @@ -218,6 +238,11 @@ examine = "Keeps the peace... kind of." drop_table = "guard" combat_def = "guard" max_hit_stab = 30 +stab_defence = 24 +slash_defence = 14 +crush_defence = 19 +magic_defence = 4 +range_defence = 16 [edmond_ardougne] id = 3213 diff --git a/data/area/kandarin/ardougne/ibans_lair/ibans_lair.npcs.toml b/data/area/kandarin/ardougne/ibans_lair/ibans_lair.npcs.toml index d3d23bac19..768a0f6189 100644 --- a/data/area/kandarin/ardougne/ibans_lair/ibans_lair.npcs.toml +++ b/data/area/kandarin/ardougne/ibans_lair/ibans_lair.npcs.toml @@ -14,6 +14,7 @@ examine = "One of the guardians of Iban." drop_table = "holthion" max_hit_slash = 90 combat_def = "holthion" +magic_defence = -10 [disciple_of_iban_ibans_lair] id = 1002 @@ -82,6 +83,7 @@ drop_table = "othainian" examine = "One of the guardians of Iban." max_hit_slash = 90 combat_def = "othainian" +magic_defence = -10 [doomion_ibans_lair] id = 999 @@ -98,3 +100,4 @@ drop_table = "disciple_of_iban" examine = "One of the guardians of Iban." max_hit_slash = 90 combat_def = "doomion" +magic_defence = -10 diff --git a/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml b/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml index 5ae372b571..5157e25a16 100644 --- a/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml +++ b/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml @@ -24,6 +24,9 @@ drop_table = "bones" examine = "Leader of the Hazeel Cult." max_hit_crush = 20 combat_def = "alomone" +stab_defence = 5 +slash_defence = 6 +crush_defence = 8 [clivet_ardougne_sewers] id = 893 diff --git a/data/area/kandarin/ardougne/underground_pass/dungeon/underground_pass_dungeon.npcs.toml b/data/area/kandarin/ardougne/underground_pass/dungeon/underground_pass_dungeon.npcs.toml index a3b46d356c..3008ef36a1 100644 --- a/data/area/kandarin/ardougne/underground_pass/dungeon/underground_pass_dungeon.npcs.toml +++ b/data/area/kandarin/ardougne/underground_pass/dungeon/underground_pass_dungeon.npcs.toml @@ -10,6 +10,11 @@ respawn_delay = 300 examine = "Some oversized vermin, blessed by Zamorak." drop_table = "blessed_giant_rat" combat_def = "giant_rat" +stab_defence = -24 +slash_defence = -24 +crush_defence = -24 +magic_defence = -24 +range_defence = -24 [blessed_giant_rat_underground_pass_dungeon_2] id = 978 diff --git a/data/area/kandarin/ardougne/underground_pass/underground_pass.npcs.toml b/data/area/kandarin/ardougne/underground_pass/underground_pass.npcs.toml index 5979527105..ddf27f48bb 100644 --- a/data/area/kandarin/ardougne/underground_pass/underground_pass.npcs.toml +++ b/data/area/kandarin/ardougne/underground_pass/underground_pass.npcs.toml @@ -117,6 +117,11 @@ respawn_delay = 100 examine = "It's one of General Khazard's warriors." drop_table = "khazard_trooper" combat_def = "guard" +stab_defence = 33 +slash_defence = 34 +crush_defence = 29 +magic_defence = -7 +range_defence = 33 [khazard_warlord_underground_pass] id = 477 @@ -229,6 +234,11 @@ respawn_delay = 300 examine = "A nasty spider, blessed by Zamorak." drop_table = "empty" combat_def = "giant_spider" +stab_defence = 15 +slash_defence = 16 +crush_defence = 7 +magic_defence = 12 +range_defence = 16 [sir_jerro_underground_pass] id = 988 @@ -311,6 +321,11 @@ examine = "A giant spider." drop_table = "empty" max_hit_stab = 90 combat_def = "kalrag" +stab_defence = 20 +slash_defence = 17 +crush_defence = 12 +magic_defence = 13 +range_defence = 13 [boulder_underground_pass] id = 986 diff --git a/data/area/kandarin/ardougne/west/west_ardougne.npcs.toml b/data/area/kandarin/ardougne/west/west_ardougne.npcs.toml index 565128831f..acfb883d2f 100644 --- a/data/area/kandarin/ardougne/west/west_ardougne.npcs.toml +++ b/data/area/kandarin/ardougne/west/west_ardougne.npcs.toml @@ -84,6 +84,9 @@ examine = "A mourner, or plague healer." drop_table = "mourner" combat_def = "guard" max_hit_crush = 20 +stab_defence = 6 +slash_defence = 6 +crush_defence = 9 [mourner_5] id = 348 @@ -108,6 +111,9 @@ def = 10 style = "crush" max_hit_melee = 20 examine = "A mourner, or plague healer." +stab_defence = 5 +slash_defence = 5 +crush_defence = 7 [mourner] id = 2373 diff --git a/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.npcs.toml b/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.npcs.toml index a1c73fc4de..fd7d27376a 100644 --- a/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.npcs.toml +++ b/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.npcs.toml @@ -14,6 +14,11 @@ drop_table = "giant_lobster" examine = "An extremely vicious lobster." max_hit_stab = 40 combat_def = "giant_lobster" +stab_defence = 30 +slash_defence = 30 +crush_defence = 15 +magic_defence = 99 +range_defence = 70 [sea_slug_witchaven_dungeon] id = 4894 diff --git a/data/area/kandarin/barbarian_outpost/barbarian_outpost.npcs.toml b/data/area/kandarin/barbarian_outpost/barbarian_outpost.npcs.toml index ed912d7d36..1841a8fdd8 100644 --- a/data/area/kandarin/barbarian_outpost/barbarian_outpost.npcs.toml +++ b/data/area/kandarin/barbarian_outpost/barbarian_outpost.npcs.toml @@ -129,3 +129,7 @@ attack_bonus = 9 xp_bonus = 0.5 hunt_mode = "cowardly" examine = "He looks a tad upset." +slash_defence = 73 +crush_defence = 72 +magic_defence = -3 +range_defence = 72 diff --git a/data/area/kandarin/battlefield/battlefield.npcs.toml b/data/area/kandarin/battlefield/battlefield.npcs.toml index bec815e499..96d47365e9 100644 --- a/data/area/kandarin/battlefield/battlefield.npcs.toml +++ b/data/area/kandarin/battlefield/battlefield.npcs.toml @@ -12,11 +12,20 @@ respawn_delay = 100 drop_table = "bones" examine = "It's one of General Khazard's warriors." combat_def = "guard" +stab_defence = 33 +slash_defence = 34 +crush_defence = 29 +magic_defence = -7 +range_defence = -33 [khazard_trooper_battlefield_2] id = 2246 clone = "khazard_trooper_battlefield" combat_def = "guard" +stab_defence = 25 +slash_defence = 25 +crush_defence = 22 +range_defence = -25 [gnome_troop_battlefield] id = 2247 @@ -33,6 +42,11 @@ respawn_delay = 60 examine = "Like a mini man!" drop_table = "gnome_troop" combat_def = "gnome_guard" +stab_defence = 3 +slash_defence = 4 +crush_defence = 5 +magic_defence = 2 +range_defence = 4 [gnome_troop_battlefield_2] id = 2248 @@ -51,6 +65,11 @@ drop_table = "gnome" combat_def = "gnome" hitpoints = 30 max_hit_crush = 10 +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [gnome_battlefield_2] id = 2250 @@ -58,6 +77,11 @@ drop_table = "gnome" combat_def = "gnome" hitpoints = 30 max_hit_crush = 10 +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [gnome_battlefield_3] id = 2251 @@ -66,6 +90,11 @@ drop_table = "gnome" combat_def = "gnome" hitpoints = 30 max_hit_crush = 10 +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [gnome_archer] id = 3814 @@ -80,6 +109,11 @@ max_hit_range = 20 hunt_mode = "cowardly" drop_table = "bones" examine = "A Gnome Arrow-chucker" +stab_defence = -30 +slash_defence = -30 +crush_defence = -30 +magic_defence = -30 +range_defence = -30 [gnome_driver] id = 3815 @@ -103,6 +137,11 @@ style = "magic" max_hit_magic = 10 hunt_mode = "cowardly" examine = "A battle mage of the gnomish variety." +stab_defence = -30 +slash_defence = -30 +crush_defence = -30 +magic_defence = -30 +range_defence = -30 [lieutenant_schepbur_battlefield] id = 3817 @@ -150,6 +189,11 @@ respawn_delay = 30 drop_table = "bones" examine = "These gnomes know how to get around!" combat_def = "gnome" +stab_defence = 16 +slash_defence = 16 +crush_defence = 18 +magic_defence = 15 +range_defence = 10 [mounted_terrorbird_gnome_battlefield_2] id = 6110 diff --git a/data/area/kandarin/baxtorian_falls/baxtorian_falls.npcs.toml b/data/area/kandarin/baxtorian_falls/baxtorian_falls.npcs.toml index d8d164f060..ba7644982f 100644 --- a/data/area/kandarin/baxtorian_falls/baxtorian_falls.npcs.toml +++ b/data/area/kandarin/baxtorian_falls/baxtorian_falls.npcs.toml @@ -43,6 +43,11 @@ str = 18 def = 14 attack_bonus = 4 max_hit_stab = 30 +stab_defence = 3 +slash_defence = 4 +crush_defence = 4 +magic_defence = 2 +range_defence = 3 [guard_baxtorian_falls_2] id = 4260 @@ -56,6 +61,11 @@ str = 18 def = 14 attack_bonus = 4 max_hit_stab = 30 +stab_defence = 3 +slash_defence = 4 +crush_defence = 4 +magic_defence = 2 +range_defence = 3 [mysterious_ghost_baxtorian_falls_2] id = 2399 @@ -72,3 +82,7 @@ attack_bonus = 9 slayer_xp = 124.0 categories = ["skeletons"] examine = "He's less heavy now." +slash_defence = 3 +crush_defence = 2 +magic_defence = -3 +range_defence = 2 diff --git a/data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.npcs.toml b/data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.npcs.toml index 20c597a3af..f2714328b0 100644 --- a/data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.npcs.toml +++ b/data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.npcs.toml @@ -11,6 +11,11 @@ categories = ["spiders"] respawn_delay = 30 examine = "Is it a spider or is it a shadow?" drop_table = "empty" +stab_defence = 20 +slash_defence = 15 +crush_defence = 10 +magic_defence = 15 +range_defence = 15 [skeleton_mage_waterfall_dungeon] id = 94 diff --git a/data/area/kandarin/camelot/castle/camelot_castle.npcs.toml b/data/area/kandarin/camelot/castle/camelot_castle.npcs.toml index 467db888f0..793809b66d 100644 --- a/data/area/kandarin/camelot/castle/camelot_castle.npcs.toml +++ b/data/area/kandarin/camelot/castle/camelot_castle.npcs.toml @@ -52,6 +52,8 @@ attack_bonus = 20 xp_bonus = 0.5 hunt_mode = "cowardly" examine = "One of the Knights of the Round Table." +stab_defence = 15 +crush_defence = 190 [sir_gawain] id = 6172 diff --git a/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml b/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml index af273adc6c..da258ccacf 100644 --- a/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml +++ b/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml @@ -25,7 +25,6 @@ hitpoints = 600 att = 43 str = 43 def = 43 -attack_bonus = 22 max_hit_crush = 70 [ogre_boat_feldip_hills] @@ -81,6 +80,9 @@ att = 86 str = 86 def = 84 max_hit_crush = 100 +stab_defence = 10 +slash_defence = 21 +crush_defence = 16 [ogress_warrior] id = 7079 diff --git a/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.npcs.toml b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.npcs.toml index ef47218400..abeb0c0c71 100644 --- a/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.npcs.toml +++ b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.npcs.toml @@ -36,6 +36,9 @@ respawn_delay = 300 drop_table = "city_guard" examine = "Tough-looking." max_hit_crush = 90 +stab_defence = 10 +slash_defence = 21 +crush_defence = 16 [toban_gu_tanoth] id = 855 @@ -58,6 +61,9 @@ drop_table = "gorad" examine = "Big, dumb and ugly." max_hit_crush = 70 combat_def = "gorad" +stab_defence = 15 +slash_defence = 27 +crush_defence = 21 [ogre_guard_gu_tanoth] id = 858 @@ -90,6 +96,9 @@ respawn_delay = 50 drop_table = "city_guard" examine = "Tries to keep the peace." combat_def = "guard" +stab_defence = 13 +slash_defence = 24 +crush_defence = 19 [scared_skavid_gu_tanoth] id = 863 @@ -127,6 +136,9 @@ respawn_delay = 12 drop_table = "city_guard" examine = "Big and ugly looking." combat_def = "guard" +stab_defence = 13 +slash_defence = 24 +crush_defence = 19 [ogre_trader_gu_tanoth] id = 873 diff --git a/data/area/kandarin/fishing_guild/fishing_guild.npcs.toml b/data/area/kandarin/fishing_guild/fishing_guild.npcs.toml index fb89e341e1..a1462cef29 100644 --- a/data/area/kandarin/fishing_guild/fishing_guild.npcs.toml +++ b/data/area/kandarin/fishing_guild/fishing_guild.npcs.toml @@ -10,6 +10,11 @@ drop_table = "goblin" combat_def = "goblin" hitpoints = 50 max_hit_crush = 10 +stab_defence = -15 +slash_defence = -15 +crush_defence = -15 +magic_defence = -15 +range_defence = -15 [goblin_fishing_guild_2] id = 4273 @@ -19,6 +24,11 @@ drop_table = "goblin" combat_def = "goblin" hitpoints = 50 max_hit_crush = 10 +stab_defence = -15 +slash_defence = -15 +crush_defence = -15 +magic_defence = -15 +range_defence = -15 [goblin_fishing_guild_3] id = 4274 @@ -28,6 +38,11 @@ drop_table = "goblin" combat_def = "goblin" hitpoints = 50 max_hit_crush = 10 +stab_defence = -15 +slash_defence = -15 +crush_defence = -15 +magic_defence = -15 +range_defence = -15 [goblin_fishing_guild_4] id = 4275 @@ -37,6 +52,11 @@ drop_table = "goblin" combat_def = "goblin" hitpoints = 50 max_hit_crush = 10 +stab_defence = -15 +slash_defence = -15 +crush_defence = -15 +magic_defence = -15 +range_defence = -15 [goblin_fishing_guild_5] id = 4276 @@ -46,6 +66,11 @@ drop_table = "goblin" combat_def = "goblin" hitpoints = 50 max_hit_crush = 10 +stab_defence = -15 +slash_defence = -15 +crush_defence = -15 +magic_defence = -15 +range_defence = -15 [roachey] id = 592 diff --git a/data/area/kandarin/hazelmeres_island/hazelmeres_island.npcs.toml b/data/area/kandarin/hazelmeres_island/hazelmeres_island.npcs.toml index 1311ef60d7..04ffcedce6 100644 --- a/data/area/kandarin/hazelmeres_island/hazelmeres_island.npcs.toml +++ b/data/area/kandarin/hazelmeres_island/hazelmeres_island.npcs.toml @@ -13,6 +13,11 @@ respawn_delay = 30 examine = "A barely visible deadly jungle spider." drop_table = "jungle_spider" combat_def = "jungle_spider_ape_atoll" +stab_defence = 20 +slash_defence = 20 +crush_defence = 10 +magic_defence = 17 +range_defence = 20 [larry_hazelmeres_island] id = 7576 diff --git a/data/area/kandarin/legends_guild/dungeon/legends_guild_dungeon.npcs.toml b/data/area/kandarin/legends_guild/dungeon/legends_guild_dungeon.npcs.toml index f4dca3dc85..626ad8f164 100644 --- a/data/area/kandarin/legends_guild/dungeon/legends_guild_dungeon.npcs.toml +++ b/data/area/kandarin/legends_guild/dungeon/legends_guild_dungeon.npcs.toml @@ -14,3 +14,8 @@ categories = ["shadow_warriors"] respawn_delay = 30 drop_table = "shadow_warrior" examine = "A fighter from the supernatural world. He's a shadow of his former self." +stab_defence = 43 +slash_defence = 31 +crush_defence = 19 +magic_defence = 15 +range_defence = 38 diff --git a/data/area/kandarin/ourania/ourania.npcs.toml b/data/area/kandarin/ourania/ourania.npcs.toml index 06b6407085..ce690d5f75 100644 --- a/data/area/kandarin/ourania/ourania.npcs.toml +++ b/data/area/kandarin/ourania/ourania.npcs.toml @@ -12,6 +12,10 @@ hunt_mode = "aggressive" hunt_range = 2 examine = "A cave dweller." drop_table = "cave_lizard" +stab_defence = 5 +slash_defence = 15 +crush_defence = 15 +range_defence = 5 [zamorak_warrior_kite] id = 6363 diff --git a/data/area/kandarin/piscatoris/piscatoris.npcs.toml b/data/area/kandarin/piscatoris/piscatoris.npcs.toml index 691d9c6729..515f9f9e48 100644 --- a/data/area/kandarin/piscatoris/piscatoris.npcs.toml +++ b/data/area/kandarin/piscatoris/piscatoris.npcs.toml @@ -45,6 +45,7 @@ respawn_delay = 50 examine = "Doesn't seem to want to go away." drop_table = "skeleton_mage" combat_def = "skeleton_mage" +magic_defence = 15 [brian_twitcher] id = 8579 diff --git a/data/area/kandarin/port_khazard/fight_arena/khazard_fight_arena.npcs.toml b/data/area/kandarin/port_khazard/fight_arena/khazard_fight_arena.npcs.toml index 2208317ac0..8107a4c11f 100644 --- a/data/area/kandarin/port_khazard/fight_arena/khazard_fight_arena.npcs.toml +++ b/data/area/kandarin/port_khazard/fight_arena/khazard_fight_arena.npcs.toml @@ -117,6 +117,9 @@ id = 7528 clone = "khazard_3" drop_table = "khazard_guard" combat_def = "guard" +stab_defence = 44 +slash_defence = 38 +crush_defence = 30 [lazy_khazard] id = 7550 diff --git a/data/area/kandarin/port_khazard/movarios_base/movarios_base.npcs.toml b/data/area/kandarin/port_khazard/movarios_base/movarios_base.npcs.toml index b27275978d..cb99c03431 100644 --- a/data/area/kandarin/port_khazard/movarios_base/movarios_base.npcs.toml +++ b/data/area/kandarin/port_khazard/movarios_base/movarios_base.npcs.toml @@ -33,4 +33,7 @@ id = 8440 clone = "elite_khazard_guard_movarios_base" drop_table = "elite_khazard_guard" combat_def = "guard" +stab_defence = 44 +slash_defence = 38 +crush_defence = 30 diff --git a/data/area/kandarin/ranging_guild/ranging_guild.npcs.toml b/data/area/kandarin/ranging_guild/ranging_guild.npcs.toml index 11573e364f..f6b18bd28a 100644 --- a/data/area/kandarin/ranging_guild/ranging_guild.npcs.toml +++ b/data/area/kandarin/ranging_guild/ranging_guild.npcs.toml @@ -84,6 +84,8 @@ max_hit_range = 40 ranged_strength = 16 hunt_mode = "aggressive" examine = "Defender of the north tower." +magic_defence = 6 +range_defence = 12 [tower_archer_east] id = 689 @@ -101,6 +103,8 @@ max_hit_range = 70 ranged_strength = 22 hunt_mode = "aggressive" examine = "Defender of the east tower." +magic_defence = 24 +range_defence = 40 [tower_archer_south] id = 690 @@ -118,6 +122,8 @@ max_hit_range = 100 ranged_strength = 31 hunt_mode = "aggressive" examine = "Defender of the south tower." +magic_defence = 20 +range_defence = 45 [tower_archer_west] id = 691 @@ -135,3 +141,5 @@ max_hit_range = 160 ranged_strength = 49 hunt_mode = "aggressive" examine = "Defender of the west tower." +magic_defence = 34 +range_defence = 66 diff --git a/data/area/kandarin/temple_of_ikov/temple_of_ikov.npcs.toml b/data/area/kandarin/temple_of_ikov/temple_of_ikov.npcs.toml index 05a9a79fc5..2a5ad22054 100644 --- a/data/area/kandarin/temple_of_ikov/temple_of_ikov.npcs.toml +++ b/data/area/kandarin/temple_of_ikov/temple_of_ikov.npcs.toml @@ -33,6 +33,11 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 +stab_defence = 9 +slash_defence = 11 +crush_defence = -2 +magic_defence = 1 +range_defence = 4 [ice_spider] id = 64 @@ -49,6 +54,11 @@ respawn_delay = 30 examine = "I think this spider has been magically modified." drop_table = "ice_spider" combat_def = "giant_spider" +stab_defence = 20 +slash_defence = 17 +crush_defence = 12 +magic_defence = 13 +range_defence = 13 [fire_warrior_of_lesarkus] id = 277 diff --git a/data/area/kandarin/tower_of_life/tower_of_life.npcs.toml b/data/area/kandarin/tower_of_life/tower_of_life.npcs.toml index e67d9f26fb..d6ba8f7924 100644 --- a/data/area/kandarin/tower_of_life/tower_of_life.npcs.toml +++ b/data/area/kandarin/tower_of_life/tower_of_life.npcs.toml @@ -11,6 +11,7 @@ respawn_delay = 50 examine = "An evil user of Magic powers." drop_table = "invrigar_the_necromancer" max_hit_crush = 30 +magic_defence = 3 [necromancer] id = 194 diff --git a/data/area/kandarin/tree_gnome_stronghold/training_camp/combat_training_camp.npcs.toml b/data/area/kandarin/tree_gnome_stronghold/training_camp/combat_training_camp.npcs.toml index 22106e049d..bb587768a3 100644 --- a/data/area/kandarin/tree_gnome_stronghold/training_camp/combat_training_camp.npcs.toml +++ b/data/area/kandarin/tree_gnome_stronghold/training_camp/combat_training_camp.npcs.toml @@ -15,6 +15,9 @@ examine = "Big, ugly, and smelly." drop_table = "ogre" combat_def = "ogre" max_hit_crush = 70 +stab_defence = 19 +slash_defence = 23 +crush_defence = 24 [guard_combat_training_camp] id = 344 diff --git a/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.npcs.toml b/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.npcs.toml index 045741c389..e7d2a05710 100644 --- a/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.npcs.toml +++ b/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.npcs.toml @@ -28,6 +28,11 @@ attack_bonus = -42 respawn_delay = 50 drop_table = "bones" examine = "Small, even by gnome standards." +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [gnome_child_2] id = 160 @@ -60,6 +65,10 @@ combat_def = "gnome_guard" respawn_delay = 30 drop_table = "bones" examine = "A tree gnome guard." +stab_defence = 8 +slash_defence = 9 +crush_defence = 7 +range_defence = 8 [gnome_woman] id = 168 @@ -69,6 +78,11 @@ attack_bonus = -42 respawn_delay = 50 drop_table = "bones" examine = "A female gnome." +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [gnome_woman_2] id = 169 @@ -91,6 +105,11 @@ categories = ["birds"] respawn_delay = 30 examine = "These gnomes know how to get around!" drop_table = "mounted_terrorbird_gnome" +stab_defence = 16 +slash_defence = 16 +crush_defence = 18 +magic_defence = 15 +range_defence = 10 [bolongo] id = 2343 @@ -158,6 +177,11 @@ combat_def = "gnome" respawn_delay = 30 examine = "It's a tree gnome trooper." drop_table = "gnome_troop" +stab_defence = 3 +slash_defence = 4 +crush_defence = 5 +magic_defence = 2 +range_defence = 4 [gnome_troop_2] id = 480 @@ -166,6 +190,11 @@ combat_def = "gnome_guard" hitpoints = 30 attack_bonus = 2 max_hit_range = 10 +stab_defence = 3 +slash_defence = 4 +crush_defence = 5 +magic_defence = 2 +range_defence = 4 [gnome_baller] id = 621 diff --git a/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.npcs.toml b/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.npcs.toml index b694390251..f91781126a 100644 --- a/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.npcs.toml +++ b/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.npcs.toml @@ -17,6 +17,9 @@ respawn_delay = 50 drop_table = "mountain_troll" examine = "Small for a troll but mean and ugly." combat_def = "ice_troll" +crush_defence = 10 +magic_defence = 200 +range_defence = 200 [mountain_troll_troll_stronghold_tunnels_2] id = 1107 @@ -74,6 +77,11 @@ drop_table = "rock_troll" examine = "One of the troll generals." combat_def = "ice_troll" max_hit_slash = 380 +stab_defence = 35 +slash_defence = 60 +crush_defence = 35 +magic_defence = 200 +range_defence = 200 [troll_general_troll_stronghold_tunnels_2] id = 1116 @@ -87,6 +95,11 @@ str = 140 def = 40 attack_bonus = 60 max_hit_slash = 380 +stab_defence = 35 +slash_defence = 60 +crush_defence = 35 +magic_defence = 200 +range_defence = 200 [troll_general_troll_stronghold_tunnels_3] id = 1117 @@ -100,6 +113,11 @@ str = 140 def = 40 attack_bonus = 60 max_hit_slash = 380 +stab_defence = 35 +slash_defence = 60 +crush_defence = 35 +magic_defence = 200 +range_defence = 200 [twig_troll_stronghold_tunnels] id = 1128 @@ -119,6 +137,9 @@ drop_table = "mountain_troll" examine = "He's guarding the cells." max_hit_crush = 130 combat_def = "twig" +crush_defence = 10 +magic_defence = 200 +range_defence = 200 [berry_troll_awake] id = 1127 @@ -140,6 +161,9 @@ drop_table = "mountain_troll" examine = "He's guarding the cells." max_hit_crush = 130 combat_def = "berry" +crush_defence = 10 +magic_defence = 200 +range_defence = 200 [cook_troll_stronghold_tunnels] id = 1135 @@ -172,6 +196,9 @@ respawn_delay = 50 examine = "Small for a troll, but mean and ugly." drop_table = "mountain_troll" combat_def = "ice_troll" +crush_defence = 10 +magic_defence = 200 +range_defence = 200 [guard_troll_stronghold_tunnels] id = 1142 @@ -226,6 +253,11 @@ hunt_mode = "cowardly" slayer_xp = 150.5 categories = ["trolls"] examine = "A massive, scary-looking troll." +stab_defence = 35 +slash_defence = 60 +crush_defence = 35 +magic_defence = 200 +range_defence = 200 [my_arm_troll_stronghold_tunnels] id = 4950 diff --git a/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.npcs.toml b/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.npcs.toml index d2f1116231..17f35d5b9c 100644 --- a/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.npcs.toml +++ b/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.npcs.toml @@ -14,6 +14,11 @@ categories = ["chaos_druids"] respawn_delay = 50 examine = "A crazy evil druid." combat_def = "guard" +stab_defence = 13 +slash_defence = 17 +crush_defence = 14 +magic_defence = -4 +range_defence = 14 [salarin_the_twisted] id = 205 diff --git a/data/area/kandarin/yanille/yanille.npcs.toml b/data/area/kandarin/yanille/yanille.npcs.toml index 7f3a064ae3..dfa326ac88 100644 --- a/data/area/kandarin/yanille/yanille.npcs.toml +++ b/data/area/kandarin/yanille/yanille.npcs.toml @@ -33,6 +33,11 @@ respawn_delay = 50 examine = "Watches stuff. But who watches him?" drop_table = "watchman" max_hit_crush = 40 +stab_defence = 24 +slash_defence = 14 +crush_defence = 19 +magic_defence = -4 +range_defence = 16 [soldier_yanille] id = 35 @@ -48,6 +53,11 @@ respawn_delay = 50 drop_table = "soldier_yanille" examine = "A soldier of the town of Yanille." combat_def = "guard" +stab_defence = 24 +slash_defence = 14 +crush_defence = 19 +magic_defence = -4 +range_defence = 16 [professor_imblewyn] id = 4586 diff --git a/data/area/karamja/brimhaven/brimhaven.npcs.toml b/data/area/karamja/brimhaven/brimhaven.npcs.toml index 3ebfbf7c98..3b87042a2e 100644 --- a/data/area/karamja/brimhaven/brimhaven.npcs.toml +++ b/data/area/karamja/brimhaven/brimhaven.npcs.toml @@ -113,6 +113,8 @@ str = 21 def = 21 attack_bonus = 8 max_hit_slash = 30 +stab_defence = 3 +slash_defence = 2 [pirate_brimhaven_5] id = 6350 @@ -151,6 +153,9 @@ respawn_delay = 50 examine = "Looks like he's been in the wars..." drop_table = "grip" max_hit_slash = 30 +stab_defence = 16 +slash_defence = 27 +crush_defence = 22 [alfonse_the_waiter_brimhaven] id = 793 diff --git a/data/area/karamja/crandor/crandor.npcs.toml b/data/area/karamja/crandor/crandor.npcs.toml index fe8901f624..96e29194fb 100644 --- a/data/area/karamja/crandor/crandor.npcs.toml +++ b/data/area/karamja/crandor/crandor.npcs.toml @@ -18,4 +18,9 @@ categories = ["green_dragons"] respawn_delay = 50 examine = "Roar! A dragon!" drop_table = "empty" -max_hit_slash = 80 \ No newline at end of file +max_hit_slash = 80 +stab_defence = 20 +slash_defence = 40 +crush_defence = 40 +magic_defence = 30 +range_defence = 20 \ No newline at end of file diff --git a/data/area/karamja/karamja.npcs.toml b/data/area/karamja/karamja.npcs.toml index 24d1f9be3d..dd5e0f0dcc 100644 --- a/data/area/karamja/karamja.npcs.toml +++ b/data/area/karamja/karamja.npcs.toml @@ -48,6 +48,11 @@ slayer_xp = 25.0 categories = ["harpie_bug_swarms"] respawn_delay = 25 examine = "A swarm of bugs." +stab_defence = 10 +slash_defence = 5 +crush_defence = 10 +magic_defence = 5 +range_defence = 10 [frog_karamja] id = 3783 @@ -60,6 +65,11 @@ str = 47 def = 92 max_hit_crush = 61 combat_def = "frog" +stab_defence = 12 +slash_defence = 22 +crush_defence = 12 +magic_defence = 12 +range_defence = 32 [jungle_forester] id = 401 @@ -105,6 +115,11 @@ respawn_delay = 30 drop_table = "jungle_spider" examine = "A barely visible deadly jungle spider." combat_def = "jungle_spider_ape_atoll" +stab_defence = 60 +slash_defence = 40 +crush_defence = 10 +magic_defence = 17 +range_defence = 30 [jungle_spider_karamja_2] id = 6377 @@ -121,6 +136,11 @@ att = 105 str = 105 def = 1 max_hit_stab = 119 +stab_defence = 42 +slash_defence = 42 +crush_defence = 32 +magic_defence = 12 +range_defence = 12 [giant_ant_worker] id = 6379 @@ -132,6 +152,11 @@ def = 50 combat_def = "giant_ant" examine = "I wonder how much he can lift." drop_table = "giant_ant_worker" +stab_defence = 75 +slash_defence = 62 +crush_defence = 32 +magic_defence = 12 +range_defence = 62 [giant_ant_soldier] id = 6380 @@ -145,6 +170,11 @@ combat_def = "giant_ant" max_hit_crush = 130 examine = "Gi-ant-ant-ant-ant..." drop_table = "giant_ant_soldier" +stab_defence = 75 +slash_defence = 62 +crush_defence = 32 +magic_defence = 12 +range_defence = 62 [giant_wasp] id = 6381 @@ -155,6 +185,11 @@ att = 36 str = 36 def = 132 max_hit_crush = 50 +stab_defence = 75 +slash_defence = 62 +crush_defence = 32 +magic_defence = 12 +range_defence = 52 [pernicious_parrot] id = 6382 @@ -166,6 +201,11 @@ att = 105 str = 105 def = 1 max_hit_stab = 119 +stab_defence = 42 +slash_defence = 42 +crush_defence = 32 +magic_defence = 12 +range_defence = 12 [giant_wasp_2] id = 6383 @@ -176,6 +216,11 @@ str = 36 def = 132 max_hit_crush = 50 combat_def = "giant_wasp" +stab_defence = 82 +slash_defence = 62 +crush_defence = 32 +magic_defence = 12 +range_defence = 52 [karamjan_jungle_eagle] id = 6387 @@ -255,6 +300,9 @@ respawn_delay = 50 examine = "A vicious warrior." drop_table = "tribesman" max_hit_stab = 40 +stab_defence = 4 +slash_defence = 6 +crush_defence = 6 [tinsay_karamja_2] id = 1165 diff --git a/data/area/karamja/kharazi_jungle/caves/kharazi_caves.npcs.toml b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.npcs.toml index 82187efc31..b6041b3574 100644 --- a/data/area/karamja/kharazi_jungle/caves/kharazi_caves.npcs.toml +++ b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.npcs.toml @@ -34,6 +34,11 @@ respawn_delay = 50 examine = "A minion of Rashiliyia." drop_table = "undead_one" combat_def = "zombie" +stab_defence = 5 +slash_defence = 5 +crush_defence = 3 +magic_defence = 1 +range_defence = 4 [undead_one_kharazi_caves_3] id = 5353 @@ -114,6 +119,11 @@ examine = "The spirit of a long-dead warrior." drop_table = "san_tojalon" max_hit_stab = 120 combat_def = "san_tojalon" +stab_defence = 18 +slash_defence = 22 +crush_defence = 20 +magic_defence = -1 +range_defence = 20 [irvig_senay_kharazi_caves] id = 937 @@ -131,6 +141,11 @@ examine = "The spirit of a long-dead warrior." drop_table = "irvig_senay" max_hit_slash = 120 combat_def = "irvig_senay" +stab_defence = 27 +slash_defence = 31 +crush_defence = 29 +magic_defence = -1 +range_defence = 29 [ranalph_devere] id = 938 @@ -149,6 +164,10 @@ categories = ["skeletons"] examine = "The spirit of a long-dead warrior." drop_table = "empty" max_hit_slash = 130 +stab_defence = 38 +slash_defence = 40 +crush_defence = 36 +range_defence = 38 [boulder_kharazi_caves] id = 939 diff --git a/data/area/karamja/shilo_village/shilo_village.npcs.toml b/data/area/karamja/shilo_village/shilo_village.npcs.toml index 219263b03e..6685610651 100644 --- a/data/area/karamja/shilo_village/shilo_village.npcs.toml +++ b/data/area/karamja/shilo_village/shilo_village.npcs.toml @@ -125,6 +125,11 @@ hunt_mode = "cowardly" slayer_xp = 70.0 categories = ["skeletons"] examine = "A giant skeleton of huge strength and devastating power." +stab_defence = 5 +slash_defence = 5 +crush_defence = 5 +magic_defence = 5 +range_defence = 5 [nazastarool_ghost] id = 509 diff --git a/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml b/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml index 33d760e4d8..62e82987a7 100644 --- a/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml +++ b/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml @@ -294,6 +294,12 @@ att = 40 str = 40 def = 40 combat_def = "fire_elemental" +attack_bonus = 10 +stab_defence = 20 +slash_defence = 20 +crush_defence = 20 +magic_defence = 30 +range_defence = 50 [fire_monster_tzhaar_caves] id = 7773 @@ -306,6 +312,12 @@ def = 55 mage = 55 max_hit_magic = 8 combat_def = "fire_monster" +attack_bonus = 10 +stab_defence = 20 +slash_defence = 20 +crush_defence = 20 +magic_defence = 10 +range_defence = 50 [tzhaar_mej_roh] id = 2623 diff --git a/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml index 929095a58a..ea3f2481ef 100644 --- a/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml +++ b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml @@ -37,6 +37,9 @@ att = 46 str = 46 def = 250 max_hit_crush = 60 +stab_defence = 90 +slash_defence = 90 +crush_defence = 90 [mummy_agility_pyramid_2] id = 6754 @@ -47,6 +50,9 @@ att = 46 str = 46 def = 250 max_hit_crush = 60 +stab_defence = 90 +slash_defence = 90 +crush_defence = 90 [mummy_agility_pyramid_3] id = 6755 @@ -57,6 +63,9 @@ att = 46 str = 46 def = 250 max_hit_crush = 60 +stab_defence = 90 +slash_defence = 90 +crush_defence = 90 [mummy_agility_pyramid_4] id = 6756 @@ -67,6 +76,9 @@ att = 46 str = 46 def = 250 max_hit_crush = 60 +stab_defence = 90 +slash_defence = 90 +crush_defence = 90 [agility_pyramid_block] id = 3124 diff --git a/data/area/kharidian_desert/bandit_camp/bandit_camp.npcs.toml b/data/area/kharidian_desert/bandit_camp/bandit_camp.npcs.toml index 4a7ca90f07..27fc202df8 100644 --- a/data/area/kharidian_desert/bandit_camp/bandit_camp.npcs.toml +++ b/data/area/kharidian_desert/bandit_camp/bandit_camp.npcs.toml @@ -67,6 +67,8 @@ str = 17 def = 17 attack_bonus = 11 max_hit_stab = 30 +slash_defence = 3 +crush_defence = 2 [eblis_bandit_camp_2] id = 1923 diff --git a/data/area/kharidian_desert/kalphite_hive/kalphite_hive.npcs.toml b/data/area/kharidian_desert/kalphite_hive/kalphite_hive.npcs.toml index 06a6bd7150..16f1ba093a 100644 --- a/data/area/kharidian_desert/kalphite_hive/kalphite_hive.npcs.toml +++ b/data/area/kharidian_desert/kalphite_hive/kalphite_hive.npcs.toml @@ -15,12 +15,22 @@ aka = ["kq"] respawn_delay = 50 drop_table = "kalphite_queen" examine = "I don't think insect repellent will work..." +stab_defence = 50 +slash_defence = 50 +crush_defence = 10 +magic_defence = 100 +range_defence = 100 [kalphite_queen_airborne] id = 1160 clone = "kalphite_queen" combat_def = "kalphite_queen_airborne" xp_bonus = 12.5 +stab_defence = 100 +slash_defence = 100 +crush_defence = 100 +magic_defence = 10 +range_defence = 10 [kalphite_worker] id = 1153 @@ -35,6 +45,11 @@ hunt_mode = "cowardly" drop_table = "kalphite_worker" categories = ["kalphites"] examine = "I don't think insect repellent will work..." +stab_defence = 5 +slash_defence = 5 +crush_defence = 1 +magic_defence = 10 +range_defence = 10 [kalphite_soldier] id = 1154 @@ -50,6 +65,11 @@ hunt_mode = "cowardly" drop_table = "kalphite_soldier" categories = ["kalphites"] examine = "I don't think insect repellent will work..." +stab_defence = 25 +slash_defence = 25 +crush_defence = 5 +magic_defence = 50 +range_defence = 50 [kalphite_guardian] id = 1155 @@ -64,6 +84,11 @@ hunt_mode = "cowardly" drop_table = "kalphite_guardian" categories = ["kalphites"] examine = "I don't think insect repellent will work..." +stab_defence = 25 +slash_defence = 25 +crush_defence = 5 +magic_defence = 50 +range_defence = 50 [kalphite_guardian_2] id = 1157 @@ -87,6 +112,11 @@ str = 20 def = 20 attack_bonus = 10 max_hit_crush = 40 +stab_defence = 10 +slash_defence = 10 +crush_defence = -21 +magic_defence = -21 +range_defence = 10 [goat_2] id = 4934 @@ -97,4 +127,9 @@ str = 20 def = 20 attack_bonus = 10 max_hit_crush = 40 -combat_def = "goat" \ No newline at end of file +combat_def = "goat" +stab_defence = 10 +slash_defence = 10 +crush_defence = -21 +magic_defence = -21 +range_defence = 10 \ No newline at end of file diff --git a/data/area/kharidian_desert/kharidian_desert.npcs.toml b/data/area/kharidian_desert/kharidian_desert.npcs.toml index 74d5e15e56..0f8176e26e 100644 --- a/data/area/kharidian_desert/kharidian_desert.npcs.toml +++ b/data/area/kharidian_desert/kharidian_desert.npcs.toml @@ -68,6 +68,11 @@ categories = ["crocodiles"] respawn_delay = 40 examine = "Never smile at a..." drop_table = "crocodile" +stab_defence = 20 +slash_defence = 12 +crush_defence = 22 +magic_defence = 10 +range_defence = 20 [wanderer_kharidian_desert] id = 2002 @@ -93,6 +98,11 @@ attack_bonus = 10 respawn_delay = 50 drop_table = "billy_goat" examine = "They'll eat anything!" +stab_defence = 10 +slash_defence = 10 +crush_defence = -21 +magic_defence = -21 +range_defence = 10 [goat_kharidian_desert_2] id = 4931 @@ -111,6 +121,11 @@ respawn_delay = 50 drop_table = "billy_goat" examine = "They'll eat anything!" max_hit_crush = 60 +stab_defence = 10 +slash_defence = 10 +crush_defence = 10 +magic_defence = -21 +range_defence = 10 [osman_kharidian_desert] id = 5283 diff --git a/data/area/kharidian_desert/klenters_pyramid/klenters_pyramid.npcs.toml b/data/area/kharidian_desert/klenters_pyramid/klenters_pyramid.npcs.toml index a0d90deb12..f737245195 100644 --- a/data/area/kharidian_desert/klenters_pyramid/klenters_pyramid.npcs.toml +++ b/data/area/kharidian_desert/klenters_pyramid/klenters_pyramid.npcs.toml @@ -26,30 +26,43 @@ categories = ["zombies"] examine = "This mummy looks like it means business!" drop_table = "mummy" combat_def = "mummy" +stab_defence = 90 +slash_defence = 90 +crush_defence = 90 +magic_defence = 15 [mummy_klenters_pyramid_2] id = 2016 clone = "mummy_klenters_pyramid" drop_table = "mummy" combat_def = "mummy" +slash_defence = 30 +magic_defence = 90 [mummy_klenters_pyramid_3] id = 2017 clone = "mummy_klenters_pyramid" drop_table = "mummy" combat_def = "mummy" +stab_defence = 30 +magic_defence = 95 [mummy_klenters_pyramid_4] id = 2018 clone = "mummy_klenters_pyramid" drop_table = "mummy" combat_def = "mummy" +crush_defence = 30 +magic_defence = 90 [mummy_klenters_pyramid_5] id = 2019 clone = "mummy_klenters_pyramid" drop_table = "mummy" combat_def = "mummy" +stab_defence = 50 +crush_defence = 50 +magic_defence = 90 [high_priest_klenters_pyramid_2] id = 1986 @@ -70,6 +83,9 @@ style = "melee" style = "crush" max_hit_melee = 10 examine = "Highly flammable!" +stab_defence = 100 +slash_defence = 100 +crush_defence = 100 [mummy_level_98] id = 1959 diff --git a/data/area/kharidian_desert/mining_camp/desert_mining_camp.npcs.toml b/data/area/kharidian_desert/mining_camp/desert_mining_camp.npcs.toml index 8bcf2fa402..c5ca943275 100644 --- a/data/area/kharidian_desert/mining_camp/desert_mining_camp.npcs.toml +++ b/data/area/kharidian_desert/mining_camp/desert_mining_camp.npcs.toml @@ -99,6 +99,11 @@ str = 18 def = 14 attack_bonus = 4 max_hit_stab = 30 +stab_defence = 17 +slash_defence = 15 +crush_defence = 19 +magic_defence = -3 +range_defence = 19 [guard_desert_mining_camp_5] id = 4997 diff --git a/data/area/kharidian_desert/nardah/nardah.npcs.toml b/data/area/kharidian_desert/nardah/nardah.npcs.toml index e89874a5e8..48c946da55 100644 --- a/data/area/kharidian_desert/nardah/nardah.npcs.toml +++ b/data/area/kharidian_desert/nardah/nardah.npcs.toml @@ -112,6 +112,11 @@ examine = "They'll eat anything!" drop_table = "billy_goat" max_hit_crush = 60 combat_def = "billy_goat" +stab_defence = 10 +slash_defence = 10 +crush_defence = -21 +magic_defence = -21 +range_defence = 10 [artimeus] id = 5109 diff --git a/data/area/kharidian_desert/pollnivneach/pollnivneach.npcs.toml b/data/area/kharidian_desert/pollnivneach/pollnivneach.npcs.toml index 87267b09ae..ea086eb87e 100644 --- a/data/area/kharidian_desert/pollnivneach/pollnivneach.npcs.toml +++ b/data/area/kharidian_desert/pollnivneach/pollnivneach.npcs.toml @@ -28,6 +28,9 @@ attack_bonus = 9 respawn_delay = 50 drop_table = "bones" examine = "Tough-looking." +stab_defence = 9 +slash_defence = 8 +crush_defence = 10 [cowardly_bandit_pollnivneach] id = 1886 @@ -54,6 +57,9 @@ attack_bonus = 4 respawn_delay = 5 drop_table = "bones" examine = "Menaphite thug." +stab_defence = 9 +slash_defence = 8 +crush_defence = 10 [aristarchus_pollnivneach] id = 3127 diff --git a/data/area/kharidian_desert/rock_island_prison/rock_island_prison.npcs.toml b/data/area/kharidian_desert/rock_island_prison/rock_island_prison.npcs.toml index 4aa95d0713..5f85935dc5 100644 --- a/data/area/kharidian_desert/rock_island_prison/rock_island_prison.npcs.toml +++ b/data/area/kharidian_desert/rock_island_prison/rock_island_prison.npcs.toml @@ -7,6 +7,11 @@ id = 1400 drop_table = "bones" combat_def = "seagull" hitpoints = 30 +stab_defence = 20 +slash_defence = 10 +crush_defence = 16 +magic_defence = 8 +range_defence = 4 [customs_officer] id = 7837 diff --git a/data/area/kharidian_desert/sophanem/sophanem_dungeon/sophanem_dungeon.npcs.toml b/data/area/kharidian_desert/sophanem/sophanem_dungeon/sophanem_dungeon.npcs.toml index 39340a281f..2ebfdf2f4c 100644 --- a/data/area/kharidian_desert/sophanem/sophanem_dungeon/sophanem_dungeon.npcs.toml +++ b/data/area/kharidian_desert/sophanem/sophanem_dungeon/sophanem_dungeon.npcs.toml @@ -19,6 +19,10 @@ hunt_mode = "cowardly" slayer_xp = 51.2 categories = ["scabarites"] examine = "Part scarab, part human." +attack_bonus = 70 +slash_defence = 90 +crush_defence = 90 +magic_defence = 34 [scarab_mage_sophanem_dungeon] id = 5250 @@ -36,6 +40,11 @@ categories = ["scabarites"] respawn_delay = 50 examine = "Part scarab, part human." drop_table = "scarab_mage" +attack_bonus = 70 +stab_defence = 40 +slash_defence = 90 +crush_defence = 90 +magic_defence = 34 [locust_rider_sophanem_dungeon] id = 5251 @@ -51,6 +60,9 @@ categories = ["scabarites"] respawn_delay = 7 drop_table = "locust_rider" examine = "A mounted lancer." +stab_defence = 90 +slash_defence = 90 +crush_defence = 40 [locust_rider_sophanem_dungeon_2] id = 5252 @@ -73,6 +85,12 @@ categories = ["scabarites"] drop_table = "locust_rider" examine = "A mounted archer." combat_def = "locust_rider" +attack_bonus = 80 +stab_defence = 50 +slash_defence = 90 +crush_defence = 50 +magic_defence = 34 +range_defence = 66 [maisa_sophanem_dungeon] id = 5280 @@ -91,6 +109,11 @@ hunt_mode = "cowardly" slayer_xp = 1.0 categories = ["scabarites"] examine = "I think they're some kind of beetle." +stab_defence = 90 +slash_defence = 90 +crush_defence = 5 +magic_defence = 90 +range_defence = 90 [scarab_swarm_pyramid_plunder] id = 4500 @@ -107,3 +130,8 @@ hunt_mode = "cowardly" slayer_xp = 1.0 categories = ["scabarites"] examine = "I think they're some kind of beetle..." +stab_defence = 15 +slash_defence = 15 +crush_defence = 15 +magic_defence = 15 +range_defence = 15 diff --git a/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml index 7150b48e1e..0c02af478e 100644 --- a/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml +++ b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml @@ -19,6 +19,10 @@ str = 1 def = 96 range = 116 max_hit_range = 130 +slash_defence = 20 +crush_defence = 20 +magic_defence = 4 +range_defence = 26 [scabaras_lancer] id = 6774 @@ -30,6 +34,8 @@ att = 116 str = 116 def = 56 max_hit_crush = 130 +stab_defence = 30 +slash_defence = 30 [scabaras_mage_scabaras_dungeon] id = 6780 @@ -43,6 +49,8 @@ def = 109 mage = 109 max_hit_magic = 104 combat_def = "scabaras_mage" +slash_defence = 90 +crush_defence = 90 [scabaras_mage_scabaras_dungeon_2] id = 6781 @@ -54,6 +62,10 @@ def = 96 mage = 96 max_hit_magic = 104 combat_def = "scabaras_mage" +attack_bonus = 70 +slash_defence = 90 +crush_defence = 90 +magic_defence = 34 [clay_golem_scabaras_dungeon] id = 6785 diff --git a/data/area/kharidian_desert/ullek/ullek.npcs.toml b/data/area/kharidian_desert/ullek/ullek.npcs.toml index b25ec3ece2..aa2fb6e049 100644 --- a/data/area/kharidian_desert/ullek/ullek.npcs.toml +++ b/data/area/kharidian_desert/ullek/ullek.npcs.toml @@ -43,6 +43,11 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 +stab_defence = 9 +slash_defence = 11 +crush_defence = -2 +magic_defence = 1 +range_defence = 4 [skeleton_ullek_2] id = 6765 @@ -53,6 +58,11 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 +stab_defence = 9 +slash_defence = 11 +crush_defence = -2 +magic_defence = 1 +range_defence = 4 [skeleton_ullek_3] id = 6766 @@ -63,6 +73,11 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 +stab_defence = 9 +slash_defence = 11 +crush_defence = -2 +magic_defence = 1 +range_defence = 4 [skeleton_ullek_4] id = 6767 @@ -73,6 +88,11 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 +stab_defence = 9 +slash_defence = 11 +crush_defence = -2 +magic_defence = 1 +range_defence = 4 [skeleton_ullek_5] id = 6768 @@ -85,6 +105,11 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 +stab_defence = 9 +slash_defence = 11 +crush_defence = -2 +magic_defence = 1 +range_defence = 4 [scabaras_locust_ullek] id = 6776 @@ -107,6 +132,8 @@ str = 106 def = 69 max_hit_crush = 120 combat_def = "locust_lancer" +stab_defence = 20 +slash_defence = 20 [locust_ranger_ullek] id = 6778 @@ -120,6 +147,8 @@ def = 1 range = 196 max_hit_range = 210 combat_def = "locust_ranger" +slash_defence = 20 +range_defence = 6 [crocodile_ullek] id = 6779 diff --git a/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml b/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml index 2918959da8..00b9334546 100644 --- a/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml +++ b/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml @@ -8,6 +8,7 @@ att = 36 str = 36 def = 19 max_hit_crush = 50 +crush_defence = 1 [golems_remains_uzer_mastaba] id = 7498 diff --git a/data/area/misthalin/barbarian_village/barbarian_village.npcs.toml b/data/area/misthalin/barbarian_village/barbarian_village.npcs.toml index 5ca78b2638..9b47be2f82 100644 --- a/data/area/misthalin/barbarian_village/barbarian_village.npcs.toml +++ b/data/area/misthalin/barbarian_village/barbarian_village.npcs.toml @@ -143,11 +143,19 @@ examine = "Acelin, a guard in the Barbarian Village." id = 3257 clone = "barbarian_hagen" examine = "Adelino, a barbarian warrior with a big axe." +slash_defence = 3 +crush_defence = 2 +magic_defence = -3 +range_defence = 2 [barbarian_adolpho] id = 3258 clone = "barbarian_wotan" examine = "Adolpho, a barbarian warrior with a warhammer." +slash_defence = 3 +crush_defence = 2 +magic_defence = -3 +range_defence = 2 [barbarian_aitan] id = 3259 diff --git a/data/area/misthalin/barbarian_village/stronghold_of_player_safety/stronghold_of_player_safety.npcs.toml b/data/area/misthalin/barbarian_village/stronghold_of_player_safety/stronghold_of_player_safety.npcs.toml index 196c135c78..34d9753861 100644 --- a/data/area/misthalin/barbarian_village/stronghold_of_player_safety/stronghold_of_player_safety.npcs.toml +++ b/data/area/misthalin/barbarian_village/stronghold_of_player_safety/stronghold_of_player_safety.npcs.toml @@ -41,6 +41,11 @@ examine = "Eurgh! A big bug." respawn_delay = 60 combat_def = "cockroach_worker" drop_table = "cockroach_worker" +stab_defence = 38 +slash_defence = 25 +crush_defence = 30 +magic_defence = 30 +range_defence = 50 [cockroach_soldier] id = 7160 @@ -54,6 +59,11 @@ examine = "Euww! A giant bug." respawn_delay = 60 drop_table = "cockroach_soldier" combat_def = "cockroach_soldier" +stab_defence = 32 +slash_defence = 55 +crush_defence = 45 +magic_defence = 50 +range_defence = 60 [mugger_stronghold_of_player_safety] id = 7161 diff --git a/data/area/misthalin/barbarian_village/stronghold_of_security/catablepon/catablepon.npcs.toml b/data/area/misthalin/barbarian_village/stronghold_of_security/catablepon/catablepon.npcs.toml index 95131f4b25..be1572e438 100644 --- a/data/area/misthalin/barbarian_village/stronghold_of_security/catablepon/catablepon.npcs.toml +++ b/data/area/misthalin/barbarian_village/stronghold_of_security/catablepon/catablepon.npcs.toml @@ -12,6 +12,11 @@ hunt_mode = "cowardly" drop_table = "catablepon" categories = ["catablepons"] examine = "Big... Cow-like... But cows don't have serpent tails!" +stab_defence = 40 +slash_defence = 30 +crush_defence = 20 +magic_defence = 20 +range_defence = 40 [catablepon_mid] id = 4398 @@ -22,6 +27,11 @@ str = 50 def = 50 mage = 45 slayer_xp = 70.0 +stab_defence = 50 +slash_defence = 40 +crush_defence = 30 +magic_defence = 30 +range_defence = 50 [catablepon_high] id = 4399 @@ -33,3 +43,8 @@ str = 60 def = 60 mage = 60 slayer_xp = 50.0 +stab_defence = 50 +slash_defence = 40 +crush_defence = 30 +magic_defence = 30 +range_defence = 50 diff --git a/data/area/misthalin/barbarian_village/stronghold_of_security/flesh_crawler/flesh_crawler.npcs.toml b/data/area/misthalin/barbarian_village/stronghold_of_security/flesh_crawler/flesh_crawler.npcs.toml index 924e1f2073..3457ce9e97 100644 --- a/data/area/misthalin/barbarian_village/stronghold_of_security/flesh_crawler/flesh_crawler.npcs.toml +++ b/data/area/misthalin/barbarian_village/stronghold_of_security/flesh_crawler/flesh_crawler.npcs.toml @@ -12,6 +12,11 @@ hunt_range = 3 drop_table = "flesh_crawler" categories = ["flesh_crawlers"] examine = "I don't think insect repellent will work..." +stab_defence = 15 +slash_defence = 15 +crush_defence = 15 +magic_defence = 15 +range_defence = 15 [flesh_crawler_2] id = 4390 diff --git a/data/area/misthalin/barbarian_village/stronghold_of_security/minotaur/minotaur.npcs.toml b/data/area/misthalin/barbarian_village/stronghold_of_security/minotaur/minotaur.npcs.toml index fe4c92a60e..f84e090ec3 100644 --- a/data/area/misthalin/barbarian_village/stronghold_of_security/minotaur/minotaur.npcs.toml +++ b/data/area/misthalin/barbarian_village/stronghold_of_security/minotaur/minotaur.npcs.toml @@ -10,6 +10,11 @@ slayer_xp = 10.0 drop_table = "minotaur" categories = ["minotaurs"] examine = "He doesn't look very pleased to see you." +stab_defence = -21 +slash_defence = -21 +crush_defence = -21 +magic_defence = -21 +range_defence = -21 [minotaur_strong] id = 4406 @@ -23,4 +28,9 @@ respawn_delay = 15 slayer_xp = 22.0 drop_table = "minotaur" categories = ["minotaurs"] -examine = "He doesn't look very pleased to see you." \ No newline at end of file +examine = "He doesn't look very pleased to see you." +stab_defence = -10 +slash_defence = -10 +crush_defence = -10 +magic_defence = 21 +range_defence = -10 \ No newline at end of file diff --git a/data/area/misthalin/dorgesh_kaan/dorgesh_kaan.npcs.toml b/data/area/misthalin/dorgesh_kaan/dorgesh_kaan.npcs.toml index 126ecd613e..812c4fb77a 100644 --- a/data/area/misthalin/dorgesh_kaan/dorgesh_kaan.npcs.toml +++ b/data/area/misthalin/dorgesh_kaan/dorgesh_kaan.npcs.toml @@ -229,6 +229,11 @@ str = 18 def = 14 attack_bonus = 4 max_hit_stab = 30 +stab_defence = 1 +slash_defence = 16 +crush_defence = 19 +magic_defence = -3 +range_defence = 12 [guard_dorgesh_kaan_2] id = 5801 @@ -242,6 +247,10 @@ str = 18 def = 14 attack_bonus = 4 max_hit_stab = 30 +slash_defence = 15 +crush_defence = 19 +magic_defence = -3 +range_defence = 12 [zanik_dorgesh_kaan_2] id = 5802 @@ -395,3 +404,8 @@ slayer_xp = 52.0 categories = ["molanisks"] drop_table = "molanisk" examine = "A strange mole-like being." +stab_defence = 45 +slash_defence = 45 +crush_defence = 35 +magic_defence = 30 +range_defence = 55 diff --git a/data/area/misthalin/draynor/draynor.npcs.toml b/data/area/misthalin/draynor/draynor.npcs.toml index 271e7e20da..17e494b7ed 100644 --- a/data/area/misthalin/draynor/draynor.npcs.toml +++ b/data/area/misthalin/draynor/draynor.npcs.toml @@ -142,6 +142,11 @@ hunt_mode = "guarding" respawn_delay = 50 examine = "He guards the Draynor Market stalls from thieves." drop_table = "market_guard" +stab_defence = 24 +slash_defence = 14 +crush_defence = 19 +magic_defence = 4 +range_defence = 16 [bank_guard_draynor] id = 2574 diff --git a/data/area/misthalin/edgeville/edgeville.npcs.toml b/data/area/misthalin/edgeville/edgeville.npcs.toml index cf3fbf2f9f..b811a3338a 100644 --- a/data/area/misthalin/edgeville/edgeville.npcs.toml +++ b/data/area/misthalin/edgeville/edgeville.npcs.toml @@ -39,6 +39,11 @@ str = 18 def = 14 attack_bonus = 4 max_hit_stab = 30 +stab_defence = 3 +slash_defence = 4 +crush_defence = 4 +magic_defence = 2 +range_defence = 3 [mysterious_ghost_edgeville] id = 2386 @@ -58,6 +63,11 @@ drop_table = "edgeville_guard" respawn_delay = 50 categories = ["human"] examine = "He tries to keep order around here." +stab_defence = 18 +slash_defence = 25 +crush_defence = 19 +magic_defence = -4 +range_defence = 20 [guard_edgeville_2] id = 297 @@ -100,6 +110,11 @@ drop_table = "ram" examine = "White and fluffy." combat_def = "ram_freds_farm" max_hit_crush = 10 +stab_defence = -21 +slash_defence = -21 +crush_defence = -21 +magic_defence = -21 +range_defence = -21 [outlaw_edgeville] id = 5842 diff --git a/data/area/misthalin/ham_hideout/ham_hideout.npcs.toml b/data/area/misthalin/ham_hideout/ham_hideout.npcs.toml index 3368d5dd22..2d1dd87e11 100644 --- a/data/area/misthalin/ham_hideout/ham_hideout.npcs.toml +++ b/data/area/misthalin/ham_hideout/ham_hideout.npcs.toml @@ -15,6 +15,9 @@ respawn_delay = 25 drop_table = "ham_guard" examine = "A guard for the humans against monster group." combat_def = "guard" +stab_defence = 5 +slash_defence = 5 +range_defence = 5 [ham_guard_ham_cave_2] id = 1711 @@ -86,6 +89,9 @@ attack_range = 8 max_hit_range = 40 hunt_mode = "cowardly" examine = "He looks pretty skilled with that bow." +stab_defence = 5 +slash_defence = 5 +range_defence = 5 [ham_mage] id = 5860 @@ -96,4 +102,8 @@ attack_speed = 6 style = "magic" max_hit_magic = 40 hunt_mode = "cowardly" -examine = "He bristles with arcane power." \ No newline at end of file +examine = "He bristles with arcane power." +attack_bonus = 8 +stab_defence = 5 +slash_defence = 5 +range_defence = 5 \ No newline at end of file diff --git a/data/area/misthalin/ham_hideout/store_rooms/ham_store_rooms.npcs.toml b/data/area/misthalin/ham_hideout/store_rooms/ham_store_rooms.npcs.toml index 84bfe66a03..6cb210cf00 100644 --- a/data/area/misthalin/ham_hideout/store_rooms/ham_store_rooms.npcs.toml +++ b/data/area/misthalin/ham_hideout/store_rooms/ham_store_rooms.npcs.toml @@ -19,7 +19,6 @@ hitpoints = 220 att = 19 str = 18 def = 14 -attack_bonus = 4 max_hit_stab = 30 [guard_ham_store_rooms_3] @@ -31,7 +30,6 @@ hitpoints = 220 att = 19 str = 18 def = 14 -attack_bonus = 4 max_hit_stab = 30 [guard_ham_store_rooms_4] @@ -43,7 +41,6 @@ hitpoints = 220 att = 19 str = 18 def = 14 -attack_bonus = 4 max_hit_stab = 30 [guard_ham_store_rooms_5] @@ -55,6 +52,5 @@ hitpoints = 220 att = 19 str = 18 def = 14 -attack_bonus = 4 max_hit_stab = 30 diff --git a/data/area/misthalin/ice_mountain/ice_mountain.npcs.toml b/data/area/misthalin/ice_mountain/ice_mountain.npcs.toml index c0c038e8fa..bcd653a9b2 100644 --- a/data/area/misthalin/ice_mountain/ice_mountain.npcs.toml +++ b/data/area/misthalin/ice_mountain/ice_mountain.npcs.toml @@ -16,6 +16,11 @@ categories = ["dwarves"] respawn_delay = 25 drop_table = "black_guard_low" examine = "A member of the Black Guard, a special division of the dwarven army." +stab_defence = 3 +slash_defence = 4 +crush_defence = 4 +magic_defence = 2 +range_defence = 3 [black_guard_2] id = 3277 diff --git a/data/area/misthalin/lumbridge/cellar/goblin_mines/goblin_mines.npcs.toml b/data/area/misthalin/lumbridge/cellar/goblin_mines/goblin_mines.npcs.toml index 10461682be..5c31d22973 100644 --- a/data/area/misthalin/lumbridge/cellar/goblin_mines/goblin_mines.npcs.toml +++ b/data/area/misthalin/lumbridge/cellar/goblin_mines/goblin_mines.npcs.toml @@ -43,6 +43,12 @@ respawn_delay = 50 drop_table = "cave_goblin_guard" examine = "He protects the miners." combat_def = "cave_goblin" +attack_bonus = 11 +stab_defence = 1 +slash_defence = 16 +crush_defence = 19 +magic_defence = -3 +range_defence = 12 [cave_goblin_guard_2] id = 2074 @@ -51,6 +57,8 @@ att = 22 str = 16 def = 22 combat_def = "cave_goblin" +attack_bonus = 16 +slash_defence = 15 [goblin_guard] id = 489 @@ -66,6 +74,9 @@ categories = ["goblins"] respawn_delay = 250 drop_table = "goblin" examine = "He doesn't look like he'd trust his own mother." +stab_defence = 4 +slash_defence = 6 +crush_defence = 6 [cave_goblin_miner_5] id = 2075 diff --git a/data/area/misthalin/lumbridge/freds_farm/freds_farm.npcs.toml b/data/area/misthalin/lumbridge/freds_farm/freds_farm.npcs.toml index 6a63653a17..ef7cd4ec80 100644 --- a/data/area/misthalin/lumbridge/freds_farm/freds_farm.npcs.toml +++ b/data/area/misthalin/lumbridge/freds_farm/freds_farm.npcs.toml @@ -15,6 +15,11 @@ drop_table = "ram" respawn_delay = 45 categories = ["rams"] examine = "White and shaggy." +stab_defence = -58 +slash_defence = -58 +crush_defence = -58 +magic_defence = -58 +range_defence = -58 [ram_freds_farm_2] id = 12370 diff --git a/data/area/misthalin/lumbridge/lumbridge.npcs.toml b/data/area/misthalin/lumbridge/lumbridge.npcs.toml index 991fdcb406..f9e61ac9d7 100644 --- a/data/area/misthalin/lumbridge/lumbridge.npcs.toml +++ b/data/area/misthalin/lumbridge/lumbridge.npcs.toml @@ -169,6 +169,11 @@ id = 7878 [lumbridge_man_7] clone = "lumbridge_man" id = 7879 +stab_defence = -58 +slash_defence = -58 +crush_defence = -58 +magic_defence = -58 +range_defence = -58 [lumbridge_woman] id = 7880 @@ -214,6 +219,11 @@ attack_bonus = 5 respawn_delay = 25 drop_table = "farmer_members" examine = "He grows the crops in this area." +stab_defence = -18 +slash_defence = -18 +crush_defence = -18 +magic_defence = -18 +range_defence = -18 [farmer_lumbridge_2] id = 1759 diff --git a/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml b/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml index 5d6b9ccc67..041a5c87c2 100644 --- a/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml +++ b/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml @@ -10,6 +10,11 @@ respawn_delay = 30 drop_table = "giant_rat" categories = ["giant_rats", "rats"] examine = "Overgrown vermin." +stab_defence = -29 +slash_defence = -29 +crush_defence = -29 +magic_defence = -29 +range_defence = -29 [fremennik_shipmaster_al_kharid] id = 9708 @@ -20,6 +25,11 @@ drop_table = "giant_spider" combat_def = "giant_spider" hitpoints = 50 max_hit_stab = 10 +stab_defence = -43 +slash_defence = -43 +crush_defence = -43 +magic_defence = -43 +range_defence = -43 [sergeant_mossfists] id = 5889 diff --git a/data/area/misthalin/varrock/air_rune_temple/air_rune_temple.npcs.toml b/data/area/misthalin/varrock/air_rune_temple/air_rune_temple.npcs.toml index 2d5c0f2681..1ce99b7d9c 100644 --- a/data/area/misthalin/varrock/air_rune_temple/air_rune_temple.npcs.toml +++ b/data/area/misthalin/varrock/air_rune_temple/air_rune_temple.npcs.toml @@ -9,4 +9,9 @@ examine = "A cute bunny rabbit." drop_table = "rabbit" combat_def = "rabbit_miscellania" max_hit_crush = 10 +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 diff --git a/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.npcs.toml b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.npcs.toml index e14864044d..102b9105d0 100644 --- a/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.npcs.toml +++ b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.npcs.toml @@ -109,6 +109,8 @@ max_hit_melee = 50 attack_speed = 5 hunt_mode = "cowardly" examine = "Is that really Tolna?" +magic_defence = 50 +range_defence = 50 [tolna_east] id = 3659 @@ -124,6 +126,8 @@ max_hit_range = 50 attack_speed = 5 hunt_mode = "cowardly" examine = "Is that really Tolna?" +magic_defence = 50 +range_defence = 50 [tolna_north] id = 3660 @@ -136,4 +140,6 @@ max_hit_melee = 50 attack_speed = 5 hunt_mode = "cowardly" examine = "Is that really Tolna?" +magic_defence = 50 +range_defence = 50 diff --git a/data/area/misthalin/varrock/varrock.npcs.toml b/data/area/misthalin/varrock/varrock.npcs.toml index 4072e34652..1ef5e7a6a5 100644 --- a/data/area/misthalin/varrock/varrock.npcs.toml +++ b/data/area/misthalin/varrock/varrock.npcs.toml @@ -125,6 +125,7 @@ examine = "A practicer of dark arts." [dark_wizard_earth_2] clone = "dark_wizard_earth" id = 8874 +magic_defence = 3 [iffie] id = 5914 @@ -200,6 +201,11 @@ combat_def = "giant_rat" drop_table = "giant_rat" categories = ["giant_rats", "rats"] examine = "Overgrown vermin." +stab_defence = -40 +slash_defence = -40 +crush_defence = -40 +magic_defence = -40 +range_defence = -40 [master_farmer_varrock] id = 2235 @@ -722,6 +728,11 @@ examine = "Peaceful man!" id = 5920 clone = "guard_varrock" drop_table = "guard" +stab_defence = 24 +slash_defence = 30 +crush_defence = 25 +magic_defence = -9 +range_defence = 25 [trainee_guard] id = 5921 diff --git a/data/area/misthalin/zanaris/evil_chicken_lair/evil_chicken_lair.npcs.toml b/data/area/misthalin/zanaris/evil_chicken_lair/evil_chicken_lair.npcs.toml index 97f1ecc298..34e90946c8 100644 --- a/data/area/misthalin/zanaris/evil_chicken_lair/evil_chicken_lair.npcs.toml +++ b/data/area/misthalin/zanaris/evil_chicken_lair/evil_chicken_lair.npcs.toml @@ -22,6 +22,11 @@ str = 200 def = 200 mage = 100 max_hit_slash = 210 +stab_defence = 50 +slash_defence = 70 +crush_defence = 70 +magic_defence = 60 +range_defence = 50 [black_dragon_evil_chicken_lair_2] id = 4675 diff --git a/data/area/misthalin/zanaris/zanaris.npcs.toml b/data/area/misthalin/zanaris/zanaris.npcs.toml index c60c3dcd5f..6b96654b12 100644 --- a/data/area/misthalin/zanaris/zanaris.npcs.toml +++ b/data/area/misthalin/zanaris/zanaris.npcs.toml @@ -82,6 +82,11 @@ categories = ["mutated_zygomites"] respawn_delay = 30 drop_table = "zygomite_level_74" examine = "A fun guy. No wait, that's awful. Plus it doesn't even make sense." +stab_defence = 10 +slash_defence = 10 +crush_defence = 10 +magic_defence = 20 +range_defence = 20 [fungi_large] id = 3345 @@ -98,6 +103,11 @@ categories = ["mutated_zygomites"] respawn_delay = 30 drop_table = "zygomite_level_86" examine = "A fun guy. No wait, that's awful. Plus it doesn't even make sense." +stab_defence = 10 +slash_defence = 10 +crush_defence = 10 +magic_defence = 20 +range_defence = 20 [fairy_9] id = 4422 @@ -170,6 +180,11 @@ categories = ["otherworldly_beings"] respawn_delay = 20 drop_table = "otherworldly_being" examine = "Is he invisible or just a set of floating clothing?" +stab_defence = 15 +slash_defence = 10 +crush_defence = 20 +magic_defence = -5 +range_defence = 15 [fairy_queen_3] id = 653 diff --git a/data/area/morytania/braindeath_island/braindeath_island.npcs.toml b/data/area/morytania/braindeath_island/braindeath_island.npcs.toml index ffc974d9eb..55cef59af7 100644 --- a/data/area/morytania/braindeath_island/braindeath_island.npcs.toml +++ b/data/area/morytania/braindeath_island/braindeath_island.npcs.toml @@ -119,6 +119,11 @@ categories = ["fever_spiders"] respawn_delay = 5 drop_table = "fever_spider" examine = "A bunch of legs, eyes and teeth." +stab_defence = 20 +slash_defence = 15 +crush_defence = 10 +magic_defence = 15 +range_defence = 15 [brewer] id = 2851 diff --git a/data/area/morytania/canifis/canifis.npcs.toml b/data/area/morytania/canifis/canifis.npcs.toml index 8beb0d42cd..02f6ca7ef5 100644 --- a/data/area/morytania/canifis/canifis.npcs.toml +++ b/data/area/morytania/canifis/canifis.npcs.toml @@ -54,6 +54,11 @@ examine = "A well organised shop keeper." id = 6028 clone = "boris" examine = "He's staring at the moon." +stab_defence = -21 +slash_defence = -21 +crush_defence = -21 +magic_defence = -21 +range_defence = -21 [joseph] id = 6029 @@ -64,6 +69,11 @@ examine = "He keeps calling me comrade." id = 6030 clone = "boris" examine = "There's a set of brows that mean business." +stab_defence = -21 +slash_defence = -21 +crush_defence = -21 +magic_defence = -21 +range_defence = -21 [eduard] id = 6031 @@ -74,6 +84,11 @@ examine = "This is one feral looking innkeeper." id = 6032 clone = "boris" examine = "A tough looking villager." +stab_defence = -21 +slash_defence = -21 +crush_defence = -21 +magic_defence = -21 +range_defence = -21 [georgy] id = 6033 diff --git a/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.npcs.toml b/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.npcs.toml index a99f8a50eb..18bc9f3179 100644 --- a/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.npcs.toml +++ b/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.npcs.toml @@ -17,6 +17,9 @@ respawn_delay = 15 drop_table = "giant_skeleton_tarns_lair" examine = "A giant skeleton." combat_def = "skeleton_unarmed" +stab_defence = 50 +slash_defence = 40 +range_defence = 40 [skeleton_lair_of_tarn_razorlor] id = 5385 @@ -29,6 +32,9 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 +stab_defence = 50 +slash_defence = 40 +range_defence = 40 [skeleton_lair_of_tarn_razorlor_2] id = 5387 @@ -41,6 +47,9 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 +stab_defence = 50 +slash_defence = 40 +range_defence = 40 [skeleton_lair_of_tarn_razorlor_3] id = 5388 @@ -53,6 +62,9 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 +stab_defence = 50 +slash_defence = 40 +range_defence = 40 [skeleton_lair_of_tarn_razorlor_4] id = 5389 @@ -65,6 +77,9 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 +stab_defence = 50 +slash_defence = 40 +range_defence = 40 [skeleton_lair_of_tarn_razorlor_5] id = 5390 @@ -77,6 +92,9 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 +stab_defence = 50 +slash_defence = 40 +range_defence = 40 [skeleton_lair_of_tarn_razorlor_6] id = 5391 @@ -89,6 +107,9 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 +stab_defence = 50 +slash_defence = 40 +range_defence = 40 [terror_dog] id = 5417 @@ -134,3 +155,8 @@ style = "magic" max_hit_melee = 90 hunt_mode = "cowardly" examine = "I preferred him when he was human." +stab_defence = 50 +slash_defence = 50 +crush_defence = 50 +magic_defence = 50 +range_defence = 50 diff --git a/data/area/morytania/mort_myre_swamp/mort_myre_swamp.npcs.toml b/data/area/morytania/mort_myre_swamp/mort_myre_swamp.npcs.toml index 02e957fc12..1931472978 100644 --- a/data/area/morytania/mort_myre_swamp/mort_myre_swamp.npcs.toml +++ b/data/area/morytania/mort_myre_swamp/mort_myre_swamp.npcs.toml @@ -83,6 +83,11 @@ hunt_mode = "cowardly" respawn_delay = 50 drop_table = "myre_blamish_snail" examine = "A marsh coloured blamish snail, these types are said to spit acid." +stab_defence = 5 +slash_defence = 5 +crush_defence = 30 +magic_defence = 5 +range_defence = 50 [blood_blamish_snail] id = 1228 @@ -96,6 +101,11 @@ hunt_mode = "cowardly" respawn_delay = 50 drop_table = "blood_blamish_snail" examine = "A blood coloured blamish snail, these types are said to spit acid." +stab_defence = 5 +slash_defence = 5 +crush_defence = 30 +magic_defence = 5 +range_defence = 50 [ochre_blamish_snail] id = 1229 @@ -110,6 +120,11 @@ attack_bonus = 10 hunt_mode = "cowardly" respawn_delay = 50 examine = "A muddy coloured blamish snail, these types are said to spit acid." +stab_defence = 5 +slash_defence = 5 +crush_defence = 30 +magic_defence = 5 +range_defence = 50 [bruise_blamish_snail] id = 1230 @@ -125,6 +140,11 @@ hunt_mode = "cowardly" respawn_delay = 50 drop_table = "bruise_blamish_snail" examine = "A bruise blue coloured blamish snail, these types are said to spit acid." +stab_defence = 5 +slash_defence = 5 +crush_defence = 30 +magic_defence = 5 +range_defence = 50 [bark_blamish_snail] id = 1231 @@ -138,6 +158,11 @@ hunt_mode = "cowardly" respawn_delay = 50 drop_table = "bark_blamish_snail" examine = "A branch bark coloured blamish snail, these types are said to spit acid." +stab_defence = 5 +slash_defence = 5 +crush_defence = 30 +magic_defence = 5 +range_defence = 50 [myre_blamish_snail_2] id = 1232 diff --git a/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml b/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml index 23cc0dcff8..8315e937c4 100644 --- a/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml +++ b/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml @@ -132,6 +132,10 @@ combat_def = "giant_mosquito" respawn_delay = 50 examine = "A flying blood sucker." drop_table = "giant_mosquito" +stab_defence = 2 +slash_defence = 2 +crush_defence = 5 +magic_defence = 2 [jungle_horror] id = 4352 diff --git a/data/area/morytania/port_phasmatys/alices_farm/alices_farm.npcs.toml b/data/area/morytania/port_phasmatys/alices_farm/alices_farm.npcs.toml index 6a59a05d4a..117f24a8bf 100644 --- a/data/area/morytania/port_phasmatys/alices_farm/alices_farm.npcs.toml +++ b/data/area/morytania/port_phasmatys/alices_farm/alices_farm.npcs.toml @@ -10,6 +10,11 @@ respawn_delay = 5 drop_table = "undead_cow" examine = "It's an undead cow." max_hit_crush = 10 +stab_defence = -21 +slash_defence = -21 +crush_defence = -21 +magic_defence = -21 +range_defence = -21 [undead_chicken] id = 1692 @@ -23,6 +28,11 @@ respawn_delay = 25 drop_table = "undead_chicken" examine = "Yep, definitely a chicken... an undead chicken." combat_def = "chicken" +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [old_man_alices_farm] id = 1696 diff --git a/data/area/morytania/slayer_tower/nechryael/nechryael.npcs.toml b/data/area/morytania/slayer_tower/nechryael/nechryael.npcs.toml index 2ff1b2168c..b2729e8873 100644 --- a/data/area/morytania/slayer_tower/nechryael/nechryael.npcs.toml +++ b/data/area/morytania/slayer_tower/nechryael/nechryael.npcs.toml @@ -13,6 +13,10 @@ drop_table = "nechryael" categories = ["nechryael"] disengage = false examine = "An evil death demon." +stab_defence = 20 +slash_defence = 20 +crush_defence = 20 +range_defence = 20 [death_spawn] id = 1614 diff --git a/data/area/realm/corporeal_beasts_lair/corporeal_beasts_lair.npcs.toml b/data/area/realm/corporeal_beasts_lair/corporeal_beasts_lair.npcs.toml index 0c0f6f6aec..74d2658569 100644 --- a/data/area/realm/corporeal_beasts_lair/corporeal_beasts_lair.npcs.toml +++ b/data/area/realm/corporeal_beasts_lair/corporeal_beasts_lair.npcs.toml @@ -13,6 +13,11 @@ combat_def = "corporeal_beast" respawn_delay = 50 immune_poison = true examine = "A vision of supernatural horror." +stab_defence = 25 +slash_defence = 200 +crush_defence = 100 +magic_defence = 150 +range_defence = 230 [dark_energy_core] id = 8127 @@ -26,3 +31,8 @@ combat_def = "dark_energy_core" hunt_mode = "aggressive_retarget" drop_table = "ashes" examine = "A small being of dark energy." +stab_defence = 10 +slash_defence = 10 +crush_defence = 10 +magic_defence = -5 +range_defence = 10 diff --git a/data/area/realm/enchanted_valley/enchanted_valley.npcs.toml b/data/area/realm/enchanted_valley/enchanted_valley.npcs.toml index 393eab2227..2b8d621a5f 100644 --- a/data/area/realm/enchanted_valley/enchanted_valley.npcs.toml +++ b/data/area/realm/enchanted_valley/enchanted_valley.npcs.toml @@ -87,4 +87,9 @@ examine = "A very angry nymph." [tree_spirit_level_14_2] id = 4500 -clone = "tree_spirit_level_14" \ No newline at end of file +clone = "tree_spirit_level_14" +stab_defence = 90 +slash_defence = 90 +crush_defence = 5 +magic_defence = 90 +range_defence = 90 \ No newline at end of file diff --git a/data/area/realm/fisher_realm/fisher_realm.npcs.toml b/data/area/realm/fisher_realm/fisher_realm.npcs.toml index d57fd6fb37..5b94742850 100644 --- a/data/area/realm/fisher_realm/fisher_realm.npcs.toml +++ b/data/area/realm/fisher_realm/fisher_realm.npcs.toml @@ -30,6 +30,11 @@ drop_table = "ram" combat_def = "ram_freds_farm" hitpoints = 80 max_hit_crush = 10 +stab_defence = -21 +slash_defence = -21 +crush_defence = -21 +magic_defence = -21 +range_defence = -21 [ram_fisher_realm_2] id = 5169 @@ -37,4 +42,9 @@ drop_table = "ram" combat_def = "ram_freds_farm" hitpoints = 80 max_hit_crush = 10 +stab_defence = -21 +slash_defence = -21 +crush_defence = -21 +magic_defence = -21 +range_defence = -21 diff --git a/data/area/realm/killerwatt_plane/killerwatt_plane.npcs.toml b/data/area/realm/killerwatt_plane/killerwatt_plane.npcs.toml index 888654f25f..14852b02c7 100644 --- a/data/area/realm/killerwatt_plane/killerwatt_plane.npcs.toml +++ b/data/area/realm/killerwatt_plane/killerwatt_plane.npcs.toml @@ -11,6 +11,11 @@ slayer_xp = 51.0 categories = ["killerwatts"] respawn_delay = 30 examine = "A ball of electrical energy." +stab_defence = 10 +slash_defence = 10 +crush_defence = 10 +magic_defence = 20 +range_defence = 20 [killerwatt_attacking] id = 3201 diff --git a/data/area/realm/spirit_realm/spirit_realm.npcs.toml b/data/area/realm/spirit_realm/spirit_realm.npcs.toml index ced2e3ef45..853df741bc 100644 --- a/data/area/realm/spirit_realm/spirit_realm.npcs.toml +++ b/data/area/realm/spirit_realm/spirit_realm.npcs.toml @@ -9,6 +9,11 @@ att = 36 str = 36 def = 30 max_hit_crush = 50 +stab_defence = 58 +slash_defence = 57 +crush_defence = 46 +magic_defence = -10 +range_defence = 56 [tormented_wraith_spirit_realm] id = 8125 diff --git a/data/area/tirannwn/iorwerth_camp/iorwerth_camp.npcs.toml b/data/area/tirannwn/iorwerth_camp/iorwerth_camp.npcs.toml index 57494355ed..f3ea8dfed7 100644 --- a/data/area/tirannwn/iorwerth_camp/iorwerth_camp.npcs.toml +++ b/data/area/tirannwn/iorwerth_camp/iorwerth_camp.npcs.toml @@ -17,6 +17,11 @@ respawn_delay = 30 drop_table = "elf_warrior" examine = "He looks pretty handy with that bow." combat_def = "guard" +stab_defence = 50 +slash_defence = 50 +crush_defence = 50 +magic_defence = 60 +range_defence = 70 [elf_warrior_2] id = 1184 @@ -34,6 +39,11 @@ respawn_delay = 30 drop_table = "elf_warrior" examine = "I don't want to get on the wrong side of him." combat_def = "guard" +stab_defence = 50 +slash_defence = 70 +crush_defence = 70 +magic_defence = 60 +range_defence = 50 [fishing_spot_iorwerth_camp] id = 1189 diff --git a/data/area/tirannwn/isafdar/isafdar.npcs.toml b/data/area/tirannwn/isafdar/isafdar.npcs.toml index 0e8db0cecc..c754c5c47a 100644 --- a/data/area/tirannwn/isafdar/isafdar.npcs.toml +++ b/data/area/tirannwn/isafdar/isafdar.npcs.toml @@ -29,6 +29,11 @@ examine = "Aww, how cute." drop_table = "rabbit" combat_def = "rabbit_miscellania" max_hit_crush = 10 +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [rabbit_isafdar_2] id = 1194 diff --git a/data/area/tirannwn/lletya/lletya.npcs.toml b/data/area/tirannwn/lletya/lletya.npcs.toml index 8afd73e094..e087dc1ba7 100644 --- a/data/area/tirannwn/lletya/lletya.npcs.toml +++ b/data/area/tirannwn/lletya/lletya.npcs.toml @@ -43,6 +43,11 @@ id = 2360 clone = "elf_warrior_lletya" drop_table = "elf_warrior" combat_def = "guard" +stab_defence = 50 +slash_defence = 70 +crush_defence = 70 +magic_defence = 60 +range_defence = 50 [elf_warrior_lletya_3] id = 2361 @@ -66,6 +71,11 @@ id = 2362 clone = "elf_warrior_lletya_3" drop_table = "elf_warrior" combat_def = "guard" +stab_defence = 50 +slash_defence = 50 +crush_defence = 50 +magic_defence = 60 +range_defence = 70 [goreu] id = 2363 @@ -114,6 +124,11 @@ drop_table = "ram" examine = "White and fluffy." combat_def = "ram_freds_farm" max_hit_crush = 10 +stab_defence = -21 +slash_defence = -21 +crush_defence = -21 +magic_defence = -21 +range_defence = -21 [gwir] id = 8894 diff --git a/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml index a6d1ae417b..7f721168f3 100644 --- a/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml +++ b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml @@ -10,6 +10,10 @@ str = 1 def = 1 range = 126 max_hit_range = 140 +stab_defence = 50 +slash_defence = 50 +crush_defence = -50 +range_defence = 62 [warped_terrorbird_2] id = 6286 @@ -23,6 +27,10 @@ str = 1 def = 1 range = 126 max_hit_range = 140 +stab_defence = -50 +slash_defence = 50 +crush_defence = 50 +range_defence = 62 [warped_terrorbird_3] id = 6287 @@ -36,6 +44,10 @@ str = 1 def = 1 range = 126 max_hit_range = 140 +stab_defence = 50 +slash_defence = -50 +crush_defence = 50 +magic_defence = 62 [warped_terrorbird_4] id = 6288 @@ -49,6 +61,10 @@ str = 1 def = 1 range = 126 max_hit_range = 140 +stab_defence = 50 +slash_defence = -50 +crush_defence = 50 +range_defence = 62 [warped_terrorbird_5] id = 6289 @@ -62,6 +78,10 @@ str = 1 def = 1 range = 126 max_hit_range = 140 +stab_defence = -50 +slash_defence = 50 +crush_defence = 50 +magic_defence = 62 [warped_terrorbird_6] id = 6290 @@ -73,6 +93,10 @@ str = 1 def = 1 range = 126 max_hit_range = 140 +stab_defence = 50 +slash_defence = 50 +crush_defence = -50 +range_defence = 62 [warped_terrorbird_7] id = 6291 @@ -86,6 +110,10 @@ str = 1 def = 1 range = 126 max_hit_range = 140 +stab_defence = 50 +slash_defence = -50 +crush_defence = 50 +range_defence = 62 [warped_terrorbird_8] id = 6292 @@ -99,6 +127,10 @@ str = 1 def = 1 range = 126 max_hit_range = 140 +stab_defence = -50 +slash_defence = 50 +crush_defence = 50 +magic_defence = 62 [warped_terrorbird_9] id = 6293 @@ -110,6 +142,10 @@ str = 1 def = 171 range = 126 max_hit_range = 140 +stab_defence = -50 +slash_defence = 50 +crush_defence = 50 +magic_defence = 62 [warped_terrorbird_10] id = 6294 @@ -123,6 +159,10 @@ str = 1 def = 171 range = 126 max_hit_range = 140 +stab_defence = 50 +slash_defence = 50 +crush_defence = -50 +range_defence = 62 [warped_terrorbird_11] id = 6295 @@ -136,6 +176,10 @@ str = 1 def = 171 range = 126 max_hit_range = 140 +stab_defence = 50 +slash_defence = -50 +crush_defence = 50 +range_defence = 62 [warped_tortoise] id = 6296 diff --git a/data/area/troll_country/death_plateau/death_plateau.npcs.toml b/data/area/troll_country/death_plateau/death_plateau.npcs.toml index b5bb9c36e6..45921cd1f2 100644 --- a/data/area/troll_country/death_plateau/death_plateau.npcs.toml +++ b/data/area/troll_country/death_plateau/death_plateau.npcs.toml @@ -28,6 +28,11 @@ respawn_delay = 50 drop_table = "rock_troll" examine = "A nasty looking troll." max_hit_crush = 230 +stab_defence = 25 +slash_defence = 25 +crush_defence = 40 +magic_defence = 200 +range_defence = 200 [pee_hat] id = 1097 @@ -36,7 +41,6 @@ hitpoints = 1200 att = 50 str = 100 def = 50 -attack_bonus = 40 max_hit_crush = 230 [stick] @@ -59,6 +63,11 @@ respawn_delay = 50 drop_table = "rock_troll" examine = "A big, bad troll." max_hit_crush = 270 +stab_defence = 30 +slash_defence = 30 +crush_defence = 50 +magic_defence = 200 +range_defence = 200 [rock_troll] id = 1095 @@ -70,6 +79,11 @@ att = 94 str = 94 def = 94 combat_def = "ice_troll" +stab_defence = 35 +slash_defence = 60 +crush_defence = 35 +magic_defence = 200 +range_defence = 200 [billy] id = 1093 diff --git a/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml b/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml index a34ebc68c5..3aaed352f4 100644 --- a/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml +++ b/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml @@ -9,6 +9,11 @@ def = 189 mage = 189 max_hit_magic = 230 combat_def = "ice_demon" +stab_defence = 50 +slash_defence = 180 +crush_defence = 180 +magic_defence = 10 +range_defence = 50 [waterfiend_ghorrock_fortress_dungeon] id = 9054 diff --git a/data/area/troll_country/god_wars_dungeon/armadyl/armadyl.npcs.toml b/data/area/troll_country/god_wars_dungeon/armadyl/armadyl.npcs.toml index 5a894904c6..0f9a404ae3 100644 --- a/data/area/troll_country/god_wars_dungeon/armadyl/armadyl.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/armadyl/armadyl.npcs.toml @@ -14,6 +14,11 @@ slayer_xp = 357.0 categories = ["aviansies", "boss"] immune_poison = true examine = "Graceful avatar of Armadyl." +stab_defence = 180 +slash_defence = 180 +crush_defence = 180 +magic_defence = 200 +range_defence = 200 [flight_kilisa] id = 6227 @@ -62,3 +67,4 @@ slayer_xp = 132.5 categories = ["aviansies"] drop_table = "armadyl_bodyguard" examine = "Graceful, bird-like creature." +attack_bonus = 60 diff --git a/data/area/troll_country/god_wars_dungeon/bandos/bandos.npcs.toml b/data/area/troll_country/god_wars_dungeon/bandos/bandos.npcs.toml index 6430a68950..6985d71472 100644 --- a/data/area/troll_country/god_wars_dungeon/bandos/bandos.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/bandos/bandos.npcs.toml @@ -16,6 +16,11 @@ slayer_xp = 338.0 categories = ["boss"] immune_poison = true examine = "A huge war chief." +stab_defence = 90 +slash_defence = 90 +crush_defence = 90 +magic_defence = 65 +range_defence = 90 [sergeant_strongstack] id = 6261 @@ -64,3 +69,4 @@ slayer_xp = 128.0 categories = ["goblins"] drop_table = "bandos_bodyguard" examine = "A battle-honed goblin." +attack_bonus = 20 diff --git a/data/area/troll_country/god_wars_dungeon/bandos/ork/ork.npcs.toml b/data/area/troll_country/god_wars_dungeon/bandos/ork/ork.npcs.toml index 787191072f..f14061654d 100644 --- a/data/area/troll_country/god_wars_dungeon/bandos/ork/ork.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/bandos/ork/ork.npcs.toml @@ -12,6 +12,11 @@ categories = ["ork"] drop_table = "ork" god = "bandos" examine = "Ugly, fierce and with a bad attitude." +stab_defence = 12 +slash_defence = 14 +crush_defence = 13 +magic_defence = 5 +range_defence = 13 [ork_axe_god_wars] id = 6272 diff --git a/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml b/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml index b12869347c..c64f529d42 100644 --- a/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml @@ -18,6 +18,11 @@ att = 388 str = 388 def = 1 max_hit_crush = 402 +stab_defence = 100 +slash_defence = 100 +crush_defence = 50 +magic_defence = 5 +range_defence = 400 [ancient_ranger] id = 13457 @@ -40,6 +45,11 @@ def = 199 mage = 199 max_hit_magic = 146 hitpoints = 1470 +stab_defence = 20 +slash_defence = 30 +crush_defence = 20 +magic_defence = 400 +range_defence = 5 [ancient_mage_god_wars_dungeon] id = 13459 diff --git a/data/area/troll_country/god_wars_dungeon/saradomin/knight_of_saradomin/knight_of_saradomin.npcs.toml b/data/area/troll_country/god_wars_dungeon/saradomin/knight_of_saradomin/knight_of_saradomin.npcs.toml index 8bdaf4d3f2..764703d3cc 100644 --- a/data/area/troll_country/god_wars_dungeon/saradomin/knight_of_saradomin/knight_of_saradomin.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/saradomin/knight_of_saradomin/knight_of_saradomin.npcs.toml @@ -12,6 +12,10 @@ respawn_delay = 50 categories = ["human"] god = "saradomin" examine = "A valiant knight." +stab_defence = 10 +slash_defence = 10 +crush_defence = 7 +range_defence = 13 [knight_of_saradomin_female] id = 6259 @@ -28,3 +32,7 @@ categories = ["human"] god = "saradomin" examine = "A valiant knight." drop_table = "knight_of_saradomin" +stab_defence = 12 +slash_defence = 14 +crush_defence = 13 +range_defence = 13 diff --git a/data/area/troll_country/god_wars_dungeon/saradomin/saradomin.npcs.toml b/data/area/troll_country/god_wars_dungeon/saradomin/saradomin.npcs.toml index 9797df9d24..3f056ffda4 100644 --- a/data/area/troll_country/god_wars_dungeon/saradomin/saradomin.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/saradomin/saradomin.npcs.toml @@ -15,6 +15,11 @@ slayer_xp = 350.0 categories = ["boss"] immune_poison = true examine = "Commander of Saradomin's forces." +stab_defence = 100 +slash_defence = 100 +crush_defence = 100 +magic_defence = 100 +range_defence = 100 [starlight] id = 6248 @@ -29,6 +34,11 @@ xp_bonus = 1.05 hunt_mode = "aggressive" drop_table = "saradomin_bodyguard" examine = "Bane of darkness." +stab_defence = 12 +slash_defence = 14 +crush_defence = 13 +magic_defence = 5 +range_defence = 13 [growler] id = 6250 @@ -42,6 +52,11 @@ combat_def = "growler" hunt_mode = "aggressive" drop_table = "saradomin_bodyguard" examine = "Defender of the faithful." +stab_defence = 12 +slash_defence = 14 +crush_defence = 14 +magic_defence = 18 +range_defence = 5 [bree] id = 6252 @@ -56,3 +71,8 @@ combat_def = "bree" hunt_mode = "aggressive" drop_table = "saradomin_bodyguard" examine = "Champion of truth." +stab_defence = 12 +slash_defence = 14 +crush_defence = 14 +magic_defence = 18 +range_defence = 5 diff --git a/data/area/troll_country/god_wars_dungeon/saradomin/saradomin_preist/saradomin_priest.npcs.toml b/data/area/troll_country/god_wars_dungeon/saradomin/saradomin_preist/saradomin_priest.npcs.toml index 7102a78c60..28e63d267e 100644 --- a/data/area/troll_country/god_wars_dungeon/saradomin/saradomin_preist/saradomin_priest.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/saradomin/saradomin_preist/saradomin_priest.npcs.toml @@ -13,3 +13,8 @@ categories = ["human"] drops = "saradomin_priest" god = "saradomin" examine = "A holy man wearing ancient clothing." +stab_defence = 12 +slash_defence = 14 +crush_defence = 13 +magic_defence = 5 +range_defence = 13 diff --git a/data/area/troll_country/god_wars_dungeon/spiritual_mage/spiritual_mage.npcs.toml b/data/area/troll_country/god_wars_dungeon/spiritual_mage/spiritual_mage.npcs.toml index e8e69b0d97..9b5be7ab81 100644 --- a/data/area/troll_country/god_wars_dungeon/spiritual_mage/spiritual_mage.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/spiritual_mage/spiritual_mage.npcs.toml @@ -28,6 +28,11 @@ drop_table = "spiritual_mage" categories = ["spiritual_creatures"] god = "saradomin" examine = "Saradomin's holy mage." +stab_defence = 8 +slash_defence = 7 +crush_defence = 3 +magic_defence = 16 +range_defence = 2 [spiritual_mage_bandos] id = 6278 @@ -43,6 +48,11 @@ drop_table = "spiritual_mage" categories = ["spiritual_creatures"] god = "bandos" examine = "One of Bandos's chosen." +stab_defence = 12 +slash_defence = 14 +crush_defence = 13 +magic_defence = 35 +range_defence = 13 [spiritual_mage_armadyl] id = 6231 @@ -57,3 +67,8 @@ slayer_level = 83 drop_table = "spiritual_mage" categories = ["spiritual_creatures"] examine = "A mage who serves Armadyl above all else - even death." +stab_defence = 9 +slash_defence = 12 +crush_defence = 5 +magic_defence = 45 +range_defence = 28 diff --git a/data/area/troll_country/god_wars_dungeon/spiritual_ranger/spiritual_ranger.npcs.toml b/data/area/troll_country/god_wars_dungeon/spiritual_ranger/spiritual_ranger.npcs.toml index 06ec3f3321..7b309c2ae1 100644 --- a/data/area/troll_country/god_wars_dungeon/spiritual_ranger/spiritual_ranger.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/spiritual_ranger/spiritual_ranger.npcs.toml @@ -31,6 +31,11 @@ drop_table = "spiritual_ranger" categories = ["spiritual_creatures"] god = "saradomin" examine = "A ranger spirit dedicated to Saradomin." +stab_defence = 3 +slash_defence = 5 +crush_defence = 13 +magic_defence = 16 +range_defence = 23 [spiritual_ranger_bandos] id = 6276 @@ -46,6 +51,11 @@ categories = ["spiritual_creatures"] drop_table = "spiritual_ranger" god = "bandos" examine = "The spirit of a ranger, serving Bandos beyond death." +stab_defence = 12 +slash_defence = 14 +crush_defence = 13 +magic_defence = 5 +range_defence = 13 [spiritual_ranger_armadyl] id = 6230 @@ -60,4 +70,9 @@ slayer_level = 63 categories = ["spiritual_creatures"] drop_table = "spiritual_ranger" examine = "Armadyl's favourite servant." +stab_defence = 17 +slash_defence = 16 +crush_defence = 8 +magic_defence = 35 +range_defence = 41 diff --git a/data/area/troll_country/god_wars_dungeon/spiritual_warrior/spiritual_warrior.npcs.toml b/data/area/troll_country/god_wars_dungeon/spiritual_warrior/spiritual_warrior.npcs.toml index c689ce03f3..11b56bac49 100644 --- a/data/area/troll_country/god_wars_dungeon/spiritual_warrior/spiritual_warrior.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/spiritual_warrior/spiritual_warrior.npcs.toml @@ -30,6 +30,11 @@ categories = ["spiritual_creatures"] drop_table = "spiritual_warrior" god = "saradomin" examine = "Saradomin's chosen warrior." +stab_defence = 12 +slash_defence = 14 +crush_defence = 13 +magic_defence = 5 +range_defence = 13 [spiritual_warrior_bandos] id = 6277 @@ -47,6 +52,11 @@ drop_table = "spiritual_warrior" categories = ["spiritual_creatures"] god = "bandos" examine = "A true servant of Bandos." +stab_defence = 12 +slash_defence = 14 +crush_defence = 13 +magic_defence = 5 +range_defence = 13 [spiritual_warrior_armadyl] id = 6229 @@ -61,3 +71,8 @@ slayer_level = 68 drop_table = "spiritual_warrior" categories = ["spiritual_creatures"] examine = "A servant of Armadyl." +stab_defence = 23 +slash_defence = 25 +crush_defence = 13 +magic_defence = 35 +range_defence = 35 diff --git a/data/area/troll_country/god_wars_dungeon/zamorak/zamorak.npcs.toml b/data/area/troll_country/god_wars_dungeon/zamorak/zamorak.npcs.toml index 98079c5200..44d4dd60e3 100644 --- a/data/area/troll_country/god_wars_dungeon/zamorak/zamorak.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/zamorak/zamorak.npcs.toml @@ -13,6 +13,11 @@ slayer_xp = 350.5 categories = ["demons", "boss"] immune_poison = true examine = "A servant of the god Zamorak." +stab_defence = 80 +slash_defence = 80 +crush_defence = 80 +magic_defence = 130 +range_defence = 80 [tstanon_karlak] id = 6204 @@ -28,6 +33,7 @@ slayer_xp = 142.0 categories = ["demons"] drop_table = "zamorak_bodyguard" examine = "Destroyer of 1000 planes!" +magic_defence = -5 [balfrug_kreeyath] id = 6208 @@ -42,6 +48,7 @@ slayer_xp = 161.0 categories = ["demons"] drop_table = "zamorak_bodyguard" examine = "Despoiler of Ullek." +magic_defence = 10 [zakln_gritch] id = 6206 @@ -57,3 +64,5 @@ slayer_xp = 150.0 categories = ["demons"] drop_table = "zamorak_bodyguard" examine = "Scourge of the Light." +attack_bonus = 20 +magic_defence = -5 diff --git a/data/area/troll_country/troll_country.npcs.toml b/data/area/troll_country/troll_country.npcs.toml index 25e66467cc..2328ce6b8e 100644 --- a/data/area/troll_country/troll_country.npcs.toml +++ b/data/area/troll_country/troll_country.npcs.toml @@ -22,6 +22,9 @@ respawn_delay = 50 drop_table = "ice_troll" examine = "Brrrrr...he must be cold!" combat_def = "ice_troll" +stab_defence = 30 +slash_defence = 60 +crush_defence = 30 [ice_troll_troll_country_3] id = 1937 @@ -40,6 +43,9 @@ respawn_delay = 50 drop_table = "ice_troll" examine = "Brrrrr...he must be cold!" combat_def = "ice_troll" +stab_defence = 30 +slash_defence = 60 +crush_defence = 30 [ice_troll_troll_country_4] id = 1938 @@ -58,6 +64,9 @@ respawn_delay = 50 drop_table = "ice_troll" examine = "Brrrrr...he must be cold!" combat_def = "ice_troll" +stab_defence = 30 +slash_defence = 60 +crush_defence = 30 [ice_troll_troll_country_5] id = 1939 @@ -76,6 +85,9 @@ respawn_delay = 50 drop_table = "ice_troll" examine = "Brrrrr...he must be cold!" combat_def = "ice_troll" +stab_defence = 30 +slash_defence = 60 +crush_defence = 30 [ice_troll_troll_country_6] id = 1940 diff --git a/data/area/troll_country/troll_tunnels/troll_tunnels.npcs.toml b/data/area/troll_country/troll_tunnels/troll_tunnels.npcs.toml index e794dc0af3..3579cdf414 100644 --- a/data/area/troll_country/troll_tunnels/troll_tunnels.npcs.toml +++ b/data/area/troll_country/troll_tunnels/troll_tunnels.npcs.toml @@ -15,6 +15,9 @@ respawn_delay = 50 examine = "Brrrrr...he must be cold!" drop_table = "ice_troll" combat_def = "ice_troll" +stab_defence = 30 +slash_defence = 60 +crush_defence = 30 [ice_troll_troll_tunnels_2] id = 1561 @@ -33,6 +36,9 @@ respawn_delay = 50 examine = "Brrrrr...he must be cold!" drop_table = "ice_troll" combat_def = "ice_troll" +stab_defence = 30 +slash_defence = 60 +crush_defence = 30 [ice_troll_troll_tunnels_3] id = 1562 @@ -51,6 +57,9 @@ respawn_delay = 50 examine = "Brrrrr...he must be cold!" drop_table = "ice_troll" combat_def = "ice_troll" +stab_defence = 30 +slash_defence = 60 +crush_defence = 30 [ice_troll_troll_tunnels_4] id = 1563 @@ -69,6 +78,9 @@ respawn_delay = 50 examine = "Brrrrr...he must be cold!" drop_table = "ice_troll" combat_def = "ice_troll" +stab_defence = 30 +slash_defence = 60 +crush_defence = 30 [ice_troll_troll_tunnels_5] id = 1564 diff --git a/data/area/troll_country/trollheim/trollheim.npcs.toml b/data/area/troll_country/trollheim/trollheim.npcs.toml index 422ee387b0..7d552f46e6 100644 --- a/data/area/troll_country/trollheim/trollheim.npcs.toml +++ b/data/area/troll_country/trollheim/trollheim.npcs.toml @@ -12,6 +12,8 @@ slayer_xp = 95.0 categories = ["trolls"] drop_table = "thrower_troll_death_plateau" examine = "Small for a troll, but it's mean, ugly and throws rocks." +magic_defence = 200 +range_defence = 200 [thrower_troll_death_plateau_large] id = 1102 @@ -43,6 +45,8 @@ slayer_xp = 95.0 categories = ["trolls"] drop_table = "thrower_troll" examine = "Small for a troll, but it's mean, ugly and throws rocks." +magic_defence = 200 +range_defence = 200 [thrower_troll_trollheim_large] id = 1131 @@ -101,6 +105,9 @@ categories = ["trolls"] respawn_delay = 50 drop_table = "mountain_troll" examine = "He's watching the arena." +crush_defence = 10 +magic_defence = 200 +range_defence = 200 [troll_spectator_2] id = 1119 diff --git a/data/area/wilderness/abyss/abyss.npcs.toml b/data/area/wilderness/abyss/abyss.npcs.toml index f089797638..bfe3591d7e 100644 --- a/data/area/wilderness/abyss/abyss.npcs.toml +++ b/data/area/wilderness/abyss/abyss.npcs.toml @@ -10,6 +10,11 @@ hunt_mode = "aggressive" height = 15 respawn_delay = 5 examine = "A blood-drinking denizen of the Abyss." +stab_defence = 50 +slash_defence = 50 +crush_defence = 100 +magic_defence = 50 +range_defence = 10 [abyssal_guardian] id = 2264 @@ -24,6 +29,11 @@ hunt_mode = "aggressive" height = 30 respawn_delay = 5 examine = "It seems to have eyes in the back of its head..." +stab_defence = 70 +slash_defence = 70 +crush_defence = 70 +magic_defence = 150 +range_defence = 70 [abyssal_walker] id = 2265 @@ -38,6 +48,11 @@ height = 50 respawn_delay = 5 xp_bonus = -7.5 examine = "Apparently walks the Abyss." +stab_defence = 75 +slash_defence = 75 +crush_defence = 10 +magic_defence = 75 +range_defence = 75 [dark_mage] id = 2262 diff --git a/data/area/wilderness/abyss/abyssal_demon/abyssal_demon.npcs.toml b/data/area/wilderness/abyss/abyssal_demon/abyssal_demon.npcs.toml index 8ee5cb97e3..bf2e0d9466 100644 --- a/data/area/wilderness/abyss/abyssal_demon/abyssal_demon.npcs.toml +++ b/data/area/wilderness/abyss/abyssal_demon/abyssal_demon.npcs.toml @@ -11,6 +11,10 @@ slayer_level = 85 drop_table = "abyssal_demon" categories = ["abyssal_demon", "demon"] examine = "A denizen of the Abyss!" +stab_defence = 20 +slash_defence = 20 +crush_defence = 20 +range_defence = 20 [abyssal_demon_1] id = 4230 diff --git a/data/area/wilderness/bandit_camp/wilderness_bandit_camp.npcs.toml b/data/area/wilderness/bandit_camp/wilderness_bandit_camp.npcs.toml index c1eb472115..64bb71f708 100644 --- a/data/area/wilderness/bandit_camp/wilderness_bandit_camp.npcs.toml +++ b/data/area/wilderness/bandit_camp/wilderness_bandit_camp.npcs.toml @@ -25,6 +25,9 @@ respawn_delay = 50 examine = "A warrior touched by chaos." drop_table = "dark_warrior" combat_def = "guard" +stab_defence = 96 +slash_defence = 79 +crush_defence = 59 [guard_bandit] id = 196 @@ -43,6 +46,11 @@ respawn_delay = 100 examine = "A wilderness outlaw." drop_table = "guard_bandit" combat_def = "guard" +stab_defence = 4 +slash_defence = 8 +crush_defence = 5 +magic_defence = 1 +range_defence = 4 [black_heather] id = 202 @@ -59,6 +67,9 @@ respawn_delay = 50 drop_table = "wilderness_bandit" examine = "Has a fearsome scowl. Moreso, after being told to smile once in a while." max_hit_slash = 40 +stab_defence = 9 +slash_defence = 8 +crush_defence = 10 [donny_the_lad] id = 203 @@ -75,6 +86,9 @@ respawn_delay = 50 drop_table = "wilderness_bandit" examine = "Has a fearsome posture, and a fearsome pair of weapons!" max_hit_slash = 40 +stab_defence = 9 +slash_defence = 8 +crush_defence = 10 [speedy_keith] id = 204 @@ -91,6 +105,9 @@ respawn_delay = 50 drop_table = "wilderness_bandit" examine = "Refuses to accept his hairstyle has gone out of fashion." max_hit_slash = 40 +stab_defence = 9 +slash_defence = 8 +crush_defence = 10 [mysterious_ghost_wilderness_bandit_camp] id = 2383 diff --git a/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml b/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml index e363a909e1..c1b66c551e 100644 --- a/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml +++ b/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml @@ -13,6 +13,9 @@ str = 1 def = 115 range = 72 max_hit_range = 86 +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [armoured_zombie_chaos_temple_dungeon_2] id = 8150 @@ -26,6 +29,9 @@ str = 1 def = 115 range = 72 max_hit_range = 86 +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [armoured_zombie_chaos_temple_dungeon_3] id = 8151 @@ -39,6 +45,9 @@ str = 1 def = 115 range = 72 max_hit_range = 86 +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [armoured_zombie_chaos_temple_dungeon_4] id = 8152 @@ -52,6 +61,9 @@ str = 1 def = 115 range = 72 max_hit_range = 86 +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [armoured_zombie_chaos_temple_dungeon_5] id = 8153 @@ -63,6 +75,9 @@ str = 1 def = 115 range = 72 max_hit_range = 86 +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [armoured_zombie_chaos_temple_dungeon_6] id = 8154 diff --git a/data/area/wilderness/chaos_tunnels/chaos_tunnels.npcs.toml b/data/area/wilderness/chaos_tunnels/chaos_tunnels.npcs.toml index cb98d6b43f..829b7fdd56 100644 --- a/data/area/wilderness/chaos_tunnels/chaos_tunnels.npcs.toml +++ b/data/area/wilderness/chaos_tunnels/chaos_tunnels.npcs.toml @@ -35,6 +35,8 @@ categories = ["turoth"] immune_cannon = true drop_table = "turoth" examine = "He's one big leg short!" +slash_defence = 20 +crush_defence = 20 [bloodworm] id = 2031 @@ -76,6 +78,11 @@ categories = ["spiders"] respawn_delay = 50 examine = "Incey wincey." drop_table = "empty" +stab_defence = 20 +slash_defence = 20 +crush_defence = 10 +magic_defence = 17 +range_defence = 20 [giant_crypt_spider] id = 2035 @@ -91,6 +98,11 @@ categories = ["spiders"] respawn_delay = 50 examine = "Not very incey wincey." drop_table = "empty" +stab_defence = 20 +slash_defence = 20 +crush_defence = 10 +magic_defence = 17 +range_defence = 20 [giant_crypt_rat_chaos_tunnels_2] id = 4920 @@ -113,6 +125,11 @@ respawn_delay = 30 drop_table = "possessed_pickaxe" categories = ["phantoms"] examine = "How does it move of its own accord?" +stab_defence = 15 +slash_defence = 10 +crush_defence = 5 +magic_defence = 5 +range_defence = 10 [animated_spade] id = 5414 @@ -164,6 +181,9 @@ categories = ["zombies"] drop_table = "mummy" respawn_delay = 30 examine = "A tightly-wrapped monster." +stab_defence = 90 +slash_defence = 90 +crush_defence = 90 [mummy_2] id = 1962 @@ -225,6 +245,9 @@ respawn_delay = 60 categories = ["skeletons", "undead"] slayer_xp = 80.0 examine = "Achingly thin." +stab_defence = 50 +slash_defence = 40 +range_defence = 40 [bork_surok] id = 7133 diff --git a/data/area/wilderness/wilderness.npcs.toml b/data/area/wilderness/wilderness.npcs.toml index 5536397133..6fecd43b40 100644 --- a/data/area/wilderness/wilderness.npcs.toml +++ b/data/area/wilderness/wilderness.npcs.toml @@ -15,6 +15,7 @@ respawn_delay = 50 examine = "A practicer of dark arts." drop_table = "dark_wizard" combat_def = "dark_wizard_water" +magic_defence = 3 [dark_wizard_wilderness_2] id = 174 @@ -30,6 +31,7 @@ respawn_delay = 50 examine = "He works evil magic." drop_table = "dark_wizard" combat_def = "dark_wizard_water" +magic_defence = 3 [william] id = 1778 @@ -169,6 +171,8 @@ str = 23 def = 23 attack_bonus = 8 max_hit_slash = 40 +stab_defence = 3 +slash_defence = 2 [pirate_wilderness_7] id = 6356 @@ -317,4 +321,7 @@ respawn_delay = 50 examine = "Rogueish." drop_table = "rogue" max_hit_stab = 20 -combat_def = "rogue" \ No newline at end of file +combat_def = "rogue" +stab_defence = 6 +slash_defence = 9 +crush_defence = 11 \ No newline at end of file diff --git a/data/entity/npc/animal/bat/bat.npcs.toml b/data/entity/npc/animal/bat/bat.npcs.toml index 3e96994034..3ef84d3f0a 100644 --- a/data/entity/npc/animal/bat/bat.npcs.toml +++ b/data/entity/npc/animal/bat/bat.npcs.toml @@ -10,6 +10,10 @@ respawn_delay = 35 drop_table = "bat" categories = ["bats"] examine = "An annoying flappy thing." +stab_defence = 2 +slash_defence = 2 +crush_defence = 5 +magic_defence = 2 [giant_bat] id = 78 @@ -24,6 +28,11 @@ respawn_delay = 35 drop_table = "bat" categories = ["bats"] examine = "An annoying flappy thing." +stab_defence = 10 +slash_defence = 10 +crush_defence = 12 +magic_defence = 10 +range_defence = 8 [giant_bat_brine_cavern] clone = "giant_bat" diff --git a/data/entity/npc/animal/birds/birds.npcs.toml b/data/entity/npc/animal/birds/birds.npcs.toml index 32fb34b0ce..f3b2aac874 100644 --- a/data/entity/npc/animal/birds/birds.npcs.toml +++ b/data/entity/npc/animal/birds/birds.npcs.toml @@ -12,6 +12,11 @@ collision = "sea" combat_def = "duck_swim" examine = "Quackers." drop_table = "duck" +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [crow] id = 1754 @@ -62,6 +67,11 @@ height = 10 drop_table = "bones" combat_def = "duck_walk" examine = "It quacks like a duck." +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [ducklings] id = 6112 diff --git a/data/entity/npc/animal/chicken/chicken.npcs.toml b/data/entity/npc/animal/chicken/chicken.npcs.toml index deb5d9be20..dd39401eba 100644 --- a/data/entity/npc/animal/chicken/chicken.npcs.toml +++ b/data/entity/npc/animal/chicken/chicken.npcs.toml @@ -10,6 +10,11 @@ respawn_delay = 25 categories = ["chickens", "birds"] drop_table = "chicken" examine = "Yep. Definitely a chicken." +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [chicken_brown] id = 1017 diff --git a/data/entity/npc/animal/cow/cow.npcs.toml b/data/entity/npc/animal/cow/cow.npcs.toml index bff657588b..c9e64af4e8 100644 --- a/data/entity/npc/animal/cow/cow.npcs.toml +++ b/data/entity/npc/animal/cow/cow.npcs.toml @@ -10,6 +10,11 @@ height = 30 drop_table = "cow" categories = ["cows"] examine = "Converts grass to beef." +stab_defence = -21 +slash_defence = -21 +crush_defence = -21 +magic_defence = -21 +range_defence = -21 [cow_brown] clone = "cow_default" @@ -30,6 +35,11 @@ drop_table = "cow" categories = ["cows"] height = 15 examine = "Young, but still beefy." +stab_defence = -26 +slash_defence = -26 +crush_defence = -26 +magic_defence = -26 +range_defence = -26 [cow_zanaris] clone = "cow_default" @@ -39,19 +49,44 @@ id = 3309 [cow_2] clone = "cow_default" id = 12362 +stab_defence = -58 +slash_defence = -58 +crush_defence = -58 +magic_defence = -58 +range_defence = -58 [cow_brown_2] clone = "cow_default" id = 12363 +stab_defence = -58 +slash_defence = -58 +crush_defence = -58 +magic_defence = -58 +range_defence = -58 [cow_calf_2] clone = "cow_calf" id = 12364 +stab_defence = -43 +slash_defence = -43 +crush_defence = -43 +magic_defence = -43 +range_defence = -43 [cow_light_spots_2] clone = "cow_default" id = 12365 +stab_defence = -58 +slash_defence = -58 +crush_defence = -58 +magic_defence = -58 +range_defence = -58 [cow_calf_3] clone = "cow_calf" -id = 12366 \ No newline at end of file +id = 12366 +stab_defence = -43 +slash_defence = -43 +crush_defence = -43 +magic_defence = -43 +range_defence = -43 \ No newline at end of file diff --git a/data/entity/npc/animal/crab/crab.npcs.toml b/data/entity/npc/animal/crab/crab.npcs.toml index 1715e6cb70..ad3038885d 100644 --- a/data/entity/npc/animal/crab/crab.npcs.toml +++ b/data/entity/npc/animal/crab/crab.npcs.toml @@ -51,11 +51,17 @@ respawn_delay = 50 hunt_mode = "aggressive" categories = ["crabs"] examine = "No one likes crabs... especially really big ones!" +stab_defence = 225 +slash_defence = 200 +crush_defence = 175 +magic_defence = -10 +range_defence = 250 [giant_rock_crab_light] clone = "giant_rock_crab" id = 2885 drop_table = "giant_rock_crab" +magic_defence = 10 [boulder] clone = "giant_rock_crab" diff --git a/data/entity/npc/animal/rat/rat.npcs.toml b/data/entity/npc/animal/rat/rat.npcs.toml index 2e6098d4f9..a34d3f0efe 100644 --- a/data/entity/npc/animal/rat/rat.npcs.toml +++ b/data/entity/npc/animal/rat/rat.npcs.toml @@ -9,6 +9,11 @@ categories = ["rats"] drop_table = "rat" height = 5 examine = "A popular dwarven delicacy." +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [stronghold_rat] clone = "rat" @@ -68,6 +73,11 @@ combat_def = "giant_rat" drop_table = "giant_rat" categories = ["giant_rats", "rats"] examine = "Overgrown vermin." +stab_defence = -40 +slash_defence = -40 +crush_defence = -40 +magic_defence = -40 +range_defence = -40 [giant_rat_brimhaven] id = 4926 diff --git a/data/entity/npc/boss/giant_mole/giant_mole.npcs.toml b/data/entity/npc/boss/giant_mole/giant_mole.npcs.toml index dc007d5e43..9cf668bd83 100644 --- a/data/entity/npc/boss/giant_mole/giant_mole.npcs.toml +++ b/data/entity/npc/boss/giant_mole/giant_mole.npcs.toml @@ -13,6 +13,11 @@ categories = ["mole"] respawn_delay = 16 examine = "Holy Mole-y!" max_hit_crush = 210 +stab_defence = 60 +slash_defence = 80 +crush_defence = 100 +magic_defence = 80 +range_defence = 60 [baby_mole] id = 3341 diff --git a/data/entity/npc/boss/king_black_dragon/king_black_dragon.npcs.toml b/data/entity/npc/boss/king_black_dragon/king_black_dragon.npcs.toml index 5aebddfa3c..1b05ae6e44 100644 --- a/data/entity/npc/boss/king_black_dragon/king_black_dragon.npcs.toml +++ b/data/entity/npc/boss/king_black_dragon/king_black_dragon.npcs.toml @@ -13,3 +13,8 @@ categories = ["dragons", "boss"] aka = ["kbd"] respawn_delay = 16 examine = "One of the biggest, meanest dragons around." +stab_defence = 70 +slash_defence = 90 +crush_defence = 90 +magic_defence = 80 +range_defence = 70 diff --git a/data/entity/npc/humanoid/dwarf/dwarf.npcs.toml b/data/entity/npc/humanoid/dwarf/dwarf.npcs.toml index f088d4f308..ddf1d4fb1f 100644 --- a/data/entity/npc/humanoid/dwarf/dwarf.npcs.toml +++ b/data/entity/npc/humanoid/dwarf/dwarf.npcs.toml @@ -34,6 +34,7 @@ slayer_xp = 16.0 drop_table = "dwarf" categories = ["dwarves"] examine = "Loves mining." +magic_defence = 5 [dwarf_hammer] id = 120 @@ -48,6 +49,7 @@ slayer_xp = 26.0 drop_table = "dwarf" categories = ["dwarves"] examine = "Loves mining, mountains and mining mountains." +magic_defence = 5 [dwarf_mining_guild] id = 3219 @@ -62,10 +64,12 @@ slayer_xp = 16.0 drop_table = "dwarf" categories = ["dwarves"] examine = "Loves mining." +magic_defence = 5 [dwarf_mining_guild_hammer] id = 3220 clone = "dwarf_mining_guild" +magic_defence = 10 [dwarf_mining_guild_earrings] id = 3221 @@ -76,30 +80,40 @@ examine = "Loves mining." id = 3268 clone = "dwarf_mining_guild" examine = "A dwarven worker." +range_defence = 10 [dwarf_dwarven_mines_wrench] id = 3269 clone = "dwarf_mining_guild" +range_defence = 10 [dwarf_dwarven_mines_wrench_apron_green] id = 3270 clone = "dwarf_mining_guild" +slash_defence = 10 +crush_defence = 10 +magic_defence = 10 +range_defence = 20 [dwarf_dwarven_mines_pickaxe] id = 3271 clone = "dwarf_mining_guild" +range_defence = 10 [dwarf_dwarven_mines_pickaxe_green] id = 3272 clone = "dwarf" +range_defence = 10 [dwarf_dwarven_mines_wrench_green] id = 3273 clone = "dwarf_mining_guild" +range_defence = 10 [dwarf_dwarven_mines_red] id = 3274 clone = "dwarf_mining_guild" +range_defence = 10 [dwarf_dwarven_mines_old] id = 3275 @@ -114,6 +128,8 @@ slayer_xp = 10.0 drop_table = "dwarf" categories = ["dwarves"] examine = "A dwarven worker." +magic_defence = 5 +range_defence = 10 [chaos_dwarf] id = 119 @@ -129,3 +145,8 @@ slayer_xp = 61.0 drop_table = "chaos_dwarf" categories = ["chaos_dwarf", "dwarves"] examine = "A dwarf gone bad." +stab_defence = 40 +slash_defence = 34 +crush_defence = 25 +magic_defence = 10 +range_defence = 35 diff --git a/data/entity/npc/humanoid/thug/thug.npcs.toml b/data/entity/npc/humanoid/thug/thug.npcs.toml index f8840b8e26..077553226f 100644 --- a/data/entity/npc/humanoid/thug/thug.npcs.toml +++ b/data/entity/npc/humanoid/thug/thug.npcs.toml @@ -10,6 +10,9 @@ respawn_delay = 50 drop_table = "thug" categories = ["thug"] examine = "Low on brains, high on aggression." +stab_defence = 2 +slash_defence = 3 +crush_defence = 3 [thug_1] id = 7107 diff --git a/data/entity/npc/monster/cave/cave_bug/cave_bug.npcs.toml b/data/entity/npc/monster/cave/cave_bug/cave_bug.npcs.toml index 50b0b5f8be..43ba8ea38c 100644 --- a/data/entity/npc/monster/cave/cave_bug/cave_bug.npcs.toml +++ b/data/entity/npc/monster/cave/cave_bug/cave_bug.npcs.toml @@ -12,6 +12,11 @@ respawn_delay = 35 hunt_mode = "cowardly" categories = ["cave_bugs"] examine = "A nasty crawling critter." +stab_defence = 10 +slash_defence = 10 +crush_defence = 5 +magic_defence = 5 +range_defence = 10 [cave_bug_green] id = 5750 @@ -25,4 +30,9 @@ slayer_xp = 93.0 slayer_level = 7 respawn_delay = 15 categories = ["cave_bugs"] -examine = "A big, smelly cave dweller." \ No newline at end of file +examine = "A big, smelly cave dweller." +stab_defence = 72 +slash_defence = 59 +crush_defence = 35 +magic_defence = 25 +range_defence = 95 \ No newline at end of file diff --git a/data/entity/npc/monster/dagannoth/dagannoth.npcs.toml b/data/entity/npc/monster/dagannoth/dagannoth.npcs.toml index f7d0c00b2e..ae75240906 100644 --- a/data/entity/npc/monster/dagannoth/dagannoth.npcs.toml +++ b/data/entity/npc/monster/dagannoth/dagannoth.npcs.toml @@ -33,6 +33,8 @@ drop_table = "dagannoth_lighthouse" categories = ["dagannoth"] respawn_delay = 30 examine = "A horror from the ocean depths..." +magic_defence = 50 +range_defence = 50 [dagannoth_lighthouse_melee_92_1] clone = "dagannoth_lighthouse_melee_92" @@ -56,10 +58,16 @@ drop_table = "dagannoth_waterbirth" categories = ["dagannoth"] respawn_delay = 30 examine = "A horror from the ocean depths..." +stab_defence = -10 +slash_defence = 10 +crush_defence = 90 +magic_defence = 200 +range_defence = 150 [dagannoth_waterbirth_range_88_2] clone = "dagannoth_waterbirth_range_88" id = 2887 +stab_defence = 10 [dagannoth_waterbirth_range_88_3] clone = "dagannoth_waterbirth_range_88" @@ -87,6 +95,11 @@ drop_table = "dagannoth_waterbirth" categories = ["dagannoth"] respawn_delay = 30 examine = "A horror from the ocean depths..." +stab_defence = 50 +slash_defence = 50 +crush_defence = 50 +magic_defence = 50 +range_defence = 50 [dagannoth_waterbirth_melee_90_1] clone = "dagannoth_waterbirth_melee_90" diff --git a/data/entity/npc/monster/demon/demons.npcs.toml b/data/entity/npc/monster/demon/demons.npcs.toml index 60fb3be5e0..fc7d80a77f 100644 --- a/data/entity/npc/monster/demon/demons.npcs.toml +++ b/data/entity/npc/monster/demon/demons.npcs.toml @@ -26,6 +26,7 @@ respawn_delay = 15 hunt_mode = "aggressive" height = 60 examine = "Big, red, and incredibly evil." +magic_defence = -10 [greater_demon_2] id = 4698 @@ -55,6 +56,7 @@ hunt_mode = "aggressive" categories = ["demons", "lesser_demons"] respawn_delay = 30 examine = "Lesser, but still pretty big." +magic_defence = -10 [lesser_demon_2] clone = "lesser_demon" @@ -90,6 +92,7 @@ respawn_delay = 30 hunt_mode = "aggressive" height = 60 examine = "A big, scary, jet-black demon." +magic_defence = -10 [black_demon_1] id = 4702 diff --git a/data/entity/npc/monster/draconic/dragons.npcs.toml b/data/entity/npc/monster/draconic/dragons.npcs.toml index 6aed981a2a..4395064dfc 100644 --- a/data/entity/npc/monster/draconic/dragons.npcs.toml +++ b/data/entity/npc/monster/draconic/dragons.npcs.toml @@ -12,6 +12,11 @@ slayer_xp = 125.0 categories = ["dragons", "bronze_dragons"] respawn_delay = 30 examine = "Its scales seem to be made of bronze." +stab_defence = 50 +slash_defence = 70 +crush_defence = 70 +magic_defence = 30 +range_defence = 90 [black_dragon] id = 54 @@ -28,6 +33,11 @@ slayer_xp = 199.5 categories = ["dragons", "black_dragons"] respawn_delay = 30 examine = "A fierce dragon with black scales!" +stab_defence = 50 +slash_defence = 70 +crush_defence = 70 +magic_defence = 60 +range_defence = 50 [black_dragon_dark] id = 4673 @@ -48,6 +58,11 @@ slayer_xp = 107.6 categories = ["dragons", "blue_dragons"] respawn_delay = 30 examine = "A mother dragon." +stab_defence = 50 +slash_defence = 70 +crush_defence = 70 +magic_defence = 60 +range_defence = 50 [blue_dragon_ocean] id = 4681 @@ -79,6 +94,11 @@ slayer_xp = 75.0 categories = ["dragons", "green_dragons"] respawn_delay = 30 examine = "Must be related to Elvarg." +stab_defence = 20 +slash_defence = 40 +crush_defence = 40 +magic_defence = 30 +range_defence = 20 [green_dragon_1] id = 4677 @@ -114,6 +134,11 @@ slayer_xp = 173.2 categories = ["dragons", "iron_dragons"] respawn_delay = 30 examine = "Its scales seem to be made of iron." +stab_defence = 50 +slash_defence = 70 +crush_defence = 70 +magic_defence = 30 +range_defence = 90 [steel_dragon] id = 1592 @@ -129,6 +154,11 @@ slayer_xp = 220.5 categories = ["dragons", "steel_dragons"] respawn_delay = 30 examine = "Its scales seem to be made of steel." +stab_defence = 50 +slash_defence = 70 +crush_defence = 70 +magic_defence = 30 +range_defence = 90 [red_dragon] id = 53 @@ -144,6 +174,11 @@ drop_table = "red_dragon" categories = ["dragons", "red_dragons"] respawn_delay = 30 examine = "Its scales seem to be made of iron." +stab_defence = 50 +slash_defence = 70 +crush_defence = 70 +magic_defence = 60 +range_defence = 50 [red_dragon_orange] id = 4669 @@ -172,6 +207,11 @@ drop_table = "baby_dragon" categories = ["dragons", "dragon_dragons"] respawn_delay = 30 examine = "Young but still dangerous." +stab_defence = 30 +slash_defence = 50 +crush_defence = 50 +magic_defence = 40 +range_defence = 30 [baby_red_dragon_1] id = 4667 @@ -196,6 +236,11 @@ drop_table = "baby_dragon" categories = ["dragons", "black_dragons"] respawn_delay = 30 examine = "Young but still dangerous." +stab_defence = 30 +slash_defence = 50 +crush_defence = 50 +magic_defence = 40 +range_defence = 30 [baby_blue_dragon] id = 52 @@ -211,6 +256,11 @@ drop_table = "baby_dragon" categories = ["dragons", "blue_dragons"] respawn_delay = 30 examine = "Young but still dangerous." +stab_defence = 30 +slash_defence = 50 +crush_defence = 50 +magic_defence = 40 +range_defence = 30 [baby_blue_dragon_1] id = 4665 diff --git a/data/entity/npc/monster/fiend/icefiend/icefiend.npcs.toml b/data/entity/npc/monster/fiend/icefiend/icefiend.npcs.toml index 1388efd2e2..502cbc0552 100644 --- a/data/entity/npc/monster/fiend/icefiend/icefiend.npcs.toml +++ b/data/entity/npc/monster/fiend/icefiend/icefiend.npcs.toml @@ -29,6 +29,11 @@ att = 10 str = 10 def = 12 max_hit_magic = 20 +stab_defence = 10 +slash_defence = 100 +crush_defence = 100 +magic_defence = 10 +range_defence = 10 [icefiend_god_wars] id = 3406 diff --git a/data/entity/npc/monster/giant/fire_giant/fire_giant.npcs.toml b/data/entity/npc/monster/giant/fire_giant/fire_giant.npcs.toml index 05106b0559..a6321a8a1f 100644 --- a/data/entity/npc/monster/giant/fire_giant/fire_giant.npcs.toml +++ b/data/entity/npc/monster/giant/fire_giant/fire_giant.npcs.toml @@ -11,6 +11,8 @@ slayer_xp = 111.0 drop_table = "fire_giant" categories = ["fire_giants"] examine = "His beard seems to have a life of its own." +slash_defence = 3 +crush_defence = 2 [fire_giant_sword] id = 1583 diff --git a/data/entity/npc/monster/giant/ice_giant/ice_giant.npcs.toml b/data/entity/npc/monster/giant/ice_giant/ice_giant.npcs.toml index 2f2b964da1..0c87c02e10 100644 --- a/data/entity/npc/monster/giant/ice_giant/ice_giant.npcs.toml +++ b/data/entity/npc/monster/giant/ice_giant/ice_giant.npcs.toml @@ -12,6 +12,8 @@ respawn_delay = 30 categories = ["ice_giants"] slayer_xp = 70.0 examine = "He's got icicles in his beard." +slash_defence = 3 +crush_defence = 2 [ice_giant_beard] id = 3072 diff --git a/data/entity/npc/monster/goblin/goblin.npcs.toml b/data/entity/npc/monster/goblin/goblin.npcs.toml index dc1a1405bb..cda595f841 100644 --- a/data/entity/npc/monster/goblin/goblin.npcs.toml +++ b/data/entity/npc/monster/goblin/goblin.npcs.toml @@ -12,6 +12,11 @@ categories = ["goblins"] height = 30 large_head = true examine = "An ugly, orange creature." +stab_defence = -28 +slash_defence = -28 +crush_defence = -28 +magic_defence = -28 +range_defence = -28 [grubfoot_brown] id = 4496 @@ -49,6 +54,11 @@ drop_table = "goblin" categories = ["goblins"] height = 30 examine = "An ugly green creature." +stab_defence = -15 +slash_defence = -15 +crush_defence = -15 +magic_defence = -15 +range_defence = -15 [goblin_mohawk_grey] clone = "goblin_mohawk_blue" @@ -143,6 +153,11 @@ clone = "goblin_shield_battleaxe_green" [goblin_light_grey_bald] clone = "goblin_mohawk_blue" id = 12353 +stab_defence = -51 +slash_defence = -51 +crush_defence = -51 +magic_defence = -51 +range_defence = -51 [goblin_turquoise_topless_mohawk] clone = "goblin_mohawk_blue" @@ -151,6 +166,11 @@ id = 12354 [goblin_light_brown_bald] clone = "goblin_mohawk_blue" id = 12355 +stab_defence = -51 +slash_defence = -51 +crush_defence = -51 +magic_defence = -51 +range_defence = -51 [goblin_turquoise_grey_ponytail] clone = "goblin_mohawk_blue" @@ -159,6 +179,11 @@ id = 12356 [goblin_light_grey_helmet] clone = "goblin_mohawk_blue" id = 12357 +stab_defence = -51 +slash_defence = -51 +crush_defence = -51 +magic_defence = -51 +range_defence = -51 [goblin_light_grey_hat] clone = "goblin_mohawk_blue" @@ -175,6 +200,11 @@ id = 12360 [goblin_light_grey_bald_spear] clone = "goblin_orange_hat_spear" id = 12361 +stab_defence = -15 +slash_defence = -15 +crush_defence = -15 +magic_defence = -15 +range_defence = -15 [stronghold_of_security_goblin_armed] id = 4407 @@ -205,6 +235,11 @@ height = 30 drop_table = "stronghold_goblin" categories = ["goblins"] examine = "An ugly green creature." +stab_defence = 4 +slash_defence = 6 +crush_defence = 8 +magic_defence = 4 +range_defence = 4 [stronghold_of_security_goblin_green_hat] id = 4409 @@ -251,6 +286,11 @@ height = 30 drop_table = "stronghold_goblin" categories = ["goblins"] examine = "These goblins have grown strong." +stab_defence = 14 +slash_defence = 16 +crush_defence = 18 +magic_defence = 14 +range_defence = 14 [stronghold_of_security_goblin_green_helmet] id = 4412 diff --git a/data/entity/npc/monster/goblin/hobgoblin/hobgoblin.npcs.toml b/data/entity/npc/monster/goblin/hobgoblin/hobgoblin.npcs.toml index 7218695b38..9c67329841 100644 --- a/data/entity/npc/monster/goblin/hobgoblin/hobgoblin.npcs.toml +++ b/data/entity/npc/monster/goblin/hobgoblin/hobgoblin.npcs.toml @@ -52,6 +52,8 @@ combat_def = "poh_hobgoblin" drop_table = "hobgoblin" categories = ["hobgoblins"] examine = "He doesn't look very welcoming." +stab_defence = 1 +slash_defence = 1 [hobgoblin_god_wars] id = 6275 diff --git a/data/entity/npc/monster/imp/imp.npcs.toml b/data/entity/npc/monster/imp/imp.npcs.toml index 7a342f38fa..2af435c304 100644 --- a/data/entity/npc/monster/imp/imp.npcs.toml +++ b/data/entity/npc/monster/imp/imp.npcs.toml @@ -7,6 +7,11 @@ respawn_delay = 60 drop_table = "imp" categories = ["imp"] examine = "A cheeky little imp." +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 [imp_god_wars] id = 6211 @@ -22,3 +27,8 @@ god = "zamorak" hunt_mode = "zamorak_aggressive" examine = "Have you checked your pockets lately?" drop_table = "imp" +stab_defence = -42 +slash_defence = -42 +crush_defence = -42 +magic_defence = -42 +range_defence = -42 diff --git a/data/entity/npc/monster/reptile/lizard/lizard.npcs.toml b/data/entity/npc/monster/reptile/lizard/lizard.npcs.toml index 29c8ef2821..8c97df2be3 100644 --- a/data/entity/npc/monster/reptile/lizard/lizard.npcs.toml +++ b/data/entity/npc/monster/reptile/lizard/lizard.npcs.toml @@ -13,6 +13,10 @@ hunt_mode = "cowardly" drop_table = "lizard" categories = ["lizards"] examine = "Run away, it's massive!" +stab_defence = 5 +slash_defence = 15 +crush_defence = 15 +range_defence = 5 [small_lizard_green] id = 2807 @@ -29,6 +33,8 @@ immune_death = true drop_table = "small_lizard" categories = ["lizards"] examine = "A small cold-blooded creature, partial to warmth." +slash_defence = 5 +crush_defence = 5 [small_lizard_orange] id = 2808 @@ -50,6 +56,10 @@ drop_table = "desert_lizard" hunt_mode = "cowardly" categories = ["lizards"] examine = "A cold-blooded creature, partial to warmth." +stab_defence = 5 +slash_defence = 15 +crush_defence = 15 +range_defence = 5 [desert_lizard_yellow] id = 2805 diff --git a/data/entity/npc/monster/reptile/scorpion/scorpion.npcs.toml b/data/entity/npc/monster/reptile/scorpion/scorpion.npcs.toml index 7a624695ff..f3d650416d 100644 --- a/data/entity/npc/monster/reptile/scorpion/scorpion.npcs.toml +++ b/data/entity/npc/monster/reptile/scorpion/scorpion.npcs.toml @@ -11,6 +11,10 @@ slayer_xp = 17.0 drop_table = "scorpion" categories = ["scorpions"] examine = "An extremely vicious scorpion." +stab_defence = 5 +slash_defence = 15 +crush_defence = 15 +range_defence = 5 [poison_scorpion] id = 108 @@ -25,6 +29,10 @@ slayer_xp = 23.0 drop_table = "scorpion" categories = ["scorpions"] examine = "It has a very vicious looking tail." +stab_defence = 5 +slash_defence = 15 +crush_defence = 15 +range_defence = 5 [pit_scorpion] id = 109 @@ -39,6 +47,8 @@ slayer_xp = 32.0 drop_table = "scorpion" categories = ["scorpions"] examine = "Tiny, annoying, stinging thing." +slash_defence = 5 +crush_defence = 5 [king_scorpion] id = 144 @@ -54,6 +64,10 @@ slayer_xp = 30.0 drop_table = "scorpion" categories = ["scorpions"] examine = "Wow! Scorpions shouldn't grow that big." +stab_defence = 5 +slash_defence = 15 +crush_defence = 15 +range_defence = 5 [khazard_scorpion] id = 271 @@ -68,6 +82,10 @@ slayer_xp = 30.0 drop_table = "scorpion" categories = ["scorpions"] examine = "A large angry scorpion." +stab_defence = 5 +slash_defence = 15 +crush_defence = 15 +range_defence = 5 [grave_scorpion] id = 493 @@ -83,6 +101,8 @@ slayer_xp = 7.0 drop_table = "scorpion" categories = ["scorpions"] examine = "A vicious, little, stinging thing." +slash_defence = 3 +crush_defence = 3 [scorpion_stronghold_of_security] id = 4402 @@ -98,6 +118,10 @@ slayer_xp = 55.0 drop_table = "scorpion" categories = ["scorpions"] examine = "An extremely vicious scorpion." +stab_defence = 5 +slash_defence = 15 +crush_defence = 15 +range_defence = 55 [scorpion_stronghold_of_security_red] id = 4403 @@ -112,4 +136,9 @@ respawn_delay = 25 slayer_xp = 37.0 drop_table = "scorpion" categories = ["scorpions"] -examine = "An extremely vicious scorpion." \ No newline at end of file +examine = "An extremely vicious scorpion." +stab_defence = 35 +slash_defence = 15 +crush_defence = 15 +magic_defence = 30 +range_defence = 35 \ No newline at end of file diff --git a/data/entity/npc/monster/reptile/spider/spider.npcs.toml b/data/entity/npc/monster/reptile/spider/spider.npcs.toml index b13f5ac3f1..615d921c94 100644 --- a/data/entity/npc/monster/reptile/spider/spider.npcs.toml +++ b/data/entity/npc/monster/reptile/spider/spider.npcs.toml @@ -10,6 +10,11 @@ max_hit_stab = 1 categories = ["spiders"] height = 10 examine = "Incey wincey." +stab_defence = -53 +slash_defence = -53 +crush_defence = -53 +magic_defence = -53 +range_defence = -53 [giant_spider] id = 59 @@ -25,6 +30,11 @@ categories = ["giant_spiders", "spiders"] height = 10 ##From wiki: 12 October 2010 The examine text of giant spiders outside of the Stronghold of Security have has their examines changed to say "magically modified" instead of "genetically modified". examine = "I think this spider has been magically modified." +stab_defence = -10 +slash_defence = -10 +crush_defence = -10 +magic_defence = -10 +range_defence = -10 [giant_spider_mid] id = 60 @@ -58,6 +68,11 @@ categories = ["giant_spiders", "spiders"] height = 10 examine = "I think this spider has been genetically modified." drop_table = "giant_spider" +stab_defence = 10 +slash_defence = 10 +crush_defence = 10 +magic_defence = 10 +range_defence = 10 [deadly_red_spider] id = 63 @@ -72,6 +87,11 @@ slayer_xp = 35.0 categories = ["giant_spiders", "spiders"] height = 10 examine = "I think this spider has been magically modified." +stab_defence = 15 +slash_defence = 16 +crush_defence = 7 +magic_defence = 12 +range_defence = 16 [poison_spider] id = 134 @@ -86,6 +106,11 @@ categories = ["spiders"] height = 10 examine = "I think this spider has been magically modified." drop_table = "poison_spider" +stab_defence = 20 +slash_defence = 17 +crush_defence = 10 +magic_defence = 14 +range_defence = 14 [spider_underground_pass] id = 1004 @@ -106,6 +131,11 @@ slayer_xp = 22.0 height = 10 categories = ["spiders"] examine = "Incey wincey... with a nasty bite." +stab_defence = 53 +slash_defence = 53 +crush_defence = 53 +magic_defence = 53 +range_defence = 53 [spider_haunted_woods] id = 1221 diff --git a/data/entity/npc/monster/turoth/turoth.npcs.toml b/data/entity/npc/monster/turoth/turoth.npcs.toml index baee9b3227..b1196a948b 100644 --- a/data/entity/npc/monster/turoth/turoth.npcs.toml +++ b/data/entity/npc/monster/turoth/turoth.npcs.toml @@ -12,6 +12,8 @@ immune_cannon = true respawn_delay = 15 drop_table = "turoth" examine = "He's one big leg short!" +slash_defence = 20 +crush_defence = 20 [turoth_level_87] id = 1626 diff --git a/data/entity/npc/monster/undead/corpse/corpse.npcs.toml b/data/entity/npc/monster/undead/corpse/corpse.npcs.toml index 983197bcb8..4836b74ba3 100644 --- a/data/entity/npc/monster/undead/corpse/corpse.npcs.toml +++ b/data/entity/npc/monster/undead/corpse/corpse.npcs.toml @@ -6,6 +6,11 @@ respawn_delay = 60 drop_table = "corpse_spider" categories = ["corpse_spider"] examine = "Could do with gaining a few pounds." +stab_defence = -26 +slash_defence = -26 +crush_defence = -26 +magic_defence = -26 +range_defence = -26 [crawling_corpse_torso] id = 7916 diff --git a/data/entity/npc/monster/undead/ghost/ghost.npcs.toml b/data/entity/npc/monster/undead/ghost/ghost.npcs.toml index 65cb0e2c6c..6c04642801 100644 --- a/data/entity/npc/monster/undead/ghost/ghost.npcs.toml +++ b/data/entity/npc/monster/undead/ghost/ghost.npcs.toml @@ -11,6 +11,11 @@ hunt_mode = "cowardly" categories = ["ghosts", "undead"] examine = "Eeek! A ghost!" drop_table = "empty" +stab_defence = 5 +slash_defence = 5 +crush_defence = 5 +magic_defence = -5 +range_defence = 5 [ghost] id = 103 @@ -87,6 +92,11 @@ slayer_xp = 80.0 categories = ["ghosts", "undead"] examine = "Eeek! A ghost!" drop_table = "empty" +stab_defence = 55 +slash_defence = 55 +crush_defence = 5 +magic_defence = 55 +range_defence = 55 [stronghold_ghost] id = 4387 @@ -100,6 +110,10 @@ clone = "stronghold_ghost_hair" hitpoints = 750 slayer_xp = 75.0 drop_table = "empty" +stab_defence = 45 +slash_defence = 45 +magic_defence = -5 +range_defence = 45 [stronghold_ghost_hood] id = 5370 diff --git a/data/entity/npc/monster/undead/magic_axe/magic_axe.npcs.toml b/data/entity/npc/monster/undead/magic_axe/magic_axe.npcs.toml index a225e89f4a..d41f5291af 100644 --- a/data/entity/npc/monster/undead/magic_axe/magic_axe.npcs.toml +++ b/data/entity/npc/monster/undead/magic_axe/magic_axe.npcs.toml @@ -10,4 +10,9 @@ respawn_delay = 30 drop_table = "magic_axe" hunt_mode = "cowardly" categories = ["magic_axe", "undead"] -examine = "A magic axe with a mind of its own." \ No newline at end of file +examine = "A magic axe with a mind of its own." +stab_defence = 10 +slash_defence = 5 +crush_defence = 15 +magic_defence = 5 +range_defence = 10 \ No newline at end of file diff --git a/data/entity/npc/monster/undead/skeleton/skeletons.npcs.toml b/data/entity/npc/monster/undead/skeleton/skeletons.npcs.toml index ab9a84586a..1c2a1396a7 100644 --- a/data/entity/npc/monster/undead/skeleton/skeletons.npcs.toml +++ b/data/entity/npc/monster/undead/skeleton/skeletons.npcs.toml @@ -23,6 +23,11 @@ respawn_delay = 60 categories = ["skeletons", "undead"] slayer_xp = 17.0 examine = "Could do with gaining a few pounds." +stab_defence = 9 +slash_defence = 11 +crush_defence = -2 +magic_defence = 1 +range_defence = 4 [skeleton_flail] clone = "skeleton_mace_shield" @@ -60,6 +65,10 @@ respawn_delay = 70 slayer_xp = 29.0 categories = ["skeletons", "undead"] examine = "Could do with gaining a few pounds." +stab_defence = 5 +slash_defence = 5 +crush_defence = -5 +range_defence = 5 [skeleton_shield_helmet] clone = "skeleton_unarmed" @@ -76,6 +85,11 @@ id = 5332 [skeleton_builder] clone = "skeleton_unarmed" id = 3291 +stab_defence = 9 +slash_defence = 11 +crush_defence = -2 +magic_defence = 1 +range_defence = 4 [skeleton_helmet] id = 5335 @@ -92,6 +106,10 @@ respawn_delay = 70 slayer_xp = 24.0 categories = ["skeletons", "undead"] examine = "Could do with gaining a few pounds." +stab_defence = 5 +slash_defence = 5 +crush_defence = -5 +range_defence = 5 [skeleton_unarmed_1] clone = "skeleton_helmet" @@ -115,6 +133,11 @@ respawn_delay = 60 categories = ["skeletons", "undead"] examine = "Could do with gaining a few pounds." drop_table = "skeleton" +stab_defence = 79 +slash_defence = 31 +crush_defence = 20 +magic_defence = 5 +range_defence = 70 [skeleton_sword_shield_85] clone = "skeleton_axe_shield_85" @@ -125,6 +148,11 @@ drop_table = "skeleton" clone = "skeleton_axe_shield_85" id = 93 drop_table = "skeleton" +stab_defence = 9 +slash_defence = 11 +crush_defence = -2 +magic_defence = 1 +range_defence = 4 [stronghold_skeleton_round_shield] id = 4384 @@ -139,6 +167,10 @@ slayer_xp = 70.0 hunt_mode = "cowardly" categories = ["skeletons", "undead"] examine = "Could do with gaining a few pounds." +stab_defence = 35 +slash_defence = 35 +crush_defence = -5 +range_defence = 35 [stronghold_skeleton_helmet] clone = "skeleton_axe_shield_85" @@ -154,11 +186,19 @@ slayer_xp = 70.0 hunt_mode = "cowardly" categories = ["skeletons", "undead"] examine = "Could do with gaining a few pounds." +stab_defence = 35 +slash_defence = 35 +crush_defence = -5 +range_defence = 35 [skeleton_hammer_shield] clone = "stronghold_skeleton_helmet" id = 4386 drop_table = "skeleton" +stab_defence = 79 +slash_defence = 31 +crush_defence = 20 +range_defence = 70 [stronghold_skeleton_unarmed] clone = "stronghold_skeleton_helmet" @@ -179,3 +219,8 @@ hunt_mode = "aggressive" drop_table = "skeleton_catacombs" categories = ["skeletons", "undead"] examine = "It rattles when it moves." +stab_defence = -22 +slash_defence = -22 +crush_defence = -22 +magic_defence = -22 +range_defence = -22 diff --git a/data/entity/npc/monster/undead/warped/warped.npcs.toml b/data/entity/npc/monster/undead/warped/warped.npcs.toml index e0917c0f79..84bfdef9ac 100644 --- a/data/entity/npc/monster/undead/warped/warped.npcs.toml +++ b/data/entity/npc/monster/undead/warped/warped.npcs.toml @@ -15,6 +15,11 @@ respawn_delay = 60 drop_table = "warped_bat" categories = ["warped_bat"] examine = "Could do with gaining a few pounds." +stab_defence = -21 +slash_defence = -21 +crush_defence = -21 +magic_defence = -21 +range_defence = -21 [warped_fly] id = 7915 diff --git a/data/entity/npc/monster/undead/zombie/zombie.npcs.toml b/data/entity/npc/monster/undead/zombie/zombie.npcs.toml index c9202a7710..2c72d32d44 100644 --- a/data/entity/npc/monster/undead/zombie/zombie.npcs.toml +++ b/data/entity/npc/monster/undead/zombie/zombie.npcs.toml @@ -109,11 +109,21 @@ examine = "The walking dead." id = 75 clone = "zombie_yellow_shirt" combat_def = "zombie_sword" +stab_defence = 9 +slash_defence = 8 +crush_defence = 12 +magic_defence = 10 +range_defence = 11 [zombie_armour_green_shorts_sword] id = 5314 clone = "zombie_yellow_shirt" combat_def = "zombie_sword" +stab_defence = 9 +slash_defence = 8 +crush_defence = 12 +magic_defence = 10 +range_defence = 11 [zombie_armour_grey_shorts_sword] id = 5315 @@ -124,6 +134,11 @@ att = 8 str = 9 def = 10 max_hit_crush = 20 +stab_defence = 9 +slash_defence = 8 +crush_defence = 12 +magic_defence = 10 +range_defence = 11 [zombie_red_outfit] id = 5311 @@ -141,26 +156,51 @@ clone = "zombie_yellow_shirt" id = 5316 clone = "zombie_yellow_shirt" combat_def = "zombie_sword" +stab_defence = 9 +slash_defence = 8 +crush_defence = 12 +magic_defence = 10 +range_defence = 11 [zombie_grey_suit_sword] id = 5318 clone = "zombie_yellow_shirt" combat_def = "zombie_sword" +stab_defence = 9 +slash_defence = 8 +crush_defence = 12 +magic_defence = 10 +range_defence = 11 [zombie_tan_trousers_axe_2] id = 5319 clone = "zombie_yellow_shirt" combat_def = "zombie_axe" +stab_defence = 9 +slash_defence = 8 +crush_defence = 12 +magic_defence = 10 +range_defence = 11 [zombie_tan_shorts_axe] id = 5320 clone = "zombie_yellow_shirt" combat_def = "zombie_axe" +stab_defence = 9 +slash_defence = 8 +crush_defence = 12 +magic_defence = 10 +range_defence = 11 [zombie_red_skirt_sword] id = 5321 clone = "zombie_yellow_shirt" combat_def = "zombie_sword" +stab_defence = 9 +slash_defence = 8 +crush_defence = 12 +magic_defence = 10 +range_defence = 11 [zombie_blue_skirt_sword_2] id = 5322 @@ -171,11 +211,21 @@ att = 8 str = 9 def = 10 max_hit_crush = 20 +stab_defence = 9 +slash_defence = 8 +crush_defence = 12 +magic_defence = 10 +range_defence = 11 [zombie_yellow_shirt_sword] id = 5323 clone = "zombie_yellow_shirt" combat_def = "zombie_sword" +stab_defence = 9 +slash_defence = 8 +crush_defence = 12 +magic_defence = 10 +range_defence = 11 [zombie_red_sword] id = 5324 @@ -213,6 +263,11 @@ respawn_delay = 35 slayer_xp = 30.0 categories = ["zombies", "undead"] examine = "The walking dead." +stab_defence = 10 +slash_defence = 8 +crush_defence = 12 +magic_defence = 10 +range_defence = 10 [zombie_entrana_armour] id = 5328 @@ -245,6 +300,11 @@ respawn_delay = 35 drop_table = "zombie_melzars_maze" categories = ["zombies", "undead"] examine = "Dead man walking." +stab_defence = 9 +slash_defence = 8 +crush_defence = 12 +magic_defence = 10 +range_defence = 11 [zombie_melzars_maze_strong] id = 6100 @@ -321,6 +381,11 @@ respawn_delay = 35 drop_table = "zombie" categories = ["zombies", "undead"] examine = "The walking dead." +stab_defence = 19 +slash_defence = 18 +crush_defence = 22 +magic_defence = 20 +range_defence = 21 [zombie_stronghold_of_security_male] id = 5380 @@ -344,6 +409,9 @@ hunt_mode = "cowardly" respawn_delay = 35 categories = ["zombies", "undead"] examine = "Could his name be 'Lurch'?" +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [zombie_tarns_lair_tan_boots] id = 5394 @@ -358,6 +426,9 @@ hunt_mode = "cowardly" respawn_delay = 35 categories = ["zombies", "undead"] examine = "Mostly 'armless." +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [zombie_tarns_lair_grey_boots] id = 5395 @@ -373,6 +444,9 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "Has anybody told him he's dead?" +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [zombie_tarns_lair_red_boots_hat] id = 5396 @@ -388,6 +462,9 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "Dave? Is that you?" +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [zombie_tarns_lair_tan_boots_hair] id = 5397 @@ -403,6 +480,9 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "Why don't zombies ever wash?" +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [zombie_tarns_lair_green_boots_hair] id = 5398 @@ -418,6 +498,9 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "A shambling pile of rotten flesh." +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [zombie_tarns_lair_red_top] id = 5399 @@ -433,6 +516,9 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "He needs lessons on walking." +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [zombie_tarns_lair_brown_top] id = 5400 @@ -448,6 +534,9 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "Fred, the undead." +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [zombie_tarns_lair_armour] id = 5401 @@ -463,6 +552,9 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "One of the undead." +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [zombie_tarns_lair_yellow_shirt] id = 5402 @@ -478,6 +570,9 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "A disgusting zombie." +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [zombie_tarns_lair_grey_shirt] id = 5403 @@ -493,6 +588,9 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "Somebody tell him he's already dead!" +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [zombie_tarns_lair_blue_shirt] id = 5404 @@ -508,6 +606,9 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "He sure looks grave." +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [zombie_tarns_lair_tan_trousers] id = 5405 @@ -523,6 +624,9 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "Can't a body get any rest around here?" +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [zombie_tarns_lair_grey_trousers] id = 5406 @@ -538,6 +642,9 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "At least he's not legless." +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [zombie_tarns_lair_green_trousers] id = 5407 @@ -553,6 +660,9 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "All skin and bones." +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [zombie_tarns_lair_brown_trousers] id = 5408 @@ -568,6 +678,9 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "All skin and bones." +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [zombie_tarns_lair_blue_trousers] id = 5409 @@ -583,6 +696,9 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "All skin and bones." +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [zombie_tarns_lair_light_grey_trousers] id = 5410 @@ -598,3 +714,6 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "Brains..." +stab_defence = 20 +slash_defence = 20 +range_defence = 10 diff --git a/data/entity/npc/monster/wallasalki/wallasalki.npcs.toml b/data/entity/npc/monster/wallasalki/wallasalki.npcs.toml index 3e5bffe07d..d3d8e35960 100644 --- a/data/entity/npc/monster/wallasalki/wallasalki.npcs.toml +++ b/data/entity/npc/monster/wallasalki/wallasalki.npcs.toml @@ -11,8 +11,14 @@ hunt_mode = "aggressive" categories = ["wallasalki"] respawn_delay = 25 examine = "A fearsome magical water creature." +stab_defence = 100 +slash_defence = 150 +crush_defence = 175 +magic_defence = 250 +range_defence = -10 [wallasalki_1] clone = "wallasalki" id = 2884 drop_table = "wallasalki" +range_defence = 10 diff --git a/data/entity/npc/monster/warrior/earth_warrior/earth_warrior.npcs.toml b/data/entity/npc/monster/warrior/earth_warrior/earth_warrior.npcs.toml index 0543cbafe8..d52be13ac8 100644 --- a/data/entity/npc/monster/warrior/earth_warrior/earth_warrior.npcs.toml +++ b/data/entity/npc/monster/warrior/earth_warrior/earth_warrior.npcs.toml @@ -10,4 +10,9 @@ respawn_delay = 30 drop_table = "earth_warrior" categories = ["earth_warrior"] slayer_xp = 54.0 -examine = "A strange, inhuman, elemental warrior." \ No newline at end of file +examine = "A strange, inhuman, elemental warrior." +stab_defence = 30 +slash_defence = 40 +crush_defence = 20 +magic_defence = 10 +range_defence = 30 \ No newline at end of file diff --git a/data/entity/npc/monster/warrior/ice_warrior/ice_warrior.npcs.toml b/data/entity/npc/monster/warrior/ice_warrior/ice_warrior.npcs.toml index fb5fd700c1..77732b09ea 100644 --- a/data/entity/npc/monster/warrior/ice_warrior/ice_warrior.npcs.toml +++ b/data/entity/npc/monster/warrior/ice_warrior/ice_warrior.npcs.toml @@ -11,6 +11,11 @@ categories = ["ice_warriors"] drop_table = "ice_warrior" slayer_xp = 59.0 examine = "A cold-hearted elemental warrior." +stab_defence = 30 +slash_defence = 40 +crush_defence = 20 +magic_defence = 10 +range_defence = 30 [ice_warrior_2] id = 3073 diff --git a/data/entity/npc/monster/werewolf/werewolf.npcs.toml b/data/entity/npc/monster/werewolf/werewolf.npcs.toml index 096d37b88a..e282a9af82 100644 --- a/data/entity/npc/monster/werewolf/werewolf.npcs.toml +++ b/data/entity/npc/monster/werewolf/werewolf.npcs.toml @@ -12,6 +12,11 @@ drop_table = "werewolf" categories = ["werewolf", "werewolves"] god = "zamorak" examine = "Down, fang!" +stab_defence = -21 +slash_defence = -21 +crush_defence = -21 +magic_defence = -21 +range_defence = -21 [werewolf_god_wars_male] id = 6213 diff --git a/data/minigame/barrows_brothers/barrows.npcs.toml b/data/minigame/barrows_brothers/barrows.npcs.toml index 5788ff250e..93791f8330 100644 --- a/data/minigame/barrows_brothers/barrows.npcs.toml +++ b/data/minigame/barrows_brothers/barrows.npcs.toml @@ -51,6 +51,11 @@ xp_bonus = 2.5 hunt_mode = "cowardly" categories = ["bosses"] examine = "A vengeful spirit corrupted by dark magic." +attack_bonus = 73 +stab_defence = 103 +slash_defence = 85 +crush_defence = 117 +magic_defence = 73 [dharok_the_wretched] id = 2026 @@ -62,6 +67,12 @@ combat_def = "dharok_the_wretched" xp_bonus = 1.5 categories = ["bosses"] examine = "A vengeful spirit corrupted by dark magic." +attack_bonus = 103 +stab_defence = 252 +slash_defence = 250 +crush_defence = 244 +magic_defence = -11 +range_defence = 249 [guthan_the_infested] id = 2027 @@ -74,6 +85,12 @@ xp_bonus = 1.5 hunt_mode = "cowardly" categories = ["bosses"] examine = "A vengeful spirit corrupted by dark magic." +attack_bonus = 75 +stab_defence = 259 +slash_defence = 257 +crush_defence = 241 +magic_defence = -11 +range_defence = 250 [karil_the_tainted] id = 2028 @@ -85,6 +102,12 @@ combat_def = "karil_the_tainted" hunt_mode = "cowardly" categories = ["bosses"] examine = "A vengeful spirit corrupted by dark magic." +attack_bonus = 134 +stab_defence = 79 +slash_defence = 71 +crush_defence = 90 +magic_defence = 106 +range_defence = 100 [torag_the_corrupted] id = 2029 @@ -97,6 +120,11 @@ xp_bonus = 12.5 hunt_mode = "cowardly" categories = ["bosses"] examine = "A vengeful spirit corrupted by dark magic." +attack_bonus = 82 +stab_defence = 221 +slash_defence = 235 +crush_defence = 222 +range_defence = 221 [verac_the_defiled] id = 2030 @@ -109,3 +137,8 @@ xp_bonus = 12.5 hunt_mode = "cowardly" categories = ["bosses"] examine = "A vengeful spirit corrupted by dark magic." +attack_bonus = 82 +stab_defence = 227 +slash_defence = 230 +crush_defence = 221 +range_defence = 225 diff --git a/data/minigame/soul_wars/soul_wars.npcs.toml b/data/minigame/soul_wars/soul_wars.npcs.toml index 5a93a16caf..962a32783f 100644 --- a/data/minigame/soul_wars/soul_wars.npcs.toml +++ b/data/minigame/soul_wars/soul_wars.npcs.toml @@ -22,6 +22,11 @@ str = 486 def = 835 max_hit_crush = 500 combat_def = "avatar_of_destruction" +stab_defence = 80 +slash_defence = 80 +crush_defence = 80 +magic_defence = 130 +range_defence = 80 [avatar_of_creation_soul_wars] id = 8597 @@ -33,6 +38,11 @@ str = 446 def = 939 max_hit_crush = 460 combat_def = "avatar_of_creation" +stab_defence = 80 +slash_defence = 80 +crush_defence = 80 +magic_defence = 130 +range_defence = 80 [pyrefiend_soul_wars] id = 8598 diff --git a/data/minigame/tai_bwo_wannai_cleanup/tai_bwo_wannai_cleanup.npcs.toml b/data/minigame/tai_bwo_wannai_cleanup/tai_bwo_wannai_cleanup.npcs.toml index b69f002b60..86fb6befac 100644 --- a/data/minigame/tai_bwo_wannai_cleanup/tai_bwo_wannai_cleanup.npcs.toml +++ b/data/minigame/tai_bwo_wannai_cleanup/tai_bwo_wannai_cleanup.npcs.toml @@ -8,6 +8,10 @@ max_hit_melee = 10 hunt_mode = "cowardly" drop_table = "mosquito" examine = "A flying bloodsucker." +stab_defence = 2 +slash_defence = 2 +crush_defence = 5 +magic_defence = 2 [mosquito_swarm_level_17] id = 2494 @@ -20,6 +24,10 @@ max_hit_melee = 10 hunt_mode = "cowardly" drop_table = "mosquito" examine = "A swarm of three highly agile mosquitoes." +stab_defence = 2 +slash_defence = 2 +crush_defence = 5 +magic_defence = 2 [mosquito_swarm_level_20] id = 2495 @@ -32,6 +40,10 @@ max_hit_melee = 10 hunt_mode = "cowardly" drop_table = "mosquito" examine = "A swarm of five highly agile mosquitoes." +stab_defence = 2 +slash_defence = 2 +crush_defence = 5 +magic_defence = 2 [broodoo_victim_green] id = 2499 diff --git a/data/minigame/warriors_guild/warriors_guild.npcs.toml b/data/minigame/warriors_guild/warriors_guild.npcs.toml index 5c66b15dc0..c44b925b89 100644 --- a/data/minigame/warriors_guild/warriors_guild.npcs.toml +++ b/data/minigame/warriors_guild/warriors_guild.npcs.toml @@ -138,6 +138,11 @@ attack_bonus = 4 immune_poison = true drop_table = "animated_bronze_armour" examine = "Animated bronze armour." +stab_defence = 50 +slash_defence = 25 +crush_defence = 19 +magic_defence = 400 +range_defence = 400 [animated_iron_armour] id = 4279 @@ -150,6 +155,11 @@ max_hit_melee = 30 attack_bonus = 4 drop_table = "animated_iron_armour" examine = "Animated iron armour." +stab_defence = 50 +slash_defence = 25 +crush_defence = 19 +magic_defence = 400 +range_defence = 400 [animated_steel_armour] id = 4280 @@ -163,6 +173,11 @@ attack_bonus = 4 immune_poison = true drop_table = "animated_steel_armour" examine = "Animated steel armour." +stab_defence = 50 +slash_defence = 25 +crush_defence = 19 +magic_defence = 400 +range_defence = 400 [animated_black_armour] id = 4281 @@ -176,6 +191,11 @@ attack_bonus = 4 immune_poison = true drop_table = "animated_black_armour" examine = "Animated black armour." +stab_defence = 50 +slash_defence = 25 +crush_defence = 19 +magic_defence = 400 +range_defence = 400 [animated_mithril_armour] id = 4282 @@ -189,6 +209,11 @@ attack_bonus = 4 immune_poison = true drop_table = "animated_mithril_armour" examine = "Animated mithril armour." +stab_defence = 50 +slash_defence = 25 +crush_defence = 19 +magic_defence = 400 +range_defence = 400 [animated_adamant_armour] id = 4283 @@ -202,6 +227,11 @@ attack_bonus = 4 immune_poison = true drop_table = "animated_adamant_armour" examine = "Animated adamant armour." +stab_defence = 50 +slash_defence = 25 +crush_defence = 19 +magic_defence = 400 +range_defence = 400 [animated_rune_armour] id = 4284 @@ -215,3 +245,8 @@ attack_bonus = 4 immune_poison = true drop_table = "animated_rune_armour" examine = "Animated rune armour." +stab_defence = 50 +slash_defence = 25 +crush_defence = 19 +magic_defence = 400 +range_defence = 400 diff --git a/data/quest/free/blood_pact/blood_pact.npcs.toml b/data/quest/free/blood_pact/blood_pact.npcs.toml index c9d2e57bdf..c7c6325ef4 100644 --- a/data/quest/free/blood_pact/blood_pact.npcs.toml +++ b/data/quest/free/blood_pact/blood_pact.npcs.toml @@ -48,6 +48,8 @@ categories = ["human"] combat_def = "kayle_attackable" hunt_mode = "aggressive" hunt_range = 5 +magic_defence = 10 +range_defence = 10 [kayle_defeated] id = 9629 diff --git a/data/quest/members/between_a_rock/between_a_rock.npcs.toml b/data/quest/members/between_a_rock/between_a_rock.npcs.toml index 948ab2dfc3..6b8be9e7f0 100644 --- a/data/quest/members/between_a_rock/between_a_rock.npcs.toml +++ b/data/quest/members/between_a_rock/between_a_rock.npcs.toml @@ -18,6 +18,11 @@ max_hit_melee = 130 xp_bonus = 2.5 hunt_mode = "cowardly" examine = "It is the avatar of the Arzinian Being of Bordanzan, representing magic." +stab_defence = 80 +slash_defence = 80 +crush_defence = 80 +magic_defence = 20 +range_defence = 15 [arzinian_avatar_of_magic_level_75] id = 1858 @@ -31,6 +36,11 @@ max_hit_melee = 80 xp_bonus = 0.0 hunt_mode = "cowardly" examine = "It is the avatar of the Arzinian Being of Bordanzan, representing magic." +stab_defence = 40 +slash_defence = 40 +crush_defence = 40 +magic_defence = 15 +range_defence = 10 [arzinian_avatar_of_ranging_invincible] id = 1853 @@ -53,6 +63,11 @@ xp_bonus = 2.5 ranged_strength = 10 hunt_mode = "cowardly" examine = "It is the avatar of the Arzinian Being of Bordanzan, representing ranging." +stab_defence = 15 +slash_defence = 15 +crush_defence = 15 +magic_defence = 80 +range_defence = 20 [arzinian_avatar_of_ranging_level_75] id = 1855 @@ -67,6 +82,11 @@ xp_bonus = 0.0 ranged_strength = 5 hunt_mode = "cowardly" examine = "It is the avatar of the Arzinian Being of Bordanzan, representing ranging." +stab_defence = 10 +slash_defence = 10 +crush_defence = 10 +magic_defence = 40 +range_defence = 15 [arzinian_avatar_of_strength_invincible] id = 1850 @@ -87,6 +107,11 @@ max_hit_melee = 110 xp_bonus = 2.5 hunt_mode = "cowardly" examine = "It is the avatar of the Arzinian Being of Bordanzan, representing strength." +stab_defence = 20 +slash_defence = 20 +crush_defence = 20 +magic_defence = 15 +range_defence = 80 [arzinian_avatar_of_strength_level_75] id = 1852 @@ -99,3 +124,8 @@ max_hit_melee = 70 xp_bonus = 0.0 hunt_mode = "cowardly" examine = "It is the avatar of the Arzinian Being of Bordanzan, representing strength." +stab_defence = 15 +slash_defence = 15 +crush_defence = 15 +magic_defence = 10 +range_defence = 40 diff --git a/data/quest/members/clock_tower/clock_tower_dungeon.npcs.toml b/data/quest/members/clock_tower/clock_tower_dungeon.npcs.toml index dc762bfae2..c4b2235f7e 100644 --- a/data/quest/members/clock_tower/clock_tower_dungeon.npcs.toml +++ b/data/quest/members/clock_tower/clock_tower_dungeon.npcs.toml @@ -21,6 +21,11 @@ str = 10 def = 9 attack_bonus = 6 max_hit_stab = 20 +stab_defence = 8 +slash_defence = 13 +crush_defence = 14 +magic_defence = 4 +range_defence = 9 [head_thief_clocktower_dungeon] id = 283 @@ -38,6 +43,11 @@ examine = "The head of the treacherous blanket stealing gang." drop_table = "head_thief" max_hit_slash = 30 combat_def = "head_thief" +stab_defence = 8 +slash_defence = 14 +crush_defence = 15 +magic_defence = 4 +range_defence = 9 [dungeon_rat_clocktower_dungeon_2] id = 4936 diff --git a/data/quest/members/contact/contact.npcs.toml b/data/quest/members/contact/contact.npcs.toml index dbb9d2ddff..839b1e4463 100644 --- a/data/quest/members/contact/contact.npcs.toml +++ b/data/quest/members/contact/contact.npcs.toml @@ -13,6 +13,11 @@ hunt_mode = "cowardly" slayer_xp = 137.0 categories = ["scabarites"] examine = "A huge scarab." +stab_defence = 70 +slash_defence = 99 +crush_defence = 99 +magic_defence = 159 +range_defence = 149 [giant_scarab] id = 6770 diff --git a/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml b/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml index 304926e617..b90828fdb6 100644 --- a/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml +++ b/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml @@ -31,6 +31,9 @@ str = 1 def = 115 range = 72 max_hit_range = 86 +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [armoured_zombie_defender_of_varrock_2] id = 8160 @@ -42,6 +45,9 @@ str = 1 def = 115 range = 72 max_hit_range = 86 +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [armoured_zombie_defender_of_varrock_3] id = 8161 @@ -53,6 +59,9 @@ str = 1 def = 115 range = 72 max_hit_range = 86 +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [armoured_zombie_defender_of_varrock_4] id = 8162 @@ -64,6 +73,9 @@ str = 1 def = 115 range = 72 max_hit_range = 86 +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [armoured_zombie_defender_of_varrock_5] id = 8163 @@ -75,6 +87,9 @@ str = 1 def = 115 range = 72 max_hit_range = 86 +stab_defence = 20 +slash_defence = 20 +range_defence = 10 [arrav_defender_of_varrock] id = 8169 diff --git a/data/quest/members/desert_treasure/desert_treasure.npcs.toml b/data/quest/members/desert_treasure/desert_treasure.npcs.toml index f0b198f1b6..ca376fbf53 100644 --- a/data/quest/members/desert_treasure/desert_treasure.npcs.toml +++ b/data/quest/members/desert_treasure/desert_treasure.npcs.toml @@ -34,6 +34,9 @@ max_hit_melee = 360 xp_bonus = 1.5 hunt_mode = "cowardly" examine = "Zamorak's warrior of fire." +stab_defence = 100 +slash_defence = 100 +crush_defence = 100 [flambeed_normal] id = 3494 @@ -47,6 +50,11 @@ attack_bonus = 100 xp_bonus = 7.5 hunt_mode = "cowardly" examine = "Will give you a beating as well as indigestion." +stab_defence = 50 +slash_defence = 50 +crush_defence = 5 +magic_defence = 5 +range_defence = 50 [kamil_normal] id = 1913 @@ -64,6 +72,9 @@ hunt_mode = "cowardly" slayer_xp = 146.0 categories = ["ice_warriors"] examine = "Ice warrior." +stab_defence = 35 +slash_defence = 60 +crush_defence = 35 [stranger_desert_treasure] id = 1919 diff --git a/data/quest/members/dwarf_cannon/dwarven_outpost.npcs.toml b/data/quest/members/dwarf_cannon/dwarven_outpost.npcs.toml index cfb010f3a9..34cf99e81c 100644 --- a/data/quest/members/dwarf_cannon/dwarven_outpost.npcs.toml +++ b/data/quest/members/dwarf_cannon/dwarven_outpost.npcs.toml @@ -22,6 +22,11 @@ str = 18 def = 14 attack_bonus = 4 max_hit_stab = 30 +stab_defence = 3 +slash_defence = 4 +crush_defence = 4 +magic_defence = 2 +range_defence = 3 [guard_dwarven_outpost_2] id = 4258 @@ -35,6 +40,11 @@ str = 18 def = 14 attack_bonus = 4 max_hit_stab = 30 +stab_defence = 3 +slash_defence = 4 +crush_defence = 4 +magic_defence = 2 +range_defence = 3 [goblin_dwarven_outpost] id = 4261 @@ -44,4 +54,9 @@ drop_table = "goblin" combat_def = "goblin" hitpoints = 50 max_hit_crush = 10 +stab_defence = -15 +slash_defence = -15 +crush_defence = -15 +magic_defence = -15 +range_defence = -15 diff --git a/data/quest/members/fremennik_isles/fremennik_isles.npcs.toml b/data/quest/members/fremennik_isles/fremennik_isles.npcs.toml index 89c6d415d0..d46476a064 100644 --- a/data/quest/members/fremennik_isles/fremennik_isles.npcs.toml +++ b/data/quest/members/fremennik_isles/fremennik_isles.npcs.toml @@ -11,3 +11,8 @@ hunt_mode = "cowardly" slayer_xp = 161.0 categories = ["trolls"] examine = "An impressive looking troll." +stab_defence = 45 +slash_defence = 45 +crush_defence = 45 +magic_defence = 2000 +range_defence = 2000 diff --git a/data/quest/members/fremennik_trials/fremennik_trials.npcs.toml b/data/quest/members/fremennik_trials/fremennik_trials.npcs.toml index 3b200c42f4..95aa9daff4 100644 --- a/data/quest/members/fremennik_trials/fremennik_trials.npcs.toml +++ b/data/quest/members/fremennik_trials/fremennik_trials.npcs.toml @@ -8,6 +8,11 @@ style = "melee" max_hit_melee = 30 hunt_mode = "cowardly" examine = "Your challenge awaits!" +stab_defence = 20 +slash_defence = 20 +crush_defence = 20 +magic_defence = 20 +range_defence = 20 [the_draugen] id = 1279 @@ -20,3 +25,8 @@ max_hit_melee = 70 xp_bonus = 2.5 hunt_mode = "cowardly" examine = "A fearful spirit of the drowned." +stab_defence = 100 +slash_defence = 100 +crush_defence = 100 +magic_defence = 500 +range_defence = 500 diff --git a/data/quest/members/ghosts_ahoy/ghosts_ahoy.npcs.toml b/data/quest/members/ghosts_ahoy/ghosts_ahoy.npcs.toml index f86b455380..8826631c8a 100644 --- a/data/quest/members/ghosts_ahoy/ghosts_ahoy.npcs.toml +++ b/data/quest/members/ghosts_ahoy/ghosts_ahoy.npcs.toml @@ -11,3 +11,7 @@ slayer_xp = 32.0 categories = ["scorpions"] drop_table = "giant_lobster_ghosts_ahoy" examine = "An extremely vicious lobster." +stab_defence = 5 +slash_defence = 15 +crush_defence = 15 +range_defence = 5 diff --git a/data/quest/members/grim_tales/grim_tales.npcs.toml b/data/quest/members/grim_tales/grim_tales.npcs.toml index f2e0af61ac..cc35b65b9f 100644 --- a/data/quest/members/grim_tales/grim_tales.npcs.toml +++ b/data/quest/members/grim_tales/grim_tales.npcs.toml @@ -10,6 +10,11 @@ max_hit_melee = 110 xp_bonus = 2.5 respawn_delay = 10 examine = "A very odd looking creature." +stab_defence = 45 +slash_defence = 70 +crush_defence = 60 +magic_defence = 60 +range_defence = 55 [glod_normal] id = 5996 @@ -23,3 +28,8 @@ xp_bonus = 0.5 hunt_mode = "cowardly" immune_poison = true examine = "A cloud giant." +stab_defence = 105 +slash_defence = 110 +crush_defence = 130 +magic_defence = 125 +range_defence = 100 diff --git a/data/quest/members/haunted_mine/abandoned_mine.npcs.toml b/data/quest/members/haunted_mine/abandoned_mine.npcs.toml index 4e3ca9341d..f60b6fcded 100644 --- a/data/quest/members/haunted_mine/abandoned_mine.npcs.toml +++ b/data/quest/members/haunted_mine/abandoned_mine.npcs.toml @@ -19,6 +19,11 @@ slayer_xp = 30.0 hunt_mode = "cowardly" categories = ["ghosts", "undead"] examine = "Eeek! A ghost!" +stab_defence = 5 +slash_defence = 5 +crush_defence = 5 +magic_defence = -5 +range_defence = 5 [haze_abandoned_mine] id = 1537 @@ -46,3 +51,8 @@ slayer_xp = 39.0 categories = ["skeletons"] drop_table = "skeletal_miner" examine = "I don't think the pickaxe is for hitting rocks." +stab_defence = 9 +slash_defence = 11 +crush_defence = -2 +magic_defence = 1 +range_defence = 4 diff --git a/data/quest/members/haunted_mine/haunted_mine.npcs.toml b/data/quest/members/haunted_mine/haunted_mine.npcs.toml index 21f427e973..d30a8a761f 100644 --- a/data/quest/members/haunted_mine/haunted_mine.npcs.toml +++ b/data/quest/members/haunted_mine/haunted_mine.npcs.toml @@ -30,6 +30,9 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 +stab_defence = 50 +slash_defence = 40 +range_defence = 40 [treus_dayth] id = 1540 @@ -45,3 +48,8 @@ slayer_xp = 100.0 categories = ["ghosts"] immune_poison = true examine = "Eeek! A big ghost!" +stab_defence = 5 +slash_defence = 5 +crush_defence = 5 +magic_defence = -5 +range_defence = 5 diff --git a/data/quest/members/monkey_madness/monkey_madness.npcs.toml b/data/quest/members/monkey_madness/monkey_madness.npcs.toml index bd82c8929b..6a4c0182b3 100644 --- a/data/quest/members/monkey_madness/monkey_madness.npcs.toml +++ b/data/quest/members/monkey_madness/monkey_madness.npcs.toml @@ -13,3 +13,5 @@ attack_bonus = 50 xp_bonus = 7.5 hunt_mode = "cowardly" examine = "A Greater Jungle Demon. A magical aura emanates from its hide." +slash_defence = 50 +magic_defence = 50 diff --git a/data/quest/members/mournings_end_part_2/mournings_end_part_2.npcs.toml b/data/quest/members/mournings_end_part_2/mournings_end_part_2.npcs.toml index 464f25b765..a4cce14208 100644 --- a/data/quest/members/mournings_end_part_2/mournings_end_part_2.npcs.toml +++ b/data/quest/members/mournings_end_part_2/mournings_end_part_2.npcs.toml @@ -4,6 +4,11 @@ categories = ["shadow_creatures"] examine = "A shadow." drop_table = "empty" hitpoints = 730 +stab_defence = 30 +slash_defence = 30 +crush_defence = 30 +magic_defence = 30 +range_defence = 30 [arianwyn] id = 8952 diff --git a/data/quest/members/my_arms_big_adventure/my_arms_big_adventure.npcs.toml b/data/quest/members/my_arms_big_adventure/my_arms_big_adventure.npcs.toml index ed1b6744c3..e344995feb 100644 --- a/data/quest/members/my_arms_big_adventure/my_arms_big_adventure.npcs.toml +++ b/data/quest/members/my_arms_big_adventure/my_arms_big_adventure.npcs.toml @@ -9,6 +9,7 @@ max_hit_melee = 80 slayer_xp = 50.0 categories = ["birds"] examine = "A mountain-dwelling bird. Cute, but vicious." +magic_defence = 150 [giant_roc_normal] id = 4972 @@ -26,3 +27,4 @@ slayer_xp = 250.0 categories = ["birds"] drop_table = "bones" examine = "A very, very large mountain-dwelling bird." +magic_defence = 150 diff --git a/data/quest/members/one_small_favour/one_small_favour.npcs.toml b/data/quest/members/one_small_favour/one_small_favour.npcs.toml index 0f92a0b73c..112095b03e 100644 --- a/data/quest/members/one_small_favour/one_small_favour.npcs.toml +++ b/data/quest/members/one_small_favour/one_small_favour.npcs.toml @@ -15,3 +15,8 @@ attack_bonus = 10 xp_bonus = 3.0 hunt_mode = "cowardly" examine = "This monster totally rocks!" +stab_defence = 50 +slash_defence = 50 +crush_defence = 5 +magic_defence = 5 +range_defence = 50 diff --git a/data/quest/members/plague_city/plague_city.npcs.toml b/data/quest/members/plague_city/plague_city.npcs.toml index 3a25cd5d08..fbbe0a6edf 100644 --- a/data/quest/members/plague_city/plague_city.npcs.toml +++ b/data/quest/members/plague_city/plague_city.npcs.toml @@ -15,6 +15,9 @@ drop_table = "mourner" combat_def = "guard" attack_bonus = 6 max_hit_crush = 20 +stab_defence = 5 +slash_defence = 5 +crush_defence = 7 [alrena] id = 710 diff --git a/data/quest/members/recipe_for_disaster/recipe_for_disaster.npcs.toml b/data/quest/members/recipe_for_disaster/recipe_for_disaster.npcs.toml index 5a5382c295..c0370a8811 100644 --- a/data/quest/members/recipe_for_disaster/recipe_for_disaster.npcs.toml +++ b/data/quest/members/recipe_for_disaster/recipe_for_disaster.npcs.toml @@ -65,6 +65,9 @@ attack_bonus = 50 xp_bonus = 1.0 hunt_mode = "cowardly" examine = "Bad for your teeth...and the rest of your body too." +stab_defence = 10 +slash_defence = 150 +crush_defence = 150 [dessous_normal] id = 1914 @@ -81,6 +84,9 @@ hunt_mode = "cowardly" slayer_xp = 220.0 categories = ["vampyres"] examine = "A vampyre warrior of Zamorak." +stab_defence = 10 +slash_defence = 150 +crush_defence = 150 [gelatinnoth_mother_white] id = 3497 @@ -96,6 +102,11 @@ max_hit_magic = 200 xp_bonus = 7.5 hunt_mode = "cowardly" examine = "Deadly AND fruity!" +stab_defence = 150 +slash_defence = 150 +crush_defence = 150 +magic_defence = 50 +range_defence = 50 [gelatinnoth_mother_orange] id = 3498 @@ -139,4 +150,10 @@ xp_bonus = 0.5 ranged_strength = 55 hunt_mode = "cowardly" immune_poison = true -examine = "Pure evil lightly whipped with a juicy cherry on top." \ No newline at end of file +examine = "Pure evil lightly whipped with a juicy cherry on top." +attack_bonus = 134 +stab_defence = 150 +slash_defence = 150 +crush_defence = 150 +magic_defence = 150 +range_defence = 150 \ No newline at end of file diff --git a/data/quest/members/rocking_out/battle_of_the_archipelago/battle_of_the_archipelago.npcs.toml b/data/quest/members/rocking_out/battle_of_the_archipelago/battle_of_the_archipelago.npcs.toml index dd974097e0..5cc64dbf79 100644 --- a/data/quest/members/rocking_out/battle_of_the_archipelago/battle_of_the_archipelago.npcs.toml +++ b/data/quest/members/rocking_out/battle_of_the_archipelago/battle_of_the_archipelago.npcs.toml @@ -3,6 +3,11 @@ id = 7860 drop_table = "bones" combat_def = "seagull" hitpoints = 30 +stab_defence = 20 +slash_defence = 10 +crush_defence = 16 +magic_defence = 8 +range_defence = 4 [jack_battle_of_the_archipelago] id = 7861 diff --git a/data/quest/members/slug_menace/slug_menace.npcs.toml b/data/quest/members/slug_menace/slug_menace.npcs.toml index be26d53267..48acc12f64 100644 --- a/data/quest/members/slug_menace/slug_menace.npcs.toml +++ b/data/quest/members/slug_menace/slug_menace.npcs.toml @@ -9,3 +9,8 @@ max_hit_melee = 60 hunt_mode = "cowardly" immune_poison = true examine = "A child of aquatic evil." +stab_defence = 30 +slash_defence = 30 +crush_defence = 30 +magic_defence = 99 +range_defence = 99 diff --git a/data/quest/members/spirits_of_the_elid/spirits_of_the_elid.npcs.toml b/data/quest/members/spirits_of_the_elid/spirits_of_the_elid.npcs.toml index 97495368bb..6677eab9cb 100644 --- a/data/quest/members/spirits_of_the_elid/spirits_of_the_elid.npcs.toml +++ b/data/quest/members/spirits_of_the_elid/spirits_of_the_elid.npcs.toml @@ -9,6 +9,11 @@ max_hit_melee = 40 xp_bonus = 0.5 hunt_mode = "cowardly" examine = "An animated clay statue." +stab_defence = 300 +slash_defence = 300 +crush_defence = 1 +magic_defence = 300 +range_defence = 300 [grey_golem] id = 3028 @@ -21,6 +26,11 @@ max_hit_melee = 40 xp_bonus = 0.5 hunt_mode = "cowardly" examine = "An animated clay statue." +stab_defence = 300 +slash_defence = 1 +crush_defence = 300 +magic_defence = 300 +range_defence = 300 [white_golem] id = 3027 @@ -33,3 +43,8 @@ max_hit_melee = 40 xp_bonus = 0.5 hunt_mode = "cowardly" examine = "An animated clay statue." +stab_defence = 1 +slash_defence = 300 +crush_defence = 300 +magic_defence = 300 +range_defence = 300 diff --git a/data/quest/members/swan_song/swan_song.npcs.toml b/data/quest/members/swan_song/swan_song.npcs.toml index 764fa59295..c522f17c7f 100644 --- a/data/quest/members/swan_song/swan_song.npcs.toml +++ b/data/quest/members/swan_song/swan_song.npcs.toml @@ -13,6 +13,10 @@ attack_bonus = 100 xp_bonus = 7.5 hunt_mode = "cowardly" examine = "The mother of all sea trolls!" +stab_defence = 20 +slash_defence = 40 +crush_defence = 40 +magic_defence = 40 [sea_troll_level_65] id = 3841 diff --git a/data/quest/members/troll_stronghold/troll_stronghold.npcs.toml b/data/quest/members/troll_stronghold/troll_stronghold.npcs.toml index 820761ef5c..f100f89e8f 100644 --- a/data/quest/members/troll_stronghold/troll_stronghold.npcs.toml +++ b/data/quest/members/troll_stronghold/troll_stronghold.npcs.toml @@ -12,3 +12,8 @@ xp_bonus = 0.5 slayer_xp = 126.0 categories = ["trolls"] examine = "An unusually large troll." +stab_defence = 25 +slash_defence = 25 +crush_defence = 40 +magic_defence = 200 +range_defence = 200 diff --git a/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml b/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml index 045542af25..af8b6357a1 100644 --- a/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml +++ b/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml @@ -39,6 +39,10 @@ att = 60 str = 60 def = 69 max_hit_crush = 74 +stab_defence = 30 +slash_defence = 30 +magic_defence = 100 +range_defence = 100 [undead_troll_luciens_camp_3] id = 8379 @@ -87,6 +91,10 @@ att = 60 str = 60 def = 250 max_hit_crush = 74 +stab_defence = 30 +slash_defence = 30 +magic_defence = 100 +range_defence = 100 [undead_troll_luciens_camp_7] id = 8383 @@ -111,6 +119,10 @@ att = 60 str = 60 def = 69 max_hit_crush = 74 +stab_defence = 30 +slash_defence = 30 +magic_defence = 100 +range_defence = 100 [undead_troll_luciens_camp_9] id = 8385 @@ -123,6 +135,10 @@ att = 60 str = 60 def = 69 max_hit_crush = 74 +stab_defence = 30 +slash_defence = 30 +magic_defence = 100 +range_defence = 100 [undead_troll_luciens_camp_10] id = 8386 @@ -171,6 +187,10 @@ att = 60 str = 60 def = 69 max_hit_crush = 74 +stab_defence = 30 +slash_defence = 30 +magic_defence = 100 +range_defence = 100 [undead_troll_luciens_camp_14] id = 8390 @@ -195,6 +215,10 @@ att = 60 str = 60 def = 250 max_hit_crush = 74 +stab_defence = 30 +slash_defence = 30 +magic_defence = 100 +range_defence = 100 [undead_troll_luciens_camp_16] id = 8392 diff --git a/data/quest/members/zogre_flesh_eaters/zogre_flesh_eaters.npcs.toml b/data/quest/members/zogre_flesh_eaters/zogre_flesh_eaters.npcs.toml index 4cf37a2483..22aa14ce23 100644 --- a/data/quest/members/zogre_flesh_eaters/zogre_flesh_eaters.npcs.toml +++ b/data/quest/members/zogre_flesh_eaters/zogre_flesh_eaters.npcs.toml @@ -14,6 +14,9 @@ slayer_xp = 100.0 categories = ["zombies"] drop_table = "slash_bash" examine = "A powerful looking Zogre." +stab_defence = 30 +slash_defence = 30 +crush_defence = 30 [zogre_sithik_man] id = 2061 diff --git a/data/skill/dungeoneering/dungeoneering.npcs.toml b/data/skill/dungeoneering/dungeoneering.npcs.toml index 8e8de86465..0feda072cb 100644 --- a/data/skill/dungeoneering/dungeoneering.npcs.toml +++ b/data/skill/dungeoneering/dungeoneering.npcs.toml @@ -101,4 +101,10 @@ def = 8 mage = 8 max_hit_magic = 40 combat_def = "luminescent_icefiend" +attack_bonus = 4 +stab_defence = 6 +slash_defence = 37 +crush_defence = 37 +magic_defence = 3 +range_defence = 6 diff --git a/data/skill/summoning/summoning.npcs.toml b/data/skill/summoning/summoning.npcs.toml index b1d00725b1..26eab393ad 100644 --- a/data/skill/summoning/summoning.npcs.toml +++ b/data/skill/summoning/summoning.npcs.toml @@ -387,6 +387,7 @@ combat_def = "granite_lobster_familiar" summoning_beast_of_burden = 1 summoning_beast_of_burden_capacity = 30 interacts = false +crush_defence = 10 [macaw_familiar] summoning_time_minutes = 31 @@ -816,6 +817,11 @@ range = 72 mage = 72 combat_def = "fire_titan_familiar" interacts = false +stab_defence = 25 +slash_defence = 25 +crush_defence = 25 +magic_defence = -25 +range_defence = 50 [moss_titan_familiar] summoning_time_minutes = 58 @@ -828,6 +834,11 @@ range = 72 mage = 72 combat_def = "moss_titan_familiar" interacts = false +stab_defence = 50 +slash_defence = 50 +crush_defence = 50 +magic_defence = 25 +range_defence = -25 [ice_titan_familiar] summoning_time_minutes = 64 @@ -1822,6 +1833,7 @@ def = 64 range = 72 mage = 72 combat_def = "granite_lobster_familiar" +crush_defence = 10 [praying_mantis_familiar_combat] id = 6799 @@ -1932,6 +1944,11 @@ def = 64 range = 72 mage = 72 combat_def = "fire_titan_familiar" +stab_defence = 25 +slash_defence = 25 +crush_defence = 25 +magic_defence = -25 +range_defence = 50 [moss_titan_familiar_combat] id = 7358 @@ -1943,6 +1960,11 @@ def = 64 range = 72 mage = 72 combat_def = "moss_titan_familiar" +stab_defence = 50 +slash_defence = 50 +crush_defence = 50 +magic_defence = 25 +range_defence = -25 [ice_titan_familiar_combat] id = 7360 @@ -1954,6 +1976,11 @@ def = 64 range = 72 mage = 72 combat_def = "ice_titan_familiar" +stab_defence = -15 +slash_defence = -15 +crush_defence = -15 +magic_defence = 50 +range_defence = 25 [lava_titan_familiar_combat] id = 7342 From e0659fb99dc3ea1b86e4ffddbe6d6bef65ce009d Mon Sep 17 00:00:00 2001 From: Harley Gilpin Date: Thu, 6 Aug 2026 21:16:07 -0700 Subject: [PATCH 09/13] Add aggression and poison from 2011 wiki data 196 spawned npcs marked hunt_mode = "aggressive" per December 2011 wiki infoboxes (only where no hunt_mode was configured; explicit disables untouched, conditional aggression skipped). Seven combat definitions gain impact_poison with wiki start damage: ancient mage 88, frog 68, sea snake hatchling 50, spinolyp 20, big snake 10, confusion beast 2. Ten poisonous species already had it. Kill rat with range test pinned npc.huntMode = "" as giant rats are aggressive and now charge the shooter mid-test. --- .../black_knights_fortress/black_knight.npcs.toml | 1 + .../kinshra_workshop/kinshra_workshop.npcs.toml | 2 ++ .../mudskipper_point/mudskipper_point.npcs.toml | 2 ++ data/area/asgarnia/rimmington/rimmington.npcs.toml | 3 +++ .../ice_queens_lair/ice_queens_lair.npcs.toml | 1 + .../fremennik_isles/fremennik_isle.npcs.toml | 1 + .../ice_troll_caves/ice_troll_caves.npcs.toml | 1 + .../chaos_dwarf_battlefield.npcs.toml | 2 ++ .../miscellania/miscellania.combat.toml | 1 + .../hunter_area/rellekka_hunter_area.npcs.toml | 4 ++++ .../fremennik_province/rellekka/rellekka.npcs.toml | 1 + .../waterbirth_island/waterbirth_island.combat.toml | 1 + .../waterbirth_island/waterbirth_island.npcs.toml | 1 + data/area/kandarin/ape_atoll/ape_atoll.npcs.toml | 7 +++++++ .../crash_island/snake_pit/snake_pit.combat.toml | 1 + .../ape_atoll/tunnels/ape_atoll_tunnels.npcs.toml | 1 + .../ardougne/sewers/ardougne_sewers.npcs.toml | 3 +++ .../underground_pass/underground_pass.npcs.toml | 1 + .../kandarin/feldip_hills/feldip_hills.npcs.toml | 5 +++++ data/area/kandarin/goblin_cave/goblin_cave.npcs.toml | 1 + .../kandarin/temple_of_ikov/temple_of_ikov.npcs.toml | 1 + .../tunnels/troll_stronghold_tunnels.npcs.toml | 2 ++ .../brimhaven/dungeon/brimhaven_dungeon.npcs.toml | 1 + data/area/karamja/karamja.combat.toml | 1 + data/area/karamja/karamja.npcs.toml | 2 ++ .../kharazi_jungle/caves/kharazi_caves.npcs.toml | 3 +++ .../pothole_dungeon/pothole_dungeon.npcs.toml | 2 ++ data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml | 1 + .../agility_pyramid/agility_pyramid.npcs.toml | 4 ++++ .../windmill_cellar/windmill_cellar.npcs.toml | 11 +++++++++++ .../klenters_pyramid/klenters_pyramid.npcs.toml | 5 +++++ .../mining_camp/desert_mining_camp.npcs.toml | 5 +++++ .../scabaras_dungeon/scabaras_dungeon.npcs.toml | 5 +++++ data/area/kharidian_desert/ullek/ullek.npcs.toml | 9 +++++++++ .../uzer/mastaba/uzer_mastaba.npcs.toml | 1 + data/area/kharidian_desert/uzer/uzer.npcs.toml | 5 +++++ .../stronghold_of_player_safety.npcs.toml | 2 ++ .../lumbridge/swamp/lumbridge_swamp.npcs.toml | 1 + .../tutorial_island/tutorial_island.npcs.toml | 1 + .../varrock/tolnas_rift/tolnas_rift.combat.toml | 1 + .../varrock/tolnas_rift/tolnas_rift.npcs.toml | 5 +++++ data/area/misthalin/varrock/varrock.npcs.toml | 1 + .../evil_chicken_lair/evil_chicken_lair.npcs.toml | 3 +++ .../braindeath_island/braindeath_island.npcs.toml | 6 ++++++ .../morytania/burgh_de_rott/burgh_de_rott.npcs.toml | 12 ++++++++++++ .../dragontooth_shipwreck.npcs.toml | 1 + .../lair_of_tarn_razorlor.npcs.toml | 6 ++++++ .../area/morytania/meiyerditch/meiyerditch.npcs.toml | 1 + .../tunnels/meiyerditch_tunnels.npcs.toml | 2 ++ .../mos_le_harmless/mos_le_harmless.npcs.toml | 1 + data/area/realm/spirit_realm/spirit_realm.npcs.toml | 1 + .../poison_waste_slayer_dungeon.npcs.toml | 11 +++++++++++ .../ghorrock_fortress_dungeon.npcs.toml | 2 ++ .../god_wars_dungeon/god_wars.combat.toml | 1 + .../god_wars_dungeon/god_wars.npcs.toml | 4 ++++ .../chaos_temple_dungeon.npcs.toml | 5 +++++ .../wilderness/chaos_tunnels/chaos_tunnels.npcs.toml | 1 + data/area/wilderness/wilderness.npcs.toml | 2 ++ data/entity/npc/animal/bear/bear.npcs.toml | 2 ++ data/entity/npc/animal/rat/rat.npcs.toml | 7 +++++++ .../npc/monster/reptile/spider/spider.npcs.toml | 2 ++ .../npc/monster/undead/skoblin/skoblin.npcs.toml | 3 ++- .../shade_catacombs/shade_catacombs.npcs.toml | 2 ++ .../soul_wars/nomads_temple/nomads_temple.npcs.toml | 1 + data/minigame/soul_wars/soul_wars.npcs.toml | 2 ++ .../clock_tower/clock_tower_dungeon.npcs.toml | 4 ++++ .../defender_of_varrock.npcs.toml | 5 +++++ .../fairy_tale_iii/orks_rift/orks_rift.npcs.toml | 3 +++ .../members/haunted_mine/haunted_mine.npcs.toml | 1 + .../black_knights_catacombs.npcs.toml | 3 +++ data/skill/dungeoneering/dungeoneering.npcs.toml | 1 + .../test/kotlin/content/entity/combat/CombatTest.kt | 1 + 72 files changed, 204 insertions(+), 1 deletion(-) diff --git a/data/area/asgarnia/black_knights_fortress/black_knight.npcs.toml b/data/area/asgarnia/black_knights_fortress/black_knight.npcs.toml index 1ad81a0278..c66c73a00f 100644 --- a/data/area/asgarnia/black_knights_fortress/black_knight.npcs.toml +++ b/data/area/asgarnia/black_knights_fortress/black_knight.npcs.toml @@ -24,6 +24,7 @@ examine = "Guards prisoners for the black knights." stab_defence = 79 slash_defence = 63 crush_defence = 47 +hunt_mode = "aggressive" [black_knight_void_stares_back] id = 12317 diff --git a/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml b/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml index 6740a535b3..4f07dc9ff5 100644 --- a/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml +++ b/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml @@ -27,6 +27,7 @@ att = 356 str = 356 def = 1 max_hit_crush = 370 +hunt_mode = "aggressive" [black_knight_guardian_kinshra_workshop_2] id = 11697 @@ -37,6 +38,7 @@ att = 356 str = 356 def = 1 max_hit_crush = 370 +hunt_mode = "aggressive" [black_knight_doorkeeper_2] id = 11690 diff --git a/data/area/asgarnia/mudskipper_point/mudskipper_point.npcs.toml b/data/area/asgarnia/mudskipper_point/mudskipper_point.npcs.toml index 2f8af47388..8eb9834d3d 100644 --- a/data/area/asgarnia/mudskipper_point/mudskipper_point.npcs.toml +++ b/data/area/asgarnia/mudskipper_point/mudskipper_point.npcs.toml @@ -24,6 +24,7 @@ att = 2 str = 3 def = 2 max_hit_stab = 10 +hunt_mode = "aggressive" [giant_rat_mudskipper_point_2] id = 4924 @@ -35,6 +36,7 @@ att = 2 str = 3 def = 2 max_hit_stab = 10 +hunt_mode = "aggressive" [mogre] id = 114 diff --git a/data/area/asgarnia/rimmington/rimmington.npcs.toml b/data/area/asgarnia/rimmington/rimmington.npcs.toml index fc64e81877..fba2453ae6 100644 --- a/data/area/asgarnia/rimmington/rimmington.npcs.toml +++ b/data/area/asgarnia/rimmington/rimmington.npcs.toml @@ -86,6 +86,7 @@ slash_defence = 11 crush_defence = -2 magic_defence = 1 range_defence = 4 +hunt_mode = "aggressive" [skeleton_rimmington_2] id = 6092 @@ -103,6 +104,7 @@ slash_defence = 11 crush_defence = -2 magic_defence = 1 range_defence = 4 +hunt_mode = "aggressive" [skeleton_rimmington_3] id = 6093 @@ -120,6 +122,7 @@ slash_defence = 11 crush_defence = -2 magic_defence = 1 range_defence = 4 +hunt_mode = "aggressive" [ghost_rimmington] id = 6094 diff --git a/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml index 7e969ccd58..95f29981ba 100644 --- a/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml +++ b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml @@ -12,6 +12,7 @@ slash_defence = 40 crush_defence = 20 magic_defence = 10 range_defence = 30 +hunt_mode = "aggressive" [ice_queen] id = 795 diff --git a/data/area/fremennik_province/fremennik_isles/fremennik_isle.npcs.toml b/data/area/fremennik_province/fremennik_isles/fremennik_isle.npcs.toml index 3c87f39173..431fc2cba9 100644 --- a/data/area/fremennik_province/fremennik_isles/fremennik_isle.npcs.toml +++ b/data/area/fremennik_province/fremennik_isles/fremennik_isle.npcs.toml @@ -67,6 +67,7 @@ combat_def = "ice_troll_female" stab_defence = 30 slash_defence = 60 crush_defence = 30 +hunt_mode = "aggressive" [ice_troll_grunt_fremennik_isle] id = 5528 diff --git a/data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.npcs.toml b/data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.npcs.toml index c449dd9db1..8bd969ab30 100644 --- a/data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.npcs.toml +++ b/data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.npcs.toml @@ -60,6 +60,7 @@ combat_def = "ice_troll_female" stab_defence = 30 slash_defence = 60 crush_defence = 30 +hunt_mode = "aggressive" [ice_troll_grunt_ice_troll_caves] id = 5476 diff --git a/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml b/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml index 0562f0dfca..62e69a286a 100644 --- a/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml +++ b/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml @@ -94,6 +94,7 @@ slash_defence = 34 crush_defence = 25 magic_defence = 10 range_defence = 35 +hunt_mode = "aggressive" [chaos_dwarf_chaos_dwarf_battlefield_2] id = 8779 @@ -112,6 +113,7 @@ slash_defence = 34 crush_defence = 25 magic_defence = 10 range_defence = 35 +hunt_mode = "aggressive" [black_guard_crossbowdwarf_chaos_dwarf_battlefield] id = 8781 diff --git a/data/area/fremennik_province/miscellania/miscellania.combat.toml b/data/area/fremennik_province/miscellania/miscellania.combat.toml index b7019642d1..3c17e88b7e 100644 --- a/data/area/fremennik_province/miscellania/miscellania.combat.toml +++ b/data/area/fremennik_province/miscellania/miscellania.combat.toml @@ -74,3 +74,4 @@ attack_speed = 4 [sea_snake_hatchling.melee] range = 1 target_hit = { offense = "crush", max = 60 } +impact_poison = 50 diff --git a/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml index 40e36727a7..d6453d8d79 100644 --- a/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml +++ b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml @@ -30,6 +30,7 @@ att = 48 str = 60 def = 39 max_hit_crush = 70 +hunt_mode = "aggressive" [yeti_2] id = 7380 @@ -40,6 +41,7 @@ str = 60 def = 39 max_hit_crush = 70 combat_def = "yeti" +hunt_mode = "aggressive" [gnoeals] id = 7381 @@ -51,6 +53,7 @@ str = 1 def = 101 mage = 101 max_hit_magic = 120 +hunt_mode = "aggressive" [gnoeals_2] id = 7382 @@ -62,6 +65,7 @@ def = 88 mage = 88 max_hit_magic = 120 combat_def = "gnoeals" +hunt_mode = "aggressive" [erjolf_base] id = 7405 diff --git a/data/area/fremennik_province/rellekka/rellekka.npcs.toml b/data/area/fremennik_province/rellekka/rellekka.npcs.toml index 780c48871f..ef78f21216 100644 --- a/data/area/fremennik_province/rellekka/rellekka.npcs.toml +++ b/data/area/fremennik_province/rellekka/rellekka.npcs.toml @@ -280,6 +280,7 @@ str = 55 def = 44 max_hit_crush = 69 combat_def = "fenris_wolf" +hunt_mode = "aggressive" [fishing_spot_rellekka] id = 1331 diff --git a/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml b/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml index d1fdbe0bd8..d4a5dcb7ea 100644 --- a/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml +++ b/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml @@ -45,6 +45,7 @@ projectile = "water_strike" target_hit = { offense = "magic", defence = "range", max = 100 } impact_gfx = "water_strike_impact" impact_sound = "water_strike_impact" +impact_poison = 20 [dagannoth_fledgeling] attack_speed = 4 diff --git a/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml b/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml index 927849279c..5d3ee7593e 100644 --- a/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml +++ b/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml @@ -57,6 +57,7 @@ range = 100 max_hit_range = 114 combat_def = "dagannoth_guardian" magic_defence = 120 +hunt_mode = "aggressive" [bardur] id = 2879 diff --git a/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml b/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml index aecda99af3..8b48776f98 100644 --- a/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml +++ b/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml @@ -202,6 +202,7 @@ respawn_delay = 50 drop_table = "monkey_archer" examine = "A bow wielding ninja monkey. It looks particularly dangerous." combat_def = "monkey_archer" +hunt_mode = "aggressive" [monkey_archer_ape_atoll_2] id = 1457 @@ -213,6 +214,7 @@ def = 80 range = 110 max_hit_range = 200 combat_def = "monkey_archer" +hunt_mode = "aggressive" [monkey_archer_ape_atoll_3] id = 1458 @@ -224,6 +226,7 @@ def = 80 range = 110 max_hit_range = 200 combat_def = "monkey_archer" +hunt_mode = "aggressive" [monkey_guard_ape_atoll_3] id = 1459 @@ -242,12 +245,14 @@ respawn_delay = 50 examine = "A huge brutish gorilla armoured with dangerous looking vambraces." drop_table = "monkey_guard" combat_def = "guard" +hunt_mode = "aggressive" [monkey_guard_ape_atoll_4] id = 1460 clone = "monkey_guard_ape_atoll_3" drop_table = "monkey_guard" combat_def = "guard" +hunt_mode = "aggressive" [elder_guard_ape_atoll] id = 1461 @@ -340,6 +345,7 @@ respawn_delay = 50 categories = ["spiders"] examine = "A very dangerous looking spider, with its fangs unsheathed." drop_table = "jungle_spider" +hunt_mode = "aggressive" [snake_ape_atoll] id = 1479 @@ -350,6 +356,7 @@ att = 4 str = 5 def = 3 max_hit_stab = 10 +hunt_mode = "aggressive" [bird_black] id = 1475 diff --git a/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.combat.toml b/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.combat.toml index ae00e31f90..a605e5ac38 100644 --- a/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.combat.toml +++ b/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.combat.toml @@ -4,3 +4,4 @@ attack_speed = 6 [big_snake.melee] range = 1 target_hit = { offense = "stab", max = 140 } +impact_poison = 10 diff --git a/data/area/kandarin/ape_atoll/tunnels/ape_atoll_tunnels.npcs.toml b/data/area/kandarin/ape_atoll/tunnels/ape_atoll_tunnels.npcs.toml index 517df0eb63..e1a16f216c 100644 --- a/data/area/kandarin/ape_atoll/tunnels/ape_atoll_tunnels.npcs.toml +++ b/data/area/kandarin/ape_atoll/tunnels/ape_atoll_tunnels.npcs.toml @@ -21,4 +21,5 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 +hunt_mode = "aggressive" diff --git a/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml b/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml index 5157e25a16..84b9e04d3f 100644 --- a/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml +++ b/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml @@ -7,6 +7,7 @@ att = 10 str = 10 def = 10 max_hit_stab = 20 +hunt_mode = "aggressive" [claus_the_chef_ardougne_sewers] id = 886 @@ -69,6 +70,7 @@ att = 2 str = 3 def = 2 max_hit_stab = 10 +hunt_mode = "aggressive" [giant_rat_ardounge_sewer_stubby] id = 4923 @@ -80,4 +82,5 @@ att = 2 str = 3 def = 2 max_hit_stab = 10 +hunt_mode = "aggressive" diff --git a/data/area/kandarin/ardougne/underground_pass/underground_pass.npcs.toml b/data/area/kandarin/ardougne/underground_pass/underground_pass.npcs.toml index ddf27f48bb..f710765f1b 100644 --- a/data/area/kandarin/ardougne/underground_pass/underground_pass.npcs.toml +++ b/data/area/kandarin/ardougne/underground_pass/underground_pass.npcs.toml @@ -135,6 +135,7 @@ examine = "He looks real nasty, smells bad too." drop_table = "khazard_warlord" max_hit_crush = 100 combat_def = "khazard_warlord" +hunt_mode = "aggressive" [child_underground_pass_3] id = 6334 diff --git a/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml b/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml index da258ccacf..8ee9297f0e 100644 --- a/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml +++ b/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml @@ -83,6 +83,7 @@ max_hit_crush = 100 stab_defence = 10 slash_defence = 21 crush_defence = 16 +hunt_mode = "aggressive" [ogress_warrior] id = 7079 @@ -95,6 +96,7 @@ att = 106 str = 106 def = 1 max_hit_crush = 120 +hunt_mode = "aggressive" [ogress_warrior_2] id = 7080 @@ -107,6 +109,7 @@ att = 106 str = 106 def = 1 max_hit_crush = 120 +hunt_mode = "aggressive" [ogress_feldip_hills] id = 7081 @@ -119,6 +122,7 @@ str = 66 def = 33 max_hit_crush = 80 combat_def = "ogress" +hunt_mode = "aggressive" [ogress_feldip_hills_2] id = 7082 @@ -131,6 +135,7 @@ str = 66 def = 33 max_hit_crush = 80 combat_def = "ogress" +hunt_mode = "aggressive" [rantz_feldip_hills_2] id = 8659 diff --git a/data/area/kandarin/goblin_cave/goblin_cave.npcs.toml b/data/area/kandarin/goblin_cave/goblin_cave.npcs.toml index f49a91a668..a7a946ebea 100644 --- a/data/area/kandarin/goblin_cave/goblin_cave.npcs.toml +++ b/data/area/kandarin/goblin_cave/goblin_cave.npcs.toml @@ -13,6 +13,7 @@ att = 10 str = 10 def = 10 max_hit_stab = 20 +hunt_mode = "aggressive" [goblin_guard_goblin_cave] id = 6496 diff --git a/data/area/kandarin/temple_of_ikov/temple_of_ikov.npcs.toml b/data/area/kandarin/temple_of_ikov/temple_of_ikov.npcs.toml index 2a5ad22054..a07177cbce 100644 --- a/data/area/kandarin/temple_of_ikov/temple_of_ikov.npcs.toml +++ b/data/area/kandarin/temple_of_ikov/temple_of_ikov.npcs.toml @@ -38,6 +38,7 @@ slash_defence = 11 crush_defence = -2 magic_defence = 1 range_defence = 4 +hunt_mode = "aggressive" [ice_spider] id = 64 diff --git a/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.npcs.toml b/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.npcs.toml index f91781126a..de431f8425 100644 --- a/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.npcs.toml +++ b/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.npcs.toml @@ -100,6 +100,7 @@ slash_defence = 60 crush_defence = 35 magic_defence = 200 range_defence = 200 +hunt_mode = "aggressive" [troll_general_troll_stronghold_tunnels_3] id = 1117 @@ -118,6 +119,7 @@ slash_defence = 60 crush_defence = 35 magic_defence = 200 range_defence = 200 +hunt_mode = "aggressive" [twig_troll_stronghold_tunnels] id = 1128 diff --git a/data/area/karamja/brimhaven/dungeon/brimhaven_dungeon.npcs.toml b/data/area/karamja/brimhaven/dungeon/brimhaven_dungeon.npcs.toml index 72388907d8..a13b1fd059 100644 --- a/data/area/karamja/brimhaven/dungeon/brimhaven_dungeon.npcs.toml +++ b/data/area/karamja/brimhaven/dungeon/brimhaven_dungeon.npcs.toml @@ -9,3 +9,4 @@ att = 130 str = 130 def = 130 max_hit_slash = 140 +hunt_mode = "aggressive" diff --git a/data/area/karamja/karamja.combat.toml b/data/area/karamja/karamja.combat.toml index d5ebf5693c..212ebcc1c3 100644 --- a/data/area/karamja/karamja.combat.toml +++ b/data/area/karamja/karamja.combat.toml @@ -50,6 +50,7 @@ attack_speed = 4 [frog.melee] range = 1 target_hit = { offense = "crush", max = 61 } +impact_poison = 68 [tenacious_toucan] attack_speed = 6 diff --git a/data/area/karamja/karamja.npcs.toml b/data/area/karamja/karamja.npcs.toml index dd5e0f0dcc..1cc5a38a0d 100644 --- a/data/area/karamja/karamja.npcs.toml +++ b/data/area/karamja/karamja.npcs.toml @@ -190,6 +190,7 @@ slash_defence = 62 crush_defence = 32 magic_defence = 12 range_defence = 52 +hunt_mode = "aggressive" [pernicious_parrot] id = 6382 @@ -221,6 +222,7 @@ slash_defence = 62 crush_defence = 32 magic_defence = 12 range_defence = 52 +hunt_mode = "aggressive" [karamjan_jungle_eagle] id = 6387 diff --git a/data/area/karamja/kharazi_jungle/caves/kharazi_caves.npcs.toml b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.npcs.toml index b6041b3574..338ef15041 100644 --- a/data/area/karamja/kharazi_jungle/caves/kharazi_caves.npcs.toml +++ b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.npcs.toml @@ -124,6 +124,7 @@ slash_defence = 22 crush_defence = 20 magic_defence = -1 range_defence = 20 +hunt_mode = "aggressive" [irvig_senay_kharazi_caves] id = 937 @@ -146,6 +147,7 @@ slash_defence = 31 crush_defence = 29 magic_defence = -1 range_defence = 29 +hunt_mode = "aggressive" [ranalph_devere] id = 938 @@ -168,6 +170,7 @@ stab_defence = 38 slash_defence = 40 crush_defence = 36 range_defence = 38 +hunt_mode = "aggressive" [boulder_kharazi_caves] id = 939 diff --git a/data/area/karamja/pothole_dungeon/pothole_dungeon.npcs.toml b/data/area/karamja/pothole_dungeon/pothole_dungeon.npcs.toml index 8b64a56421..96e2853956 100644 --- a/data/area/karamja/pothole_dungeon/pothole_dungeon.npcs.toml +++ b/data/area/karamja/pothole_dungeon/pothole_dungeon.npcs.toml @@ -9,6 +9,7 @@ str = 43 def = 43 attack_bonus = 22 max_hit_crush = 70 +hunt_mode = "aggressive" [jogre_pothole_dungeon_2] id = 3450 @@ -21,4 +22,5 @@ str = 43 def = 43 attack_bonus = 22 max_hit_crush = 70 +hunt_mode = "aggressive" diff --git a/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml b/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml index 62e82987a7..0f3ba854a3 100644 --- a/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml +++ b/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml @@ -318,6 +318,7 @@ slash_defence = 20 crush_defence = 20 magic_defence = 10 range_defence = 50 +hunt_mode = "aggressive" [tzhaar_mej_roh] id = 2623 diff --git a/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml index ea3f2481ef..3b0fabd824 100644 --- a/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml +++ b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml @@ -40,6 +40,7 @@ max_hit_crush = 60 stab_defence = 90 slash_defence = 90 crush_defence = 90 +hunt_mode = "aggressive" [mummy_agility_pyramid_2] id = 6754 @@ -53,6 +54,7 @@ max_hit_crush = 60 stab_defence = 90 slash_defence = 90 crush_defence = 90 +hunt_mode = "aggressive" [mummy_agility_pyramid_3] id = 6755 @@ -66,6 +68,7 @@ max_hit_crush = 60 stab_defence = 90 slash_defence = 90 crush_defence = 90 +hunt_mode = "aggressive" [mummy_agility_pyramid_4] id = 6756 @@ -79,6 +82,7 @@ max_hit_crush = 60 stab_defence = 90 slash_defence = 90 crush_defence = 90 +hunt_mode = "aggressive" [agility_pyramid_block] id = 3124 diff --git a/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml b/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml index fae33bd6be..d8d4a38887 100644 --- a/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml +++ b/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml @@ -10,6 +10,7 @@ att = 46 str = 46 def = 56 max_hit_crush = 60 +hunt_mode = "aggressive" [zombie_pirate_windmill_cellar_2] id = 5632 @@ -20,6 +21,7 @@ att = 46 str = 46 def = 56 max_hit_crush = 60 +hunt_mode = "aggressive" [zombie_pirate_windmill_cellar_3] id = 5636 @@ -30,6 +32,7 @@ att = 46 str = 46 def = 56 max_hit_crush = 60 +hunt_mode = "aggressive" [zombie_pirate_windmill_cellar_4] id = 5649 @@ -40,6 +43,7 @@ att = 46 str = 46 def = 56 max_hit_crush = 60 +hunt_mode = "aggressive" [zombie_pirate_windmill_cellar_5] id = 5651 @@ -50,6 +54,7 @@ att = 46 str = 46 def = 56 max_hit_crush = 60 +hunt_mode = "aggressive" [zombie_pirate_windmill_cellar_6] id = 5653 @@ -60,6 +65,7 @@ att = 46 str = 46 def = 56 max_hit_crush = 60 +hunt_mode = "aggressive" [zombie_pirate_windmill_cellar_7] id = 5655 @@ -70,6 +76,7 @@ att = 46 str = 46 def = 56 max_hit_crush = 60 +hunt_mode = "aggressive" [zombie_pirate_windmill_cellar_8] id = 5657 @@ -80,6 +87,7 @@ att = 46 str = 46 def = 56 max_hit_crush = 60 +hunt_mode = "aggressive" [zombie_pirate_windmill_cellar_9] id = 5660 @@ -90,6 +98,7 @@ att = 46 str = 46 def = 56 max_hit_crush = 60 +hunt_mode = "aggressive" [zombie_pirate_windmill_cellar_10] id = 5662 @@ -100,6 +109,7 @@ att = 46 str = 46 def = 56 max_hit_crush = 60 +hunt_mode = "aggressive" [zombie_pirate_windmill_cellar_11] id = 5664 @@ -110,6 +120,7 @@ att = 46 str = 46 def = 56 max_hit_crush = 60 +hunt_mode = "aggressive" [monk_windmill_cellar] id = 5673 diff --git a/data/area/kharidian_desert/klenters_pyramid/klenters_pyramid.npcs.toml b/data/area/kharidian_desert/klenters_pyramid/klenters_pyramid.npcs.toml index f737245195..90b353437b 100644 --- a/data/area/kharidian_desert/klenters_pyramid/klenters_pyramid.npcs.toml +++ b/data/area/kharidian_desert/klenters_pyramid/klenters_pyramid.npcs.toml @@ -30,6 +30,7 @@ stab_defence = 90 slash_defence = 90 crush_defence = 90 magic_defence = 15 +hunt_mode = "aggressive" [mummy_klenters_pyramid_2] id = 2016 @@ -38,6 +39,7 @@ drop_table = "mummy" combat_def = "mummy" slash_defence = 30 magic_defence = 90 +hunt_mode = "aggressive" [mummy_klenters_pyramid_3] id = 2017 @@ -46,6 +48,7 @@ drop_table = "mummy" combat_def = "mummy" stab_defence = 30 magic_defence = 95 +hunt_mode = "aggressive" [mummy_klenters_pyramid_4] id = 2018 @@ -54,6 +57,7 @@ drop_table = "mummy" combat_def = "mummy" crush_defence = 30 magic_defence = 90 +hunt_mode = "aggressive" [mummy_klenters_pyramid_5] id = 2019 @@ -63,6 +67,7 @@ combat_def = "mummy" stab_defence = 50 crush_defence = 50 magic_defence = 90 +hunt_mode = "aggressive" [high_priest_klenters_pyramid_2] id = 1986 diff --git a/data/area/kharidian_desert/mining_camp/desert_mining_camp.npcs.toml b/data/area/kharidian_desert/mining_camp/desert_mining_camp.npcs.toml index c5ca943275..954b0eb440 100644 --- a/data/area/kharidian_desert/mining_camp/desert_mining_camp.npcs.toml +++ b/data/area/kharidian_desert/mining_camp/desert_mining_camp.npcs.toml @@ -33,24 +33,28 @@ respawn_delay = 50 examine = "He looks a bit aggressive." drop_table = "mercenary" combat_def = "guard" +hunt_mode = "aggressive" [mercenary_desert_mining_camp_2] id = 4990 clone = "mercenary_desert_mining_camp" drop_table = "mercenary" combat_def = "guard" +hunt_mode = "aggressive" [mercenary_desert_mining_camp_3] id = 4991 clone = "mercenary_desert_mining_camp" drop_table = "mercenary" combat_def = "guard" +hunt_mode = "aggressive" [mercenary_desert_mining_camp_4] id = 4992 clone = "mercenary_desert_mining_camp" drop_table = "mercenary" combat_def = "guard" +hunt_mode = "aggressive" [guard_desert_mining_camp] id = 4993 @@ -191,6 +195,7 @@ respawn_delay = 50 examine = "He looks a bit aggressive." drop_table = "rowdy_slave" max_hit_crush = 20 +hunt_mode = "aggressive" [mercenary_captain] id = 830 diff --git a/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml index 0c02af478e..9cb6fd171d 100644 --- a/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml +++ b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml @@ -7,6 +7,7 @@ str = 15 def = 15 combat_def = "scarab_larva" hitpoints = 140 +hunt_mode = "aggressive" [scabaras_ranger] id = 6773 @@ -23,6 +24,7 @@ slash_defence = 20 crush_defence = 20 magic_defence = 4 range_defence = 26 +hunt_mode = "aggressive" [scabaras_lancer] id = 6774 @@ -36,6 +38,7 @@ def = 56 max_hit_crush = 130 stab_defence = 30 slash_defence = 30 +hunt_mode = "aggressive" [scabaras_mage_scabaras_dungeon] id = 6780 @@ -51,6 +54,7 @@ max_hit_magic = 104 combat_def = "scabaras_mage" slash_defence = 90 crush_defence = 90 +hunt_mode = "aggressive" [scabaras_mage_scabaras_dungeon_2] id = 6781 @@ -66,6 +70,7 @@ attack_bonus = 70 slash_defence = 90 crush_defence = 90 magic_defence = 34 +hunt_mode = "aggressive" [clay_golem_scabaras_dungeon] id = 6785 diff --git a/data/area/kharidian_desert/ullek/ullek.npcs.toml b/data/area/kharidian_desert/ullek/ullek.npcs.toml index aa2fb6e049..9aafe2ac5c 100644 --- a/data/area/kharidian_desert/ullek/ullek.npcs.toml +++ b/data/area/kharidian_desert/ullek/ullek.npcs.toml @@ -48,6 +48,7 @@ slash_defence = 11 crush_defence = -2 magic_defence = 1 range_defence = 4 +hunt_mode = "aggressive" [skeleton_ullek_2] id = 6765 @@ -63,6 +64,7 @@ slash_defence = 11 crush_defence = -2 magic_defence = 1 range_defence = 4 +hunt_mode = "aggressive" [skeleton_ullek_3] id = 6766 @@ -78,6 +80,7 @@ slash_defence = 11 crush_defence = -2 magic_defence = 1 range_defence = 4 +hunt_mode = "aggressive" [skeleton_ullek_4] id = 6767 @@ -93,6 +96,7 @@ slash_defence = 11 crush_defence = -2 magic_defence = 1 range_defence = 4 +hunt_mode = "aggressive" [skeleton_ullek_5] id = 6768 @@ -110,6 +114,7 @@ slash_defence = 11 crush_defence = -2 magic_defence = 1 range_defence = 4 +hunt_mode = "aggressive" [scabaras_locust_ullek] id = 6776 @@ -120,6 +125,7 @@ str = 99 def = 99 combat_def = "scabaras_locust" hitpoints = 1060 +hunt_mode = "aggressive" [locust_lancer_ullek] id = 6777 @@ -134,6 +140,7 @@ max_hit_crush = 120 combat_def = "locust_lancer" stab_defence = 20 slash_defence = 20 +hunt_mode = "aggressive" [locust_ranger_ullek] id = 6778 @@ -149,6 +156,7 @@ max_hit_range = 210 combat_def = "locust_ranger" slash_defence = 20 range_defence = 6 +hunt_mode = "aggressive" [crocodile_ullek] id = 6779 @@ -159,6 +167,7 @@ str = 54 def = 54 max_hit_slash = 60 combat_def = "crocodile" +hunt_mode = "aggressive" [lead_archaeologist_abigail] id = 6786 diff --git a/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml b/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml index 00b9334546..10191af2cf 100644 --- a/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml +++ b/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml @@ -24,4 +24,5 @@ str = 1 def = 82 max_hit_crush = 15 combat_def = "small_scarab" +hunt_mode = "aggressive" diff --git a/data/area/kharidian_desert/uzer/uzer.npcs.toml b/data/area/kharidian_desert/uzer/uzer.npcs.toml index f0c5e7dde5..2a1b9ad6d1 100644 --- a/data/area/kharidian_desert/uzer/uzer.npcs.toml +++ b/data/area/kharidian_desert/uzer/uzer.npcs.toml @@ -7,6 +7,7 @@ hitpoints = 400 att = 34 str = 34 def = 34 +hunt_mode = "aggressive" [bandit_looter_uzer_2] id = 7493 @@ -17,6 +18,7 @@ hitpoints = 400 att = 34 str = 34 def = 34 +hunt_mode = "aggressive" [bandit_looter_uzer_3] id = 7494 @@ -27,6 +29,7 @@ hitpoints = 400 att = 34 str = 34 def = 34 +hunt_mode = "aggressive" [bandit_looter_uzer_4] id = 7495 @@ -37,6 +40,7 @@ hitpoints = 400 att = 34 str = 34 def = 34 +hunt_mode = "aggressive" [bandit_looter_uzer_5] id = 7496 @@ -47,4 +51,5 @@ hitpoints = 400 att = 34 str = 34 def = 34 +hunt_mode = "aggressive" diff --git a/data/area/misthalin/barbarian_village/stronghold_of_player_safety/stronghold_of_player_safety.npcs.toml b/data/area/misthalin/barbarian_village/stronghold_of_player_safety/stronghold_of_player_safety.npcs.toml index 34d9753861..57c268eb99 100644 --- a/data/area/misthalin/barbarian_village/stronghold_of_player_safety/stronghold_of_player_safety.npcs.toml +++ b/data/area/misthalin/barbarian_village/stronghold_of_player_safety/stronghold_of_player_safety.npcs.toml @@ -75,8 +75,10 @@ style = "crush" combat_def = "mugger" drop_table = "mugger" examine = "He jumps out and attacks people." +hunt_mode = "aggressive" [mugger_stronghold_of_player_safety_2] id = 7162 clone = "mugger_stronghold_of_player_safety" +hunt_mode = "aggressive" diff --git a/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml b/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml index 041a5c87c2..83e6460cdd 100644 --- a/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml +++ b/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml @@ -15,6 +15,7 @@ slash_defence = -29 crush_defence = -29 magic_defence = -29 range_defence = -29 +hunt_mode = "aggressive" [fremennik_shipmaster_al_kharid] id = 9708 diff --git a/data/area/misthalin/tutorial_island/tutorial_island.npcs.toml b/data/area/misthalin/tutorial_island/tutorial_island.npcs.toml index 7857242498..6a1336a1c1 100644 --- a/data/area/misthalin/tutorial_island/tutorial_island.npcs.toml +++ b/data/area/misthalin/tutorial_island/tutorial_island.npcs.toml @@ -57,6 +57,7 @@ categories = ["giant_rats", "rats"] respawn_delay = 30 drop_table = "giant_rat" examine = "Overgrown vermin." +hunt_mode = "aggressive" [chicken_tutorial_island] id = 951 diff --git a/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.combat.toml b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.combat.toml index 8fe2c50a6e..0849105bf6 100644 --- a/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.combat.toml +++ b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.combat.toml @@ -18,6 +18,7 @@ attack_speed = 4 [confusion_beast.melee] range = 1 target_hit = { offense = "slash", max = 60 } +impact_poison = 2 [hopeless_creature] attack_speed = 4 diff --git a/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.npcs.toml b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.npcs.toml index 102b9105d0..d2a75e7f15 100644 --- a/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.npcs.toml +++ b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.npcs.toml @@ -10,6 +10,7 @@ examine = "He looks a little on the cross side!" drop_table = "empty" max_hit_stab = 50 combat_def = "angry_unicorn" +hunt_mode = "aggressive" [angry_giant_rat_tolnas_rift] id = 3662 @@ -23,6 +24,7 @@ categories = ["rats"] drop_table = "bones" examine = "He looks a little on the cross side!" combat_def = "giant_rat" +hunt_mode = "aggressive" [angry_goblin_tolnas_rift] id = 3663 @@ -36,6 +38,7 @@ categories = ["goblins"] examine = "He looks a little on the cross side!" drop_table = "empty" combat_def = "goblin" +hunt_mode = "aggressive" [angry_bear_tolnas_rift] id = 3664 @@ -48,6 +51,7 @@ max_hit_melee = 50 examine = "He looks a little on the cross side!" drop_table = "empty" combat_def = "bear" +hunt_mode = "aggressive" [fear_reaper_tolnas_rift] id = 3665 @@ -97,6 +101,7 @@ combat_def = "hopeless_creature" id = 4940 clone = "angry_giant_rat_tolnas_rift" combat_def = "giant_rat" +hunt_mode = "aggressive" [tolna_south] id = 3658 diff --git a/data/area/misthalin/varrock/varrock.npcs.toml b/data/area/misthalin/varrock/varrock.npcs.toml index 1ef5e7a6a5..765bb15a64 100644 --- a/data/area/misthalin/varrock/varrock.npcs.toml +++ b/data/area/misthalin/varrock/varrock.npcs.toml @@ -206,6 +206,7 @@ slash_defence = -40 crush_defence = -40 magic_defence = -40 range_defence = -40 +hunt_mode = "aggressive" [master_farmer_varrock] id = 2235 diff --git a/data/area/misthalin/zanaris/evil_chicken_lair/evil_chicken_lair.npcs.toml b/data/area/misthalin/zanaris/evil_chicken_lair/evil_chicken_lair.npcs.toml index 34e90946c8..8c1b01bf4a 100644 --- a/data/area/misthalin/zanaris/evil_chicken_lair/evil_chicken_lair.npcs.toml +++ b/data/area/misthalin/zanaris/evil_chicken_lair/evil_chicken_lair.npcs.toml @@ -27,6 +27,7 @@ slash_defence = 70 crush_defence = 70 magic_defence = 60 range_defence = 50 +hunt_mode = "aggressive" [black_dragon_evil_chicken_lair_2] id = 4675 @@ -40,6 +41,7 @@ str = 200 def = 200 mage = 100 max_hit_slash = 210 +hunt_mode = "aggressive" [black_dragon_evil_chicken_lair_3] id = 4676 @@ -53,4 +55,5 @@ str = 200 def = 200 mage = 100 max_hit_slash = 210 +hunt_mode = "aggressive" diff --git a/data/area/morytania/braindeath_island/braindeath_island.npcs.toml b/data/area/morytania/braindeath_island/braindeath_island.npcs.toml index 55cef59af7..27d14236e4 100644 --- a/data/area/morytania/braindeath_island/braindeath_island.npcs.toml +++ b/data/area/morytania/braindeath_island/braindeath_island.npcs.toml @@ -85,26 +85,32 @@ categories = ["zombies"] respawn_delay = 37 drop_table = "pirate" examine = "He talks a good fight." +hunt_mode = "aggressive" [zombie_swab_2] id = 2844 clone = "zombie_swab" +hunt_mode = "aggressive" [zombie_swab_3] id = 2845 clone = "zombie_swab" +hunt_mode = "aggressive" [zombie_swab_4] id = 2846 clone = "zombie_swab" +hunt_mode = "aggressive" [zombie_swab_5] id = 2847 clone = "zombie_swab" +hunt_mode = "aggressive" [zombie_swab_6] id = 2848 clone = "zombie_swab" +hunt_mode = "aggressive" [fever_spider] id = 2850 diff --git a/data/area/morytania/burgh_de_rott/burgh_de_rott.npcs.toml b/data/area/morytania/burgh_de_rott/burgh_de_rott.npcs.toml index b84a3604ee..5a4d06b71f 100644 --- a/data/area/morytania/burgh_de_rott/burgh_de_rott.npcs.toml +++ b/data/area/morytania/burgh_de_rott/burgh_de_rott.npcs.toml @@ -16,6 +16,7 @@ att = 40 str = 40 def = 30 max_hit_crush = 50 +hunt_mode = "aggressive" [vampyre_juvinate_4] id = 3523 @@ -26,6 +27,7 @@ att = 40 str = 40 def = 30 max_hit_crush = 50 +hunt_mode = "aggressive" [vampyre_juvinate_5] id = 3524 @@ -36,6 +38,7 @@ att = 40 str = 40 def = 30 max_hit_crush = 50 +hunt_mode = "aggressive" [vampyre_juvinate_6] id = 3525 @@ -46,6 +49,7 @@ att = 40 str = 40 def = 30 max_hit_crush = 50 +hunt_mode = "aggressive" [vampyre_juvenile] id = 3531 @@ -170,6 +174,7 @@ def = 85 mage = 110 range = 110 max_hit_crush = 110 +hunt_mode = "aggressive" [vyrewatch_2] id = 7692 @@ -182,6 +187,7 @@ mage = 120 range = 120 max_hit_crush = 120 combat_def = "vyrewatch" +hunt_mode = "aggressive" [vyrewatch_3] id = 7693 @@ -194,6 +200,7 @@ mage = 120 range = 120 max_hit_crush = 130 combat_def = "vyrewatch" +hunt_mode = "aggressive" [vyrewatch_4] id = 7694 @@ -206,6 +213,7 @@ mage = 120 range = 120 max_hit_crush = 130 combat_def = "vyrewatch" +hunt_mode = "aggressive" [vyrewatch_5] id = 7699 @@ -218,6 +226,7 @@ mage = 110 range = 110 max_hit_crush = 110 combat_def = "vyrewatch" +hunt_mode = "aggressive" [vyrewatch_6] id = 7700 @@ -230,6 +239,7 @@ mage = 120 range = 120 max_hit_crush = 120 combat_def = "vyrewatch" +hunt_mode = "aggressive" [vyrewatch_7] id = 7701 @@ -242,6 +252,7 @@ mage = 120 range = 120 max_hit_crush = 130 combat_def = "vyrewatch" +hunt_mode = "aggressive" [vyrewatch_8] id = 7702 @@ -254,6 +265,7 @@ mage = 120 range = 120 max_hit_crush = 130 combat_def = "vyrewatch" +hunt_mode = "aggressive" [ivan_strom] id = 7708 diff --git a/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.npcs.toml b/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.npcs.toml index 7e3472304c..687831168e 100644 --- a/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.npcs.toml +++ b/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.npcs.toml @@ -9,6 +9,7 @@ def = 40 max_hit_stab = 40 max_hit_crush = 90 combat_def = "giant_lobster" +hunt_mode = "aggressive" [giant_crab_dragontooth_shipwreck] id = 7829 diff --git a/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.npcs.toml b/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.npcs.toml index 18bc9f3179..5ce71c48cc 100644 --- a/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.npcs.toml +++ b/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.npcs.toml @@ -35,6 +35,7 @@ max_hit_crush = 30 stab_defence = 50 slash_defence = 40 range_defence = 40 +hunt_mode = "aggressive" [skeleton_lair_of_tarn_razorlor_2] id = 5387 @@ -50,6 +51,7 @@ max_hit_crush = 30 stab_defence = 50 slash_defence = 40 range_defence = 40 +hunt_mode = "aggressive" [skeleton_lair_of_tarn_razorlor_3] id = 5388 @@ -65,6 +67,7 @@ max_hit_crush = 30 stab_defence = 50 slash_defence = 40 range_defence = 40 +hunt_mode = "aggressive" [skeleton_lair_of_tarn_razorlor_4] id = 5389 @@ -80,6 +83,7 @@ max_hit_crush = 30 stab_defence = 50 slash_defence = 40 range_defence = 40 +hunt_mode = "aggressive" [skeleton_lair_of_tarn_razorlor_5] id = 5390 @@ -95,6 +99,7 @@ max_hit_crush = 30 stab_defence = 50 slash_defence = 40 range_defence = 40 +hunt_mode = "aggressive" [skeleton_lair_of_tarn_razorlor_6] id = 5391 @@ -110,6 +115,7 @@ max_hit_crush = 30 stab_defence = 50 slash_defence = 40 range_defence = 40 +hunt_mode = "aggressive" [terror_dog] id = 5417 diff --git a/data/area/morytania/meiyerditch/meiyerditch.npcs.toml b/data/area/morytania/meiyerditch/meiyerditch.npcs.toml index f851debba4..bb7daa3f43 100644 --- a/data/area/morytania/meiyerditch/meiyerditch.npcs.toml +++ b/data/area/morytania/meiyerditch/meiyerditch.npcs.toml @@ -339,6 +339,7 @@ mage = 110 range = 110 max_hit_crush = 110 combat_def = "vyrewatch" +hunt_mode = "aggressive" [vampyre_juvenile_male] id = 4774 diff --git a/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml index 33ff1d6a9e..c9998b39f7 100644 --- a/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml +++ b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml @@ -53,6 +53,7 @@ def = 111 mage = 111 max_hit_magic = 90 combat_def = "mutated_bloodveld" +hunt_mode = "aggressive" [mutated_bloodveld_meiyerditch_tunnels_2] id = 7643 @@ -66,4 +67,5 @@ def = 138 mage = 138 max_hit_magic = 90 combat_def = "mutated_bloodveld" +hunt_mode = "aggressive" diff --git a/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml b/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml index 8315e937c4..117bb0d1db 100644 --- a/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml +++ b/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml @@ -109,6 +109,7 @@ att = 4 str = 5 def = 3 max_hit_stab = 10 +hunt_mode = "aggressive" [monkey_mos_le_harmless] id = 4344 diff --git a/data/area/realm/spirit_realm/spirit_realm.npcs.toml b/data/area/realm/spirit_realm/spirit_realm.npcs.toml index 853df741bc..305177e386 100644 --- a/data/area/realm/spirit_realm/spirit_realm.npcs.toml +++ b/data/area/realm/spirit_realm/spirit_realm.npcs.toml @@ -14,6 +14,7 @@ slash_defence = 57 crush_defence = 46 magic_defence = -10 range_defence = 56 +hunt_mode = "aggressive" [tormented_wraith_spirit_realm] id = 8125 diff --git a/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml index 7f721168f3..f91198686d 100644 --- a/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml +++ b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml @@ -14,6 +14,7 @@ stab_defence = 50 slash_defence = 50 crush_defence = -50 range_defence = 62 +hunt_mode = "aggressive" [warped_terrorbird_2] id = 6286 @@ -31,6 +32,7 @@ stab_defence = -50 slash_defence = 50 crush_defence = 50 range_defence = 62 +hunt_mode = "aggressive" [warped_terrorbird_3] id = 6287 @@ -48,6 +50,7 @@ stab_defence = 50 slash_defence = -50 crush_defence = 50 magic_defence = 62 +hunt_mode = "aggressive" [warped_terrorbird_4] id = 6288 @@ -65,6 +68,7 @@ stab_defence = 50 slash_defence = -50 crush_defence = 50 range_defence = 62 +hunt_mode = "aggressive" [warped_terrorbird_5] id = 6289 @@ -82,6 +86,7 @@ stab_defence = -50 slash_defence = 50 crush_defence = 50 magic_defence = 62 +hunt_mode = "aggressive" [warped_terrorbird_6] id = 6290 @@ -97,6 +102,7 @@ stab_defence = 50 slash_defence = 50 crush_defence = -50 range_defence = 62 +hunt_mode = "aggressive" [warped_terrorbird_7] id = 6291 @@ -114,6 +120,7 @@ stab_defence = 50 slash_defence = -50 crush_defence = 50 range_defence = 62 +hunt_mode = "aggressive" [warped_terrorbird_8] id = 6292 @@ -131,6 +138,7 @@ stab_defence = -50 slash_defence = 50 crush_defence = 50 magic_defence = 62 +hunt_mode = "aggressive" [warped_terrorbird_9] id = 6293 @@ -146,6 +154,7 @@ stab_defence = -50 slash_defence = 50 crush_defence = 50 magic_defence = 62 +hunt_mode = "aggressive" [warped_terrorbird_10] id = 6294 @@ -163,6 +172,7 @@ stab_defence = 50 slash_defence = 50 crush_defence = -50 range_defence = 62 +hunt_mode = "aggressive" [warped_terrorbird_11] id = 6295 @@ -180,6 +190,7 @@ stab_defence = 50 slash_defence = -50 crush_defence = 50 range_defence = 62 +hunt_mode = "aggressive" [warped_tortoise] id = 6296 diff --git a/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml b/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml index 3aaed352f4..8219168b7d 100644 --- a/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml +++ b/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml @@ -14,6 +14,7 @@ slash_defence = 180 crush_defence = 180 magic_defence = 10 range_defence = 50 +hunt_mode = "aggressive" [waterfiend_ghorrock_fortress_dungeon] id = 9054 @@ -25,4 +26,5 @@ str = 1 def = 113 mage = 113 max_hit_magic = 119 +hunt_mode = "aggressive" diff --git a/data/area/troll_country/god_wars_dungeon/god_wars.combat.toml b/data/area/troll_country/god_wars_dungeon/god_wars.combat.toml index 67eba1d53e..a455e567fc 100644 --- a/data/area/troll_country/god_wars_dungeon/god_wars.combat.toml +++ b/data/area/troll_country/god_wars_dungeon/god_wars.combat.toml @@ -18,3 +18,4 @@ attack_speed = 4 [ancient_mage.magic] range = 6 target_hit = { offense = "magic", max = 207 } +impact_poison = 88 diff --git a/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml b/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml index c64f529d42..7b562b97ff 100644 --- a/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml @@ -23,6 +23,7 @@ slash_defence = 100 crush_defence = 50 magic_defence = 5 range_defence = 400 +hunt_mode = "aggressive" [ancient_ranger] id = 13457 @@ -34,6 +35,7 @@ str = 1 def = 1 range = 636 max_hit_range = 650 +hunt_mode = "aggressive" [blood_reaver] id = 13458 @@ -50,6 +52,7 @@ slash_defence = 30 crush_defence = 20 magic_defence = 400 range_defence = 5 +hunt_mode = "aggressive" [ancient_mage_god_wars_dungeon] id = 13459 @@ -62,6 +65,7 @@ def = 183 mage = 183 max_hit_magic = 207 combat_def = "ancient_mage" +hunt_mode = "aggressive" [nanuq] id = 8076 diff --git a/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml b/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml index c1b66c551e..0121af7b6d 100644 --- a/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml +++ b/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml @@ -16,6 +16,7 @@ max_hit_range = 86 stab_defence = 20 slash_defence = 20 range_defence = 10 +hunt_mode = "aggressive" [armoured_zombie_chaos_temple_dungeon_2] id = 8150 @@ -32,6 +33,7 @@ max_hit_range = 86 stab_defence = 20 slash_defence = 20 range_defence = 10 +hunt_mode = "aggressive" [armoured_zombie_chaos_temple_dungeon_3] id = 8151 @@ -48,6 +50,7 @@ max_hit_range = 86 stab_defence = 20 slash_defence = 20 range_defence = 10 +hunt_mode = "aggressive" [armoured_zombie_chaos_temple_dungeon_4] id = 8152 @@ -64,6 +67,7 @@ max_hit_range = 86 stab_defence = 20 slash_defence = 20 range_defence = 10 +hunt_mode = "aggressive" [armoured_zombie_chaos_temple_dungeon_5] id = 8153 @@ -78,6 +82,7 @@ max_hit_range = 86 stab_defence = 20 slash_defence = 20 range_defence = 10 +hunt_mode = "aggressive" [armoured_zombie_chaos_temple_dungeon_6] id = 8154 diff --git a/data/area/wilderness/chaos_tunnels/chaos_tunnels.npcs.toml b/data/area/wilderness/chaos_tunnels/chaos_tunnels.npcs.toml index 829b7fdd56..9346fc91a3 100644 --- a/data/area/wilderness/chaos_tunnels/chaos_tunnels.npcs.toml +++ b/data/area/wilderness/chaos_tunnels/chaos_tunnels.npcs.toml @@ -130,6 +130,7 @@ slash_defence = 10 crush_defence = 5 magic_defence = 5 range_defence = 10 +hunt_mode = "aggressive" [animated_spade] id = 5414 diff --git a/data/area/wilderness/wilderness.npcs.toml b/data/area/wilderness/wilderness.npcs.toml index 6fecd43b40..d718b5291d 100644 --- a/data/area/wilderness/wilderness.npcs.toml +++ b/data/area/wilderness/wilderness.npcs.toml @@ -106,6 +106,7 @@ combat_def = "giant_rat" drop_table = "giant_rat" categories = ["giant_rats", "rats"] examine = "Overgrown vermin." +hunt_mode = "aggressive" [black_salamander] id = 5116 @@ -217,6 +218,7 @@ att = 6 str = 5 def = 2 max_hit_stab = 10 +hunt_mode = "aggressive" [battle_mage_zamorak] id = 912 diff --git a/data/entity/npc/animal/bear/bear.npcs.toml b/data/entity/npc/animal/bear/bear.npcs.toml index b62cae175c..271af94357 100644 --- a/data/entity/npc/animal/bear/bear.npcs.toml +++ b/data/entity/npc/animal/bear/bear.npcs.toml @@ -80,8 +80,10 @@ respawn_delay = 50 drop_table = "bear" categories = ["bears"] examine = " Cute. But deadly." +hunt_mode = "aggressive" [bear_cub_black] id = 1327 clone = "bear_cub" combat_def = "bear" +hunt_mode = "aggressive" diff --git a/data/entity/npc/animal/rat/rat.npcs.toml b/data/entity/npc/animal/rat/rat.npcs.toml index a34d3f0efe..958b0d3d1e 100644 --- a/data/entity/npc/animal/rat/rat.npcs.toml +++ b/data/entity/npc/animal/rat/rat.npcs.toml @@ -38,16 +38,19 @@ respawn_delay = 30 categories = ["rats"] drop_table = "stronghold_rat" examine = "Overgrown vermin." +hunt_mode = "aggressive" [stronghold_giant_rat_2] id = 4945 categories = ["rats"] clone = "stronghold_giant_rat" +hunt_mode = "aggressive" [stronghold_giant_rat_3] id = 4395 categories = ["rats"] clone = "stronghold_giant_rat" +hunt_mode = "aggressive" [giant_rat] id = 86 @@ -61,6 +64,7 @@ respawn_delay = 30 drop_table = "giant_rat" categories = ["giant_rats", "rats"] examine = "Overgrown vermin." +hunt_mode = "aggressive" [giant_rat_dark] id = 8828 @@ -78,15 +82,18 @@ slash_defence = -40 crush_defence = -40 magic_defence = -40 range_defence = -40 +hunt_mode = "aggressive" [giant_rat_brimhaven] id = 4926 categories = ["rats"] clone = "giant_rat_dark" +hunt_mode = "aggressive" [giant_rat_dark_injured] clone = "giant_rat_dark" id = 8829 +hunt_mode = "aggressive" [rat_ratcatchers] id = 2974 diff --git a/data/entity/npc/monster/reptile/spider/spider.npcs.toml b/data/entity/npc/monster/reptile/spider/spider.npcs.toml index 615d921c94..cc703ceca4 100644 --- a/data/entity/npc/monster/reptile/spider/spider.npcs.toml +++ b/data/entity/npc/monster/reptile/spider/spider.npcs.toml @@ -92,6 +92,7 @@ slash_defence = 16 crush_defence = 7 magic_defence = 12 range_defence = 16 +hunt_mode = "aggressive" [poison_spider] id = 134 @@ -111,6 +112,7 @@ slash_defence = 17 crush_defence = 10 magic_defence = 14 range_defence = 14 +hunt_mode = "aggressive" [spider_underground_pass] id = 1004 diff --git a/data/entity/npc/monster/undead/skoblin/skoblin.npcs.toml b/data/entity/npc/monster/undead/skoblin/skoblin.npcs.toml index 24cfff4671..e770f6ebcb 100644 --- a/data/entity/npc/monster/undead/skoblin/skoblin.npcs.toml +++ b/data/entity/npc/monster/undead/skoblin/skoblin.npcs.toml @@ -6,4 +6,5 @@ max_hit_melee = 28 respawn_delay = 60 drop_table = "skoblin" categories = ["skoblin"] -examine = "Could do with gaining a few pounds." \ No newline at end of file +examine = "Could do with gaining a few pounds." +hunt_mode = "aggressive" \ No newline at end of file diff --git a/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.npcs.toml b/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.npcs.toml index 508e406e02..9216bcf125 100644 --- a/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.npcs.toml +++ b/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.npcs.toml @@ -16,6 +16,7 @@ examine = "A shadowy sort of entity, kind of creepy looking." drop_table = "phrin_shadow" max_hit_crush = 60 combat_def = "phrin_shadow" +hunt_mode = "aggressive" [phrin_shade_shade] id = 1244 @@ -120,6 +121,7 @@ drop_table = "fiyr_shade" examine = "A shadowy sort of entity, kind of creepy looking." max_hit_crush = 110 combat_def = "fiyr_shadow" +hunt_mode = "aggressive" [asyn_shade] id = 1248 diff --git a/data/minigame/soul_wars/nomads_temple/nomads_temple.npcs.toml b/data/minigame/soul_wars/nomads_temple/nomads_temple.npcs.toml index 7d6d7abf00..bb003148bd 100644 --- a/data/minigame/soul_wars/nomads_temple/nomads_temple.npcs.toml +++ b/data/minigame/soul_wars/nomads_temple/nomads_temple.npcs.toml @@ -41,6 +41,7 @@ att = 99 str = 99 def = 99 combat_def = "spectral_worshipper" +hunt_mode = "aggressive" [knight_nomads_temple_2] id = 9448 diff --git a/data/minigame/soul_wars/soul_wars.npcs.toml b/data/minigame/soul_wars/soul_wars.npcs.toml index 962a32783f..afc9dc45c8 100644 --- a/data/minigame/soul_wars/soul_wars.npcs.toml +++ b/data/minigame/soul_wars/soul_wars.npcs.toml @@ -27,6 +27,7 @@ slash_defence = 80 crush_defence = 80 magic_defence = 130 range_defence = 80 +hunt_mode = "aggressive" [avatar_of_creation_soul_wars] id = 8597 @@ -43,6 +44,7 @@ slash_defence = 80 crush_defence = 80 magic_defence = 130 range_defence = 80 +hunt_mode = "aggressive" [pyrefiend_soul_wars] id = 8598 diff --git a/data/quest/members/clock_tower/clock_tower_dungeon.npcs.toml b/data/quest/members/clock_tower/clock_tower_dungeon.npcs.toml index c4b2235f7e..1821c601ef 100644 --- a/data/quest/members/clock_tower/clock_tower_dungeon.npcs.toml +++ b/data/quest/members/clock_tower/clock_tower_dungeon.npcs.toml @@ -9,6 +9,7 @@ att = 10 str = 10 def = 10 max_hit_stab = 20 +hunt_mode = "aggressive" [thief_clocktower_dungeon] id = 282 @@ -60,6 +61,7 @@ att = 10 str = 10 def = 10 max_hit_stab = 20 +hunt_mode = "aggressive" [dungeon_rat_clocktower_dungeon_3] id = 4937 @@ -72,6 +74,7 @@ att = 10 str = 10 def = 10 max_hit_stab = 20 +hunt_mode = "aggressive" [dungeon_rat_clocktower_dungeon_4] id = 88 @@ -84,4 +87,5 @@ att = 10 str = 10 def = 10 max_hit_stab = 20 +hunt_mode = "aggressive" diff --git a/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml b/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml index b90828fdb6..194942c182 100644 --- a/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml +++ b/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml @@ -34,6 +34,7 @@ max_hit_range = 86 stab_defence = 20 slash_defence = 20 range_defence = 10 +hunt_mode = "aggressive" [armoured_zombie_defender_of_varrock_2] id = 8160 @@ -48,6 +49,7 @@ max_hit_range = 86 stab_defence = 20 slash_defence = 20 range_defence = 10 +hunt_mode = "aggressive" [armoured_zombie_defender_of_varrock_3] id = 8161 @@ -62,6 +64,7 @@ max_hit_range = 86 stab_defence = 20 slash_defence = 20 range_defence = 10 +hunt_mode = "aggressive" [armoured_zombie_defender_of_varrock_4] id = 8162 @@ -76,6 +79,7 @@ max_hit_range = 86 stab_defence = 20 slash_defence = 20 range_defence = 10 +hunt_mode = "aggressive" [armoured_zombie_defender_of_varrock_5] id = 8163 @@ -90,6 +94,7 @@ max_hit_range = 86 stab_defence = 20 slash_defence = 20 range_defence = 10 +hunt_mode = "aggressive" [arrav_defender_of_varrock] id = 8169 diff --git a/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.npcs.toml b/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.npcs.toml index 7cf19cc508..0c4988e7ba 100644 --- a/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.npcs.toml +++ b/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.npcs.toml @@ -7,6 +7,7 @@ att = 98 str = 98 def = 77 max_hit_crush = 112 +hunt_mode = "aggressive" [ivory_gromblod_cursed] id = 11353 @@ -17,6 +18,7 @@ att = 92 str = 92 def = 92 range = 92 +hunt_mode = "aggressive" [ivory_breegth_cursed] id = 11354 @@ -29,6 +31,7 @@ def = 113 mage = 113 max_hit_magic = 114 combat_def = "ivory_bre_egth_cursed" +hunt_mode = "aggressive" [farming_patch_orks_rift] id = 11383 diff --git a/data/quest/members/haunted_mine/haunted_mine.npcs.toml b/data/quest/members/haunted_mine/haunted_mine.npcs.toml index d30a8a761f..ba24515387 100644 --- a/data/quest/members/haunted_mine/haunted_mine.npcs.toml +++ b/data/quest/members/haunted_mine/haunted_mine.npcs.toml @@ -33,6 +33,7 @@ max_hit_crush = 30 stab_defence = 50 slash_defence = 40 range_defence = 40 +hunt_mode = "aggressive" [treus_dayth] id = 1540 diff --git a/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml b/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml index 6e05b96a07..af9d39de94 100644 --- a/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml +++ b/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml @@ -8,6 +8,7 @@ att = 80 str = 80 def = 175 max_hit_crush = 94 +hunt_mode = "aggressive" [elite_dark_ranger_black_knights_catacombs] id = 8316 @@ -20,6 +21,7 @@ def = 88 range = 76 max_hit_range = 90 combat_def = "elite_dark_ranger" +hunt_mode = "aggressive" [elite_dark_mage_black_knights_catacombs] id = 8320 @@ -32,6 +34,7 @@ def = 80 mage = 80 max_hit_magic = 190 combat_def = "elite_dark_mage" +hunt_mode = "aggressive" [elite_black_knight_black_knights_catacombs] id = 8328 diff --git a/data/skill/dungeoneering/dungeoneering.npcs.toml b/data/skill/dungeoneering/dungeoneering.npcs.toml index 0feda072cb..da116138f5 100644 --- a/data/skill/dungeoneering/dungeoneering.npcs.toml +++ b/data/skill/dungeoneering/dungeoneering.npcs.toml @@ -107,4 +107,5 @@ slash_defence = 37 crush_defence = 37 magic_defence = 3 range_defence = 6 +hunt_mode = "aggressive" diff --git a/game/src/test/kotlin/content/entity/combat/CombatTest.kt b/game/src/test/kotlin/content/entity/combat/CombatTest.kt index 10fdea6bc4..59cf9a3e38 100644 --- a/game/src/test/kotlin/content/entity/combat/CombatTest.kt +++ b/game/src/test/kotlin/content/entity/combat/CombatTest.kt @@ -148,6 +148,7 @@ internal class CombatTest : WorldTest() { }) val player = createPlayer(emptyTile) val npc = createNPC("giant_rat", emptyTile.addY(4)) + npc.huntMode = "" player.levels.set(Skill.Ranged, 50) player.equipment.set(EquipSlot.Weapon.index, "magic_shortbow") From 8345e0815c5a60072850d3cc725790f8cb03d69c Mon Sep 17 00:00:00 2001 From: Harley Gilpin Date: Fri, 7 Aug 2026 05:38:20 -0700 Subject: [PATCH 10/13] Address review: remove config equipment stats, fix aggression semantics Remove the 718 equipment stat config keys - the cache already contains these params via DefinitionsParameterConverter so config duplication is unnecessary. Wiki 'aggressive' means aggressive with a combat level check, which is hunt_mode "cowardly"; reserve "aggressive" for npcs that attack regardless of level. All 194 added hunt modes flipped to cowardly. Stronghold of Player Safety muggers are the exception among muggers and are not aggressive; removed with source comment. --- .../freaky_forester/freaky_forester.npcs.toml | 22 ---- .../treasure_trails/treasure_trails.npcs.toml | 3 +- .../black_knights_fortress_basement.npcs.toml | 5 - .../black_knight.npcs.toml | 5 +- .../kinshra_workshop.npcs.toml | 4 +- .../asgarnia/burthorpe/burthorpe.npcs.toml | 25 ---- .../dwarven_mines/dwarven_mine.npcs.toml | 9 -- .../living_rock_caverns.npcs.toml | 15 --- data/area/asgarnia/entrana/entrana.npcs.toml | 5 - data/area/asgarnia/falador/falador.npcs.toml | 53 +------- .../asgarnian_ice_resource_dungeon.npcs.toml | 6 - .../skeletal_wyvern/skeletal_wyvern.npcs.toml | 5 - .../mudskipper_point.npcs.toml | 4 +- .../asgarnia/port_sarim/port_sarim.npcs.toml | 15 --- .../asgarnia/rimmington/rimmington.npcs.toml | 31 +---- .../mouse_hole/mouse_hole.npcs.toml | 5 - .../ice_queens_lair/ice_queens_lair.npcs.toml | 7 +- .../fremennik_isles/fremennik_isle.npcs.toml | 14 +-- .../ice_troll_caves/ice_troll_caves.npcs.toml | 14 +-- .../neitiznot/neitiznot.npcs.toml | 9 -- .../chaos_dwarf_battlefield.npcs.toml | 40 +----- .../keldagrim/keldagrim.npcs.toml | 12 -- .../lunar_isle/lunar_isle.npcs.toml | 5 - .../miscellania/miscellania.npcs.toml | 40 ------ .../pirates_cove/pirates_cove.npcs.toml | 2 - .../brine_rat_cavern.npcs.toml | 15 --- .../aquanite/aquanite.npcs.toml | 4 - .../rellekka_hunter_area.npcs.toml | 8 +- .../rellekka/rellekka.npcs.toml | 22 +--- .../waterbirth_island.npcs.toml | 28 +---- .../ancient_cavern/ancient_cavern.npcs.toml | 37 ------ .../kuradals_dungeon.npcs.toml | 5 - .../kandarin/ape_atoll/ape_atoll.npcs.toml | 16 ++- .../tunnels/ape_atoll_tunnels.npcs.toml | 2 +- .../kandarin/ardougne/east_ardougne.npcs.toml | 25 ---- .../ardougne/ibans_lair/ibans_lair.npcs.toml | 3 - .../ardougne/sewers/ardougne_sewers.npcs.toml | 9 +- .../underground_pass_dungeon.npcs.toml | 5 - .../underground_pass.npcs.toml | 17 +-- .../ardougne/west/west_ardougne.npcs.toml | 6 - .../witchaven_dungeon.npcs.toml | 5 - .../barbarian_outpost.npcs.toml | 4 - .../battlefield/battlefield.npcs.toml | 44 ------- .../baxtorian_falls/baxtorian_falls.npcs.toml | 14 --- .../waterfall_dungeon.npcs.toml | 5 - .../camelot/castle/camelot_castle.npcs.toml | 2 - .../feldip_hills/feldip_hills.npcs.toml | 14 +-- .../gu_tanoth/gu_tanoth.npcs.toml | 12 -- .../fishing_guild/fishing_guild.npcs.toml | 25 ---- .../goblin_cave/goblin_cave.npcs.toml | 2 +- .../hazelmeres_island.npcs.toml | 5 - .../dungeon/legends_guild_dungeon.npcs.toml | 5 - data/area/kandarin/ourania/ourania.npcs.toml | 4 - .../kandarin/piscatoris/piscatoris.npcs.toml | 1 - .../fight_arena/khazard_fight_arena.npcs.toml | 3 - .../movarios_base/movarios_base.npcs.toml | 3 - .../ranging_guild/ranging_guild.npcs.toml | 8 -- .../temple_of_ikov/temple_of_ikov.npcs.toml | 12 +- .../tower_of_life/tower_of_life.npcs.toml | 1 - .../combat_training_camp.npcs.toml | 3 - .../tree_gnome_stronghold.npcs.toml | 29 ----- .../troll_stronghold_tunnels.npcs.toml | 36 +----- .../yanille_agility_dungeon.npcs.toml | 5 - data/area/kandarin/yanille/yanille.npcs.toml | 10 -- .../karamja/brimhaven/brimhaven.npcs.toml | 5 - .../dungeon/brimhaven_dungeon.npcs.toml | 2 +- data/area/karamja/crandor/crandor.npcs.toml | 7 +- data/area/karamja/karamja.npcs.toml | 52 +------- .../caves/kharazi_caves.npcs.toml | 25 +--- .../pothole_dungeon/pothole_dungeon.npcs.toml | 4 +- .../shilo_village/shilo_village.npcs.toml | 5 - .../karamja/tzhaar_city/tzhaar_city.npcs.toml | 14 +-- .../agility_pyramid/agility_pyramid.npcs.toml | 20 +-- .../bandit_camp/bandit_camp.npcs.toml | 2 - .../windmill_cellar/windmill_cellar.npcs.toml | 22 ++-- .../kalphite_hive/kalphite_hive.npcs.toml | 37 +----- .../kharidian_desert.npcs.toml | 15 --- .../klenters_pyramid.npcs.toml | 26 +--- .../mining_camp/desert_mining_camp.npcs.toml | 15 +-- .../kharidian_desert/nardah/nardah.npcs.toml | 5 - .../pollnivneach/pollnivneach.npcs.toml | 6 - .../rock_island_prison.npcs.toml | 5 - .../sophanem_dungeon.npcs.toml | 28 ----- .../scabaras_dungeon.npcs.toml | 22 +--- .../kharidian_desert/ullek/ullek.npcs.toml | 47 ++----- .../uzer/mastaba/uzer_mastaba.npcs.toml | 3 +- .../area/kharidian_desert/uzer/uzer.npcs.toml | 10 +- .../barbarian_village.npcs.toml | 8 -- .../stronghold_of_player_safety.npcs.toml | 13 +- .../catablepon/catablepon.npcs.toml | 15 --- .../flesh_crawler/flesh_crawler.npcs.toml | 5 - .../minotaur/minotaur.npcs.toml | 12 +- .../dorgesh_kaan/dorgesh_kaan.npcs.toml | 14 --- data/area/misthalin/draynor/draynor.npcs.toml | 5 - .../misthalin/edgeville/edgeville.npcs.toml | 15 --- .../ham_hideout/ham_hideout.npcs.toml | 12 +- .../store_rooms/ham_store_rooms.npcs.toml | 4 + .../ice_mountain/ice_mountain.npcs.toml | 5 - .../goblin_mines/goblin_mines.npcs.toml | 11 -- .../lumbridge/freds_farm/freds_farm.npcs.toml | 5 - .../misthalin/lumbridge/lumbridge.npcs.toml | 10 -- .../lumbridge/swamp/lumbridge_swamp.npcs.toml | 12 +- .../tutorial_island/tutorial_island.npcs.toml | 2 +- .../air_rune_temple/air_rune_temple.npcs.toml | 5 - .../varrock/tolnas_rift/tolnas_rift.npcs.toml | 16 +-- data/area/misthalin/varrock/varrock.npcs.toml | 13 +- .../evil_chicken_lair.npcs.toml | 11 +- data/area/misthalin/zanaris/zanaris.npcs.toml | 15 --- .../braindeath_island.npcs.toml | 17 +-- .../burgh_de_rott/burgh_de_rott.npcs.toml | 24 ++-- data/area/morytania/canifis/canifis.npcs.toml | 15 --- .../dragontooth_shipwreck.npcs.toml | 2 +- .../lair_of_tarn_razorlor.npcs.toml | 38 +----- .../meiyerditch/meiyerditch.npcs.toml | 2 +- .../tunnels/meiyerditch_tunnels.npcs.toml | 4 +- .../mort_myre_swamp/mort_myre_swamp.npcs.toml | 25 ---- .../mos_le_harmless/mos_le_harmless.npcs.toml | 6 +- .../alices_farm/alices_farm.npcs.toml | 10 -- .../nechryael/nechryael.npcs.toml | 4 - .../corporeal_beasts_lair.npcs.toml | 10 -- .../enchanted_valley.npcs.toml | 7 +- .../realm/fisher_realm/fisher_realm.npcs.toml | 10 -- .../killerwatt_plane.npcs.toml | 5 - .../realm/spirit_realm/spirit_realm.npcs.toml | 7 +- .../iorwerth_camp/iorwerth_camp.npcs.toml | 10 -- data/area/tirannwn/isafdar/isafdar.npcs.toml | 5 - data/area/tirannwn/lletya/lletya.npcs.toml | 15 --- .../poison_waste_slayer_dungeon.npcs.toml | 66 ++-------- .../death_plateau/death_plateau.npcs.toml | 16 +-- .../ghorrock_fortress_dungeon.npcs.toml | 9 +- .../armadyl/armadyl.npcs.toml | 6 - .../god_wars_dungeon/bandos/bandos.npcs.toml | 6 - .../god_wars_dungeon/bandos/ork/ork.npcs.toml | 5 - .../god_wars_dungeon/god_wars.npcs.toml | 18 +-- .../knight_of_saradomin.npcs.toml | 8 -- .../saradomin/saradomin.npcs.toml | 20 --- .../saradomin_priest.npcs.toml | 5 - .../spiritual_mage/spiritual_mage.npcs.toml | 15 --- .../spiritual_ranger.npcs.toml | 15 --- .../spiritual_warrior.npcs.toml | 15 --- .../zamorak/zamorak.npcs.toml | 9 -- .../troll_country/troll_country.npcs.toml | 12 -- .../troll_tunnels/troll_tunnels.npcs.toml | 12 -- .../trollheim/trollheim.npcs.toml | 7 -- data/area/wilderness/abyss/abyss.npcs.toml | 15 --- .../abyssal_demon/abyssal_demon.npcs.toml | 4 - .../wilderness_bandit_camp.npcs.toml | 17 --- .../chaos_temple_dungeon.npcs.toml | 25 +--- .../chaos_tunnels/chaos_tunnels.npcs.toml | 25 +--- data/area/wilderness/wilderness.npcs.toml | 13 +- data/entity/npc/animal/bat/bat.npcs.toml | 9 -- data/entity/npc/animal/bear/bear.npcs.toml | 4 +- data/entity/npc/animal/birds/birds.npcs.toml | 10 -- .../npc/animal/chicken/chicken.npcs.toml | 5 - data/entity/npc/animal/cow/cow.npcs.toml | 37 +----- data/entity/npc/animal/crab/crab.npcs.toml | 6 - data/entity/npc/animal/rat/rat.npcs.toml | 24 ++-- .../npc/boss/giant_mole/giant_mole.npcs.toml | 5 - .../king_black_dragon.npcs.toml | 5 - .../entity/npc/humanoid/dwarf/dwarf.npcs.toml | 21 ---- data/entity/npc/humanoid/thug/thug.npcs.toml | 3 - .../monster/cave/cave_bug/cave_bug.npcs.toml | 12 +- .../npc/monster/dagannoth/dagannoth.npcs.toml | 13 -- .../entity/npc/monster/demon/demons.npcs.toml | 3 - .../npc/monster/draconic/dragons.npcs.toml | 50 -------- .../monster/fiend/icefiend/icefiend.npcs.toml | 5 - .../giant/fire_giant/fire_giant.npcs.toml | 2 - .../giant/ice_giant/ice_giant.npcs.toml | 2 - .../npc/monster/goblin/goblin.npcs.toml | 40 ------ .../goblin/hobgoblin/hobgoblin.npcs.toml | 2 - data/entity/npc/monster/imp/imp.npcs.toml | 10 -- .../monster/reptile/lizard/lizard.npcs.toml | 10 -- .../reptile/scorpion/scorpion.npcs.toml | 31 +---- .../monster/reptile/spider/spider.npcs.toml | 34 +---- .../npc/monster/turoth/turoth.npcs.toml | 2 - .../monster/undead/corpse/corpse.npcs.toml | 5 - .../npc/monster/undead/ghost/ghost.npcs.toml | 14 --- .../undead/magic_axe/magic_axe.npcs.toml | 7 +- .../undead/skeleton/skeletons.npcs.toml | 45 ------- .../monster/undead/skoblin/skoblin.npcs.toml | 2 +- .../monster/undead/warped/warped.npcs.toml | 5 - .../monster/undead/zombie/zombie.npcs.toml | 119 ------------------ .../monster/wallasalki/wallasalki.npcs.toml | 6 - .../earth_warrior/earth_warrior.npcs.toml | 7 +- .../warrior/ice_warrior/ice_warrior.npcs.toml | 5 - .../npc/monster/werewolf/werewolf.npcs.toml | 5 - .../barrows_brothers/barrows.npcs.toml | 33 ----- .../shade_catacombs/shade_catacombs.npcs.toml | 4 +- .../nomads_temple/nomads_temple.npcs.toml | 2 +- data/minigame/soul_wars/soul_wars.npcs.toml | 14 +-- .../tai_bwo_wannai_cleanup.npcs.toml | 12 -- .../warriors_guild/warriors_guild.npcs.toml | 35 ------ .../free/blood_pact/blood_pact.npcs.toml | 2 - .../between_a_rock/between_a_rock.npcs.toml | 30 ----- .../clock_tower/clock_tower_dungeon.npcs.toml | 18 +-- data/quest/members/contact/contact.npcs.toml | 5 - .../defender_of_varrock.npcs.toml | 25 +--- .../desert_treasure/desert_treasure.npcs.toml | 11 -- .../dwarf_cannon/dwarven_outpost.npcs.toml | 15 --- .../orks_rift/orks_rift.npcs.toml | 6 +- .../fremennik_isles/fremennik_isles.npcs.toml | 5 - .../fremennik_trials.npcs.toml | 10 -- .../members/ghosts_ahoy/ghosts_ahoy.npcs.toml | 4 - .../members/grim_tales/grim_tales.npcs.toml | 10 -- .../haunted_mine/abandoned_mine.npcs.toml | 10 -- .../haunted_mine/haunted_mine.npcs.toml | 10 +- .../monkey_madness/monkey_madness.npcs.toml | 2 - .../mournings_end_part_2.npcs.toml | 5 - .../my_arms_big_adventure.npcs.toml | 2 - .../one_small_favour.npcs.toml | 5 - .../members/plague_city/plague_city.npcs.toml | 3 - .../recipe_for_disaster.npcs.toml | 19 +-- .../battle_of_the_archipelago.npcs.toml | 5 - .../members/slug_menace/slug_menace.npcs.toml | 5 - .../spirits_of_the_elid.npcs.toml | 15 --- .../members/swan_song/swan_song.npcs.toml | 4 - .../troll_stronghold.npcs.toml | 5 - .../black_knights_catacombs.npcs.toml | 6 +- .../luciens_camp/luciens_camp.npcs.toml | 24 ---- .../zogre_flesh_eaters.npcs.toml | 3 - .../dungeoneering/dungeoneering.npcs.toml | 8 +- data/skill/summoning/summoning.npcs.toml | 27 ---- 222 files changed, 215 insertions(+), 2702 deletions(-) diff --git a/data/activity/event/random/freaky_forester/freaky_forester.npcs.toml b/data/activity/event/random/freaky_forester/freaky_forester.npcs.toml index e1e4483e5f..6485aa9467 100644 --- a/data/activity/event/random/freaky_forester/freaky_forester.npcs.toml +++ b/data/activity/event/random/freaky_forester/freaky_forester.npcs.toml @@ -33,49 +33,27 @@ id = 13246 clone = "pheasant_1_tail" drop_table = "pheasant" combat_def = "chicken" -stab_defence = 1 -slash_defence = 1 [pheasant_3_tails] id = 13247 clone = "pheasant_1_tail" drop_table = "pheasant" combat_def = "chicken" -stab_defence = -15 -slash_defence = -15 -crush_defence = -15 -magic_defence = -15 -range_defence = -15 [pheasant_3_tails_2] id = 13248 clone = "pheasant_1_tail" drop_table = "pheasant" combat_def = "chicken" -stab_defence = -15 -slash_defence = -15 -crush_defence = -15 -magic_defence = -15 -range_defence = -15 [pheasant_4_tails] id = 13249 clone = "pheasant_1_tail" drop_table = "pheasant" combat_def = "chicken" -stab_defence = -15 -slash_defence = -15 -crush_defence = -15 -magic_defence = -15 -range_defence = -15 [pheasant_4_tails_2] id = 13250 clone = "pheasant_1_tail" drop_table = "pheasant" combat_def = "chicken" -stab_defence = -15 -slash_defence = -15 -crush_defence = -15 -magic_defence = -15 -range_defence = -15 diff --git a/data/activity/treasure_trails/treasure_trails.npcs.toml b/data/activity/treasure_trails/treasure_trails.npcs.toml index 4e47a522bf..e064437d68 100644 --- a/data/activity/treasure_trails/treasure_trails.npcs.toml +++ b/data/activity/treasure_trails/treasure_trails.npcs.toml @@ -36,5 +36,4 @@ max_hit_melee = 200 hunt_mode = "cowardly" immune_poison = true drop_table = "zamorak_wizard" -examine = "A servant of Zamorak." -magic_defence = 3 \ No newline at end of file +examine = "A servant of Zamorak." \ No newline at end of file diff --git a/data/area/asgarnia/black_knights_fortress/basement/black_knights_fortress_basement.npcs.toml b/data/area/asgarnia/black_knights_fortress/basement/black_knights_fortress_basement.npcs.toml index cc6a60dca4..7c941953c4 100644 --- a/data/area/asgarnia/black_knights_fortress/basement/black_knights_fortress_basement.npcs.toml +++ b/data/area/asgarnia/black_knights_fortress/basement/black_knights_fortress_basement.npcs.toml @@ -39,11 +39,6 @@ id = 2682 drop_table = "rat" combat_def = "rat" hitpoints = 20 -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [arthur_black_knights_fortress_basement] id = 3778 diff --git a/data/area/asgarnia/black_knights_fortress/black_knight.npcs.toml b/data/area/asgarnia/black_knights_fortress/black_knight.npcs.toml index c66c73a00f..2edb44fc47 100644 --- a/data/area/asgarnia/black_knights_fortress/black_knight.npcs.toml +++ b/data/area/asgarnia/black_knights_fortress/black_knight.npcs.toml @@ -21,10 +21,7 @@ combat_def = "man" max_hit_crush = 50 respawn_delay = 50 examine = "Guards prisoners for the black knights." -stab_defence = 79 -slash_defence = 63 -crush_defence = 47 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [black_knight_void_stares_back] id = 12317 diff --git a/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml b/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml index 4f07dc9ff5..d5f0137f52 100644 --- a/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml +++ b/data/area/asgarnia/black_knights_fortress/kinshra_workshop/kinshra_workshop.npcs.toml @@ -27,7 +27,7 @@ att = 356 str = 356 def = 1 max_hit_crush = 370 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [black_knight_guardian_kinshra_workshop_2] id = 11697 @@ -38,7 +38,7 @@ att = 356 str = 356 def = 1 max_hit_crush = 370 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [black_knight_doorkeeper_2] id = 11690 diff --git a/data/area/asgarnia/burthorpe/burthorpe.npcs.toml b/data/area/asgarnia/burthorpe/burthorpe.npcs.toml index 958480f6ea..3601b527a8 100644 --- a/data/area/asgarnia/burthorpe/burthorpe.npcs.toml +++ b/data/area/asgarnia/burthorpe/burthorpe.npcs.toml @@ -38,11 +38,6 @@ combat_def = "woman" respawn_delay = 25 drop_table = "citizen" examine = "A citizen of Burthorpe." -stab_defence = -12 -slash_defence = -12 -crush_defence = -12 -magic_defence = -12 -range_defence = -12 [penda] id = 1087 @@ -77,11 +72,6 @@ respawn_delay = 25 collision = "outdoors" drop_table = "citizen" examine = "A citizen of Burthorpe." -stab_defence = -12 -slash_defence = -12 -crush_defence = -12 -magic_defence = -12 -range_defence = -12 [hygd] id = 1088 @@ -94,11 +84,6 @@ combat_def = "woman" respawn_delay = 25 drop_table = "citizen" examine = "A citizen of Burthorpe." -stab_defence = -12 -slash_defence = -12 -crush_defence = -12 -magic_defence = -12 -range_defence = -12 [dunstan] id = 1082 @@ -151,11 +136,6 @@ combat_def = "woman" respawn_delay = 25 drop_table = "bones" examine = "The Burthorpe Castle cook." -stab_defence = -12 -slash_defence = -12 -crush_defence = -12 -magic_defence = -12 -range_defence = -12 [denulth] id = 1060 @@ -244,11 +224,6 @@ attack_bonus = 30 respawn_delay = 50 examine = "The knight seems to be watching something." drop_table = "white_knight" -stab_defence = 83 -slash_defence = 76 -crush_defence = 70 -magic_defence = -11 -range_defence = 74 [helemos] id = 797 diff --git a/data/area/asgarnia/dwarven_mines/dwarven_mine.npcs.toml b/data/area/asgarnia/dwarven_mines/dwarven_mine.npcs.toml index 26e86f5fe8..7475e1df50 100644 --- a/data/area/asgarnia/dwarven_mines/dwarven_mine.npcs.toml +++ b/data/area/asgarnia/dwarven_mines/dwarven_mine.npcs.toml @@ -13,9 +13,6 @@ att = 40 str = 40 def = 35 max_hit_crush = 50 -stab_defence = 7 -slash_defence = 7 -range_defence = 7 [dwarf_gang_member_2] id = 1796 @@ -28,9 +25,6 @@ att = 80 str = 30 def = 25 max_hit_crush = 40 -stab_defence = 7 -slash_defence = 7 -range_defence = 7 [dwarf_gang_member_3] id = 1797 @@ -41,9 +35,6 @@ att = 30 str = 60 def = 57 max_hit_crush = 70 -stab_defence = 7 -slash_defence = 7 -range_defence = 7 [cart_conductor] id = 2186 diff --git a/data/area/asgarnia/dwarven_mines/living_rock_caverns/living_rock_caverns.npcs.toml b/data/area/asgarnia/dwarven_mines/living_rock_caverns/living_rock_caverns.npcs.toml index b0d01cb08b..1d25ddb5f3 100644 --- a/data/area/asgarnia/dwarven_mines/living_rock_caverns/living_rock_caverns.npcs.toml +++ b/data/area/asgarnia/dwarven_mines/living_rock_caverns/living_rock_caverns.npcs.toml @@ -13,11 +13,6 @@ att = 130 str = 130 def = 80 examine = "A being of ore and minerals." -stab_defence = 345 -slash_defence = 345 -crush_defence = 245 -magic_defence = 345 -range_defence = 345 [living_rock_protector_remains] id = 8837 @@ -38,11 +33,6 @@ str = 150 def = 80 range = 100 examine = "A being of ore and minerals." -stab_defence = 345 -slash_defence = 345 -crush_defence = 245 -magic_defence = 345 -range_defence = 345 [living_rock_striker_remains] id = 8838 @@ -58,11 +48,6 @@ combat_def = "living_rock_patriarch" categories = ["living_rock_creatures"] drop_table = "living_rock_patriarch" examine = "A being of ore and minerals." -stab_defence = 475 -slash_defence = 475 -crush_defence = 340 -magic_defence = 475 -range_defence = 475 [living_rock_patriarch_remains] id = 8839 diff --git a/data/area/asgarnia/entrana/entrana.npcs.toml b/data/area/asgarnia/entrana/entrana.npcs.toml index 187aebf8ca..cd39a9bb4f 100644 --- a/data/area/asgarnia/entrana/entrana.npcs.toml +++ b/data/area/asgarnia/entrana/entrana.npcs.toml @@ -70,11 +70,6 @@ categories = ["birds"] respawn_delay = 35 drop_table = "firebird" examine = "Probably not a chicken." -stab_defence = -26 -slash_defence = -26 -crush_defence = -26 -magic_defence = -26 -range_defence = -26 [mysterious_ghost_entrana_2] id = 2401 diff --git a/data/area/asgarnia/falador/falador.npcs.toml b/data/area/asgarnia/falador/falador.npcs.toml index 448cd5a7dc..983b8f45e6 100644 --- a/data/area/asgarnia/falador/falador.npcs.toml +++ b/data/area/asgarnia/falador/falador.npcs.toml @@ -147,22 +147,12 @@ id = 2313 drop_table = "chicken" combat_def = "chicken" hitpoints = 30 -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [chicken_falador_2] id = 2314 drop_table = "chicken" combat_def = "chicken" hitpoints = 30 -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [chicken_falador_3] id = 2315 @@ -171,11 +161,6 @@ examine = "Yep. Definitely a chicken." drop_table = "chicken" combat_def = "chicken" hitpoints = 30 -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [elstan] id = 2323 @@ -219,7 +204,6 @@ combat_def = "air_wizard" respawn_delay = 50 drop_table = "air_wizard" examine = "At least he looks solid enough to fight." -magic_defence = 15 [malignius_mortifer] id = 2713 @@ -269,47 +253,22 @@ examine = "He tries to keep order around here." id = 3229 clone = "guard_falador" combat_def = "guard_xbow" -stab_defence = 13 -slash_defence = 17 -crush_defence = 14 -magic_defence = -4 -range_defence = 15 [guard_falador_3] id = 3230 clone = "guard_falador" -stab_defence = 5 -slash_defence = 5 -crush_defence = 5 -magic_defence = -4 -range_defence = 5 [guard_falador_4] id = 3231 clone = "guard_falador" -stab_defence = 5 -slash_defence = 5 -crush_defence = 5 -magic_defence = -4 -range_defence = 5 [guard_falador_5] id = 3232 clone = "guard_falador" -stab_defence = 5 -slash_defence = 5 -crush_defence = 5 -magic_defence = -4 -range_defence = 5 [guard_falador_6] id = 3233 clone = "guard_falador" -stab_defence = 5 -slash_defence = 5 -crush_defence = 5 -magic_defence = -4 -range_defence = 5 [apprentice_workman] id = 3235 @@ -370,7 +329,6 @@ respawn_delay = 50 drop_table = "dark_wizard_high" examine = "A practicer of dark arts." combat_def = "dark_wizard_water" -magic_defence = 5 [dark_wizard_falador_2] id = 3243 @@ -391,7 +349,6 @@ respawn_delay = 50 drop_table = "dark_wizard_low" examine = "A practicer of dark arts." combat_def = "dark_wizard_water" -magic_defence = 5 [dark_wizard_falador_4] id = 3245 @@ -521,9 +478,6 @@ hunt_mode = "cowardly" respawn_delay = 100 drop_table = "highwayman" examine = "He holds up passers by." -slash_defence = 3 -crush_defence = 2 -range_defence = 2 [assistant_falador] id = 7726 @@ -716,9 +670,4 @@ attack_bonus = 30 combat_def = "white_knight" respawn_delay = 50 examine = "The knight seems to be watching something." -drop_table = "white_knight" -stab_defence = 83 -slash_defence = 76 -crush_defence = 70 -magic_defence = -11 -range_defence = 74 \ No newline at end of file +drop_table = "white_knight" \ No newline at end of file diff --git a/data/area/asgarnia/mudskipper_point/asgarnian_ice_dungeon/resource_dungeon/asgarnian_ice_resource_dungeon.npcs.toml b/data/area/asgarnia/mudskipper_point/asgarnian_ice_dungeon/resource_dungeon/asgarnian_ice_resource_dungeon.npcs.toml index 81897b494b..3294f73f01 100644 --- a/data/area/asgarnia/mudskipper_point/asgarnian_ice_dungeon/resource_dungeon/asgarnian_ice_resource_dungeon.npcs.toml +++ b/data/area/asgarnia/mudskipper_point/asgarnian_ice_dungeon/resource_dungeon/asgarnian_ice_resource_dungeon.npcs.toml @@ -14,12 +14,6 @@ slayer_xp = 235.5 categories = ["dragons", "frost_dragons"] respawn_delay = 30 examine = "A dragon covered in frost and ice." -attack_bonus = 40 -stab_defence = 24 -slash_defence = 140 -crush_defence = 140 -magic_defence = 60 -range_defence = 24 [frost_dragon_2] id = 11634 diff --git a/data/area/asgarnia/mudskipper_point/asgarnian_ice_dungeon/skeletal_wyvern/skeletal_wyvern.npcs.toml b/data/area/asgarnia/mudskipper_point/asgarnian_ice_dungeon/skeletal_wyvern/skeletal_wyvern.npcs.toml index 94a993f9b7..fe41a860c9 100644 --- a/data/area/asgarnia/mudskipper_point/asgarnian_ice_dungeon/skeletal_wyvern/skeletal_wyvern.npcs.toml +++ b/data/area/asgarnia/mudskipper_point/asgarnian_ice_dungeon/skeletal_wyvern/skeletal_wyvern.npcs.toml @@ -16,11 +16,6 @@ xp_bonus = 0.5 combat_def = "skeletal_wyvern" drop_table = "skeletal_wyvern" examine = "A very dangerous pile of animated wyvern bones." -stab_defence = 140 -slash_defence = 90 -crush_defence = 90 -magic_defence = 80 -range_defence = 140 [skeletal_wyvern_horns] id = 3069 diff --git a/data/area/asgarnia/mudskipper_point/mudskipper_point.npcs.toml b/data/area/asgarnia/mudskipper_point/mudskipper_point.npcs.toml index 8eb9834d3d..b8df16a7f5 100644 --- a/data/area/asgarnia/mudskipper_point/mudskipper_point.npcs.toml +++ b/data/area/asgarnia/mudskipper_point/mudskipper_point.npcs.toml @@ -24,7 +24,7 @@ att = 2 str = 3 def = 2 max_hit_stab = 10 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [giant_rat_mudskipper_point_2] id = 4924 @@ -36,7 +36,7 @@ att = 2 str = 3 def = 2 max_hit_stab = 10 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [mogre] id = 114 diff --git a/data/area/asgarnia/port_sarim/port_sarim.npcs.toml b/data/area/asgarnia/port_sarim/port_sarim.npcs.toml index 0d273db591..1ca908bfcf 100644 --- a/data/area/asgarnia/port_sarim/port_sarim.npcs.toml +++ b/data/area/asgarnia/port_sarim/port_sarim.npcs.toml @@ -15,11 +15,6 @@ combat_def = "guard" attack_bonus = 4 respawn_delay = 50 examine = "Keeping an eye out for suspicious activity." -stab_defence = 18 -slash_defence = 25 -crush_defence = 19 -magic_defence = -4 -range_defence = 20 [port_sarim_guard_1] id = 2700 @@ -263,11 +258,6 @@ respawn_delay = 25 combat_def = "seagull" drop_table = "seagull" examine = "A messy bird." -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [seagull_port_sarim_2] id = 6116 @@ -279,11 +269,6 @@ respawn_delay = 25 combat_def = "seagull" drop_table = "seagull" examine = "Smells of rotten fish." -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [thaki_the_delivery_dwarf] id = 7115 diff --git a/data/area/asgarnia/rimmington/rimmington.npcs.toml b/data/area/asgarnia/rimmington/rimmington.npcs.toml index fba2453ae6..814884d296 100644 --- a/data/area/asgarnia/rimmington/rimmington.npcs.toml +++ b/data/area/asgarnia/rimmington/rimmington.npcs.toml @@ -81,12 +81,7 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 -stab_defence = 9 -slash_defence = 11 -crush_defence = -2 -magic_defence = 1 -range_defence = 4 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [skeleton_rimmington_2] id = 6092 @@ -99,12 +94,7 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 -stab_defence = 9 -slash_defence = 11 -crush_defence = -2 -magic_defence = 1 -range_defence = 4 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [skeleton_rimmington_3] id = 6093 @@ -117,12 +107,7 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 -stab_defence = 9 -slash_defence = 11 -crush_defence = -2 -magic_defence = 1 -range_defence = 4 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [ghost_rimmington] id = 6094 @@ -133,11 +118,6 @@ att = 13 str = 13 def = 18 max_hit_crush = 20 -stab_defence = 5 -slash_defence = 5 -crush_defence = 5 -magic_defence = -5 -range_defence = 5 [ghost_rimmington_2] id = 6095 @@ -148,11 +128,6 @@ att = 13 str = 13 def = 18 max_hit_crush = 20 -stab_defence = 5 -slash_defence = 5 -crush_defence = 5 -magic_defence = -5 -range_defence = 5 [ghost_rimmington_3] id = 6096 diff --git a/data/area/asgarnia/taverley/witches_house/mouse_hole/mouse_hole.npcs.toml b/data/area/asgarnia/taverley/witches_house/mouse_hole/mouse_hole.npcs.toml index c8e576db38..0a06d17375 100644 --- a/data/area/asgarnia/taverley/witches_house/mouse_hole/mouse_hole.npcs.toml +++ b/data/area/asgarnia/taverley/witches_house/mouse_hole/mouse_hole.npcs.toml @@ -11,11 +11,6 @@ respawn_delay = 35 examine = "A huge mouse. It looks hungry..." drop_table = "mouse" combat_def = "rat" -stab_defence = 30 -slash_defence = 55 -crush_defence = 65 -magic_defence = 50 -range_defence = 60 [mouse_mouse_hole_dark] id = 5995 diff --git a/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml index 95f29981ba..5fd41d4dec 100644 --- a/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml +++ b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml @@ -7,12 +7,7 @@ att = 47 str = 47 def = 47 max_hit_slash = 60 -stab_defence = 30 -slash_defence = 40 -crush_defence = 20 -magic_defence = 10 -range_defence = 30 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [ice_queen] id = 795 diff --git a/data/area/fremennik_province/fremennik_isles/fremennik_isle.npcs.toml b/data/area/fremennik_province/fremennik_isles/fremennik_isle.npcs.toml index 431fc2cba9..83fa779b8b 100644 --- a/data/area/fremennik_province/fremennik_isles/fremennik_isle.npcs.toml +++ b/data/area/fremennik_province/fremennik_isles/fremennik_isle.npcs.toml @@ -23,9 +23,6 @@ respawn_delay = 50 examine = "An ice troll youngling." drop_table = "ice_troll_runt" combat_def = "ice_troll" -stab_defence = 30 -slash_defence = 60 -crush_defence = 30 [ice_troll_male_fremennik_isle] id = 5526 @@ -43,9 +40,6 @@ categories = ["trolls"] drop_table = "ice_troll_male" examine = "A male troll wielding a large club." combat_def = "ice_troll" -stab_defence = 30 -slash_defence = 60 -crush_defence = 30 [ice_troll_female_fremennik_isle] id = 5527 @@ -64,10 +58,7 @@ categories = ["trolls"] drop_table = "ice_troll_female" examine = "An ice troll with a bag of rocks." combat_def = "ice_troll_female" -stab_defence = 30 -slash_defence = 60 -crush_defence = 30 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [ice_troll_grunt_fremennik_isle] id = 5528 @@ -86,6 +77,3 @@ respawn_delay = 50 drop_table = "ice_troll_grunt" examine = "A large ice troll." combat_def = "ice_troll" -stab_defence = 30 -slash_defence = 60 -crush_defence = 30 diff --git a/data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.npcs.toml b/data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.npcs.toml index 8bd969ab30..61b33a2e16 100644 --- a/data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.npcs.toml +++ b/data/area/fremennik_province/fremennik_isles/ice_troll_caves/ice_troll_caves.npcs.toml @@ -15,9 +15,6 @@ respawn_delay = 50 examine = "An ice troll youngling." drop_table = "ice_troll_runt" combat_def = "ice_troll" -stab_defence = 30 -slash_defence = 60 -crush_defence = 30 [ice_troll_male_ice_troll_caves] id = 5474 @@ -35,9 +32,6 @@ categories = ["trolls"] drop_table = "ice_troll_male" examine = "A male troll wielding a large club." combat_def = "ice_troll" -stab_defence = 30 -slash_defence = 60 -crush_defence = 30 [ice_troll_female_ice_troll_caves] id = 5475 @@ -57,10 +51,7 @@ categories = ["trolls"] drop_table = "ice_troll_female" examine = "An ice troll with a bag of rocks." combat_def = "ice_troll_female" -stab_defence = 30 -slash_defence = 60 -crush_defence = 30 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [ice_troll_grunt_ice_troll_caves] id = 5476 @@ -79,9 +70,6 @@ respawn_delay = 50 drop_table = "ice_troll_grunt" examine = "A large ice troll." combat_def = "ice_troll" -stab_defence = 30 -slash_defence = 60 -crush_defence = 30 [bork_sigmundson_ice_troll_caves] id = 5477 diff --git a/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.npcs.toml b/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.npcs.toml index 44ce52d1cb..2392d4108f 100644 --- a/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.npcs.toml +++ b/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.npcs.toml @@ -69,9 +69,6 @@ categories = ["trolls"] respawn_delay = 50 examine = "An ice troll youngling." drop_table = "ice_troll_runt" -stab_defence = 30 -slash_defence = 60 -crush_defence = 30 [ice_troll_male_neitiznot] id = 5522 @@ -87,9 +84,6 @@ slayer_xp = 84.0 categories = ["trolls"] drop_table = "ice_troll_male" examine = "A male troll wielding a large club." -stab_defence = 30 -slash_defence = 60 -crush_defence = 30 [ice_troll_female_neitiznot] id = 5523 @@ -105,9 +99,6 @@ slayer_xp = 84.0 categories = ["trolls"] drop_table = "ice_troll_female" examine = "An ice troll with a bag of rocks." -stab_defence = 30 -slash_defence = 60 -crush_defence = 30 [yak] id = 5529 diff --git a/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml b/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml index 62e69a286a..1887bf4a6c 100644 --- a/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml +++ b/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.npcs.toml @@ -26,10 +26,6 @@ respawn_delay = 30 examine = "A member of the Black Guard, a special division of the dwarven army." drop_table = "black_guard" combat_def = "dwarf" -stab_defence = 40 -slash_defence = 40 -crush_defence = 40 -range_defence = 40 [black_guard_chaos_dwarf_battlefield_2] id = 8773 @@ -55,11 +51,6 @@ str = 1 def = 91 range = 96 max_hit_range = 110 -stab_defence = 40 -slash_defence = 34 -crush_defence = 25 -magic_defence = 10 -range_defence = 35 [chaos_dwarf_hand_cannoneer_chaos_dwarf_battlefield_2] id = 8777 @@ -73,11 +64,6 @@ str = 1 def = 91 range = 96 max_hit_range = 110 -stab_defence = 40 -slash_defence = 34 -crush_defence = 25 -magic_defence = 10 -range_defence = 35 [chaos_dwarf_chaos_dwarf_battlefield] id = 8778 @@ -89,12 +75,7 @@ str = 42 def = 28 attack_bonus = 13 max_hit_crush = 60 -stab_defence = 40 -slash_defence = 34 -crush_defence = 25 -magic_defence = 10 -range_defence = 35 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [chaos_dwarf_chaos_dwarf_battlefield_2] id = 8779 @@ -108,12 +89,7 @@ str = 42 def = 28 attack_bonus = 13 max_hit_crush = 60 -stab_defence = 40 -slash_defence = 34 -crush_defence = 25 -magic_defence = 10 -range_defence = 35 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [black_guard_crossbowdwarf_chaos_dwarf_battlefield] id = 8781 @@ -127,10 +103,6 @@ str = 1 def = 84 range = 86 max_hit_range = 100 -stab_defence = 40 -slash_defence = 40 -crush_defence = 40 -range_defence = 40 [black_guard_crossbowdwarf_chaos_dwarf_battlefield_2] id = 8782 @@ -144,10 +116,6 @@ str = 1 def = 84 range = 86 max_hit_range = 100 -stab_defence = 40 -slash_defence = 40 -crush_defence = 40 -range_defence = 40 [black_guard_berserker_chaos_dwarf_battlefield] id = 8783 @@ -166,10 +134,6 @@ respawn_delay = 30 examine = "An elite member of the Black Guard." drop_table = "black_guard_berserker" combat_def = "guard" -stab_defence = 60 -slash_defence = 60 -crush_defence = 60 -range_defence = 60 [black_guard_berserker_chaos_dwarf_battlefield_2] id = 8784 diff --git a/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml b/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml index 54546fa11e..520148e625 100644 --- a/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml +++ b/data/area/fremennik_province/keldagrim/keldagrim.npcs.toml @@ -284,10 +284,6 @@ hunt_mode = "guarding" drop_table = "black_guard_high" examine = "A member of the Black Guard, a special division of the dwarven army." combat_def = "dwarf" -stab_defence = 40 -slash_defence = 40 -crush_defence = 40 -range_defence = 40 [black_guard_keldagrim_market_2] id = 2131 @@ -321,10 +317,6 @@ respawn_delay = 30 drop_table = "black_guard_high" examine = "An elite member of the Black Guard." combat_def = "dwarf" -stab_defence = 60 -slash_defence = 60 -crush_defence = 60 -range_defence = 60 [black_guard_berserker_keldagrim_2] id = 2135 @@ -648,10 +640,6 @@ att = 150 str = 150 def = 1 max_hit_crush = 164 -stab_defence = 60 -slash_defence = 60 -crush_defence = 60 -range_defence = 60 [colonel_grenda_keldagrim] id = 8817 diff --git a/data/area/fremennik_province/lunar_isle/lunar_isle.npcs.toml b/data/area/fremennik_province/lunar_isle/lunar_isle.npcs.toml index 4d04dc2f4a..80d7b1ece2 100644 --- a/data/area/fremennik_province/lunar_isle/lunar_isle.npcs.toml +++ b/data/area/fremennik_province/lunar_isle/lunar_isle.npcs.toml @@ -82,11 +82,6 @@ slayer_xp = 107.6 categories = ["suqahs"] drop_table = "suqah" examine = "A strange creature unique to Lunar Isle." -stab_defence = 50 -slash_defence = 70 -crush_defence = 70 -magic_defence = 90 -range_defence = 50 [suqah_2] id = 4528 diff --git a/data/area/fremennik_province/miscellania/miscellania.npcs.toml b/data/area/fremennik_province/miscellania/miscellania.npcs.toml index 804719c623..1669d93160 100644 --- a/data/area/fremennik_province/miscellania/miscellania.npcs.toml +++ b/data/area/fremennik_province/miscellania/miscellania.npcs.toml @@ -60,11 +60,6 @@ respawn_delay = 25 drop_table = "bones" examine = "A warrior of Etceteria." combat_def = "guard" -stab_defence = -12 -slash_defence = -12 -crush_defence = -12 -magic_defence = -12 -range_defence = -12 [skraeling_battleaxe] id = 1368 @@ -239,11 +234,6 @@ respawn_delay = 25 drop_table = "bones" examine = "A subject of Miscellania." max_hit_crush = 10 -stab_defence = -12 -slash_defence = -12 -crush_defence = -12 -magic_defence = -12 -range_defence = -12 [ragnvald] id = 1392 @@ -257,11 +247,6 @@ respawn_delay = 25 drop_table = "bones" examine = "A subject of Miscellania." max_hit_crush = 10 -stab_defence = -12 -slash_defence = -12 -crush_defence = -12 -magic_defence = -12 -range_defence = -12 [fishmonger_miscellania] id = 1393 @@ -299,22 +284,12 @@ examine = "Yep. Definitely a chicken." drop_table = "chicken" combat_def = "chicken" hitpoints = 30 -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [chicken_miscellania_2] id = 1402 drop_table = "chicken" combat_def = "chicken" hitpoints = 30 -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [rooster_miscellania] id = 1403 @@ -328,11 +303,6 @@ respawn_delay = 25 examine = "He rules the, er, roost." drop_table = "rooster" combat_def = "chicken" -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [rabbit_miscellania] id = 1404 @@ -342,11 +312,6 @@ attack_bonus = -47 respawn_delay = 25 drop_table = "rabbit" examine = "A cute bunny rabbit." -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [rhazien] id = 2337 @@ -488,11 +453,6 @@ drop_table = "rabbit" combat_def = "rabbit_miscellania" hitpoints = 50 max_hit_crush = 10 -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [king_vargas_2] id = 7403 diff --git a/data/area/fremennik_province/pirates_cove/pirates_cove.npcs.toml b/data/area/fremennik_province/pirates_cove/pirates_cove.npcs.toml index 6c05cf53a2..02434124c2 100644 --- a/data/area/fremennik_province/pirates_cove/pirates_cove.npcs.toml +++ b/data/area/fremennik_province/pirates_cove/pirates_cove.npcs.toml @@ -15,8 +15,6 @@ examine = "Avast ye scurvy land lubbers!" drop_table = "pirate" combat_def = "pirate" max_hit_slash = 30 -stab_defence = 3 -slash_defence = 2 [lokar_searunner_after] id = 4537 diff --git a/data/area/fremennik_province/rellekka/brine_rat_cavern/brine_rat_cavern.npcs.toml b/data/area/fremennik_province/rellekka/brine_rat_cavern/brine_rat_cavern.npcs.toml index dd7e657742..f38c9019f1 100644 --- a/data/area/fremennik_province/rellekka/brine_rat_cavern/brine_rat_cavern.npcs.toml +++ b/data/area/fremennik_province/rellekka/brine_rat_cavern/brine_rat_cavern.npcs.toml @@ -14,11 +14,6 @@ respawn_delay = 50 examine = "Could use a good meal." drop_table = "skeleton_fremennik" combat_def = "skeleton_barbarian" -stab_defence = 14 -slash_defence = 18 -crush_defence = 15 -magic_defence = -4 -range_defence = 15 [skeleton_fremennik_2] id = 3698 @@ -48,11 +43,6 @@ respawn_delay = 50 examine = "He seems a little underweight." drop_table = "skeleton_fremennik" combat_def = "skeleton_barbarian" -stab_defence = 14 -slash_defence = 18 -crush_defence = 15 -magic_defence = -4 -range_defence = 15 [skeleton_fremennik_5] id = 3701 @@ -82,11 +72,6 @@ respawn_delay = 50 examine = "He seems a little underweight." drop_table = "skeleton_fremennik" combat_def = "skeleton_barbarian" -stab_defence = 14 -slash_defence = 18 -crush_defence = 15 -magic_defence = -4 -range_defence = 15 [skeleton_fremennik_8] id = 3704 diff --git a/data/area/fremennik_province/rellekka/fremennik_dungeon/aquanite/aquanite.npcs.toml b/data/area/fremennik_province/rellekka/fremennik_dungeon/aquanite/aquanite.npcs.toml index 1969107fca..fcb5413217 100644 --- a/data/area/fremennik_province/rellekka/fremennik_dungeon/aquanite/aquanite.npcs.toml +++ b/data/area/fremennik_province/rellekka/fremennik_dungeon/aquanite/aquanite.npcs.toml @@ -11,7 +11,3 @@ slayer_level = 78 slayer_xp = 125.0 drop_table = "aquanite" examine = "It has a light on its forehead. What a pretty light... So shiny!" -stab_defence = 30 -slash_defence = 90 -crush_defence = 90 -magic_defence = 90 diff --git a/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml index d6453d8d79..80bb99a3c0 100644 --- a/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml +++ b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml @@ -30,7 +30,7 @@ att = 48 str = 60 def = 39 max_hit_crush = 70 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [yeti_2] id = 7380 @@ -41,7 +41,7 @@ str = 60 def = 39 max_hit_crush = 70 combat_def = "yeti" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [gnoeals] id = 7381 @@ -53,7 +53,7 @@ str = 1 def = 101 mage = 101 max_hit_magic = 120 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [gnoeals_2] id = 7382 @@ -65,7 +65,7 @@ def = 88 mage = 88 max_hit_magic = 120 combat_def = "gnoeals" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [erjolf_base] id = 7405 diff --git a/data/area/fremennik_province/rellekka/rellekka.npcs.toml b/data/area/fremennik_province/rellekka/rellekka.npcs.toml index ef78f21216..b858ad1a5c 100644 --- a/data/area/fremennik_province/rellekka/rellekka.npcs.toml +++ b/data/area/fremennik_province/rellekka/rellekka.npcs.toml @@ -20,11 +20,6 @@ respawn_delay = 25 drop_table = "rooster" examine = "He rules the, er, roost." combat_def = "chicken" -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [lalli_rellekka] id = 1270 @@ -208,11 +203,6 @@ respawn_delay = 30 drop_table = "market_guard" examine = "Keeps the stalls secure." combat_def = "guard" -stab_defence = 50 -slash_defence = 50 -crush_defence = 50 -magic_defence = 50 -range_defence = 50 [peter_rellekka] id = 13175 @@ -236,11 +226,6 @@ respawn_delay = 25 combat_def = "bunny" drop_table = "bunny" examine = "Hoppity, hoppity." -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [bunny_rellekka_2] id = 1321 @@ -280,7 +265,7 @@ str = 55 def = 44 max_hit_crush = 69 combat_def = "fenris_wolf" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [fishing_spot_rellekka] id = 1331 @@ -419,11 +404,6 @@ respawn_delay = 30 drop_table = "market_guard" examine = "A hardened Fremennik warrior." combat_def = "guard" -stab_defence = 50 -slash_defence = 50 -crush_defence = 50 -magic_defence = 50 -range_defence = 50 [black_unicorn_foal] id = 1329 diff --git a/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml b/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml index 5d3ee7593e..e5291414db 100644 --- a/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml +++ b/data/area/fremennik_province/waterbirth_island/waterbirth_island.npcs.toml @@ -56,8 +56,7 @@ def = 187 range = 100 max_hit_range = 114 combat_def = "dagannoth_guardian" -magic_defence = 120 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [bardur] id = 2879 @@ -68,11 +67,6 @@ att = 80 str = 80 def = 80 combat_def = "man" -stab_defence = 150 -slash_defence = 150 -crush_defence = 150 -magic_defence = 150 -range_defence = 150 [dagannoth_fledgeling] id = 2880 @@ -106,11 +100,6 @@ slayer_xp = 255.0 categories = ["dagannoth"] xp_bonus = 3.0 examine = "The dagannoth king responsible for the death of the Bukalla." -stab_defence = 10 -slash_defence = 10 -crush_defence = 10 -magic_defence = 255 -range_defence = 255 [dagannoth_prime] id = 2882 @@ -127,11 +116,6 @@ slayer_xp = 331.4 categories = ["dagannoth"] xp_bonus = 3.0 examine = "A legendary dagannoth king, rumoured to fly on the North winds." -stab_defence = 255 -slash_defence = 255 -crush_defence = 255 -magic_defence = 255 -range_defence = 10 [dagannoth_rex] id = 2883 @@ -148,11 +132,6 @@ slayer_xp = 331.4 categories = ["dagannoth"] xp_bonus = 3.0 examine = "Firstborn of the legendary dagannoth kings." -stab_defence = 255 -slash_defence = 255 -crush_defence = 255 -magic_defence = 10 -range_defence = 255 [suspicious_water] id = 2891 @@ -170,11 +149,6 @@ hunt_range = 10 respawn_delay = 10 drop_table = "bones" examine = "A sneaky, spiny, subterranean sea-dwelling scamp." -stab_defence = 100 -slash_defence = 100 -crush_defence = 100 -magic_defence = 50 -range_defence = 50 [suspicious_water_2] id = 2893 diff --git a/data/area/kandarin/ancient_cavern/ancient_cavern.npcs.toml b/data/area/kandarin/ancient_cavern/ancient_cavern.npcs.toml index 7e1205d4df..c81dccb13d 100644 --- a/data/area/kandarin/ancient_cavern/ancient_cavern.npcs.toml +++ b/data/area/kandarin/ancient_cavern/ancient_cavern.npcs.toml @@ -26,10 +26,6 @@ attack_bonus = 9 respawn_delay = 50 drop_table = "mangled_bones" examine = "He looks about, blankly." -slash_defence = 3 -crush_defence = 2 -magic_defence = -3 -range_defence = 2 [lost_barbarian] id = 6102 @@ -58,10 +54,6 @@ categories = ["skeletons"] respawn_delay = 50 drop_table = "barbarian_spirit" examine = "An ex-barbarian, willing to make you ex too." -slash_defence = 3 -crush_defence = 2 -magic_defence = -3 -range_defence = 2 [skeleton_warlord] id = 6105 @@ -77,10 +69,6 @@ categories = ["skeletons"] respawn_delay = 50 drop_table = "barbarian_spirit" examine = "He's heartless." -slash_defence = 3 -crush_defence = 2 -magic_defence = -3 -range_defence = 2 [skeleton_thug] id = 6107 @@ -96,10 +84,6 @@ categories = ["skeletons"] respawn_delay = 50 drop_table = "barbarian_spirit" examine = "Floats like an anvil, hits like a hammer." -slash_defence = 3 -crush_defence = 2 -magic_defence = -3 -range_defence = 2 [skeleton_hero] id = 6103 @@ -115,10 +99,6 @@ slayer_xp = 124.0 categories = ["skeletons"] drop_table = "barbarian_spirit" examine = "An opponent from the grave. He seems unimpressed by your bone rummaging." -slash_defence = 3 -crush_defence = 2 -magic_defence = -3 -range_defence = 2 [angry_barbarian] id = 749 @@ -132,10 +112,6 @@ hunt_mode = "cowardly" respawn_delay = 50 drop_table = "barbarian_spirit" examine = "He looks a tad upset." -slash_defence = 3 -crush_defence = 2 -magic_defence = -3 -range_defence = 2 [enraged_barbarian_spirit] id = 750 @@ -149,10 +125,6 @@ hunt_mode = "cowardly" respawn_delay = 50 drop_table = "barbarian_spirit" examine = "He looks a tad upset." -slash_defence = 3 -crush_defence = 2 -magic_defence = -3 -range_defence = 2 [berserk_barbarian_spirit] id = 751 @@ -166,10 +138,6 @@ hunt_mode = "cowardly" respawn_delay = 50 drop_table = "barbarian_spirit" examine = "He looks a tad upset." -slash_defence = 3 -crush_defence = 2 -magic_defence = -3 -range_defence = 2 [gargoyle_ancient_cavern] id = 9087 @@ -191,8 +159,3 @@ categories = ["mithril_dragons"] respawn_delay = 30 drop_table = "mithril_dragon" examine = "Experimenting with mithril gone bad!" -stab_defence = 50 -slash_defence = 100 -crush_defence = 70 -magic_defence = 30 -range_defence = 90 diff --git a/data/area/kandarin/ancient_cavern/kuradals_dungeon/kuradals_dungeon.npcs.toml b/data/area/kandarin/ancient_cavern/kuradals_dungeon/kuradals_dungeon.npcs.toml index 889cab35a9..b1e9577b0e 100644 --- a/data/area/kandarin/ancient_cavern/kuradals_dungeon/kuradals_dungeon.npcs.toml +++ b/data/area/kandarin/ancient_cavern/kuradals_dungeon/kuradals_dungeon.npcs.toml @@ -13,8 +13,3 @@ categories = ["dark_beasts"] respawn_delay = 50 drop_table = "dark_beast" examine = "From a darker dimension." -stab_defence = 30 -slash_defence = 40 -crush_defence = 100 -magic_defence = 90 -range_defence = 100 diff --git a/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml b/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml index 8b48776f98..e69df5df57 100644 --- a/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml +++ b/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml @@ -25,8 +25,6 @@ respawn_delay = 2 hunt_mode = "cowardly" examine = "It's an extremely small brown spider, probably very poisonous." drop_table = "spider" -slash_defence = 1 -magic_defence = 1 [pedestal_ape_atoll] id = 13176 @@ -202,7 +200,7 @@ respawn_delay = 50 drop_table = "monkey_archer" examine = "A bow wielding ninja monkey. It looks particularly dangerous." combat_def = "monkey_archer" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [monkey_archer_ape_atoll_2] id = 1457 @@ -214,7 +212,7 @@ def = 80 range = 110 max_hit_range = 200 combat_def = "monkey_archer" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [monkey_archer_ape_atoll_3] id = 1458 @@ -226,7 +224,7 @@ def = 80 range = 110 max_hit_range = 200 combat_def = "monkey_archer" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [monkey_guard_ape_atoll_3] id = 1459 @@ -245,14 +243,14 @@ respawn_delay = 50 examine = "A huge brutish gorilla armoured with dangerous looking vambraces." drop_table = "monkey_guard" combat_def = "guard" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [monkey_guard_ape_atoll_4] id = 1460 clone = "monkey_guard_ape_atoll_3" drop_table = "monkey_guard" combat_def = "guard" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [elder_guard_ape_atoll] id = 1461 @@ -345,7 +343,7 @@ respawn_delay = 50 categories = ["spiders"] examine = "A very dangerous looking spider, with its fangs unsheathed." drop_table = "jungle_spider" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [snake_ape_atoll] id = 1479 @@ -356,7 +354,7 @@ att = 4 str = 5 def = 3 max_hit_stab = 10 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [bird_black] id = 1475 diff --git a/data/area/kandarin/ape_atoll/tunnels/ape_atoll_tunnels.npcs.toml b/data/area/kandarin/ape_atoll/tunnels/ape_atoll_tunnels.npcs.toml index e1a16f216c..135e9cac1a 100644 --- a/data/area/kandarin/ape_atoll/tunnels/ape_atoll_tunnels.npcs.toml +++ b/data/area/kandarin/ape_atoll/tunnels/ape_atoll_tunnels.npcs.toml @@ -21,5 +21,5 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 -hunt_mode = "aggressive" +hunt_mode = "cowardly" diff --git a/data/area/kandarin/ardougne/east_ardougne.npcs.toml b/data/area/kandarin/ardougne/east_ardougne.npcs.toml index 193cb9f6e0..3d993e13a4 100644 --- a/data/area/kandarin/ardougne/east_ardougne.npcs.toml +++ b/data/area/kandarin/ardougne/east_ardougne.npcs.toml @@ -60,11 +60,6 @@ str = 22 def = 22 attack_bonus = 6 max_hit_stab = 30 -stab_defence = 40 -slash_defence = 41 -crush_defence = 37 -magic_defence = -10 -range_defence = 38 [milton_the_miller] id = 1739 @@ -85,11 +80,6 @@ respawn_delay = 50 examine = "A holy warrior." drop_table = "paladin" combat_def = "guard" -stab_defence = 87 -slash_defence = 84 -crush_defence = 76 -magic_defence = -10 -range_defence = 79 [hero] id = 21 @@ -128,11 +118,6 @@ hunt_mode = "guarding" examine = "A member of Ardougne's militia." drop_table = "knight_of_ardougne" combat_def = "black_knight" -stab_defence = 39 -slash_defence = 40 -crush_defence = 36 -magic_defence = -11 -range_defence = 36 [richard_ardougne] id = 2306 @@ -173,11 +158,6 @@ str = 1 def = 60 range = 26 max_hit_range = 40 -stab_defence = 18 -slash_defence = 23 -crush_defence = 27 -magic_defence = 10 -range_defence = 19 [zookeeper] id = 28 @@ -238,11 +218,6 @@ examine = "Keeps the peace... kind of." drop_table = "guard" combat_def = "guard" max_hit_stab = 30 -stab_defence = 24 -slash_defence = 14 -crush_defence = 19 -magic_defence = 4 -range_defence = 16 [edmond_ardougne] id = 3213 diff --git a/data/area/kandarin/ardougne/ibans_lair/ibans_lair.npcs.toml b/data/area/kandarin/ardougne/ibans_lair/ibans_lair.npcs.toml index 768a0f6189..d3d23bac19 100644 --- a/data/area/kandarin/ardougne/ibans_lair/ibans_lair.npcs.toml +++ b/data/area/kandarin/ardougne/ibans_lair/ibans_lair.npcs.toml @@ -14,7 +14,6 @@ examine = "One of the guardians of Iban." drop_table = "holthion" max_hit_slash = 90 combat_def = "holthion" -magic_defence = -10 [disciple_of_iban_ibans_lair] id = 1002 @@ -83,7 +82,6 @@ drop_table = "othainian" examine = "One of the guardians of Iban." max_hit_slash = 90 combat_def = "othainian" -magic_defence = -10 [doomion_ibans_lair] id = 999 @@ -100,4 +98,3 @@ drop_table = "disciple_of_iban" examine = "One of the guardians of Iban." max_hit_slash = 90 combat_def = "doomion" -magic_defence = -10 diff --git a/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml b/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml index 84b9e04d3f..4f6bb64ce2 100644 --- a/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml +++ b/data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml @@ -7,7 +7,7 @@ att = 10 str = 10 def = 10 max_hit_stab = 20 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [claus_the_chef_ardougne_sewers] id = 886 @@ -25,9 +25,6 @@ drop_table = "bones" examine = "Leader of the Hazeel Cult." max_hit_crush = 20 combat_def = "alomone" -stab_defence = 5 -slash_defence = 6 -crush_defence = 8 [clivet_ardougne_sewers] id = 893 @@ -70,7 +67,7 @@ att = 2 str = 3 def = 2 max_hit_stab = 10 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [giant_rat_ardounge_sewer_stubby] id = 4923 @@ -82,5 +79,5 @@ att = 2 str = 3 def = 2 max_hit_stab = 10 -hunt_mode = "aggressive" +hunt_mode = "cowardly" diff --git a/data/area/kandarin/ardougne/underground_pass/dungeon/underground_pass_dungeon.npcs.toml b/data/area/kandarin/ardougne/underground_pass/dungeon/underground_pass_dungeon.npcs.toml index 3008ef36a1..a3b46d356c 100644 --- a/data/area/kandarin/ardougne/underground_pass/dungeon/underground_pass_dungeon.npcs.toml +++ b/data/area/kandarin/ardougne/underground_pass/dungeon/underground_pass_dungeon.npcs.toml @@ -10,11 +10,6 @@ respawn_delay = 300 examine = "Some oversized vermin, blessed by Zamorak." drop_table = "blessed_giant_rat" combat_def = "giant_rat" -stab_defence = -24 -slash_defence = -24 -crush_defence = -24 -magic_defence = -24 -range_defence = -24 [blessed_giant_rat_underground_pass_dungeon_2] id = 978 diff --git a/data/area/kandarin/ardougne/underground_pass/underground_pass.npcs.toml b/data/area/kandarin/ardougne/underground_pass/underground_pass.npcs.toml index f710765f1b..64076a5909 100644 --- a/data/area/kandarin/ardougne/underground_pass/underground_pass.npcs.toml +++ b/data/area/kandarin/ardougne/underground_pass/underground_pass.npcs.toml @@ -117,11 +117,6 @@ respawn_delay = 100 examine = "It's one of General Khazard's warriors." drop_table = "khazard_trooper" combat_def = "guard" -stab_defence = 33 -slash_defence = 34 -crush_defence = 29 -magic_defence = -7 -range_defence = 33 [khazard_warlord_underground_pass] id = 477 @@ -135,7 +130,7 @@ examine = "He looks real nasty, smells bad too." drop_table = "khazard_warlord" max_hit_crush = 100 combat_def = "khazard_warlord" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [child_underground_pass_3] id = 6334 @@ -235,11 +230,6 @@ respawn_delay = 300 examine = "A nasty spider, blessed by Zamorak." drop_table = "empty" combat_def = "giant_spider" -stab_defence = 15 -slash_defence = 16 -crush_defence = 7 -magic_defence = 12 -range_defence = 16 [sir_jerro_underground_pass] id = 988 @@ -322,11 +312,6 @@ examine = "A giant spider." drop_table = "empty" max_hit_stab = 90 combat_def = "kalrag" -stab_defence = 20 -slash_defence = 17 -crush_defence = 12 -magic_defence = 13 -range_defence = 13 [boulder_underground_pass] id = 986 diff --git a/data/area/kandarin/ardougne/west/west_ardougne.npcs.toml b/data/area/kandarin/ardougne/west/west_ardougne.npcs.toml index acfb883d2f..565128831f 100644 --- a/data/area/kandarin/ardougne/west/west_ardougne.npcs.toml +++ b/data/area/kandarin/ardougne/west/west_ardougne.npcs.toml @@ -84,9 +84,6 @@ examine = "A mourner, or plague healer." drop_table = "mourner" combat_def = "guard" max_hit_crush = 20 -stab_defence = 6 -slash_defence = 6 -crush_defence = 9 [mourner_5] id = 348 @@ -111,9 +108,6 @@ def = 10 style = "crush" max_hit_melee = 20 examine = "A mourner, or plague healer." -stab_defence = 5 -slash_defence = 5 -crush_defence = 7 [mourner] id = 2373 diff --git a/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.npcs.toml b/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.npcs.toml index fd7d27376a..a1c73fc4de 100644 --- a/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.npcs.toml +++ b/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.npcs.toml @@ -14,11 +14,6 @@ drop_table = "giant_lobster" examine = "An extremely vicious lobster." max_hit_stab = 40 combat_def = "giant_lobster" -stab_defence = 30 -slash_defence = 30 -crush_defence = 15 -magic_defence = 99 -range_defence = 70 [sea_slug_witchaven_dungeon] id = 4894 diff --git a/data/area/kandarin/barbarian_outpost/barbarian_outpost.npcs.toml b/data/area/kandarin/barbarian_outpost/barbarian_outpost.npcs.toml index 1841a8fdd8..ed912d7d36 100644 --- a/data/area/kandarin/barbarian_outpost/barbarian_outpost.npcs.toml +++ b/data/area/kandarin/barbarian_outpost/barbarian_outpost.npcs.toml @@ -129,7 +129,3 @@ attack_bonus = 9 xp_bonus = 0.5 hunt_mode = "cowardly" examine = "He looks a tad upset." -slash_defence = 73 -crush_defence = 72 -magic_defence = -3 -range_defence = 72 diff --git a/data/area/kandarin/battlefield/battlefield.npcs.toml b/data/area/kandarin/battlefield/battlefield.npcs.toml index 96d47365e9..bec815e499 100644 --- a/data/area/kandarin/battlefield/battlefield.npcs.toml +++ b/data/area/kandarin/battlefield/battlefield.npcs.toml @@ -12,20 +12,11 @@ respawn_delay = 100 drop_table = "bones" examine = "It's one of General Khazard's warriors." combat_def = "guard" -stab_defence = 33 -slash_defence = 34 -crush_defence = 29 -magic_defence = -7 -range_defence = -33 [khazard_trooper_battlefield_2] id = 2246 clone = "khazard_trooper_battlefield" combat_def = "guard" -stab_defence = 25 -slash_defence = 25 -crush_defence = 22 -range_defence = -25 [gnome_troop_battlefield] id = 2247 @@ -42,11 +33,6 @@ respawn_delay = 60 examine = "Like a mini man!" drop_table = "gnome_troop" combat_def = "gnome_guard" -stab_defence = 3 -slash_defence = 4 -crush_defence = 5 -magic_defence = 2 -range_defence = 4 [gnome_troop_battlefield_2] id = 2248 @@ -65,11 +51,6 @@ drop_table = "gnome" combat_def = "gnome" hitpoints = 30 max_hit_crush = 10 -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [gnome_battlefield_2] id = 2250 @@ -77,11 +58,6 @@ drop_table = "gnome" combat_def = "gnome" hitpoints = 30 max_hit_crush = 10 -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [gnome_battlefield_3] id = 2251 @@ -90,11 +66,6 @@ drop_table = "gnome" combat_def = "gnome" hitpoints = 30 max_hit_crush = 10 -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [gnome_archer] id = 3814 @@ -109,11 +80,6 @@ max_hit_range = 20 hunt_mode = "cowardly" drop_table = "bones" examine = "A Gnome Arrow-chucker" -stab_defence = -30 -slash_defence = -30 -crush_defence = -30 -magic_defence = -30 -range_defence = -30 [gnome_driver] id = 3815 @@ -137,11 +103,6 @@ style = "magic" max_hit_magic = 10 hunt_mode = "cowardly" examine = "A battle mage of the gnomish variety." -stab_defence = -30 -slash_defence = -30 -crush_defence = -30 -magic_defence = -30 -range_defence = -30 [lieutenant_schepbur_battlefield] id = 3817 @@ -189,11 +150,6 @@ respawn_delay = 30 drop_table = "bones" examine = "These gnomes know how to get around!" combat_def = "gnome" -stab_defence = 16 -slash_defence = 16 -crush_defence = 18 -magic_defence = 15 -range_defence = 10 [mounted_terrorbird_gnome_battlefield_2] id = 6110 diff --git a/data/area/kandarin/baxtorian_falls/baxtorian_falls.npcs.toml b/data/area/kandarin/baxtorian_falls/baxtorian_falls.npcs.toml index ba7644982f..d8d164f060 100644 --- a/data/area/kandarin/baxtorian_falls/baxtorian_falls.npcs.toml +++ b/data/area/kandarin/baxtorian_falls/baxtorian_falls.npcs.toml @@ -43,11 +43,6 @@ str = 18 def = 14 attack_bonus = 4 max_hit_stab = 30 -stab_defence = 3 -slash_defence = 4 -crush_defence = 4 -magic_defence = 2 -range_defence = 3 [guard_baxtorian_falls_2] id = 4260 @@ -61,11 +56,6 @@ str = 18 def = 14 attack_bonus = 4 max_hit_stab = 30 -stab_defence = 3 -slash_defence = 4 -crush_defence = 4 -magic_defence = 2 -range_defence = 3 [mysterious_ghost_baxtorian_falls_2] id = 2399 @@ -82,7 +72,3 @@ attack_bonus = 9 slayer_xp = 124.0 categories = ["skeletons"] examine = "He's less heavy now." -slash_defence = 3 -crush_defence = 2 -magic_defence = -3 -range_defence = 2 diff --git a/data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.npcs.toml b/data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.npcs.toml index f2714328b0..20c597a3af 100644 --- a/data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.npcs.toml +++ b/data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.npcs.toml @@ -11,11 +11,6 @@ categories = ["spiders"] respawn_delay = 30 examine = "Is it a spider or is it a shadow?" drop_table = "empty" -stab_defence = 20 -slash_defence = 15 -crush_defence = 10 -magic_defence = 15 -range_defence = 15 [skeleton_mage_waterfall_dungeon] id = 94 diff --git a/data/area/kandarin/camelot/castle/camelot_castle.npcs.toml b/data/area/kandarin/camelot/castle/camelot_castle.npcs.toml index 793809b66d..467db888f0 100644 --- a/data/area/kandarin/camelot/castle/camelot_castle.npcs.toml +++ b/data/area/kandarin/camelot/castle/camelot_castle.npcs.toml @@ -52,8 +52,6 @@ attack_bonus = 20 xp_bonus = 0.5 hunt_mode = "cowardly" examine = "One of the Knights of the Round Table." -stab_defence = 15 -crush_defence = 190 [sir_gawain] id = 6172 diff --git a/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml b/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml index 8ee9297f0e..2cfdabb789 100644 --- a/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml +++ b/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml @@ -25,6 +25,7 @@ hitpoints = 600 att = 43 str = 43 def = 43 +attack_bonus = 22 max_hit_crush = 70 [ogre_boat_feldip_hills] @@ -80,10 +81,7 @@ att = 86 str = 86 def = 84 max_hit_crush = 100 -stab_defence = 10 -slash_defence = 21 -crush_defence = 16 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [ogress_warrior] id = 7079 @@ -96,7 +94,7 @@ att = 106 str = 106 def = 1 max_hit_crush = 120 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [ogress_warrior_2] id = 7080 @@ -109,7 +107,7 @@ att = 106 str = 106 def = 1 max_hit_crush = 120 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [ogress_feldip_hills] id = 7081 @@ -122,7 +120,7 @@ str = 66 def = 33 max_hit_crush = 80 combat_def = "ogress" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [ogress_feldip_hills_2] id = 7082 @@ -135,7 +133,7 @@ str = 66 def = 33 max_hit_crush = 80 combat_def = "ogress" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [rantz_feldip_hills_2] id = 8659 diff --git a/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.npcs.toml b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.npcs.toml index abeb0c0c71..ef47218400 100644 --- a/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.npcs.toml +++ b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.npcs.toml @@ -36,9 +36,6 @@ respawn_delay = 300 drop_table = "city_guard" examine = "Tough-looking." max_hit_crush = 90 -stab_defence = 10 -slash_defence = 21 -crush_defence = 16 [toban_gu_tanoth] id = 855 @@ -61,9 +58,6 @@ drop_table = "gorad" examine = "Big, dumb and ugly." max_hit_crush = 70 combat_def = "gorad" -stab_defence = 15 -slash_defence = 27 -crush_defence = 21 [ogre_guard_gu_tanoth] id = 858 @@ -96,9 +90,6 @@ respawn_delay = 50 drop_table = "city_guard" examine = "Tries to keep the peace." combat_def = "guard" -stab_defence = 13 -slash_defence = 24 -crush_defence = 19 [scared_skavid_gu_tanoth] id = 863 @@ -136,9 +127,6 @@ respawn_delay = 12 drop_table = "city_guard" examine = "Big and ugly looking." combat_def = "guard" -stab_defence = 13 -slash_defence = 24 -crush_defence = 19 [ogre_trader_gu_tanoth] id = 873 diff --git a/data/area/kandarin/fishing_guild/fishing_guild.npcs.toml b/data/area/kandarin/fishing_guild/fishing_guild.npcs.toml index a1462cef29..fb89e341e1 100644 --- a/data/area/kandarin/fishing_guild/fishing_guild.npcs.toml +++ b/data/area/kandarin/fishing_guild/fishing_guild.npcs.toml @@ -10,11 +10,6 @@ drop_table = "goblin" combat_def = "goblin" hitpoints = 50 max_hit_crush = 10 -stab_defence = -15 -slash_defence = -15 -crush_defence = -15 -magic_defence = -15 -range_defence = -15 [goblin_fishing_guild_2] id = 4273 @@ -24,11 +19,6 @@ drop_table = "goblin" combat_def = "goblin" hitpoints = 50 max_hit_crush = 10 -stab_defence = -15 -slash_defence = -15 -crush_defence = -15 -magic_defence = -15 -range_defence = -15 [goblin_fishing_guild_3] id = 4274 @@ -38,11 +28,6 @@ drop_table = "goblin" combat_def = "goblin" hitpoints = 50 max_hit_crush = 10 -stab_defence = -15 -slash_defence = -15 -crush_defence = -15 -magic_defence = -15 -range_defence = -15 [goblin_fishing_guild_4] id = 4275 @@ -52,11 +37,6 @@ drop_table = "goblin" combat_def = "goblin" hitpoints = 50 max_hit_crush = 10 -stab_defence = -15 -slash_defence = -15 -crush_defence = -15 -magic_defence = -15 -range_defence = -15 [goblin_fishing_guild_5] id = 4276 @@ -66,11 +46,6 @@ drop_table = "goblin" combat_def = "goblin" hitpoints = 50 max_hit_crush = 10 -stab_defence = -15 -slash_defence = -15 -crush_defence = -15 -magic_defence = -15 -range_defence = -15 [roachey] id = 592 diff --git a/data/area/kandarin/goblin_cave/goblin_cave.npcs.toml b/data/area/kandarin/goblin_cave/goblin_cave.npcs.toml index a7a946ebea..bebb031bd8 100644 --- a/data/area/kandarin/goblin_cave/goblin_cave.npcs.toml +++ b/data/area/kandarin/goblin_cave/goblin_cave.npcs.toml @@ -13,7 +13,7 @@ att = 10 str = 10 def = 10 max_hit_stab = 20 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [goblin_guard_goblin_cave] id = 6496 diff --git a/data/area/kandarin/hazelmeres_island/hazelmeres_island.npcs.toml b/data/area/kandarin/hazelmeres_island/hazelmeres_island.npcs.toml index 04ffcedce6..1311ef60d7 100644 --- a/data/area/kandarin/hazelmeres_island/hazelmeres_island.npcs.toml +++ b/data/area/kandarin/hazelmeres_island/hazelmeres_island.npcs.toml @@ -13,11 +13,6 @@ respawn_delay = 30 examine = "A barely visible deadly jungle spider." drop_table = "jungle_spider" combat_def = "jungle_spider_ape_atoll" -stab_defence = 20 -slash_defence = 20 -crush_defence = 10 -magic_defence = 17 -range_defence = 20 [larry_hazelmeres_island] id = 7576 diff --git a/data/area/kandarin/legends_guild/dungeon/legends_guild_dungeon.npcs.toml b/data/area/kandarin/legends_guild/dungeon/legends_guild_dungeon.npcs.toml index 626ad8f164..f4dca3dc85 100644 --- a/data/area/kandarin/legends_guild/dungeon/legends_guild_dungeon.npcs.toml +++ b/data/area/kandarin/legends_guild/dungeon/legends_guild_dungeon.npcs.toml @@ -14,8 +14,3 @@ categories = ["shadow_warriors"] respawn_delay = 30 drop_table = "shadow_warrior" examine = "A fighter from the supernatural world. He's a shadow of his former self." -stab_defence = 43 -slash_defence = 31 -crush_defence = 19 -magic_defence = 15 -range_defence = 38 diff --git a/data/area/kandarin/ourania/ourania.npcs.toml b/data/area/kandarin/ourania/ourania.npcs.toml index ce690d5f75..06b6407085 100644 --- a/data/area/kandarin/ourania/ourania.npcs.toml +++ b/data/area/kandarin/ourania/ourania.npcs.toml @@ -12,10 +12,6 @@ hunt_mode = "aggressive" hunt_range = 2 examine = "A cave dweller." drop_table = "cave_lizard" -stab_defence = 5 -slash_defence = 15 -crush_defence = 15 -range_defence = 5 [zamorak_warrior_kite] id = 6363 diff --git a/data/area/kandarin/piscatoris/piscatoris.npcs.toml b/data/area/kandarin/piscatoris/piscatoris.npcs.toml index 515f9f9e48..691d9c6729 100644 --- a/data/area/kandarin/piscatoris/piscatoris.npcs.toml +++ b/data/area/kandarin/piscatoris/piscatoris.npcs.toml @@ -45,7 +45,6 @@ respawn_delay = 50 examine = "Doesn't seem to want to go away." drop_table = "skeleton_mage" combat_def = "skeleton_mage" -magic_defence = 15 [brian_twitcher] id = 8579 diff --git a/data/area/kandarin/port_khazard/fight_arena/khazard_fight_arena.npcs.toml b/data/area/kandarin/port_khazard/fight_arena/khazard_fight_arena.npcs.toml index 8107a4c11f..2208317ac0 100644 --- a/data/area/kandarin/port_khazard/fight_arena/khazard_fight_arena.npcs.toml +++ b/data/area/kandarin/port_khazard/fight_arena/khazard_fight_arena.npcs.toml @@ -117,9 +117,6 @@ id = 7528 clone = "khazard_3" drop_table = "khazard_guard" combat_def = "guard" -stab_defence = 44 -slash_defence = 38 -crush_defence = 30 [lazy_khazard] id = 7550 diff --git a/data/area/kandarin/port_khazard/movarios_base/movarios_base.npcs.toml b/data/area/kandarin/port_khazard/movarios_base/movarios_base.npcs.toml index cb99c03431..b27275978d 100644 --- a/data/area/kandarin/port_khazard/movarios_base/movarios_base.npcs.toml +++ b/data/area/kandarin/port_khazard/movarios_base/movarios_base.npcs.toml @@ -33,7 +33,4 @@ id = 8440 clone = "elite_khazard_guard_movarios_base" drop_table = "elite_khazard_guard" combat_def = "guard" -stab_defence = 44 -slash_defence = 38 -crush_defence = 30 diff --git a/data/area/kandarin/ranging_guild/ranging_guild.npcs.toml b/data/area/kandarin/ranging_guild/ranging_guild.npcs.toml index f6b18bd28a..11573e364f 100644 --- a/data/area/kandarin/ranging_guild/ranging_guild.npcs.toml +++ b/data/area/kandarin/ranging_guild/ranging_guild.npcs.toml @@ -84,8 +84,6 @@ max_hit_range = 40 ranged_strength = 16 hunt_mode = "aggressive" examine = "Defender of the north tower." -magic_defence = 6 -range_defence = 12 [tower_archer_east] id = 689 @@ -103,8 +101,6 @@ max_hit_range = 70 ranged_strength = 22 hunt_mode = "aggressive" examine = "Defender of the east tower." -magic_defence = 24 -range_defence = 40 [tower_archer_south] id = 690 @@ -122,8 +118,6 @@ max_hit_range = 100 ranged_strength = 31 hunt_mode = "aggressive" examine = "Defender of the south tower." -magic_defence = 20 -range_defence = 45 [tower_archer_west] id = 691 @@ -141,5 +135,3 @@ max_hit_range = 160 ranged_strength = 49 hunt_mode = "aggressive" examine = "Defender of the west tower." -magic_defence = 34 -range_defence = 66 diff --git a/data/area/kandarin/temple_of_ikov/temple_of_ikov.npcs.toml b/data/area/kandarin/temple_of_ikov/temple_of_ikov.npcs.toml index a07177cbce..c3e2b273c5 100644 --- a/data/area/kandarin/temple_of_ikov/temple_of_ikov.npcs.toml +++ b/data/area/kandarin/temple_of_ikov/temple_of_ikov.npcs.toml @@ -33,12 +33,7 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 -stab_defence = 9 -slash_defence = 11 -crush_defence = -2 -magic_defence = 1 -range_defence = 4 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [ice_spider] id = 64 @@ -55,11 +50,6 @@ respawn_delay = 30 examine = "I think this spider has been magically modified." drop_table = "ice_spider" combat_def = "giant_spider" -stab_defence = 20 -slash_defence = 17 -crush_defence = 12 -magic_defence = 13 -range_defence = 13 [fire_warrior_of_lesarkus] id = 277 diff --git a/data/area/kandarin/tower_of_life/tower_of_life.npcs.toml b/data/area/kandarin/tower_of_life/tower_of_life.npcs.toml index d6ba8f7924..e67d9f26fb 100644 --- a/data/area/kandarin/tower_of_life/tower_of_life.npcs.toml +++ b/data/area/kandarin/tower_of_life/tower_of_life.npcs.toml @@ -11,7 +11,6 @@ respawn_delay = 50 examine = "An evil user of Magic powers." drop_table = "invrigar_the_necromancer" max_hit_crush = 30 -magic_defence = 3 [necromancer] id = 194 diff --git a/data/area/kandarin/tree_gnome_stronghold/training_camp/combat_training_camp.npcs.toml b/data/area/kandarin/tree_gnome_stronghold/training_camp/combat_training_camp.npcs.toml index bb587768a3..22106e049d 100644 --- a/data/area/kandarin/tree_gnome_stronghold/training_camp/combat_training_camp.npcs.toml +++ b/data/area/kandarin/tree_gnome_stronghold/training_camp/combat_training_camp.npcs.toml @@ -15,9 +15,6 @@ examine = "Big, ugly, and smelly." drop_table = "ogre" combat_def = "ogre" max_hit_crush = 70 -stab_defence = 19 -slash_defence = 23 -crush_defence = 24 [guard_combat_training_camp] id = 344 diff --git a/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.npcs.toml b/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.npcs.toml index e7d2a05710..045741c389 100644 --- a/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.npcs.toml +++ b/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.npcs.toml @@ -28,11 +28,6 @@ attack_bonus = -42 respawn_delay = 50 drop_table = "bones" examine = "Small, even by gnome standards." -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [gnome_child_2] id = 160 @@ -65,10 +60,6 @@ combat_def = "gnome_guard" respawn_delay = 30 drop_table = "bones" examine = "A tree gnome guard." -stab_defence = 8 -slash_defence = 9 -crush_defence = 7 -range_defence = 8 [gnome_woman] id = 168 @@ -78,11 +69,6 @@ attack_bonus = -42 respawn_delay = 50 drop_table = "bones" examine = "A female gnome." -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [gnome_woman_2] id = 169 @@ -105,11 +91,6 @@ categories = ["birds"] respawn_delay = 30 examine = "These gnomes know how to get around!" drop_table = "mounted_terrorbird_gnome" -stab_defence = 16 -slash_defence = 16 -crush_defence = 18 -magic_defence = 15 -range_defence = 10 [bolongo] id = 2343 @@ -177,11 +158,6 @@ combat_def = "gnome" respawn_delay = 30 examine = "It's a tree gnome trooper." drop_table = "gnome_troop" -stab_defence = 3 -slash_defence = 4 -crush_defence = 5 -magic_defence = 2 -range_defence = 4 [gnome_troop_2] id = 480 @@ -190,11 +166,6 @@ combat_def = "gnome_guard" hitpoints = 30 attack_bonus = 2 max_hit_range = 10 -stab_defence = 3 -slash_defence = 4 -crush_defence = 5 -magic_defence = 2 -range_defence = 4 [gnome_baller] id = 621 diff --git a/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.npcs.toml b/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.npcs.toml index de431f8425..2a6ad50cb0 100644 --- a/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.npcs.toml +++ b/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.npcs.toml @@ -17,9 +17,6 @@ respawn_delay = 50 drop_table = "mountain_troll" examine = "Small for a troll but mean and ugly." combat_def = "ice_troll" -crush_defence = 10 -magic_defence = 200 -range_defence = 200 [mountain_troll_troll_stronghold_tunnels_2] id = 1107 @@ -77,11 +74,6 @@ drop_table = "rock_troll" examine = "One of the troll generals." combat_def = "ice_troll" max_hit_slash = 380 -stab_defence = 35 -slash_defence = 60 -crush_defence = 35 -magic_defence = 200 -range_defence = 200 [troll_general_troll_stronghold_tunnels_2] id = 1116 @@ -95,12 +87,7 @@ str = 140 def = 40 attack_bonus = 60 max_hit_slash = 380 -stab_defence = 35 -slash_defence = 60 -crush_defence = 35 -magic_defence = 200 -range_defence = 200 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [troll_general_troll_stronghold_tunnels_3] id = 1117 @@ -114,12 +101,7 @@ str = 140 def = 40 attack_bonus = 60 max_hit_slash = 380 -stab_defence = 35 -slash_defence = 60 -crush_defence = 35 -magic_defence = 200 -range_defence = 200 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [twig_troll_stronghold_tunnels] id = 1128 @@ -139,9 +121,6 @@ drop_table = "mountain_troll" examine = "He's guarding the cells." max_hit_crush = 130 combat_def = "twig" -crush_defence = 10 -magic_defence = 200 -range_defence = 200 [berry_troll_awake] id = 1127 @@ -163,9 +142,6 @@ drop_table = "mountain_troll" examine = "He's guarding the cells." max_hit_crush = 130 combat_def = "berry" -crush_defence = 10 -magic_defence = 200 -range_defence = 200 [cook_troll_stronghold_tunnels] id = 1135 @@ -198,9 +174,6 @@ respawn_delay = 50 examine = "Small for a troll, but mean and ugly." drop_table = "mountain_troll" combat_def = "ice_troll" -crush_defence = 10 -magic_defence = 200 -range_defence = 200 [guard_troll_stronghold_tunnels] id = 1142 @@ -255,11 +228,6 @@ hunt_mode = "cowardly" slayer_xp = 150.5 categories = ["trolls"] examine = "A massive, scary-looking troll." -stab_defence = 35 -slash_defence = 60 -crush_defence = 35 -magic_defence = 200 -range_defence = 200 [my_arm_troll_stronghold_tunnels] id = 4950 diff --git a/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.npcs.toml b/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.npcs.toml index 17f35d5b9c..d2f1116231 100644 --- a/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.npcs.toml +++ b/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.npcs.toml @@ -14,11 +14,6 @@ categories = ["chaos_druids"] respawn_delay = 50 examine = "A crazy evil druid." combat_def = "guard" -stab_defence = 13 -slash_defence = 17 -crush_defence = 14 -magic_defence = -4 -range_defence = 14 [salarin_the_twisted] id = 205 diff --git a/data/area/kandarin/yanille/yanille.npcs.toml b/data/area/kandarin/yanille/yanille.npcs.toml index dfa326ac88..7f3a064ae3 100644 --- a/data/area/kandarin/yanille/yanille.npcs.toml +++ b/data/area/kandarin/yanille/yanille.npcs.toml @@ -33,11 +33,6 @@ respawn_delay = 50 examine = "Watches stuff. But who watches him?" drop_table = "watchman" max_hit_crush = 40 -stab_defence = 24 -slash_defence = 14 -crush_defence = 19 -magic_defence = -4 -range_defence = 16 [soldier_yanille] id = 35 @@ -53,11 +48,6 @@ respawn_delay = 50 drop_table = "soldier_yanille" examine = "A soldier of the town of Yanille." combat_def = "guard" -stab_defence = 24 -slash_defence = 14 -crush_defence = 19 -magic_defence = -4 -range_defence = 16 [professor_imblewyn] id = 4586 diff --git a/data/area/karamja/brimhaven/brimhaven.npcs.toml b/data/area/karamja/brimhaven/brimhaven.npcs.toml index 3b87042a2e..3ebfbf7c98 100644 --- a/data/area/karamja/brimhaven/brimhaven.npcs.toml +++ b/data/area/karamja/brimhaven/brimhaven.npcs.toml @@ -113,8 +113,6 @@ str = 21 def = 21 attack_bonus = 8 max_hit_slash = 30 -stab_defence = 3 -slash_defence = 2 [pirate_brimhaven_5] id = 6350 @@ -153,9 +151,6 @@ respawn_delay = 50 examine = "Looks like he's been in the wars..." drop_table = "grip" max_hit_slash = 30 -stab_defence = 16 -slash_defence = 27 -crush_defence = 22 [alfonse_the_waiter_brimhaven] id = 793 diff --git a/data/area/karamja/brimhaven/dungeon/brimhaven_dungeon.npcs.toml b/data/area/karamja/brimhaven/dungeon/brimhaven_dungeon.npcs.toml index a13b1fd059..143733be2a 100644 --- a/data/area/karamja/brimhaven/dungeon/brimhaven_dungeon.npcs.toml +++ b/data/area/karamja/brimhaven/dungeon/brimhaven_dungeon.npcs.toml @@ -9,4 +9,4 @@ att = 130 str = 130 def = 130 max_hit_slash = 140 -hunt_mode = "aggressive" +hunt_mode = "cowardly" diff --git a/data/area/karamja/crandor/crandor.npcs.toml b/data/area/karamja/crandor/crandor.npcs.toml index 96e29194fb..fe8901f624 100644 --- a/data/area/karamja/crandor/crandor.npcs.toml +++ b/data/area/karamja/crandor/crandor.npcs.toml @@ -18,9 +18,4 @@ categories = ["green_dragons"] respawn_delay = 50 examine = "Roar! A dragon!" drop_table = "empty" -max_hit_slash = 80 -stab_defence = 20 -slash_defence = 40 -crush_defence = 40 -magic_defence = 30 -range_defence = 20 \ No newline at end of file +max_hit_slash = 80 \ No newline at end of file diff --git a/data/area/karamja/karamja.npcs.toml b/data/area/karamja/karamja.npcs.toml index 1cc5a38a0d..614160e876 100644 --- a/data/area/karamja/karamja.npcs.toml +++ b/data/area/karamja/karamja.npcs.toml @@ -48,11 +48,6 @@ slayer_xp = 25.0 categories = ["harpie_bug_swarms"] respawn_delay = 25 examine = "A swarm of bugs." -stab_defence = 10 -slash_defence = 5 -crush_defence = 10 -magic_defence = 5 -range_defence = 10 [frog_karamja] id = 3783 @@ -65,11 +60,6 @@ str = 47 def = 92 max_hit_crush = 61 combat_def = "frog" -stab_defence = 12 -slash_defence = 22 -crush_defence = 12 -magic_defence = 12 -range_defence = 32 [jungle_forester] id = 401 @@ -115,11 +105,6 @@ respawn_delay = 30 drop_table = "jungle_spider" examine = "A barely visible deadly jungle spider." combat_def = "jungle_spider_ape_atoll" -stab_defence = 60 -slash_defence = 40 -crush_defence = 10 -magic_defence = 17 -range_defence = 30 [jungle_spider_karamja_2] id = 6377 @@ -136,11 +121,6 @@ att = 105 str = 105 def = 1 max_hit_stab = 119 -stab_defence = 42 -slash_defence = 42 -crush_defence = 32 -magic_defence = 12 -range_defence = 12 [giant_ant_worker] id = 6379 @@ -152,11 +132,6 @@ def = 50 combat_def = "giant_ant" examine = "I wonder how much he can lift." drop_table = "giant_ant_worker" -stab_defence = 75 -slash_defence = 62 -crush_defence = 32 -magic_defence = 12 -range_defence = 62 [giant_ant_soldier] id = 6380 @@ -170,11 +145,6 @@ combat_def = "giant_ant" max_hit_crush = 130 examine = "Gi-ant-ant-ant-ant..." drop_table = "giant_ant_soldier" -stab_defence = 75 -slash_defence = 62 -crush_defence = 32 -magic_defence = 12 -range_defence = 62 [giant_wasp] id = 6381 @@ -185,12 +155,7 @@ att = 36 str = 36 def = 132 max_hit_crush = 50 -stab_defence = 75 -slash_defence = 62 -crush_defence = 32 -magic_defence = 12 -range_defence = 52 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [pernicious_parrot] id = 6382 @@ -202,11 +167,6 @@ att = 105 str = 105 def = 1 max_hit_stab = 119 -stab_defence = 42 -slash_defence = 42 -crush_defence = 32 -magic_defence = 12 -range_defence = 12 [giant_wasp_2] id = 6383 @@ -217,12 +177,7 @@ str = 36 def = 132 max_hit_crush = 50 combat_def = "giant_wasp" -stab_defence = 82 -slash_defence = 62 -crush_defence = 32 -magic_defence = 12 -range_defence = 52 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [karamjan_jungle_eagle] id = 6387 @@ -302,9 +257,6 @@ respawn_delay = 50 examine = "A vicious warrior." drop_table = "tribesman" max_hit_stab = 40 -stab_defence = 4 -slash_defence = 6 -crush_defence = 6 [tinsay_karamja_2] id = 1165 diff --git a/data/area/karamja/kharazi_jungle/caves/kharazi_caves.npcs.toml b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.npcs.toml index 338ef15041..7e9bf759ba 100644 --- a/data/area/karamja/kharazi_jungle/caves/kharazi_caves.npcs.toml +++ b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.npcs.toml @@ -34,11 +34,6 @@ respawn_delay = 50 examine = "A minion of Rashiliyia." drop_table = "undead_one" combat_def = "zombie" -stab_defence = 5 -slash_defence = 5 -crush_defence = 3 -magic_defence = 1 -range_defence = 4 [undead_one_kharazi_caves_3] id = 5353 @@ -119,12 +114,7 @@ examine = "The spirit of a long-dead warrior." drop_table = "san_tojalon" max_hit_stab = 120 combat_def = "san_tojalon" -stab_defence = 18 -slash_defence = 22 -crush_defence = 20 -magic_defence = -1 -range_defence = 20 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [irvig_senay_kharazi_caves] id = 937 @@ -142,12 +132,7 @@ examine = "The spirit of a long-dead warrior." drop_table = "irvig_senay" max_hit_slash = 120 combat_def = "irvig_senay" -stab_defence = 27 -slash_defence = 31 -crush_defence = 29 -magic_defence = -1 -range_defence = 29 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [ranalph_devere] id = 938 @@ -166,11 +151,7 @@ categories = ["skeletons"] examine = "The spirit of a long-dead warrior." drop_table = "empty" max_hit_slash = 130 -stab_defence = 38 -slash_defence = 40 -crush_defence = 36 -range_defence = 38 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [boulder_kharazi_caves] id = 939 diff --git a/data/area/karamja/pothole_dungeon/pothole_dungeon.npcs.toml b/data/area/karamja/pothole_dungeon/pothole_dungeon.npcs.toml index 96e2853956..619ead7c70 100644 --- a/data/area/karamja/pothole_dungeon/pothole_dungeon.npcs.toml +++ b/data/area/karamja/pothole_dungeon/pothole_dungeon.npcs.toml @@ -9,7 +9,7 @@ str = 43 def = 43 attack_bonus = 22 max_hit_crush = 70 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [jogre_pothole_dungeon_2] id = 3450 @@ -22,5 +22,5 @@ str = 43 def = 43 attack_bonus = 22 max_hit_crush = 70 -hunt_mode = "aggressive" +hunt_mode = "cowardly" diff --git a/data/area/karamja/shilo_village/shilo_village.npcs.toml b/data/area/karamja/shilo_village/shilo_village.npcs.toml index 6685610651..219263b03e 100644 --- a/data/area/karamja/shilo_village/shilo_village.npcs.toml +++ b/data/area/karamja/shilo_village/shilo_village.npcs.toml @@ -125,11 +125,6 @@ hunt_mode = "cowardly" slayer_xp = 70.0 categories = ["skeletons"] examine = "A giant skeleton of huge strength and devastating power." -stab_defence = 5 -slash_defence = 5 -crush_defence = 5 -magic_defence = 5 -range_defence = 5 [nazastarool_ghost] id = 509 diff --git a/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml b/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml index 0f3ba854a3..45d30a74e9 100644 --- a/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml +++ b/data/area/karamja/tzhaar_city/tzhaar_city.npcs.toml @@ -294,12 +294,6 @@ att = 40 str = 40 def = 40 combat_def = "fire_elemental" -attack_bonus = 10 -stab_defence = 20 -slash_defence = 20 -crush_defence = 20 -magic_defence = 30 -range_defence = 50 [fire_monster_tzhaar_caves] id = 7773 @@ -312,13 +306,7 @@ def = 55 mage = 55 max_hit_magic = 8 combat_def = "fire_monster" -attack_bonus = 10 -stab_defence = 20 -slash_defence = 20 -crush_defence = 20 -magic_defence = 10 -range_defence = 50 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [tzhaar_mej_roh] id = 2623 diff --git a/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml index 3b0fabd824..f4dc1d3327 100644 --- a/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml +++ b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.npcs.toml @@ -37,10 +37,7 @@ att = 46 str = 46 def = 250 max_hit_crush = 60 -stab_defence = 90 -slash_defence = 90 -crush_defence = 90 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [mummy_agility_pyramid_2] id = 6754 @@ -51,10 +48,7 @@ att = 46 str = 46 def = 250 max_hit_crush = 60 -stab_defence = 90 -slash_defence = 90 -crush_defence = 90 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [mummy_agility_pyramid_3] id = 6755 @@ -65,10 +59,7 @@ att = 46 str = 46 def = 250 max_hit_crush = 60 -stab_defence = 90 -slash_defence = 90 -crush_defence = 90 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [mummy_agility_pyramid_4] id = 6756 @@ -79,10 +70,7 @@ att = 46 str = 46 def = 250 max_hit_crush = 60 -stab_defence = 90 -slash_defence = 90 -crush_defence = 90 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [agility_pyramid_block] id = 3124 diff --git a/data/area/kharidian_desert/bandit_camp/bandit_camp.npcs.toml b/data/area/kharidian_desert/bandit_camp/bandit_camp.npcs.toml index 27fc202df8..4a7ca90f07 100644 --- a/data/area/kharidian_desert/bandit_camp/bandit_camp.npcs.toml +++ b/data/area/kharidian_desert/bandit_camp/bandit_camp.npcs.toml @@ -67,8 +67,6 @@ str = 17 def = 17 attack_bonus = 11 max_hit_stab = 30 -slash_defence = 3 -crush_defence = 2 [eblis_bandit_camp_2] id = 1923 diff --git a/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml b/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml index d8d4a38887..d743f9b2d7 100644 --- a/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml +++ b/data/area/kharidian_desert/harmony_island/windmill_cellar/windmill_cellar.npcs.toml @@ -10,7 +10,7 @@ att = 46 str = 46 def = 56 max_hit_crush = 60 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [zombie_pirate_windmill_cellar_2] id = 5632 @@ -21,7 +21,7 @@ att = 46 str = 46 def = 56 max_hit_crush = 60 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [zombie_pirate_windmill_cellar_3] id = 5636 @@ -32,7 +32,7 @@ att = 46 str = 46 def = 56 max_hit_crush = 60 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [zombie_pirate_windmill_cellar_4] id = 5649 @@ -43,7 +43,7 @@ att = 46 str = 46 def = 56 max_hit_crush = 60 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [zombie_pirate_windmill_cellar_5] id = 5651 @@ -54,7 +54,7 @@ att = 46 str = 46 def = 56 max_hit_crush = 60 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [zombie_pirate_windmill_cellar_6] id = 5653 @@ -65,7 +65,7 @@ att = 46 str = 46 def = 56 max_hit_crush = 60 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [zombie_pirate_windmill_cellar_7] id = 5655 @@ -76,7 +76,7 @@ att = 46 str = 46 def = 56 max_hit_crush = 60 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [zombie_pirate_windmill_cellar_8] id = 5657 @@ -87,7 +87,7 @@ att = 46 str = 46 def = 56 max_hit_crush = 60 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [zombie_pirate_windmill_cellar_9] id = 5660 @@ -98,7 +98,7 @@ att = 46 str = 46 def = 56 max_hit_crush = 60 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [zombie_pirate_windmill_cellar_10] id = 5662 @@ -109,7 +109,7 @@ att = 46 str = 46 def = 56 max_hit_crush = 60 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [zombie_pirate_windmill_cellar_11] id = 5664 @@ -120,7 +120,7 @@ att = 46 str = 46 def = 56 max_hit_crush = 60 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [monk_windmill_cellar] id = 5673 diff --git a/data/area/kharidian_desert/kalphite_hive/kalphite_hive.npcs.toml b/data/area/kharidian_desert/kalphite_hive/kalphite_hive.npcs.toml index 16f1ba093a..06a6bd7150 100644 --- a/data/area/kharidian_desert/kalphite_hive/kalphite_hive.npcs.toml +++ b/data/area/kharidian_desert/kalphite_hive/kalphite_hive.npcs.toml @@ -15,22 +15,12 @@ aka = ["kq"] respawn_delay = 50 drop_table = "kalphite_queen" examine = "I don't think insect repellent will work..." -stab_defence = 50 -slash_defence = 50 -crush_defence = 10 -magic_defence = 100 -range_defence = 100 [kalphite_queen_airborne] id = 1160 clone = "kalphite_queen" combat_def = "kalphite_queen_airborne" xp_bonus = 12.5 -stab_defence = 100 -slash_defence = 100 -crush_defence = 100 -magic_defence = 10 -range_defence = 10 [kalphite_worker] id = 1153 @@ -45,11 +35,6 @@ hunt_mode = "cowardly" drop_table = "kalphite_worker" categories = ["kalphites"] examine = "I don't think insect repellent will work..." -stab_defence = 5 -slash_defence = 5 -crush_defence = 1 -magic_defence = 10 -range_defence = 10 [kalphite_soldier] id = 1154 @@ -65,11 +50,6 @@ hunt_mode = "cowardly" drop_table = "kalphite_soldier" categories = ["kalphites"] examine = "I don't think insect repellent will work..." -stab_defence = 25 -slash_defence = 25 -crush_defence = 5 -magic_defence = 50 -range_defence = 50 [kalphite_guardian] id = 1155 @@ -84,11 +64,6 @@ hunt_mode = "cowardly" drop_table = "kalphite_guardian" categories = ["kalphites"] examine = "I don't think insect repellent will work..." -stab_defence = 25 -slash_defence = 25 -crush_defence = 5 -magic_defence = 50 -range_defence = 50 [kalphite_guardian_2] id = 1157 @@ -112,11 +87,6 @@ str = 20 def = 20 attack_bonus = 10 max_hit_crush = 40 -stab_defence = 10 -slash_defence = 10 -crush_defence = -21 -magic_defence = -21 -range_defence = 10 [goat_2] id = 4934 @@ -127,9 +97,4 @@ str = 20 def = 20 attack_bonus = 10 max_hit_crush = 40 -combat_def = "goat" -stab_defence = 10 -slash_defence = 10 -crush_defence = -21 -magic_defence = -21 -range_defence = 10 \ No newline at end of file +combat_def = "goat" \ No newline at end of file diff --git a/data/area/kharidian_desert/kharidian_desert.npcs.toml b/data/area/kharidian_desert/kharidian_desert.npcs.toml index 0f8176e26e..74d5e15e56 100644 --- a/data/area/kharidian_desert/kharidian_desert.npcs.toml +++ b/data/area/kharidian_desert/kharidian_desert.npcs.toml @@ -68,11 +68,6 @@ categories = ["crocodiles"] respawn_delay = 40 examine = "Never smile at a..." drop_table = "crocodile" -stab_defence = 20 -slash_defence = 12 -crush_defence = 22 -magic_defence = 10 -range_defence = 20 [wanderer_kharidian_desert] id = 2002 @@ -98,11 +93,6 @@ attack_bonus = 10 respawn_delay = 50 drop_table = "billy_goat" examine = "They'll eat anything!" -stab_defence = 10 -slash_defence = 10 -crush_defence = -21 -magic_defence = -21 -range_defence = 10 [goat_kharidian_desert_2] id = 4931 @@ -121,11 +111,6 @@ respawn_delay = 50 drop_table = "billy_goat" examine = "They'll eat anything!" max_hit_crush = 60 -stab_defence = 10 -slash_defence = 10 -crush_defence = 10 -magic_defence = -21 -range_defence = 10 [osman_kharidian_desert] id = 5283 diff --git a/data/area/kharidian_desert/klenters_pyramid/klenters_pyramid.npcs.toml b/data/area/kharidian_desert/klenters_pyramid/klenters_pyramid.npcs.toml index 90b353437b..addcd29ab5 100644 --- a/data/area/kharidian_desert/klenters_pyramid/klenters_pyramid.npcs.toml +++ b/data/area/kharidian_desert/klenters_pyramid/klenters_pyramid.npcs.toml @@ -26,48 +26,35 @@ categories = ["zombies"] examine = "This mummy looks like it means business!" drop_table = "mummy" combat_def = "mummy" -stab_defence = 90 -slash_defence = 90 -crush_defence = 90 -magic_defence = 15 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [mummy_klenters_pyramid_2] id = 2016 clone = "mummy_klenters_pyramid" drop_table = "mummy" combat_def = "mummy" -slash_defence = 30 -magic_defence = 90 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [mummy_klenters_pyramid_3] id = 2017 clone = "mummy_klenters_pyramid" drop_table = "mummy" combat_def = "mummy" -stab_defence = 30 -magic_defence = 95 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [mummy_klenters_pyramid_4] id = 2018 clone = "mummy_klenters_pyramid" drop_table = "mummy" combat_def = "mummy" -crush_defence = 30 -magic_defence = 90 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [mummy_klenters_pyramid_5] id = 2019 clone = "mummy_klenters_pyramid" drop_table = "mummy" combat_def = "mummy" -stab_defence = 50 -crush_defence = 50 -magic_defence = 90 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [high_priest_klenters_pyramid_2] id = 1986 @@ -88,9 +75,6 @@ style = "melee" style = "crush" max_hit_melee = 10 examine = "Highly flammable!" -stab_defence = 100 -slash_defence = 100 -crush_defence = 100 [mummy_level_98] id = 1959 diff --git a/data/area/kharidian_desert/mining_camp/desert_mining_camp.npcs.toml b/data/area/kharidian_desert/mining_camp/desert_mining_camp.npcs.toml index 954b0eb440..9f7b351e39 100644 --- a/data/area/kharidian_desert/mining_camp/desert_mining_camp.npcs.toml +++ b/data/area/kharidian_desert/mining_camp/desert_mining_camp.npcs.toml @@ -33,28 +33,28 @@ respawn_delay = 50 examine = "He looks a bit aggressive." drop_table = "mercenary" combat_def = "guard" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [mercenary_desert_mining_camp_2] id = 4990 clone = "mercenary_desert_mining_camp" drop_table = "mercenary" combat_def = "guard" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [mercenary_desert_mining_camp_3] id = 4991 clone = "mercenary_desert_mining_camp" drop_table = "mercenary" combat_def = "guard" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [mercenary_desert_mining_camp_4] id = 4992 clone = "mercenary_desert_mining_camp" drop_table = "mercenary" combat_def = "guard" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [guard_desert_mining_camp] id = 4993 @@ -103,11 +103,6 @@ str = 18 def = 14 attack_bonus = 4 max_hit_stab = 30 -stab_defence = 17 -slash_defence = 15 -crush_defence = 19 -magic_defence = -3 -range_defence = 19 [guard_desert_mining_camp_5] id = 4997 @@ -195,7 +190,7 @@ respawn_delay = 50 examine = "He looks a bit aggressive." drop_table = "rowdy_slave" max_hit_crush = 20 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [mercenary_captain] id = 830 diff --git a/data/area/kharidian_desert/nardah/nardah.npcs.toml b/data/area/kharidian_desert/nardah/nardah.npcs.toml index 48c946da55..e89874a5e8 100644 --- a/data/area/kharidian_desert/nardah/nardah.npcs.toml +++ b/data/area/kharidian_desert/nardah/nardah.npcs.toml @@ -112,11 +112,6 @@ examine = "They'll eat anything!" drop_table = "billy_goat" max_hit_crush = 60 combat_def = "billy_goat" -stab_defence = 10 -slash_defence = 10 -crush_defence = -21 -magic_defence = -21 -range_defence = 10 [artimeus] id = 5109 diff --git a/data/area/kharidian_desert/pollnivneach/pollnivneach.npcs.toml b/data/area/kharidian_desert/pollnivneach/pollnivneach.npcs.toml index ea086eb87e..87267b09ae 100644 --- a/data/area/kharidian_desert/pollnivneach/pollnivneach.npcs.toml +++ b/data/area/kharidian_desert/pollnivneach/pollnivneach.npcs.toml @@ -28,9 +28,6 @@ attack_bonus = 9 respawn_delay = 50 drop_table = "bones" examine = "Tough-looking." -stab_defence = 9 -slash_defence = 8 -crush_defence = 10 [cowardly_bandit_pollnivneach] id = 1886 @@ -57,9 +54,6 @@ attack_bonus = 4 respawn_delay = 5 drop_table = "bones" examine = "Menaphite thug." -stab_defence = 9 -slash_defence = 8 -crush_defence = 10 [aristarchus_pollnivneach] id = 3127 diff --git a/data/area/kharidian_desert/rock_island_prison/rock_island_prison.npcs.toml b/data/area/kharidian_desert/rock_island_prison/rock_island_prison.npcs.toml index 5f85935dc5..4aa95d0713 100644 --- a/data/area/kharidian_desert/rock_island_prison/rock_island_prison.npcs.toml +++ b/data/area/kharidian_desert/rock_island_prison/rock_island_prison.npcs.toml @@ -7,11 +7,6 @@ id = 1400 drop_table = "bones" combat_def = "seagull" hitpoints = 30 -stab_defence = 20 -slash_defence = 10 -crush_defence = 16 -magic_defence = 8 -range_defence = 4 [customs_officer] id = 7837 diff --git a/data/area/kharidian_desert/sophanem/sophanem_dungeon/sophanem_dungeon.npcs.toml b/data/area/kharidian_desert/sophanem/sophanem_dungeon/sophanem_dungeon.npcs.toml index 2ebfdf2f4c..39340a281f 100644 --- a/data/area/kharidian_desert/sophanem/sophanem_dungeon/sophanem_dungeon.npcs.toml +++ b/data/area/kharidian_desert/sophanem/sophanem_dungeon/sophanem_dungeon.npcs.toml @@ -19,10 +19,6 @@ hunt_mode = "cowardly" slayer_xp = 51.2 categories = ["scabarites"] examine = "Part scarab, part human." -attack_bonus = 70 -slash_defence = 90 -crush_defence = 90 -magic_defence = 34 [scarab_mage_sophanem_dungeon] id = 5250 @@ -40,11 +36,6 @@ categories = ["scabarites"] respawn_delay = 50 examine = "Part scarab, part human." drop_table = "scarab_mage" -attack_bonus = 70 -stab_defence = 40 -slash_defence = 90 -crush_defence = 90 -magic_defence = 34 [locust_rider_sophanem_dungeon] id = 5251 @@ -60,9 +51,6 @@ categories = ["scabarites"] respawn_delay = 7 drop_table = "locust_rider" examine = "A mounted lancer." -stab_defence = 90 -slash_defence = 90 -crush_defence = 40 [locust_rider_sophanem_dungeon_2] id = 5252 @@ -85,12 +73,6 @@ categories = ["scabarites"] drop_table = "locust_rider" examine = "A mounted archer." combat_def = "locust_rider" -attack_bonus = 80 -stab_defence = 50 -slash_defence = 90 -crush_defence = 50 -magic_defence = 34 -range_defence = 66 [maisa_sophanem_dungeon] id = 5280 @@ -109,11 +91,6 @@ hunt_mode = "cowardly" slayer_xp = 1.0 categories = ["scabarites"] examine = "I think they're some kind of beetle." -stab_defence = 90 -slash_defence = 90 -crush_defence = 5 -magic_defence = 90 -range_defence = 90 [scarab_swarm_pyramid_plunder] id = 4500 @@ -130,8 +107,3 @@ hunt_mode = "cowardly" slayer_xp = 1.0 categories = ["scabarites"] examine = "I think they're some kind of beetle..." -stab_defence = 15 -slash_defence = 15 -crush_defence = 15 -magic_defence = 15 -range_defence = 15 diff --git a/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml index 9cb6fd171d..0d90e5c144 100644 --- a/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml +++ b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.npcs.toml @@ -7,7 +7,7 @@ str = 15 def = 15 combat_def = "scarab_larva" hitpoints = 140 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [scabaras_ranger] id = 6773 @@ -20,11 +20,7 @@ str = 1 def = 96 range = 116 max_hit_range = 130 -slash_defence = 20 -crush_defence = 20 -magic_defence = 4 -range_defence = 26 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [scabaras_lancer] id = 6774 @@ -36,9 +32,7 @@ att = 116 str = 116 def = 56 max_hit_crush = 130 -stab_defence = 30 -slash_defence = 30 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [scabaras_mage_scabaras_dungeon] id = 6780 @@ -52,9 +46,7 @@ def = 109 mage = 109 max_hit_magic = 104 combat_def = "scabaras_mage" -slash_defence = 90 -crush_defence = 90 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [scabaras_mage_scabaras_dungeon_2] id = 6781 @@ -66,11 +58,7 @@ def = 96 mage = 96 max_hit_magic = 104 combat_def = "scabaras_mage" -attack_bonus = 70 -slash_defence = 90 -crush_defence = 90 -magic_defence = 34 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [clay_golem_scabaras_dungeon] id = 6785 diff --git a/data/area/kharidian_desert/ullek/ullek.npcs.toml b/data/area/kharidian_desert/ullek/ullek.npcs.toml index 9aafe2ac5c..d46bab1e84 100644 --- a/data/area/kharidian_desert/ullek/ullek.npcs.toml +++ b/data/area/kharidian_desert/ullek/ullek.npcs.toml @@ -43,12 +43,7 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 -stab_defence = 9 -slash_defence = 11 -crush_defence = -2 -magic_defence = 1 -range_defence = 4 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [skeleton_ullek_2] id = 6765 @@ -59,12 +54,7 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 -stab_defence = 9 -slash_defence = 11 -crush_defence = -2 -magic_defence = 1 -range_defence = 4 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [skeleton_ullek_3] id = 6766 @@ -75,12 +65,7 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 -stab_defence = 9 -slash_defence = 11 -crush_defence = -2 -magic_defence = 1 -range_defence = 4 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [skeleton_ullek_4] id = 6767 @@ -91,12 +76,7 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 -stab_defence = 9 -slash_defence = 11 -crush_defence = -2 -magic_defence = 1 -range_defence = 4 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [skeleton_ullek_5] id = 6768 @@ -109,12 +89,7 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 -stab_defence = 9 -slash_defence = 11 -crush_defence = -2 -magic_defence = 1 -range_defence = 4 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [scabaras_locust_ullek] id = 6776 @@ -125,7 +100,7 @@ str = 99 def = 99 combat_def = "scabaras_locust" hitpoints = 1060 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [locust_lancer_ullek] id = 6777 @@ -138,9 +113,7 @@ str = 106 def = 69 max_hit_crush = 120 combat_def = "locust_lancer" -stab_defence = 20 -slash_defence = 20 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [locust_ranger_ullek] id = 6778 @@ -154,9 +127,7 @@ def = 1 range = 196 max_hit_range = 210 combat_def = "locust_ranger" -slash_defence = 20 -range_defence = 6 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [crocodile_ullek] id = 6779 @@ -167,7 +138,7 @@ str = 54 def = 54 max_hit_slash = 60 combat_def = "crocodile" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [lead_archaeologist_abigail] id = 6786 diff --git a/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml b/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml index 10191af2cf..2eafdc93c0 100644 --- a/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml +++ b/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.npcs.toml @@ -8,7 +8,6 @@ att = 36 str = 36 def = 19 max_hit_crush = 50 -crush_defence = 1 [golems_remains_uzer_mastaba] id = 7498 @@ -24,5 +23,5 @@ str = 1 def = 82 max_hit_crush = 15 combat_def = "small_scarab" -hunt_mode = "aggressive" +hunt_mode = "cowardly" diff --git a/data/area/kharidian_desert/uzer/uzer.npcs.toml b/data/area/kharidian_desert/uzer/uzer.npcs.toml index 2a1b9ad6d1..226a88cc21 100644 --- a/data/area/kharidian_desert/uzer/uzer.npcs.toml +++ b/data/area/kharidian_desert/uzer/uzer.npcs.toml @@ -7,7 +7,7 @@ hitpoints = 400 att = 34 str = 34 def = 34 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [bandit_looter_uzer_2] id = 7493 @@ -18,7 +18,7 @@ hitpoints = 400 att = 34 str = 34 def = 34 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [bandit_looter_uzer_3] id = 7494 @@ -29,7 +29,7 @@ hitpoints = 400 att = 34 str = 34 def = 34 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [bandit_looter_uzer_4] id = 7495 @@ -40,7 +40,7 @@ hitpoints = 400 att = 34 str = 34 def = 34 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [bandit_looter_uzer_5] id = 7496 @@ -51,5 +51,5 @@ hitpoints = 400 att = 34 str = 34 def = 34 -hunt_mode = "aggressive" +hunt_mode = "cowardly" diff --git a/data/area/misthalin/barbarian_village/barbarian_village.npcs.toml b/data/area/misthalin/barbarian_village/barbarian_village.npcs.toml index 9b47be2f82..5ca78b2638 100644 --- a/data/area/misthalin/barbarian_village/barbarian_village.npcs.toml +++ b/data/area/misthalin/barbarian_village/barbarian_village.npcs.toml @@ -143,19 +143,11 @@ examine = "Acelin, a guard in the Barbarian Village." id = 3257 clone = "barbarian_hagen" examine = "Adelino, a barbarian warrior with a big axe." -slash_defence = 3 -crush_defence = 2 -magic_defence = -3 -range_defence = 2 [barbarian_adolpho] id = 3258 clone = "barbarian_wotan" examine = "Adolpho, a barbarian warrior with a warhammer." -slash_defence = 3 -crush_defence = 2 -magic_defence = -3 -range_defence = 2 [barbarian_aitan] id = 3259 diff --git a/data/area/misthalin/barbarian_village/stronghold_of_player_safety/stronghold_of_player_safety.npcs.toml b/data/area/misthalin/barbarian_village/stronghold_of_player_safety/stronghold_of_player_safety.npcs.toml index 57c268eb99..6f2783d941 100644 --- a/data/area/misthalin/barbarian_village/stronghold_of_player_safety/stronghold_of_player_safety.npcs.toml +++ b/data/area/misthalin/barbarian_village/stronghold_of_player_safety/stronghold_of_player_safety.npcs.toml @@ -41,11 +41,6 @@ examine = "Eurgh! A big bug." respawn_delay = 60 combat_def = "cockroach_worker" drop_table = "cockroach_worker" -stab_defence = 38 -slash_defence = 25 -crush_defence = 30 -magic_defence = 30 -range_defence = 50 [cockroach_soldier] id = 7160 @@ -59,12 +54,8 @@ examine = "Euww! A giant bug." respawn_delay = 60 drop_table = "cockroach_soldier" combat_def = "cockroach_soldier" -stab_defence = 32 -slash_defence = 55 -crush_defence = 45 -magic_defence = 50 -range_defence = 60 +# Unlike other muggers these are not aggressive: https://www.youtube.com/watch?v=iWUsTvMLQtY [mugger_stronghold_of_player_safety] id = 7161 hitpoints = 80 @@ -75,10 +66,8 @@ style = "crush" combat_def = "mugger" drop_table = "mugger" examine = "He jumps out and attacks people." -hunt_mode = "aggressive" [mugger_stronghold_of_player_safety_2] id = 7162 clone = "mugger_stronghold_of_player_safety" -hunt_mode = "aggressive" diff --git a/data/area/misthalin/barbarian_village/stronghold_of_security/catablepon/catablepon.npcs.toml b/data/area/misthalin/barbarian_village/stronghold_of_security/catablepon/catablepon.npcs.toml index be1572e438..95131f4b25 100644 --- a/data/area/misthalin/barbarian_village/stronghold_of_security/catablepon/catablepon.npcs.toml +++ b/data/area/misthalin/barbarian_village/stronghold_of_security/catablepon/catablepon.npcs.toml @@ -12,11 +12,6 @@ hunt_mode = "cowardly" drop_table = "catablepon" categories = ["catablepons"] examine = "Big... Cow-like... But cows don't have serpent tails!" -stab_defence = 40 -slash_defence = 30 -crush_defence = 20 -magic_defence = 20 -range_defence = 40 [catablepon_mid] id = 4398 @@ -27,11 +22,6 @@ str = 50 def = 50 mage = 45 slayer_xp = 70.0 -stab_defence = 50 -slash_defence = 40 -crush_defence = 30 -magic_defence = 30 -range_defence = 50 [catablepon_high] id = 4399 @@ -43,8 +33,3 @@ str = 60 def = 60 mage = 60 slayer_xp = 50.0 -stab_defence = 50 -slash_defence = 40 -crush_defence = 30 -magic_defence = 30 -range_defence = 50 diff --git a/data/area/misthalin/barbarian_village/stronghold_of_security/flesh_crawler/flesh_crawler.npcs.toml b/data/area/misthalin/barbarian_village/stronghold_of_security/flesh_crawler/flesh_crawler.npcs.toml index 3457ce9e97..924e1f2073 100644 --- a/data/area/misthalin/barbarian_village/stronghold_of_security/flesh_crawler/flesh_crawler.npcs.toml +++ b/data/area/misthalin/barbarian_village/stronghold_of_security/flesh_crawler/flesh_crawler.npcs.toml @@ -12,11 +12,6 @@ hunt_range = 3 drop_table = "flesh_crawler" categories = ["flesh_crawlers"] examine = "I don't think insect repellent will work..." -stab_defence = 15 -slash_defence = 15 -crush_defence = 15 -magic_defence = 15 -range_defence = 15 [flesh_crawler_2] id = 4390 diff --git a/data/area/misthalin/barbarian_village/stronghold_of_security/minotaur/minotaur.npcs.toml b/data/area/misthalin/barbarian_village/stronghold_of_security/minotaur/minotaur.npcs.toml index f84e090ec3..fe4c92a60e 100644 --- a/data/area/misthalin/barbarian_village/stronghold_of_security/minotaur/minotaur.npcs.toml +++ b/data/area/misthalin/barbarian_village/stronghold_of_security/minotaur/minotaur.npcs.toml @@ -10,11 +10,6 @@ slayer_xp = 10.0 drop_table = "minotaur" categories = ["minotaurs"] examine = "He doesn't look very pleased to see you." -stab_defence = -21 -slash_defence = -21 -crush_defence = -21 -magic_defence = -21 -range_defence = -21 [minotaur_strong] id = 4406 @@ -28,9 +23,4 @@ respawn_delay = 15 slayer_xp = 22.0 drop_table = "minotaur" categories = ["minotaurs"] -examine = "He doesn't look very pleased to see you." -stab_defence = -10 -slash_defence = -10 -crush_defence = -10 -magic_defence = 21 -range_defence = -10 \ No newline at end of file +examine = "He doesn't look very pleased to see you." \ No newline at end of file diff --git a/data/area/misthalin/dorgesh_kaan/dorgesh_kaan.npcs.toml b/data/area/misthalin/dorgesh_kaan/dorgesh_kaan.npcs.toml index 812c4fb77a..126ecd613e 100644 --- a/data/area/misthalin/dorgesh_kaan/dorgesh_kaan.npcs.toml +++ b/data/area/misthalin/dorgesh_kaan/dorgesh_kaan.npcs.toml @@ -229,11 +229,6 @@ str = 18 def = 14 attack_bonus = 4 max_hit_stab = 30 -stab_defence = 1 -slash_defence = 16 -crush_defence = 19 -magic_defence = -3 -range_defence = 12 [guard_dorgesh_kaan_2] id = 5801 @@ -247,10 +242,6 @@ str = 18 def = 14 attack_bonus = 4 max_hit_stab = 30 -slash_defence = 15 -crush_defence = 19 -magic_defence = -3 -range_defence = 12 [zanik_dorgesh_kaan_2] id = 5802 @@ -404,8 +395,3 @@ slayer_xp = 52.0 categories = ["molanisks"] drop_table = "molanisk" examine = "A strange mole-like being." -stab_defence = 45 -slash_defence = 45 -crush_defence = 35 -magic_defence = 30 -range_defence = 55 diff --git a/data/area/misthalin/draynor/draynor.npcs.toml b/data/area/misthalin/draynor/draynor.npcs.toml index 17e494b7ed..271e7e20da 100644 --- a/data/area/misthalin/draynor/draynor.npcs.toml +++ b/data/area/misthalin/draynor/draynor.npcs.toml @@ -142,11 +142,6 @@ hunt_mode = "guarding" respawn_delay = 50 examine = "He guards the Draynor Market stalls from thieves." drop_table = "market_guard" -stab_defence = 24 -slash_defence = 14 -crush_defence = 19 -magic_defence = 4 -range_defence = 16 [bank_guard_draynor] id = 2574 diff --git a/data/area/misthalin/edgeville/edgeville.npcs.toml b/data/area/misthalin/edgeville/edgeville.npcs.toml index b811a3338a..cf3fbf2f9f 100644 --- a/data/area/misthalin/edgeville/edgeville.npcs.toml +++ b/data/area/misthalin/edgeville/edgeville.npcs.toml @@ -39,11 +39,6 @@ str = 18 def = 14 attack_bonus = 4 max_hit_stab = 30 -stab_defence = 3 -slash_defence = 4 -crush_defence = 4 -magic_defence = 2 -range_defence = 3 [mysterious_ghost_edgeville] id = 2386 @@ -63,11 +58,6 @@ drop_table = "edgeville_guard" respawn_delay = 50 categories = ["human"] examine = "He tries to keep order around here." -stab_defence = 18 -slash_defence = 25 -crush_defence = 19 -magic_defence = -4 -range_defence = 20 [guard_edgeville_2] id = 297 @@ -110,11 +100,6 @@ drop_table = "ram" examine = "White and fluffy." combat_def = "ram_freds_farm" max_hit_crush = 10 -stab_defence = -21 -slash_defence = -21 -crush_defence = -21 -magic_defence = -21 -range_defence = -21 [outlaw_edgeville] id = 5842 diff --git a/data/area/misthalin/ham_hideout/ham_hideout.npcs.toml b/data/area/misthalin/ham_hideout/ham_hideout.npcs.toml index 2d1dd87e11..3368d5dd22 100644 --- a/data/area/misthalin/ham_hideout/ham_hideout.npcs.toml +++ b/data/area/misthalin/ham_hideout/ham_hideout.npcs.toml @@ -15,9 +15,6 @@ respawn_delay = 25 drop_table = "ham_guard" examine = "A guard for the humans against monster group." combat_def = "guard" -stab_defence = 5 -slash_defence = 5 -range_defence = 5 [ham_guard_ham_cave_2] id = 1711 @@ -89,9 +86,6 @@ attack_range = 8 max_hit_range = 40 hunt_mode = "cowardly" examine = "He looks pretty skilled with that bow." -stab_defence = 5 -slash_defence = 5 -range_defence = 5 [ham_mage] id = 5860 @@ -102,8 +96,4 @@ attack_speed = 6 style = "magic" max_hit_magic = 40 hunt_mode = "cowardly" -examine = "He bristles with arcane power." -attack_bonus = 8 -stab_defence = 5 -slash_defence = 5 -range_defence = 5 \ No newline at end of file +examine = "He bristles with arcane power." \ No newline at end of file diff --git a/data/area/misthalin/ham_hideout/store_rooms/ham_store_rooms.npcs.toml b/data/area/misthalin/ham_hideout/store_rooms/ham_store_rooms.npcs.toml index 6cb210cf00..84bfe66a03 100644 --- a/data/area/misthalin/ham_hideout/store_rooms/ham_store_rooms.npcs.toml +++ b/data/area/misthalin/ham_hideout/store_rooms/ham_store_rooms.npcs.toml @@ -19,6 +19,7 @@ hitpoints = 220 att = 19 str = 18 def = 14 +attack_bonus = 4 max_hit_stab = 30 [guard_ham_store_rooms_3] @@ -30,6 +31,7 @@ hitpoints = 220 att = 19 str = 18 def = 14 +attack_bonus = 4 max_hit_stab = 30 [guard_ham_store_rooms_4] @@ -41,6 +43,7 @@ hitpoints = 220 att = 19 str = 18 def = 14 +attack_bonus = 4 max_hit_stab = 30 [guard_ham_store_rooms_5] @@ -52,5 +55,6 @@ hitpoints = 220 att = 19 str = 18 def = 14 +attack_bonus = 4 max_hit_stab = 30 diff --git a/data/area/misthalin/ice_mountain/ice_mountain.npcs.toml b/data/area/misthalin/ice_mountain/ice_mountain.npcs.toml index bcd653a9b2..c0c038e8fa 100644 --- a/data/area/misthalin/ice_mountain/ice_mountain.npcs.toml +++ b/data/area/misthalin/ice_mountain/ice_mountain.npcs.toml @@ -16,11 +16,6 @@ categories = ["dwarves"] respawn_delay = 25 drop_table = "black_guard_low" examine = "A member of the Black Guard, a special division of the dwarven army." -stab_defence = 3 -slash_defence = 4 -crush_defence = 4 -magic_defence = 2 -range_defence = 3 [black_guard_2] id = 3277 diff --git a/data/area/misthalin/lumbridge/cellar/goblin_mines/goblin_mines.npcs.toml b/data/area/misthalin/lumbridge/cellar/goblin_mines/goblin_mines.npcs.toml index 5c31d22973..10461682be 100644 --- a/data/area/misthalin/lumbridge/cellar/goblin_mines/goblin_mines.npcs.toml +++ b/data/area/misthalin/lumbridge/cellar/goblin_mines/goblin_mines.npcs.toml @@ -43,12 +43,6 @@ respawn_delay = 50 drop_table = "cave_goblin_guard" examine = "He protects the miners." combat_def = "cave_goblin" -attack_bonus = 11 -stab_defence = 1 -slash_defence = 16 -crush_defence = 19 -magic_defence = -3 -range_defence = 12 [cave_goblin_guard_2] id = 2074 @@ -57,8 +51,6 @@ att = 22 str = 16 def = 22 combat_def = "cave_goblin" -attack_bonus = 16 -slash_defence = 15 [goblin_guard] id = 489 @@ -74,9 +66,6 @@ categories = ["goblins"] respawn_delay = 250 drop_table = "goblin" examine = "He doesn't look like he'd trust his own mother." -stab_defence = 4 -slash_defence = 6 -crush_defence = 6 [cave_goblin_miner_5] id = 2075 diff --git a/data/area/misthalin/lumbridge/freds_farm/freds_farm.npcs.toml b/data/area/misthalin/lumbridge/freds_farm/freds_farm.npcs.toml index ef7cd4ec80..6a63653a17 100644 --- a/data/area/misthalin/lumbridge/freds_farm/freds_farm.npcs.toml +++ b/data/area/misthalin/lumbridge/freds_farm/freds_farm.npcs.toml @@ -15,11 +15,6 @@ drop_table = "ram" respawn_delay = 45 categories = ["rams"] examine = "White and shaggy." -stab_defence = -58 -slash_defence = -58 -crush_defence = -58 -magic_defence = -58 -range_defence = -58 [ram_freds_farm_2] id = 12370 diff --git a/data/area/misthalin/lumbridge/lumbridge.npcs.toml b/data/area/misthalin/lumbridge/lumbridge.npcs.toml index f9e61ac9d7..991fdcb406 100644 --- a/data/area/misthalin/lumbridge/lumbridge.npcs.toml +++ b/data/area/misthalin/lumbridge/lumbridge.npcs.toml @@ -169,11 +169,6 @@ id = 7878 [lumbridge_man_7] clone = "lumbridge_man" id = 7879 -stab_defence = -58 -slash_defence = -58 -crush_defence = -58 -magic_defence = -58 -range_defence = -58 [lumbridge_woman] id = 7880 @@ -219,11 +214,6 @@ attack_bonus = 5 respawn_delay = 25 drop_table = "farmer_members" examine = "He grows the crops in this area." -stab_defence = -18 -slash_defence = -18 -crush_defence = -18 -magic_defence = -18 -range_defence = -18 [farmer_lumbridge_2] id = 1759 diff --git a/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml b/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml index 83e6460cdd..27492598fc 100644 --- a/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml +++ b/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml @@ -10,12 +10,7 @@ respawn_delay = 30 drop_table = "giant_rat" categories = ["giant_rats", "rats"] examine = "Overgrown vermin." -stab_defence = -29 -slash_defence = -29 -crush_defence = -29 -magic_defence = -29 -range_defence = -29 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [fremennik_shipmaster_al_kharid] id = 9708 @@ -26,11 +21,6 @@ drop_table = "giant_spider" combat_def = "giant_spider" hitpoints = 50 max_hit_stab = 10 -stab_defence = -43 -slash_defence = -43 -crush_defence = -43 -magic_defence = -43 -range_defence = -43 [sergeant_mossfists] id = 5889 diff --git a/data/area/misthalin/tutorial_island/tutorial_island.npcs.toml b/data/area/misthalin/tutorial_island/tutorial_island.npcs.toml index 6a1336a1c1..856be617da 100644 --- a/data/area/misthalin/tutorial_island/tutorial_island.npcs.toml +++ b/data/area/misthalin/tutorial_island/tutorial_island.npcs.toml @@ -57,7 +57,7 @@ categories = ["giant_rats", "rats"] respawn_delay = 30 drop_table = "giant_rat" examine = "Overgrown vermin." -hunt_mode = "aggressive" +hunt_mode = "cowardly" [chicken_tutorial_island] id = 951 diff --git a/data/area/misthalin/varrock/air_rune_temple/air_rune_temple.npcs.toml b/data/area/misthalin/varrock/air_rune_temple/air_rune_temple.npcs.toml index 1ce99b7d9c..2d5c0f2681 100644 --- a/data/area/misthalin/varrock/air_rune_temple/air_rune_temple.npcs.toml +++ b/data/area/misthalin/varrock/air_rune_temple/air_rune_temple.npcs.toml @@ -9,9 +9,4 @@ examine = "A cute bunny rabbit." drop_table = "rabbit" combat_def = "rabbit_miscellania" max_hit_crush = 10 -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 diff --git a/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.npcs.toml b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.npcs.toml index d2a75e7f15..8f74039d69 100644 --- a/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.npcs.toml +++ b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.npcs.toml @@ -10,7 +10,7 @@ examine = "He looks a little on the cross side!" drop_table = "empty" max_hit_stab = 50 combat_def = "angry_unicorn" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [angry_giant_rat_tolnas_rift] id = 3662 @@ -24,7 +24,7 @@ categories = ["rats"] drop_table = "bones" examine = "He looks a little on the cross side!" combat_def = "giant_rat" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [angry_goblin_tolnas_rift] id = 3663 @@ -38,7 +38,7 @@ categories = ["goblins"] examine = "He looks a little on the cross side!" drop_table = "empty" combat_def = "goblin" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [angry_bear_tolnas_rift] id = 3664 @@ -51,7 +51,7 @@ max_hit_melee = 50 examine = "He looks a little on the cross side!" drop_table = "empty" combat_def = "bear" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [fear_reaper_tolnas_rift] id = 3665 @@ -101,7 +101,7 @@ combat_def = "hopeless_creature" id = 4940 clone = "angry_giant_rat_tolnas_rift" combat_def = "giant_rat" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [tolna_south] id = 3658 @@ -114,8 +114,6 @@ max_hit_melee = 50 attack_speed = 5 hunt_mode = "cowardly" examine = "Is that really Tolna?" -magic_defence = 50 -range_defence = 50 [tolna_east] id = 3659 @@ -131,8 +129,6 @@ max_hit_range = 50 attack_speed = 5 hunt_mode = "cowardly" examine = "Is that really Tolna?" -magic_defence = 50 -range_defence = 50 [tolna_north] id = 3660 @@ -145,6 +141,4 @@ max_hit_melee = 50 attack_speed = 5 hunt_mode = "cowardly" examine = "Is that really Tolna?" -magic_defence = 50 -range_defence = 50 diff --git a/data/area/misthalin/varrock/varrock.npcs.toml b/data/area/misthalin/varrock/varrock.npcs.toml index 765bb15a64..fb08ed836d 100644 --- a/data/area/misthalin/varrock/varrock.npcs.toml +++ b/data/area/misthalin/varrock/varrock.npcs.toml @@ -125,7 +125,6 @@ examine = "A practicer of dark arts." [dark_wizard_earth_2] clone = "dark_wizard_earth" id = 8874 -magic_defence = 3 [iffie] id = 5914 @@ -201,12 +200,7 @@ combat_def = "giant_rat" drop_table = "giant_rat" categories = ["giant_rats", "rats"] examine = "Overgrown vermin." -stab_defence = -40 -slash_defence = -40 -crush_defence = -40 -magic_defence = -40 -range_defence = -40 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [master_farmer_varrock] id = 2235 @@ -729,11 +723,6 @@ examine = "Peaceful man!" id = 5920 clone = "guard_varrock" drop_table = "guard" -stab_defence = 24 -slash_defence = 30 -crush_defence = 25 -magic_defence = -9 -range_defence = 25 [trainee_guard] id = 5921 diff --git a/data/area/misthalin/zanaris/evil_chicken_lair/evil_chicken_lair.npcs.toml b/data/area/misthalin/zanaris/evil_chicken_lair/evil_chicken_lair.npcs.toml index 8c1b01bf4a..0409909aec 100644 --- a/data/area/misthalin/zanaris/evil_chicken_lair/evil_chicken_lair.npcs.toml +++ b/data/area/misthalin/zanaris/evil_chicken_lair/evil_chicken_lair.npcs.toml @@ -22,12 +22,7 @@ str = 200 def = 200 mage = 100 max_hit_slash = 210 -stab_defence = 50 -slash_defence = 70 -crush_defence = 70 -magic_defence = 60 -range_defence = 50 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [black_dragon_evil_chicken_lair_2] id = 4675 @@ -41,7 +36,7 @@ str = 200 def = 200 mage = 100 max_hit_slash = 210 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [black_dragon_evil_chicken_lair_3] id = 4676 @@ -55,5 +50,5 @@ str = 200 def = 200 mage = 100 max_hit_slash = 210 -hunt_mode = "aggressive" +hunt_mode = "cowardly" diff --git a/data/area/misthalin/zanaris/zanaris.npcs.toml b/data/area/misthalin/zanaris/zanaris.npcs.toml index 6b96654b12..c60c3dcd5f 100644 --- a/data/area/misthalin/zanaris/zanaris.npcs.toml +++ b/data/area/misthalin/zanaris/zanaris.npcs.toml @@ -82,11 +82,6 @@ categories = ["mutated_zygomites"] respawn_delay = 30 drop_table = "zygomite_level_74" examine = "A fun guy. No wait, that's awful. Plus it doesn't even make sense." -stab_defence = 10 -slash_defence = 10 -crush_defence = 10 -magic_defence = 20 -range_defence = 20 [fungi_large] id = 3345 @@ -103,11 +98,6 @@ categories = ["mutated_zygomites"] respawn_delay = 30 drop_table = "zygomite_level_86" examine = "A fun guy. No wait, that's awful. Plus it doesn't even make sense." -stab_defence = 10 -slash_defence = 10 -crush_defence = 10 -magic_defence = 20 -range_defence = 20 [fairy_9] id = 4422 @@ -180,11 +170,6 @@ categories = ["otherworldly_beings"] respawn_delay = 20 drop_table = "otherworldly_being" examine = "Is he invisible or just a set of floating clothing?" -stab_defence = 15 -slash_defence = 10 -crush_defence = 20 -magic_defence = -5 -range_defence = 15 [fairy_queen_3] id = 653 diff --git a/data/area/morytania/braindeath_island/braindeath_island.npcs.toml b/data/area/morytania/braindeath_island/braindeath_island.npcs.toml index 27d14236e4..cd7f78a027 100644 --- a/data/area/morytania/braindeath_island/braindeath_island.npcs.toml +++ b/data/area/morytania/braindeath_island/braindeath_island.npcs.toml @@ -85,32 +85,32 @@ categories = ["zombies"] respawn_delay = 37 drop_table = "pirate" examine = "He talks a good fight." -hunt_mode = "aggressive" +hunt_mode = "cowardly" [zombie_swab_2] id = 2844 clone = "zombie_swab" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [zombie_swab_3] id = 2845 clone = "zombie_swab" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [zombie_swab_4] id = 2846 clone = "zombie_swab" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [zombie_swab_5] id = 2847 clone = "zombie_swab" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [zombie_swab_6] id = 2848 clone = "zombie_swab" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [fever_spider] id = 2850 @@ -125,11 +125,6 @@ categories = ["fever_spiders"] respawn_delay = 5 drop_table = "fever_spider" examine = "A bunch of legs, eyes and teeth." -stab_defence = 20 -slash_defence = 15 -crush_defence = 10 -magic_defence = 15 -range_defence = 15 [brewer] id = 2851 diff --git a/data/area/morytania/burgh_de_rott/burgh_de_rott.npcs.toml b/data/area/morytania/burgh_de_rott/burgh_de_rott.npcs.toml index 5a4d06b71f..799b83880d 100644 --- a/data/area/morytania/burgh_de_rott/burgh_de_rott.npcs.toml +++ b/data/area/morytania/burgh_de_rott/burgh_de_rott.npcs.toml @@ -16,7 +16,7 @@ att = 40 str = 40 def = 30 max_hit_crush = 50 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [vampyre_juvinate_4] id = 3523 @@ -27,7 +27,7 @@ att = 40 str = 40 def = 30 max_hit_crush = 50 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [vampyre_juvinate_5] id = 3524 @@ -38,7 +38,7 @@ att = 40 str = 40 def = 30 max_hit_crush = 50 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [vampyre_juvinate_6] id = 3525 @@ -49,7 +49,7 @@ att = 40 str = 40 def = 30 max_hit_crush = 50 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [vampyre_juvenile] id = 3531 @@ -174,7 +174,7 @@ def = 85 mage = 110 range = 110 max_hit_crush = 110 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [vyrewatch_2] id = 7692 @@ -187,7 +187,7 @@ mage = 120 range = 120 max_hit_crush = 120 combat_def = "vyrewatch" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [vyrewatch_3] id = 7693 @@ -200,7 +200,7 @@ mage = 120 range = 120 max_hit_crush = 130 combat_def = "vyrewatch" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [vyrewatch_4] id = 7694 @@ -213,7 +213,7 @@ mage = 120 range = 120 max_hit_crush = 130 combat_def = "vyrewatch" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [vyrewatch_5] id = 7699 @@ -226,7 +226,7 @@ mage = 110 range = 110 max_hit_crush = 110 combat_def = "vyrewatch" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [vyrewatch_6] id = 7700 @@ -239,7 +239,7 @@ mage = 120 range = 120 max_hit_crush = 120 combat_def = "vyrewatch" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [vyrewatch_7] id = 7701 @@ -252,7 +252,7 @@ mage = 120 range = 120 max_hit_crush = 130 combat_def = "vyrewatch" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [vyrewatch_8] id = 7702 @@ -265,7 +265,7 @@ mage = 120 range = 120 max_hit_crush = 130 combat_def = "vyrewatch" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [ivan_strom] id = 7708 diff --git a/data/area/morytania/canifis/canifis.npcs.toml b/data/area/morytania/canifis/canifis.npcs.toml index 02f6ca7ef5..8beb0d42cd 100644 --- a/data/area/morytania/canifis/canifis.npcs.toml +++ b/data/area/morytania/canifis/canifis.npcs.toml @@ -54,11 +54,6 @@ examine = "A well organised shop keeper." id = 6028 clone = "boris" examine = "He's staring at the moon." -stab_defence = -21 -slash_defence = -21 -crush_defence = -21 -magic_defence = -21 -range_defence = -21 [joseph] id = 6029 @@ -69,11 +64,6 @@ examine = "He keeps calling me comrade." id = 6030 clone = "boris" examine = "There's a set of brows that mean business." -stab_defence = -21 -slash_defence = -21 -crush_defence = -21 -magic_defence = -21 -range_defence = -21 [eduard] id = 6031 @@ -84,11 +74,6 @@ examine = "This is one feral looking innkeeper." id = 6032 clone = "boris" examine = "A tough looking villager." -stab_defence = -21 -slash_defence = -21 -crush_defence = -21 -magic_defence = -21 -range_defence = -21 [georgy] id = 6033 diff --git a/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.npcs.toml b/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.npcs.toml index 687831168e..d736db78cf 100644 --- a/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.npcs.toml +++ b/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.npcs.toml @@ -9,7 +9,7 @@ def = 40 max_hit_stab = 40 max_hit_crush = 90 combat_def = "giant_lobster" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [giant_crab_dragontooth_shipwreck] id = 7829 diff --git a/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.npcs.toml b/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.npcs.toml index 5ce71c48cc..0423300efa 100644 --- a/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.npcs.toml +++ b/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.npcs.toml @@ -17,9 +17,6 @@ respawn_delay = 15 drop_table = "giant_skeleton_tarns_lair" examine = "A giant skeleton." combat_def = "skeleton_unarmed" -stab_defence = 50 -slash_defence = 40 -range_defence = 40 [skeleton_lair_of_tarn_razorlor] id = 5385 @@ -32,10 +29,7 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 -stab_defence = 50 -slash_defence = 40 -range_defence = 40 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [skeleton_lair_of_tarn_razorlor_2] id = 5387 @@ -48,10 +42,7 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 -stab_defence = 50 -slash_defence = 40 -range_defence = 40 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [skeleton_lair_of_tarn_razorlor_3] id = 5388 @@ -64,10 +55,7 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 -stab_defence = 50 -slash_defence = 40 -range_defence = 40 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [skeleton_lair_of_tarn_razorlor_4] id = 5389 @@ -80,10 +68,7 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 -stab_defence = 50 -slash_defence = 40 -range_defence = 40 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [skeleton_lair_of_tarn_razorlor_5] id = 5390 @@ -96,10 +81,7 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 -stab_defence = 50 -slash_defence = 40 -range_defence = 40 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [skeleton_lair_of_tarn_razorlor_6] id = 5391 @@ -112,10 +94,7 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 -stab_defence = 50 -slash_defence = 40 -range_defence = 40 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [terror_dog] id = 5417 @@ -161,8 +140,3 @@ style = "magic" max_hit_melee = 90 hunt_mode = "cowardly" examine = "I preferred him when he was human." -stab_defence = 50 -slash_defence = 50 -crush_defence = 50 -magic_defence = 50 -range_defence = 50 diff --git a/data/area/morytania/meiyerditch/meiyerditch.npcs.toml b/data/area/morytania/meiyerditch/meiyerditch.npcs.toml index bb7daa3f43..4c6e8247cb 100644 --- a/data/area/morytania/meiyerditch/meiyerditch.npcs.toml +++ b/data/area/morytania/meiyerditch/meiyerditch.npcs.toml @@ -339,7 +339,7 @@ mage = 110 range = 110 max_hit_crush = 110 combat_def = "vyrewatch" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [vampyre_juvenile_male] id = 4774 diff --git a/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml index c9998b39f7..460b2d207e 100644 --- a/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml +++ b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml @@ -53,7 +53,7 @@ def = 111 mage = 111 max_hit_magic = 90 combat_def = "mutated_bloodveld" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [mutated_bloodveld_meiyerditch_tunnels_2] id = 7643 @@ -67,5 +67,5 @@ def = 138 mage = 138 max_hit_magic = 90 combat_def = "mutated_bloodveld" -hunt_mode = "aggressive" +hunt_mode = "cowardly" diff --git a/data/area/morytania/mort_myre_swamp/mort_myre_swamp.npcs.toml b/data/area/morytania/mort_myre_swamp/mort_myre_swamp.npcs.toml index 1931472978..02e957fc12 100644 --- a/data/area/morytania/mort_myre_swamp/mort_myre_swamp.npcs.toml +++ b/data/area/morytania/mort_myre_swamp/mort_myre_swamp.npcs.toml @@ -83,11 +83,6 @@ hunt_mode = "cowardly" respawn_delay = 50 drop_table = "myre_blamish_snail" examine = "A marsh coloured blamish snail, these types are said to spit acid." -stab_defence = 5 -slash_defence = 5 -crush_defence = 30 -magic_defence = 5 -range_defence = 50 [blood_blamish_snail] id = 1228 @@ -101,11 +96,6 @@ hunt_mode = "cowardly" respawn_delay = 50 drop_table = "blood_blamish_snail" examine = "A blood coloured blamish snail, these types are said to spit acid." -stab_defence = 5 -slash_defence = 5 -crush_defence = 30 -magic_defence = 5 -range_defence = 50 [ochre_blamish_snail] id = 1229 @@ -120,11 +110,6 @@ attack_bonus = 10 hunt_mode = "cowardly" respawn_delay = 50 examine = "A muddy coloured blamish snail, these types are said to spit acid." -stab_defence = 5 -slash_defence = 5 -crush_defence = 30 -magic_defence = 5 -range_defence = 50 [bruise_blamish_snail] id = 1230 @@ -140,11 +125,6 @@ hunt_mode = "cowardly" respawn_delay = 50 drop_table = "bruise_blamish_snail" examine = "A bruise blue coloured blamish snail, these types are said to spit acid." -stab_defence = 5 -slash_defence = 5 -crush_defence = 30 -magic_defence = 5 -range_defence = 50 [bark_blamish_snail] id = 1231 @@ -158,11 +138,6 @@ hunt_mode = "cowardly" respawn_delay = 50 drop_table = "bark_blamish_snail" examine = "A branch bark coloured blamish snail, these types are said to spit acid." -stab_defence = 5 -slash_defence = 5 -crush_defence = 30 -magic_defence = 5 -range_defence = 50 [myre_blamish_snail_2] id = 1232 diff --git a/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml b/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml index 117bb0d1db..ef49c6f9a7 100644 --- a/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml +++ b/data/area/morytania/mos_le_harmless/mos_le_harmless.npcs.toml @@ -109,7 +109,7 @@ att = 4 str = 5 def = 3 max_hit_stab = 10 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [monkey_mos_le_harmless] id = 4344 @@ -133,10 +133,6 @@ combat_def = "giant_mosquito" respawn_delay = 50 examine = "A flying blood sucker." drop_table = "giant_mosquito" -stab_defence = 2 -slash_defence = 2 -crush_defence = 5 -magic_defence = 2 [jungle_horror] id = 4352 diff --git a/data/area/morytania/port_phasmatys/alices_farm/alices_farm.npcs.toml b/data/area/morytania/port_phasmatys/alices_farm/alices_farm.npcs.toml index 117f24a8bf..6a59a05d4a 100644 --- a/data/area/morytania/port_phasmatys/alices_farm/alices_farm.npcs.toml +++ b/data/area/morytania/port_phasmatys/alices_farm/alices_farm.npcs.toml @@ -10,11 +10,6 @@ respawn_delay = 5 drop_table = "undead_cow" examine = "It's an undead cow." max_hit_crush = 10 -stab_defence = -21 -slash_defence = -21 -crush_defence = -21 -magic_defence = -21 -range_defence = -21 [undead_chicken] id = 1692 @@ -28,11 +23,6 @@ respawn_delay = 25 drop_table = "undead_chicken" examine = "Yep, definitely a chicken... an undead chicken." combat_def = "chicken" -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [old_man_alices_farm] id = 1696 diff --git a/data/area/morytania/slayer_tower/nechryael/nechryael.npcs.toml b/data/area/morytania/slayer_tower/nechryael/nechryael.npcs.toml index b2729e8873..2ff1b2168c 100644 --- a/data/area/morytania/slayer_tower/nechryael/nechryael.npcs.toml +++ b/data/area/morytania/slayer_tower/nechryael/nechryael.npcs.toml @@ -13,10 +13,6 @@ drop_table = "nechryael" categories = ["nechryael"] disengage = false examine = "An evil death demon." -stab_defence = 20 -slash_defence = 20 -crush_defence = 20 -range_defence = 20 [death_spawn] id = 1614 diff --git a/data/area/realm/corporeal_beasts_lair/corporeal_beasts_lair.npcs.toml b/data/area/realm/corporeal_beasts_lair/corporeal_beasts_lair.npcs.toml index 74d2658569..0c0f6f6aec 100644 --- a/data/area/realm/corporeal_beasts_lair/corporeal_beasts_lair.npcs.toml +++ b/data/area/realm/corporeal_beasts_lair/corporeal_beasts_lair.npcs.toml @@ -13,11 +13,6 @@ combat_def = "corporeal_beast" respawn_delay = 50 immune_poison = true examine = "A vision of supernatural horror." -stab_defence = 25 -slash_defence = 200 -crush_defence = 100 -magic_defence = 150 -range_defence = 230 [dark_energy_core] id = 8127 @@ -31,8 +26,3 @@ combat_def = "dark_energy_core" hunt_mode = "aggressive_retarget" drop_table = "ashes" examine = "A small being of dark energy." -stab_defence = 10 -slash_defence = 10 -crush_defence = 10 -magic_defence = -5 -range_defence = 10 diff --git a/data/area/realm/enchanted_valley/enchanted_valley.npcs.toml b/data/area/realm/enchanted_valley/enchanted_valley.npcs.toml index 2b8d621a5f..393eab2227 100644 --- a/data/area/realm/enchanted_valley/enchanted_valley.npcs.toml +++ b/data/area/realm/enchanted_valley/enchanted_valley.npcs.toml @@ -87,9 +87,4 @@ examine = "A very angry nymph." [tree_spirit_level_14_2] id = 4500 -clone = "tree_spirit_level_14" -stab_defence = 90 -slash_defence = 90 -crush_defence = 5 -magic_defence = 90 -range_defence = 90 \ No newline at end of file +clone = "tree_spirit_level_14" \ No newline at end of file diff --git a/data/area/realm/fisher_realm/fisher_realm.npcs.toml b/data/area/realm/fisher_realm/fisher_realm.npcs.toml index 5b94742850..d57fd6fb37 100644 --- a/data/area/realm/fisher_realm/fisher_realm.npcs.toml +++ b/data/area/realm/fisher_realm/fisher_realm.npcs.toml @@ -30,11 +30,6 @@ drop_table = "ram" combat_def = "ram_freds_farm" hitpoints = 80 max_hit_crush = 10 -stab_defence = -21 -slash_defence = -21 -crush_defence = -21 -magic_defence = -21 -range_defence = -21 [ram_fisher_realm_2] id = 5169 @@ -42,9 +37,4 @@ drop_table = "ram" combat_def = "ram_freds_farm" hitpoints = 80 max_hit_crush = 10 -stab_defence = -21 -slash_defence = -21 -crush_defence = -21 -magic_defence = -21 -range_defence = -21 diff --git a/data/area/realm/killerwatt_plane/killerwatt_plane.npcs.toml b/data/area/realm/killerwatt_plane/killerwatt_plane.npcs.toml index 14852b02c7..888654f25f 100644 --- a/data/area/realm/killerwatt_plane/killerwatt_plane.npcs.toml +++ b/data/area/realm/killerwatt_plane/killerwatt_plane.npcs.toml @@ -11,11 +11,6 @@ slayer_xp = 51.0 categories = ["killerwatts"] respawn_delay = 30 examine = "A ball of electrical energy." -stab_defence = 10 -slash_defence = 10 -crush_defence = 10 -magic_defence = 20 -range_defence = 20 [killerwatt_attacking] id = 3201 diff --git a/data/area/realm/spirit_realm/spirit_realm.npcs.toml b/data/area/realm/spirit_realm/spirit_realm.npcs.toml index 305177e386..ef3c696c89 100644 --- a/data/area/realm/spirit_realm/spirit_realm.npcs.toml +++ b/data/area/realm/spirit_realm/spirit_realm.npcs.toml @@ -9,12 +9,7 @@ att = 36 str = 36 def = 30 max_hit_crush = 50 -stab_defence = 58 -slash_defence = 57 -crush_defence = 46 -magic_defence = -10 -range_defence = 56 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [tormented_wraith_spirit_realm] id = 8125 diff --git a/data/area/tirannwn/iorwerth_camp/iorwerth_camp.npcs.toml b/data/area/tirannwn/iorwerth_camp/iorwerth_camp.npcs.toml index f3ea8dfed7..57494355ed 100644 --- a/data/area/tirannwn/iorwerth_camp/iorwerth_camp.npcs.toml +++ b/data/area/tirannwn/iorwerth_camp/iorwerth_camp.npcs.toml @@ -17,11 +17,6 @@ respawn_delay = 30 drop_table = "elf_warrior" examine = "He looks pretty handy with that bow." combat_def = "guard" -stab_defence = 50 -slash_defence = 50 -crush_defence = 50 -magic_defence = 60 -range_defence = 70 [elf_warrior_2] id = 1184 @@ -39,11 +34,6 @@ respawn_delay = 30 drop_table = "elf_warrior" examine = "I don't want to get on the wrong side of him." combat_def = "guard" -stab_defence = 50 -slash_defence = 70 -crush_defence = 70 -magic_defence = 60 -range_defence = 50 [fishing_spot_iorwerth_camp] id = 1189 diff --git a/data/area/tirannwn/isafdar/isafdar.npcs.toml b/data/area/tirannwn/isafdar/isafdar.npcs.toml index c754c5c47a..0e8db0cecc 100644 --- a/data/area/tirannwn/isafdar/isafdar.npcs.toml +++ b/data/area/tirannwn/isafdar/isafdar.npcs.toml @@ -29,11 +29,6 @@ examine = "Aww, how cute." drop_table = "rabbit" combat_def = "rabbit_miscellania" max_hit_crush = 10 -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [rabbit_isafdar_2] id = 1194 diff --git a/data/area/tirannwn/lletya/lletya.npcs.toml b/data/area/tirannwn/lletya/lletya.npcs.toml index e087dc1ba7..8afd73e094 100644 --- a/data/area/tirannwn/lletya/lletya.npcs.toml +++ b/data/area/tirannwn/lletya/lletya.npcs.toml @@ -43,11 +43,6 @@ id = 2360 clone = "elf_warrior_lletya" drop_table = "elf_warrior" combat_def = "guard" -stab_defence = 50 -slash_defence = 70 -crush_defence = 70 -magic_defence = 60 -range_defence = 50 [elf_warrior_lletya_3] id = 2361 @@ -71,11 +66,6 @@ id = 2362 clone = "elf_warrior_lletya_3" drop_table = "elf_warrior" combat_def = "guard" -stab_defence = 50 -slash_defence = 50 -crush_defence = 50 -magic_defence = 60 -range_defence = 70 [goreu] id = 2363 @@ -124,11 +114,6 @@ drop_table = "ram" examine = "White and fluffy." combat_def = "ram_freds_farm" max_hit_crush = 10 -stab_defence = -21 -slash_defence = -21 -crush_defence = -21 -magic_defence = -21 -range_defence = -21 [gwir] id = 8894 diff --git a/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml index f91198686d..36126200cb 100644 --- a/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml +++ b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.npcs.toml @@ -10,11 +10,7 @@ str = 1 def = 1 range = 126 max_hit_range = 140 -stab_defence = 50 -slash_defence = 50 -crush_defence = -50 -range_defence = 62 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [warped_terrorbird_2] id = 6286 @@ -28,11 +24,7 @@ str = 1 def = 1 range = 126 max_hit_range = 140 -stab_defence = -50 -slash_defence = 50 -crush_defence = 50 -range_defence = 62 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [warped_terrorbird_3] id = 6287 @@ -46,11 +38,7 @@ str = 1 def = 1 range = 126 max_hit_range = 140 -stab_defence = 50 -slash_defence = -50 -crush_defence = 50 -magic_defence = 62 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [warped_terrorbird_4] id = 6288 @@ -64,11 +52,7 @@ str = 1 def = 1 range = 126 max_hit_range = 140 -stab_defence = 50 -slash_defence = -50 -crush_defence = 50 -range_defence = 62 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [warped_terrorbird_5] id = 6289 @@ -82,11 +66,7 @@ str = 1 def = 1 range = 126 max_hit_range = 140 -stab_defence = -50 -slash_defence = 50 -crush_defence = 50 -magic_defence = 62 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [warped_terrorbird_6] id = 6290 @@ -98,11 +78,7 @@ str = 1 def = 1 range = 126 max_hit_range = 140 -stab_defence = 50 -slash_defence = 50 -crush_defence = -50 -range_defence = 62 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [warped_terrorbird_7] id = 6291 @@ -116,11 +92,7 @@ str = 1 def = 1 range = 126 max_hit_range = 140 -stab_defence = 50 -slash_defence = -50 -crush_defence = 50 -range_defence = 62 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [warped_terrorbird_8] id = 6292 @@ -134,11 +106,7 @@ str = 1 def = 1 range = 126 max_hit_range = 140 -stab_defence = -50 -slash_defence = 50 -crush_defence = 50 -magic_defence = 62 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [warped_terrorbird_9] id = 6293 @@ -150,11 +118,7 @@ str = 1 def = 171 range = 126 max_hit_range = 140 -stab_defence = -50 -slash_defence = 50 -crush_defence = 50 -magic_defence = 62 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [warped_terrorbird_10] id = 6294 @@ -168,11 +132,7 @@ str = 1 def = 171 range = 126 max_hit_range = 140 -stab_defence = 50 -slash_defence = 50 -crush_defence = -50 -range_defence = 62 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [warped_terrorbird_11] id = 6295 @@ -186,11 +146,7 @@ str = 1 def = 171 range = 126 max_hit_range = 140 -stab_defence = 50 -slash_defence = -50 -crush_defence = 50 -range_defence = 62 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [warped_tortoise] id = 6296 diff --git a/data/area/troll_country/death_plateau/death_plateau.npcs.toml b/data/area/troll_country/death_plateau/death_plateau.npcs.toml index 45921cd1f2..b5bb9c36e6 100644 --- a/data/area/troll_country/death_plateau/death_plateau.npcs.toml +++ b/data/area/troll_country/death_plateau/death_plateau.npcs.toml @@ -28,11 +28,6 @@ respawn_delay = 50 drop_table = "rock_troll" examine = "A nasty looking troll." max_hit_crush = 230 -stab_defence = 25 -slash_defence = 25 -crush_defence = 40 -magic_defence = 200 -range_defence = 200 [pee_hat] id = 1097 @@ -41,6 +36,7 @@ hitpoints = 1200 att = 50 str = 100 def = 50 +attack_bonus = 40 max_hit_crush = 230 [stick] @@ -63,11 +59,6 @@ respawn_delay = 50 drop_table = "rock_troll" examine = "A big, bad troll." max_hit_crush = 270 -stab_defence = 30 -slash_defence = 30 -crush_defence = 50 -magic_defence = 200 -range_defence = 200 [rock_troll] id = 1095 @@ -79,11 +70,6 @@ att = 94 str = 94 def = 94 combat_def = "ice_troll" -stab_defence = 35 -slash_defence = 60 -crush_defence = 35 -magic_defence = 200 -range_defence = 200 [billy] id = 1093 diff --git a/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml b/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml index 8219168b7d..17c7d8a6a6 100644 --- a/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml +++ b/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.npcs.toml @@ -9,12 +9,7 @@ def = 189 mage = 189 max_hit_magic = 230 combat_def = "ice_demon" -stab_defence = 50 -slash_defence = 180 -crush_defence = 180 -magic_defence = 10 -range_defence = 50 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [waterfiend_ghorrock_fortress_dungeon] id = 9054 @@ -26,5 +21,5 @@ str = 1 def = 113 mage = 113 max_hit_magic = 119 -hunt_mode = "aggressive" +hunt_mode = "cowardly" diff --git a/data/area/troll_country/god_wars_dungeon/armadyl/armadyl.npcs.toml b/data/area/troll_country/god_wars_dungeon/armadyl/armadyl.npcs.toml index 0f9a404ae3..5a894904c6 100644 --- a/data/area/troll_country/god_wars_dungeon/armadyl/armadyl.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/armadyl/armadyl.npcs.toml @@ -14,11 +14,6 @@ slayer_xp = 357.0 categories = ["aviansies", "boss"] immune_poison = true examine = "Graceful avatar of Armadyl." -stab_defence = 180 -slash_defence = 180 -crush_defence = 180 -magic_defence = 200 -range_defence = 200 [flight_kilisa] id = 6227 @@ -67,4 +62,3 @@ slayer_xp = 132.5 categories = ["aviansies"] drop_table = "armadyl_bodyguard" examine = "Graceful, bird-like creature." -attack_bonus = 60 diff --git a/data/area/troll_country/god_wars_dungeon/bandos/bandos.npcs.toml b/data/area/troll_country/god_wars_dungeon/bandos/bandos.npcs.toml index 6985d71472..6430a68950 100644 --- a/data/area/troll_country/god_wars_dungeon/bandos/bandos.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/bandos/bandos.npcs.toml @@ -16,11 +16,6 @@ slayer_xp = 338.0 categories = ["boss"] immune_poison = true examine = "A huge war chief." -stab_defence = 90 -slash_defence = 90 -crush_defence = 90 -magic_defence = 65 -range_defence = 90 [sergeant_strongstack] id = 6261 @@ -69,4 +64,3 @@ slayer_xp = 128.0 categories = ["goblins"] drop_table = "bandos_bodyguard" examine = "A battle-honed goblin." -attack_bonus = 20 diff --git a/data/area/troll_country/god_wars_dungeon/bandos/ork/ork.npcs.toml b/data/area/troll_country/god_wars_dungeon/bandos/ork/ork.npcs.toml index f14061654d..787191072f 100644 --- a/data/area/troll_country/god_wars_dungeon/bandos/ork/ork.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/bandos/ork/ork.npcs.toml @@ -12,11 +12,6 @@ categories = ["ork"] drop_table = "ork" god = "bandos" examine = "Ugly, fierce and with a bad attitude." -stab_defence = 12 -slash_defence = 14 -crush_defence = 13 -magic_defence = 5 -range_defence = 13 [ork_axe_god_wars] id = 6272 diff --git a/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml b/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml index 7b562b97ff..39334dea6d 100644 --- a/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/god_wars.npcs.toml @@ -18,12 +18,7 @@ att = 388 str = 388 def = 1 max_hit_crush = 402 -stab_defence = 100 -slash_defence = 100 -crush_defence = 50 -magic_defence = 5 -range_defence = 400 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [ancient_ranger] id = 13457 @@ -35,7 +30,7 @@ str = 1 def = 1 range = 636 max_hit_range = 650 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [blood_reaver] id = 13458 @@ -47,12 +42,7 @@ def = 199 mage = 199 max_hit_magic = 146 hitpoints = 1470 -stab_defence = 20 -slash_defence = 30 -crush_defence = 20 -magic_defence = 400 -range_defence = 5 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [ancient_mage_god_wars_dungeon] id = 13459 @@ -65,7 +55,7 @@ def = 183 mage = 183 max_hit_magic = 207 combat_def = "ancient_mage" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [nanuq] id = 8076 diff --git a/data/area/troll_country/god_wars_dungeon/saradomin/knight_of_saradomin/knight_of_saradomin.npcs.toml b/data/area/troll_country/god_wars_dungeon/saradomin/knight_of_saradomin/knight_of_saradomin.npcs.toml index 764703d3cc..8bdaf4d3f2 100644 --- a/data/area/troll_country/god_wars_dungeon/saradomin/knight_of_saradomin/knight_of_saradomin.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/saradomin/knight_of_saradomin/knight_of_saradomin.npcs.toml @@ -12,10 +12,6 @@ respawn_delay = 50 categories = ["human"] god = "saradomin" examine = "A valiant knight." -stab_defence = 10 -slash_defence = 10 -crush_defence = 7 -range_defence = 13 [knight_of_saradomin_female] id = 6259 @@ -32,7 +28,3 @@ categories = ["human"] god = "saradomin" examine = "A valiant knight." drop_table = "knight_of_saradomin" -stab_defence = 12 -slash_defence = 14 -crush_defence = 13 -range_defence = 13 diff --git a/data/area/troll_country/god_wars_dungeon/saradomin/saradomin.npcs.toml b/data/area/troll_country/god_wars_dungeon/saradomin/saradomin.npcs.toml index 3f056ffda4..9797df9d24 100644 --- a/data/area/troll_country/god_wars_dungeon/saradomin/saradomin.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/saradomin/saradomin.npcs.toml @@ -15,11 +15,6 @@ slayer_xp = 350.0 categories = ["boss"] immune_poison = true examine = "Commander of Saradomin's forces." -stab_defence = 100 -slash_defence = 100 -crush_defence = 100 -magic_defence = 100 -range_defence = 100 [starlight] id = 6248 @@ -34,11 +29,6 @@ xp_bonus = 1.05 hunt_mode = "aggressive" drop_table = "saradomin_bodyguard" examine = "Bane of darkness." -stab_defence = 12 -slash_defence = 14 -crush_defence = 13 -magic_defence = 5 -range_defence = 13 [growler] id = 6250 @@ -52,11 +42,6 @@ combat_def = "growler" hunt_mode = "aggressive" drop_table = "saradomin_bodyguard" examine = "Defender of the faithful." -stab_defence = 12 -slash_defence = 14 -crush_defence = 14 -magic_defence = 18 -range_defence = 5 [bree] id = 6252 @@ -71,8 +56,3 @@ combat_def = "bree" hunt_mode = "aggressive" drop_table = "saradomin_bodyguard" examine = "Champion of truth." -stab_defence = 12 -slash_defence = 14 -crush_defence = 14 -magic_defence = 18 -range_defence = 5 diff --git a/data/area/troll_country/god_wars_dungeon/saradomin/saradomin_preist/saradomin_priest.npcs.toml b/data/area/troll_country/god_wars_dungeon/saradomin/saradomin_preist/saradomin_priest.npcs.toml index 28e63d267e..7102a78c60 100644 --- a/data/area/troll_country/god_wars_dungeon/saradomin/saradomin_preist/saradomin_priest.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/saradomin/saradomin_preist/saradomin_priest.npcs.toml @@ -13,8 +13,3 @@ categories = ["human"] drops = "saradomin_priest" god = "saradomin" examine = "A holy man wearing ancient clothing." -stab_defence = 12 -slash_defence = 14 -crush_defence = 13 -magic_defence = 5 -range_defence = 13 diff --git a/data/area/troll_country/god_wars_dungeon/spiritual_mage/spiritual_mage.npcs.toml b/data/area/troll_country/god_wars_dungeon/spiritual_mage/spiritual_mage.npcs.toml index 9b5be7ab81..e8e69b0d97 100644 --- a/data/area/troll_country/god_wars_dungeon/spiritual_mage/spiritual_mage.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/spiritual_mage/spiritual_mage.npcs.toml @@ -28,11 +28,6 @@ drop_table = "spiritual_mage" categories = ["spiritual_creatures"] god = "saradomin" examine = "Saradomin's holy mage." -stab_defence = 8 -slash_defence = 7 -crush_defence = 3 -magic_defence = 16 -range_defence = 2 [spiritual_mage_bandos] id = 6278 @@ -48,11 +43,6 @@ drop_table = "spiritual_mage" categories = ["spiritual_creatures"] god = "bandos" examine = "One of Bandos's chosen." -stab_defence = 12 -slash_defence = 14 -crush_defence = 13 -magic_defence = 35 -range_defence = 13 [spiritual_mage_armadyl] id = 6231 @@ -67,8 +57,3 @@ slayer_level = 83 drop_table = "spiritual_mage" categories = ["spiritual_creatures"] examine = "A mage who serves Armadyl above all else - even death." -stab_defence = 9 -slash_defence = 12 -crush_defence = 5 -magic_defence = 45 -range_defence = 28 diff --git a/data/area/troll_country/god_wars_dungeon/spiritual_ranger/spiritual_ranger.npcs.toml b/data/area/troll_country/god_wars_dungeon/spiritual_ranger/spiritual_ranger.npcs.toml index 7b309c2ae1..06ec3f3321 100644 --- a/data/area/troll_country/god_wars_dungeon/spiritual_ranger/spiritual_ranger.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/spiritual_ranger/spiritual_ranger.npcs.toml @@ -31,11 +31,6 @@ drop_table = "spiritual_ranger" categories = ["spiritual_creatures"] god = "saradomin" examine = "A ranger spirit dedicated to Saradomin." -stab_defence = 3 -slash_defence = 5 -crush_defence = 13 -magic_defence = 16 -range_defence = 23 [spiritual_ranger_bandos] id = 6276 @@ -51,11 +46,6 @@ categories = ["spiritual_creatures"] drop_table = "spiritual_ranger" god = "bandos" examine = "The spirit of a ranger, serving Bandos beyond death." -stab_defence = 12 -slash_defence = 14 -crush_defence = 13 -magic_defence = 5 -range_defence = 13 [spiritual_ranger_armadyl] id = 6230 @@ -70,9 +60,4 @@ slayer_level = 63 categories = ["spiritual_creatures"] drop_table = "spiritual_ranger" examine = "Armadyl's favourite servant." -stab_defence = 17 -slash_defence = 16 -crush_defence = 8 -magic_defence = 35 -range_defence = 41 diff --git a/data/area/troll_country/god_wars_dungeon/spiritual_warrior/spiritual_warrior.npcs.toml b/data/area/troll_country/god_wars_dungeon/spiritual_warrior/spiritual_warrior.npcs.toml index 11b56bac49..c689ce03f3 100644 --- a/data/area/troll_country/god_wars_dungeon/spiritual_warrior/spiritual_warrior.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/spiritual_warrior/spiritual_warrior.npcs.toml @@ -30,11 +30,6 @@ categories = ["spiritual_creatures"] drop_table = "spiritual_warrior" god = "saradomin" examine = "Saradomin's chosen warrior." -stab_defence = 12 -slash_defence = 14 -crush_defence = 13 -magic_defence = 5 -range_defence = 13 [spiritual_warrior_bandos] id = 6277 @@ -52,11 +47,6 @@ drop_table = "spiritual_warrior" categories = ["spiritual_creatures"] god = "bandos" examine = "A true servant of Bandos." -stab_defence = 12 -slash_defence = 14 -crush_defence = 13 -magic_defence = 5 -range_defence = 13 [spiritual_warrior_armadyl] id = 6229 @@ -71,8 +61,3 @@ slayer_level = 68 drop_table = "spiritual_warrior" categories = ["spiritual_creatures"] examine = "A servant of Armadyl." -stab_defence = 23 -slash_defence = 25 -crush_defence = 13 -magic_defence = 35 -range_defence = 35 diff --git a/data/area/troll_country/god_wars_dungeon/zamorak/zamorak.npcs.toml b/data/area/troll_country/god_wars_dungeon/zamorak/zamorak.npcs.toml index 44d4dd60e3..98079c5200 100644 --- a/data/area/troll_country/god_wars_dungeon/zamorak/zamorak.npcs.toml +++ b/data/area/troll_country/god_wars_dungeon/zamorak/zamorak.npcs.toml @@ -13,11 +13,6 @@ slayer_xp = 350.5 categories = ["demons", "boss"] immune_poison = true examine = "A servant of the god Zamorak." -stab_defence = 80 -slash_defence = 80 -crush_defence = 80 -magic_defence = 130 -range_defence = 80 [tstanon_karlak] id = 6204 @@ -33,7 +28,6 @@ slayer_xp = 142.0 categories = ["demons"] drop_table = "zamorak_bodyguard" examine = "Destroyer of 1000 planes!" -magic_defence = -5 [balfrug_kreeyath] id = 6208 @@ -48,7 +42,6 @@ slayer_xp = 161.0 categories = ["demons"] drop_table = "zamorak_bodyguard" examine = "Despoiler of Ullek." -magic_defence = 10 [zakln_gritch] id = 6206 @@ -64,5 +57,3 @@ slayer_xp = 150.0 categories = ["demons"] drop_table = "zamorak_bodyguard" examine = "Scourge of the Light." -attack_bonus = 20 -magic_defence = -5 diff --git a/data/area/troll_country/troll_country.npcs.toml b/data/area/troll_country/troll_country.npcs.toml index 2328ce6b8e..25e66467cc 100644 --- a/data/area/troll_country/troll_country.npcs.toml +++ b/data/area/troll_country/troll_country.npcs.toml @@ -22,9 +22,6 @@ respawn_delay = 50 drop_table = "ice_troll" examine = "Brrrrr...he must be cold!" combat_def = "ice_troll" -stab_defence = 30 -slash_defence = 60 -crush_defence = 30 [ice_troll_troll_country_3] id = 1937 @@ -43,9 +40,6 @@ respawn_delay = 50 drop_table = "ice_troll" examine = "Brrrrr...he must be cold!" combat_def = "ice_troll" -stab_defence = 30 -slash_defence = 60 -crush_defence = 30 [ice_troll_troll_country_4] id = 1938 @@ -64,9 +58,6 @@ respawn_delay = 50 drop_table = "ice_troll" examine = "Brrrrr...he must be cold!" combat_def = "ice_troll" -stab_defence = 30 -slash_defence = 60 -crush_defence = 30 [ice_troll_troll_country_5] id = 1939 @@ -85,9 +76,6 @@ respawn_delay = 50 drop_table = "ice_troll" examine = "Brrrrr...he must be cold!" combat_def = "ice_troll" -stab_defence = 30 -slash_defence = 60 -crush_defence = 30 [ice_troll_troll_country_6] id = 1940 diff --git a/data/area/troll_country/troll_tunnels/troll_tunnels.npcs.toml b/data/area/troll_country/troll_tunnels/troll_tunnels.npcs.toml index 3579cdf414..e794dc0af3 100644 --- a/data/area/troll_country/troll_tunnels/troll_tunnels.npcs.toml +++ b/data/area/troll_country/troll_tunnels/troll_tunnels.npcs.toml @@ -15,9 +15,6 @@ respawn_delay = 50 examine = "Brrrrr...he must be cold!" drop_table = "ice_troll" combat_def = "ice_troll" -stab_defence = 30 -slash_defence = 60 -crush_defence = 30 [ice_troll_troll_tunnels_2] id = 1561 @@ -36,9 +33,6 @@ respawn_delay = 50 examine = "Brrrrr...he must be cold!" drop_table = "ice_troll" combat_def = "ice_troll" -stab_defence = 30 -slash_defence = 60 -crush_defence = 30 [ice_troll_troll_tunnels_3] id = 1562 @@ -57,9 +51,6 @@ respawn_delay = 50 examine = "Brrrrr...he must be cold!" drop_table = "ice_troll" combat_def = "ice_troll" -stab_defence = 30 -slash_defence = 60 -crush_defence = 30 [ice_troll_troll_tunnels_4] id = 1563 @@ -78,9 +69,6 @@ respawn_delay = 50 examine = "Brrrrr...he must be cold!" drop_table = "ice_troll" combat_def = "ice_troll" -stab_defence = 30 -slash_defence = 60 -crush_defence = 30 [ice_troll_troll_tunnels_5] id = 1564 diff --git a/data/area/troll_country/trollheim/trollheim.npcs.toml b/data/area/troll_country/trollheim/trollheim.npcs.toml index 7d552f46e6..422ee387b0 100644 --- a/data/area/troll_country/trollheim/trollheim.npcs.toml +++ b/data/area/troll_country/trollheim/trollheim.npcs.toml @@ -12,8 +12,6 @@ slayer_xp = 95.0 categories = ["trolls"] drop_table = "thrower_troll_death_plateau" examine = "Small for a troll, but it's mean, ugly and throws rocks." -magic_defence = 200 -range_defence = 200 [thrower_troll_death_plateau_large] id = 1102 @@ -45,8 +43,6 @@ slayer_xp = 95.0 categories = ["trolls"] drop_table = "thrower_troll" examine = "Small for a troll, but it's mean, ugly and throws rocks." -magic_defence = 200 -range_defence = 200 [thrower_troll_trollheim_large] id = 1131 @@ -105,9 +101,6 @@ categories = ["trolls"] respawn_delay = 50 drop_table = "mountain_troll" examine = "He's watching the arena." -crush_defence = 10 -magic_defence = 200 -range_defence = 200 [troll_spectator_2] id = 1119 diff --git a/data/area/wilderness/abyss/abyss.npcs.toml b/data/area/wilderness/abyss/abyss.npcs.toml index bfe3591d7e..f089797638 100644 --- a/data/area/wilderness/abyss/abyss.npcs.toml +++ b/data/area/wilderness/abyss/abyss.npcs.toml @@ -10,11 +10,6 @@ hunt_mode = "aggressive" height = 15 respawn_delay = 5 examine = "A blood-drinking denizen of the Abyss." -stab_defence = 50 -slash_defence = 50 -crush_defence = 100 -magic_defence = 50 -range_defence = 10 [abyssal_guardian] id = 2264 @@ -29,11 +24,6 @@ hunt_mode = "aggressive" height = 30 respawn_delay = 5 examine = "It seems to have eyes in the back of its head..." -stab_defence = 70 -slash_defence = 70 -crush_defence = 70 -magic_defence = 150 -range_defence = 70 [abyssal_walker] id = 2265 @@ -48,11 +38,6 @@ height = 50 respawn_delay = 5 xp_bonus = -7.5 examine = "Apparently walks the Abyss." -stab_defence = 75 -slash_defence = 75 -crush_defence = 10 -magic_defence = 75 -range_defence = 75 [dark_mage] id = 2262 diff --git a/data/area/wilderness/abyss/abyssal_demon/abyssal_demon.npcs.toml b/data/area/wilderness/abyss/abyssal_demon/abyssal_demon.npcs.toml index bf2e0d9466..8ee5cb97e3 100644 --- a/data/area/wilderness/abyss/abyssal_demon/abyssal_demon.npcs.toml +++ b/data/area/wilderness/abyss/abyssal_demon/abyssal_demon.npcs.toml @@ -11,10 +11,6 @@ slayer_level = 85 drop_table = "abyssal_demon" categories = ["abyssal_demon", "demon"] examine = "A denizen of the Abyss!" -stab_defence = 20 -slash_defence = 20 -crush_defence = 20 -range_defence = 20 [abyssal_demon_1] id = 4230 diff --git a/data/area/wilderness/bandit_camp/wilderness_bandit_camp.npcs.toml b/data/area/wilderness/bandit_camp/wilderness_bandit_camp.npcs.toml index 64bb71f708..c1eb472115 100644 --- a/data/area/wilderness/bandit_camp/wilderness_bandit_camp.npcs.toml +++ b/data/area/wilderness/bandit_camp/wilderness_bandit_camp.npcs.toml @@ -25,9 +25,6 @@ respawn_delay = 50 examine = "A warrior touched by chaos." drop_table = "dark_warrior" combat_def = "guard" -stab_defence = 96 -slash_defence = 79 -crush_defence = 59 [guard_bandit] id = 196 @@ -46,11 +43,6 @@ respawn_delay = 100 examine = "A wilderness outlaw." drop_table = "guard_bandit" combat_def = "guard" -stab_defence = 4 -slash_defence = 8 -crush_defence = 5 -magic_defence = 1 -range_defence = 4 [black_heather] id = 202 @@ -67,9 +59,6 @@ respawn_delay = 50 drop_table = "wilderness_bandit" examine = "Has a fearsome scowl. Moreso, after being told to smile once in a while." max_hit_slash = 40 -stab_defence = 9 -slash_defence = 8 -crush_defence = 10 [donny_the_lad] id = 203 @@ -86,9 +75,6 @@ respawn_delay = 50 drop_table = "wilderness_bandit" examine = "Has a fearsome posture, and a fearsome pair of weapons!" max_hit_slash = 40 -stab_defence = 9 -slash_defence = 8 -crush_defence = 10 [speedy_keith] id = 204 @@ -105,9 +91,6 @@ respawn_delay = 50 drop_table = "wilderness_bandit" examine = "Refuses to accept his hairstyle has gone out of fashion." max_hit_slash = 40 -stab_defence = 9 -slash_defence = 8 -crush_defence = 10 [mysterious_ghost_wilderness_bandit_camp] id = 2383 diff --git a/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml b/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml index 0121af7b6d..652fd3f1a4 100644 --- a/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml +++ b/data/area/wilderness/chaos_temple_dungeon/chaos_temple_dungeon.npcs.toml @@ -13,10 +13,7 @@ str = 1 def = 115 range = 72 max_hit_range = 86 -stab_defence = 20 -slash_defence = 20 -range_defence = 10 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [armoured_zombie_chaos_temple_dungeon_2] id = 8150 @@ -30,10 +27,7 @@ str = 1 def = 115 range = 72 max_hit_range = 86 -stab_defence = 20 -slash_defence = 20 -range_defence = 10 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [armoured_zombie_chaos_temple_dungeon_3] id = 8151 @@ -47,10 +41,7 @@ str = 1 def = 115 range = 72 max_hit_range = 86 -stab_defence = 20 -slash_defence = 20 -range_defence = 10 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [armoured_zombie_chaos_temple_dungeon_4] id = 8152 @@ -64,10 +55,7 @@ str = 1 def = 115 range = 72 max_hit_range = 86 -stab_defence = 20 -slash_defence = 20 -range_defence = 10 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [armoured_zombie_chaos_temple_dungeon_5] id = 8153 @@ -79,10 +67,7 @@ str = 1 def = 115 range = 72 max_hit_range = 86 -stab_defence = 20 -slash_defence = 20 -range_defence = 10 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [armoured_zombie_chaos_temple_dungeon_6] id = 8154 diff --git a/data/area/wilderness/chaos_tunnels/chaos_tunnels.npcs.toml b/data/area/wilderness/chaos_tunnels/chaos_tunnels.npcs.toml index 9346fc91a3..c61d0ce7e7 100644 --- a/data/area/wilderness/chaos_tunnels/chaos_tunnels.npcs.toml +++ b/data/area/wilderness/chaos_tunnels/chaos_tunnels.npcs.toml @@ -35,8 +35,6 @@ categories = ["turoth"] immune_cannon = true drop_table = "turoth" examine = "He's one big leg short!" -slash_defence = 20 -crush_defence = 20 [bloodworm] id = 2031 @@ -78,11 +76,6 @@ categories = ["spiders"] respawn_delay = 50 examine = "Incey wincey." drop_table = "empty" -stab_defence = 20 -slash_defence = 20 -crush_defence = 10 -magic_defence = 17 -range_defence = 20 [giant_crypt_spider] id = 2035 @@ -98,11 +91,6 @@ categories = ["spiders"] respawn_delay = 50 examine = "Not very incey wincey." drop_table = "empty" -stab_defence = 20 -slash_defence = 20 -crush_defence = 10 -magic_defence = 17 -range_defence = 20 [giant_crypt_rat_chaos_tunnels_2] id = 4920 @@ -125,12 +113,7 @@ respawn_delay = 30 drop_table = "possessed_pickaxe" categories = ["phantoms"] examine = "How does it move of its own accord?" -stab_defence = 15 -slash_defence = 10 -crush_defence = 5 -magic_defence = 5 -range_defence = 10 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [animated_spade] id = 5414 @@ -182,9 +165,6 @@ categories = ["zombies"] drop_table = "mummy" respawn_delay = 30 examine = "A tightly-wrapped monster." -stab_defence = 90 -slash_defence = 90 -crush_defence = 90 [mummy_2] id = 1962 @@ -246,9 +226,6 @@ respawn_delay = 60 categories = ["skeletons", "undead"] slayer_xp = 80.0 examine = "Achingly thin." -stab_defence = 50 -slash_defence = 40 -range_defence = 40 [bork_surok] id = 7133 diff --git a/data/area/wilderness/wilderness.npcs.toml b/data/area/wilderness/wilderness.npcs.toml index d718b5291d..da7d6957a7 100644 --- a/data/area/wilderness/wilderness.npcs.toml +++ b/data/area/wilderness/wilderness.npcs.toml @@ -15,7 +15,6 @@ respawn_delay = 50 examine = "A practicer of dark arts." drop_table = "dark_wizard" combat_def = "dark_wizard_water" -magic_defence = 3 [dark_wizard_wilderness_2] id = 174 @@ -31,7 +30,6 @@ respawn_delay = 50 examine = "He works evil magic." drop_table = "dark_wizard" combat_def = "dark_wizard_water" -magic_defence = 3 [william] id = 1778 @@ -106,7 +104,7 @@ combat_def = "giant_rat" drop_table = "giant_rat" categories = ["giant_rats", "rats"] examine = "Overgrown vermin." -hunt_mode = "aggressive" +hunt_mode = "cowardly" [black_salamander] id = 5116 @@ -172,8 +170,6 @@ str = 23 def = 23 attack_bonus = 8 max_hit_slash = 40 -stab_defence = 3 -slash_defence = 2 [pirate_wilderness_7] id = 6356 @@ -218,7 +214,7 @@ att = 6 str = 5 def = 2 max_hit_stab = 10 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [battle_mage_zamorak] id = 912 @@ -323,7 +319,4 @@ respawn_delay = 50 examine = "Rogueish." drop_table = "rogue" max_hit_stab = 20 -combat_def = "rogue" -stab_defence = 6 -slash_defence = 9 -crush_defence = 11 \ No newline at end of file +combat_def = "rogue" \ No newline at end of file diff --git a/data/entity/npc/animal/bat/bat.npcs.toml b/data/entity/npc/animal/bat/bat.npcs.toml index 3ef84d3f0a..3e96994034 100644 --- a/data/entity/npc/animal/bat/bat.npcs.toml +++ b/data/entity/npc/animal/bat/bat.npcs.toml @@ -10,10 +10,6 @@ respawn_delay = 35 drop_table = "bat" categories = ["bats"] examine = "An annoying flappy thing." -stab_defence = 2 -slash_defence = 2 -crush_defence = 5 -magic_defence = 2 [giant_bat] id = 78 @@ -28,11 +24,6 @@ respawn_delay = 35 drop_table = "bat" categories = ["bats"] examine = "An annoying flappy thing." -stab_defence = 10 -slash_defence = 10 -crush_defence = 12 -magic_defence = 10 -range_defence = 8 [giant_bat_brine_cavern] clone = "giant_bat" diff --git a/data/entity/npc/animal/bear/bear.npcs.toml b/data/entity/npc/animal/bear/bear.npcs.toml index 271af94357..65c1dffd0f 100644 --- a/data/entity/npc/animal/bear/bear.npcs.toml +++ b/data/entity/npc/animal/bear/bear.npcs.toml @@ -80,10 +80,10 @@ respawn_delay = 50 drop_table = "bear" categories = ["bears"] examine = " Cute. But deadly." -hunt_mode = "aggressive" +hunt_mode = "cowardly" [bear_cub_black] id = 1327 clone = "bear_cub" combat_def = "bear" -hunt_mode = "aggressive" +hunt_mode = "cowardly" diff --git a/data/entity/npc/animal/birds/birds.npcs.toml b/data/entity/npc/animal/birds/birds.npcs.toml index f3b2aac874..32fb34b0ce 100644 --- a/data/entity/npc/animal/birds/birds.npcs.toml +++ b/data/entity/npc/animal/birds/birds.npcs.toml @@ -12,11 +12,6 @@ collision = "sea" combat_def = "duck_swim" examine = "Quackers." drop_table = "duck" -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [crow] id = 1754 @@ -67,11 +62,6 @@ height = 10 drop_table = "bones" combat_def = "duck_walk" examine = "It quacks like a duck." -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [ducklings] id = 6112 diff --git a/data/entity/npc/animal/chicken/chicken.npcs.toml b/data/entity/npc/animal/chicken/chicken.npcs.toml index dd39401eba..deb5d9be20 100644 --- a/data/entity/npc/animal/chicken/chicken.npcs.toml +++ b/data/entity/npc/animal/chicken/chicken.npcs.toml @@ -10,11 +10,6 @@ respawn_delay = 25 categories = ["chickens", "birds"] drop_table = "chicken" examine = "Yep. Definitely a chicken." -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [chicken_brown] id = 1017 diff --git a/data/entity/npc/animal/cow/cow.npcs.toml b/data/entity/npc/animal/cow/cow.npcs.toml index c9e64af4e8..bff657588b 100644 --- a/data/entity/npc/animal/cow/cow.npcs.toml +++ b/data/entity/npc/animal/cow/cow.npcs.toml @@ -10,11 +10,6 @@ height = 30 drop_table = "cow" categories = ["cows"] examine = "Converts grass to beef." -stab_defence = -21 -slash_defence = -21 -crush_defence = -21 -magic_defence = -21 -range_defence = -21 [cow_brown] clone = "cow_default" @@ -35,11 +30,6 @@ drop_table = "cow" categories = ["cows"] height = 15 examine = "Young, but still beefy." -stab_defence = -26 -slash_defence = -26 -crush_defence = -26 -magic_defence = -26 -range_defence = -26 [cow_zanaris] clone = "cow_default" @@ -49,44 +39,19 @@ id = 3309 [cow_2] clone = "cow_default" id = 12362 -stab_defence = -58 -slash_defence = -58 -crush_defence = -58 -magic_defence = -58 -range_defence = -58 [cow_brown_2] clone = "cow_default" id = 12363 -stab_defence = -58 -slash_defence = -58 -crush_defence = -58 -magic_defence = -58 -range_defence = -58 [cow_calf_2] clone = "cow_calf" id = 12364 -stab_defence = -43 -slash_defence = -43 -crush_defence = -43 -magic_defence = -43 -range_defence = -43 [cow_light_spots_2] clone = "cow_default" id = 12365 -stab_defence = -58 -slash_defence = -58 -crush_defence = -58 -magic_defence = -58 -range_defence = -58 [cow_calf_3] clone = "cow_calf" -id = 12366 -stab_defence = -43 -slash_defence = -43 -crush_defence = -43 -magic_defence = -43 -range_defence = -43 \ No newline at end of file +id = 12366 \ No newline at end of file diff --git a/data/entity/npc/animal/crab/crab.npcs.toml b/data/entity/npc/animal/crab/crab.npcs.toml index ad3038885d..1715e6cb70 100644 --- a/data/entity/npc/animal/crab/crab.npcs.toml +++ b/data/entity/npc/animal/crab/crab.npcs.toml @@ -51,17 +51,11 @@ respawn_delay = 50 hunt_mode = "aggressive" categories = ["crabs"] examine = "No one likes crabs... especially really big ones!" -stab_defence = 225 -slash_defence = 200 -crush_defence = 175 -magic_defence = -10 -range_defence = 250 [giant_rock_crab_light] clone = "giant_rock_crab" id = 2885 drop_table = "giant_rock_crab" -magic_defence = 10 [boulder] clone = "giant_rock_crab" diff --git a/data/entity/npc/animal/rat/rat.npcs.toml b/data/entity/npc/animal/rat/rat.npcs.toml index 958b0d3d1e..fad2c3bce1 100644 --- a/data/entity/npc/animal/rat/rat.npcs.toml +++ b/data/entity/npc/animal/rat/rat.npcs.toml @@ -9,11 +9,6 @@ categories = ["rats"] drop_table = "rat" height = 5 examine = "A popular dwarven delicacy." -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [stronghold_rat] clone = "rat" @@ -38,19 +33,19 @@ respawn_delay = 30 categories = ["rats"] drop_table = "stronghold_rat" examine = "Overgrown vermin." -hunt_mode = "aggressive" +hunt_mode = "cowardly" [stronghold_giant_rat_2] id = 4945 categories = ["rats"] clone = "stronghold_giant_rat" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [stronghold_giant_rat_3] id = 4395 categories = ["rats"] clone = "stronghold_giant_rat" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [giant_rat] id = 86 @@ -64,7 +59,7 @@ respawn_delay = 30 drop_table = "giant_rat" categories = ["giant_rats", "rats"] examine = "Overgrown vermin." -hunt_mode = "aggressive" +hunt_mode = "cowardly" [giant_rat_dark] id = 8828 @@ -77,23 +72,18 @@ combat_def = "giant_rat" drop_table = "giant_rat" categories = ["giant_rats", "rats"] examine = "Overgrown vermin." -stab_defence = -40 -slash_defence = -40 -crush_defence = -40 -magic_defence = -40 -range_defence = -40 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [giant_rat_brimhaven] id = 4926 categories = ["rats"] clone = "giant_rat_dark" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [giant_rat_dark_injured] clone = "giant_rat_dark" id = 8829 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [rat_ratcatchers] id = 2974 diff --git a/data/entity/npc/boss/giant_mole/giant_mole.npcs.toml b/data/entity/npc/boss/giant_mole/giant_mole.npcs.toml index 9cf668bd83..dc007d5e43 100644 --- a/data/entity/npc/boss/giant_mole/giant_mole.npcs.toml +++ b/data/entity/npc/boss/giant_mole/giant_mole.npcs.toml @@ -13,11 +13,6 @@ categories = ["mole"] respawn_delay = 16 examine = "Holy Mole-y!" max_hit_crush = 210 -stab_defence = 60 -slash_defence = 80 -crush_defence = 100 -magic_defence = 80 -range_defence = 60 [baby_mole] id = 3341 diff --git a/data/entity/npc/boss/king_black_dragon/king_black_dragon.npcs.toml b/data/entity/npc/boss/king_black_dragon/king_black_dragon.npcs.toml index 1b05ae6e44..5aebddfa3c 100644 --- a/data/entity/npc/boss/king_black_dragon/king_black_dragon.npcs.toml +++ b/data/entity/npc/boss/king_black_dragon/king_black_dragon.npcs.toml @@ -13,8 +13,3 @@ categories = ["dragons", "boss"] aka = ["kbd"] respawn_delay = 16 examine = "One of the biggest, meanest dragons around." -stab_defence = 70 -slash_defence = 90 -crush_defence = 90 -magic_defence = 80 -range_defence = 70 diff --git a/data/entity/npc/humanoid/dwarf/dwarf.npcs.toml b/data/entity/npc/humanoid/dwarf/dwarf.npcs.toml index ddf1d4fb1f..f088d4f308 100644 --- a/data/entity/npc/humanoid/dwarf/dwarf.npcs.toml +++ b/data/entity/npc/humanoid/dwarf/dwarf.npcs.toml @@ -34,7 +34,6 @@ slayer_xp = 16.0 drop_table = "dwarf" categories = ["dwarves"] examine = "Loves mining." -magic_defence = 5 [dwarf_hammer] id = 120 @@ -49,7 +48,6 @@ slayer_xp = 26.0 drop_table = "dwarf" categories = ["dwarves"] examine = "Loves mining, mountains and mining mountains." -magic_defence = 5 [dwarf_mining_guild] id = 3219 @@ -64,12 +62,10 @@ slayer_xp = 16.0 drop_table = "dwarf" categories = ["dwarves"] examine = "Loves mining." -magic_defence = 5 [dwarf_mining_guild_hammer] id = 3220 clone = "dwarf_mining_guild" -magic_defence = 10 [dwarf_mining_guild_earrings] id = 3221 @@ -80,40 +76,30 @@ examine = "Loves mining." id = 3268 clone = "dwarf_mining_guild" examine = "A dwarven worker." -range_defence = 10 [dwarf_dwarven_mines_wrench] id = 3269 clone = "dwarf_mining_guild" -range_defence = 10 [dwarf_dwarven_mines_wrench_apron_green] id = 3270 clone = "dwarf_mining_guild" -slash_defence = 10 -crush_defence = 10 -magic_defence = 10 -range_defence = 20 [dwarf_dwarven_mines_pickaxe] id = 3271 clone = "dwarf_mining_guild" -range_defence = 10 [dwarf_dwarven_mines_pickaxe_green] id = 3272 clone = "dwarf" -range_defence = 10 [dwarf_dwarven_mines_wrench_green] id = 3273 clone = "dwarf_mining_guild" -range_defence = 10 [dwarf_dwarven_mines_red] id = 3274 clone = "dwarf_mining_guild" -range_defence = 10 [dwarf_dwarven_mines_old] id = 3275 @@ -128,8 +114,6 @@ slayer_xp = 10.0 drop_table = "dwarf" categories = ["dwarves"] examine = "A dwarven worker." -magic_defence = 5 -range_defence = 10 [chaos_dwarf] id = 119 @@ -145,8 +129,3 @@ slayer_xp = 61.0 drop_table = "chaos_dwarf" categories = ["chaos_dwarf", "dwarves"] examine = "A dwarf gone bad." -stab_defence = 40 -slash_defence = 34 -crush_defence = 25 -magic_defence = 10 -range_defence = 35 diff --git a/data/entity/npc/humanoid/thug/thug.npcs.toml b/data/entity/npc/humanoid/thug/thug.npcs.toml index 077553226f..f8840b8e26 100644 --- a/data/entity/npc/humanoid/thug/thug.npcs.toml +++ b/data/entity/npc/humanoid/thug/thug.npcs.toml @@ -10,9 +10,6 @@ respawn_delay = 50 drop_table = "thug" categories = ["thug"] examine = "Low on brains, high on aggression." -stab_defence = 2 -slash_defence = 3 -crush_defence = 3 [thug_1] id = 7107 diff --git a/data/entity/npc/monster/cave/cave_bug/cave_bug.npcs.toml b/data/entity/npc/monster/cave/cave_bug/cave_bug.npcs.toml index 43ba8ea38c..50b0b5f8be 100644 --- a/data/entity/npc/monster/cave/cave_bug/cave_bug.npcs.toml +++ b/data/entity/npc/monster/cave/cave_bug/cave_bug.npcs.toml @@ -12,11 +12,6 @@ respawn_delay = 35 hunt_mode = "cowardly" categories = ["cave_bugs"] examine = "A nasty crawling critter." -stab_defence = 10 -slash_defence = 10 -crush_defence = 5 -magic_defence = 5 -range_defence = 10 [cave_bug_green] id = 5750 @@ -30,9 +25,4 @@ slayer_xp = 93.0 slayer_level = 7 respawn_delay = 15 categories = ["cave_bugs"] -examine = "A big, smelly cave dweller." -stab_defence = 72 -slash_defence = 59 -crush_defence = 35 -magic_defence = 25 -range_defence = 95 \ No newline at end of file +examine = "A big, smelly cave dweller." \ No newline at end of file diff --git a/data/entity/npc/monster/dagannoth/dagannoth.npcs.toml b/data/entity/npc/monster/dagannoth/dagannoth.npcs.toml index ae75240906..f7d0c00b2e 100644 --- a/data/entity/npc/monster/dagannoth/dagannoth.npcs.toml +++ b/data/entity/npc/monster/dagannoth/dagannoth.npcs.toml @@ -33,8 +33,6 @@ drop_table = "dagannoth_lighthouse" categories = ["dagannoth"] respawn_delay = 30 examine = "A horror from the ocean depths..." -magic_defence = 50 -range_defence = 50 [dagannoth_lighthouse_melee_92_1] clone = "dagannoth_lighthouse_melee_92" @@ -58,16 +56,10 @@ drop_table = "dagannoth_waterbirth" categories = ["dagannoth"] respawn_delay = 30 examine = "A horror from the ocean depths..." -stab_defence = -10 -slash_defence = 10 -crush_defence = 90 -magic_defence = 200 -range_defence = 150 [dagannoth_waterbirth_range_88_2] clone = "dagannoth_waterbirth_range_88" id = 2887 -stab_defence = 10 [dagannoth_waterbirth_range_88_3] clone = "dagannoth_waterbirth_range_88" @@ -95,11 +87,6 @@ drop_table = "dagannoth_waterbirth" categories = ["dagannoth"] respawn_delay = 30 examine = "A horror from the ocean depths..." -stab_defence = 50 -slash_defence = 50 -crush_defence = 50 -magic_defence = 50 -range_defence = 50 [dagannoth_waterbirth_melee_90_1] clone = "dagannoth_waterbirth_melee_90" diff --git a/data/entity/npc/monster/demon/demons.npcs.toml b/data/entity/npc/monster/demon/demons.npcs.toml index fc7d80a77f..60fb3be5e0 100644 --- a/data/entity/npc/monster/demon/demons.npcs.toml +++ b/data/entity/npc/monster/demon/demons.npcs.toml @@ -26,7 +26,6 @@ respawn_delay = 15 hunt_mode = "aggressive" height = 60 examine = "Big, red, and incredibly evil." -magic_defence = -10 [greater_demon_2] id = 4698 @@ -56,7 +55,6 @@ hunt_mode = "aggressive" categories = ["demons", "lesser_demons"] respawn_delay = 30 examine = "Lesser, but still pretty big." -magic_defence = -10 [lesser_demon_2] clone = "lesser_demon" @@ -92,7 +90,6 @@ respawn_delay = 30 hunt_mode = "aggressive" height = 60 examine = "A big, scary, jet-black demon." -magic_defence = -10 [black_demon_1] id = 4702 diff --git a/data/entity/npc/monster/draconic/dragons.npcs.toml b/data/entity/npc/monster/draconic/dragons.npcs.toml index 4395064dfc..6aed981a2a 100644 --- a/data/entity/npc/monster/draconic/dragons.npcs.toml +++ b/data/entity/npc/monster/draconic/dragons.npcs.toml @@ -12,11 +12,6 @@ slayer_xp = 125.0 categories = ["dragons", "bronze_dragons"] respawn_delay = 30 examine = "Its scales seem to be made of bronze." -stab_defence = 50 -slash_defence = 70 -crush_defence = 70 -magic_defence = 30 -range_defence = 90 [black_dragon] id = 54 @@ -33,11 +28,6 @@ slayer_xp = 199.5 categories = ["dragons", "black_dragons"] respawn_delay = 30 examine = "A fierce dragon with black scales!" -stab_defence = 50 -slash_defence = 70 -crush_defence = 70 -magic_defence = 60 -range_defence = 50 [black_dragon_dark] id = 4673 @@ -58,11 +48,6 @@ slayer_xp = 107.6 categories = ["dragons", "blue_dragons"] respawn_delay = 30 examine = "A mother dragon." -stab_defence = 50 -slash_defence = 70 -crush_defence = 70 -magic_defence = 60 -range_defence = 50 [blue_dragon_ocean] id = 4681 @@ -94,11 +79,6 @@ slayer_xp = 75.0 categories = ["dragons", "green_dragons"] respawn_delay = 30 examine = "Must be related to Elvarg." -stab_defence = 20 -slash_defence = 40 -crush_defence = 40 -magic_defence = 30 -range_defence = 20 [green_dragon_1] id = 4677 @@ -134,11 +114,6 @@ slayer_xp = 173.2 categories = ["dragons", "iron_dragons"] respawn_delay = 30 examine = "Its scales seem to be made of iron." -stab_defence = 50 -slash_defence = 70 -crush_defence = 70 -magic_defence = 30 -range_defence = 90 [steel_dragon] id = 1592 @@ -154,11 +129,6 @@ slayer_xp = 220.5 categories = ["dragons", "steel_dragons"] respawn_delay = 30 examine = "Its scales seem to be made of steel." -stab_defence = 50 -slash_defence = 70 -crush_defence = 70 -magic_defence = 30 -range_defence = 90 [red_dragon] id = 53 @@ -174,11 +144,6 @@ drop_table = "red_dragon" categories = ["dragons", "red_dragons"] respawn_delay = 30 examine = "Its scales seem to be made of iron." -stab_defence = 50 -slash_defence = 70 -crush_defence = 70 -magic_defence = 60 -range_defence = 50 [red_dragon_orange] id = 4669 @@ -207,11 +172,6 @@ drop_table = "baby_dragon" categories = ["dragons", "dragon_dragons"] respawn_delay = 30 examine = "Young but still dangerous." -stab_defence = 30 -slash_defence = 50 -crush_defence = 50 -magic_defence = 40 -range_defence = 30 [baby_red_dragon_1] id = 4667 @@ -236,11 +196,6 @@ drop_table = "baby_dragon" categories = ["dragons", "black_dragons"] respawn_delay = 30 examine = "Young but still dangerous." -stab_defence = 30 -slash_defence = 50 -crush_defence = 50 -magic_defence = 40 -range_defence = 30 [baby_blue_dragon] id = 52 @@ -256,11 +211,6 @@ drop_table = "baby_dragon" categories = ["dragons", "blue_dragons"] respawn_delay = 30 examine = "Young but still dangerous." -stab_defence = 30 -slash_defence = 50 -crush_defence = 50 -magic_defence = 40 -range_defence = 30 [baby_blue_dragon_1] id = 4665 diff --git a/data/entity/npc/monster/fiend/icefiend/icefiend.npcs.toml b/data/entity/npc/monster/fiend/icefiend/icefiend.npcs.toml index 502cbc0552..1388efd2e2 100644 --- a/data/entity/npc/monster/fiend/icefiend/icefiend.npcs.toml +++ b/data/entity/npc/monster/fiend/icefiend/icefiend.npcs.toml @@ -29,11 +29,6 @@ att = 10 str = 10 def = 12 max_hit_magic = 20 -stab_defence = 10 -slash_defence = 100 -crush_defence = 100 -magic_defence = 10 -range_defence = 10 [icefiend_god_wars] id = 3406 diff --git a/data/entity/npc/monster/giant/fire_giant/fire_giant.npcs.toml b/data/entity/npc/monster/giant/fire_giant/fire_giant.npcs.toml index a6321a8a1f..05106b0559 100644 --- a/data/entity/npc/monster/giant/fire_giant/fire_giant.npcs.toml +++ b/data/entity/npc/monster/giant/fire_giant/fire_giant.npcs.toml @@ -11,8 +11,6 @@ slayer_xp = 111.0 drop_table = "fire_giant" categories = ["fire_giants"] examine = "His beard seems to have a life of its own." -slash_defence = 3 -crush_defence = 2 [fire_giant_sword] id = 1583 diff --git a/data/entity/npc/monster/giant/ice_giant/ice_giant.npcs.toml b/data/entity/npc/monster/giant/ice_giant/ice_giant.npcs.toml index 0c87c02e10..2f2b964da1 100644 --- a/data/entity/npc/monster/giant/ice_giant/ice_giant.npcs.toml +++ b/data/entity/npc/monster/giant/ice_giant/ice_giant.npcs.toml @@ -12,8 +12,6 @@ respawn_delay = 30 categories = ["ice_giants"] slayer_xp = 70.0 examine = "He's got icicles in his beard." -slash_defence = 3 -crush_defence = 2 [ice_giant_beard] id = 3072 diff --git a/data/entity/npc/monster/goblin/goblin.npcs.toml b/data/entity/npc/monster/goblin/goblin.npcs.toml index cda595f841..dc1a1405bb 100644 --- a/data/entity/npc/monster/goblin/goblin.npcs.toml +++ b/data/entity/npc/monster/goblin/goblin.npcs.toml @@ -12,11 +12,6 @@ categories = ["goblins"] height = 30 large_head = true examine = "An ugly, orange creature." -stab_defence = -28 -slash_defence = -28 -crush_defence = -28 -magic_defence = -28 -range_defence = -28 [grubfoot_brown] id = 4496 @@ -54,11 +49,6 @@ drop_table = "goblin" categories = ["goblins"] height = 30 examine = "An ugly green creature." -stab_defence = -15 -slash_defence = -15 -crush_defence = -15 -magic_defence = -15 -range_defence = -15 [goblin_mohawk_grey] clone = "goblin_mohawk_blue" @@ -153,11 +143,6 @@ clone = "goblin_shield_battleaxe_green" [goblin_light_grey_bald] clone = "goblin_mohawk_blue" id = 12353 -stab_defence = -51 -slash_defence = -51 -crush_defence = -51 -magic_defence = -51 -range_defence = -51 [goblin_turquoise_topless_mohawk] clone = "goblin_mohawk_blue" @@ -166,11 +151,6 @@ id = 12354 [goblin_light_brown_bald] clone = "goblin_mohawk_blue" id = 12355 -stab_defence = -51 -slash_defence = -51 -crush_defence = -51 -magic_defence = -51 -range_defence = -51 [goblin_turquoise_grey_ponytail] clone = "goblin_mohawk_blue" @@ -179,11 +159,6 @@ id = 12356 [goblin_light_grey_helmet] clone = "goblin_mohawk_blue" id = 12357 -stab_defence = -51 -slash_defence = -51 -crush_defence = -51 -magic_defence = -51 -range_defence = -51 [goblin_light_grey_hat] clone = "goblin_mohawk_blue" @@ -200,11 +175,6 @@ id = 12360 [goblin_light_grey_bald_spear] clone = "goblin_orange_hat_spear" id = 12361 -stab_defence = -15 -slash_defence = -15 -crush_defence = -15 -magic_defence = -15 -range_defence = -15 [stronghold_of_security_goblin_armed] id = 4407 @@ -235,11 +205,6 @@ height = 30 drop_table = "stronghold_goblin" categories = ["goblins"] examine = "An ugly green creature." -stab_defence = 4 -slash_defence = 6 -crush_defence = 8 -magic_defence = 4 -range_defence = 4 [stronghold_of_security_goblin_green_hat] id = 4409 @@ -286,11 +251,6 @@ height = 30 drop_table = "stronghold_goblin" categories = ["goblins"] examine = "These goblins have grown strong." -stab_defence = 14 -slash_defence = 16 -crush_defence = 18 -magic_defence = 14 -range_defence = 14 [stronghold_of_security_goblin_green_helmet] id = 4412 diff --git a/data/entity/npc/monster/goblin/hobgoblin/hobgoblin.npcs.toml b/data/entity/npc/monster/goblin/hobgoblin/hobgoblin.npcs.toml index 9c67329841..7218695b38 100644 --- a/data/entity/npc/monster/goblin/hobgoblin/hobgoblin.npcs.toml +++ b/data/entity/npc/monster/goblin/hobgoblin/hobgoblin.npcs.toml @@ -52,8 +52,6 @@ combat_def = "poh_hobgoblin" drop_table = "hobgoblin" categories = ["hobgoblins"] examine = "He doesn't look very welcoming." -stab_defence = 1 -slash_defence = 1 [hobgoblin_god_wars] id = 6275 diff --git a/data/entity/npc/monster/imp/imp.npcs.toml b/data/entity/npc/monster/imp/imp.npcs.toml index 2af435c304..7a342f38fa 100644 --- a/data/entity/npc/monster/imp/imp.npcs.toml +++ b/data/entity/npc/monster/imp/imp.npcs.toml @@ -7,11 +7,6 @@ respawn_delay = 60 drop_table = "imp" categories = ["imp"] examine = "A cheeky little imp." -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 [imp_god_wars] id = 6211 @@ -27,8 +22,3 @@ god = "zamorak" hunt_mode = "zamorak_aggressive" examine = "Have you checked your pockets lately?" drop_table = "imp" -stab_defence = -42 -slash_defence = -42 -crush_defence = -42 -magic_defence = -42 -range_defence = -42 diff --git a/data/entity/npc/monster/reptile/lizard/lizard.npcs.toml b/data/entity/npc/monster/reptile/lizard/lizard.npcs.toml index 8c97df2be3..29c8ef2821 100644 --- a/data/entity/npc/monster/reptile/lizard/lizard.npcs.toml +++ b/data/entity/npc/monster/reptile/lizard/lizard.npcs.toml @@ -13,10 +13,6 @@ hunt_mode = "cowardly" drop_table = "lizard" categories = ["lizards"] examine = "Run away, it's massive!" -stab_defence = 5 -slash_defence = 15 -crush_defence = 15 -range_defence = 5 [small_lizard_green] id = 2807 @@ -33,8 +29,6 @@ immune_death = true drop_table = "small_lizard" categories = ["lizards"] examine = "A small cold-blooded creature, partial to warmth." -slash_defence = 5 -crush_defence = 5 [small_lizard_orange] id = 2808 @@ -56,10 +50,6 @@ drop_table = "desert_lizard" hunt_mode = "cowardly" categories = ["lizards"] examine = "A cold-blooded creature, partial to warmth." -stab_defence = 5 -slash_defence = 15 -crush_defence = 15 -range_defence = 5 [desert_lizard_yellow] id = 2805 diff --git a/data/entity/npc/monster/reptile/scorpion/scorpion.npcs.toml b/data/entity/npc/monster/reptile/scorpion/scorpion.npcs.toml index f3d650416d..7a624695ff 100644 --- a/data/entity/npc/monster/reptile/scorpion/scorpion.npcs.toml +++ b/data/entity/npc/monster/reptile/scorpion/scorpion.npcs.toml @@ -11,10 +11,6 @@ slayer_xp = 17.0 drop_table = "scorpion" categories = ["scorpions"] examine = "An extremely vicious scorpion." -stab_defence = 5 -slash_defence = 15 -crush_defence = 15 -range_defence = 5 [poison_scorpion] id = 108 @@ -29,10 +25,6 @@ slayer_xp = 23.0 drop_table = "scorpion" categories = ["scorpions"] examine = "It has a very vicious looking tail." -stab_defence = 5 -slash_defence = 15 -crush_defence = 15 -range_defence = 5 [pit_scorpion] id = 109 @@ -47,8 +39,6 @@ slayer_xp = 32.0 drop_table = "scorpion" categories = ["scorpions"] examine = "Tiny, annoying, stinging thing." -slash_defence = 5 -crush_defence = 5 [king_scorpion] id = 144 @@ -64,10 +54,6 @@ slayer_xp = 30.0 drop_table = "scorpion" categories = ["scorpions"] examine = "Wow! Scorpions shouldn't grow that big." -stab_defence = 5 -slash_defence = 15 -crush_defence = 15 -range_defence = 5 [khazard_scorpion] id = 271 @@ -82,10 +68,6 @@ slayer_xp = 30.0 drop_table = "scorpion" categories = ["scorpions"] examine = "A large angry scorpion." -stab_defence = 5 -slash_defence = 15 -crush_defence = 15 -range_defence = 5 [grave_scorpion] id = 493 @@ -101,8 +83,6 @@ slayer_xp = 7.0 drop_table = "scorpion" categories = ["scorpions"] examine = "A vicious, little, stinging thing." -slash_defence = 3 -crush_defence = 3 [scorpion_stronghold_of_security] id = 4402 @@ -118,10 +98,6 @@ slayer_xp = 55.0 drop_table = "scorpion" categories = ["scorpions"] examine = "An extremely vicious scorpion." -stab_defence = 5 -slash_defence = 15 -crush_defence = 15 -range_defence = 55 [scorpion_stronghold_of_security_red] id = 4403 @@ -136,9 +112,4 @@ respawn_delay = 25 slayer_xp = 37.0 drop_table = "scorpion" categories = ["scorpions"] -examine = "An extremely vicious scorpion." -stab_defence = 35 -slash_defence = 15 -crush_defence = 15 -magic_defence = 30 -range_defence = 35 \ No newline at end of file +examine = "An extremely vicious scorpion." \ No newline at end of file diff --git a/data/entity/npc/monster/reptile/spider/spider.npcs.toml b/data/entity/npc/monster/reptile/spider/spider.npcs.toml index cc703ceca4..b163f4514a 100644 --- a/data/entity/npc/monster/reptile/spider/spider.npcs.toml +++ b/data/entity/npc/monster/reptile/spider/spider.npcs.toml @@ -10,11 +10,6 @@ max_hit_stab = 1 categories = ["spiders"] height = 10 examine = "Incey wincey." -stab_defence = -53 -slash_defence = -53 -crush_defence = -53 -magic_defence = -53 -range_defence = -53 [giant_spider] id = 59 @@ -30,11 +25,6 @@ categories = ["giant_spiders", "spiders"] height = 10 ##From wiki: 12 October 2010 The examine text of giant spiders outside of the Stronghold of Security have has their examines changed to say "magically modified" instead of "genetically modified". examine = "I think this spider has been magically modified." -stab_defence = -10 -slash_defence = -10 -crush_defence = -10 -magic_defence = -10 -range_defence = -10 [giant_spider_mid] id = 60 @@ -68,11 +58,6 @@ categories = ["giant_spiders", "spiders"] height = 10 examine = "I think this spider has been genetically modified." drop_table = "giant_spider" -stab_defence = 10 -slash_defence = 10 -crush_defence = 10 -magic_defence = 10 -range_defence = 10 [deadly_red_spider] id = 63 @@ -87,12 +72,7 @@ slayer_xp = 35.0 categories = ["giant_spiders", "spiders"] height = 10 examine = "I think this spider has been magically modified." -stab_defence = 15 -slash_defence = 16 -crush_defence = 7 -magic_defence = 12 -range_defence = 16 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [poison_spider] id = 134 @@ -107,12 +87,7 @@ categories = ["spiders"] height = 10 examine = "I think this spider has been magically modified." drop_table = "poison_spider" -stab_defence = 20 -slash_defence = 17 -crush_defence = 10 -magic_defence = 14 -range_defence = 14 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [spider_underground_pass] id = 1004 @@ -133,11 +108,6 @@ slayer_xp = 22.0 height = 10 categories = ["spiders"] examine = "Incey wincey... with a nasty bite." -stab_defence = 53 -slash_defence = 53 -crush_defence = 53 -magic_defence = 53 -range_defence = 53 [spider_haunted_woods] id = 1221 diff --git a/data/entity/npc/monster/turoth/turoth.npcs.toml b/data/entity/npc/monster/turoth/turoth.npcs.toml index b1196a948b..baee9b3227 100644 --- a/data/entity/npc/monster/turoth/turoth.npcs.toml +++ b/data/entity/npc/monster/turoth/turoth.npcs.toml @@ -12,8 +12,6 @@ immune_cannon = true respawn_delay = 15 drop_table = "turoth" examine = "He's one big leg short!" -slash_defence = 20 -crush_defence = 20 [turoth_level_87] id = 1626 diff --git a/data/entity/npc/monster/undead/corpse/corpse.npcs.toml b/data/entity/npc/monster/undead/corpse/corpse.npcs.toml index 4836b74ba3..983197bcb8 100644 --- a/data/entity/npc/monster/undead/corpse/corpse.npcs.toml +++ b/data/entity/npc/monster/undead/corpse/corpse.npcs.toml @@ -6,11 +6,6 @@ respawn_delay = 60 drop_table = "corpse_spider" categories = ["corpse_spider"] examine = "Could do with gaining a few pounds." -stab_defence = -26 -slash_defence = -26 -crush_defence = -26 -magic_defence = -26 -range_defence = -26 [crawling_corpse_torso] id = 7916 diff --git a/data/entity/npc/monster/undead/ghost/ghost.npcs.toml b/data/entity/npc/monster/undead/ghost/ghost.npcs.toml index 6c04642801..65cb0e2c6c 100644 --- a/data/entity/npc/monster/undead/ghost/ghost.npcs.toml +++ b/data/entity/npc/monster/undead/ghost/ghost.npcs.toml @@ -11,11 +11,6 @@ hunt_mode = "cowardly" categories = ["ghosts", "undead"] examine = "Eeek! A ghost!" drop_table = "empty" -stab_defence = 5 -slash_defence = 5 -crush_defence = 5 -magic_defence = -5 -range_defence = 5 [ghost] id = 103 @@ -92,11 +87,6 @@ slayer_xp = 80.0 categories = ["ghosts", "undead"] examine = "Eeek! A ghost!" drop_table = "empty" -stab_defence = 55 -slash_defence = 55 -crush_defence = 5 -magic_defence = 55 -range_defence = 55 [stronghold_ghost] id = 4387 @@ -110,10 +100,6 @@ clone = "stronghold_ghost_hair" hitpoints = 750 slayer_xp = 75.0 drop_table = "empty" -stab_defence = 45 -slash_defence = 45 -magic_defence = -5 -range_defence = 45 [stronghold_ghost_hood] id = 5370 diff --git a/data/entity/npc/monster/undead/magic_axe/magic_axe.npcs.toml b/data/entity/npc/monster/undead/magic_axe/magic_axe.npcs.toml index d41f5291af..a225e89f4a 100644 --- a/data/entity/npc/monster/undead/magic_axe/magic_axe.npcs.toml +++ b/data/entity/npc/monster/undead/magic_axe/magic_axe.npcs.toml @@ -10,9 +10,4 @@ respawn_delay = 30 drop_table = "magic_axe" hunt_mode = "cowardly" categories = ["magic_axe", "undead"] -examine = "A magic axe with a mind of its own." -stab_defence = 10 -slash_defence = 5 -crush_defence = 15 -magic_defence = 5 -range_defence = 10 \ No newline at end of file +examine = "A magic axe with a mind of its own." \ No newline at end of file diff --git a/data/entity/npc/monster/undead/skeleton/skeletons.npcs.toml b/data/entity/npc/monster/undead/skeleton/skeletons.npcs.toml index 1c2a1396a7..ab9a84586a 100644 --- a/data/entity/npc/monster/undead/skeleton/skeletons.npcs.toml +++ b/data/entity/npc/monster/undead/skeleton/skeletons.npcs.toml @@ -23,11 +23,6 @@ respawn_delay = 60 categories = ["skeletons", "undead"] slayer_xp = 17.0 examine = "Could do with gaining a few pounds." -stab_defence = 9 -slash_defence = 11 -crush_defence = -2 -magic_defence = 1 -range_defence = 4 [skeleton_flail] clone = "skeleton_mace_shield" @@ -65,10 +60,6 @@ respawn_delay = 70 slayer_xp = 29.0 categories = ["skeletons", "undead"] examine = "Could do with gaining a few pounds." -stab_defence = 5 -slash_defence = 5 -crush_defence = -5 -range_defence = 5 [skeleton_shield_helmet] clone = "skeleton_unarmed" @@ -85,11 +76,6 @@ id = 5332 [skeleton_builder] clone = "skeleton_unarmed" id = 3291 -stab_defence = 9 -slash_defence = 11 -crush_defence = -2 -magic_defence = 1 -range_defence = 4 [skeleton_helmet] id = 5335 @@ -106,10 +92,6 @@ respawn_delay = 70 slayer_xp = 24.0 categories = ["skeletons", "undead"] examine = "Could do with gaining a few pounds." -stab_defence = 5 -slash_defence = 5 -crush_defence = -5 -range_defence = 5 [skeleton_unarmed_1] clone = "skeleton_helmet" @@ -133,11 +115,6 @@ respawn_delay = 60 categories = ["skeletons", "undead"] examine = "Could do with gaining a few pounds." drop_table = "skeleton" -stab_defence = 79 -slash_defence = 31 -crush_defence = 20 -magic_defence = 5 -range_defence = 70 [skeleton_sword_shield_85] clone = "skeleton_axe_shield_85" @@ -148,11 +125,6 @@ drop_table = "skeleton" clone = "skeleton_axe_shield_85" id = 93 drop_table = "skeleton" -stab_defence = 9 -slash_defence = 11 -crush_defence = -2 -magic_defence = 1 -range_defence = 4 [stronghold_skeleton_round_shield] id = 4384 @@ -167,10 +139,6 @@ slayer_xp = 70.0 hunt_mode = "cowardly" categories = ["skeletons", "undead"] examine = "Could do with gaining a few pounds." -stab_defence = 35 -slash_defence = 35 -crush_defence = -5 -range_defence = 35 [stronghold_skeleton_helmet] clone = "skeleton_axe_shield_85" @@ -186,19 +154,11 @@ slayer_xp = 70.0 hunt_mode = "cowardly" categories = ["skeletons", "undead"] examine = "Could do with gaining a few pounds." -stab_defence = 35 -slash_defence = 35 -crush_defence = -5 -range_defence = 35 [skeleton_hammer_shield] clone = "stronghold_skeleton_helmet" id = 4386 drop_table = "skeleton" -stab_defence = 79 -slash_defence = 31 -crush_defence = 20 -range_defence = 70 [stronghold_skeleton_unarmed] clone = "stronghold_skeleton_helmet" @@ -219,8 +179,3 @@ hunt_mode = "aggressive" drop_table = "skeleton_catacombs" categories = ["skeletons", "undead"] examine = "It rattles when it moves." -stab_defence = -22 -slash_defence = -22 -crush_defence = -22 -magic_defence = -22 -range_defence = -22 diff --git a/data/entity/npc/monster/undead/skoblin/skoblin.npcs.toml b/data/entity/npc/monster/undead/skoblin/skoblin.npcs.toml index e770f6ebcb..a1cdaa77b9 100644 --- a/data/entity/npc/monster/undead/skoblin/skoblin.npcs.toml +++ b/data/entity/npc/monster/undead/skoblin/skoblin.npcs.toml @@ -7,4 +7,4 @@ respawn_delay = 60 drop_table = "skoblin" categories = ["skoblin"] examine = "Could do with gaining a few pounds." -hunt_mode = "aggressive" \ No newline at end of file +hunt_mode = "cowardly" \ No newline at end of file diff --git a/data/entity/npc/monster/undead/warped/warped.npcs.toml b/data/entity/npc/monster/undead/warped/warped.npcs.toml index 84bfdef9ac..e0917c0f79 100644 --- a/data/entity/npc/monster/undead/warped/warped.npcs.toml +++ b/data/entity/npc/monster/undead/warped/warped.npcs.toml @@ -15,11 +15,6 @@ respawn_delay = 60 drop_table = "warped_bat" categories = ["warped_bat"] examine = "Could do with gaining a few pounds." -stab_defence = -21 -slash_defence = -21 -crush_defence = -21 -magic_defence = -21 -range_defence = -21 [warped_fly] id = 7915 diff --git a/data/entity/npc/monster/undead/zombie/zombie.npcs.toml b/data/entity/npc/monster/undead/zombie/zombie.npcs.toml index 2c72d32d44..c9202a7710 100644 --- a/data/entity/npc/monster/undead/zombie/zombie.npcs.toml +++ b/data/entity/npc/monster/undead/zombie/zombie.npcs.toml @@ -109,21 +109,11 @@ examine = "The walking dead." id = 75 clone = "zombie_yellow_shirt" combat_def = "zombie_sword" -stab_defence = 9 -slash_defence = 8 -crush_defence = 12 -magic_defence = 10 -range_defence = 11 [zombie_armour_green_shorts_sword] id = 5314 clone = "zombie_yellow_shirt" combat_def = "zombie_sword" -stab_defence = 9 -slash_defence = 8 -crush_defence = 12 -magic_defence = 10 -range_defence = 11 [zombie_armour_grey_shorts_sword] id = 5315 @@ -134,11 +124,6 @@ att = 8 str = 9 def = 10 max_hit_crush = 20 -stab_defence = 9 -slash_defence = 8 -crush_defence = 12 -magic_defence = 10 -range_defence = 11 [zombie_red_outfit] id = 5311 @@ -156,51 +141,26 @@ clone = "zombie_yellow_shirt" id = 5316 clone = "zombie_yellow_shirt" combat_def = "zombie_sword" -stab_defence = 9 -slash_defence = 8 -crush_defence = 12 -magic_defence = 10 -range_defence = 11 [zombie_grey_suit_sword] id = 5318 clone = "zombie_yellow_shirt" combat_def = "zombie_sword" -stab_defence = 9 -slash_defence = 8 -crush_defence = 12 -magic_defence = 10 -range_defence = 11 [zombie_tan_trousers_axe_2] id = 5319 clone = "zombie_yellow_shirt" combat_def = "zombie_axe" -stab_defence = 9 -slash_defence = 8 -crush_defence = 12 -magic_defence = 10 -range_defence = 11 [zombie_tan_shorts_axe] id = 5320 clone = "zombie_yellow_shirt" combat_def = "zombie_axe" -stab_defence = 9 -slash_defence = 8 -crush_defence = 12 -magic_defence = 10 -range_defence = 11 [zombie_red_skirt_sword] id = 5321 clone = "zombie_yellow_shirt" combat_def = "zombie_sword" -stab_defence = 9 -slash_defence = 8 -crush_defence = 12 -magic_defence = 10 -range_defence = 11 [zombie_blue_skirt_sword_2] id = 5322 @@ -211,21 +171,11 @@ att = 8 str = 9 def = 10 max_hit_crush = 20 -stab_defence = 9 -slash_defence = 8 -crush_defence = 12 -magic_defence = 10 -range_defence = 11 [zombie_yellow_shirt_sword] id = 5323 clone = "zombie_yellow_shirt" combat_def = "zombie_sword" -stab_defence = 9 -slash_defence = 8 -crush_defence = 12 -magic_defence = 10 -range_defence = 11 [zombie_red_sword] id = 5324 @@ -263,11 +213,6 @@ respawn_delay = 35 slayer_xp = 30.0 categories = ["zombies", "undead"] examine = "The walking dead." -stab_defence = 10 -slash_defence = 8 -crush_defence = 12 -magic_defence = 10 -range_defence = 10 [zombie_entrana_armour] id = 5328 @@ -300,11 +245,6 @@ respawn_delay = 35 drop_table = "zombie_melzars_maze" categories = ["zombies", "undead"] examine = "Dead man walking." -stab_defence = 9 -slash_defence = 8 -crush_defence = 12 -magic_defence = 10 -range_defence = 11 [zombie_melzars_maze_strong] id = 6100 @@ -381,11 +321,6 @@ respawn_delay = 35 drop_table = "zombie" categories = ["zombies", "undead"] examine = "The walking dead." -stab_defence = 19 -slash_defence = 18 -crush_defence = 22 -magic_defence = 20 -range_defence = 21 [zombie_stronghold_of_security_male] id = 5380 @@ -409,9 +344,6 @@ hunt_mode = "cowardly" respawn_delay = 35 categories = ["zombies", "undead"] examine = "Could his name be 'Lurch'?" -stab_defence = 20 -slash_defence = 20 -range_defence = 10 [zombie_tarns_lair_tan_boots] id = 5394 @@ -426,9 +358,6 @@ hunt_mode = "cowardly" respawn_delay = 35 categories = ["zombies", "undead"] examine = "Mostly 'armless." -stab_defence = 20 -slash_defence = 20 -range_defence = 10 [zombie_tarns_lair_grey_boots] id = 5395 @@ -444,9 +373,6 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "Has anybody told him he's dead?" -stab_defence = 20 -slash_defence = 20 -range_defence = 10 [zombie_tarns_lair_red_boots_hat] id = 5396 @@ -462,9 +388,6 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "Dave? Is that you?" -stab_defence = 20 -slash_defence = 20 -range_defence = 10 [zombie_tarns_lair_tan_boots_hair] id = 5397 @@ -480,9 +403,6 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "Why don't zombies ever wash?" -stab_defence = 20 -slash_defence = 20 -range_defence = 10 [zombie_tarns_lair_green_boots_hair] id = 5398 @@ -498,9 +418,6 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "A shambling pile of rotten flesh." -stab_defence = 20 -slash_defence = 20 -range_defence = 10 [zombie_tarns_lair_red_top] id = 5399 @@ -516,9 +433,6 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "He needs lessons on walking." -stab_defence = 20 -slash_defence = 20 -range_defence = 10 [zombie_tarns_lair_brown_top] id = 5400 @@ -534,9 +448,6 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "Fred, the undead." -stab_defence = 20 -slash_defence = 20 -range_defence = 10 [zombie_tarns_lair_armour] id = 5401 @@ -552,9 +463,6 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "One of the undead." -stab_defence = 20 -slash_defence = 20 -range_defence = 10 [zombie_tarns_lair_yellow_shirt] id = 5402 @@ -570,9 +478,6 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "A disgusting zombie." -stab_defence = 20 -slash_defence = 20 -range_defence = 10 [zombie_tarns_lair_grey_shirt] id = 5403 @@ -588,9 +493,6 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "Somebody tell him he's already dead!" -stab_defence = 20 -slash_defence = 20 -range_defence = 10 [zombie_tarns_lair_blue_shirt] id = 5404 @@ -606,9 +508,6 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "He sure looks grave." -stab_defence = 20 -slash_defence = 20 -range_defence = 10 [zombie_tarns_lair_tan_trousers] id = 5405 @@ -624,9 +523,6 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "Can't a body get any rest around here?" -stab_defence = 20 -slash_defence = 20 -range_defence = 10 [zombie_tarns_lair_grey_trousers] id = 5406 @@ -642,9 +538,6 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "At least he's not legless." -stab_defence = 20 -slash_defence = 20 -range_defence = 10 [zombie_tarns_lair_green_trousers] id = 5407 @@ -660,9 +553,6 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "All skin and bones." -stab_defence = 20 -slash_defence = 20 -range_defence = 10 [zombie_tarns_lair_brown_trousers] id = 5408 @@ -678,9 +568,6 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "All skin and bones." -stab_defence = 20 -slash_defence = 20 -range_defence = 10 [zombie_tarns_lair_blue_trousers] id = 5409 @@ -696,9 +583,6 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "All skin and bones." -stab_defence = 20 -slash_defence = 20 -range_defence = 10 [zombie_tarns_lair_light_grey_trousers] id = 5410 @@ -714,6 +598,3 @@ hunt_mode = "cowardly" respawn_delay = 50 categories = ["zombies", "undead"] examine = "Brains..." -stab_defence = 20 -slash_defence = 20 -range_defence = 10 diff --git a/data/entity/npc/monster/wallasalki/wallasalki.npcs.toml b/data/entity/npc/monster/wallasalki/wallasalki.npcs.toml index d3d8e35960..3e5bffe07d 100644 --- a/data/entity/npc/monster/wallasalki/wallasalki.npcs.toml +++ b/data/entity/npc/monster/wallasalki/wallasalki.npcs.toml @@ -11,14 +11,8 @@ hunt_mode = "aggressive" categories = ["wallasalki"] respawn_delay = 25 examine = "A fearsome magical water creature." -stab_defence = 100 -slash_defence = 150 -crush_defence = 175 -magic_defence = 250 -range_defence = -10 [wallasalki_1] clone = "wallasalki" id = 2884 drop_table = "wallasalki" -range_defence = 10 diff --git a/data/entity/npc/monster/warrior/earth_warrior/earth_warrior.npcs.toml b/data/entity/npc/monster/warrior/earth_warrior/earth_warrior.npcs.toml index d52be13ac8..0543cbafe8 100644 --- a/data/entity/npc/monster/warrior/earth_warrior/earth_warrior.npcs.toml +++ b/data/entity/npc/monster/warrior/earth_warrior/earth_warrior.npcs.toml @@ -10,9 +10,4 @@ respawn_delay = 30 drop_table = "earth_warrior" categories = ["earth_warrior"] slayer_xp = 54.0 -examine = "A strange, inhuman, elemental warrior." -stab_defence = 30 -slash_defence = 40 -crush_defence = 20 -magic_defence = 10 -range_defence = 30 \ No newline at end of file +examine = "A strange, inhuman, elemental warrior." \ No newline at end of file diff --git a/data/entity/npc/monster/warrior/ice_warrior/ice_warrior.npcs.toml b/data/entity/npc/monster/warrior/ice_warrior/ice_warrior.npcs.toml index 77732b09ea..fb5fd700c1 100644 --- a/data/entity/npc/monster/warrior/ice_warrior/ice_warrior.npcs.toml +++ b/data/entity/npc/monster/warrior/ice_warrior/ice_warrior.npcs.toml @@ -11,11 +11,6 @@ categories = ["ice_warriors"] drop_table = "ice_warrior" slayer_xp = 59.0 examine = "A cold-hearted elemental warrior." -stab_defence = 30 -slash_defence = 40 -crush_defence = 20 -magic_defence = 10 -range_defence = 30 [ice_warrior_2] id = 3073 diff --git a/data/entity/npc/monster/werewolf/werewolf.npcs.toml b/data/entity/npc/monster/werewolf/werewolf.npcs.toml index e282a9af82..096d37b88a 100644 --- a/data/entity/npc/monster/werewolf/werewolf.npcs.toml +++ b/data/entity/npc/monster/werewolf/werewolf.npcs.toml @@ -12,11 +12,6 @@ drop_table = "werewolf" categories = ["werewolf", "werewolves"] god = "zamorak" examine = "Down, fang!" -stab_defence = -21 -slash_defence = -21 -crush_defence = -21 -magic_defence = -21 -range_defence = -21 [werewolf_god_wars_male] id = 6213 diff --git a/data/minigame/barrows_brothers/barrows.npcs.toml b/data/minigame/barrows_brothers/barrows.npcs.toml index 93791f8330..5788ff250e 100644 --- a/data/minigame/barrows_brothers/barrows.npcs.toml +++ b/data/minigame/barrows_brothers/barrows.npcs.toml @@ -51,11 +51,6 @@ xp_bonus = 2.5 hunt_mode = "cowardly" categories = ["bosses"] examine = "A vengeful spirit corrupted by dark magic." -attack_bonus = 73 -stab_defence = 103 -slash_defence = 85 -crush_defence = 117 -magic_defence = 73 [dharok_the_wretched] id = 2026 @@ -67,12 +62,6 @@ combat_def = "dharok_the_wretched" xp_bonus = 1.5 categories = ["bosses"] examine = "A vengeful spirit corrupted by dark magic." -attack_bonus = 103 -stab_defence = 252 -slash_defence = 250 -crush_defence = 244 -magic_defence = -11 -range_defence = 249 [guthan_the_infested] id = 2027 @@ -85,12 +74,6 @@ xp_bonus = 1.5 hunt_mode = "cowardly" categories = ["bosses"] examine = "A vengeful spirit corrupted by dark magic." -attack_bonus = 75 -stab_defence = 259 -slash_defence = 257 -crush_defence = 241 -magic_defence = -11 -range_defence = 250 [karil_the_tainted] id = 2028 @@ -102,12 +85,6 @@ combat_def = "karil_the_tainted" hunt_mode = "cowardly" categories = ["bosses"] examine = "A vengeful spirit corrupted by dark magic." -attack_bonus = 134 -stab_defence = 79 -slash_defence = 71 -crush_defence = 90 -magic_defence = 106 -range_defence = 100 [torag_the_corrupted] id = 2029 @@ -120,11 +97,6 @@ xp_bonus = 12.5 hunt_mode = "cowardly" categories = ["bosses"] examine = "A vengeful spirit corrupted by dark magic." -attack_bonus = 82 -stab_defence = 221 -slash_defence = 235 -crush_defence = 222 -range_defence = 221 [verac_the_defiled] id = 2030 @@ -137,8 +109,3 @@ xp_bonus = 12.5 hunt_mode = "cowardly" categories = ["bosses"] examine = "A vengeful spirit corrupted by dark magic." -attack_bonus = 82 -stab_defence = 227 -slash_defence = 230 -crush_defence = 221 -range_defence = 225 diff --git a/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.npcs.toml b/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.npcs.toml index 9216bcf125..5199f49723 100644 --- a/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.npcs.toml +++ b/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.npcs.toml @@ -16,7 +16,7 @@ examine = "A shadowy sort of entity, kind of creepy looking." drop_table = "phrin_shadow" max_hit_crush = 60 combat_def = "phrin_shadow" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [phrin_shade_shade] id = 1244 @@ -121,7 +121,7 @@ drop_table = "fiyr_shade" examine = "A shadowy sort of entity, kind of creepy looking." max_hit_crush = 110 combat_def = "fiyr_shadow" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [asyn_shade] id = 1248 diff --git a/data/minigame/soul_wars/nomads_temple/nomads_temple.npcs.toml b/data/minigame/soul_wars/nomads_temple/nomads_temple.npcs.toml index bb003148bd..3c981f870d 100644 --- a/data/minigame/soul_wars/nomads_temple/nomads_temple.npcs.toml +++ b/data/minigame/soul_wars/nomads_temple/nomads_temple.npcs.toml @@ -41,7 +41,7 @@ att = 99 str = 99 def = 99 combat_def = "spectral_worshipper" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [knight_nomads_temple_2] id = 9448 diff --git a/data/minigame/soul_wars/soul_wars.npcs.toml b/data/minigame/soul_wars/soul_wars.npcs.toml index afc9dc45c8..a811dbabdf 100644 --- a/data/minigame/soul_wars/soul_wars.npcs.toml +++ b/data/minigame/soul_wars/soul_wars.npcs.toml @@ -22,12 +22,7 @@ str = 486 def = 835 max_hit_crush = 500 combat_def = "avatar_of_destruction" -stab_defence = 80 -slash_defence = 80 -crush_defence = 80 -magic_defence = 130 -range_defence = 80 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [avatar_of_creation_soul_wars] id = 8597 @@ -39,12 +34,7 @@ str = 446 def = 939 max_hit_crush = 460 combat_def = "avatar_of_creation" -stab_defence = 80 -slash_defence = 80 -crush_defence = 80 -magic_defence = 130 -range_defence = 80 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [pyrefiend_soul_wars] id = 8598 diff --git a/data/minigame/tai_bwo_wannai_cleanup/tai_bwo_wannai_cleanup.npcs.toml b/data/minigame/tai_bwo_wannai_cleanup/tai_bwo_wannai_cleanup.npcs.toml index 86fb6befac..b69f002b60 100644 --- a/data/minigame/tai_bwo_wannai_cleanup/tai_bwo_wannai_cleanup.npcs.toml +++ b/data/minigame/tai_bwo_wannai_cleanup/tai_bwo_wannai_cleanup.npcs.toml @@ -8,10 +8,6 @@ max_hit_melee = 10 hunt_mode = "cowardly" drop_table = "mosquito" examine = "A flying bloodsucker." -stab_defence = 2 -slash_defence = 2 -crush_defence = 5 -magic_defence = 2 [mosquito_swarm_level_17] id = 2494 @@ -24,10 +20,6 @@ max_hit_melee = 10 hunt_mode = "cowardly" drop_table = "mosquito" examine = "A swarm of three highly agile mosquitoes." -stab_defence = 2 -slash_defence = 2 -crush_defence = 5 -magic_defence = 2 [mosquito_swarm_level_20] id = 2495 @@ -40,10 +32,6 @@ max_hit_melee = 10 hunt_mode = "cowardly" drop_table = "mosquito" examine = "A swarm of five highly agile mosquitoes." -stab_defence = 2 -slash_defence = 2 -crush_defence = 5 -magic_defence = 2 [broodoo_victim_green] id = 2499 diff --git a/data/minigame/warriors_guild/warriors_guild.npcs.toml b/data/minigame/warriors_guild/warriors_guild.npcs.toml index c44b925b89..5c66b15dc0 100644 --- a/data/minigame/warriors_guild/warriors_guild.npcs.toml +++ b/data/minigame/warriors_guild/warriors_guild.npcs.toml @@ -138,11 +138,6 @@ attack_bonus = 4 immune_poison = true drop_table = "animated_bronze_armour" examine = "Animated bronze armour." -stab_defence = 50 -slash_defence = 25 -crush_defence = 19 -magic_defence = 400 -range_defence = 400 [animated_iron_armour] id = 4279 @@ -155,11 +150,6 @@ max_hit_melee = 30 attack_bonus = 4 drop_table = "animated_iron_armour" examine = "Animated iron armour." -stab_defence = 50 -slash_defence = 25 -crush_defence = 19 -magic_defence = 400 -range_defence = 400 [animated_steel_armour] id = 4280 @@ -173,11 +163,6 @@ attack_bonus = 4 immune_poison = true drop_table = "animated_steel_armour" examine = "Animated steel armour." -stab_defence = 50 -slash_defence = 25 -crush_defence = 19 -magic_defence = 400 -range_defence = 400 [animated_black_armour] id = 4281 @@ -191,11 +176,6 @@ attack_bonus = 4 immune_poison = true drop_table = "animated_black_armour" examine = "Animated black armour." -stab_defence = 50 -slash_defence = 25 -crush_defence = 19 -magic_defence = 400 -range_defence = 400 [animated_mithril_armour] id = 4282 @@ -209,11 +189,6 @@ attack_bonus = 4 immune_poison = true drop_table = "animated_mithril_armour" examine = "Animated mithril armour." -stab_defence = 50 -slash_defence = 25 -crush_defence = 19 -magic_defence = 400 -range_defence = 400 [animated_adamant_armour] id = 4283 @@ -227,11 +202,6 @@ attack_bonus = 4 immune_poison = true drop_table = "animated_adamant_armour" examine = "Animated adamant armour." -stab_defence = 50 -slash_defence = 25 -crush_defence = 19 -magic_defence = 400 -range_defence = 400 [animated_rune_armour] id = 4284 @@ -245,8 +215,3 @@ attack_bonus = 4 immune_poison = true drop_table = "animated_rune_armour" examine = "Animated rune armour." -stab_defence = 50 -slash_defence = 25 -crush_defence = 19 -magic_defence = 400 -range_defence = 400 diff --git a/data/quest/free/blood_pact/blood_pact.npcs.toml b/data/quest/free/blood_pact/blood_pact.npcs.toml index c7c6325ef4..c9d2e57bdf 100644 --- a/data/quest/free/blood_pact/blood_pact.npcs.toml +++ b/data/quest/free/blood_pact/blood_pact.npcs.toml @@ -48,8 +48,6 @@ categories = ["human"] combat_def = "kayle_attackable" hunt_mode = "aggressive" hunt_range = 5 -magic_defence = 10 -range_defence = 10 [kayle_defeated] id = 9629 diff --git a/data/quest/members/between_a_rock/between_a_rock.npcs.toml b/data/quest/members/between_a_rock/between_a_rock.npcs.toml index 6b8be9e7f0..948ab2dfc3 100644 --- a/data/quest/members/between_a_rock/between_a_rock.npcs.toml +++ b/data/quest/members/between_a_rock/between_a_rock.npcs.toml @@ -18,11 +18,6 @@ max_hit_melee = 130 xp_bonus = 2.5 hunt_mode = "cowardly" examine = "It is the avatar of the Arzinian Being of Bordanzan, representing magic." -stab_defence = 80 -slash_defence = 80 -crush_defence = 80 -magic_defence = 20 -range_defence = 15 [arzinian_avatar_of_magic_level_75] id = 1858 @@ -36,11 +31,6 @@ max_hit_melee = 80 xp_bonus = 0.0 hunt_mode = "cowardly" examine = "It is the avatar of the Arzinian Being of Bordanzan, representing magic." -stab_defence = 40 -slash_defence = 40 -crush_defence = 40 -magic_defence = 15 -range_defence = 10 [arzinian_avatar_of_ranging_invincible] id = 1853 @@ -63,11 +53,6 @@ xp_bonus = 2.5 ranged_strength = 10 hunt_mode = "cowardly" examine = "It is the avatar of the Arzinian Being of Bordanzan, representing ranging." -stab_defence = 15 -slash_defence = 15 -crush_defence = 15 -magic_defence = 80 -range_defence = 20 [arzinian_avatar_of_ranging_level_75] id = 1855 @@ -82,11 +67,6 @@ xp_bonus = 0.0 ranged_strength = 5 hunt_mode = "cowardly" examine = "It is the avatar of the Arzinian Being of Bordanzan, representing ranging." -stab_defence = 10 -slash_defence = 10 -crush_defence = 10 -magic_defence = 40 -range_defence = 15 [arzinian_avatar_of_strength_invincible] id = 1850 @@ -107,11 +87,6 @@ max_hit_melee = 110 xp_bonus = 2.5 hunt_mode = "cowardly" examine = "It is the avatar of the Arzinian Being of Bordanzan, representing strength." -stab_defence = 20 -slash_defence = 20 -crush_defence = 20 -magic_defence = 15 -range_defence = 80 [arzinian_avatar_of_strength_level_75] id = 1852 @@ -124,8 +99,3 @@ max_hit_melee = 70 xp_bonus = 0.0 hunt_mode = "cowardly" examine = "It is the avatar of the Arzinian Being of Bordanzan, representing strength." -stab_defence = 15 -slash_defence = 15 -crush_defence = 15 -magic_defence = 10 -range_defence = 40 diff --git a/data/quest/members/clock_tower/clock_tower_dungeon.npcs.toml b/data/quest/members/clock_tower/clock_tower_dungeon.npcs.toml index 1821c601ef..7fe0bf61da 100644 --- a/data/quest/members/clock_tower/clock_tower_dungeon.npcs.toml +++ b/data/quest/members/clock_tower/clock_tower_dungeon.npcs.toml @@ -9,7 +9,7 @@ att = 10 str = 10 def = 10 max_hit_stab = 20 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [thief_clocktower_dungeon] id = 282 @@ -22,11 +22,6 @@ str = 10 def = 9 attack_bonus = 6 max_hit_stab = 20 -stab_defence = 8 -slash_defence = 13 -crush_defence = 14 -magic_defence = 4 -range_defence = 9 [head_thief_clocktower_dungeon] id = 283 @@ -44,11 +39,6 @@ examine = "The head of the treacherous blanket stealing gang." drop_table = "head_thief" max_hit_slash = 30 combat_def = "head_thief" -stab_defence = 8 -slash_defence = 14 -crush_defence = 15 -magic_defence = 4 -range_defence = 9 [dungeon_rat_clocktower_dungeon_2] id = 4936 @@ -61,7 +51,7 @@ att = 10 str = 10 def = 10 max_hit_stab = 20 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [dungeon_rat_clocktower_dungeon_3] id = 4937 @@ -74,7 +64,7 @@ att = 10 str = 10 def = 10 max_hit_stab = 20 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [dungeon_rat_clocktower_dungeon_4] id = 88 @@ -87,5 +77,5 @@ att = 10 str = 10 def = 10 max_hit_stab = 20 -hunt_mode = "aggressive" +hunt_mode = "cowardly" diff --git a/data/quest/members/contact/contact.npcs.toml b/data/quest/members/contact/contact.npcs.toml index 839b1e4463..dbb9d2ddff 100644 --- a/data/quest/members/contact/contact.npcs.toml +++ b/data/quest/members/contact/contact.npcs.toml @@ -13,11 +13,6 @@ hunt_mode = "cowardly" slayer_xp = 137.0 categories = ["scabarites"] examine = "A huge scarab." -stab_defence = 70 -slash_defence = 99 -crush_defence = 99 -magic_defence = 159 -range_defence = 149 [giant_scarab] id = 6770 diff --git a/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml b/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml index 194942c182..56c2464bff 100644 --- a/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml +++ b/data/quest/members/defender_of_varrock/defender_of_varrock.npcs.toml @@ -31,10 +31,7 @@ str = 1 def = 115 range = 72 max_hit_range = 86 -stab_defence = 20 -slash_defence = 20 -range_defence = 10 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [armoured_zombie_defender_of_varrock_2] id = 8160 @@ -46,10 +43,7 @@ str = 1 def = 115 range = 72 max_hit_range = 86 -stab_defence = 20 -slash_defence = 20 -range_defence = 10 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [armoured_zombie_defender_of_varrock_3] id = 8161 @@ -61,10 +55,7 @@ str = 1 def = 115 range = 72 max_hit_range = 86 -stab_defence = 20 -slash_defence = 20 -range_defence = 10 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [armoured_zombie_defender_of_varrock_4] id = 8162 @@ -76,10 +67,7 @@ str = 1 def = 115 range = 72 max_hit_range = 86 -stab_defence = 20 -slash_defence = 20 -range_defence = 10 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [armoured_zombie_defender_of_varrock_5] id = 8163 @@ -91,10 +79,7 @@ str = 1 def = 115 range = 72 max_hit_range = 86 -stab_defence = 20 -slash_defence = 20 -range_defence = 10 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [arrav_defender_of_varrock] id = 8169 diff --git a/data/quest/members/desert_treasure/desert_treasure.npcs.toml b/data/quest/members/desert_treasure/desert_treasure.npcs.toml index ca376fbf53..f0b198f1b6 100644 --- a/data/quest/members/desert_treasure/desert_treasure.npcs.toml +++ b/data/quest/members/desert_treasure/desert_treasure.npcs.toml @@ -34,9 +34,6 @@ max_hit_melee = 360 xp_bonus = 1.5 hunt_mode = "cowardly" examine = "Zamorak's warrior of fire." -stab_defence = 100 -slash_defence = 100 -crush_defence = 100 [flambeed_normal] id = 3494 @@ -50,11 +47,6 @@ attack_bonus = 100 xp_bonus = 7.5 hunt_mode = "cowardly" examine = "Will give you a beating as well as indigestion." -stab_defence = 50 -slash_defence = 50 -crush_defence = 5 -magic_defence = 5 -range_defence = 50 [kamil_normal] id = 1913 @@ -72,9 +64,6 @@ hunt_mode = "cowardly" slayer_xp = 146.0 categories = ["ice_warriors"] examine = "Ice warrior." -stab_defence = 35 -slash_defence = 60 -crush_defence = 35 [stranger_desert_treasure] id = 1919 diff --git a/data/quest/members/dwarf_cannon/dwarven_outpost.npcs.toml b/data/quest/members/dwarf_cannon/dwarven_outpost.npcs.toml index 34cf99e81c..cfb010f3a9 100644 --- a/data/quest/members/dwarf_cannon/dwarven_outpost.npcs.toml +++ b/data/quest/members/dwarf_cannon/dwarven_outpost.npcs.toml @@ -22,11 +22,6 @@ str = 18 def = 14 attack_bonus = 4 max_hit_stab = 30 -stab_defence = 3 -slash_defence = 4 -crush_defence = 4 -magic_defence = 2 -range_defence = 3 [guard_dwarven_outpost_2] id = 4258 @@ -40,11 +35,6 @@ str = 18 def = 14 attack_bonus = 4 max_hit_stab = 30 -stab_defence = 3 -slash_defence = 4 -crush_defence = 4 -magic_defence = 2 -range_defence = 3 [goblin_dwarven_outpost] id = 4261 @@ -54,9 +44,4 @@ drop_table = "goblin" combat_def = "goblin" hitpoints = 50 max_hit_crush = 10 -stab_defence = -15 -slash_defence = -15 -crush_defence = -15 -magic_defence = -15 -range_defence = -15 diff --git a/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.npcs.toml b/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.npcs.toml index 0c4988e7ba..c47d4c5089 100644 --- a/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.npcs.toml +++ b/data/quest/members/fairy_tale_iii/orks_rift/orks_rift.npcs.toml @@ -7,7 +7,7 @@ att = 98 str = 98 def = 77 max_hit_crush = 112 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [ivory_gromblod_cursed] id = 11353 @@ -18,7 +18,7 @@ att = 92 str = 92 def = 92 range = 92 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [ivory_breegth_cursed] id = 11354 @@ -31,7 +31,7 @@ def = 113 mage = 113 max_hit_magic = 114 combat_def = "ivory_bre_egth_cursed" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [farming_patch_orks_rift] id = 11383 diff --git a/data/quest/members/fremennik_isles/fremennik_isles.npcs.toml b/data/quest/members/fremennik_isles/fremennik_isles.npcs.toml index d46476a064..89c6d415d0 100644 --- a/data/quest/members/fremennik_isles/fremennik_isles.npcs.toml +++ b/data/quest/members/fremennik_isles/fremennik_isles.npcs.toml @@ -11,8 +11,3 @@ hunt_mode = "cowardly" slayer_xp = 161.0 categories = ["trolls"] examine = "An impressive looking troll." -stab_defence = 45 -slash_defence = 45 -crush_defence = 45 -magic_defence = 2000 -range_defence = 2000 diff --git a/data/quest/members/fremennik_trials/fremennik_trials.npcs.toml b/data/quest/members/fremennik_trials/fremennik_trials.npcs.toml index 95aa9daff4..3b200c42f4 100644 --- a/data/quest/members/fremennik_trials/fremennik_trials.npcs.toml +++ b/data/quest/members/fremennik_trials/fremennik_trials.npcs.toml @@ -8,11 +8,6 @@ style = "melee" max_hit_melee = 30 hunt_mode = "cowardly" examine = "Your challenge awaits!" -stab_defence = 20 -slash_defence = 20 -crush_defence = 20 -magic_defence = 20 -range_defence = 20 [the_draugen] id = 1279 @@ -25,8 +20,3 @@ max_hit_melee = 70 xp_bonus = 2.5 hunt_mode = "cowardly" examine = "A fearful spirit of the drowned." -stab_defence = 100 -slash_defence = 100 -crush_defence = 100 -magic_defence = 500 -range_defence = 500 diff --git a/data/quest/members/ghosts_ahoy/ghosts_ahoy.npcs.toml b/data/quest/members/ghosts_ahoy/ghosts_ahoy.npcs.toml index 8826631c8a..f86b455380 100644 --- a/data/quest/members/ghosts_ahoy/ghosts_ahoy.npcs.toml +++ b/data/quest/members/ghosts_ahoy/ghosts_ahoy.npcs.toml @@ -11,7 +11,3 @@ slayer_xp = 32.0 categories = ["scorpions"] drop_table = "giant_lobster_ghosts_ahoy" examine = "An extremely vicious lobster." -stab_defence = 5 -slash_defence = 15 -crush_defence = 15 -range_defence = 5 diff --git a/data/quest/members/grim_tales/grim_tales.npcs.toml b/data/quest/members/grim_tales/grim_tales.npcs.toml index cc35b65b9f..f2e0af61ac 100644 --- a/data/quest/members/grim_tales/grim_tales.npcs.toml +++ b/data/quest/members/grim_tales/grim_tales.npcs.toml @@ -10,11 +10,6 @@ max_hit_melee = 110 xp_bonus = 2.5 respawn_delay = 10 examine = "A very odd looking creature." -stab_defence = 45 -slash_defence = 70 -crush_defence = 60 -magic_defence = 60 -range_defence = 55 [glod_normal] id = 5996 @@ -28,8 +23,3 @@ xp_bonus = 0.5 hunt_mode = "cowardly" immune_poison = true examine = "A cloud giant." -stab_defence = 105 -slash_defence = 110 -crush_defence = 130 -magic_defence = 125 -range_defence = 100 diff --git a/data/quest/members/haunted_mine/abandoned_mine.npcs.toml b/data/quest/members/haunted_mine/abandoned_mine.npcs.toml index f60b6fcded..4e3ca9341d 100644 --- a/data/quest/members/haunted_mine/abandoned_mine.npcs.toml +++ b/data/quest/members/haunted_mine/abandoned_mine.npcs.toml @@ -19,11 +19,6 @@ slayer_xp = 30.0 hunt_mode = "cowardly" categories = ["ghosts", "undead"] examine = "Eeek! A ghost!" -stab_defence = 5 -slash_defence = 5 -crush_defence = 5 -magic_defence = -5 -range_defence = 5 [haze_abandoned_mine] id = 1537 @@ -51,8 +46,3 @@ slayer_xp = 39.0 categories = ["skeletons"] drop_table = "skeletal_miner" examine = "I don't think the pickaxe is for hitting rocks." -stab_defence = 9 -slash_defence = 11 -crush_defence = -2 -magic_defence = 1 -range_defence = 4 diff --git a/data/quest/members/haunted_mine/haunted_mine.npcs.toml b/data/quest/members/haunted_mine/haunted_mine.npcs.toml index ba24515387..ed56db3fe5 100644 --- a/data/quest/members/haunted_mine/haunted_mine.npcs.toml +++ b/data/quest/members/haunted_mine/haunted_mine.npcs.toml @@ -30,10 +30,7 @@ att = 17 str = 17 def = 17 max_hit_crush = 30 -stab_defence = 50 -slash_defence = 40 -range_defence = 40 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [treus_dayth] id = 1540 @@ -49,8 +46,3 @@ slayer_xp = 100.0 categories = ["ghosts"] immune_poison = true examine = "Eeek! A big ghost!" -stab_defence = 5 -slash_defence = 5 -crush_defence = 5 -magic_defence = -5 -range_defence = 5 diff --git a/data/quest/members/monkey_madness/monkey_madness.npcs.toml b/data/quest/members/monkey_madness/monkey_madness.npcs.toml index 6a4c0182b3..bd82c8929b 100644 --- a/data/quest/members/monkey_madness/monkey_madness.npcs.toml +++ b/data/quest/members/monkey_madness/monkey_madness.npcs.toml @@ -13,5 +13,3 @@ attack_bonus = 50 xp_bonus = 7.5 hunt_mode = "cowardly" examine = "A Greater Jungle Demon. A magical aura emanates from its hide." -slash_defence = 50 -magic_defence = 50 diff --git a/data/quest/members/mournings_end_part_2/mournings_end_part_2.npcs.toml b/data/quest/members/mournings_end_part_2/mournings_end_part_2.npcs.toml index a4cce14208..464f25b765 100644 --- a/data/quest/members/mournings_end_part_2/mournings_end_part_2.npcs.toml +++ b/data/quest/members/mournings_end_part_2/mournings_end_part_2.npcs.toml @@ -4,11 +4,6 @@ categories = ["shadow_creatures"] examine = "A shadow." drop_table = "empty" hitpoints = 730 -stab_defence = 30 -slash_defence = 30 -crush_defence = 30 -magic_defence = 30 -range_defence = 30 [arianwyn] id = 8952 diff --git a/data/quest/members/my_arms_big_adventure/my_arms_big_adventure.npcs.toml b/data/quest/members/my_arms_big_adventure/my_arms_big_adventure.npcs.toml index e344995feb..ed1b6744c3 100644 --- a/data/quest/members/my_arms_big_adventure/my_arms_big_adventure.npcs.toml +++ b/data/quest/members/my_arms_big_adventure/my_arms_big_adventure.npcs.toml @@ -9,7 +9,6 @@ max_hit_melee = 80 slayer_xp = 50.0 categories = ["birds"] examine = "A mountain-dwelling bird. Cute, but vicious." -magic_defence = 150 [giant_roc_normal] id = 4972 @@ -27,4 +26,3 @@ slayer_xp = 250.0 categories = ["birds"] drop_table = "bones" examine = "A very, very large mountain-dwelling bird." -magic_defence = 150 diff --git a/data/quest/members/one_small_favour/one_small_favour.npcs.toml b/data/quest/members/one_small_favour/one_small_favour.npcs.toml index 112095b03e..0f92a0b73c 100644 --- a/data/quest/members/one_small_favour/one_small_favour.npcs.toml +++ b/data/quest/members/one_small_favour/one_small_favour.npcs.toml @@ -15,8 +15,3 @@ attack_bonus = 10 xp_bonus = 3.0 hunt_mode = "cowardly" examine = "This monster totally rocks!" -stab_defence = 50 -slash_defence = 50 -crush_defence = 5 -magic_defence = 5 -range_defence = 50 diff --git a/data/quest/members/plague_city/plague_city.npcs.toml b/data/quest/members/plague_city/plague_city.npcs.toml index fbbe0a6edf..3a25cd5d08 100644 --- a/data/quest/members/plague_city/plague_city.npcs.toml +++ b/data/quest/members/plague_city/plague_city.npcs.toml @@ -15,9 +15,6 @@ drop_table = "mourner" combat_def = "guard" attack_bonus = 6 max_hit_crush = 20 -stab_defence = 5 -slash_defence = 5 -crush_defence = 7 [alrena] id = 710 diff --git a/data/quest/members/recipe_for_disaster/recipe_for_disaster.npcs.toml b/data/quest/members/recipe_for_disaster/recipe_for_disaster.npcs.toml index c0370a8811..5a5382c295 100644 --- a/data/quest/members/recipe_for_disaster/recipe_for_disaster.npcs.toml +++ b/data/quest/members/recipe_for_disaster/recipe_for_disaster.npcs.toml @@ -65,9 +65,6 @@ attack_bonus = 50 xp_bonus = 1.0 hunt_mode = "cowardly" examine = "Bad for your teeth...and the rest of your body too." -stab_defence = 10 -slash_defence = 150 -crush_defence = 150 [dessous_normal] id = 1914 @@ -84,9 +81,6 @@ hunt_mode = "cowardly" slayer_xp = 220.0 categories = ["vampyres"] examine = "A vampyre warrior of Zamorak." -stab_defence = 10 -slash_defence = 150 -crush_defence = 150 [gelatinnoth_mother_white] id = 3497 @@ -102,11 +96,6 @@ max_hit_magic = 200 xp_bonus = 7.5 hunt_mode = "cowardly" examine = "Deadly AND fruity!" -stab_defence = 150 -slash_defence = 150 -crush_defence = 150 -magic_defence = 50 -range_defence = 50 [gelatinnoth_mother_orange] id = 3498 @@ -150,10 +139,4 @@ xp_bonus = 0.5 ranged_strength = 55 hunt_mode = "cowardly" immune_poison = true -examine = "Pure evil lightly whipped with a juicy cherry on top." -attack_bonus = 134 -stab_defence = 150 -slash_defence = 150 -crush_defence = 150 -magic_defence = 150 -range_defence = 150 \ No newline at end of file +examine = "Pure evil lightly whipped with a juicy cherry on top." \ No newline at end of file diff --git a/data/quest/members/rocking_out/battle_of_the_archipelago/battle_of_the_archipelago.npcs.toml b/data/quest/members/rocking_out/battle_of_the_archipelago/battle_of_the_archipelago.npcs.toml index 5cc64dbf79..dd974097e0 100644 --- a/data/quest/members/rocking_out/battle_of_the_archipelago/battle_of_the_archipelago.npcs.toml +++ b/data/quest/members/rocking_out/battle_of_the_archipelago/battle_of_the_archipelago.npcs.toml @@ -3,11 +3,6 @@ id = 7860 drop_table = "bones" combat_def = "seagull" hitpoints = 30 -stab_defence = 20 -slash_defence = 10 -crush_defence = 16 -magic_defence = 8 -range_defence = 4 [jack_battle_of_the_archipelago] id = 7861 diff --git a/data/quest/members/slug_menace/slug_menace.npcs.toml b/data/quest/members/slug_menace/slug_menace.npcs.toml index 48acc12f64..be26d53267 100644 --- a/data/quest/members/slug_menace/slug_menace.npcs.toml +++ b/data/quest/members/slug_menace/slug_menace.npcs.toml @@ -9,8 +9,3 @@ max_hit_melee = 60 hunt_mode = "cowardly" immune_poison = true examine = "A child of aquatic evil." -stab_defence = 30 -slash_defence = 30 -crush_defence = 30 -magic_defence = 99 -range_defence = 99 diff --git a/data/quest/members/spirits_of_the_elid/spirits_of_the_elid.npcs.toml b/data/quest/members/spirits_of_the_elid/spirits_of_the_elid.npcs.toml index 6677eab9cb..97495368bb 100644 --- a/data/quest/members/spirits_of_the_elid/spirits_of_the_elid.npcs.toml +++ b/data/quest/members/spirits_of_the_elid/spirits_of_the_elid.npcs.toml @@ -9,11 +9,6 @@ max_hit_melee = 40 xp_bonus = 0.5 hunt_mode = "cowardly" examine = "An animated clay statue." -stab_defence = 300 -slash_defence = 300 -crush_defence = 1 -magic_defence = 300 -range_defence = 300 [grey_golem] id = 3028 @@ -26,11 +21,6 @@ max_hit_melee = 40 xp_bonus = 0.5 hunt_mode = "cowardly" examine = "An animated clay statue." -stab_defence = 300 -slash_defence = 1 -crush_defence = 300 -magic_defence = 300 -range_defence = 300 [white_golem] id = 3027 @@ -43,8 +33,3 @@ max_hit_melee = 40 xp_bonus = 0.5 hunt_mode = "cowardly" examine = "An animated clay statue." -stab_defence = 1 -slash_defence = 300 -crush_defence = 300 -magic_defence = 300 -range_defence = 300 diff --git a/data/quest/members/swan_song/swan_song.npcs.toml b/data/quest/members/swan_song/swan_song.npcs.toml index c522f17c7f..764fa59295 100644 --- a/data/quest/members/swan_song/swan_song.npcs.toml +++ b/data/quest/members/swan_song/swan_song.npcs.toml @@ -13,10 +13,6 @@ attack_bonus = 100 xp_bonus = 7.5 hunt_mode = "cowardly" examine = "The mother of all sea trolls!" -stab_defence = 20 -slash_defence = 40 -crush_defence = 40 -magic_defence = 40 [sea_troll_level_65] id = 3841 diff --git a/data/quest/members/troll_stronghold/troll_stronghold.npcs.toml b/data/quest/members/troll_stronghold/troll_stronghold.npcs.toml index f100f89e8f..820761ef5c 100644 --- a/data/quest/members/troll_stronghold/troll_stronghold.npcs.toml +++ b/data/quest/members/troll_stronghold/troll_stronghold.npcs.toml @@ -12,8 +12,3 @@ xp_bonus = 0.5 slayer_xp = 126.0 categories = ["trolls"] examine = "An unusually large troll." -stab_defence = 25 -slash_defence = 25 -crush_defence = 40 -magic_defence = 200 -range_defence = 200 diff --git a/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml b/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml index af9d39de94..eec722457c 100644 --- a/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml +++ b/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.npcs.toml @@ -8,7 +8,7 @@ att = 80 str = 80 def = 175 max_hit_crush = 94 -hunt_mode = "aggressive" +hunt_mode = "cowardly" [elite_dark_ranger_black_knights_catacombs] id = 8316 @@ -21,7 +21,7 @@ def = 88 range = 76 max_hit_range = 90 combat_def = "elite_dark_ranger" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [elite_dark_mage_black_knights_catacombs] id = 8320 @@ -34,7 +34,7 @@ def = 80 mage = 80 max_hit_magic = 190 combat_def = "elite_dark_mage" -hunt_mode = "aggressive" +hunt_mode = "cowardly" [elite_black_knight_black_knights_catacombs] id = 8328 diff --git a/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml b/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml index af8b6357a1..045542af25 100644 --- a/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml +++ b/data/quest/members/while_guthix_sleeps/luciens_camp/luciens_camp.npcs.toml @@ -39,10 +39,6 @@ att = 60 str = 60 def = 69 max_hit_crush = 74 -stab_defence = 30 -slash_defence = 30 -magic_defence = 100 -range_defence = 100 [undead_troll_luciens_camp_3] id = 8379 @@ -91,10 +87,6 @@ att = 60 str = 60 def = 250 max_hit_crush = 74 -stab_defence = 30 -slash_defence = 30 -magic_defence = 100 -range_defence = 100 [undead_troll_luciens_camp_7] id = 8383 @@ -119,10 +111,6 @@ att = 60 str = 60 def = 69 max_hit_crush = 74 -stab_defence = 30 -slash_defence = 30 -magic_defence = 100 -range_defence = 100 [undead_troll_luciens_camp_9] id = 8385 @@ -135,10 +123,6 @@ att = 60 str = 60 def = 69 max_hit_crush = 74 -stab_defence = 30 -slash_defence = 30 -magic_defence = 100 -range_defence = 100 [undead_troll_luciens_camp_10] id = 8386 @@ -187,10 +171,6 @@ att = 60 str = 60 def = 69 max_hit_crush = 74 -stab_defence = 30 -slash_defence = 30 -magic_defence = 100 -range_defence = 100 [undead_troll_luciens_camp_14] id = 8390 @@ -215,10 +195,6 @@ att = 60 str = 60 def = 250 max_hit_crush = 74 -stab_defence = 30 -slash_defence = 30 -magic_defence = 100 -range_defence = 100 [undead_troll_luciens_camp_16] id = 8392 diff --git a/data/quest/members/zogre_flesh_eaters/zogre_flesh_eaters.npcs.toml b/data/quest/members/zogre_flesh_eaters/zogre_flesh_eaters.npcs.toml index 22aa14ce23..4cf37a2483 100644 --- a/data/quest/members/zogre_flesh_eaters/zogre_flesh_eaters.npcs.toml +++ b/data/quest/members/zogre_flesh_eaters/zogre_flesh_eaters.npcs.toml @@ -14,9 +14,6 @@ slayer_xp = 100.0 categories = ["zombies"] drop_table = "slash_bash" examine = "A powerful looking Zogre." -stab_defence = 30 -slash_defence = 30 -crush_defence = 30 [zogre_sithik_man] id = 2061 diff --git a/data/skill/dungeoneering/dungeoneering.npcs.toml b/data/skill/dungeoneering/dungeoneering.npcs.toml index da116138f5..f36f7b2c34 100644 --- a/data/skill/dungeoneering/dungeoneering.npcs.toml +++ b/data/skill/dungeoneering/dungeoneering.npcs.toml @@ -101,11 +101,5 @@ def = 8 mage = 8 max_hit_magic = 40 combat_def = "luminescent_icefiend" -attack_bonus = 4 -stab_defence = 6 -slash_defence = 37 -crush_defence = 37 -magic_defence = 3 -range_defence = 6 -hunt_mode = "aggressive" +hunt_mode = "cowardly" diff --git a/data/skill/summoning/summoning.npcs.toml b/data/skill/summoning/summoning.npcs.toml index 26eab393ad..b1d00725b1 100644 --- a/data/skill/summoning/summoning.npcs.toml +++ b/data/skill/summoning/summoning.npcs.toml @@ -387,7 +387,6 @@ combat_def = "granite_lobster_familiar" summoning_beast_of_burden = 1 summoning_beast_of_burden_capacity = 30 interacts = false -crush_defence = 10 [macaw_familiar] summoning_time_minutes = 31 @@ -817,11 +816,6 @@ range = 72 mage = 72 combat_def = "fire_titan_familiar" interacts = false -stab_defence = 25 -slash_defence = 25 -crush_defence = 25 -magic_defence = -25 -range_defence = 50 [moss_titan_familiar] summoning_time_minutes = 58 @@ -834,11 +828,6 @@ range = 72 mage = 72 combat_def = "moss_titan_familiar" interacts = false -stab_defence = 50 -slash_defence = 50 -crush_defence = 50 -magic_defence = 25 -range_defence = -25 [ice_titan_familiar] summoning_time_minutes = 64 @@ -1833,7 +1822,6 @@ def = 64 range = 72 mage = 72 combat_def = "granite_lobster_familiar" -crush_defence = 10 [praying_mantis_familiar_combat] id = 6799 @@ -1944,11 +1932,6 @@ def = 64 range = 72 mage = 72 combat_def = "fire_titan_familiar" -stab_defence = 25 -slash_defence = 25 -crush_defence = 25 -magic_defence = -25 -range_defence = 50 [moss_titan_familiar_combat] id = 7358 @@ -1960,11 +1943,6 @@ def = 64 range = 72 mage = 72 combat_def = "moss_titan_familiar" -stab_defence = 50 -slash_defence = 50 -crush_defence = 50 -magic_defence = 25 -range_defence = -25 [ice_titan_familiar_combat] id = 7360 @@ -1976,11 +1954,6 @@ def = 64 range = 72 mage = 72 combat_def = "ice_titan_familiar" -stab_defence = -15 -slash_defence = -15 -crush_defence = -15 -magic_defence = 50 -range_defence = 25 [lava_titan_familiar_combat] id = 7342 From 4e23359c5b5f850dec5ed15e26b08d91de09d84a Mon Sep 17 00:00:00 2001 From: Harley Gilpin Date: Fri, 7 Aug 2026 05:59:30 -0700 Subject: [PATCH 11/13] Add combat animations and sounds from 2009scape data 114 combat definitions authored earlier in this branch had no attack/defend/death animations. Ported from 2009scape's npc_configs.json (rev 530 data; animation ids are stable across revisions for pre-existing content - goblin's ported defend/death ids match void's hand-authored entries exactly). 266 animation and 57 sound entries added next to each combat definition, including per-style attack anims where the source distinguishes magic/ranged. 35 definitions remain without animations: post-2009 content absent from the source (blood reaver, elite dark warriors, cursed ivory bosses, Temple Trekking shadows). --- .../asgarnia/burthorpe/burthorpe.anims.toml | 6 ++ .../asgarnia/burthorpe/burthorpe.combat.toml | 3 + .../melzars_maze/melzars_maze.anims.toml | 6 ++ .../melzars_maze/melzars_maze.combat.toml | 3 + .../ice_queens_lair.anims.toml | 4 ++ .../ice_queens_lair.combat.toml | 2 + .../miscellania/miscellania.anims.toml | 57 ++++++++++++++++ .../miscellania/miscellania.combat.toml | 25 +++++++ .../miscellania/miscellania.sounds.toml | 18 +++++ .../pirates_cove/pirates_cove.anims.toml | 15 +++++ .../pirates_cove/pirates_cove.combat.toml | 6 ++ .../rellekka_hunter_area.anims.toml | 15 +++++ .../rellekka_hunter_area.combat.toml | 6 ++ .../rellekka/rellekka.anims.toml | 66 +++++++++++++++++++ .../rellekka/rellekka.combat.toml | 37 +++++++++++ .../rellekka/rellekka.sounds.toml | 42 ++++++++++++ .../waterbirth_island.anims.toml | 6 ++ .../waterbirth_island.combat.toml | 2 + .../kandarin/ape_atoll/ape_atoll.anims.toml | 18 +++++ .../kandarin/ape_atoll/ape_atoll.combat.toml | 9 +++ .../kandarin/ape_atoll/ape_atoll.sounds.toml | 6 ++ .../snake_pit/snake_pit.anims.toml | 4 ++ .../snake_pit/snake_pit.combat.toml | 5 ++ .../snake_pit/snake_pit.sounds.toml | 6 ++ .../ardougne/east_ardougne.anims.toml | 6 ++ .../ardougne/east_ardougne.combat.toml | 3 + .../ardougne/ibans_lair/ibans_lair.anims.toml | 37 +++++++++++ .../ibans_lair/ibans_lair.combat.toml | 13 ++++ .../monastery/ardougne_monastery.anims.toml | 4 ++ .../monastery/ardougne_monastery.combat.toml | 5 ++ .../monastery/ardougne_monastery.sounds.toml | 6 ++ .../sewers/ardougne_sewers.anims.toml | 19 ++++++ .../sewers/ardougne_sewers.combat.toml | 10 +++ .../sewers/ardougne_sewers.sounds.toml | 6 ++ .../underground_pass.anims.toml | 39 +++++++++++ .../underground_pass.combat.toml | 14 ++++ .../witchaven_dungeon.anims.toml | 4 ++ .../witchaven_dungeon.combat.toml | 2 + .../battlefield/battlefield.anims.toml | 10 +++ .../battlefield/battlefield.combat.toml | 7 ++ .../battlefield/battlefield.sounds.toml | 6 ++ .../feldip_hills/feldip_hills.anims.toml | 15 +++++ .../feldip_hills/feldip_hills.combat.toml | 5 ++ .../gu_tanoth/gu_tanoth.anims.toml | 6 ++ .../gu_tanoth/gu_tanoth.combat.toml | 6 ++ .../gu_tanoth/gu_tanoth.sounds.toml | 6 ++ .../underwater_cave.anims.toml | 4 ++ .../underwater_cave.combat.toml | 2 + .../tower_of_life/tower_of_life.anims.toml | 10 +++ .../tower_of_life/tower_of_life.combat.toml | 4 ++ .../yanille_agility_dungeon.anims.toml | 4 ++ .../yanille_agility_dungeon.combat.toml | 2 + data/area/kandarin/yanille/yanille.anims.toml | 16 ++++- .../area/kandarin/yanille/yanille.combat.toml | 5 ++ data/area/karamja/crandor/crandor.anims.toml | 6 ++ data/area/karamja/crandor/crandor.combat.toml | 3 + data/area/karamja/karamja.anims.toml | 31 ++++++++- data/area/karamja/karamja.combat.toml | 10 +++ .../caves/kharazi_caves.anims.toml | 13 ++++ .../caves/kharazi_caves.combat.toml | 5 ++ .../kharazi_jungle/kharazi_jungle.anims.toml | 10 +++ .../kharazi_jungle/kharazi_jungle.combat.toml | 4 ++ .../ship_yard/karamja_ship_yard.anims.toml | 4 ++ .../ship_yard/karamja_ship_yard.combat.toml | 2 + .../tzhaar_city/tzhaar_city.anims.toml | 7 +- .../tzhaar_city/tzhaar_city.combat.toml | 2 + .../agility_pyramid.anims.toml | 6 ++ .../agility_pyramid.combat.toml | 6 ++ .../agility_pyramid.sounds.toml | 6 ++ .../bedabin_camp/bedabin_camp.anims.toml | 4 ++ .../bedabin_camp/bedabin_camp.combat.toml | 2 + .../harmony_island/harmony.anims.toml | 4 ++ .../harmony_island/harmony.combat.toml | 2 + .../kalphite_hive/kalphite_hive.combat.toml | 3 + .../kharidian_desert.anims.toml | 6 ++ .../kharidian_desert.combat.toml | 2 + .../mining_camp/desert_mining_camp.anims.toml | 10 +++ .../desert_mining_camp.combat.toml | 4 ++ .../kharidian_desert/nardah/nardah.anims.toml | 24 +++++++ .../nardah/nardah.combat.toml | 9 +++ .../sophanem/sophanem.anims.toml | 7 +- .../sophanem/sophanem.combat.toml | 2 + .../scabaras_dungeon.anims.toml | 22 +++++++ .../scabaras_dungeon.combat.toml | 8 +++ .../kharidian_desert/ullek/ullek.anims.toml | 16 +++++ .../kharidian_desert/ullek/ullek.combat.toml | 12 ++++ .../dorgesh_kaan_agility_course.anims.toml | 13 ++++ .../dorgesh_kaan_agility_course.combat.toml | 5 ++ .../combat_hall/combat_hall.anims.toml | 10 +++ .../combat_hall/combat_hall.combat.toml | 4 ++ .../tolnas_rift/tolnas_rift.anims.toml | 28 ++++++++ .../tolnas_rift/tolnas_rift.combat.toml | 22 +++++++ .../tolnas_rift/tolnas_rift.sounds.toml | 33 ++++++++++ .../morytania/darkmeyer/darkmeyer.anims.toml | 2 + .../morytania/darkmeyer/darkmeyer.combat.toml | 1 + .../dungeon/fenkenstrains_dungeon.anims.toml | 6 ++ .../dungeon/fenkenstrains_dungeon.combat.toml | 3 + .../lair_of_tarn_razorlor.anims.toml | 4 ++ .../lair_of_tarn_razorlor.combat.toml | 2 + .../tunnels/meiyerditch_tunnels.anims.toml | 13 ++++ .../tunnels/meiyerditch_tunnels.combat.toml | 5 ++ .../alices_farm/alices_farm.anims.toml | 6 ++ .../alices_farm/alices_farm.combat.toml | 3 + .../enchanted_valley.anims.toml | 4 ++ .../enchanted_valley.combat.toml | 5 ++ .../enchanted_valley.sounds.toml | 6 ++ .../poison_waste_slayer_dungeon.anims.toml | 4 ++ .../poison_waste_slayer_dungeon.combat.toml | 2 + .../death_plateau/death_plateau.anims.toml | 24 +++++++ .../death_plateau/death_plateau.combat.toml | 9 +++ .../wilderness_bandit_camp.anims.toml | 16 +++++ .../wilderness_bandit_camp.combat.toml | 6 ++ data/area/wilderness/wilderness.anims.toml | 6 ++ data/area/wilderness/wilderness.combat.toml | 2 + data/entity/npc/animal/dog/dog.anims.toml | 9 +++ data/entity/npc/animal/dog/dog.combat.toml | 3 + .../boss/giant_mole/giant_mole.combat.toml | 6 ++ .../clock_tower_dungeon.anims.toml | 4 ++ .../clock_tower_dungeon.combat.toml | 2 + .../defender_of_varrock.anims.toml | 4 ++ .../defender_of_varrock.combat.toml | 2 + .../dream_mentor/dream_mentor.anims.toml | 4 ++ .../dream_mentor/dream_mentor.combat.toml | 2 + .../mournings_end_part_2.anims.toml | 4 ++ .../mournings_end_part_2.combat.toml | 2 + 125 files changed, 1177 insertions(+), 4 deletions(-) create mode 100644 data/area/asgarnia/burthorpe/burthorpe.anims.toml create mode 100644 data/area/asgarnia/rimmington/melzars_maze/melzars_maze.anims.toml create mode 100644 data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.anims.toml create mode 100644 data/area/fremennik_province/pirates_cove/pirates_cove.anims.toml create mode 100644 data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.anims.toml create mode 100644 data/area/fremennik_province/rellekka/rellekka.sounds.toml create mode 100644 data/area/kandarin/ape_atoll/ape_atoll.sounds.toml create mode 100644 data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.anims.toml create mode 100644 data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.sounds.toml create mode 100644 data/area/kandarin/ardougne/east_ardougne.anims.toml create mode 100644 data/area/kandarin/ardougne/ibans_lair/ibans_lair.anims.toml create mode 100644 data/area/kandarin/ardougne/monastery/ardougne_monastery.anims.toml create mode 100644 data/area/kandarin/ardougne/monastery/ardougne_monastery.sounds.toml create mode 100644 data/area/kandarin/ardougne/sewers/ardougne_sewers.anims.toml create mode 100644 data/area/kandarin/ardougne/sewers/ardougne_sewers.sounds.toml create mode 100644 data/area/kandarin/ardougne/underground_pass/underground_pass.anims.toml create mode 100644 data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.anims.toml create mode 100644 data/area/kandarin/battlefield/battlefield.anims.toml create mode 100644 data/area/kandarin/battlefield/battlefield.sounds.toml create mode 100644 data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.anims.toml create mode 100644 data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.sounds.toml create mode 100644 data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.anims.toml create mode 100644 data/area/kandarin/tower_of_life/tower_of_life.anims.toml create mode 100644 data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.anims.toml create mode 100644 data/area/karamja/crandor/crandor.anims.toml create mode 100644 data/area/karamja/kharazi_jungle/caves/kharazi_caves.anims.toml create mode 100644 data/area/karamja/kharazi_jungle/kharazi_jungle.anims.toml create mode 100644 data/area/karamja/ship_yard/karamja_ship_yard.anims.toml create mode 100644 data/area/kharidian_desert/agility_pyramid/agility_pyramid.anims.toml create mode 100644 data/area/kharidian_desert/agility_pyramid/agility_pyramid.sounds.toml create mode 100644 data/area/kharidian_desert/bedabin_camp/bedabin_camp.anims.toml create mode 100644 data/area/kharidian_desert/harmony_island/harmony.anims.toml create mode 100644 data/area/kharidian_desert/mining_camp/desert_mining_camp.anims.toml create mode 100644 data/area/kharidian_desert/nardah/nardah.anims.toml create mode 100644 data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.anims.toml create mode 100644 data/area/kharidian_desert/ullek/ullek.anims.toml create mode 100644 data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.anims.toml create mode 100644 data/area/misthalin/lumbridge/combat_hall/combat_hall.anims.toml create mode 100644 data/area/misthalin/varrock/tolnas_rift/tolnas_rift.anims.toml create mode 100644 data/area/misthalin/varrock/tolnas_rift/tolnas_rift.sounds.toml create mode 100644 data/area/morytania/darkmeyer/darkmeyer.anims.toml create mode 100644 data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.anims.toml create mode 100644 data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.anims.toml create mode 100644 data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.anims.toml create mode 100644 data/area/morytania/port_phasmatys/alices_farm/alices_farm.anims.toml create mode 100644 data/area/realm/enchanted_valley/enchanted_valley.anims.toml create mode 100644 data/area/realm/enchanted_valley/enchanted_valley.sounds.toml create mode 100644 data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.anims.toml create mode 100644 data/area/troll_country/death_plateau/death_plateau.anims.toml create mode 100644 data/area/wilderness/bandit_camp/wilderness_bandit_camp.anims.toml create mode 100644 data/quest/members/clock_tower/clock_tower_dungeon.anims.toml create mode 100644 data/quest/members/defender_of_varrock/defender_of_varrock.anims.toml create mode 100644 data/quest/members/dream_mentor/dream_mentor.anims.toml create mode 100644 data/quest/members/mournings_end_part_2/mournings_end_part_2.anims.toml diff --git a/data/area/asgarnia/burthorpe/burthorpe.anims.toml b/data/area/asgarnia/burthorpe/burthorpe.anims.toml new file mode 100644 index 0000000000..49cac164ed --- /dev/null +++ b/data/area/asgarnia/burthorpe/burthorpe.anims.toml @@ -0,0 +1,6 @@ +[archer_defend] +id = 404 +[archer_death] +id = 9055 +[archer_attack] +id = 426 diff --git a/data/area/asgarnia/burthorpe/burthorpe.combat.toml b/data/area/asgarnia/burthorpe/burthorpe.combat.toml index 5b5dd6ca09..1def85f830 100644 --- a/data/area/asgarnia/burthorpe/burthorpe.combat.toml +++ b/data/area/asgarnia/burthorpe/burthorpe.combat.toml @@ -10,7 +10,10 @@ target_hit = { offense = "slash", max = 60 } [archer] attack_speed = 4 +defend_anim = "archer_defend" +death_anim = "archer_death" [archer.range] range = 7 target_hit = { offense = "range", max = 40 } +anim = "archer_attack" diff --git a/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.anims.toml b/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.anims.toml new file mode 100644 index 0000000000..40618a1669 --- /dev/null +++ b/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.anims.toml @@ -0,0 +1,6 @@ +[melzar_the_mad_defend] +id = 404 +[melzar_the_mad_death] +id = 9055 +[melzar_the_mad_attack] +id = 423 diff --git a/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.combat.toml b/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.combat.toml index 918f9b579f..a74ff171cf 100644 --- a/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.combat.toml +++ b/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.combat.toml @@ -1,6 +1,9 @@ [melzar_the_mad] attack_speed = 4 +defend_anim = "melzar_the_mad_defend" +death_anim = "melzar_the_mad_death" [melzar_the_mad.melee] range = 1 target_hit = { offense = "crush", max = 50 } +anim = "melzar_the_mad_attack" diff --git a/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.anims.toml b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.anims.toml new file mode 100644 index 0000000000..4c12419a4d --- /dev/null +++ b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.anims.toml @@ -0,0 +1,4 @@ +[ice_queen_death] +id = 836 +[ice_queen_attack] +id = 422 diff --git a/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.combat.toml b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.combat.toml index d4cf2a9c85..7e53bac8ae 100644 --- a/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.combat.toml +++ b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.combat.toml @@ -1,6 +1,8 @@ [ice_queen] attack_speed = 4 +death_anim = "ice_queen_death" [ice_queen.melee] range = 1 target_hit = { offense = "crush", max = 100 } +anim = "ice_queen_attack" diff --git a/data/area/fremennik_province/miscellania/miscellania.anims.toml b/data/area/fremennik_province/miscellania/miscellania.anims.toml index 56a2208832..23ef1582bc 100644 --- a/data/area/fremennik_province/miscellania/miscellania.anims.toml +++ b/data/area/fremennik_province/miscellania/miscellania.anims.toml @@ -6,3 +6,60 @@ id = 6091 [rabbit_death] id = 6092 + +[alrik_defend] +id = 425 + +[alrik_death] +id = 836 + +[alrik_attack] +id = 422 + +[broddi_defend] +id = 425 + +[broddi_death] +id = 836 + +[broddi_attack] +id = 422 + +[ragnvald_defend] +id = 425 + +[ragnvald_death] +id = 836 + +[ragnvald_attack] +id = 810 + +[rannveig_defend] +id = 425 + +[rannveig_death] +id = 836 + +[rannveig_attack] +id = 422 + +[sea_snake_hatchling_death] +id = 3540 + +[sea_snake_hatchling_attack] +id = 3538 + +[sea_snake_young_death] +id = 3540 + +[sea_snake_young_attack] +id = 3538 + +[valgerd_defend] +id = 425 + +[valgerd_death] +id = 836 + +[valgerd_attack] +id = 422 diff --git a/data/area/fremennik_province/miscellania/miscellania.combat.toml b/data/area/fremennik_province/miscellania/miscellania.combat.toml index 3c17e88b7e..4c368e59b6 100644 --- a/data/area/fremennik_province/miscellania/miscellania.combat.toml +++ b/data/area/fremennik_province/miscellania/miscellania.combat.toml @@ -21,10 +21,13 @@ target_hit = { offense = "crush", max = 10 } [alrik] attack_speed = 4 +defend_anim = "alrik_defend" +death_anim = "alrik_death" [alrik.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "alrik_attack" [thorhild] attack_speed = 4 @@ -35,43 +38,65 @@ target_hit = { offense = "crush", max = 10 } [rannveig] attack_speed = 4 +defend_anim = "rannveig_defend" +death_anim = "rannveig_death" [rannveig.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "rannveig_attack" [valgerd] attack_speed = 4 +defend_anim = "valgerd_defend" +death_anim = "valgerd_death" [valgerd.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "valgerd_attack" [broddi] attack_speed = 4 +defend_anim = "broddi_defend" +death_anim = "broddi_death" [broddi.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "broddi_attack" [ragnvald] attack_speed = 4 +defend_anim = "ragnvald_defend" +death_anim = "ragnvald_death" [ragnvald.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "ragnvald_attack" [sea_snake_young] attack_speed = 4 +death_anim = "sea_snake_young_death" +defend_sound = "sea_snake_young_defend" +death_sound = "sea_snake_young_death" [sea_snake_young.melee] range = 1 target_hit = { offense = "crush", max = 80 } +anim = "sea_snake_young_attack" +sound = "sea_snake_young_attack" [sea_snake_hatchling] attack_speed = 4 +death_anim = "sea_snake_hatchling_death" +defend_sound = "sea_snake_hatchling_defend" +death_sound = "sea_snake_hatchling_death" [sea_snake_hatchling.melee] range = 1 target_hit = { offense = "crush", max = 60 } impact_poison = 50 +anim = "sea_snake_hatchling_attack" +sound = "sea_snake_hatchling_attack" diff --git a/data/area/fremennik_province/miscellania/miscellania.sounds.toml b/data/area/fremennik_province/miscellania/miscellania.sounds.toml index 87463d7fc0..7471fc0315 100644 --- a/data/area/fremennik_province/miscellania/miscellania.sounds.toml +++ b/data/area/fremennik_province/miscellania/miscellania.sounds.toml @@ -6,3 +6,21 @@ id = 701 [rabbit_defend] id = 702 + +[sea_snake_hatchling_defend] +id = 3608 + +[sea_snake_hatchling_death] +id = 3610 + +[sea_snake_hatchling_attack] +id = 3609 + +[sea_snake_young_defend] +id = 3608 + +[sea_snake_young_death] +id = 3610 + +[sea_snake_young_attack] +id = 3609 diff --git a/data/area/fremennik_province/pirates_cove/pirates_cove.anims.toml b/data/area/fremennik_province/pirates_cove/pirates_cove.anims.toml new file mode 100644 index 0000000000..78a4522801 --- /dev/null +++ b/data/area/fremennik_province/pirates_cove/pirates_cove.anims.toml @@ -0,0 +1,15 @@ +[jake_defend] +id = 425 +[jake_death] +id = 836 +[jake_attack] +id = 422 + +[wilson_defend] +id = 425 + +[wilson_death] +id = 836 + +[wilson_attack] +id = 395 diff --git a/data/area/fremennik_province/pirates_cove/pirates_cove.combat.toml b/data/area/fremennik_province/pirates_cove/pirates_cove.combat.toml index 63063720bc..f9472bf975 100644 --- a/data/area/fremennik_province/pirates_cove/pirates_cove.combat.toml +++ b/data/area/fremennik_province/pirates_cove/pirates_cove.combat.toml @@ -1,16 +1,22 @@ [jake] attack_speed = 4 +defend_anim = "jake_defend" +death_anim = "jake_death" [jake.melee] range = 1 target_hit = { offense = "crush", max = 40 } +anim = "jake_attack" [wilson] attack_speed = 4 +defend_anim = "wilson_defend" +death_anim = "wilson_death" [wilson.melee] range = 1 target_hit = { offense = "crush", max = 40 } +anim = "wilson_attack" [palmer] attack_speed = 4 diff --git a/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.anims.toml b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.anims.toml new file mode 100644 index 0000000000..9265e80311 --- /dev/null +++ b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.anims.toml @@ -0,0 +1,15 @@ +[gnoeals_defend] +id = 8957 +[gnoeals_death] +id = 8956 +[gnoeals_attack] +id = 8955 + +[yeti_defend] +id = 8966 + +[yeti_death] +id = 8967 + +[yeti_attack] +id = 8965 diff --git a/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.combat.toml b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.combat.toml index 2cbdfd2f91..eb3ff6bb7c 100644 --- a/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.combat.toml +++ b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.combat.toml @@ -1,13 +1,19 @@ [yeti] attack_speed = 4 +defend_anim = "yeti_defend" +death_anim = "yeti_death" [yeti.melee] range = 1 target_hit = { offense = "crush", max = 70 } +anim = "yeti_attack" [gnoeals] attack_speed = 6 +defend_anim = "gnoeals_defend" +death_anim = "gnoeals_death" [gnoeals.magic] range = 6 target_hit = { offense = "magic", max = 120 } +anim = "gnoeals_attack" diff --git a/data/area/fremennik_province/rellekka/rellekka.anims.toml b/data/area/fremennik_province/rellekka/rellekka.anims.toml index 6abaca9074..2eea70cc15 100644 --- a/data/area/fremennik_province/rellekka/rellekka.anims.toml +++ b/data/area/fremennik_province/rellekka/rellekka.anims.toml @@ -15,3 +15,69 @@ id = 6569 [fox_death] id = 6570 + +[black_unicorn_defend] +id = 6375 + +[black_unicorn_death] +id = 6377 + +[black_unicorn_attack] +id = 6376 + +[black_unicorn_foal_death] +id = 6377 + +[black_unicorn_foal_attack] +id = 6376 + +[borrokar_defend] +id = 425 + +[borrokar_death] +id = 836 + +[borrokar_attack] +id = 395 + +[fenris_wolf_death] +id = 6558 + +[fenris_wolf_attack] +id = 6559 + +[freidir_defend] +id = 425 + +[freidir_death] +id = 836 + +[freidir_attack] +id = 422 + +[lanzig_defend] +id = 425 + +[lanzig_death] +id = 836 + +[lanzig_attack] +id = 422 + +[lensa_defend] +id = 404 + +[lensa_death] +id = 9055 + +[lensa_attack] +id = 422 + +[unicorn_foal_defend] +id = 6375 + +[unicorn_foal_death] +id = 6377 + +[unicorn_foal_attack] +id = 6376 diff --git a/data/area/fremennik_province/rellekka/rellekka.combat.toml b/data/area/fremennik_province/rellekka/rellekka.combat.toml index 0755f86675..ceb01902b7 100644 --- a/data/area/fremennik_province/rellekka/rellekka.combat.toml +++ b/data/area/fremennik_province/rellekka/rellekka.combat.toml @@ -20,38 +20,59 @@ target_hit = { offense = "crush", max = 0 } [black_unicorn] attack_speed = 4 +defend_anim = "black_unicorn_defend" +death_anim = "black_unicorn_death" +defend_sound = "black_unicorn_defend" +death_sound = "black_unicorn_death" [black_unicorn.melee] range = 1 target_hit = { offense = "stab", max = 30 } +anim = "black_unicorn_attack" +sound = "black_unicorn_attack" [freidir] attack_speed = 4 +defend_anim = "freidir_defend" +death_anim = "freidir_death" [freidir.melee] range = 1 target_hit = { offense = "crush", max = 60 } +anim = "freidir_attack" [borrokar] attack_speed = 4 +defend_anim = "borrokar_defend" +death_anim = "borrokar_death" [borrokar.melee] range = 1 target_hit = { offense = "crush", max = 60 } +anim = "borrokar_attack" [lanzig] attack_speed = 4 +defend_anim = "lanzig_defend" +death_anim = "lanzig_death" [lanzig.melee] range = 1 target_hit = { offense = "crush", max = 60 } +anim = "lanzig_attack" [lensa] attack_speed = 4 +defend_anim = "lensa_defend" +death_anim = "lensa_death" +defend_sound = "lensa_defend" +death_sound = "lensa_death" [lensa.melee] range = 1 target_hit = { offense = "crush", max = 60 } +anim = "lensa_attack" +sound = "lensa_attack" [jennella] attack_speed = 4 @@ -62,21 +83,37 @@ target_hit = { offense = "crush", max = 60 } [unicorn_foal] attack_speed = 4 +defend_anim = "unicorn_foal_defend" +death_anim = "unicorn_foal_death" +defend_sound = "unicorn_foal_defend" +death_sound = "unicorn_foal_death" [unicorn_foal.melee] range = 1 target_hit = { offense = "stab", max = 20 } +anim = "unicorn_foal_attack" +sound = "unicorn_foal_attack" [black_unicorn_foal] attack_speed = 4 +death_anim = "black_unicorn_foal_death" +defend_sound = "black_unicorn_foal_defend" +death_sound = "black_unicorn_foal_death" [black_unicorn_foal.melee] range = 1 target_hit = { offense = "stab", max = 30 } +anim = "black_unicorn_foal_attack" +sound = "black_unicorn_foal_attack" [fenris_wolf] attack_speed = 4 +death_anim = "fenris_wolf_death" +defend_sound = "fenris_wolf_defend" +death_sound = "fenris_wolf_death" [fenris_wolf.melee] range = 1 target_hit = { offense = "crush", max = 69 } +anim = "fenris_wolf_attack" +sound = "fenris_wolf_attack" diff --git a/data/area/fremennik_province/rellekka/rellekka.sounds.toml b/data/area/fremennik_province/rellekka/rellekka.sounds.toml new file mode 100644 index 0000000000..b0e5b37e2c --- /dev/null +++ b/data/area/fremennik_province/rellekka/rellekka.sounds.toml @@ -0,0 +1,42 @@ +[black_unicorn_defend] +id = 371 +[black_unicorn_death] +id = 370 +[black_unicorn_attack] +id = 369 + +[black_unicorn_foal_defend] +id = 371 + +[black_unicorn_foal_death] +id = 370 + +[black_unicorn_foal_attack] +id = 369 + +[fenris_wolf_defend] +id = 491 + +[fenris_wolf_death] +id = 490 + +[fenris_wolf_attack] +id = 481 + +[lensa_defend] +id = 513 + +[lensa_death] +id = 512 + +[lensa_attack] +id = 511 + +[unicorn_foal_defend] +id = 371 + +[unicorn_foal_death] +id = 370 + +[unicorn_foal_attack] +id = 369 diff --git a/data/area/fremennik_province/waterbirth_island/waterbirth_island.anims.toml b/data/area/fremennik_province/waterbirth_island/waterbirth_island.anims.toml index d4956b1c10..5c952f9696 100644 --- a/data/area/fremennik_province/waterbirth_island/waterbirth_island.anims.toml +++ b/data/area/fremennik_province/waterbirth_island/waterbirth_island.anims.toml @@ -39,3 +39,9 @@ id = 2868 [spinolyp_defend] id = 2869 + +[dagannoth_fledgeling_death] +id = 1581 + +[dagannoth_fledgeling_attack] +id = 1579 diff --git a/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml b/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml index d4a5dcb7ea..cb7d3f5ffb 100644 --- a/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml +++ b/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml @@ -49,10 +49,12 @@ impact_poison = 20 [dagannoth_fledgeling] attack_speed = 4 +death_anim = "dagannoth_fledgeling_death" [dagannoth_fledgeling.melee] range = 1 target_hit = { offense = "stab", max = 60 } +anim = "dagannoth_fledgeling_attack" [dagannoth_guardian] attack_speed = 4 diff --git a/data/area/kandarin/ape_atoll/ape_atoll.anims.toml b/data/area/kandarin/ape_atoll/ape_atoll.anims.toml index 5f75c920cf..1fe07ef85b 100644 --- a/data/area/kandarin/ape_atoll/ape_atoll.anims.toml +++ b/data/area/kandarin/ape_atoll/ape_atoll.anims.toml @@ -6,3 +6,21 @@ id = 6776 [bird_death] id = 6777 + +[monkey_archer_defend] +id = 1393 + +[monkey_archer_death] +id = 1384 + +[monkey_archer_attack] +id = 1394 + +[padulah_defend] +id = 1393 + +[padulah_death] +id = 1384 + +[padulah_attack] +id = 1383 diff --git a/data/area/kandarin/ape_atoll/ape_atoll.combat.toml b/data/area/kandarin/ape_atoll/ape_atoll.combat.toml index 63f14d9603..47f3d87697 100644 --- a/data/area/kandarin/ape_atoll/ape_atoll.combat.toml +++ b/data/area/kandarin/ape_atoll/ape_atoll.combat.toml @@ -46,14 +46,23 @@ target_hit = { offense = "slash", max = 140 } [padulah] attack_speed = 4 +defend_anim = "padulah_defend" +death_anim = "padulah_death" [padulah.melee] range = 1 target_hit = { offense = "slash", max = 200 } +anim = "padulah_attack" [monkey_archer] attack_speed = 4 +defend_anim = "monkey_archer_defend" +death_anim = "monkey_archer_death" +defend_sound = "monkey_archer_defend" +death_sound = "monkey_archer_death" [monkey_archer.range] range = 6 target_hit = { offense = "range", max = 200 } +anim = "monkey_archer_attack" +sound = "monkey_archer_attack" diff --git a/data/area/kandarin/ape_atoll/ape_atoll.sounds.toml b/data/area/kandarin/ape_atoll/ape_atoll.sounds.toml new file mode 100644 index 0000000000..aee8dd4cc2 --- /dev/null +++ b/data/area/kandarin/ape_atoll/ape_atoll.sounds.toml @@ -0,0 +1,6 @@ +[monkey_archer_defend] +id = 631 +[monkey_archer_death] +id = 630 +[monkey_archer_attack] +id = 629 diff --git a/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.anims.toml b/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.anims.toml new file mode 100644 index 0000000000..f0776b3952 --- /dev/null +++ b/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.anims.toml @@ -0,0 +1,4 @@ +[big_snake_death] +id = 3540 +[big_snake_attack] +id = 3538 diff --git a/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.combat.toml b/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.combat.toml index a605e5ac38..ea9edb4cc6 100644 --- a/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.combat.toml +++ b/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.combat.toml @@ -1,7 +1,12 @@ [big_snake] attack_speed = 6 +death_anim = "big_snake_death" +defend_sound = "big_snake_defend" +death_sound = "big_snake_death" [big_snake.melee] range = 1 target_hit = { offense = "stab", max = 140 } impact_poison = 10 +anim = "big_snake_attack" +sound = "big_snake_attack" diff --git a/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.sounds.toml b/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.sounds.toml new file mode 100644 index 0000000000..c969b565d8 --- /dev/null +++ b/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.sounds.toml @@ -0,0 +1,6 @@ +[big_snake_defend] +id = 3608 +[big_snake_death] +id = 3610 +[big_snake_attack] +id = 3609 diff --git a/data/area/kandarin/ardougne/east_ardougne.anims.toml b/data/area/kandarin/ardougne/east_ardougne.anims.toml new file mode 100644 index 0000000000..7a58bfe615 --- /dev/null +++ b/data/area/kandarin/ardougne/east_ardougne.anims.toml @@ -0,0 +1,6 @@ +[hero_defend] +id = 425 +[hero_death] +id = 836 +[hero_attack] +id = 390 diff --git a/data/area/kandarin/ardougne/east_ardougne.combat.toml b/data/area/kandarin/ardougne/east_ardougne.combat.toml index a2537cce16..5442af9a38 100644 --- a/data/area/kandarin/ardougne/east_ardougne.combat.toml +++ b/data/area/kandarin/ardougne/east_ardougne.combat.toml @@ -11,7 +11,10 @@ target_hit = { offense = "crush", max = 70 } [hero] attack_speed = 5 +defend_anim = "hero_defend" +death_anim = "hero_death" [hero.melee] range = 1 target_hit = { offense = "slash", max = 90 } +anim = "hero_attack" diff --git a/data/area/kandarin/ardougne/ibans_lair/ibans_lair.anims.toml b/data/area/kandarin/ardougne/ibans_lair/ibans_lair.anims.toml new file mode 100644 index 0000000000..56d9ccb6b5 --- /dev/null +++ b/data/area/kandarin/ardougne/ibans_lair/ibans_lair.anims.toml @@ -0,0 +1,37 @@ +[disciple_of_iban_death] +id = 836 +[disciple_of_iban_attack] +id = 422 + +[doomion_defend] +id = 65 + +[doomion_death] +id = 67 + +[doomion_attack] +id = 64 + +[holthion_defend] +id = 65 + +[holthion_death] +id = 67 + +[holthion_attack] +id = 64 + +[othainian_defend] +id = 65 + +[othainian_death] +id = 67 + +[othainian_attack] +id = 64 + +[soulless_death] +id = 340 + +[soulless_attack] +id = 338 diff --git a/data/area/kandarin/ardougne/ibans_lair/ibans_lair.combat.toml b/data/area/kandarin/ardougne/ibans_lair/ibans_lair.combat.toml index d1fafd70a6..c915342d16 100644 --- a/data/area/kandarin/ardougne/ibans_lair/ibans_lair.combat.toml +++ b/data/area/kandarin/ardougne/ibans_lair/ibans_lair.combat.toml @@ -1,34 +1,47 @@ [soulless] attack_speed = 4 +death_anim = "soulless_death" [soulless.melee] range = 1 target_hit = { offense = "crush", max = 20 } +anim = "soulless_attack" [othainian] attack_speed = 4 +defend_anim = "othainian_defend" +death_anim = "othainian_death" [othainian.melee] range = 1 target_hit = { offense = "slash", max = 90 } +anim = "othainian_attack" [doomion] attack_speed = 4 +defend_anim = "doomion_defend" +death_anim = "doomion_death" [doomion.melee] range = 1 target_hit = { offense = "slash", max = 90 } +anim = "doomion_attack" [holthion] attack_speed = 4 +defend_anim = "holthion_defend" +death_anim = "holthion_death" [holthion.melee] range = 1 target_hit = { offense = "slash", max = 90 } +anim = "holthion_attack" [disciple_of_iban] attack_speed = 4 +death_anim = "disciple_of_iban_death" [disciple_of_iban.melee] range = 1 target_hit = { offense = "crush", max = 20 } +anim = "disciple_of_iban_attack" diff --git a/data/area/kandarin/ardougne/monastery/ardougne_monastery.anims.toml b/data/area/kandarin/ardougne/monastery/ardougne_monastery.anims.toml new file mode 100644 index 0000000000..e46b4e792c --- /dev/null +++ b/data/area/kandarin/ardougne/monastery/ardougne_monastery.anims.toml @@ -0,0 +1,4 @@ +[monk_death] +id = 836 +[monk_attack] +id = 422 diff --git a/data/area/kandarin/ardougne/monastery/ardougne_monastery.combat.toml b/data/area/kandarin/ardougne/monastery/ardougne_monastery.combat.toml index 4550f9f918..3d79268f17 100644 --- a/data/area/kandarin/ardougne/monastery/ardougne_monastery.combat.toml +++ b/data/area/kandarin/ardougne/monastery/ardougne_monastery.combat.toml @@ -1,6 +1,11 @@ [monk] attack_speed = 4 +death_anim = "monk_death" +defend_sound = "monk_defend" +death_sound = "monk_death" [monk.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "monk_attack" +sound = "monk_attack" diff --git a/data/area/kandarin/ardougne/monastery/ardougne_monastery.sounds.toml b/data/area/kandarin/ardougne/monastery/ardougne_monastery.sounds.toml new file mode 100644 index 0000000000..8ecd8aafc6 --- /dev/null +++ b/data/area/kandarin/ardougne/monastery/ardougne_monastery.sounds.toml @@ -0,0 +1,6 @@ +[monk_defend] +id = 513 +[monk_death] +id = 512 +[monk_attack] +id = 511 diff --git a/data/area/kandarin/ardougne/sewers/ardougne_sewers.anims.toml b/data/area/kandarin/ardougne/sewers/ardougne_sewers.anims.toml new file mode 100644 index 0000000000..6e6771bcb9 --- /dev/null +++ b/data/area/kandarin/ardougne/sewers/ardougne_sewers.anims.toml @@ -0,0 +1,19 @@ +[alomone_death] +id = 836 +[alomone_attack] +id = 422 + +[clivet_defend] +id = 425 + +[clivet_death] +id = 836 + +[clivet_attack] +id = 811 + +[hazeel_cultist_death] +id = 836 + +[hazeel_cultist_attack] +id = 422 diff --git a/data/area/kandarin/ardougne/sewers/ardougne_sewers.combat.toml b/data/area/kandarin/ardougne/sewers/ardougne_sewers.combat.toml index 8611162906..8c0f7c72cd 100644 --- a/data/area/kandarin/ardougne/sewers/ardougne_sewers.combat.toml +++ b/data/area/kandarin/ardougne/sewers/ardougne_sewers.combat.toml @@ -1,20 +1,30 @@ [alomone] attack_speed = 4 +death_anim = "alomone_death" +defend_sound = "alomone_defend" +death_sound = "alomone_death" [alomone.melee] range = 1 target_hit = { offense = "crush", max = 20 } +anim = "alomone_attack" +sound = "alomone_attack" [clivet] attack_speed = 4 +defend_anim = "clivet_defend" +death_anim = "clivet_death" [clivet.melee] range = 1 target_hit = { offense = "crush", max = 20 } +anim = "clivet_attack" [hazeel_cultist] attack_speed = 4 +death_anim = "hazeel_cultist_death" [hazeel_cultist.melee] range = 1 target_hit = { offense = "crush", max = 20 } +anim = "hazeel_cultist_attack" diff --git a/data/area/kandarin/ardougne/sewers/ardougne_sewers.sounds.toml b/data/area/kandarin/ardougne/sewers/ardougne_sewers.sounds.toml new file mode 100644 index 0000000000..fce1434255 --- /dev/null +++ b/data/area/kandarin/ardougne/sewers/ardougne_sewers.sounds.toml @@ -0,0 +1,6 @@ +[alomone_defend] +id = 513 +[alomone_death] +id = 512 +[alomone_attack] +id = 511 diff --git a/data/area/kandarin/ardougne/underground_pass/underground_pass.anims.toml b/data/area/kandarin/ardougne/underground_pass/underground_pass.anims.toml new file mode 100644 index 0000000000..ac39e999d9 --- /dev/null +++ b/data/area/kandarin/ardougne/underground_pass/underground_pass.anims.toml @@ -0,0 +1,39 @@ +[kalrag_defend] +id = 5320 +[kalrag_death] +id = 5321 +[kalrag_attack] +id = 5319 + +[khazard_warlord_death] +id = 836 + +[khazard_warlord_attack] +id = 401 + +[sir_carl_defend] +id = 425 + +[sir_carl_death] +id = 836 + +[sir_carl_attack] +id = 400 + +[sir_harry_defend] +id = 425 + +[sir_harry_death] +id = 836 + +[sir_harry_attack] +id = 400 + +[sir_jerro_defend] +id = 425 + +[sir_jerro_death] +id = 836 + +[sir_jerro_attack] +id = 400 diff --git a/data/area/kandarin/ardougne/underground_pass/underground_pass.combat.toml b/data/area/kandarin/ardougne/underground_pass/underground_pass.combat.toml index a935b516ac..3eefdf6312 100644 --- a/data/area/kandarin/ardougne/underground_pass/underground_pass.combat.toml +++ b/data/area/kandarin/ardougne/underground_pass/underground_pass.combat.toml @@ -1,34 +1,48 @@ [khazard_warlord] attack_speed = 4 +death_anim = "khazard_warlord_death" [khazard_warlord.melee] range = 1 target_hit = { offense = "crush", max = 100 } +anim = "khazard_warlord_attack" [sir_jerro] attack_speed = 5 +defend_anim = "sir_jerro_defend" +death_anim = "sir_jerro_death" [sir_jerro.melee] range = 1 target_hit = { offense = "slash", max = 80 } +anim = "sir_jerro_attack" [sir_carl] attack_speed = 5 +defend_anim = "sir_carl_defend" +death_anim = "sir_carl_death" [sir_carl.melee] range = 1 target_hit = { offense = "slash", max = 80 } +anim = "sir_carl_attack" [sir_harry] attack_speed = 5 +defend_anim = "sir_harry_defend" +death_anim = "sir_harry_death" [sir_harry.melee] range = 1 target_hit = { offense = "slash", max = 80 } +anim = "sir_harry_attack" [kalrag] attack_speed = 4 +defend_anim = "kalrag_defend" +death_anim = "kalrag_death" [kalrag.melee] range = 1 target_hit = { offense = "stab", max = 90 } +anim = "kalrag_attack" diff --git a/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.anims.toml b/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.anims.toml new file mode 100644 index 0000000000..674b64aea3 --- /dev/null +++ b/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.anims.toml @@ -0,0 +1,4 @@ +[giant_lobster_death] +id = 6267 +[giant_lobster_attack] +id = 6265 diff --git a/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.combat.toml b/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.combat.toml index af9e2453d1..67027099e6 100644 --- a/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.combat.toml +++ b/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.combat.toml @@ -1,6 +1,8 @@ [giant_lobster] attack_speed = 4 +death_anim = "giant_lobster_death" [giant_lobster.melee] range = 1 target_hit = { offense = "stab", max = 40 } +anim = "giant_lobster_attack" diff --git a/data/area/kandarin/battlefield/battlefield.anims.toml b/data/area/kandarin/battlefield/battlefield.anims.toml new file mode 100644 index 0000000000..06701752cb --- /dev/null +++ b/data/area/kandarin/battlefield/battlefield.anims.toml @@ -0,0 +1,10 @@ +[khazard_commander_death] +id = 836 +[khazard_commander_attack] +id = 428 + +[tortoise_death] +id = 3962 + +[tortoise_attack] +id = 3960 diff --git a/data/area/kandarin/battlefield/battlefield.combat.toml b/data/area/kandarin/battlefield/battlefield.combat.toml index b1e7069217..d17734b5d1 100644 --- a/data/area/kandarin/battlefield/battlefield.combat.toml +++ b/data/area/kandarin/battlefield/battlefield.combat.toml @@ -1,13 +1,20 @@ [khazard_commander] attack_speed = 4 +death_anim = "khazard_commander_death" [khazard_commander.melee] range = 1 target_hit = { offense = "stab", max = 50 } +anim = "khazard_commander_attack" [tortoise] attack_speed = 4 +death_anim = "tortoise_death" +defend_sound = "tortoise_defend" +death_sound = "tortoise_death" [tortoise.melee] range = 1 target_hit = { offense = "crush", max = 110 } +anim = "tortoise_attack" +sound = "tortoise_attack" diff --git a/data/area/kandarin/battlefield/battlefield.sounds.toml b/data/area/kandarin/battlefield/battlefield.sounds.toml new file mode 100644 index 0000000000..0bbc3ede1c --- /dev/null +++ b/data/area/kandarin/battlefield/battlefield.sounds.toml @@ -0,0 +1,6 @@ +[tortoise_defend] +id = 459 +[tortoise_death] +id = 458 +[tortoise_attack] +id = 456 diff --git a/data/area/kandarin/feldip_hills/feldip_hills.anims.toml b/data/area/kandarin/feldip_hills/feldip_hills.anims.toml index b1d4006184..29192c7224 100644 --- a/data/area/kandarin/feldip_hills/feldip_hills.anims.toml +++ b/data/area/kandarin/feldip_hills/feldip_hills.anims.toml @@ -15,3 +15,18 @@ id = 12795 [strykewyrm_bury] id = 12796 + +[carnivorous_chinchompa_death] +id = 5183 + +[ogress_death] +id = 8640 + +[ogress_attack] +id = 8636 + +[ogress_champion_death] +id = 8640 + +[ogress_champion_attack] +id = 8636 diff --git a/data/area/kandarin/feldip_hills/feldip_hills.combat.toml b/data/area/kandarin/feldip_hills/feldip_hills.combat.toml index c9460ffa79..5034193548 100644 --- a/data/area/kandarin/feldip_hills/feldip_hills.combat.toml +++ b/data/area/kandarin/feldip_hills/feldip_hills.combat.toml @@ -35,6 +35,7 @@ target_hit = { offense = "magic", max = 0 } range = 8 [carnivorous_chinchompa] attack_speed = 4 +death_anim = "carnivorous_chinchompa_death" [carnivorous_chinchompa.melee] range = 1 @@ -42,14 +43,18 @@ target_hit = { offense = "crush", max = 10 } [ogress_champion] attack_speed = 4 +death_anim = "ogress_champion_death" [ogress_champion.melee] range = 1 target_hit = { offense = "crush", max = 100 } +anim = "ogress_champion_attack" [ogress] attack_speed = 6 +death_anim = "ogress_death" [ogress.melee] range = 1 target_hit = { offense = "crush", max = 80 } +anim = "ogress_attack" diff --git a/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.anims.toml b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.anims.toml new file mode 100644 index 0000000000..e4c3b7e141 --- /dev/null +++ b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.anims.toml @@ -0,0 +1,6 @@ +[gorad_defend] +id = 360 +[gorad_death] +id = 361 +[gorad_attack] +id = 359 diff --git a/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.combat.toml b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.combat.toml index aa811fb05c..800b5f4017 100644 --- a/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.combat.toml +++ b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.combat.toml @@ -7,7 +7,13 @@ target_hit = { offense = "crush", max = 90 } [gorad] attack_speed = 4 +defend_anim = "gorad_defend" +death_anim = "gorad_death" +defend_sound = "gorad_defend" +death_sound = "gorad_death" [gorad.melee] range = 1 target_hit = { offense = "crush", max = 70 } +anim = "gorad_attack" +sound = "gorad_attack" diff --git a/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.sounds.toml b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.sounds.toml new file mode 100644 index 0000000000..0be38d8dcd --- /dev/null +++ b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.sounds.toml @@ -0,0 +1,6 @@ +[gorad_defend] +id = 451 +[gorad_death] +id = 450 +[gorad_attack] +id = 448 diff --git a/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.anims.toml b/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.anims.toml new file mode 100644 index 0000000000..adf8ead5e5 --- /dev/null +++ b/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.anims.toml @@ -0,0 +1,4 @@ +[crab_death] +id = 3430 +[crab_attack] +id = 3428 diff --git a/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.combat.toml b/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.combat.toml index 6473ac68b8..6371ba1f01 100644 --- a/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.combat.toml +++ b/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.combat.toml @@ -1,6 +1,8 @@ [crab] attack_speed = 4 +death_anim = "crab_death" [crab.melee] range = 1 target_hit = { offense = "crush", max = 30 } +anim = "crab_attack" diff --git a/data/area/kandarin/tower_of_life/tower_of_life.anims.toml b/data/area/kandarin/tower_of_life/tower_of_life.anims.toml new file mode 100644 index 0000000000..48c041a5c8 --- /dev/null +++ b/data/area/kandarin/tower_of_life/tower_of_life.anims.toml @@ -0,0 +1,10 @@ +[invrigar_the_necromancer_death] +id = 836 +[invrigar_the_necromancer_attack] +id = 422 + +[necromancer_death] +id = 836 + +[necromancer_attack] +id = 422 diff --git a/data/area/kandarin/tower_of_life/tower_of_life.combat.toml b/data/area/kandarin/tower_of_life/tower_of_life.combat.toml index 14cee01eec..02deee02d3 100644 --- a/data/area/kandarin/tower_of_life/tower_of_life.combat.toml +++ b/data/area/kandarin/tower_of_life/tower_of_life.combat.toml @@ -1,13 +1,17 @@ [invrigar_the_necromancer] attack_speed = 4 +death_anim = "invrigar_the_necromancer_death" [invrigar_the_necromancer.melee] range = 1 target_hit = { offense = "crush", max = 30 } +anim = "invrigar_the_necromancer_attack" [necromancer] attack_speed = 4 +death_anim = "necromancer_death" [necromancer.melee] range = 1 target_hit = { offense = "crush", max = 30 } +anim = "necromancer_attack" diff --git a/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.anims.toml b/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.anims.toml new file mode 100644 index 0000000000..a45bdaaeba --- /dev/null +++ b/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.anims.toml @@ -0,0 +1,4 @@ +[salarin_the_twisted_death] +id = 836 +[salarin_the_twisted_attack] +id = 422 diff --git a/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.combat.toml b/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.combat.toml index be6104b9f3..29176f7e94 100644 --- a/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.combat.toml +++ b/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.combat.toml @@ -1,6 +1,8 @@ [salarin_the_twisted] attack_speed = 4 +death_anim = "salarin_the_twisted_death" [salarin_the_twisted.melee] range = 1 target_hit = { offense = "crush", max = 70 } +anim = "salarin_the_twisted_attack" diff --git a/data/area/kandarin/yanille/yanille.anims.toml b/data/area/kandarin/yanille/yanille.anims.toml index 90f686b829..9be2e3121e 100644 --- a/data/area/kandarin/yanille/yanille.anims.toml +++ b/data/area/kandarin/yanille/yanille.anims.toml @@ -5,4 +5,18 @@ id = 2589 id = 2590 [climb_out_of_tunnel] -id = 2591 \ No newline at end of file +id = 2591 +[colonel_radick_defend] +id = 425 + +[colonel_radick_death] +id = 836 + +[colonel_radick_attack] +id = 395 + +[watchman_death] +id = 836 + +[watchman_attack] +id = 422 diff --git a/data/area/kandarin/yanille/yanille.combat.toml b/data/area/kandarin/yanille/yanille.combat.toml index fa689b077a..868f218c3a 100644 --- a/data/area/kandarin/yanille/yanille.combat.toml +++ b/data/area/kandarin/yanille/yanille.combat.toml @@ -1,13 +1,18 @@ [watchman] attack_speed = 4 +death_anim = "watchman_death" [watchman.melee] range = 1 target_hit = { offense = "crush", max = 40 } +anim = "watchman_attack" [colonel_radick] attack_speed = 4 +defend_anim = "colonel_radick_defend" +death_anim = "colonel_radick_death" [colonel_radick.melee] range = 1 target_hit = { offense = "slash", max = 40 } +anim = "colonel_radick_attack" diff --git a/data/area/karamja/crandor/crandor.anims.toml b/data/area/karamja/crandor/crandor.anims.toml new file mode 100644 index 0000000000..ecfb7b285e --- /dev/null +++ b/data/area/karamja/crandor/crandor.anims.toml @@ -0,0 +1,6 @@ +[elvarg_defend] +id = 89 +[elvarg_death] +id = 4642 +[elvarg_attack] +id = 80 diff --git a/data/area/karamja/crandor/crandor.combat.toml b/data/area/karamja/crandor/crandor.combat.toml index af87212b46..aff00fc63a 100644 --- a/data/area/karamja/crandor/crandor.combat.toml +++ b/data/area/karamja/crandor/crandor.combat.toml @@ -1,6 +1,9 @@ [elvarg] attack_speed = 4 +defend_anim = "elvarg_defend" +death_anim = "elvarg_death" [elvarg.melee] range = 1 target_hit = { offense = "slash", max = 80 } +anim = "elvarg_attack" diff --git a/data/area/karamja/karamja.anims.toml b/data/area/karamja/karamja.anims.toml index 2f9dfa1054..941f689db7 100644 --- a/data/area/karamja/karamja.anims.toml +++ b/data/area/karamja/karamja.anims.toml @@ -20,4 +20,33 @@ id = 7237 id = 7239 [giant_ant_death] -id = 7238 \ No newline at end of file +id = 7238 +[frog_death] +id = 7256 + +[frog_attack] +id = 7260 + +[giant_wasp_death] +id = 7244 + +[giant_wasp_attack] +id = 7242 + +[pernicious_parrot_death] +id = 6777 + +[pernicious_parrot_attack] +id = 6775 + +[tenacious_toucan_death] +id = 6779 + +[tenacious_toucan_attack] +id = 6775 + +[tribesman_death] +id = 836 + +[tribesman_attack] +id = 428 diff --git a/data/area/karamja/karamja.combat.toml b/data/area/karamja/karamja.combat.toml index 212ebcc1c3..fe2c9c551a 100644 --- a/data/area/karamja/karamja.combat.toml +++ b/data/area/karamja/karamja.combat.toml @@ -39,36 +39,46 @@ target_hit = { offense = "crush", max = 60 } [tribesman] attack_speed = 4 +death_anim = "tribesman_death" [tribesman.melee] range = 1 target_hit = { offense = "stab", max = 40 } +anim = "tribesman_attack" [frog] attack_speed = 4 +death_anim = "frog_death" [frog.melee] range = 1 target_hit = { offense = "crush", max = 61 } impact_poison = 68 +anim = "frog_attack" [tenacious_toucan] attack_speed = 6 +death_anim = "tenacious_toucan_death" [tenacious_toucan.melee] range = 1 target_hit = { offense = "stab", max = 119 } +anim = "tenacious_toucan_attack" [giant_wasp] attack_speed = 6 +death_anim = "giant_wasp_death" [giant_wasp.melee] range = 1 target_hit = { offense = "crush", max = 50 } +anim = "giant_wasp_attack" [pernicious_parrot] attack_speed = 6 +death_anim = "pernicious_parrot_death" [pernicious_parrot.melee] range = 1 target_hit = { offense = "stab", max = 119 } +anim = "pernicious_parrot_attack" diff --git a/data/area/karamja/kharazi_jungle/caves/kharazi_caves.anims.toml b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.anims.toml new file mode 100644 index 0000000000..4430e9e52a --- /dev/null +++ b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.anims.toml @@ -0,0 +1,13 @@ +[death_wing_death] +id = 4917 +[death_wing_attack] +id = 4915 + +[ranalph_devere_defend] +id = 5489 + +[ranalph_devere_death] +id = 5491 + +[ranalph_devere_attack] +id = 5485 diff --git a/data/area/karamja/kharazi_jungle/caves/kharazi_caves.combat.toml b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.combat.toml index 55977fa7d6..a368c94410 100644 --- a/data/area/karamja/kharazi_jungle/caves/kharazi_caves.combat.toml +++ b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.combat.toml @@ -1,9 +1,11 @@ [death_wing] attack_speed = 4 +death_anim = "death_wing_death" [death_wing.melee] range = 1 target_hit = { offense = "stab", max = 80 } +anim = "death_wing_attack" [ungadulu] attack_speed = 4 @@ -28,7 +30,10 @@ target_hit = { offense = "slash", max = 120 } [ranalph_devere] attack_speed = 4 +defend_anim = "ranalph_devere_defend" +death_anim = "ranalph_devere_death" [ranalph_devere.melee] range = 1 target_hit = { offense = "slash", max = 130 } +anim = "ranalph_devere_attack" diff --git a/data/area/karamja/kharazi_jungle/kharazi_jungle.anims.toml b/data/area/karamja/kharazi_jungle/kharazi_jungle.anims.toml new file mode 100644 index 0000000000..1e0e62e447 --- /dev/null +++ b/data/area/karamja/kharazi_jungle/kharazi_jungle.anims.toml @@ -0,0 +1,10 @@ +[jungle_wolf_death] +id = 6558 +[jungle_wolf_attack] +id = 6559 + +[oomlie_bird_death] +id = 5389 + +[oomlie_bird_attack] +id = 5387 diff --git a/data/area/karamja/kharazi_jungle/kharazi_jungle.combat.toml b/data/area/karamja/kharazi_jungle/kharazi_jungle.combat.toml index b6897b471f..0bb85ab5de 100644 --- a/data/area/karamja/kharazi_jungle/kharazi_jungle.combat.toml +++ b/data/area/karamja/kharazi_jungle/kharazi_jungle.combat.toml @@ -1,13 +1,17 @@ [oomlie_bird] attack_speed = 4 +death_anim = "oomlie_bird_death" [oomlie_bird.melee] range = 1 target_hit = { offense = "stab", max = 50 } +anim = "oomlie_bird_attack" [jungle_wolf] attack_speed = 4 +death_anim = "jungle_wolf_death" [jungle_wolf.melee] range = 1 target_hit = { offense = "stab", max = 60 } +anim = "jungle_wolf_attack" diff --git a/data/area/karamja/ship_yard/karamja_ship_yard.anims.toml b/data/area/karamja/ship_yard/karamja_ship_yard.anims.toml new file mode 100644 index 0000000000..1f8562c32e --- /dev/null +++ b/data/area/karamja/ship_yard/karamja_ship_yard.anims.toml @@ -0,0 +1,4 @@ +[foreman_death] +id = 836 +[foreman_attack] +id = 422 diff --git a/data/area/karamja/ship_yard/karamja_ship_yard.combat.toml b/data/area/karamja/ship_yard/karamja_ship_yard.combat.toml index 22635c008e..4bd2cb80f3 100644 --- a/data/area/karamja/ship_yard/karamja_ship_yard.combat.toml +++ b/data/area/karamja/ship_yard/karamja_ship_yard.combat.toml @@ -1,6 +1,8 @@ [foreman] attack_speed = 4 +death_anim = "foreman_death" [foreman.melee] range = 1 target_hit = { offense = "crush", max = 30 } +anim = "foreman_attack" diff --git a/data/area/karamja/tzhaar_city/tzhaar_city.anims.toml b/data/area/karamja/tzhaar_city/tzhaar_city.anims.toml index a8e2815a05..9aa1990b8c 100644 --- a/data/area/karamja/tzhaar_city/tzhaar_city.anims.toml +++ b/data/area/karamja/tzhaar_city/tzhaar_city.anims.toml @@ -44,4 +44,9 @@ id = 9314 id = 9345 [tzhaar_stick_out_arm] -id = 9349 \ No newline at end of file +id = 9349 +[fire_monster_death] +id = 9344 + +[fire_monster_attack] +id = 9341 diff --git a/data/area/karamja/tzhaar_city/tzhaar_city.combat.toml b/data/area/karamja/tzhaar_city/tzhaar_city.combat.toml index deca1ff977..5bc95804c1 100644 --- a/data/area/karamja/tzhaar_city/tzhaar_city.combat.toml +++ b/data/area/karamja/tzhaar_city/tzhaar_city.combat.toml @@ -65,7 +65,9 @@ miss_sound = "spell_splash" [fire_monster] attack_speed = 4 +death_anim = "fire_monster_death" [fire_monster.magic] range = 6 target_hit = { offense = "magic", max = 8 } +anim = "fire_monster_attack" diff --git a/data/area/kharidian_desert/agility_pyramid/agility_pyramid.anims.toml b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.anims.toml new file mode 100644 index 0000000000..f563061686 --- /dev/null +++ b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.anims.toml @@ -0,0 +1,6 @@ +[vulture_defend] +id = 2024 +[vulture_death] +id = 2021 +[vulture_attack] +id = 2019 diff --git a/data/area/kharidian_desert/agility_pyramid/agility_pyramid.combat.toml b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.combat.toml index c4384e0bf5..6566bb5ead 100644 --- a/data/area/kharidian_desert/agility_pyramid/agility_pyramid.combat.toml +++ b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.combat.toml @@ -1,6 +1,12 @@ [vulture] attack_speed = 4 +defend_anim = "vulture_defend" +death_anim = "vulture_death" +defend_sound = "vulture_defend" +death_sound = "vulture_death" [vulture.melee] range = 1 target_hit = { offense = "crush", max = 50 } +anim = "vulture_attack" +sound = "vulture_attack" diff --git a/data/area/kharidian_desert/agility_pyramid/agility_pyramid.sounds.toml b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.sounds.toml new file mode 100644 index 0000000000..73591298f2 --- /dev/null +++ b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.sounds.toml @@ -0,0 +1,6 @@ +[vulture_defend] +id = 892 +[vulture_death] +id = 891 +[vulture_attack] +id = 890 diff --git a/data/area/kharidian_desert/bedabin_camp/bedabin_camp.anims.toml b/data/area/kharidian_desert/bedabin_camp/bedabin_camp.anims.toml new file mode 100644 index 0000000000..129c9a451a --- /dev/null +++ b/data/area/kharidian_desert/bedabin_camp/bedabin_camp.anims.toml @@ -0,0 +1,4 @@ +[bedabin_nomad_fighter_death] +id = 836 +[bedabin_nomad_fighter_attack] +id = 390 diff --git a/data/area/kharidian_desert/bedabin_camp/bedabin_camp.combat.toml b/data/area/kharidian_desert/bedabin_camp/bedabin_camp.combat.toml index c630b5104a..c302cce6b9 100644 --- a/data/area/kharidian_desert/bedabin_camp/bedabin_camp.combat.toml +++ b/data/area/kharidian_desert/bedabin_camp/bedabin_camp.combat.toml @@ -1,6 +1,8 @@ [bedabin_nomad_fighter] attack_speed = 4 +death_anim = "bedabin_nomad_fighter_death" [bedabin_nomad_fighter.melee] range = 1 target_hit = { offense = "slash", max = 70 } +anim = "bedabin_nomad_fighter_attack" diff --git a/data/area/kharidian_desert/harmony_island/harmony.anims.toml b/data/area/kharidian_desert/harmony_island/harmony.anims.toml new file mode 100644 index 0000000000..e1e511c34d --- /dev/null +++ b/data/area/kharidian_desert/harmony_island/harmony.anims.toml @@ -0,0 +1,4 @@ +[sorebones_death] +id = 5658 +[sorebones_attack] +id = 5643 diff --git a/data/area/kharidian_desert/harmony_island/harmony.combat.toml b/data/area/kharidian_desert/harmony_island/harmony.combat.toml index 4d0af8d806..0b60a16387 100644 --- a/data/area/kharidian_desert/harmony_island/harmony.combat.toml +++ b/data/area/kharidian_desert/harmony_island/harmony.combat.toml @@ -1,6 +1,8 @@ [sorebones] attack_speed = 4 +death_anim = "sorebones_death" [sorebones.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "sorebones_attack" diff --git a/data/area/kharidian_desert/kalphite_hive/kalphite_hive.combat.toml b/data/area/kharidian_desert/kalphite_hive/kalphite_hive.combat.toml index 393ea90355..e1ff6b9954 100644 --- a/data/area/kharidian_desert/kalphite_hive/kalphite_hive.combat.toml +++ b/data/area/kharidian_desert/kalphite_hive/kalphite_hive.combat.toml @@ -1,6 +1,9 @@ [goat] attack_speed = 4 +defend_anim = "goat_defend" +death_anim = "goat_death" [goat.melee] range = 1 target_hit = { offense = "crush", max = 40 } +anim = "goat_attack" diff --git a/data/area/kharidian_desert/kharidian_desert.anims.toml b/data/area/kharidian_desert/kharidian_desert.anims.toml index 5dd582a7b4..7af5766d48 100644 --- a/data/area/kharidian_desert/kharidian_desert.anims.toml +++ b/data/area/kharidian_desert/kharidian_desert.anims.toml @@ -18,3 +18,9 @@ id = 4936 [knife_chop] id = 911 + +[desert_wolf_death] +id = 6558 + +[desert_wolf_attack] +id = 6559 diff --git a/data/area/kharidian_desert/kharidian_desert.combat.toml b/data/area/kharidian_desert/kharidian_desert.combat.toml index e8cea297c5..bef0993911 100644 --- a/data/area/kharidian_desert/kharidian_desert.combat.toml +++ b/data/area/kharidian_desert/kharidian_desert.combat.toml @@ -29,7 +29,9 @@ clone = "goat_kharidian_desert.melee" [desert_wolf] attack_speed = 4 +death_anim = "desert_wolf_death" [desert_wolf.melee] range = 1 target_hit = { offense = "slash", max = 30 } +anim = "desert_wolf_attack" diff --git a/data/area/kharidian_desert/mining_camp/desert_mining_camp.anims.toml b/data/area/kharidian_desert/mining_camp/desert_mining_camp.anims.toml new file mode 100644 index 0000000000..fbe162e31d --- /dev/null +++ b/data/area/kharidian_desert/mining_camp/desert_mining_camp.anims.toml @@ -0,0 +1,10 @@ +[mercenary_captain_death] +id = 836 +[mercenary_captain_attack] +id = 390 + +[rowdy_slave_death] +id = 836 + +[rowdy_slave_attack] +id = 422 diff --git a/data/area/kharidian_desert/mining_camp/desert_mining_camp.combat.toml b/data/area/kharidian_desert/mining_camp/desert_mining_camp.combat.toml index 906a4c2809..a2eebf35b6 100644 --- a/data/area/kharidian_desert/mining_camp/desert_mining_camp.combat.toml +++ b/data/area/kharidian_desert/mining_camp/desert_mining_camp.combat.toml @@ -1,13 +1,17 @@ [rowdy_slave] attack_speed = 4 +death_anim = "rowdy_slave_death" [rowdy_slave.melee] range = 1 target_hit = { offense = "crush", max = 20 } +anim = "rowdy_slave_attack" [mercenary_captain] attack_speed = 4 +death_anim = "mercenary_captain_death" [mercenary_captain.melee] range = 1 target_hit = { offense = "slash", max = 50 } +anim = "mercenary_captain_attack" diff --git a/data/area/kharidian_desert/nardah/nardah.anims.toml b/data/area/kharidian_desert/nardah/nardah.anims.toml new file mode 100644 index 0000000000..64c90e8253 --- /dev/null +++ b/data/area/kharidian_desert/nardah/nardah.anims.toml @@ -0,0 +1,24 @@ +[billy_goat_defend] +id = 5342 +[billy_goat_death] +id = 5343 +[billy_goat_attack] +id = 5341 + +[poltenip_defend] +id = 425 + +[poltenip_death] +id = 836 + +[poltenip_attack] +id = 395 + +[radat_defend] +id = 425 + +[radat_death] +id = 836 + +[radat_attack] +id = 395 diff --git a/data/area/kharidian_desert/nardah/nardah.combat.toml b/data/area/kharidian_desert/nardah/nardah.combat.toml index ef10a5b3d1..76f96be59b 100644 --- a/data/area/kharidian_desert/nardah/nardah.combat.toml +++ b/data/area/kharidian_desert/nardah/nardah.combat.toml @@ -1,20 +1,29 @@ [poltenip] attack_speed = 4 +defend_anim = "poltenip_defend" +death_anim = "poltenip_death" [poltenip.melee] range = 1 target_hit = { offense = "stab", max = 30 } +anim = "poltenip_attack" [radat] attack_speed = 4 +defend_anim = "radat_defend" +death_anim = "radat_death" [radat.melee] range = 1 target_hit = { offense = "stab", max = 30 } +anim = "radat_attack" [billy_goat] attack_speed = 4 +defend_anim = "billy_goat_defend" +death_anim = "billy_goat_death" [billy_goat.melee] range = 1 target_hit = { offense = "crush", max = 60 } +anim = "billy_goat_attack" diff --git a/data/area/kharidian_desert/sophanem/sophanem.anims.toml b/data/area/kharidian_desert/sophanem/sophanem.anims.toml index 215dc757da..5888d05c93 100644 --- a/data/area/kharidian_desert/sophanem/sophanem.anims.toml +++ b/data/area/kharidian_desert/sophanem/sophanem.anims.toml @@ -11,4 +11,9 @@ id = 2015 id = 1946 [scarab_attack] -id = 1948 \ No newline at end of file +id = 1948 +[plague_frog_death] +id = 1022 + +[plague_frog_attack] +id = 1021 diff --git a/data/area/kharidian_desert/sophanem/sophanem.combat.toml b/data/area/kharidian_desert/sophanem/sophanem.combat.toml index b0b45f1c1a..6906d41b54 100644 --- a/data/area/kharidian_desert/sophanem/sophanem.combat.toml +++ b/data/area/kharidian_desert/sophanem/sophanem.combat.toml @@ -12,7 +12,9 @@ target_hit = { offense = "crush", max = 30 } [plague_frog] attack_speed = 4 +death_anim = "plague_frog_death" [plague_frog.melee] range = 1 target_hit = { offense = "crush", max = 20 } +anim = "plague_frog_attack" diff --git a/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.anims.toml b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.anims.toml new file mode 100644 index 0000000000..f7df40eb9e --- /dev/null +++ b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.anims.toml @@ -0,0 +1,22 @@ +[scabaras_lancer_death] +id = 7614 +[scabaras_lancer_attack] +id = 7612 + +[scabaras_mage_death] +id = 7616 + +[scabaras_mage_attack] +id = 7615 + +[scabaras_ranger_death] +id = 7609 + +[scabaras_ranger_attack] +id = 7607 + +[scarab_larva_death] +id = 7656 + +[scarab_larva_attack] +id = 7657 diff --git a/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.combat.toml b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.combat.toml index 942f4cf90e..d24c90294e 100644 --- a/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.combat.toml +++ b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.combat.toml @@ -1,27 +1,35 @@ [scarab_larva] attack_speed = 4 +death_anim = "scarab_larva_death" [scarab_larva.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "scarab_larva_attack" [scabaras_ranger] attack_speed = 4 +death_anim = "scabaras_ranger_death" [scabaras_ranger.range] range = 6 target_hit = { offense = "range", max = 130 } +anim = "scabaras_ranger_attack" [scabaras_lancer] attack_speed = 4 +death_anim = "scabaras_lancer_death" [scabaras_lancer.melee] range = 1 target_hit = { offense = "crush", max = 130 } +anim = "scabaras_lancer_attack" [scabaras_mage] attack_speed = 4 +death_anim = "scabaras_mage_death" [scabaras_mage.magic] range = 6 target_hit = { offense = "magic", max = 104 } +anim = "scabaras_mage_attack" diff --git a/data/area/kharidian_desert/ullek/ullek.anims.toml b/data/area/kharidian_desert/ullek/ullek.anims.toml new file mode 100644 index 0000000000..360dbc4ad0 --- /dev/null +++ b/data/area/kharidian_desert/ullek/ullek.anims.toml @@ -0,0 +1,16 @@ +[locust_lancer_death] +id = 7581 +[locust_lancer_attack] +id = 7584 + +[locust_ranger_death] +id = 7581 + +[locust_ranger_attack] +id = 5451 + +[scabaras_locust_death] +id = 7581 + +[scabaras_locust_attack] +id = 7586 diff --git a/data/area/kharidian_desert/ullek/ullek.combat.toml b/data/area/kharidian_desert/ullek/ullek.combat.toml index 8e4a1b15c0..ac00d1f81f 100644 --- a/data/area/kharidian_desert/ullek/ullek.combat.toml +++ b/data/area/kharidian_desert/ullek/ullek.combat.toml @@ -1,27 +1,39 @@ [crocodile] attack_speed = 4 +defend_anim = "crocodile_defend" +death_anim = "crocodile_death" +defend_sound = "crocodile_defend" +death_sound = "crocodile_death" [crocodile.melee] range = 1 target_hit = { offense = "slash", max = 60 } +anim = "crocodile_attack" +sound = "crocodile_attack" [scabaras_locust] attack_speed = 4 +death_anim = "scabaras_locust_death" [scabaras_locust.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "scabaras_locust_attack" [locust_lancer] attack_speed = 4 +death_anim = "locust_lancer_death" [locust_lancer.melee] range = 1 target_hit = { offense = "crush", max = 120 } +anim = "locust_lancer_attack" [locust_ranger] attack_speed = 4 +death_anim = "locust_ranger_death" [locust_ranger.range] range = 6 target_hit = { offense = "range", max = 210 } +anim = "locust_ranger_attack" diff --git a/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.anims.toml b/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.anims.toml new file mode 100644 index 0000000000..f909e66fef --- /dev/null +++ b/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.anims.toml @@ -0,0 +1,13 @@ +[big_frog_death] +id = 1795 +[big_frog_attack] +id = 1793 + +[giant_frog_defend] +id = 1794 + +[giant_frog_death] +id = 1795 + +[giant_frog_attack] +id = 1793 diff --git a/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.combat.toml b/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.combat.toml index bf8ad7e4e3..a643527633 100644 --- a/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.combat.toml +++ b/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.combat.toml @@ -1,13 +1,18 @@ [giant_frog] attack_speed = 4 +defend_anim = "giant_frog_defend" +death_anim = "giant_frog_death" [giant_frog.melee] range = 1 target_hit = { offense = "crush", max = 90 } +anim = "giant_frog_attack" [big_frog] attack_speed = 4 +death_anim = "big_frog_death" [big_frog.melee] range = 1 target_hit = { offense = "crush", max = 30 } +anim = "big_frog_attack" diff --git a/data/area/misthalin/lumbridge/combat_hall/combat_hall.anims.toml b/data/area/misthalin/lumbridge/combat_hall/combat_hall.anims.toml new file mode 100644 index 0000000000..03d292fbd3 --- /dev/null +++ b/data/area/misthalin/lumbridge/combat_hall/combat_hall.anims.toml @@ -0,0 +1,10 @@ +[magic_dummy_death] +id = 97 +[magic_dummy_attack] +id = 94 + +[melee_dummy_death] +id = 97 + +[melee_dummy_attack] +id = 94 diff --git a/data/area/misthalin/lumbridge/combat_hall/combat_hall.combat.toml b/data/area/misthalin/lumbridge/combat_hall/combat_hall.combat.toml index 4bff1ac8c3..1d06f147d3 100644 --- a/data/area/misthalin/lumbridge/combat_hall/combat_hall.combat.toml +++ b/data/area/misthalin/lumbridge/combat_hall/combat_hall.combat.toml @@ -1,13 +1,17 @@ [magic_dummy] attack_speed = 4 +death_anim = "magic_dummy_death" [magic_dummy.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "magic_dummy_attack" [melee_dummy] attack_speed = 4 +death_anim = "melee_dummy_death" [melee_dummy.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "melee_dummy_attack" diff --git a/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.anims.toml b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.anims.toml new file mode 100644 index 0000000000..c83e848184 --- /dev/null +++ b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.anims.toml @@ -0,0 +1,28 @@ +[angry_unicorn_death] +id = 6377 +[angry_unicorn_attack] +id = 6376 + +[confusion_beast_defend] +id = 3820 + +[confusion_beast_death] +id = 3821 + +[confusion_beast_attack] +id = 3818 + +[fear_reaper_defend] +id = 3811 + +[fear_reaper_death] +id = 3813 + +[fear_reaper_attack] +id = 3812 + +[hopeless_creature_death] +id = 3827 + +[hopeless_creature_attack] +id = 3823 diff --git a/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.combat.toml b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.combat.toml index 0849105bf6..117364004c 100644 --- a/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.combat.toml +++ b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.combat.toml @@ -1,28 +1,50 @@ [angry_unicorn] attack_speed = 4 +death_anim = "angry_unicorn_death" +defend_sound = "angry_unicorn_defend" +death_sound = "angry_unicorn_death" [angry_unicorn.melee] range = 1 target_hit = { offense = "stab", max = 50 } +anim = "angry_unicorn_attack" +sound = "angry_unicorn_attack" [fear_reaper] attack_speed = 4 +defend_anim = "fear_reaper_defend" +death_anim = "fear_reaper_death" +defend_sound = "fear_reaper_defend" +death_sound = "fear_reaper_death" [fear_reaper.melee] range = 1 target_hit = { offense = "slash", max = 60 } +anim = "fear_reaper_attack" +sound = "fear_reaper_attack" [confusion_beast] attack_speed = 4 +defend_anim = "confusion_beast_defend" +death_anim = "confusion_beast_death" +defend_sound = "confusion_beast_defend" +death_sound = "confusion_beast_death" [confusion_beast.melee] range = 1 target_hit = { offense = "slash", max = 60 } impact_poison = 2 +anim = "confusion_beast_attack" +sound = "confusion_beast_attack" [hopeless_creature] attack_speed = 4 +death_anim = "hopeless_creature_death" +defend_sound = "hopeless_creature_defend" +death_sound = "hopeless_creature_death" [hopeless_creature.melee] range = 1 target_hit = { offense = "slash", max = 70 } +anim = "hopeless_creature_attack" +sound = "hopeless_creature_attack" diff --git a/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.sounds.toml b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.sounds.toml new file mode 100644 index 0000000000..6e03b90e04 --- /dev/null +++ b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.sounds.toml @@ -0,0 +1,33 @@ +[angry_unicorn_defend] +id = 878 +[angry_unicorn_death] +id = 877 +[angry_unicorn_attack] +id = 876 + +[confusion_beast_defend] +id = 299 + +[confusion_beast_death] +id = 298 + +[confusion_beast_attack] +id = 297 + +[fear_reaper_defend] +id = 299 + +[fear_reaper_death] +id = 298 + +[fear_reaper_attack] +id = 297 + +[hopeless_creature_defend] +id = 299 + +[hopeless_creature_death] +id = 298 + +[hopeless_creature_attack] +id = 297 diff --git a/data/area/morytania/darkmeyer/darkmeyer.anims.toml b/data/area/morytania/darkmeyer/darkmeyer.anims.toml new file mode 100644 index 0000000000..c21e811b62 --- /dev/null +++ b/data/area/morytania/darkmeyer/darkmeyer.anims.toml @@ -0,0 +1,2 @@ +[vyrewatch_attack] +id = 7435 diff --git a/data/area/morytania/darkmeyer/darkmeyer.combat.toml b/data/area/morytania/darkmeyer/darkmeyer.combat.toml index c259e2bc3a..5305c58759 100644 --- a/data/area/morytania/darkmeyer/darkmeyer.combat.toml +++ b/data/area/morytania/darkmeyer/darkmeyer.combat.toml @@ -4,3 +4,4 @@ attack_speed = 8 [vyrewatch.melee] range = 1 target_hit = { offense = "crush", max = 110 } +anim = "vyrewatch_attack" diff --git a/data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.anims.toml b/data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.anims.toml new file mode 100644 index 0000000000..e11897f687 --- /dev/null +++ b/data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.anims.toml @@ -0,0 +1,6 @@ +[experiment_defend] +id = 1627 +[experiment_death] +id = 1628 +[experiment_attack] +id = 1626 diff --git a/data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.combat.toml b/data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.combat.toml index df63421e5a..b4c5398691 100644 --- a/data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.combat.toml +++ b/data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.combat.toml @@ -1,6 +1,9 @@ [experiment] attack_speed = 4 +defend_anim = "experiment_defend" +death_anim = "experiment_death" [experiment.melee] range = 1 target_hit = { offense = "stab", max = 60 } +anim = "experiment_attack" diff --git a/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.anims.toml b/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.anims.toml new file mode 100644 index 0000000000..056a78de9d --- /dev/null +++ b/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.anims.toml @@ -0,0 +1,4 @@ +[terror_dog_death] +id = 5628 +[terror_dog_attack] +id = 5625 diff --git a/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.combat.toml b/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.combat.toml index 9fd5e8bbcd..d224b7f58a 100644 --- a/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.combat.toml +++ b/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.combat.toml @@ -1,6 +1,8 @@ [terror_dog] attack_speed = 4 +death_anim = "terror_dog_death" [terror_dog.melee] range = 1 target_hit = { offense = "crush", max = 150 } +anim = "terror_dog_attack" diff --git a/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.anims.toml b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.anims.toml new file mode 100644 index 0000000000..499ba6909f --- /dev/null +++ b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.anims.toml @@ -0,0 +1,13 @@ +[mutated_bloodveld_death] +id = 9131 +[mutated_bloodveld_attack] +id = 9102 + +[skeletal_hand_defend] +id = 9127 + +[skeletal_hand_death] +id = 9126 + +[skeletal_hand_attack] +id = 9125 diff --git a/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.combat.toml b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.combat.toml index dd910054ce..972061c0e3 100644 --- a/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.combat.toml +++ b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.combat.toml @@ -1,13 +1,18 @@ [skeletal_hand] attack_speed = 6 +defend_anim = "skeletal_hand_defend" +death_anim = "skeletal_hand_death" [skeletal_hand.melee] range = 1 target_hit = { offense = "crush", max = 130 } +anim = "skeletal_hand_attack" [mutated_bloodveld] attack_speed = 6 +death_anim = "mutated_bloodveld_death" [mutated_bloodveld.magic] range = 6 target_hit = { offense = "magic", max = 90 } +anim = "mutated_bloodveld_attack" diff --git a/data/area/morytania/port_phasmatys/alices_farm/alices_farm.anims.toml b/data/area/morytania/port_phasmatys/alices_farm/alices_farm.anims.toml new file mode 100644 index 0000000000..6bca758d7c --- /dev/null +++ b/data/area/morytania/port_phasmatys/alices_farm/alices_farm.anims.toml @@ -0,0 +1,6 @@ +[undead_cow_defend] +id = 5850 +[undead_cow_death] +id = 5851 +[undead_cow_attack] +id = 5849 diff --git a/data/area/morytania/port_phasmatys/alices_farm/alices_farm.combat.toml b/data/area/morytania/port_phasmatys/alices_farm/alices_farm.combat.toml index e5f75aa5db..85bc0421d5 100644 --- a/data/area/morytania/port_phasmatys/alices_farm/alices_farm.combat.toml +++ b/data/area/morytania/port_phasmatys/alices_farm/alices_farm.combat.toml @@ -1,6 +1,9 @@ [undead_cow] attack_speed = 4 +defend_anim = "undead_cow_defend" +death_anim = "undead_cow_death" [undead_cow.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "undead_cow_attack" diff --git a/data/area/realm/enchanted_valley/enchanted_valley.anims.toml b/data/area/realm/enchanted_valley/enchanted_valley.anims.toml new file mode 100644 index 0000000000..e3c801eb1e --- /dev/null +++ b/data/area/realm/enchanted_valley/enchanted_valley.anims.toml @@ -0,0 +1,4 @@ +[stag_death] +id = 6377 +[stag_attack] +id = 6376 diff --git a/data/area/realm/enchanted_valley/enchanted_valley.combat.toml b/data/area/realm/enchanted_valley/enchanted_valley.combat.toml index 596137e07f..4be8463f4e 100644 --- a/data/area/realm/enchanted_valley/enchanted_valley.combat.toml +++ b/data/area/realm/enchanted_valley/enchanted_valley.combat.toml @@ -1,6 +1,11 @@ [stag] attack_speed = 4 +death_anim = "stag_death" +defend_sound = "stag_defend" +death_sound = "stag_death" [stag.melee] range = 1 target_hit = { offense = "stab", max = 20 } +anim = "stag_attack" +sound = "stag_attack" diff --git a/data/area/realm/enchanted_valley/enchanted_valley.sounds.toml b/data/area/realm/enchanted_valley/enchanted_valley.sounds.toml new file mode 100644 index 0000000000..6a144c7a0b --- /dev/null +++ b/data/area/realm/enchanted_valley/enchanted_valley.sounds.toml @@ -0,0 +1,6 @@ +[stag_defend] +id = 814 +[stag_death] +id = 813 +[stag_attack] +id = 812 diff --git a/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.anims.toml b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.anims.toml new file mode 100644 index 0000000000..bd3e7a1a6b --- /dev/null +++ b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.anims.toml @@ -0,0 +1,4 @@ +[warped_tortoise_death] +id = 7091 +[warped_tortoise_attack] +id = 7093 diff --git a/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.combat.toml b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.combat.toml index 3e6b5086ec..e9979b8af6 100644 --- a/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.combat.toml +++ b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.combat.toml @@ -1,6 +1,8 @@ [warped_tortoise] attack_speed = 6 +death_anim = "warped_tortoise_death" [warped_tortoise.melee] range = 1 target_hit = { offense = "crush", max = 120 } +anim = "warped_tortoise_attack" diff --git a/data/area/troll_country/death_plateau/death_plateau.anims.toml b/data/area/troll_country/death_plateau/death_plateau.anims.toml new file mode 100644 index 0000000000..d191fa1c0d --- /dev/null +++ b/data/area/troll_country/death_plateau/death_plateau.anims.toml @@ -0,0 +1,24 @@ +[kraka_defend] +id = 285 +[kraka_death] +id = 287 +[kraka_attack] +id = 284 + +[pee_hat_defend] +id = 285 + +[pee_hat_death] +id = 287 + +[pee_hat_attack] +id = 284 + +[stick_defend] +id = 285 + +[stick_death] +id = 287 + +[stick_attack] +id = 284 diff --git a/data/area/troll_country/death_plateau/death_plateau.combat.toml b/data/area/troll_country/death_plateau/death_plateau.combat.toml index 79ad014aea..9419206a2d 100644 --- a/data/area/troll_country/death_plateau/death_plateau.combat.toml +++ b/data/area/troll_country/death_plateau/death_plateau.combat.toml @@ -1,20 +1,29 @@ [stick] attack_speed = 6 +defend_anim = "stick_defend" +death_anim = "stick_death" [stick.melee] range = 1 target_hit = { offense = "crush", max = 270 } +anim = "stick_attack" [pee_hat] attack_speed = 6 +defend_anim = "pee_hat_defend" +death_anim = "pee_hat_death" [pee_hat.melee] range = 1 target_hit = { offense = "crush", max = 230 } +anim = "pee_hat_attack" [kraka] attack_speed = 6 +defend_anim = "kraka_defend" +death_anim = "kraka_death" [kraka.melee] range = 1 target_hit = { offense = "crush", max = 230 } +anim = "kraka_attack" diff --git a/data/area/wilderness/bandit_camp/wilderness_bandit_camp.anims.toml b/data/area/wilderness/bandit_camp/wilderness_bandit_camp.anims.toml new file mode 100644 index 0000000000..aefcafcee4 --- /dev/null +++ b/data/area/wilderness/bandit_camp/wilderness_bandit_camp.anims.toml @@ -0,0 +1,16 @@ +[black_heather_death] +id = 836 +[black_heather_attack] +id = 390 + +[donny_the_lad_death] +id = 836 + +[donny_the_lad_attack] +id = 390 + +[speedy_keith_death] +id = 836 + +[speedy_keith_attack] +id = 390 diff --git a/data/area/wilderness/bandit_camp/wilderness_bandit_camp.combat.toml b/data/area/wilderness/bandit_camp/wilderness_bandit_camp.combat.toml index 7fd45b8281..02d9ffe5cc 100644 --- a/data/area/wilderness/bandit_camp/wilderness_bandit_camp.combat.toml +++ b/data/area/wilderness/bandit_camp/wilderness_bandit_camp.combat.toml @@ -1,20 +1,26 @@ [black_heather] attack_speed = 4 +death_anim = "black_heather_death" [black_heather.melee] range = 1 target_hit = { offense = "slash", max = 40 } +anim = "black_heather_attack" [donny_the_lad] attack_speed = 4 +death_anim = "donny_the_lad_death" [donny_the_lad.melee] range = 1 target_hit = { offense = "slash", max = 40 } +anim = "donny_the_lad_attack" [speedy_keith] attack_speed = 4 +death_anim = "speedy_keith_death" [speedy_keith.melee] range = 1 target_hit = { offense = "slash", max = 40 } +anim = "speedy_keith_attack" diff --git a/data/area/wilderness/wilderness.anims.toml b/data/area/wilderness/wilderness.anims.toml index 4f76ff2662..f4298181c4 100644 --- a/data/area/wilderness/wilderness.anims.toml +++ b/data/area/wilderness/wilderness.anims.toml @@ -1,2 +1,8 @@ [wild_ditch_jump] id = 6132 + +[rogue_death] +id = 836 + +[rogue_attack] +id = 386 diff --git a/data/area/wilderness/wilderness.combat.toml b/data/area/wilderness/wilderness.combat.toml index a4b728c5d7..8e70f9eec1 100644 --- a/data/area/wilderness/wilderness.combat.toml +++ b/data/area/wilderness/wilderness.combat.toml @@ -1,6 +1,8 @@ [rogue] attack_speed = 4 +death_anim = "rogue_death" [rogue.melee] range = 1 target_hit = { offense = "stab", max = 20 } +anim = "rogue_attack" diff --git a/data/entity/npc/animal/dog/dog.anims.toml b/data/entity/npc/animal/dog/dog.anims.toml index ae2dca82eb..f4dce812bb 100644 --- a/data/entity/npc/animal/dog/dog.anims.toml +++ b/data/entity/npc/animal/dog/dog.anims.toml @@ -15,3 +15,12 @@ id = 6564 [medium_dog_attack] id = 6565 + +[wild_dog_defend] +id = 6563 + +[wild_dog_death] +id = 6564 + +[wild_dog_attack] +id = 6562 diff --git a/data/entity/npc/animal/dog/dog.combat.toml b/data/entity/npc/animal/dog/dog.combat.toml index bf90e4644d..50d78f3a4a 100644 --- a/data/entity/npc/animal/dog/dog.combat.toml +++ b/data/entity/npc/animal/dog/dog.combat.toml @@ -22,7 +22,10 @@ anim = "medium_dog_attack" [wild_dog] attack_speed = 4 +defend_anim = "wild_dog_defend" +death_anim = "wild_dog_death" [wild_dog.melee] range = 1 target_hit = { offense = "stab", max = 60 } +anim = "wild_dog_attack" diff --git a/data/entity/npc/boss/giant_mole/giant_mole.combat.toml b/data/entity/npc/boss/giant_mole/giant_mole.combat.toml index 83ad8b905d..95ad93d727 100644 --- a/data/entity/npc/boss/giant_mole/giant_mole.combat.toml +++ b/data/entity/npc/boss/giant_mole/giant_mole.combat.toml @@ -1,6 +1,12 @@ [giant_mole] attack_speed = 4 +defend_anim = "giant_mole_defend" +death_anim = "giant_mole_death" +defend_sound = "giant_mole_defend" +death_sound = "giant_mole_death" [giant_mole.melee] range = 1 target_hit = { offense = "crush", max = 210 } +anim = "giant_mole_attack" +sound = "giant_mole_attack" diff --git a/data/quest/members/clock_tower/clock_tower_dungeon.anims.toml b/data/quest/members/clock_tower/clock_tower_dungeon.anims.toml new file mode 100644 index 0000000000..302df85e22 --- /dev/null +++ b/data/quest/members/clock_tower/clock_tower_dungeon.anims.toml @@ -0,0 +1,4 @@ +[head_thief_death] +id = 836 +[head_thief_attack] +id = 390 diff --git a/data/quest/members/clock_tower/clock_tower_dungeon.combat.toml b/data/quest/members/clock_tower/clock_tower_dungeon.combat.toml index 34a2342cb6..209f5cab90 100644 --- a/data/quest/members/clock_tower/clock_tower_dungeon.combat.toml +++ b/data/quest/members/clock_tower/clock_tower_dungeon.combat.toml @@ -1,6 +1,8 @@ [head_thief] attack_speed = 5 +death_anim = "head_thief_death" [head_thief.melee] range = 1 target_hit = { offense = "slash", max = 30 } +anim = "head_thief_attack" diff --git a/data/quest/members/defender_of_varrock/defender_of_varrock.anims.toml b/data/quest/members/defender_of_varrock/defender_of_varrock.anims.toml new file mode 100644 index 0000000000..c29fdd2863 --- /dev/null +++ b/data/quest/members/defender_of_varrock/defender_of_varrock.anims.toml @@ -0,0 +1,4 @@ +[barbarian_death] +id = 836 +[barbarian_attack] +id = 422 diff --git a/data/quest/members/defender_of_varrock/defender_of_varrock.combat.toml b/data/quest/members/defender_of_varrock/defender_of_varrock.combat.toml index edecb1d908..d40cfba1a7 100644 --- a/data/quest/members/defender_of_varrock/defender_of_varrock.combat.toml +++ b/data/quest/members/defender_of_varrock/defender_of_varrock.combat.toml @@ -1,6 +1,8 @@ [barbarian] attack_speed = 4 +death_anim = "barbarian_death" [barbarian.melee] range = 1 target_hit = { offense = "crush", max = 20 } +anim = "barbarian_attack" diff --git a/data/quest/members/dream_mentor/dream_mentor.anims.toml b/data/quest/members/dream_mentor/dream_mentor.anims.toml new file mode 100644 index 0000000000..a7d22bf429 --- /dev/null +++ b/data/quest/members/dream_mentor/dream_mentor.anims.toml @@ -0,0 +1,4 @@ +[the_inadequacy_death] +id = 6322 +[the_inadequacy_attack] +id = 6318 diff --git a/data/quest/members/dream_mentor/dream_mentor.combat.toml b/data/quest/members/dream_mentor/dream_mentor.combat.toml index fb006726cd..c756e74e47 100644 --- a/data/quest/members/dream_mentor/dream_mentor.combat.toml +++ b/data/quest/members/dream_mentor/dream_mentor.combat.toml @@ -1,6 +1,8 @@ [the_inadequacy] attack_speed = 4 +death_anim = "the_inadequacy_death" [the_inadequacy.range] range = 6 target_hit = { offense = "range", max = 200 } +anim = "the_inadequacy_attack" diff --git a/data/quest/members/mournings_end_part_2/mournings_end_part_2.anims.toml b/data/quest/members/mournings_end_part_2/mournings_end_part_2.anims.toml new file mode 100644 index 0000000000..c0fd1444cc --- /dev/null +++ b/data/quest/members/mournings_end_part_2/mournings_end_part_2.anims.toml @@ -0,0 +1,4 @@ +[shadow_mournings_end_part_2_death] +id = 2739 +[shadow_mournings_end_part_2_attack] +id = 2738 diff --git a/data/quest/members/mournings_end_part_2/mournings_end_part_2.combat.toml b/data/quest/members/mournings_end_part_2/mournings_end_part_2.combat.toml index ef88021715..0f61087cd7 100644 --- a/data/quest/members/mournings_end_part_2/mournings_end_part_2.combat.toml +++ b/data/quest/members/mournings_end_part_2/mournings_end_part_2.combat.toml @@ -1,7 +1,9 @@ [shadow_mournings_end_part_2] attack_speed = 4 +death_anim = "shadow_mournings_end_part_2_death" [shadow_mournings_end_part_2.melee] range = 1 target_hit = { offense = "crush", max = 80 } +anim = "shadow_mournings_end_part_2_attack" From d2b8d4e4fc5f18b71a9342125018fef794264aaa Mon Sep 17 00:00:00 2001 From: Harley Gilpin Date: Fri, 7 Aug 2026 05:59:30 -0700 Subject: [PATCH 12/13] Add combat animations and sounds from 2009 era data 114 combat definitions authored earlier in this branch had no attack/defend/death animations. (ported from rev 530 data; animation ids are stable across revisions for pre-existing content - goblin's ported defend/death ids match void's hand-authored entries exactly). 266 animation and 57 sound entries added next to each combat definition, including per-style attack anims where the source distinguishes magic/ranged. 35 definitions remain without animations: blood reaver, elite dark warriors, cursed ivory bosses, Temple Trekking shadows --- .../asgarnia/burthorpe/burthorpe.anims.toml | 6 ++ .../asgarnia/burthorpe/burthorpe.combat.toml | 3 + .../melzars_maze/melzars_maze.anims.toml | 6 ++ .../melzars_maze/melzars_maze.combat.toml | 3 + .../ice_queens_lair.anims.toml | 4 ++ .../ice_queens_lair.combat.toml | 2 + .../miscellania/miscellania.anims.toml | 57 ++++++++++++++++ .../miscellania/miscellania.combat.toml | 25 +++++++ .../miscellania/miscellania.sounds.toml | 18 +++++ .../pirates_cove/pirates_cove.anims.toml | 15 +++++ .../pirates_cove/pirates_cove.combat.toml | 6 ++ .../rellekka_hunter_area.anims.toml | 15 +++++ .../rellekka_hunter_area.combat.toml | 6 ++ .../rellekka/rellekka.anims.toml | 66 +++++++++++++++++++ .../rellekka/rellekka.combat.toml | 37 +++++++++++ .../rellekka/rellekka.sounds.toml | 42 ++++++++++++ .../waterbirth_island.anims.toml | 6 ++ .../waterbirth_island.combat.toml | 2 + .../kandarin/ape_atoll/ape_atoll.anims.toml | 18 +++++ .../kandarin/ape_atoll/ape_atoll.combat.toml | 9 +++ .../kandarin/ape_atoll/ape_atoll.sounds.toml | 6 ++ .../snake_pit/snake_pit.anims.toml | 4 ++ .../snake_pit/snake_pit.combat.toml | 5 ++ .../snake_pit/snake_pit.sounds.toml | 6 ++ .../ardougne/east_ardougne.anims.toml | 6 ++ .../ardougne/east_ardougne.combat.toml | 3 + .../ardougne/ibans_lair/ibans_lair.anims.toml | 37 +++++++++++ .../ibans_lair/ibans_lair.combat.toml | 13 ++++ .../monastery/ardougne_monastery.anims.toml | 4 ++ .../monastery/ardougne_monastery.combat.toml | 5 ++ .../monastery/ardougne_monastery.sounds.toml | 6 ++ .../sewers/ardougne_sewers.anims.toml | 19 ++++++ .../sewers/ardougne_sewers.combat.toml | 10 +++ .../sewers/ardougne_sewers.sounds.toml | 6 ++ .../underground_pass.anims.toml | 39 +++++++++++ .../underground_pass.combat.toml | 14 ++++ .../witchaven_dungeon.anims.toml | 4 ++ .../witchaven_dungeon.combat.toml | 2 + .../battlefield/battlefield.anims.toml | 10 +++ .../battlefield/battlefield.combat.toml | 7 ++ .../battlefield/battlefield.sounds.toml | 6 ++ .../feldip_hills/feldip_hills.anims.toml | 15 +++++ .../feldip_hills/feldip_hills.combat.toml | 5 ++ .../gu_tanoth/gu_tanoth.anims.toml | 6 ++ .../gu_tanoth/gu_tanoth.combat.toml | 6 ++ .../gu_tanoth/gu_tanoth.sounds.toml | 6 ++ .../underwater_cave.anims.toml | 4 ++ .../underwater_cave.combat.toml | 2 + .../tower_of_life/tower_of_life.anims.toml | 10 +++ .../tower_of_life/tower_of_life.combat.toml | 4 ++ .../yanille_agility_dungeon.anims.toml | 4 ++ .../yanille_agility_dungeon.combat.toml | 2 + data/area/kandarin/yanille/yanille.anims.toml | 16 ++++- .../area/kandarin/yanille/yanille.combat.toml | 5 ++ data/area/karamja/crandor/crandor.anims.toml | 6 ++ data/area/karamja/crandor/crandor.combat.toml | 3 + data/area/karamja/karamja.anims.toml | 31 ++++++++- data/area/karamja/karamja.combat.toml | 10 +++ .../caves/kharazi_caves.anims.toml | 13 ++++ .../caves/kharazi_caves.combat.toml | 5 ++ .../kharazi_jungle/kharazi_jungle.anims.toml | 10 +++ .../kharazi_jungle/kharazi_jungle.combat.toml | 4 ++ .../ship_yard/karamja_ship_yard.anims.toml | 4 ++ .../ship_yard/karamja_ship_yard.combat.toml | 2 + .../tzhaar_city/tzhaar_city.anims.toml | 7 +- .../tzhaar_city/tzhaar_city.combat.toml | 2 + .../agility_pyramid.anims.toml | 6 ++ .../agility_pyramid.combat.toml | 6 ++ .../agility_pyramid.sounds.toml | 6 ++ .../bedabin_camp/bedabin_camp.anims.toml | 4 ++ .../bedabin_camp/bedabin_camp.combat.toml | 2 + .../harmony_island/harmony.anims.toml | 4 ++ .../harmony_island/harmony.combat.toml | 2 + .../kalphite_hive/kalphite_hive.combat.toml | 3 + .../kharidian_desert.anims.toml | 6 ++ .../kharidian_desert.combat.toml | 2 + .../mining_camp/desert_mining_camp.anims.toml | 10 +++ .../desert_mining_camp.combat.toml | 4 ++ .../kharidian_desert/nardah/nardah.anims.toml | 24 +++++++ .../nardah/nardah.combat.toml | 9 +++ .../sophanem/sophanem.anims.toml | 7 +- .../sophanem/sophanem.combat.toml | 2 + .../scabaras_dungeon.anims.toml | 22 +++++++ .../scabaras_dungeon.combat.toml | 8 +++ .../kharidian_desert/ullek/ullek.anims.toml | 16 +++++ .../kharidian_desert/ullek/ullek.combat.toml | 12 ++++ .../dorgesh_kaan_agility_course.anims.toml | 13 ++++ .../dorgesh_kaan_agility_course.combat.toml | 5 ++ .../combat_hall/combat_hall.anims.toml | 10 +++ .../combat_hall/combat_hall.combat.toml | 4 ++ .../tolnas_rift/tolnas_rift.anims.toml | 28 ++++++++ .../tolnas_rift/tolnas_rift.combat.toml | 22 +++++++ .../tolnas_rift/tolnas_rift.sounds.toml | 33 ++++++++++ .../morytania/darkmeyer/darkmeyer.anims.toml | 2 + .../morytania/darkmeyer/darkmeyer.combat.toml | 1 + .../dungeon/fenkenstrains_dungeon.anims.toml | 6 ++ .../dungeon/fenkenstrains_dungeon.combat.toml | 3 + .../lair_of_tarn_razorlor.anims.toml | 4 ++ .../lair_of_tarn_razorlor.combat.toml | 2 + .../tunnels/meiyerditch_tunnels.anims.toml | 13 ++++ .../tunnels/meiyerditch_tunnels.combat.toml | 5 ++ .../alices_farm/alices_farm.anims.toml | 6 ++ .../alices_farm/alices_farm.combat.toml | 3 + .../enchanted_valley.anims.toml | 4 ++ .../enchanted_valley.combat.toml | 5 ++ .../enchanted_valley.sounds.toml | 6 ++ .../poison_waste_slayer_dungeon.anims.toml | 4 ++ .../poison_waste_slayer_dungeon.combat.toml | 2 + .../death_plateau/death_plateau.anims.toml | 24 +++++++ .../death_plateau/death_plateau.combat.toml | 9 +++ .../wilderness_bandit_camp.anims.toml | 16 +++++ .../wilderness_bandit_camp.combat.toml | 6 ++ data/area/wilderness/wilderness.anims.toml | 6 ++ data/area/wilderness/wilderness.combat.toml | 2 + data/entity/npc/animal/dog/dog.anims.toml | 9 +++ data/entity/npc/animal/dog/dog.combat.toml | 3 + .../boss/giant_mole/giant_mole.combat.toml | 6 ++ .../clock_tower_dungeon.anims.toml | 4 ++ .../clock_tower_dungeon.combat.toml | 2 + .../defender_of_varrock.anims.toml | 4 ++ .../defender_of_varrock.combat.toml | 2 + .../dream_mentor/dream_mentor.anims.toml | 4 ++ .../dream_mentor/dream_mentor.combat.toml | 2 + .../mournings_end_part_2.anims.toml | 4 ++ .../mournings_end_part_2.combat.toml | 2 + 125 files changed, 1177 insertions(+), 4 deletions(-) create mode 100644 data/area/asgarnia/burthorpe/burthorpe.anims.toml create mode 100644 data/area/asgarnia/rimmington/melzars_maze/melzars_maze.anims.toml create mode 100644 data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.anims.toml create mode 100644 data/area/fremennik_province/pirates_cove/pirates_cove.anims.toml create mode 100644 data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.anims.toml create mode 100644 data/area/fremennik_province/rellekka/rellekka.sounds.toml create mode 100644 data/area/kandarin/ape_atoll/ape_atoll.sounds.toml create mode 100644 data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.anims.toml create mode 100644 data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.sounds.toml create mode 100644 data/area/kandarin/ardougne/east_ardougne.anims.toml create mode 100644 data/area/kandarin/ardougne/ibans_lair/ibans_lair.anims.toml create mode 100644 data/area/kandarin/ardougne/monastery/ardougne_monastery.anims.toml create mode 100644 data/area/kandarin/ardougne/monastery/ardougne_monastery.sounds.toml create mode 100644 data/area/kandarin/ardougne/sewers/ardougne_sewers.anims.toml create mode 100644 data/area/kandarin/ardougne/sewers/ardougne_sewers.sounds.toml create mode 100644 data/area/kandarin/ardougne/underground_pass/underground_pass.anims.toml create mode 100644 data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.anims.toml create mode 100644 data/area/kandarin/battlefield/battlefield.anims.toml create mode 100644 data/area/kandarin/battlefield/battlefield.sounds.toml create mode 100644 data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.anims.toml create mode 100644 data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.sounds.toml create mode 100644 data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.anims.toml create mode 100644 data/area/kandarin/tower_of_life/tower_of_life.anims.toml create mode 100644 data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.anims.toml create mode 100644 data/area/karamja/crandor/crandor.anims.toml create mode 100644 data/area/karamja/kharazi_jungle/caves/kharazi_caves.anims.toml create mode 100644 data/area/karamja/kharazi_jungle/kharazi_jungle.anims.toml create mode 100644 data/area/karamja/ship_yard/karamja_ship_yard.anims.toml create mode 100644 data/area/kharidian_desert/agility_pyramid/agility_pyramid.anims.toml create mode 100644 data/area/kharidian_desert/agility_pyramid/agility_pyramid.sounds.toml create mode 100644 data/area/kharidian_desert/bedabin_camp/bedabin_camp.anims.toml create mode 100644 data/area/kharidian_desert/harmony_island/harmony.anims.toml create mode 100644 data/area/kharidian_desert/mining_camp/desert_mining_camp.anims.toml create mode 100644 data/area/kharidian_desert/nardah/nardah.anims.toml create mode 100644 data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.anims.toml create mode 100644 data/area/kharidian_desert/ullek/ullek.anims.toml create mode 100644 data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.anims.toml create mode 100644 data/area/misthalin/lumbridge/combat_hall/combat_hall.anims.toml create mode 100644 data/area/misthalin/varrock/tolnas_rift/tolnas_rift.anims.toml create mode 100644 data/area/misthalin/varrock/tolnas_rift/tolnas_rift.sounds.toml create mode 100644 data/area/morytania/darkmeyer/darkmeyer.anims.toml create mode 100644 data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.anims.toml create mode 100644 data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.anims.toml create mode 100644 data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.anims.toml create mode 100644 data/area/morytania/port_phasmatys/alices_farm/alices_farm.anims.toml create mode 100644 data/area/realm/enchanted_valley/enchanted_valley.anims.toml create mode 100644 data/area/realm/enchanted_valley/enchanted_valley.sounds.toml create mode 100644 data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.anims.toml create mode 100644 data/area/troll_country/death_plateau/death_plateau.anims.toml create mode 100644 data/area/wilderness/bandit_camp/wilderness_bandit_camp.anims.toml create mode 100644 data/quest/members/clock_tower/clock_tower_dungeon.anims.toml create mode 100644 data/quest/members/defender_of_varrock/defender_of_varrock.anims.toml create mode 100644 data/quest/members/dream_mentor/dream_mentor.anims.toml create mode 100644 data/quest/members/mournings_end_part_2/mournings_end_part_2.anims.toml diff --git a/data/area/asgarnia/burthorpe/burthorpe.anims.toml b/data/area/asgarnia/burthorpe/burthorpe.anims.toml new file mode 100644 index 0000000000..49cac164ed --- /dev/null +++ b/data/area/asgarnia/burthorpe/burthorpe.anims.toml @@ -0,0 +1,6 @@ +[archer_defend] +id = 404 +[archer_death] +id = 9055 +[archer_attack] +id = 426 diff --git a/data/area/asgarnia/burthorpe/burthorpe.combat.toml b/data/area/asgarnia/burthorpe/burthorpe.combat.toml index 5b5dd6ca09..1def85f830 100644 --- a/data/area/asgarnia/burthorpe/burthorpe.combat.toml +++ b/data/area/asgarnia/burthorpe/burthorpe.combat.toml @@ -10,7 +10,10 @@ target_hit = { offense = "slash", max = 60 } [archer] attack_speed = 4 +defend_anim = "archer_defend" +death_anim = "archer_death" [archer.range] range = 7 target_hit = { offense = "range", max = 40 } +anim = "archer_attack" diff --git a/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.anims.toml b/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.anims.toml new file mode 100644 index 0000000000..40618a1669 --- /dev/null +++ b/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.anims.toml @@ -0,0 +1,6 @@ +[melzar_the_mad_defend] +id = 404 +[melzar_the_mad_death] +id = 9055 +[melzar_the_mad_attack] +id = 423 diff --git a/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.combat.toml b/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.combat.toml index 918f9b579f..a74ff171cf 100644 --- a/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.combat.toml +++ b/data/area/asgarnia/rimmington/melzars_maze/melzars_maze.combat.toml @@ -1,6 +1,9 @@ [melzar_the_mad] attack_speed = 4 +defend_anim = "melzar_the_mad_defend" +death_anim = "melzar_the_mad_death" [melzar_the_mad.melee] range = 1 target_hit = { offense = "crush", max = 50 } +anim = "melzar_the_mad_attack" diff --git a/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.anims.toml b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.anims.toml new file mode 100644 index 0000000000..4c12419a4d --- /dev/null +++ b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.anims.toml @@ -0,0 +1,4 @@ +[ice_queen_death] +id = 836 +[ice_queen_attack] +id = 422 diff --git a/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.combat.toml b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.combat.toml index d4cf2a9c85..7e53bac8ae 100644 --- a/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.combat.toml +++ b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.combat.toml @@ -1,6 +1,8 @@ [ice_queen] attack_speed = 4 +death_anim = "ice_queen_death" [ice_queen.melee] range = 1 target_hit = { offense = "crush", max = 100 } +anim = "ice_queen_attack" diff --git a/data/area/fremennik_province/miscellania/miscellania.anims.toml b/data/area/fremennik_province/miscellania/miscellania.anims.toml index 56a2208832..23ef1582bc 100644 --- a/data/area/fremennik_province/miscellania/miscellania.anims.toml +++ b/data/area/fremennik_province/miscellania/miscellania.anims.toml @@ -6,3 +6,60 @@ id = 6091 [rabbit_death] id = 6092 + +[alrik_defend] +id = 425 + +[alrik_death] +id = 836 + +[alrik_attack] +id = 422 + +[broddi_defend] +id = 425 + +[broddi_death] +id = 836 + +[broddi_attack] +id = 422 + +[ragnvald_defend] +id = 425 + +[ragnvald_death] +id = 836 + +[ragnvald_attack] +id = 810 + +[rannveig_defend] +id = 425 + +[rannveig_death] +id = 836 + +[rannveig_attack] +id = 422 + +[sea_snake_hatchling_death] +id = 3540 + +[sea_snake_hatchling_attack] +id = 3538 + +[sea_snake_young_death] +id = 3540 + +[sea_snake_young_attack] +id = 3538 + +[valgerd_defend] +id = 425 + +[valgerd_death] +id = 836 + +[valgerd_attack] +id = 422 diff --git a/data/area/fremennik_province/miscellania/miscellania.combat.toml b/data/area/fremennik_province/miscellania/miscellania.combat.toml index 3c17e88b7e..4c368e59b6 100644 --- a/data/area/fremennik_province/miscellania/miscellania.combat.toml +++ b/data/area/fremennik_province/miscellania/miscellania.combat.toml @@ -21,10 +21,13 @@ target_hit = { offense = "crush", max = 10 } [alrik] attack_speed = 4 +defend_anim = "alrik_defend" +death_anim = "alrik_death" [alrik.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "alrik_attack" [thorhild] attack_speed = 4 @@ -35,43 +38,65 @@ target_hit = { offense = "crush", max = 10 } [rannveig] attack_speed = 4 +defend_anim = "rannveig_defend" +death_anim = "rannveig_death" [rannveig.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "rannveig_attack" [valgerd] attack_speed = 4 +defend_anim = "valgerd_defend" +death_anim = "valgerd_death" [valgerd.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "valgerd_attack" [broddi] attack_speed = 4 +defend_anim = "broddi_defend" +death_anim = "broddi_death" [broddi.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "broddi_attack" [ragnvald] attack_speed = 4 +defend_anim = "ragnvald_defend" +death_anim = "ragnvald_death" [ragnvald.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "ragnvald_attack" [sea_snake_young] attack_speed = 4 +death_anim = "sea_snake_young_death" +defend_sound = "sea_snake_young_defend" +death_sound = "sea_snake_young_death" [sea_snake_young.melee] range = 1 target_hit = { offense = "crush", max = 80 } +anim = "sea_snake_young_attack" +sound = "sea_snake_young_attack" [sea_snake_hatchling] attack_speed = 4 +death_anim = "sea_snake_hatchling_death" +defend_sound = "sea_snake_hatchling_defend" +death_sound = "sea_snake_hatchling_death" [sea_snake_hatchling.melee] range = 1 target_hit = { offense = "crush", max = 60 } impact_poison = 50 +anim = "sea_snake_hatchling_attack" +sound = "sea_snake_hatchling_attack" diff --git a/data/area/fremennik_province/miscellania/miscellania.sounds.toml b/data/area/fremennik_province/miscellania/miscellania.sounds.toml index 87463d7fc0..7471fc0315 100644 --- a/data/area/fremennik_province/miscellania/miscellania.sounds.toml +++ b/data/area/fremennik_province/miscellania/miscellania.sounds.toml @@ -6,3 +6,21 @@ id = 701 [rabbit_defend] id = 702 + +[sea_snake_hatchling_defend] +id = 3608 + +[sea_snake_hatchling_death] +id = 3610 + +[sea_snake_hatchling_attack] +id = 3609 + +[sea_snake_young_defend] +id = 3608 + +[sea_snake_young_death] +id = 3610 + +[sea_snake_young_attack] +id = 3609 diff --git a/data/area/fremennik_province/pirates_cove/pirates_cove.anims.toml b/data/area/fremennik_province/pirates_cove/pirates_cove.anims.toml new file mode 100644 index 0000000000..78a4522801 --- /dev/null +++ b/data/area/fremennik_province/pirates_cove/pirates_cove.anims.toml @@ -0,0 +1,15 @@ +[jake_defend] +id = 425 +[jake_death] +id = 836 +[jake_attack] +id = 422 + +[wilson_defend] +id = 425 + +[wilson_death] +id = 836 + +[wilson_attack] +id = 395 diff --git a/data/area/fremennik_province/pirates_cove/pirates_cove.combat.toml b/data/area/fremennik_province/pirates_cove/pirates_cove.combat.toml index 63063720bc..f9472bf975 100644 --- a/data/area/fremennik_province/pirates_cove/pirates_cove.combat.toml +++ b/data/area/fremennik_province/pirates_cove/pirates_cove.combat.toml @@ -1,16 +1,22 @@ [jake] attack_speed = 4 +defend_anim = "jake_defend" +death_anim = "jake_death" [jake.melee] range = 1 target_hit = { offense = "crush", max = 40 } +anim = "jake_attack" [wilson] attack_speed = 4 +defend_anim = "wilson_defend" +death_anim = "wilson_death" [wilson.melee] range = 1 target_hit = { offense = "crush", max = 40 } +anim = "wilson_attack" [palmer] attack_speed = 4 diff --git a/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.anims.toml b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.anims.toml new file mode 100644 index 0000000000..9265e80311 --- /dev/null +++ b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.anims.toml @@ -0,0 +1,15 @@ +[gnoeals_defend] +id = 8957 +[gnoeals_death] +id = 8956 +[gnoeals_attack] +id = 8955 + +[yeti_defend] +id = 8966 + +[yeti_death] +id = 8967 + +[yeti_attack] +id = 8965 diff --git a/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.combat.toml b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.combat.toml index 2cbdfd2f91..eb3ff6bb7c 100644 --- a/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.combat.toml +++ b/data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.combat.toml @@ -1,13 +1,19 @@ [yeti] attack_speed = 4 +defend_anim = "yeti_defend" +death_anim = "yeti_death" [yeti.melee] range = 1 target_hit = { offense = "crush", max = 70 } +anim = "yeti_attack" [gnoeals] attack_speed = 6 +defend_anim = "gnoeals_defend" +death_anim = "gnoeals_death" [gnoeals.magic] range = 6 target_hit = { offense = "magic", max = 120 } +anim = "gnoeals_attack" diff --git a/data/area/fremennik_province/rellekka/rellekka.anims.toml b/data/area/fremennik_province/rellekka/rellekka.anims.toml index 6abaca9074..2eea70cc15 100644 --- a/data/area/fremennik_province/rellekka/rellekka.anims.toml +++ b/data/area/fremennik_province/rellekka/rellekka.anims.toml @@ -15,3 +15,69 @@ id = 6569 [fox_death] id = 6570 + +[black_unicorn_defend] +id = 6375 + +[black_unicorn_death] +id = 6377 + +[black_unicorn_attack] +id = 6376 + +[black_unicorn_foal_death] +id = 6377 + +[black_unicorn_foal_attack] +id = 6376 + +[borrokar_defend] +id = 425 + +[borrokar_death] +id = 836 + +[borrokar_attack] +id = 395 + +[fenris_wolf_death] +id = 6558 + +[fenris_wolf_attack] +id = 6559 + +[freidir_defend] +id = 425 + +[freidir_death] +id = 836 + +[freidir_attack] +id = 422 + +[lanzig_defend] +id = 425 + +[lanzig_death] +id = 836 + +[lanzig_attack] +id = 422 + +[lensa_defend] +id = 404 + +[lensa_death] +id = 9055 + +[lensa_attack] +id = 422 + +[unicorn_foal_defend] +id = 6375 + +[unicorn_foal_death] +id = 6377 + +[unicorn_foal_attack] +id = 6376 diff --git a/data/area/fremennik_province/rellekka/rellekka.combat.toml b/data/area/fremennik_province/rellekka/rellekka.combat.toml index 0755f86675..ceb01902b7 100644 --- a/data/area/fremennik_province/rellekka/rellekka.combat.toml +++ b/data/area/fremennik_province/rellekka/rellekka.combat.toml @@ -20,38 +20,59 @@ target_hit = { offense = "crush", max = 0 } [black_unicorn] attack_speed = 4 +defend_anim = "black_unicorn_defend" +death_anim = "black_unicorn_death" +defend_sound = "black_unicorn_defend" +death_sound = "black_unicorn_death" [black_unicorn.melee] range = 1 target_hit = { offense = "stab", max = 30 } +anim = "black_unicorn_attack" +sound = "black_unicorn_attack" [freidir] attack_speed = 4 +defend_anim = "freidir_defend" +death_anim = "freidir_death" [freidir.melee] range = 1 target_hit = { offense = "crush", max = 60 } +anim = "freidir_attack" [borrokar] attack_speed = 4 +defend_anim = "borrokar_defend" +death_anim = "borrokar_death" [borrokar.melee] range = 1 target_hit = { offense = "crush", max = 60 } +anim = "borrokar_attack" [lanzig] attack_speed = 4 +defend_anim = "lanzig_defend" +death_anim = "lanzig_death" [lanzig.melee] range = 1 target_hit = { offense = "crush", max = 60 } +anim = "lanzig_attack" [lensa] attack_speed = 4 +defend_anim = "lensa_defend" +death_anim = "lensa_death" +defend_sound = "lensa_defend" +death_sound = "lensa_death" [lensa.melee] range = 1 target_hit = { offense = "crush", max = 60 } +anim = "lensa_attack" +sound = "lensa_attack" [jennella] attack_speed = 4 @@ -62,21 +83,37 @@ target_hit = { offense = "crush", max = 60 } [unicorn_foal] attack_speed = 4 +defend_anim = "unicorn_foal_defend" +death_anim = "unicorn_foal_death" +defend_sound = "unicorn_foal_defend" +death_sound = "unicorn_foal_death" [unicorn_foal.melee] range = 1 target_hit = { offense = "stab", max = 20 } +anim = "unicorn_foal_attack" +sound = "unicorn_foal_attack" [black_unicorn_foal] attack_speed = 4 +death_anim = "black_unicorn_foal_death" +defend_sound = "black_unicorn_foal_defend" +death_sound = "black_unicorn_foal_death" [black_unicorn_foal.melee] range = 1 target_hit = { offense = "stab", max = 30 } +anim = "black_unicorn_foal_attack" +sound = "black_unicorn_foal_attack" [fenris_wolf] attack_speed = 4 +death_anim = "fenris_wolf_death" +defend_sound = "fenris_wolf_defend" +death_sound = "fenris_wolf_death" [fenris_wolf.melee] range = 1 target_hit = { offense = "crush", max = 69 } +anim = "fenris_wolf_attack" +sound = "fenris_wolf_attack" diff --git a/data/area/fremennik_province/rellekka/rellekka.sounds.toml b/data/area/fremennik_province/rellekka/rellekka.sounds.toml new file mode 100644 index 0000000000..b0e5b37e2c --- /dev/null +++ b/data/area/fremennik_province/rellekka/rellekka.sounds.toml @@ -0,0 +1,42 @@ +[black_unicorn_defend] +id = 371 +[black_unicorn_death] +id = 370 +[black_unicorn_attack] +id = 369 + +[black_unicorn_foal_defend] +id = 371 + +[black_unicorn_foal_death] +id = 370 + +[black_unicorn_foal_attack] +id = 369 + +[fenris_wolf_defend] +id = 491 + +[fenris_wolf_death] +id = 490 + +[fenris_wolf_attack] +id = 481 + +[lensa_defend] +id = 513 + +[lensa_death] +id = 512 + +[lensa_attack] +id = 511 + +[unicorn_foal_defend] +id = 371 + +[unicorn_foal_death] +id = 370 + +[unicorn_foal_attack] +id = 369 diff --git a/data/area/fremennik_province/waterbirth_island/waterbirth_island.anims.toml b/data/area/fremennik_province/waterbirth_island/waterbirth_island.anims.toml index d4956b1c10..5c952f9696 100644 --- a/data/area/fremennik_province/waterbirth_island/waterbirth_island.anims.toml +++ b/data/area/fremennik_province/waterbirth_island/waterbirth_island.anims.toml @@ -39,3 +39,9 @@ id = 2868 [spinolyp_defend] id = 2869 + +[dagannoth_fledgeling_death] +id = 1581 + +[dagannoth_fledgeling_attack] +id = 1579 diff --git a/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml b/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml index d4a5dcb7ea..cb7d3f5ffb 100644 --- a/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml +++ b/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml @@ -49,10 +49,12 @@ impact_poison = 20 [dagannoth_fledgeling] attack_speed = 4 +death_anim = "dagannoth_fledgeling_death" [dagannoth_fledgeling.melee] range = 1 target_hit = { offense = "stab", max = 60 } +anim = "dagannoth_fledgeling_attack" [dagannoth_guardian] attack_speed = 4 diff --git a/data/area/kandarin/ape_atoll/ape_atoll.anims.toml b/data/area/kandarin/ape_atoll/ape_atoll.anims.toml index 5f75c920cf..1fe07ef85b 100644 --- a/data/area/kandarin/ape_atoll/ape_atoll.anims.toml +++ b/data/area/kandarin/ape_atoll/ape_atoll.anims.toml @@ -6,3 +6,21 @@ id = 6776 [bird_death] id = 6777 + +[monkey_archer_defend] +id = 1393 + +[monkey_archer_death] +id = 1384 + +[monkey_archer_attack] +id = 1394 + +[padulah_defend] +id = 1393 + +[padulah_death] +id = 1384 + +[padulah_attack] +id = 1383 diff --git a/data/area/kandarin/ape_atoll/ape_atoll.combat.toml b/data/area/kandarin/ape_atoll/ape_atoll.combat.toml index 63f14d9603..47f3d87697 100644 --- a/data/area/kandarin/ape_atoll/ape_atoll.combat.toml +++ b/data/area/kandarin/ape_atoll/ape_atoll.combat.toml @@ -46,14 +46,23 @@ target_hit = { offense = "slash", max = 140 } [padulah] attack_speed = 4 +defend_anim = "padulah_defend" +death_anim = "padulah_death" [padulah.melee] range = 1 target_hit = { offense = "slash", max = 200 } +anim = "padulah_attack" [monkey_archer] attack_speed = 4 +defend_anim = "monkey_archer_defend" +death_anim = "monkey_archer_death" +defend_sound = "monkey_archer_defend" +death_sound = "monkey_archer_death" [monkey_archer.range] range = 6 target_hit = { offense = "range", max = 200 } +anim = "monkey_archer_attack" +sound = "monkey_archer_attack" diff --git a/data/area/kandarin/ape_atoll/ape_atoll.sounds.toml b/data/area/kandarin/ape_atoll/ape_atoll.sounds.toml new file mode 100644 index 0000000000..aee8dd4cc2 --- /dev/null +++ b/data/area/kandarin/ape_atoll/ape_atoll.sounds.toml @@ -0,0 +1,6 @@ +[monkey_archer_defend] +id = 631 +[monkey_archer_death] +id = 630 +[monkey_archer_attack] +id = 629 diff --git a/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.anims.toml b/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.anims.toml new file mode 100644 index 0000000000..f0776b3952 --- /dev/null +++ b/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.anims.toml @@ -0,0 +1,4 @@ +[big_snake_death] +id = 3540 +[big_snake_attack] +id = 3538 diff --git a/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.combat.toml b/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.combat.toml index a605e5ac38..ea9edb4cc6 100644 --- a/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.combat.toml +++ b/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.combat.toml @@ -1,7 +1,12 @@ [big_snake] attack_speed = 6 +death_anim = "big_snake_death" +defend_sound = "big_snake_defend" +death_sound = "big_snake_death" [big_snake.melee] range = 1 target_hit = { offense = "stab", max = 140 } impact_poison = 10 +anim = "big_snake_attack" +sound = "big_snake_attack" diff --git a/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.sounds.toml b/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.sounds.toml new file mode 100644 index 0000000000..c969b565d8 --- /dev/null +++ b/data/area/kandarin/ape_atoll/crash_island/snake_pit/snake_pit.sounds.toml @@ -0,0 +1,6 @@ +[big_snake_defend] +id = 3608 +[big_snake_death] +id = 3610 +[big_snake_attack] +id = 3609 diff --git a/data/area/kandarin/ardougne/east_ardougne.anims.toml b/data/area/kandarin/ardougne/east_ardougne.anims.toml new file mode 100644 index 0000000000..7a58bfe615 --- /dev/null +++ b/data/area/kandarin/ardougne/east_ardougne.anims.toml @@ -0,0 +1,6 @@ +[hero_defend] +id = 425 +[hero_death] +id = 836 +[hero_attack] +id = 390 diff --git a/data/area/kandarin/ardougne/east_ardougne.combat.toml b/data/area/kandarin/ardougne/east_ardougne.combat.toml index a2537cce16..5442af9a38 100644 --- a/data/area/kandarin/ardougne/east_ardougne.combat.toml +++ b/data/area/kandarin/ardougne/east_ardougne.combat.toml @@ -11,7 +11,10 @@ target_hit = { offense = "crush", max = 70 } [hero] attack_speed = 5 +defend_anim = "hero_defend" +death_anim = "hero_death" [hero.melee] range = 1 target_hit = { offense = "slash", max = 90 } +anim = "hero_attack" diff --git a/data/area/kandarin/ardougne/ibans_lair/ibans_lair.anims.toml b/data/area/kandarin/ardougne/ibans_lair/ibans_lair.anims.toml new file mode 100644 index 0000000000..56d9ccb6b5 --- /dev/null +++ b/data/area/kandarin/ardougne/ibans_lair/ibans_lair.anims.toml @@ -0,0 +1,37 @@ +[disciple_of_iban_death] +id = 836 +[disciple_of_iban_attack] +id = 422 + +[doomion_defend] +id = 65 + +[doomion_death] +id = 67 + +[doomion_attack] +id = 64 + +[holthion_defend] +id = 65 + +[holthion_death] +id = 67 + +[holthion_attack] +id = 64 + +[othainian_defend] +id = 65 + +[othainian_death] +id = 67 + +[othainian_attack] +id = 64 + +[soulless_death] +id = 340 + +[soulless_attack] +id = 338 diff --git a/data/area/kandarin/ardougne/ibans_lair/ibans_lair.combat.toml b/data/area/kandarin/ardougne/ibans_lair/ibans_lair.combat.toml index d1fafd70a6..c915342d16 100644 --- a/data/area/kandarin/ardougne/ibans_lair/ibans_lair.combat.toml +++ b/data/area/kandarin/ardougne/ibans_lair/ibans_lair.combat.toml @@ -1,34 +1,47 @@ [soulless] attack_speed = 4 +death_anim = "soulless_death" [soulless.melee] range = 1 target_hit = { offense = "crush", max = 20 } +anim = "soulless_attack" [othainian] attack_speed = 4 +defend_anim = "othainian_defend" +death_anim = "othainian_death" [othainian.melee] range = 1 target_hit = { offense = "slash", max = 90 } +anim = "othainian_attack" [doomion] attack_speed = 4 +defend_anim = "doomion_defend" +death_anim = "doomion_death" [doomion.melee] range = 1 target_hit = { offense = "slash", max = 90 } +anim = "doomion_attack" [holthion] attack_speed = 4 +defend_anim = "holthion_defend" +death_anim = "holthion_death" [holthion.melee] range = 1 target_hit = { offense = "slash", max = 90 } +anim = "holthion_attack" [disciple_of_iban] attack_speed = 4 +death_anim = "disciple_of_iban_death" [disciple_of_iban.melee] range = 1 target_hit = { offense = "crush", max = 20 } +anim = "disciple_of_iban_attack" diff --git a/data/area/kandarin/ardougne/monastery/ardougne_monastery.anims.toml b/data/area/kandarin/ardougne/monastery/ardougne_monastery.anims.toml new file mode 100644 index 0000000000..e46b4e792c --- /dev/null +++ b/data/area/kandarin/ardougne/monastery/ardougne_monastery.anims.toml @@ -0,0 +1,4 @@ +[monk_death] +id = 836 +[monk_attack] +id = 422 diff --git a/data/area/kandarin/ardougne/monastery/ardougne_monastery.combat.toml b/data/area/kandarin/ardougne/monastery/ardougne_monastery.combat.toml index 4550f9f918..3d79268f17 100644 --- a/data/area/kandarin/ardougne/monastery/ardougne_monastery.combat.toml +++ b/data/area/kandarin/ardougne/monastery/ardougne_monastery.combat.toml @@ -1,6 +1,11 @@ [monk] attack_speed = 4 +death_anim = "monk_death" +defend_sound = "monk_defend" +death_sound = "monk_death" [monk.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "monk_attack" +sound = "monk_attack" diff --git a/data/area/kandarin/ardougne/monastery/ardougne_monastery.sounds.toml b/data/area/kandarin/ardougne/monastery/ardougne_monastery.sounds.toml new file mode 100644 index 0000000000..8ecd8aafc6 --- /dev/null +++ b/data/area/kandarin/ardougne/monastery/ardougne_monastery.sounds.toml @@ -0,0 +1,6 @@ +[monk_defend] +id = 513 +[monk_death] +id = 512 +[monk_attack] +id = 511 diff --git a/data/area/kandarin/ardougne/sewers/ardougne_sewers.anims.toml b/data/area/kandarin/ardougne/sewers/ardougne_sewers.anims.toml new file mode 100644 index 0000000000..6e6771bcb9 --- /dev/null +++ b/data/area/kandarin/ardougne/sewers/ardougne_sewers.anims.toml @@ -0,0 +1,19 @@ +[alomone_death] +id = 836 +[alomone_attack] +id = 422 + +[clivet_defend] +id = 425 + +[clivet_death] +id = 836 + +[clivet_attack] +id = 811 + +[hazeel_cultist_death] +id = 836 + +[hazeel_cultist_attack] +id = 422 diff --git a/data/area/kandarin/ardougne/sewers/ardougne_sewers.combat.toml b/data/area/kandarin/ardougne/sewers/ardougne_sewers.combat.toml index 8611162906..8c0f7c72cd 100644 --- a/data/area/kandarin/ardougne/sewers/ardougne_sewers.combat.toml +++ b/data/area/kandarin/ardougne/sewers/ardougne_sewers.combat.toml @@ -1,20 +1,30 @@ [alomone] attack_speed = 4 +death_anim = "alomone_death" +defend_sound = "alomone_defend" +death_sound = "alomone_death" [alomone.melee] range = 1 target_hit = { offense = "crush", max = 20 } +anim = "alomone_attack" +sound = "alomone_attack" [clivet] attack_speed = 4 +defend_anim = "clivet_defend" +death_anim = "clivet_death" [clivet.melee] range = 1 target_hit = { offense = "crush", max = 20 } +anim = "clivet_attack" [hazeel_cultist] attack_speed = 4 +death_anim = "hazeel_cultist_death" [hazeel_cultist.melee] range = 1 target_hit = { offense = "crush", max = 20 } +anim = "hazeel_cultist_attack" diff --git a/data/area/kandarin/ardougne/sewers/ardougne_sewers.sounds.toml b/data/area/kandarin/ardougne/sewers/ardougne_sewers.sounds.toml new file mode 100644 index 0000000000..fce1434255 --- /dev/null +++ b/data/area/kandarin/ardougne/sewers/ardougne_sewers.sounds.toml @@ -0,0 +1,6 @@ +[alomone_defend] +id = 513 +[alomone_death] +id = 512 +[alomone_attack] +id = 511 diff --git a/data/area/kandarin/ardougne/underground_pass/underground_pass.anims.toml b/data/area/kandarin/ardougne/underground_pass/underground_pass.anims.toml new file mode 100644 index 0000000000..ac39e999d9 --- /dev/null +++ b/data/area/kandarin/ardougne/underground_pass/underground_pass.anims.toml @@ -0,0 +1,39 @@ +[kalrag_defend] +id = 5320 +[kalrag_death] +id = 5321 +[kalrag_attack] +id = 5319 + +[khazard_warlord_death] +id = 836 + +[khazard_warlord_attack] +id = 401 + +[sir_carl_defend] +id = 425 + +[sir_carl_death] +id = 836 + +[sir_carl_attack] +id = 400 + +[sir_harry_defend] +id = 425 + +[sir_harry_death] +id = 836 + +[sir_harry_attack] +id = 400 + +[sir_jerro_defend] +id = 425 + +[sir_jerro_death] +id = 836 + +[sir_jerro_attack] +id = 400 diff --git a/data/area/kandarin/ardougne/underground_pass/underground_pass.combat.toml b/data/area/kandarin/ardougne/underground_pass/underground_pass.combat.toml index a935b516ac..3eefdf6312 100644 --- a/data/area/kandarin/ardougne/underground_pass/underground_pass.combat.toml +++ b/data/area/kandarin/ardougne/underground_pass/underground_pass.combat.toml @@ -1,34 +1,48 @@ [khazard_warlord] attack_speed = 4 +death_anim = "khazard_warlord_death" [khazard_warlord.melee] range = 1 target_hit = { offense = "crush", max = 100 } +anim = "khazard_warlord_attack" [sir_jerro] attack_speed = 5 +defend_anim = "sir_jerro_defend" +death_anim = "sir_jerro_death" [sir_jerro.melee] range = 1 target_hit = { offense = "slash", max = 80 } +anim = "sir_jerro_attack" [sir_carl] attack_speed = 5 +defend_anim = "sir_carl_defend" +death_anim = "sir_carl_death" [sir_carl.melee] range = 1 target_hit = { offense = "slash", max = 80 } +anim = "sir_carl_attack" [sir_harry] attack_speed = 5 +defend_anim = "sir_harry_defend" +death_anim = "sir_harry_death" [sir_harry.melee] range = 1 target_hit = { offense = "slash", max = 80 } +anim = "sir_harry_attack" [kalrag] attack_speed = 4 +defend_anim = "kalrag_defend" +death_anim = "kalrag_death" [kalrag.melee] range = 1 target_hit = { offense = "stab", max = 90 } +anim = "kalrag_attack" diff --git a/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.anims.toml b/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.anims.toml new file mode 100644 index 0000000000..674b64aea3 --- /dev/null +++ b/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.anims.toml @@ -0,0 +1,4 @@ +[giant_lobster_death] +id = 6267 +[giant_lobster_attack] +id = 6265 diff --git a/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.combat.toml b/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.combat.toml index af9e2453d1..67027099e6 100644 --- a/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.combat.toml +++ b/data/area/kandarin/ardougne/witchaven/witchaven_dungeon/witchaven_dungeon.combat.toml @@ -1,6 +1,8 @@ [giant_lobster] attack_speed = 4 +death_anim = "giant_lobster_death" [giant_lobster.melee] range = 1 target_hit = { offense = "stab", max = 40 } +anim = "giant_lobster_attack" diff --git a/data/area/kandarin/battlefield/battlefield.anims.toml b/data/area/kandarin/battlefield/battlefield.anims.toml new file mode 100644 index 0000000000..06701752cb --- /dev/null +++ b/data/area/kandarin/battlefield/battlefield.anims.toml @@ -0,0 +1,10 @@ +[khazard_commander_death] +id = 836 +[khazard_commander_attack] +id = 428 + +[tortoise_death] +id = 3962 + +[tortoise_attack] +id = 3960 diff --git a/data/area/kandarin/battlefield/battlefield.combat.toml b/data/area/kandarin/battlefield/battlefield.combat.toml index b1e7069217..d17734b5d1 100644 --- a/data/area/kandarin/battlefield/battlefield.combat.toml +++ b/data/area/kandarin/battlefield/battlefield.combat.toml @@ -1,13 +1,20 @@ [khazard_commander] attack_speed = 4 +death_anim = "khazard_commander_death" [khazard_commander.melee] range = 1 target_hit = { offense = "stab", max = 50 } +anim = "khazard_commander_attack" [tortoise] attack_speed = 4 +death_anim = "tortoise_death" +defend_sound = "tortoise_defend" +death_sound = "tortoise_death" [tortoise.melee] range = 1 target_hit = { offense = "crush", max = 110 } +anim = "tortoise_attack" +sound = "tortoise_attack" diff --git a/data/area/kandarin/battlefield/battlefield.sounds.toml b/data/area/kandarin/battlefield/battlefield.sounds.toml new file mode 100644 index 0000000000..0bbc3ede1c --- /dev/null +++ b/data/area/kandarin/battlefield/battlefield.sounds.toml @@ -0,0 +1,6 @@ +[tortoise_defend] +id = 459 +[tortoise_death] +id = 458 +[tortoise_attack] +id = 456 diff --git a/data/area/kandarin/feldip_hills/feldip_hills.anims.toml b/data/area/kandarin/feldip_hills/feldip_hills.anims.toml index b1d4006184..29192c7224 100644 --- a/data/area/kandarin/feldip_hills/feldip_hills.anims.toml +++ b/data/area/kandarin/feldip_hills/feldip_hills.anims.toml @@ -15,3 +15,18 @@ id = 12795 [strykewyrm_bury] id = 12796 + +[carnivorous_chinchompa_death] +id = 5183 + +[ogress_death] +id = 8640 + +[ogress_attack] +id = 8636 + +[ogress_champion_death] +id = 8640 + +[ogress_champion_attack] +id = 8636 diff --git a/data/area/kandarin/feldip_hills/feldip_hills.combat.toml b/data/area/kandarin/feldip_hills/feldip_hills.combat.toml index c9460ffa79..5034193548 100644 --- a/data/area/kandarin/feldip_hills/feldip_hills.combat.toml +++ b/data/area/kandarin/feldip_hills/feldip_hills.combat.toml @@ -35,6 +35,7 @@ target_hit = { offense = "magic", max = 0 } range = 8 [carnivorous_chinchompa] attack_speed = 4 +death_anim = "carnivorous_chinchompa_death" [carnivorous_chinchompa.melee] range = 1 @@ -42,14 +43,18 @@ target_hit = { offense = "crush", max = 10 } [ogress_champion] attack_speed = 4 +death_anim = "ogress_champion_death" [ogress_champion.melee] range = 1 target_hit = { offense = "crush", max = 100 } +anim = "ogress_champion_attack" [ogress] attack_speed = 6 +death_anim = "ogress_death" [ogress.melee] range = 1 target_hit = { offense = "crush", max = 80 } +anim = "ogress_attack" diff --git a/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.anims.toml b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.anims.toml new file mode 100644 index 0000000000..e4c3b7e141 --- /dev/null +++ b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.anims.toml @@ -0,0 +1,6 @@ +[gorad_defend] +id = 360 +[gorad_death] +id = 361 +[gorad_attack] +id = 359 diff --git a/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.combat.toml b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.combat.toml index aa811fb05c..800b5f4017 100644 --- a/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.combat.toml +++ b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.combat.toml @@ -7,7 +7,13 @@ target_hit = { offense = "crush", max = 90 } [gorad] attack_speed = 4 +defend_anim = "gorad_defend" +death_anim = "gorad_death" +defend_sound = "gorad_defend" +death_sound = "gorad_death" [gorad.melee] range = 1 target_hit = { offense = "crush", max = 70 } +anim = "gorad_attack" +sound = "gorad_attack" diff --git a/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.sounds.toml b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.sounds.toml new file mode 100644 index 0000000000..0be38d8dcd --- /dev/null +++ b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.sounds.toml @@ -0,0 +1,6 @@ +[gorad_defend] +id = 451 +[gorad_death] +id = 450 +[gorad_attack] +id = 448 diff --git a/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.anims.toml b/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.anims.toml new file mode 100644 index 0000000000..adf8ead5e5 --- /dev/null +++ b/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.anims.toml @@ -0,0 +1,4 @@ +[crab_death] +id = 3430 +[crab_attack] +id = 3428 diff --git a/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.combat.toml b/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.combat.toml index 6473ac68b8..6371ba1f01 100644 --- a/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.combat.toml +++ b/data/area/kandarin/port_khazard/morge_camp/underwater_cave/underwater_cave.combat.toml @@ -1,6 +1,8 @@ [crab] attack_speed = 4 +death_anim = "crab_death" [crab.melee] range = 1 target_hit = { offense = "crush", max = 30 } +anim = "crab_attack" diff --git a/data/area/kandarin/tower_of_life/tower_of_life.anims.toml b/data/area/kandarin/tower_of_life/tower_of_life.anims.toml new file mode 100644 index 0000000000..48c041a5c8 --- /dev/null +++ b/data/area/kandarin/tower_of_life/tower_of_life.anims.toml @@ -0,0 +1,10 @@ +[invrigar_the_necromancer_death] +id = 836 +[invrigar_the_necromancer_attack] +id = 422 + +[necromancer_death] +id = 836 + +[necromancer_attack] +id = 422 diff --git a/data/area/kandarin/tower_of_life/tower_of_life.combat.toml b/data/area/kandarin/tower_of_life/tower_of_life.combat.toml index 14cee01eec..02deee02d3 100644 --- a/data/area/kandarin/tower_of_life/tower_of_life.combat.toml +++ b/data/area/kandarin/tower_of_life/tower_of_life.combat.toml @@ -1,13 +1,17 @@ [invrigar_the_necromancer] attack_speed = 4 +death_anim = "invrigar_the_necromancer_death" [invrigar_the_necromancer.melee] range = 1 target_hit = { offense = "crush", max = 30 } +anim = "invrigar_the_necromancer_attack" [necromancer] attack_speed = 4 +death_anim = "necromancer_death" [necromancer.melee] range = 1 target_hit = { offense = "crush", max = 30 } +anim = "necromancer_attack" diff --git a/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.anims.toml b/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.anims.toml new file mode 100644 index 0000000000..a45bdaaeba --- /dev/null +++ b/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.anims.toml @@ -0,0 +1,4 @@ +[salarin_the_twisted_death] +id = 836 +[salarin_the_twisted_attack] +id = 422 diff --git a/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.combat.toml b/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.combat.toml index be6104b9f3..29176f7e94 100644 --- a/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.combat.toml +++ b/data/area/kandarin/yanille/agility_dungeon/yanille_agility_dungeon.combat.toml @@ -1,6 +1,8 @@ [salarin_the_twisted] attack_speed = 4 +death_anim = "salarin_the_twisted_death" [salarin_the_twisted.melee] range = 1 target_hit = { offense = "crush", max = 70 } +anim = "salarin_the_twisted_attack" diff --git a/data/area/kandarin/yanille/yanille.anims.toml b/data/area/kandarin/yanille/yanille.anims.toml index 90f686b829..9be2e3121e 100644 --- a/data/area/kandarin/yanille/yanille.anims.toml +++ b/data/area/kandarin/yanille/yanille.anims.toml @@ -5,4 +5,18 @@ id = 2589 id = 2590 [climb_out_of_tunnel] -id = 2591 \ No newline at end of file +id = 2591 +[colonel_radick_defend] +id = 425 + +[colonel_radick_death] +id = 836 + +[colonel_radick_attack] +id = 395 + +[watchman_death] +id = 836 + +[watchman_attack] +id = 422 diff --git a/data/area/kandarin/yanille/yanille.combat.toml b/data/area/kandarin/yanille/yanille.combat.toml index fa689b077a..868f218c3a 100644 --- a/data/area/kandarin/yanille/yanille.combat.toml +++ b/data/area/kandarin/yanille/yanille.combat.toml @@ -1,13 +1,18 @@ [watchman] attack_speed = 4 +death_anim = "watchman_death" [watchman.melee] range = 1 target_hit = { offense = "crush", max = 40 } +anim = "watchman_attack" [colonel_radick] attack_speed = 4 +defend_anim = "colonel_radick_defend" +death_anim = "colonel_radick_death" [colonel_radick.melee] range = 1 target_hit = { offense = "slash", max = 40 } +anim = "colonel_radick_attack" diff --git a/data/area/karamja/crandor/crandor.anims.toml b/data/area/karamja/crandor/crandor.anims.toml new file mode 100644 index 0000000000..ecfb7b285e --- /dev/null +++ b/data/area/karamja/crandor/crandor.anims.toml @@ -0,0 +1,6 @@ +[elvarg_defend] +id = 89 +[elvarg_death] +id = 4642 +[elvarg_attack] +id = 80 diff --git a/data/area/karamja/crandor/crandor.combat.toml b/data/area/karamja/crandor/crandor.combat.toml index af87212b46..aff00fc63a 100644 --- a/data/area/karamja/crandor/crandor.combat.toml +++ b/data/area/karamja/crandor/crandor.combat.toml @@ -1,6 +1,9 @@ [elvarg] attack_speed = 4 +defend_anim = "elvarg_defend" +death_anim = "elvarg_death" [elvarg.melee] range = 1 target_hit = { offense = "slash", max = 80 } +anim = "elvarg_attack" diff --git a/data/area/karamja/karamja.anims.toml b/data/area/karamja/karamja.anims.toml index 2f9dfa1054..941f689db7 100644 --- a/data/area/karamja/karamja.anims.toml +++ b/data/area/karamja/karamja.anims.toml @@ -20,4 +20,33 @@ id = 7237 id = 7239 [giant_ant_death] -id = 7238 \ No newline at end of file +id = 7238 +[frog_death] +id = 7256 + +[frog_attack] +id = 7260 + +[giant_wasp_death] +id = 7244 + +[giant_wasp_attack] +id = 7242 + +[pernicious_parrot_death] +id = 6777 + +[pernicious_parrot_attack] +id = 6775 + +[tenacious_toucan_death] +id = 6779 + +[tenacious_toucan_attack] +id = 6775 + +[tribesman_death] +id = 836 + +[tribesman_attack] +id = 428 diff --git a/data/area/karamja/karamja.combat.toml b/data/area/karamja/karamja.combat.toml index 212ebcc1c3..fe2c9c551a 100644 --- a/data/area/karamja/karamja.combat.toml +++ b/data/area/karamja/karamja.combat.toml @@ -39,36 +39,46 @@ target_hit = { offense = "crush", max = 60 } [tribesman] attack_speed = 4 +death_anim = "tribesman_death" [tribesman.melee] range = 1 target_hit = { offense = "stab", max = 40 } +anim = "tribesman_attack" [frog] attack_speed = 4 +death_anim = "frog_death" [frog.melee] range = 1 target_hit = { offense = "crush", max = 61 } impact_poison = 68 +anim = "frog_attack" [tenacious_toucan] attack_speed = 6 +death_anim = "tenacious_toucan_death" [tenacious_toucan.melee] range = 1 target_hit = { offense = "stab", max = 119 } +anim = "tenacious_toucan_attack" [giant_wasp] attack_speed = 6 +death_anim = "giant_wasp_death" [giant_wasp.melee] range = 1 target_hit = { offense = "crush", max = 50 } +anim = "giant_wasp_attack" [pernicious_parrot] attack_speed = 6 +death_anim = "pernicious_parrot_death" [pernicious_parrot.melee] range = 1 target_hit = { offense = "stab", max = 119 } +anim = "pernicious_parrot_attack" diff --git a/data/area/karamja/kharazi_jungle/caves/kharazi_caves.anims.toml b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.anims.toml new file mode 100644 index 0000000000..4430e9e52a --- /dev/null +++ b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.anims.toml @@ -0,0 +1,13 @@ +[death_wing_death] +id = 4917 +[death_wing_attack] +id = 4915 + +[ranalph_devere_defend] +id = 5489 + +[ranalph_devere_death] +id = 5491 + +[ranalph_devere_attack] +id = 5485 diff --git a/data/area/karamja/kharazi_jungle/caves/kharazi_caves.combat.toml b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.combat.toml index 55977fa7d6..a368c94410 100644 --- a/data/area/karamja/kharazi_jungle/caves/kharazi_caves.combat.toml +++ b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.combat.toml @@ -1,9 +1,11 @@ [death_wing] attack_speed = 4 +death_anim = "death_wing_death" [death_wing.melee] range = 1 target_hit = { offense = "stab", max = 80 } +anim = "death_wing_attack" [ungadulu] attack_speed = 4 @@ -28,7 +30,10 @@ target_hit = { offense = "slash", max = 120 } [ranalph_devere] attack_speed = 4 +defend_anim = "ranalph_devere_defend" +death_anim = "ranalph_devere_death" [ranalph_devere.melee] range = 1 target_hit = { offense = "slash", max = 130 } +anim = "ranalph_devere_attack" diff --git a/data/area/karamja/kharazi_jungle/kharazi_jungle.anims.toml b/data/area/karamja/kharazi_jungle/kharazi_jungle.anims.toml new file mode 100644 index 0000000000..1e0e62e447 --- /dev/null +++ b/data/area/karamja/kharazi_jungle/kharazi_jungle.anims.toml @@ -0,0 +1,10 @@ +[jungle_wolf_death] +id = 6558 +[jungle_wolf_attack] +id = 6559 + +[oomlie_bird_death] +id = 5389 + +[oomlie_bird_attack] +id = 5387 diff --git a/data/area/karamja/kharazi_jungle/kharazi_jungle.combat.toml b/data/area/karamja/kharazi_jungle/kharazi_jungle.combat.toml index b6897b471f..0bb85ab5de 100644 --- a/data/area/karamja/kharazi_jungle/kharazi_jungle.combat.toml +++ b/data/area/karamja/kharazi_jungle/kharazi_jungle.combat.toml @@ -1,13 +1,17 @@ [oomlie_bird] attack_speed = 4 +death_anim = "oomlie_bird_death" [oomlie_bird.melee] range = 1 target_hit = { offense = "stab", max = 50 } +anim = "oomlie_bird_attack" [jungle_wolf] attack_speed = 4 +death_anim = "jungle_wolf_death" [jungle_wolf.melee] range = 1 target_hit = { offense = "stab", max = 60 } +anim = "jungle_wolf_attack" diff --git a/data/area/karamja/ship_yard/karamja_ship_yard.anims.toml b/data/area/karamja/ship_yard/karamja_ship_yard.anims.toml new file mode 100644 index 0000000000..1f8562c32e --- /dev/null +++ b/data/area/karamja/ship_yard/karamja_ship_yard.anims.toml @@ -0,0 +1,4 @@ +[foreman_death] +id = 836 +[foreman_attack] +id = 422 diff --git a/data/area/karamja/ship_yard/karamja_ship_yard.combat.toml b/data/area/karamja/ship_yard/karamja_ship_yard.combat.toml index 22635c008e..4bd2cb80f3 100644 --- a/data/area/karamja/ship_yard/karamja_ship_yard.combat.toml +++ b/data/area/karamja/ship_yard/karamja_ship_yard.combat.toml @@ -1,6 +1,8 @@ [foreman] attack_speed = 4 +death_anim = "foreman_death" [foreman.melee] range = 1 target_hit = { offense = "crush", max = 30 } +anim = "foreman_attack" diff --git a/data/area/karamja/tzhaar_city/tzhaar_city.anims.toml b/data/area/karamja/tzhaar_city/tzhaar_city.anims.toml index a8e2815a05..9aa1990b8c 100644 --- a/data/area/karamja/tzhaar_city/tzhaar_city.anims.toml +++ b/data/area/karamja/tzhaar_city/tzhaar_city.anims.toml @@ -44,4 +44,9 @@ id = 9314 id = 9345 [tzhaar_stick_out_arm] -id = 9349 \ No newline at end of file +id = 9349 +[fire_monster_death] +id = 9344 + +[fire_monster_attack] +id = 9341 diff --git a/data/area/karamja/tzhaar_city/tzhaar_city.combat.toml b/data/area/karamja/tzhaar_city/tzhaar_city.combat.toml index deca1ff977..5bc95804c1 100644 --- a/data/area/karamja/tzhaar_city/tzhaar_city.combat.toml +++ b/data/area/karamja/tzhaar_city/tzhaar_city.combat.toml @@ -65,7 +65,9 @@ miss_sound = "spell_splash" [fire_monster] attack_speed = 4 +death_anim = "fire_monster_death" [fire_monster.magic] range = 6 target_hit = { offense = "magic", max = 8 } +anim = "fire_monster_attack" diff --git a/data/area/kharidian_desert/agility_pyramid/agility_pyramid.anims.toml b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.anims.toml new file mode 100644 index 0000000000..f563061686 --- /dev/null +++ b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.anims.toml @@ -0,0 +1,6 @@ +[vulture_defend] +id = 2024 +[vulture_death] +id = 2021 +[vulture_attack] +id = 2019 diff --git a/data/area/kharidian_desert/agility_pyramid/agility_pyramid.combat.toml b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.combat.toml index c4384e0bf5..6566bb5ead 100644 --- a/data/area/kharidian_desert/agility_pyramid/agility_pyramid.combat.toml +++ b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.combat.toml @@ -1,6 +1,12 @@ [vulture] attack_speed = 4 +defend_anim = "vulture_defend" +death_anim = "vulture_death" +defend_sound = "vulture_defend" +death_sound = "vulture_death" [vulture.melee] range = 1 target_hit = { offense = "crush", max = 50 } +anim = "vulture_attack" +sound = "vulture_attack" diff --git a/data/area/kharidian_desert/agility_pyramid/agility_pyramid.sounds.toml b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.sounds.toml new file mode 100644 index 0000000000..73591298f2 --- /dev/null +++ b/data/area/kharidian_desert/agility_pyramid/agility_pyramid.sounds.toml @@ -0,0 +1,6 @@ +[vulture_defend] +id = 892 +[vulture_death] +id = 891 +[vulture_attack] +id = 890 diff --git a/data/area/kharidian_desert/bedabin_camp/bedabin_camp.anims.toml b/data/area/kharidian_desert/bedabin_camp/bedabin_camp.anims.toml new file mode 100644 index 0000000000..129c9a451a --- /dev/null +++ b/data/area/kharidian_desert/bedabin_camp/bedabin_camp.anims.toml @@ -0,0 +1,4 @@ +[bedabin_nomad_fighter_death] +id = 836 +[bedabin_nomad_fighter_attack] +id = 390 diff --git a/data/area/kharidian_desert/bedabin_camp/bedabin_camp.combat.toml b/data/area/kharidian_desert/bedabin_camp/bedabin_camp.combat.toml index c630b5104a..c302cce6b9 100644 --- a/data/area/kharidian_desert/bedabin_camp/bedabin_camp.combat.toml +++ b/data/area/kharidian_desert/bedabin_camp/bedabin_camp.combat.toml @@ -1,6 +1,8 @@ [bedabin_nomad_fighter] attack_speed = 4 +death_anim = "bedabin_nomad_fighter_death" [bedabin_nomad_fighter.melee] range = 1 target_hit = { offense = "slash", max = 70 } +anim = "bedabin_nomad_fighter_attack" diff --git a/data/area/kharidian_desert/harmony_island/harmony.anims.toml b/data/area/kharidian_desert/harmony_island/harmony.anims.toml new file mode 100644 index 0000000000..e1e511c34d --- /dev/null +++ b/data/area/kharidian_desert/harmony_island/harmony.anims.toml @@ -0,0 +1,4 @@ +[sorebones_death] +id = 5658 +[sorebones_attack] +id = 5643 diff --git a/data/area/kharidian_desert/harmony_island/harmony.combat.toml b/data/area/kharidian_desert/harmony_island/harmony.combat.toml index 4d0af8d806..0b60a16387 100644 --- a/data/area/kharidian_desert/harmony_island/harmony.combat.toml +++ b/data/area/kharidian_desert/harmony_island/harmony.combat.toml @@ -1,6 +1,8 @@ [sorebones] attack_speed = 4 +death_anim = "sorebones_death" [sorebones.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "sorebones_attack" diff --git a/data/area/kharidian_desert/kalphite_hive/kalphite_hive.combat.toml b/data/area/kharidian_desert/kalphite_hive/kalphite_hive.combat.toml index 393ea90355..e1ff6b9954 100644 --- a/data/area/kharidian_desert/kalphite_hive/kalphite_hive.combat.toml +++ b/data/area/kharidian_desert/kalphite_hive/kalphite_hive.combat.toml @@ -1,6 +1,9 @@ [goat] attack_speed = 4 +defend_anim = "goat_defend" +death_anim = "goat_death" [goat.melee] range = 1 target_hit = { offense = "crush", max = 40 } +anim = "goat_attack" diff --git a/data/area/kharidian_desert/kharidian_desert.anims.toml b/data/area/kharidian_desert/kharidian_desert.anims.toml index 5dd582a7b4..7af5766d48 100644 --- a/data/area/kharidian_desert/kharidian_desert.anims.toml +++ b/data/area/kharidian_desert/kharidian_desert.anims.toml @@ -18,3 +18,9 @@ id = 4936 [knife_chop] id = 911 + +[desert_wolf_death] +id = 6558 + +[desert_wolf_attack] +id = 6559 diff --git a/data/area/kharidian_desert/kharidian_desert.combat.toml b/data/area/kharidian_desert/kharidian_desert.combat.toml index e8cea297c5..bef0993911 100644 --- a/data/area/kharidian_desert/kharidian_desert.combat.toml +++ b/data/area/kharidian_desert/kharidian_desert.combat.toml @@ -29,7 +29,9 @@ clone = "goat_kharidian_desert.melee" [desert_wolf] attack_speed = 4 +death_anim = "desert_wolf_death" [desert_wolf.melee] range = 1 target_hit = { offense = "slash", max = 30 } +anim = "desert_wolf_attack" diff --git a/data/area/kharidian_desert/mining_camp/desert_mining_camp.anims.toml b/data/area/kharidian_desert/mining_camp/desert_mining_camp.anims.toml new file mode 100644 index 0000000000..fbe162e31d --- /dev/null +++ b/data/area/kharidian_desert/mining_camp/desert_mining_camp.anims.toml @@ -0,0 +1,10 @@ +[mercenary_captain_death] +id = 836 +[mercenary_captain_attack] +id = 390 + +[rowdy_slave_death] +id = 836 + +[rowdy_slave_attack] +id = 422 diff --git a/data/area/kharidian_desert/mining_camp/desert_mining_camp.combat.toml b/data/area/kharidian_desert/mining_camp/desert_mining_camp.combat.toml index 906a4c2809..a2eebf35b6 100644 --- a/data/area/kharidian_desert/mining_camp/desert_mining_camp.combat.toml +++ b/data/area/kharidian_desert/mining_camp/desert_mining_camp.combat.toml @@ -1,13 +1,17 @@ [rowdy_slave] attack_speed = 4 +death_anim = "rowdy_slave_death" [rowdy_slave.melee] range = 1 target_hit = { offense = "crush", max = 20 } +anim = "rowdy_slave_attack" [mercenary_captain] attack_speed = 4 +death_anim = "mercenary_captain_death" [mercenary_captain.melee] range = 1 target_hit = { offense = "slash", max = 50 } +anim = "mercenary_captain_attack" diff --git a/data/area/kharidian_desert/nardah/nardah.anims.toml b/data/area/kharidian_desert/nardah/nardah.anims.toml new file mode 100644 index 0000000000..64c90e8253 --- /dev/null +++ b/data/area/kharidian_desert/nardah/nardah.anims.toml @@ -0,0 +1,24 @@ +[billy_goat_defend] +id = 5342 +[billy_goat_death] +id = 5343 +[billy_goat_attack] +id = 5341 + +[poltenip_defend] +id = 425 + +[poltenip_death] +id = 836 + +[poltenip_attack] +id = 395 + +[radat_defend] +id = 425 + +[radat_death] +id = 836 + +[radat_attack] +id = 395 diff --git a/data/area/kharidian_desert/nardah/nardah.combat.toml b/data/area/kharidian_desert/nardah/nardah.combat.toml index ef10a5b3d1..76f96be59b 100644 --- a/data/area/kharidian_desert/nardah/nardah.combat.toml +++ b/data/area/kharidian_desert/nardah/nardah.combat.toml @@ -1,20 +1,29 @@ [poltenip] attack_speed = 4 +defend_anim = "poltenip_defend" +death_anim = "poltenip_death" [poltenip.melee] range = 1 target_hit = { offense = "stab", max = 30 } +anim = "poltenip_attack" [radat] attack_speed = 4 +defend_anim = "radat_defend" +death_anim = "radat_death" [radat.melee] range = 1 target_hit = { offense = "stab", max = 30 } +anim = "radat_attack" [billy_goat] attack_speed = 4 +defend_anim = "billy_goat_defend" +death_anim = "billy_goat_death" [billy_goat.melee] range = 1 target_hit = { offense = "crush", max = 60 } +anim = "billy_goat_attack" diff --git a/data/area/kharidian_desert/sophanem/sophanem.anims.toml b/data/area/kharidian_desert/sophanem/sophanem.anims.toml index 215dc757da..5888d05c93 100644 --- a/data/area/kharidian_desert/sophanem/sophanem.anims.toml +++ b/data/area/kharidian_desert/sophanem/sophanem.anims.toml @@ -11,4 +11,9 @@ id = 2015 id = 1946 [scarab_attack] -id = 1948 \ No newline at end of file +id = 1948 +[plague_frog_death] +id = 1022 + +[plague_frog_attack] +id = 1021 diff --git a/data/area/kharidian_desert/sophanem/sophanem.combat.toml b/data/area/kharidian_desert/sophanem/sophanem.combat.toml index b0b45f1c1a..6906d41b54 100644 --- a/data/area/kharidian_desert/sophanem/sophanem.combat.toml +++ b/data/area/kharidian_desert/sophanem/sophanem.combat.toml @@ -12,7 +12,9 @@ target_hit = { offense = "crush", max = 30 } [plague_frog] attack_speed = 4 +death_anim = "plague_frog_death" [plague_frog.melee] range = 1 target_hit = { offense = "crush", max = 20 } +anim = "plague_frog_attack" diff --git a/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.anims.toml b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.anims.toml new file mode 100644 index 0000000000..f7df40eb9e --- /dev/null +++ b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.anims.toml @@ -0,0 +1,22 @@ +[scabaras_lancer_death] +id = 7614 +[scabaras_lancer_attack] +id = 7612 + +[scabaras_mage_death] +id = 7616 + +[scabaras_mage_attack] +id = 7615 + +[scabaras_ranger_death] +id = 7609 + +[scabaras_ranger_attack] +id = 7607 + +[scarab_larva_death] +id = 7656 + +[scarab_larva_attack] +id = 7657 diff --git a/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.combat.toml b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.combat.toml index 942f4cf90e..d24c90294e 100644 --- a/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.combat.toml +++ b/data/area/kharidian_desert/ullek/scabaras_dungeon/scabaras_dungeon.combat.toml @@ -1,27 +1,35 @@ [scarab_larva] attack_speed = 4 +death_anim = "scarab_larva_death" [scarab_larva.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "scarab_larva_attack" [scabaras_ranger] attack_speed = 4 +death_anim = "scabaras_ranger_death" [scabaras_ranger.range] range = 6 target_hit = { offense = "range", max = 130 } +anim = "scabaras_ranger_attack" [scabaras_lancer] attack_speed = 4 +death_anim = "scabaras_lancer_death" [scabaras_lancer.melee] range = 1 target_hit = { offense = "crush", max = 130 } +anim = "scabaras_lancer_attack" [scabaras_mage] attack_speed = 4 +death_anim = "scabaras_mage_death" [scabaras_mage.magic] range = 6 target_hit = { offense = "magic", max = 104 } +anim = "scabaras_mage_attack" diff --git a/data/area/kharidian_desert/ullek/ullek.anims.toml b/data/area/kharidian_desert/ullek/ullek.anims.toml new file mode 100644 index 0000000000..360dbc4ad0 --- /dev/null +++ b/data/area/kharidian_desert/ullek/ullek.anims.toml @@ -0,0 +1,16 @@ +[locust_lancer_death] +id = 7581 +[locust_lancer_attack] +id = 7584 + +[locust_ranger_death] +id = 7581 + +[locust_ranger_attack] +id = 5451 + +[scabaras_locust_death] +id = 7581 + +[scabaras_locust_attack] +id = 7586 diff --git a/data/area/kharidian_desert/ullek/ullek.combat.toml b/data/area/kharidian_desert/ullek/ullek.combat.toml index 8e4a1b15c0..ac00d1f81f 100644 --- a/data/area/kharidian_desert/ullek/ullek.combat.toml +++ b/data/area/kharidian_desert/ullek/ullek.combat.toml @@ -1,27 +1,39 @@ [crocodile] attack_speed = 4 +defend_anim = "crocodile_defend" +death_anim = "crocodile_death" +defend_sound = "crocodile_defend" +death_sound = "crocodile_death" [crocodile.melee] range = 1 target_hit = { offense = "slash", max = 60 } +anim = "crocodile_attack" +sound = "crocodile_attack" [scabaras_locust] attack_speed = 4 +death_anim = "scabaras_locust_death" [scabaras_locust.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "scabaras_locust_attack" [locust_lancer] attack_speed = 4 +death_anim = "locust_lancer_death" [locust_lancer.melee] range = 1 target_hit = { offense = "crush", max = 120 } +anim = "locust_lancer_attack" [locust_ranger] attack_speed = 4 +death_anim = "locust_ranger_death" [locust_ranger.range] range = 6 target_hit = { offense = "range", max = 210 } +anim = "locust_ranger_attack" diff --git a/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.anims.toml b/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.anims.toml new file mode 100644 index 0000000000..f909e66fef --- /dev/null +++ b/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.anims.toml @@ -0,0 +1,13 @@ +[big_frog_death] +id = 1795 +[big_frog_attack] +id = 1793 + +[giant_frog_defend] +id = 1794 + +[giant_frog_death] +id = 1795 + +[giant_frog_attack] +id = 1793 diff --git a/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.combat.toml b/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.combat.toml index bf8ad7e4e3..a643527633 100644 --- a/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.combat.toml +++ b/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.combat.toml @@ -1,13 +1,18 @@ [giant_frog] attack_speed = 4 +defend_anim = "giant_frog_defend" +death_anim = "giant_frog_death" [giant_frog.melee] range = 1 target_hit = { offense = "crush", max = 90 } +anim = "giant_frog_attack" [big_frog] attack_speed = 4 +death_anim = "big_frog_death" [big_frog.melee] range = 1 target_hit = { offense = "crush", max = 30 } +anim = "big_frog_attack" diff --git a/data/area/misthalin/lumbridge/combat_hall/combat_hall.anims.toml b/data/area/misthalin/lumbridge/combat_hall/combat_hall.anims.toml new file mode 100644 index 0000000000..03d292fbd3 --- /dev/null +++ b/data/area/misthalin/lumbridge/combat_hall/combat_hall.anims.toml @@ -0,0 +1,10 @@ +[magic_dummy_death] +id = 97 +[magic_dummy_attack] +id = 94 + +[melee_dummy_death] +id = 97 + +[melee_dummy_attack] +id = 94 diff --git a/data/area/misthalin/lumbridge/combat_hall/combat_hall.combat.toml b/data/area/misthalin/lumbridge/combat_hall/combat_hall.combat.toml index 4bff1ac8c3..1d06f147d3 100644 --- a/data/area/misthalin/lumbridge/combat_hall/combat_hall.combat.toml +++ b/data/area/misthalin/lumbridge/combat_hall/combat_hall.combat.toml @@ -1,13 +1,17 @@ [magic_dummy] attack_speed = 4 +death_anim = "magic_dummy_death" [magic_dummy.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "magic_dummy_attack" [melee_dummy] attack_speed = 4 +death_anim = "melee_dummy_death" [melee_dummy.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "melee_dummy_attack" diff --git a/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.anims.toml b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.anims.toml new file mode 100644 index 0000000000..c83e848184 --- /dev/null +++ b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.anims.toml @@ -0,0 +1,28 @@ +[angry_unicorn_death] +id = 6377 +[angry_unicorn_attack] +id = 6376 + +[confusion_beast_defend] +id = 3820 + +[confusion_beast_death] +id = 3821 + +[confusion_beast_attack] +id = 3818 + +[fear_reaper_defend] +id = 3811 + +[fear_reaper_death] +id = 3813 + +[fear_reaper_attack] +id = 3812 + +[hopeless_creature_death] +id = 3827 + +[hopeless_creature_attack] +id = 3823 diff --git a/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.combat.toml b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.combat.toml index 0849105bf6..117364004c 100644 --- a/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.combat.toml +++ b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.combat.toml @@ -1,28 +1,50 @@ [angry_unicorn] attack_speed = 4 +death_anim = "angry_unicorn_death" +defend_sound = "angry_unicorn_defend" +death_sound = "angry_unicorn_death" [angry_unicorn.melee] range = 1 target_hit = { offense = "stab", max = 50 } +anim = "angry_unicorn_attack" +sound = "angry_unicorn_attack" [fear_reaper] attack_speed = 4 +defend_anim = "fear_reaper_defend" +death_anim = "fear_reaper_death" +defend_sound = "fear_reaper_defend" +death_sound = "fear_reaper_death" [fear_reaper.melee] range = 1 target_hit = { offense = "slash", max = 60 } +anim = "fear_reaper_attack" +sound = "fear_reaper_attack" [confusion_beast] attack_speed = 4 +defend_anim = "confusion_beast_defend" +death_anim = "confusion_beast_death" +defend_sound = "confusion_beast_defend" +death_sound = "confusion_beast_death" [confusion_beast.melee] range = 1 target_hit = { offense = "slash", max = 60 } impact_poison = 2 +anim = "confusion_beast_attack" +sound = "confusion_beast_attack" [hopeless_creature] attack_speed = 4 +death_anim = "hopeless_creature_death" +defend_sound = "hopeless_creature_defend" +death_sound = "hopeless_creature_death" [hopeless_creature.melee] range = 1 target_hit = { offense = "slash", max = 70 } +anim = "hopeless_creature_attack" +sound = "hopeless_creature_attack" diff --git a/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.sounds.toml b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.sounds.toml new file mode 100644 index 0000000000..6e03b90e04 --- /dev/null +++ b/data/area/misthalin/varrock/tolnas_rift/tolnas_rift.sounds.toml @@ -0,0 +1,33 @@ +[angry_unicorn_defend] +id = 878 +[angry_unicorn_death] +id = 877 +[angry_unicorn_attack] +id = 876 + +[confusion_beast_defend] +id = 299 + +[confusion_beast_death] +id = 298 + +[confusion_beast_attack] +id = 297 + +[fear_reaper_defend] +id = 299 + +[fear_reaper_death] +id = 298 + +[fear_reaper_attack] +id = 297 + +[hopeless_creature_defend] +id = 299 + +[hopeless_creature_death] +id = 298 + +[hopeless_creature_attack] +id = 297 diff --git a/data/area/morytania/darkmeyer/darkmeyer.anims.toml b/data/area/morytania/darkmeyer/darkmeyer.anims.toml new file mode 100644 index 0000000000..c21e811b62 --- /dev/null +++ b/data/area/morytania/darkmeyer/darkmeyer.anims.toml @@ -0,0 +1,2 @@ +[vyrewatch_attack] +id = 7435 diff --git a/data/area/morytania/darkmeyer/darkmeyer.combat.toml b/data/area/morytania/darkmeyer/darkmeyer.combat.toml index c259e2bc3a..5305c58759 100644 --- a/data/area/morytania/darkmeyer/darkmeyer.combat.toml +++ b/data/area/morytania/darkmeyer/darkmeyer.combat.toml @@ -4,3 +4,4 @@ attack_speed = 8 [vyrewatch.melee] range = 1 target_hit = { offense = "crush", max = 110 } +anim = "vyrewatch_attack" diff --git a/data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.anims.toml b/data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.anims.toml new file mode 100644 index 0000000000..e11897f687 --- /dev/null +++ b/data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.anims.toml @@ -0,0 +1,6 @@ +[experiment_defend] +id = 1627 +[experiment_death] +id = 1628 +[experiment_attack] +id = 1626 diff --git a/data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.combat.toml b/data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.combat.toml index df63421e5a..b4c5398691 100644 --- a/data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.combat.toml +++ b/data/area/morytania/fenkenstrains_castle/dungeon/fenkenstrains_dungeon.combat.toml @@ -1,6 +1,9 @@ [experiment] attack_speed = 4 +defend_anim = "experiment_defend" +death_anim = "experiment_death" [experiment.melee] range = 1 target_hit = { offense = "stab", max = 60 } +anim = "experiment_attack" diff --git a/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.anims.toml b/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.anims.toml new file mode 100644 index 0000000000..056a78de9d --- /dev/null +++ b/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.anims.toml @@ -0,0 +1,4 @@ +[terror_dog_death] +id = 5628 +[terror_dog_attack] +id = 5625 diff --git a/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.combat.toml b/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.combat.toml index 9fd5e8bbcd..d224b7f58a 100644 --- a/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.combat.toml +++ b/data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.combat.toml @@ -1,6 +1,8 @@ [terror_dog] attack_speed = 4 +death_anim = "terror_dog_death" [terror_dog.melee] range = 1 target_hit = { offense = "crush", max = 150 } +anim = "terror_dog_attack" diff --git a/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.anims.toml b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.anims.toml new file mode 100644 index 0000000000..499ba6909f --- /dev/null +++ b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.anims.toml @@ -0,0 +1,13 @@ +[mutated_bloodveld_death] +id = 9131 +[mutated_bloodveld_attack] +id = 9102 + +[skeletal_hand_defend] +id = 9127 + +[skeletal_hand_death] +id = 9126 + +[skeletal_hand_attack] +id = 9125 diff --git a/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.combat.toml b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.combat.toml index dd910054ce..972061c0e3 100644 --- a/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.combat.toml +++ b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.combat.toml @@ -1,13 +1,18 @@ [skeletal_hand] attack_speed = 6 +defend_anim = "skeletal_hand_defend" +death_anim = "skeletal_hand_death" [skeletal_hand.melee] range = 1 target_hit = { offense = "crush", max = 130 } +anim = "skeletal_hand_attack" [mutated_bloodveld] attack_speed = 6 +death_anim = "mutated_bloodveld_death" [mutated_bloodveld.magic] range = 6 target_hit = { offense = "magic", max = 90 } +anim = "mutated_bloodveld_attack" diff --git a/data/area/morytania/port_phasmatys/alices_farm/alices_farm.anims.toml b/data/area/morytania/port_phasmatys/alices_farm/alices_farm.anims.toml new file mode 100644 index 0000000000..6bca758d7c --- /dev/null +++ b/data/area/morytania/port_phasmatys/alices_farm/alices_farm.anims.toml @@ -0,0 +1,6 @@ +[undead_cow_defend] +id = 5850 +[undead_cow_death] +id = 5851 +[undead_cow_attack] +id = 5849 diff --git a/data/area/morytania/port_phasmatys/alices_farm/alices_farm.combat.toml b/data/area/morytania/port_phasmatys/alices_farm/alices_farm.combat.toml index e5f75aa5db..85bc0421d5 100644 --- a/data/area/morytania/port_phasmatys/alices_farm/alices_farm.combat.toml +++ b/data/area/morytania/port_phasmatys/alices_farm/alices_farm.combat.toml @@ -1,6 +1,9 @@ [undead_cow] attack_speed = 4 +defend_anim = "undead_cow_defend" +death_anim = "undead_cow_death" [undead_cow.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "undead_cow_attack" diff --git a/data/area/realm/enchanted_valley/enchanted_valley.anims.toml b/data/area/realm/enchanted_valley/enchanted_valley.anims.toml new file mode 100644 index 0000000000..e3c801eb1e --- /dev/null +++ b/data/area/realm/enchanted_valley/enchanted_valley.anims.toml @@ -0,0 +1,4 @@ +[stag_death] +id = 6377 +[stag_attack] +id = 6376 diff --git a/data/area/realm/enchanted_valley/enchanted_valley.combat.toml b/data/area/realm/enchanted_valley/enchanted_valley.combat.toml index 596137e07f..4be8463f4e 100644 --- a/data/area/realm/enchanted_valley/enchanted_valley.combat.toml +++ b/data/area/realm/enchanted_valley/enchanted_valley.combat.toml @@ -1,6 +1,11 @@ [stag] attack_speed = 4 +death_anim = "stag_death" +defend_sound = "stag_defend" +death_sound = "stag_death" [stag.melee] range = 1 target_hit = { offense = "stab", max = 20 } +anim = "stag_attack" +sound = "stag_attack" diff --git a/data/area/realm/enchanted_valley/enchanted_valley.sounds.toml b/data/area/realm/enchanted_valley/enchanted_valley.sounds.toml new file mode 100644 index 0000000000..6a144c7a0b --- /dev/null +++ b/data/area/realm/enchanted_valley/enchanted_valley.sounds.toml @@ -0,0 +1,6 @@ +[stag_defend] +id = 814 +[stag_death] +id = 813 +[stag_attack] +id = 812 diff --git a/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.anims.toml b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.anims.toml new file mode 100644 index 0000000000..bd3e7a1a6b --- /dev/null +++ b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.anims.toml @@ -0,0 +1,4 @@ +[warped_tortoise_death] +id = 7091 +[warped_tortoise_attack] +id = 7093 diff --git a/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.combat.toml b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.combat.toml index 3e6b5086ec..e9979b8af6 100644 --- a/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.combat.toml +++ b/data/area/tirannwn/poison_waste/slayer_dungeon/poison_waste_slayer_dungeon.combat.toml @@ -1,6 +1,8 @@ [warped_tortoise] attack_speed = 6 +death_anim = "warped_tortoise_death" [warped_tortoise.melee] range = 1 target_hit = { offense = "crush", max = 120 } +anim = "warped_tortoise_attack" diff --git a/data/area/troll_country/death_plateau/death_plateau.anims.toml b/data/area/troll_country/death_plateau/death_plateau.anims.toml new file mode 100644 index 0000000000..d191fa1c0d --- /dev/null +++ b/data/area/troll_country/death_plateau/death_plateau.anims.toml @@ -0,0 +1,24 @@ +[kraka_defend] +id = 285 +[kraka_death] +id = 287 +[kraka_attack] +id = 284 + +[pee_hat_defend] +id = 285 + +[pee_hat_death] +id = 287 + +[pee_hat_attack] +id = 284 + +[stick_defend] +id = 285 + +[stick_death] +id = 287 + +[stick_attack] +id = 284 diff --git a/data/area/troll_country/death_plateau/death_plateau.combat.toml b/data/area/troll_country/death_plateau/death_plateau.combat.toml index 79ad014aea..9419206a2d 100644 --- a/data/area/troll_country/death_plateau/death_plateau.combat.toml +++ b/data/area/troll_country/death_plateau/death_plateau.combat.toml @@ -1,20 +1,29 @@ [stick] attack_speed = 6 +defend_anim = "stick_defend" +death_anim = "stick_death" [stick.melee] range = 1 target_hit = { offense = "crush", max = 270 } +anim = "stick_attack" [pee_hat] attack_speed = 6 +defend_anim = "pee_hat_defend" +death_anim = "pee_hat_death" [pee_hat.melee] range = 1 target_hit = { offense = "crush", max = 230 } +anim = "pee_hat_attack" [kraka] attack_speed = 6 +defend_anim = "kraka_defend" +death_anim = "kraka_death" [kraka.melee] range = 1 target_hit = { offense = "crush", max = 230 } +anim = "kraka_attack" diff --git a/data/area/wilderness/bandit_camp/wilderness_bandit_camp.anims.toml b/data/area/wilderness/bandit_camp/wilderness_bandit_camp.anims.toml new file mode 100644 index 0000000000..aefcafcee4 --- /dev/null +++ b/data/area/wilderness/bandit_camp/wilderness_bandit_camp.anims.toml @@ -0,0 +1,16 @@ +[black_heather_death] +id = 836 +[black_heather_attack] +id = 390 + +[donny_the_lad_death] +id = 836 + +[donny_the_lad_attack] +id = 390 + +[speedy_keith_death] +id = 836 + +[speedy_keith_attack] +id = 390 diff --git a/data/area/wilderness/bandit_camp/wilderness_bandit_camp.combat.toml b/data/area/wilderness/bandit_camp/wilderness_bandit_camp.combat.toml index 7fd45b8281..02d9ffe5cc 100644 --- a/data/area/wilderness/bandit_camp/wilderness_bandit_camp.combat.toml +++ b/data/area/wilderness/bandit_camp/wilderness_bandit_camp.combat.toml @@ -1,20 +1,26 @@ [black_heather] attack_speed = 4 +death_anim = "black_heather_death" [black_heather.melee] range = 1 target_hit = { offense = "slash", max = 40 } +anim = "black_heather_attack" [donny_the_lad] attack_speed = 4 +death_anim = "donny_the_lad_death" [donny_the_lad.melee] range = 1 target_hit = { offense = "slash", max = 40 } +anim = "donny_the_lad_attack" [speedy_keith] attack_speed = 4 +death_anim = "speedy_keith_death" [speedy_keith.melee] range = 1 target_hit = { offense = "slash", max = 40 } +anim = "speedy_keith_attack" diff --git a/data/area/wilderness/wilderness.anims.toml b/data/area/wilderness/wilderness.anims.toml index 4f76ff2662..f4298181c4 100644 --- a/data/area/wilderness/wilderness.anims.toml +++ b/data/area/wilderness/wilderness.anims.toml @@ -1,2 +1,8 @@ [wild_ditch_jump] id = 6132 + +[rogue_death] +id = 836 + +[rogue_attack] +id = 386 diff --git a/data/area/wilderness/wilderness.combat.toml b/data/area/wilderness/wilderness.combat.toml index a4b728c5d7..8e70f9eec1 100644 --- a/data/area/wilderness/wilderness.combat.toml +++ b/data/area/wilderness/wilderness.combat.toml @@ -1,6 +1,8 @@ [rogue] attack_speed = 4 +death_anim = "rogue_death" [rogue.melee] range = 1 target_hit = { offense = "stab", max = 20 } +anim = "rogue_attack" diff --git a/data/entity/npc/animal/dog/dog.anims.toml b/data/entity/npc/animal/dog/dog.anims.toml index ae2dca82eb..f4dce812bb 100644 --- a/data/entity/npc/animal/dog/dog.anims.toml +++ b/data/entity/npc/animal/dog/dog.anims.toml @@ -15,3 +15,12 @@ id = 6564 [medium_dog_attack] id = 6565 + +[wild_dog_defend] +id = 6563 + +[wild_dog_death] +id = 6564 + +[wild_dog_attack] +id = 6562 diff --git a/data/entity/npc/animal/dog/dog.combat.toml b/data/entity/npc/animal/dog/dog.combat.toml index bf90e4644d..50d78f3a4a 100644 --- a/data/entity/npc/animal/dog/dog.combat.toml +++ b/data/entity/npc/animal/dog/dog.combat.toml @@ -22,7 +22,10 @@ anim = "medium_dog_attack" [wild_dog] attack_speed = 4 +defend_anim = "wild_dog_defend" +death_anim = "wild_dog_death" [wild_dog.melee] range = 1 target_hit = { offense = "stab", max = 60 } +anim = "wild_dog_attack" diff --git a/data/entity/npc/boss/giant_mole/giant_mole.combat.toml b/data/entity/npc/boss/giant_mole/giant_mole.combat.toml index 83ad8b905d..95ad93d727 100644 --- a/data/entity/npc/boss/giant_mole/giant_mole.combat.toml +++ b/data/entity/npc/boss/giant_mole/giant_mole.combat.toml @@ -1,6 +1,12 @@ [giant_mole] attack_speed = 4 +defend_anim = "giant_mole_defend" +death_anim = "giant_mole_death" +defend_sound = "giant_mole_defend" +death_sound = "giant_mole_death" [giant_mole.melee] range = 1 target_hit = { offense = "crush", max = 210 } +anim = "giant_mole_attack" +sound = "giant_mole_attack" diff --git a/data/quest/members/clock_tower/clock_tower_dungeon.anims.toml b/data/quest/members/clock_tower/clock_tower_dungeon.anims.toml new file mode 100644 index 0000000000..302df85e22 --- /dev/null +++ b/data/quest/members/clock_tower/clock_tower_dungeon.anims.toml @@ -0,0 +1,4 @@ +[head_thief_death] +id = 836 +[head_thief_attack] +id = 390 diff --git a/data/quest/members/clock_tower/clock_tower_dungeon.combat.toml b/data/quest/members/clock_tower/clock_tower_dungeon.combat.toml index 34a2342cb6..209f5cab90 100644 --- a/data/quest/members/clock_tower/clock_tower_dungeon.combat.toml +++ b/data/quest/members/clock_tower/clock_tower_dungeon.combat.toml @@ -1,6 +1,8 @@ [head_thief] attack_speed = 5 +death_anim = "head_thief_death" [head_thief.melee] range = 1 target_hit = { offense = "slash", max = 30 } +anim = "head_thief_attack" diff --git a/data/quest/members/defender_of_varrock/defender_of_varrock.anims.toml b/data/quest/members/defender_of_varrock/defender_of_varrock.anims.toml new file mode 100644 index 0000000000..c29fdd2863 --- /dev/null +++ b/data/quest/members/defender_of_varrock/defender_of_varrock.anims.toml @@ -0,0 +1,4 @@ +[barbarian_death] +id = 836 +[barbarian_attack] +id = 422 diff --git a/data/quest/members/defender_of_varrock/defender_of_varrock.combat.toml b/data/quest/members/defender_of_varrock/defender_of_varrock.combat.toml index edecb1d908..d40cfba1a7 100644 --- a/data/quest/members/defender_of_varrock/defender_of_varrock.combat.toml +++ b/data/quest/members/defender_of_varrock/defender_of_varrock.combat.toml @@ -1,6 +1,8 @@ [barbarian] attack_speed = 4 +death_anim = "barbarian_death" [barbarian.melee] range = 1 target_hit = { offense = "crush", max = 20 } +anim = "barbarian_attack" diff --git a/data/quest/members/dream_mentor/dream_mentor.anims.toml b/data/quest/members/dream_mentor/dream_mentor.anims.toml new file mode 100644 index 0000000000..a7d22bf429 --- /dev/null +++ b/data/quest/members/dream_mentor/dream_mentor.anims.toml @@ -0,0 +1,4 @@ +[the_inadequacy_death] +id = 6322 +[the_inadequacy_attack] +id = 6318 diff --git a/data/quest/members/dream_mentor/dream_mentor.combat.toml b/data/quest/members/dream_mentor/dream_mentor.combat.toml index fb006726cd..c756e74e47 100644 --- a/data/quest/members/dream_mentor/dream_mentor.combat.toml +++ b/data/quest/members/dream_mentor/dream_mentor.combat.toml @@ -1,6 +1,8 @@ [the_inadequacy] attack_speed = 4 +death_anim = "the_inadequacy_death" [the_inadequacy.range] range = 6 target_hit = { offense = "range", max = 200 } +anim = "the_inadequacy_attack" diff --git a/data/quest/members/mournings_end_part_2/mournings_end_part_2.anims.toml b/data/quest/members/mournings_end_part_2/mournings_end_part_2.anims.toml new file mode 100644 index 0000000000..c0fd1444cc --- /dev/null +++ b/data/quest/members/mournings_end_part_2/mournings_end_part_2.anims.toml @@ -0,0 +1,4 @@ +[shadow_mournings_end_part_2_death] +id = 2739 +[shadow_mournings_end_part_2_attack] +id = 2738 diff --git a/data/quest/members/mournings_end_part_2/mournings_end_part_2.combat.toml b/data/quest/members/mournings_end_part_2/mournings_end_part_2.combat.toml index ef88021715..0f61087cd7 100644 --- a/data/quest/members/mournings_end_part_2/mournings_end_part_2.combat.toml +++ b/data/quest/members/mournings_end_part_2/mournings_end_part_2.combat.toml @@ -1,7 +1,9 @@ [shadow_mournings_end_part_2] attack_speed = 4 +death_anim = "shadow_mournings_end_part_2_death" [shadow_mournings_end_part_2.melee] range = 1 target_hit = { offense = "crush", max = 80 } +anim = "shadow_mournings_end_part_2_attack" From 38c9c3bffa40635b5d0e8d5b7fa00b698e902a21 Mon Sep 17 00:00:00 2001 From: Harley Gilpin Date: Fri, 7 Aug 2026 06:39:16 -0700 Subject: [PATCH 13/13] Add animations for remaining combat definitions from Darkan data 31 of the 35 post-2009 combat definitions 2009scape couldn't cover. Eight ported from darkanrs combatdefs json (chaos dwogre, ogre chieftain, soul wars avatars, blood reaver, ancient mage/ranger attack anims - their defend/death were goblin placeholders so human anims are used - and luminescent icefiend's magic attack from its java combat script). Five Temple Trekking shadows share death anim 1292. Eighteen reuse existing species anims (fremennik citizens and quest humans -> human, elite dark ranger -> archer, trolls, rock crab, demon, dagannoth, ghost, scarab larva) where Darkan only had -1 stubs. Remaining without anims: baby tanglefoot and the three cursed Ivory zogre bosses - no source data in any reference codebase. --- .../chaos_dwarf_battlefield.anims.toml | 6 ++++++ .../chaos_dwarf_battlefield.combat.toml | 3 +++ .../miscellania/miscellania.combat.toml | 6 ++++++ .../pirates_cove/pirates_cove.combat.toml | 3 +++ .../rellekka/rellekka.combat.toml | 3 +++ .../waterbirth_island.combat.toml | 3 +++ .../feldip_hills/gu_tanoth/gu_tanoth.anims.toml | 9 +++++++++ .../feldip_hills/gu_tanoth/gu_tanoth.combat.toml | 3 +++ .../tunnels/troll_stronghold_tunnels.combat.toml | 6 ++++++ data/area/karamja/brimhaven/brimhaven.combat.toml | 3 +++ .../caves/kharazi_caves.combat.toml | 9 +++++++++ .../uzer/mastaba/uzer_mastaba.combat.toml | 2 ++ .../dragontooth_shipwreck.combat.toml | 3 +++ data/area/morytania/mort_ton/mort_ton.combat.toml | 1 + .../realm/spirit_realm/spirit_realm.combat.toml | 3 +++ .../ghorrock_fortress_dungeon.combat.toml | 3 +++ .../god_wars_dungeon/god_wars.anims.toml | 11 +++++++++++ .../god_wars_dungeon/god_wars.combat.toml | 8 ++++++++ .../shade_catacombs/shade_catacombs.anims.toml | 2 ++ .../shade_catacombs/shade_catacombs.combat.toml | 4 ++++ .../nomads_temple/nomads_temple.combat.toml | 3 +++ data/minigame/soul_wars/soul_wars.anims.toml | 15 +++++++++++++++ data/minigame/soul_wars/soul_wars.combat.toml | 6 ++++++ .../black_knights_catacombs.combat.toml | 6 ++++++ data/skill/dungeoneering/dungeoneering.anims.toml | 3 +++ .../skill/dungeoneering/dungeoneering.combat.toml | 1 + 26 files changed, 125 insertions(+) create mode 100644 data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.anims.toml create mode 100644 data/area/troll_country/god_wars_dungeon/god_wars.anims.toml create mode 100644 data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.anims.toml create mode 100644 data/minigame/soul_wars/soul_wars.anims.toml diff --git a/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.anims.toml b/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.anims.toml new file mode 100644 index 0000000000..a708b50563 --- /dev/null +++ b/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.anims.toml @@ -0,0 +1,6 @@ +[chaos_dwogre_attack] +id = 12146 +[chaos_dwogre_defend] +id = 12147 +[chaos_dwogre_death] +id = 12150 diff --git a/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.combat.toml b/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.combat.toml index 80b561d614..b4f80d7122 100644 --- a/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.combat.toml +++ b/data/area/fremennik_province/keldagrim/chaos_dwarf_battlefield/chaos_dwarf_battlefield.combat.toml @@ -1,6 +1,9 @@ [chaos_dwogre] attack_speed = 6 +defend_anim = "chaos_dwogre_defend" +death_anim = "chaos_dwogre_death" [chaos_dwogre.magic] range = 6 target_hit = { offense = "magic", max = 121 } +anim = "chaos_dwogre_attack" diff --git a/data/area/fremennik_province/miscellania/miscellania.combat.toml b/data/area/fremennik_province/miscellania/miscellania.combat.toml index 4c368e59b6..59f92d0e6f 100644 --- a/data/area/fremennik_province/miscellania/miscellania.combat.toml +++ b/data/area/fremennik_province/miscellania/miscellania.combat.toml @@ -14,10 +14,13 @@ target_hit = { offense = "crush", max = 10 } [einar] attack_speed = 4 +defend_anim = "human_defend" +death_anim = "human_death" [einar.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "human_attack" [alrik] attack_speed = 4 @@ -31,10 +34,13 @@ anim = "alrik_attack" [thorhild] attack_speed = 4 +defend_anim = "human_defend" +death_anim = "human_death" [thorhild.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "human_attack" [rannveig] attack_speed = 4 diff --git a/data/area/fremennik_province/pirates_cove/pirates_cove.combat.toml b/data/area/fremennik_province/pirates_cove/pirates_cove.combat.toml index f9472bf975..654d871761 100644 --- a/data/area/fremennik_province/pirates_cove/pirates_cove.combat.toml +++ b/data/area/fremennik_province/pirates_cove/pirates_cove.combat.toml @@ -20,7 +20,10 @@ anim = "wilson_attack" [palmer] attack_speed = 4 +defend_anim = "human_defend" +death_anim = "human_death" [palmer.melee] range = 1 target_hit = { offense = "crush", max = 40 } +anim = "human_attack" diff --git a/data/area/fremennik_province/rellekka/rellekka.combat.toml b/data/area/fremennik_province/rellekka/rellekka.combat.toml index ceb01902b7..1bb1151895 100644 --- a/data/area/fremennik_province/rellekka/rellekka.combat.toml +++ b/data/area/fremennik_province/rellekka/rellekka.combat.toml @@ -76,10 +76,13 @@ sound = "lensa_attack" [jennella] attack_speed = 4 +defend_anim = "human_defend" +death_anim = "human_death" [jennella.melee] range = 1 target_hit = { offense = "crush", max = 60 } +anim = "human_attack" [unicorn_foal] attack_speed = 4 diff --git a/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml b/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml index cb7d3f5ffb..a4e7f6b95a 100644 --- a/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml +++ b/data/area/fremennik_province/waterbirth_island/waterbirth_island.combat.toml @@ -58,7 +58,10 @@ anim = "dagannoth_fledgeling_attack" [dagannoth_guardian] attack_speed = 4 +defend_anim = "dagannoth_defend" +death_anim = "dagannoth_death" [dagannoth_guardian.range] range = 6 target_hit = { offense = "range", max = 114 } +anim = "dagannoth_attack" diff --git a/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.anims.toml b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.anims.toml index e4c3b7e141..18ebb58a4d 100644 --- a/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.anims.toml +++ b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.anims.toml @@ -4,3 +4,12 @@ id = 360 id = 361 [gorad_attack] id = 359 + +[ogre_chieftain_attack] +id = 11470 + +[ogre_chieftain_defend] +id = 11473 + +[ogre_chieftain_death] +id = 11476 diff --git a/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.combat.toml b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.combat.toml index 800b5f4017..bf8c12c707 100644 --- a/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.combat.toml +++ b/data/area/kandarin/feldip_hills/gu_tanoth/gu_tanoth.combat.toml @@ -1,9 +1,12 @@ [ogre_chieftain] attack_speed = 4 +defend_anim = "ogre_chieftain_defend" +death_anim = "ogre_chieftain_death" [ogre_chieftain.melee] range = 1 target_hit = { offense = "crush", max = 90 } +anim = "ogre_chieftain_attack" [gorad] attack_speed = 4 diff --git a/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.combat.toml b/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.combat.toml index 2b5262f2b6..8c8f5081dd 100644 --- a/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.combat.toml +++ b/data/area/kandarin/tree_gnome_stronghold/tunnels/troll_stronghold_tunnels.combat.toml @@ -1,13 +1,19 @@ [twig] attack_speed = 6 +defend_anim = "troll_defend" +death_anim = "troll_death" [twig.melee] range = 1 target_hit = { offense = "crush", max = 130 } +anim = "troll_attack" [berry] attack_speed = 6 +defend_anim = "troll_defend" +death_anim = "troll_death" [berry.melee] range = 1 target_hit = { offense = "crush", max = 130 } +anim = "troll_attack" diff --git a/data/area/karamja/brimhaven/brimhaven.combat.toml b/data/area/karamja/brimhaven/brimhaven.combat.toml index c11150df12..87d7e17ef7 100644 --- a/data/area/karamja/brimhaven/brimhaven.combat.toml +++ b/data/area/karamja/brimhaven/brimhaven.combat.toml @@ -1,6 +1,9 @@ [grip] attack_speed = 4 +defend_anim = "human_defend" +death_anim = "human_death" [grip.melee] range = 1 target_hit = { offense = "slash", max = 30 } +anim = "human_attack" diff --git a/data/area/karamja/kharazi_jungle/caves/kharazi_caves.combat.toml b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.combat.toml index a368c94410..880e4c275d 100644 --- a/data/area/karamja/kharazi_jungle/caves/kharazi_caves.combat.toml +++ b/data/area/karamja/kharazi_jungle/caves/kharazi_caves.combat.toml @@ -9,24 +9,33 @@ anim = "death_wing_attack" [ungadulu] attack_speed = 4 +defend_anim = "human_defend" +death_anim = "human_death" [ungadulu.melee] range = 1 target_hit = { offense = "crush", max = 70 } +anim = "human_attack" [san_tojalon] attack_speed = 4 +defend_anim = "human_defend" +death_anim = "human_death" [san_tojalon.melee] range = 1 target_hit = { offense = "stab", max = 120 } +anim = "human_attack" [irvig_senay] attack_speed = 4 +defend_anim = "human_defend" +death_anim = "human_death" [irvig_senay.melee] range = 1 target_hit = { offense = "slash", max = 120 } +anim = "human_attack" [ranalph_devere] attack_speed = 4 diff --git a/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.combat.toml b/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.combat.toml index 71cee56799..83acd572d4 100644 --- a/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.combat.toml +++ b/data/area/kharidian_desert/uzer/mastaba/uzer_mastaba.combat.toml @@ -1,6 +1,8 @@ [small_scarab] attack_speed = 4 +death_anim = "scarab_larva_death" [small_scarab.melee] range = 1 target_hit = { offense = "crush", max = 15 } +anim = "scarab_larva_attack" diff --git a/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.combat.toml b/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.combat.toml index 74c9fe27a9..d1157fc140 100644 --- a/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.combat.toml +++ b/data/area/morytania/dragontooth_shipwreck/dragontooth_shipwreck.combat.toml @@ -1,6 +1,9 @@ [giant_crab] attack_speed = 4 +defend_anim = "rock_crab_defend" +death_anim = "rock_crab_death" [giant_crab.melee] range = 1 target_hit = { offense = "crush", max = 90 } +anim = "rock_crab_attack" diff --git a/data/area/morytania/mort_ton/mort_ton.combat.toml b/data/area/morytania/mort_ton/mort_ton.combat.toml index 71aab09e8c..0392cc07d5 100644 --- a/data/area/morytania/mort_ton/mort_ton.combat.toml +++ b/data/area/morytania/mort_ton/mort_ton.combat.toml @@ -26,6 +26,7 @@ target_hit = { offense = "crush", max = 40 } [loar_shadow] attack_speed = 4 +death_anim = "shadow_death" [loar_shadow.melee] range = 1 diff --git a/data/area/realm/spirit_realm/spirit_realm.combat.toml b/data/area/realm/spirit_realm/spirit_realm.combat.toml index ff6ee3956a..a10b1c3a31 100644 --- a/data/area/realm/spirit_realm/spirit_realm.combat.toml +++ b/data/area/realm/spirit_realm/spirit_realm.combat.toml @@ -1,6 +1,9 @@ [tormented_wraith] attack_speed = 6 +defend_anim = "ghost_defend" +death_anim = "ghost_death" [tormented_wraith.melee] range = 1 target_hit = { offense = "crush", max = 220 } +anim = "ghost_attack" diff --git a/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.combat.toml b/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.combat.toml index a4ae4135b7..f9f025fa2c 100644 --- a/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.combat.toml +++ b/data/area/troll_country/ghorrock/ghorrock_fortress_dungeon/ghorrock_fortress_dungeon.combat.toml @@ -1,6 +1,9 @@ [ice_demon] attack_speed = 4 +defend_anim = "demon_defend" +death_anim = "demon_death" [ice_demon.magic] range = 6 target_hit = { offense = "magic", max = 230 } +anim = "demon_attack" diff --git a/data/area/troll_country/god_wars_dungeon/god_wars.anims.toml b/data/area/troll_country/god_wars_dungeon/god_wars.anims.toml new file mode 100644 index 0000000000..a25c23ebbc --- /dev/null +++ b/data/area/troll_country/god_wars_dungeon/god_wars.anims.toml @@ -0,0 +1,11 @@ +[ancient_mage_attack] +id = 1979 + +[ancient_ranger_attack] +id = 426 + +[blood_reaver_attack] +id = 7004 + +[blood_reaver_death] +id = 7000 diff --git a/data/area/troll_country/god_wars_dungeon/god_wars.combat.toml b/data/area/troll_country/god_wars_dungeon/god_wars.combat.toml index a455e567fc..d251d15d14 100644 --- a/data/area/troll_country/god_wars_dungeon/god_wars.combat.toml +++ b/data/area/troll_country/god_wars_dungeon/god_wars.combat.toml @@ -1,21 +1,29 @@ [ancient_ranger] attack_speed = 4 +defend_anim = "human_defend" +death_anim = "human_death" [ancient_ranger.range] range = 6 target_hit = { offense = "range", max = 650 } +anim = "ancient_ranger_attack" [blood_reaver] attack_speed = 4 +death_anim = "blood_reaver_death" [blood_reaver.magic] range = 6 target_hit = { offense = "magic", max = 146 } +anim = "blood_reaver_attack" [ancient_mage] attack_speed = 4 +defend_anim = "human_defend" +death_anim = "human_death" [ancient_mage.magic] range = 6 target_hit = { offense = "magic", max = 207 } impact_poison = 88 +anim = "ancient_mage_attack" diff --git a/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.anims.toml b/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.anims.toml new file mode 100644 index 0000000000..de9be56965 --- /dev/null +++ b/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.anims.toml @@ -0,0 +1,2 @@ +[shadow_death] +id = 1292 diff --git a/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.combat.toml b/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.combat.toml index 77e7898047..0b2d5f9909 100644 --- a/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.combat.toml +++ b/data/minigame/shades_of_mort'ton/shade_catacombs/shade_catacombs.combat.toml @@ -1,5 +1,6 @@ [phrin_shadow] attack_speed = 4 +death_anim = "shadow_death" [phrin_shadow.melee] range = 1 @@ -7,6 +8,7 @@ target_hit = { offense = "crush", max = 60 } [riyl_shadow] attack_speed = 4 +death_anim = "shadow_death" [riyl_shadow.melee] range = 1 @@ -14,6 +16,7 @@ target_hit = { offense = "crush", max = 60 } [asyn_shadow] attack_speed = 4 +death_anim = "shadow_death" [asyn_shadow.melee] range = 1 @@ -21,6 +24,7 @@ target_hit = { offense = "crush", max = 90 } [fiyr_shadow] attack_speed = 4 +death_anim = "shadow_death" [fiyr_shadow.melee] range = 1 diff --git a/data/minigame/soul_wars/nomads_temple/nomads_temple.combat.toml b/data/minigame/soul_wars/nomads_temple/nomads_temple.combat.toml index 77f90a9864..da6e1cd151 100644 --- a/data/minigame/soul_wars/nomads_temple/nomads_temple.combat.toml +++ b/data/minigame/soul_wars/nomads_temple/nomads_temple.combat.toml @@ -1,6 +1,9 @@ [spectral_worshipper] attack_speed = 4 +defend_anim = "ghost_defend" +death_anim = "ghost_death" [spectral_worshipper.melee] range = 1 target_hit = { offense = "crush", max = 10 } +anim = "ghost_attack" diff --git a/data/minigame/soul_wars/soul_wars.anims.toml b/data/minigame/soul_wars/soul_wars.anims.toml new file mode 100644 index 0000000000..8d7dadb270 --- /dev/null +++ b/data/minigame/soul_wars/soul_wars.anims.toml @@ -0,0 +1,15 @@ +[avatar_of_destruction_attack] +id = 11197 +[avatar_of_destruction_defend] +id = 11198 +[avatar_of_destruction_death] +id = 11199 + +[avatar_of_creation_attack] +id = 11202 + +[avatar_of_creation_defend] +id = 11203 + +[avatar_of_creation_death] +id = 11204 diff --git a/data/minigame/soul_wars/soul_wars.combat.toml b/data/minigame/soul_wars/soul_wars.combat.toml index ddab71f077..46a47c5b4d 100644 --- a/data/minigame/soul_wars/soul_wars.combat.toml +++ b/data/minigame/soul_wars/soul_wars.combat.toml @@ -1,13 +1,19 @@ [avatar_of_destruction] attack_speed = 4 +defend_anim = "avatar_of_destruction_defend" +death_anim = "avatar_of_destruction_death" [avatar_of_destruction.melee] range = 1 target_hit = { offense = "crush", max = 500 } +anim = "avatar_of_destruction_attack" [avatar_of_creation] attack_speed = 4 +defend_anim = "avatar_of_creation_defend" +death_anim = "avatar_of_creation_death" [avatar_of_creation.melee] range = 1 target_hit = { offense = "crush", max = 460 } +anim = "avatar_of_creation_attack" diff --git a/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.combat.toml b/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.combat.toml index b0beb953ee..316e6631bf 100644 --- a/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.combat.toml +++ b/data/quest/members/while_guthix_sleeps/black_knights_catacombs/black_knights_catacombs.combat.toml @@ -1,13 +1,19 @@ [elite_dark_ranger] attack_speed = 4 +defend_anim = "archer_defend" +death_anim = "archer_death" [elite_dark_ranger.range] range = 6 target_hit = { offense = "range", max = 90 } +anim = "archer_attack" [elite_dark_mage] attack_speed = 4 +defend_anim = "human_defend" +death_anim = "human_death" [elite_dark_mage.magic] range = 6 target_hit = { offense = "magic", max = 190 } +anim = "human_attack" diff --git a/data/skill/dungeoneering/dungeoneering.anims.toml b/data/skill/dungeoneering/dungeoneering.anims.toml index d440fbf597..14729c99ad 100644 --- a/data/skill/dungeoneering/dungeoneering.anims.toml +++ b/data/skill/dungeoneering/dungeoneering.anims.toml @@ -18,3 +18,6 @@ id = 14568 [repair_collapsing_doorframe] id = 14566 + +[luminescent_icefiend_attack] +id = 13352 diff --git a/data/skill/dungeoneering/dungeoneering.combat.toml b/data/skill/dungeoneering/dungeoneering.combat.toml index 7ae97025d6..59d749d1fd 100644 --- a/data/skill/dungeoneering/dungeoneering.combat.toml +++ b/data/skill/dungeoneering/dungeoneering.combat.toml @@ -4,3 +4,4 @@ attack_speed = 6 [luminescent_icefiend.magic] range = 6 target_hit = { offense = "magic", max = 40 } +anim = "luminescent_icefiend_attack"