Fixed bugreport:6406,bugreport:5986 updated Extreme Vacuum to its official behavior.

Fixed bugreport:6404 where using KG_GENWAKU on sitting targets the client doesn't sync with the server in sitting state.
Updated RK_FIGHTINGSPIRIT ASPD bonus. Thanks to michieru.

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

1 files changed, 38 insertions, 9 deletions

diff --git a/src/map/skill.c b/src/map/skill.c
index 8246493ae..e6496a3e9 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -8760,6 +8760,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 				if (unit_movepos(bl,x,y,0,0))
 				{
 					clif_skill_damage(bl,bl,tick, status_get_amotion(src), 0, -30000, 1, skillid, -1, 6);
+					if( sd && pc_issit(sd))
+						clif_sitting(bl); //Avoid sitting sync problem
 					clif_slide(bl,x,y) ;
 					sc_start(bl,SC_CONFUSION,80,skilllv,skill_get_time(skillid,skilllv));
 				}
@@ -10567,7 +10569,9 @@ struct skill_unit_group* skill_unitsetting (struct block_list *src, short skilli
 	case SO_WARMER:
 		skill_clear_group(src, 8);
 		break;
-		
+	case SO_VACUUM_EXTREME:
+		range++;
+		break;
 	case GN_WALLOFTHORN:
 		if( flag&1 )
 			limit = 3000;
@@ -11562,7 +11566,32 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 			break;			
 			
 		case UNT_VACUUM_EXTREME:
-			sc_start(bl, SC_VACUUM_EXTREME, 100, sg->skill_lv, sg->limit);
+			{// TODO: official behavior in gvg area. [malufett]
+				int sec = sg->limit - DIFF_TICK(tick, sg->tick); 
+				int range = skill_get_unit_range(sg->skill_id, sg->skill_lv);
+
+				if( tsc && !tsc->data[type] &&
+					distance_xy(src->bl.x, src->bl.y, bl->x, bl->y) <= range)// don't consider outer bounderies
+					sc_start(bl, type, 100, sg->skill_lv, sec);
+
+				if( unit_is_walking(bl) && // wait until target stop walking
+					( tsc && tsc->data[type] && tsc->data[type]->val4 >= tsc->data[type]->val3-range ))
+						break; 
+
+				if( tsc && ( !tsc->data[type] || (tsc->data[type] && tsc->data[type]->val4 < 1 ) ) )
+					break;
+
+				if( unit_is_walking(bl) && 
+					distance_xy(src->bl.x, src->bl.y, bl->x, bl->y) > range )// going outside of boundaries? then force it to stop
+						unit_stop_walking(bl,1);
+
+				if(	!unit_is_walking(bl) && 
+					distance_xy(src->bl.x, src->bl.y, bl->x, bl->y) <= range &&  // only snap if the target is inside the range or
+					src->bl.x != bl->x && src->bl.y != bl->y){// diagonal position parallel to VE's center
+					unit_movepos(bl, src->bl.x, src->bl.y, 0, 0);
+					clif_fixpos(bl);
+				}		
+			}
 			break;
 			
 		case UNT_FIRE_MANTLE:
@@ -14376,13 +14405,13 @@ static int skill_trap_splash (struct block_list *bl, va_list ap)
 			if( ss != bl )
 				skill_attack(BF_MISC,ss,src,bl,sg->skill_id,sg->skill_lv,tick,sg->val1|SD_LEVEL);
 			break;
-	case UNT_MAGENTATRAP:
-	case UNT_COBALTTRAP:
-	case UNT_MAIZETRAP:
-	case UNT_VERDURETRAP:
-		if( bl->type != BL_PC && !is_boss(bl) )
-			sc_start2(bl,SC_ELEMENTALCHANGE,100,sg->skill_lv,skill_get_ele(sg->skill_id,sg->skill_lv),skill_get_time2(sg->skill_id,sg->skill_lv));
-		break;
+		case UNT_MAGENTATRAP:
+		case UNT_COBALTTRAP:
+		case UNT_MAIZETRAP:
+		case UNT_VERDURETRAP:
+			if( bl->type != BL_PC && !is_boss(bl) )
+				sc_start2(bl,SC_ELEMENTALCHANGE,100,sg->skill_lv,skill_get_ele(sg->skill_id,sg->skill_lv),skill_get_time2(sg->skill_id,sg->skill_lv));
+			break;
 		case UNT_REVERBERATION:
 			skill_addtimerskill(ss,tick+50,bl->id,0,0,WM_REVERBERATION_MELEE,sg->skill_lv,BF_WEAPON,0); // for proper skill delay animation when use with Dominion Impulse
 			skill_addtimerskill(ss,tick+250,bl->id,0,0,WM_REVERBERATION_MAGIC,sg->skill_lv,BF_MAGIC,0);