- When reinvoking a combo-time, the previous combo time will be terminated.

- Fixed Esma-state not ending after casting it.
- Fixed @hominfo displaying intimacy on a 1/10k scale.


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

Changelog-Trunk.txt

@@ -3,6 +3,11 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2006/10/16
+	* When reinvoking a combo-time, the previous combo time will be terminated.
+	  This could fix the ongoing difficulties pulling off Monk combos. [Skotlex]
+	* Fixed Esma-state not ending after casting it. [Skotlex]
+	* Fixed @hominfo displaying intimacy on a 1/10k scale. [Skotlex]
 2006/10/14
 	* Homun info window to show crit value. As default, homun does NOT crit,
 	  as monsters do not crit. This is purely for display purpose for players

src/map/atcommand.c

@@ -10064,7 +10064,7 @@ int atcommand_hominfo(
 	snprintf(atcmd_output, sizeof(atcmd_output) ,"ATK : %d - MATK : %d~%d", sd->hd->battle_status.rhw.atk2+sd->hd->battle_status.batk, sd->hd->battle_status.matk_min, sd->hd->battle_status.matk_max);
 	clif_displaymessage(fd, atcmd_output);
 
-	snprintf(atcmd_output, sizeof(atcmd_output) ,"Hungry : %d - Intimacy : %u", sd->homunculus.hunger, sd->homunculus.intimacy);
+	snprintf(atcmd_output, sizeof(atcmd_output) ,"Hungry : %d - Intimacy : %u", sd->homunculus.hunger, sd->homunculus.intimacy/100);
 	clif_displaymessage(fd, atcmd_output);
 
 	return 0;

src/map/skill.c

@@ -2835,7 +2835,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
 		break;
 	
 	case MO_EXTREMITYFIST:
-		if (sc && sc->count)
+		if (sc)
 		{
 			if (sc->data[SC_EXPLOSIONSPIRITS].timer != -1)
 				status_change_end(src, SC_EXPLOSIONSPIRITS, -1);
@@ -3084,9 +3084,11 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
 			skill_attack(BF_MAGIC, src, src, bl, skillid, skilllv, tick, flag);
 	break;
 
+	case SL_SMA:
+		if (sc && sc->data[SC_SMA].timer != -1)
+			status_change_end(src,SC_SMA,-1);
 	case SL_STIN:
 	case SL_STUN:
-	case SL_SMA:
 		if (sd && !battle_config.allow_es_magic_pc && bl->type != BL_MOB) {
 			status_change_start(src,SC_STUN,10000,skilllv,0,0,0,500,10);
 			clif_skill_fail(sd,skillid,0,0);

src/map/status.c

@@ -4752,13 +4752,13 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
 			case SC_BLIND:
 			case SC_BLEEDING:
 			case SC_DPOISON:
-			case SC_COMBO: //You aren't supposed to change the combo (and it gets turned off when you trigger it)
 			case SC_CLOSECONFINE2: //Can't be re-closed in.
 			case SC_MARIONETTE:
 			case SC_MARIONETTE2:
 			case SC_NOCHAT:
 			case SC_CHANGE: //Otherwise your Hp/Sp would get refilled while still within effect of the last invocation.
 				return 0;
+			case SC_COMBO: 
 			case SC_DANCING:
 			case SC_DEVOTION:
 			case SC_ASPDPOTION0: