Fix Bug # 7049

Added new item bonuses bFixedCast, bVariableCast & bFixedCastrate. (see
'doc/item_bonus.txt' for info)
Added new conf for max walk path.(Bug Report # 7042)

http://hercules.ws/board/tracker/issue-7049-do-we-need-new-bonus/?gopid=16578#entry16578

9 files changed, 66 insertions, 7 deletions

diff --git a/src/map/battle.c b/src/map/battle.c
index 0506f2fe9..f9748833f 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -5868,6 +5868,7 @@ static const struct _battle_data {
 	 **/
 	{ "skill_trap_type",                    &battle_config.skill_trap_type,                 0,      0,      1,              },
 	{ "item_restricted_consumption_type",   &battle_config.item_restricted_consumption_type,1,      0,      1,              },
+	{ "max_walk_path",						&battle_config.max_walk_path,					17,     1,      MAX_WALKPATH,   },
 };
 #ifndef STATS_OPT_OUT
 /**
diff --git a/src/map/battle.h b/src/map/battle.h
index c5ca19b90..6586f4561 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -485,6 +485,7 @@ extern struct Battle_Config
 	int mob_size_influence; // Enable modifications on earned experience, drop rates and monster status depending on monster size. [mkbu95]
 	int skill_trap_type;
 	int item_restricted_consumption_type;
+	int max_walk_path;
 } battle_config;
 
 void do_init_battle(void);
diff --git a/src/map/map.h b/src/map/map.h
index 86d936972..bb0bccf2c 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -406,7 +406,7 @@ enum _sp {
 	SP_ADD_SKILL_BLOW, SP_SP_VANISH_RATE, SP_MAGIC_SP_GAIN_VALUE, SP_MAGIC_HP_GAIN_VALUE, SP_ADD_CLASS_DROP_ITEM, //2041-2045
 	SP_EMATK, SP_SP_GAIN_RACE_ATTACK, SP_HP_GAIN_RACE_ATTACK, SP_SKILL_USE_SP_RATE, //2046-2049
 	SP_SKILL_COOLDOWN,SP_SKILL_FIXEDCAST, SP_SKILL_VARIABLECAST, SP_FIXCASTRATE, SP_VARCASTRATE, //2050-2054
-	SP_SKILL_USE_SP,SP_MAGIC_ATK_ELE  //2055-2056
+	SP_SKILL_USE_SP,SP_MAGIC_ATK_ELE, SP_ADD_FIXEDCAST, SP_ADD_VARIABLECAST  //2055-2058
 };
 
 enum _look {
diff --git a/src/map/pc.c b/src/map/pc.c
index 4fb555d0f..6e24d7d49 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -2591,11 +2591,22 @@ int pc_bonus(struct map_session_data *sd,int type,int val)
 		if(sd->state.lr_flag != 2)
 			sd->bonus.fixcastrate -= val;
 		break;
+	case SP_ADD_FIXEDCAST:
+		if(sd->state.lr_flag != 2)
+			sd->bonus.add_fixcast += val;
+
+		break;
 #ifdef RENEWAL_CAST
 	case SP_VARCASTRATE:
 		if(sd->state.lr_flag != 2)
 			sd->bonus.varcastrate -= val;
 		break;
+	case SP_ADD_VARIABLECAST:
+		if(sd->state.lr_flag != 2)
+
+			sd->bonus.add_varcast += val;
+
+		break;
 #endif
 	default:
 		ShowWarning("pc_bonus: unknown type %d %d !\n",type,val);
@@ -2953,7 +2964,15 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val)
 		ARR_FIND(0, ARRAYLENGTH(sd->skillcast), i, sd->skillcast[i].id == 0 || sd->skillcast[i].id == type2);
 		if (i == ARRAYLENGTH(sd->skillcast))
 		{	//Better mention this so the array length can be updated. [Skotlex]
-			ShowDebug("run_script: bonus2 bCastRate reached it's limit (%d skills per character), bonus skill %d (+%d%%) lost.\n", ARRAYLENGTH(sd->skillcast), type2, val);
+			ShowDebug("run_script: bonus2 %s reached it's limit (%d skills per character), bonus skill %d (+%d%%) lost.\n",
+
+#ifndef RENEWAL_CAST
+				"bCastRate",
+#else
+				"bVariableCastrate",
+#endif
+
+				ARRAYLENGTH(sd->skillcast), type2, val);
 			break;
 		}
 		if(sd->skillcast[i].id == type2)
@@ -2964,6 +2983,30 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val)
 		}
 		break;
 
+	case SP_FIXCASTRATE:
+		if(sd->state.lr_flag == 2)
+			break;
+
+		ARR_FIND(0, ARRAYLENGTH(sd->skillfixcastrate), i, sd->skillfixcastrate[i].id == 0 || sd->skillfixcastrate[i].id == type2);
+
+		if (i == ARRAYLENGTH(sd->skillfixcastrate))
+
+		{
+
+			ShowDebug("run_script: bonus2 bFixedCastrate reached it's limit (%d skills per character), bonus skill %d (+%d%%) lost.\n", ARRAYLENGTH(sd->skillfixcastrate), type2, val);
+			break;
+		}
+
+		if(sd->skillfixcastrate[i].id == type2)
+			sd->skillfixcastrate[i].val += val;
+
+		else {
+			sd->skillfixcastrate[i].id = type2;
+			sd->skillfixcastrate[i].val = val;
+		}
+
+		break;
+
 	case SP_HP_LOSS_RATE:
 		if(sd->state.lr_flag != 2) {
 			sd->hp_loss.value = type2;
diff --git a/src/map/pc.h b/src/map/pc.h
index 870945d73..ac1950a69 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -263,7 +263,7 @@ struct map_session_data {
 	struct { //skillatk raises bonus dmg% of skills, skillheal increases heal%, skillblown increases bonus blewcount for some skills.
 		unsigned short id;
 		short val;
-	} skillatk[MAX_PC_BONUS], skillusesprate[MAX_PC_BONUS], skillusesp[MAX_PC_BONUS], skillheal[5], skillheal2[5], skillblown[MAX_PC_BONUS], skillcast[MAX_PC_BONUS], skillcooldown[MAX_PC_BONUS], skillfixcast[MAX_PC_BONUS], skillvarcast[MAX_PC_BONUS];
+	} skillatk[MAX_PC_BONUS], skillusesprate[MAX_PC_BONUS], skillusesp[MAX_PC_BONUS], skillheal[5], skillheal2[5], skillblown[MAX_PC_BONUS], skillcast[MAX_PC_BONUS], skillcooldown[MAX_PC_BONUS], skillfixcast[MAX_PC_BONUS], skillvarcast[MAX_PC_BONUS], skillfixcastrate[MAX_PC_BONUS];
 	struct {
 		short value;
 		int rate;
@@ -320,6 +320,7 @@ struct map_session_data {
 		unsigned short unbreakable_equip; //100% break resistance on certain equipment
 		unsigned short unstripable_equip;
 		int fixcastrate,varcastrate;
+		int add_fixcast,add_varcast;
 		int ematk; // matk bonus from equipment
 //		int eatk; // atk bonus from equipment
 	} bonus;
diff --git a/src/map/script.c b/src/map/script.c
index 60a61654a..0b649f990 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -7860,6 +7860,7 @@ BUILDIN_FUNC(bonus)
 		case SP_SKILL_FIXEDCAST:
 		case SP_SKILL_VARIABLECAST:
 		case SP_VARCASTRATE:
+		case SP_FIXCASTRATE:
 		case SP_SKILL_USE_SP:
 			// these bonuses support skill names
 			val1 = ( script_isstring(st,3) ? skill_name2id(script_getstr(st,3)) : script_getnum(st,3) );
diff --git a/src/map/skill.c b/src/map/skill.c
index 9c07390f3..2cc3ed1ab 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -13819,6 +13819,10 @@ int skill_vfcastfix (struct block_list *bl, double time, uint16 skill_id, uint16
 	if(sd  && !(skill_get_castnodex(skill_id, skill_lv)&4) ){ // Increases/Decreases fixed/variable cast time of a skill by item/card bonuses.
 		if( sd->bonus.varcastrate < 0 )
 			VARCAST_REDUCTION(sd->bonus.varcastrate);
+		if( sd->bonus.add_varcast != 0 ) // bonus bVariableCast
+			time += sd->bonus.add_varcast; 
+		if( sd->bonus.add_fixcast != 0 ) // bonus bFixedCast
+			fixed += sd->bonus.add_fixcast; 
 		for (i = 0; i < ARRAYLENGTH(sd->skillfixcast) && sd->skillfixcast[i].id; i++)
 			if (sd->skillfixcast[i].id == skill_id){ // bonus2 bSkillFixedCast
 				fixed += sd->skillfixcast[i].val;
@@ -13835,6 +13839,12 @@ int skill_vfcastfix (struct block_list *bl, double time, uint16 skill_id, uint16
 					VARCAST_REDUCTION(i);
 				break;
 			}
+		for( i = 0; i < ARRAYLENGTH(sd->skillfixcastrate) && sd->skillfixcastrate[i].id; i++ )
+
+			if( sd->skillfixcastrate[i].id == skill_id ){ // bonus2 bFixedCastrate
+				fixcast_r = sd->skillfixcastrate[i].val; // just speculation
+				break;
+			}
 	}
 
 	if (sc && sc->count && !(skill_get_castnodex(skill_id, skill_lv)&2) ) {
diff --git a/src/map/status.c b/src/map/status.c
index 7840a7a7f..8fd48aefc 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1,4 +1,4 @@
-// Copyright (c) Hercules dev team, licensed under GNU GPL.
+// Copyright (c) Hercules dev team, licensed under GNU GPL.
 // See the LICENSE file
 // Portions Copyright (c) Athena dev team
 
@@ -2416,6 +2416,7 @@ int status_calc_pc_(struct map_session_data* sd, bool first)
 		+ sizeof(sd->skillcooldown)
 		+ sizeof(sd->skillfixcast)
 		+ sizeof(sd->skillvarcast)
+		+ sizeof(sd->skillfixcastrate)
 	);
 
 	memset (&sd->bonus, 0,sizeof(sd->bonus));
diff --git a/src/map/unit.c b/src/map/unit.c
index e901d3138..fca406e5f 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -315,21 +315,22 @@ int unit_walktoxy( struct block_list *bl, short x, short y, int flag)
 {
 	struct unit_data* ud = NULL;
 	struct status_change* sc = NULL;
-#ifdef OFFICIAL_WALKPATH
 	struct walkpath_data wpd;
-#endif
+
 	nullpo_ret(bl);
 
 	ud = unit_bl2ud(bl);
 
 	if( ud == NULL) return 0;
 
-#ifdef OFFICIAL_WALKPATH
 	path_search(&wpd, bl->m, bl->x, bl->y, x, y, flag&1, CELL_CHKNOPASS); // Count walk path cells
+#ifdef OFFICIAL_WALKPATH
 	if( !path_search_long(NULL, bl->m, bl->x, bl->y, x, y, CELL_CHKNOPASS) // Check if there is an obstacle between
 		&& wpd.path_len > 14 ) // Official number of walkable cells is 14 if and only if there is an obstacle between. [malufett]
 		return 0;
 #endif
+	if( battle_config.max_walk_path < wpd.path_len )
+		return 0;
 
 	if (flag&4 && DIFF_TICK(ud->canmove_tick, gettick()) > 0 &&
 		DIFF_TICK(ud->canmove_tick, gettick()) < 2000)