- Vending is now cancelled on a pc_setpos

- Pressure again ignores Basilica.
- Fixed attacker's sc being nulled when the target's sc is empty.
- Slaves now do a battle_check_target to check if the new target is an enemy when acquired through sd->skilltarget.
- Fixed SC_SKE halving defense2 twice.


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

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.  EVERYTHING ELSE
 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
 
+2006/02/21
+	* Vending is now cancelled on a pc_setpos [Skotlex]
+	* Pressure again ignores Basilica. [Skotlex]
+	* Fixed attacker's sc being nulled when the target's sc is empty (fixes
+	  most status changes not taking effect during battle) [Skotlex]
+	* Slaves now do a battle_check_target to check if the new target is an
+	  enemy when acquired through the master's skilltarget. [Skotlex]
+	* Fixed SC_SKE halving de2 twice. [Skotlex]
 2006/02/20
 	* The Super Novice Explosion Spirits skill will now trigger when the last
 	  sentence is said (not after the next sentence as it was currently) [Skotlex]

src/map/battle.c

@@ -1111,7 +1111,7 @@ static struct Damage battle_calc_weapon_attack(
 	if (sc && !sc->count)
 		sc = NULL; //Skip checking as there are no status changes active.
 	if (tsc && !tsc->count)
-		sc = NULL; //Skip checking as there are no status changes active.
+		tsc = NULL; //Skip checking as there are no status changes active.
 	
 	switch (src->type)
 	{

src/map/mob.c

@@ -1469,8 +1469,11 @@ static int mob_ai_sub_hard_slavemob(struct mob_data *md,unsigned int tick)
 					struct block_list *tbl = NULL;
 					if(msd->attacktarget)
 						tbl = map_id2bl(msd->attacktarget);
-					else if (msd->skilltarget)
+					else if (msd->skilltarget) {
 						tbl = map_id2bl(msd->skilltarget);
+						if (tbl && battle_check_target(&md->bl, tbl, BCT_ENEMY) <= 0)
+							tbl = NULL; //Required check as skilltarget is not always an enemy. [Skotlex]
+					}
 					if(tbl && status_check_skilluse(&md->bl, tbl, 0, 0)) {
 						md->target_id=tbl->id;
 						md->state.targettype = ATTACKABLE;

src/map/pc.c

@@ -3189,6 +3189,8 @@ int pc_setpos(struct map_session_data *sd,unsigned short mapindex,int x,int y,in
 		chat_leavechat(sd);
 	if(sd->trade_partner)	// 取引を中?する
 		trade_tradecancel(sd);
+	if(sd->vender_id)
+		vending_closevending(sd);
 	if(sd->state.storage_flag == 1)
 		storage_storage_quit(sd,0);	// 倉庫を開いてるなら保存する
 	else if (sd->state.storage_flag == 2)

src/map/status.c

@@ -347,18 +347,6 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int
 	
 	if (!skill_num && !(mode&MD_CANATTACK))
 		return 0; //This mode is only needed for melee attacking.
-	
-	if (((src && map_getcell(src->m,src->x,src->y,CELL_CHKBASILICA)) ||
-		(target && target != src && map_getcell(target->m,target->x,target->y,CELL_CHKBASILICA)))
-		&& !(mode&MD_BOSS))
-	{	//Basilica Check
-		if (!skill_num) return 0;
-		race = skill_get_inf(skill_num);
-		if (race&INF_ATTACK_SKILL)
-			return 0;
-		if (race&INF_GROUND_SKILL && skill_get_unit_target(skill_num)&BCT_ENEMY)
-			return 0;
-	}	
 
 	if (skill_num == PA_PRESSURE && flag) {
 	//Gloria Avoids pretty much everythng....
@@ -372,6 +360,18 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int
 		return 1;
 	}
 
+	if (((src && map_getcell(src->m,src->x,src->y,CELL_CHKBASILICA)) ||
+		(target && target != src && map_getcell(target->m,target->x,target->y,CELL_CHKBASILICA)))
+		&& !(mode&MD_BOSS))
+	{	//Basilica Check
+		if (!skill_num) return 0;
+		race = skill_get_inf(skill_num);
+		if (race&INF_ATTACK_SKILL)
+			return 0;
+		if (race&INF_GROUND_SKILL && skill_get_unit_target(skill_num)&BCT_ENEMY)
+			return 0;
+	}	
+
 	if (src) sc = status_get_sc(src);
 	
 	if(sc && sc->opt1 >0)
@@ -2058,8 +2058,6 @@ int status_calc_def2(struct block_list *bl, int def2)
 			def2 -= def2 * 50/100;
 		if(sc->data[SC_PROVOKE].timer!=-1)
 			def2 -= def2 * (5+5*sc->data[SC_PROVOKE].val1)/100;
-		if(sc->data[SC_SKE].timer!=-1)
-			def2 /= 2;
 		if(sc->data[SC_JOINTBEAT].timer!=-1){
 			if(sc->data[SC_JOINTBEAT].val2==3)
 				def2 -= def2 * 50/100;