Merge remote-tracking branch 'hornguy6/master'

# Conflicts:
#	locations/ender.qsrc
#	locations/rape_events.qsrc

locations/ender.qsrc

@@ -374,11 +374,11 @@ if $ARGS[0] = 'loss':
 		Loss += 1
         pcs_mood -= 20
 		if temp['rape_loc'] = 'city_park' or temp['rape_loc'] = 'pav_park':
-!!			if temp['rape_type'] = 'gang':
+			if temp['rape_type'] = 'gang':
 				gt'rape_events','park_gangrape_fight_loss'
-!!			else
-			
-!!			end
+			else
+				gs'rape_events','park_rape_solo'
+			end
 		else
 !!			if temp['rape_type'] = 'gang':
 			

locations/rape_events.qsrc

@@ -40,7 +40,7 @@ if $ARGS[0] = 'fight_init':
 		i += 1
 		jump 'rape_gang_fight_loop'
 	else
-		fightEnding = 22
+		fightEnding = 23
 		gt 'fight', 'start'
 	end
 end
@@ -205,7 +205,7 @@ if $ARGS[0] = 'urban_rape_limp':
 		'Fear flashes through you. Your legs turn to jelly. Your mind goes blank as you tumble to the ground...'
 		act'Black out':
 			cla & *clr
-			'<center><img <<$set_imgh>> src="images/shared/sex/rape/unconscious_street.jpg"></center>'
+			'<center><video autoplay loop src="images/shared/sex/rape/unconscious_street.mp4"></video></center>'
 			'Time passes.'
 			*nl
 			if rand(0,1) = 1:
@@ -656,19 +656,20 @@ if $ARGS[0] = 'park_gangrape_start':
 !!	jump 'rapist_generate_loop'
 	
 	gs 'boyStat', $rapist[0]
-	'<center><img <<$set_imgh>> src="images/shared/misc/jumped.jpg"></center>'
+!!	'<center><img <<$set_imgh>> src="images/shared/sex/rape/gangrape1.jpg"></center>'
+	'<center><video autoplay loop src="images/shared/sex/rape/park_gangrape_undress1.mp4"></video></center>'
 	'The men haul you off into the bushes and you try to scream, but the hand clamped over your mouth prevents anything from coming out but muffled sobs. They tear the clothes from your body as you struggle but it''s no use.'
 	*nl
 	'You can''t escape.'
 	gs 'rape_events', 'park_gangrape_struggle1'
 	
-	act'Go limp':
+!!	act'Go limp':
 	
-	end
+!!	end
 end
 
 if $ARGS[0] = 'park_gangrape_fight_loss':
-	'<center><img <<$set_imgh>> src="images/shared/misc/jumped.jpg"></center>'
+	'<center><video autoplay loop src="images/shared/sex/rape/park_gangrape_undress1.mp4"></video></center>'
 	'A fist slugs you upside the head and your legs turn to jelly. You collapse to the ground and your vision swims.'
 	*nl
 	'"Fucking bitch made us work for it."'
@@ -693,7 +694,7 @@ end
 
 
 if $ARGS[0] = 'park_gangrape_fight_surrender':
-	'<center><img <<$set_imgh>> src="images/shared/misc/jumped.jpg"></center>'
+	'<center><video autoplay loop src="images/shared/sex/rape/park_gangrape_undress1.mp4"></video></center>'
 	'"Stop!" you cry out. "Please! Stop! I give u-"'
 	'Even as you attempt to surrender, a fist slugs you upside the head and your legs turn to jelly. You collapse to the ground and your vision swims.'
 	*nl
@@ -741,7 +742,7 @@ if $ARGS[0] = 'park_gangrape_struggle2':
 		gs 'arousal', 'vaginal', rand(3,5), 'rough', 'rape'
 		gs 'stat'
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape1.jpg"></center>'
 		if stat['think_virgin'] = 1:
 			'"Hey, I think this bitch is a virgin," the man giggles.'
 			'"<i>Was</i> a virgin," another voice snickers.'
@@ -764,7 +765,7 @@ if $ARGS[0] = 'park_gangrape_tp':
 		gs 'arousal', 'bj', -temp['rape_time'], 'rough', 'rape'
 		gs 'stat'
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape<<rand(3,4)>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape5.jpg"></center>'
 		'The men violate you, roughly fucking you with no regard for your pain or your pleasure. With one cock choking your mouth, it''s all you can do to breathe, let alone make any noise other than the occasional groan as the others ravage your ass and pussy.'
 		*nl
 		'There''s nothing for you to do except hold on for dear life until it ends.'
@@ -791,7 +792,7 @@ if $ARGS[0] = 'park_gangrape_end1':
 	act'Endure':
 		gs 'rape_events', 'park_gangrape_cum'
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape5.jpg"></center>'
+		'<center><video autoplay loop src="images/shared/sex/rape/park_gangrape_fuck3.mp4"></video></center>'
 		'Time passes in a blur. You feel like your rape has been going on for hours. You''re not sure how much longer you can-'
 		*nl
 		'<b><i>"MMMMPH-!"</i></b>'
@@ -806,7 +807,7 @@ if $ARGS[0] = 'park_gangrape_end1':
 	
 	act'Pass out':
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape<<rand(3,4)>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape5.jpg"></center>'
 		'In the end, it''s too much to bear.'
 		*nl
 		'With your body being pummelled in every hole and your mind overwhelmed, everything just shuts down, and unconsciousness takes you.'
@@ -834,7 +835,7 @@ if $ARGS[0] = 'park_gangrape_end2':
 	
 	act'Pass out':
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape<<rand(3,4)>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape5.jpg"></center>'
 		'In the end, it''s too much to bear.'
 		*nl
 		'You try to pull back from the cock that chokes you, but you''re unable to escape it. You panic, coughing even as your vision grows blurry, but your rapist refuses to let you go until you''ve swallowed every drop.'