summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-05 14:13:03 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-05 14:13:03 +0000
commit5c6a9a4f7a53505a31f6d5c9fe16280d1782b264 (patch)
treeb6ca3ace8bc811a21dff1226f6c805d5703ed670 /src/map/battle.c
parent17724e67996877069caf4533b835c41c696d5cdc (diff)
downloadhercules-5c6a9a4f7a53505a31f6d5c9fe16280d1782b264.tar.gz
hercules-5c6a9a4f7a53505a31f6d5c9fe16280d1782b264.tar.bz2
hercules-5c6a9a4f7a53505a31f6d5c9fe16280d1782b264.tar.xz
hercules-5c6a9a4f7a53505a31f6d5c9fe16280d1782b264.zip
- OnEquip scripts will be trigger on log-on now.
- Infinite Endure will no longer give mdef bonus. - Removed bInfiniteEndure bonus, Eddga card now uses onequip/onunequip to start/end infinite endure. - Hammer fall's stun duration is now 1+lv seconds. - Fixed Kaahi's SP cost per heal. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6487 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 97aaf1ee3..8a66cbedf 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -210,9 +210,9 @@ int battle_damage(struct block_list *src,struct block_list *target,int damage, i
status_change_end(target, SC_CLOAKING, -1);
if (sc->data[SC_CHASEWALK].timer != -1)
status_change_end(target, SC_CHASEWALK, -1);
- if (sc->data[SC_ENDURE].timer != -1 && sc->data[SC_ENDURE].val1 <= 10) {
+ if (sc->data[SC_ENDURE].timer != -1 && !sc->data[SC_ENDURE].val4) {
//Endure count is only reduced by non-players on non-gvg maps.
- //if val1 is greater than 10, this is infinite endure. [Skotlex]
+ //val4 signals infinite endure. [Skotlex]
if (src && src->type != BL_PC && !map_flag_gvg(target->m)
&& --(sc->data[SC_ENDURE].val2) < 0)
status_change_end(target, SC_ENDURE, -1);