Merge branch 'master' of https://github.com/cmangos/tbc-db

lduguid · Jan 21, 2025 · 7fad89b · 7fad89b
2 parents ab0239f + 0671290
commit 7fad89b
Show file tree

Hide file tree

Showing 64 changed files with 38,653 additions and 2,999 deletions.
diff --git a/ACID/acid_tbc.sql b/ACID/acid_tbc.sql
diff --git a/Updates/0334_outland_veins.sql b/Updates/0334_outland_veins.sql
@@ -6,7 +6,7 @@
 -- blades edge        - 72
 -- netherstorm        - 48
 -- shadowmoon         - 79
--- total              1205
+-- total               666
 
 -- adamantite - rough map counts
 -- hellfire peninsula - 0

diff --git a/Updates/0335_outland_herbs.sql b/Updates/0335_outland_herbs.sql
@@ -1,52 +1,53 @@
 SET @SGGUID := 21300;
 SET @GGUID := 5307600;
--- Golden Sansam - 176583 - https://www.wowhead.com/object=176583/golden-sansam
--- hellfire peninsula - 
--- zangarmarsh        - 
--- terokkar           - 
--- nagrand            - 
--- blades edge        - 
--- netherstorm        - 
--- shadowmoon         - 
--- total         
+-- Dreamfoil - 176584 - https://www.wowhead.com/tbc/object=176584/dreamfoil
+-- hellfire peninsula - 61
+-- zangarmarsh        - 41
+-- total             - 102
 
--- Mountain Silversage - 176586 - https://www.wowhead.com/object=176586/mountain-silversage     
+-- Golden Sansam - 176583 - https://www.wowhead.com/tbc/object=176583/golden-sansam
+-- hellfire peninsula - 58
+-- zangarmarsh        - 52
+-- netherstorm        - 16
+-- total             - 126
 
--- Hellfire Spineleaf - 181372 - https://www.wowhead.com/object=181372/hellfire-spineleaf
+-- Mountain Silversage - 176586 - https://www.wowhead.com/tbc/object=176586/mountain-silversage
+-- hellfire peninsula - 55
+
+-- Blindweed - 183046 - https://www.wowhead.com/tbc/object=183046/blindweed
+-- zangarmarsh - 59
+
+-- Liferoot - 2041 - https://www.wowhead.com/tbc/object=2041/liferoot
+-- netherstorm - 8
+
+-- Hellfire Spineleaf - 181372 - https://www.wowhead.com/tbc/object=181372/hellfire-spineleaf
+-- hellfire peninsula - 100
 
 -- Felweed - rough map counts - 181270 - https://www.wowhead.com/object=181270/felweed
--- hellfire peninsula - 
--- zangarmarsh        - 
--- terokkar           - 
--- nagrand            - 
--- blades edge        - 
--- netherstorm        - 
--- shadowmoon         - 
--- total              
+-- hellfire peninsula - 148
+-- zangarmarsh        - 117 - different entry
+-- terokkar           - 91
+-- nagrand            - 145
+-- blades edge        - 100
+-- netherstorm        - 20
+-- shadowmoon         - 90
+-- total              594 + 117
 
 -- Dreaming Glory - rough map counts - 181271 - https://www.wowhead.com/object=181271/dreaming-glory
--- hellfire peninsula - 
--- zangarmarsh        - 
--- terokkar           - 
--- nagrand            - 
--- blades edge        - 
--- netherstorm        - 
--- shadowmoon         - 
--- total            
-
--- Ragveil - rough map counts - 181275 - https://www.wowhead.com/object=181275/ragveil
--- hellfire peninsula - 
--- zangarmarsh        - 
--- terokkar           - 
--- nagrand            - 
--- blades edge        - 
--- netherstorm        - 
--- shadowmoon         - 
--- total        
-
--- Flamecap - 181276 - https://www.wowhead.com/object=181276/flame-cap
--- zangarmarsh        - 
--- total        
+-- hellfire peninsula - 52
+-- zangarmarsh        - 58 - different entry
+-- terokkar           - 86
+-- nagrand            - 100
+-- blades edge        - 85
+-- netherstorm        - 84
+-- shadowmoon         - 41
+-- total            448 + 58
+
+-- Ragveil - rough map counts - 183043 - https://www.wowhead.com/tbc/object=183043/ragveil + https://www.wowhead.com/tbc/object=181276/flame-cap
+-- zangarmarsh        - 174
+
+-- Ghost Mushroom
+-- zangarmarsh - 12
 
 -- select count(*) from gameobject where map=530 and id = 181277;
 -- Terocone - rough map counts - 181277 - https://www.wowhead.com/object=181277/terocone
@@ -177,7 +178,7 @@ INSERT INTO `spawn_group_spawn` (`Id`, `Guid`, `SlotId`) VALUES
 (@SGGUID+5, @GGUID+13, -1),
 -- Nagrand North
 (@SGGUID+6, @GGUID+9, -1),
-(@SGGUID+5, @GGUID+26, -1),
+(@SGGUID+6, @GGUID+26, -1),
 (@SGGUID+6, @GGUID+28, -1),
 (@SGGUID+6, @GGUID+53, -1),
 -- Barrier Hills 01
@@ -222,11 +223,11 @@ INSERT INTO `spawn_group_spawn` (`Id`, `Guid`, `SlotId`) VALUES
 -- total                121
 
 -- select count(*) from gameobject where map=530 and id = 181280;
--- Nightmare Vine - rough map counts - 181280 - https://www.wowhead.com/object=181280/nightmare-vine
--- hellfire peninsula - 12
--- blades edge        - 23
+-- Nightmare Vine - rough map counts - 181280 - https://www.wowhead.com/tbc/object=181280/nightmare-vine
+-- hellfire peninsula - 3
+-- blades edge        - 6
 -- shadowmoon         - 103
--- total                138
+-- total                112
 
 -- select count(*) from gameobject where map=530 and id = 185881;
 -- Netherdust Bush - 185881 - https://www.wowhead.com/object=185881/netherdust-bush

diff --git a/Updates/0421_VDB-20220224185216_world.sql b/Updates/0421_VDB-20220224185216_world.sql
@@ -11,14 +11,14 @@ UPDATE `creature_template` SET `GossipMenuId` = 3803 WHERE `entry` = 10684;
 DELETE FROM `gossip_menu` WHERE `entry` = 3803;
 INSERT INTO `gossip_menu` (`entry`, `text_id`, `condition_id`) VALUES
 (3803, 4635, 0),
-(3803, 4636, 9040);
+(3803, 4636, 9045);
 
 DELETE FROM `npc_text_broadcast_text` WHERE `id` = 4636 AND `BroadcastTextID0` = 7309;
 INSERT INTO `npc_text_broadcast_text` (`ID`, `BroadcastTextID0`, `Prob0`) VALUES (4636, 7309, 1);
 
--- 9040: Target Has Done Quest 5248
-DELETE FROM `conditions` WHERE `condition_entry` = 9040;
-INSERT INTO `conditions` (`condition_entry`, `type`, `value1`) VALUES (9040, 8, 5248);
+-- 9045: Target Has Done Quest 5248
+DELETE FROM `conditions` WHERE `condition_entry` = 9045;
+INSERT INTO `conditions` (`condition_entry`, `type`, `value1`) VALUES (9045, 8, 5248);
 
 -- ----------------------------------------------------------------------
 

diff --git a/Updates/0474_durotar_spell_lists.sql b/Updates/0474_durotar_spell_lists.sql
@@ -436,7 +436,8 @@ INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `C
 
 DELETE FROM `creature_spell_list` WHERE `Id` = 322501;
 INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
-(322501, 1, 3385, 0, -1, 2, 0, 100, 0, 0, 10000, 10000, 20000, 'Corrupted Mottled Boar - Boar Charge - self');
+(322501, 1, 3385, 0, -1, 2, 0, 100, 0, 0, 10000, 10000, 20000, 'Corrupted Mottled Boar - Boar Charge - self'),
+(322501, 2, 6818, 0, -1, 130, 0, 100, 0, 0, 10000, 10000, 25000, 'Corrupted Mottled Boar - Corrupted Intellect - top aggro aura not present');
 
 UPDATE `creature_template` SET `SpellList` = 322501 WHERE `entry` = 3225;
 
@@ -449,7 +450,8 @@ INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `C
 
 DELETE FROM `creature_spell_list` WHERE `Id` = 322601;
 INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
-(322601, 1, 5413, 0, -1, 130, 0, 100, 0, 0, 10000, 10000, 25000, 'Corrupted Scorpid - Noxious Catalyst - top aggro aura not present');
+(322601, 1, 5413, 0, -1, 130, 0, 100, 0, 0, 10000, 10000, 25000, 'Corrupted Scorpid - Noxious Catalyst - top aggro aura not present'),
+(322601, 2, 11918, 0, -1, 130, 0, 100, 0, 0, 10000, 10000, 25000, 'Corrupted Scorpid - Poison - top aggro aura not present');
 
 UPDATE `creature_template` SET `SpellList` = 322601 WHERE `entry` = 3226;
 

diff --git a/Updates/0481_eversong_fixes.sql b/Updates/0481_eversong_fixes.sql
@@ -1042,6 +1042,7 @@ DELETE FROM creature_movement WHERE id IN(56043,/*56065,*/1007504,1007505,100750
 -- Table `dbscripts_on_creature_movement` contain unused script, id 1565401. - despawn
 -- Table `dbscripts_on_creature_movement` contain unused script, id 1565501. - RUN ON
 DELETE FROM `dbscripts_on_creature_movement` WHERE `id` IN (1565401,1565501);
+UPDATE `creature_movement` SET `ScriptId` = 5 WHERE `id` = 56065 AND `point` = 1; -- creature_movement for entry 56065, point 1 have script_id 1565501 that does not exist in `dbscripts_on_creature_movement`, ignoring
 
 INSERT INTO creature(guid, id, map, spawnMask, position_x, position_y, position_z, orientation, spawntimesecsmin, spawntimesecsmax, spawndist, MovementType) VALUES
 (@CGUID + 37, '0', '530', '1', 8146.6187,-6758.287,71.86238,5.957955837249755859, '300', '300', '0', '2'),