- Corrected skill_check_condition to not delete items right away for certain skills that do the deletion themselves. Fixes several skills consuming items twice.

- Dispel's success rate is no longer affected by MDEF
- You are no longer blocked from being warped when standing in a warp while in a duel.
- Duels are now automatically ended when you warp out of the map you are in.


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

4 files changed, 47 insertions, 38 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index e4d6a67a4..8ebade1dd 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,14 @@ 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/11/28
+	* Corrected skill_check_condition to not delete items right away for
+	  certain skills that do the deletion themselves. Fixes several skills
+	  consuming items twice.
+	* Dispel's success rate is no longer affected by MDEF
+	* You are no longer blocked from being warped when standing in a warp while
+	  in a duel.
+	* Duels are now automatically ended when you warp out of the map you are
+	  in. [Skotlex]
 	* Fixed reflected spells bypassing WoE no-knockback restriction, because
 	  the code allowed that when cast on self; not anymore (bugreport:231)
 	* Reverted the position of the max_hp/max_sp basic setting, modified the
diff --git a/src/map/npc.c b/src/map/npc.c
index 12d8f0e9b..7b44c4afa 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -751,8 +751,7 @@ int npc_touch_areanpc(struct map_session_data* sd, int m, int x, int y)
 	switch(map[m].npc[i]->subtype) {
 		case WARP:
 			// hidden chars cannot use warps -- is it the same for scripts too?
-			if (sd->sc.option&(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK) ||
-				(!battle_config.duel_allow_teleport && sd->duel_group)) // duel rstrct [LuzZza]
+			if (sd->sc.option&(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK))
 				break;
 			pc_setpos(sd,map[m].npc[i]->u.warp.mapindex,map[m].npc[i]->u.warp.x,map[m].npc[i]->u.warp.y,0);
 			break;
diff --git a/src/map/skill.c b/src/map/skill.c
index f31c5941e..142764794 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1880,8 +1880,7 @@ static int skill_check_condition_hom (struct homun_data *hd, int skill, int lv,
 	struct status_data *status;
 	TBL_PC * sd;
 	int i,j,hp,sp,hp_rate,sp_rate,state,mhp ;
-	int itemid[10],amount[10];
-	int delitem_flag = 1;
+	int itemid[10],amount[ARRAYLENGTH(itemid)],index[ARRAYLENGTH(itemid)];
 	
 	nullpo_retr(0, hd);
 	sd = hd->master;
@@ -1954,31 +1953,26 @@ static int skill_check_condition_hom (struct homun_data *hd, int skill, int lv,
 	if(!(type&1))
 		return 1;
 
-	if( delitem_flag )
+	// Check items and reduce required amounts
+	for( i = 0; i < ARRAYLENGTH(itemid); ++i )
 	{
-		int index[ARRAYLENGTH(itemid)];
+		index[i] = -1;
+		if(itemid[i] <= 0)
+			continue;// no item
 
-		// Check items and reduce required amounts
-		for( i = 0; i < ARRAYLENGTH(itemid); ++i )
+		index[i] = pc_search_inventory(sd,itemid[i]);
+		if(index[i] < 0 || sd->status.inventory[index[i]].amount < amount[i])
 		{
-			index[i] = -1;
-			if(itemid[i] <= 0)
-				continue;// no item
-
-			index[i] = pc_search_inventory(sd,itemid[i]);
-			if(index[i] < 0 || sd->status.inventory[index[i]].amount < amount[i])
-			{
-				clif_skill_fail(sd,skill,0,0);
-				return 0;
-			}
+			clif_skill_fail(sd,skill,0,0);
+			return 0;
 		}
+	}
 
-		// Consume items
-		for( i = 0; i < ARRAYLENGTH(itemid); ++i )
-		{
-			if(index[i] >= 0)
-				pc_delitem(sd,index[i],amount[i],0);
-		}
+	// Consume items
+	for( i = 0; i < ARRAYLENGTH(itemid); ++i )
+	{
+		if(index[i] >= 0)
+			pc_delitem(sd,index[i],amount[i],0);
 	}
 
 	if(type&2)
@@ -4169,12 +4163,9 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 		if (flag&1 || (i = skill_get_splash(skillid, skilllv)) < 1)
 		{
 			clif_skill_nodamage(src,bl,skillid,skilllv,1);
-			i = tstatus->mdef;
-			if (i >= 100 ||
-				(dstsd && (dstsd->class_&MAPID_UPPERMASK) == MAPID_SOUL_LINKER) ||
-				tsc == NULL || (tsc->data[SC_SPIRIT] && tsc->data[SC_SPIRIT]->val2 == SL_ROGUE) || //Rogue's spirit defends againt dispel.
-			//Fixed & changed to use a proportionnal reduction (no info, but seems far more logical) [DracoRPG]
-				rand()%100 >= (100-i)*(50+10*skilllv)/100)
+			if((dstsd && (dstsd->class_&MAPID_UPPERMASK) == MAPID_SOUL_LINKER)
+				|| (tsc && tsc->data[SC_SPIRIT] && tsc->data[SC_SPIRIT]->val2 == SL_ROGUE) //Rogue's spirit defends againt dispel.
+				|| rand()%100 >= 50+10*skilllv)
 			{
 				if (sd)
 					clif_skill_fail(sd,skillid,0,0);
@@ -7447,7 +7438,7 @@ int skill_check_condition(struct map_session_data* sd, short skill, short lv, in
 	struct status_change *sc;
 	int i,j,hp,sp,hp_rate,sp_rate,zeny,weapon,ammo,ammo_qty,state,spiritball,mhp;
 	int itemid[10],amount[10];
-	int delitem_flag = 1;
+	char item_flag = 2; //0 - no item checking. 1 - only check if you have items. 2 - check and delete
 
 	nullpo_retr(0, sd);
 
@@ -7638,7 +7629,7 @@ int skill_check_condition(struct map_session_data* sd, short skill, short lv, in
 
 	case AL_WARP:
 		if(!(type&2)) //Delete the item when the portal has been selected (type&2). [Skotlex]
-			delitem_flag = 0;
+			item_flag = 1;
 		if(!battle_config.duel_allow_teleport && sd->duel_group) { // duel restriction [LuzZza]
 			clif_displaymessage(sd->fd, "Duel: Can't use warp in duel.");
 			return 0;
@@ -7821,6 +7812,17 @@ int skill_check_condition(struct map_session_data* sd, short skill, short lv, in
 		if(!(sc && sc->data[SC_COMBO] && sc->data[SC_COMBO]->val1 == skill))
 			return 0;
 		break;
+	case AM_BERSERKPITCHER:
+	case AM_POTIONPITCHER:
+	case CR_SLIMPITCHER:
+	case MG_STONECURSE:
+	case CR_CULTIVATION:
+	case SA_FLAMELAUNCHER:
+	case SA_FROSTWEAPON:
+	case SA_LIGHTNINGLOADER:
+	case SA_SEISMICWEAPON:
+		item_flag = 1;
+		break;
 	case SA_DELUGE:
 	case SA_VOLCANO:
 	case SA_VIOLENTGALE:
@@ -7833,7 +7835,7 @@ int skill_check_condition(struct map_session_data* sd, short skill, short lv, in
 			sg->skill_id == SA_VIOLENTGALE
 		)) {
 			if (sg->limit - DIFF_TICK(gettick(), sg->tick) > 0)
-				delitem_flag = 0;
+				item_flag = 0;
 			else
 				sg->limit = 0; //Disable it.
 		}
@@ -7966,7 +7968,7 @@ int skill_check_condition(struct map_session_data* sd, short skill, short lv, in
 			return 0;
 		}
 		if (sd->status.hom_id) //Don't delete items when hom is already out.
-			delitem_flag = 0;
+			item_flag = 0;
 		break;
 	case AM_REST: //Can't vapo homun if you don't have an active homunc or it's hp is < 80%
 		if (!merc_is_hom_active(sd->hd) || sd->hd->battle_status.hp < (sd->hd->battle_status.max_hp*80/100))
@@ -8104,7 +8106,7 @@ int skill_check_condition(struct map_session_data* sd, short skill, short lv, in
 	if(!(type&1))
 		return 1; // consumption only happens on cast-end
 
-	if( delitem_flag )
+	if( item_flag )
 	{
 		int index[ARRAYLENGTH(itemid)];
 
@@ -8146,6 +8148,7 @@ int skill_check_condition(struct map_session_data* sd, short skill, short lv, in
 		}
 
 		// Consume items
+		if (item_flag==2)
 		for( i = 0; i < ARRAYLENGTH(itemid); ++i )
 		{
 			if(index[i] >= 0)
diff --git a/src/map/unit.c b/src/map/unit.c
index a9384eca9..cda650a63 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -1700,6 +1700,8 @@ int unit_remove_map(struct block_list *bl, int clrtype)
 			sd->pvp_timer = -1;
 			sd->pvp_rank = 0;
 		}
+		if(sd->duel_group > 0)
+			duel_leave(sd->duel_group, sd);
 
 		if(pc_issit(sd)) {
 			pc_setstand(sd);
@@ -1807,9 +1809,6 @@ int unit_free(struct block_list *bl, int clrtype)
 
 		if (sd->followtimer != -1)
 			pc_stop_following(sd);
-		// Force exiting from duel and rejecting all duel invitations when player quit [LuzZza]
-		if(sd->duel_group > 0)
-			duel_leave(sd->duel_group, sd);
 			
 		if(sd->duel_invite > 0)
 			duel_reject(sd->duel_invite, sd);