diff options
13 files changed, 474 insertions, 10 deletions
diff --git a/sql/updates/world/2014_04_27_00_world_misc.sql b/sql/updates/world/2014_04_27_00_world_misc.sql new file mode 100644 index 00000000000..4046efcc190 --- /dev/null +++ b/sql/updates/world/2014_04_27_00_world_misc.sql @@ -0,0 +1,24 @@ +-- Reconnaissance Flight (12671) +-- additions +SET @PLANE := 28710; -- Vic's Flying Machine +SET @SPELL_PLANE := 52256; -- Vic's Flying Machine Validate (must have condition to target player) +SET @SPELL_LAND := 52226; -- Land Flying Machine +SET @GOB_LANDING := 190708; -- Landing Pad Focus +SET @SPELL_AGGRO := 52259; -- Vic's Flying Machine Aggro Dummy +SET @NPC_SCREECHER := 28170; -- Frosthowl Screecher +SET @SPELL_SBOLT := 52257; -- Shadow Bolt + +UPDATE `creature_template` SET InhabitType='4' WHERE `entry`=@PLANE; +DELETE FROM `vehicle_template_accessory` WHERE `entry`=@PLANE; + +DELETE FROM `conditions` WHERE (`SourceEntry`=@SPELL_LAND AND `SourceTypeOrReferenceId`=17) OR (`SourceEntry` IN (@SPELL_AGGRO,@SPELL_SBOLT) AND `SourceTypeOrReferenceId`=13); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +-- because vehicles ignore spell focus we add an extra condition to fill in for this +(17,0,@SPELL_LAND,0,0,30,0,@GOB_LANDING,10,0,0,0,0,'','Requires Landing Pad Focus near to cast Land Flying Machine'), +(13,1,@SPELL_AGGRO,0,0,31,0,3,@NPC_SCREECHER,0,0,0,0,'','Vic''s Flying Machine Aggro Dummy to Frosthowl Screecher'), +(13,1,@SPELL_SBOLT,0,0,31,0,3,@PLANE,0,0,0,0,'','Shadow Bolt to Vic''s Flying Machine'); + +-- Frosthowl Screecher +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@NPC_SCREECHER; +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 +(@NPC_SCREECHER,0,0,0,0,0,100,0,0,0,3000,4000,11,52257,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Shadow Bolt'); diff --git a/sql/updates/world/2014_04_27_01_world_gossip_menu_option.sql b/sql/updates/world/2014_04_27_01_world_gossip_menu_option.sql new file mode 100644 index 00000000000..0ed8a806cf8 --- /dev/null +++ b/sql/updates/world/2014_04_27_01_world_gossip_menu_option.sql @@ -0,0 +1,223 @@ +DELETE FROM `gossip_menu` WHERE (`entry`=646 AND `text_id`=7017) OR (`entry`=657 AND `text_id`=1220) OR (`entry`=657 AND `text_id`=7026) OR (`entry`=940 AND `text_id`=1514) OR (`entry`=941 AND `text_id`=1515) OR (`entry`=1047 AND `text_id`=1647) OR (`entry`=1049 AND `text_id`=1649) OR (`entry`=1469 AND `text_id`=2138) OR (`entry`=2386 AND `text_id`=3056) OR (`entry`=2721 AND `text_id`=3380) OR (`entry`=2952 AND `text_id`=3666) OR (`entry`=3202 AND `text_id`=3960) OR (`entry`=4152 AND `text_id`=5177) OR (`entry`=4508 AND `text_id`=5694) OR (`entry`=4510 AND `text_id`=4986) OR (`entry`=4544 AND `text_id`=4439) OR (`entry`=4554 AND `text_id`=560) OR (`entry`=4764 AND `text_id`=5821) OR (`entry`=4844 AND `text_id`=5919) OR (`entry`=5268 AND `text_id`=6287) OR (`entry`=5855 AND `text_id`=7027) OR (`entry`=5962 AND `text_id`=7115) OR (`entry`=6185 AND `text_id`=7340) OR (`entry`=6187 AND `text_id`=7341) OR (`entry`=6210 AND `text_id`=7363) OR (`entry`=6211 AND `text_id`=7364) OR (`entry`=6212 AND `text_id`=7365) OR (`entry`=6213 AND `text_id`=7375) OR (`entry`=6222 AND `text_id`=7379) OR (`entry`=6470 AND `text_id`=7642) OR (`entry`=6472 AND `text_id`=7642) OR (`entry`=6473 AND `text_id`=7642) OR (`entry`=6474 AND `text_id`=7642) OR (`entry`=6475 AND `text_id`=7642) OR (`entry`=6478 AND `text_id`=7678) OR (`entry`=6480 AND `text_id`=7678) OR (`entry`=6482 AND `text_id`=7678) OR (`entry`=6502 AND `text_id`=7699) OR (`entry`=6506 AND `text_id`=7699) OR (`entry`=7236 AND `text_id`=8536) OR (`entry`=7361 AND `text_id`=8822) OR (`entry`=7398 AND `text_id`=8862) OR (`entry`=7399 AND `text_id`=8865) OR (`entry`=7400 AND `text_id`=8868) OR (`entry`=7428 AND `text_id`=8990) OR (`entry`=7429 AND `text_id`=8991) OR (`entry`=7430 AND `text_id`=8992) OR (`entry`=7434 AND `text_id`=8997) OR (`entry`=7479 AND `text_id`=9061) OR (`entry`=7700 AND `text_id`=9395) OR (`entry`=7858 AND `text_id`=9623) OR (`entry`=7859 AND `text_id`=9622) OR (`entry`=8494 AND `text_id`=10214) OR (`entry`=8775 AND `text_id`=11217) OR (`entry`=8816 AND `text_id`=11324) OR (`entry`=8817 AND `text_id`=11328) OR (`entry`=8853 AND `text_id`=11496) OR (`entry`=8875 AND `text_id`=11580) OR (`entry`=8885 AND `text_id`=11614) OR (`entry`=8886 AND `text_id`=11622) OR (`entry`=8917 AND `text_id`=11851) OR (`entry`=8926 AND `text_id`=11898) OR (`entry`=8929 AND `text_id`=11912) OR (`entry`=9044 AND `text_id`=12221) OR (`entry`=9200 AND `text_id`=12500) OR (`entry`=9201 AND `text_id`=12502) OR (`entry`=9253 AND `text_id`=12566) OR (`entry`=9253 AND `text_id`=12591) OR (`entry`=9262 AND `text_id`=12577) OR (`entry`=9295 AND `text_id`=12607) OR (`entry`=9296 AND `text_id`=12608) OR (`entry`=9297 AND `text_id`=12606) OR (`entry`=9418 AND `text_id`=12664) OR (`entry`=9492 AND `text_id`=12775) OR (`entry`=9495 AND `text_id`=12780) OR (`entry`=9600 AND `text_id`=12958) OR (`entry`=9631 AND `text_id`=13031) OR (`entry`=9669 AND `text_id`=13100) OR (`entry`=9821 AND `text_id`=13557) OR (`entry`=9853 AND `text_id`=13642) OR (`entry`=9871 AND `text_id`=13682) OR (`entry`=9923 AND `text_id`=13786) OR (`entry`=9928 AND `text_id`=13800) OR (`entry`=9983 AND `text_id`=13832) OR (`entry`=10012 AND `text_id`=13883) OR (`entry`=10200 AND `text_id`=14159) OR (`entry`=10200 AND `text_id`=14160) OR (`entry`=10204 AND `text_id`=14168) OR (`entry`=10204 AND `text_id`=14169) OR (`entry`=10204 AND `text_id`=14170) OR (`entry`=10366 AND `text_id`=14375) OR (`entry`=10398 AND `text_id`=14431) OR (`entry`=10400 AND `text_id`=14436) OR (`entry`=10402 AND `text_id`=14438) OR (`entry`=10453 AND `text_id`=14489) OR (`entry`=10464 AND `text_id`=14492) OR (`entry`=10465 AND `text_id`=14492) OR (`entry`=10476 AND `text_id`=14497) OR (`entry`=10477 AND `text_id`=14496) OR (`entry`=10601 AND `text_id`=14670) OR (`entry`=10605 AND `text_id`=14673) OR (`entry`=10614 AND `text_id`=14688) OR (`entry`=10614 AND `text_id`=14738) OR (`entry`=10860 AND `text_id`=15081) OR (`entry`=10906 AND `text_id`=15152) OR (`entry`=10923 AND `text_id`=15172) OR (`entry`=10930 AND `text_id`=15189) OR (`entry`=10944 AND `text_id`=15412) OR (`entry`=10949 AND `text_id`=15214) OR (`entry`=11016 AND `text_id`=15221) OR (`entry`=11032 AND `text_id`=15340) OR (`entry`=11397 AND `text_id`=15877) OR (`entry`=11398 AND `text_id`=15876); +INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES +(646, 7017), +(657, 1220), +(657, 7026), +(940, 1514), +(941, 1515), +(1047, 1647), +(1049, 1649), +(1469, 2138), +(2386, 3056), +(2721, 3380), +(2952, 3666), +(3202, 3960), +(4152, 5177), +(4508, 5694), +(4510, 4986), +(4544, 4439), +(4554, 560), +(4764, 5821), +(4844, 5919), +(5268, 6287), +(5855, 7027), +(5962, 7115), +(6185, 7340), +(6187, 7341), +(6210, 7363), +(6211, 7364), +(6212, 7365), +(6213, 7375), +(6222, 7379), +(6470, 7642), +(6472, 7642), +(6473, 7642), +(6474, 7642), +(6475, 7642), +(6478, 7678), +(6480, 7678), +(6482, 7678), +(6502, 7699), +(6506, 7699), +(7236, 8536), +(7361, 8822), +(7398, 8862), +(7399, 8865), +(7400, 8868), +(7428, 8990), +(7429, 8991), +(7430, 8992), +(7434, 8997), +(7479, 9061), +(7700, 9395), +(7858, 9623), +(7859, 9622), +(8494, 10214), +(8775, 11217), +(8816, 11324), +(8817, 11328), +(8853, 11496), +(8875, 11580), +(8885, 11614), +(8886, 11622), +(8917, 11851), +(8926, 11898), +(8929, 11912), +(9044, 12221), +(9200, 12500), +(9201, 12502), +(9253, 12566), +(9253, 12591), +(9262, 12577), +(9295, 12607), +(9296, 12608), +(9297, 12606), +(9418, 12664), +(9492, 12775), +(9495, 12780), +(9600, 12958), +(9631, 13031), +(9669, 13100), +(9821, 13557), +(9853, 13642), +(9871, 13682), +(9923, 13786), +(9928, 13800), +(9983, 13832), +(10012, 13883), +(10200, 14159), +(10200, 14160), +(10204, 14168), +(10204, 14169), +(10204, 14170), +(10366, 14375), +(10398, 14431), +(10400, 14436), +(10402, 14438), +(10453, 14489), +(10464, 14492), +(10465, 14492), +(10476, 14497), +(10477, 14496), +(10601, 14670), +(10605, 14673), +(10614, 14688), +(10614, 14738), +(10860, 15081), +(10906, 15152), +(10923, 15172), +(10930, 15189), +(10944, 15412), +(10949, 15214), +(11016, 15221), +(11032, 15340), +(11397, 15877), +(11398, 15876); + + +DELETE FROM `gossip_menu_option` WHERE (`menu_id`=344 AND `id`=3) OR (`menu_id`=646 AND `id`=0) OR (`menu_id`=900 AND `id`=0) OR (`menu_id`=940 AND `id`=0) OR (`menu_id`=942 AND `id`=0) OR (`menu_id`=942 AND `id`=1) OR (`menu_id`=1022 AND `id`=0) OR (`menu_id`=1142 AND `id`=0) OR (`menu_id`=1293 AND `id`=3) OR (`menu_id`=1801 AND `id`=0) OR (`menu_id`=1802 AND `id`=0) OR (`menu_id`=1802 AND `id`=1) OR (`menu_id`=1971 AND `id`=0) OR (`menu_id`=2306 AND `id`=0) OR (`menu_id`=2422 AND `id`=0) OR (`menu_id`=2890 AND `id`=1) OR (`menu_id`=2890 AND `id`=5) OR (`menu_id`=2952 AND `id`=0) OR (`menu_id`=3624 AND `id`=0) OR (`menu_id`=3626 AND `id`=0) OR (`menu_id`=3626 AND `id`=1) OR (`menu_id`=4149 AND `id`=0) OR (`menu_id`=4152 AND `id`=0) OR (`menu_id`=4166 AND `id`=0) OR (`menu_id`=4210 AND `id`=0) OR (`menu_id`=4306 AND `id`=0) OR (`menu_id`=4354 AND `id`=0) OR (`menu_id`=4554 AND `id`=0) OR (`menu_id`=4554 AND `id`=1) OR (`menu_id`=4746 AND `id`=0) OR (`menu_id`=4822 AND `id`=0) OR (`menu_id`=4844 AND `id`=0) OR (`menu_id`=5221 AND `id`=0) OR (`menu_id`=5221 AND `id`=1) OR (`menu_id`=5262 AND `id`=0) OR (`menu_id`=5262 AND `id`=1) OR (`menu_id`=5262 AND `id`=2) OR (`menu_id`=5262 AND `id`=3) OR (`menu_id`=5262 AND `id`=4) OR (`menu_id`=5262 AND `id`=5) OR (`menu_id`=5262 AND `id`=6) OR (`menu_id`=5263 AND `id`=0) OR (`menu_id`=5263 AND `id`=1) OR (`menu_id`=5268 AND `id`=0) OR (`menu_id`=5268 AND `id`=1) OR (`menu_id`=5268 AND `id`=2) OR (`menu_id`=5268 AND `id`=3) OR (`menu_id`=5268 AND `id`=4) OR (`menu_id`=5268 AND `id`=5) OR (`menu_id`=5268 AND `id`=6) OR (`menu_id`=6185 AND `id`=0) OR (`menu_id`=6185 AND `id`=1) OR (`menu_id`=6185 AND `id`=2) OR (`menu_id`=6185 AND `id`=3) OR (`menu_id`=6186 AND `id`=0) OR (`menu_id`=6187 AND `id`=0) OR (`menu_id`=6210 AND `id`=0) OR (`menu_id`=6210 AND `id`=1) OR (`menu_id`=6210 AND `id`=2) OR (`menu_id`=6211 AND `id`=0) OR (`menu_id`=6213 AND `id`=1) OR (`menu_id`=7149 AND `id`=0) OR (`menu_id`=7428 AND `id`=0) OR (`menu_id`=7429 AND `id`=0) OR (`menu_id`=7430 AND `id`=0) OR (`menu_id`=7859 AND `id`=0) OR (`menu_id`=8917 AND `id`=0) OR (`menu_id`=9200 AND `id`=0) OR (`menu_id`=9280 AND `id`=0) OR (`menu_id`=9297 AND `id`=0) OR (`menu_id`=9297 AND `id`=1) OR (`menu_id`=9418 AND `id`=0) OR (`menu_id`=9492 AND `id`=0) OR (`menu_id`=9669 AND `id`=0) OR (`menu_id`=9683 AND `id`=0) OR (`menu_id`=9848 AND `id`=0) OR (`menu_id`=9928 AND `id`=0) OR (`menu_id`=10012 AND `id`=0) OR (`menu_id`=10200 AND `id`=0) OR (`menu_id`=10204 AND `id`=0) OR (`menu_id`=10204 AND `id`=1) OR (`menu_id`=10206 AND `id`=0) OR (`menu_id`=10316 AND `id`=1) OR (`menu_id`=10366 AND `id`=0) OR (`menu_id`=10464 AND `id`=1) OR (`menu_id`=10465 AND `id`=1) OR (`menu_id`=10477 AND `id`=0) OR (`menu_id`=10601 AND `id`=0) OR (`menu_id`=10614 AND `id`=0) OR (`menu_id`=10614 AND `id`=2) OR (`menu_id`=10614 AND `id`=3) OR (`menu_id`=10860 AND `id`=0) OR (`menu_id`=10949 AND `id`=0) OR (`menu_id`=10949 AND `id`=1) OR (`menu_id`=11014 AND `id`=0) OR (`menu_id`=11014 AND `id`=3) OR (`menu_id`=11014 AND `id`=4) OR (`menu_id`=11014 AND `id`=5) OR (`menu_id`=11016 AND `id`=0) OR (`menu_id`=11016 AND `id`=1) OR (`menu_id`=11016 AND `id`=3) OR (`menu_id`=11016 AND `id`=5) OR (`menu_id`=11104 AND `id`=0) OR (`menu_id`=11398 AND `id`=0); +INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `OptionBroadcastTextID`, `box_coded`, `box_money`, `box_text`) VALUES +(344, 3, 1, 'Let me browse your goods.', 2823, 0, 0, ''), +(646, 0, 3, 'Train me.', 3266, 0, 0, ''), +(900, 0, 1, 'I would like to buy from you.', 2583, 0, 0, ''), +(940, 0, 0, 'Will you blow up that door now?', 3805, 0, 0, ''), +(942, 0, 0, 'Please tell me more about the hippogryphs.', 3814, 0, 0, ''), +(942, 1, 0, 'Please tell me more about the Gordunni ogres.', 3923, 0, 0, ''), +(1022, 0, 3, 'Train me.', 3266, 0, 0, ''), +(1142, 0, 0, 'Tell me more, Trenton.', 4183, 0, 0, ''), +(1293, 3, 1, 'I want to browse your goods.', 3370, 0, 0, ''), +(1801, 0, 0, 'How can I get Evoroot?', 4827, 0, 0, ''), +(1802, 0, 0, 'Can you tell me how I can get a Videre Elixir?', 4721, 0, 0, ''), +(1802, 1, 1, 'Buy somethin'', will ya?', 4720, 0, 0, ''), +(1971, 0, 0, 'Where is the zeppelin now?', 22086, 0, 0, ''), +(2306, 0, 0, 'I need help in defeating the shadowsilk poachers.', 5306, 0, 0, ''), +(2422, 0, 0, 'What do you think of Dadanga?', 5512, 0, 0, ''), +(2890, 1, 5, 'Make this inn your home.', 2822, 0, 0, ''), +(2890, 5, 1, 'I want to browse your goods.', 3370, 0, 0, ''), +(2952, 0, 1, 'I would like to buy from you.', 2583, 0, 0, ''), +(3624, 0, 0, 'What about the Winterfall furbolg?', 7139, 0, 0, ''), +(3626, 0, 3, 'I''d like to train.', 7149, 0, 0, ''), +(3626, 1, 1, 'Let me browse your goods.', 2823, 0, 0, ''), +(4149, 0, 3, 'Train me.', 3266, 0, 0, ''), +(4152, 0, 3, 'Train me.', 3266, 0, 0, ''), +(4166, 0, 3, 'Train me.', 3266, 0, 0, ''), +(4210, 0, 3, 'Train me.', 3266, 0, 0, ''), +(4306, 0, 2, 'Sure! Let''s go for a ride.', 8105, 0, 0, ''), +(4354, 0, 3, 'Train me.', 3266, 0, 0, ''), +(4554, 0, 3, 'I am interested in mage training.', 2522, 0, 0, ''), +(4554, 1, 0, 'I wish to unlearn my talents.', 8271, 0, 0, ''), +(4746, 0, 1, 'I wish to browse your goods, Dirge.', 8345, 0, 0, ''), +(4822, 0, 3, 'Please teach me.', 8442, 0, 0, ''), +(4844, 0, 3, 'Train me.', 3266, 0, 0, ''), +(5221, 0, 3, 'I''d like some weapon training', 8811, 0, 0, ''), +(5221, 1, 0, 'What can other weapon masters teach?', 8812, 0, 0, ''), +(5262, 0, 0, 'Crossbow', 20582, 0, 0, ''), +(5262, 1, 0, 'Dagger', 20583, 0, 0, ''), +(5262, 2, 0, 'Fist Weapon', 20584, 0, 0, ''), +(5262, 3, 0, 'Gun', 20585, 0, 0, ''), +(5262, 4, 0, 'Mace', 20586, 0, 0, ''), +(5262, 5, 0, 'Polearm', 20587, 0, 0, ''), +(5262, 6, 0, 'Sword', 20589, 0, 0, ''), +(5263, 0, 3, 'I''d like some weapon training', 8811, 0, 0, ''), +(5263, 1, 0, 'What can other weapon masters teach?', 8812, 0, 0, ''), +(5268, 0, 0, 'Axe', 20580, 0, 0, ''), +(5268, 1, 0, 'Bow', 20581, 0, 0, ''), +(5268, 2, 0, 'Fist Weapon', 20584, 0, 0, ''), +(5268, 3, 0, 'Gun', 20585, 0, 0, ''), +(5268, 4, 0, 'Mace', 20586, 0, 0, ''), +(5268, 5, 0, 'Staff', 20588, 0, 0, ''), +(5268, 6, 0, 'Thrown', 20590, 0, 0, ''), +(6185, 0, 0, 'I slay the man on the spot as my liege would expect me to do, as he is nothing more than a thief and a liar.', 10049, 0, 0, ''), +(6185, 1, 0, 'I turn over the man to my liege for punishment, as he has broken the law of the land and it is my sworn duty to enforce it.', 10050, 0, 0, ''), +(6185, 2, 0, 'I confiscate the corn he has stolen, warn him that stealing is a path towards doom and destruction, but I let him go to return to his family.', 10051, 0, 0, ''), +(6185, 3, 0, 'I allow the man to take enough corn to feed his family for a couple of days, encouraging him to leave the land.', 10052, 0, 0, ''), +(6186, 0, 0, 'I am ready to discover where my fortune lies!', 10047, 0, 0, ''), +(6187, 0, 0, 'I execute him as per my liege''s instructions, and do it in such a manner that he suffers painfully before he dies as retribution for his crimes against my people.', 10075, 0, 0, ''), +(6210, 0, 0, 'I would show my liege the beast''s ear and claim the beast''s death as my own, taking the reward for my own use. It is wrong to claim a deed as your own that someone else in fact did.\r\n', 10087, 0, 0, ''), +(6210, 1, 0, 'I would show my liege the beast''s ear and claim the beast''s death as my own - after all, I did slay it. I would then offer some of the reward to the destitute knight to help his family.', 10088, 0, 0, ''), +(6210, 2, 0, 'I would remain silent about the kill and allow the knight to claim the reward to aid his family.', 10089, 0, 0, ''), +(6211, 0, 0, 'I''d love to get one of those written fortunes you mentioned! I''ve got the space in my inventory for it.', 10091, 0, 0, ''), +(6213, 1, 0, 'The Darkmoon Faire has already arrived, you say? Where is it located?', 10110, 0, 0, ''), +(7149, 0, 2, 'Yes, I''d like to purchase a ride down to the Ghostlands.', 12085, 0, 0, ''), +(7428, 0, 1, 'I wish to browse your wares, Ergh.', 14155, 0, 0, ''), +(7429, 0, 3, 'Please teach me how to skin, Gurf.', 14157, 0, 0, ''), +(7430, 0, 3, 'I wish to become a leatherworker, Moordo. Please train me.', 14159, 0, 0, ''), +(7859, 0, 0, 'Show me, Seer.', 16026, 0, 0, ''), +(8917, 0, 0, 'So, how does a dwarf like you end up in a place like this?', 22609, 0, 0, ''), +(9200, 0, 0, 'What can we do to assist you?', 25096, 0, 0, ''), +(9280, 0, 0, '<Search corpse for Issliruk''s Totem.>', 25422, 0, 0, ''), +(9297, 0, 0, 'You''re not alone here?', 25562, 0, 0, ''), +(9297, 1, 0, 'What would Kil''jaeden want with a mortal woman?', 25564, 0, 0, ''), +(9418, 0, 0, 'Let''s do this, Thassarian. It''s now or never.', 25840, 0, 0, ''), +(9492, 0, 0, 'Use the outhouse.', 26332, 0, 0, ''), +(9669, 0, 0, 'Brann, it would be our honor!', 27614, 0, 0, ''), +(9683, 0, 2, 'Do you think I could take a ride on one of those flying machines?', 27819, 0, 0, ''), +(9848, 0, 1, 'Can you repair my gear?', 30450, 0, 0, ''), +(9928, 0, 0, 'I''m with you, Thorim.', 31225, 0, 0, ''), +(10012, 0, 0, 'We''re with you Brann! Open it!', 31547, 0, 0, ''), +(10200, 0, 0, 'I''m ready, Highlord.', 32933, 0, 0, ''), +(10204, 0, 0, 'I... I think so....', 32988, 0, 0, ''), +(10204, 1, 0, 'I am ready, Lady Corastrasza.', 32990, 0, 0, ''), +(10206, 0, 0, 'There will be plenty of time for this later Brann, we need to get moving!', 33002, 0, 0, ''), +(10316, 1, 0, 'Glad to help, my lady. I''m told you were once the guardian of a fabled sword. Do you know where I might find it?', 33363, 0, 0, ''), +(10366, 0, 0, 'Activate secondary defensive systems.', 34420, 0, 0, ''), +(10464, 1, 0, 'I am ready to fight!', 33430, 0, 0, ''), +(10465, 1, 0, 'I am ready to fight!', 33430, 0, 0, ''), +(10477, 0, 0, 'Confirmed.', 34421, 0, 0, ''), +(10601, 0, 9, 'I would like to go to the battleground.', 10355, 0, 0, ''), +(10614, 0, 0, 'I am ready.', 35320, 0, 0, ''), +(10614, 2, 0, 'I am ready.', 35320, 0, 0, ''), +(10614, 3, 0, 'I am ready. However, I''d like to skip the pageantry.', 36657, 0, 0, ''), +(10860, 0, 0, 'We''re ready! Let''s go!', 36885, 0, 0, ''), +(10949, 0, 1, 'I''m not into any of that creepy stuff you like, Brazie. Just show me the "legal" wares.', 37565, 0, 0, ''), +(10949, 1, 0, 'You''re an odd little guy.', 37619, 0, 0, ''), +(11014, 0, 0, 'Teleport to Light''s Hammer.', 37671, 0, 0, ''), +(11014, 3, 0, 'Teleport to the Rampart of Skulls.', 37723, 0, 0, ''), +(11014, 4, 0, 'Teleport to the Deathbringer''s Rise.', 37724, 0, 0, ''), +(11014, 5, 0, 'Teleport to the Upper Spire.', 37725, 0, 0, ''), +(11016, 0, 0, 'Teleport to Light''s Hammer.', 37671, 0, 0, ''), +(11016, 1, 0, 'Teleport to the Oratory of the Damned.', 37722, 0, 0, ''), +(11016, 3, 0, 'Teleport to the Rampart of Skulls.', 37723, 0, 0, ''), +(11016, 5, 0, 'Teleport to the Upper Spire.', 37725, 0, 0, ''), +(11104, 0, 1, 'I wish to browse your wares.', 4424, 0, 0, ''), +(11398, 0, 0, 'How do we do that?', 40480, 0, 0, ''); diff --git a/sql/updates/world/2014_04_27_02_world_creature_template.sql b/sql/updates/world/2014_04_27_02_world_creature_template.sql new file mode 100644 index 00000000000..9d5c16410f8 --- /dev/null +++ b/sql/updates/world/2014_04_27_02_world_creature_template.sql @@ -0,0 +1,8 @@ +-- +UPDATE `creature_template` SET `faction_A`=1216, `faction_H`=1216 WHERE `entry` IN (13087,22731,31948); +UPDATE `creature_template` SET `faction_A`=59, `faction_H`=59 WHERE `entry` IN (13081,22746,32017); +UPDATE `creature_template` SET `faction_A`=14, `faction_H`=14 WHERE `entry` IN (34606,34649,33670,34109,33651,34108,33515,34175,33432,34106); +UPDATE `creature_template` SET `faction_A`=103, `faction_H`=103 WHERE `entry` IN (31218,31541,30882,31539,30858,31546); +UPDATE `creature_template` SET `faction_A`=35, `faction_H`=35 WHERE `entry` IN (31118,31491); +UPDATE `creature_template` SET `faction_A`=16, `faction_H`=16 WHERE `entry` IN (29829,30926); +UPDATE `command` SET `name`='reload broadcast_text' WHERE `name`='broadcast_text'; diff --git a/sql/updates/world/2014_04_27_03_world_creature_template.sql b/sql/updates/world/2014_04_27_03_world_creature_template.sql new file mode 100644 index 00000000000..bcc5bc10226 --- /dev/null +++ b/sql/updates/world/2014_04_27_03_world_creature_template.sql @@ -0,0 +1,125 @@ +-- +UPDATE `creature_template` SET `difficulty_entry_2`=32003, `difficulty_entry_3`=37322 WHERE `entry`=14848; +UPDATE `creature_template` SET `difficulty_entry_3`=37266 WHERE `entry`=13087; +UPDATE `creature_template` SET `difficulty_entry_3`=37247 WHERE `entry`=13551; +UPDATE `creature_template` SET `difficulty_entry_3`=37265 WHERE `entry`=13089; +UPDATE `creature_template` SET `difficulty_entry_2`=31928, `difficulty_entry_3`=37246 WHERE `entry`=13536; +UPDATE `creature_template` SET `difficulty_entry_1`=40673, `difficulty_entry_2`=40674, `difficulty_entry_3`=40675 WHERE `entry`=40135; +UPDATE `creature_template` SET `difficulty_entry_1`=40670, `difficulty_entry_2`=40671, `difficulty_entry_3`=40672 WHERE `entry`=40001; +UPDATE `creature_template` SET `difficulty_entry_1`=39232, `difficulty_entry_2`=39233, `difficulty_entry_3`=39234 WHERE `entry`=39231; +UPDATE `creature_template` SET `difficulty_entry_1`=39011, `difficulty_entry_2`=39012, `difficulty_entry_3`=39013 WHERE `entry`=39010; +UPDATE `creature_template` SET `difficulty_entry_1`=38601 WHERE `entry`=37919; +UPDATE `creature_template` SET `difficulty_entry_1`=38698 WHERE `entry`=38456; +UPDATE `creature_template` SET `difficulty_entry_1`=38590 WHERE `entry`=38589; +UPDATE `creature_template` SET `difficulty_entry_1`=38552 WHERE `entry`=38551; +UPDATE `creature_template` SET `difficulty_entry_1`=37658 WHERE `entry`=36792; +UPDATE `creature_template` SET `difficulty_entry_1`=37678 WHERE `entry`=36595; +UPDATE `creature_template` SET `difficulty_entry_1`=38496 WHERE `entry`=38492; +UPDATE `creature_template` SET `difficulty_entry_1`=37654 WHERE `entry`=36889; +UPDATE `creature_template` SET `difficulty_entry_1`=37653 WHERE `entry`=36888; +UPDATE `creature_template` SET `difficulty_entry_1`=37634 WHERE `entry`=37222; +UPDATE `creature_template` SET `difficulty_entry_1`=38388 WHERE `entry`=38386; +UPDATE `creature_template` SET `difficulty_entry_1`=38094 WHERE `entry`=37028; +UPDATE `creature_template` SET `difficulty_entry_1`=38495 WHERE `entry`=38491; +UPDATE `creature_template` SET `difficulty_entry_1`=38134 WHERE `entry`=37228; +UPDATE `creature_template` SET `difficulty_entry_1`=38137 WHERE `entry`=37229; +UPDATE `creature_template` SET `difficulty_entry_1`=37657 WHERE `entry`=36796; +UPDATE `creature_template` SET `difficulty_entry_3`=37482 WHERE `entry`=13181; +UPDATE `creature_template` SET `difficulty_entry_3`=37478 WHERE `entry`=11837; +UPDATE `creature_template` SET `difficulty_entry_3`=37477 WHERE `entry`=11838; +UPDATE `creature_template` SET `difficulty_entry_3`=37476 WHERE `entry`=10991; +UPDATE `creature_template` SET `difficulty_entry_3`=37474 WHERE `entry`=11840; +UPDATE `creature_template` SET `difficulty_entry_2`=32142, `difficulty_entry_3`=37472 WHERE `entry`=11606; +UPDATE `creature_template` SET `difficulty_entry_3`=37471 WHERE `entry`=11605; +UPDATE `creature_template` SET `difficulty_entry_2`=31903, `difficulty_entry_3`=37467 WHERE `entry`=14769; +UPDATE `creature_template` SET `difficulty_entry_2`=32138, `difficulty_entry_3`=37466 WHERE `entry`=13178; +UPDATE `creature_template` SET `difficulty_entry_2`=32137, `difficulty_entry_3`=37465 WHERE `entry`=13817; +UPDATE `creature_template` SET `difficulty_entry_2`=32136, `difficulty_entry_3`=37464 WHERE `entry`=14948; +UPDATE `creature_template` SET `difficulty_entry_2`=32135, `difficulty_entry_3`=37463 WHERE `entry`=13337; +UPDATE `creature_template` SET `difficulty_entry_2`=37462, `difficulty_entry_3`=37462 WHERE `entry`=13336; +UPDATE `creature_template` SET `difficulty_entry_2`=31904, `difficulty_entry_3`=37461 WHERE `entry`=13530; +UPDATE `creature_template` SET `difficulty_entry_2`=31905, `difficulty_entry_3`=37460 WHERE `entry`=13522; +UPDATE `creature_template` SET `difficulty_entry_2`=31906, `difficulty_entry_3`=37459 WHERE `entry`=13518; +UPDATE `creature_template` SET `difficulty_entry_2`=32133, `difficulty_entry_3`=37458 WHERE `entry`=13335; +UPDATE `creature_template` SET `difficulty_entry_3`=37457 WHERE `entry`=13334; +UPDATE `creature_template` SET `difficulty_entry_3`=37456 WHERE `entry`=13556; +UPDATE `creature_template` SET `difficulty_entry_2`=32130, `difficulty_entry_3`=37455 WHERE `entry`=13544; +UPDATE `creature_template` SET `difficulty_entry_3`=37454 WHERE `entry`=13553; +UPDATE `creature_template` SET `difficulty_entry_2`=32128, `difficulty_entry_3`=37453 WHERE `entry`=13541; +UPDATE `creature_template` SET `difficulty_entry_2`=32127, `difficulty_entry_3`=37452 WHERE `entry`=13333; +UPDATE `creature_template` SET `difficulty_entry_2`=31907, `difficulty_entry_3`=37449 WHERE `entry`=13526; +UPDATE `creature_template` SET `difficulty_entry_3`=37448 WHERE `entry`=13538; +UPDATE `creature_template` SET `difficulty_entry_3`=37447 WHERE `entry`=13550; +UPDATE `creature_template` SET `difficulty_entry_3`=37446 WHERE `entry`=13535; +UPDATE `creature_template` SET `difficulty_entry_3`=37445 WHERE `entry`=13547; +UPDATE `creature_template` SET `difficulty_entry_2`=32120, `difficulty_entry_3`=37443 WHERE `entry`=14016; +UPDATE `creature_template` SET `difficulty_entry_2`=32118, `difficulty_entry_3`=37441 WHERE `entry`=14031; +UPDATE `creature_template` SET `difficulty_entry_2`=32117, `difficulty_entry_3`=37440 WHERE `entry`=14030; +UPDATE `creature_template` SET `difficulty_entry_2`=32116, `difficulty_entry_3`=37439 WHERE `entry`=14027; +UPDATE `creature_template` SET `difficulty_entry_2`=32115, `difficulty_entry_3`=37438 WHERE `entry`=14028; +UPDATE `creature_template` SET `difficulty_entry_2`=32114, `difficulty_entry_3`=37437 WHERE `entry`=14029; +UPDATE `creature_template` SET `difficulty_entry_2`=32113, `difficulty_entry_3`=37436 WHERE `entry`=14026; +UPDATE `creature_template` SET `difficulty_entry_2`=31908, `difficulty_entry_3`=37434 WHERE `entry`=14767; +UPDATE `creature_template` SET `difficulty_entry_2`=32112, `difficulty_entry_3`=37433 WHERE `entry`=13217; +UPDATE `creature_template` SET `difficulty_entry_2`=32111, `difficulty_entry_3`=37432 WHERE `entry`=14019; +UPDATE `creature_template` SET `difficulty_entry_2`=32109, `difficulty_entry_3`=37430 WHERE `entry`=13151; +UPDATE `creature_template` SET `difficulty_entry_2`=32108, `difficulty_entry_3`=37429 WHERE `entry`=13149; +UPDATE `creature_template` SET `difficulty_entry_2`=32107, `difficulty_entry_3`=37428 WHERE `entry`=13150; +UPDATE `creature_template` SET `difficulty_entry_2`=32104, `difficulty_entry_3`=37425 WHERE `entry`=13416; +UPDATE `creature_template` SET `difficulty_entry_2`=32103, `difficulty_entry_3`=37424 WHERE `entry`=14141; +UPDATE `creature_template` SET `difficulty_entry_2`=32102, `difficulty_entry_3`=37423 WHERE `entry`=13520; +UPDATE `creature_template` SET `difficulty_entry_2`=32100, `difficulty_entry_3`=37421 WHERE `entry`=13576; +UPDATE `creature_template` SET `difficulty_entry_2`=32097, `difficulty_entry_3`=37418 WHERE `entry`=12047; +UPDATE `creature_template` SET `difficulty_entry_2`=32096, `difficulty_entry_3`=37417 WHERE `entry`=13356; +UPDATE `creature_template` SET `difficulty_entry_2`=32093, `difficulty_entry_3`=37414 WHERE `entry`=13598; +UPDATE `creature_template` SET `difficulty_entry_2`=32092, `difficulty_entry_3`=37413 WHERE `entry`=15103; +UPDATE `creature_template` SET `difficulty_entry_2`=32090, `difficulty_entry_3`=37411 WHERE `entry`=13524; +UPDATE `creature_template` SET `difficulty_entry_1`=22573, `difficulty_entry_2`=32087, `difficulty_entry_3`=37408 WHERE `entry`=14775; +UPDATE `creature_template` SET `difficulty_entry_2`=32075, `difficulty_entry_3`=37396 WHERE `entry`=13330; +UPDATE `creature_template` SET `difficulty_entry_2`=32074, `difficulty_entry_3`=37395 WHERE `entry`=13327; +UPDATE `creature_template` SET `difficulty_entry_2`=32073, `difficulty_entry_3`=37394 WHERE `entry`=13529; +UPDATE `creature_template` SET `difficulty_entry_2`=32072, `difficulty_entry_3`=37393 WHERE `entry`=13521; +UPDATE `creature_template` SET `difficulty_entry_2`=32071, `difficulty_entry_3`=37392 WHERE `entry`=13517; +UPDATE `creature_template` SET `difficulty_entry_2`=32070, `difficulty_entry_3`=37391 WHERE `entry`=13325; +UPDATE `creature_template` SET `difficulty_entry_2`=32069, `difficulty_entry_3`=37390 WHERE `entry`=13329; +UPDATE `creature_template` SET `difficulty_entry_3`=37389 WHERE `entry`=13555; +UPDATE `creature_template` SET `difficulty_entry_3`=37388 WHERE `entry`=13543; +UPDATE `creature_template` SET `difficulty_entry_3`=37387 WHERE `entry`=13552; +UPDATE `creature_template` SET `difficulty_entry_3`=37386 WHERE `entry`=13540; +UPDATE `creature_template` SET `difficulty_entry_2`=32064, `difficulty_entry_3`=37385 WHERE `entry`=13324; +UPDATE `creature_template` SET `difficulty_entry_2`=32061, `difficulty_entry_3`=37382 WHERE `entry`=13525; +UPDATE `creature_template` SET `difficulty_entry_2`=32060, `difficulty_entry_3`=37381 WHERE `entry`=13537; +UPDATE `creature_template` SET `difficulty_entry_3`=37380 WHERE `entry`=13549; +UPDATE `creature_template` SET `difficulty_entry_3`=37379 WHERE `entry`=13534; +UPDATE `creature_template` SET `difficulty_entry_3`=37378 WHERE `entry`=13546; +UPDATE `creature_template` SET `difficulty_entry_2`=15998 WHERE `entry`=15992; +UPDATE `creature_template` SET `difficulty_entry_2`=15999 WHERE `entry`=15993; +UPDATE `creature_template` SET `difficulty_entry_2`=32056, `difficulty_entry_3`=37377 WHERE `entry`=13221; +UPDATE `creature_template` SET `difficulty_entry_1`=33691 WHERE `entry`=33051; +UPDATE `creature_template` SET `difficulty_entry_1`=35546 WHERE `entry`=35545; +UPDATE `creature_template` SET `difficulty_entry_1`=35717 WHERE `entry`=35590; +UPDATE `creature_template` SET `difficulty_entry_1`=35568 WHERE `entry`=35564; +UPDATE `creature_template` SET `difficulty_entry_2`=32055, `difficulty_entry_3`=37376 WHERE `entry`=13496; +UPDATE `creature_template` SET `difficulty_entry_2`=32054, `difficulty_entry_3`=37375 WHERE `entry`=14018; +UPDATE `creature_template` SET `difficulty_entry_2`=32042, `difficulty_entry_3`=37362 WHERE `entry`=13144; +UPDATE `creature_template` SET `difficulty_entry_2`=32041, `difficulty_entry_3`=37361 WHERE `entry`=13143; +UPDATE `creature_template` SET `difficulty_entry_2`=32040, `difficulty_entry_3`=37360 WHERE `entry`=13297; +UPDATE `creature_template` SET `difficulty_entry_2`=32039, `difficulty_entry_3`=37359 WHERE `entry`=13138; +UPDATE `creature_template` SET `difficulty_entry_2`=32038, `difficulty_entry_3`=37358 WHERE `entry`=13137; +UPDATE `creature_template` SET `difficulty_entry_2`=32037, `difficulty_entry_3`=37357 WHERE `entry`=13146; +UPDATE `creature_template` SET `difficulty_entry_2`=32036, `difficulty_entry_3`=37356 WHERE `entry`=13300; +UPDATE `creature_template` SET `difficulty_entry_2`=32035, `difficulty_entry_3`=37355 WHERE `entry`=13299; +UPDATE `creature_template` SET `difficulty_entry_2`=32034, `difficulty_entry_3`=37354 WHERE `entry`=13147; +UPDATE `creature_template` SET `difficulty_entry_2`=32033, `difficulty_entry_3`=37353 WHERE `entry`=13296; +UPDATE `creature_template` SET `difficulty_entry_2`=32032, `difficulty_entry_3`=37352 WHERE `entry`=13841; +UPDATE `creature_template` SET `difficulty_entry_2`=32031, `difficulty_entry_3`=37351 WHERE `entry`=13145; +UPDATE `creature_template` SET `difficulty_entry_2`=32030, `difficulty_entry_3`=37350 WHERE `entry`=13298; +UPDATE `creature_template` SET `difficulty_entry_3`=37339 WHERE `entry`=13098; +UPDATE `creature_template` SET `difficulty_entry_3`=37338 WHERE `entry`=11602; +UPDATE `creature_template` SET `difficulty_entry_3`=37336 WHERE `entry`=13081; +UPDATE `creature_template` SET `difficulty_entry_2`=32013, `difficulty_entry_3`=37332 WHERE `entry`=11599; +UPDATE `creature_template` SET `difficulty_entry_2`=32011, `difficulty_entry_3`=37330 WHERE `entry`=11601; +UPDATE `creature_template` SET `difficulty_entry_2`=31938, `difficulty_entry_3`=37256 WHERE `entry`=13557; +UPDATE `creature_template` SET `difficulty_entry_2`=31937, `difficulty_entry_3`=37255 WHERE `entry`=13545; +UPDATE `creature_template` SET `difficulty_entry_2`=31936, `difficulty_entry_3`=37254 WHERE `entry`=13554; +UPDATE `creature_template` SET `difficulty_entry_2`=31935, `difficulty_entry_3`=37253 WHERE `entry`=13542; diff --git a/sql/updates/world/2014_04_27_04_world_creature_template.sql b/sql/updates/world/2014_04_27_04_world_creature_template.sql new file mode 100644 index 00000000000..134452b9485 --- /dev/null +++ b/sql/updates/world/2014_04_27_04_world_creature_template.sql @@ -0,0 +1,5 @@ +-- +UPDATE `creature_template` SET `exp`=2 WHERE `entry` IN (39232,39233,39234,40673,40674,40675,40670,40671,40672,38601,38590,37654,38698,39011,39012,39013,38094,38496,38552,38137,38134,37653,37678,35546,35717,35568,33691); +UPDATE `creature_template` SET `exp`=1 WHERE `entry` IN (32118,37441,32117,37440,32114,37437,32115,37438,32116,37439,32113,37436,32033,37353); +UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=38094; +UPDATE `creature_template` SET `unit_class`=2 WHERE `entry` IN (37456,37389,37445,37378,37386,37448,32060,37339,37477,37478,37654,32055); diff --git a/sql/updates/world/2014_04_27_05_world_creature_template.sql b/sql/updates/world/2014_04_27_05_world_creature_template.sql new file mode 100644 index 00000000000..323b596eafa --- /dev/null +++ b/sql/updates/world/2014_04_27_05_world_creature_template.sql @@ -0,0 +1,12 @@ +-- +UPDATE `creature_template` SET `faction_A`=14, `faction_H`=14 WHERE `entry` IN (40673,40674,40675,40670,40671,40672,38601,38698,37386,32069,37390,37678,35568,37476); +UPDATE `creature_template` SET `faction_A`=1214, `faction_H`=1214 WHERE `entry` IN (32137,32087,37408,32034,37354,32037,37357,32031,37351,32042,37362,32041,37361,37265,32038,37358); +UPDATE `creature_template` SET `faction_A`=1216, `faction_H`=1216 WHERE `entry` IN (32039,37359,37339,32090,37411,32104,37425,32096,37417,32093,32100,37421,37378,32035,37355,32030,37350,32033,37353,37266,32097,37418); +UPDATE `creature_template` SET `faction_A`=32, `faction_H`=32 WHERE `entry` IN (32056,37377,32040,37360,31904,37461,32073,37394,31907,37449,32061,37382,37462,32136,37464,31938,37256,37456,37389,31936,37254,37454,37387,37247,37447,37380,37445,32130,37455,37388,31908,37434,32128,37453,32133,37458,3212737452,32064,37385,32036,37356); +UPDATE `creature_template` SET `faction_A`=85, `faction_H`=85 WHERE `entry` IN (32135,37463,31935,37448,32060,37446,37379,37457,37396,32138); +UPDATE `creature_template` SET `faction_A`=70, `faction_H`=70 WHERE `entry` IN (32109,32107,37428,32108,37429); +UPDATE `creature_template` SET `faction_A`=59, `faction_H`=59 WHERE `entry` IN (32011,37330,32013,37332,37336,37338); +UPDATE `creature_template` SET `faction_A`=1334, `faction_H`=1334 WHERE `entry` IN (32003,32032,32112); +UPDATE `creature_template` SET `faction_A`=21, `faction_H`=21 WHERE `entry` IN (39232,39233,39234); +UPDATE `creature_template` SET `faction_A`=16, `faction_H`=16 WHERE `entry` IN (39011,39011,39012,39012,39013,39013,35717,35717); +UPDATE `creature_template` SET `faction_A`=39, `faction_H`=39 WHERE `entry` IN (37474,37477,37478); diff --git a/sql/updates/world/2014_04_27_06_world_creature_template.sql b/sql/updates/world/2014_04_27_06_world_creature_template.sql new file mode 100644 index 00000000000..19711483634 --- /dev/null +++ b/sql/updates/world/2014_04_27_06_world_creature_template.sql @@ -0,0 +1,14 @@ +-- +UPDATE `creature_template` SET `faction_A`=2209, `faction_H`=2209 WHERE `entry` IN (38137,38134); +UPDATE `creature_template` SET `faction_A`=1770, `faction_H`=1770 WHERE `entry` IN (37653,37654); +UPDATE `creature_template` SET `faction_A`=1534, `faction_H`=1534 WHERE `entry` IN (31903,37467); +UPDATE `creature_template` SET `faction_A`=29, `faction_H`=29 WHERE `entry` IN (31937,31928); +UPDATE `creature_template` SET `faction_A`=32, `faction_H`=32 WHERE `entry` IN (32127,37452); +UPDATE `creature_template` SET `faction_A`=11, `faction_H`=11 WHERE `entry` IN (32074,37395); +UPDATE `creature_template` SET `faction_A`=55, `faction_H`=55 WHERE `entry` IN (32070,37391); +UPDATE `creature_template` SET `faction_A`=83, `faction_H`=83 WHERE `entry` IN (38094); +UPDATE `creature_template` SET `faction_A`=1771, `faction_H`=1771 WHERE `entry` IN (37657); +UPDATE `creature_template` SET `faction_A`=1217, `faction_H`=1217 WHERE `entry` IN (32092); +UPDATE `creature_template` SET `faction_A`=1215, `faction_H`=1215 WHERE `entry` IN (37482); +UPDATE `creature_template` SET `faction_A`=85, `faction_H`=85 WHERE `entry` IN (32075); +UPDATE `creature_template` SET `faction_A`=26, `faction_H`=26 WHERE `entry` IN (37471); diff --git a/sql/updates/world/2014_04_27_07_world_creature_template.sql b/sql/updates/world/2014_04_27_07_world_creature_template.sql new file mode 100644 index 00000000000..a79ab1e0f68 --- /dev/null +++ b/sql/updates/world/2014_04_27_07_world_creature_template.sql @@ -0,0 +1,40 @@ +-- +UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=37376; +UPDATE `creature_template` SET `faction_A`=32, `faction_H`=32 WHERE `entry`=32134; +UPDATE `creature_template` SET `difficulty_entry_2`=32134 WHERE `entry`=13336; +UPDATE `creature_template` SET `npcflag`=1048577 WHERE `entry` IN (32092,37413); +UPDATE `creature_template` SET `faction_A`=1334, `faction_H`=1334, `npcflag`=3 WHERE `entry`=37352; +UPDATE `creature_template` SET `faction_A`=1334, `faction_H`=1334, `npcflag`=3 WHERE `entry`=37322; +UPDATE `creature_template` SET `faction_A`=1214, `faction_H`=1214, `npcflag`=2 WHERE `entry`=37465; +UPDATE `creature_template` SET `faction_A`=1216, `faction_H`=1216, `npcflag`=2 WHERE `entry`=37414; +UPDATE `creature_template` SET `faction_A`=29, `faction_H`=29, `npcflag`=2 WHERE `entry`=37255; +UPDATE `creature_template` SET `faction_A`=85, `faction_H`=85, `npcflag`=2 WHERE `entry`=37253; +UPDATE `creature_template` SET `faction_A`=85, `faction_H`=85, `npcflag`=2 WHERE `entry`=37381; +UPDATE `creature_template` SET `faction_A`=29, `faction_H`=29, `npcflag`=2 WHERE `entry`=37246; +UPDATE `creature_template` SET `npcflag`=4224 WHERE `entry`=32112; +UPDATE `creature_template` SET `npcflag`=4224 WHERE `entry`=37433; +UPDATE `creature_template` SET `npcflag`=3 WHERE `entry`=38590; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=38495; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=38552; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=38496; +UPDATE `creature_template` SET `npcflag`=3 WHERE `entry`=32003; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=32137; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=32093; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=31937; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=31935; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37448; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=32060; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=31928; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37446; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37379; +UPDATE `creature_template` SET `npcflag`=3 WHERE `entry`=37482; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=32138; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=32109; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37265; +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37336; +UPDATE `creature_template` SET `faction_A`=1217, `faction_H`=1217 WHERE `entry`=37413; +UPDATE `creature_template` SET `faction_A`=1334, `faction_H`=1334 WHERE `entry`=37433; +UPDATE `creature_template` SET `faction_A`=85, `faction_H`=85, `npcflag`=2 WHERE `entry`=37466; +UPDATE `creature_template` SET `faction_A`=70, `faction_H`=70, `npcflag`=2 WHERE `entry`=37430; +UPDATE `creature_template` SET `npcflag`=3 WHERE `entry`=32032; +UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=37381; diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index f60990a3213..919d033f9f1 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -33,6 +33,7 @@ #define INTERACTION_DISTANCE 5.0f #define ATTACK_DISTANCE 5.0f #define INSPECT_DISTANCE 28.0f +#define TRADE_DISTANCE 11.11f #define MAX_VISIBILITY_DISTANCE SIZE_OF_GRIDS // max distance for visible objects #define SIGHT_RANGE_UNIT 50.0f #define DEFAULT_VISIBILITY_DISTANCE 90.0f // default visible distance, 90 yards on continents diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 0348a17768f..3c16cf0df4e 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -6736,9 +6736,6 @@ bool Player::UpdatePosition(float x, float y, float z, float orientation, bool t if (GetGroup()) SetGroupUpdateFlag(GROUP_UPDATE_FLAG_POSITION); - if (GetTrader() && !IsWithinDistInMap(GetTrader(), INTERACTION_DISTANCE)) - GetSession()->SendCancelTrade(); - CheckAreaExploreAndOutdoor(); return true; diff --git a/src/server/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp index 726685044f3..298ae29bfcd 100644 --- a/src/server/game/Handlers/TradeHandler.cpp +++ b/src/server/game/Handlers/TradeHandler.cpp @@ -337,6 +337,13 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/) // set before checks for propertly undo at problems (it already set in to client) my_trade->SetAccepted(true); + if (!_player->IsWithinDistInMap(trader, TRADE_DISTANCE, false)) + { + SendTradeStatus(TRADE_STATUS_TARGET_TO_FAR); + my_trade->SetAccepted(false); + return; + } + // not accept case incorrect money amount if (!_player->HasEnoughMoney(my_trade->GetMoney())) { @@ -726,7 +733,7 @@ void WorldSession::HandleInitiateTradeOpcode(WorldPacket& recvPacket) return; } - if (!pOther->IsWithinDistInMap(_player, 10.0f, false)) + if (!pOther->IsWithinDistInMap(_player, TRADE_DISTANCE, false)) { SendTradeStatus(TRADE_STATUS_TARGET_TO_FAR); return; diff --git a/src/server/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp index fe72e12e7e1..e2d69e1bfc4 100644 --- a/src/server/game/Texts/CreatureTextMgr.cpp +++ b/src/server/game/Texts/CreatureTextMgr.cpp @@ -82,7 +82,7 @@ void CreatureTextMgr::LoadCreatureTexts() if (!result) { - TC_LOG_INFO("server.loading", ">> Loaded 0 ceature texts. DB table `creature_texts` is empty."); + TC_LOG_INFO("server.loading", ">> Loaded 0 ceature texts. DB table `creature_text` is empty."); return; } @@ -111,20 +111,20 @@ void CreatureTextMgr::LoadCreatureTexts() { if (!sSoundEntriesStore.LookupEntry(temp.sound)) { - TC_LOG_ERROR("sql.sql", "CreatureTextMgr: Entry %u, Group %u in table `creature_texts` has Sound %u but sound does not exist.", temp.entry, temp.group, temp.sound); + TC_LOG_ERROR("sql.sql", "CreatureTextMgr: Entry %u, Group %u in table `creature_text` has Sound %u but sound does not exist.", temp.entry, temp.group, temp.sound); temp.sound = 0; } } if (!GetLanguageDescByID(temp.lang)) { - TC_LOG_ERROR("sql.sql", "CreatureTextMgr: Entry %u, Group %u in table `creature_texts` using Language %u but Language does not exist.", temp.entry, temp.group, uint32(temp.lang)); + TC_LOG_ERROR("sql.sql", "CreatureTextMgr: Entry %u, Group %u in table `creature_text` using Language %u but Language does not exist.", temp.entry, temp.group, uint32(temp.lang)); temp.lang = LANG_UNIVERSAL; } if (temp.type >= MAX_CHAT_MSG_TYPE) { - TC_LOG_ERROR("sql.sql", "CreatureTextMgr: Entry %u, Group %u in table `creature_texts` has Type %u but this Chat Type does not exist.", temp.entry, temp.group, uint32(temp.type)); + TC_LOG_ERROR("sql.sql", "CreatureTextMgr: Entry %u, Group %u in table `creature_text` has Type %u but this Chat Type does not exist.", temp.entry, temp.group, uint32(temp.type)); temp.type = CHAT_MSG_SAY; } @@ -132,7 +132,7 @@ void CreatureTextMgr::LoadCreatureTexts() { if (!sEmotesStore.LookupEntry(temp.emote)) { - TC_LOG_ERROR("sql.sql", "CreatureTextMgr: Entry %u, Group %u in table `creature_texts` has Emote %u but emote does not exist.", temp.entry, temp.group, uint32(temp.emote)); + TC_LOG_ERROR("sql.sql", "CreatureTextMgr: Entry %u, Group %u in table `creature_text` has Emote %u but emote does not exist.", temp.entry, temp.group, uint32(temp.emote)); temp.emote = EMOTE_ONESHOT_NONE; } } @@ -141,7 +141,7 @@ void CreatureTextMgr::LoadCreatureTexts() { if (!sObjectMgr->GetBroadcastText(temp.BroadcastTextId)) { - TC_LOG_ERROR("sql.sql", "CreatureTextMgr: Entry %u, Group %u, Id %u in table `creature_texts` has non-existing or incompatible BroadcastTextId %u.", temp.entry, temp.group, temp.id, temp.BroadcastTextId); + TC_LOG_ERROR("sql.sql", "CreatureTextMgr: Entry %u, Group %u, Id %u in table `creature_text` has non-existing or incompatible BroadcastTextId %u.", temp.entry, temp.group, temp.id, temp.BroadcastTextId); temp.BroadcastTextId = 0; } } diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index 6e39d341c58..770a95c23d7 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -1021,7 +1021,14 @@ public: void PassengerBoarded(Unit* passenger, int8 /*seatId*/, bool apply) OVERRIDE { if (apply && passenger->GetTypeId() == TYPEID_PLAYER) + { + /// @workaround - Because accessory gets unmounted when using vehicle_template_accessory. + /// When vehicle spawns accessory is mounted to seat 0,but when player mounts + /// he uses the same seat (instead of mounting to seat 1) kicking the accessory out. + passenger->ChangeSeat(1, false); + me->GetVehicleKit()->InstallAccessory(NPC_PILOT, 0, true, TEMPSUMMON_DEAD_DESPAWN, 0); me->GetMotionMaster()->MovePath(NPC_PLANE, false); + } } void MovementInform(uint32 type, uint32 id) OVERRIDE @@ -1056,6 +1063,7 @@ public: case 25: Talk(PLANE_EMOTE); DoCast(SPELL_ENGINE); + me->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FORCE_MOVEMENT); break; } } |