summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-04-25 13:15:45 +0000
committerPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-04-25 13:15:45 +0000
commit7ac8d40efcf43589f36c23d33bc5f6525ec06edc (patch)
tree40039b5e92fd8b0eb549e46f917465bc724bea5a /src
parent5328e63b9fb979e175f888e0b17f4c88ef9bb890 (diff)
downloadhercules-7ac8d40efcf43589f36c23d33bc5f6525ec06edc.tar.gz
hercules-7ac8d40efcf43589f36c23d33bc5f6525ec06edc.tar.bz2
hercules-7ac8d40efcf43589f36c23d33bc5f6525ec06edc.tar.xz
hercules-7ac8d40efcf43589f36c23d33bc5f6525ec06edc.zip
* Fixed Monster Spiral Pierce not being reduced by Ghostring Card
- it is forced neutral as its a MISC skill for monsters and doesn't take weapon element git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13702 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/battle.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index bf2119dc3..9d6ead21e 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1035,8 +1035,17 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
} else if (s_ele == -2) { //Use enchantment's element
s_ele = s_ele_ = status_get_attack_sc_element(src,sc);
}
- if (skill_num == GS_GROUNDDRIFT)
- s_ele = s_ele_ = wflag; //element comes in flag.
+
+ switch(skill_num)
+ {
+ case GS_GROUNDDRIFT:
+ s_ele = s_ele_ = wflag; //element comes in flag.
+ break;
+
+ case LK_SPIRALPIERCE:
+ if (!sd) nk &= ~NK_NO_ELEFIX; //forced neutral for monsters
+ break;
+ }
if(!skill_num)
{ //Skills ALWAYS use ONLY your right-hand weapon (tested on Aegis 10.2)