diff options
| author | Vicious <Vicious@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-28 16:15:16 +0000 |
|---|---|---|
| committer | Vicious <Vicious@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-28 16:15:16 +0000 |
| commit | 229fb46f2c42aaf6a1977d122122af4b641b3819 (patch) | |
| tree | 8266172e81861d9a13d4d2d6b9b8536863d3cfe3 /src/map/battle.c | |
| parent | 06841373f453322e33aa6a22d68fa803e17ae76d (diff) | |
| download | hercules-229fb46f2c42aaf6a1977d122122af4b641b3819.tar.gz hercules-229fb46f2c42aaf6a1977d122122af4b641b3819.tar.bz2 hercules-229fb46f2c42aaf6a1977d122122af4b641b3819.tar.xz hercules-229fb46f2c42aaf6a1977d122122af4b641b3819.zip | |
reverted mpeg's work
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8522 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index ff9794345..360fe997a 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -857,6 +857,7 @@ static struct Damage battle_calc_weapon_attack( } wd.flag=(wd.flag&~BF_RANGEMASK)|BF_LONG; break; + case GS_MAGICALBULLET: case HT_PHANTASMIC: //Since these do not consume ammo, they need to be explicitly set as arrow attacks. flag.arrow = 1; @@ -880,10 +881,6 @@ static struct Damage battle_calc_weapon_attack( case NPC_GRANDDARKNESS: case NJ_HUUMA: case NJ_TATAMIGAESHI: - case GS_FLING: - case GS_TRIPLEACTION: - case GS_BULLSEYE: - case GS_MAGICALBULLET: wd.flag=(wd.flag&~BF_RANGEMASK)|BF_LONG; break; @@ -1508,17 +1505,13 @@ static struct Damage battle_calc_weapon_attack( break; case GS_BULLSEYE: skillratio += 400; - flag.cardfix = 0; break; case GS_TRACKING: - // Where does this damage calculation come from ? Reverse the changes if necessary (or else delete me) - /*skillratio += 60*skill_lv; + skillratio += 60*skill_lv; if (skill_lv == 2) skillratio += 20; if (skill_lv == 3) skillratio += 80; if (skill_lv >= 4) skillratio += 60*(skill_lv-3); if (skill_lv == 10) skillratio += 80; - break;*/ - skillratio += 100 *(skill_lv+1); break; case GS_PIERCINGSHOT: skillratio += 20*skill_lv; @@ -1527,16 +1520,16 @@ static struct Damage battle_calc_weapon_attack( skillratio += 10*skill_lv; break; case GS_DESPERADO: - skillratio += 50*(skill_lv-1); + skillratio += 50*skill_lv - 50; break; case GS_DUST: skillratio += 50*skill_lv; break; case GS_FULLBUSTER: - skillratio += 100*(skill_lv+2); + skillratio += 200 + 100*skill_lv; break; case GS_SPREADATTACK: - skillratio += 20*(skill_lv-1); + skillratio += 20*skill_lv-20; break; case NJ_HUUMA: skillratio += 50 + 150*skill_lv; |