diff options
| author | Vicious <Vicious@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-09 18:39:57 +0000 |
|---|---|---|
| committer | Vicious <Vicious@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-09 18:39:57 +0000 |
| commit | 3241a51ac2689e7ffa63e01bf9e81ec08d0b0187 (patch) | |
| tree | be24c64ed17cb01a6a1153b3f2b629195cd1487b /src/map/battle.c | |
| parent | a81d4e79c7aa5b519047ee4ee1d59f5ecf27083f (diff) | |
| download | hercules-3241a51ac2689e7ffa63e01bf9e81ec08d0b0187.tar.gz hercules-3241a51ac2689e7ffa63e01bf9e81ec08d0b0187.tar.bz2 hercules-3241a51ac2689e7ffa63e01bf9e81ec08d0b0187.tar.xz hercules-3241a51ac2689e7ffa63e01bf9e81ec08d0b0187.zip | |
more ninja/gs update
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5535 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 4fc5fb72f..992ed62e3 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1256,10 +1256,12 @@ static struct Damage battle_calc_weapon_attack( case NJ_SYURIKEN:
case NJ_KUNAI:
case NJ_HUUMA:
+ wd.flag=(wd.flag&~BF_RANGEMASK)|BF_LONG;
flag.arrow = 1;
break;
case GS_MAGICALBULLET:
+ wd.flag=(wd.flag&~BF_RANGEMASK)|BF_LONG;
flag.arrow = 0;
break;
}
@@ -2267,8 +2269,9 @@ static struct Damage battle_calc_weapon_attack( wd.div_=skill_get_num(TF_DOUBLE,skill_lv?skill_lv:1);
wd.type = 0x08;
}
- } else if (( (skill_lv = 5*pc_checkskill(sd,GS_CHAINACTION)) > 0 && sd->weapontype1 == 0x11) ||
- sd->double_rate > 0) // Copied double attack
+ } else if (( (skill_lv = 5*pc_checkskill(sd,GS_CHAINACTION)) > 0 &&
+ (sd->weapontype1 == 0x11 || sd->weapontype1 == 0x12 || sd->weapontype1 == 0x13
+ || sd->weapontype1 == 0x14 || sd->weapontype1 == 0x15)) || sd->double_rate > 0) // Copied double attack
if (rand()%100 < (skill_lv>sd->double_rate?skill_lv:sd->double_rate))
{
wd.damage *=2;
@@ -2946,7 +2949,7 @@ struct Damage battle_calc_misc_attack( break;
case NJ_ZENYNAGE:
damage=1000*skill_lv;
- if(skill_lv == 0) damage -= 1;
+ if(skill_lv == 10) damage -= 1;
if(map_flag_vs(bl->m) || is_boss(bl))
damage=damage/2; //temp value
break;
|