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 87 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
7968d55
Ashbringer event timers and coordinates use sniffing data
fangshun2004 Oct 22, 2023
094d85b
Add data in SQL
fangshun2004 Oct 22, 2023
a18d496
The time to remove the sniff
fangshun2004 Oct 22, 2023
15f8809
Add a trigger
fangshun2004 Oct 22, 2023
e2160cf
Just trigger the event with ABE_ffect_000 spell
fangshun2004 Oct 22, 2023
e6de517
Add comments
fangshun2004 Oct 22, 2023
97de19a
Remove extra spaces
fangshun2004 Oct 22, 2023
bd18df4
Data already existing in world db is not re-added
fangshun2004 Oct 22, 2023
b173f47
Remove spaces
fangshun2004 Oct 22, 2023
560926e
emove spaces
fangshun2004 Oct 22, 2023
753a3e8
Delete empty rows
fangshun2004 Oct 22, 2023
3690ab3
Narrow down the bio search, because even 4,000 yards doesn't make the…
fangshun2004 Oct 27, 2023
5d6eb2e
Instead, use OnTrigger to contact the event
fangshun2004 Nov 4, 2023
e302dd3
Change the code as required by the audit
fangshun2004 Nov 8, 2023
a25aa07
Add a judgment
fangshun2004 Nov 8, 2023
db91d74
Delete unused enums
fangshun2004 Nov 8, 2023
de74d6a
Remove emoticons in sql, use emoticons in cpp and sniff time
fangshun2004 Nov 8, 2023
700f1fb
Fixed the wrong use of emotes
fangshun2004 Nov 8, 2023
7053b78
Adjust the time of sniffing The modification may be the time of the s…
fangshun2004 Nov 9, 2023
7a763a7
Remove spaces
fangshun2004 Nov 9, 2023
a565a10
Modify as required
fangshun2004 Nov 13, 2023
39cb68d
Merge branch 'master' of github.com:fangshun2004/azerothcore-wotlk in…
fangshun2004 Jan 1, 2024
ef8aa78
Merge branch 'azerothcore:master' into Scarlet_Monastery_improvement
fangshun2004 Jan 2, 2024
b996ea1
Reworked the battle between Mograine and Whitemane
fangshun2004 Jan 2, 2024
5fc8085
Remove some comments
fangshun2004 Jan 2, 2024
1824ac5
Delete blank lines
fangshun2004 Jan 3, 2024
db61caa
Remove spaces
fangshun2004 Jan 3, 2024
d4b14d9
Add header files
fangshun2004 Jan 3, 2024
be45787
Comment out unused parameters
fangshun2004 Jan 3, 2024
ca5537d
Add spaces
fangshun2004 Jan 6, 2024
c8cc0aa
Remove spaces
fangshun2004 Jan 6, 2024
016f0e1
Remove spaces
fangshun2004 Jan 6, 2024
3f8997b
Code modifications
fangshun2004 Jan 6, 2024
a0b90fd
Modify time
fangshun2004 Jan 6, 2024
be9d5cb
Modify DOMINATE_MIND chances
fangshun2004 Jan 6, 2024
45e1360
Modify the code location
fangshun2004 Jan 6, 2024
d114437
Modify the comment
fangshun2004 Jan 6, 2024
50bb106
Code formatting
fangshun2004 Jan 7, 2024
8eeca47
Merge branch 'azerothcore:master' into Scarlet_Monastery_improvement
fangshun2004 Jan 7, 2024
2240326
Merge branch 'azerothcore:master' into Scarlet_Monastery_improvement
fangshun2004 Jan 7, 2024
2778851
Modify the code
fangshun2004 Jan 7, 2024
77bbd72
Modify the code
fangshun2004 Jan 7, 2024
ffd693a
Code tweaks
fangshun2004 Jan 8, 2024
fc2c7f7
Change the name of a private member variable
fangshun2004 Jan 9, 2024
d124b19
Code style adjustments
fangshun2004 Jan 13, 2024
9ce7289
Delete unused header files
fangshun2004 Jan 13, 2024
a960898
Merge branch 'azerothcore:master' into Scarlet_Monastery_improvement
fangshun2004 Jan 13, 2024
9216f22
Fixed an issue where some events would not run.
fangshun2004 Jan 13, 2024
37c6a4b
1.Moves the expression to the database
fangshun2004 Feb 1, 2024
7aa8049
Modify the sniffing time
fangshun2004 Feb 4, 2024
e4a9320
Delete data that is not in the sniff data
fangshun2004 Feb 4, 2024
03007ff
Fixed the buff of the "Ember Bringer" item causing NPCs to enter battle
fangshun2004 Feb 8, 2024
b02a664
Modify the TextRange
fangshun2004 Feb 14, 2024
979f6bf
Merge branch 'azerothcore:master' into Scarlet_Monastery_improvement
fangshun2004 Mar 11, 2024
454a720
Merge branch 'Scarlet_Monastery_improvement' of github.com:fangshun20…
fangshun2004 Mar 24, 2024
5052d18
Merge branch 'master' of github.com:fangshun2004/azerothcore-wotlk in…
fangshun2004 Mar 24, 2024
ab871e2
Delete spaces
fangshun2004 Mar 24, 2024
b8ba3ce
Merge branch 'azerothcore:master' into Scarlet_Monastery_improvement
fangshun2004 Apr 4, 2024
09b4f5b
Merge branch 'azerothcore:master' into Scarlet_Monastery_improvement
fangshun2004 Apr 6, 2024
9f1a1d0
Merge branch 'azerothcore:master' into Scarlet_Monastery_improvement
fangshun2004 Apr 21, 2024
8f8ff13
Merge branch 'master' into Scarlet_Monastery_improvement
fangshun2004 May 17, 2024
a76c7a8
Merge branch 'master' of github.com:fangshun2004/azerothcore-wotlk in…
fangshun2004 Jun 23, 2024
32205b7
Merge branch 'azerothcore:master' into Scarlet_Monastery_improvement
fangshun2004 Sep 2, 2024
6f58463
Code style
fangshun2004 Sep 2, 2024
13516f8
Merge branch 'master' of github.com:fangshun2004/azerothcore-wotlk in…
fangshun2004 Sep 27, 2024
49253b3
Merge branch 'Scarlet_Monastery_improvement' of github.com:fangshun20…
fangshun2004 Sep 28, 2024
cd012d6
Merge branch 'azerothcore:master' into Scarlet_Monastery_improvement
fangshun2004 Nov 21, 2024
9230bdd
Delete the C++ script code.
fangshun2004 Nov 24, 2024
3b936ab
Mograine, Whitemane, Fairbanks, and Ashbringer Conversation Events mo…
fangshun2004 Nov 24, 2024
a8418d1
Merge branch 'master' of github.com:fangshun2004/azerothcore-wotlk in…
fangshun2004 Dec 7, 2024
d4855a5
Move C++ scripts to Smart AI
fangshun2004 Dec 7, 2024
4ec41cc
Merge branch 'master' of github.com:fangshun2004/azerothcore-wotlk in…
fangshun2004 Dec 7, 2024
7e8d006
Modify the code style
fangshun2004 Dec 7, 2024
44af575
Remove spaces
fangshun2004 Dec 7, 2024
08643b3
Merge branch 'master' into Scarlet_Monastery_improvement
Kitzunu Dec 22, 2024
f16f79e
Revised to Lowercase
fangshun2004 Dec 22, 2024
11962e1
Delete some header files
fangshun2004 Dec 22, 2024
0a9df0d
Delete some header files
fangshun2004 Dec 24, 2024
60e0627
quash
fangshun2004 Dec 24, 2024
39e698c
fix
fangshun2004 Dec 24, 2024
4f59cf7
fix error
fangshun2004 Dec 24, 2024
b2567a3
Merge branch 'master' into Scarlet_Monastery_improvement
fangshun2004 Dec 24, 2024
b2f77d2
code style
fangshun2004 Dec 24, 2024
4187ae4
Merge branch 'Scarlet_Monastery_improvement' of github.com:fangshun20…
fangshun2004 Dec 24, 2024
ad60ab5
edit
fangshun2004 Jan 1, 2025
b216660
fix error
fangshun2004 Jan 1, 2025
69b4f0e
Update rev_1697941424465768700.sql
fangshun2004 Jan 1, 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
65 changes: 65 additions & 0 deletions data/sql/updates/pending_db_world/rev_1697941424465768700.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
-- 28282 is buff
DELETE
FROM `spell_custom_attr`
WHERE `spell_id` = 28282;
INSERT INTO `spell_custom_attr` (`spell_id`, `attributes`) VALUES (28282, 67108864);

-- It takes time to open the door with a key in Blizzard servers
UPDATE `gameobject_template_addon` SET `flags` = 34
sudlud marked this conversation as resolved.
Show resolved Hide resolved
WHERE (`entry` = 104591);


-- Add a trigger for Ashbringer events Fire once after approaching
DELETE
FROM `areatrigger_scripts`
WHERE `entry` = 4089;
INSERT INTO `areatrigger_scripts` (`entry`, `ScriptName`) VALUES
(4089, 'at_scarlet_monastery_cathedral_entrance');

-- Scarlet Commander Mograine say--
DELETE
FROM `creature_text`
WHERE `CreatureID`=3976;
INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
(3976, 0, 0, 'Infidels! They must be purified!', 14, 0, 100, 0, 0, 5835, 2847, 0, 'mograine SAY_MO_AGGRO'),
(3976, 1, 0, 'Unworthy.', 14, 0, 100, 0, 0, 5836, 6197, 0, 'mograine SAY_MO_KILL'),
(3976, 2, 0, 'At your side, milady!', 14, 0, 100, 0, 0, 5837, 18026, 0, 'mograine SAY_MO_RESSURECTED'),
(3976, 3, 0, 'You hold my father\'s blade, $n. My soldiers are yours TO control, my $g Lord:Lady;. Take them... LEAD them... The impure must be purged. They must be cleansed of their taint.', 12, 0, 100, 1, 0, 0, 12390, 0, 'mograine SAY_ASHBRINGER_ONE'),
(3976, 4, 0, 'Father... But... How?', 12, 0, 100, 6, 0, 0, 12470, 0, 'mograine SAY_ASHBRINGER_TWO'),
(3976, 5, 0, 'Forgive me, father! Please...', 12, 0, 100, 20, 0, 0, 12472, 0, 'mograine SAY_ASHBRINGER_THREE'),
(3976, 6, 0, 'Bow down! Kneel BEFORE the Ashbringer! A NEW dawn approaches, brothers AND sisters! Our message will be delivered TO the filth of this world through the chosen one!', 14, 0, 100, 0, 0, 0, 12389, 3, 'Ashbringer EVENT intro yell');

-- Highlord Mograine ---
-- Highlord Mograine say
DELETE FROM `creature_text` WHERE `CreatureID`=16062;
INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `Type`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
(16062, 0, 0, 'Renault...', 0, 100, 0, 0, 0, 12, 12469, 0, 'mograine MOGRAINE_ONE'),
(16062, 1, 0, 'Did you think that your betrayal would be forgotten? Lost in the carefully planned cover up of my death? Blood of my blood, the blade felt your cruelty long after my heart had stopped beating. And in death, I knew what you had done. But now, the chains of Kel\'thuzad hold me NO more. I come TO serve justice. I AM ASHBRINGER.', 0, 100, 0, 0, 0, 12, 12471, 0, 'mograine MOGRAINE_TWO'),
(16062, 2, 0, 'You are forgiven...', 0, 100, 0, 0, 0, 12, 12473, 0, 'mograine MOGRAINE_THREE');

-- Highlord Mograine smart_scripts---
UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 16062;
DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 16062);
INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
(16062, 0, 0, 0, 54, 0, 100, 0, 0, 0, 0, 0, 0, 0, 53, 0, 16062, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Highlord Mograine Transform - Just_Summoned - Start Waypoint (No Repeat)'),
(16062, 0, 1, 0, 40, 0, 100, 0, 12, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 19, 3976, 0, 0, 0, 0, 0, 0, 0, 'Highlord Mograine Transform - On Waypoint 5 Reached - Set Rooted On');



-- The coordinates of the movement sniffed
DELETE
FROM `waypoints`
WHERE `entry`=16062;
INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `point_comment`) VALUES
(16062, 1, 1033.4642, 1399.1022, 27.337427, NULL, 0, 'Ashbringer Event Move Points'),
(16062, 2, 1034.9252, 1399.0653, 27.393204, NULL, 0, 'Ashbringer Event Move Points'),
(16062, 3, 1036.3861, 1399.0284, 27.44898, NULL, 0, 'Ashbringer Event Move Points'),
(16062, 4, 1045.484, 1398.7991, 27.448977, NULL, 0, 'Ashbringer Event Move Points'),
(16062, 5, 1059.524, 1399.0273, 28.271557, NULL, 0, 'Ashbringer Event Move Points'),
(16062, 6, 1068.8096, 1399.2064, 30.7867, NULL, 0, 'Ashbringer Event Move Points'),
(16062, 7, 1086.6564, 1399.2048, 30.44898, NULL, 0, 'Ashbringer Event Move Points'),
(16062, 8, 1101.5681, 1399.3694, 30.485447, NULL, 0, 'Ashbringer Event Move Points'),
(16062, 9, 1116.6019, 1399.4752, 30.485447, NULL, 0, 'Ashbringer Event Move Points'),
(16062, 10, 1129.5881, 1399.2926, 30.524086, NULL, 0, 'Ashbringer Event Move Points'),
(16062, 11, 1149.4045, 1399.0231, 32.528877, NULL, 0, 'Ashbringer Event Move Points'),
(16062, 12, 1150.3911, 1398.723, 32.54613, NULL, 0, 'Ashbringer Event Move Points');
Loading