diff options
Diffstat (limited to 'src/trinitycore')
| -rw-r--r-- | src/trinitycore/Main.cpp | 2 | ||||
| -rw-r--r-- | src/trinitycore/trinitycore.conf.dist | 16 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/trinitycore/Main.cpp b/src/trinitycore/Main.cpp index 3bcbb02b9d7..342252741fb 100644 --- a/src/trinitycore/Main.cpp +++ b/src/trinitycore/Main.cpp @@ -40,7 +40,7 @@ // Format is YYYYMMDDRR where RR is the change in the conf file // for that day. #ifndef _TRINITY_CORE_CONFVER -# define _TRINITY_CORE_CONFVER 2009101501 +# define _TRINITY_CORE_CONFVER 2009101701 #endif //_TRINITY_CORE_CONFVER #ifdef WIN32 diff --git a/src/trinitycore/trinitycore.conf.dist b/src/trinitycore/trinitycore.conf.dist index 4c9d6d0de63..7c741e38e0e 100644 --- a/src/trinitycore/trinitycore.conf.dist +++ b/src/trinitycore/trinitycore.conf.dist @@ -1,7 +1,7 @@ ########################################## # Trinity Core worldd configuration file # ########################################## -ConfVersion=2009101501 +ConfVersion=2009101701 ################################################################################################################### # CONNECTIONS AND DIRECTORIES @@ -1917,27 +1917,27 @@ Ra.Secure = 1 # # OutdoorPvP.Wintergrasp.CustomHonorBattleWin # Defines the amount of honor points that should be given to the team winning the Wintergrasp Battle. Requires OutdoorPvP.Wintergrasp.CustomHonorRewards = 1. +# Default: 3000 # # OutdoorPvP.Wintergrasp.CustomHonorBattleLose # Defines the amount of honor points that should be given to the team losing the Wintergrasp Battle. Requires OutdoorPvP.Wintergrasp.CustomHonorRewards = 1. +# Default: 1250 # # OutdoorPvP.Wintergrasp.CustomHonorDamageTower # Defines the amount of honor points that should be given to the team for damaging a tower. Requires OutdoorPvP.Wintergrasp.CustomHonorRewards = 1. +# Default: 750 # # OutdoorPvP.Wintergrasp.CustomHonorDestroyedTower # Defines the amount of honor points that should be given to the team for destroying a tower. Requires OutdoorPvP.Wintergrasp.CustomHonorRewards = 1. +# Default: 750 # # OutdoorPvP.Wintergrasp.CustomHonorDamagedBuilding # Defines the amount of honor points that should be given to the team for damaged buildings after the battle. Requires OutdoorPvP.Wintergrasp.CustomHonorRewards = 1. +# Default: 750 # # OutdoorPvP.Wintergrasp.CustomHonorIntactBuilding # Defines the amount of honor points that should be given to the team for intact buildings after the battle. Requires OutdoorPvP.Wintergrasp.CustomHonorRewards = 1. -# -# OutdoorPvP.Wintergrasp.CustomHonorBattleWinMarks -# Defines the amount of wintergrasp reward marks that should be given to the team winning the Wintergrasp Battle. Requires OutdoorPvP.Wintergrasp.CustomHonorRewards = 1. -# -# OutdoorPvP.Wintergrasp.CustomHonorBattleLoseMarks -# Defines the amount of wintergrasp reward marks that should be given to the team losing the Wintergrasp Battle. Requires OutdoorPvP.Wintergrasp.CustomHonorRewards = 1. +# Default: 1500 # # ForbiddenMaps # map ids that users below SEC_GAMEMASTER cannot enter, with delimiter ',' @@ -1997,8 +1997,6 @@ OutdoorPvP.Wintergrasp.CustomHonorDamageTower = 750 OutdoorPvP.Wintergrasp.CustomHonorDestroyedTower = 750 OutdoorPvP.Wintergrasp.CustomHonorDamagedBuilding = 750 OutdoorPvP.Wintergrasp.CustomHonorIntactBuilding = 1500 -OutdoorPvP.Wintergrasp.CustomHonorBattleWinMarks = 3 -OutdoorPvP.Wintergrasp.CustomHonorBattleLoseMarks = 1 NoResetTalentsCost = 0 ShowKickInWorld = 0 RecordUpdateTimeDiffInterval = 60000 |