diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-24 15:10:51 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-24 15:10:51 +0000 |
| commit | bcfd26477585eb8de9ec336cd201688e9314150e (patch) | |
| tree | 69ace2996d9385022b8d5501fd9c3df78f3e62d5 /src/map/battle.c | |
| parent | 1e629a763c308781b17c03bc64e937006b568bac (diff) | |
| download | hercules-bcfd26477585eb8de9ec336cd201688e9314150e.tar.gz hercules-bcfd26477585eb8de9ec336cd201688e9314150e.tar.bz2 hercules-bcfd26477585eb8de9ec336cd201688e9314150e.tar.xz hercules-bcfd26477585eb8de9ec336cd201688e9314150e.zip | |
- Changed Land Protector's range back to 3.
- fixed unban unblocking players as well.
- Fixed Volcano/Deluge/Violent Gale increasing damage based on element of attack instead of defense element of attacker.
- Cleaned up the code of Magic Rod, fixed it not giving SP.
- Moved the code of Hermod and Basilica to castend_pos2 so it should work now.
- Modified the code of Ankle Snare so the status ends on unit's time-limit rather than when the snared object moves away.
- Re-worded the water check of ST_WATER skills.
- Allowed sc-cast reductions to be processed even when cast-time is instant (to let suffragium end even on instant-cast skills)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7855 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index bbee2fe24..acd5d547d 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -198,11 +198,11 @@ int battle_attr_fix(struct block_list *src, struct block_list *target, int damag ratio = attr_fix_table[def_lv-1][atk_elem][def_type]; if (sc && sc->count) { - if(sc->data[SC_VOLCANO].timer!=-1 && atk_elem == ELE_FIRE) + if(sc->data[SC_VOLCANO].timer!=-1 && status_get_element(src) == ELE_FIRE) ratio += enchant_eff[sc->data[SC_VOLCANO].val1-1]; - if(sc->data[SC_VIOLENTGALE].timer!=-1 && atk_elem == ELE_WIND) + if(sc->data[SC_VIOLENTGALE].timer!=-1 && status_get_element(src) == ELE_WIND) ratio += enchant_eff[sc->data[SC_VIOLENTGALE].val1-1]; - if(sc->data[SC_DELUGE].timer!=-1 && atk_elem == ELE_WATER) + if(sc->data[SC_DELUGE].timer!=-1 && status_get_element(src) == ELE_WATER) ratio += enchant_eff[sc->data[SC_DELUGE].val1-1]; } if (tsc && tsc->count) |