summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-19 02:43:28 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-19 02:43:28 +0000
commitac48f740efef4d87163bef288ef231a561c34b3c (patch)
tree2a2088af88dc52e1d0b64ddc01cb5ca14c29f31f /src/map/battle.c
parentdb1d85ba43de36a3dfc115c66e9f6dc404f98cfc (diff)
downloadhercules-ac48f740efef4d87163bef288ef231a561c34b3c.tar.gz
hercules-ac48f740efef4d87163bef288ef231a561c34b3c.tar.bz2
hercules-ac48f740efef4d87163bef288ef231a561c34b3c.tar.xz
hercules-ac48f740efef4d87163bef288ef231a561c34b3c.zip
Updated pneuma
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@254 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index e1367cbc0..9994c6821 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1498,7 +1498,8 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i
skill_unit_move(bl,gettick(),1); // 重ね掛けチェック
damage=0;
}
- if(sc_data[SC_PNEUMA].timer!=-1 && damage>0 && flag&BF_WEAPON && flag&BF_LONG && skill_num != NPC_GUIDEDATTACK){
+ if(sc_data[SC_PNEUMA].timer!=-1 && damage>0 && ((flag&BF_WEAPON && flag&BF_LONG && skill_num != NPC_GUIDEDATTACK) ||
+ (flag&BF_MISC && (skill_num == HT_BLITZBEAT || skill_num == SN_FALCONASSAULT)))){ // [DracoRPG]
// ニューマ
damage=0;
}