Skip to content

Commit e2a097d

Browse files
authored
Add ancient cavern and kuradals dungeon (#924)
* Start adding ancient cavern and kuradals dungeon * Add waterfiends * Add confused barbarian * Fix metal dragon animations * Fix metal dragon animations * Add mithril dragon * Add barbarian skeletons and spirits * Remove unused kalphite combat def * Hide internal function * Fix combat def centre projectile origin * Fix projectiles * Add skeleton looting and log exit * Fix barrier anims * Fix origin x/y cloning * Fix spellbook filtering closes #923 * Add waterfiend tasks * Formatting
1 parent 6eec11c commit e2a097d

35 files changed

Lines changed: 894 additions & 118 deletions
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[jump_whirlpool]
2+
id = 6723
3+
4+
[pass_through_barrier]
5+
id = 10584
6+
7+
[brutal_dragon_shoot]
8+
id = 4972
9+
10+
[barbarian_unarmed_defend]
11+
id = 3238
12+
13+
[barbarian_spirit_attack]
14+
id = 6726
15+
16+
[barbarian_spirit_defend]
17+
id = 6728
18+
19+
[barbarian_spirit_death]
20+
id = 6727
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
[kuradals_dungeon]
22
x = [1600, 1663]
33
y = [5248, 5311]
4+
5+
[kuradals_teleport]
6+
x = [1736, 1739]
7+
y = [5311, 5313]
8+
level = 1
Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
[brutal_green_dragon]
2+
attack_speed = 4
3+
retreat_range = 8
4+
defend_anim = "colour_dragon_defend"
5+
defend_sound = "dragon_defend"
6+
death_anim = "colour_dragon_death"
7+
death_sound = "dragon_death"
8+
9+
[brutal_green_dragon.melee]
10+
chance = 75
11+
range = 1
12+
anim = "colour_dragon_attack"
13+
target_hit = { offense = "stab", max = 180 }
14+
target_sound = "dragon_attack"
15+
16+
[brutal_green_dragon.dragonfire]
17+
chance = 25
18+
range = 8
19+
anim = "colour_dragon_breath"
20+
gfx = "dragon_breath_shoot"
21+
target_hit = { offense = "dragonfire", special = true, max = 500 }
22+
target_sound = "dragon_breath"
23+
24+
[brutal_green_dragon.magic]
25+
chance = 75
26+
range = 8
27+
anim = "brutal_dragon_shoot"
28+
projectile = "water_wave"
29+
projectile_origin_x = 2
30+
projectile_origin_y = 2
31+
target_hit = { offense = "magic", max = 180 }
32+
target_sound = "dragon_attack"
33+
34+
[skeleton_barbarian_axe]
35+
attack_speed = 4
36+
retreat_range = 8
37+
defend_anim = "barbarian_unarmed_defend"
38+
defend_sound = "barbarian_grunt_defend"
39+
death_anim = "confused_barbarian_death"
40+
death_sound = "confused_barbarian_death"
41+
42+
[skeleton_barbarian_axe.melee]
43+
range = 1
44+
anim = "dharoks_greataxe_smash"
45+
target_sound = "dharok_axe_crush"
46+
target_hit = { offense = "crush", max = 150 }
47+
48+
[lost_barbarian]
49+
attack_speed = 4
50+
retreat_range = 8
51+
defend_anim = "unarmed_defend"
52+
defend_sound = "barbarian_grunt_defend"
53+
death_anim = "human_death"
54+
death_sound = "barbarian_grunt_death"
55+
56+
[lost_barbarian.melee]
57+
range = 1
58+
anim = "unarmed_punch"
59+
target_sound = "barbarian_grunt_attack"
60+
target_hit = { offense = "crush", max = 150 }
61+
62+
[skeleton_barbarian]
63+
attack_speed = 4
64+
retreat_range = 8
65+
defend_anim = "unarmed_defend"
66+
defend_sound = "skeleton_defend"
67+
death_anim = "human_death"
68+
death_sound = "skeleton_death"
69+
70+
[skeleton_barbarian.melee]
71+
range = 1
72+
anim = "unarmed_punch"
73+
target_sound = "skeleton_attack_unarmed"
74+
target_hit = { offense = "crush", max = 150 }
75+
76+
[barbarian_spirit]
77+
attack_speed = 4
78+
retreat_range = 8
79+
defend_anim = "barbarian_spirit_defend"
80+
defend_sound = "ghoul_defend"
81+
death_anim = "barbarian_spirit_death"
82+
death_sound = "ghoul_defend"
83+
84+
[barbarian_spirit.melee]
85+
range = 1
86+
anim = "barbarian_spirit_attack"
87+
target_sound = "ghoul_attack"
88+
target_hit = { offense = "crush", max = 180 }
89+
90+
[mithril_dragon]
91+
attack_speed = 4
92+
retreat_range = 8
93+
defend_anim = "metal_dragon_defend"
94+
defend_sound = "dragon_defend"
95+
death_anim = "metal_dragon_death"
96+
death_sound = "dragon_death"
97+
98+
[mithril_dragon.melee]
99+
chance = 60
100+
range = 1
101+
anim = "metal_dragon_attack"
102+
target_hit = { offense = "stab", max = 280 }
103+
target_sound = "dragon_attack"
104+
105+
[mithril_dragon.dragonfire]
106+
chance = 20
107+
range = 8
108+
condition = "ranged_only"
109+
anim = "metal_dragon_breath"
110+
gfx = "dragon_breath_shoot"
111+
target_hit = { offense = "dragonfire", special = true, max = 500 }
112+
target_sound = "dragon_breath"
113+
114+
[mithril_dragon.magic]
115+
chance = 40
116+
range = 8
117+
anim = "metal_dragon_shoot"
118+
projectile = "water_wave"
119+
projectile_origin_x = 2
120+
projectile_origin_y = 2
121+
target_hit = { offense = "magic", max = 180 }
122+
target_sound = "dragon_attack"
123+
124+
[mithril_dragon.range]
125+
chance = 40
126+
range = 8
127+
condition = "ranged_only"
128+
anim = "metal_dragon_shoot"
129+
projectile = "ice_arrow"
130+
projectile_origin_x = 2
131+
projectile_origin_y = 2
132+
target_hit = { offense = "range", defence = "magic", max = 180 }
133+
target_sound = "dragon_attack"

data/area/kandarin/ancient_cavern/ancient_cavern.drops.toml

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ drops = [
4343
{ id = "strength_mix_2", chance = 5 },
4444
{ id = "mithril_grapple", amount = 2, chance = 3 },
4545
{ id = "sapphire_ring", chance = 2 },
46+
{ table = "ancient_cavern_pages", chance = 5 },
4647
{ table = "gem_drop_table", chance = 2 },
4748
]
4849

@@ -53,6 +54,7 @@ drops = [
5354
{ id = "green_dragonhide", amount = 2 },
5455
{ table = "brutal_green_dragon_secondary" },
5556
{ table = "hard_clue_scroll", roll = 128 },
57+
{ table = "brutal_green_dragon_charms" },
5658
]
5759

5860
[brutal_green_dragon_secondary]
@@ -84,8 +86,119 @@ drops = [
8486
{ table = "rare_drop_table", chance = 2 },
8587
]
8688

89+
[brutal_green_dragon_charms]
90+
roll = 1000
91+
drops = [
92+
{ id = "gold_charm", chance = 143 },
93+
{ id = "green_charm", chance = 356 },
94+
{ id = "crimson_charm", chance = 143 },
95+
{ id = "blue_charm", chance = 28 },
96+
]
97+
8798
[mangled_bones_drop_table]
8899
type = "all"
89100
drops = [
90101
{ id = "mangled_bones" },
91102
]
103+
104+
105+
[mithril_dragon_drop_table]
106+
type = "all"
107+
drops = [
108+
{ id = "dragon_bones" },
109+
{ id = "mithril_bar", amount = 3 },
110+
{ table = "mithril_dragon_secondary" },
111+
{ table = "mithril_dragon_tertiary" },
112+
{ table = "mithril_dragon_charms" },
113+
]
114+
115+
[mithril_dragon_secondary]
116+
roll = 32768
117+
drops = [
118+
{ id = "rune_battleaxe", chance = 2048 },
119+
{ id = "rune_mace", chance = 2048 },
120+
{ id = "rune_2h_sword", chance = 64 },
121+
{ id = "rune_dart_p", amount = 14, chance = 2048 },
122+
{ id = "rune_javelin", amount = 8, chance = 2048 },
123+
{ id = "adamant_dart_p", amount = 20, chance = 128 },
124+
{ id = "runite_bolts", min = 10, max = 27, chance = 512 },
125+
{ id = "rune_knife", min = 8, max = 18, chance = 512 },
126+
{ id = "rune_arrow", min = 8, max = 42, chance = 512 },
127+
{ id = "rune_full_helm", chance = 512 },
128+
{ id = "dragon_full_helm" },
129+
{ id = "law_rune", min = 4, max = 45, chance = 128 },
130+
{ id = "death_rune", amount = 45, chance = 128 },
131+
{ id = "blood_rune", amount = 27, chance = 2048 },
132+
{ id = "soul_rune", amount = 10, chance = 512 },
133+
{ id = "super_attack_mix_2", chance = 512 },
134+
{ id = "super_strength_mix_2", chance = 512 },
135+
{ id = "super_defence_mix_2", chance = 512 },
136+
{ id = "prayer_mix_2", chance = 512 },
137+
{ id = "coins", min = 283, max = 3000, chance = 2048 },
138+
{ id = "rune_bar", amount = 2, chance = 128 },
139+
{ id = "shark", min = 1, max = 6, chance = 512 },
140+
{ table = "ancient_cavern_pages", chance = 512 },
141+
{ id = "chewed_bones", chance = 512 },
142+
{ table = "rare_drop_table", chance = 256 },
143+
]
144+
145+
[mithril_dragon_tertiary]
146+
roll = 10000
147+
drops = [
148+
{ id = "mithril_dragon_tail_bone", chance = 2500, variable = "fur_n_seek_wish_list", equals = "started", default = "unstarted" },
149+
{ id = "starved_ancient_effigy", chance = 40 },
150+
{ table = "hard_clue_scroll", chance = 40 },
151+
{ table = "elite_clue_scroll", chance = 10 },
152+
{ id = "draconic_visage" },
153+
]
154+
155+
[mithril_dragon_charms]
156+
roll = 1000
157+
drops = [
158+
{ id = "gold_charm", chance = 198 },
159+
{ id = "green_charm", chance = 495 },
160+
{ id = "crimson_charm", chance = 198 },
161+
{ id = "blue_charm", chance = 40 },
162+
]
163+
164+
165+
[ancient_cavern_pages]
166+
roll = 26
167+
drops = [
168+
{ id = "ancient_page_1" },
169+
{ id = "ancient_page_2" },
170+
{ id = "ancient_page_3" },
171+
{ id = "ancient_page_4" },
172+
{ id = "ancient_page_5" },
173+
{ id = "ancient_page_6" },
174+
{ id = "ancient_page_7" },
175+
{ id = "ancient_page_8" },
176+
{ id = "ancient_page_9" },
177+
{ id = "ancient_page_10" },
178+
{ id = "ancient_page_11" },
179+
{ id = "ancient_page_12" },
180+
{ id = "ancient_page_13" },
181+
{ id = "ancient_page_14" },
182+
{ id = "ancient_page_15" },
183+
{ id = "ancient_page_16" },
184+
{ id = "ancient_page_17" },
185+
{ id = "ancient_page_18" },
186+
{ id = "ancient_page_19" },
187+
{ id = "ancient_page_20" },
188+
{ id = "ancient_page_21" },
189+
{ id = "ancient_page_22" },
190+
{ id = "ancient_page_23" },
191+
{ id = "ancient_page_24" },
192+
{ id = "ancient_page_25" },
193+
{ id = "ancient_page_26" },
194+
]
195+
196+
[ancient_cavern_skeleton]
197+
roll = 512
198+
drops = [
199+
{ id = "skeleton_guard", chance = 22 }, # skeleton_heavy
200+
{ id = "guard_dog", chance = 70 }, # skeleton_hero
201+
{ id = "bones", chance = 80 },
202+
{ table = "ancient_cavern_pages", chance = 120 },
203+
{ id = "mangled_bones", chance = 180 },
204+
]

data/area/kandarin/ancient_cavern/ancient_cavern.items.toml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,27 +258,42 @@ kept = "Vanish"
258258
[ferocious_ring_5]
259259
id = 15398
260260
slot = "Ring"
261-
examine = "It looks in pretty good condition."
261+
charges = 1
262+
degrade = "ferocious_ring_4"
263+
degrade_message = "Your ferocious ring has four uses left."
262264
weight = 0.004
265+
examine = "It looks in pretty good condition."
263266

264267
[ferocious_ring_4]
265268
clone = "ferocious_ring_5"
266269
id = 15399
270+
charges = 1
271+
degrade = "ferocious_ring_3"
272+
degrade_message = "Your ferocious ring has three uses left."
267273

268274
[ferocious_ring_3]
269275
id = 15400
270276
slot = "Ring"
271-
examine = "It looks quite worn."
277+
charges = 1
278+
degrade = "ferocious_ring_2"
279+
degrade_message = "Your ferocious ring has two uses left."
272280
weight = 0.004
281+
examine = "It looks quite worn."
273282

274283
[ferocious_ring_2]
275284
id = 15401
276285
slot = "Ring"
277-
examine = "It looks pretty worn."
286+
charges = 1
287+
degrade = "ferocious_ring_1"
288+
degrade_message = "Your ferocious ring has one use left."
278289
weight = 0.004
290+
examine = "It looks pretty worn."
279291

280292
[ferocious_ring_1]
281293
id = 15402
282294
slot = "Ring"
283-
examine = "It looks like it's going to break soon."
295+
charges = 1
296+
degrade = "destroy"
297+
degrade_message = "Your ferocious ring crumbles to dust."
284298
weight = 0.004
299+
examine = "It looks like it's going to break soon."

data/area/kandarin/ancient_cavern/ancient_cavern.npc-spawns.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ spawns = [
3131
{ id = "mithril_dragon", x = 1783, y = 5328, level = 1, members = true },
3232
{ id = "confused_barbarian", x = 1767, y = 5345 },
3333
{ id = "lost_barbarian", x = 1761, y = 5322 },
34-
{ id = "skeleton_brute_ancient_cavern", x = 1748, y = 5323 },
35-
{ id = "skeleton_warlord_ancient_cavern", x = 1763, y = 5355 },
36-
{ id = "skeleton_warlord_ancient_cavern", x = 1789, y = 5333, level = 1 },
37-
{ id = "skeleton_thug_ancient_cavern", x = 1787, y = 5340 },
34+
{ id = "skeleton_brute", x = 1748, y = 5323 },
35+
{ id = "skeleton_warlord", x = 1763, y = 5355 },
36+
{ id = "skeleton_warlord", x = 1789, y = 5333, level = 1 },
37+
{ id = "skeleton_thug", x = 1787, y = 5340 },
3838
{ id = "angry_barbarian", x = 1746, y = 5326 },
3939
{ id = "enraged_barbarian_spirit", x = 1751, y = 5331 },
4040
{ id = "enraged_barbarian_spirit", x = 1775, y = 5324 },
4141
{ id = "berserk_barbarian_spirit", x = 1779, y = 5325 },
4242
{ id = "kuradal", x = 1738, y = 5312, level = 1, members = true },
43-
{ id = "gargoyle_ancient_cavern", x = 1733, y = 5312, level = 1, members = true },
43+
# { id = "gargoyle_ancient_cavern", x = 1733, y = 5312, level = 1, members = true },
4444
]

0 commit comments

Comments
 (0)