diff options
| author | Odyssey <odysseyhyd@gmail.com> | 2014-09-08 15:56:00 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2014-09-08 15:56:32 +0100 |
| commit | 54e201b8b97912b45f5ae942c5b71abb1cf58640 (patch) | |
| tree | fedaab04089811e63a9d77bd519efe6eed5985dc /src/server/game | |
| parent | 5e745f3fbba4956c9ed732c74016e6ed8a6e1143 (diff) | |
Scripts/Commands: Allow to set a custom duration to the Freeze command applied Aura
- Allow to set a default duration for the Freeze Aura in worldserver.conf
- Handle the .freeze and .unfreeze command custom effects through the Freeze AuraScript
- Make players able to eventually unfreeze by themselves since the aura will expire without someone having to use .unfreeze
- Make .freeze command usable with the following syntax:
* .freeze (with a targeted player)
* .freeze duration_in_seconds (with a targeted player)
* .freeze playername duration (if duration is an invalid value it will be defaulted to the config one)
* .freeze playername (in this case, duration will be defaulted to the config value)
- Make .listfreeze command able to show the remaining freeze duration on all affected players
Closes #12972
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Miscellaneous/Language.h | 4 | ||||
| -rw-r--r-- | src/server/game/World/World.cpp | 1 | ||||
| -rw-r--r-- | src/server/game/World/World.h | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index eceb0a8e7de..c1de3aae7cb 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -1054,7 +1054,7 @@ enum TrinityStrings LANG_COMMAND_UNFREEZE = 5003, LANG_COMMAND_NO_FROZEN_PLAYERS = 5004, LANG_COMMAND_LIST_FREEZE = 5005, - LANG_COMMAND_FROZEN_PLAYERS = 5006, + LANG_COMMAND_PERMA_FROZEN_PLAYER = 5006, LANG_INSTANCE_RAID_GROUP_ONLY = 5007, LANG_INSTANCE_CLOSED = 5008, LANG_COMMAND_PLAYED_TO_ALL = 5009, @@ -1068,7 +1068,7 @@ enum TrinityStrings LANG_ARENA = 5016, LANG_RAID = 5017, //= 5018, - //= 5019, + LANG_COMMAND_TEMP_FROZEN_PLAYER = 5019, LANG_NPCINFO_PHASEMASK = 5020, LANG_NPCINFO_ARMOR = 5021, LANG_CHANNEL_ENABLE_OWNERSHIP = 5022, diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 5c65055f3c0..58e3cffa8de 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -856,6 +856,7 @@ void World::LoadConfigSettings(bool reload) m_int_configs[CONFIG_GM_VISIBLE_STATE] = sConfigMgr->GetIntDefault("GM.Visible", 2); m_int_configs[CONFIG_GM_CHAT] = sConfigMgr->GetIntDefault("GM.Chat", 2); m_int_configs[CONFIG_GM_WHISPERING_TO] = sConfigMgr->GetIntDefault("GM.WhisperingTo", 2); + m_int_configs[CONFIG_GM_FREEZE_DURATION] = sConfigMgr->GetIntDefault("GM.FreezeAuraDuration", 0); m_int_configs[CONFIG_GM_LEVEL_IN_GM_LIST] = sConfigMgr->GetIntDefault("GM.InGMList.Level", SEC_ADMINISTRATOR); m_int_configs[CONFIG_GM_LEVEL_IN_WHO_LIST] = sConfigMgr->GetIntDefault("GM.InWhoList.Level", SEC_ADMINISTRATOR); diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 05bfcc21462..cc2078bc736 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -227,6 +227,7 @@ enum WorldIntConfigs CONFIG_GM_ACCEPT_TICKETS, CONFIG_GM_CHAT, CONFIG_GM_WHISPERING_TO, + CONFIG_GM_FREEZE_DURATION, CONFIG_GM_LEVEL_IN_GM_LIST, CONFIG_GM_LEVEL_IN_WHO_LIST, CONFIG_START_GM_LEVEL, |
