diff options
author | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-29 16:25:25 +0000 |
---|---|---|
committer | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-29 16:25:25 +0000 |
commit | c845207ead7f60b26fd20d9143c09f20416fede6 (patch) | |
tree | b00602e15c084881971b1e6d48bb759bb27fe6de /src/map/skill.c | |
parent | 13132344467b3f5e2c968bb7cfaec8eaf269280e (diff) | |
download | hercules-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/skill.c')
-rw-r--r-- | src/map/skill.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index e25510a64..066b732f7 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1337,6 +1337,10 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int sd->itemid = -1; } break; + case GN_HELLS_PLANT_ATK: + sc_start(bl, SC_STUN, 5 + 5 * skilllv, skilllv, skill_get_time2(skillid, skilllv)); + sc_start(bl, SC_BLEEDING, 20 + 10 * skilllv, skilllv, skill_get_time2(skillid, skilllv)); + break; case EL_WIND_SLASH: // Non confirmed rate. sc_start(bl, SC_BLEEDING, 25, skilllv, skill_get_time(skillid,skilllv)); break; @@ -10049,6 +10053,7 @@ struct skill_unit_group* skill_unitsetting (struct block_list *src, short skilli break; case WZ_QUAGMIRE: //The target changes to "all" if used in a gvg map. [Skotlex] case AM_DEMONSTRATION: + case GN_HELLS_PLANT: if (map_flag_vs(src->m) && battle_config.vs_traps_bctall && (src->type&battle_config.vs_traps_bctall)) target = BCT_ALL; @@ -11186,7 +11191,8 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns case UNT_HELLS_PLANT: if( battle_check_target(&src->bl,bl,BCT_ENEMY) > 0 ) skill_attack(skill_get_type(GN_HELLS_PLANT_ATK), ss, &src->bl, bl, GN_HELLS_PLANT_ATK, sg->skill_lv, tick, 0); - sg->limit = DIFF_TICK(tick, sg->tick) + 100; + if( ss != bl) //The caster is the only one who can step on the Plants, without destroying them + sg->limit = DIFF_TICK(tick, sg->tick) + 100; break; case UNT_CLOUD_KILL: |