* Some clean ups on autocast and itemskill code. (see topic:220921 for some info)

- Autocasted Teleport now skips the menu.
- Fixed nullpo info when defensive autocasts are triggered. (follow up to r13815)
- Fixed Warp portal used in item script never worked.
- Item skills now bypass skill delay check.
- Implemented SM_SELFPROVOKE. 
- Updated item db using 'itemskill' for some items.
* Basic skills will never be reset. 

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13841 54d463be-8e91-2dee-dedb-b68131a5f0ec

6 files changed, 62 insertions, 49 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index d24007de9..ba774497c 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9481,8 +9481,11 @@ void clif_parse_UseSkillToId(int fd, struct map_session_data *sd)
 	}
 	else if( DIFF_TICK(tick, sd->ud.canact_tick) < 0 )
 	{
-		clif_skill_fail(sd, skillnum, 4, 0);
-		return;
+		if( sd->skillitem != skillnum )
+		{
+			clif_skill_fail(sd, skillnum, 4, 0);
+			return;
+		}
 	}
 
 	if( sd->sc.option&(OPTION_WEDDING|OPTION_XMAS|OPTION_SUMMER) )
@@ -9490,7 +9493,7 @@ void clif_parse_UseSkillToId(int fd, struct map_session_data *sd)
 
 	if( sd->sc.data[SC_BASILICA] && (skillnum != HP_BASILICA || sd->sc.data[SC_BASILICA]->val4 != sd->bl.id) )
 		return; // On basilica only caster can use Basilica again to stop it.
-	
+
 	if( sd->menuskill_id )
 	{
 		if( sd->menuskill_id == SA_TAMINGMONSTER )
@@ -9604,8 +9607,11 @@ void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, short skil
 
 	if( DIFF_TICK(tick, sd->ud.canact_tick) < 0 )
 	{
-		clif_skill_fail(sd, skillnum, 4, 0);
-		return;
+		if( sd->skillitem != skillnum )
+		{
+			clif_skill_fail(sd, skillnum, 4, 0);
+			return;
+		}
 	}
 
 	if( sd->sc.option&(OPTION_WEDDING|OPTION_XMAS|OPTION_SUMMER) )
diff --git a/src/map/pc.c b/src/map/pc.c
index cbee0b000..0b658b90b 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -3487,10 +3487,7 @@ int pc_useitem(struct map_session_data *sd,int n)
 	//Since most delay-consume items involve using a "skill-type" target cursor,
 	//perform a skill-use check before going through. [Skotlex]
 	//resurrection was picked as testing skill, as a non-offensive, generic skill, it will do.
-	if (sd->inventory_data[n]->flag.delay_consume && (
-		sd->ud.skilltimer != -1 ||
-		DIFF_TICK(tick, sd->ud.canact_tick) < 0 ||
-		!status_check_skilluse(&sd->bl, &sd->bl, ALL_RESURRECTION, 0)))
+	if( sd->inventory_data[n]->flag.delay_consume && ( sd->ud.skilltimer != -1 || !status_check_skilluse(&sd->bl, &sd->bl, ALL_RESURRECTION, 0) ) )
 		return 0;
 
 	sd->itemid = sd->status.inventory[n].nameid;
@@ -5147,7 +5144,7 @@ int pc_resetskill(struct map_session_data* sd, int flag)
 		if( inf2&(INF2_WEDDING_SKILL|INF2_SPIRIT_SKILL) ) //Avoid reseting wedding/linker skills.
 			continue;
 		
-		 // Don't reset trick dead if not a novice/baby
+		// Don't reset trick dead if not a novice/baby
 		if( i == NV_TRICKDEAD && (sd->class_&MAPID_UPPERMASK) != MAPID_NOVICE && (sd->class_&MAPID_UPPERMASK) != MAPID_BABY )
 		{
 			sd->status.skill[i].lv = 0;
@@ -5155,6 +5152,13 @@ int pc_resetskill(struct map_session_data* sd, int flag)
 			continue;
 		}
 
+		if( i == NV_BASIC && (sd->class_&MAPID_UPPERMASK) != MAPID_NOVICE && (sd->class_&MAPID_UPPERMASK) != MAPID_BABY )
+		{ // Official server does not include Basic Skill to be resetted. [Jobbie]
+			sd->status.skill[i].lv = 9;
+			sd->status.skill[i].flag = 0;
+			continue;
+		}
+
 		if( inf2&INF2_QUEST_SKILL && !battle_config.quest_skill_learn )
 		{ //Only handle quest skills in a special way when you can't learn them manually
 			if( battle_config.quest_skill_reset && !(flag&2) )
diff --git a/src/map/pc.h b/src/map/pc.h
index 3b4ae9193..ea8a13dec 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -96,6 +96,7 @@ struct map_session_data {
 		unsigned snovice_call_flag : 2; //Summon Angel (stage 1~3)
 		unsigned snovice_dead_flag : 1; //Explosion spirits on death: 0 off, 1 used.
 		unsigned abra_flag : 1; // Abracadabra bugfix by Aru
+		unsigned autocast : 1; // Autospell flag [Inkfish]
 		unsigned autotrade : 1;	//By Fantik
 		unsigned reg_dirty : 3; //By Skotlex (marks whether registry variables have been saved or not yet)
 		unsigned showdelay :1;
diff --git a/src/map/skill.c b/src/map/skill.c
index a55ba6339..bcd25556d 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1008,7 +1008,8 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int
 			else
 				tbl = bl;
 
-			skill_consume_requirement(sd,skill,skilllv,2); // Autocasts don't consume sp
+			sd->state.autocast = 1;
+			skill_consume_requirement(sd,skill,skilllv,1);
 			switch (skill_get_casttype(skill)) {
 				case CAST_GROUND:
 					skill_castend_pos2(src, tbl->x, tbl->y, skill, skilllv, tick, 0);
@@ -1020,6 +1021,7 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int
 					skill_castend_damage_id(src, tbl, skill, skilllv, tick, 0);
 					break;
 			}
+			sd->state.autocast = 0;
 			//Set canact delay. [Skotlex]
 			ud = unit_bl2ud(src);
 			if (ud) {
@@ -1030,7 +1032,6 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int
 						clif_status_change(src, SI_ACTIONDELAY, 1, rate);
 				}
 			}
-			//break; //Only one auto skill comes off at a time.
 		}
 	}
 
@@ -1106,13 +1107,15 @@ int skill_onskillusage(struct map_session_data *sd, struct block_list *bl, int s
 		else
 			tbl = bl;
 
+		sd->state.autocast = 1;
+		skill_consume_requirement(sd,skill,skilllv,1);
 		switch( skill_get_casttype(skill) )
 		{
 			case CAST_GROUND:   skill_castend_pos2(&sd->bl, tbl->x, tbl->y, skill, skilllv, tick, 0); break;
 			case CAST_NODAMAGE: skill_castend_nodamage_id(&sd->bl, tbl, skill, skilllv, tick, 0); break;
 			case CAST_DAMAGE:   skill_castend_damage_id(&sd->bl, tbl, skill, skilllv, tick, 0); break;
 		}
-		//break;
+		sd->state.autocast = 0;
 	}
 
 	if( sd->autoscript3[0].script )
@@ -1263,7 +1266,8 @@ int skill_counter_additional_effect (struct block_list* src, struct block_list *
 			else
 				tbl = src;
 
-			skill_consume_requirement(sd,skillid,skilllv,2); // Autocasts don't consume sp
+			dstsd->state.autocast = 1;
+			skill_consume_requirement(dstsd,skillid,skilllv,1);
 			switch (skill_get_casttype(skillid)) {
 				case CAST_GROUND:
 					skill_castend_pos2(bl, tbl->x, tbl->y, skillid, skilllv, tick, 0);
@@ -1275,6 +1279,7 @@ int skill_counter_additional_effect (struct block_list* src, struct block_list *
 					skill_castend_damage_id(bl, tbl, skillid, skilllv, tick, 0);
 					break;
 			}
+			dstsd->state.autocast = 0;
 			//Set canact delay. [Skotlex]
 			ud = unit_bl2ud(bl);
 			if (ud) {
@@ -1285,7 +1290,6 @@ int skill_counter_additional_effect (struct block_list* src, struct block_list *
 						clif_status_change(bl, SI_ACTIONDELAY, 1, rate);
 				}
 			}
-			//break; //trigger only one auto-spell per hit.
 		}
 	}
 	//Auto-script when attacked
@@ -3077,7 +3081,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
 			battle_consume_ammo(sd, skillid, skilllv);
 		if( !sd->state.skillonskill )
 			skill_onskillusage(sd, bl, skillid, tick);
-		skill_consume_requirement(sd,skillid,skilllv,4);
+		skill_consume_requirement(sd,skillid,skilllv,2);
 	}
 
 	return 0;
@@ -3750,6 +3754,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 		break;
 
 	case SM_PROVOKE:
+	case SM_SELFPROVOKE:
 	case MER_PROVOKE:
 		if( (tstatus->mode&MD_BOSS) || battle_check_undead(tstatus->race,tstatus->def_ele) )
 		{
@@ -3758,7 +3763,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 		}
 		//TODO: How much does base level affects? Dummy value of 1% per level difference used. [Skotlex]
 		clif_skill_nodamage(src,bl,skillid,skilllv,
-			(i = sc_start(bl,type, 50 + 3*skilllv + status_get_lv(src) - status_get_lv(bl), skilllv, skill_get_time(skillid,skilllv))));
+			(i = sc_start(bl,type, skillid == SM_SELFPROVOKE ? 100:( 50 + 3*skilllv + status_get_lv(src) - status_get_lv(bl)), skilllv, skill_get_time(skillid,skilllv))));
 		if( !i )
 		{
 			if( sd )
@@ -4365,24 +4370,21 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 				clif_displaymessage(sd->fd, "Duel: Can't use teleport in duel.");
 				break;
 			}
-			clif_skill_nodamage(src,bl,skillid,skilllv,1);
 
-			// FIXME: Before r13836, sd->skillitem was never equal to AL_TELEPORT!! So, I don't know what was intened to do. 
-			// Now, Teleport thru items won't show the menu but normal casted and autocasted will. [Inkfish]
-			if( skilllv == 1 )
+			if( sd->state.autocast || sd->skillitem == AL_TELEPORT || battle_config.skip_teleport_lv1_menu || skilllv > 2 )
 			{
-				if( !battle_config.skip_teleport_lv1_menu && sd->skillitem != AL_TELEPORT ) // possibility to skip menu [LuzZza]
-					clif_skill_warppoint(sd,skillid,skilllv, (unsigned short)-1,0,0,0);
-				else
+				if( skilllv == 1 )
 					pc_randomwarp(sd,3);
-			}
-			else
-			{
-				if( sd->skillitem != AL_TELEPORT )
-					clif_skill_warppoint(sd,skillid,skilllv, (unsigned short)-1,sd->status.save_point.map,0,0);
-				else //Autocasted Teleport level 2??
+				else
 					pc_setpos(sd,sd->status.save_point.map,sd->status.save_point.x,sd->status.save_point.y,3);
+				break;
 			}
+
+			clif_skill_nodamage(src,bl,skillid,skilllv,1);
+			if( skilllv == 1 )
+				clif_skill_warppoint(sd,skillid,skilllv, (unsigned short)-1,0,0,0);
+			else
+				clif_skill_warppoint(sd,skillid,skilllv, (unsigned short)-1,sd->status.save_point.map,0,0);
 		} else
 			unit_warp(bl,-1,-1,-1,3);
 		break;
@@ -5634,7 +5636,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 			battle_consume_ammo(sd, skillid, skilllv);
 		if( !sd->state.skillonskill )
 			skill_onskillusage(sd, bl, skillid, tick);
-		skill_consume_requirement(sd,skillid,skilllv,4);
+		skill_consume_requirement(sd,skillid,skilllv,2);
 	}
 
 	map_freeblock_unlock();
@@ -5793,7 +5795,7 @@ int skill_castend_id(int tid, unsigned int tick, int id, intptr data)
 			if (sd) {
 				clif_skill_fail(sd,ud->skillid,0,0);
 				if(battle_config.skill_out_range_consume) //Consume items anyway. [Skotlex]
-					skill_consume_requirement(sd,ud->skillid,ud->skilllv,7);
+					skill_consume_requirement(sd,ud->skillid,ud->skilllv,3);
 			}
 			break;
 		}
@@ -5803,7 +5805,7 @@ int skill_castend_id(int tid, unsigned int tick, int id, intptr data)
 			if( !skill_check_condition_castend(sd, ud->skillid, ud->skilllv) )
 				break;
 			else
-				skill_consume_requirement(sd,ud->skillid,ud->skilllv,3);
+				skill_consume_requirement(sd,ud->skillid,ud->skilllv,1);
 		}
 
 		if( (src->type == BL_MER || src->type == BL_HOM) && !skill_check_condition_mercenary(src, ud->skillid, ud->skilllv, 1) )
@@ -5862,7 +5864,7 @@ int skill_castend_id(int tid, unsigned int tick, int id, intptr data)
 				sc->data[SC_SPIRIT]->val3 = 0; //Clear bounced spell check.
 		}
 
-		if( sd && sd->skillitem == ud->skillid )
+		if( sd && ud->skillid != SA_ABRACADABRA ) // Hocus-Pocus has just set the data so leave it as it is.[Inkfish]
 			sd->skillitem = sd->skillitemlv = 0;
 
 		if (ud->skilltimer == -1) {
@@ -5878,7 +5880,7 @@ int skill_castend_id(int tid, unsigned int tick, int id, intptr data)
 	if (ud->skillid == MO_EXTREMITYFIST && sd && !(sc && sc->data[SC_FOGWALL]))
   	{	//When Asura fails... (except when it fails from Fog of Wall)
 		//Consume SP/spheres
-		skill_consume_requirement(sd,ud->skillid, ud->skilllv,3);
+		skill_consume_requirement(sd,ud->skillid, ud->skilllv,1);
 		status_set_sp(src, 0, 0);
 		sc = &sd->sc;
 		if (sc->count)
@@ -5996,7 +5998,7 @@ int skill_castend_pos(int tid, unsigned int tick, int id, intptr data)
 			if(battle_config.skill_add_range &&
 				!check_distance_blxy(src, ud->skillx, ud->skilly, skill_get_range2(src,ud->skillid,ud->skilllv)+battle_config.skill_add_range)) {
 				if (sd && battle_config.skill_out_range_consume) //Consume items anyway.
-					skill_consume_requirement(sd,ud->skillid,ud->skilllv,7);
+					skill_consume_requirement(sd,ud->skillid,ud->skilllv,3);
 				break;
 			}
 		}
@@ -6006,7 +6008,7 @@ int skill_castend_pos(int tid, unsigned int tick, int id, intptr data)
 			if( !skill_check_condition_castend(sd, ud->skillid, ud->skilllv) )
 				break;
 			else
-				skill_consume_requirement(sd,ud->skillid,ud->skilllv,3);
+				skill_consume_requirement(sd,ud->skillid,ud->skilllv,1);
 		}
 
 		if( (src->type == BL_MER || src->type == BL_HOM) && !skill_check_condition_mercenary(src, ud->skillid, ud->skilllv, 1) )
@@ -6040,7 +6042,7 @@ int skill_castend_pos(int tid, unsigned int tick, int id, intptr data)
 		map_freeblock_lock();
 		skill_castend_pos2(src,ud->skillx,ud->skilly,ud->skillid,ud->skilllv,tick,0);
 
-		if( sd && sd->skillitem == ud->skillid )
+		if( sd && sd->skillitem != AL_WARP ) // Warp-Portal thru items will clear data in skill_castend_map. [Inkfish]
 			sd->skillitem = sd->skillitemlv = 0;
 
 		if (ud->skilltimer == -1) {
@@ -6480,7 +6482,7 @@ int skill_castend_pos2(struct block_list* src, int x, int y, int skillid, int sk
 			battle_consume_ammo(sd, skillid, skilllv);
 		if( !sd->state.skillonskill )
 			skill_onskillusage(sd, NULL, skillid, tick);
-		skill_consume_requirement(sd,skillid,skilllv,4);
+		skill_consume_requirement(sd,skillid,skilllv,2);
 	}
 
 	return 0;
@@ -6573,8 +6575,7 @@ int skill_castend_map (struct map_session_data *sd, short skill_num, const char
 				}
 			}
 
-			//When it's an item-used warp-portal, the skill-lv used is lost.. assume max level.
-			lv = sd->skillitem==skill_num?skill_get_max(skill_num):pc_checkskill(sd,skill_num);
+			lv = sd->skillitem==skill_num?sd->skillitemlv:pc_checkskill(sd,skill_num);
 			wx = sd->menuskill_val>>16;
 			wy = sd->menuskill_val&0xffff;
 
@@ -6597,7 +6598,8 @@ int skill_castend_map (struct map_session_data *sd, short skill_num, const char
 				return 0;
 			}
 
-			skill_consume_requirement(sd,sd->menuskill_id,lv,4);
+			skill_consume_requirement(sd,sd->menuskill_id,lv,2);
+			sd->skillitem = sd->skillitemlv = 0; // Clear data that's skipped in 'skill_castend_pos' [Inkfish]
 
 			if((group=skill_unitsetting(&sd->bl,skill_num,lv,wx,wy,0))==NULL) {
 				skill_failed(sd);
@@ -8670,6 +8672,8 @@ int skill_check_condition_castend(struct map_session_data* sd, short skill, shor
 	return 1;
 }
 
+// type&2: consume items (after skill was used)
+// type&1: consume the others (before skill was used)
 int skill_consume_requirement( struct map_session_data *sd, short skill, short lv, short type)
 {
 	int n,i;
@@ -8681,14 +8685,11 @@ int skill_consume_requirement( struct map_session_data *sd, short skill, short l
 
 	if( type&1 )
 	{
-		if( skill == CG_TAROTCARD )
-			req.sp = 0; // sp will be consumed in skill_cast_nodamage_id [Inkfish]
+		if( skill == CG_TAROTCARD || sd->state.autocast )
+			req.sp = 0; // TarotCard will consume sp in skill_cast_nodamage_id [Inkfish]
 		if(req.hp || req.sp)
 			status_zap(&sd->bl, req.hp, req.sp);
-	}
 
-	if( type&2 )
-	{
 		if(req.spiritball > 0)
 			pc_delspiritball(sd,req.spiritball,0);
 
@@ -8702,7 +8703,7 @@ int skill_consume_requirement( struct map_session_data *sd, short skill, short l
 		}
 	}
 
-	if( type&4 )
+	if( type&2 )
 	{
 		struct status_change *sc = &sd->sc;
 
diff --git a/src/map/status.c b/src/map/status.c
index df1706cb0..0b89ba5a9 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -341,6 +341,7 @@ void initChangeTables(void)
 	set_sc( SL_SKE               , SC_SKE             , SI_BLANK           , SCB_BATK|SCB_WATK|SCB_DEF|SCB_DEF2 );
 	set_sc( SL_SKA               , SC_SKA             , SI_BLANK           , SCB_DEF|SCB_MDEF|SCB_ASPD );
 	set_sc( SL_SMA               , SC_SMA             , SI_SMA             , SCB_NONE );
+	set_sc( SM_SELFPROVOKE       , SC_PROVOKE         , SI_PROVOKE         , SCB_DEF|SCB_DEF2|SCB_BATK|SCB_WATK );
 	set_sc( ST_PRESERVE          , SC_PRESERVE        , SI_PRESERVE        , SCB_NONE );
 	set_sc( PF_DOUBLECASTING     , SC_DOUBLECAST      , SI_DOUBLECAST      , SCB_NONE );
 	set_sc( HW_GRAVITATION       , SC_GRAVITATION     , SI_BLANK           , SCB_ASPD );
diff --git a/src/map/unit.c b/src/map/unit.c
index 05bfa1b50..9e7d813dc 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -951,7 +951,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh
 		if (!skill_check_condition_castbegin(sd, skill_num, skill_lv))
 			return 0;
 	}
-	//TODO: Add type-independant skill_check_condition function.
+
 	if( src->type == BL_MOB )
 		switch( skill_num )
 		{