diff options
| author | Playtester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-04-15 16:30:08 +0000 |
|---|---|---|
| committer | Playtester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-04-15 16:30:08 +0000 |
| commit | af1178fafa38833a4577c11f00f451ec0b53c39a (patch) | |
| tree | a3d031a74ae1d2cb805ec7c6e17eca89f28c3f4c /src/map/battle.c | |
| parent | 446b24910597339d03cbf2d0686213236063bfcd (diff) | |
| download | hercules-af1178fafa38833a4577c11f00f451ec0b53c39a.tar.gz hercules-af1178fafa38833a4577c11f00f451ec0b53c39a.tar.bz2 hercules-af1178fafa38833a4577c11f00f451ec0b53c39a.tar.xz hercules-af1178fafa38833a4577c11f00f451ec0b53c39a.zip | |
* Monster Spiral Pierce is now a ranged misc attack
- it always gets blocked by Pneuma, but never by Safety Wall
- Defender doesn't reduce its damage
- Range-Def item bonuses reduce its damage
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13672 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 5c1c9562a..9a274b28c 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -322,9 +322,6 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i if( sc->data[SC_PNEUMA] && (flag&(BF_MAGIC|BF_LONG)) == BF_LONG ) return 0; - - if( sc->data[SC_PNEUMA] && src->type == BL_MOB && skill_num == LK_SPIRALPIERCE) - return 0; //Mob's Spiral Pierce is always blocked by pneuma [Brain] if( (sce=sc->data[SC_AUTOGUARD]) && flag&BF_WEAPON && !(skill_get_nk(skill_num)&NK_NO_CARDFIX_ATK) && rand()%100 < sce->val2 ) { @@ -1010,6 +1007,10 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo case NPC_CRITICALSLASH: flag.cri = 1; //Always critical skill. break; + + case LK_SPIRALPIERCE: + if (!sd) wd.flag=(wd.flag&~(BF_RANGEMASK|BF_WEAPONMASK))|BF_LONG|BF_WEAPON; + break; } } else //Range for normal attacks. wd.flag |= flag.arrow?BF_LONG:BF_SHORT; |