Merge branch 'master' of github.com:TrinityCore/TrinityCore

Conflicts:
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Server/Protocol/Opcodes.cpp

6 files changed, 329 insertions, 0 deletions

diff --git a/sql/updates/world/2011_11_21_00_world_db_errors.sql b/sql/updates/world/2011_11_21_00_world_db_errors.sql
new file mode 100644
index 00000000000..d3ae6fb197b
--- /dev/null
+++ b/sql/updates/world/2011_11_21_00_world_db_errors.sql
@@ -0,0 +1,11 @@
+UPDATE `creature_template` SET `lootid`=0 WHERE `entry`=11054;
+UPDATE `conditions` SET `SourceTypeOrReferenceId`=17 WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=47305 AND `ConditionTypeOrReference`=20;
+UPDATE `conditions` SET `SourceTypeOrReferenceId`=18, `SourceEntry`=36732, `ConditionTypeOrReference`=24 WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=47305 AND `ConditionTypeOrReference`=18;
+UPDATE `smart_scripts` SET `target_param1`=35 WHERE `entryorguid`=2275 AND `source_type`=0 AND `id`=0;
+UPDATE `smart_scripts` SET `target_param1`=35 WHERE `entryorguid`=1806901 AND `source_type`=9 AND `id`=3;
+
+DELETE FROM `db_script_string` WHERE `entry` IN (2000000102, 2000000103, 2000000104);
+INSERT INTO `db_script_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES
+(2000000102,'Oh, darn...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(2000000103,'Ok, let''s get started!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(2000000104,'... oops.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
diff --git a/sql/updates/world/2011_11_21_01_pilgrim_achievement_reward.sql b/sql/updates/world/2011_11_21_01_pilgrim_achievement_reward.sql
new file mode 100644
index 00000000000..7083107a8c2
--- /dev/null
+++ b/sql/updates/world/2011_11_21_01_pilgrim_achievement_reward.sql
@@ -0,0 +1 @@
+UPDATE `achievement_reward` SET `item`=44810, `sender`=28951, `subject`='A Gobbler not yet Gobbled', `text` = 'Can you believe this Plump Turkey made it through November alive?$B$BSince all this friends have been served up on Bountiful Tables with sides of Cranberry Chutney and Spice Bread Stuffing and... ooo... I''m getting hungry. But anyhow! He''s all alone, now, so I was hoping you might be willing to take care of him. There simply isn''t enough room left in my shop!$B$BJust keep him away from cooking fires, please. He gets this strange look in his eyes around them...' WHERE `entry` IN (3478,3656); -- Pilgrim achievement (A/H)
diff --git a/sql/updates/world/2011_11_21_02_pilgrim_achievement_criteria_data.sql b/sql/updates/world/2011_11_21_02_pilgrim_achievement_criteria_data.sql
new file mode 100644
index 00000000000..589dbb0b2a4
--- /dev/null
+++ b/sql/updates/world/2011_11_21_02_pilgrim_achievement_criteria_data.sql
@@ -0,0 +1,11 @@
+-- Achievement: Turkey Lurkey
+DELETE FROM `achievement_criteria_data` WHERE `type`=2 AND `criteria_id` IN (11158,11159,11160,11161,11162,11163,11164,11165);
+INSERT INTO `achievement_criteria_data` (`criteria_id`, `type`, `value1`, `value2`) VALUES
+(11158, 2, 4, 1), -- Human Rogue
+(11159, 2, 4, 4), -- Night Elf Rogue
+(11160, 2, 4, 2), -- Orc Rogue
+(11161, 2, 4, 8), -- Troll Rogue
+(11162, 2, 4, 5), -- Undead Rogue
+(11163, 2, 4, 10), -- Blood Elf Rogue
+(11164, 2, 4, 3), -- Dwarf Rogue
+(11165, 2, 4, 7); -- Gnome Rogue
diff --git a/sql/updates/world/2011_11_21_03_pilgrim_misc.sql b/sql/updates/world/2011_11_21_03_pilgrim_misc.sql
new file mode 100644
index 00000000000..6547fe9a53a
--- /dev/null
+++ b/sql/updates/world/2011_11_21_03_pilgrim_misc.sql
@@ -0,0 +1,145 @@
+-- Misc stuffz
+UPDATE `npc_text` SET `WDBVerified`=12340 WHERE `ID`=14648; -- "A Bountiful Table is laid out..."
+
+-- Template updates
+UPDATE `creature_template` SET `faction_A`=714,`faction_H`=714,`baseattacktime`=2000,`npcflag`=3,  `unit_flags`=33536 WHERE `entry`=34654; -- Bountiful Feast Hostess
+UPDATE `creature_template` SET `faction_A`=714,`faction_H`=714,`baseattacktime`=2000,`unit_flags`=33536 WHERE `entry`=34678; -- Dokin Farplain
+UPDATE `creature_template` SET `faction_A`=714,`faction_H`=714,`baseattacktime`=2000,`npcflag`=640,`unit_flags`=33536 WHERE `entry`=34684; -- Laha Farplain
+UPDATE `creature_template` SET `faction_A`=714,`faction_H`=714,`baseattacktime`=2000,`npcflag`=640,`speed_run`=1 WHERE `entry`=35343; -- Bountiful Barrel
+UPDATE `creature_template` SET `faction_A`=714,`faction_H`=714,`baseattacktime`=2000,`npcflag`=640,`unit_flags`=33536 WHERE `entry`=34685; -- Dalni Tallgrass
+UPDATE `creature_template` SET `faction_A`=714,`faction_H`=714,`baseattacktime`=2000,`npcflag`=640,`speed_run`=1 WHERE `entry`=35342; -- Bountiful Barrel
+UPDATE `creature_template` SET `faction_A`=714,`faction_H`=714,`baseattacktime`=2000,`npcflag`=83,`unit_flags`=33536 WHERE `entry`=34713; -- Ondani Greatmill
+UPDATE `creature_template` SET `faction_A`=714,`faction_H`=714,`baseattacktime`=2000,`npcflag`=640,`unit_flags`=33536 WHERE `entry`=34787; -- John Rigsdale
+UPDATE `creature_template` SET `faction_A`=714,`faction_H`=714,`baseattacktime`=2000,`npcflag`=83,`unit_flags`=33536 WHERE `entry`=34786; -- Alice Rigsdale
+UPDATE `creature_template` SET `faction_A`=714,`faction_H`=714,`baseattacktime`=2000,`unit_flags`=33536 WHERE `entry`=34677; -- Miles Standish
+UPDATE `creature_template` SET `faction_A`=714,`faction_H`=714,`baseattacktime`=2000,`npcflag`=83,`unit_flags`=33536 WHERE `entry`=34712; -- Roberta Carter
+UPDATE `creature_template` SET `faction_A`=714,`faction_H`=714,`baseattacktime`=2000,`npcflag`=640,`unit_flags`=33536 WHERE `entry`=34683; -- Rose Standish
+UPDATE `creature_template` SET `faction_A`=714,`faction_H`=714,`baseattacktime`=2000,`npcflag`=640,`speed_run`=1 WHERE `entry`=35341; -- Bountiful Barrel
+
+UPDATE `creature_template` SET `baseattacktime`=2000,`npcflag`=16777216,`unit_flags`=16384,`speed_run`=1.57143,`VehicleId`=321 WHERE `entry`=34819; -- The Stuffing Chair
+UPDATE `creature_template` SET `baseattacktime`=2000,`npcflag`=16777216,`unit_flags`=16384,`speed_run`=1.57143,`VehicleId`=321 WHERE `entry`=34824; -- The Sweet Potato Chair
+UPDATE `creature_template` SET `baseattacktime`=2000,`npcflag`=16777216,`unit_flags`=16384,`speed_run`=1.57143,`VehicleId`=321 WHERE `entry`=34823; -- The Cranberry Chair
+UPDATE `creature_template` SET `baseattacktime`=2000,`npcflag`=16777216,`unit_flags`=16384,`speed_run`=1.57143,`VehicleId`=321 WHERE `entry`=34812; -- The Turkey Chair
+UPDATE `creature_template` SET `baseattacktime`=2000,`npcflag`=16777216,`unit_flags`=16384,`speed_run`=1.57143,`VehicleId`=321 WHERE `entry`=34822; -- The Pie Chair
+
+UPDATE `creature_model_info` SET `bounding_radius`=0.8725,`combat_reach`=3.75,`gender`=1 WHERE `modelid`=29330; -- Bountiful Feast Hostess
+UPDATE `creature_model_info` SET `bounding_radius`=0.9747,`combat_reach`=4.05,`gender`=0 WHERE `modelid`=29339; -- Dokin Farplain
+UPDATE `creature_model_info` SET `bounding_radius`=1,`combat_reach`=0,`gender`=0 WHERE `modelid`=29775; -- Bountiful Barrel
+UPDATE `creature_model_info` SET `bounding_radius`=0.8725,`combat_reach`=3.75,`gender`=1 WHERE `modelid`=29342; -- Laha Farplain
+UPDATE `creature_model_info` SET `bounding_radius`=1.6,`combat_reach`=0,`gender`=2 WHERE `modelid`=29205; -- Chairs
+UPDATE `creature_model_info` SET `bounding_radius`=0.8725,`combat_reach`=3.75,`gender`=1 WHERE `modelid`=29397; -- Dalni Tallgrass
+UPDATE `creature_model_info` SET `bounding_radius`=0.8725,`combat_reach`=3.75,`gender`=1 WHERE `modelid`=29401; -- Ondani Greatmill
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=29428; -- John Rigsdale
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1.5,`gender`=1 WHERE `modelid`=29427; -- Alice Rigsdale
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=29338; -- Miles Standish
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1.5,`gender`=1 WHERE `modelid`=29365; -- Roberta Carter
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1.5,`gender`=1 WHERE `modelid`=29340; -- Rose Standish
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (34654,34678,35343,34684,34819,34824,34823,34812,34822,34685,35342,34713,34787,34786,34677,34712,34683,35341);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(34654,0,0,1,0, NULL), -- Bountiful Feast Hostess
+(34678,0,0,2,0, NULL), -- Dokin Farplain
+(35343,0,0,1,0, NULL), -- Bountiful Barrel (TB)
+(34684,0,0,1,0, NULL), -- Laha Farplain
+(34685,0,0,1,0, NULL), -- Dalni Tallgrass
+(35342,0,0,1,0, NULL), -- Bountiful Barrel (OG)
+(34713,0,0,2,0, NULL), -- Ondani Greatmill
+(34787,0,0,1,0, NULL), -- John Rigsdale
+(34786,0,0,2,0, NULL), -- Alice Rigsdale
+(34677,0,0,2,0, NULL), -- Miles Standish
+(34712,0,0,2,0, NULL), -- Roberta Carter
+(34683,0,0,1,0, NULL), -- Rose Standish
+(35341,0,0,1,0, NULL), -- Bountiful Barrel
+(34819,0,0,1,0, '61795'), -- The Stuffing Chair (Stuffing Server)
+(34824,0,0,1,0, '61797'), -- The Sweet Potato Chair (Sweet Potatoes Server)
+(34823,0,0,1,0, '61793'), -- The Cranberry Chair (Cranberry Server)
+(34812,0,0,1,0, '61796'), -- The Turkey Chair (Turkey Server)
+(34822,0,0,1,0, '61794'); -- The Pie Chair (Pie Server)
+
+-- Vehicles
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (34819,34824,34823,34812,34822);
+INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`, `aura_required`, `aura_forbidden`, `user_type`) VALUES
+(34819, 65403, 0, 0, 0, 1, 0, 0, 0), -- The Stuffing Chair (Ride Vehicle)
+(34824, 65403, 0, 0, 0, 1, 0, 0, 0), -- The Sweet Potato Chair (Ride Vehicle)
+(34823, 65403, 0, 0, 0, 1, 0, 0, 0), -- The Cranberry Chair (Ride Vehicle)
+(34812, 65403, 0, 0, 0, 1, 0, 0, 0), -- The Turkey Chair (Ride Vehicle)
+(34822, 65403, 0, 0, 0, 1, 0, 0, 0); -- The Pie Chair (Ride Vehicle)
+
+-- Gossips
+UPDATE `creature_template` SET `gossip_menu_id`=10575 WHERE `entry`=34654; -- Bountiful Feast Hostess
+DELETE FROM `gossip_menu` WHERE `entry`=10575 AND `text_id`=14633;
+DELETE FROM `gossip_menu` WHERE `entry`=10589 AND `text_id`=14648;
+INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES
+(10575, 14633),
+(10589, 14648);
+
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=10575 AND `id`=0;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`) VALUES
+(10575, 0, 0, 'How do the Bountiful Tables work?', 1, 1, 10589, 0, 0, 0, NULL);
+
+-- Vendor tables
+UPDATE `item_template` SET `BuyCount`=5 WHERE `entry` IN (44835,44853,46797,46793,46796); -- Autumnal Herbs, Honey, Mulgore Sweet Potato, Tangy Southfury Cranberries, Ripe Tirisfal Pumpkin
+DELETE FROM `npc_vendor` WHERE `entry` IN (35343,34684,35342,34685,34787,35341,34683);
+INSERT INTO `npc_vendor` (`entry`, `slot`, `item`, `maxcount`, `ExtendedCost`) VALUES
+-- 35343 (Bountiful Barrel)
+(35343, 1, 46810, 0, 0), -- Bountiful Cookbook
+(35343, 2, 46797, 0, 0), -- Mulgore Sweet Potato
+(35343, 3, 44835, 0, 0), -- Autumnal Herbs
+(35343, 4, 44853, 0, 0), -- Honey
+(35343, 5, 159, 0, 0), -- Refreshing Spring Water
+(35343, 6, 2678, 0, 0), -- Mild Spices
+(35343, 7, 30817, 0, 0), -- Simple Flour
+(35343, 8, 46888, 0, 0), -- Bountiful Basket
+-- 34684 (Laha Farplain)
+(34684, 1, 46810, 0, 0), -- Bountiful Cookbook
+(34684, 2, 46797, 0, 0), -- Mulgore Sweet Potato
+(34684, 3, 44835, 0, 0), -- Autumnal Herbs
+(34684, 4, 44853, 0, 0), -- Honey
+(34684, 5, 159, 0, 0), -- Refreshing Spring Water
+(34684, 6, 2678, 0, 0), -- Mild Spices
+(34684, 7, 30817, 0, 0), -- Simple Flour
+(34684, 8, 46888, 0, 0), -- Bountiful Basket
+-- 35342 (Bountiful Barrel)
+(35342, 1, 46810, 0, 0), -- Bountiful Cookbook
+(35342, 2, 46793, 0, 0), -- Tangy Southfury Cranberries
+(35342, 3, 44835, 0, 0), -- Autumnal Herbs
+(35342, 4, 44853, 0, 0), -- Honey
+(35342, 5, 159, 0, 0), -- Refreshing Spring Water
+(35342, 6, 2678, 0, 0), -- Mild Spices
+(35342, 7, 30817, 0, 0), -- Simple Flour
+(35342, 8, 46888, 0, 0), -- Bountiful Basket
+-- 34685 (Dalni Tallgrass)
+(34685, 1, 46810, 0, 0), -- Bountiful Cookbook
+(34685, 2, 46793, 0, 0), -- Tangy Southfury Cranberries
+(34685, 3, 44835, 0, 0), -- Autumnal Herbs
+(34685, 4, 44853, 0, 0), -- Honey
+(34685, 5, 159, 0, 0), -- Refreshing Spring Water
+(34685, 6, 2678, 0, 0), -- Mild Spices
+(34685, 7, 30817, 0, 0), -- Simple Flour
+(34685, 8, 46888, 0, 0), -- Bountiful Basket
+-- 34787 (John Rigsdale)
+(34787, 1, 46810, 0, 0), -- Bountiful Cookbook
+(34787, 2, 44835, 0, 0), -- Autumnal Herbs
+(34787, 3, 44853, 0, 0), -- Honey
+(34787, 4, 159, 0, 0), -- Refreshing Spring Water
+(34787, 5, 2678, 0, 0), -- Mild Spices
+(34787, 6, 30817, 0, 0), -- Simple Flour
+(34787, 7, 46888, 0, 0), -- Bountiful Basket
+-- 35341 (Bountiful Barrel)
+(35341, 1, 46810, 0, 0), -- Bountiful Cookbook
+(35341, 2, 46796, 0, 0), -- Ripe Tirisfal Pumpkin
+(35341, 3, 44835, 0, 0), -- Autumnal Herbs
+(35341, 4, 44853, 0, 0), -- Honey
+(35341, 5, 159, 0, 0), -- Refreshing Spring Water
+(35341, 6, 2678, 0, 0), -- Mild Spices
+(35341, 7, 30817, 0, 0), -- Simple Flour
+(35341, 8, 46888, 0, 0), -- Bountiful Basket
+-- 34683 (Rose Standish)
+(34683, 1, 46810, 0, 0), -- Bountiful Cookbook
+(34683, 2, 46796, 0, 0), -- Ripe Tirisfal Pumpkin
+(34683, 3, 44835, 0, 0), -- Autumnal Herbs
+(34683, 4, 44853, 0, 0), -- Honey
+(34683, 5, 159, 0, 0), -- Refreshing Spring Water
+(34683, 6, 2678, 0, 0), -- Mild Spices
+(34683, 7, 30817, 0, 0), -- Simple Flour
+(34683, 8, 46888, 0, 0); -- Bountiful Basket
diff --git a/sql/updates/world/2011_11_21_04_pilgrim_misc.sql b/sql/updates/world/2011_11_21_04_pilgrim_misc.sql
new file mode 100644
index 00000000000..194c084ebc5
--- /dev/null
+++ b/sql/updates/world/2011_11_21_04_pilgrim_misc.sql
@@ -0,0 +1,109 @@
+DELETE FROM `creature_template_addon` WHERE `entry` IN (32823,34645,34783,34682,35337,35338,35340,34711,34676,34708,34644,34744,34710,34675);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(32823,0,0,1,0, NULL), -- Bountiful Table
+(34645,0,0,1,0, NULL), -- Elizabeth Barker Winslow
+(34783,0,0,1,0, NULL), -- Ranisa Whitebough
+(34682,0,0,1,0, NULL), -- Wilmina Holbeck
+(35337,0,0,1,0, NULL), -- Bountiful Barrel
+(35338,0,0,1,0, NULL), -- Bountiful Barrel
+(35340,0,0,1,0, NULL), -- Bountiful Barrel
+(34711,0,0,2,0, NULL), -- Mary Allerton
+(34676,0,0,2,0, NULL), -- Isaac Allerton
+(34708,0,0,2,0, NULL), -- Caitrin Ironkettle
+(34644,0,0,2,0, NULL), -- Edward Winslow
+(34744,0,0,1,0, NULL), -- Jasper Moore
+(34710,0,0,1,0, NULL), -- Ellen Moore
+(34675,0,0,2,0, NULL); -- Gregory Tabor
+
+UPDATE `creature_template` SET `faction_A`=534,`faction_H`=534,`baseattacktime`=2000,`npcflag`=640,`unit_flags`=33536 WHERE `entry`=34783; -- Ranisa Whitebough
+UPDATE `creature_template` SET `faction_A`=534,`faction_H`=534,`baseattacktime`=2000,`npcflag`=640,`unit_flags`=33536 WHERE `entry`=34645; -- Elizabeth Barker Winslow
+UPDATE `creature_template` SET `faction_A`=534,`faction_H`=534,`baseattacktime`=2000,`npcflag`=640,`unit_flags`=33536 WHERE `entry`=34681; -- Ikaneba Summerset
+UPDATE `creature_template` SET `faction_A`=534,`faction_H`=534,`baseattacktime`=2000,`npcflag`=640,`unit_flags`=33536 WHERE `entry`=34682; -- Wilmina Holbeck
+UPDATE `creature_template` SET `faction_A`=534,`faction_H`=534,`baseattacktime`=2000,`npcflag`=640,`speed_run`=1 WHERE `entry`=35337; -- Bountiful Barrel
+UPDATE `creature_template` SET `faction_A`=534,`faction_H`=534,`baseattacktime`=2000,`npcflag`=640,`speed_run`=1 WHERE `entry`=35338; -- Bountiful Barrel
+UPDATE `creature_template` SET `faction_A`=534,`faction_H`=534,`baseattacktime`=2000,`npcflag`=640,`speed_run`=1 WHERE `entry`=35340; -- Bountiful Barrel
+UPDATE `creature_template` SET `faction_A`=534,`faction_H`=534,`baseattacktime`=2000,`npcflag`=83,`unit_flags`=33536 WHERE `entry`=34711; -- Mary Allerton
+UPDATE `creature_template` SET `faction_A`=534,`faction_H`=534,`baseattacktime`=2000,`unit_flags`=33536 WHERE `entry`=34676; -- Isaac Allerton
+UPDATE `creature_template` SET `faction_A`=534,`faction_H`=534,`baseattacktime`=2000,`npcflag`=83,`unit_flags`=33536 WHERE `entry`=34708; -- Caitrin Ironkettle
+UPDATE `creature_template` SET `faction_A`=534,`faction_H`=534,`baseattacktime`=2000,`unit_flags`=33536 WHERE `entry`=34644; -- Edward Winslow
+UPDATE `creature_template` SET `faction_A`=534,`faction_H`=534,`baseattacktime`=2000,`npcflag`=3,`unit_flags`=33536 WHERE `entry`=34744; -- Jasper Moore
+UPDATE `creature_template` SET `faction_A`=534,`faction_H`=534,`baseattacktime`=2000,`npcflag`=83,`unit_flags`=33536 WHERE `entry`=34710; -- Ellen Moore
+UPDATE `creature_template` SET `faction_A`=534,`faction_H`=534,`baseattacktime`=2000,`unit_flags`=33536 WHERE `entry`=34675; -- Gregory Tabor
+
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1.5,`gender`=1 WHERE `modelid`=29394; -- Elizabeth Barker Winslow
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1.5,`gender`=1 WHERE `modelid`=29430; -- Ranisa Whitebough
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1.5,`gender`=1 WHERE `modelid`=29393; -- Ikaneba Summerset
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1.5,`gender`=1 WHERE `modelid`=29329; -- Wilmina Holbeck
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1.5,`gender`=1 WHERE `modelid`=29388; -- Mary Allerton
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=29391; -- Isaac Allerton
+UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1.5,`gender`=1 WHERE `modelid`=29324; -- Caitrin Ironkettle
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=29392; -- Edward Winslow
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=29444; -- Jasper Moore
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1.5,`gender`=1 WHERE `modelid`=29400; -- Ellen Moore
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=29337; -- Gregory Tabor
+
+UPDATE `item_template` SET `BuyCount`=5 WHERE `entry` IN (44854,46784,44855);
+DELETE FROM `npc_vendor` WHERE `entry` IN (34645, 34783, 35337, 35338, 35340, 34681, 34682);
+INSERT INTO `npc_vendor` (`entry`, `slot`, `item`, `maxcount`, `ExtendedCost`) VALUES
+-- 34645 (Elizabeth Barker Winslow)
+(34645, 1, 46809, 0, 0), -- Bountiful Cookbook
+(34645, 2, 44854, 0, 0), -- Tangy Wetland Cranberries
+(34645, 3, 44835, 0, 0), -- Autumnal Herbs
+(34645, 4, 44853, 0, 0), -- Honey
+(34645, 5, 159, 0, 0), -- Refreshing Spring Water
+(34645, 6, 2678, 0, 0), -- Mild Spices
+(34645, 7, 30817, 0, 0), -- Simple Flour
+(34645, 8, 46888, 0, 0), -- Bountiful Basket
+-- 34783 (Ranisa Whitebough)
+(34783, 1, 46809, 0, 0), -- Bountiful Cookbook
+(34783, 2, 44835, 0, 0), -- Autumnal Herbs
+(34783, 3, 44853, 0, 0), -- Honey
+(34783, 4, 159, 0, 0), -- Refreshing Spring Water
+(34783, 5, 2678, 0, 0), -- Mild Spices
+(34783, 6, 30817, 0, 0), -- Simple Flour
+(34783, 7, 46888, 0, 0), -- Bountiful Basket
+-- 35337 (Bountiful Barrel)
+(35337, 1, 46809, 0, 0), -- Bountiful Cookbook
+(35337, 2, 46784, 0, 0), -- Ripe Elwynn Pumpkin
+(35337, 3, 44835, 0, 0), -- Autumnal Herbs
+(35337, 4, 44853, 0, 0), -- Honey
+(35337, 5, 159, 0, 0), -- Refreshing Spring Water
+(35337, 6, 2678, 0, 0), -- Mild Spices
+(35337, 7, 30817, 0, 0), -- Simple Flour
+(35337, 8, 46888, 0, 0), -- Bountiful Basket
+-- 35338 (Bountiful Barrel)
+(35338, 1, 46809, 0, 0), -- Bountiful Cookbook
+(35338, 2, 44855, 0, 0), -- Teldrassil Sweet Potato
+(35338, 3, 44835, 0, 0), -- Autumnal Herbs
+(35338, 4, 44853, 0, 0), -- Honey
+(35338, 5, 159, 0, 0), -- Refreshing Spring Water
+(35338, 6, 2678, 0, 0), -- Mild Spices
+(35338, 7, 30817, 0, 0), -- Simple Flour
+(35338, 8, 46888, 0, 0), -- Bountiful Basket
+-- 35340 (Bountiful Barrel)
+(35340, 1, 46809, 0, 0), -- Bountiful Cookbook
+(35340, 2, 44854, 0, 0), -- Tangy Wetland Cranberries
+(35340, 3, 44835, 0, 0), -- Autumnal Herbs
+(35340, 4, 44853, 0, 0), -- Honey
+(35340, 5, 159, 0, 0), -- Refreshing Spring Water
+(35340, 6, 2678, 0, 0), -- Mild Spices
+(35340, 7, 30817, 0, 0), -- Simple Flour
+(35340, 8, 46888, 0, 0), -- Bountiful Basket
+-- 34681 (Ikaneba Summerset)
+(34681, 1, 46809, 0, 0), -- Bountiful Cookbook
+(34681, 2, 44855, 0, 0), -- Teldrassil Sweet Potato
+(34681, 3, 44835, 0, 0), -- Autumnal Herbs
+(34681, 4, 44853, 0, 0), -- Honey
+(34681, 5, 159, 0, 0), -- Refreshing Spring Water
+(34681, 6, 2678, 0, 0), -- Mild Spices
+(34681, 7, 30817, 0, 0), -- Simple Flour
+(34681, 8, 46888, 0, 0), -- Bountiful Basket
+-- 34682 (Wilmina Holbeck)
+(34682, 1, 46809, 0, 0), -- Bountiful Cookbook
+(34682, 2, 46784, 0, 0), -- Ripe Elwynn Pumpkin
+(34682, 3, 44835, 0, 0), -- Autumnal Herbs
+(34682, 4, 44853, 0, 0), -- Honey
+(34682, 5, 159, 0, 0), -- Refreshing Spring Water
+(34682, 6, 2678, 0, 0), -- Mild Spices
+(34682, 7, 30817, 0, 0), -- Simple Flour
+(34682, 8, 46888, 0, 0); -- Bountiful Basket
diff --git a/sql/updates/world/2011_11_21_05_pilgrim_tables.sql b/sql/updates/world/2011_11_21_05_pilgrim_tables.sql
new file mode 100644
index 00000000000..18881e14eaf
--- /dev/null
+++ b/sql/updates/world/2011_11_21_05_pilgrim_tables.sql
@@ -0,0 +1,52 @@
+UPDATE `creature_template` SET `unit_flags`=33555200,`VehicleId`=323 WHERE `entry`=32830; -- Food Holder
+UPDATE `creature_template` SET `unit_flags`=33555200,`VehicleId`=325 WHERE `entry`=32840; -- Plate Holder
+UPDATE `creature_template` SET `unit_flags`=33554432,`speed_run`=1,`VehicleId`=320 WHERE `entry`=32823; -- Bountiful Table
+UPDATE `creature_template` SET `unit_flags`=33554432,`speed_run`=1 WHERE `entry`=32839; -- Sturdy Plate
+UPDATE `creature_template` SET `unit_flags`=33554432 WHERE `entry`=32824; -- [PH] Pilgrim's Bounty Table - Turkey
+UPDATE `creature_template` SET `unit_flags`=33554432 WHERE `entry`=32827; -- [PH] Pilgrim's Bounty Table - Cranberry Sauce
+UPDATE `creature_template` SET `unit_flags`=33554432 WHERE `entry`=32831; -- [PH] Pilgrim's Bounty Table - Stuffing
+UPDATE `creature_template` SET `unit_flags`=33554432 WHERE `entry`=32825; -- [PH] Pilgrim's Bounty Table - Yams
+UPDATE `creature_template` SET `unit_flags`=33554432 WHERE `entry`=32829; -- [PH] Pilgrim's Bounty Table - Pie
+
+UPDATE `creature_model_info` SET `bounding_radius`=1.8,`combat_reach`=0,`gender`=2 WHERE `modelid`=28293; -- Bountiful Table
+UPDATE `creature_model_info` SET `bounding_radius`=1.75,`combat_reach`=0,`gender`=2 WHERE `modelid`=28310; -- Sturdy Plate
+UPDATE `creature_model_info` SET `bounding_radius`=0.125,`combat_reach`=0.25,`gender`=2 WHERE `modelid`=17188; -- [PH] Pilgrim's Bounty Table - X
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (32830,32840,32839,32824,32827,32831,32829,32825);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(32830,0,0,1,0, NULL), -- Food Holder
+(32840,0,0,1,0, NULL), -- Plate Holder
+(32839,0,0,1,0, NULL), -- Sturdy Plate
+(32824,0,0,1,0, NULL), -- [PH] Pilgrim's Bounty Table - Turkey
+(32827,0,0,1,0, NULL), -- [PH] Pilgrim's Bounty Table - Cranberry Sauce
+(32831,0,0,1,0, NULL), -- [PH] Pilgrim's Bounty Table - Stuffing
+(32825,0,0,1,0, NULL), -- [PH] Pilgrim's Bounty Table - Yams
+(32829,0,0,1,0, NULL); -- [PH] Pilgrim's Bounty Table - Pie
+
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (32823,32830,32840);
+INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`, `aura_required`, `aura_forbidden`, `user_type`) VALUES
+(32823, 46598, 0, 0, 0, 1, 0, 0, 0), -- Bountiful Table (Ride Vehicle Hardcoded)
+(32830, 46598, 0, 0, 0, 1, 0, 0, 0), -- Food Holder (Ride Vehicle Hardcoded)
+(32840, 46598, 0, 0, 0, 1, 0, 0, 0); -- Plate Holder (Ride Vehicle Hardcoded)
+
+DELETE FROM `vehicle_template_accessory` WHERE `entry` IN (32823,32830,32840);
+INSERT INTO `vehicle_template_accessory` (`entry`, `accessory_entry`, `seat_id`, `minion`, `description`, `summontype`, `summontimer`) VALUES
+(32823, 34812, 0, 1, 'Bountiful Table - The Turkey Chair', 8, 0),
+(32823, 34823, 1, 1, 'Bountiful Table - The Cranberry Chair', 8, 0),
+(32823, 34819, 2, 1, 'Bountiful Table - The Stuffing Chair', 8, 0),
+(32823, 34824, 3, 1, 'Bountiful Table - The Sweet Potato Chair', 8, 0),
+(32823, 34822, 4, 1, 'Bountiful Table - The Pie Chair', 8, 0),
+(32823, 32830, 5, 1, 'Bountiful Table - Food Holder', 8, 0),
+(32823, 32840, 6, 1, 'Bountiful Table - Plate Holder', 8, 0),
+--
+(32830, 32824, 0, 1, 'Food Holder - [PH] Pilgrim''s Bounty Table - Turkey', 8, 0),
+(32830, 32827, 1, 1, 'Food Holder - [PH] Pilgrim''s Bounty Table - Cranberry Sauce', 8, 0),
+(32830, 32831, 2, 1, 'Food Holder - [PH] Pilgrim''s Bounty Table - Stuffing', 8, 0),
+(32830, 32825, 3, 1, 'Food Holder - [PH] Pilgrim''s Bounty Table - Yams', 8, 0),
+(32830, 32829, 4, 1, 'Food Holder - [PH] Pilgrim''s Bounty Table - Pie', 8, 0),
+--
+(32840, 32839, 0, 1, 'Plate Holder - Sturdy Plate', 8, 0),
+(32840, 32839, 1, 1, 'Plate Holder - Sturdy Plate', 8, 0),
+(32840, 32839, 2, 1, 'Plate Holder - Sturdy Plate', 8, 0),
+(32840, 32839, 3, 1, 'Plate Holder - Sturdy Plate', 8, 0),
+(32840, 32839, 4, 1, 'Plate Holder - Sturdy Plate', 8, 0);