gunnars ground quest

some animations need naming
itemsbox with 2 items shows but won't continue
cutscene still needs some work
missing Gudrun Hugging Dororan anim
antique_lamp_gunnars_ground needs adding

data/definitions/animations.yml

@@ -1,4 +1,7 @@
 # Dialogue expressions
+
+expression_unknown_expression: 9807
+
 expression_no: 9740
 expression_yes: 9741
 expression_amazed1: 9742
@@ -1624,4 +1627,5 @@ teleport_jewellery:
 teleport_pharaohs_sceptre:
   id: 9596
   ticks: 3
-fill_bucket: 895
+fill_bucket: 895
+engrave: 14736

data/definitions/interfaces.yml

@@ -226,6 +226,12 @@ inventory:
         Option12: 17
         Drag: 20
         Option13: 21
+messagescrol:
+  id: 156
+  type: wide_screen
+  components:  
+    title: 5
+    line0: 7-106        
 slayer_rewards_assignment: 161
 slayer_rewards_learn_old: 163
 slayer_rewards: 164

data/definitions/npcs.yml

@@ -409,6 +409,11 @@ squire_asrol:
   race: human
   wander_radius: 4
   examine: "Indentured servant of a Knight."
+jeffery:
+  id: 637
+  wander_radius: 4
+  race: human
+  examine: "The man with the armour."
 reldo:
   id: 647
   wander_radius: 4
@@ -595,6 +600,10 @@ banker_canifis:
   interact_distance: 2
   race: human
   examine: "He can look after my money."
+dororan:
+  id: 1168
+  race: dwarf
+  examine: "A dwarf in anguish."  
 yrsa:
   id: 1301
   race: human
@@ -674,6 +683,19 @@ quiz_master:
   interact_distance: 4
   race: human
   examine: "Apparently a master of quizzes!"
+dororan_after_cutscene:
+  id: 2646
+dororan_after_cutscene2:
+  id: 2647
+  examine: "A dwarf on top of the world."
+dororan_after_quest:
+  &dororan_after_quest
+  id: 2648
+  race: dwarf
+  examine: "A dwarf on top of the world."
+dororan_after_quest2:
+  <<: *dororan_after_quest
+  id: 2651
 reldo_normal:
   id: 2661
   race: human
@@ -709,6 +731,58 @@ ellis:
   id: 2824
   race: human
   examine: "Manufacturer of fine leathers."
+dororan_cutscene:
+  id: 2863
+  examine: "A dwarf in suspense."  
+gudrun:
+  &gudrun
+  id: 2864
+  wander_radius: 4
+  race: human
+  examine: "The chieftain's daughter."
+gudrun2:
+  <<: *gudrun
+  id: 2865
+gudrun_after_cutscene:
+  <<: *gudrun
+  id: 2866
+gudrun_after_cutscene2:
+  <<: *gudrun
+  id: 2867  
+gudrun_after_quest:
+  <<: *gudrun
+  id: 2869
+gudrun_after_quest2:
+  <<: *gudrun
+  id: 2870
+gudrun_cutscene:
+  <<: *gudrun
+  id: 2871
+kjell:
+  &kjell
+  id: 2872
+  race: human
+  examine: "A barbarian guard."
+kjell_sword:
+  <<: *kjell
+  id: 2873
+kjell_guitar:
+  <<: *kjell
+  id: 2874
+kjell_cutscene:
+  id: 2875
+  examine: "A barbarian guard."
+chieftain_gunthor:
+  &chieftain_gunthor
+  id: 2876
+  race: human
+  examine: "A heavily built barbarian with an air of power and authority."
+chieftain_gunthor_icon:
+  <<: *chieftain_gunthor
+  id: 2877
+chieftain_gunthort_no_icon:
+  <<: *chieftain_gunthor
+  id: 2878
 rat_ratcatchers:
   id: 2974
   wander_radius: 4
@@ -731,6 +805,22 @@ rat_ratcatchers_7:
   id: 2980
   wander_radius: 4
   examine: "A popular dwarven delicacy."
+chieftain_gunthor_cutscene:
+  id: 3089
+  examine: "A heavily built barbarian with an air of power and authority."
+haakon_the_champion:
+  id: 3090
+  max_hit_melee: 42
+  hitpoints: 360
+  immune_poison: true
+  wander_radius: 4
+  respawn_delay: 75
+  style: crush
+  race: human
+  examine: "A mighty warrior, Haakon is powerfully concerned for his tribe."
+haakon_the_champion_cutscene:
+  id: 3091
+  examine: "A mighty warrior, Haakon is powerfully concerned for his tribe."
 prison_pete:
   id: 3118
   examine: "He wants to escape!"
@@ -767,6 +857,11 @@ frog_9_frogland:
 cow_zanaris:
   <<: *cow
   id: 3309
+jeffery3:
+  id: 3323
+  wander_radius: 4
+  race: human
+  examine: "The man with the armour."
 tarquin:
   id: 3328
   examine: "A dandy canoe man."
@@ -1109,6 +1204,11 @@ fishing_spot_crayfish_lumbridge:
         none:
           - raw_crayfish
   examine: "It looks like there might be fish swimming in the water."
+jeffery2:
+  id: 6298
+  wander_radius: 4
+  race: human
+  examine: "The man with the armour."
 pikkupstix:
   id: 6970
   race: human

data/definitions/variables-custom.yml

@@ -1,3 +1,12 @@
+dororan_ruby_bracelet:
+  format: boolean
+  persist: true
+dororan_dragonstone_necklace:
+  format: boolean
+  persist: true
+dororan_onyx_amulet:
+  format: boolean
+  persist: true
 demon_slayer_bones:
   format: int
   persist: true

data/definitions/variables-player-bit.yml

@@ -1,3 +1,69 @@
+gunnars_ground:
+  id: 5730
+  persist: true
+  format: map
+  default: unstarted
+  values:
+    unstarted: 0
+    started: 1
+    love_poem: 2
+    jeffery_ring: 3
+    engrave: 4
+    engraved_ring: 5
+    show_gudrun: 6
+    meet_chieftain: 7
+    tell_gudrun: 8
+    tell_dororan: 9
+    write_poem: 10
+    more_poem: 11
+    one_more_poem: 12
+    poem_done: 13
+    poem: 14
+    recital: 15
+    gunnars_ground: 16
+    completed: 100
+kjell:
+  id: 5819
+  persist: true
+  format: list
+  default: sword
+  values: [ sword, guitar ]
+dororan:
+  id: 5820
+  persist: true
+  format: list
+  default: shown
+  values: [ shown, hidden ]
+gudrun:
+  id: 6664
+  persist: true
+  format: list
+  default: shown
+  values: [ shown, hidden ]
+dororan_after_quest:
+  id: 6665
+  persist: true
+  format: list
+  default: hidden
+  values: [ hidden, shown ]
+gudrun_after_quest:
+  id: 6666
+  persist: true
+  format: list
+  default: hidden
+  values: [ hidden, shown ]
+dororan_after_cutscene:
+  id: 8242
+  persist: true
+  format: list
+  default: hidden
+  values: [ hidden, shown ]
+gudrun_after_cutscene:
+  id: 8243
+  persist: true
+  format: list
+  default: hidden
+  values: [ hidden, shown ]
 demon_slayer:
   id: 2561
   persist: true

data/definitions/variables-player.yml

@@ -95,7 +95,7 @@ quest_points_total:
   format: map
   default: total
   values:
-    total: 7
+    total: 12
 cooks_assistant:
   id: 29
   persist: true

data/spawns/npc-spawns.yml

@@ -383,6 +383,8 @@
 - { id: goblin_light_grey_bald_spear, x: 2392, y: 9656 }
 - { id: goblin_light_grey_bald_spear, x: 2396, y: 9658 }
 - { id: goblin_light_grey_bald_spear, x: 2397, y: 9655 }
+# 9623
+- { id: zombie, x: 2405, y: 9713, members: true }
 # 9772
 - { id: giant_spider_2, x: 2459, y: 2864, members: true }
 - { id: giant_spider_2, x: 2479, y: 2866, members: true }
@@ -521,6 +523,7 @@
 - { id: goblin_light_grey_bald_spear, x: 2438, y: 9700 }
 - { id: goblin_light_grey_bald_spear, x: 2441, y: 9698 }
 - { id: goblin_light_grey_bald_spear, x: 2439, y: 9696 }
+- { id: zombie, x: 2452, y: 9684, members: true }
 # 9882
 - { id: rat, x: 2442, y: 9891, members: true }
 - { id: rat, x: 2447, y: 9891, members: true }
@@ -650,10 +653,14 @@
 - { id: rat, x: 2502, y: 9437, members: true }
 - { id: rat, x: 2501, y: 9430, members: true }
 - { id: rat, x: 2527, y: 9412, members: true }
+# 10133
+- { id: zombie, x: 2541, y: 9569, members: true }
 # 10137
 - { id: butterfly_1, x: 2540, y: 9820, members: true }
 - { id: butterfly_1, x: 2546, y: 9817, members: true }
 - { id: butterfly_1, x: 2543, y: 9813, members: true }
+# 10137
+- { id: zombie, x: 2540, y: 9823, members: true }
 # 10138
 - { id: rat, x: 2542, y: 9897, members: true }
 # 10284
@@ -1351,6 +1358,13 @@
 - { id: goblin_orange_hat_spear, x: 3126, y: 3450 }
 - { id: goblin_orange_hat_spear, x: 3121, y: 3422 }
 - { id: sigurd, x: 3113, y: 3413 }
+- { id: dororan_after_cutscene, x: 3083, y: 3417, direction: SOUTH }
+- { id: gudrun_after_cutscene, x: 3082, y: 3417, direction: SOUTH }
+- { id: dororan, x: 3098, y: 3422, direction: EAST }
+- { id: gudrun, x: 3082, y: 3417 }
+- { id: chieftain_gunthor, x: 3078, y: 3444 }
+- { id: haakon_the_champion, x: 3081, y: 3444 }
+- { id: kjell, x: 3079, y: 3414, direction: NORTH_EAST }
 # 12342
 - { id: man, x: 3093, y: 3512 }
 - { id: man, x: 3097, y: 3512 }
@@ -1369,6 +1383,7 @@
 - { id: rat, x: 3123, y: 3487 }
 - { id: rat, x: 3128, y: 3485 }
 - { id: hari, x: 3133, y: 3509 }
+- { id: jeffery, x: 3108, y: 3500 }
 # 12436
 - { id: combat_instructor, x: 3106, y: 9509 }
 - { id: mining_instructor, x: 3081, y: 9504 }
@@ -1634,6 +1649,8 @@
 - { id: banker_4, x: 3166, y: 3489, direction: EAST }
 - { id: rat, x: 3151, y: 3414 }
 - { id: musician_cooks_guild, x: 3153, y: 3422, direction: SOUTH }
+- { id: dororan_after_quest, x: 3159, y: 3434 }
+- { id: gudrun_after_quest, x: 3162, y: 3434 }
 # 12600
 - { id: goblin_musician, x: 3143, y: 3642, direction: WEST }
 - { id: rat, x: 3160, y: 3639 }