Multiple fixes for burthorpe immersion.

What have you done in this MR?

More immersion updates to Burthorpe

Commit 1

• Harrallak Menarous isn't sliding around the floor now.
• Corrected Bernald's Dialogue to be the the one before Garden of Tranquility's quest.
• Swapped Ocga and Penda's Dialogue (minor) because Penda is the crazy one in the bar.
• Added drops(man) for killing the Servant.
• Made Eadburg the chef drops(bones only) and adjusted fighting values.
• Adjusted guards attack animation. youtu.be/dWeGYbFk1MA 35:53
• Added Sam and Rachael the gamesroom barmaids.
• Moved Bernald and Tostig's dialogue from Taverley to Burthorpe. They are in Burthorpe not Taverley.

Commit 2

• Swapped out default archers on level 2 castle to Burthorpe archers instead.
• Reserve one archer on level 2 for Death Plateau later.
• Added more examine text.
• Added Unferth as the new spawn and moved Ocga out of that house.
• Updated Hild's dialogue.

Are there any tricky things testers should keep an eye out for?

• No
• Yes, as follows:

These are just immersion/content changes.

• I have tested these changes thoroughly.

• This requires extra testing due to changes to architecture or other similarly risky changes.

• I used the Thanos Tool for any JSON edits where possible, and have attached screenshots of any changes.

I used the Thanos tool first, then deleted useless lines for non-attackable NPCs like:

  {
    "examine": "Barman of the Toad and Chicken.",
    "name": "Tostig",
    "id": "1079"
  },

I think this could save lots of space since I see lots of non-attackable NPC repeating attack/defence values of "0".

• I acknowledge that this contribution will be released under the AGPL license.

*** NOTE: If Gitlab complains about pipelines stating that you need to "Validate your Gitlab account" there is no need to worry. You do not have to do this and it is only occurring because OUR pipeline tried to run on your fork. While it's preferred that you do validate your account, you can safely ignore/dismiss this message from Gitlab. ***

marked the checklist item I used the Thanos Tool for any JSON edits where possible, and have attached screenshots of any changes. as completed

changed the description

added 1 commit

• 970bc515 - More modifications to people in burthorpe.

Compare with previous version

changed the description

marked this merge request as ready

added StatusNeeds Testing label

added StatusChanges Required label and removed StatusNeeds Testing label

resolved all threads

added 1 commit

• c65e1a44 - Changed to use hasrequirement. Fix minor burthorpe castle staircase animation.

Compare with previous version

added 7 commits

• c65e1a44...02e06a95 - 4 commits from branch 2009scape:master
• 283a814b - Multiple fixes for burthorpe immersion.
• f4f37983 - More modifications to people in burthorpe.
• 6fbc1463 - Changed to use hasrequirement. Fix minor burthorpe castle staircase animation.

Compare with previous version

added StatusNeeds Testing label and removed StatusChanges Required label

added 15 commits

• 6fbc1463...cb16fe43 - 12 commits from branch 2009scape:master
• b29f3c64 - Multiple fixes for burthorpe immersion.
• e8f963f8 - More modifications to people in burthorpe.
• 2495e2aa - Changed to use hasrequirement. Fix minor burthorpe castle staircase animation.

Compare with previous version

added StatusNeeds Deployment label and removed StatusNeeds Testing label

added StatusNeeds Testing label and removed StatusNeeds Deployment label

added 6 commits

• 2495e2aa...2f74cdaf - 3 commits from branch 2009scape:master
• a61c5a67 - Multiple fixes for burthorpe immersion.
• eb519e97 - More modifications to people in burthorpe.
• 4b3c5776 - Changed to use hasrequirement. Fix minor burthorpe castle staircase animation.

Compare with previous version

• Harrallak Menarous is walking correctly

• Bernalds default dialogue(when you don't have quest garden of tranquility pre reqs) is correct. However if you have all the pre reqs you get the dialogue as if you have finished the step in the quest where you help him with his grape vines. The quest is not implemented yet so you could just disable that dialogue and when the quest is written it can be locked behind a quest stage requirement / isQuestComplete. You also get a message in the chat saying you don't have the requirements.

• Ocga and Penda's dialogue seem correct

• Servant drops are good

• Eadburg drops bones

• Guards attack animation are good

• Sam and Rachel the barmaid are good

• Bernald and Tostig dialouge work

• Burthope archers are good

• Examines are good

• Ocga location is correct but Unferth's dialogue is incorrect. He has the dialogue that you would get after a tale of two cats quest. I cant find a good source for what you should get without the quest requirements but osrs is the only source I can provide and is most likely correct and could be used.

• Hild's dialogue works

Test Results: Changes Required

added StatusChanges Required label and removed StatusNeeds Testing label

added 1 commit

• e55f8088 - Fixed Unferth and Bernald dialogues.

Compare with previous version

added 9 commits

• e55f8088...6d96611d - 5 commits from branch 2009scape:master
• ee27fbff - Multiple fixes for burthorpe immersion.
• 535e7c94 - More modifications to people in burthorpe.
• 1f3610d7 - Changed to use hasrequirement. Fix minor burthorpe castle staircase animation.
• 8f779842 - Fixed Unferth and Bernald dialogues.

Compare with previous version

added StatusNeeds Deployment label and removed StatusChanges Required label

try not to rebase unless there is a merge conflict noted

added StatusNeeds Testing label and removed StatusNeeds Deployment label

Harrallak Menarous finally got his non-slip shoes.

Bernald is complaining about his diseased grapevines, I think this is correct?

Penda is kind of bipolar. Sometimes he gives his 'crazy' dialogues, other times it's just the generic greetings. Dunno if this is correct or not.

Servant and Eadburg drops work.

Guard attack animation seems fine.

Sam and Rachael work, however it's not currently possible to talk to Sam without teleporting inside the bar. Their dialogues mostly work, however the one about Draughts isn't complete (only on Rachael).

Unferth/Ocga locations seem fine.

Unferth's dialogue seems fine.

New examines seem fine. Only thing off I noticed is that Dunstan is still missing an examine.

added 1 commit

• f0c1373d - Corrected Rachael's dialogue and added Dunstan's examine text. Added all...

Compare with previous version

resolved all threads

resolved all threads

added StatusNeeds Deployment label and removed StatusNeeds Testing label

added StatusNeeds Testing label and removed StatusNeeds Deployment label

added Test PriorityNice to Have label

added 1 commit

• 37b34ebe - Added periods.

Compare with previous version

Added the periods.

added StatusReady To Merge label and removed StatusNeeds Testing label

added 19 commits

• 37b34ebe...defe780c - 13 commits from branch 2009scape:master
• 1072cee7 - Multiple fixes for burthorpe immersion.
• a1fed377 - More modifications to people in burthorpe.
• 0ee82b96 - Changed to use hasrequirement. Fix minor burthorpe castle staircase animation.
• 7f2d5d4e - Fixed Unferth and Bernald dialogues.
• a42be5ef - Corrected Rachael's dialogue and added Dunstan's examine text. Added all...
• 32dfd7bc - Added periods.

Compare with previous version

approved this merge request

enabled an automatic merge when the pipeline for d4b0ad5a succeeds

merged