Auto Guard / Parrying / Kyrie Eleison & bShortWeaponDamageReturn

[Scylla]

This has been asked a few times as I've searched the forum with this problem as well as i am aware that this is currently the official behavior on official servers but i wasn't able to find the solution for it. So, if you're wearing an equipment with bShortWeaponDamageReturn script (Orc Lord Card for example or Valkyrie Manteau) and you're in auto guard / parrying / kyrie eleison + they proc'ed, the damage will miss but there's still a reflect to the attacker. Like this on the video: 

 

But the expected result is it shouldn't have reflect because there wasn't any damage registered to the target.

I've tried various possible solutions by editing this line in battle.cpp:

	if (flag & BF_SHORT) {//Bounces back part of the damage.
		if ( (skill_get_inf2(skill_id)&INF2_TRAP || !status_reflect) && sd && sd->bonus.short_weapon_damage_return) {
			rdamage += damage * sd->bonus.short_weapon_damage_return / 100;
			rdamage = i64max(rdamage,1);

But i wasn't able to revert it. 

May i ask for help on reverting this? Thank you!

Edited October 10, 2020 by Scylla

[Scylla]

I've finally solved it.

battle.cpp:

	if (flag & BF_SHORT) {//Bounces back part of the damage.
		if ( (skill_get_inf2(skill_id, INF2_ISTRAP) || !status_reflect) && sd && sd->bonus.short_weapon_damage_return ) {
			rdamage += damage * sd->bonus.short_weapon_damage_return / 100;
			rdamage = i64max(rdamage,1);
		} else if( status_reflect && sc && sc->count ) {

to

	if (flag & BF_SHORT) {//Bounces back part of the damage.
		if ( (skill_get_inf2(skill_id)&INF2_TRAP || !status_reflect) && sd && sd->bonus.short_weapon_damage_return) {
			rdamage = i64max(rdamage,-1);
		}
		else if ( (status_reflect) && sd && sd->bonus.short_weapon_damage_return) {
			rdamage += damage * sd->bonus.short_weapon_damage_return / 100;
			rdamage = i64max(rdamage,1);
		}
		if( status_reflect && sc && sc->count ) {

Thanks a lot to @Wazaby for assisting me with this.

 

EDIT: You may just add this line on else if, if you want trap to reflect

skill_get_inf2(skill_id)&INF2_TRAP

EDIT 2:

 

 Just to update to my fix, for those people using bLongWeaponDamageReturn:

in battle.cpp

Find:

        if (!status_reflect && sd && sd->bonus.long_weapon_damage_return) {
            rdamage += damage * sd->bonus.long_weapon_damage_return / 100;
            rdamage = i64max(rdamage, 1);
        }
    }

to:

        if (!status_reflect && sd && sd->bonus.long_weapon_damage_return) {
            rdamage = i64max(rdamage,-1);
        }
        else if (status_reflect && sd && sd->bonus.long_weapon_damage_return) {
            rdamage += damage * sd->bonus.long_weapon_damage_return / 100;
            rdamage = i64max(rdamage, 1);
    }

 

Edited July 14, 2021 by Scylla

[Gidz Cross]

Well this isnt compatible with my TRUNK. But @Scylla was able to help me with it. Thank you so much bro!

if somebody have this on your battle.c

	if (flag & BF_SHORT) {//Bounces back part of the damage.
		if ( (skill_get_inf2(skill_id, INF2_ISTRAP) || !status_reflect) && sd && sd->bonus.short_weapon_damage_return ) {
			rdamage += damage * sd->bonus.short_weapon_damage_return / 100;
			rdamage = i64max(rdamage,1);
		} else if( status_reflect && sc && sc->count ) {

change it to
 

	if (flag & BF_SHORT) {//Bounces back part of the damage.
		if ( (skill_get_inf2(skill_id, INF2_ISTRAP) || !status_reflect) && sd && sd->bonus.short_weapon_damage_return) {
			rdamage = i64max(rdamage,-1);
		}
		else if ( (status_reflect) && sd && sd->bonus.short_weapon_damage_return) {
			rdamage += damage * sd->bonus.short_weapon_damage_return / 100;
			rdamage = i64max(rdamage,1);
		}
		if( status_reflect && sc && sc->count ) {

voila!!!

Edited July 1, 2021 by Gidz Cross

[Wazaby]

15 hours ago, Scylla said:

I've finally solved it.

battle.cpp:

	if (flag & BF_SHORT) {//Bounces back part of the damage.
		if ( (skill_get_inf2(skill_id, INF2_ISTRAP) || !status_reflect) && sd && sd->bonus.short_weapon_damage_return ) {
			rdamage += damage * sd->bonus.short_weapon_damage_return / 100;
			rdamage = i64max(rdamage,1);
		} else if( status_reflect && sc && sc->count ) {

to

	if (flag & BF_SHORT) {//Bounces back part of the damage.
		if ( (skill_get_inf2(skill_id)&INF2_TRAP || !status_reflect) && sd && sd->bonus.short_weapon_damage_return) {
			rdamage = i64max(rdamage,-1);
		}
		else if ( (status_reflect) && sd && sd->bonus.short_weapon_damage_return) {
			rdamage += damage * sd->bonus.short_weapon_damage_return / 100;
			rdamage = i64max(rdamage,1);
		}
		if( status_reflect && sc && sc->count ) {

Thanks a lot to @Wazaby for assisting me with this.

 

EDIT: You may just add this line on else if, if you want trap to reflect

skill_get_inf2(skill_id)&INF2_TRAP

Thanks for the mention.

[kalabasa]

On 10/17/2020 at 1:43 AM, Scylla said:

I've finally solved it.

battle.cpp:

	if (flag & BF_SHORT) {//Bounces back part of the damage.
		if ( (skill_get_inf2(skill_id, INF2_ISTRAP) || !status_reflect) && sd && sd->bonus.short_weapon_damage_return ) {
			rdamage += damage * sd->bonus.short_weapon_damage_return / 100;
			rdamage = i64max(rdamage,1);
		} else if( status_reflect && sc && sc->count ) {

to

	if (flag & BF_SHORT) {//Bounces back part of the damage.
		if ( (skill_get_inf2(skill_id)&INF2_TRAP || !status_reflect) && sd && sd->bonus.short_weapon_damage_return) {
			rdamage = i64max(rdamage,-1);
		}
		else if ( (status_reflect) && sd && sd->bonus.short_weapon_damage_return) {
			rdamage += damage * sd->bonus.short_weapon_damage_return / 100;
			rdamage = i64max(rdamage,1);
		}
		if( status_reflect && sc && sc->count ) {

Thanks a lot to @Wazaby for assisting me with this.

 

EDIT: You may just add this line on else if, if you want trap to reflect

skill_get_inf2(skill_id)&INF2_TRAP

can you please update the codes to the latest git/pull

[Scylla]

1 hour ago, kalabasa said:

can you please update the codes to the latest git/pull

Nothing really changed...