Skip to content

[pull] master from rathena:master #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Mar 15, 2026
+678 −316
Merged

[pull] master from rathena:master #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e8ea9a
Corrected POW ratio of skill SHC_SAVAGE_IMPACT (#9923)
Atemo Mar 14, 2026
223b4ee
Added modifyDamageData impl (#9910)
Atemo Mar 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
324 changes: 21 additions & 303 deletions src/map/battle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4451,52 +4451,6 @@ static void battle_calc_multi_attack(struct Damage* wd, block_list *src,block_li
sc_start(src,src,SC_QD_SHOT_READY,100,target->id,skill_get_time(RL_QD_SHOT,1));
}
}

switch (skill_id) {
case RK_WINDCUTTER:
if (sd && sd->weapontype1 == W_2HSWORD)
wd->div_ = 2;
break;
case SC_FATALMENACE:
if (sd && sd->weapontype1 == W_DAGGER)
wd->div_++;
break;
case SR_RIDEINLIGHTNING:
wd->div_ = (sd ? max(1, skill_lv) : 1);
break;
case RL_QD_SHOT:
wd->div_ = 1 + (sd ? sd->status.job_level : 1) / 20;
break;
case KO_JYUMONJIKIRI:
if( tsc && tsc->getSCE(SC_JYUMONJIKIRI) )
wd->div_ = wd->div_ * -1;// needs more info
break;
case MH_BLAZING_AND_FURIOUS: {
homun_data *hd = BL_CAST(BL_HOM, src);
if (hd) {
wd->div_ = hd->homunculus.spiritball;
hom_delspiritball(hd, MAX_SPIRITBALL, 1);
}
break;
}
case ABC_FRENZY_SHOT:
if( rnd_chance( 5 * skill_lv, 100 ) ){
wd->div_ = 3;
}
break;
case NW_SPIRAL_SHOOTING:
if (sd && sd->weapontype1 == W_GRENADE)
wd->div_ += 1;
break;
case NW_MAGAZINE_FOR_ONE:
if (sd && sd->weapontype1 == W_GATLING)
wd->div_ += 4;
break;
case NW_THE_VIGILANTE_AT_NIGHT:
if (sd && sd->weapontype1 == W_GATLING)
wd->div_ += 3;
break;
}
}

/**
Expand Down Expand Up @@ -4627,13 +4581,6 @@ static int32 battle_calc_attack_skill_ratio(struct Damage* wd, block_list *src,b
skill->impl->calculateSkillRatio(wd, src, target, skill_lv, skillratio, 0);
}

switch(skill_id) {
case SKE_ALL_IN_THE_SKY:
// TODO: refactor
if (status_get_race(target) == RC_DEMIHUMAN || status_get_race(target) == RC_DEMON)
wd->div_ = 3;
break;
}
return skillratio;
}

Expand Down Expand Up @@ -5474,162 +5421,14 @@ static struct Damage initialize_weapon_data(const block_list* src, const block_l
wd.blewcount += battle_blewcount_bonus(sd, skill_id);

if (skill_id) {
// wd.flag from skills
wd.flag |= battle_range_type(src, target, skill_id, skill_lv);
switch(skill_id)
{
#ifdef RENEWAL
case RG_BACKSTAP:
if (sd && sd->status.weapon == W_DAGGER)
wd.div_ = 2;
break;
case MO_CHAINCOMBO:
if (sd && sd->status.weapon == W_KNUCKLE)
wd.div_ = -6;
break;
#endif
case MH_SONIC_CRAW:
if(const homun_data* hd = BL_CAST(BL_HOM,src); hd != nullptr){
wd.div_ = hd->homunculus.spiritball;
}
break;
case MO_FINGEROFFENSIVE:
if (sd) {
if (battle_config.finger_offensive_type)
wd.div_ = 1;
#ifndef RENEWAL
else if ((sd->spiritball + sd->spiritball_old) < wd.div_)
wd.div_ = sd->spiritball + sd->spiritball_old;
#endif
}
break;

case KN_PIERCE:
case ML_PIERCE:
wd.div_= (wd.div_>0?tstatus->size+1:-(tstatus->size+1));
break;

case TF_DOUBLE: //For NPC used skill.
case GS_CHAINACTION:
wd.type = DMG_MULTI_HIT;
break;

case GS_GROUNDDRIFT:
wd.amotion = sstatus->amotion;
[[fallthrough]];
case KN_SPEARSTAB:
#ifndef RENEWAL
case KN_BOWLINGBASH:
#endif
case MS_BOWLINGBASH:
case MO_BALKYOUNG:
case TK_TURNKICK:
wd.blewcount = 0;
break;
case SG_SUN_WARM:
case SG_MOON_WARM:
case SG_STAR_WARM:
// A random 0~3 knockback bonus is added to the base knockback
wd.blewcount += rnd_value(0, 3);
break;
#ifdef RENEWAL
case KN_BOWLINGBASH:
if (sd && sd->status.weapon == W_2HSWORD) {
if (wd.miscflag >= 2 && wd.miscflag <= 3)
wd.div_ = 3;
else if (wd.miscflag >= 4)
wd.div_ = 4;
}
break;
#endif
case KN_AUTOCOUNTER:
wd.flag = (wd.flag&~BF_SKILLMASK)|BF_NORMAL;
break;
case LK_SPIRALPIERCE:
if (!sd) wd.flag = (wd.flag&~(BF_RANGEMASK|BF_WEAPONMASK))|BF_LONG|BF_MISC;
break;
case RK_WINDCUTTER:
if (sd && (sd->status.weapon == W_1HSPEAR || sd->status.weapon == W_2HSPEAR))
wd.flag |= BF_LONG;
break;
case NC_BOOSTKNUCKLE:
case NC_VULCANARM:
case NC_ARMSCANNON:
if (sc && sc->getSCE(SC_ABR_DUAL_CANNON))
wd.div_ = 2;
break;
case NC_POWERSWING:
if (sc && sc->getSCE(SC_ABR_BATTLE_WARIOR))
wd.div_ = -2;
break;
case GN_CARTCANNON:
if (sc && sc->getSCE(SC_BIONIC_WOODENWARRIOR))
wd.div_ = 2;
break;
case DK_SERVANT_W_PHANTOM:
case DK_SERVANT_W_DEMOL:
if (sd && (sd->servantball + sd->servantball_old) < wd.div_)
wd.div_ = sd->servantball + sd->servantball_old;
break;
case IQ_THIRD_FLAME_BOMB:
wd.div_ = min(wd.div_ + wd.miscflag, 3); // Number of hits doesn't go above 3.
break;
case IG_OVERSLASH:
if( wd.miscflag >= 4 ){
wd.div_ = 7;
}else if( wd.miscflag >= 2 ){
wd.div_ = 5;
}
break;
case SHC_ETERNAL_SLASH:
if (sc && sc->getSCE(SC_E_SLASH_COUNT))
wd.div_ = sc->getSCE(SC_E_SLASH_COUNT)->val1;
break;
case SHC_IMPACT_CRATER:
if (sc && sc->getSCE(SC_ROLLINGCUTTER))
wd.div_ = sc->getSCE(SC_ROLLINGCUTTER)->val1;
break;
case MT_AXE_STOMP:
if (sd && sd->status.weapon == W_2HAXE)
wd.div_ = 3;
break;
case SHC_SAVAGE_IMPACT:
wd.div_ = wd.div_ + wd.miscflag;
break;
case MT_MIGHTY_SMASH:
if (sc && sc->getSCE(SC_AXE_STOMP))
wd.div_ = 7;
break;
case BO_EXPLOSIVE_POWDER:
if (sc && sc->getSCE(SC_RESEARCHREPORT))
wd.div_ = 5;
break;
case BO_MAYHEMIC_THORNS:
if (sc && sc->getSCE(SC_RESEARCHREPORT))
wd.div_ = 4;
break;
case ABC_CHASING_BREAK:
if (sc != nullptr && sc->hasSCE(SC_CHASING))
wd.div_ = 7;
break;
case ABC_CHASING_SHOT:
if (sc != nullptr && sc->hasSCE(SC_CHASING))
wd.div_ = 3;
break;
case ABC_HIT_AND_SLIDING:
if (sd != nullptr && sd->status.weapon == W_BOW)
wd.flag |= BF_LONG;
break;
case HN_DOUBLEBOWLINGBASH:
if (wd.miscflag > 1)
wd.div_ += min(4, wd.miscflag);
break;
}
} else {
bool is_long = false;

if (is_skill_using_arrow(src, skill_id) || (sc && sc->getSCE(SC_SOULATTACK)))
is_long = true;
wd.flag |= is_long ? BF_LONG : BF_SHORT;
// wd.flag from basic attacks
if (is_skill_using_arrow(src, skill_id) || (sc != nullptr && sc->hasSCE(SC_SOULATTACK)))
wd.flag |= BF_LONG;
else
wd.flag |= BF_SHORT;
}

return wd;
Expand Down Expand Up @@ -5717,6 +5516,11 @@ static struct Damage battle_calc_weapon_attack(block_list *src, block_list *targ

wd = initialize_weapon_data(src, target, skill_id, skill_lv, wflag);

// Update Damage data based on skill
if (std::shared_ptr<s_skill_db> skill = skill_db.find(skill_id); skill != nullptr && skill->impl != nullptr) {
skill->impl->modifyDamageData(wd, *src, *target, skill_lv);
}

right_element = battle_get_weapon_element(&wd, src, target, skill_id, skill_lv, EQI_HAND_R, false);
left_element = battle_get_weapon_element(&wd, src, target, skill_id, skill_lv, EQI_HAND_L, false);

Expand Down Expand Up @@ -6159,50 +5963,6 @@ struct Damage battle_calc_magic_attack(block_list *src,block_list *target,uint16
//Initialize variables that will be used afterwards
s_ele = battle_get_magic_element(src, target, skill_id, skill_lv, mflag);

switch(skill_id) {
case WL_HELLINFERNO:
if (mflag & 2) { // ELE_DARK
ad.div_ = -3;
}
break;
case NPC_PSYCHIC_WAVE:
case SO_PSYCHIC_WAVE:
if (sd && (sd->weapontype1 == W_STAFF || sd->weapontype1 == W_2HSTAFF || sd->weapontype1 == W_BOOK))
ad.div_ = 2;
break;
case AG_DESTRUCTIVE_HURRICANE:
if (sc && sc->getSCE(SC_CLIMAX) && sc->getSCE(SC_CLIMAX)->val1 == 2)
ad.blewcount = 2;
break;
case AG_CRYSTAL_IMPACT:
if (sc && sc->getSCE(SC_CLIMAX) && sc->getSCE(SC_CLIMAX)->val1 == 2)
ad.div_ = 2;
break;
case ABC_ABYSS_SQUARE:
if (mflag == 2)
ad.div_ = 2;
break;
case AG_CRIMSON_ARROW_ATK:
if( sc != nullptr && sc->getSCE( SC_CLIMAX ) ){
ad.div_ = 2;
}
break;
case SOA_TALISMAN_OF_FOUR_BEARING_GOD:
if (sc != nullptr){
if (sc->getSCE(SC_T_FIRST_GOD) != nullptr)
ad.div_ = 2;
else if (sc->getSCE(SC_T_SECOND_GOD) != nullptr)
ad.div_ = 3;
else if (sc->getSCE(SC_T_THIRD_GOD) != nullptr)
ad.div_ = 4;
else if (sc->getSCE(SC_T_FOURTH_GOD) != nullptr)
ad.div_ = 5;
else if (sc->getSCE(SC_T_FIFTH_GOD) != nullptr)
ad.div_ = 7;
}
break;
}

//Set miscellaneous data that needs be filled
if(sd) {
sd->state.arrow_atk = 0;
Expand All @@ -6212,20 +5972,14 @@ struct Damage battle_calc_magic_attack(block_list *src,block_list *target,uint16
//Skill Range Criteria
ad.flag |= battle_range_type(src, target, skill_id, skill_lv);

// Update Damage data based on skill
if (skill != nullptr && skill->impl != nullptr) {
skill->impl->modifyDamageData(ad, *src, *target, skill_lv);
}

//Infinite defense (plant mode)
flag.infdef = is_infinite_defense(target, ad.flag)?1:0;

switch(skill_id) {
case MG_FIREWALL:
if (tstatus->def_ele == ELE_FIRE || battle_check_undead(tstatus->race, tstatus->def_ele)) {
ad.blewcount = 0; //No knockback
// Fire and undead units hit by firewall cannot be stopped for 2 seconds
if (unit_data* ud = unit_bl2ud(target); ud != nullptr)
ud->endure_tick = gettick() + 2000;
}
break;
}

if (!flag.infdef) { //No need to do the math for plants
int32 skillratio = 100; //Skill dmg modifiers.
if (sd != nullptr)
Expand Down Expand Up @@ -6341,47 +6095,6 @@ struct Damage battle_calc_magic_attack(block_list *src,block_list *target,uint16
skill->impl->calculateSkillRatio(&ad, src, target, skill_lv, skillratio, mflag);
}

switch(skill_id) {
case MG_FIREBOLT:
case MG_COLDBOLT:
case MG_LIGHTNINGBOLT:
if (sc) {
// TODO: Refactor
if (sc->getSCE(SC_SPELLFIST) && mflag & BF_SHORT) {
ad.div_ = 1; // ad mods, to make it work similar to regular hits [Xazax]
ad.flag = BF_WEAPON | BF_SHORT;
ad.type = DMG_NORMAL;
}
}
break;
case WZ_FIREPILLAR:
// TODO: Refactor
if (sd && ad.div_ > 0)
ad.div_ *= -1; //For players, damage is divided by number of hits
break;
case HN_GROUND_GRAVITATION:
if (mflag & SKILL_ALTDMG_FLAG) {
// Initial damage
// TODO: refactor / move elsewhere
ad.div_ = -2;
}
break;
case HN_JACK_FROST_NOVA:
if (mflag & SKILL_ALTDMG_FLAG) {
// Initial damage
// TODO: refactor / move elsewhere
ad.div_ = 1; // 1 hit
}
break;
case HN_METEOR_STORM_BUSTER:
if (mflag & SKILL_ALTDMG_FLAG) {
// Fall damage
// TODO: refactor / move elsewhere
ad.div_ = -3;
}
break;
}

if (sc) {// Insignia's increases the damage of offensive magic by a fixed percentage depending on the element.
if ((sc->getSCE(SC_FIRE_INSIGNIA) && sc->getSCE(SC_FIRE_INSIGNIA)->val1 == 3 && s_ele == ELE_FIRE) ||
(sc->getSCE(SC_WATER_INSIGNIA) && sc->getSCE(SC_WATER_INSIGNIA)->val1 == 3 && s_ele == ELE_WATER) ||
Expand Down Expand Up @@ -6733,6 +6446,11 @@ struct Damage battle_calc_misc_attack(block_list *src,block_list *target,uint16
//Skill Range Criteria
md.flag |= battle_range_type(src, target, skill_id, skill_lv);

// Update Damage data based on skill
if (skill != nullptr && skill->impl != nullptr) {
skill->impl->modifyDamageData(md, *src, *target, skill_lv);
}

switch (skill_id) {
case TF_THROWSTONE:
if (sd)
Expand Down
Loading
Loading