Skip to content

Commit

Permalink
[0.15.1.0090.10]
Browse files Browse the repository at this point in the history
  • Loading branch information
NeatElves committed May 27, 2022
1 parent 057537b commit d39dbd8
Show file tree
Hide file tree
Showing 12 changed files with 5,935 additions and 9,462 deletions.
685 changes: 372 additions & 313 deletions ACID/acid_wotlk.sql

Large diffs are not rendered by default.

5,107 changes: 629 additions & 4,478 deletions Locales/0_script_texts.sql

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Updates/0003_BroadcastTextUpdate.sql
Original file line number Diff line number Diff line change
Expand Up @@ -1399,6 +1399,7 @@ UPDATE `broadcast_text` SET `ChatTypeId` = 1 WHERE `Id` IN (11721,12861,12862,12
UPDATE `broadcast_text` SET `ChatTypeId` = 1 WHERE `Id` IN (12417,12418,12419);
UPDATE `broadcast_text` SET `ChatTypeId` = 2 WHERE `Id` IN (15959,15960);
UPDATE `broadcast_text` SET `ChatTypeID` = 2 WHERE `Id` = 1342;
UPDATE `broadcast_text` SET `ChatTypeId` = 3 WHERE `Id` BETWEEN 24930 AND 24932;

-- text
# 4139_TDB-0206_betrayed.sql
Expand Down
108 changes: 95 additions & 13 deletions Updates/0004_updatepack.sql
Original file line number Diff line number Diff line change
Expand Up @@ -87919,7 +87919,7 @@ INSERT INTO worldstate_name(Id,Name) VALUES

UPDATE creature SET MovementType = 3 WHERE id = 5936 AND MovementType = 2;

UPDATE `creature` SET `position_x`='2954.253', `position_y`='-3215.4094', `position_z`='169.20816', `orientation`='2.8972' WHERE (`guid`='32331');
UPDATE `creature` SET `position_x`='2954.253', `position_y`='-3215.4094', `position_z`='169.20816', `orientation`='2.8972' WHERE (`guid`='41242');
UPDATE `creature_template` SET `EquipmentTemplateId`='141' WHERE (`Entry`='3848');
SET @PATH := 3848;
DELETE FROM creature_movement_template WHERE `Entry` = @PATH;
Expand Down Expand Up @@ -89149,17 +89149,6 @@ DELETE FROM creature_template_addon WHERE entry IN(23134,23135, 23136);
INSERT INTO creature_template_addon(entry,b2_1_pvp_state) VALUES (23134,1), (23135,1), (23136,1);

DELETE FROM `dbscripts_on_quest_end` WHERE `id`=11691;
INSERT INTO `dbscripts_on_quest_end` (`id`, `delay`, `priority`, `command`, `datalong`, `datalong2`, `datalong3`, `buddy_entry`, `search_radius`, `data_flags`, `dataint`, `dataint2`, `dataint3`, `dataint4`, `datafloat`, `x`, `y`, `z`, `o`, `speed`, `condition_id`, `comments`) VALUES
(11691, 0, 0, 15, 45937, 0, 0, 25745, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '[PH] Ahune Summon Loc Bunny - Cast Ahune - Summoning Visual 1'),
(11691, 1000, 0, 15, 46603, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'cast Force Wisp Flight Missile'),
(11691, 1000, 0, 0, 0, 0, 0, 0, 0, 2, 24895, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'say Ahune 1'),
(11691, 3000, 0, 15, 45930, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'cast Ahune - Summoning Rhyme Spell, make bonfire'),
(11691, 3000, 0, 0, 0, 0, 0, 0, 0, 2, 24893, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'say Ahune 2'),
(11691, 5000, 0, 0, 0, 0, 0, 0, 0, 2, 24894, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'say Ahune 3'),
(11691, 10000, 0, 15, 46402, 0, 0, 25745, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '[PH] Ahune Summon Loc Bunny - Cast Ahune Resurfaces'),
(11691, 10000, 0, 10, 25740, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, -99.1021, -233.753, -1.22297, 1.5282, 0, 0, 'spawn Ahune'),
(11691, 12000, 0, 10, 25865, 0, 0, 25740, 100, 0, 0, 0, 0, 0, 0, -98.0151, -230.456, -1.21089, 1.79769, 0, 0, 'spawn Frozen Core');
UPDATE dbscripts_on_gossip SET data_flags = 2 WHERE id = 1138900 AND dataint > 1;
UPDATE `quest_template` SET `RequiredRaces` = 0, `PrevQuestId` = 0, `CompleteScript` = 0 WHERE `entry` IN (11401,11404);
DELETE FROM `dbscripts_on_quest_end` WHERE `id` IN (11401,11404);
UPDATE `quest_template` SET `RequiredRaces` = 0, `PrevQuestId` = 0 WHERE `entry` =11405;
Expand Down Expand Up @@ -94661,7 +94650,6 @@ INSERT INTO `gameobject_loot_template` (`entry`, `item`, `ChanceOrQuestChance`,
(188124, 35509, 0, 2, 1, 1, 0, ''),
(188124, 35511, 0, 2, 1, 1, 0, '');


DELETE FROM creature WHERE guid IN(42422) AND Id IN(37964);
INSERT INTO creature(guid,id,map,spawnMask,phaseMask,position_x,position_y,position_z,orientation,spawndist,spawntimesecsmin,spawntimesecsmax,curhealth,movementType) VALUES
(42422,37964,0,1,1,1484.66,348.019,-64.5469,0.837758,0,300,300,0,0);
Expand Down Expand Up @@ -94790,3 +94778,97 @@ INSERT INTO dbscripts_on_creature_movement(id, delay, priority, command, datalon
(3681201,0,0,15,50630,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'Love Boat Generic - Eject All Passengers');
INSERT INTO dbscripts_on_creature_movement(id, delay, priority, command, datalong, datalong2, datalong3, buddy_entry, search_radius, data_flags, dataint, dataint2, dataint3, dataint4, datafloat, x, y, z, o, speed, condition_id, comments) VALUES
(3681201,0,0,18,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'Love Boat Generic - Despawn Self');

UPDATE gameobject_template SET `data10` = 1, `data11` = 1, `data12` = 1, `data13` = 1, `data15` = 1 WHERE entry=188124;
UPDATE gameobject_template SET `flags` = '0' WHERE entry=187892;
UPDATE `creature_template` SET `ExtraFlags` = 1 WHERE `entry` = 25740;
UPDATE `creature_template` SET `ExtraFlags` = 1 WHERE `entry` = 26338;
UPDATE `creature_template` SET `ExtraFlags` = 1 WHERE `entry` IN (25865,26339);
UPDATE `creature_template` SET `UnitFlags` = 256+33554432 WHERE `entry` IN (25865,25985,26337,26339);
UPDATE creature_template SET Expansion = 2 WHERE entry IN (25865,26339);
UPDATE `creature_template` SET `MinLevel` = '80',`MaxLevel` = '80',`MinLevelHealth` = '504000',`MaxLevelHealth` = '504000' WHERE `Entry` =25865;
UPDATE `creature_template` SET `MinLevel` = '80',`MaxLevel` = '80',`MinLevelHealth` = '655200',`MaxLevelHealth` = '655200' WHERE `Entry` =26339;
UPDATE `creature_template` SET `MinLevel` = '70',`MaxLevel` = '70',`MinLevelHealth` = '4050',`MaxLevelHealth` = '4050' WHERE `Entry` =25985;
UPDATE `creature_template` SET `MinLevel` = '70',`MaxLevel` = '70',`MinLevelHealth` = '4050',`MaxLevelHealth` = '4050' WHERE `Entry` =26337;
UPDATE creature_template SET MinLevel = 80, MaxLevel = 80 WHERE entry IN (25757,26341);

UPDATE creature_template SET MovementType = 3 WHERE entry IN (25964,25965,25966);

UPDATE `gameobject` SET `rotation2` = '-1', `rotation3` = '0' WHERE `guid` =48588;

REPLACE INTO gameobject (`guid`, `id`, `map`, `spawnMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecsmin`, `spawntimesecsmax`, `animprogress`, `state`) VALUES
(6206,176573,1,1,-3667.09,-4754,1.80047,2.26892,0,0,0.906307,0.422619,180,180,0,1),
(576,179487,1,1,3535.29,948.417,3.52732,4.97419,0,0,-0.608761,0.793354,180,180,100,1),
(9191,179487,1,1,3595.42,1129.77,1.17463,5.0091,0,0,-0.594823,0.803857,180,180,100,1),
(13947,179487,1,1,3616.25,878.275,-2.91687,0.488691,0,0,0.241921,0.970296,180,180,100,1),
(177,179487,1,1,3722.14,904.603,0.96701,2.02458,0,0,0.848047,0.529921,180,180,100,1),
(6207,179489,1,1,3510.62,1146.26,-9.0148,1.78023,0,0,0.777145,0.629321,180,180,100,1);
UPDATE `pool_gameobject` SET `pool_entry` = '355' WHERE `guid` =9191;

DELETE FROM `creature` WHERE `guid` IN (82129,82143,82142,82137,86593,86603);
DELETE FROM `game_event_creature` WHERE `guid` IN (82129,82143,82142,82137,86593,86603) AND `event` = 1;
REPLACE INTO creature (`guid`, `id`, `map`, `spawnMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecsmin`, `spawntimesecsmax`, `spawndist`, `MovementType`) VALUES
(74579,26401,530,1,-2514.7,7556.93,-1.79236,5.37561,300,300,0,0),
(55109,26401,530,1,194.096,6019.69,22.1904,6.16101,300,300,0,0),
(96038,26401,530,1,2025.93,6593.35,135.64,5.93412,300,300,0,0),
(130068,26401,530,1,-3000.53,4166.53,4.95846,0.593412,300,300,0,0),
(74707,26401,530,1,-3948.36,2045.08,95.1881,4.5204,300,300,0,0),
(130061,26401,530,1,3127.92,3746.13,141.726,6.16101,300,300,0,0),
(130092,26520,530,1,-3080.07,2366.79,62.8312,3.96565,300,300,0,0),
(130121,26520,530,1,2283.71,6137.62,136.705,1.5708,300,300,0,0),
(130097,26520,530,1,2916.6,3690.48,144.095,2.93215,300,300,0,0),
(130110,26520,530,1,7684.2,-6830.84,78.7005,1.46608,300,300,0,0),
(130116,26520,530,1,9383.31,-6773.07,14.3748,4.60767,300,300,0,0);
UPDATE `creature` SET `position_x` = -524.57, `position_y` = 2327.02, `position_z` = 38.97, `orientation` = 3.66 WHERE `guid` = 82146 AND `id` = 26401;

UPDATE creature_template SET LootId = 40446, PickPocketLootId = 40446 WHERE entry = 40446;
DELETE FROM `pickpocketing_loot_template` WHERE entry=40446;
INSERT INTO `pickpocketing_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `groupid`, `mincountOrRef`, `maxcount`, `condition_id`, `comments`) VALUES
('40446','37452','25','0','1','1','0','Fatty Bluefin'),
('40446','38274','25','0','1','1','0','Large Snail Shell'),
('40446','43575','20','0','1','1','0','Reinforced Junkbox'),
('40446','38273','15','0','1','1','0','Brain Coral'),
('40446','33447','5','0','1','1','0','Runic Healing Potion');
DELETE FROM `creature_loot_template` WHERE entry=40446;
INSERT INTO `creature_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `groupid`, `mincountOrRef`, `maxcount`, `condition_id`, `comments`) VALUES
('40446','17057','10','12','1','1','0','Shiny Fish Scales'),
('40446','17058','10','12','1','1','0','Fish Oil'),
('40446','33470','10','12','2','7','0','Frostweave Cloth'),
('40446','36781','10','9','1','1','0','Darkwater Clam'),
('40446','43852','10','12','1','1','0','Thick Fur Clothing Scraps'),
('40446','35951','10','11','1','3','0','Poached Emperor Salmon'),
('40446','39152','5','0','1','1','245','Manual: Heavy Frostweave Bandage'),
('40446','33445','10','11','1','1','0','Honeymint Tea'),
('40446','43507','1','0','-43507','1','0','reference - Cooking Recepies'),
('40446','37091','0.3','0','-37091','1','0','NPC LOOT (White World Drop) - (Item Levels: 80 (Scrolls VII)) - (NPC Levels ?-?)');

DELETE FROM conditions WHERE condition_entry BETWEEN 20311 AND 20312;
INSERT INTO conditions (condition_entry, `type`, value1, value2, value3, flags, comments) VALUES
(20311, 42, 20001, 0, 1, 0, 'The Slave Pens - Midsummer Fire Festival - Creatures spawned with event "ON"'),
(20312, 42, 20001, 0, 0, 0, 'The Slave Pens - Midsummer Fire Festival - Creatures spawned with event "OFF"');
UPDATE quest_template SET prevQuestId = 11696, RewSpellCast = 0, CompleteScript = 0 WHERE entry = 11691;
DELETE FROM npc_text_broadcast_text WHERE Id IN (15864);
INSERT INTO npc_text_broadcast_text (Id, Prob0, BroadcastTextId0) VALUES (15864, 0, 25213);
UPDATE `gossip_menu_option` SET `action_script_id` = '1138901' WHERE `menu_id` =11389 AND `id` =0;
DELETE FROM `dbscripts_on_gossip` WHERE `id` = 1138900;
DELETE FROM spell_script_target WHERE entry IN (46735);
INSERT INTO spell_script_target (entry, type, targetEntry) VALUES (46735, 1, 26190);
DELETE FROM `dbscripts_on_spell` WHERE `id` IN (46320);
INSERT INTO `dbscripts_on_spell` (`id`, `delay`, `command`, `datalong`, `datalong2`, `datalong3`, `buddy_entry`, `search_radius`, `data_flags`, `dataint`, `dataint2`, `dataint3`, `dataint4`, `x`, `y`, `z`, `o`, `comments`) VALUES
(46320, 1, 15, 45946, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 'cast 45946 t->t'),
(46320, 10, 15, 45947, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 'cast 45947 t->t');

DELETE FROM `dbscripts_on_relay` WHERE id = 16;
INSERT INTO `dbscripts_on_relay` (`id`, `delay`, `priority`, `command`, `datalong`, `datalong2`, `datalong3`, `buddy_entry`, `search_radius`, `data_flags`, `dataint`, `dataint2`, `dataint3`, `dataint4`, `datafloat`, `x`, `y`, `z`, `o`, `speed`, `condition_id`, `comments`) VALUES
('16','3000','0','36','0','0','0','0','0','2','0','0','0','0','0','0','0','0','0','0','0','Justine Demalier - Face Player'),
('16','5000','0','1','25','0','0','0','0','2','0','0','0','0','0','0','0','0','0','0','0','Justine Demalier - Do Emote OneShotPoint'),
('16','8000','0','0','0','0','0','0','0','2','7900','0','0','0','0','0','0','0','0','0','0','Justine Demalier - Say Line 7900'),
('16','11500','0','36','1','0','0','0','0','2','0','0','0','0','0','0','0','0','0','0','0','Justine Demalier - Reset Orientation'),
('16','11700','0','36','0','0','0','12480','20','3','0','0','0','0','0','0','0','0','0','0','0','Justine Demalier - Face Player (Melris Malagan)'),
('16','12000','0','0','0','0','0','12480','20','3','7901','0','0','0','0','0','0','0','0','0','0','Justine Demalier - Say Line 7901 (Melris Malagan)'),
('16','15000','0','1','1','0','0','12480','20','3','0','0','0','0','0','0','0','0','0','0','0','Justine Demalier - Do Emote OneShotTalk (Melris Malagan)'),
('16','18000','0','1','25','0','0','12480','20','3','0','0','0','0','0','0','0','0','0','0','0','Justine Demalier - Do Emote OneShotPoint (Melris Malagan)'),
('16','21000','0','36','1','0','0','12480','20','3','0','0','0','0','0','0','0','0','0','0','0','Justine Demalier - Reset Orientation (Melris Malagan)'),
('16','500000','0','35','6','0','0','0','0','6','0','0','0','0','0','0','0','0','0','0','0','Justine Demalier - Send Custom Event B to Self');

UPDATE npc_text_broadcast_text SET BroadcastTextId0=11228 WHERE Id=60046 AND BroadcastTextId0=2143;
10 changes: 5 additions & 5 deletions Updates/Instances/000_setup.sql
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ DELETE FROM pool_gameobject WHERE guid IN (SELECT guid FROM tmp_gameobject);
DELETE FROM pool_gameobject_template WHERE id IN (SELECT id FROM tmp_gameobject);

-- Exclude Outland, Northrend, Ebon Hold
DELETE FROM spawn_group WHERE `Id` BETWEEN 3000000 AND 5299999 OR `Id` BETWEEN 5310000 AND 5709999 OR `Id` BETWEEN 5720000 AND 6089999 OR `Id` BETWEEN 6100000 AND 7249999;
DELETE FROM spawn_group_entry WHERE `Id` BETWEEN 3000000 AND 5299999 OR `Id` BETWEEN 5310000 AND 5709999 OR `Id` BETWEEN 5720000 AND 6089999 OR `Id` BETWEEN 6100000 AND 7249999;
DELETE FROM spawn_group WHERE `Id` BETWEEN 1090000 AND 5299999 OR `Id` BETWEEN 5310000 AND 5709999 OR `Id` BETWEEN 5720000 AND 6089999 OR `Id` BETWEEN 6100000 AND 9009999;
DELETE FROM spawn_group_entry WHERE `Id` BETWEEN 1090000 AND 5299999 OR `Id` BETWEEN 5310000 AND 5709999 OR `Id` BETWEEN 5720000 AND 6089999 OR `Id` BETWEEN 6100000 AND 9009999;
DELETE FROM spawn_group_spawn WHERE `Guid` IN (SELECT guid FROM tmp_creature);
DELETE FROM spawn_group_formation WHERE `Id` BETWEEN 3000000 AND 5299999 OR `Id` BETWEEN 5310000 AND 5709999 OR `Id` BETWEEN 5720000 AND 6089999 OR `Id` BETWEEN 6100000 AND 7249999;
DELETE FROM spawn_group_linked_group WHERE `Id` BETWEEN 3000000 AND 5299999 OR `Id` BETWEEN 5310000 AND 5709999 OR `Id` BETWEEN 5720000 AND 6089999 OR `Id` BETWEEN 6100000 AND 7249999;
DELETE FROM waypoint_path WHERE `PathId` BETWEEN 3000000 AND 5299999 OR `PathId` BETWEEN 5310000 AND 5709999 OR `PathId` BETWEEN 5720000 AND 6089999 OR `PathId` BETWEEN 6100000 AND 7249999;
DELETE FROM spawn_group_formation WHERE `Id` BETWEEN 1090000 AND 5299999 OR `Id` BETWEEN 5310000 AND 5709999 OR `Id` BETWEEN 5720000 AND 6089999 OR `Id` BETWEEN 6100000 AND 9009999;
DELETE FROM spawn_group_linked_group WHERE `Id` BETWEEN 1090000 AND 5299999 OR `Id` BETWEEN 5310000 AND 5709999 OR `Id` BETWEEN 5720000 AND 6089999 OR `Id` BETWEEN 6100000 AND 9009999;
DELETE FROM waypoint_path WHERE `PathId` BETWEEN 1090000 AND 5299999 OR `PathId` BETWEEN 5310000 AND 5709999 OR `PathId` BETWEEN 5720000 AND 6089999 OR `PathId` BETWEEN 6100000 AND 9009999;

DELETE FROM creature_movement WHERE id IN (SELECT guid FROM tmp_creature);
DELETE FROM creature_movement_template WHERE entry IN (SELECT id FROM tmp_creature WHERE id NOT IN (12999,21075,23033,24110)); -- Exclude NPCs spawned in both instance and open world
Expand Down

0 comments on commit d39dbd8

Please sign in to comment.