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

feat(Core/WorldState): implement Battle for Sun's Reach Event #21219

Merged
merged 37 commits into from
Jan 31, 2025
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
207e1c6
cherry-pick Implement Suns Reach Reclamation event and phasing
sogladev Jan 19, 2025
25d26f0
fix build, commands, add data
sogladev Jan 19, 2025
099db64
remove pending sunwell gates data
sogladev Jan 21, 2025
5f89054
refactor: remove initial worldstate helper functions
sogladev Jan 21, 2025
aa5a839
add status command, refactor commands
sogladev Jan 21, 2025
ed3b57c
config: Add Sunsreach.CounterMax option
sogladev Jan 21, 2025
c5e85a1
fix: Load sWorldState on startup
sogladev Jan 21, 2025
74e58fb
fix: Set world_event to internal to prevent GameEventMgr from disabling
sogladev Jan 21, 2025
53303ef
fix: gossip_menu depends on phase, vendors unavaiable until subphase …
sogladev Jan 22, 2025
7cb0226
add banners to phases
sogladev Jan 22, 2025
688204e
fix: Shattered Sun Marksman and Warrior conditional transform auras
sogladev Jan 22, 2025
b25d4b0
add Demonic Crystals
sogladev Jan 23, 2025
2435131
refactor: Alchemy Lab @guid
sogladev Jan 23, 2025
88ae2f8
wip: add portal subphase shattrath spawns
sogladev Jan 23, 2025
5da3ad0
add missing enemies, refactor guids to cguids if needed
sogladev Jan 23, 2025
ca46d5e
refactor
sogladev Jan 23, 2025
6e533e3
add shattrath portal subphase RP
sogladev Jan 23, 2025
a0bc662
re-add sunwell gates data
sogladev Jan 23, 2025
b916748
add Sunwell Plateau gate opening handling
sogladev Jan 23, 2025
8d8a011
refactor: formatting
sogladev Jan 24, 2025
740051c
fix: sentry spawns
sogladev Jan 24, 2025
0d837f1
fix: remove waypoint movement Armory Irespeakers
sogladev Jan 24, 2025
3514ebd
fix: addd Shattered Sun Warrior patrol armory->mgt to p3
sogladev Jan 24, 2025
8a29c22
fix: remove duplicate spawns, add Abyssal wp
sogladev Jan 24, 2025
0c07d54
fix: cleanup demons behind armory
sogladev Jan 24, 2025
dedc15b
fix: equipment of new spawns, smartAI equip dawnblade marksman
sogladev Jan 24, 2025
03f7f17
fix: Marksman auras on bridge
sogladev Jan 24, 2025
53416e5
fix: despawn a Dawnblade marksman in p4
sogladev Jan 24, 2025
704a94a
fix: close sunwell gates
sogladev Jan 24, 2025
fba3e00
fix: formatting, command set gate phase
sogladev Jan 24, 2025
b6f692e
refactor: bypass sql codestyle ci
sogladev Jan 24, 2025
61a4035
set default final stages of Isle and Sunwell Gate progression
sogladev Jan 24, 2025
0e82138
fixup! refactor: bypass sql codestyle ci
sogladev Jan 24, 2025
d8db239
Merge branch 'master' into feat(Core/World)SunsReach
Rorschach91 Jan 30, 2025
ead5bcc
Revert "refactor: bypass sql codestyle ci
sogladev Jan 31, 2025
1e4b87e
Merge branch 'master' into feat(Core/World)SunsReach
sogladev Jan 31, 2025
dc1e7f3
fix: spawn multiple gates
sogladev Jan 31, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor: Alchemy Lab @Guid
  • Loading branch information
sogladev committed Jan 24, 2025
commit 24351312d411fea1033115bd9f44751eb266753c
13 changes: 7 additions & 6 deletions data/sql/updates/pending_db_world/rev_1737318437190767069.sql
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ SET @guidjc = 94386;
SET @guidalch = 94378;
-- Demonic Crystals
SET @guidcrystals:=5300500;
-- Alchemy lab
SET @guidalch=5300290;

DELETE FROM `game_event` WHERE `eventEntry` IN (@sunsreachpone, @sunsreachptwoonly, @sunsreachptwoperm, @sunsreachnoportal, @sunsreachportal, @sunsreachpthreeonly, @sunsreachpthreeperm, @sunsreachnoanvil, @sunsreachanvil, @sunsreachpfour, @sunsreachnomonument, @sunsreachmonument, @sunsreachnolab, @sunsreachlab, @sunsreachkiru);
INSERT INTO `game_event` (`eventEntry`, `start_time`, `end_time`, `occurence`, `length`, `holiday`, `holidayStage`, `description`, `world_event`, `announce`) VALUES
Expand Down Expand Up @@ -338,7 +340,7 @@ INSERT INTO `game_event_gameobject` (`guid`, `eventEntry`) VALUES
-- Monument
(50446, @sunsreachmonument), -- 187116, Monument to the Fallen - Sunwell Plateau
(27862, @sunsreachmonument), -- 187116, Monument to the Fallen - Isle of Quel'Danas
(5300290, @sunsreachlab), -- 187115, Alchemy Lab
(@guidalch, @sunsreachlab), -- 187115, Alchemy Lab
-- Crystals
(@guidcrystals+0, -@sunsreachpthreeperm), -- 187120, Demonic Crystal
(@guidcrystals+1, -@sunsreachpthreeperm), -- 187120, Demonic Crystal
Expand Down Expand Up @@ -544,11 +546,6 @@ DELETE FROM `gossip_menu` WHERE (`MenuID` = 9050) AND (`TextID` IN (12238));
INSERT INTO `gossip_menu` (`MenuID`, `TextID`) VALUES
(9050, 12238);

-- Alchemy Lab
DELETE FROM `gameobject` WHERE (`id` = 187115) AND (`guid` IN (5300290));
INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`) VALUES
(5300290, 187115, 530, 4080, 4087, 1, 1, 12845.603516, -7011.98584, 18.592701, 5.543178, 0, 0, 0, 0, 0, 0, 0, '', 0);

-- Monument
DELETE FROM `gossip_menu` WHERE (`MenuID` = 9115) AND (`TextID` IN (12322));
INSERT INTO `gossip_menu` (`MenuID`, `TextID`) VALUES
Expand Down Expand Up @@ -800,6 +797,10 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry
(22, 4, 25115, 0, 0, 12, 1, @sunsreachanvil, 0, 0, 0, 0, 0, '', 'if the event ''Sun''s Reach Reclamation Phase Anvil'' is active');

-- Gameobjects
-- Alchemy Lab
DELETE FROM `gameobject` WHERE (`id` = 187115) AND (`guid` IN (@guidalch));
INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`) VALUES
(@guidalch, 187115, 530, 4080, 4087, 1, 1, 12845.603516, -7011.98584, 18.592701, 5.543178, 0, 0, 0, 0, 0, 0, 0, '', 0);
-- Demonic Crystals
DELETE FROM `gameobject` WHERE `id` = 187120 AND `guid` BETWEEN @guidcrystals AND @guidcrystals+4;
INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `VerifiedBuild`, `Comment`) VALUES
Expand Down