1 files changed, 62 insertions, 40 deletions

diff --git a/src/map/status.c b/src/map/status.c
index 3cd28e322..824ad1f58 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -2485,13 +2485,14 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt) {
 	bstatus->mode = MD_MASK&~(MD_BOSS|MD_PLANT|MD_DETECTOR|MD_ANGRY|MD_TARGETWEAK);
 
 	bstatus->size = (sd->class_&JOBL_BABY)?SZ_SMALL:SZ_MEDIUM;
-	if (battle_config.character_size && (pc_isriding(sd) || pc_isridingdragon(sd)) ) { //[Lupus]
+	if (battle_config.character_size && (pc_isridingpeco(sd) || pc_isridingdragon(sd))) { //[Lupus]
 		if (sd->class_&JOBL_BABY) {
 			if (battle_config.character_size&SZ_BIG)
 				bstatus->size++;
-		} else
+		} else {
 			if(battle_config.character_size&SZ_MEDIUM)
 				bstatus->size++;
+		}
 	}
 	bstatus->aspd_rate = 1000;
 	bstatus->ele_lv = 1;
@@ -2780,9 +2781,10 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt) {
 	sd->left_weapon.atkmods[1] = status->atkmods[1][sd->weapontype2];
 	sd->left_weapon.atkmods[2] = status->atkmods[2][sd->weapontype2];
 
-	if( (pc_isriding(sd) || pc_isridingdragon(sd)) &&
-		(sd->status.weapon==W_1HSPEAR || sd->status.weapon==W_2HSPEAR))
-	{	//When Riding with spear, damage modifier to mid-class becomes
+	if ((pc_isridingpeco(sd) || pc_isridingdragon(sd))
+	    && (sd->status.weapon==W_1HSPEAR || sd->status.weapon==W_2HSPEAR)
+	    ) {
+		//When Riding with spear, damage modifier to mid-class becomes
 		//same as versus large size.
 		sd->right_weapon.atkmods[1] = sd->right_weapon.atkmods[2];
 		sd->left_weapon.atkmods[1] = sd->left_weapon.atkmods[2];
@@ -3062,9 +3064,9 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt) {
 	if((skill_lv=pc->checkskill(sd,GS_SINGLEACTION))>0 &&
 		(sd->status.weapon >= W_REVOLVER && sd->status.weapon <= W_GRENADE))
 		bstatus->aspd_rate -= ((skill_lv+1)/2) * 10;
-	if(pc_isriding(sd))
+	if (pc_isridingpeco(sd))
 		bstatus->aspd_rate += 500-100*pc->checkskill(sd,KN_CAVALIERMASTERY);
-	else if(pc_isridingdragon(sd))
+	else if (pc_isridingdragon(sd))
 		bstatus->aspd_rate += 250-50*pc->checkskill(sd,RK_DRAGONTRAINING);
 #else // needs more info
 	if((skill_lv=pc->checkskill(sd,SA_ADVANCEDBOOK))>0 && sd->status.weapon == W_BOOK)
@@ -3074,9 +3076,9 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt) {
 	if((skill_lv=pc->checkskill(sd,GS_SINGLEACTION))>0 &&
 		(sd->status.weapon >= W_REVOLVER && sd->status.weapon <= W_GRENADE))
 		bstatus->aspd_rate += ((skill_lv+1)/2) * 10;
-	if(pc_isriding(sd))
+	if (pc_isridingpeco(sd))
 		bstatus->aspd_rate -= 500-100*pc->checkskill(sd,KN_CAVALIERMASTERY);
-	else if(pc_isridingdragon(sd))
+	else if (pc_isridingdragon(sd))
 		bstatus->aspd_rate -= 250-50*pc->checkskill(sd,RK_DRAGONTRAINING);
 #endif
 	bstatus->adelay = 2*bstatus->amotion;
@@ -3094,7 +3096,7 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt) {
 	// Weight
 	if((skill_lv=pc->checkskill(sd,MC_INCCARRY))>0)
 		sd->max_weight += 2000*skill_lv;
-	if(pc_isriding(sd) && pc->checkskill(sd,KN_RIDING)>0)
+	if (pc_isridingpeco(sd) && pc->checkskill(sd,KN_RIDING) > 0)
 		sd->max_weight += 10000;
 	else if(pc_isridingdragon(sd))
 		sd->max_weight += 5000+2000*pc->checkskill(sd,RK_DRAGONTRAINING);
@@ -5231,16 +5233,16 @@ unsigned short status_calc_speed(struct block_list *bl, struct status_change *sc
 		{
 			int val = 0;
 
-			if( sc->data[SC_FUSION] )
+			if(sc->data[SC_FUSION]) {
 				val = 25;
-			else if( sd ) {
-				if( pc_isriding(sd) || sd->sc.option&(OPTION_DRAGON) || sd->sc.data[SC_ALL_RIDING] )
+			} else if (sd) {
+				if (pc_isridingpeco(sd) || pc_isridingdragon(sd) || sd->sc.data[SC_ALL_RIDING])
 					val = 25;//Same bonus
-				else if( pc_isridingwug(sd) )
+				else if (pc_isridingwug(sd))
 					val = 15 + 5 * pc->checkskill(sd, RA_WUGRIDER);
-				else if( pc_ismadogear(sd) ) {
+				else if (pc_ismadogear(sd)) {
 					val = (- 10 * (5 - pc->checkskill(sd,NC_MADOLICENCE)));
-					if( sc->data[SC_ACCELERATION] )
+					if (sc->data[SC_ACCELERATION])
 						val += 25;
 				}
 			}
@@ -6013,7 +6015,9 @@ int status_get_party_id(struct block_list *bl) {
 			return ((TBL_MER*)bl)->master->status.party_id;
 		break;
 	case BL_SKILL:
-		return ((TBL_SKILL*)bl)->group->party_id;
+		if (((TBL_SKILL*)bl)->group)
+			return ((TBL_SKILL*)bl)->group->party_id;
+		break;
 	case BL_ELEM:
 		if (((TBL_ELEM*)bl)->master)
 			return ((TBL_ELEM*)bl)->master->status.party_id;
@@ -6056,7 +6060,9 @@ int status_get_guild_id(struct block_list *bl) {
 			return ((TBL_NPC*)bl)->u.scr.guild_id;
 		break;
 	case BL_SKILL:
-		return ((TBL_SKILL*)bl)->group->guild_id;
+		if (((TBL_SKILL*)bl)->group)
+				return ((TBL_SKILL*)bl)->group->guild_id;
+			break;
 	case BL_ELEM:
 		if (((TBL_ELEM*)bl)->master)
 			return ((TBL_ELEM*)bl)->master->status.guild_id;
@@ -6178,7 +6184,7 @@ void status_set_viewdata(struct block_list *bl, int class_)
 		{
 			TBL_PC* sd = (TBL_PC*)bl;
 			if (pcdb_checkid(class_)) {
-				if (sd->sc.option&OPTION_RIDING) {
+				if (pc_isridingpeco(sd)) {
 					switch (class_) {	//Adapt class to a Mounted one.
 						case JOB_KNIGHT:
 							class_ = JOB_KNIGHT2;
@@ -7881,8 +7887,8 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t
 			case SC_RUWACH:
 			case SC_WZ_SIGHTBLASTER:
 				val3 = skill->get_splash(val2, val1); //Val2 should bring the skill-id.
-				val2 = tick/250;
-				tick_time = 10; // [GodLesZ] tick time
+				val2 = tick/20;
+				tick_time = 20; // [GodLesZ] tick time
 				break;
 
 				//Permanent effects.
@@ -8581,14 +8587,22 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t
 				val2 = 20 + 10 * val1; //ASPD. Need to confirm if Movement Speed reduction is the same. [Jobbie]
 				val3 = 20 * val1; //HIT
 				if( sd ) { // Removes Animals
-					if( pc_isriding(sd) ) pc->setriding(sd, 0);
-					if( pc_isridingdragon(sd) ) pc->setoption(sd, sd->sc.option&~OPTION_DRAGON);
-					if( pc_iswug(sd) ) pc->setoption(sd, sd->sc.option&~OPTION_WUG);
-					if( pc_isridingwug(sd) ) pc->setoption(sd, sd->sc.option&~OPTION_WUGRIDER);
-					if( pc_isfalcon(sd) ) pc->setoption(sd, sd->sc.option&~OPTION_FALCON);
-					if( sd->status.pet_id > 0 ) pet->menu(sd, 3);
-					if( homun_alive(sd->hd) ) homun->vaporize(sd,HOM_ST_REST);
-					if( sd->md ) mercenary->delete(sd->md,3);
+					if (pc_isridingpeco(sd))
+						pc->setridingpeco(sd, false);
+					if (pc_isridingdragon(sd))
+						pc->setridingdragon(sd, 0);
+					if (pc_iswug(sd))
+						pc->setoption(sd, sd->sc.option&~OPTION_WUG);
+					if (pc_isridingwug(sd))
+						pc->setridingwug(sd, false);
+					if (pc_isfalcon(sd))
+						pc->setfalcon(sd, false);
+					if (sd->status.pet_id > 0)
+						pet->menu(sd, 3);
+					if (homun_alive(sd->hd))
+						homun->vaporize(sd,HOM_ST_REST);
+					if (sd->md)
+						mercenary->delete(sd->md,3);
 				}
 				break;
 			case SC__LAZINESS:
@@ -8685,8 +8699,10 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t
 					if ( !val3 )
 						val3 = 50;
 					if( sd ) {
-						if( pc_isriding(sd) ) pc->setriding(sd, 0);
-						if( pc_isridingdragon(sd) ) pc->setoption(sd, sd->sc.option&~OPTION_DRAGON);
+						if (pc_isridingpeco(sd))
+							pc->setridingpeco(sd, false);
+						if (pc_isridingdragon(sd))
+							pc->setridingdragon(sd, false);
 					}
 				}
 				break;
@@ -8782,7 +8798,7 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t
 				struct block_list * src2;
 				val3 = st->agi * val1 / 60; // ASPD increase: [(Target AGI x Skill Level) / 60] %
 				if( (src2 = map->id2bl(val2)) ){
-					val4 = ( 200/status_get_int(src2)?status_get_int(src2):1 ) * val1;// MDEF decrease: MDEF [(200 / Caster INT) x Skill Level]
+					val4 = ( 200/(status_get_int(src2)?status_get_int(src2):1) ) * val1;// MDEF decrease: MDEF [(200 / Caster INT) x Skill Level]
 					val2 = ( status_get_dex(src2)/4 + status_get_str(src2)/2 ) * val1 / 5; // ATK increase: ATK [{(Caster DEX / 4) + (Caster STR / 2)} x Skill Level / 5]
 				}
 			}
@@ -10510,14 +10526,17 @@ int status_change_timer(int tid, int64 tick, int id, intptr_t data) {
 		case SC_SIGHT:
 		case SC_RUWACH:
 		case SC_WZ_SIGHTBLASTER:
-			if(type == SC_WZ_SIGHTBLASTER)
+			if(type == SC_WZ_SIGHTBLASTER) {
+			//Restore trap immunity
+			if(sce->val4%2)
+				sce->val4--;
 				map->foreachinrange(status->change_timer_sub, bl, sce->val3, BL_CHAR|BL_SKILL, bl, sce, type, tick);
-			else
+			} else
 				map->foreachinrange(status->change_timer_sub, bl, sce->val3, BL_CHAR, bl, sce, type, tick);
 
 			if( --(sce->val2)>0 ){
-				sce->val4 += 250; // use for Shadow Form 2 seconds checking.
-				sc_timer_next(250+tick, status->change_timer, bl->id, data);
+				sce->val4 += 20; // use for Shadow Form 2 seconds checking.
+				sc_timer_next(20+tick, status->change_timer, bl->id, data);
 				return 0;
 			}
 			break;
@@ -11312,10 +11331,13 @@ int status_change_timer_sub(struct block_list* bl, va_list ap) {
 			if (battle->check_target( src, bl, BCT_ENEMY ) > 0
 			 && status->check_skilluse(src, bl, WZ_SIGHTBLASTER, 2)
 			) {
-				if (sce && !(bl->type&BL_SKILL) //The hit is not counted if it's against a trap
-						&& skill->attack(BF_MAGIC,src,src,bl,WZ_SIGHTBLASTER,1,tick,0)
-				){
-						sce->val2 = 0; //This signals it to end.
+				struct skill_unit *su = (struct skill_unit *)bl;
+				if (sce && skill->attack(BF_MAGIC,src,src,bl,WZ_SIGHTBLASTER,sce->val1,tick,0x4000)
+					&& (!su || !su->group || !(skill->get_inf2(su->group->skill_id)&INF2_TRAP))) { // The hit is not counted if it's against a trap
+					sce->val2 = 0; // This signals it to end.
+				} else if((bl->type&BL_SKILL) && sce->val4%2 == 0) {
+					//Remove trap immunity temporarily so it triggers if you still stand on it
+					sce->val4++;
 				}
 			}
 			break;