Merge remote-tracking branch 'Hornguy6/master'

locations/sex_ev_after.qsrc

@@ -2028,6 +2028,7 @@ end
 
 if $ARGS[0] = 'sleep_function':
 	gs 'sex_ev_sex', 'reset'
+	gs 'arousal', 'end'
 	if npc_latesleeper[$boy] = 0 and npc_caretaker[$boy] = 1 and rand(1,4) < 4 and $sex_ev['loc'] ! 'hotel_room': sex_ev['boy_make_breakfast'] = 1
 !!{	if $sex_ev['loc'] = 'npc_home':
 		if hour < 20:

locations/sex_ev_cum.qsrc

@@ -2198,9 +2198,7 @@ if $ARGS[0] = 'what_now':
 		'"Let''s keep going," you smile. "I''m not satisfied yet anyways."'
 		'"Great! Gimme a minute to get hard again," he says, working his cock, concentrating hard to try and stiffen up again.'
 		gs'sex_ev_sex', 'reset'
-		act'Let him lead':cla & gs 'sex_ev_sex', 'he_choose_position'
-		act'Foreplay':cla & gs 'sex_ev_foreplay', 'foreplay_choose'
-		act'Sex':cla & gs'sex_ev_sex', 'position_change' & gs 'sex_ev_condoms', 'condoms'
+		gs'sex_ev_sex', 'sex_menu'
 	end
 	if sex_ev['condom'] = 1 and sex_ev['no_condoms'] ! 1:
 		act'Keep going (no condoms)':
@@ -2218,11 +2216,9 @@ if $ARGS[0] = 'what_now':
 				'<<$npc_firstname[$boy]>> grins back at you and his cock immediately starts to stiffen again, apparently getting hard just at the thought of fucking you bareback.'
 			end
 			gs'sex_ev_sex', 'reset'
-			act'Let him lead':cla & gs 'sex_ev_sex', 'he_choose_position'
-			act'Foreplay':cla & gs 'sex_ev_foreplay', 'foreplay_choose'
-			act'Sex':cla & gs'sex_ev_sex', 'position_change' & gs 'sex_ev_condoms', 'condoms'
+			gs'sex_ev_sex', 'sex_menu'
 		end
-	elseif sex_ev['creampie_count'] > 0:
+	elseif sex_ev['creampie_count'] > 0 and sex_ev['creampie_allowance'] < 1 and npc_free_creampies[$boy] < 1:
 		act'Keep going (free creampies)':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/misc/wait.mp4"></video></center>'
@@ -2243,9 +2239,7 @@ if $ARGS[0] = 'what_now':
 				'<<$npc_firstname[$boy]>> grins back at you seeming to be excited he has permission.'
 			end
 			gs'sex_ev_sex', 'reset'
-			act'Let him lead':cla & gs 'sex_ev_sex', 'he_choose_position'
-			act'Foreplay':cla & gs 'sex_ev_foreplay', 'foreplay_choose'
-			act'Sex':cla & gs'sex_ev_sex', 'position_change' & gs 'sex_ev_condoms', 'condoms'
+			gs'sex_ev_sex', 'sex_menu'
 		end
 	end
 end

locations/sex_ev_favorite_part.qsrc

@@ -1024,7 +1024,7 @@ if $ARGS[0] = 'pc_fuck_fav1':
 						
 						act'Like feeling his weight':
 							cla & *nl
-							'"There''s something really hot about feeling a guy''s on top of me," you say. "His entire weight, pressing down, through his hips and his cock into my pussy. I can''t totally explain it, but it feels really good."'
+							'"There''s something really hot about feeling a guy''s on top of me," you say. "I can feel the weight of your entire body pressing down through your cock and into my pussy. It''s really intense."'
 							gs'sex_ev_pillow_talk', 'topic_route'
 						end
 						

locations/sex_ev_morning.qsrc

@@ -1845,7 +1845,7 @@ if $ARGS[0] = 'pc_make_breakfast_done':
 			else
 				'"Coffee''s ready," you say, turning around to walk two steaming mugs back to <<$npc_firstname[$boy]>>.'
 			end
-			act'Drink your coffee':gt'sex_ev_morning', 'eat_breakfast1'
+			act'Drink your coffee':gt'sex_ev_morning', 'coffee_together'
 		else
 			if sex_ev['boy_asleep'] = 1 and sex_ev['wake_fuck'] = 0 and sex_ev['morning_fuck'] = 0:
 				'<<$npc_firstname[$boy]>> begins to stir in bed, blearily blinking at you.'

locations/sex_ev_pillow_talk.qsrc

@@ -1753,15 +1753,19 @@ if $ARGS[0] = 'boy_talk':
 	
 	if sex_ev['boy_topics'] > 0 and rand(0,1) = 1:
 		:boy_talk_loop
-		if sex_ev['good_for_you'] = 0 and rand(1,2) = 1:
-			gs 'sex_ev_favorite_part', 'boy_good_for_you'
-		elseif sex_ev['boy_pube_talk'] = 0 and rand(1,1) = 1:
-			gs'sex_ev_pillow_talk', 'boy_pube_talk'
+		if sex_ev['good_for_you'] = 0 and rand(1,sex_ev['boy_topics']) = 1:
+			cla
+			act'Continue':gs 'sex_ev_favorite_part', 'boy_good_for_you'
+		elseif sex_ev['boy_pube_talk'] = 0 and rand(1,sex_ev['boy_topics']) = 1:
+			cla
+			act'Continue':gs'sex_ev_pillow_talk', 'boy_pube_talk'
 !!		elseif sex_ev['broken_condom_talk'] = 0 and rand(1,2) = 1:
 		
 !!		elseif sex_ev['creampie_okay'] = 0:
 		
 !!		elseif sex_ev['boy_no_kids'] = 0:
+		else
+			jump 'boy_talk_loop'
 		end
 	end
 end
@@ -2098,7 +2102,7 @@ if $ARGS[0] = 'boy_pubes_response':
 	elseif pcs_pubes < 4:
 		if npc_bush_pref[$boy] = 1:
 			'"I think it''s hot," he grins. "No one likes to find a gorilla between a girl''s legs. Clean-shaven is the best."'
-			gs'sex_ev_pillow_talk', 'boy_asks_cleanshave'
+			gs'sex_ev_pillow_talk', 'boy_likes_pubes2'
 		elseif npc_bush_pref[$boy] = 2:
 			'"Ever considered letting it grow out a little?"'
 			gs'sex_ev_pillow_talk', 'boy_asks_trim'

locations/sex_ev_pillow_talk2.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'weather_talk':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 				'"It''s so hot today," you pant. "I''m sweating after that. And not just from the sex."'
-				'"Yeah," <<$npc_firstname[$boy]>> nods. "I''m practically dripping."'
+				'"Yeah," <<$npc_firstname[$boy]>> nods. "I need a shower..."'
 				gs'sex_ev_pillow_talk2', 'small_talk'
 			end
 		elseif temper <= 10:

locations/sex_ev_reactions.qsrc

@@ -1570,7 +1570,7 @@ if $ARGS[0] = 'cum_together_kiss':
 				end
 			else
 				npc_no_kiss[$boy] = 2
-				'He returns the kiss eagerly and your entire body tingles with pleasure. The warmth of his cum inside you, his cock still filling you up, and his lips on yours create a mixture of undescribable satisfaction inside you.'
+				'He returns the kiss eagerly and your entire body tingles with pleasure. The warmth of his cum inside you, his cock still filling you up, and his lips on yours create a mixture of indescribable satisfaction inside you.'
 				gs 'sex_ev_sex', 'sex_end'
 			end
 		end

locations/sex_ev_sex.qsrc

@@ -465,9 +465,12 @@ if $ARGS[0] = 'position_change':
 						end
 					end
 				end
-				
+			elseif $npc_fav_pos[$boy] = 'blowjob':
+				'"Sure," he grins. "I love blowjobs anyways."'
+				act'Blow him':gt 'sex_ev_foreplay', 'bj_dom2'
 			else
-			
+				'"Sure," he grins. "As long as we can come back later."'
+				act'Blow him':gt 'sex_ev_foreplay', 'bj_dom2'
 			end
 		end
 	end