From a0bbbf1729e4873cea93a2dd0b579e540cf51e8c Mon Sep 17 00:00:00 2001 From: Atemo Date: Sat, 17 Feb 2024 20:14:22 +0100 Subject: [PATCH] Rebalance Wind Hawk 20240205 (#8133) * Gale Storm - Reduces skill cooldown from 1.2 seconds to 0.7 seconds. - Increases base damage from 10000%Atk to 13500%Atk based on level 5. * Crescive Bolt - Increases base damage from 9400%Atk to 13500%Atk based on level 10. - Increases damage bonus on standing still from 10% per stack (up to 30% on 3 stacks) to 20% per stack (up to 60% on 3 stacks). - Changes sound effect. * Calamity Gale - Reduces AP consumption from 200 to 125. - Reduces skill cooldown from 180 seconds to 60 seconds. * Added missing clif_skill_nodamage for WH_GALESTORM Thanks to @Haydrich ! --- db/re/skill_db.yml | 6 +++--- src/map/battle.cpp | 8 +++++--- src/map/skill.cpp | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/db/re/skill_db.yml b/db/re/skill_db.yml index 3ce842a279..0561b51758 100644 --- a/db/re/skill_db.yml +++ b/db/re/skill_db.yml @@ -39160,11 +39160,11 @@ Body: CastCancel: true AfterCastActDelay: 500 Duration1: 180000 - Cooldown: 180000 + Cooldown: 60000 FixedCastTime: 1000 Requires: SpCost: 300 - ApCost: 200 + ApCost: 125 Status: CalamityGale - Id: 5329 Name: WH_HAWKBOOMERANG @@ -39225,7 +39225,7 @@ Body: CastCancel: true CastTime: 3500 AfterCastActDelay: 500 - Cooldown: 1200 + Cooldown: 700 FixedCastTime: 500 Requires: SpCost: diff --git a/src/map/battle.cpp b/src/map/battle.cpp index ffae3e46e8..01b3c8a9e4 100644 --- a/src/map/battle.cpp +++ b/src/map/battle.cpp @@ -5690,17 +5690,19 @@ static int battle_calc_attack_skill_ratio(struct Damage* wd, struct block_list * RE_LVL_DMOD(100); break; case WH_GALESTORM: - skillratio += -100 + 1000 * skill_lv + 10 * sstatus->con; + skillratio += -100 + 1350 * skill_lv; + skillratio += 10 * sstatus->con; RE_LVL_DMOD(100); if (sc && sc->getSCE(SC_CALAMITYGALE) && (tstatus->race == RC_BRUTE || tstatus->race == RC_FISH)) skillratio += skillratio * 50 / 100; break; case WH_CRESCIVE_BOLT: - skillratio += -100 + 400 + 900 * skill_lv + 5 * sstatus->con; + skillratio += -100 + 500 + 1300 * skill_lv; + skillratio += 5 * sstatus->con; RE_LVL_DMOD(100); if (sc) { if (sc->getSCE(SC_CRESCIVEBOLT)) - skillratio += skillratio * (10 * sc->getSCE(SC_CRESCIVEBOLT)->val1) / 100; + skillratio += skillratio * (20 * sc->getSCE(SC_CRESCIVEBOLT)->val1) / 100; if (sc->getSCE(SC_CALAMITYGALE)) { skillratio += skillratio * 20 / 100; diff --git a/src/map/skill.cpp b/src/map/skill.cpp index 0f925da2ec..85bc68075b 100755 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -5872,6 +5872,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint case WH_GALESTORM:// Give AP if 3 or more targets are hit. if (sd && map_foreachinallrange(skill_area_sub, bl, skill_get_splash(skill_id, skill_lv), BL_CHAR, src, skill_id, skill_lv, tick, BCT_ENEMY, skill_area_sub_count) >= 3) status_heal(src, 0, 0, 10, 0); + clif_skill_nodamage(src, bl, skill_id, skill_lv, 1); break; case BO_ACIDIFIED_ZONE_WATER: case BO_ACIDIFIED_ZONE_GROUND: