[z2815] Creature: Implement Pursuit

cmangos · Jun 21, 2023 · 37206a9 · 37206a9
1 parent dc9b81c
commit 37206a9
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/sql/base/mangos.sql b/sql/base/mangos.sql
@@ -23,7 +23,7 @@ DROP TABLE IF EXISTS `db_version`;
 CREATE TABLE `db_version` (
   `version` varchar(120) DEFAULT NULL,
   `creature_ai_version` varchar(120) DEFAULT NULL,
-  `required_z2814_01_mangos_worldstate_expression_spawn_group` bit(1) DEFAULT NULL
+  `required_z2815_01_mangos_pursuit` bit(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Used DB version notes';
 
 --
@@ -1277,7 +1277,7 @@ CREATE TABLE `creature_template` (
   `SpeedRun` float NOT NULL DEFAULT '0',
   `Detection` INT(10) UNSIGNED NOT NULL DEFAULT '18' COMMENT 'Detection range for proximity',
   `CallForHelp` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Range in which creature calls for help?',
-  `Pursuit` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'When exceeded during pursuit creature evades?',
+  `Pursuit` INT(10) UNSIGNED NOT NULL DEFAULT '15000' COMMENT 'Hit refresh time after which creature evades',
   `Leash` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Leash range from combat start position',
   `Timeout` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Time for refreshing leashing before evade?',
   `UnitClass` tinyint(3) unsigned NOT NULL DEFAULT '0',

diff --git a/sql/updates/mangos/z2815_01_mangos_pursuit.sql b/sql/updates/mangos/z2815_01_mangos_pursuit.sql
@@ -0,0 +1,5 @@
+ALTER TABLE db_version CHANGE COLUMN required_z2814_01_mangos_worldstate_expression_spawn_group required_z2815_01_mangos_pursuit bit;
+
+UPDATE creature_template SET Pursuit=15000 WHERE Pursuit=0;
+
+
diff --git a/src/game/Combat/CombatManager.cpp b/src/game/Combat/CombatManager.cpp
@@ -189,7 +189,7 @@ void CombatManager::TriggerCombatTimer(Unit* target)
 
 void CombatManager::TriggerCombatTimer(bool pvp)
 {
-    m_combatTimer = pvp ? 5000 : 15000;
+    m_combatTimer = pvp ? 5000 : m_owner->GetPursuit();
     m_lastRefreshPos = m_owner->GetPosition();
 }
 

diff --git a/src/game/Entities/Creature.h b/src/game/Entities/Creature.h
@@ -770,6 +770,7 @@ class Creature : public Unit
         void SetCombatStartPosition(Position const& pos) { m_combatStartPos = pos; }
         void GetCombatStartPosition(Position& pos) const { pos = m_combatStartPos; }
         Position const& GetCombatStartPosition() const { return m_combatStartPos; }
+        uint32 GetPursuit() const override { return GetCreatureInfo()->Pursuit; }
 
         void SetRespawnCoord(CreatureCreatePos const& pos) { m_respawnPos = pos.m_pos; }
         void SetRespawnCoord(float x, float y, float z, float ori) { m_respawnPos.x = x; m_respawnPos.y = y; m_respawnPos.z = z; m_respawnPos.o = ori; }

diff --git a/src/game/Entities/Unit.h b/src/game/Entities/Unit.h
@@ -1621,6 +1621,7 @@ class Unit : public WorldObject
         void EngageInCombatWithAggressor(Unit* aggressor);
         void ClearInCombat();
         void HandleExitCombat(bool customLeash, bool pvpCombat = false);
+        virtual uint32 GetPursuit() const { return 15000; }
 
         SpellAuraHolderBounds GetSpellAuraHolderBounds(uint32 spell_id)
         {

diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h
@@ -3,5 +3,5 @@
  #define REVISION_DB_REALMD "required_z2800_01_realmd_platform"
  #define REVISION_DB_LOGS "required_z2778_01_logs_anticheat"
  #define REVISION_DB_CHARACTERS "required_z2799_01_characters_account_data"
- #define REVISION_DB_MANGOS "required_z2814_01_mangos_worldstate_expression_spawn_group"
+ #define REVISION_DB_MANGOS "required_z2815_01_mangos_pursuit"
 #endif // __REVISION_SQL_H__