diff --git a/db/re/skill_db.yml b/db/re/skill_db.yml index a5c5ff57eba..b0721f295d1 100644 --- a/db/re/skill_db.yml +++ b/db/re/skill_db.yml @@ -37855,7 +37855,7 @@ Body: Time: 300000 Requires: SpCost: 150 - ApCost: 150 + ApCost: 125 Status: Rush_Quake2 - Id: 5297 Name: MT_M_MACHINE @@ -45328,7 +45328,7 @@ Body: - Level: 10 Area: 3 CastTime: 1000 - AfterCastActDelay: 1200 + AfterCastActDelay: 1000 Cooldown: 700 FixedCastTime: 1000 Requires: @@ -45451,15 +45451,15 @@ Body: Area: 3 Cooldown: - Level: 1 - Time: 2000 - - Level: 2 Time: 1750 - - Level: 3 + - Level: 2 Time: 1500 - - Level: 4 + - Level: 3 Time: 1250 - - Level: 5 + - Level: 4 Time: 1000 + - Level: 5 + Time: 750 Requires: SpCost: - Level: 1 @@ -45503,15 +45503,15 @@ Body: Requires: SpCost: - Level: 1 - Amount: 62 + Amount: 57 - Level: 2 - Amount: 64 + Amount: 59 - Level: 3 - Amount: 66 + Amount: 61 - Level: 4 - Amount: 68 + Amount: 63 - Level: 5 - Amount: 70 + Amount: 65 Weapon: 2hAxe: true - Id: 6508 diff --git a/src/map/skills/merchant/powerfulswing.cpp b/src/map/skills/merchant/powerfulswing.cpp index 0352484cda1..ed25ed37988 100644 --- a/src/map/skills/merchant/powerfulswing.cpp +++ b/src/map/skills/merchant/powerfulswing.cpp @@ -15,7 +15,7 @@ void SkillPowerfulSwing::calculateSkillRatio(const Damage* wd, const block_list* const status_data* sstatus = status_get_status_data(*src); const status_change* sc = status_get_sc(src); - skillratio += -100 + 300 + 850 * skill_lv; + skillratio += -100 + 300 + 880 * skill_lv; skillratio += 5 * sstatus->pow; // !TODO: check POW ratio if (sc && sc->getSCE(SC_AXE_STOMP)) skillratio += 100 + 100 * skill_lv; diff --git a/src/map/skills/merchant/rushstrike.cpp b/src/map/skills/merchant/rushstrike.cpp index 5259e0506ca..3a7b47a7e9f 100644 --- a/src/map/skills/merchant/rushstrike.cpp +++ b/src/map/skills/merchant/rushstrike.cpp @@ -16,7 +16,7 @@ SkillRushStrike::SkillRushStrike() : SkillImplRecursiveDamageSplash(MT_RUSH_STRI void SkillRushStrike::calculateSkillRatio(const Damage* wd, const block_list* src, const block_list* target, uint16 skill_lv, int32& skillratio, int32 mflag) const { const status_data* sstatus = status_get_status_data(*src); - skillratio += -100 + 3500 * skill_lv; + skillratio += -100 + 650 + 3750 * skill_lv; skillratio += 5 * sstatus->pow; // !TODO: check POW ratio RE_LVL_DMOD(100); } diff --git a/src/map/skills/swordman/imperialpressure.cpp b/src/map/skills/swordman/imperialpressure.cpp index 11b49ce95f4..2ea9b19a647 100644 --- a/src/map/skills/swordman/imperialpressure.cpp +++ b/src/map/skills/swordman/imperialpressure.cpp @@ -16,7 +16,7 @@ void SkillImperialPressure::calculateSkillRatio(const Damage* wd, const block_li const map_session_data* sd = BL_CAST(BL_PC, src); const status_data* sstatus = status_get_status_data(*src); - skillratio += -100 + 5600 + 1850 * skill_lv; + skillratio += -100 + 3750 + 2650 * skill_lv; skillratio += 7 * sstatus->spl; skillratio += 50 * pc_checkskill(sd, IG_SPEAR_SWORD_M); RE_LVL_DMOD(100); diff --git a/src/map/skills/swordman/overslash.cpp b/src/map/skills/swordman/overslash.cpp index fbe9d6786aa..fdb5204373a 100644 --- a/src/map/skills/swordman/overslash.cpp +++ b/src/map/skills/swordman/overslash.cpp @@ -27,8 +27,8 @@ void SkillOverSlash::calculateSkillRatio(const Damage* wd, const block_list* src const status_data* sstatus = status_get_status_data(*src); int32 i; - skillratio += -100 + 220 * skill_lv; - skillratio += pc_checkskill(sd, IG_SPEAR_SWORD_M) * 50 * skill_lv; + skillratio += -100 + 260 * skill_lv; + skillratio += pc_checkskill(sd, IG_SPEAR_SWORD_M) * 60 * skill_lv; skillratio += 7 * sstatus->pow; RE_LVL_DMOD(100); if ((i = pc_checkskill_imperial_guard(sd, 3)) > 0)