Merge remote-tracking branch 'hornguy6/master'

locations/booty_call_morning.qsrc

@@ -1207,7 +1207,7 @@ if $ARGS[0] = 'pc_make_breakfast_choices':
 			end
 			
 			act'Yes (10 minutes)':
-				booty_call['cooking_time'] += 1
+				booty_call['cooking_time'] += 10
 				booty_call['kolbasa_make'] = 1
 				booty_call['cooking_total'] += 1
 				cla & *nl
@@ -1229,7 +1229,7 @@ if $ARGS[0] = 'pc_make_breakfast_choices':
 			end
 			
 			act'Yes (15 minutes)':
-				booty_call['cooking_time'] += 3
+				booty_call['cooking_time'] += 15
 				booty_call['pancakes_make'] = 1
 				booty_call['cooking_total'] += 1
 				cla & *nl
@@ -1524,7 +1524,7 @@ if $ARGS[0] = 'after_breakfast_sex':
 			gs 'booty_call_start', 'bed_start'
 		end
 		
-		if booty_call['wake_fuck'] = 1:
+		if booty_call['wake_fuck'] = 1 or booty_call['morning_fuck'] = 1:
 			act'Again?!':
 				cla & *nl
 				'"Again?!" you giggle as <<$npc_firstname[$boy]>> begins groping your breast and fingering your clit. "You''re insatiable!"'

locations/hookup.qsrc

@@ -1,7 +1,13 @@
 # hookup
 !! 2021/05/06
 if $ARGS[0] = 'start':
-	
+	if $boy ! $npclastgenerated and $boy ! $npclastsaved:
+		if npcgen_lastrun = 1:
+			gs 'boystat', $npclastgenerated
+		elseif npcgen_lastrun = 2:
+			gs 'boystat', $npclastsaved
+		end
+	end
 	hookup['orgasm_count'] = orgasm
 	$location_type = 'indoors'
 	$location_type = 'indoors'

locations/npcgeneratec.qsrc

@@ -4,6 +4,11 @@
 !! You can also set their approx. home location
 !! All data produced is random so if you need a specific value you will have to overwrite it
 
+!! npcgen_lastrun is a flag to help track whether npcgeneratec or npcpreservec has been run last
+!! npcgeneratec is 1
+!! npcpreservec is 2
+npcgen_lastrun = 1
+
 !! sets sex, 0 male, 1 female, 2 female herm, 3 male herm
 npctempgsex = ARGS[0]
 

locations/npcpreservec.qsrc

@@ -3,6 +3,11 @@
 !! {This initializes the array and acts as a gate to deny bad calls.}
 $npctemp = $ARGS[0]
 
+!! npcgen_lastrun is a flag to help track whether npcgeneratec or npcpreservec has been run last
+!! npcgeneratec is 1
+!! npcpreservec is 2
+npcgen_lastrun = 1
+
 if mid($npctemp,1,1) = 'C':
 	:npcsavebsanityloop
 	i = 0