Fix guards, add cooking ranges and fishing guild gate

data/area/asgarnia/falador/falador.combat.toml

@@ -21,3 +21,14 @@ anim = "crossbow_accurate"
 target_sound = "crossbow_shoot"
 projectile = "crossbow_bolt"
 target_hit = { offense = "range", max = 40 }
+
+[white_knight]
+attack_speed = 7
+retreat_range = 4
+defend_anim = "human_defend"
+death_anim = "human_death"
+
+[white_knight.melee]
+range = 1
+anim = "2h_chop"
+target_hit = { offense = "slash", max = 60 }

data/area/asgarnia/falador/falador.npcs.toml

@@ -541,16 +541,7 @@ examine = "Bow wow."
 
 [guard_falador_8]
 id = 9
-hitpoints = 220
-att = 19
-str = 18
-def = 14
-style = "stab"
-max_hit_melee = 30
-attack_bonus = 4
-respawn_delay = 50
-pickpocket = { level = 40, stun_ticks = 8, stun_hit = 20, xp = 46.8, chance_min = 50, chance_max = 240, table = "guard" }
-examine = "He tries to keep order around here."
+clone = "guard_falador"
 
 [water_wizard]
 id = 2710
@@ -690,9 +681,7 @@ hitpoints = 520
 att = 27
 str = 29
 def = 21
-attack_speed = 7
-style = "slash"
-max_hit_melee = 60
 attack_bonus = 30
+combat_def = "white_knight"
 respawn_delay = 50
 examine = "The knight seems to be watching something."

data/area/asgarnia/falador/falador.objs.toml

@@ -17,3 +17,7 @@ examine = "A tunnel leading under the wall."
 [falador_underwall_tunnel_south]
 id = 9309
 examine = "A tunnel leading under the wall."
+
+[cooking_range_falador]
+id = 2728
+examine = "Ideal for cooking on."

data/area/asgarnia/port_sarim/port_sarim.objs.toml

@@ -29,3 +29,7 @@ examine = "Handy for boarding the ship."
 [port_sarim_lady_lumbridge_gangplank_enter]
 id = 2593
 examine = "Handy for boarding the ship."
+
+[cooking_range_port_sarim]
+id = 40110
+examine = "Ideal for cooking on."

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

@@ -1,3 +1,7 @@
 [suit_of_armour]
 id = 32292
 examine = "A dusty old suit of armour."
+
+[cooking_range_black_knights_base]
+id = 36973
+examine = "Ideal for cooking on."

data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.objs.toml

@@ -1,3 +1,7 @@
 [bank_chest_neitiznot]
 id = 21301
 examine = "An open bank chest."
+
+[cooking_range_neitiznot]
+id = 21302
+examine = "Cook your food here."

data/area/fremennik_province/pirates_cove/pirates_cove.objs.toml

@@ -0,0 +1,3 @@
+[cooking_range_pirates_cove]
+id = 16893
+examine = "An appliance for cooking with."

data/area/fremennik_province/rellekka/rellekka.objs.toml

@@ -21,3 +21,7 @@ examine = "There's something fishy about this stall."
 
 [fish_stall_empty]
 id = 4276
+
+[fire_rellekka]
+id = 4265
+examine = "Toasty."

data/area/kandarin/ardougne/east_ardougne.objs.toml

@@ -153,4 +153,16 @@ id = 34233
 id = 2555
 level = 61
 exp = 50.0
-examine = "A secure door."
+examine = "A secure door."
+
+[cooking_range_west_ardougne]
+id = 34495
+examine = "Ideal for cooking on."
+
+[cooking_range_east_ardougne]
+id = 34546
+examine = "Ideal for cooking on."
+
+[cooking_range_ardougne]
+id = 34565
+examine = "An appliance used for cooking."

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

@@ -82,7 +82,7 @@ spawns = [
   { id = "duck_grey_swim", x = 2617, y = 3445 },
   { id = "duck_grey_swim", x = 2619, y = 3447 },
   { id = "duck_grey_swim", x = 2621, y = 3444 },
-  { id = "master_fisher_fishing_guild", x = 2613, y = 3394 },
+  { id = "master_fisher", x = 2613, y = 3394 },
   { id = "fishing_spot_fishing_guild", x = 2599, y = 3419, members = true },
   { id = "fishing_spot_fishing_guild", x = 2601, y = 3422, members = true },
   { id = "fishing_spot_fishing_guild", x = 2602, y = 3412, members = true },

data/area/kandarin/fishing_guild/fishing_guild.npcs.toml

@@ -1,4 +1,4 @@
-[master_fisher_fishing_guild]
+[master_fisher]
 id = 308
 examine = "The man in charge of the fishing guild."
 
@@ -40,3 +40,38 @@ examine = "He runs the Fishing Guild shop."
 id = 3709
 examine = "She seems happy in her work."
 
+[bonzo]
+id = 225
+examine = "The Fishing Contest judge."
+
+[sinister_stranger]
+id = 226
+
+[morris]
+id = 227
+examine = "He checks the entrants to the Fishing Contest."
+
+[big_dave]
+id = 228
+examine = "I can see how he got his name."
+
+[joshua]
+id = 229
+examine = "He loves to fish!"
+
+[grandpa_jack]
+id = 230
+examine = "He looks elderly."
+
+[fishing_spot_ranging_guild]
+id = 233
+examine = "I can fish here."
+
+[fishing_spot_ranging_guild_2]
+id = 234
+
+[fishing_spot_ranging_guild_3]
+id = 235
+
+[fishing_spot_ranging_guild_4]
+id = 236

data/area/kandarin/fishing_guild/fishing_guild.objs.toml

@@ -1,3 +1,31 @@
 [bank_booth_fishing_guild]
 id = 49018
 examine = "The bank teller will serve you from here."
+
+[gate_fishing_guild_left_opened]
+id = 49015
+
+[gate_fishing_guild_left_closed]
+id = 49014
+gate = false
+examine = "A gate."
+
+[gate_fishing_guild_right_opened]
+id = 49017
+
+[gate_fishing_guild_right_closed]
+id = 49016
+gate = false
+examine = "A gate."
+
+[gate_fishing_contest_opened]
+id = 49
+examine = "A wooden gate."
+
+[gate_fishing_contest_closed]
+id = 47
+examine = "A wooden gate."
+
+[cooking_range_fishing_content]
+id = 49035
+examine = "Ideal for cooking on."

data/area/kandarin/piscatoris/piscatoris.objs.toml

@@ -1,3 +1,7 @@
 [piscatoris_obelisk_ladder_up]
 id = 28743
-examine = "Allows access to the level above."
+examine = "Allows access to the level above."
+
+[cooking_range_piscatoris]
+id = 14919
+examine = "Smells of fried fish."

data/area/kandarin/ranging_guild/ranging_guild.npcs.toml

@@ -1,39 +1,3 @@
-[bonzo]
-id = 225
-examine = "The Fishing Contest judge."
-
-[sinister_stranger]
-id = 226
-
-[morris]
-id = 227
-examine = "He checks the entrants to the Fishing Contest."
-
-[big_dave]
-id = 228
-examine = "I can see how he got his name."
-
-[joshua]
-id = 229
-examine = "He loves to fish!"
-
-[grandpa_jack]
-id = 230
-examine = "He looks elderly."
-
-[fishing_spot_ranging_guild]
-id = 233
-examine = "I can fish here."
-
-[fishing_spot_ranging_guild_2]
-id = 234
-
-[fishing_spot_ranging_guild_3]
-id = 235
-
-[fishing_spot_ranging_guild_4]
-id = 236
-
 [guard_ranging_guild]
 id = 678
 examine = "Keeps order in the ranging guild."

data/area/kharidian_desert/nardah/nardah.objs.toml

@@ -1,3 +1,7 @@
 [bank_booth_nardah]
 id = 10517
 examine = "The bank teller will serve you from here."
+
+[cooking_range_clay_oven]
+id = 10377
+examine = "A clay oven for cooking with."

data/area/misthalin/draynor/draynor.objs.toml

@@ -25,4 +25,8 @@ restock = 4
 examine = "Lots of seeds here."
 
 [seed_stall_empty]
-id = 14012
+id = 14012
+
+[cooking_range_draynor_manor]
+id = 47633
+examine = "It smells of fried fish."

data/area/misthalin/varrock/varrock.objs.toml

@@ -2,6 +2,14 @@
 id = 31759
 examine = "This drain leads from the sink to the sewers below."
 
+[varrock_palace_drain_key]
+id = 17424
+examine = "This drain leads from the sink to the sewers below."
+
+[varrock_palace_drain_empty]
+id = 17423
+examine = "This drain leads from the sink to the sewers below."
+
 [varrock_manhole]
 id = 881
 examine = "There's a cover over this manhole."
@@ -27,3 +35,11 @@ examine = "Fine brews from exotic regions."
 
 [tea_stall_empty]
 id = 634
+
+[cooking_range_varrock]
+id = 24283
+examine = "Ideal for cooking on."
+
+[cooking_range_varrock_palace_oven]
+id = 24313
+examine = "For cooking food."

data/area/misthalin/zanaris/zanaris.objs.toml

@@ -1,3 +1,7 @@
 [bank_booth_zanaris]
 id = 52589
 examine = "The bank teller will serve you from here."
+
+[cooking_range_zanaris]
+id = 52576
+examine = "I could cook up a storm on this."

data/area/morytania/port_phasmatys/port_phasmatys.objs.toml

@@ -49,3 +49,7 @@ examine = "These stairs were carved out of the rock of the cavern."
 [phasmatys_barrier]
 id = 52760
 examine = "A ghostly barrier."
+
+[cooking_range_port_phasmatys]
+id = 5275
+examine = "An appliance for cooking with."

data/area/wilderness/rogues_castle/rogues_castle.objs.toml

@@ -0,0 +1,3 @@
+[cooking_range_rogues_castle]
+id = 9682
+examine = "Ideal for cooking on."

data/entity/obj/gates.objs.toml

@@ -13,14 +13,6 @@ examine = "Solid bars of iron."
 id = 38
 examine = "Stops people walking past."
 
-[gate_4_opened]
-id = 49
-examine = "A wooden gate."
-
-[gate_4_closed]
-id = 47
-examine = "A wooden gate."
-
 [gate_5_opened]
 id = 50
 examine = "A wooden gate."
@@ -1469,19 +1461,3 @@ examine = "A wooden gate."
 [gate_242]
 id = 45213
 examine = "A wooden gate."
-
-[gate_253_opened]
-id = 49015
-
-[gate_253_closed]
-id = 49014
-gate = false
-examine = "A gate."
-
-[gate_254_opened]
-id = 49017
-
-[gate_254_closed]
-id = 49016
-gate = false
-examine = "A gate."

game/src/main/kotlin/content/area/kandarin/fishing_guild/FishingGuild.kt

@@ -0,0 +1,35 @@
+package content.area.kandarin.fishing_guild
+
+import content.entity.obj.door.enterDoor
+import content.entity.player.dialogue.Confused
+import content.entity.player.dialogue.Neutral
+import content.entity.player.dialogue.Sad
+import content.entity.player.dialogue.type.choice
+import content.entity.player.dialogue.type.npc
+import world.gregs.voidps.engine.Script
+import world.gregs.voidps.engine.entity.character.player.skill.Skill
+import world.gregs.voidps.engine.entity.character.player.skill.level.Level.has
+
+class FishingGuild : Script {
+    init {
+        objectOperate("Open", "gate_fishing_guild_*_closed") { (target) ->
+            if (!has(Skill.Fishing, 68)) {
+                npc<Neutral>("master_fisher", "Hello, only the top fishers are allowed in here. You need a fishing level of 68 to enter.")
+                return@objectOperate
+            }
+            enterDoor(target)
+        }
+
+        objectOperate("Open", "gate_fishing_contest_closed") { (target) ->
+            npc<Neutral>("morris", "Competition pass please.")
+            choice {
+                option<Sad>("I don't have one of them.") {
+                    npc<Neutral>("morris", "Oh well. I can't let you past then.")
+                }
+                option<Confused>("What do I need that for?") {
+                    npc<Neutral>("morris", "This is the entrance to the Hemenster fishing competition. It's a high class competition. Invitation only.")
+                }
+            }
+        }
+    }
+}