Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/area/asgarnia/entrana/entrana.npc-spawns.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spawns = [
{ id = "entrana_monk_grey", x = 2835, y = 3336, members = true },
{ id = "entrana_monk_white", x = 2839, y = 3335 },
{ id = "entrana_monk_ginger", x = 2830, y = 3335 },
{ id = "mazion_entrana", x = 2818, y = 3342, members = true },
{ id = "mazion", x = 2818, y = 3342, members = true },
{ id = "fishing_spot_entrana", x = 2840, y = 3356, members = true },
{ id = "fishing_spot_entrana", x = 2842, y = 3359, members = true },
{ id = "fishing_spot_entrana", x = 2845, y = 3356, members = true },
Expand Down
2 changes: 1 addition & 1 deletion data/area/asgarnia/entrana/entrana.npcs.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ examine = "Holy looking."
id = 658
examine = "Holy looking."

[mazion_entrana]
[mazion]
id = 3114
examine = "Mazion seems to be covered in sand."

Expand Down
15 changes: 15 additions & 0 deletions data/area/asgarnia/entrana/entrana.objs.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,18 @@ examine = "Handy for boarding the ship."
[entrana_gangplank_enter]
id = 2414
examine = "Handy for boarding the ship."

[entrana_ladder]
id = 2408

[dramen_tree]
id = 1292
examine = "An ancient magical tree."

[magic_door_opened]
id = 31812
examine = "A large single door."

[magic_door_closed]
id = 2407
examine = "The door is closed."
4 changes: 2 additions & 2 deletions data/area/kandarin/ancient_cavern/ancient_cavern.combat.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ attack_speed = 4
retreat_range = 8
defend_anim = "barbarian_unarmed_defend"
defend_sound = "barbarian_grunt_defend"
death_anim = "confused_barbarian_death"
death_sound = "confused_barbarian_death"
death_anim = "human_death"
death_sound = "barbarian_grunt_death"

[skeleton_barbarian_axe.melee]
range = 1
Expand Down
9 changes: 0 additions & 9 deletions data/area/kandarin/ancient_cavern/ancient_cavern.sounds.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,3 @@ id = 3382

[dharok_axe_crush]
id = 1316

[ghoul_attack]
id = 442

[ghoul_defend]
id = 444

[ghoul_death]
id = 443
14 changes: 13 additions & 1 deletion data/area/kandarin/ardougne/east_ardougne.objs.toml
Original file line number Diff line number Diff line change
Expand Up @@ -175,4 +175,16 @@ examine = "Used for fashioning clay items."
id = 8783

[ladder_mourner_tunnels]
id = 8785
id = 8785

[flour_bin_ardougne]
id = 1782

[hopper_ardougne]
id = 2717

[hopper_controls_ardougne]
id = 2721

[flour_bin_ardougne_empty]
id = 5792
17 changes: 16 additions & 1 deletion data/area/misthalin/lumbridge/swamp/lumbridge_swamp.objs.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,19 @@ examine = "Noxious gas hazard! Naked flames may cause an explosion!"

[goblin_cave_entrance]
id = 5947
examine = "An entrance to Lumbridge Swamp Caves."
examine = "An entrance to Lumbridge Swamp Caves."

[lost_city_tree]
clone = "tree"
id = 2409
examine = "A gnarly swamp tree."

[tools]
id = 10375

[zanaris_door_opened]
id = 10363

[zanaris_door_closed]
id = 2406
examine = "A pretty door."
11 changes: 11 additions & 0 deletions data/area/misthalin/varrock/cooks_guild/cooks_guild.objs.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[flour_bin_cooks_guild]
id = 24070

[hopper_cooks_guild]
id = 24071

[hopper_controls_cooks_guild]
id = 24072

[flour_bin_cooks_guild_empty]
id = 24069
52 changes: 52 additions & 0 deletions data/area/misthalin/zanaris/zanaris.anims.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,55 @@ id = 2776

[zygomite_death]
id = 2777

[teleport_puro_puro]
id = 6601
ticks = 9

[otherworldly_being_attack]
id = 14094

[otherworldly_being_defend]
id = 14095

[otherworldly_being_death]
id = 14096

[pick_zygomite]
id = 3335

[zygomite_grow]
id = 2983

[spear_trap_side_caught]
id = 3279

[spear_trap_caught_right]
id = 3278

[spear_trap_caught_left]
id = 3279

[spear_trap_jump_left]
id = 3275

[spear_trap_jump_right]
id = 3274

[side_hurt_right]
id = 2592

[side_hurt_left]
id = 2593

[spear_trap_release]
id = 459

[spear_trap_walk_left]
id = 3277

[spear_trap_walk_right]
id = 3276

[dive_player]
id = 1115
39 changes: 38 additions & 1 deletion data/area/misthalin/zanaris/zanaris.combat.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,47 @@ death_sound = "zygomite_death"
range = 1
anim = "zygomite_attack"
target_sound = "zygomite_attack"
target_hit = { offense = "magic", defence = "melee", max = 70 }
target_hit = { offense = "magic", defence = "melee", max = 80 }

[zygomite.ranged]
range = 1
anim = "zygomite_attack"
target_sound = "zygomite_attack"
projectile = "zygomite_spores"
target_hit = { offense = "magic", defence = "range", max = 100 }

[adolescent_zygomite]
attack_speed = 4
retreat_range = 8
defend_anim = "zygomite_defend"
defend_sound = "adolescent_zygomite_defend"
death_anim = "zygomite_death"
death_sound = "adolescent_zygomite_death"

[adolescent_zygomite.melee]
range = 1
anim = "zygomite_attack"
target_sound = "zygomite_attack"
target_hit = { offense = "magic", defence = "melee", max = 70 }

[adolescent_zygomite.ranged]
range = 1
anim = "zygomite_attack"
target_sound = "adolescent_zygomite_attack"
projectile = "adolescent_zygomite_spores"
impact_sound = "adolescent_zygomite_impact"
target_hit = { offense = "magic", defence = "range", max = 60 }

[otherworldly_being]
attack_speed = 4
retreat_range = 8
defend_anim = "otherworldly_being_defend"
defend_sound = "otherworldly_being_defend"
death_anim = "otherworldly_being_death"
death_sound = "otherworldly_being_death"

[otherworldly_being.melee]
range = 1
anim = "otherworldly_being_attack"
target_sound = "otherworldly_being_attack"
target_hit = { offense = "crush", max = 70 }
7 changes: 7 additions & 0 deletions data/area/misthalin/zanaris/zanaris.gfx.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[teleport_puro_puro]
id = 1118

[zygomite_spores]
id = 576
delay = 35
time_offset = 5
12 changes: 6 additions & 6 deletions data/area/misthalin/zanaris/zanaris.npc-spawns.toml
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ spawns = [
{ id = "fungi", x = 2415, y = 4475, members = true },
{ id = "fungi", x = 2419, y = 4467, members = true },
{ id = "fungi", x = 2419, y = 4474, members = true },
{ id = "fungi_2", x = 2412, y = 4370, members = true },
{ id = "fungi_2", x = 2416, y = 4376, members = true },
{ id = "fungi_2", x = 2419, y = 4374, members = true },
{ id = "fungi_2", x = 2420, y = 4377, members = true },
{ id = "fungi_2", x = 2421, y = 4370, members = true },
{ id = "fungi_large", x = 2412, y = 4370, members = true },
{ id = "fungi_large", x = 2416, y = 4376, members = true },
{ id = "fungi_large", x = 2419, y = 4374, members = true },
{ id = "fungi_large", x = 2420, y = 4377, members = true },
{ id = "fungi_large", x = 2421, y = 4370, members = true },
{ id = "fairy_9", x = 2377, y = 4450, members = true },
{ id = "fairy_9", x = 2381, y = 4459, members = true },
{ id = "fairy_9", x = 2388, y = 4425, members = true },
Expand Down Expand Up @@ -114,7 +114,7 @@ spawns = [
{ id = "jukat", x = 2484, y = 4452 },
{ id = "lunderwin", x = 2475, y = 4465 },
{ id = "irksol", x = 2479, y = 4469 },
{ id = "fairy_11", x = 2486, y = 4470 },
{ id = "fairy_attendant", x = 2486, y = 4470 },
{ id = "fairy_aeryka", x = 2426, y = 4442 },
{ id = "wandering_impling", x = 2424, y = 4436, members = true },
{ id = "banker_zanaris_2", x = 2379, y = 4459, members = true },
Expand Down
52 changes: 34 additions & 18 deletions data/area/misthalin/zanaris/zanaris.npcs.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ examine = "Guardian of the market gate."

[sheep_zanaris]
id = 3310
large_head = true

[fairy_queen]
id = 3314
Expand All @@ -68,10 +69,35 @@ examine = "Likes to cook with mushrooms."

[fungi]
id = 3344
hitpoints = 650
att = 65
str = 65
def = 65
mage = 65
range = 65
attack_bonus = 30
slayer_level = 57
slayer_xp = 65.0
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."

[fungi_2]
[fungi_large]
id = 3345
hitpoints = 750
att = 75
str = 75
def = 75
mage = 75
range = 75
attack_bonus = 30
slayer_level = 57
slayer_xp = 75.0
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."

[fairy_9]
id = 4422
Expand All @@ -94,6 +120,7 @@ examine = "Fairy ring maintenance division."

[sheep_zanaris_2]
id = 5164
large_head = true

[fairy_shopkeeper]
id = 534
Expand All @@ -119,7 +146,7 @@ id = 566
shop = "irksols_ruby_rings"
examine = "Is he invisible or just floating clothing?"

[fairy_11]
[fairy_attendant]
id = 567
examine = "Looks strange and mysterious."

Expand All @@ -137,8 +164,7 @@ hitpoints = 660
att = 56
str = 56
def = 46
style = "crush"
max_hit_melee = 70
combat_def = "otherworldly_being"
slayer_xp = 66.0
categories = ["otherworldly_beings"]
respawn_delay = 20
Expand Down Expand Up @@ -219,21 +245,11 @@ id = 11434

[zygomite]
id = 3346
hitpoints = 650
att = 65
str = 65
def = 65
mage = 65
range = 65
combat_def = "zygomite"
attack_bonus = 30
slayer_xp = 65.0
categories = ["mutated_zygomites"]
respawn_delay = 30
drop_table = "zygomite_level_74"
combat_def = "adolescent_zygomite"
examine = "A bouncy fungus."

[zygomite_2]
[zygomite_large]
id = 3347
clone = "zygomite"
drop_table = "zygomite_level_86"
combat_def = "zygomite"
examine = "A fun guy. No wait, that's awful.."
Loading
Loading