Correct Attack speed

ProjectCeleste · May 31, 2023 · adc1f5f · adc1f5f
1 parent 40a1239
commit adc1f5f
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 7 deletions.
diff --git a/db/effects.js b/db/effects.js
@@ -161,16 +161,22 @@ export async function convertEffects(effects, civ, isAdvisor) {
     } else if (type === "Armor") {
       type += e.damagetype
     } else if (type === "Haste") {
-      type = "AttackSpeed"
+      /*type = "AttackSpeed"*/
       switch (e.action) {
         case "RangedAttack":
-          type += "DamageRanged"
+          type = "AttackSpeedDamageRanged"
           break
         case "BurningAttack":
           type = "AttackSpeedDamageRanged"
           break
         case "RangedAttack2":
-          type += "DamageRanged"
+          type = "AttackSpeedDamageRanged"
+          break
+        case "MeleeAttack":
+          type = "AttackSpeedDamageMelee"
+          break
+        case "BuildingAttack":
+          type = "AttackSpeedDamageBuilding"
           break
       }
     } else if (type === "DamageBonusReduction") {
@@ -1059,6 +1065,16 @@ const templates = {
     sort: 36
   },
   AttackSpeed: { name: "Attack Rate", icon: "DamageOverTime", sort: 0 },
+  AttackSpeedDamageBuilding: {
+    name: "Attack Rate",
+    icon: "DamageOverTime",
+    sort: 0
+  },
+  AttackSpeedDamageMelee: {
+    name: "Attack Rate",
+    icon: "DamageOverTime",
+    sort: 0
+  },
   AttackSpeedDamageRanged: {
     name: "Attack Rate",
     icon: "DamageOverTime",

diff --git a/src/components/Stats.vue b/src/components/Stats.vue
@@ -386,7 +386,6 @@ export default {
 
       switch (effect.type) {
         case "Damage":
-        case "AttackSpeed":
           // If type is Damage, apply to all damage subtypes
           for (let keyDmg in stats) {
             if (
@@ -398,6 +397,20 @@ export default {
             }
           }
           break
+        case "AttackSpeedDamageBuilding":
+          break
+        case "AttackSpeedDamageMelee":
+          for (let keyDmg in stats) {
+            if (
+              keyDmg === "DamageHand" ||
+              keyDmg === "DamageCavalry" ||
+              keyDmg === "DamageSiegeMeleeAttack"
+            ) {
+              this.setBaseStat(stats, keyDmg)
+              stats[keyDmg] *= mod
+            }
+          }
+          break
         case "AttackSpeedDamageRanged":
           ;[
             "DamageRanged",

diff --git a/src/data/advisors.json b/src/data/advisors.json
diff --git a/src/data/effects.json b/src/data/effects.json
diff --git a/src/data/milestones.json b/src/data/milestones.json