diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-07 20:24:41 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-07 20:24:41 +0000 |
commit | 9212ac09f4c80361ba4e69273bc9e9a265d27f25 (patch) | |
tree | 85389ee018205adc9cca4a5402d3178dbd7fb55f /src/map/battle.c | |
parent | 8cf58f2846e8a701fe61a149c5bf532732572780 (diff) | |
download | hercules-9212ac09f4c80361ba4e69273bc9e9a265d27f25.tar.gz hercules-9212ac09f4c80361ba4e69273bc9e9a265d27f25.tar.bz2 hercules-9212ac09f4c80361ba4e69273bc9e9a265d27f25.tar.xz hercules-9212ac09f4c80361ba4e69273bc9e9a265d27f25.zip |
- Changed the default of sg_angel_skill_ratio to 10 based on recent information from Tharis.
- Cleaned up the doridori parse clif function.
- Moved doridori_counter to state.doridori
- Merged some of mpeg's work on NJ skills
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8665 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r-- | src/map/battle.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index a8aa4e988..a2f71a32c 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -882,7 +882,6 @@ static struct Damage battle_calc_weapon_attack( case CR_GRANDCROSS: case NPC_GRANDDARKNESS: case NJ_HUUMA: - case NJ_TATAMIGAESHI: case GS_FLING: case GS_TRIPLEACTION: case GS_BULLSEYE: @@ -2618,7 +2617,7 @@ struct Damage battle_calc_misc_attack( pc_payzeny(sd, md.damage); } - if(is_boss(target)) + if(is_boss(target) || tsd) md.damage=md.damage*60/100; break; case GS_FLING: |