diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/Chat/Commands/Level2.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Miscellaneous/SharedDefines.h | 15 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 13 |
3 files changed, 17 insertions, 13 deletions
diff --git a/src/server/game/Chat/Commands/Level2.cpp b/src/server/game/Chat/Commands/Level2.cpp index 1dd603094f6..295ab1fbf99 100755 --- a/src/server/game/Chat/Commands/Level2.cpp +++ b/src/server/game/Chat/Commands/Level2.cpp @@ -385,6 +385,8 @@ bool ChatHandler::HandlePInfoCommand(const char* args) case RACE_TROLL: race_s = "Troll"; break; case RACE_BLOODELF: race_s = "Blood Elf"; break; case RACE_DRAENEI: race_s = "Draenei"; break; + case RACE_GOBLIN: race_s = "Goblin"; break; + case RACE_WORGEN: race_s = "Worgen"; break; } switch (Class) { diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index a99d0f37c02..8cb9056ed07 100755 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -62,9 +62,9 @@ enum Races RACE_TAUREN = 6, RACE_GNOME = 7, RACE_TROLL = 8, - //RACE_GOBLIN = 9, + RACE_GOBLIN = 9, RACE_BLOODELF = 10, - RACE_DRAENEI = 11 + RACE_DRAENEI = 11, //RACE_FEL_ORC = 12, //RACE_NAGA = 13, //RACE_BROKEN = 14, @@ -74,7 +74,8 @@ enum Races //RACE_FOREST_TROLL = 18, //RACE_TAUNKA = 19, //RACE_NORTHREND_SKELETON = 20, - //RACE_ICE_TROLL = 21 + //RACE_ICE_TROLL = 21, + RACE_WORGEN = 22 }; // max+1 for player race @@ -82,13 +83,13 @@ enum Races #define RACEMASK_ALL_PLAYABLE \ ((1<<(RACE_HUMAN-1)) |(1<<(RACE_ORC-1)) |(1<<(RACE_DWARF-1)) | \ - (1<<(RACE_NIGHTELF-1))|(1<<(RACE_UNDEAD_PLAYER-1))|(1<<(RACE_TAUREN-1)) | \ - (1<<(RACE_GNOME-1)) |(1<<(RACE_TROLL-1)) |(1<<(RACE_BLOODELF-1))| \ - (1<<(RACE_DRAENEI-1))) + (1<<(RACE_NIGHTELF-1))|(1<<(RACE_UNDEAD_PLAYER-1))|(1<<(RACE_TAUREN-1)) | \ + (1<<(RACE_GNOME-1)) |(1<<(RACE_TROLL-1)) |(1<<(RACE_BLOODELF-1))| \ + (1<<(RACE_DRAENEI-1)) |(1<<(RACE_GOBLIN-1)) |(1<<(RACE_WORGEN-1))) #define RACEMASK_ALLIANCE \ ((1<<(RACE_HUMAN-1)) | (1<<(RACE_DWARF-1)) | (1<<(RACE_NIGHTELF-1)) | \ - (1<<(RACE_GNOME-1)) | (1<<(RACE_DRAENEI-1))) + (1<<(RACE_GNOME-1)) | (1<<(RACE_DRAENEI-1)) | (1<<(RACE_WORGEN-1))) #define RACEMASK_HORDE RACEMASK_ALL_PLAYABLE & ~RACEMASK_ALLIANCE diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 742421b5ead..818db5d46b8 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -910,11 +910,12 @@ DeclinedNames = 0 # Expansion # Description: Allow server to use content from expansions. Checks for expansion-related # map files, client compatibility and class/race character creation. -# Default: 2 - (Expansion 2) +# Default: 3 - (Expansion 3) +# 2 - (Expansion 2) # 1 - (Expansion 1) # 0 - (Disabled, Ignore and disable expansion content (maps, races, classes) -Expansion = 2 +Expansion = 3 # # MinPlayerName @@ -1041,16 +1042,16 @@ SkipCinematics = 0 # Description: Maximum level that can be reached by players. # Important: Levels beyond 100 are not recommended at all. # Range: 1-255 -# Default: 80 +# Default: 85 -MaxPlayerLevel = 80 +MaxPlayerLevel = 85 # # MinDualSpecLevel # Description: Level requirement for Dual Talent Specialization -# Default: 40 +# Default: 30 -MinDualSpecLevel = 40 +MinDualSpecLevel = 30 # # StartPlayerLevel |