diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/battle.c | 8 | ||||
| -rw-r--r-- | src/map/unit.c | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 25bacc337..0b30f4f1d 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1833,7 +1833,9 @@ static struct Damage battle_calc_weapon_attack( s_race2 = status_get_race2(src); s_class = status_get_class(src); - cardfix=cardfix*(100-tsd->subele[sstatus->def_ele])/100; + cardfix=cardfix*(100-tsd->subele[s_ele])/100; + if (flag.lh && s_ele_ != s_ele) + cardfix=cardfix*(100-tsd->subele[s_ele_])/100; cardfix=cardfix*(100-tsd->subsize[sstatus->size])/100; cardfix=cardfix*(100-tsd->subrace2[s_race2])/100; cardfix=cardfix*(100-tsd->subrace[sstatus->race])/100; @@ -2357,7 +2359,7 @@ struct Damage battle_calc_magic_attack( short cardfix=100; if (flag.elefix) - cardfix=cardfix*(100-tsd->subele[sstatus->def_ele])/100; + cardfix=cardfix*(100-tsd->subele[s_ele])/100; cardfix=cardfix*(100-tsd->subsize[sstatus->size])/100; cardfix=cardfix*(100-tsd->subrace2[s_race2])/100; cardfix=cardfix*(100-tsd->subrace[sstatus->race])/100; @@ -2595,7 +2597,7 @@ struct Damage battle_calc_misc_attack( if(md.damage && flag.cardfix && tsd){ int cardfix = 10000; int race2 = status_get_race(src); - cardfix=cardfix*(100-tsd->subele[sstatus->def_ele])/100; + cardfix=cardfix*(100-tsd->subele[s_ele])/100; cardfix=cardfix*(100-tsd->subsize[sstatus->size])/100; cardfix=cardfix*(100-tsd->subrace2[race2])/100; cardfix=cardfix*(100-tsd->subrace[sstatus->race])/100; diff --git a/src/map/unit.c b/src/map/unit.c index 57a557395..5497f8c2e 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -198,7 +198,9 @@ static int unit_walktoxy_timer(int tid,unsigned int tick,int id,int data) return 0; if (md->min_chase > md->db->range2) md->min_chase--; //Walk skills are triggered regardless of target due to the idle-walk mob state. - if(!(ud->walk_count%WALK_SKILL_INTERVAL) && + //However, avoid triggering them when there's a forced stop-walk call + //(tid == -1) or client desync problems can appear. + if(tid != -1 && !(ud->walk_count%WALK_SKILL_INTERVAL) && mobskill_use(md, tick, -1)) return 0; } |