Skip to content

Commit

Permalink
Merge pull request #53 from vmangos/development
Browse files Browse the repository at this point in the history
20231225
  • Loading branch information
mygithome002 authored Dec 26, 2023
2 parents d38df87 + 6eb7e54 commit 3c422b9
Show file tree
Hide file tree
Showing 65 changed files with 5,953 additions and 588 deletions.
28 changes: 28 additions & 0 deletions sql/migrations/20231126103923_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
DROP PROCEDURE IF EXISTS add_migration;
delimiter ??
CREATE PROCEDURE `add_migration`()
BEGIN
DECLARE v INT DEFAULT 1;
SET v = (SELECT COUNT(*) FROM `migrations` WHERE `id`='20231126103923');
IF v=0 THEN
INSERT INTO `migrations` VALUES ('20231126103923');
-- Add your query below.

-- Concussion; 16106 already set to 5464
UPDATE `spell_affect` SET `build_min`='5464' WHERE `entry` IN (16035, 16105, 16107, 16108) AND `effectId`=0;

-- Convection
UPDATE `spell_affect` SET `build_min`='5464' WHERE `entry` IN (16039, 16109, 16110, 16111, 16112) AND `effectId`=0;

-- Healing Focus/Improved Lesser Healing Wave
UPDATE `spell_affect` SET `build_min`='5464' WHERE `entry` IN (16181, 16230, 16232, 16233, 16234) AND `effectId`=0;

-- Restorative Totems/Improved Mana Spring Totem
UPDATE `spell_affect` SET `build_min`='5464' WHERE `entry` IN (16187, 16205, 16206, 16207, 16208) AND `effectId`=0;

-- End of migration.
END IF;
END??
delimiter ;
CALL add_migration();
DROP PROCEDURE IF EXISTS add_migration;
49 changes: 49 additions & 0 deletions sql/migrations/20231126224918_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
DROP PROCEDURE IF EXISTS add_migration;
delimiter ??
CREATE PROCEDURE `add_migration`()
BEGIN
DECLARE v INT DEFAULT 1;
SET v = (SELECT COUNT(*) FROM `migrations` WHERE `id`='20231126224918');
IF v=0 THEN
INSERT INTO `migrations` VALUES ('20231126224918');
-- Add your query below.


-- Pathing for Harb Foulmountain Entry: 14426
SET @NPC := 21564;
UPDATE `creature` SET `wander_distance`=0,`movement_type`=2,`position_x`=-4929.023,`position_y`=-2066.4766,`position_z`=85.52668 WHERE `guid`=@NPC;
DELETE FROM `creature_movement` WHERE `id`=@NPC;
INSERT INTO `creature_movement` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`waittime`,`wander_distance`,`script_id`) VALUES
(@NPC,1,-4929.023,-2066.4766,85.52668,100,0,0,0),
(@NPC,2,-4905.3555,-2069.9805,84.25914,100,0,0,0),
(@NPC,3,-4899.6943,-2061.0269,83.636856,100,0,0,0),
(@NPC,4,-4891.1626,-2039.651,83.30705,100,0,0,0),
(@NPC,5,-4881.945,-2017.6359,86.298546,100,0,0,0),
(@NPC,6,-4873.128,-1993.7965,91.65875,100,0,0,0),
(@NPC,7,-4878.21,-1974.4436,92.018616,100,0,0,0),
(@NPC,8,-4873.579,-1956.8225,90.450455,100,0,0,0),
(@NPC,9,-4862.9395,-1946.7357,86.90235,100,0,0,0),
(@NPC,10,-4834.9155,-1923.0642,84.13316,100,0,0,0),
(@NPC,11,-4801.48,-1895.6833,89.333145,100,0,0,0),
(@NPC,12,-4776.8984,-1881.0486,90.39604,100,0,0,0),
(@NPC,13,-4751.4434,-1865.2213,88.92392,100,0,0,0),
(@NPC,14,-4776.8984,-1881.0486,90.39604,100,0,0,0),
(@NPC,15,-4801.48,-1895.6833,89.333145,100,0,0,0),
(@NPC,16,-4834.9155,-1923.0642,84.13316,100,0,0,0),
(@NPC,17,-4862.9395,-1946.7357,86.90235,100,0,0,0),
(@NPC,18,-4873.579,-1956.8225,90.450455,100,0,0,0),
(@NPC,19,-4878.21,-1974.4436,92.018616,100,0,0,0),
(@NPC,20,-4873.128,-1993.7965,91.65875,100,0,0,0),
(@NPC,21,-4881.914,-2017.5612,86.331604,100,0,0,0),
(@NPC,22,-4891.1626,-2039.651,83.30705,100,0,0,0),
(@NPC,23,-4899.6943,-2061.0269,83.636856,100,0,0,0),
(@NPC,24,-4905.3555,-2069.9805,84.25914,100,0,0,0);
-- .go xyz -4929.023 -2066.4766 85.52668


-- End of migration.
END IF;
END??
delimiter ;
CALL add_migration();
DROP PROCEDURE IF EXISTS add_migration;
93 changes: 93 additions & 0 deletions sql/migrations/20231126234028_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
DROP PROCEDURE IF EXISTS add_migration;
delimiter ??
CREATE PROCEDURE `add_migration`()
BEGIN
DECLARE v INT DEFAULT 1;
SET v = (SELECT COUNT(*) FROM `migrations` WHERE `id`='20231126234028');
IF v=0 THEN
INSERT INTO `migrations` VALUES ('20231126234028');
-- Add your query below.


-- Pathing for Siege Golem Entry: 2749
SET @NPC := 69115;
UPDATE `creature` SET `wander_distance`=0,`movement_type`=2,`position_x`=-6547.9683,`position_y`=-3114.9539,`position_z`=264.9055 WHERE `guid`=@NPC;
DELETE FROM `creature_movement` WHERE `id`=@NPC;
INSERT INTO `creature_movement` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`waittime`,`wander_distance`,`script_id`) VALUES
(@NPC,1,-6547.9683,-3114.9539,264.9055,100,0,0,0),
(@NPC,2,-6553.9746,-3080.9055,267.58408,100,0,0,0),
(@NPC,3,-6557.094,-3047.38,268.07318,100,0,0,0),
(@NPC,4,-6583.489,-3019.4617,267.2856,100,0,0,0),
(@NPC,5,-6595.54,-2988.4001,248.66078,100,0,0,0),
(@NPC,6,-6612.3384,-2975.3618,245.18498,100,0,0,0),
(@NPC,7,-6631.2095,-2949.6042,241.79167,100,0,0,0),
(@NPC,8,-6647.4727,-2939.6243,241.74365,100,0,0,0),
(@NPC,9,-6682.0034,-2913.2668,240.72977,100,0,0,0),
(@NPC,10,-6712.083,-2905.665,240.99365,100,0,0,0),
(@NPC,11,-6735.7236,-2891.606,240.99365,100,0,0,0),
(@NPC,12,-6760.9585,-2881.194,240.99365,100,0,0,0),
(@NPC,13,-6780.3325,-2876.3694,241.33063,100,0,0,0),
(@NPC,14,-6802.048,-2870.8613,242.0467,100,0,0,0),
(@NPC,15,-6830.3306,-2858.8135,241.77203,100,0,0,0),
(@NPC,16,-6849.8003,-2841.1125,241.91667,100,0,0,0),
(@NPC,17,-6858.149,-2813.8555,241.79167,100,0,0,0),
(@NPC,18,-6855.9204,-2785.7144,241.79167,100,0,0,0),
(@NPC,19,-6851.1675,-2752.9753,242.53874,100,0,0,0),
(@NPC,20,-6846.6313,-2713.5332,242.10515,100,0,0,0),
(@NPC,21,-6843.9126,-2672.0486,241.16257,100,0,0,0),
(@NPC,22,-6849.9062,-2641.5,240.86865,100,0,0,0),
(@NPC,23,-6856.145,-2608.6953,241.0625,100,0,0,0),
(@NPC,24,-6848.404,-2583.9202,241.05528,100,0,0,0),
(@NPC,25,-6860.871,-2559.1516,240.85477,100,0,0,0),
(@NPC,26,-6887.109,-2546.2512,240.86865,100,0,0,0),
(@NPC,27,-6917.7764,-2514.2366,240.86865,100,0,0,0),
(@NPC,28,-6941.0034,-2487.0896,240.86865,100,0,0,0),
(@NPC,29,-6953.5747,-2448.6816,241.74365,100,0,0,0),
(@NPC,30,-6953.0713,-2417.7148,243.04272,100,0,0,0),
(@NPC,31,-6952.0454,-2377.9636,242.18118,100,0,0,0),
(@NPC,32,-6946.1523,-2343.278,240.86865,100,0,0,0),
(@NPC,33,-6930.9873,-2308.3232,240.86865,100,0,0,0),
(@NPC,34,-6916.122,-2275.2998,240.86865,100,0,0,0),
(@NPC,35,-6911.809,-2249.564,241.74365,100,0,0,0),
(@NPC,36,-6916.122,-2275.2998,240.86865,100,0,0,0),
(@NPC,37,-6930.9873,-2308.3232,240.86865,100,0,0,0),
(@NPC,38,-6946.1523,-2343.278,240.86865,100,0,0,0),
(@NPC,39,-6952.0454,-2377.9636,242.18118,100,0,0,0),
(@NPC,40,-6953.0713,-2417.7148,243.04272,100,0,0,0),
(@NPC,41,-6953.5747,-2448.6816,241.74365,100,0,0,0),
(@NPC,42,-6941.0034,-2487.0896,240.86865,100,0,0,0),
(@NPC,43,-6917.7764,-2514.2366,240.86865,100,0,0,0),
(@NPC,44,-6887.109,-2546.2512,240.86865,100,0,0,0),
(@NPC,45,-6860.871,-2559.1516,240.85477,100,0,0,0),
(@NPC,46,-6848.404,-2583.9202,241.05528,100,0,0,0),
(@NPC,47,-6856.145,-2608.6953,241.0625,100,0,0,0),
(@NPC,48,-6849.9062,-2641.5,240.86865,100,0,0,0),
(@NPC,49,-6843.9126,-2672.0486,241.16257,100,0,0,0),
(@NPC,50,-6846.6313,-2713.5332,242.10515,100,0,0,0),
(@NPC,51,-6851.1675,-2752.9753,242.53874,100,0,0,0),
(@NPC,52,-6855.9204,-2785.7144,241.79167,100,0,0,0),
(@NPC,53,-6858.149,-2813.8555,241.79167,100,0,0,0),
(@NPC,54,-6849.8003,-2841.1125,241.91667,100,0,0,0),
(@NPC,55,-6830.3306,-2858.8135,241.77203,100,0,0,0),
(@NPC,56,-6802.048,-2870.8613,242.0467,100,0,0,0),
(@NPC,57,-6780.3325,-2876.3694,241.33063,100,0,0,0),
(@NPC,58,-6760.9585,-2881.194,240.99365,100,0,0,0),
(@NPC,59,-6735.7236,-2891.606,240.99365,100,0,0,0),
(@NPC,60,-6712.083,-2905.665,240.99365,100,0,0,0),
(@NPC,61,-6682.0034,-2913.2668,240.72977,100,0,0,0),
(@NPC,62,-6647.4727,-2939.6243,241.74365,100,0,0,0),
(@NPC,63,-6631.2095,-2949.6042,241.79167,100,0,0,0),
(@NPC,64,-6612.3384,-2975.3618,245.18498,100,0,0,0),
(@NPC,65,-6595.54,-2988.4001,248.66078,100,0,0,0),
(@NPC,66,-6583.489,-3019.4617,267.2856,100,0,0,0),
(@NPC,67,-6557.094,-3047.38,268.07318,100,0,0,0),
(@NPC,68,-6553.9746,-3080.9055,267.58408,100,0,0,0);
-- 0x204CB0000002AF4000001300003C2BB4 .go xyz -6547.9683 -3114.9539 264.9055


-- End of migration.
END IF;
END??
delimiter ;
CALL add_migration();
DROP PROCEDURE IF EXISTS add_migration;
42 changes: 42 additions & 0 deletions sql/migrations/20231126234757_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
DROP PROCEDURE IF EXISTS add_migration;
delimiter ??
CREATE PROCEDURE `add_migration`()
BEGIN
DECLARE v INT DEFAULT 1;
SET v = (SELECT COUNT(*) FROM `migrations` WHERE `id`='20231126234757');
IF v=0 THEN
INSERT INTO `migrations` VALUES ('20231126234757');
-- Add your query below.


-- Pathing for Witherheart the Stalker Entry: 8218
SET @NPC := 85478;
UPDATE `creature` SET `wander_distance`=0,`movement_type`=2,`position_x`=-399.90463,`position_y`=-2810.7239,`position_z`=78.00985 WHERE `guid`=@NPC;
DELETE FROM `creature_movement` WHERE `id`=@NPC;
INSERT INTO `creature_movement` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`waittime`,`wander_distance`,`script_id`) VALUES
(@NPC,1,-399.90463,-2810.7239,78.00985,100,0,0,0),
(@NPC,2,-411.23264,-2833.3965,79.34615,100,0,0,0),
(@NPC,3,-419.67285,-2866.848,81.6237,100,0,0,0),
(@NPC,4,-433.39053,-2891.0513,85.470924,100,0,0,0),
(@NPC,5,-440.9833,-2912.3506,88.50849,100,0,0,0),
(@NPC,6,-431.72278,-2919.4988,87.758095,100,0,0,0),
(@NPC,7,-410.9552,-2911.8176,80.65067,100,0,0,0),
(@NPC,8,-398.36133,-2915.043,79.20992,100,0,0,0),
(@NPC,9,-368.3346,-2925.7651,75.58492,100,0,0,0),
(@NPC,10,-333.24603,-2914.1536,77.88582,100,0,0,0),
(@NPC,11,-312.31683,-2894.8928,79.29725,100,0,0,0),
(@NPC,12,-316.2032,-2867.8672,80.33094,100,0,0,0),
(@NPC,13,-343.85233,-2834.53,75.73404,100,0,0,0),
(@NPC,14,-331.66537,-2820.3848,79.355644,100,0,0,0),
(@NPC,15,-345.9131,-2799.4731,80.685,100,0,0,0),
(@NPC,16,-368.80045,-2797.7434,76.87515,100,0,0,0),
(@NPC,17,-390.4299,-2788.0408,77.2648,100,0,0,0);
-- 0x204CB0000008068000000D00003DC2AA .go xyz -399.90463 -2810.7239 78.00985


-- End of migration.
END IF;
END??
delimiter ;
CALL add_migration();
DROP PROCEDURE IF EXISTS add_migration;
21 changes: 21 additions & 0 deletions sql/migrations/20231130171235_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
DROP PROCEDURE IF EXISTS add_migration;
delimiter ??
CREATE PROCEDURE `add_migration`()
BEGIN
DECLARE v INT DEFAULT 1;
SET v = (SELECT COUNT(*) FROM `migrations` WHERE `id`='20231130171235');
IF v=0 THEN
INSERT INTO `migrations` VALUES ('20231130171235');
-- Add your query below.


-- Fix opening Sharpbeak's cage.
INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`, `conditionId`, `inverseEffectMask`, `build_min`, `build_max`) VALUES (11792, 0, 144070, 0, 0, 0, 5875);


-- End of migration.
END IF;
END??
delimiter ;
CALL add_migration();
DROP PROCEDURE IF EXISTS add_migration;
33 changes: 33 additions & 0 deletions sql/migrations/20231203135355_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
DROP PROCEDURE IF EXISTS add_migration;
delimiter ??
CREATE PROCEDURE `add_migration`()
BEGIN
DECLARE v INT DEFAULT 1;
SET v = (SELECT COUNT(*) FROM `migrations` WHERE `id`='20231203135355');
IF v=0 THEN
INSERT INTO `migrations` VALUES ('20231203135355');
-- Add your query below.


-- Remove custom creature Burning Adrenaline Trigger. It does not seem to be used.
DELETE FROM `creature_template` WHERE `entry`=160016;

-- Assign spawn spell to Rookery Whelp.
UPDATE `creature_template` SET `spawn_spell_id`=15750 WHERE `entry`=10161;

-- Remove custom creature Rookery Whelp.
DELETE FROM `creature_ai_scripts` WHERE `id` IN (16001501, 16001502);
DELETE FROM `creature_ai_events` WHERE `creature_id`=160015;
DELETE FROM `creature_template` WHERE `entry`=160015;

-- Remove custom creature Solakar Trigger.
DELETE FROM `creature_template` WHERE `entry`=160014;
DELETE FROM `creature` WHERE `id`=160014;


-- End of migration.
END IF;
END??
delimiter ;
CALL add_migration();
DROP PROCEDURE IF EXISTS add_migration;
21 changes: 21 additions & 0 deletions sql/migrations/20231205020742_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
DROP PROCEDURE IF EXISTS add_migration;
delimiter ??
CREATE PROCEDURE `add_migration`()
BEGIN
DECLARE v INT DEFAULT 1;
SET v = (SELECT COUNT(*) FROM `migrations` WHERE `id`='20231205020742');
IF v=0 THEN
INSERT INTO `migrations` VALUES ('20231205020742');
-- Add your query below.


-- Will of Shahram and Holy Strength should have separate aura slot per caster.
UPDATE `spell_template` SET `customFlags` = (`customFlags` | 4096) WHERE `entry` IN (16598, 20007);


-- End of migration.
END IF;
END??
delimiter ;
CALL add_migration();
DROP PROCEDURE IF EXISTS add_migration;
Loading

0 comments on commit 3c422b9

Please sign in to comment.