diff options
| author | toms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-29 10:23:11 +0000 |
|---|---|---|
| committer | toms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-29 10:23:11 +0000 |
| commit | 3bc63f72702b2863f1439e69c6b5add1009a02c5 (patch) | |
| tree | befa8038a634b39fcdac89160da9317b21bb307d /src/map/battle.c | |
| parent | 089657a99ef08deb2e7202e3d2af6382a2e874f2 (diff) | |
| download | hercules-3bc63f72702b2863f1439e69c6b5add1009a02c5.tar.gz hercules-3bc63f72702b2863f1439e69c6b5add1009a02c5.tar.bz2 hercules-3bc63f72702b2863f1439e69c6b5add1009a02c5.tar.xz hercules-3bc63f72702b2863f1439e69c6b5add1009a02c5.zip | |
- Applied Mpeg's work on GS
( http://gpegon.free.fr/ea/gunslinger_08-29-06_mpeg.txt )
- Fixed a syntax error in @showmobs
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8528 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index ca04db941..a39a006c1 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -858,7 +858,6 @@ 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; @@ -882,6 +881,10 @@ 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; @@ -1506,13 +1509,10 @@ static struct Damage battle_calc_weapon_attack( break; case GS_BULLSEYE: skillratio += 400; + flag.cardfix = 0; break; case GS_TRACKING: - 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; + skillratio += 100 *(skill_lv+1); break; case GS_PIERCINGSHOT: skillratio += 20*skill_lv; @@ -1521,16 +1521,16 @@ static struct Damage battle_calc_weapon_attack( skillratio += 10*skill_lv; break; case GS_DESPERADO: - skillratio += 50*skill_lv - 50; + skillratio += 50*(skill_lv-1); break; case GS_DUST: skillratio += 50*skill_lv; break; case GS_FULLBUSTER: - skillratio += 200 + 100*skill_lv; + skillratio += 100*(skill_lv+2); break; case GS_SPREADATTACK: - skillratio += 20*skill_lv-20; + skillratio += 20*(skill_lv-1); break; case NJ_HUUMA: skillratio += 50 + 150*skill_lv; |