fix(CORE/OPvP): Halaa Mechanics not working properly #15634

Valdifer · 2023-03-28T12:27:17Z

Halaa mechanics are not working like blizzlike

Closes #14355
Closes chromiecraft/chromiecraft#4642

Co-authored-by: Gultask
Author: Valdifer

Changes Proposed:

Rework of Halaa

Issues Addressed:

Closes Halaa mechanics not working properly #14355
Closes Halaa Issues chromiecraft/chromiecraft#4642
Closes Halaa Battle Token Range #15489
Closes Halaa Battle Token Range chromiecraft/chromiecraft#4760

SOURCE:

Tests Performed:

How to Test the Changes:

.tele halaa
capture it Horde/Alliance
change to opposite faction
try to capture it with guards alive
use roosts
throw a bomb to the guards
kill guards until none is alive
try capture it
kill a player in the area named Halaa to get a mark
kill a player in the area not named Halaa

Known Issues and TODO List:

Bombs leave a DOT to guards
Alliance Halaa guards shouldn't be ghost model id
Halaa message warning no guards
Halaa capturable only when there is 0 guards and max points by the Controller Team
All dead players can spawn in Halaa when it should be by the Controller Team (Happens only when server is restarted)
Guards patrolling waypoints
Flags players when interact with Roosts
~~Capture area has to be more small~~ (Not anymore due i don't remember how it was in Vanilla)
Halaa mark should be obtained in all Halaa Area

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.

Halaa mechanics are not working like blizzlike Closes azerothcore#14355 Closes chromiecraft/chromiecraft#4642 Co-authored-by: Gultask Author: Valdifer

src/server/game/Globals/ObjectMgr.cpp

src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp

Valdifer · 2023-04-14T14:34:42Z

Right now it is working without bugs and AIs are ok

Valdifer · 2023-04-17T18:52:05Z

Ok, i found the error of display ID:

What should be there? I suppose that should be 18254 but don't know, i'm going to check trinity and mangos DB

Kitzunu · 2023-04-17T19:00:23Z

That is sniffed
@Gultask u have any sniffs of it?

heyitsbench · 2023-04-17T19:13:20Z

Might be the parser or maybe an incomplete sniff, but here's what I could find in a 45854 packet:

(18254, 1, 1.5, 0, 0),
(18255, 1.20000004768371582, 1.80000007152557373, 0, 0),
(18256, 1, 1.5, 1, 0),
(18257, 1, 1.5, 1, 0),

Gultask · 2023-04-17T19:16:56Z

Cmangos has it at 0

Valdifer · 2023-04-17T19:19:41Z

OregonCore and TrinityCore has the same values as AC (As expected)

EDIT: Well, if we use that sniffed data, we don't get anymore the ghost guard

Valdifer · 2023-06-20T12:52:57Z

I need someone test it and tell me what need to change, it has been done since the last update

Nyeriah · 2023-12-03T22:17:42Z

#include CreatureScript.h

Valdifer · 2023-12-03T23:10:12Z

#include CreatureScript.h

I deleted because i thought it wasn't necessary :/, older version didn't had it, prolly something changed in an update, well adding it again and lets see

Update to select max GUID from creature

Valdifer · 2023-12-27T19:05:00Z

Anyone? D:

FrancescoBorzi · 2023-12-28T15:35:14Z

@azerothcore/developers please have a look at this

@Valdifer apologies for the delay and thanks for contributing

src/server/game/Globals/ObjectMgr.cpp

https://github.com/Valdifer/azerothcore-wotlk into fix-issue-HalaaOPvP

Valdifer · 2023-12-28T17:23:55Z

@azerothcore/developers please have a look at this

@Valdifer apologies for the delay and thanks for contributing

Thanks you guys for support me and teach me new things :), i will try to do my best, if something required a review tell me

elthehablo · 2023-12-29T09:51:06Z

Will test this this weekend

Kitzunu

I have made pretty generic reviews, and not pointed out every occurence of things. Go through the entire file and check for issues I mention in my review. Also check https://www.azerothcore.org/wiki/cpp-code-standards

It's way better than the first draft though.

data/sql/updates/pending_db_world/rev_1680005777631310400.sql

src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp

src/server/scripts/OutdoorPvP/OutdoorPvPNA.h

Changed to 40 GUID consecutive

Kitzunu · 2024-01-03T17:25:16Z

@elthehablo how testing going

elthehablo · 2024-01-03T19:46:21Z

Did some tests:

Message about Halaa being defenseless seems to work
Token is now also obtained outside

However:

Upon capturing guards remaining goes to 15/15, then immediately to 0/15 with the message Halaa being defenseless being thrown

~~This might be an issue from my side, I will check again to ensure I compiled correctly.~~ I don't think it is because the rest is working fine

This means I wasn't able to test the following yet:

DOT staying on guards
Halaa being capturable when guards are up

Valdifer · 2024-01-05T23:57:42Z

Did some tests:

Message about Halaa being defenseless seems to work

Token is now also obtained outside

However:

Upon capturing guards remaining goes to 15/15, then immediately to 0/15 with the message Halaa being defenseless being thrown

~~This might be an issue from my side, I will check again to ensure I compiled correctly.~~ I don't think it is because the rest is working fine

This means I wasn't able to test the following yet:

DOT staying on guards

Halaa being capturable when guards are up

For me its working:

But thanks to you i found an error when u interact with the roost :)

EDIT: Ok i took a look into the Roosts and the problem is when u have only 6 stacks of bomb (or 7 or 8)

you get a message You can't transport more of that item

As far i saw is related with PlayerStorage.cpp::CanStoreItem Line 1129

EDIT2: But before this was getting controlled by OPvPCapturePointNA::HandleCustomSpell

heyitsbench · 2024-01-06T00:12:02Z

src/server/game/Miscellaneous/Language.h

@@ -1239,6 +1239,7 @@ enum AcoreStrings
    LANG_OPVP_NA_CAPTURE_A              = 10026,
    LANG_OPVP_NA_LOSE_H                = 10027,
    LANG_OPVP_NA_LOSE_A                = 10028,
+    LANG_OPVP_NA_DEFENSELESS           = 10074,


Surely these aren't necessary? They do exist in broadcast_text.

stale

- follow-up to PR azerothcore#18170 to fix the remaining guid conflicts of PR azerothcore#15634

sudlud · 2024-01-19T14:16:54Z

This PR features pure delete-by-GUID sql statements that would usually never get merged, but it seems that the CI doesn't care.

Merging this PR as-is resulted in GUID conflicts from which half almost went unnoticed.

Can we please try not to repeat something like this - it just hurts to get the own work overwritten like this and then only partially fixed.

Kitzunu · 2024-01-19T14:44:10Z

CI can't catch that particular case. But with enough RegEx we could probably improve it.

sudlud · 2024-01-19T14:46:03Z

CI can't catch that particular case. But with enough RegEx we could probably improve it.

At least the CI would have failed if the DELETE-statements would have included the "AND ID IN (...)" condition as the GUIDs were already taken with other IDs, or would it still have passed

- follow-up to PR #18170 to fix the remaining guid conflicts of PR #15634

fix(CORE/OPvP): Halaa Mechanics not working properly

f12a0b9

Halaa mechanics are not working like blizzlike Closes azerothcore#14355 Closes chromiecraft/chromiecraft#4642 Co-authored-by: Gultask Author: Valdifer

yehonal-bot added CORE Related to the core DB related to the SQL database file-cpp Used to trigger the matrix build Script labels Mar 28, 2023

Valdifer mentioned this pull request Mar 28, 2023

fix(CORE/OPvP): Halaa Mechanics not working properly #14428

Closed

Kitzunu reviewed Mar 28, 2023

View reviewed changes

src/server/game/Globals/ObjectMgr.cpp Outdated Show resolved Hide resolved

Valdifer added 3 commits April 2, 2023 18:35

Update (Cleaned some Hardcode)

aec142f

Missing SQL Update

dcae86b

Clean code

e73ad68

Kitzunu reviewed Apr 2, 2023

View reviewed changes

src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp Outdated Show resolved Hide resolved

Valdifer added 2 commits April 3, 2023 02:41

Update to RegisterCreatureAI

3cb8135

Rollback and fix creatureAI

f945e95

Valdifer added 5 commits April 14, 2023 23:56

Brackets

aca467a

canRecap initialization order

17ac8f2

RespawnTimer

5c0ae9b

Message Halaa Defenseless

90533ab

Halaa Mark

a55ab4e

Valdifer added 2 commits April 18, 2023 12:16

Ghost guard fix, hide DB Wagons

2546b71

Revert change state, it wasn't showing horde icon

6eb91a5

Valdifer requested a review from Kitzunu June 20, 2023 12:53

Nyeriah added Ready to be Reviewed Waiting to be Tested labels Jun 27, 2023

Valdifer added 2 commits December 4, 2023 00:10

Update OutdoorPvPNA.cpp

1f4d79f

Update rev_1680005777631310400.sql

8073810

Update to select max GUID from creature

Nyeriah reviewed Dec 28, 2023

View reviewed changes

src/server/game/Globals/ObjectMgr.cpp Outdated Show resolved Hide resolved

Valdifer added 2 commits December 28, 2023 18:01

Move UpdateCreatureHalaa method to OutdoorPvPNA.cpp

b89bd4a

git statusMerge branch 'fix-issue-HalaaOPvP' of

bb5087a

https://github.com/Valdifer/azerothcore-wotlk into fix-issue-HalaaOPvP

Kitzunu previously requested changes Dec 29, 2023

View reviewed changes

Valdifer and others added 4 commits December 30, 2023 16:56

Update rev_1680005777631310400.sql

277545d

Changed to 40 GUID consecutive

Refactor code

a1db60f

Refactor Code

abfe4e2

Refactor OutdoorPVPNA

1c81db2

heyitsbench reviewed Jan 6, 2024

View reviewed changes

Nyeriah approved these changes Jan 14, 2024

View reviewed changes

Nyeriah merged commit 2c7c3b6 into azerothcore:master Jan 14, 2024
13 checks passed

sudlud added a commit to sudlud/azerothcore-wotlk that referenced this pull request Jan 19, 2024

fix(DB/Creature): fix additional guid conflicts

5856523

- follow-up to PR azerothcore#18170 to fix the remaining guid conflicts of PR azerothcore#15634

sudlud mentioned this pull request Jan 19, 2024

fix(DB/Creature): fix additional guid conflicts #18195

Merged

12 tasks

Nyeriah pushed a commit that referenced this pull request Jan 20, 2024

fix(DB/Creature): fix additional guid conflicts (#18195)

bf7c004

- follow-up to PR #18170 to fix the remaining guid conflicts of PR #15634

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(CORE/OPvP): Halaa Mechanics not working properly #15634

fix(CORE/OPvP): Halaa Mechanics not working properly #15634

Valdifer commented Mar 28, 2023 •

edited

Loading

Valdifer commented Apr 14, 2023 •

edited

Loading

Valdifer commented Apr 17, 2023 •

edited

Loading

Kitzunu commented Apr 17, 2023

heyitsbench commented Apr 17, 2023

Gultask commented Apr 17, 2023

Valdifer commented Apr 17, 2023 •

edited

Loading

Valdifer commented Jun 20, 2023

Nyeriah commented Dec 3, 2023

Valdifer commented Dec 3, 2023 •

edited

Loading

Valdifer commented Dec 27, 2023

FrancescoBorzi commented Dec 28, 2023

Valdifer commented Dec 28, 2023

elthehablo commented Dec 29, 2023

Kitzunu left a comment

Kitzunu commented Jan 3, 2024

elthehablo commented Jan 3, 2024 •

edited

Loading

Valdifer commented Jan 5, 2024 •

edited

Loading

heyitsbench Jan 6, 2024

sudlud commented Jan 19, 2024

Kitzunu commented Jan 19, 2024

sudlud commented Jan 19, 2024 •

edited

Loading

fix(CORE/OPvP): Halaa Mechanics not working properly #15634

fix(CORE/OPvP): Halaa Mechanics not working properly #15634

Conversation

Valdifer commented Mar 28, 2023 • edited Loading

Changes Proposed:

Issues Addressed:

SOURCE:

Tests Performed:

How to Test the Changes:

Known Issues and TODO List:

How to Test AzerothCore PRs

Valdifer commented Apr 14, 2023 • edited Loading

Valdifer commented Apr 17, 2023 • edited Loading

Kitzunu commented Apr 17, 2023

heyitsbench commented Apr 17, 2023

Gultask commented Apr 17, 2023

Valdifer commented Apr 17, 2023 • edited Loading

Valdifer commented Jun 20, 2023

Nyeriah commented Dec 3, 2023

Valdifer commented Dec 3, 2023 • edited Loading

Valdifer commented Dec 27, 2023

FrancescoBorzi commented Dec 28, 2023

Valdifer commented Dec 28, 2023

elthehablo commented Dec 29, 2023

Kitzunu left a comment

Choose a reason for hiding this comment

Kitzunu commented Jan 3, 2024

elthehablo commented Jan 3, 2024 • edited Loading

Valdifer commented Jan 5, 2024 • edited Loading

heyitsbench Jan 6, 2024

Choose a reason for hiding this comment

sudlud commented Jan 19, 2024

Kitzunu commented Jan 19, 2024

sudlud commented Jan 19, 2024 • edited Loading

Valdifer commented Mar 28, 2023 •

edited

Loading

Valdifer commented Apr 14, 2023 •

edited

Loading

Valdifer commented Apr 17, 2023 •

edited

Loading

Valdifer commented Apr 17, 2023 •

edited

Loading

Valdifer commented Dec 3, 2023 •

edited

Loading

elthehablo commented Jan 3, 2024 •

edited

Loading

Valdifer commented Jan 5, 2024 •

edited

Loading

sudlud commented Jan 19, 2024 •

edited

Loading