summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-29 16:17:00 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-29 16:17:00 +0000
commit4e039253ef7dbed85c64625cfd1f5175e8d423e3 (patch)
tree3dc35ac335cf77792f52f82f4e46137552f7d2aa
parent3fed87361c9edc2ab38e56b6558c143fb2f96e5a (diff)
downloadhercules-4e039253ef7dbed85c64625cfd1f5175e8d423e3.tar.gz
hercules-4e039253ef7dbed85c64625cfd1f5175e8d423e3.tar.bz2
hercules-4e039253ef7dbed85c64625cfd1f5175e8d423e3.tar.xz
hercules-4e039253ef7dbed85c64625cfd1f5175e8d423e3.zip
- Changed some numbers for their respective constants in battle.c
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8901 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/battle.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index db50d4db4..49fcd1d2e 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1168,11 +1168,11 @@ static struct Damage battle_calc_weapon_attack(
break;
case LK_SPIRALPIERCE:
if (sd) {
- short index = sd->equip_index[9];
+ short index = sd->equip_index[EQI_HAND_R];
if (index >= 0 &&
sd->inventory_data[index] &&
- sd->inventory_data[index]->type == 4)
+ sd->inventory_data[index]->type == IT_WEAPON)
wd.damage = sd->inventory_data[index]->weight*8/100; //80% of weight
ATK_ADDRATE(50*skill_lv); //Skill modifier applies to weight only.
@@ -1194,13 +1194,13 @@ static struct Damage battle_calc_weapon_attack(
case CR_SHIELDBOOMERANG:
case PA_SHIELDCHAIN:
if (sd) {
- short index = sd->equip_index[8];
+ short index = sd->equip_index[EQI_HAND_L];
wd.damage = sstatus->batk;
if (index >= 0 &&
sd->inventory_data[index] &&
- sd->inventory_data[index]->type == 5)
+ sd->inventory_data[index]->type == IT_ARMOR)
ATK_ADD(sd->inventory_data[index]->weight/10);
break;
}
@@ -1896,10 +1896,10 @@ static struct Damage battle_calc_weapon_attack(
}
if (skill_num == CR_SHIELDBOOMERANG || skill_num == PA_SHIELDCHAIN) { //Refine bonus applies after cards and elements.
- short index= sd->equip_index[8];
+ short index= sd->equip_index[EQI_HAND_L];
if (index >= 0 &&
sd->inventory_data[index] &&
- sd->inventory_data[index]->type == 5)
+ sd->inventory_data[index]->type == IT_ARMOR)
ATK_ADD(10*sd->status.inventory[index].refine);
}
} //if (sd)