diff --git a/data/sql/updates/pending_db_world/rev_1715963160927436310.sql b/data/sql/updates/pending_db_world/rev_1715963160927436310.sql new file mode 100644 index 000000000..e32567761 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1715963160927436310.sql @@ -0,0 +1,197 @@ +-- +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Ancona Chicken' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7394; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Azure Whelpling' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7547; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Black Kingsnake' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7565; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Black Tabby Cat' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7383; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Blue Dragonhawk Hatchling' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=21056; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Blue Moth' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=21010; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Bombay Cat' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7385; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Brown Prairie Dog' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=14421; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Brown Rabbit' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=20472; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Brown Snake' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7562; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Cobra Hatchling' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=32591; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Cockroach' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7395; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Cornish Rex Cat' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7384; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Crimson Snake' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7567; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Crimson Whelpling' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7544; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Dark Whelpling' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7543; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Egbert' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=23258; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Emerald Whelpling' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7545; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Frosty' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=28883; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Ghostly Skull' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=29147; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Golden Dragonhawk Hatchling' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=21055; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Great Horned Owl' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7553; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Green Wing Macaw' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7387; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Hawk Owl' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7555; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Hyacinth Macaw' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7391; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Jubling' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=14878; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Lifelike Toad' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=12419; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Magical Crawdad' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=18839; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Mana Wyrmling' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=20408; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Mechanical Chicken' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=8376; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Mechanical Squirrel' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=2671; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Miniwing' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=22445; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Orange Tabby Cat' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7382; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Peddlefeet' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=16085; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Pengu' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=32595; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Proto-Drake Whelp' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=32592; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Red Dragonhawk Hatchling' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=21064; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Red Moth' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=21009; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Senegal' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7389; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Siamese Cat' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7380; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Silver Dragonhawk Hatchling' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=21063; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Silver Tabby Cat' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7381; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Sinister Squashling' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=23909; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Smolderweb Hatchling' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=10598; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Snowshoe Rabbit' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7560; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Speedy' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=16547; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Spirit of Summer' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=16701; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Sprite Darter Hatchling' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=9662; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Stinker' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=23274; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Tickbird Hatchling' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=32589; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Tree Frog' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7549; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Westfall Chicken' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=30379; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Whiskers the Rat' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=16549; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - White Kitten' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7386; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - White Moth' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=21018; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - White Tickbird Hatchling' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=32590; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Wood Frog' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=7550; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Worg Pup' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=10259; +UPDATE `conditions` SET `Comment`='Target Non-Combat Pet - Yellow Moth' WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48649 AND `ConditionValue2`=21008; + +DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 13) AND (`SourceGroup` = 1) AND (`SourceEntry` = 48649) +AND (`ConditionValue2` IN (14633,33205,14143,32841,18152,15661,23234,11236,15356,7563,7546,34364,40624,31128,26056,7390,32591,7388,36871,7558,28267,33530,33529,35396,7551,35395,15429,33194,33198,7570,33200,27346,27914,7548,9256,21076,40198,31575,25146,15360,7569,34694,36908,35400,16069,14632,17255,7552,35156,34930,32643,35387,36979,9657,40703,32939,23114,23198,15358,34770,35155,11326,42078,29089,24480,29726,16548,24389,33219,15361,33578,40721,15186,28470,18381,35399,35468,36607,11325,36911,27849,23266,37865,9656,29482,26119,15359,24753,27865,32818,16456,7392,15357,21266,35397,35398,35394,7568,25109,34531,15944,7566,25706,33810,34724,25147,26050,7554,36511,27217,7559,32791,33226,33188,16445,27196,27197,14755,35157,14756,25062,33197,15699,24388,38374,28513,7393,17254,23231,36909,15706,22943,36910)); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(13, 1, 48649, 0, 59, 31, 0, 3, 14633, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Albino Snapjaw'), +(13, 1, 48649, 0, 60, 31, 0, 3, 33205, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Ammen Vale Lashling'), +(13, 1, 48649, 0, 61, 31, 0, 3, 14143, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Ar\'lia'), +(13, 1, 48649, 0, 62, 31, 0, 3, 32841, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Baby Blizzard Bear'), +(13, 1, 48649, 0, 63, 31, 0, 3, 18152, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Baby Murloc'), +(13, 1, 48649, 0, 64, 31, 0, 3, 15661, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Baby shark'), +(13, 1, 48649, 0, 65, 31, 0, 3, 23234, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Bananas'), +(13, 1, 48649, 0, 66, 31, 0, 3, 11236, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Blood Parrot'), +(13, 1, 48649, 0, 67, 31, 0, 3, 15356, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Blue Baby Murloc'), +(13, 1, 48649, 0, 68, 31, 0, 3, 7563, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Blue Racer'), +(13, 1, 48649, 0, 69, 31, 0, 3, 7546, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Bronze Whelpling'), +(13, 1, 48649, 0, 70, 31, 0, 3, 34364, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Calico Cat'), +(13, 1, 48649, 0, 71, 31, 0, 3, 40624, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Celestial Dragon'), +(13, 1, 48649, 0, 72, 31, 0, 3, 31128, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Chilly'), +(13, 1, 48649, 0, 73, 31, 0, 3, 26056, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Chuck'), +(13, 1, 48649, 0, 74, 31, 0, 3, 7390, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Cockatiel'), +(13, 1, 48649, 0, 75, 31, 0, 3, 32591, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Cobra Hatchling'), +(13, 1, 48649, 0, 76, 31, 0, 3, 7388, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Cockatoo'), +(13, 1, 48649, 0, 77, 31, 0, 3, 36871, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Core Hound Pup'), +(13, 1, 48649, 0, 78, 31, 0, 3, 7558, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Cottontail Rabbit'), +(13, 1, 48649, 0, 79, 31, 0, 3, 28267, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Coyote Spirit'), +(13, 1, 48649, 0, 80, 31, 0, 3, 33530, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Curious Oracle Hatchling'), +(13, 1, 48649, 0, 81, 31, 0, 3, 33529, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Curious Wolvar Pup'), +(13, 1, 48649, 0, 82, 31, 0, 3, 35396, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Darting Hatchling'), +(13, 1, 48649, 0, 83, 31, 0, 3, 7551, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Dart Frog'), +(13, 1, 48649, 0, 84, 31, 0, 3, 35395, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Deviate Hatchling'), +(13, 1, 48649, 0, 85, 31, 0, 3, 15429, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Disgusting Oozeling'), +(13, 1, 48649, 0, 86, 31, 0, 3, 33194, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Dun Morogh Cub'), +(13, 1, 48649, 0, 87, 31, 0, 3, 33198, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Durotar Scorpion'), +(13, 1, 48649, 0, 88, 31, 0, 3, 7570, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Elven Wisp'), +(13, 1, 48649, 0, 89, 31, 0, 3, 33200, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Elwynn Lamb'), +(13, 1, 48649, 0, 90, 31, 0, 3, 27346, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Essence of Competition'), +(13, 1, 48649, 0, 91, 31, 0, 3, 27914, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Ethereal Soul-Trader'), +(13, 1, 48649, 0, 92, 31, 0, 3, 7548, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Faeling'), +(13, 1, 48649, 0, 93, 31, 0, 3, 9256, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Farm Chicken'), +(13, 1, 48649, 0, 94, 31, 0, 3, 21076, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Firefly'), +(13, 1, 48649, 0, 95, 31, 0, 3, 40198, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Frigid Frostling'), +(13, 1, 48649, 0, 96, 31, 0, 3, 31575, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Giant Sewer Rat'), +(13, 1, 48649, 0, 97, 31, 0, 3, 25146, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Golden Pig'), +(13, 1, 48649, 0, 98, 31, 0, 3, 15360, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Green Baby Murloc'), +(13, 1, 48649, 0, 99, 31, 0, 3, 7569, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Green Water snake'), +(13, 1, 48649, 0, 100, 31, 0, 3, 34694, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Grunty'), +(13, 1, 48649, 0, 101, 31, 0, 3, 36908, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Gryphon Hatchling'), +(13, 1, 48649, 0, 102, 31, 0, 3, 35400, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Gundrak Hatchling'), +(13, 1, 48649, 0, 103, 31, 0, 3, 16069, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Gurky'), +(13, 1, 48649, 0, 104, 31, 0, 3, 14632, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Hawksbill Snapjaw'), +(13, 1, 48649, 0, 105, 31, 0, 3, 17255, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Hippogryph Hatchling'), +(13, 1, 48649, 0, 106, 31, 0, 3, 7552, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Island Frog'), +(13, 1, 48649, 0, 107, 31, 0, 3, 35156, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Jade Panda'), +(13, 1, 48649, 0, 108, 31, 0, 3, 34930, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Jade Tiger'), +(13, 1, 48649, 0, 109, 31, 0, 3, 32643, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Kirin Tor Familiar'), +(13, 1, 48649, 0, 110, 31, 0, 3, 35387, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Leaping Hatchling'), +(13, 1, 48649, 0, 111, 31, 0, 3, 36979, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Lil\' K.T.'), +(13, 1, 48649, 0, 112, 31, 0, 3, 9657, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Lil\' Smoky'), +(13, 1, 48649, 0, 113, 31, 0, 3, 40703, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Lil\' XT'), +(13, 1, 48649, 0, 114, 31, 0, 3, 32939, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Little Fawn'), +(13, 1, 48649, 0, 115, 31, 0, 3, 23114, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Lucky'), +(13, 1, 48649, 0, 116, 31, 0, 3, 23198, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Lucky'), +(13, 1, 48649, 0, 117, 31, 0, 3, 15358, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Lucky'), +(13, 1, 48649, 0, 118, 31, 0, 3, 34770, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Macabre Marionette'), +(13, 1, 48649, 0, 119, 31, 0, 3, 35155, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Mana Spirit'), +(13, 1, 48649, 0, 120, 31, 0, 3, 11326, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Mini Diablo'), +(13, 1, 48649, 0, 121, 31, 0, 3, 42078, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Mini Thor'), +(13, 1, 48649, 0, 122, 31, 0, 3, 29089, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Mini Tyrael'), +(13, 1, 48649, 0, 123, 31, 0, 3, 24480, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Mojo'), +(13, 1, 48649, 0, 124, 31, 0, 3, 29726, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Mr. Chilly'), +(13, 1, 48649, 0, 125, 31, 0, 3, 16548, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Mr. Wiggles'), +(13, 1, 48649, 0, 126, 31, 0, 3, 24389, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Muckbreath'), +(13, 1, 48649, 0, 127, 31, 0, 3, 33219, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Mulgore Hatchling'), +(13, 1, 48649, 0, 128, 31, 0, 3, 15361, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Murki'), +(13, 1, 48649, 0, 129, 31, 0, 3, 33578, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Murkimus the Gladiator'), +(13, 1, 48649, 0, 130, 31, 0, 3, 40721, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Murkimus the Gladiator'), +(13, 1, 48649, 0, 131, 31, 0, 3, 15186, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Murky'), +(13, 1, 48649, 0, 132, 31, 0, 3, 28470, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Nether Ray Fry'), +(13, 1, 48649, 0, 133, 31, 0, 3, 18381, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Netherwhelp'), +(13, 1, 48649, 0, 134, 31, 0, 3, 35399, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Obsidian Hatchling'), +(13, 1, 48649, 0, 135, 31, 0, 3, 35468, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Onyx Panther'), +(13, 1, 48649, 0, 136, 31, 0, 3, 36607, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Onyxian Whelpling'), +(13, 1, 48649, 0, 137, 31, 0, 3, 11325, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Panda Cub'), +(13, 1, 48649, 0, 138, 31, 0, 3, 36911, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Pandaren Monk'), +(13, 1, 48649, 0, 139, 31, 0, 3, 27849, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Patchy'), +(13, 1, 48649, 0, 140, 31, 0, 3, 23266, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Peanut'), +(13, 1, 48649, 0, 141, 31, 0, 3, 37865, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Perky Pug'), +(13, 1, 48649, 0, 142, 31, 0, 3, 9656, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Pet Bombling'), +(13, 1, 48649, 0, 143, 31, 0, 3, 29482, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Pet Skunk'), +(13, 1, 48649, 0, 144, 31, 0, 3, 26119, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Phoenix Hatchling'), +(13, 1, 48649, 0, 145, 31, 0, 3, 15359, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Pink Baby Murloc'), +(13, 1, 48649, 0, 146, 31, 0, 3, 24753, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Pint-Sized Pink Pachyderm'), +(13, 1, 48649, 0, 147, 31, 0, 3, 27865, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Plagued pet'), +(13, 1, 48649, 0, 148, 31, 0, 3, 32818, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Plump Turkey'), +(13, 1, 48649, 0, 149, 31, 0, 3, 16456, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Poley'), +(13, 1, 48649, 0, 150, 31, 0, 3, 7392, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Prairie Chicken'), +(13, 1, 48649, 0, 151, 31, 0, 3, 15357, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Purple Baby Murloc'), +(13, 1, 48649, 0, 152, 31, 0, 3, 21266, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Ravager Hatchling'), +(13, 1, 48649, 0, 153, 31, 0, 3, 35397, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Ravasaur Hatchling'), +(13, 1, 48649, 0, 154, 31, 0, 3, 35398, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Razormaw Hatchling'), +(13, 1, 48649, 0, 155, 31, 0, 3, 35394, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Razzashi Hatchling'), +(13, 1, 48649, 0, 156, 31, 0, 3, 7568, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Ribbon Snake'), +(13, 1, 48649, 0, 157, 31, 0, 3, 25109, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Rocket Chicken'), +(13, 1, 48649, 0, 158, 31, 0, 3, 34531, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Roo'), +(13, 1, 48649, 0, 159, 31, 0, 3, 15944, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Ruby Serpent'), +(13, 1, 48649, 0, 160, 31, 0, 3, 7566, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Scarlet Snake'), +(13, 1, 48649, 0, 161, 31, 0, 3, 25706, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Scorchling'), +(13, 1, 48649, 0, 162, 31, 0, 3, 33810, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Sen\'jin Fetish'), +(13, 1, 48649, 0, 163, 31, 0, 3, 34724, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Shimmering Wyrmling'), +(13, 1, 48649, 0, 164, 31, 0, 3, 25147, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Silver Pig'), +(13, 1, 48649, 0, 165, 31, 0, 3, 26050, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Snarly'), +(13, 1, 48649, 0, 166, 31, 0, 3, 7554, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Snowy Owl'), +(13, 1, 48649, 0, 167, 31, 0, 3, 36511, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Spectral Tiger Cub'), +(13, 1, 48649, 0, 168, 31, 0, 3, 27217, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Spirit of Competition'), +(13, 1, 48649, 0, 169, 31, 0, 3, 7559, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Spotted Rabbit'), +(13, 1, 48649, 0, 170, 31, 0, 3, 32791, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Spring Rabbit'), +(13, 1, 48649, 0, 171, 31, 0, 3, 33226, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Strand Scrawler'), +(13, 1, 48649, 0, 172, 31, 0, 3, 33188, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Teldrassil Sproutling'), +(13, 1, 48649, 0, 173, 31, 0, 3, 16445, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Terky'), +(13, 1, 48649, 0, 174, 31, 0, 3, 27196, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Tiny Blue Dragon'), +(13, 1, 48649, 0, 175, 31, 0, 3, 27197, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Tiny Gold Dragon'), +(13, 1, 48649, 0, 176, 31, 0, 3, 14755, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Tiny Green Dragon'), +(13, 1, 48649, 0, 177, 31, 0, 3, 35157, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Tiny Jade Dragon'), +(13, 1, 48649, 0, 178, 31, 0, 3, 14756, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Tiny Red Dragon'), +(13, 1, 48649, 0, 179, 31, 0, 3, 25062, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Tiny Sporebat'), +(13, 1, 48649, 0, 180, 31, 0, 3, 33197, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Tirisfal Batling'), +(13, 1, 48649, 0, 181, 31, 0, 3, 15699, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Tranquil Mechanical Yeti'), +(13, 1, 48649, 0, 182, 31, 0, 3, 24388, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Toothy'), +(13, 1, 48649, 0, 183, 31, 0, 3, 38374, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Toxic Wasteling'), +(13, 1, 48649, 0, 184, 31, 0, 3, 28513, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Vampiric Batling'), +(13, 1, 48649, 0, 185, 31, 0, 3, 7393, 0, 0, 0, 0, '', 'Target Non-Combat Pet - White Plymouth Rock'), +(13, 1, 48649, 0, 186, 31, 0, 3, 17254, 0, 0, 0, 0, '', 'Target Non-Combat Pet - White Tiger Cub'), +(13, 1, 48649, 0, 187, 31, 0, 3, 23231, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Willy'), +(13, 1, 48649, 0, 188, 31, 0, 3, 36909, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Wind Riber Cub'), +(13, 1, 48649, 0, 189, 31, 0, 3, 15706, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Winter Reindeer'), +(13, 1, 48649, 0, 190, 31, 0, 3, 22943, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Wolpertinger'), +(13, 1, 48649, 0, 191, 31, 0, 3, 36910, 0, 0, 0, 0, '', 'Target Non-Combat Pet - Zipao Tiger'); diff --git a/src/server/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp index 4aae7ba20..2138aa0c5 100644 --- a/src/server/scripts/Pet/pet_generic.cpp +++ b/src/server/scripts/Pet/pet_generic.cpp @@ -718,11 +718,15 @@ struct npc_pet_gen_toxic_wasteling : public PassiveAI } }; +enum FetchBall +{ + SPELL_PET_TOY_FETCH_BALL_COME_HERE = 48649, + SPELL_PET_TOY_FETCH_BALL_HAS_BALL = 48708 +}; + struct npc_pet_gen_fetch_ball : public NullCreatureAI { - npc_pet_gen_fetch_ball(Creature* c) : NullCreatureAI(c) - { - } + npc_pet_gen_fetch_ball(Creature* c) : NullCreatureAI(c) { } uint32 checkTimer; ObjectGuid targetGUID; @@ -735,12 +739,12 @@ struct npc_pet_gen_fetch_ball : public NullCreatureAI me->SetOwnerGUID(summoner->GetGUID()); checkTimer = 0; targetGUID.Clear(); - me->CastSpell(me, 48649 /*SPELL_PET_TOY_FETCH_BALL_COME_HERE*/, true); + me->CastSpell(me, SPELL_PET_TOY_FETCH_BALL_COME_HERE, true); } void SpellHitTarget(Unit* target, SpellInfo const* spellInfo) override { - if (spellInfo->Id == 48649 /*SPELL_PET_TOY_FETCH_BALL_COME_HERE*/) + if (spellInfo->Id == SPELL_PET_TOY_FETCH_BALL_COME_HERE) { target->GetMotionMaster()->MovePoint(50, me->GetHomePosition()); targetGUID = target->GetGUID(); @@ -757,8 +761,8 @@ struct npc_pet_gen_fetch_ball : public NullCreatureAI if (me->GetDistance2d(target) < 2.0f) { target->AI()->EnterEvadeMode(); - target->CastSpell(target, 48708 /*SPELL_PET_TOY_FETCH_BALL_HAS_BALL*/, true); - me->DespawnOrUnsummon(1); + target->CastSpell(target, SPELL_PET_TOY_FETCH_BALL_HAS_BALL, true); + me->DespawnOrUnsummon(); } } }