Skip to content

Commit 599cec3

Browse files
Merge pull request #3293 from skyleo/missing-atkdefpercent-commits
Add missing commit for (m)atk/(m)def percent implementation and one official behavior fix for BS_OVERTHRUST
2 parents a2d8e27 + 53e0ee4 commit 599cec3

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

src/map/status.c

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3884,6 +3884,11 @@ static void status_calc_misc(struct block_list *bl, struct status_data *st, int
38843884
st->mdef2 += st->int_ + (st->vit >> 1);
38853885
#endif // RENEWAL
38863886

3887+
st->atk_percent = 100;
3888+
st->matk_percent = 100;
3889+
st->def_percent = 100;
3890+
st->mdef_percent = 100;
3891+
38873892
if ( bl->type&battle_config.enable_critical )
38883893
st->cri += 10 + (st->luk * 10 / 3); // (every 1 luk = +0.33 critical -> 3 luk = +1 critical)
38893894
else
@@ -8303,8 +8308,15 @@ static int status_change_start_sub(struct block_list *src, struct block_list *bl
83038308
val2 = 20*val1; //Power increase
83048309
break;
83058310
case SC_OVERTHRUST:
8306-
//val2 holds if it was casted on self, or is bonus received from others
8307-
val3 = 5*val1; //Power increase
8311+
#ifndef RENEWAL
8312+
if (val2 == 1) // cast on self
8313+
val3 = 5 * val1; //Power increase
8314+
else // received cast
8315+
val3 = 5;
8316+
#else
8317+
// for renewal this is actually wrong for party members since 2020 and will need to be changed.
8318+
val3 = 5 * val1; // Power increase
8319+
#endif
83088320
if(sd && pc->checkskill(sd,BS_HILTBINDING)>0)
83098321
total_tick += total_tick / 10;
83108322
break;

0 commit comments

Comments
 (0)