Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Scripts/ScarletMonastery): improvement ScarletMonastery #17558

Open
wants to merge 66 commits into
base: master
Choose a base branch
from

Conversation

fangshun2004
Copy link
Contributor

@fangshun2004 fangshun2004 commented Oct 22, 2023

Changes Proposed:

  1. Go to the pull request fix(Script/Instance): Rework Scarlet Monastery Ashbringer event partially #15218 from @feltwitch to see the detailed changes I gave with the sniffing data given by @heyitsbench based on that pull request Reworked triggering the Ember Bringer event.
  2. The door should open after the event is triggered, and Mograini should be able to receive a welcome dialogue.
  3. NPCs inside the church. All Friendly, Removed Whiteman

4 . Added the emote(salute) of Whitemane's creature after resurrecting Mograine(growl).
5. After resurrecting Mograine, Whitemayne dies, the player quits the fight or dies, and Mograine does not respawn Pick up Mograine's items without a shot
Out of combat should be respawning rather than waiting for the mob to move back to the spawn point
6. Whitemane's HOLY_SMITE spells should be cast at ranged (not moving) whenever possible, and will only attempt to move to melee range if the spell is unusable (behind a building, etc.).
7. Whitemane has less than 50% HP and is released DEEP_SLEEP after the spell should be moved to Mograine's side before using Resurrection (if the player does not have a DEEP_SLEEP debuff after moving to Mograine, the resurrection will be released immediately, and if there is a debuff, it will wait for 5 seconds before it is released)
8. When Mograine has dot damage and triggers the first death, the dot damage number can still appear on Mograine, and does not remove all Aura

This PR proposes changes to:

  • Scripts (bosses, spell scripts, creature scripts).
  • Database (SAI, creatures, etc).

Issues Addressed:

SOURCE:

The changes have been validated through:

  • Live research (checked on live servers, e.g Classic WotLK, Retail, etc.)
  • Sniffs (remember to share them with the open source community!)
  • Video evidence, knowledge databases or other public sources (e.g forums, Wowhead, etc.)
  • The changes promoted by this pull request come partially or entirely from another project (cherry-pick). Cherry-picks must be committed using the proper --author tag in order to be accepted, thus crediting the original authors, unless otherwise unable to be found

#15218

Tests Performed:

This PR has been:

  • Tested in-game by the author.

How to Test the Changes:

  • This pull request can be tested by following the reproduction steps provided in the linked issue

Tests Ashbringer

  1. .additem 22691.
  2. .level 60 or .character level 60.
  3. Armament weapon ID 22691 .additem 22691.
  4. .instance unbind all.
  5. .tele smcath.
  6. The doors of the church should be opened.
  7. Unloading weapon ID 22691 after Ashbringer event All creatures in the dungeon should be friendly (including in churches)

Test combat

  1. .level 80 or .character level 80.
  2. It is recommended to use a Warlock or Priest to test the battle when changing weapons.
  3. Use dot spells on Mograine as much as possible, such as Doomsday Curse, Corrosion, etc. After Mograine dies for the first time and falls to the ground, you can still see the damage on Mograine on the ground.
  4. Whitemane exits from behind the gate and moves to Mograine's side, and does not enter the battle (at player level 80, enters the battle at low level), at which point Whitemane will always stay outside the gate if .gm on is used, and will not return to the spawn point.
  5. Whitemane should always cast HOLY_SMITE spell in place, and after taking a detour behind a pillar, Whitemane will attempt to move to melee range to attack the player
  6. After Whitemane first enters the fight Pull him away from Mograine's corpse (the farther away the better) and reduce his HP to less than 50% Trigger the Resurrection Mograine event Whitemane hypnotizes the player and starts moving next to Mograine's corpse (now just stays in place and uses the resurrection spell until Mograine is revived) Until Mograine resurrects, his HP will only drop to 1 at most, and he will not be able to kill him
  7. Whitemane will make an emote after resurrecting Mograine

Known Issues and TODO List:

  • Adds missing behaviors in the resurrection event when Mograine and Whitemane fight
  • Modified Whitemane act of releasing spells
  • Move C++ scripts to SmartScript

How to Test AzerothCore PRs

When a PR is ready to be tested, it will be marked as [WAITING TO BE TESTED].

You can help by testing PRs and writing your feedback here on the PR's page on GitHub. Follow the instructions here:

http://www.azerothcore.org/wiki/How-to-test-a-PR

REMEMBER: when testing a PR that changes something generic (i.e. a part of code that handles more than one specific thing), the tester should not only check that the PR does its job (e.g. fixing spell XXX) but especially check that the PR does not cause any regression (i.e. introducing new bugs).

For example: if a PR fixes spell X by changing a part of code that handles spells X, Y, and Z, we should not only test X, but we should test Y and Z as well.

@github-actions github-actions bot added DB related to the SQL database CORE Related to the core Script file-cpp Used to trigger the matrix build labels Oct 22, 2023
@fangshun2004
Copy link
Contributor Author

I really can't find where there are extra spaces 😒😒😒😒😒😒

@fangshun2004
Copy link
Contributor Author

fangshun2004 commented Apr 1, 2024 via email

@fangshun2004 fangshun2004 restored the Scarlet_Monastery_improvement branch April 1, 2024 14:40
@sudlud
Copy link
Member

sudlud commented Apr 1, 2024

Ah ok because you deleted 4 branches of PRs that were not merged yet

@fangshun2004 fangshun2004 reopened this Apr 5, 2024
@alecsci
Copy link
Member

alecsci commented Sep 1, 2024

@fangshun2004 this looks fun to test.

  1. Is the PR ready and up-to-date (given the longevity)?
  2. Is the PR a fix for Corrupted Ashbringer effect seems inconsistent. #14478 ? If more can you list them ?

@sudlud
Copy link
Member

sudlud commented Sep 2, 2024

Can you please address the codestyle CI issues

@sudlud
Copy link
Member

sudlud commented Sep 21, 2024

can you please respond to the last comment of @alecsci, also there are merge conflicts to be resolved if the PR is ready to be tested

…to Scarlet_Monastery_improvement

# Conflicts:
#	src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
…04/azerothcore-wotlk into Scarlet_Monastery_improvement
@fangshun2004
Copy link
Contributor Author

It's been fixed in #15218, as described at the beginning Go there and see what's fixed I don't want to type in a whole bunch of text

@sudlud sudlud requested a review from alecsci September 28, 2024 13:56
@alecsci
Copy link
Member

alecsci commented Sep 28, 2024

Hi @fangshun2004,
Based on your PR description, I started some regression tests:

  1. Added the emote of Whitemane's creature after resurrecting Mograine
  2. After resurrecting Mograine, Whitemayne dies, the player quits the fight or dies, and Mograine does not respawn Pick up Mograine's items without a shot
  3. Out of combat should be respawning rather than waiting for the mob to move back to the spawn point
    Whitemane's HOLY_SMITE spells should be cast at ranged (not moving) whenever possible, and will only attempt to move to melee range if the spell is unusable (behind a building, etc.).

These proposed fixes looks like are part of the existing master changes.
The emotes from creature_text are already behave correctly. I am not sure why you are changing them again ?
Ashbringer event work almost perfect.

Can you please update the PR description to what you actually propose to improve with this PR ?
I still have to test 5) and 6)

@TheSCREWEDSoftware
Copy link
Contributor

Does this still need to be tested. If yes, what or how does it need to tested.

@alecsci
Copy link
Member

alecsci commented Oct 16, 2024

Hi @TheSCREWEDSoftware, I suggest to test it again, but we have to clarify the proposed changes.

@fangshun2004 can you please can edit the PR description to tell us what you exactly want to fix, so we know what to test. There aren't that many changes, so I don't expect a wall of text ?

I make a lot of assumptions in my previous test #17558 (comment)

@fangshun2004
Copy link
Contributor Author

fangshun2004 commented Oct 17, 2024

If only next to Mograine's corpse would reduce Whitemane's health to less than 50%. The difference is not discerning. The difference can only be seen by pulling Whitemane far away from the corpse

All emoji in creature_text are now 0, and there is emoji data in the analyzed conversation data. And there's also a lack of dialogue to shout at the player to welcome. So I'm going to revise creature_text.

  1. Reducing Whitemane's health to 50% for the first time should always move to Mograine's side and use Resurrection. Instead of staying where and using the resurrection. That's why it's mentioned in the test that Whitemane needs to be lured far away and then drop her health below 50%.
  2. If Whitemane moves in front of the corpse and casts Resurrection, the hypnotic debuff on the player will disappear and Resurrection will soon be released. (Mograini's corpse needs to be kept away, and if the player is hypnotized while casting Resurrection, she will wait 4 seconds before releasing Resurrection3.) Whitemane uses "Salute" - after Mograine uses the healing, uses Roar - moves to Whitemane's side - to start attacking

@fangshun2004
Copy link
Contributor Author

To put it simply, it's a matter of adding some details. The player is hypnotized and will have to wait some time to release the resurrection. The player is not hypnotized and will soon be unleashed resurrection. After resurrection, there should be some small interactions between bosses

@TheSCREWEDSoftware TheSCREWEDSoftware added Testing in Progress Waiting For More Info from Author Issue pending due to needing more additional informatino from the author and removed Waiting to be Tested Testing in Progress labels Nov 14, 2024
@TheSCREWEDSoftware
Copy link
Contributor

@fangshun2004 confirm if what's on the video here is the expected result of this PR

@fangshun2004
Copy link
Contributor Author

@fangshun2004 confirm if what's on the video here is the expected result of this PR

Sorry, I can't access everything on YouTube😥😥

@TheSCREWEDSoftware
Copy link
Contributor

Can you elaborate?

@fangshun2004 confirm if what's on the video here is the expected result of this PR

Sorry, I can't access everything on YouTube😥😥

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CORE Related to the core DB related to the SQL database file-cpp Used to trigger the matrix build Script Waiting For More Info from Author Issue pending due to needing more additional informatino from the author
Projects
None yet
Development

Successfully merging this pull request may close these issues.