diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-20 14:33:54 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-20 14:33:54 +0000 |
| commit | d3df9e597f966fff6bdabc088257ad0f090903e1 (patch) | |
| tree | b2b73ee9bcad4baaa4a553cc892b8dd4662e383b /src/map/battle.c | |
| parent | 0c98e7140a0d11fe40d277f8e04eb852b629ace3 (diff) | |
| download | hercules-d3df9e597f966fff6bdabc088257ad0f090903e1.tar.gz hercules-d3df9e597f966fff6bdabc088257ad0f090903e1.tar.bz2 hercules-d3df9e597f966fff6bdabc088257ad0f090903e1.tar.xz hercules-d3df9e597f966fff6bdabc088257ad0f090903e1.zip | |
- Updated skill_require_db to place the Zeny requirements of ZenyNage and Fling.
- Fixed crash when non-players use ZenyNage. Added the correct Zeny check in skill_check_condition, fixed the skill so that it's damage is based on whatever zeny is specified in skill_require_db.
- Can-act delay will not be reset when warping now.
- Fixed Quagmire not altering walking-speed.
- Silence now blocks skills both on begin/end casting.
- Updated status_calc_bl so that when walking speed changes, the character is made to rewalk so that the new speed takes effect inmediately.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7264 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index b2be1e295..91541270f 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2516,7 +2516,9 @@ struct Damage battle_calc_misc_attack( if (tsd) md.damage>>=1; break; case NJ_ZENYNAGE: - md.damage = 500*skill_lv +rand()%(500*skill_lv); + md.damage = skill_get_zeny(skill_num ,skill_lv); + if (!md.damage) md.damage = 2; + md.damage = md.damage/2 + rand()%md.damage; if (sd) pc_payzeny(sd, md.damage); if(map_flag_vs(target->m) || is_boss(target)) md.damage>>=1; //temp value |