Merge branch 'master' of https://git.tfgames.site/hornguy6/glife

locations/booty_call_cum.qsrc

@@ -289,6 +289,8 @@ if $ARGS[0] = 'fuck_cum':
 	if booty_call['morning_after'] = 1:booty_call['morning_fuck'] = 1
 	booty_call['fuck'] = 1
 	booty_call['no_sex'] = 0
+	booty_call['fuck_again'] = 0
+	booty_call['must_fuck'] = 0
 	if booty_call['speed'] = 1: booty_call['gentle_fuck'] = 1
 	if booty_call['speed'] = 2: booty_call['steady_fuck'] = 1
 	if booty_call['speed'] = 3: booty_call['rough_fuck'] = 1

locations/booty_call_sex.qsrc

@@ -7,6 +7,7 @@ if $ARGS[0] = 'sex_start':
 		act'Fuck <<$npc_firstname[$boy]>>':booty_call['must_fuck'] = 1 & gs 'booty_call_sex', 'sex_pre'
 	elseif booty_call['cock_remove'] = 0 and $booty_call['last_cum'] = 'creampie' and ($booty_call['position'] = 'miss' or  $booty_call['position'] = 'doggy' or  $booty_call['position'] = 'cowgirl'):
 		act'Fuck again':
+			booty_call['must_fuck'] = 1
 			if booty_call['cum_count'] >= npc_sexdrive[$boy]:
 				gs 'booty_call_after', 'fucked_out'
 			else
@@ -48,6 +49,7 @@ if $ARGS[0] = 'sex_start':
 !!					'"Ready to go again?" you grin eagerly at <<$npc_firstname[$boy]>>.'
 !!					'"Yeah, gimme a minute to get hard again," he grunts back, working himself with his hand to force some stiffness back into his cock while you decide what position you want to fuck in next.'
 				gs 'booty_call_sex', 'reset'
+				booty_call['must_fuck'] = 1
 				if booty_call['no_condom'] = 0:
 					gs 'booty_call_condoms', 'condoms'
 				else
@@ -998,8 +1000,7 @@ if $ARGS[0] = 'reset':
 	booty_call['spit'] = 0
 	booty_call['gag'] = 0
 	booty_call['react'] = 0
-	booty_call['fuck_again'] = 0
-	booty_call['must_fuck'] = 0
+	
 	booty_call['smoke_break'] = 0
 	booty_call['first_break'] = 0
 	booty_call['cycle_limit'] = 0

locations/booty_call_shower.qsrc

@@ -94,6 +94,8 @@ end
 
 if $ARGS[0] = 'before_together1':
 	booty_call['start_shower'] = 1
+	noShampoo = 1
+	dynamic $showerdin
 	gs'arousal', 'massage',5,'no_orgasm_msg'
 	gs'stat'
 	cla & *clr
@@ -1745,6 +1747,8 @@ end
 
 if $ARGS[0] = 'morning_sex_end':
 	booty_call['npc_morning_shower'] = 2
+	noShampoo = 1
+	dynamic $showerdin
 	act'Finish up':
 		cla
 		act'Put on a towel':gt'booty_call_shower', 'morning_towel_on'