diff options
| -rwxr-xr-x | src/server/game/DataStores/DBCStores.h | 3 | ||||
| -rwxr-xr-x | src/server/game/Globals/ObjectMgr.cpp | 4 | ||||
| -rwxr-xr-x | src/server/game/Miscellaneous/Formulas.h | 3 | ||||
| -rwxr-xr-x | src/server/game/Miscellaneous/SharedDefines.h | 10 | ||||
| -rwxr-xr-x | src/server/game/Server/Protocol/Handlers/MiscHandler.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Server/Protocol/Opcodes.h | 4 |
6 files changed, 17 insertions, 9 deletions
diff --git a/src/server/game/DataStores/DBCStores.h b/src/server/game/DataStores/DBCStores.h index 0278a2ace99..635d319abbb 100755 --- a/src/server/game/DataStores/DBCStores.h +++ b/src/server/game/DataStores/DBCStores.h @@ -50,7 +50,8 @@ enum ContentLevels { CONTENT_1_60 = 0, CONTENT_61_70, - CONTENT_71_80 + CONTENT_71_80, + CONTENT_81_85 }; ContentLevels GetContentLevelsForMapAndZone(uint32 mapid, uint32 zoneId); diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 8c14c0b04fc..6d9fbbc435d 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -179,7 +179,9 @@ LanguageDesc lang_description[LANGUAGES_COUNT] = { LANG_DRAENEI, 29932, SKILL_LANG_DRAENEI }, { LANG_ZOMBIE, 0, 0 }, { LANG_GNOMISH_BINARY, 0, 0 }, - { LANG_GOBLIN_BINARY, 0, 0 } + { LANG_GOBLIN_BINARY, 0, 0 }, + { LANG_WORGEN, 69270, SKILL_LANG_WORGEN }, + { LANG_GOBLIN, 69269, SKILL_LANG_GOBLIN } }; LanguageDesc const* GetLanguageDescByID(uint32 lang) diff --git a/src/server/game/Miscellaneous/Formulas.h b/src/server/game/Miscellaneous/Formulas.h index 4faacc1f7b7..27397837265 100755 --- a/src/server/game/Miscellaneous/Formulas.h +++ b/src/server/game/Miscellaneous/Formulas.h @@ -126,6 +126,9 @@ namespace Trinity case CONTENT_71_80: nBaseExp = 580; break; + case CONTENT_81_85: + nBaseExp = 1878; + break; default: sLog->outError("BaseGain: Unsupported content level %u", content); nBaseExp = 45; diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index c8199f2c98a..8fac594520e 100755 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -79,11 +79,11 @@ enum Races //RACE_NORTHREND_SKELETON = 20, //RACE_ICE_TROLL = 21, RACE_WORGEN = 22, - RACE_GILNEAN = 23 + //RACE_GILNEAN = 23 }; // max+1 for player race -#define MAX_RACES 24 +#define MAX_RACES 23 #define RACEMASK_ALL_PLAYABLE \ ((1<<(RACE_HUMAN-1)) |(1<<(RACE_ORC-1)) |(1<<(RACE_DWARF-1)) | \ @@ -641,10 +641,12 @@ enum Language LANG_ZOMBIE = 36, LANG_GNOMISH_BINARY = 37, LANG_GOBLIN_BINARY = 38, + LANG_WORGEN = 39, + LANG_GOBLIN = 40, LANG_ADDON = 0xFFFFFFFF // used by addons, in 2.4.0 not exist, replaced by messagetype? }; -#define LANGUAGES_COUNT 19 +#define LANGUAGES_COUNT 21 enum TeamId { @@ -2673,7 +2675,7 @@ enum SkillType SKILL_PET_EXOTIC_SPIRIT_BEAST = 788, SKILL_RACIAL_WORGEN = 789, SKILL_RACIAL_GOBLIN = 790, - SKILL_LANG_GILNEAN = 791, + SKILL_LANG_WORGEN = 791, SKILL_LANG_GOBLIN = 792, SKILL_ARCHAEOLOGY = 794, SKILL_GENERAL_HUNTER = 795, diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp index 7ffadb7bad8..d51afc5eaf1 100755 --- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp @@ -1207,7 +1207,7 @@ void WorldSession::HandleInspectOpcode(WorldPacket& recv_data) if (!player) // wrong player return; - uint32 talent_points = 0x47; + uint32 talent_points = 41; uint32 guid_size = player->GetPackGUID().wpos(); WorldPacket data(SMSG_INSPECT_TALENT, guid_size+4+talent_points); data.append(player->GetPackGUID()); diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index 645701be817..d4c19057d6f 100755 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -173,7 +173,7 @@ enum Opcodes CMSG_FORCE_WALK_SPEED_CHANGE_ACK = 0x00, CMSG_GAMEOBJECT_QUERY = 0xCEFF, CMSG_GAMEOBJ_REPORT_USE = 0x00, - CMSG_GAMEOBJ_USE = 0x9A4A, // might be CMSG_GAMEOBJ_USE + CMSG_GAMEOBJ_USE = 0x9A4A, // might be CMSG_GAMEOBJ_REPORT_USE CMSG_GAMESPEED_SET = 0x00, CMSG_GAMETIME_SET = 0x00, CMSG_GETDEATHBINDZONE = 0x00, @@ -994,7 +994,7 @@ enum Opcodes SMSG_TEXT_EMOTE = 0x9E5A, SMSG_THREAT_CLEAR = 0x9E4A, SMSG_THREAT_REMOVE = 0x8A7E, - SMSG_THREAT_UPDATE = 0x0CE3, // Can be SMSG_HIGHEST_THREAT_UPDATE + SMSG_THREAT_UPDATE = 0x0CE3, SMSG_TIME_SYNC_REQ = 0x1009, SMSG_TITLE_EARNED = 0x1AFA, SMSG_TOGGLE_XP_GAIN = 0x8A5B, |