diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/battle.c | 6 | ||||
| -rw-r--r-- | src/map/clif.c | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 878f9e322..d0eab1861 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -323,10 +323,12 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i } if ((sc->data[SC_UTSUSEMI].timer != -1 || sc->data[SC_BUNSINJYUTSU].timer != -1) - && (flag&(BF_WEAPON|BF_MISC)) + && +// This check used instead, is 'aproximate' to what it can block. + (flag&BF_WEAPON || (flag&(BF_MISC|BF_SHORT)) == (BF_MISC|BF_SHORT)) /* FIXME: This check is awful, there has to be some kind of logic behind this! - && ( // there is no rule for that, only some exceptions.. which I listed according to many tests and says + && ( skill_num != ASC_BREAKER && skill_num != NJ_KUNAI && skill_num != SN_FALCONASSAULT && diff --git a/src/map/clif.c b/src/map/clif.c index bb985a20e..516b909e4 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -4404,7 +4404,6 @@ int clif_skillinfoblock(struct map_session_data *sd) if(((!(inf2&INF2_QUEST_SKILL) || battle_config.quest_skill_learn) &&
!(inf2&(INF2_WEDDING_SKILL|INF2_SPIRIT_SKILL))) ||
(battle_config.gm_allskill > 0 && pc_isGM(sd) >= battle_config.gm_allskill) )
- //WFIFOB(fd,len+36)= (sd->status.skill[i].lv < skill_get_max(id) && sd->status.skill[i].flag ==0 )? 1:0;
WFIFOB(fd,len+36)= (sd->status.skill[i].lv < skill_tree_get_max(id, sd->status.class_) && sd->status.skill[i].flag ==0 )? 1:0;
else
WFIFOB(fd,len+36) = 0;
|