Skip to content

Commit

Permalink
[CDB] Dustwallow Marsh - Tin Vein | Silver Vein
Browse files Browse the repository at this point in the history
no Tin Veins were spawned in Dustwallow Marsh, there should be 2

(cherry picked from commit cmangos/classic-db@5736e85

Co-authored-by: AnonXS <AnonXS@users.noreply.github.com>
  • Loading branch information
Tobschinski and AnonXS committed May 12, 2023
1 parent f7e8d4d commit b695ed2
Show file tree
Hide file tree
Showing 3 changed files with 126 additions and 1 deletion.
5 changes: 5 additions & 0 deletions Updates/0759_CDB-4342_thousand_needles_splithoof_hold.sql
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@

DELETE FROM `creature_addon` WHERE (`guid` IN (SELECT `guid` FROM `creature` where `id` IN (4093,4094,4096,4095,4097,4099)));
DELETE FROM `creature` WHERE (`guid` IN (13083, 13085, 13094, 13095, 13096, 13097, 13098, 13099, 20970, 20971, 20972, 20974, 20975, 20977, 20994, 21010, 21011, 21012, 21013, 21014, 21015, 21016, 21028, 21029,
21030, 21031, 21032, 21033, 21035, 21037, 21038, 21702, 21703, 21759, 21760, 21761, 21762, 21763, 21764, 21765, 21766, 21767, 21768, 21769, 21770, 21771));

DELETE FROM `creature_movement` WHERE (`id` IN (21763, 21769, 20977));
UPDATE `creature` SET `MovementType` = 0 WHERE (`guid`IN (21763, 21769, 20977));

REPLACE INTO `creature_addon` (`guid`, `sheath_state`, `stand_state`) VALUES
(140032, 1, 3),
(140033, 1, 3); -- no visual impact as centauren lack certain animation states

SET @CGUID := 140024;
SET @SGUID := 10103;

Expand Down
2 changes: 1 addition & 1 deletion Updates/0764_CDB-4347_loch_modan_silver_stream_mine.sql
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

DELETE FROM `creature` WHERE (`guid` IN (9147, 9151, 9155, 9317, 9319, 9322, 9332, 9408, 9409, 9414, 9149, 9150, 9311, 9318, 9321, 9323, 9325, 9326, 9327, 9328, 9333, 9407, 9410, 9153, 9154, 9156, 9192));

DELETE FROM `creature_movement` WHERE (`id` IN (9407));
DELETE FROM `creature_movement` WHERE (`id` IN (9407,9192)); -- 9192 (1425)
DELETE FROM `pool_creature_template` WHERE (`id` = 1425); -- 1425 1086 0 Grizlak (1425)
UPDATE `creature_template` SET `SpeedWalk` = 1 WHERE (`Entry` IN (1175, 1177, 1425));
DELETE FROM `pool_template` WHERE (`entry` = 1086); -- 1086 1 Grizlak (1425)
Expand Down
120 changes: 120 additions & 0 deletions Updates/0765_CDB-4348_dustwallow_marsh_tin_vein.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
-- https://github.com/cmangos/classic-db/commit/5736e856185a9d95b9f8e3b1546527ae6c54c519
-- Iron Deposit & Silver Vein (no Tin exists, surprisingly)
-- DELETE FROM `gameobject` WHERE (`guid` IN (40757, 40823, 120390));
-- DELETE FROM `pool_gameobject` WHERE (`guid` IN (40757, 40823, 120390));
UPDATE `pool_gameobject` SET `chance` = 0 WHERE `pool_entry` IN (7605,7708) AND `description` LIKE '%Mithril%'; -- TEMPORARY setting as main deposite

DELETE FROM `gameobject` WHERE `guid` BETWEEN 103425 AND 103430;
DELETE FROM `pool_gameobject` WHERE `guid` BETWEEN 103425 AND 103430;
DELETE FROM `pool_pool` WHERE `pool_id` = 7605;
DELETE FROM `pool_template` WHERE `entry` = 7605;

DELETE FROM `gameobject` WHERE `guid` BETWEEN 103919 AND 103924;
DELETE FROM `pool_gameobject` WHERE `guid` BETWEEN 103919 AND 103924;
DELETE FROM `pool_pool` WHERE `pool_id` = 7708;
DELETE FROM `pool_template` WHERE `entry` = 7708;

DELETE FROM `gameobject` WHERE `guid` BETWEEN 103431 AND 103436;
DELETE FROM `pool_gameobject` WHERE `guid` BETWEEN 103431 AND 103436;
DELETE FROM `pool_pool` WHERE `pool_id` = 7606;
DELETE FROM `pool_template` WHERE `entry` = 7606;

DELETE FROM `gameobject` WHERE `guid` BETWEEN 108513 AND 108518;
DELETE FROM `pool_gameobject` WHERE `guid` BETWEEN 108513 AND 108518;
DELETE FROM `pool_pool` WHERE `pool_id` = 9156;
DELETE FROM `pool_template` WHERE `entry` = 9156;

DELETE FROM `gameobject` WHERE `guid` BETWEEN 108507 AND 108512;
DELETE FROM `pool_gameobject` WHERE `guid` BETWEEN 108507 AND 108512;
DELETE FROM `pool_pool` WHERE `pool_id` = 9155;
DELETE FROM `pool_template` WHERE `entry` = 9155;

DELETE FROM `gameobject` WHERE `guid` IN (1044002,1044001,103425,103919);
DELETE FROM `pool_gameobject` WHERE `guid` IN (1044002,1044001,103425,103919);

-- nonexistant

-- 2042 19 Master Mineral Pool - Dustwallow Marsh, now ~18 but ok
DELETE FROM `gameobject` WHERE `guid` IN (SELECT `guid` FROM `pool_gameobject` WHERE `pool_entry` IN (SELECT `pool_id` FROM `pool_pool` WHERE `mother_pool` = 2042) AND `description` LIKE '%Tin%'); -- XXX wrong small thorium nodes in Thousand Needles
DELETE FROM `pool_gameobject` WHERE `pool_entry` IN (SELECT `pool_id` FROM `pool_pool` WHERE `mother_pool` = 2042) AND `description` LIKE '%Tin%';

DELETE FROM `gameobject` WHERE `guid` IN (SELECT `guid` FROM `pool_gameobject` WHERE `pool_entry` IN (SELECT `pool_id` FROM `pool_pool` WHERE `mother_pool` = 2042) AND `description` LIKE '%Silver%'); -- XXX wrong small thorium nodes in Thousand Needles
DELETE FROM `pool_gameobject` WHERE `pool_entry` IN (SELECT `pool_id` FROM `pool_pool` WHERE `mother_pool` = 2042) AND `description` LIKE '%Silver%'; -- Also delete Truesilver which is very rare.

DELETE FROM `gameobject` WHERE `guid` IN (SELECT `guid` FROM `pool_gameobject` WHERE `pool_entry` IN (SELECT `pool_id` FROM `pool_pool` WHERE `mother_pool` = 2042) AND `description` LIKE '%Gold%'); -- XXX wrong small thorium nodes in Thousand Needles
DELETE FROM `pool_gameobject` WHERE `pool_entry` IN (SELECT `pool_id` FROM `pool_pool` WHERE `mother_pool` = 2042) AND `description` LIKE '%Gold%';

-- https://www.wowhead.com/classic/object=2040/mithril-deposit
UPDATE `pool_gameobject` SET `chance` = 20 WHERE `pool_entry` IN (SELECT `pool_id` FROM `pool_pool` WHERE `mother_pool` = 2042) AND `description` LIKE '%Mithril%'; -- not so much Mithril, just in North Spider Cave and Soutern Area
-- 103239 7574 0 Mineral Spawn Point 1 - Iron
-- 103240 7574 30 Mineral Spawn Point 1 - Mithril
-- 103241 7574 16 Mineral Spawn Point 1 - Tin -> 0
-- 103242 7574 5 Mineral Spawn Point 1 - Silver -> 0
-- 103243 7574 3 Mineral Spawn Point 1 - Gold -> 0, only very few which will be respawned too soonishTM
-- 103244 7574 2 Mineral Spawn Point 1 - Truesilver -> 0, only very few which will be respawned too soonishTM


-- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

SET @OBJECT_1 = 140980;
SET @OBJECT_2 = 140981;
SET @OBJECT_3 = 140982;
SET @OBJECT_4 = 140983;
SET @OBJECT_5 = 140984;

SET @GROUP_ID = 10225;

INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecsmin`, `spawntimesecsmax`) VALUES
(@OBJECT_1, 0, 1, 1, -2737.970458984375, -2789.707519531250, 50.63771820068359375, 4.817109584808349609, 0, 0, -0.66913032531738281, 0.743145048618316650, 300, 600),
(@OBJECT_2, 0, 1, 1, -2512.523681640625, -2842.585693359375, 63.24610900878906250, 2.617989301681518554, 0, 0, 0.965925216674804687, 0.258821308612823486, 300, 600),
(@OBJECT_3, 0, 1, 1, -2356.372802734375, -3166.029541015625, 49.91487503051757812, 4.415683269500732421, 0, 0, -0.80385684967041015, 0.594822824001312255, 300, 600),
(@OBJECT_4, 0, 1, 1, -2632.812988281250, -3647.329101562500, 41.45550918579101562, 1.256635904312133789, 0, 0, 0.587784767150878906, 0.809017360210418701, 300, 600),
(@OBJECT_5, 0, 1, 1, -2748.489746093750, -4020.918457031250, 43.71214294433593750, 3.647741317749023437, 0, 0, -0.96814727783203125, 0.250381410121917724, 300, 600);

INSERT INTO `spawn_group_spawn` (`Id`, `Guid`, `SlotId`) VALUES
(@GROUP_ID, @OBJECT_1, '-1'),
(@GROUP_ID, @OBJECT_2, '-1'),
(@GROUP_ID, @OBJECT_3, '-1'),
(@GROUP_ID, @OBJECT_4, '-1'),
(@GROUP_ID, @OBJECT_5, '-1');

INSERT INTO `spawn_group` (`Id`, `Name`, `Type`, `MaxCount`, `WorldState`, `Flags`) VALUES
(@GROUP_ID, 'Dustwallow Marsh - Tin Vein | Silver Vein (1) Ore 000', '1', '1', '0', '0');

INSERT INTO `spawn_group_entry` (`Id`, `Entry`, `MinCount`, `MaxCount`, `Chance`) VALUES
(@GROUP_ID, '1732', '0', '0', '0'),
(@GROUP_ID, '1733', '0', '0', '5');

-- ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

SET @OBJECT_1 = 140990;
SET @OBJECT_2 = 140991;
SET @OBJECT_3 = 140992;
SET @OBJECT_4 = 140993;
SET @OBJECT_5 = 140994;
SET @OBJECT_6 = 140995;

SET @GROUP_ID = 10226;

INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecsmin`, `spawntimesecsmax`) VALUES
(@OBJECT_1, 0, 1, 1, -3608.114990234375, -3567.088134765625, 44.72138214111328125, 0.506144583225250244, 0, 0, 0.250379562377929687, 0.968147754669189453, 300, 600),
(@OBJECT_2, 0, 1, 1, -3770.909667968750, -3715.187011718750, 48.85344696044921875, 3.124123096466064453, 0, 0, 0.999961853027343750, 0.008734640665352344, 300, 600),
(@OBJECT_3, 0, 1, 1, -3814.187011718750, -3819.936279296875, 56.22981262207031250, 2.844882726669311523, 0, 0, 0.989015579223632812, 0.147811368107795715, 300, 600),
(@OBJECT_4, 0, 1, 1, -3876.552490234375, -3889.244873046875, 65.15455627441406250, 0.052358884364366531, 0, 0, 0.026176452636718750, 0.999657332897186279, 300, 600),
(@OBJECT_5, 0, 1, 1, -4117.821289062500, -3831.941894531250, 56.78618621826171875, 3.089183330535888671, 0, 0, 0.999656677246093750, 0.026201646775007247, 300, 600),
(@OBJECT_6, 0, 1, 1, -4203.838378906250, -3725.701416015625, 56.89252471923828125, 6.021387100219726562, 0, 0, -0.13052558898925781, 0.991444945335388183, 300, 600);

INSERT INTO `spawn_group_spawn` (`Id`, `Guid`, `SlotId`) VALUES
(@GROUP_ID, @OBJECT_1, '-1'),
(@GROUP_ID, @OBJECT_2, '-1'),
(@GROUP_ID, @OBJECT_3, '-1'),
(@GROUP_ID, @OBJECT_4, '-1'),
(@GROUP_ID, @OBJECT_5, '-1'),
(@GROUP_ID, @OBJECT_6, '-1');

INSERT INTO `spawn_group` (`Id`, `Name`, `Type`, `MaxCount`, `WorldState`, `Flags`) VALUES
(@GROUP_ID, 'Dustwallow Marsh - Tin Vein | Silver Vein (1) Ore 001', '1', '1', '0', '0');

INSERT INTO `spawn_group_entry` (`Id`, `Entry`, `MinCount`, `MaxCount`, `Chance`) VALUES
(@GROUP_ID, '1732', '0', '0', '0'),
(@GROUP_ID, '1733', '0', '0', '5');

0 comments on commit b695ed2

Please sign in to comment.