fix(Scripts/Zulaman) Multiple fixes to Jan'alai #21257

blinkysc · 2025-01-24T05:02:52Z

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 [Zul'Aman] Jan'alai's wrong behaviors when he start bombing #21125
Additionally changed Flame Breath to 1.5 seconds based on the video evidence
Created new SpawnBombs() so that bomb spread is more Blizzlike based on video evidence

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:

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 c id 23578
57 seconds before middle
wait 3 seconds before start throwing bombs for 5 seconds
Restart bombing 30 seconds
.die while throwing bombs to ensure full reset

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.

fix spacing

Remove commented spawbombs test

clang-format

clang-format round 2

Fix formatting

blinkysc · 2025-01-24T06:19:18Z

Honestly still not quite happy with SpawnBombs(). Was going for something like a circle spreading from the center and that area being the potential for random bomb with the max circle being the arena and max time the 5 seconds... Maybe I'll keep poking at it but does certainly look more blizzlike then before.

amed80 · 2025-01-24T06:56:53Z

Jan'alai still stay in the middle until the bombs explodes.
After throwing bombs ,he shouldn't wait for the bombs to explode, he should stop doing his animation and start attacking the target again.

blinkysc · 2025-01-24T13:35:33Z

Jan'alai still stay in the middle until the bombs explodes. After throwing bombs ,he shouldn't wait for the bombs to explode, he should stop doing his animation and start attacking the target again.

I see what you mean, I made another commit to make him start attacking 1s before boom

amed80 · 2025-01-24T16:13:01Z

I believe it should be 3s at least before the bombs explode (so L341 from 8s down to 6s?) but everything else seems to be working fine :)

blinkysc · 2025-01-24T20:03:31Z

I believe it should be 3s at least before the bombs explode (so L341 from 8s down to 6s?) but everything else seems to be working fine :)

Watched the youtubes again... Agreed, made the commit for da boom

amed80 · 2025-01-24T20:07:58Z

@blinkysc 21266 ?

blinkysc · 2025-01-24T20:10:54Z

@blinkysc 21266 ?

Im tired lol

sogladev · 2025-01-24T22:41:05Z

src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp

-
-        FireWall();
-        SpawnBombs();
+        me->AddUnitState(UNIT_STATE_NOT_MOVE);


This includes UNIT_STATE_DIED.

azerothcore-wotlk/src/server/game/Entities/Unit/UnitDefines.h

Line 218 in dcf097a

UNIT_STATE_NOT_MOVE = UNIT_STATE_ROOT | UNIT_STATE_STUNNED | UNIT_STATE_DIED | UNIT_STATE_DISTRACTED,

Also check if this is cleared in Reset as Reset() clears taskscheduler and the ClearUnitState may never run

I see these are similar instructions as flamebreathing above but me->AttackStop(); could be missing

Hmm yeah let me make sure, also probably better way to get him to stop moving. Let me check

Added the me->ClearUnitState(UNIT_STATE_NOT_MOVE); to Reset() and tested .die both without doing bombs and while in UNIT_STATE_NOT_MOVE. both seem to reset. Didn't test before adding the UNIT_STATE_NOT_MOVE to Reset() but assuming could be bug in future if I didn't.

Tried stuff like me->StopMoving() but for whatever reason those other methods just wouldn't work.

Why was this marked as resolved? This is a hack and won't be merged as is

Sorry, don't wan't to mess anything else up, I'll just close

Should be max threat not random

blinkysc · 2025-01-26T02:30:56Z

Ready for review

src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp

blinkysc added 4 commits January 23, 2025 19:09

Update boss_janalai.cpp

29507be

Update boss_janalai.cpp

a0f3e32

Update boss_janalai.cpp

bd1e42f

Update boss_janalai.cpp

6b4204f

blinkysc mentioned this pull request Jan 24, 2025

[Zul'Aman] Jan'alai's wrong behaviors when he start bombing #21125

Open

github-actions bot added Script file-cpp Used to trigger the matrix build labels Jan 24, 2025

blinkysc added 13 commits January 23, 2025 23:08

Update boss_janalai.cpp

d25d432

fix spacing

Update boss_janalai.cpp

069709c

Remove commented spawbombs test

Update boss_janalai.cpp

fb6b4db

clang-format

Update boss_janalai.cpp

ea0e719

clang-format round 2

Update boss_janalai.cpp

248d3a2

Fix formatting

Update boss_janalai.cpp

e812841

Update boss_janalai.cpp

306385b

Update boss_janalai.cpp

00bac08

Update boss_janalai.cpp

e0fc3d3

Update boss_janalai.cpp

b888ab3

Update boss_janalai.cpp

f90eba3

Update boss_janalai.cpp

70f28b2

Update boss_janalai.cpp

04a9fd9

Attack 1s before boom

6f3d140

Attack 3s before boom

935fbc2

blinkysc added 2 commits January 24, 2025 14:08

Update boss_janalai.cpp

a30b29c

Update boss_janalai.cpp

f24fd05

sogladev reviewed Jan 24, 2025

View reviewed changes

blinkysc added 2 commits January 24, 2025 17:23

Update boss_janalai.cpp

adf33a6

Should be max threat not random

Make sure UNIT_STATE_NOT_MOVE cleared on reset()

d42da41

sogladev added the Ready to be Reviewed label Jan 26, 2025

sudlud reviewed Feb 6, 2025

View reviewed changes

src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp Outdated Show resolved Hide resolved

src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp Show resolved Hide resolved

blinkysc added 3 commits February 6, 2025 07:43

East const flavor

2ce1686

Clean Random

d57ecdd

psuedo random more better

ac4bbc8

Kitzunu reviewed Feb 6, 2025

View reviewed changes

src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp Outdated Show resolved Hide resolved

Kitzunu reviewed Feb 6, 2025

View reviewed changes

src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp Outdated Show resolved Hide resolved

blinkysc added 3 commits February 7, 2025 18:06

Update boss_janalai.cpp

faf2ef4

constexpr

134f826

Merge branch 'master' into janalaiFix

83c7796

blinkysc closed this Feb 8, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(Scripts/Zulaman) Multiple fixes to Jan'alai #21257

fix(Scripts/Zulaman) Multiple fixes to Jan'alai #21257

blinkysc commented Jan 24, 2025 •

edited

Loading

blinkysc commented Jan 24, 2025

amed80 commented Jan 24, 2025

blinkysc commented Jan 24, 2025

amed80 commented Jan 24, 2025

blinkysc commented Jan 24, 2025

amed80 commented Jan 24, 2025

blinkysc commented Jan 24, 2025

sogladev Jan 24, 2025

blinkysc Jan 24, 2025

blinkysc Jan 24, 2025

blinkysc Jan 24, 2025

Nyeriah Feb 6, 2025

blinkysc Feb 8, 2025

blinkysc commented Jan 26, 2025

fix(Scripts/Zulaman) Multiple fixes to Jan'alai #21257

fix(Scripts/Zulaman) Multiple fixes to Jan'alai #21257

Conversation

blinkysc commented Jan 24, 2025 • edited Loading

Changes Proposed:

Issues Addressed:

SOURCE:

Tests Performed:

How to Test the Changes:

Known Issues and TODO List:

How to Test AzerothCore PRs

blinkysc commented Jan 24, 2025

amed80 commented Jan 24, 2025

blinkysc commented Jan 24, 2025

amed80 commented Jan 24, 2025

blinkysc commented Jan 24, 2025

amed80 commented Jan 24, 2025

blinkysc commented Jan 24, 2025

sogladev Jan 24, 2025

Choose a reason for hiding this comment

blinkysc Jan 24, 2025

Choose a reason for hiding this comment

blinkysc Jan 24, 2025

Choose a reason for hiding this comment

blinkysc Jan 24, 2025

Choose a reason for hiding this comment

Nyeriah Feb 6, 2025

Choose a reason for hiding this comment

blinkysc Feb 8, 2025

Choose a reason for hiding this comment

blinkysc commented Jan 26, 2025

blinkysc commented Jan 24, 2025 •

edited

Loading