fix(DB/Scripts): Reset Scourgelord Tyrannus encounter state #21057

blinkysc · 2024-12-28T22:43:13Z

Changes Proposed:

This PR proposes changes to:

Core (units, players, creatures, game systems).
Scripts (bosses, spell scripts, creature scripts).
Database (SAI, creatures, etc).

Issues Addressed:

Closes [Pit of Saron]: Scourgelord Tyrannus doesn't restart when you die #15824

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

Tests Performed:

This PR has been:

[ X] Tested in-game by the author.
Tested in-game by other community members/someone else other than the author/has been live on production servers.
This pull request requires further testing and may have edge cases to be tested.

How to Test the Changes:

This pull request can be tested by following the reproduction steps provided in the linked issue
This pull request requires further testing. Provide steps to test your changes. If it requires any specific setup e.g multiple players please specify it as well.

go Pit of Saron
go to Scourgelord Tyrannus start combat and die

Known Issues and TODO List:

[ ]
[ ]

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.

Talamorts1 · 2024-12-28T22:51:30Z

Fixes #15824

TheSCREWEDSoftware

Match the SQL Standards

flags_extra=flags_extra | 1073741824

TheSCREWEDSoftware

Now we just need to wait for someone that has cpp knowledge to review the cpp line.

Talamorts1 · 2024-12-29T20:15:06Z

Now we just need to wait for someone that has cpp knowledge to review the cpp line.

its one line of code and its alot better than the original hack fix that was applied.

I worked on this project way before more people did. Ive made modules that are still being used - Talamortis

data/sql/updates/pending_db_world/rev_1735425042597130000.sql

sudlud · 2024-12-30T19:16:41Z

data/sql/updates/pending_db_world/rev_1735425042597130000.sql

@@ -0,0 +1,2 @@
+-- Remove HARD_RESET flag while retaining IMMUNITY_KNOCKBACK
+UPDATE `creature_template` SET `flags_extra` = `flags_extra` | 1073741824 WHERE `entry` = 36658;


Now with your comment added I think that the sql query currently is not doing what you intended to do.
Right now it's only setting the knockback flag (which was probably already set before?)

But you wanted to remove another flag instead - so please update this to actually remove that other flag.

https://www.azerothcore.org/wiki/bit-and-bytes-tutorial

https://www.azerothcore.org/flag-checker/

Sorry about that, changed to newer syntax forgetting bitwise operation

Nyeriah · 2024-12-30T19:29:46Z

data/sql/updates/pending_db_world/rev_1735425042597130000.sql

@@ -0,0 +1,2 @@
+-- Remove HARD_RESET flag while retaining IMMUNITY_KNOCKBACK
+UPDATE `creature_template` SET `flags_extra` = `flags_extra` &~ (2147483648) WHERE `entry` = 36658;


He should despawn on evade, so this is wrong

It's definitely a hack on the current hack that exists, but seems to at least fix (at the moment) the boss not "reseting" if players die at him. Think the logic is that because line 100 pInstance->SetData(DATA_TYRANNUS, NOT_STARTED); in reset() sets to not even started (soft reset ish?); the HARD_RESET must not happen. Perhaps you have more thoughts @Talamorts1

He should despawn on evade, so this is wrong

where is your evidence of this? this Flag was applied in a previous "Fix",

if this is the case then you need rework your instance script to spawn npc if event is not done and creature is not in instance.

Nyeriah · 2024-12-30T21:09:40Z

I will be addressing the respawn issue in another PR.

Talamorts1 · 2024-12-30T21:21:25Z

Testing another fix now. Ill keep you updated.

Nyeriah · 2024-12-30T21:22:18Z

@Talamorts1 As I said, I am already working on this

TheSCREWEDSoftware · 2024-12-30T21:27:08Z

Thanks @blinkysc for submitting this PR.

@Talamorts1 as mentioned by Nyeriah they would be addressing the issue so there's no need in over-laping work. If you think there other issues that you could resolve be free to submit a PR. But the issue mentions someone fixing it, ask them first if they are still working on it, otherwise is wasting everyone's time :)

Nyeriah · 2024-12-30T21:31:28Z

Tyrannus isn't a permanent spawn. So that would never work

TheSCREWEDSoftware · 2024-12-30T21:31:57Z

I've marked your comment as off-topic @Talamorts1 if you want someone to test your fixes or you have fixes open your own PR.

Talamorts1 · 2024-12-30T21:32:57Z

na im good, this is why i stopped helping in the first place peace out ^.^

Fix Scourgelord Tyrannus

0d1941b

github-actions bot added DB related to the SQL database Script file-cpp Used to trigger the matrix build labels Dec 28, 2024

Fix syntax issue

46aadd7

Talamorts1 approved these changes Dec 29, 2024

View reviewed changes

TheSCREWEDSoftware requested changes Dec 29, 2024

View reviewed changes

Fix SQL Syntax

54a887a

TheSCREWEDSoftware reviewed Dec 29, 2024

View reviewed changes

TheSCREWEDSoftware added the Ready to be Reviewed label Dec 29, 2024

TheSCREWEDSoftware approved these changes Dec 29, 2024

View reviewed changes

sudlud reviewed Dec 30, 2024

View reviewed changes

data/sql/updates/pending_db_world/rev_1735425042597130000.sql Outdated Show resolved Hide resolved

blinkysc added 2 commits December 30, 2024 05:57

Add comments to SQL

b7346fe

Missing E

98e79fe

sudlud reviewed Dec 30, 2024

View reviewed changes

Fix bitwise operation removing CREATURE_FLAG_EXTRA_HARD_RESET

51d8437

Nyeriah reviewed Dec 30, 2024

View reviewed changes

remove sql in order to merge pr

dca4c85

Nyeriah changed the title ~~fix(DB/Scripts) Scourgelord Tyrannus~~ fix(DB/Scripts) Reset Scourgelord Tyrannus encounter state Dec 30, 2024

Nyeriah changed the title ~~fix(DB/Scripts) Reset Scourgelord Tyrannus encounter state~~ fix(DB/Scripts): Reset Scourgelord Tyrannus encounter state Dec 30, 2024

github-actions bot removed the DB related to the SQL database label Dec 30, 2024

Nyeriah merged commit 4e49f52 into azerothcore:master Dec 30, 2024
12 checks passed

This comment was marked as off-topic.

Sign in to view

azerothcore locked as resolved and limited conversation to collaborators Dec 30, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(DB/Scripts): Reset Scourgelord Tyrannus encounter state #21057

fix(DB/Scripts): Reset Scourgelord Tyrannus encounter state #21057

blinkysc commented Dec 28, 2024 •

edited by TheSCREWEDSoftware

Loading

Talamorts1 commented Dec 28, 2024 •

edited

Loading

TheSCREWEDSoftware left a comment

TheSCREWEDSoftware left a comment

Talamorts1 commented Dec 29, 2024

sudlud Dec 30, 2024

blinkysc Dec 30, 2024

Nyeriah Dec 30, 2024

blinkysc Dec 30, 2024 •

edited

Loading

Talamorts1 Dec 30, 2024

Nyeriah commented Dec 30, 2024

Talamorts1 commented Dec 30, 2024

Nyeriah commented Dec 30, 2024

TheSCREWEDSoftware commented Dec 30, 2024

This comment was marked as off-topic.

Nyeriah commented Dec 30, 2024

TheSCREWEDSoftware commented Dec 30, 2024

Talamorts1 commented Dec 30, 2024

		@@ -0,0 +1,2 @@
		-- Remove HARD_RESET flag while retaining IMMUNITY_KNOCKBACK
		UPDATE `creature_template` SET `flags_extra` = `flags_extra` \| 1073741824 WHERE `entry` = 36658;

fix(DB/Scripts): Reset Scourgelord Tyrannus encounter state #21057

fix(DB/Scripts): Reset Scourgelord Tyrannus encounter state #21057

Conversation

blinkysc commented Dec 28, 2024 • edited by TheSCREWEDSoftware Loading

Changes Proposed:

Issues Addressed:

SOURCE:

Tests Performed:

How to Test the Changes:

Known Issues and TODO List:

How to Test AzerothCore PRs

Talamorts1 commented Dec 28, 2024 • edited Loading

TheSCREWEDSoftware left a comment

Choose a reason for hiding this comment

TheSCREWEDSoftware left a comment

Choose a reason for hiding this comment

Talamorts1 commented Dec 29, 2024

sudlud Dec 30, 2024

Choose a reason for hiding this comment

blinkysc Dec 30, 2024

Choose a reason for hiding this comment

Nyeriah Dec 30, 2024

Choose a reason for hiding this comment

blinkysc Dec 30, 2024 • edited Loading

Choose a reason for hiding this comment

Talamorts1 Dec 30, 2024

Choose a reason for hiding this comment

Nyeriah commented Dec 30, 2024

Talamorts1 commented Dec 30, 2024

Nyeriah commented Dec 30, 2024

TheSCREWEDSoftware commented Dec 30, 2024

This comment was marked as off-topic.

Nyeriah commented Dec 30, 2024

TheSCREWEDSoftware commented Dec 30, 2024

Talamorts1 commented Dec 30, 2024

blinkysc commented Dec 28, 2024 •

edited by TheSCREWEDSoftware

Loading

Talamorts1 commented Dec 28, 2024 •

edited

Loading

blinkysc Dec 30, 2024 •

edited

Loading