Revert revisions 67325b1a0af0 and a0cba24b9060.

Made vendors ignore gold cost by default when extended cost is set, except when item has ITEM_FLAGS_EXTRA_EXT_COST_REQUIRES_GOLD flag

--HG--
branch : trunk

2 files changed, 7 insertions, 0 deletions

diff --git a/sql/updates/8897_world_npc_vendor.sql b/sql/updates/8897_world_npc_vendor.sql
new file mode 100644
index 00000000000..0e1c793863d
--- /dev/null
+++ b/sql/updates/8897_world_npc_vendor.sql
@@ -0,0 +1,5 @@
+-- Restore negative ExtendedCost, we now use FlagsExtra value instead
+UPDATE `npc_vendor` SET `ExtendedCost`=-`ExtendedCost` WHERE `ExtendedCost`<0;
+
+-- Set field type to unsigned
+ALTER TABLE npc_vendor CHANGE COLUMN `ExtendedCost` `ExtendedCost` mediumint(8) UNSIGNED NOT NULL default '0' COMMENT '';
diff --git a/sql/updates/8897_world_trinity_string.sql b/sql/updates/8897_world_trinity_string.sql
new file mode 100644
index 00000000000..691b0723a5b
--- /dev/null
+++ b/sql/updates/8897_world_trinity_string.sql
@@ -0,0 +1,2 @@
+-- UPDATE so we don't kill customized locale strings if user has any
+UPDATE `trinity_string` SET `content_default`='Item ''%u'' (with extended cost %u) already in vendor list.' WHERE `entry`=210;