summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c17
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;