summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-29 16:25:25 +0000
committerrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-29 16:25:25 +0000
commitc845207ead7f60b26fd20d9143c09f20416fede6 (patch)
treeb00602e15c084881971b1e6d48bb759bb27fe6de /src/map/battle.c
parent13132344467b3f5e2c968bb7cfaec8eaf269280e (diff)
downloadhercules-c845207ead7f60b26fd20d9143c09f20416fede6.tar.gz
hercules-c845207ead7f60b26fd20d9143c09f20416fede6.tar.bz2
hercules-c845207ead7f60b26fd20d9143c09f20416fede6.tar.xz
hercules-c845207ead7f60b26fd20d9143c09f20416fede6.zip
Fixed bugreport:5850 GN_HELLS_PLANT damage formula and behavior are now updated.
Fixed bugreport:5848 RK_DRAGONTRAINING should now work normally. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16166 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 978b45792..2c74ed240 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3955,7 +3955,8 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
md.damage = 100 + 200 * skill_lv + sstatus->int_;
break;
case GN_HELLS_PLANT_ATK:
- md.damage = sstatus->int_ * 4 * skill_lv * (10 / (10 - pc_checkskill(sd,AM_CANNIBALIZE)));//Need accurate official formula. [Rytech]
+ //[{( Hell Plant Skill Level x Caster’s Base Level ) x 10 } + {( Caster’s INT x 7 ) / 2 } x { 18 + ( Caster’s Job Level / 4 )] x ( 5 / ( 10 - Summon Flora Skill Level ))
+ md.damage = ( skill_lv * status_get_lv(src) * 10 ) + ( sstatus->int_ * 7 / 2 ) * ( 18 + (sd?sd->status.job_level:0) / 4 ) * ( 5 / (10 - (sd?pc_checkskill(sd,AM_CANNIBALIZE):0)) );
break;
}