Merge remote-tracking branch 'Hornguy6/master'

locations/sex_ev_reactions_creampie.qsrc

@@ -10,15 +10,11 @@ if $ARGS[0] = 'creampie_react':
 		if sex_ev['creampie_ask'] = 1 and npc_boyfriend_creampie_rule[$boy] > 0 and npc_boyfriend_creampie_rule[$boy] < 3 and npc_free_creampies[$boy] = 0:
 			gs'sex_ev_reactions_creampie', 'thought_no_creampies'
 		else
-			if sex_ev['reluctant_creampie'] ! 1 and sex_ev['unhappy_creampie'] ! 1:
-				act'Happy creampie':cla & gs'sex_ev_reactions_creampie', 'creampie_happy'
-			end
 
-			if sex_ev['unhappy_creampie'] ! 1:
-				act'Conflicted creampie':cla & gs'sex_ev_reactions_creampie', 'creampie_conflicted'
-			end
+			gs'sex_ev_reactions_creampie', 'creampie_happy'
+			gs'sex_ev_reactions_creampie', 'creampie_conflicted'
 
-			act'Unhappy creampie':cla & gs'sex_ev_reactions_creampie', 'creampie_unhappy'
+			gs'sex_ev_reactions_creampie', 'creampie_unhappy'
 			gs'sex_ev_reactions_creampie', 'creampie_cum_together_react'
 			gs'sex_ev_talk', 'free_creampies'
 			gs'sex_ev_reactions_creampie', 'creampie_safe_day'
@@ -319,35 +315,50 @@ if $ARGS[0] = 'creampie_safe_day':
 end
 
 if $ARGS[0] = 'creampie_happy':
-	act'Back': cla & gs'sex_ev_reactions', 'react_menu'
-	gs'sex_ev_reactions_creampie', 'creampie_felt_great'
-	gs'sex_ev_reactions_creampie', 'feel_full'
-	gs'sex_ev_reactions_creampie', 'love_creampies'
-	gs'sex_ev_reactions_creampie', 'cum_together_kiss'
-	gs'sex_ev_reactions_creampie', 'cum_together_best'
-	gs'sex_ev_reactions_creampie', 'creampie_apologize'
-	gs'sex_ev_reactions_creampie', 'already_creampied_me'
-	gs'sex_ev_reactions_creampie', 'thanks_for_asking'
-	gs'sex_ev_reactions_creampie', 'creampie_enjoy_that'
-	gs'sex_ev_reactions_creampie', 'creampie_safe_day'
-	gs'sex_ev_reactions_creampie', 'pullout_game_tease'
-	gs'sex_ev_talk', 'free_creampies'
-	gs'sex_ev_reactions_creampie', 'have_plan_b2'
+	if sex_ev['reluctant_creampie'] ! 1 and sex_ev['unhappy_creampie'] ! 1:
+		act'Happy creampie':
+			cla
+			act'Back': cla & gs'sex_ev_reactions', 'react_menu'
+			gs'sex_ev_reactions_creampie', 'creampie_felt_great'
+			gs'sex_ev_reactions_creampie', 'feel_full'
+			gs'sex_ev_reactions_creampie', 'love_creampies'
+			gs'sex_ev_reactions_creampie', 'cum_together_kiss'
+			gs'sex_ev_reactions_creampie', 'cum_together_best'
+			gs'sex_ev_reactions_creampie', 'creampie_apologize'
+			gs'sex_ev_reactions_creampie', 'already_creampied_me'
+			gs'sex_ev_reactions_creampie', 'thanks_for_asking'
+			gs'sex_ev_reactions_creampie', 'creampie_enjoy_that'
+			gs'sex_ev_reactions_creampie', 'creampie_safe_day'
+			gs'sex_ev_reactions_creampie', 'pullout_game_tease'
+			gs'sex_ev_talk', 'free_creampies'
+			gs'sex_ev_reactions_creampie', 'have_plan_b2'
+		end
+	end
 end
 
 if $ARGS[0] = 'creampie_conflicted':
-	act'Back': cla & gs'sex_ev_reactions', 'react_menu'
-	gs'sex_ev_reactions_creampie', 'creampie_ask_next_time'
-	gs'sex_ev_reactions_creampie', 'told_you_not_to_creampie'
-	gs'sex_ev_reactions_creampie', 'cum_together_no_bc1'
+	if sex_ev['unhappy_creampie'] ! 1 and sex_ev['creampie_allowance'] < 1:
+		act'Conflicted creampie':
+			cla
+			act'Back': cla & gs'sex_ev_reactions', 'react_menu'
+			gs'sex_ev_reactions_creampie', 'creampie_ask_next_time'
+			gs'sex_ev_reactions_creampie', 'told_you_not_to_creampie'
+			gs'sex_ev_reactions_creampie', 'cum_together_no_bc1'
+		end
+	end
 end
 
 if $ARGS[0] = 'creampie_unhappy':
-	act'Back': cla & gs'sex_ev_reactions', 'react_menu'
-	gs'sex_ev_reactions_creampie', 'creampie_gross'
-	gs'sex_ev_reactions_creampie', 'creampie_ask_next_time_mad'
-	gs'sex_ev_reactions_creampie', 'cum_together_no_bc2'
-	gs'sex_ev_reactions_creampie', 'promised_no_creampie'
+	if sex_ev['creampie_allowance'] < 1:
+		act'Unhappy creampie':
+			cla
+			act'Back': cla & gs'sex_ev_reactions', 'react_menu'
+			gs'sex_ev_reactions_creampie', 'creampie_gross'
+			gs'sex_ev_reactions_creampie', 'creampie_ask_next_time_mad'
+			gs'sex_ev_reactions_creampie', 'cum_together_no_bc2'
+			gs'sex_ev_reactions_creampie', 'promised_no_creampie'
+		end
+	end
 end
 
 if $ARGS[0] = 'creampie_cum_together_react':

locations/sex_ev_stats.qsrc

@@ -47,7 +47,7 @@ if $ARGS[0] = 'starting_stats':
 		$npc_lovername[$boy] = 'babe'
 		$npc_lovername2[$boy] = 'baby'
 	end
-	if npc_creampie_permission[$boy] = 1: sex_ev['creampie_allowance'] = 1
+	if npc_creampie_permission[$boy] = 1 or npc_free_creampies[$boy] = 2: sex_ev['creampie_allowance'] = 1
 	if birth_control['think_safe'] = 1:
 		if tabletkishot > 0:
 			$sex_ev['bc_type'] = 'shot'

locations/stripclub.qsrc

@@ -4,7 +4,7 @@ close ALL
 
 if $ARGS[0] = 'start':
 	*clr & cla
-	minut += 5
+	minut += 1
 	$menu_loc = 'stripclub'
 	$menu_arg = 'start'
 	menu_off = 0