Skip to content

Commit 346d903

Browse files
MrSlayerGodlucid-softGregHibjarryd229
authored
add brimhavern dungeon and objects (#691)
* fixed chicken drops table now working * update chicken * fix some spawns in white wolf mountain and added missing and added some dialogues * added asgarnia ice dungeon spawns, gfx, anims, drops etc * Update Ice_Giant.kts * all dungeon stuff for brimhavern * Update Ice_Giant.kts * StringEntry/NameEntry fix (#685) * Change StringEntry to NameEntry, which has a max of 13 characters and has last input recall for player name usage. Change ClanChatDecoder to StringEntryDecoder for new StringEntry which lets user input much longer strings * Fix decoder test and decoder-packets.csv data to match * Add Prince Ali Rescue Quest (#687) * Add karamja and port sarim npcs * Add prince ali rescue npcs * Add hassan, osman, leela and ned dialogues * Add cat expressions * Add more quest dialogue * Improvements to DropTableConverter * More dialogues * Simplify quest journals by using quest definitions * Fix mill controls * Add picking object sounds * Add Ali Morrisane * Dialogue tweaks * Fix gate sounds * Add prison door * Add spinning wheel anims and sounds * Dialogue finishing touches * Quest complete & tollgate reward --------- Co-authored-by: jarryd229 <[email protected]> * Remove config naming magic (#689) * Make drop_table's explicit rather than use a mix of names and categories * Check drop tables exist on startup * Simplify anim configs with combat_anims * Make combat_sounds explicit * Increase gradle wrapper memory * Require combat anims to exist and check for at least some sounds * Remove unused categories and make sure the slayer categories are plural * Add missing spider sounds * Fix slayer tasks * Bump gradlew mem to 600mb * Set gradlew mem min 500mb * update npc n drops and remove what didnt need to be add * update the final parts for brimhaven dungeon * fixed baby dragons bones --------- Co-authored-by: LucidSoft <[email protected]> Co-authored-by: Greg <[email protected]> Co-authored-by: jarryd229 <[email protected]>
1 parent 253f9db commit 346d903

24 files changed

+1009
-18
lines changed

‎data/area/karamja/brimhaven/brimhaven.npc-spawns.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ spawns = [
1313
{ id = "snake", x = 2754, y = 3171, members = true },
1414
{ id = "snake", x = 2786, y = 3174, members = true },
1515
# 10801
16+
{ id = "saniboch", x = 2744, y = 3152, members = true },
1617
{ id = "snake", x = 2739, y = 3169, members = true },
1718
{ id = "snake", x = 2733, y = 3165, members = true },
1819
{ id = "snake", x = 2751, y = 3166, members = true },

‎data/area/karamja/brimhaven/brimhaven.objs.toml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,43 @@ examine = "I hope I don't fall off this."
2121
[brimhaven_log_balance_end]
2222
id = 5090
2323
examine = "I hope I don't fall off this."
24+
25+
[brimhaven_dungeon_entrance]
26+
id = 5083
27+
examine = "An overgrown dungeon entrance."
28+
29+
[brimhaven_dungeon_exit]
30+
id = 5084
31+
examine = "A closed overgrown dungeon entrance"
32+
33+
[brimhaven_walk_up_1]
34+
id = 5094
35+
examine = "A closed overgrown dungeon entrance"
36+
37+
[brimhaven_walk_down_2]
38+
id = 5096
39+
examine = "A closed overgrown dungeon entrance"
40+
41+
[brimhaven_walk_up_3]
42+
id = 5097
43+
examine = "A closed overgrown dungeon entrance"
44+
45+
[brimhaven_walk_down_4]
46+
id = 5098
47+
examine = "A closed overgrown dungeon entrance"
48+
49+
[brimhaven_vine_1]
50+
id = 5103
51+
examine = "A closed overgrown dungeon entrance"
52+
53+
[brimhaven_vine_2]
54+
id = 5104
55+
examine = "A closed overgrown dungeon entrance"
56+
57+
[brimhaven_vine_3]
58+
id = 5105
59+
examine = "A closed overgrown dungeon entrance"
60+
61+
[brimhaven_vine_4]
62+
id = 5106
63+
examine = "A closed overgrown dungeon entrance"

‎data/area/karamja/brimhaven/brimhaven.teles.toml‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,34 @@ delta = { level = 1 }
2626
[basic_ladder_top]
2727
option = "Climb-down"
2828
tile = { x = 2808, y = 3161, level = 1 }
29-
delta = { level = -1 }
29+
delta = { level = -1 }
30+
31+
[brimhaven_dungeon_entrance]
32+
option = "Enter"
33+
tile = { x = 2743, y = 3153 }
34+
to = { x = 2712, y = 9564 }
35+
36+
[brimhaven_dungeon_exit]
37+
option = "Leave"
38+
tile = { x = 2714, y = 9564 }
39+
to = { x = 2744, y = 3152 }
40+
41+
[brimhaven_walk_up_1]
42+
option = "Walk-up"
43+
tile = { x = 2648, y = 9592}
44+
to = { x = 2643, y = 9594, level = 2}
45+
46+
[brimhaven_walk_down_2]
47+
option = "Walk-down"
48+
tile = { x = 2644, y = 9593, level = 2}
49+
to = { x = 2649, y = 9591}
50+
51+
[brimhaven_walk_up_3]
52+
option = "Walk-up"
53+
tile = { x = 2635, y = 9514 }
54+
to = { x = 2636, y = 9510, level = 2}
55+
56+
[brimhaven_walk_down_4]
57+
option = "Walk-down"
58+
tile = { x = 2635, y = 9511, level = 2}
59+
to = { x = 2636, y = 9517}

‎data/area/karamja/brimhaven/brimhaven_dungeon.vars.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[temporary_saniboch_access]
2+
persist = true
3+
format = "boolean"

‎data/area/karamja/brimhaven/dungeon/brimhaven_dungeon.npc-spawns.toml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
spawns = [
22
# 10644
3+
{ id = "fire_giant_3", x = 2664, y = 9482, members = true },
4+
{ id = "fire_giant_5", x = 2659, y = 9481, members = true },
5+
{ id = "fire_giant_4", x = 2655, y = 9480, members = true },
6+
{ id = "fire_giant_4", x = 2667, y = 9496, members = true },
7+
{ id = "fire_giant_5", x = 2658, y = 9501, members = true },
8+
{ id = "bronze_dragon", x = 2731, y = 9482, members = true },
9+
{ id = "bronze_dragon", x = 2731, y = 9491, members = true },
10+
{ id = "bronze_dragon", x = 2740, y = 9492, members = true },
311
{ id = "moss_giant", x = 2642, y = 9492, members = true },
412
{ id = "moss_giant", x = 2645, y = 9532, members = true },
513
{ id = "moss_giant_2", x = 2636, y = 9528, members = true },
@@ -21,4 +29,59 @@ spawns = [
2129
{ id = "moss_giant_3", x = 2682, y = 9573, members = true },
2230
{ id = "moss_giant_3", x = 2648, y = 9537, members = true },
2331
{ id = "moss_giant_4", x = 2659, y = 9548, members = true },
32+
{ id = "greater_demon_2", x = 2631, y = 9482, level = 2, members = true },
33+
{ id = "greater_demon", x = 2631, y = 9505, level = 2, members = true },
34+
{ id = "greater_demon_4", x = 2633, y = 9491, level = 2, members = true },
35+
{ id = "greater_demon_4", x = 2635, y = 9477, level = 2, members = true },
36+
{ id = "greater_demon_2", x = 2638, y = 9501, level = 2, members = true },
37+
{ id = "greater_demon_3", x = 2642, y = 9506, level = 2, members = true },
38+
{ id = "greater_demon_5", x = 2646, y = 9476, level = 2, members = true },
39+
{ id = "fire_giant_5", x = 2628, y = 9543, level = 2, members = true },
40+
{ id = "fire_giant_3", x = 2630, y = 9551, level = 2, members = true },
41+
{ id = "fire_giant_4", x = 2632, y = 9585, level = 2, members = true },
42+
{ id = "fire_giant_3", x = 2634, y = 9577, level = 2, members = true },
43+
{ id = "fire_giant_3", x = 2635, y = 9557, level = 2, members = true },
44+
{ id = "fire_giant_5", x = 2635, y = 9562, level = 2, members = true },
45+
{ id = "fire_giant_4", x = 2640, y = 9566, level = 2, members = true },
46+
{ id = "fire_giant_3", x = 2643, y = 9563, level = 2, members = true },
47+
# 10899
48+
{ id = "black_demon_2", x = 2700, y = 9489, members = true },
49+
{ id = "black_demon_1", x = 2703, y = 9483, members = true },
50+
{ id = "black_demon", x = 2709, y = 9479, members = true },
51+
{ id = "black_demon", x = 2715, y = 9482, members = true },
52+
{ id = "iron_dragon", x = 2704, y = 9431, members = true },
53+
{ id = "iron_dragon", x = 2704, y = 9457, members = true },
54+
{ id = "iron_dragon", x = 2705, y = 9424, members = true },
55+
{ id = "iron_dragon", x = 2714, y = 9420, members = true },
56+
{ id = "iron_dragon", x = 2714, y = 9449, members = true },
57+
{ id = "iron_dragon", x = 2714, y = 9460, members = true },
58+
{ id = "iron_dragon", x = 2722, y = 9424, members = true },
59+
{ id = "iron_dragon", x = 2724, y = 9435, members = true },
60+
{ id = "iron_dragon", x = 2730, y = 9437, members = true },
61+
{ id = "iron_dragon", x = 2732, y = 9459, members = true },
62+
{ id = "iron_dragon", x = 2736, y = 9424, members = true },
63+
{ id = "iron_dragon", x = 2738, y = 9440, members = true },
64+
{ id = "iron_dragon", x = 2739, y = 9450, members = true },
65+
{ id = "steel_dragon", x = 2712, y = 9435, members = true },
66+
{ id = "steel_dragon", x = 2702, y = 9447, members = true },
67+
{ id = "steel_dragon", x = 2723, y = 9458, members = true },
68+
{ id = "steel_dragon", x = 2726, y = 9445, members = true },
69+
# 10900
70+
{ id = "baby_red_dragon", x = 2696, y = 9501, members = true },
71+
{ id = "baby_red_dragon_2", x = 2698, y = 9524, members = true },
72+
{ id = "baby_red_dragon_1", x = 2708, y = 9500, members = true },
73+
{ id = "baby_red_dragon_1", x = 2708, y = 9526, members = true },
74+
{ id = "baby_red_dragon", x = 2711, y = 9516, members = true },
75+
{ id = "baby_red_dragon_2", x = 2714, y = 9505, members = true },
76+
{ id = "baby_red_dragon_1", x = 2730, y = 9512, members = true },
77+
{ id = "red_dragon", x = 2697, y = 9506, members = true },
78+
{ id = "red_dragon_1", x = 2702, y = 9504, members = true },
79+
{ id = "red_dragon", x = 2703, y = 9522, members = true },
80+
{ id = "red_dragon", x = 2706, y = 9516, members = true },
81+
{ id = "red_dragon_1", x = 2708, y = 9508, members = true },
82+
{ id = "red_dragon", x = 2711, y = 9500, members = true },
83+
{ id = "red_dragon_1", x = 2714, y = 9526, members = true },
84+
{ id = "red_dragon", x = 2717, y = 9516, members = true },
85+
{ id = "red_dragon_2", x = 2721, y = 9522, members = true },
86+
{ id = "red_dragon", x = 2724, y = 9516, members = true },
2487
]

‎data/entity/npc/animal/dog/dog.npc-spawns.toml‎

Lines changed: 59 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,63 @@ spawns = [
8686
{ id = "guard_dog", x = 2674, y = 3504, members = true },
8787
{ id = "guard_dog", x = 2645, y = 3488, members = true },
8888
# Brimhaven Dungeon
89-
{ id = "wild_dog", x = 2740, y = 9502, members = true },
90-
{ id = "wild_dog", x = 2740, y = 9508, members = true },
91-
{ id = "wild_dog", x = 2743, y = 9503, members = true },
92-
{ id = "wild_dog", x = 2657, y = 9515, members = true },
93-
{ id = "wild_dog", x = 2662, y = 9515, members = true },
94-
{ id = "wild_dog", x = 2662, y = 9517, members = true },
95-
{ id = "wild_dog", x = 2662, y = 9522, members = true },
96-
{ id = "wild_dog", x = 2666, y = 9523, members = true },
97-
{ id = "wild_dog", x = 2667, y = 9513, members = true },
98-
{ id = "wild_dog", x = 2671, y = 9519, members = true },
99-
{ id = "wild_dog", x = 2672, y = 9515, members = true },
89+
{ id = "wild_dog", x = 2700, y = 9489, members = true },
90+
{ id = "wild_dog", x = 2703, y = 9483, members = true },
91+
{ id = "wild_dog", x = 2709, y = 9479, members = true },
92+
{ id = "wild_dog", x = 2715, y = 9482, members = true },
93+
{ id = "wild_dog", x = 2652, y = 9526, members = true },
94+
{ id = "wild_dog", x = 2656, y = 9514, members = true },
95+
{ id = "wild_dog", x = 2666, y = 9522, members = true },
96+
{ id = "wild_dog", x = 2665, y = 9513, members = true },
97+
{ id = "wild_dog", x = 2666, y = 9489, members = true },
98+
{ id = "wild_dog", x = 2626, y = 9535, level = 2, members = true },
99+
{ id = "wild_dog", x = 2628, y = 9507, level = 2, members = true },
100+
{ id = "wild_dog", x = 2635, y = 9508, level = 2, members = true },
101+
{ id = "wild_dog", x = 2634, y = 9483, level = 2, members = true },
102+
{ id = "wild_dog", x = 2681, y = 9563, members = true },
103+
{ id = "wild_dog", x = 2677, y = 9586, members = true },
104+
{ id = "wild_dog", x = 2644, y = 9587, members = true },
105+
{ id = "wild_dog", x = 2638, y = 9592, level = 2, members = true },
106+
{ id = "wild_dog", x = 2633, y = 9583, level = 2, members = true },
107+
{ id = "wild_dog", x = 2627, y = 9545, level = 2, members = true },
108+
{ id = "wild_dog", x = 2744, y = 9503, members = true },
109+
{ id = "wild_dog", x = 2702, y = 9525, members = true },
110+
{ id = "wild_dog", x = 2704, y = 9487, members = true },
111+
{ id = "wild_dog", x = 2711, y = 9485, members = true },
112+
{ id = "wild_dog", x = 2722, y = 9486, members = true },
113+
{ id = "wild_dog", x = 2717, y = 9480, members = true },
114+
{ id = "wild_dog", x = 2733, y = 9494, members = true },
115+
{ id = "wild_dog", x = 2742, y = 9489, members = true },
116+
{ id = "wild_dog_1", x = 2646, y = 9530, members = true },
117+
{ id = "wild_dog_1", x = 2643, y = 9519, members = true },
118+
{ id = "wild_dog_1", x = 2660, y = 9521, members = true },
119+
{ id = "wild_dog_1", x = 2665, y = 9527, members = true },
120+
{ id = "wild_dog_1", x = 2671, y = 9521, members = true },
121+
{ id = "wild_dog_1", x = 2670, y = 9516, members = true },
122+
{ id = "wild_dog_1", x = 2660, y = 9497, members = true },
123+
{ id = "wild_dog_1", x = 2643, y = 9487, members = true },
124+
{ id = "wild_dog_1", x = 2653, y = 9488, members = true },
125+
{ id = "wild_dog_1", x = 2677, y = 9501, members = true },
126+
{ id = "wild_dog_1", x = 2683, y = 9476, members = true },
127+
{ id = "wild_dog_1", x = 2630, y = 9515, level = 2, members = true },
128+
{ id = "wild_dog_1", x = 2642, y = 9506, level = 2, members = true },
129+
{ id = "wild_dog_1", x = 2629, y = 9487, level = 2, members = true },
130+
{ id = "wild_dog_1", x = 2648, y = 9476, level = 2, members = true },
131+
{ id = "wild_dog_1", x = 2672, y = 9569, members = true },
132+
{ id = "wild_dog_1", x = 2657, y = 9577, members = true },
133+
{ id = "wild_dog_1", x = 2643, y = 9543, members = true },
134+
{ id = "wild_dog_1", x = 2658, y = 9546, members = true },
135+
{ id = "wild_dog_1", x = 2636, y = 9574, level = 2, members = true },
136+
{ id = "wild_dog_1", x = 2643, y = 9566, level = 2, members = true },
137+
{ id = "wild_dog_1", x = 2635, y = 9559, level = 2, members = true },
138+
{ id = "wild_dog_1", x = 2699, y = 9516, members = true },
139+
{ id = "wild_dog_1", x = 2709, y = 9524, members = true },
140+
{ id = "wild_dog_1", x = 2700, y = 9489, members = true },
141+
{ id = "wild_dog_1", x = 2703, y = 9484, members = true },
142+
{ id = "wild_dog_1", x = 2710, y = 9481, members = true },
143+
{ id = "wild_dog_1", x = 2716, y = 9486, members = true },
144+
{ id = "wild_dog_1", x = 2726, y = 9489, members = true },
145+
{ id = "wild_dog_1", x = 2735, y = 9481, members = true },
146+
{ id = "wild_dog_1", x = 2740, y = 9497, members = true },
147+
{ id = "wild_dog_1", x = 2739, y = 9506, members = true },
100148
]

‎data/entity/npc/animal/dog/dog.npcs.toml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,8 @@ drop_table = "dog"
5353
combat_anims = "medium_dog"
5454
combat_sounds = "dog"
5555
categories = ["dogs"]
56-
examine = "Looks like it's got Rabies!"
56+
examine = "Looks like it's got Rabies!"
57+
58+
[wild_dog_1]
59+
id = 1594
60+
clone = "wild_dog"

‎data/entity/npc/humanoid/humans.npcs.toml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,12 @@ categories = ["human"]
494494
wander_radius = 3
495495
examine = "A holy man."
496496

497+
[saniboch]
498+
id = 1595
499+
categories = ["human"]
500+
wander_radius = 2
501+
examine = "Looks like he wants money."
502+
497503
[dark_mage]
498504
id = 2262
499505
faces = false

‎data/entity/npc/monster/demon/demon.drops.toml‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,69 @@ drops = [
3535
roll = 5000
3636
drops = [
3737
{ id = "lesser_demon_champions_scroll", members = true },
38+
]
39+
40+
[greater_demon_drop_table]
41+
type = "all"
42+
drops = [
43+
{ table = "greater_demon_secondary" },
44+
{ table = "hard_clue_scroll", roll = 128 },
45+
]
46+
47+
[greater_demon_secondary]
48+
roll = 128
49+
drops = [
50+
{ id = "steel_2h_sword", chance = 4 },
51+
{ id = "steel_hatchet", chance = 3 },
52+
{ id = "steel_battleaxe", chance = 3 },
53+
{ id = "mithril_kiteshield" },
54+
{ id = "adamant_platelegs" },
55+
{ id = "rune_full_helm" },
56+
{ id = "fire_rune", amount = 75, chance = 8 },
57+
{ id = "chaos_rune", amount = 15, chance = 3 },
58+
{ id = "death_rune", amount = 5, chance = 3 },
59+
{ id = "fire_rune", amount = 37 },
60+
{ id = "coins", amount = 132, chance = 40 },
61+
{ id = "coins", amount = 44, chance = 29 },
62+
{ id = "coins", amount = 220, chance = 10 },
63+
{ id = "coins", amount = 11, chance = 7 },
64+
{ id = "coins", amount = 460 },
65+
{ id = "nothing", amount = 0, chance = 2 },
66+
{ id = "tuna", chance = 3 },
67+
{ id = "gold_bar", chance = 2 },
68+
{ id = "thread", amount = 10 },
69+
{ table = "gem_drop_table", chance = 5 },
70+
]
71+
72+
[black_demon_drop_table]
73+
type = "all"
74+
drops = [
75+
{ table = "black_demon_secondary" },
76+
{ table = "hard_clue_scroll", roll = 128 },
77+
]
78+
79+
[black_demon_secondary]
80+
roll = 128
81+
drops = [
82+
{ id = "black_sword", chance = 4 },
83+
{ id = "steel_battleaxe", chance = 3 },
84+
{ id = "black_hatchet", chance = 2 },
85+
{ id = "mithril_kiteshield" },
86+
{ id = "rune_med_helm" },
87+
{ id = "rune_chainbody" },
88+
{ id = "air_rune", amount = 50, chance = 8 },
89+
{ id = "chaos_rune", amount = 10, chance = 7 },
90+
{ id = "blood_rune", amount = 7, chance = 4 },
91+
{ id = "fire_rune", amount = 37 },
92+
{ id = "law_rune", amount = 3 },
93+
{ table = "herb_drop_table", chance = 23 },
94+
{ id = "coins", amount = 132, chance = 40 },
95+
{ id = "coins", amount = 30, chance = 7 },
96+
{ id = "coins", amount = 44, chance = 6 },
97+
{ id = "coins", amount = 220, chance = 6 },
98+
{ id = "coins", amount = 460 },
99+
{ id = "lobster", chance = 3 },
100+
{ id = "adamant_bar", chance = 2 },
101+
{ id = "defence_potion_3" },
102+
{ table = "rare_drop_table" },
38103
]

0 commit comments

Comments
 (0)