Explorar o código

4th Improvement - Inquisitor (#7705)

munkrej %!s(int64=2) %!d(string=hai) anos
pai
achega
16195cea2a
Modificáronse 2 ficheiros con 31 adicións e 14 borrados
  1. 23 10
      db/re/skill_db.yml
  2. 8 4
      src/map/battle.cpp

+ 23 - 10
db/re/skill_db.yml

@@ -36299,7 +36299,7 @@ Body:
         Time: 6000
       - Level: 5
         Time: 7000
-    Cooldown: 5000
+    Cooldown: 3000
     Requires:
       SpCost:
         - Level: 1
@@ -36362,6 +36362,7 @@ Body:
     TargetType: Self
     DamageFlags:
       Splash: true
+      Critical: true
     Range: 9
     Hit: Single
     HitCount: 1
@@ -36377,12 +36378,13 @@ Body:
     Status: Massive_F_Blaster
   - Id: 5244
     Name: IQ_EXPOSION_BLASTER
-    Description: Exposion Blaster
+    Description: Explosion Blaster
     MaxLevel: 5
     Type: Weapon
     TargetType: Self
     DamageFlags:
       Splash: true
+      Critical: true
     Range: 9
     Hit: Single
     HitCount: 1
@@ -36398,10 +36400,20 @@ Body:
         Area: 3
       - Level: 5
         Area: 4
-    GiveAp: 5
+    GiveAp: 4
     CastCancel: true
-    AfterCastActDelay: 500
-    Cooldown: 5000
+    AfterCastActDelay:
+      - Level: 1
+        Time: 500
+      - Level: 2
+        Time: 400
+      - Level: 3
+        Time: 300
+      - Level: 4
+        Time: 200
+      - Level: 5
+        Time: 0
+    Cooldown: 4000
     Requires:
       SpCost:
         - Level: 1
@@ -36518,7 +36530,7 @@ Body:
     FixedCastTime: 1000
     Requires:
       SpCost: 60
-      ApCost: 100
+      ApCost: 50
       Status:
         First_Faith_Power: true
     Status: Second_Judge
@@ -36650,9 +36662,10 @@ Body:
     TargetType: Attack
     DamageFlags:
       Splash: true
+      Critical: true
     Range: 3
     Hit: Multi_Hit
-    HitCount: -2
+    HitCount: 2
     Element: Weapon
     SplashArea:
       - Level: 1
@@ -36727,7 +36740,7 @@ Body:
       Splash: true
     Range: 3
     Hit: Multi_Hit
-    HitCount: -3
+    HitCount: 5
     Element: Weapon
     SplashArea:
       - Level: 1
@@ -36756,7 +36769,7 @@ Body:
           Amount: 85
   - Id: 5254
     Name: IQ_THIRD_EXOR_FLAME
-    Description: Third Exor Flame
+    Description: Third Exorcism Flame
     MaxLevel: 5
     TargetType: Self
     DamageFlags:
@@ -36781,7 +36794,7 @@ Body:
     FixedCastTime: 1000
     Requires:
       SpCost: 60
-      ApCost: 150
+      ApCost: 100
       Status:
         Second_Judge: true
     Status: Third_Exor_Flame

+ 8 - 4
src/map/battle.cpp

@@ -5416,10 +5416,13 @@ static int battle_calc_attack_skill_ratio(struct Damage* wd, struct block_list *
 			RE_LVL_DMOD(100);
 			break;
 		case IQ_EXPOSION_BLASTER:
-			skillratio += -100 + 450 * skill_lv + 5 * sstatus->pow;
+			skillratio += -100 + 650 * skill_lv + 5 * sstatus->pow;
+
+			if( tsc != nullptr && tsc->getSCE( SC_HOLY_OIL ) ){
+				skillratio += 200 * skill_lv;
+			}
+
 			RE_LVL_DMOD(100);
-			if (tsc && tsc->getSCE(SC_HOLY_OIL))
-				skillratio += skillratio * 50 / 100;
 			break;
 		case IQ_FIRST_BRAND:
 			skillratio += -100 + 450 * skill_lv + 5 * sstatus->pow;
@@ -5438,11 +5441,12 @@ static int battle_calc_attack_skill_ratio(struct Damage* wd, struct block_list *
 			RE_LVL_DMOD(100);
 			break;
 		case IQ_THIRD_PUNISH:
-			skillratio += -100 + 550 * skill_lv + 5 * sstatus->pow;
+			skillratio += -100 + 650 * skill_lv + 5 * sstatus->pow;
 			RE_LVL_DMOD(100);
 			break;
 		case IQ_THIRD_FLAME_BOMB:
 			skillratio += -100 + 650 * skill_lv + 5 * sstatus->pow;
+			skillratio += sstatus->max_hp * 20 / 100;
 			RE_LVL_DMOD(100);
 			break;
 		case IQ_THIRD_CONSECRATION: