summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-16 14:42:54 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-16 14:42:54 +0000
commited800c53cea74042b2666c9588f8e92787013d14 (patch)
tree0684746027dbc96ab956628887ac403f706d9807 /src/map/battle.c
parent4575744180e62e1ae1d90bf628ace2839aeb15a4 (diff)
downloadhercules-ed800c53cea74042b2666c9588f8e92787013d14.tar.gz
hercules-ed800c53cea74042b2666c9588f8e92787013d14.tar.bz2
hercules-ed800c53cea74042b2666c9588f8e92787013d14.tar.xz
hercules-ed800c53cea74042b2666c9588f8e92787013d14.zip
- Fire Pillar will now do 200%MATK damage per hit when level is >10.
- Blood Drain always hits now. - Fixed Mob Area Skills not updating their use-time (rendering their skill delay useless) - Search free cell will now skip picking the center-tile as target location. Will prevent slaves from walking on top of their master, or mobs placing stuff right under themselves with the "around" target conditions. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6621 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 5df3bdc0b..39ded0982 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1267,6 +1267,7 @@ static struct Damage battle_calc_weapon_attack(
case SG_SUN_WARM:
case SG_MOON_WARM:
case SG_STAR_WARM:
+ case NPC_BLOODDRAIN:
flag.hit = 1;
break;
case CR_SHIELDBOOMERANG:
@@ -2530,7 +2531,9 @@ struct Damage battle_calc_magic_attack(
skillratio += (100+skill_lv*10)*2/3-100;
break;
case WZ_FIREPILLAR:
- if (skill_lv <= 10)
+ if (skill_lv > 10)
+ skillratio += 100;
+ else
skillratio -= 80;
break;
case WZ_SIGHTRASHER: