=General

*cooldown_rate
*min_skill_cooldown_limit
*no_skill_cooldown
+Added these config settings to the skill.conf file.

*clif_spdamage
+Added seprate function for the ZC_NOTIFY_ACT3 packet.
-This packet is mainly used for displaying SP damage and not HP damage.
-The ZC_NOTIFY_ACT2 packet is confirmed still used for HP damage.

*Fixed a issue where some status's that deal damage and shows it will not show
the damage done on the enemy if its a killing blow.

*Autocasted skills will no longer trigger a cooldown on renewal era skills.

*skill_cooldownfix
+Added support for this function.
-This function is kinda like skill_delayfix, but for cooldowns.
-At the moment its functional enough to allow cooldown time adjustments through
-status's but will be updated later to work with equip bonuses.



=Skills
*LG_BANDING
+Fixed a issue where using the skill under certain conditions would crash the server.

*WM_METALICSOUND
+Fixed a issue where it didn't deal bonus damage on sleeping targets.
+Now displays SP damage as blue numbers.

*SJ_SUNSTANCE
*SJ_LUNARSTANCE
*SJ_STARSTANCE
*SJ_UNIVERSESTANCE
+Switching or disabling stances now removes status's given from skills exclusive
-to the previously active stance.

*SJ_GRAVITYCONTROL
*SJ_BOOKOFDIMENSION
*Added full support for these skills.

*SJ_NOVAEXPLOSING
+Recoded the skill.
+Damage is now fully fixed and not reduceable.
+Damage is now only blockable with Safety Wall / Millennium Shield / Defense Spehre.
+Damage is no longer affected by anger skills on hated targets.
+Now gives a penalty after use that blocks skill usage for 2 seconds.

*SJ_BOOKOFCREATINGSTAR
+Recoded the skill.
+Now reduces movement speed and deals damage for as long as the enemy is standing
-in the AoE.

*SJ_PROMINENCEKICK
+Now deals 2 hits.
-The first hit is the main damage. The second hit is the 100% fire damage.

*SP_SOULDIVISION
+Adjusted map check code.

*SP_SOULEXPLOSION
+Now only usable in PVP type maps.

*GN_ILLUSIONDOPING
+Fixed a issue where casting the skill didn't require alcohol.

git-svn-id: svn://svn.code.sf.net/p/v1-3ceam/code/trunk@861 cad27aaa-dce3-4a30-a00a-e4fd67c11881

rewrite/conf/battle/skill.conf

@@ -27,6 +27,9 @@ casting_rate: 100
 // Delay time after casting (Note 2)
 delay_rate: 100
 
+// Cooldown time after casting (Note 2)
+cooldown_rate: 100
+
 // Does the delay time depend on the caster's DEX and/or AGI? (Note 1)
 // Note: On Official servers, neither Dex nor Agi affect delay time
 delay_dependon_dex: no
@@ -36,6 +39,10 @@ delay_dependon_agi: no
 // Note: Setting this to anything above 0 can stop speedhacks.
 min_skill_delay_limit: 100
 
+// Minimum allowed cooldown for ANY skills after casting (in miliseconds) (Note 1)
+// Note: Setting this above 0 will make all skills have a cooldown of at least what you set.
+min_skill_cooldown_limit: 0
+
 // This delay is the min 'can't walk delay' of all skills.
 // NOTE: Do not set this too low, if a character starts moving too soon after 
 // doing a skill, the client will not update this, and the player/mob will 
@@ -49,18 +56,24 @@ default_walk_delay: 300
 //  min_skill_delay_limit.
 no_skill_delay: 2
 
+//Completely disable skill cooldown of the following types (Note 3)
+//NOTE: By default mobs don't have the skill cooldown as specified in the skill
+//  database, but follow their own 'reuse' skill delay which is specified on
+//  the mob skill db. When set, the delay for all skills become
+//  min_skill_cooldown_limit.
+no_skill_cooldown: 2
+
 // At what dex does the cast time become zero (instacast)?
 castrate_dex_scale: 150
 
-// How much DEX is needed to instant cast 1st and 2nd job skills when the player is a 3rd job?
-// This also includes Expanded Super Novice, Kagerou, Oboro, and Rebellion.
+// How much DEX is needed to instant cast pre-renewal era skills when the player is a renewal era job?
 castrate_dex_scale_renewal_jobs: 150
 
 // Enable renewal casting/cycling system for 3rd jobs skills and other skills released in renewal?
 // This will make all 3rd job skills and other skills added since renewal use the renewal casting system.
 // This means skill cast times will use a Variable/Fixed setup, variable cast times will be affected by INT/DEX.
 // Disabling the system will make all these skills use the prenewal cast system where only DEX affects cast times
-// and fixed times dont exist. Renewal skills thats 100% fixed will only be reduceable and fixed cast reduction methods.
+// and fixed times dont exist. Renewal skills thats 100% fixed will only be reduceable by fixed cast reduction methods.
 // (Default: Yes)
 renewal_casting_renewal_skills: yes
 

rewrite/db/skill_db.txt

@@ -1318,10 +1318,10 @@
 2579,0,6,4,-1,0x2,3,7,1,yes,0,0,0,weapon,0,	SJ_NEWMOONKICK,New Moon Kick
 2580,1,6,1,-1,0,0,7,1,yes,0,0,0,weapon,0,	SJ_FLASHKICK,Flash Kick
 2581,0,6,4,-1,0x2,3,5,1,yes,0,0,0,weapon,0,	SJ_STAREMPEROR,Star Emperor
-2582,3,6,1,0,0xA8,0,5,1,yes,0,0,0,weapon,0,	SJ_NOVAEXPLOSING,Nova Explosing
+2582,3,6,1,0,0xD0,0,5,1,yes,0,0,0,misc,0,	SJ_NOVAEXPLOSING,Nova Explosing
 2583,0,6,4,0,0x1,0,3,1,yes,0,0,0,none,0,	SJ_UNIVERSESTANCE,Universe Stance
 2584,0,6,4,0,0x1,0,7,1,yes,0,0,0,none,0,	SJ_FALLINGSTAR,Falling Star
-2585,9,6,1,0,0,0,1,1,yes,0,0,0,none,0,		SJ_GRAVITYCONTROL,Gravity Control
+2585,9,6,1,0,0x1,0,1,1,yes,0,0,0,none,0,	SJ_GRAVITYCONTROL,Gravity Control
 2586,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0,	SJ_BOOKOFDIMENSION,Book of Dimension
 2587,7,6,2,-1,0,0,5,1,yes,0,0,0,weapon,0,	SJ_BOOKOFCREATINGSTAR,Book of Creating Star
 2588,0,6,4,0,0x1,0,3,1,yes,0,0,0,none,0,	SJ_DOCUMENT,Document

rewrite/db/skill_renewal_cast_db.txt

@@ -652,8 +652,8 @@
 2580,0,0,0,0,0,4000:5000:6000:7000:8000:9000:10000,0
 //-- SJ_STAREMPEROR
 2581,0,1000,1000,10000,0,7000,0
-//-- SJ_NOVAEXPLOSING - Confirmed 1 second aftercast.
-2582,5000,1000,1000,20000,0,0,0
+//-- SJ_NOVAEXPLOSING
+2582,5000,1000,1000,20000,0,2000,0
 //-- SJ_UNIVERSESTANCE
 2583,0,0,0,0,0,0,0
 //-- SJ_FALLINGSTAR - Confirm the duration.

rewrite/db/skill_require_db.txt

@@ -1120,7 +1120,7 @@
 // EP 14.3 Part 2 3rd Job Skills
 5001,0,0,22:34:46:58:70,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GC_DARKCROW#Dark Claw#
 5002,0,0,100:120:140:160:180,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RA_UNLIMIT#Unlimited#
-5003,0,0,60:70:80:90:100,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GN_ILLUSIONDOPING#Illusion Doping#
+5003,0,0,60:70:80:90:100,0,0,0,99,0,0,none,0,970,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GN_ILLUSIONDOPING#Illusion Doping#
 5004,0,0,30:35:40:45:50:55:60:65:70:75,0,0,0,99,0,0,dragon,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RK_DRAGONBREATH_WATER#Dragon Breath - Water#
 5005,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RK_LUXANIMA#Lux Anima#
 5006,0,0,60:70:80:90:100,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NC_MAGMA_ERUPTION#Magma Eruption#

rewrite/db/skill_unit_db.txt

@@ -153,7 +153,7 @@
 2555,0x104,   ,  0, 1:2:2:3:3,500,enemy,0x002	//RL_B_TRAP
 2567,0x105,   , -1, 0,1000,enemy, 0x018	//RL_FIRE_RAIN
 2571,0x86,    ,  0, 2,1000,enemy, 0x018	//RL_HAMMER_OF_GOD
-2587,0x109,   ,  0, 2,500,enemy,  0x018	//SJ_BOOKOFCREATINGSTAR
+2587,0x109,   ,  2, 0,  -1,enemy,0x1018	//SJ_BOOKOFCREATINGSTAR
 3010,0xfc,    ,  0, 0,2000,enemy, 0x01A	//KO_MAKIBISHI - Need to know how often these things hit.
 3020,0xf8,    ,  2, 0,1000,all,   0x101A	//KO_ZENKAI
 5006,0x101,   ,  0, 3,500,enemy,   0x018	//NC_MAGMA_ERUPTION

rewrite/src/map/battle.c

@@ -1559,7 +1559,8 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src, struct bl
 				break;
 
 		case RL_H_MINE:
-			if ( wflag&8 )// Explosion damage deals fire damage according to description.
+		case SJ_PROMINENCEKICK:
+			if ( wflag&8 )// Explosion damage for howling mine deals fire damage according to description.
 				s_ele = s_ele_ = ELE_FIRE;
 			break;
 
@@ -2907,9 +2908,6 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src, struct bl
 				case SJ_STAREMPEROR:
 					skillratio = 800 + 200 * skill_lv;
 					break;
-				case SJ_NOVAEXPLOSING:
-					skillratio = 200 + 100 * skill_lv;
-					break;
 				case SJ_SOLARBURST:
 					skillratio = 900 + 100 * skill_lv;
 					if( level_effect_bonus == 1 )
@@ -2918,7 +2916,8 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src, struct bl
 						skillratio += skillratio * sc->data[SC_LIGHTOFSUN]->val2 / 100;
 					break;
 				case SJ_PROMINENCEKICK:
-					skillratio = 150 + 50 * skill_lv;
+					if ( !(wflag&8) )// Ratio for main hit. The fire hit is just 100%.
+						skillratio = 150 + 50 * skill_lv;
 					break;
 				case SJ_FALLINGSTAR_ATK:
 				case SJ_FALLINGSTAR_ATK2:
@@ -3150,14 +3149,6 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src, struct bl
 					if( sc && sc->data[SC_GN_CARTBOOST] )
 					ATK_ADD( 10 * sc->data[SC_GN_CARTBOOST]->val1 );
 					break;
-				case SJ_NOVAEXPLOSING:
-					{
-						short hp_skilllv = skill_lv;
-						if ( hp_skilllv > 5 )
-							hp_skilllv = 5;// Prevents dividing the MaxHP by 0 on levels higher then 5.
-						ATK_ADD(sstatus->max_hp / (6 - hp_skilllv) + status_get_max_sp(src) * (2 * skill_lv));
-					}
-					break;
 			}
 		}
 		//Div fix.
@@ -4253,6 +4244,8 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
 						skillratio = 120 * skill_lv + 60 * (sd?pc_checkskill(sd, WM_LESSON):10);
 						if( level_effect_bonus == 1 )
 							skillratio = skillratio * status_get_base_lv_effect(src) / 100;
+						if ( tsc && (tsc->data[SC_SLEEP] || tsc->data[SC_DEEPSLEEP]) )
+							skillratio += skillratio * 50 / 100;
 						break;
 					case WM_REVERBERATION_MAGIC:
 						skillratio += 100 * skill_lv;
@@ -4803,6 +4796,20 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
 	case GN_HELLS_PLANT_ATK:
 		md.damage = 10 * skill_lv * status_get_base_lv_effect(target) + 7 * sstatus->int_ / 2 * ( status_get_job_lv_effect(src) / 4 + 18 ) * 5 / ( 10 - (sd?pc_checkskill(sd,AM_CANNIBALIZE):5) );
 		break;
+	case SJ_NOVAEXPLOSING:
+		{
+			short hp_skilllv = skill_lv;
+
+			if ( hp_skilllv > 5 )
+				hp_skilllv = 5;// Prevents dividing the MaxHP by 0 on levels higher then 5.
+
+			// (Base ATK + Weapon ATK) * Ratio
+			md.damage = (sstatus->batk + sstatus->rhw.atk) * (200 + 100 * skill_lv) / 100;
+
+			// Additional Damage
+			md.damage += sstatus->max_hp / (6 - hp_skilllv) + status_get_max_sp(src) * (2 * skill_lv);
+		}
+		break;
 	case SP_SOULEXPLOSION:
 		md.damage = tstatus->hp * (20 + 10 * skill_lv) / 100;
 		break;
@@ -6391,6 +6398,9 @@ static const struct _battle_data {
 	{ "renewal_casting_square_debug",       &battle_config.renewal_casting_square_debug,    0,      0,      1,              },
 	{ "renewal_level_effect_skills",        &battle_config.renewal_level_effect_skills,     1,      0,      1,              },
 	{ "castrate_dex_scale_renewal_jobs",    &battle_config.castrate_dex_scale_renewal_jobs, 150,    1,      INT_MAX,        },
+	{ "cooldown_rate",                      &battle_config.cooldown_rate,                   100,    0,      INT_MAX,        },
+	{ "min_skill_cooldown_limit",           &battle_config.min_skill_cooldown_limit,        0,      0,      INT_MAX,        },
+	{ "no_skill_cooldown",                  &battle_config.no_skill_cooldown,               BL_MOB, BL_NUL, BL_ALL,         },
 	{ "max_parameter_renewal_jobs",         &battle_config.max_parameter_renewal_jobs,      130,    10,     10000,          },
 	{ "max_baby_parameter_renewal_jobs",    &battle_config.max_baby_parameter_renewal_jobs, 117,    10,     10000,          },
 	{ "renewal_stats_handling",             &battle_config.renewal_stats_handling,          1,      0,      1,              },

rewrite/src/map/battle.h

@@ -521,6 +521,9 @@ extern struct Battle_Config
 	int renewal_casting_square_debug;
 	int renewal_level_effect_skills;
 	int castrate_dex_scale_renewal_jobs;
+	int cooldown_rate;
+	int min_skill_cooldown_limit;
+	int no_skill_cooldown;
 	int max_parameter_renewal_jobs;
 	int max_baby_parameter_renewal_jobs;
 	int renewal_stats_handling;

rewrite/src/map/clif.c

@@ -4975,7 +4975,7 @@ static int clif_calc_walkdelay(struct block_list *bl,int delay, int type, int da
 /// Sends a 'damage' packet (src performs action on dst)
 /// 008a <src ID>.L <dst ID>.L <server tick>.L <src speed>.L <dst speed>.L <damage>.W <div>.W <type>.B <damage2>.W (ZC_NOTIFY_ACT)
 /// 02e1 <src ID>.L <dst ID>.L <server tick>.L <src speed>.L <dst speed>.L <damage>.L <div>.W <type>.B <damage2>.L (ZC_NOTIFY_ACT2)
-/// 08c8 <src ID>.L <dst ID>.L <server tick>.L <src speed>.L <dst speed>.L <damage>.L <IsSPDamage>.B <div>.W <type>.B <damage2>.L (ZC_NOTIFY_ACT3) (Not Coded In - Rytech)
+/// 08c8 <src ID>.L <dst ID>.L <server tick>.L <src speed>.L <dst speed>.L <damage>.L <IsSPDamage>.B <div>.W <type>.B <damage2>.L (ZC_NOTIFY_ACT3)
 ///	Types:
 ///     0 = ATTACK - damage [ damage: total damage, div: amount of hits, damage2: assassin dual-wield damage ]
 ///     1 = ITEMPICKUP - pick up item
@@ -4992,14 +4992,12 @@ static int clif_calc_walkdelay(struct block_list *bl,int delay, int type, int da
 ///    12 = TOUCHSKILL - (touch skill?)
 int clif_damage(struct block_list* src, struct block_list* dst, unsigned int tick, int sdelay, int ddelay, int damage, int div, int type, int damage2)
 {
-	unsigned char buf[34];
+	unsigned char buf[33];
 	struct status_change *sc;
 #if PACKETVER < 20071113
 	const int cmd = 0x8a;
-#elif PACKETVER < 20131223
-	const int cmd = 0x2e1;
 #else
-	const int cmd = 0x8c8;
+	const int cmd = 0x2e1;
 #endif
 
 	nullpo_ret(src);
@@ -5035,7 +5033,7 @@ int clif_damage(struct block_list* src, struct block_list* dst, unsigned int tic
 	}
 	WBUFW(buf,24)=div;
 	WBUFB(buf,26)=type;
-#elif PACKETVER < 20131223
+#else
 	if (battle_config.hide_woe_damage && map_flag_gvg(src->m))
 	{
 		WBUFL(buf,22)=damage?div:0;
@@ -5048,7 +5046,56 @@ int clif_damage(struct block_list* src, struct block_list* dst, unsigned int tic
 	}
 	WBUFW(buf,26)=div;
 	WBUFB(buf,28)=type;
+#endif
+	if(disguised(dst))
+	{
+		clif_send(buf,packet_len(cmd),dst,AREA_WOS);
+		WBUFL(buf,6) = -dst->id;
+		clif_send(buf,packet_len(cmd),dst,SELF);
+	}
+	else
+		clif_send(buf,packet_len(cmd),dst,AREA);
+
+	if(disguised(src))
+	{
+		WBUFL(buf,2) = -src->id;
+		if (disguised(dst))
+			WBUFL(buf,6) = dst->id;
+#if PACKETVER < 20071113
+		if(damage > 0) WBUFW(buf,22) = -1;
+		if(damage2 > 0) WBUFW(buf,27) = -1;
 #else
+		if(damage > 0) WBUFL(buf,22) = -1;
+		if(damage2 > 0) WBUFL(buf,29) = -1;
+#endif
+		clif_send(buf,packet_len(cmd),src,SELF);
+	}
+	//Return adjusted can't walk delay for further processing.
+	return clif_calc_walkdelay(dst,ddelay,type,damage+damage2,div);
+}
+
+/// Sends a 'damage' packet for sp damage (src performs action on dst)
+/// 08c8 <src ID>.L <dst ID>.L <server tick>.L <src speed>.L <dst speed>.L <damage>.L <IsSPDamage>.B <div>.W <type>.B <damage2>.L (ZC_NOTIFY_ACT3)
+///	Types:
+///     0 = ATTACK - damage [ damage: total damage, div: amount of hits, damage2: assassin dual-wield damage ]
+///     7 = ATTACK_REPEAT - (repeat damage?)
+///     8 = ATTACK_MULTIPLE - multi-hit damage
+///    10 = ATTACK_CRITICAL - critical hit
+int clif_spdamage(struct block_list* src, struct block_list* dst, unsigned int tick, int sdelay, int ddelay, int damage, int div, int type, int damage2)
+{
+	unsigned char buf[34];
+
+	nullpo_ret(src);
+	nullpo_ret(dst);
+
+	type = clif_calc_delay(type,div,damage+damage2,ddelay);
+
+	WBUFW(buf,0)=0x8c8;
+	WBUFL(buf,2)=src->id;
+	WBUFL(buf,6)=dst->id;
+	WBUFL(buf,10)=tick;
+	WBUFL(buf,14)=sdelay;
+	WBUFL(buf,18)=ddelay;
 	if (battle_config.hide_woe_damage && map_flag_gvg(src->m))
 	{
 		WBUFL(buf,22)=damage?div:0;
@@ -5059,35 +5106,27 @@ int clif_damage(struct block_list* src, struct block_list* dst, unsigned int tic
 		WBUFL(buf,22)=damage;
 		WBUFL(buf,30)=damage2;
 	}
-	WBUFB(buf,26)=0;// IsSPDamage - Displays blue digits. Need a way to handle this. [Rytech]
+	WBUFB(buf,26)=1;
 	WBUFW(buf,27)=div;
 	WBUFB(buf,29)=type;
-#endif
+
 	if(disguised(dst))
 	{
-		clif_send(buf,packet_len(cmd),dst,AREA_WOS);
+		clif_send(buf,packet_len(0x8c8),dst,AREA_WOS);
 		WBUFL(buf,6) = -dst->id;
-		clif_send(buf,packet_len(cmd),dst,SELF);
+		clif_send(buf,packet_len(0x8c8),dst,SELF);
 	}
 	else
-		clif_send(buf,packet_len(cmd),dst,AREA);
+		clif_send(buf,packet_len(0x8c8),dst,AREA);
 
 	if(disguised(src))
 	{
 		WBUFL(buf,2) = -src->id;
 		if (disguised(dst))
 			WBUFL(buf,6) = dst->id;
-#if PACKETVER < 20071113
-		if(damage > 0) WBUFW(buf,22) = -1;
-		if(damage2 > 0) WBUFW(buf,27) = -1;
-#elif PACKETVER < 20131223
-		if(damage > 0) WBUFL(buf,22) = -1;
-		if(damage2 > 0) WBUFL(buf,29) = -1;
-#else
 		if(damage > 0) WBUFL(buf,22) = -1;
 		if(damage2 > 0) WBUFL(buf,30) = -1;
-#endif
-		clif_send(buf,packet_len(cmd),src,SELF);
+		clif_send(buf,packet_len(0x8c8),src,SELF);
 	}
 	//Return adjusted can't walk delay for further processing.
 	return clif_calc_walkdelay(dst,ddelay,type,damage+damage2,div);
@@ -11232,6 +11271,7 @@ void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type,
 		sd->sc.data[SC_FALLENEMPIRE] || 
 		sd->sc.data[SC_CURSEDCIRCLE_ATKER] ||
 		sd->sc.data[SC_CURSEDCIRCLE_TARGET] ||
+		sd->sc.data[SC_GRAVITYCONTROL] ||
 		sd->sc.data[SC_SUHIDE]
 	))
 		return;
@@ -11568,6 +11608,7 @@ void clif_parse_TakeItem(int fd, struct map_session_data *sd)
 			(sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOITEM) ||
 			sd->sc.data[SC_CURSEDCIRCLE_TARGET] ||
 			sd->sc.data[SC_NEWMOON] ||
+			sd->sc.data[SC_GRAVITYCONTROL] ||
 			sd->sc.data[SC_SUHIDE])
 		)
 			break;

rewrite/src/map/clif.h

@@ -387,6 +387,7 @@ int clif_delitem(struct map_session_data*,int,int,short); //self
 int clif_updatestatus(struct map_session_data*,int);	//self
 int clif_changestatus(struct block_list*,int,int);	//area
 int clif_damage(struct block_list* src,struct block_list *dst,unsigned int tick,int sdelay,int ddelay,int damage,int div,int type,int damage2);	// area
+int clif_spdamage(struct block_list* src,struct block_list *dst,unsigned int tick,int sdelay,int ddelay,int damage,int div,int type,int damage2); // area
 void clif_takeitem(struct block_list* src,struct block_list* dst);
 void clif_sitting(struct block_list* bl, bool area);
 void clif_standing(struct block_list* bl, bool area);

rewrite/src/map/party.c

@@ -1029,7 +1029,7 @@ int party_sub_count(struct block_list *bl, va_list ap)
 int party_sub_count_banding(struct block_list *bl, va_list ap)
 {
 	struct map_session_data *sd = (TBL_PC *)bl;
-	unsigned char check_type = va_arg(ap,unsigned char);// 0 = Banding Count, 1 = HP Check, 2 = Max Rage Spheres On All
+	int check_type = va_arg(ap,int);// 0 = Banding Count, 1 = HP Check, 2 = Max Rage Spheres On All
 
 	if (sd->state.autotrade)
 		return 0;