[z2818] Spell: Also add AP columns and functionality

cmangos · Feb 22, 2024 · 229842f · 229842f
1 parent 3fb169d
commit 229842f
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 12 deletions.
diff --git a/sql/base/dbc/original_data/Spell.sql b/sql/base/dbc/original_data/Spell.sql
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_z2817_01_mangos_spell_template` bit(1) DEFAULT NULL
+  `required_z2818_01_mangos_spell_template_ap` bit(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Used DB version notes';
 
 --

diff --git a/sql/updates/mangos/z2818_01_mangos_spell_template_ap.sql b/sql/updates/mangos/z2818_01_mangos_spell_template_ap.sql
@@ -0,0 +1,8 @@
+ALTER TABLE db_version CHANGE COLUMN required_z2817_01_mangos_spell_template required_z2818_01_mangos_spell_template_ap bit;
+
+ALTER TABLE `spell_template`
+	ADD COLUMN `EffectBonusCoefficientFromAP1` FLOAT NOT NULL DEFAULT '0' AFTER `EffectBonusCoefficient3`,
+	ADD COLUMN `EffectBonusCoefficientFromAP2` FLOAT NOT NULL DEFAULT '0' AFTER `EffectBonusCoefficientFromAP1`,
+	ADD COLUMN `EffectBonusCoefficientFromAP3` FLOAT NOT NULL DEFAULT '0' AFTER `EffectBonusCoefficientFromAP2`;
+
+
diff --git a/src/game/Entities/Unit.cpp b/src/game/Entities/Unit.cpp
@@ -6896,8 +6896,16 @@ int32 Unit::SpellBonusWithCoeffs(SpellEntry const* spellProto, SpellEffectIndex
     if (GetTypeId() == TYPEID_UNIT && !((Creature*)this)->IsPet())
         coeff = 1.0f;
     // Check for table values
-    if (spellProto->effectBonusCoefficient[effectIndex] > 0)
+    if (spellProto->effectBonusCoefficient[effectIndex] > 0 || spellProto->effectBonusCoefficientFromAP[effectIndex] > 0)
+    {
         coeff = spellProto->effectBonusCoefficient[effectIndex];
+
+        if (donePart && spellProto->effectBonusCoefficientFromAP[effectIndex] > 0)
+        {
+            float ap_bonus = spellProto->effectBonusCoefficientFromAP[effectIndex];
+            total += int32(ap_bonus * (GetTotalAttackPowerValue(IsSpellRequiresRangedAP(spellProto) ? RANGED_ATTACK : BASE_ATTACK) + ap_benefit));
+        }
+    }
     // Default calculation
     else if (benefit)
         coeff = CalculateDefaultCoefficient(spellProto, damagetype);

diff --git a/src/game/Server/DBCStructure.h b/src/game/Server/DBCStructure.h
@@ -786,6 +786,7 @@ struct SpellEntry
         uint32    MinReputation;                            // 171 not used, and 0 in 2.4.2
         uint32    RequiredAuraVision;                       // 172 not used
         float     effectBonusCoefficient[MAX_EFFECT_INDEX]; // 173-175 (filled from SpellEffects.db2)
+        float     effectBonusCoefficientFromAP[MAX_EFFECT_INDEX]; // 232-234
 
         // custom
         uint32    IsServerSide;                             // 176

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_z2817_01_mangos_spell_template"
+ #define REVISION_DB_MANGOS "required_z2818_01_mangos_spell_template_ap"
 #endif // __REVISION_SQL_H__