summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-03-05 16:24:13 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-03-05 16:24:13 +0000
commitdd6d232f62f0c3611902eadc4ebdc5f2a6c2ec23 (patch)
tree7524477f5afab19270dcb1bc5040d23a7a382ca4 /src/map
parent47865ba6bec2130fd19c5bdbbb65dade86546caf (diff)
downloadhercules-dd6d232f62f0c3611902eadc4ebdc5f2a6c2ec23.tar.gz
hercules-dd6d232f62f0c3611902eadc4ebdc5f2a6c2ec23.tar.bz2
hercules-dd6d232f62f0c3611902eadc4ebdc5f2a6c2ec23.tar.xz
hercules-dd6d232f62f0c3611902eadc4ebdc5f2a6c2ec23.zip
- Soul Breaker no longer ignores elemental adjustments.
- Simplified the Utsusemi/Bunsinjyutsu check to only block weapon skills that do not ignore offensive cards. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9960 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 12438ea62..0b4aa2f69 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -295,7 +295,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i
if (sc && sc->count) {
//First, sc_*'s that reduce damage to 0.
- if (sc->data[SC_SAFETYWALL].timer!=-1 && flag&BF_SHORT && (skill_num != NPC_GUIDEDATTACK && skill_num != AM_DEMONSTRATION)
+ if (sc->data[SC_SAFETYWALL].timer!=-1 && flag&BF_SHORT && skill_num != NPC_GUIDEDATTACK
) {
struct skill_unit_group *group = (struct skill_unit_group *)sc->data[SC_SAFETYWALL].val3;
if (group) {
@@ -363,9 +363,7 @@ 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 || (flag&(BF_MISC|BF_SHORT)) == (BF_MISC|BF_SHORT)) &&
- !(skill_get_nk(skill_num)&NK_NO_CARDFIX)
- )
+ flag&BF_WEAPON && !(skill_get_nk(skill_num)&NK_NO_CARDFIX))
{
if (sc->data[SC_UTSUSEMI].timer != -1) {
clif_specialeffect(bl, 462, AREA);