Add the dwarf multicannon

data/area/asgarnia/dwarven_mines/dwarven_mine.areas.toml

@@ -0,0 +1,5 @@
+
+[dwarven_mine_no_cannon]
+x = [2944, 3071]
+y = [9728, 9855]
+tags = ["no_cannon", "no_cannon_black_guard"]

data/area/asgarnia/entrana/entrana.areas.toml

@@ -1,7 +1,7 @@
 [entrana]
 x = [2783,2879]
 y = [3328,3391]
-tags = ["penguin_area"]
+tags = ["penguin_area", "no_cannon"]
 hint = "where no weapons may go."
 
 [entrana_dock_fishing_area]

data/area/asgarnia/taverley/dungeon/taverley_dungeon.areas.toml

@@ -1,3 +1,8 @@
 [taverley_dungeon_fishing_area]
 x = [2878, 2901]
 y = [9761, 9766]
+
+[wyvern_cave]
+x = [3008, 3071]
+y = [9536, 9599]
+tags = ["no_cannon"]

data/area/fremennik_province/rellekka/rellekka.areas.toml

@@ -31,3 +31,7 @@ y = [3708, 3711]
 x = [2675, 2693]
 y = [3592, 3598]
 
+[fremennik_slayer_dungeon]
+x = [2688, 2815]
+y = [9920, 10047]
+tags = ["no_cannon", "no_cannon_dank"]

data/area/fremennik_province/waterbirth_island/waterbirth_island.areas.toml

@@ -22,4 +22,4 @@ hint = "on a small crescent island."
 [waterbirth_island_dungeon]
 x = [2432, 2559]
 y = [10112, 10175]
-tags = ["no_random_events"]
+tags = ["no_random_events", "no_cannon"]

data/area/kandarin/ancient_cavern/ancient_cavern.areas.toml

@@ -1,7 +1,7 @@
 [kuradals_dungeon]
 x = [1600, 1663]
 y = [5248, 5311]
-tags = ["no_random_events"]
+tags = ["no_random_events", "no_cannon"]
 
 [kuradals_teleport]
 x = [1736, 1739]
@@ -11,4 +11,9 @@ level = 1
 [ancient_cavern]
 x = [1728, 1791]
 y = [5312, 5375]
-tags = ["no_random_events"]
+tags = ["no_random_events", "no_cannon"]
+
+[ancient_cavern_lower]
+x = [1664, 1791]
+y = [5248, 5311]
+tags = ["no_cannon"]

data/area/kandarin/feldip_hills/feldip_hills.areas.toml

@@ -27,3 +27,8 @@ y = [2915, 2922]
 [feldip_hills_south_fishing_area]
 x = [2435, 2436]
 y = [2890, 2895]
+
+[zogre_burial_grounds]
+x = [2496, 2559]
+y = [2880, 2943]
+tags = ["no_cannon", "no_cannon_dark_forces"]

data/area/kandarin/ourania/ourania.areas.toml

@@ -2,3 +2,8 @@
 x = [2465, 2467]
 y = [3244, 3246]
 tags = ["teleport"]
+
+[ourania_altar]
+x = [3264, 3327]
+y = [4800, 4863]
+tags = ["no_cannon", "no_cannon_dark_forces"]

data/area/kharidian_desert/al_kharid/al_kharid.areas.toml

@@ -43,3 +43,8 @@ hint = "around the Al Kharid region, north of Shantay Pass."
 [al_kharid_fishing_spot]
 x = [3255, 3281]
 y = [3135, 3166]
+
+[al_kharid_palace]
+x = [3288, 3308]
+y = [3155, 3180]
+tags = ["no_cannon"]

data/area/kharidian_desert/kalphite_hive/kalphite_hive.areas.toml

@@ -1,4 +1,4 @@
 [kalphite_queen_lair]
 x = [3456, 3519]
 y = [9472, 9535]
-tags = ["multi_combat"]
+tags = ["multi_combat", "no_cannon"]

data/area/misthalin/barbarian_village/stronghold_of_security/stronghold_of_security.areas.toml

@@ -1,4 +1,4 @@
 [stronghold_of_security_multi_area]
 x = [1856, 1919]
 y = [5184, 5247]
-tags = ["multi_combat"]
+tags = ["multi_combat", "no_cannon"]

data/area/misthalin/ice_mountain/ice_mountain.areas.toml

@@ -1,5 +1,5 @@
 [ice_mountain_area]
 x = [2944, 3071]
 y = [3392, 3521]
-tags = ["penguin_area"]
-hint = "around the Ice Mountain Region."
+tags = ["penguin_area", "no_cannon", "no_cannon_black_guard"]
+hint = "around the Ice Mountain Region."

data/area/misthalin/varrock/grand_exchange/grand_exchange.areas.toml

@@ -2,4 +2,4 @@
 x = [3145, 3189]
 y = [3469, 3513]
 level = 0
-tags = ["grand_exchange", "no_random_events"]
+tags = ["grand_exchange", "no_random_events", "no_cannon", "no_cannon_grand_exchange"]

data/area/morytania/lair_of_tarn_razorlor/lair_of_tarn_razorlor.areas.toml

@@ -0,0 +1,4 @@
+[lair_of_tarn_razorlor]
+x = [3136, 3199]
+y = [4544, 4671]
+tags = ["no_cannon", "no_cannon_temple"]

data/area/morytania/mort_myre_swamp/mort_myre_swamp.areas.toml

@@ -18,6 +18,8 @@ y = [3329, 3454]
 x = [3400, 3520]
 y = [3324, 3455]
 
+tags = ["no_cannon", "no_cannon_damp"]
+
 [filliman_grotto]
 x = [3433, 3447]
 y = [3331, 3343]

data/area/morytania/slayer_tower/slayer_tower.areas.toml

@@ -8,3 +8,8 @@ tags = ["abyssal"]
 x = [3428, 3429]
 y = [3531, 3532]
 tags = ["teleport"]
+
+[slayer_tower]
+x = [3392, 3455]
+y = [3520, 3583]
+tags = ["no_cannon"]

data/area/realm/enchanted_valley/enchanted_valley.areas.toml

@@ -1,4 +1,4 @@
 [enchanted_valley_multi_area]
 x = [3008, 3071]
 y = [4480, 4543]
-tags = ["multi_combat"]
+tags = ["multi_combat", "no_cannon"]

data/area/realm/killerwatt_plane/killerwatt_plane.areas.toml

@@ -0,0 +1,4 @@
+[killerwatt_plane]
+x = [2624, 2687]
+y = [5184, 5247]
+tags = ["no_cannon", "no_cannon_electric"]

data/area/troll_country/god_wars_dungeon/god_wars.areas.toml

@@ -8,6 +8,8 @@ x = [2878, 2878, 2861, 2851, 2846, 2844, 2844, 2851, 2851, 2865, 2875, 2883, 288
 y = [5277, 5277, 5277, 5285, 5291, 5295, 5300, 5330, 5336, 5349, 5349, 5339, 5339, 5314, 5295, 5263, 5263]
 level = 2
 
+tags = ["no_cannon"]
+
 [armadyl_chamber]
 x = [2824, 2842]
 y = [5296, 5308]

data/area/wilderness/abyss/abyss.areas.toml

@@ -1,8 +1,13 @@
 [abyss_multi_area]
 x = [3008, 3071]
 y = [4800, 4863]
-tags = ["multi_combat"]
+tags = ["multi_combat", "no_cannon"]
 
 [abyss_center]
 x = [3039, 3052, 3057, 3053, 3042, 3033, 3025, 3021, 3022, 3029]
 y = [4849, 4845, 4832, 4820, 4815, 4816, 4820, 4829, 4838, 4846]
+
+[abyss_outer_rift]
+x = [3008, 3071]
+y = [4864, 4991]
+tags = ["no_cannon"]

data/area/wilderness/chaos_tunnels/chaos_tunnels.areas.toml

@@ -1,14 +1,19 @@
 [chaos_tunnels]
 x = [3136, 3327]
 y = [5440, 5567]
-tags = ["multi_combat"]
+tags = ["multi_combat", "no_cannon"]
 
 [bork_cavern]
 x = [3072, 3135]
 y = [5504, 5567]
-tags = ["multi_combat"]
+tags = ["multi_combat", "no_cannon"]
 
 [bork_legion_spawn]
 x = [3093, 3106]
 y = [5531, 5540]
 tags = ["multi_combat"]
+
+[chaos_tunnels_resource_dungeon]
+x = [1216, 1279]
+y = [4480, 4543]
+tags = ["no_cannon"]

data/area/wilderness/wilderness.areas.toml

@@ -94,3 +94,8 @@ y = [3793, 3817]
 x = [3264, 3279]
 y = [3672, 3695]
 tags = ["safe_zone"]
+
+[revenant_cave]
+x = [3072, 3135]
+y = [10112, 10175]
+tags = ["no_cannon"]

data/entity/npc/boss/king_black_dragon/king_black_dragon.areas.toml

@@ -1,4 +1,4 @@
 [king_black_dragon_multi_area]
 x = [2240, 2303]
 y = [4672, 4735]
-tags = ["multi_combat"]
+tags = ["multi_combat", "no_cannon"]

data/minigame/castle_wars/castle_wars.areas.toml

@@ -2,7 +2,7 @@
 x = [2368, 2431]
 y = [3072, 3135]
 level = 0
-tags = ["multi_combat"]
+tags = ["multi_combat", "no_cannon"]
 
 [castle_wars_teleport]
 x = [2440, 2444]

data/minigame/duel_arena/duel_arena.areas.toml

@@ -2,3 +2,8 @@
 x = [3313, 3317]
 y = [3233, 3237]
 tags = ["teleport"]
+
+[duel_arena]
+x = [3311, 3391]
+y = [3199, 3290]
+tags = ["no_cannon"]

data/minigame/fist_of_guthix/fist_of_guthix.areas.toml

@@ -2,3 +2,8 @@
 x = [1692, 1696]
 y = [5599, 5603]
 tags = ["teleport"]
+
+[fist_of_guthix]
+x = [1664, 1727]
+y = [5568, 5631]
+tags = ["no_cannon"]

data/minigame/pest_control/pest_control.areas.toml

@@ -2,4 +2,4 @@
 x = [2624, 2687]
 y = [2560, 2623]
 level = 0
-tags = ["multi_combat"]
+tags = ["multi_combat", "no_cannon"]

data/minigame/tzhaar_fight_cave/tzhaar_fight_cave.areas.toml

@@ -1,7 +1,7 @@
 [tzhaar_fight_cave_multi_area]
 x = [2368, 2559]
 y = [5056, 5183]
-tags = ["multi_combat"]
+tags = ["multi_combat", "no_cannon"]
 
 [tzhaar_fight_cave_north_west]
 x = [2378, 2385]
@@ -22,4 +22,3 @@ y = [5080, 5086]
 [tzhaar_fight_cave_none]
 x = [2397, 2403]
 y = [5085, 5091]
-

data/minigame/warriors_guild/warriors_guild.areas.toml

@@ -2,3 +2,8 @@
 x = [2879, 2882]
 y = [3544, 3548]
 tags = ["teleport"]
+
+[warriors_guild]
+x = [2816, 2879]
+y = [3520, 3583]
+tags = ["no_cannon"]

data/quest/members/dwarf_cannon/dwarf_cannon.anims.toml

@@ -0,0 +1,27 @@
+[cannon_setup]
+id = 827
+
+# Barrel rotation, one per octant, in Direction.all order.
+[cannon_turn_north_west]
+id = 514
+
+[cannon_turn_north]
+id = 515
+
+[cannon_turn_north_east]
+id = 516
+
+[cannon_turn_east]
+id = 517
+
+[cannon_turn_south_east]
+id = 518
+
+[cannon_turn_south]
+id = 519
+
+[cannon_turn_south_west]
+id = 520
+
+[cannon_turn_west]
+id = 521

data/quest/members/dwarf_cannon/dwarf_cannon.gfx.toml

@@ -0,0 +1,6 @@
+[cannonball]
+id = 53
+delay = 10
+height = 38
+curve = 5
+time_offset = 5

data/quest/members/dwarf_cannon/dwarf_cannon.objs.toml

@@ -0,0 +1,15 @@
+[dwarf_multicannon_base]
+id = 7
+examine = "The cannon is built on this."
+
+[dwarf_multicannon_stand]
+id = 8
+examine = "The mounting for the multicannon."
+
+[dwarf_multicannon_barrels]
+id = 9
+examine = "The barrels of the multicannon."
+
+[dwarf_multicannon]
+id = 6
+examine = "A dwarf multicannon."

data/quest/members/dwarf_cannon/dwarf_cannon.varps.toml

@@ -3,4 +3,4 @@ id = 0
 persist = true
 format = "map"
 default = "unstarted"
-values = { unstarted = 0, started = 1 }
+values = { unstarted = 0, started = 1, completed = 11 }

data/quest/members/dwarf_cannon/dwarf_cannon.vars.toml

@@ -0,0 +1,10 @@
+# Pieces of a dwarf multicannon owed to the player after theirs vanished when they logged out.
+# Nulodion hands them back free of charge.
+[cannon_lost_parts]
+persist = true
+format = "int"
+
+# Cannonballs that were loaded in it; a replaced cannon comes back with them still in.
+[cannon_lost_balls]
+persist = true
+format = "int"