From 869aa6bf567177d3a859344631841b47b69031a4 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 27 Jan 2021 00:16:20 -0500 Subject: [PATCH] Core/Pvp: Add config option to enable warmode/pvptalents --- Source/Framework/Constants/SharedConst.cs | 1 + Source/Game/Handlers/CharacterHandler.cs | 2 +- Source/Game/Server/WorldConfig.cs | 1 + Source/WorldServer/WorldServer.conf.dist | 8 ++++++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Source/Framework/Constants/SharedConst.cs b/Source/Framework/Constants/SharedConst.cs index 1b2865bc4..69c4636a8 100644 --- a/Source/Framework/Constants/SharedConst.cs +++ b/Source/Framework/Constants/SharedConst.cs @@ -1169,6 +1169,7 @@ namespace Framework.Constants FeatureSystemBpayStoreEnabled, FeatureSystemCharacterUndeleteCooldown, FeatureSystemCharacterUndeleteEnabled, + FeatureSystemWarModeEnabled, ForceShutdownThreshold, GameobjectCheckInvalidPostion, GameType, diff --git a/Source/Game/Handlers/CharacterHandler.cs b/Source/Game/Handlers/CharacterHandler.cs index cbf747566..0b436300e 100644 --- a/Source/Game/Handlers/CharacterHandler.cs +++ b/Source/Game/Handlers/CharacterHandler.cs @@ -1080,8 +1080,8 @@ namespace Game features.CharUndeleteEnabled = WorldConfig.GetBoolValue(WorldCfg.FeatureSystemCharacterUndeleteEnabled); features.BpayStoreEnabled = WorldConfig.GetBoolValue(WorldCfg.FeatureSystemBpayStoreEnabled); + features.WarModeFeatureEnabled = WorldConfig.GetBoolValue(WorldCfg.FeatureSystemWarModeEnabled); features.IsMuted = !CanSpeak(); - features.WarModeFeatureEnabled = true; SendPacket(features); } diff --git a/Source/Game/Server/WorldConfig.cs b/Source/Game/Server/WorldConfig.cs index a964642ac..e7c001a96 100644 --- a/Source/Game/Server/WorldConfig.cs +++ b/Source/Game/Server/WorldConfig.cs @@ -871,6 +871,7 @@ namespace Game Values[WorldCfg.FeatureSystemBpayStoreEnabled] = GetDefaultValue("FeatureSystem.BpayStore.Enabled", false); Values[WorldCfg.FeatureSystemCharacterUndeleteEnabled] = GetDefaultValue("FeatureSystem.CharacterUndelete.Enabled", false); Values[WorldCfg.FeatureSystemCharacterUndeleteCooldown] = GetDefaultValue("FeatureSystem.CharacterUndelete.Cooldown", 2592000); + Values[WorldCfg.FeatureSystemWarModeEnabled] = GetDefaultValue("FeatureSystem.WarMode.Enabled", false); // Dungeon finder Values[WorldCfg.LfgOptionsmask] = GetDefaultValue("DungeonFinder.OptionsMask", 1); diff --git a/Source/WorldServer/WorldServer.conf.dist b/Source/WorldServer/WorldServer.conf.dist index 220393325..53208a503 100644 --- a/Source/WorldServer/WorldServer.conf.dist +++ b/Source/WorldServer/WorldServer.conf.dist @@ -1268,6 +1268,14 @@ FeatureSystem.CharacterUndelete.Enabled = 0 FeatureSystem.CharacterUndelete.Cooldown = 2592000 +# +# FeatureSystem.WarMode.Enabled +# Description: Enables Warmode with access to PvpTalents. +# Default: 0 - (Disabled) +# 1 - (Enabled, Experimental) + +FeatureSystem.WarMode.Enabled = 0 + # ###################################################################################################