diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/World.cpp | 17 | ||||
| -rw-r--r-- | src/game/World.h | 4 | ||||
| -rw-r--r-- | src/trinitycore/trinitycore.conf.dist | 23 |
3 files changed, 1 insertions, 43 deletions
diff --git a/src/game/World.cpp b/src/game/World.cpp index ce733a035ec..a7cff4cb686 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -953,23 +953,6 @@ void World::LoadConfigSettings(bool reload) m_configs[CONFIG_MAX_WHO] = sConfig.GetIntDefault("MaxWhoListReturns", 49); - m_configs[CONFIG_PLAYER_START_GOLD] = (uint32)(sConfig.GetFloatDefault("PlayerStart.Gold", 0.0f) * 10000.0f); - - if(m_configs[CONFIG_PLAYER_START_GOLD] > MAX_MONEY_AMOUNT) - m_configs[CONFIG_PLAYER_START_GOLD] = MAX_MONEY_AMOUNT; - - m_configs[CONFIG_PLAYER_START_HONOR] = sConfig.GetIntDefault("PlayerStart.HonorPoints", 0); - if(m_configs[CONFIG_PLAYER_START_HONOR] < 0) - m_configs[CONFIG_PLAYER_START_HONOR] = 0; - - m_configs[CONFIG_PLAYER_START_ARENAPTS] = sConfig.GetIntDefault("PlayerStart.ArenaPoints", 0); - if(m_configs[CONFIG_PLAYER_START_ARENAPTS] < 0) - m_configs[CONFIG_PLAYER_START_ARENAPTS] = 0; - - m_configs[CONFIG_GM_START_LEVEL] = sConfig.GetIntDefault("GamemasterStartLevel", 1); - if(m_configs[CONFIG_GM_START_LEVEL] < 1) - m_configs[CONFIG_GM_START_LEVEL] = 1; - m_configs[CONFIG_BG_START_MUSIC] = sConfig.GetBoolDefault("MusicInBattleground", false); m_configs[CONFIG_START_ALL_SPELLS] = sConfig.GetBoolDefault("PlayerStart.AllSpells", false); m_configs[CONFIG_HONOR_AFTER_DUEL] = sConfig.GetIntDefault("HonorPointsAfterDuel", 0); diff --git a/src/game/World.h b/src/game/World.h index 9dd989bd4fe..73266c1b090 100644 --- a/src/game/World.h +++ b/src/game/World.h @@ -180,10 +180,6 @@ enum WorldConfigs CONFIG_LISTEN_RANGE_YELL, CONFIG_MAX_WHO, - CONFIG_PLAYER_START_GOLD, - CONFIG_PLAYER_START_HONOR, - CONFIG_PLAYER_START_ARENAPTS, - CONFIG_GM_START_LEVEL, CONFIG_BG_START_MUSIC, CONFIG_START_ALL_SPELLS, diff --git a/src/trinitycore/trinitycore.conf.dist b/src/trinitycore/trinitycore.conf.dist index c957b894d97..0f0c42eae13 100644 --- a/src/trinitycore/trinitycore.conf.dist +++ b/src/trinitycore/trinitycore.conf.dist @@ -870,7 +870,7 @@ GM.WhisperingTo = 2 GM.InGMList = 0 GM.InWhoList = 0 GM.LogTrade = 1 -GM.StartLevel = 1 +GM.StartLevel = 70 ################################################################################################################### # VISIBILITY AND RADIUSES @@ -1200,19 +1200,6 @@ BattleGround.PrematureFinishTimer = 0 ################################################################################################################### # CUSTOM SERVER OPTIONS # -# PlayerStart.Gold -# Amount of gold that new players will start with. -# If you want to start with silver, use for example 0.1 (for 10s) -# Default: 0 -# -# PlayerStart.HonorPoints -# Amount of honor that new players will start with -# Default: 0 -# -# PlayerStart.ArenaPoints -# Amount of arena points that new players will start with -# Default: 0 -# # PlayerStart.AllReputation # Players will start with most of the high level reputations that are needed for items, mounts etc. # If there are any reputation faction you want to be added, just tell me. @@ -1229,10 +1216,6 @@ BattleGround.PrematureFinishTimer = 0 # PlayerStart.AllFlightPaths # Players will start with all flight paths (Note: ALL flight paths, not only player's team) # -# GamemasterStartLevel -# GM starting level -# Default: 70 Min,max: 1 - 255 -# # PlayerInstantLogout # Enable or disable instant logout for all players (NOT in combat/while dueling/while falling) # Default: 0 - off @@ -1276,14 +1259,10 @@ BattleGround.PrematureFinishTimer = 0 # ################################################################################################################### -PlayerStart.Gold = 0 -PlayerStart.HonorPoints = 0 -PlayerStart.ArenaPoints = 0 PlayerStart.AllReputation = 0 PlayerStart.AllSpells = 0 PlayerStart.MapsExplored = 0 PlayerStart.AllFlightPaths = 0 -GamemasterStartLevel = 70 PlayerInstantLogout = 0 MusicInBattleground = 0 HonorPointsAfterDuel = 0 |