From 8c625f0f89be959e8c73f5552fa8437e57499b89 Mon Sep 17 00:00:00 2001 From: ariel- Date: Mon, 29 Aug 2016 19:20:06 +0100 Subject: Core/GameObject: added possibilty for gameobjects to contain money loot. Updates #14564 (cherry picked from commit b091415c03ffbfb5a7534d6b087101b15640fae7) Conflicts: src/server/game/Globals/ObjectMgr.cpp Core/GameObject: migrated non-WDB fields to new gameobject_template_addon table (cherry picked from commit bd4bf0a73fa29701835176ce757e2fb498b39cdc) Conflicts: src/server/game/Globals/ObjectMgr.cpp Core/GameObject: cache pointer to GameObjectTemplateAddon (cherry picked from commit 33102220e53731ca958b46e87abacdce07e3aa88) Conflicts: src/server/game/Entities/GameObject/GameObject.cpp Core/ObjectMgr: filter out bogus check This restores previous behaviour (cherry picked from commit 7028503e8f80dc5488ea9dbf33f595ef2044001d) Typo fix (cherry picked from commit fe3a0bf7e135cf8ba9035c4d3c271969d2915aaa) --- sql/updates/world/6.x/2016_08_29_00_world_.sql | 3 +++ sql/updates/world/6.x/2016_08_29_01_world_.sql | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 sql/updates/world/6.x/2016_08_29_00_world_.sql create mode 100644 sql/updates/world/6.x/2016_08_29_01_world_.sql (limited to 'sql') diff --git a/sql/updates/world/6.x/2016_08_29_00_world_.sql b/sql/updates/world/6.x/2016_08_29_00_world_.sql new file mode 100644 index 00000000000..6f948e61cf5 --- /dev/null +++ b/sql/updates/world/6.x/2016_08_29_00_world_.sql @@ -0,0 +1,3 @@ +ALTER TABLE `gameobject_template` +ADD COLUMN `mingold` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0' AFTER `unk1`, +ADD COLUMN `maxgold` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0' AFTER `mingold`; diff --git a/sql/updates/world/6.x/2016_08_29_01_world_.sql b/sql/updates/world/6.x/2016_08_29_01_world_.sql new file mode 100644 index 00000000000..732f5788318 --- /dev/null +++ b/sql/updates/world/6.x/2016_08_29_01_world_.sql @@ -0,0 +1,18 @@ +DROP TABLE IF EXISTS `gameobject_template_addon`; +CREATE TABLE `gameobject_template_addon`( + `entry` mediumint(8) UNSIGNED NOT NULL DEFAULT '0', + `faction` smallint(5) unsigned NOT NULL DEFAULT '0', + `flags` int(10) unsigned NOT NULL DEFAULT '0', + `mingold` mediumint(8) UNSIGNED NOT NULL DEFAULT '0', + `maxgold` mediumint(8) UNSIGNED NOT NULL DEFAULT '0', + PRIMARY KEY (`entry`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +INSERT INTO `gameobject_template_addon` (`entry`, `faction`, `flags`, `mingold`, `maxgold`) +SELECT `entry`, `faction`, `flags`, `mingold`, `maxgold` FROM `gameobject_template`; + +ALTER TABLE `gameobject_template` +DROP COLUMN `faction`, +DROP COLUMN `flags`, +DROP COLUMN `mingold`, +DROP COLUMN `maxgold`; -- cgit v1.2.3