Merge pull request #15731 from ShinDarth/toscri

Convert the Duel Cooldown Reset feature to scripts

5 files changed, 60 insertions, 19 deletions

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 9737940dc14..bfcdb7a8f57 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -7610,15 +7610,6 @@ void Player::DuelComplete(DuelCompleteType type)
     duel->opponent->SetGuidValue(PLAYER_DUEL_ARBITER, ObjectGuid::Empty);
     duel->opponent->SetUInt32Value(PLAYER_DUEL_TEAM, 0);
 
-    if (sWorld->getBoolConfig(CONFIG_RESET_DUEL_COOLDOWNS))
-    {
-        RemoveArenaSpellCooldowns(true);
-        duel->opponent->RemoveArenaSpellCooldowns(true);
-
-        GetSpellHistory()->RestoreCooldownStateAfterDuel();
-        duel->opponent->GetSpellHistory()->RestoreCooldownStateAfterDuel();
-    }
-
     delete duel->opponent->duel;
     duel->opponent->duel = NULL;
     delete duel;
diff --git a/src/server/game/Handlers/DuelHandler.cpp b/src/server/game/Handlers/DuelHandler.cpp
index 79539258bd5..2f39a91afbe 100644
--- a/src/server/game/Handlers/DuelHandler.cpp
+++ b/src/server/game/Handlers/DuelHandler.cpp
@@ -43,15 +43,6 @@ void WorldSession::HandleDuelAcceptedOpcode(WorldPacket& recvPacket)
     TC_LOG_DEBUG("network", "Player 1 is: %u (%s)", player->GetGUID().GetCounter(), player->GetName().c_str());
     TC_LOG_DEBUG("network", "Player 2 is: %u (%s)", plTarget->GetGUID().GetCounter(), plTarget->GetName().c_str());
 
-    if (sWorld->getBoolConfig(CONFIG_RESET_DUEL_COOLDOWNS))
-    {
-        player->GetSpellHistory()->SaveCooldownStateBeforeDuel();
-        plTarget->GetSpellHistory()->SaveCooldownStateBeforeDuel();
-
-        player->RemoveArenaSpellCooldowns(true);
-        plTarget->RemoveArenaSpellCooldowns(true);
-    }
-
     time_t now = time(NULL);
     player->duel->startTimer = now;
     plTarget->duel->startTimer = now;
diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp
index 7c4b11769b5..a6a8eca6004 100644
--- a/src/server/game/Scripting/ScriptLoader.cpp
+++ b/src/server/game/Scripting/ScriptLoader.cpp
@@ -92,6 +92,7 @@ void AddSC_npcs_special();
 void AddSC_npc_taxi();
 void AddSC_achievement_scripts();
 void AddSC_action_ip_logger();
+void AddSC_duel_reset();
 
 //eastern kingdoms
 void AddSC_alterac_valley();                 //Alterac Valley
@@ -789,6 +790,7 @@ void AddWorldScripts()
     // To avoid duplicate code, we check once /*ONLY*/ if logging is permitted or not.
     if (sWorld->getBoolConfig(CONFIG_IP_BASED_ACTION_LOGGING))
         AddSC_action_ip_logger(); // location: scripts\World\action_ip_logger.cpp
+    AddSC_duel_reset();
 #endif
 }
 
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 8a84176ade1..1c401be97c6 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1191,7 +1191,7 @@ void World::LoadConfigSettings(bool reload)
     m_int_configs[CONFIG_MAX_WHO] = sConfigMgr->GetIntDefault("MaxWhoListReturns", 49);
     m_bool_configs[CONFIG_START_ALL_SPELLS] = sConfigMgr->GetBoolDefault("PlayerStart.AllSpells", false);
     m_int_configs[CONFIG_HONOR_AFTER_DUEL] = sConfigMgr->GetIntDefault("HonorPointsAfterDuel", 0);
-    m_bool_configs[CONFIG_RESET_DUEL_COOLDOWNS] = sConfigMgr->GetBoolDefault("ResetDuelCooldowns", 0);
+    m_bool_configs[CONFIG_RESET_DUEL_COOLDOWNS] = sConfigMgr->GetBoolDefault("ResetDuelCooldowns", false);
     m_bool_configs[CONFIG_START_ALL_EXPLORED] = sConfigMgr->GetBoolDefault("PlayerStart.MapsExplored", false);
     m_bool_configs[CONFIG_START_ALL_REP] = sConfigMgr->GetBoolDefault("PlayerStart.AllReputation", false);
     m_bool_configs[CONFIG_ALWAYS_MAXSKILL] = sConfigMgr->GetBoolDefault("AlwaysMaxWeaponSkill", false);
diff --git a/src/server/scripts/World/duel_reset.cpp b/src/server/scripts/World/duel_reset.cpp
new file mode 100644
index 00000000000..f08469d5bd5
--- /dev/null
+++ b/src/server/scripts/World/duel_reset.cpp
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2008-2015 TrinityCore <http://www.trinitycore.org/>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ScriptMgr.h"
+#include "Player.h"
+
+class DuelResetScript : public PlayerScript
+{
+    public:
+        DuelResetScript() : PlayerScript("DuelResetScript") { }
+
+        // Called when a duel starts (after 3s countdown)
+        void OnDuelStart(Player* player1, Player* player2) override
+        {
+            if (sWorld->getBoolConfig(CONFIG_RESET_DUEL_COOLDOWNS))
+            {
+                player1->GetSpellHistory()->SaveCooldownStateBeforeDuel();
+                player2->GetSpellHistory()->SaveCooldownStateBeforeDuel();
+
+                player1->RemoveArenaSpellCooldowns(true);
+                player2->RemoveArenaSpellCooldowns(true);
+            }
+        }
+
+        // Called when a duel ends
+        void OnDuelEnd(Player* winner, Player* loser, DuelCompleteType /*type*/) override
+        {
+            if (sWorld->getBoolConfig(CONFIG_RESET_DUEL_COOLDOWNS))
+            {
+                winner->RemoveArenaSpellCooldowns(true);
+                loser->RemoveArenaSpellCooldowns(true);
+
+                winner->GetSpellHistory()->RestoreCooldownStateAfterDuel();
+                loser->GetSpellHistory()->RestoreCooldownStateAfterDuel();
+            }
+        }
+};
+
+void AddSC_duel_reset()
+{
+    new DuelResetScript();
+}
+