- Kaite and Assumptio no longer stack. One will remove the other in the same way Assumptio and Kyrie do.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9722 54d463be-8e91-2dee-dedb-b68131a5f0ec

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

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]