Merge remote-tracking branch 'hornguy6/master'

locations/booty_call_shower.qsrc

@@ -1300,8 +1300,7 @@ if $ARGS[0] = 'morning_together1':
 					'"Yeah, and now I''m done. Keep it in your pants."'
 					'"Fine, fine." He backs off, as you asked.'
 				end
-				act'Put on a towel':gt'booty_call_shower', 'morning_towel_on'
-				act'Skip the towel':gt'booty_call_shower', 'morning_towel_skip'
+				gs 'booty_call_shower', 'morning_shower_together_end'
 			end
 
 			act'I don''t have time':
@@ -1316,8 +1315,7 @@ if $ARGS[0] = 'morning_together1':
 					'"Fine, fine."'
 					'He backs off as you asked.'
 				end
-				act'Put on a towel':gt'booty_call_shower', 'morning_towel_on'
-				act'Skip the towel':gt'booty_call_shower', 'morning_towel_skip'
+				gs 'booty_call_shower', 'morning_shower_together_end'
 			end
 		end
 
@@ -1346,8 +1344,7 @@ if $ARGS[0] = 'morning_together1':
 								'"No," you say firmly. "I''m saving my virginity."'
 							end
 							'<<$npc_firstname[$boy]>> seems disappointed, but accepts anyways. He does continue to fondle your breasts until you finish up though.'
-							act'Put on a towel':gt'booty_call_shower', 'morning_towel_on'
-							act'Skip the towel':gt'booty_call_shower', 'morning_towel_skip'
+							gs 'booty_call_shower', 'morning_shower_together_end'
 						end
 					else
 						'"Come on... We could keep going..."'
@@ -1355,8 +1352,7 @@ if $ARGS[0] = 'morning_together1':
 							cla & *nl
 							'"No thanks, I got enough earlier."'
 							'<<$npc_firstname[$boy]>> seems disappointed, but accepts anyways. He does continue to fondle your breasts until you finish up though.'
-							act'Put on a towel':gt'booty_call_shower', 'morning_towel_on'
-							act'Skip the towel':gt'booty_call_shower', 'morning_towel_skip'
+							gs 'booty_call_shower', 'morning_shower_together_end'
 						end
 					end
 					act'Mutual masturbation':
@@ -1413,8 +1409,7 @@ if $ARGS[0] = 'morning_together_sex1':
 		'You stay in the shower with <<$npc_firstname[$boy]>> a while longer, allowing him to keep playing with your breasts and fondling your body, but don''t let it progress any further until the water shuts off.'
 		*nl
 		'He doesn''t seem put off by it at all.'
-		act'Put on a towel':gt'booty_call_shower', 'morning_towel_on'
-		act'Skip the towel':gt'booty_call_shower', 'morning_towel_skip'
+		gs 'booty_call_shower', 'morning_shower_together_end'
 	end
 	act'Jerk him off':gt'booty_call_shower', 'morning_jerkoff1'
 	
@@ -1764,8 +1759,7 @@ if $ARGS[0] = 'morning_shower_fuck_jerkoff_end':
 	gs'booty_call_shower', 'morning_sex_end'
 end
 
-if $ARGS[0] = 'morning_sex_end':
-	booty_call['npc_morning_shower'] = 2
+if $ARGS[0] = 'morning_shower_together_end':
 	noShampoo = 1
 	dynamic $showerdin
 	act'Finish up':
@@ -1773,6 +1767,11 @@ if $ARGS[0] = 'morning_sex_end':
 		act'Put on a towel':gt'booty_call_shower', 'morning_towel_on'
 		act'Skip the towel':gt'booty_call_shower', 'morning_towel_skip'
 	end
+end
+
+if $ARGS[0] = 'morning_sex_end':
+	booty_call['npc_morning_shower'] = 2
+	gs 'booty_call_shower', 'morning_shower_together_end'
 	if booty_call['morning_fuck'] = 0:
 		if booty_call['morning_shower_cum'] = 1:
 			act'Round 2 in the bed?':

locations/park_walkevents.qsrc

@@ -864,22 +864,40 @@ if $ARGS[0] = '9':
 end
 
 if $ARGS[0] = 'running_image':
+	cla & *clr
 	if month >= 11 or month <= 3:
 		if daystage = 2 or daystage = 3:
-			'<center><img <<$set_imgh>> src="images/locations/shared/park/park_jog1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/activities/exercises/running/park_jog1.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/shared/park/park_jogn1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/activities/exercises/running/park_jogn1.jpg"></center>'
 		end
 	else
 		if daystage = 2 or daystage = 3:
-			'<center><img <<$set_imgh>> src="images/locations/shared/park/park_jog2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/activities/exercises/running/park_jog2.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/shared/park/park_jogn2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/activities/exercises/running/park_jogn2.jpg"></center>'
 		end
 	end
 end
 
 
+if $ARGS[0] = 'run_cooldown_image':
+	cla & *clr
+	if month >= 11 or month <= 3:
+		if daystage = 2 or daystage = 3:
+			'<center><img <<$set_imgh>> src="images/pc/activities/exercises/running/park_jog_cool1.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/pc/activities/exercises/running/park_jog_cooln1.jpg"></center>'
+		end
+	else
+		if daystage = 2 or daystage = 3:
+			'<center><img <<$set_imgh>> src="images/pc/activities/exercises/running/park_jog_cool2.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/pc/activities/exercises/running/park_jog_cooln1.jpg"></center>'
+		end
+	end
+end
+
 if $ARGS[0] = 'run':
 	if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich':
 		act 'Jog through the park (1:00)':
@@ -907,9 +925,9 @@ if $ARGS[0] = 'run':
 						act'Turn':
 							cla & *clr
 							if $region = 'city':
-								gs 'npcgeneratec', 0, 'stranger', rand(18,45), rand(3,4)
+								gs 'npcgeneratec', 0, '', rand(18,45), rand(3,4)
 							elseif $region = 'pav':
-								gs 'npcgeneratec', 0, 'stranger', rand(18,45), 1
+								gs 'npcgeneratec', 0, '', rand(18,45), 1
 							end
 							gs 'boy', 'details'
 							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
@@ -1133,12 +1151,12 @@ if $ARGS[0] = 'run_reactions':
 end
 
 if $ARGS[0] = 'run_end':
-	gs 'park_walkevents', 'running_image'
+	gs 'park_walkevents', 'run_cooldown_image'
 	if temp['catcall'] = 4:
 		pcs_mood -= 30
 		'After about a full hour of running, you finally start to slow down, breathing tiredly. Under normal circumstances, you might be in the middle of your runner''s high but that guy in the middle of your jog just soured the whole thing. You feel exhausted and angry and you just want to go home.'
 	else
-		'An hour after you started, you call your run to a halt, breathing tiredly. You feel exhausted in a good way. A bit sweaty, but also that you''ve managed to improve your stamina as you even feel a bit slimmer.'
+		'About an hour after you started, you call your run to a halt, breathing tiredly. You feel exhausted in a good way. A bit sweaty, but also that you''ve managed to improve your stamina as you even feel a bit slimmer.'
 	end
 	if daybegskver = daystart:
 		gs 'exercise', 'tier1', 30, 'run_exp'

locations/rape_events.qsrc

@@ -826,7 +826,7 @@ end
 if $ARGS[0] = 'park_gangrape_end2':
 	act'Cough':
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude2.mp4"></video></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_after_nude2.jpg"></center>'
 		'Their lust satisfied, your rapists toss you aside into the mud where you retch, hacking up the remnants of the cum you were unable to swallow.'
 		*nl
 		'You writhe on the ground, trembling as they walk away laughing, as casual as if they had just finished getting drunk at the cinema. By the time you manage to struggle to your knees, they''re already gone.'
@@ -861,7 +861,7 @@ if $ARGS[0] = 'park_wakeup':
     gs 'stat'
 	act'Wake up':
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude1.mp4"></video></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_after_nude1.jpg"></center>'
 		
 		'Slowly, you come back to consciousness and your eyes creak open.'
 		*nl
@@ -872,7 +872,7 @@ if $ARGS[0] = 'park_wakeup':
 		'You were raped.'
 		act'Get up':
 			cla & *clr
-			'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude2.mp4"></video></center>'
+			'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_after_nude2.jpg"></center>'
 			'Shakily, you pull haul yourself out of the mud, stumbling to your feet.'
 			*nl
 			'There are no signs of your attackers except for the muddy ground where bodies wrestled.'
@@ -893,7 +893,7 @@ if $ARGS[0] = 'park_walkaway1':
 		gs 'clothing', 'dispose'
 		gs 'stat'
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude3.mp4"></video></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_after_nude3.jpg"></center>'
 		'Looking around, you try to find something to cover yourself with. All around you are the remains of your ruined clothing.'
 		*nl
 		if PCloDress = 1:
@@ -916,14 +916,14 @@ end
 if $ARGS[0] = 'park_walkaway2':
 	act'Back to the road':
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude<<rand(4,5)>>.mp4"></video></center>'
+		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude_walk1.mp4"></video></center>'
 		'Naked and with cum leaking from every orifice, you limp away, looking for the road...'
 		act'Continue':gt $loc, $loc_arg
 	end
 	
 	act'Back to the road (stoic)':
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude_walk<<rand(1,2)>>.mp4"></video></center>'
+		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude_walk1.mp4"></video></center>'
 		'You limp away, forcing yourself to take one step after the other.'
 		*nl
 		'You''ve been gangraped. Your body is bruised, battered, and filthy from the ordeal, cum leaking from every orifice. And there was nothing you could have done about it.'
@@ -938,14 +938,14 @@ end
 if $ARGS[0] = 'park_walkaway3':
 	act'Back to the road':
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude<<rand(4,5)>>.mp4"></video></center>'
+		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude_walk1.mp4"></video></center>'
 		'You don''t even bother trying to find your clothes. Instead you limp away, naked and with cum leaking from every orifice, looking for the road...'
 		act'Continue':gt $loc, $loc_arg
 	end
 	
 	act'Back to the road (stoic)':
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude_walk<<rand(1,2)>>.mp4"></video></center>'
+		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude_walk1.mp4"></video></center>'
 		'You don''t even bother trying to find your clothes. Instead you limp away, forcing yourself to take one step after the other.'
 		*nl
 		'You''ve been gangraped. Your body is bruised, battered, and filthy from the ordeal, cum leaking from every orifice. And there was nothing you could have done about it.'