From d7bc82bc13d5b54a57042d217ff68ee82dc52ed8 Mon Sep 17 00:00:00 2001 From: lee1991 Date: Fri, 3 Feb 2017 12:44:48 +0000 Subject: [PATCH] pushed all pending sqls. --- data/sql/updates/db_world/2017_02_03_00.sql | 22 ++++++++ data/sql/updates/db_world/2017_02_03_01.sql | 24 ++++++++ .../2017_02_03_02.sql} | 20 +++++++ .../2017_02_03_03.sql} | 20 +++++++ .../2017_02_03_04.sql} | 20 +++++++ .../2017_02_03_05.sql} | 20 +++++++ .../2017_02_03_06.sql} | 20 +++++++ .../2017_02_03_07.sql} | 20 +++++++ .../2017_02_03_08.sql} | 20 +++++++ .../2017_02_03_09.sql} | 20 +++++++ .../2017_02_03_10.sql} | 20 +++++++ .../2017_02_03_11.sql} | 20 +++++++ .../2017_02_03_12.sql} | 20 +++++++ .../2017_02_03_13.sql} | 20 +++++++ .../2017_02_03_14.sql} | 20 +++++++ .../2017_02_03_15.sql} | 20 +++++++ .../2017_02_03_16.sql} | 21 ++++++- .../2017_02_03_17.sql} | 21 ++++++- .../2017_02_03_18.sql} | 21 ++++++- .../2017_02_03_19.sql} | 21 ++++++- .../2017_02_03_20.sql} | 21 ++++++- .../2017_02_03_21.sql} | 21 ++++++- .../2017_02_03_22.sql} | 21 ++++++- .../2017_02_03_23.sql} | 21 ++++++- .../2017_02_03_24.sql} | 21 ++++++- .../2017_02_03_25.sql} | 21 ++++++- .../2017_02_03_26.sql} | 21 ++++++- .../2017_02_03_27.sql} | 21 ++++++- .../2017_02_03_28.sql} | 21 ++++++- .../2017_02_03_29.sql} | 21 ++++++- .../2017_02_03_30.sql} | 21 ++++++- .../2017_02_03_31.sql} | 21 ++++++- .../2017_02_03_32.sql} | 21 ++++++- .../2017_02_03_33.sql} | 21 ++++++- .../2017_02_03_34.sql} | 21 ++++++- .../2017_02_03_35.sql} | 21 ++++++- data/sql/updates/db_world/2017_02_03_36.sql | 26 +++++++++ .../2017_02_03_37.sql} | 21 ++++++- data/sql/updates/db_world/2017_02_03_38.sql | 21 +++++++ .../2017_02_03_39.sql} | 21 ++++++- .../2017_02_03_40.sql} | 21 ++++++- .../2017_02_03_41.sql} | 20 +++++++ data/sql/updates/db_world/2017_02_03_42.sql | 23 ++++++++ .../2017_02_03_43.sql} | 20 +++++++ .../2017_02_03_44.sql} | 20 +++++++ data/sql/updates/db_world/2017_02_03_45.sql | 23 ++++++++ data/sql/updates/db_world/2017_02_03_46.sql | 24 ++++++++ .../2017_02_03_47.sql} | 21 ++++++- .../rev_1485367877592394862.sql | 2 - .../rev_1485367936523741798.sql | 4 -- .../rev_1485433480867835400.sql | 7 --- .../rev_1485433783048119200.sql | 2 - .../rev_1485721126246629100.sql | 4 -- .../rev_1486114293799849200.sql | 4 -- .../rev_1486119784125250900.sql | 4 -- .../instance_trial_of_the_champion.cpp | 6 +- .../trial_of_the_champion.cpp | 56 +++++++++---------- 57 files changed, 1014 insertions(+), 82 deletions(-) create mode 100644 data/sql/updates/db_world/2017_02_03_00.sql create mode 100644 data/sql/updates/db_world/2017_02_03_01.sql rename data/sql/updates/{pending_db_world/rev_1485367955664959270.sql => db_world/2017_02_03_02.sql} (72%) rename data/sql/updates/{pending_db_world/rev_1485367987525031467.sql => db_world/2017_02_03_03.sql} (91%) rename data/sql/updates/{pending_db_world/rev_1485368761589638156.sql => db_world/2017_02_03_04.sql} (96%) rename data/sql/updates/{pending_db_world/rev_1485370364401596254.sql => db_world/2017_02_03_05.sql} (94%) rename data/sql/updates/{pending_db_world/rev_1485372721456090106.sql => db_world/2017_02_03_06.sql} (62%) rename data/sql/updates/{pending_db_world/rev_1485380024518159887.sql => db_world/2017_02_03_07.sql} (87%) rename data/sql/updates/{pending_db_world/rev_1485380723419936376.sql => db_world/2017_02_03_08.sql} (81%) rename data/sql/updates/{pending_db_world/rev_1485381009640442878.sql => db_world/2017_02_03_09.sql} (94%) rename data/sql/updates/{pending_db_world/rev_1485381169908880329.sql => db_world/2017_02_03_10.sql} (86%) rename data/sql/updates/{pending_db_world/rev_1485381323407860747.sql => db_world/2017_02_03_11.sql} (84%) rename data/sql/updates/{pending_db_world/rev_1485381491399791033.sql => db_world/2017_02_03_12.sql} (87%) rename data/sql/updates/{pending_db_world/rev_1485381659665860694.sql => db_world/2017_02_03_13.sql} (94%) rename data/sql/updates/{pending_db_world/rev_1485384033201060550.sql => db_world/2017_02_03_14.sql} (92%) rename data/sql/updates/{pending_db_world/rev_1485387833989282858.sql => db_world/2017_02_03_15.sql} (96%) rename data/sql/updates/{pending_db_world/rev_1485431016613888200.sql => db_world/2017_02_03_16.sql} (92%) rename data/sql/updates/{pending_db_world/rev_1485431085279815600.sql => db_world/2017_02_03_17.sql} (94%) rename data/sql/updates/{pending_db_world/rev_1485431395889581500.sql => db_world/2017_02_03_18.sql} (93%) rename data/sql/updates/{pending_db_world/rev_1485431484557653000.sql => db_world/2017_02_03_19.sql} (95%) rename data/sql/updates/{pending_db_world/rev_1485431717555979800.sql => db_world/2017_02_03_20.sql} (95%) rename data/sql/updates/{pending_db_world/rev_1485431827424263900.sql => db_world/2017_02_03_21.sql} (94%) rename data/sql/updates/{pending_db_world/rev_1485431926939955800.sql => db_world/2017_02_03_22.sql} (91%) rename data/sql/updates/{pending_db_world/rev_1485431991613655000.sql => db_world/2017_02_03_23.sql} (96%) rename data/sql/updates/{pending_db_world/rev_1485432088863217300.sql => db_world/2017_02_03_24.sql} (94%) rename data/sql/updates/{pending_db_world/rev_1485432195025289400.sql => db_world/2017_02_03_25.sql} (85%) rename data/sql/updates/{pending_db_world/rev_1485432556104942000.sql => db_world/2017_02_03_26.sql} (83%) rename data/sql/updates/{pending_db_world/rev_1485432620657634200.sql => db_world/2017_02_03_27.sql} (84%) rename data/sql/updates/{pending_db_world/rev_1485432691232670900.sql => db_world/2017_02_03_28.sql} (86%) rename data/sql/updates/{pending_db_world/rev_1485432759914599300.sql => db_world/2017_02_03_29.sql} (88%) rename data/sql/updates/{pending_db_world/rev_1485432843445377000.sql => db_world/2017_02_03_30.sql} (85%) rename data/sql/updates/{pending_db_world/rev_1485432952303603300.sql => db_world/2017_02_03_31.sql} (92%) rename data/sql/updates/{pending_db_world/rev_1485433015636225700.sql => db_world/2017_02_03_32.sql} (93%) rename data/sql/updates/{pending_db_world/rev_1485433070640371800.sql => db_world/2017_02_03_33.sql} (88%) rename data/sql/updates/{pending_db_world/rev_1485433257771075000.sql => db_world/2017_02_03_34.sql} (94%) rename data/sql/updates/{pending_db_world/rev_1485433317271478300.sql => db_world/2017_02_03_35.sql} (87%) create mode 100644 data/sql/updates/db_world/2017_02_03_36.sql rename data/sql/updates/{pending_db_world/rev_1485433649970507600.sql => db_world/2017_02_03_37.sql} (61%) create mode 100644 data/sql/updates/db_world/2017_02_03_38.sql rename data/sql/updates/{pending_db_world/rev_1485433910197391700.sql => db_world/2017_02_03_39.sql} (93%) rename data/sql/updates/{pending_db_world/rev_1485434129254921100.sql => db_world/2017_02_03_40.sql} (99%) rename data/sql/updates/{pending_db_world/rev_1485705893269189700.sql => db_world/2017_02_03_41.sql} (94%) create mode 100644 data/sql/updates/db_world/2017_02_03_42.sql rename data/sql/updates/{pending_db_world/rev_1485734753369055900.sql => db_world/2017_02_03_43.sql} (51%) rename data/sql/updates/{pending_db_world/rev_1486030596737432500.sql => db_world/2017_02_03_44.sql} (84%) create mode 100644 data/sql/updates/db_world/2017_02_03_45.sql create mode 100644 data/sql/updates/db_world/2017_02_03_46.sql rename data/sql/updates/{pending_db_world/rev_1486125349482449900.sql => db_world/2017_02_03_47.sql} (54%) delete mode 100644 data/sql/updates/pending_db_world/rev_1485367877592394862.sql delete mode 100644 data/sql/updates/pending_db_world/rev_1485367936523741798.sql delete mode 100644 data/sql/updates/pending_db_world/rev_1485433480867835400.sql delete mode 100644 data/sql/updates/pending_db_world/rev_1485433783048119200.sql delete mode 100644 data/sql/updates/pending_db_world/rev_1485721126246629100.sql delete mode 100644 data/sql/updates/pending_db_world/rev_1486114293799849200.sql delete mode 100644 data/sql/updates/pending_db_world/rev_1486119784125250900.sql diff --git a/data/sql/updates/db_world/2017_02_03_00.sql b/data/sql/updates/db_world/2017_02_03_00.sql new file mode 100644 index 000000000..e504f9bde --- /dev/null +++ b/data/sql/updates/db_world/2017_02_03_00.sql @@ -0,0 +1,22 @@ +-- DB update 2017_01_24_06 -> 2017_02_03_00 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_01_24_06 2017_02_03_00 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485367877592394862'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- +INSERT INTO version_db_world (`sql_rev`) VALUES ('1485367877592394862'); +UPDATE `creature` SET `MovementType` = 1, `spawndist` = 10 WHERE `guid` IN (1976006, 1976007, 1976008, 1976009, 1976010, 1976011, 1976012); +-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/db_world/2017_02_03_01.sql b/data/sql/updates/db_world/2017_02_03_01.sql new file mode 100644 index 000000000..856749204 --- /dev/null +++ b/data/sql/updates/db_world/2017_02_03_01.sql @@ -0,0 +1,24 @@ +-- DB update 2017_02_03_00 -> 2017_02_03_01 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_00 2017_02_03_01 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485367936523741798'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- +INSERT INTO version_db_world (`sql_rev`) VALUES ('1485367936523741798'); +DELETE FROM `disables` WHERE `entry`= 45425; +INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES +(0, 45425, 64, '', '', 'Ignore LOS for Shoot (Dummy)'); +-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485367955664959270.sql b/data/sql/updates/db_world/2017_02_03_02.sql similarity index 72% rename from data/sql/updates/pending_db_world/rev_1485367955664959270.sql rename to data/sql/updates/db_world/2017_02_03_02.sql index 10f3041e8..5f5d92d84 100644 --- a/data/sql/updates/pending_db_world/rev_1485367955664959270.sql +++ b/data/sql/updates/db_world/2017_02_03_02.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_01 -> 2017_02_03_02 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_01 2017_02_03_02 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485367955664959270'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485367955664959270'); -- [Quest][WotlK] The Last of Her Kind -- Harnessed Icemaw Matriarch SAI @@ -10,3 +21,12 @@ INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceGroup`=29563 AND `SourceEntry`=56795; INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES (18, 29563, 56795, 0, 0, 9, 0, 12983, 0, 0, 0, 0, 0, '', 'Required quest \'The Last of Her Kind\' active for spellclick'); +-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485367987525031467.sql b/data/sql/updates/db_world/2017_02_03_03.sql similarity index 91% rename from data/sql/updates/pending_db_world/rev_1485367987525031467.sql rename to data/sql/updates/db_world/2017_02_03_03.sql index 767f67726..bf60ed0af 100644 --- a/data/sql/updates/pending_db_world/rev_1485367987525031467.sql +++ b/data/sql/updates/db_world/2017_02_03_03.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_02 -> 2017_02_03_03 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_02 2017_02_03_03 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485367987525031467'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485367987525031467'); INSERT INTO version_db_world (`sql_rev`) VALUES ('1485365422169494530'); -- Civilian Recruit modelid from 3422 to 24821 @@ -58,3 +69,12 @@ INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language (25317, 3, 0, 'I just don\'t want to let anyone down.', 12, 7, 100, 0, 0, 0, 26494, 'Civilian Recruit'), (25317, 3, 1, 'I need to do something to keep myself busy.', 12, 7, 100, 0, 0, 0, 26495, 'Civilian Recruit'), (25317, 3, 2, 'I\'m just nervous. Sorry.', 12, 7, 100, 0, 0, 0, 26493, 'Civilian Recruit'); +-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485368761589638156.sql b/data/sql/updates/db_world/2017_02_03_04.sql similarity index 96% rename from data/sql/updates/pending_db_world/rev_1485368761589638156.sql rename to data/sql/updates/db_world/2017_02_03_04.sql index cc2620836..d23bcd870 100644 --- a/data/sql/updates/pending_db_world/rev_1485368761589638156.sql +++ b/data/sql/updates/db_world/2017_02_03_04.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_03 -> 2017_02_03_04 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_03 2017_02_03_04 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485368761589638156'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485368761589638156'); -- Bailey + Bellinger Event UPDATE `creature` SET `spawndist`=0, `MovementType`=0 WHERE `guid` IN (114937, 114958); @@ -130,3 +141,12 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi (29643, 13, 6047.42, -752.5, 372.131, 'Bailey'), (29643, 14, 6036.15, -753.071, 369.981, 'Bailey'), (29643, 15, 6036.69, -751.232, 370.083, 'Bailey'); +-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485370364401596254.sql b/data/sql/updates/db_world/2017_02_03_05.sql similarity index 94% rename from data/sql/updates/pending_db_world/rev_1485370364401596254.sql rename to data/sql/updates/db_world/2017_02_03_05.sql index d78369bc2..3cd273b9e 100644 --- a/data/sql/updates/pending_db_world/rev_1485370364401596254.sql +++ b/data/sql/updates/db_world/2017_02_03_05.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_04 -> 2017_02_03_05 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_04 2017_02_03_05 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485370364401596254'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485370364401596254'); -- add fake death emote for K3 Snow Runner UPDATE `creature` SET `spawndist`=0, `MovementType`=0, `dynamicflags`=32 WHERE `guid` IN (105491); @@ -111,3 +122,12 @@ INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z` (@PATH, 5, 6310.96, -1762.02, 457.424, 0, 0, 0, 1); UPDATE `waypoint_data` SET `action_chance`=100 WHERE `action` IN (@SCRIPTID); +-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485372721456090106.sql b/data/sql/updates/db_world/2017_02_03_06.sql similarity index 62% rename from data/sql/updates/pending_db_world/rev_1485372721456090106.sql rename to data/sql/updates/db_world/2017_02_03_06.sql index 6af7b2cfc..c54ec10c4 100644 --- a/data/sql/updates/pending_db_world/rev_1485372721456090106.sql +++ b/data/sql/updates/db_world/2017_02_03_06.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_05 -> 2017_02_03_06 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_05 2017_02_03_06 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485372721456090106'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485372721456090106'); -- Torseg the Exiled SAI SET @ENTRY := 29350; @@ -5,3 +16,12 @@ DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0 AND ` 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`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES (@ENTRY,0,2,0,25,0,100,0,0,0,0,0,90,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Torseg the Exiled - On Reset - Set Flag Standstate Sleep"), (@ENTRY,0,3,0,4,0,100,0,0,0,0,0,91,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Torseg the Exiled - On Aggro - Remove Flag Standstate Sleep"); +-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485380024518159887.sql b/data/sql/updates/db_world/2017_02_03_07.sql similarity index 87% rename from data/sql/updates/pending_db_world/rev_1485380024518159887.sql rename to data/sql/updates/db_world/2017_02_03_07.sql index 5d857d63c..56a263b40 100644 --- a/data/sql/updates/pending_db_world/rev_1485380024518159887.sql +++ b/data/sql/updates/db_world/2017_02_03_07.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_06 -> 2017_02_03_07 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_06 2017_02_03_07 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485380024518159887'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485380024518159887'); -- Reduce respawntime for landmine UPDATE `gameobject` SET `spawntimesecs`=10 WHERE `id`=191502; @@ -39,3 +50,12 @@ INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language (29429, 1, 0, 'No... no... that''s not it, is it? That heartless lout probably sent you after the tools, didn''t he?', 12, 0, 100, 0, 0, 0, 30199, 'Janks'), (29429, 2, 0, 'Well... I guess I''ll just keep an eye on the turrets... or something.', 12, 0, 100, 0, 0, 0, 30200, 'Janks'), (29429, 3, 0, '%s sighs.', 16, 0, 100, 0, 0, 0, 30201, 'Janks'); +-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485380723419936376.sql b/data/sql/updates/db_world/2017_02_03_08.sql similarity index 81% rename from data/sql/updates/pending_db_world/rev_1485380723419936376.sql rename to data/sql/updates/db_world/2017_02_03_08.sql index 34a950c4b..019b870d2 100644 --- a/data/sql/updates/pending_db_world/rev_1485380723419936376.sql +++ b/data/sql/updates/db_world/2017_02_03_08.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_07 -> 2017_02_03_08 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_07 2017_02_03_08 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485380723419936376'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485380723419936376'); -- Initiate Park SET @NPC := 111475; @@ -26,3 +37,12 @@ DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9; 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`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES (@ENTRY,9,0,0,0,0,100,0,3000,3000,0,0,17,69,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Emote State 69"), (@ENTRY,9,1,0,0,0,100,0,10000,10000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Emote State 0"); +-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485381009640442878.sql b/data/sql/updates/db_world/2017_02_03_09.sql similarity index 94% rename from data/sql/updates/pending_db_world/rev_1485381009640442878.sql rename to data/sql/updates/db_world/2017_02_03_09.sql index 1cb5fdaad..6a6e71c0c 100644 --- a/data/sql/updates/pending_db_world/rev_1485381009640442878.sql +++ b/data/sql/updates/db_world/2017_02_03_09.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_08 -> 2017_02_03_09 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_08 2017_02_03_09 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485381009640442878'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485381009640442878'); -- Initiate Vernon SAI SET @ENTRY := 27300; @@ -97,3 +108,12 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi (27299, 9, 3641.21, 5906.38, 174.577, 'Initiate Greer'), (27299, 10, 3640.11, 5908.16, 174.577, 'Initiate Greer'), (27299, 11, 3641.55, 5908.3, 174.577, 'Initiate Greer'); +-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485381169908880329.sql b/data/sql/updates/db_world/2017_02_03_10.sql similarity index 86% rename from data/sql/updates/pending_db_world/rev_1485381169908880329.sql rename to data/sql/updates/db_world/2017_02_03_10.sql index c946a3811..97aa5954f 100644 --- a/data/sql/updates/pending_db_world/rev_1485381169908880329.sql +++ b/data/sql/updates/db_world/2017_02_03_10.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_09 -> 2017_02_03_10 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_09 2017_02_03_10 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485381169908880329'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485381169908880329'); -- Apprentice Trotter -- http://www.wowhead.com/npc=27301 -- Apprentice Trotter SAI @@ -34,3 +45,12 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi (27301, 7, 3659.6, 5887.87, 174.577, 'Apprentice Trotter'), (27301, 8, 3661.47, 5888.53, 174.577, 'Apprentice Trotter'), (27301, 9, 3659.61, 5887.48, 174.576, 'Apprentice Trotter'); +-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485381323407860747.sql b/data/sql/updates/db_world/2017_02_03_11.sql similarity index 84% rename from data/sql/updates/pending_db_world/rev_1485381323407860747.sql rename to data/sql/updates/db_world/2017_02_03_11.sql index 77139c4ab..dbfa43f2e 100644 --- a/data/sql/updates/pending_db_world/rev_1485381323407860747.sql +++ b/data/sql/updates/db_world/2017_02_03_11.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_10 -> 2017_02_03_11 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_10 2017_02_03_11 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485381323407860747'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485381323407860747'); -- Librarian Hamilton -- http://www.wowhead.com/npc=27141/librarian-hamilton -- Librarian Hamilton SAI @@ -27,3 +38,12 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi (27141, 2, 3590.25, 5953.57, 136.203, 'Librarian Hamilton'), (27141, 3, 3595.1, 5959.01, 136.328, 'Librarian Hamilton'), (27141, 4, 3593.01, 5963.17, 136.328, 'Librarian Hamilton'); +-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485381491399791033.sql b/data/sql/updates/db_world/2017_02_03_12.sql similarity index 87% rename from data/sql/updates/pending_db_world/rev_1485381491399791033.sql rename to data/sql/updates/db_world/2017_02_03_12.sql index 95758f607..00e6786e5 100644 --- a/data/sql/updates/pending_db_world/rev_1485381491399791033.sql +++ b/data/sql/updates/db_world/2017_02_03_12.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_11 -> 2017_02_03_12 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_11 2017_02_03_12 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485381491399791033'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485381491399791033'); -- Karen I Don't Caribou the Culler SAI SET @ENTRY := 25803; @@ -40,3 +51,12 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi (25803, 24, 2721.45, 5267.05, 71.632, 'Karen I Don''t Caribou the Cullerr'), (25803, 25, 2721.44, 5276.07, 70.8437, 'Karen I Don''t Caribou the Cullerr'), (25803, 26, 2729.39, 5276.17, 71.4764, 'Karen I Don''t Caribou the Cullerr'); +-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485381659665860694.sql b/data/sql/updates/db_world/2017_02_03_13.sql similarity index 94% rename from data/sql/updates/pending_db_world/rev_1485381659665860694.sql rename to data/sql/updates/db_world/2017_02_03_13.sql index da693176a..1bf942448 100644 --- a/data/sql/updates/pending_db_world/rev_1485381659665860694.sql +++ b/data/sql/updates/db_world/2017_02_03_13.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_12 -> 2017_02_03_13 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_12 2017_02_03_13 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485381659665860694'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485381659665860694'); -- Armorer Orkuruk -- UPDATE `creature_addon` SET `path_id`=0 WHERE `guid`=125542; @@ -124,3 +135,12 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi (25274, 87, 2762.77, 6202.1, 83.4395, 'Armorer Orkuruk'), (25274, 88, 2762.54, 6187.41, 83.4578, 'Armorer Orkuruk'), (25274, 89, 2765.46, 6178.01, 83.4598, 'Armorer Orkuruk'); +-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485384033201060550.sql b/data/sql/updates/db_world/2017_02_03_14.sql similarity index 92% rename from data/sql/updates/pending_db_world/rev_1485384033201060550.sql rename to data/sql/updates/db_world/2017_02_03_14.sql index 480b7a9e9..496903233 100644 --- a/data/sql/updates/pending_db_world/rev_1485384033201060550.sql +++ b/data/sql/updates/db_world/2017_02_03_14.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_13 -> 2017_02_03_14 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_13 2017_02_03_14 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485384033201060550'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485384033201060550'); -- Warden Nork Bloodfrenzy SAI SET @ENTRY := 25379; @@ -59,3 +70,12 @@ INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language (25426, 4, 0, 'I... I don\'t understand, popo.', 12, 1, 100, 1, 0, 0, 24643, 'Ug''thor Bloodfrenzy'), (25426, 5, 0, '%s puffs out his chest and stands on his tip-toes.', 16, 1, 100, 0, 0, 0, 24644, 'Ug''thor Bloodfrenzy'), (25426, 6, 0, 'Lok\'tar ogar, popo!', 12, 1, 100, 1, 0, 0, 24645, 'Ug''thor Bloodfrenzy'); +-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485387833989282858.sql b/data/sql/updates/db_world/2017_02_03_15.sql similarity index 96% rename from data/sql/updates/pending_db_world/rev_1485387833989282858.sql rename to data/sql/updates/db_world/2017_02_03_15.sql index c8920e5da..4b5ff612d 100644 --- a/data/sql/updates/pending_db_world/rev_1485387833989282858.sql +++ b/data/sql/updates/db_world/2017_02_03_15.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_14 -> 2017_02_03_15 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_14 2017_02_03_15 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485387833989282858'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485387833989282858'); DELETE FROM `creature_addon` WHERE `guid`=13964; UPDATE `creature` SET `MovementType`=0 WHERE `guid`=13964; @@ -165,3 +176,12 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi (14909, 10, 1025.37, -2240.84, 92.4583, 'Pooka'), (14909, 11, 1020.98, -2232.5, 93.3069, 'Pooka'), (14909, 12, 1014.45, -2225.92, 93.0579, 'Pooka'); -- move rndm +-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485431016613888200.sql b/data/sql/updates/db_world/2017_02_03_16.sql similarity index 92% rename from data/sql/updates/pending_db_world/rev_1485431016613888200.sql rename to data/sql/updates/db_world/2017_02_03_16.sql index f63bade29..0ba6be1c8 100644 --- a/data/sql/updates/pending_db_world/rev_1485431016613888200.sql +++ b/data/sql/updates/db_world/2017_02_03_16.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_15 -> 2017_02_03_16 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_15 2017_02_03_16 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485431016613888200'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485431016613888200'); -- Jimmy the Stable Boy UPDATE `creature` SET `position_x`=2260.2114, `position_y`=5205.3139, `position_z`=11.4189, `orientation`=5.8917 WHERE `guid`=117744; @@ -90,4 +101,12 @@ INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language (27364, 1, 0, 'Let''s go boy.', 12, 7, 100, 0, 0, 0, 26432, 'Jimmy the Stable Boy'), (27364, 2, 0, 'If I were king, I''d have a horse like you. I''d make sure you didn''t get lost, and I bet you''d make sure I never got lost.', 12, 7, 100, 0, 0, 0, 26478, 'Jimmy the Stable Boy'), (27364, 3, 0, 'We''d be best friends. I bet me and Anduin would also be best friends, too. Friends are important. ', 12, 7, 100, 0, 0, 0, 26479, 'Jimmy the Stable Boy'), -(27364, 4, 0, 'I''ll take you to some other horses. You probably miss being around other horses. They can be your friend too.', 12, 7, 100, 0, 0, 0, 26486, 'Jimmy the Stable Boy'); \ No newline at end of file +(27364, 4, 0, 'I''ll take you to some other horses. You probably miss being around other horses. They can be your friend too.', 12, 7, 100, 0, 0, 0, 26486, 'Jimmy the Stable Boy');-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485431085279815600.sql b/data/sql/updates/db_world/2017_02_03_17.sql similarity index 94% rename from data/sql/updates/pending_db_world/rev_1485431085279815600.sql rename to data/sql/updates/db_world/2017_02_03_17.sql index 7e8356abe..5edd0ff68 100644 --- a/data/sql/updates/pending_db_world/rev_1485431085279815600.sql +++ b/data/sql/updates/db_world/2017_02_03_17.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_16 -> 2017_02_03_17 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_16 2017_02_03_17 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485431085279815600'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485431085279815600'); -- Hammerfall - Arathi Highland -- Hammerfall Guardian SAI @@ -124,4 +135,12 @@ INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z` (@PATH, 1, -10656.2, 1126.87, 34.1967, 90000, @SCTIPT_ID+0), (@PATH, 2, -10667.4, 1121.39, 34.1967, 90000, @SCTIPT_ID+0); -UPDATE `waypoint_data` SET `action_chance`=100 WHERE `action` BETWEEN @SCTIPT_ID+0 AND @SCTIPT_ID+1; \ No newline at end of file +UPDATE `waypoint_data` SET `action_chance`=100 WHERE `action` BETWEEN @SCTIPT_ID+0 AND @SCTIPT_ID+1;-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485431395889581500.sql b/data/sql/updates/db_world/2017_02_03_18.sql similarity index 93% rename from data/sql/updates/pending_db_world/rev_1485431395889581500.sql rename to data/sql/updates/db_world/2017_02_03_18.sql index 5f59bed57..5665478f6 100644 --- a/data/sql/updates/pending_db_world/rev_1485431395889581500.sql +++ b/data/sql/updates/db_world/2017_02_03_18.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_17 -> 2017_02_03_18 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_17 2017_02_03_18 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485431395889581500'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485431395889581500'); UPDATE `creature` SET `spawndist`=0, `MovementType`=0, `unit_flags`=`unit_flags`|536870912|32770, `dynamicflags`=32 WHERE `guid`=116778; @@ -83,4 +94,12 @@ INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `positio (@PATH, 54, 6438.53, -1244.41, 449.509, 0, 0, 0, 0, 100, 0), (@PATH, 55, 6473.51, -1253.46, 465.931, 0, 0, 0, 0, 100, 0); -UPDATE `waypoint_data` SET `move_type`=1 WHERE `id`=@PATH; \ No newline at end of file +UPDATE `waypoint_data` SET `move_type`=1 WHERE `id`=@PATH;-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485431484557653000.sql b/data/sql/updates/db_world/2017_02_03_19.sql similarity index 95% rename from data/sql/updates/pending_db_world/rev_1485431484557653000.sql rename to data/sql/updates/db_world/2017_02_03_19.sql index b588d7aee..66fb010e8 100644 --- a/data/sql/updates/pending_db_world/rev_1485431484557653000.sql +++ b/data/sql/updates/db_world/2017_02_03_19.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_18 -> 2017_02_03_19 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_18 2017_02_03_19 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485431484557653000'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485431484557653000'); -- Sentinell Hill - Westfall -- Lumberjack @@ -116,4 +127,12 @@ INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z` (@PATH, 19, -10582.3, 1141.47, 39.7775, 1.75786, 0, 0), (@PATH, 20, -10583.1, 1143.39, 40.0436, 2.16391, 0, 0); -UPDATE `waypoint_data` SET `action_chance`=100 WHERE `action` BETWEEN @SCRIPTID+0 AND @SCRIPTID+3; \ No newline at end of file +UPDATE `waypoint_data` SET `action_chance`=100 WHERE `action` BETWEEN @SCRIPTID+0 AND @SCRIPTID+3;-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485431717555979800.sql b/data/sql/updates/db_world/2017_02_03_20.sql similarity index 95% rename from data/sql/updates/pending_db_world/rev_1485431717555979800.sql rename to data/sql/updates/db_world/2017_02_03_20.sql index 4faa0d8bb..8efa89257 100644 --- a/data/sql/updates/pending_db_world/rev_1485431717555979800.sql +++ b/data/sql/updates/db_world/2017_02_03_20.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_19 -> 2017_02_03_20 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_19 2017_02_03_20 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485431717555979800'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485431717555979800'); -- SCRIPT 1 SET @MAXGUID := 919; @@ -146,4 +157,12 @@ INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z` (@PATH, 10, -8878.29, -410.994, 65.6802, 4.63836, 0, 1, 0), (@PATH, 11, -8878.29, -410.994, 65.6802, 4.63836, 25000, 1, @SCRIPTID); -UPDATE `waypoint_data` SET `action_chance`=100 WHERE `action` IN (@SCRIPTID); \ No newline at end of file +UPDATE `waypoint_data` SET `action_chance`=100 WHERE `action` IN (@SCRIPTID);-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485431827424263900.sql b/data/sql/updates/db_world/2017_02_03_21.sql similarity index 94% rename from data/sql/updates/pending_db_world/rev_1485431827424263900.sql rename to data/sql/updates/db_world/2017_02_03_21.sql index 14402bd4f..7724c0d40 100644 --- a/data/sql/updates/pending_db_world/rev_1485431827424263900.sql +++ b/data/sql/updates/db_world/2017_02_03_21.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_20 -> 2017_02_03_21 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_20 2017_02_03_21 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485431827424263900'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485431827424263900'); -- Zalduun SET @NPC := 57213; @@ -140,4 +151,12 @@ INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type DELETE FROM `creature_text` WHERE `entry`=16502; INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `comment`) VALUES -(16502, 0, 0, 'Oh no! I\'m losing this one!', 12, 7, 100, 0, 0, 0, 13113, 'Zalduun'); \ No newline at end of file +(16502, 0, 0, 'Oh no! I\'m losing this one!', 12, 7, 100, 0, 0, 0, 13113, 'Zalduun');-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485431926939955800.sql b/data/sql/updates/db_world/2017_02_03_22.sql similarity index 91% rename from data/sql/updates/pending_db_world/rev_1485431926939955800.sql rename to data/sql/updates/db_world/2017_02_03_22.sql index 7ccb57480..04e9912f8 100644 --- a/data/sql/updates/pending_db_world/rev_1485431926939955800.sql +++ b/data/sql/updates/db_world/2017_02_03_22.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_21 -> 2017_02_03_22 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_21 2017_02_03_22 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485431926939955800'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485431926939955800'); -- Gothik the Harvester Entry 2 event -- Scarlet Deserter @@ -54,4 +65,12 @@ INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language (29112, 2, 0, 'Oh yes. Immensely. The pain will propably render you unconcious - hence the vat of slime you\'re floating in!', 12, 0, 100, 1, 0, 0, 0, 'Gothik the Harvester'), (29112, 3, 0, 'That\'s how you know it\'s working.', 12, 0, 100, 1, 0, 0, 29648, 'Gothik the Harvester'), (29112, 4, 0, 'You idiot! That\'s What I\'m Doing Right Now!', 12, 0, 100, 5, 0, 0, 0, 'Gothik the Harvester'), -(29112, 5, 0, 'I AM going to kill you. What\'s the rush?', 12, 0, 100, 6, 0, 0, 29649, 'Gothik the Harvester'); \ No newline at end of file +(29112, 5, 0, 'I AM going to kill you. What\'s the rush?', 12, 0, 100, 6, 0, 0, 29649, 'Gothik the Harvester');-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485431991613655000.sql b/data/sql/updates/db_world/2017_02_03_23.sql similarity index 96% rename from data/sql/updates/pending_db_world/rev_1485431991613655000.sql rename to data/sql/updates/db_world/2017_02_03_23.sql index 33b5e2c66..d37caf888 100644 --- a/data/sql/updates/pending_db_world/rev_1485431991613655000.sql +++ b/data/sql/updates/db_world/2017_02_03_23.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_22 -> 2017_02_03_23 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_22 2017_02_03_23 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485431991613655000'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485431991613655000'); -- Gothik the Harvester UPDATE `creature_template` SET `Speed_Walk` = 1.6, `Speed_Run` = 1.714286 WHERE `entry` = 28890; @@ -166,4 +177,12 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry (13, 1, 52683, 0, 1, 31, 0, 3, 28898, 0, 0, 0, 0, '', 'Scarlet Ghoul only targets Scarlet Captain'), (13, 1, 52683, 0, 2, 31, 0, 3, 28892, 0, 0, 0, 0, '', 'Scarlet Ghoul only targets Scarlet Peasant'), (13, 1, 52683, 0, 3, 31, 0, 3, 28897, 0, 0, 0, 0, '', 'Scarlet Ghoul only targets Scarlet Ghoul'), -(13, 1, 52683, 0, 4, 31, 0, 3, 28886, 0, 0, 0, 0, '', 'Scarlet Ghoul only targets Scarlet Fleet Defender'); \ No newline at end of file +(13, 1, 52683, 0, 4, 31, 0, 3, 28886, 0, 0, 0, 0, '', 'Scarlet Ghoul only targets Scarlet Fleet Defender');-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485432088863217300.sql b/data/sql/updates/db_world/2017_02_03_24.sql similarity index 94% rename from data/sql/updates/pending_db_world/rev_1485432088863217300.sql rename to data/sql/updates/db_world/2017_02_03_24.sql index e75d8fa92..7f2186116 100644 --- a/data/sql/updates/pending_db_world/rev_1485432088863217300.sql +++ b/data/sql/updates/db_world/2017_02_03_24.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_23 -> 2017_02_03_24 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_23 2017_02_03_24 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485432088863217300'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485432088863217300'); -- Lord Thorval - Rework Textevent SET @NPC := 128506; @@ -89,4 +100,12 @@ INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`pr (@ENTRY, 5, 0, 'As masters of blood, we know battle without end...', 12, 0, 100, 1, 0, 0, 'Lord Thorval', 29872), (@ENTRY, 6, 0, 'We know hunger never to be quenched...', 12, 0, 100, 1, 0, 0, 'Lord Thorval', 29873), (@ENTRY, 7, 0, 'We know power never to be overcome...', 12, 0, 100, 1, 0, 0, 'Lord Thorval', 29874), -(@ENTRY, 8, 0, 'As masters of blood, we are masters of life and death itself. Agains us, even hope falls drained and lifeless.', 12, 0, 100, 1, 0, 0, 'Lord Thorval', 29875); \ No newline at end of file +(@ENTRY, 8, 0, 'As masters of blood, we are masters of life and death itself. Agains us, even hope falls drained and lifeless.', 12, 0, 100, 1, 0, 0, 'Lord Thorval', 29875);-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485432195025289400.sql b/data/sql/updates/db_world/2017_02_03_25.sql similarity index 85% rename from data/sql/updates/pending_db_world/rev_1485432195025289400.sql rename to data/sql/updates/db_world/2017_02_03_25.sql index 578355a14..8d3c3cfd0 100644 --- a/data/sql/updates/pending_db_world/rev_1485432195025289400.sql +++ b/data/sql/updates/db_world/2017_02_03_25.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_24 -> 2017_02_03_25 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_24 2017_02_03_25 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485432195025289400'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485432195025289400'); -- Fruits of Our Labor - http://wotlk.openwow.com/quest=11904 -- Cart Release SAI @@ -40,4 +51,12 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi (25986,12,2752.95,5288.89,24.7977, 'Ore Cart'), (25986,13,2748.91,5286.94,24.7359, 'Ore Cart'), (25986,14,2746.13,5285.9,24.8515, 'Ore Cart'), -(25986,15,2733.06,5284.92,27.2962, 'Ore Cart'); \ No newline at end of file +(25986,15,2733.06,5284.92,27.2962, 'Ore Cart');-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485432556104942000.sql b/data/sql/updates/db_world/2017_02_03_26.sql similarity index 83% rename from data/sql/updates/pending_db_world/rev_1485432556104942000.sql rename to data/sql/updates/db_world/2017_02_03_26.sql index 08c509d49..e4096efe5 100644 --- a/data/sql/updates/pending_db_world/rev_1485432556104942000.sql +++ b/data/sql/updates/db_world/2017_02_03_26.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_25 -> 2017_02_03_26 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_25 2017_02_03_26 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485432556104942000'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485432556104942000'); -- Mordenai -- http://wotlk.openwow.com/npc=22113 -- Mordenai SAI @@ -34,4 +45,12 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi (22113, 15, -4115.26, 851.276, 7.68533, 'Mordenai'), (22113, 16, -4109.66, 883.088, 13.8876, 'Mordenai'), (22113, 17, -4110.74, 914.769, 17.723, 'Mordenai'), -(22113, 18, -4106.89, 948.026, 23.0078, 'Mordenai'); \ No newline at end of file +(22113, 18, -4106.89, 948.026, 23.0078, 'Mordenai');-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485432620657634200.sql b/data/sql/updates/db_world/2017_02_03_27.sql similarity index 84% rename from data/sql/updates/pending_db_world/rev_1485432620657634200.sql rename to data/sql/updates/db_world/2017_02_03_27.sql index 303375454..eed9b7219 100644 --- a/data/sql/updates/pending_db_world/rev_1485432620657634200.sql +++ b/data/sql/updates/db_world/2017_02_03_27.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_26 -> 2017_02_03_27 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_26 2017_02_03_27 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485432620657634200'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485432620657634200'); -- Chancellor Bloodleaf -- http://wotlk.openwow.com/npc=22012 -- Chancellor Bloodleaf SAI @@ -26,4 +37,12 @@ INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language -- Chancellor Bloodleaf (22012, 0, 0, 'Lend us the strength of the giants of Shadowmoon, Corok. The master is a just ruler. He will be sure to take care of those that assisted in subduing the dissidents of this world.', 12, 0, 100, 0, 0, 0, 19693, 'Chancellor Bloodleaf'), (22012, 1, 0, 'Then you become enemies of my lord, Illidan. Enemies of Illidan are destroyed. Are your giants able to withstand an attack from the forces of Eclipse Point?', 12, 0, 100, 0, 0, 0, 19696, 'Chancellor Bloodleaf'), -(22012, 2, 0, 'No... I did not think so...', 12, 0, 100, 0, 0, 0, 19697, 'Chancellor Bloodleaf'); \ No newline at end of file +(22012, 2, 0, 'No... I did not think so...', 12, 0, 100, 0, 0, 0, 19697, 'Chancellor Bloodleaf');-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485432691232670900.sql b/data/sql/updates/db_world/2017_02_03_28.sql similarity index 86% rename from data/sql/updates/pending_db_world/rev_1485432691232670900.sql rename to data/sql/updates/db_world/2017_02_03_28.sql index 6b51eedbd..27bd99515 100644 --- a/data/sql/updates/pending_db_world/rev_1485432691232670900.sql +++ b/data/sql/updates/db_world/2017_02_03_28.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_27 -> 2017_02_03_28 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_27 2017_02_03_28 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485432691232670900'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485432691232670900'); -- Painmistress Gabrissa -- http://wotlk.openwow.com/npc=21309 -- Painmistress Gabrissa SAI @@ -32,4 +43,12 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi (21309, 6, -3690.92, 2682.03, 108.744, 'Painmistress Gabrissa'), (21309, 7, -3694.07, 2677.51, 108.537, 'Painmistress Gabrissa'), (21309, 8, -3697.53, 2673.77, 108.581, 'Painmistress Gabrissa'), -(21309, 9, -3693.46, 2668.44, 107.174, 'Painmistress Gabrissa'); \ No newline at end of file +(21309, 9, -3693.46, 2668.44, 107.174, 'Painmistress Gabrissa');-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485432759914599300.sql b/data/sql/updates/db_world/2017_02_03_29.sql similarity index 88% rename from data/sql/updates/pending_db_world/rev_1485432759914599300.sql rename to data/sql/updates/db_world/2017_02_03_29.sql index d1a23fe1f..362f1314e 100644 --- a/data/sql/updates/pending_db_world/rev_1485432759914599300.sql +++ b/data/sql/updates/db_world/2017_02_03_29.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_28 -> 2017_02_03_29 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_28 2017_02_03_29 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485432759914599300'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485432759914599300'); -- Eye of the Citadel -- http://wotlk.openwow.com/npc=21134 -- Warlord Morkh SAI @@ -35,4 +46,12 @@ DELETE FROM `creature_text` WHERE `entry`=21134; INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `comment`, `TextRange`) VALUES (21134, 0, 0, 'A deep, bone chilling voice echoes from the %s...', 16, 0, 100, 0, 0, 0, 18774, 'Eye of the Citadel', 0), (21134, 1, 0, 'How dare you trifle with my playthings, $n!', 12, 0, 100, 0, 0, 0, 18775, 'Eye of the Citadel', 0), -(21134, 2, 0, 'The orcs in my citadel will drink your blood and dovour you!', 12, 0, 100, 0, 0, 0, 18776, 'Eye of the Citadel', 0); \ No newline at end of file +(21134, 2, 0, 'The orcs in my citadel will drink your blood and dovour you!', 12, 0, 100, 0, 0, 0, 18776, 'Eye of the Citadel', 0);-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485432843445377000.sql b/data/sql/updates/db_world/2017_02_03_30.sql similarity index 85% rename from data/sql/updates/pending_db_world/rev_1485432843445377000.sql rename to data/sql/updates/db_world/2017_02_03_30.sql index 6095b31e8..7f80da29c 100644 --- a/data/sql/updates/pending_db_world/rev_1485432843445377000.sql +++ b/data/sql/updates/db_world/2017_02_03_30.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_29 -> 2017_02_03_30 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_29 2017_02_03_30 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485432843445377000'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485432843445377000'); -- Levixus SAI SET @ENTRY := 19847; @@ -30,4 +41,12 @@ INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language (19847, 1, 4, 'CHRIS METZEN!', 12, 8, 100, 15, 0, 0, 17449, 'Levixus'), (19847, 1, 5, 'Pat Nagle! World design team! Cory Stockton, Paul C., Jim Chadwick, Staats, Ed Hanes, Morris, Gotcher, Jesse!, Sarah B., Victor C., Dave A.! All of our amazing exterior artists!', 12, 8, 100, 15, 0, 0, 17450, 'Levixus'), (19847, 1, 6, 'Scott Mercer! Geoff, Wyatt, Joe, Travis, Kris, Steven! Brazie!', 12, 8, 100, 15, 0, 0, 17451, 'Levixus'), -(19847, 1, 7, 'Luis, Brianna and Eric! Blizzard QA team! Of course our fans!', 12, 8, 100, 15, 0, 0, 17452, 'Levixus'); \ No newline at end of file +(19847, 1, 7, 'Luis, Brianna and Eric! Blizzard QA team! Of course our fans!', 12, 8, 100, 15, 0, 0, 17452, 'Levixus');-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485432952303603300.sql b/data/sql/updates/db_world/2017_02_03_31.sql similarity index 92% rename from data/sql/updates/pending_db_world/rev_1485432952303603300.sql rename to data/sql/updates/db_world/2017_02_03_31.sql index fcebfbec8..eb7c2c257 100644 --- a/data/sql/updates/pending_db_world/rev_1485432952303603300.sql +++ b/data/sql/updates/db_world/2017_02_03_31.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_30 -> 2017_02_03_31 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_30 2017_02_03_31 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485432952303603300'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485432952303603300'); -- Experimental Pilot -- http://wotlk.openwow.com/npc=19776 @@ -73,4 +84,12 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi (19776, 12, 2975.27, 3712.82, 142.309, 'Experimental Pilot'), (19776, 13, 2975.12, 3725.84, 142.688, 'Experimental Pilot'), (19776, 14, 2965.31, 3733.57, 143.503, 'Experimental Pilot'), -(19776, 15, 2966.14, 3733, 143.472, 'Experimental Pilot'); \ No newline at end of file +(19776, 15, 2966.14, 3733, 143.472, 'Experimental Pilot');-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485433015636225700.sql b/data/sql/updates/db_world/2017_02_03_32.sql similarity index 93% rename from data/sql/updates/pending_db_world/rev_1485433015636225700.sql rename to data/sql/updates/db_world/2017_02_03_32.sql index 1a2bc9491..0f30e03f6 100644 --- a/data/sql/updates/pending_db_world/rev_1485433015636225700.sql +++ b/data/sql/updates/db_world/2017_02_03_32.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_31 -> 2017_02_03_32 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_31 2017_02_03_32 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485433015636225700'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485433015636225700'); -- Consortium Nether Runner -- http://wotlk.openwow.com/npc=19667 UPDATE `creature` SET `position_x`=-2057.45, `position_y`=8528.71, `position_z`=24.6556, `orientation`=2.05449, `spawntimesecs`=120 WHERE `guid`=70166; @@ -70,4 +81,12 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi (19667, 5, -2083.14, 8565.28, 22.0791, 'Consortium Nether Runner'), (19667, 6, -2062.94, 8574.57, 23.1942, 'Consortium Nether Runner'), (19667, 7, -2056.25, 8597.59, 21.3663, 'Consortium Nether Runner'), -(19667, 8, -2049.12, 8603.37, 22.7377, 'Consortium Nether Runner'); \ No newline at end of file +(19667, 8, -2049.12, 8603.37, 22.7377, 'Consortium Nether Runner');-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485433070640371800.sql b/data/sql/updates/db_world/2017_02_03_33.sql similarity index 88% rename from data/sql/updates/pending_db_world/rev_1485433070640371800.sql rename to data/sql/updates/db_world/2017_02_03_33.sql index 44aeb1bbc..57e667e2a 100644 --- a/data/sql/updates/pending_db_world/rev_1485433070640371800.sql +++ b/data/sql/updates/db_world/2017_02_03_33.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_32 -> 2017_02_03_33 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_32 2017_02_03_33 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485433070640371800'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485433070640371800'); -- Nurse Judith -- http://wotlk.openwow.com/npc=19455 UPDATE `creature_template_addon` SET `bytes1`=0 WHERE `entry`=19455; @@ -46,4 +57,12 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi (19455, 12, -349.964, 970.224, 54.2733, 'Nurse Judith'), (19455, 13, -350.597, 974.797, 54.2635, 'Nurse Judith'), (19455, 14, -362.665, 981.665, 54.2171, 'Nurse Judith'), -(19455, 15, -364.29, 984.89, 54.2066, 'Nurse Judith'); \ No newline at end of file +(19455, 15, -364.29, 984.89, 54.2066, 'Nurse Judith');-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485433257771075000.sql b/data/sql/updates/db_world/2017_02_03_34.sql similarity index 94% rename from data/sql/updates/pending_db_world/rev_1485433257771075000.sql rename to data/sql/updates/db_world/2017_02_03_34.sql index ba783208e..51c11acc0 100644 --- a/data/sql/updates/pending_db_world/rev_1485433257771075000.sql +++ b/data/sql/updates/db_world/2017_02_03_34.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_33 -> 2017_02_03_34 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_33 2017_02_03_34 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485433257771075000'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485433257771075000'); -- Eye of Naxxramas -- http://www.wowhead.com/npc=10411 SET @GUID := 73922; -- 3 creatures needed CONSECUTIVE @@ -153,4 +164,12 @@ INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z` (@PATH, @POINT := @POINT + 1, 3997.682, -3556.203, 124.7969), (@PATH, @POINT := @POINT + 1, 4021.720, -3529.522, 122.2696), (@PATH, @POINT := @POINT + 1, 4044.845, -3520.759, 121.6993), -(@PATH, @POINT := @POINT + 1, 4067.240, -3534.060, 122.5621); \ No newline at end of file +(@PATH, @POINT := @POINT + 1, 4067.240, -3534.060, 122.5621);-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485433317271478300.sql b/data/sql/updates/db_world/2017_02_03_35.sql similarity index 87% rename from data/sql/updates/pending_db_world/rev_1485433317271478300.sql rename to data/sql/updates/db_world/2017_02_03_35.sql index 7e63ef146..a2d3709c1 100644 --- a/data/sql/updates/pending_db_world/rev_1485433317271478300.sql +++ b/data/sql/updates/db_world/2017_02_03_35.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_34 -> 2017_02_03_35 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_34 2017_02_03_35 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485433317271478300'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485433317271478300'); -- Durkot Wolfbrother -- http://wotlk.openwow.com/npc=26044 SET @MAXGUID := 911; @@ -62,4 +73,12 @@ INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z` (@PATH, 45, 2788.16, 6243.06, 84.4932, 5000, 0, 5.38473), (@PATH, 46, 2773.72, 6258.83, 83.6357, 5000, 0, 2.29026); -UPDATE `waypoint_data` SET `action_chance`=100 WHERE `action` IN (@SCRIPTID); \ No newline at end of file +UPDATE `waypoint_data` SET `action_chance`=100 WHERE `action` IN (@SCRIPTID);-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/db_world/2017_02_03_36.sql b/data/sql/updates/db_world/2017_02_03_36.sql new file mode 100644 index 000000000..66264d59a --- /dev/null +++ b/data/sql/updates/db_world/2017_02_03_36.sql @@ -0,0 +1,26 @@ +-- DB update 2017_02_03_35 -> 2017_02_03_36 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_35 2017_02_03_36 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485433480867835400'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- +INSERT INTO version_db_world (`sql_rev`) VALUES ('1485433480867835400'); +DELETE FROM `spell_area` WHERE `quest_start` IN (13861, 13862, 13863, 13864) AND `area`=4522; +INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`, `quest_start_status`, `quest_end_status`) VALUES +(64576, 4522, 13864, 13864, 0, 0, 2, 1, 74, 11), +(64576, 4522, 13861, 13861, 0, 0, 2, 1, 74, 11), +(64576, 4522, 13862, 13862, 0, 0, 2, 1, 74, 11), +(64576, 4522, 13863, 13863, 0, 0, 2, 1, 74, 11);-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485433649970507600.sql b/data/sql/updates/db_world/2017_02_03_37.sql similarity index 61% rename from data/sql/updates/pending_db_world/rev_1485433649970507600.sql rename to data/sql/updates/db_world/2017_02_03_37.sql index 0a48347db..a04977ca8 100644 --- a/data/sql/updates/pending_db_world/rev_1485433649970507600.sql +++ b/data/sql/updates/db_world/2017_02_03_37.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_36 -> 2017_02_03_37 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_36 2017_02_03_37 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485433649970507600'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485433649970507600'); -- At The Enemy's Gates - Phasing for Icecrown -- http://www.wowhead.com/quest=13847/at-the-enemys-gates DELETE FROM `spell_area` WHERE `quest_start` IN (13847, 13851, 13852, 13854, 13855, 13856, 13857, 13858, 13859, 13860) AND `area`=4522; @@ -11,4 +22,12 @@ INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spe (64576, 4522, 13857, 13857, 0, 0, 2, 1, 74, 11), (64576, 4522, 13858, 13858, 0, 0, 2, 1, 74, 11), (64576, 4522, 13859, 13859, 0, 0, 2, 1, 74, 11), -(64576, 4522, 13860, 13860, 0, 0, 2, 1, 74, 11); \ No newline at end of file +(64576, 4522, 13860, 13860, 0, 0, 2, 1, 74, 11);-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/db_world/2017_02_03_38.sql b/data/sql/updates/db_world/2017_02_03_38.sql new file mode 100644 index 000000000..bb2b1df61 --- /dev/null +++ b/data/sql/updates/db_world/2017_02_03_38.sql @@ -0,0 +1,21 @@ +-- DB update 2017_02_03_37 -> 2017_02_03_38 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_37 2017_02_03_38 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485433783048119200'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- +INSERT INTO version_db_world (`sql_rev`) VALUES ('1485433783048119200'); +DELETE FROM `creature_Loot_template` WHERE `item` = 23612 AND `entry` IN (21060,21061);-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485433910197391700.sql b/data/sql/updates/db_world/2017_02_03_39.sql similarity index 93% rename from data/sql/updates/pending_db_world/rev_1485433910197391700.sql rename to data/sql/updates/db_world/2017_02_03_39.sql index 321ce1cae..2bb17b85a 100644 --- a/data/sql/updates/pending_db_world/rev_1485433910197391700.sql +++ b/data/sql/updates/db_world/2017_02_03_39.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_38 -> 2017_02_03_39 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_38 2017_02_03_39 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485433910197391700'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485433910197391700'); -- ====================================== -- All Bosses Are Immune To Crowd Control -- Daze, Horror, Shackle, Banish, Polymorph, Knockout, Freeze, Stun, Snare, Sleep, Silence, Pacify, Root, Fear, Distract, Disarm, Confused, Charm @@ -132,4 +143,12 @@ INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, (79336, 79370, 0, 0, 2, 0, 0); -- Defias Blackguard -- VanCleef Adds (Should Not Random Move) -UPDATE `creature` SET `SpawnDist` = 0, `MovementType` = 0 WHERE `guid` IN (79369,79370); \ No newline at end of file +UPDATE `creature` SET `SpawnDist` = 0, `MovementType` = 0 WHERE `guid` IN (79369,79370);-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485434129254921100.sql b/data/sql/updates/db_world/2017_02_03_40.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1485434129254921100.sql rename to data/sql/updates/db_world/2017_02_03_40.sql index 332602bef..efd2cf53b 100644 --- a/data/sql/updates/pending_db_world/rev_1485434129254921100.sql +++ b/data/sql/updates/db_world/2017_02_03_40.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_39 -> 2017_02_03_40 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_39 2017_02_03_40 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485434129254921100'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485434129254921100'); -- ======================================== -- Caverns of Time: Old Hillsbrad Foothills @@ -1860,4 +1871,12 @@ UPDATE `gameobject` SET `SpawnMask` = 3, `SpawnTimeSecs` = 86400 WHERE `map`=560 -- Creature Spawn Time Fixes (24 Hour Respawn) - Confirmed No Special Short Spawn Time NPC -- =========================================== UPDATE `creature` SET `SpawnTimeSecs` = 86400 WHERE `map` IN (560); -UPDATE `creature` SET `SpawnTimeSecs` = 180 WHERE `map` IN (560) AND id IN (2350,2385,2408,2354); \ No newline at end of file +UPDATE `creature` SET `SpawnTimeSecs` = 180 WHERE `map` IN (560) AND id IN (2350,2385,2408,2354);-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485705893269189700.sql b/data/sql/updates/db_world/2017_02_03_41.sql similarity index 94% rename from data/sql/updates/pending_db_world/rev_1485705893269189700.sql rename to data/sql/updates/db_world/2017_02_03_41.sql index d5da4abb9..64896840e 100644 --- a/data/sql/updates/pending_db_world/rev_1485705893269189700.sql +++ b/data/sql/updates/db_world/2017_02_03_41.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_40 -> 2017_02_03_41 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_40 2017_02_03_41 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485705893269189700'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485705893269189700'); DELETE FROM `waypoints` WHERE `entry`=14508; @@ -127,3 +138,12 @@ Which one is corect 8000 [2h 13min 20 sec] or 10800 [3h]: -- Arena Treasure Chest (179697) set spawntime to 3h (was 8000 [2h 13min 20 sec]) UPDATE `gameobject` SET `spawntimesecs` = 10800 WHERE `guid` = 12029; */ +-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/db_world/2017_02_03_42.sql b/data/sql/updates/db_world/2017_02_03_42.sql new file mode 100644 index 000000000..b40bcb381 --- /dev/null +++ b/data/sql/updates/db_world/2017_02_03_42.sql @@ -0,0 +1,23 @@ +-- DB update 2017_02_03_41 -> 2017_02_03_42 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_41 2017_02_03_42 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485721126246629100'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- +INSERT INTO version_db_world (`sql_rev`) VALUES ('1485721126246629100'); +-- [NPC][WOTLK] Argent Cannon +UPDATE `creature` SET `curmana`=0 WHERE `id`=30236; +UPDATE `creature_template` SET `VehicleId`=244 WHERE `entry`=30236;-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485734753369055900.sql b/data/sql/updates/db_world/2017_02_03_43.sql similarity index 51% rename from data/sql/updates/pending_db_world/rev_1485734753369055900.sql rename to data/sql/updates/db_world/2017_02_03_43.sql index 8ed75f55f..8adf0d702 100644 --- a/data/sql/updates/pending_db_world/rev_1485734753369055900.sql +++ b/data/sql/updates/db_world/2017_02_03_43.sql @@ -1,6 +1,26 @@ +-- DB update 2017_02_03_42 -> 2017_02_03_43 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_42 2017_02_03_43 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1485734753369055900'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1485734753369055900'); -- SET run_speed of (Thunder BluffSilvermoon, Undercity, Stormwind, Ironforge, Exodar, Gnomeregan and Darnassus Champion(s) from 2 to 1.38571) UPDATE `creature_template` SET `speed_run` = 1.38571 WHERE `entry` IN (35325, 35326, 35327, 35328, 35329, 35330, 35331, 35332); -- SET run_speed of (Colosos, Marshal Jacob Alerius, Ambrose Boltspark, Lana Stouthammer and Jaelyne Evensong from 2 to 1.14286) UPDATE `creature_template` SET `speed_run` = 1.14286 WHERE `entry` IN (34657, 34701, 34702, 34703, 34705); +-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1486030596737432500.sql b/data/sql/updates/db_world/2017_02_03_44.sql similarity index 84% rename from data/sql/updates/pending_db_world/rev_1486030596737432500.sql rename to data/sql/updates/db_world/2017_02_03_44.sql index 2d0764b1d..0520e3515 100644 --- a/data/sql/updates/pending_db_world/rev_1486030596737432500.sql +++ b/data/sql/updates/db_world/2017_02_03_44.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_43 -> 2017_02_03_44 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_43 2017_02_03_44 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1486030596737432500'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1486030596737432500'); DELETE FROM `creature_template` WHERE `entry` = "32322"; @@ -15,3 +26,12 @@ INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entr (32341, 0, 0, 0, 0, 0, 27926, 27927, 0, 0, 'Gold Mage', '', '', 0, 70, 70, 2, 11, 0, 1, 1.14286, 1, 0, 248, 363, 0, 135, 1, 2000, 2000, 8, 0, 0, 0, 0, 0, 0, 0, 0, 233, 347, 28, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 1, 0, 0, 'npc_dalaran_mage', 12340), (32321, 0, 0, 0, 0, 0, 27919, 27920, 27921, 0, 'Green Warrior', '', '', 0, 70, 70, 0, 85, 0, 1, 1.14286, 1, 0, 252, 357, 0, 304, 1, 2000, 2000, 1, 0, 0, 0, 0, 0, 0, 0, 0, 215, 320, 44, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 1, 0, 0, 'npc_dalaran_warrior', 12340), (32324, 0, 0, 0, 0, 0, 27928, 27929, 0, 0, 'Green Mage', '', '', 0, 70, 70, 2, 85, 0, 1, 1.14286, 1, 0, 248, 363, 0, 135, 1, 2000, 2000, 8, 0, 0, 0, 0, 0, 0, 0, 0, 233, 347, 28, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 1, 0, 0, 'npc_dalaran_mage', 12340); +-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/db_world/2017_02_03_45.sql b/data/sql/updates/db_world/2017_02_03_45.sql new file mode 100644 index 000000000..fb128eb63 --- /dev/null +++ b/data/sql/updates/db_world/2017_02_03_45.sql @@ -0,0 +1,23 @@ +-- DB update 2017_02_03_44 -> 2017_02_03_45 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_44 2017_02_03_45 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1486114293799849200'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- +INSERT INTO version_db_world (`sql_rev`) VALUES ('1486114293799849200'); + +UPDATE `creature_text` SET `emote` = "2" WHERE `entry` = "34928" AND `groupid` = "37"; +UPDATE `creature_text` SET `emote` = "398", `duration` = "3000" WHERE `entry` = "34928" AND `groupid` = "38";-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/db_world/2017_02_03_46.sql b/data/sql/updates/db_world/2017_02_03_46.sql new file mode 100644 index 000000000..2041c9351 --- /dev/null +++ b/data/sql/updates/db_world/2017_02_03_46.sql @@ -0,0 +1,24 @@ +-- DB update 2017_02_03_45 -> 2017_02_03_46 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_45 2017_02_03_46 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1486119784125250900'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- +INSERT INTO version_db_world (`sql_rev`) VALUES ('1486119784125250900'); + +INSERT INTO `disables` (`sourceType`, `entry`, `flags`, `params_0`, `params_1`, `comment`) VALUES +(0, 54028, 64, '', '', 'Removed LOS for SPELL 54028'); +-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1486125349482449900.sql b/data/sql/updates/db_world/2017_02_03_47.sql similarity index 54% rename from data/sql/updates/pending_db_world/rev_1486125349482449900.sql rename to data/sql/updates/db_world/2017_02_03_47.sql index f30a61485..583078606 100644 --- a/data/sql/updates/pending_db_world/rev_1486125349482449900.sql +++ b/data/sql/updates/db_world/2017_02_03_47.sql @@ -1,3 +1,14 @@ +-- DB update 2017_02_03_46 -> 2017_02_03_47 +DROP PROCEDURE IF EXISTS `updateDb`; +DELIMITER // +CREATE PROCEDURE updateDb () +proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2017_02_03_46 2017_02_03_47 bit; +SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1486125349482449900'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; +-- +-- START UPDATING QUERIES +-- INSERT INTO version_db_world (`sql_rev`) VALUES ('1486125349482449900'); DELETE FROM `creature` WHERE `guid` = "1978829"; @@ -10,4 +21,12 @@ DELETE FROM `linked_respawn` WHERE `guid` = "79378"; DELETE FROM `linked_respawn` WHERE `guid` = "79379"; DELETE FROM `linked_respawn` WHERE `guid` = "79380"; DELETE FROM `linked_respawn` WHERE `guid` = "79383"; -UPDATE `quest_template_addon` SET `SpecialFlags` = "2" WHERE `ID` = "10409"; \ No newline at end of file +UPDATE `quest_template_addon` SET `SpecialFlags` = "2" WHERE `ID` = "10409";-- +-- END UPDATING QUERIES +-- +COMMIT; +END; +// +DELIMITER ; +CALL updateDb(); +DROP PROCEDURE IF EXISTS `updateDb`; diff --git a/data/sql/updates/pending_db_world/rev_1485367877592394862.sql b/data/sql/updates/pending_db_world/rev_1485367877592394862.sql deleted file mode 100644 index cfc838a5d..000000000 --- a/data/sql/updates/pending_db_world/rev_1485367877592394862.sql +++ /dev/null @@ -1,2 +0,0 @@ -INSERT INTO version_db_world (`sql_rev`) VALUES ('1485367877592394862'); -UPDATE `creature` SET `MovementType` = 1, `spawndist` = 10 WHERE `guid` IN (1976006, 1976007, 1976008, 1976009, 1976010, 1976011, 1976012); diff --git a/data/sql/updates/pending_db_world/rev_1485367936523741798.sql b/data/sql/updates/pending_db_world/rev_1485367936523741798.sql deleted file mode 100644 index 2422d4959..000000000 --- a/data/sql/updates/pending_db_world/rev_1485367936523741798.sql +++ /dev/null @@ -1,4 +0,0 @@ -INSERT INTO version_db_world (`sql_rev`) VALUES ('1485367936523741798'); -DELETE FROM `disables` WHERE `entry`= 45425; -INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES -(0, 45425, 64, '', '', 'Ignore LOS for Shoot (Dummy)'); diff --git a/data/sql/updates/pending_db_world/rev_1485433480867835400.sql b/data/sql/updates/pending_db_world/rev_1485433480867835400.sql deleted file mode 100644 index 15b78595d..000000000 --- a/data/sql/updates/pending_db_world/rev_1485433480867835400.sql +++ /dev/null @@ -1,7 +0,0 @@ -INSERT INTO version_db_world (`sql_rev`) VALUES ('1485433480867835400'); -DELETE FROM `spell_area` WHERE `quest_start` IN (13861, 13862, 13863, 13864) AND `area`=4522; -INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`, `quest_start_status`, `quest_end_status`) VALUES -(64576, 4522, 13864, 13864, 0, 0, 2, 1, 74, 11), -(64576, 4522, 13861, 13861, 0, 0, 2, 1, 74, 11), -(64576, 4522, 13862, 13862, 0, 0, 2, 1, 74, 11), -(64576, 4522, 13863, 13863, 0, 0, 2, 1, 74, 11); \ No newline at end of file diff --git a/data/sql/updates/pending_db_world/rev_1485433783048119200.sql b/data/sql/updates/pending_db_world/rev_1485433783048119200.sql deleted file mode 100644 index 363b26d51..000000000 --- a/data/sql/updates/pending_db_world/rev_1485433783048119200.sql +++ /dev/null @@ -1,2 +0,0 @@ -INSERT INTO version_db_world (`sql_rev`) VALUES ('1485433783048119200'); -DELETE FROM `creature_Loot_template` WHERE `item` = 23612 AND `entry` IN (21060,21061); \ No newline at end of file diff --git a/data/sql/updates/pending_db_world/rev_1485721126246629100.sql b/data/sql/updates/pending_db_world/rev_1485721126246629100.sql deleted file mode 100644 index 529f24f80..000000000 --- a/data/sql/updates/pending_db_world/rev_1485721126246629100.sql +++ /dev/null @@ -1,4 +0,0 @@ -INSERT INTO version_db_world (`sql_rev`) VALUES ('1485721126246629100'); --- [NPC][WOTLK] Argent Cannon -UPDATE `creature` SET `curmana`=0 WHERE `id`=30236; -UPDATE `creature_template` SET `VehicleId`=244 WHERE `entry`=30236; \ No newline at end of file diff --git a/data/sql/updates/pending_db_world/rev_1486114293799849200.sql b/data/sql/updates/pending_db_world/rev_1486114293799849200.sql deleted file mode 100644 index 21d1425d2..000000000 --- a/data/sql/updates/pending_db_world/rev_1486114293799849200.sql +++ /dev/null @@ -1,4 +0,0 @@ -INSERT INTO version_db_world (`sql_rev`) VALUES ('1486114293799849200'); - -UPDATE `creature_text` SET `emote` = "2" WHERE `entry` = "34928" AND `groupid` = "37"; -UPDATE `creature_text` SET `emote` = "398", `duration` = "3000" WHERE `entry` = "34928" AND `groupid` = "38"; \ No newline at end of file diff --git a/data/sql/updates/pending_db_world/rev_1486119784125250900.sql b/data/sql/updates/pending_db_world/rev_1486119784125250900.sql deleted file mode 100644 index ed3720cbe..000000000 --- a/data/sql/updates/pending_db_world/rev_1486119784125250900.sql +++ /dev/null @@ -1,4 +0,0 @@ -INSERT INTO version_db_world (`sql_rev`) VALUES ('1486119784125250900'); - -INSERT INTO `disables` (`sourceType`, `entry`, `flags`, `params_0`, `params_1`, `comment`) VALUES -(0, 54028, 64, '', '', 'Removed LOS for SPELL 54028'); diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index 4c5f78392..5f825256d 100644 --- a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -1017,7 +1017,7 @@ public: { if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) announcer->GetMotionMaster()->MovePoint(0, 735.81f, 661.92f, 412.39f); - if( Creature* boss = instance->SummonCreature(Counter ? NPC_EADRIC : NPC_PALETRESS, SpawnPosition) ) + if (Creature* boss = instance->SummonCreature(Counter ? NPC_EADRIC : NPC_PALETRESS, SpawnPosition)) boss->GetMotionMaster()->MovePoint(0, 746.881f, 660.263f, 411.7f); events.ScheduleEvent(EVENT_CLOSE_GATE, 5000); events.ScheduleEvent(EVENT_ARGENT_CHALLENGE_SAY_1, 4000); @@ -1059,8 +1059,8 @@ public: break; case EVENT_ARGENT_CHALLENGE_MOVE_FORWARD: { - if( Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID) ) - boss->GetMotionMaster()->MovePoint(0, 746.881f, 635.263f, 411.7f); + if (Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID)) + boss->GetMotionMaster()->MovePoint(0, 746.881f, 635.263f, 411.7f); events.ScheduleEvent(EVENT_ARGENT_CHALLENGE_ATTACK, 3000); events.PopEvent(); } diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index 61d8b14cd..90e861ca2 100644 --- a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -20,41 +20,41 @@ public: bool OnGossipHello(Player* pPlayer, Creature* pCreature) { - if (!pCreature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP)) + if( !pCreature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP) ) return true; InstanceScript* pInstance = pCreature->GetInstanceScript(); - if (!pInstance) + if( !pInstance ) return true; uint32 gossipTextId = 0; - switch (pInstance->GetData(DATA_INSTANCE_PROGRESS)) + switch( pInstance->GetData(DATA_INSTANCE_PROGRESS) ) { - case INSTANCE_PROGRESS_INITIAL: - if (!pPlayer->GetVehicle()) - { - if (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE) - gossipTextId = 15043; //Horde text - else - gossipTextId = 14757; //Alliance text - } - else - { - gossipTextId = 14688; - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1a, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1338); - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1b, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1341); - } - break; - case INSTANCE_PROGRESS_CHAMPIONS_DEAD: - gossipTextId = 14737; - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1339); - break; - case INSTANCE_PROGRESS_ARGENT_CHALLENGE_DIED: - gossipTextId = 14738; - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1340); - break; - default: - return true; + case INSTANCE_PROGRESS_INITIAL: + if(!pPlayer->GetVehicle() ) + { + if (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE) + gossipTextId = 15043; //Horde text + else + gossipTextId = 14757; //Alliance text + } + else + { + gossipTextId = 14688; + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1a, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1338); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1b, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1341); + } + break; + case INSTANCE_PROGRESS_CHAMPIONS_DEAD: + gossipTextId = 14737; + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1339); + break; + case INSTANCE_PROGRESS_ARGENT_CHALLENGE_DIED: + gossipTextId = 14738; + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1340); + break; + default: + return true; } pPlayer->SEND_GOSSIP_MENU(gossipTextId, pCreature->GetGUID());