summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/status.c7
2 files changed, 9 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index f058c28e3..0215c7f8d 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/01/26
+ * Kaite and Assumptio no longer stack. One will remove the other in the
+ same way Assumptio and Kyrie do.
* Made homunculus renaming go through the char-server so it can be
validated against the allowed characters setting.
* Added battle config hom_rename so you can enable renaming multiple times
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]