diff options
| -rw-r--r-- | sql/updates/world/2012_10_18_00_world_trinity_string.sql | 31 | ||||
| -rwxr-xr-x | src/server/game/DataStores/DBCfmt.h | 2 | ||||
| -rwxr-xr-x | src/server/game/Miscellaneous/Language.h | 30 |
3 files changed, 32 insertions, 31 deletions
diff --git a/sql/updates/world/2012_10_18_00_world_trinity_string.sql b/sql/updates/world/2012_10_18_00_world_trinity_string.sql index 8d62174d868..a12b20388eb 100644 --- a/sql/updates/world/2012_10_18_00_world_trinity_string.sql +++ b/sql/updates/world/2012_10_18_00_world_trinity_string.sql @@ -1,16 +1,17 @@ -REPLACE INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) +DELETE FROM `trinity_string` WHERE `entry` IN (9986, 9987, 9989, 9990, 9991, 9992, 9993, 9994, 9995, 9996, 9997, 9998, 9999); +INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES - (11015, 'Error', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), - (11014, 'None', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), - (11013, 'Leader', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), - (11012, 'Dps', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), - (11011, 'Healer', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), - (11010, 'Tank', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), - (11009, 'Raid browser', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), - (11008, 'Finished dungeon', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), - (11007, 'In dungeon', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), - (11006, 'Vote kick', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), - (11005, 'Proposal', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), - (11004, 'Queued', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), - (11003, 'Role check', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), - (11002, 'None', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + (9986, 'Error', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), + (9987, 'None', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), + (9988, 'Leader', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), + (9989, 'Dps', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), + (9990, 'Healer', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), + (9991, 'Tank', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), + (9992, 'Raid browser', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), + (9993, 'Finished dungeon', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), + (9994, 'In dungeon', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), + (9995, 'Vote kick', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), + (9996, 'Proposal', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), + (9997, 'Queued', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), + (9998, 'Role check', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), + (9999, 'None', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h index 0c2cc565b22..0fe82ea3311 100755 --- a/src/server/game/DataStores/DBCfmt.h +++ b/src/server/game/DataStores/DBCfmt.h @@ -77,7 +77,7 @@ char const ItemLimitCategoryEntryfmt[]="nxxxxxxxxxxxxxxxxxii"; char const ItemRandomPropertiesfmt[]="nxiiixxssssssssssssssssx"; char const ItemRandomSuffixfmt[]="nssssssssssssssssxxiiixxiiixx"; char const ItemSetEntryfmt[]="dssssssssssssssssxiiiiiiiiiixxxxxxxiiiiiiiiiiiiiiiiii"; -char const LFGDungeonEntryfmt[]="nssssssssssssssssiiiiiiiiixxixixxxxxxxxxxxxxxxxx"; +char const LFGDungeonEntryfmt[]="nssssssssssssssssxiiiiiiiiixxixixxxxxxxxxxxxxxxxx"; char const LiquidTypefmt[]="nxxixixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; char const LockEntryfmt[]="niiiiiiiiiiiiiiiiiiiiiiiixxxxxxxx"; char const MailTemplateEntryfmt[]="nxxxxxxxxxxxxxxxxxssssssssssssssssx"; diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index ee3be6f2b2d..6868db35975 100755 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -990,6 +990,21 @@ enum TrinityStrings LANG_WORLD_CLOSED = 7523, LANG_WORLD_OPENED = 7524, + LANG_LFG_STATE_NONE = 9986, + LANG_LFG_STATE_ROLECHECK = 9987, + LANG_LFG_STATE_QUEUED = 9988, + LANG_LFG_STATE_PROPOSAL = 9989, + LANG_LFG_STATE_BOOT = 9990, + LANG_LFG_STATE_DUNGEON = 9991, + LANG_LFG_STATE_FINISHED_DUNGEON = 9992, + LANG_LFG_STATE_RAIDBROWSER = 9993, + LANG_LFG_ROLE_TANK = 9994, + LANG_LFG_ROLE_HEALER = 9995, + LANG_LFG_ROLE_DAMAGE = 9996, + LANG_LFG_ROLE_LEADER = 9997, + LANG_LFG_ROLE_NONE = 9998, + LANG_LFG_ERROR = 9999, + // Use for not-in-offcial-sources patches // 10000-10999 // opvp hp @@ -1078,21 +1093,6 @@ enum TrinityStrings LANG_AUTO_BROADCAST = 11000, LANG_INVALID_REALMID = 11001, - LANG_LFG_STATE_NONE = 11002, - LANG_LFG_STATE_ROLECHECK = 11003, - LANG_LFG_STATE_QUEUED = 11004, - LANG_LFG_STATE_PROPOSAL = 11005, - LANG_LFG_STATE_BOOT = 11006, - LANG_LFG_STATE_DUNGEON = 11007, - LANG_LFG_STATE_FINISHED_DUNGEON = 11008, - LANG_LFG_STATE_RAIDBROWSER = 11009, - LANG_LFG_ROLE_TANK = 11010, - LANG_LFG_ROLE_HEALER = 11011, - LANG_LFG_ROLE_DAMAGE = 11012, - LANG_LFG_ROLE_LEADER = 11013, - LANG_LFG_ROLE_NONE = 11014, - LANG_LFG_ERROR = 11015, - // NOT RESERVED IDS 12000-1999999999 // `db_script_string` table index 2000000000-2000009999 (MIN_DB_SCRIPT_STRING_ID-MAX_DB_SCRIPT_STRING_ID) // For other tables maybe 2000010000-2147483647 (max index) |