From a818232e7772a4c941f68a4cf46c42beebb53d52 Mon Sep 17 00:00:00 2001
From: munkrej <schmunk@posteo.de>
Date: Sat, 15 Apr 2023 23:16:26 +0200
Subject: [PATCH] 4th Improvement - Cardinal (#7706)

---
 db/re/skill_db.yml | 19 +++++++++++++++----
 src/map/battle.cpp |  7 ++++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/db/re/skill_db.yml b/db/re/skill_db.yml
index a10683ac08..6ec9e1f327 100644
--- a/db/re/skill_db.yml
+++ b/db/re/skill_db.yml
@@ -37308,7 +37308,7 @@ Body:
     CastTime: 2000
     AfterCastActDelay: 500
     Duration1: 20000
-    Cooldown: 3000
+    Cooldown: 2000
     FixedCastTime: 1000
     Requires:
       SpCost:
@@ -37638,6 +37638,7 @@ Body:
     TargetType: Attack
     DamageFlags:
       Splash: true
+      Critical: true
     Range: 2
     Hit: Single
     HitCount: 1
@@ -37666,7 +37667,7 @@ Body:
     GiveAp: 2
     CastCancel: true
     AfterCastActDelay: 500
-    Cooldown: 2000
+    Cooldown: 1000
     Requires:
       SpCost:
         - Level: 1
@@ -37716,11 +37717,21 @@ Body:
         Area: 3
       - Level: 5
         Area: 3
-    GiveAp: 3
+    GiveAp: 1
     CastCancel: true
     CastTime: 2000
     AfterCastActDelay: 500
-    Cooldown: 3000
+    Cooldown:
+      - Level: 1
+        Time: 3000
+      - Level: 2
+        Time: 2100
+      - Level: 3
+        Time: 1500
+      - Level: 4
+        Time: 900
+      - Level: 5
+        Time: 300
     FixedCastTime: 1000
     Requires:
       SpCost:
diff --git a/src/map/battle.cpp b/src/map/battle.cpp
index 2b03f5c1c5..54a8ae01aa 100644
--- a/src/map/battle.cpp
+++ b/src/map/battle.cpp
@@ -7875,8 +7875,13 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
 						RE_LVL_DMOD(100);
 						break;
 					case CD_ARBITRIUM:
+						skillratio += -100 + 400 * skill_lv + 5 * sstatus->spl;
+						skillratio += 100 * pc_checkskill( sd, CD_FIDUS_ANIMUS );
+						RE_LVL_DMOD(100);
+						break;
 					case CD_ARBITRIUM_ATK:
-						skillratio += -100 + 200 * skill_lv + 5 * sstatus->spl;
+						skillratio += -100 + 550 * skill_lv + 5 * sstatus->spl;
+						skillratio += 100 * pc_checkskill( sd, CD_FIDUS_ANIMUS );
 						RE_LVL_DMOD(100);
 						break;
 					case CD_PNEUMATICUS_PROCELLA: