Rebalance cardinal 20220608 (#7871)

* Framen
- Increases SP consumption from 60 to 92 based on level 5.
- Increases AP recovery rate from 1 to 2.
- Increases damage from 2750%/3500%(demon and undead race)Matk to 4250%/4750%(demon and undead race)Matk based on level 5 (Fidus Animus level 10).

* Arbitrium
- Reduces cooldown from 2 seconds to 1.5 seconds.
- Reduces SP consumption from 140 to 112 based on level 10.
- Increases damage from 5000%/6500%(area damage)Matk to 11000%/13500%(area damage)Matk based on level 10.

Additional:
- Updated the factor weight of SPL in skill formula to 7 (according to the next rebalance)

* Petitio
- Reduces cooldown from 1 second to 0.5 seconds.
- Increases SP consumption from 50 to 65 based on level 10.
- Increases AP recovery rate from 2 to 3.
- Increases damage from 3200%Atk to 11500%Atk based on level 10 (Mace & Book Mastery Level 10).

* Competentia
- Reduces AP consumption from 200 to 160 based on level 5.
- Increases duration from 240 seconds to 300 seconds based on level 5.

* Pneumaticus Procella
- Reduces cooldown from 60 seconds to 5 seconds.
- Removes 1.5 seconds delay after skill.
- Reduces AP consumption from 150 to 30.
- Increases damage from 2030%/3050%(demon and undead race)Matk to 21180%/22750%(demon and undead race)Matk per hit based on level 10 (Fidus Animus level 10).

* Effligo
- Reduces cooldown from 60 seconds to 0.5 seconds.
- Removes 1 seconds delay after skill.
- Increases SP consumption from 60 to 75.
- Reduces AP consumption from 100 to 12.
- Increases damage from 8080%/12150%(demon and undead race)Atk to 16580%/18150%(demon and undead race)Atk based on level 10 (Mace & Book Mastery Level 10).
- Reduces factor weight of POW in skill formula from 10/10(demon and undead race) to 7/7(demon and undead race).

Co-authored-by: Aleos <aleos89@users.noreply.github.com>

db/re/skill_db.yml

@@ -37378,30 +37378,30 @@ Body:
     CastTime: 2000
     AfterCastActDelay: 500
     Duration1: 20000
-    Cooldown: 2000
+    Cooldown: 1500
     FixedCastTime: 1000
     Requires:
       SpCost:
         - Level: 1
-          Amount: 50
+          Amount: 94
         - Level: 2
-          Amount: 60
+          Amount: 96
         - Level: 3
-          Amount: 70
+          Amount: 98
         - Level: 4
-          Amount: 80
+          Amount: 100
         - Level: 5
-          Amount: 90
+          Amount: 102
         - Level: 6
-          Amount: 100
+          Amount: 104
         - Level: 7
-          Amount: 110
+          Amount: 106
         - Level: 8
-          Amount: 120
+          Amount: 108
         - Level: 9
-          Amount: 130
+          Amount: 110
         - Level: 10
-          Amount: 140
+          Amount: 112
     Status: HandicapState_DeepSilence
   - Id: 5274
     Name: CD_ARBITRIUM_ATK
@@ -37494,11 +37494,10 @@ Body:
     HitCount: -7
     Element: Weapon
     CastCancel: true
-    AfterCastActDelay: 500
-    Cooldown: 60000
+    Cooldown: 500
     Requires:
-      SpCost: 60
-      ApCost: 100
+      SpCost: 75
+      ApCost: 12
       Weapon:
         Mace: true
         2hMace: true
@@ -37519,20 +37518,30 @@ Body:
     AfterCastActDelay: 500
     Duration1:
       - Level: 1
-        Time: 120000
+        Time: 180000
       - Level: 2
-        Time: 150000
+        Time: 210000
       - Level: 3
-        Time: 180000
+        Time: 240000
       - Level: 4
-        Time: 210000
+        Time: 270000
       - Level: 5
-        Time: 240000
+        Time: 300000
     Cooldown: 60000
     FixedCastTime: 2000
     Requires:
       SpCost: 60
-      ApCost: 200
+      ApCost:
+        - Level: 1
+          Amount: 200
+        - Level: 2
+          Amount: 190
+        - Level: 3
+          Amount: 180
+        - Level: 4
+          Amount: 170
+        - Level: 5
+          Amount: 160
     Status: Competentia
   - Id: 5279
     Name: CD_PNEUMATICUS_PROCELLA
@@ -37546,13 +37555,12 @@ Body:
     Element: Holy
     CastCancel: true
     CastTime: 3000
-    AfterCastActDelay: 500
     Duration1: 12000
-    Cooldown: 60000
+    Cooldown: 5000
     FixedCastTime: 2000
     Requires:
       SpCost: 150
-      ApCost: 150
+      ApCost: 30
     Unit:
       Id: Pneumaticus_Procella
       Range:
@@ -37734,32 +37742,32 @@ Body:
         Area: 3
       - Level: 10
         Area: 4
-    GiveAp: 2
+    GiveAp: 3
     CastCancel: true
     AfterCastActDelay: 500
-    Cooldown: 1000
+    Cooldown: 500
     Requires:
       SpCost:
         - Level: 1
-          Amount: 32
+          Amount: 38
         - Level: 2
-          Amount: 34
+          Amount: 41
         - Level: 3
-          Amount: 36
+          Amount: 44
         - Level: 4
-          Amount: 38
+          Amount: 47
         - Level: 5
-          Amount: 40
+          Amount: 50
         - Level: 6
-          Amount: 42
+          Amount: 53
         - Level: 7
-          Amount: 44
+          Amount: 56
         - Level: 8
-          Amount: 46
+          Amount: 59
         - Level: 9
-          Amount: 48
+          Amount: 62
         - Level: 10
-          Amount: 50
+          Amount: 65
       Weapon:
         Mace: true
         2hMace: true
@@ -37787,7 +37795,7 @@ Body:
         Area: 3
       - Level: 5
         Area: 3
-    GiveAp: 1
+    GiveAp: 2
     CastCancel: true
     CastTime: 2000
     AfterCastActDelay: 500
@@ -37806,15 +37814,15 @@ Body:
     Requires:
       SpCost:
         - Level: 1
-          Amount: 40
+          Amount: 80
         - Level: 2
-          Amount: 45
+          Amount: 83
         - Level: 3
-          Amount: 50
+          Amount: 86
         - Level: 4
-          Amount: 55
+          Amount: 89
         - Level: 5
-          Amount: 60
+          Amount: 92
   - Id: 5285
     Name: SHC_SHADOW_EXCEED
     Description: Shadow Exceed

src/map/battle.cpp

@@ -5479,13 +5479,16 @@ static int battle_calc_attack_skill_ratio(struct Damage* wd, struct block_list *
 				skillratio += skillratio * i / 100;
 			break;
 		case CD_EFFLIGO:
-			skillratio += -100 + 800 * skill_lv + 5 * sstatus->pow;
-			if (tstatus->race == RC_UNDEAD || tstatus->race == RC_DEMON)
-				skillratio += 400 * skill_lv;
+			skillratio += -100 + 1650 * skill_lv + 7 * sstatus->pow;
+			skillratio += 8 * pc_checkskill( sd, CD_MACE_BOOK_M );
+			if (tstatus->race == RC_UNDEAD || tstatus->race == RC_DEMON) {
+				skillratio += 150 * skill_lv;
+				skillratio += 7 * pc_checkskill( sd, CD_MACE_BOOK_M );
+			}
 			RE_LVL_DMOD(100);
 			break;
 		case CD_PETITIO:
-			skillratio += -100 + 270 * skill_lv + 5 * sstatus->pow;
+			skillratio += -100 + (1050 + pc_checkskill(sd,CD_MACE_BOOK_M) * 10) * skill_lv + 5 * sstatus->pow;
 			RE_LVL_DMOD(100);
 			break;
 		case SHC_DANCING_KNIFE:
@@ -7901,25 +7904,28 @@ 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 );
+						skillratio += -100 + 1000 * skill_lv + 7 * sstatus->spl;
+						skillratio += 10 * pc_checkskill( sd, CD_FIDUS_ANIMUS ) * skill_lv;
 						RE_LVL_DMOD(100);
 						break;
 					case CD_ARBITRIUM_ATK:
-						skillratio += -100 + 550 * skill_lv + 5 * sstatus->spl;
-						skillratio += 100 * pc_checkskill( sd, CD_FIDUS_ANIMUS );
+						skillratio += -100 + 1250 * skill_lv + 7 * sstatus->spl;
+						skillratio += 10 * pc_checkskill( sd, CD_FIDUS_ANIMUS ) * skill_lv;
 						RE_LVL_DMOD(100);
 						break;
 					case CD_PNEUMATICUS_PROCELLA:
-						skillratio += -100 + 200 * skill_lv + 10 * sstatus->spl;
-						if (tstatus->race == RC_UNDEAD || tstatus->race == RC_DEMON)
-							skillratio += 100 * skill_lv;
+						skillratio += -100 + 150 + 2100 * skill_lv + 10 * sstatus->spl;
+						skillratio += 3 * pc_checkskill( sd, CD_FIDUS_ANIMUS );
+						if (tstatus->race == RC_UNDEAD || tstatus->race == RC_DEMON) {
+							skillratio += 50 + 150 * skill_lv;
+							skillratio += 2 * pc_checkskill( sd, CD_FIDUS_ANIMUS );
+						}
 						RE_LVL_DMOD(100);
 						break;
 					case CD_FRAMEN:
-						skillratio += -100 + 500 * skill_lv + 5 * sstatus->spl;
+						skillratio += -100 + (800 + 5 * pc_checkskill(sd,CD_FIDUS_ANIMUS)) * skill_lv + 5 * sstatus->spl;
 						if (tstatus->race == RC_UNDEAD || tstatus->race == RC_DEMON)
-							skillratio += 150 * skill_lv;
+							skillratio += 100 * skill_lv;
 						RE_LVL_DMOD(100);
 						break;
 					case AG_DESTRUCTIVE_HURRICANE_CLIMAX:// Is this affected by BaseLV and SPL too??? [Rytech]