diff options
| -rw-r--r-- | src/game/Level3.cpp | 7 | ||||
| -rw-r--r-- | src/game/World.cpp | 2 | ||||
| -rw-r--r-- | src/game/World.h | 1 | ||||
| -rw-r--r-- | src/trinitycore/trinitycore.conf.dist | 10 |
4 files changed, 17 insertions, 3 deletions
diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index 326f1ea6c65..773b8a52ac4 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -4223,8 +4223,11 @@ bool ChatHandler::HandleDieCommand(const char* /*args*/) if( target->isAlive() ) { - m_session->GetPlayer()->DealDamage(target, target->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - } + if(sWorld.getConfig(CONFIG_DIE_COMMAND_MODE)) + m_session->GetPlayer()->Kill(target); + else + m_session->GetPlayer()->DealDamage(target, target->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); +} return true; } diff --git a/src/game/World.cpp b/src/game/World.cpp index 0be652c5689..c2975be9b94 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -990,6 +990,8 @@ void World::LoadConfigSettings(bool reload) m_configs[CONFIG_DEATH_BONES_WORLD] = sConfig.GetBoolDefault("Death.Bones.World", true); m_configs[CONFIG_DEATH_BONES_BG_OR_ARENA] = sConfig.GetBoolDefault("Death.Bones.BattlegroundOrArena", true); + m_configs[CONFIG_DIE_COMMAND_MODE] = sConfig.GetBoolDefault("Die.Command.Mode", true); + m_configs[CONFIG_THREAT_RADIUS] = sConfig.GetIntDefault("ThreatRadius", 60); // always use declined names in the russian client diff --git a/src/game/World.h b/src/game/World.h index 5e16d973f7d..e04099db612 100644 --- a/src/game/World.h +++ b/src/game/World.h @@ -199,6 +199,7 @@ enum WorldConfigs CONFIG_DEATH_CORPSE_RECLAIM_DELAY_PVE, CONFIG_DEATH_BONES_WORLD, CONFIG_DEATH_BONES_BG_OR_ARENA, + CONFIG_DIE_COMMAND_MODE, CONFIG_THREAT_RADIUS, CONFIG_INSTANT_LOGOUT, CONFIG_DISABLE_BREATHING, diff --git a/src/trinitycore/trinitycore.conf.dist b/src/trinitycore/trinitycore.conf.dist index 2f59ebd0304..bd39a70f6ef 100644 --- a/src/trinitycore/trinitycore.conf.dist +++ b/src/trinitycore/trinitycore.conf.dist @@ -1,7 +1,7 @@ ########################################## # Trinity Core worldd configuration file # ########################################## -ConfVersion=2009081702 +ConfVersion=2009082013 ################################################################################################################### # CONNECTIONS AND DIRECTORIES @@ -1295,6 +1295,13 @@ Visibility.Distance.Grey.Object = 10 # Default: 1 (enabled) # 0 (disabled) # +# Die.Command.Mode +# Switch between two possible .die modes, where mode 1 kills +# and does not trigger anything such as loot, and mode 0 does +# damage and does trigger things such as loot +# Default: 1 +# 0 +# ################################################################################################################### Rate.Health = 1 @@ -1356,6 +1363,7 @@ Death.CorpseReclaimDelay.PvP = 1 Death.CorpseReclaimDelay.PvE = 0 Death.Bones.World = 1 Death.Bones.BattlegroundOrArena = 1 +Die.Command.Mode = 1 ################################################################################################################### # AUTO BROADCAST |