summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorVicious <Vicious@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-11 16:12:04 +0000
committerVicious <Vicious@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-11 16:12:04 +0000
commit1cda64d5ff2b604cbe85b3a225e0dacbdbce5e35 (patch)
tree5f9f75cc8d978518b08ab04ef65501bc75eddbdf /src/map/battle.c
parentf16af9875351189970a11ca873720da3690e1520 (diff)
downloadhercules-1cda64d5ff2b604cbe85b3a225e0dacbdbce5e35.tar.gz
hercules-1cda64d5ff2b604cbe85b3a225e0dacbdbce5e35.tar.bz2
hercules-1cda64d5ff2b604cbe85b3a225e0dacbdbce5e35.tar.xz
hercules-1cda64d5ff2b604cbe85b3a225e0dacbdbce5e35.zip
more ninja/gs work
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5572 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 633c774d7..c17977151 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2280,9 +2280,7 @@ static struct Damage battle_calc_weapon_attack(
damage_div_fix(wd.damage, wd.div_);
wd.type = 0x08;
}
- } 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
+ } else if (( (skill_lv = 5*pc_checkskill(sd,GS_CHAINACTION)) > 0 && sd->weapontype1 == 0x11) || sd->double_rate > 0)
if (rand()%100 < (skill_lv>sd->double_rate?skill_lv:sd->double_rate))
{
wd.div_=skill_get_num(GS_CHAINACTION,skill_lv?skill_lv:1);