diff options
| author | Palabola <Palabola@users.noreply.github.com> | 2018-09-08 16:49:08 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2018-09-16 16:57:47 +0200 |
| commit | 01680312eb4b4f2b04297433a24e359d985df813 (patch) | |
| tree | 24da3e9f182c7e78e8318f774af200e88154000b /src | |
| parent | 322bb4a6800621d719235d94562fa215646b234a (diff) | |
Core/Misc: Updated current expansion config
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/DataStores/DBCEnums.h | 4 | ||||
| -rw-r--r-- | src/server/game/Miscellaneous/SharedDefines.h | 7 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 9 |
3 files changed, 11 insertions, 9 deletions
diff --git a/src/server/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h index 80d109a51a1..730f11a9908 100644 --- a/src/server/game/DataStores/DBCEnums.h +++ b/src/server/game/DataStores/DBCEnums.h @@ -44,11 +44,11 @@ enum LevelLimit // Client expected level limitation, like as used in DBC item max levels for "until max player level" // use as default max player level, must be fit max level for used client // also see MAX_LEVEL and STRONG_MAX_LEVEL define - DEFAULT_MAX_LEVEL = 110, + DEFAULT_MAX_LEVEL = 120, // client supported max level for player/pets/etc. Avoid overflow or client stability affected. // also see GT_MAX_LEVEL define - MAX_LEVEL = 110, + MAX_LEVEL = 120, // Server side limitation. Base at used code requirements. // also see MAX_LEVEL and GT_MAX_LEVEL define diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index f7bea0e904e..af3a0119300 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -85,15 +85,14 @@ enum Expansions EXPANSION_MISTS_OF_PANDARIA = 4, EXPANSION_WARLORDS_OF_DRAENOR = 5, EXPANSION_LEGION = 6, + EXPANSION_BATTLE_FOR_AZEROTH = 7, MAX_EXPANSIONS, - // future expansion - EXPANSION_BATTLE_FOR_AZEROTH = 7, MAX_ACCOUNT_EXPANSIONS }; -#define CURRENT_EXPANSION EXPANSION_LEGION +#define CURRENT_EXPANSION EXPANSION_BATTLE_FOR_AZEROTH inline uint32 GetMaxLevelForExpansion(uint32 expansion) { @@ -113,6 +112,8 @@ inline uint32 GetMaxLevelForExpansion(uint32 expansion) return 100; case EXPANSION_LEGION: return 110; + case EXPANSION_BATTLE_FOR_AZEROTH: + return 120; default: break; } diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 6f187fca25d..6fddde26c31 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -671,7 +671,8 @@ 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: 6 - (Expansion 6) +# Default: 7 - (Expansion 7) +# 6 - (Expansion 6) # 5 - (Expansion 5) # 4 - (Expansion 4) # 3 - (Expansion 3) @@ -679,7 +680,7 @@ DeclinedNames = 0 # 1 - (Expansion 1) # 0 - (Disabled, Ignore and disable expansion content (maps, races, classes) -Expansion = 6 +Expansion = 7 # # MinPlayerName @@ -830,9 +831,9 @@ SkipCinematics = 0 # Description: Maximum level that can be reached by players. # Important: Levels beyond 110 are not recommended at all. # Range: 1-255 -# Default: 110 +# Default: 120 -MaxPlayerLevel = 110 +MaxPlayerLevel = 120 # # MinDualSpecLevel |