diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Miscellaneous/Language.h | 45 |
1 files changed, 31 insertions, 14 deletions
diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index fb0e1ebd3da..5f6e3b99751 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -218,7 +218,14 @@ enum TrinityStrings LANG_INVALID_GAMEOBJECT_TYPE = 176, LANG_GAMEOBJECT_DAMAGED = 177, LANG_GRID_POSITION = 178, - // 179-185 used in master branch + + LANG_PHASESHIFT_STATUS = 179, // master branch ONLY + LANG_PHASESHIFT_PHASES = 180, // master branch ONLY + LANG_PHASESHIFT_VISIBLE_MAP_IDS = 181, // master branch ONLY + LANG_PHASESHIFT_UI_WORLD_MAP_AREA_SWAPS = 182,//master branch ONLY + LANG_PHASE_FLAG_COSMETIC = 183, // master branch ONLY + LANG_PHASE_FLAG_PERSONAL = 184, // master branch ONLY + // 185 not used LANG_TRANSPORT_POSITION = 186, LANG_PARTIAL_GROUP_SUMMON = 187, LANG_2FA_SECRET_TOO_LONG = 188, @@ -976,7 +983,14 @@ enum TrinityStrings LANG_COMMAND_BOSS_MULTIPLE_SPAWN_ETY = 1209, LANG_COMMAND_GO_BOSS_FAILED = 1210, LANG_COMMAND_WENT_TO_BOSS = 1211, - // 1212-1499 - free + LANG_GUILD_INFO_LEVEL = 1212, // master branch ONLY + LANG_ACCOUNT_BNET_LINKED = 1213, // master branch ONLY + LANG_ACCOUNT_OR_BNET_DOES_NOT_EXIST = 1214, // master branch ONLY + LANG_ACCOUNT_ALREADY_LINKED = 1215, // master branch ONLY + LANG_ACCOUNT_BNET_UNLINKED = 1216, // master branch ONLY + LANG_ACCOUNT_BNET_NOT_LINKED = 1217, // master branch ONLY + LANG_DISALLOW_TICKETS_CONFIG = 1218, // master branch ONLY + // 1219-1499 - free // Command argument parsers LANG_CMDPARSER_EITHER = 1500, @@ -996,8 +1010,8 @@ enum TrinityStrings LANG_CMDPARSER_SPELL_NO_EXIST = 1514, LANG_CMDPARSER_EXACT_SEQ_MISMATCH = 1515, - // 1212-1998 - free - LANG_DO_NOT_USE_6X_DEBUG_AREATRIGGER_LEFT = 1999, + // 1516-1998 - free + LANG_DEBUG_AREATRIGGER_LEFT = 1999, // master branch ONLY // Ticket Strings 2000-2030 LANG_COMMAND_TICKETNEW = 2000, LANG_COMMAND_TICKETUPDATED = 2001, @@ -1039,7 +1053,7 @@ enum TrinityStrings LANG_COMMAND_NO_FROZEN_PLAYERS = 5004, LANG_COMMAND_LIST_FREEZE = 5005, LANG_COMMAND_PERMA_FROZEN_PLAYER = 5006, - // = 5007, unused + LANG_PHASE_NOTFOUND = 5007, // master branch ONLY LANG_INSTANCE_CLOSED = 5008, LANG_COMMAND_PLAYED_TO_ALL = 5009, LANG_NPCINFO_LINKGUID = 5010, @@ -1101,14 +1115,14 @@ enum TrinityStrings LANG_COMMAND_MUTEHISTORY_OUTPUT = 5061, // Scene debugs commands [Master only, not used in 3.3.5] - /* LANG_COMMAND_SCENE_DEBUG_ON = 5062, - LANG_COMMAND_SCENE_DEBUG_OFF = 5063, - LANG_COMMAND_SCENE_DEBUG_PLAY = 5064, - LANG_COMMAND_SCENE_DEBUG_TRIGGER = 5065, - LANG_COMMAND_SCENE_DEBUG_CANCEL = 5066, - LANG_COMMAND_SCENE_DEBUG_COMPLETE = 5067, - LANG_DEBUG_SCENE_OBJECT_LIST = 5068, - LANG_DEBUG_SCENE_OBJECT_DETAIL = 5069, */ + LANG_COMMAND_SCENE_DEBUG_ON = 5062, // master branch ONLY + LANG_COMMAND_SCENE_DEBUG_OFF = 5063, // master branch ONLY + LANG_COMMAND_SCENE_DEBUG_PLAY = 5064, // master branch ONLY + LANG_COMMAND_SCENE_DEBUG_TRIGGER = 5065, // master branch ONLY + LANG_COMMAND_SCENE_DEBUG_CANCEL = 5066, // master branch ONLY + LANG_COMMAND_SCENE_DEBUG_COMPLETE = 5067, // master branch ONLY + LANG_DEBUG_SCENE_OBJECT_LIST = 5068, // master branch ONLY + LANG_DEBUG_SCENE_OBJECT_DETAIL = 5069, // master branch ONLY // Strings added for dynamic_spawning LANG_SPAWNINFO_GROUP_ID = 5070, @@ -1215,6 +1229,9 @@ enum TrinityStrings LANG_CREATURE_NOT_AI_ENABLED = 11015, LANG_SELECT_PLAYER_OR_PET = 11016, LANG_SHUTDOWN_DELAYED = 11017, - LANG_SHUTDOWN_CANCELLED = 11018 + LANG_SHUTDOWN_CANCELLED = 11018, + LANG_YOU_CHANGE_POWER = 11019, // master branch ONLY + LANG_YOUR_POWER_CHANGED = 11020, // master branch ONLY + LANG_INVALID_POWER_NAME = 11021 // master branch ONLY }; #endif |