summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-27 00:53:26 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-27 00:53:26 +0000
commit1d699d1f9ba6facaba5f6e817d9b6b2730d6872e (patch)
treec62e085c90ad262ba338cce38f55c895dc40e7a5 /src/map
parent760a86e1c577f776986f4558726a1784317037bb (diff)
downloadhercules-1d699d1f9ba6facaba5f6e817d9b6b2730d6872e.tar.gz
hercules-1d699d1f9ba6facaba5f6e817d9b6b2730d6872e.tar.bz2
hercules-1d699d1f9ba6facaba5f6e817d9b6b2730d6872e.tar.xz
hercules-1d699d1f9ba6facaba5f6e817d9b6b2730d6872e.zip
- Kaite and Assumptio no longer stack. One will remove the other in the same way Assumptio and Kyrie do.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9722 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/status.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/map/status.c b/src/map/status.c
index ac05fcb9f..0620b0c0f 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -4820,7 +4820,14 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
case SC_ASSUMPTIO:
if(sc->data[SC_KYRIE].timer!=-1)
status_change_end(bl,SC_KYRIE,-1);
+ if(sc->data[SC_KAITE].timer!=-1)
+ status_change_end(bl,SC_KAITE,-1);
break;
+ case SC_KAITE:
+ if(sc->data[SC_ASSUMPTIO].timer!=-1 )
+ status_change_end(bl,SC_ASSUMPTIO,-1);
+ break;
+
case SC_CARTBOOST:
if(sc->data[SC_DECREASEAGI].timer!=-1 )
{ //Cancel Decrease Agi, but take no further effect [Skotlex]