diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-11-19 02:43:28 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-11-19 02:43:28 +0000 |
| commit | ac48f740efef4d87163bef288ef231a561c34b3c (patch) | |
| tree | 2a2088af88dc52e1d0b64ddc01cb5ca14c29f31f | |
| parent | db1d85ba43de36a3dfc115c66e9f6dc404f98cfc (diff) | |
| download | hercules-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
| -rw-r--r-- | Changelog.txt | 1 | ||||
| -rw-r--r-- | src/map/battle.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog.txt b/Changelog.txt index 7ad0caff3..470b41b0e 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -7,6 +7,7 @@ Date Added * Added flag to pc_unequipitem (thanks to DracoRPG for suggestion) [celest] * Skill updates [celest] - Updated Cloaking (thanks to orn), Endure + - Pneuma (thanks to DracoRPG) * Modified pc_attack to fix monster npc's not working in certain exes, thanks to leinsirk10 [celest] * Moved mapflags organized by type to main mapflag folder and removed "type" folder. 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; } |