Merge remote-tracking branch 'upstream/master'

locations/Cum_Manage.qsrc

@@ -875,7 +875,7 @@ if $ARGS[0] = 'cum_stat_display':
 					end
 				end
 				$icon_txtiscum = $txtiscum
-				if j <= 4 and trait['cumeater'] = 1 and $txtiscum = 'cum': $txtiscum = '<a href="exec:gs ''cum_manage'', ''cumeater'', <<i>>"><font color=#0064FF>' + $txtiscum + '</font></a>'
+				if j <= 4 and pcs_traits['cumeater'] = 1 and $txtiscum = 'cum': $txtiscum = '<a href="exec:gs ''cum_manage'', ''cumeater'', <<i>>"><font color=#0064FF>' + $txtiscum + '</font></a>'
 				if $txtperson ! '':
 					$txtperson = ' from ' + $txtperson
 				end

locations/MartinSex2.qsrc

@@ -954,7 +954,7 @@ if $ARGS[0] = 'MartinCumshot_Mouth':
 	*nl
 	$orgasm_txt = 'The taste of Martin''s hot cum on your tongue finally pushes you over the edge, causing you to moan around his cock as you keep pleasing him, both him and you completely taken off-guard by your oral orgasm.'
 	gs 'arousal', 'bj', 1
-	'When his ' + iif(pcs_horny=0,'and your orgasm have','orgasm has') + ' subsided, you release his softening dick from your mouth once more and show Martin his jizz on your tongue before swallowing it' + iif(trait['cumeater']=1,', savoring the taste you come to love as the thick liquid goes down your throat',' reluctantly, knowing that men love it when women do that') + '. The smile he gives you as you show him your clean tongue is simply priceless.'
+	'When his ' + iif(pcs_horny=0,'and your orgasm have','orgasm has') + ' subsided, you release his softening dick from your mouth once more and show Martin his jizz on your tongue before swallowing it' + iif(pcs_traits['cumeater']=1,', savouring the taste you come to love as the thick liquid goes down your throat',' reluctantly, knowing that men love it when women do that') + '. The smile he gives you as you show him your clean tongue is simply priceless.'
 	$orgasm_txt = ''
 	pcs_energy += 5
 	gs 'cum_call', 'mouth', $boy, 1

locations/albina_house_events.qsrc

@@ -644,9 +644,9 @@ if $ARGS[0] = 'hot_tub_no_panties':
 		'"You already know I don''t wear them," you smirk back.'
 	elseif albina['commando_know'] > 0:
 		'"You already know I consider panties to be optional," you smirk back.'
-	elseif trait['commando_lvl'] = 3:
+	elseif pcs_traits['commando_lvl'] = 3:
 		'"I hate wearing panties," you smirk, stepping into the tub with her.'
-	elseif trait['commando_lvl'] > 0:	
+	elseif pcs_traits['commando_lvl'] > 0:	
 		'"I don''t always wear them," you smirk back, stepping into the tub with her.'
 	else
 		'"I uhh, may have forgotten to wear them today..." you blush, stepping into the tub with her.'
@@ -656,15 +656,15 @@ if $ARGS[0] = 'hot_tub_no_panties':
 	else
 		gs 'albina_house_events', 'hot_tub_no_panties2'
 	end
-	albina['commando_know'] = trait['commando_lvl']
+	albina['commando_know'] = pcs_traits['commando_lvl']
 end
 	
 	
 if $ARGS[0] = 'hot_tub_no_panties2':
 	*nl
-	'She grins back at you and starts wriggling around beneath the bubbling water. Her knees briefly breach the surface and a moment later, she tosses something over her shoulder. Black fabric wetly slaps onto the poolside and peering past her, you realize it''s Albina''s thong. She leans back into the hot tub''s jets just before taking a sharp gasp.'
+	'Albina grins back at you and starts wriggling around beneath the bubbling water. Her knees briefly breach the surface and a moment later, she pulls up a thin, stringy, piece of fabric. She stretches it between her hands and slingshots it past your head, making a wet slapping sound when it lands on the deck. Turning your head to see what it was, you realize as soon as you lay eyes on it: it''s her thong. As you turn around, Albina takes a sharp gasp.'
 	*nl
-	'"Oh <i>fuck...</i>" she moans. "I should do this more often..."'
+	'"Oh <i>fuck...</i>" she moans, leaning further into the water. "I should do this more often..."'
 	*nl
 	gs 'albina_house_events', 'hot_tub_no_panties3'
 end
@@ -719,7 +719,7 @@ if $ARGS[0] = 'goodie_two_shoes':
 		'"Look who''s talking, bitch," you scowl at Albina, making her laugh out loud.'
 		gs 'albina_house_events', 'hot_tub_no_panties2'
 	end
-	if trait['commando_lvl'] > 0:
+	if pcs_traits['commando_lvl'] > 0:
 		albina['goodie_two_shoes_commando'] = 1
 		act 'Guess you didn''t know me':
 			cla & *nl

locations/albina_wine_event.qsrc

@@ -574,7 +574,7 @@ if $ARGS[0] = 'wine_chat1':
 				albina['wine_convo_7'] = daystart
 			end
 			'"So, you really don''t wear panties?" Albina slurs while turning her head toward your pussy. "Like, ever?"'
-			if trait['commando_lvl'] = 3:
+			if pcs_traits['commando_lvl'] = 3:
 				act 'Only when I have to':
 					cla & *nl
 					'"Only when I have to," you say, wrinkling your nose in annoyance. "Sometimes you just can''t get away with it."'
@@ -627,7 +627,7 @@ if $ARGS[0] = 'wine_chat1':
 					'"What?" Albina looks confused. "That doesn''t make any sense at all..."'
 					gs 'albina_wine_event','wine_chat2'
 				end
-			elseif trait['commando_lvl'] > 0:
+			elseif pcs_traits['commando_lvl'] > 0:
 				act 'I just forget sometimes':
 					cla & *nl
 					'"Not <i>never</i>," you slur. "I just...  forget to put them on sometimes..."'
@@ -671,7 +671,7 @@ if $ARGS[0] = 'wine_chat1':
 					end
 				end
 				
-				if trait['commando_lvl'] = 1:
+				if pcs_traits['commando_lvl'] = 1:
 					act 'Only with skirts':
 						cla & *nl
 						'"Only when I''m wearing skirts," you say. "My pussy gets itchy when it rubs against my pants."'
@@ -760,7 +760,7 @@ if $ARGS[0] = 'wine_chat2':
 			'"Damn straight," Albina says, throwing up her hand and high fiving you.'
 			act 'Continue':gt 'albina_wine_event','wine_chat1'
 		end
-		if trait['cumeater'] > 0:
+		if pcs_traits['cumeater'] > 0:
 			act 'I love the taste':
 				cla & *nl
 				'"Me too," you smile. "I love the way it feels going down my throat. Taste is pretty good too."'

locations/arousal.qsrc

@@ -188,10 +188,10 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		orgasm_flag['anal'] = 1
 		count['rimming'] = 1
 		stim['act'] = 30
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['mag'] += 2
 			stim['act'] = 50
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['mag'] += 4
 			stim['act'] = 80
 		end
@@ -208,9 +208,9 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		else
 			count['anal'] = 1
 		end
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['mag'] += 1
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['mag'] += 3
 		end
 		if pcs_ass < temp_dick:pcs_ass += 1
@@ -243,10 +243,10 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		orgasm_flag['anal'] = 1
 		count['anal_finger'] = 1
 		stim['act'] = 40
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['mag'] += 1
 			stim['act'] = 60
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['mag'] += 1
 			stim['act'] = 80
 		end
@@ -254,9 +254,9 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		orgasm_flag['anal'] = 1
 		count['anal_fist'] = 1
 		stim['act'] = 30
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['act'] = 50
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['act'] = 70
 		end
 		if pcs_ass + anal_slip < 30:
@@ -268,9 +268,9 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		orgasm_flag['anal'] = 1
 		count['self_fisting_anal'] = 1
 		stim['act'] = 30
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['act'] = 50
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['act'] = 70
 		end
 		if pcs_ass + anal_slip < 30:
@@ -292,9 +292,9 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		if agrdif > anal_slip: agrdif = agrdif - anal_slip else if agrdif > 0: agrdif = 0
 		if -agrdif > anal_slip: agrdif = agrdif + anal_slip else if agrdif < 0: agrdif = 0
 		stim['act'] = 80 - (iif(altdif>0,altdif,-altdif) + iif(agrdif >0,agrdif,-agrdif)) + temp_silavag*8
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['act'] += 10
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['mag'] += 1
 		end
 		if agrdif < 0: agrdif = 0
@@ -316,9 +316,9 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		if agrdif > anal_slip: agrdif = agrdif - anal_slip else if agrdif > 0: agrdif = 0
 		if -agrdif > anal_slip: agrdif = agrdif + anal_slip else if agrdif < 0: agrdif = 0
 		stim['act'] = 80 - (iif(altdif>0,altdif,-altdif) + iif(agrdif >0,agrdif,-agrdif)) + temp_silavag*8
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['act'] += 10
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['mag'] += 1
 		end
 		if agrdif < 0: agrdif = 0
@@ -331,16 +331,16 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		count['anal_vibe'] = 1
 		stim['mag'] += 1
 		stim['act'] = 60
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['mag'] += 1
 			stim['act'] = 70
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['mag'] += 2
 			stim['act'] = 90
 		end
 	elseif $ARGS[0] = 'vaginal':
+		
 		orgasm_flag['vaginal'] = 1
-
 		!! pre-cum check
 		if rand(0,120) < ARGS[1]: cumprecheck = 1 & gs 'cum_manage'
 		
@@ -552,7 +552,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 
 	!! anal acts
 	if (mid($ARGS[0],1,4) = 'anal' and mid($ARGS[0],len($ARGS[0])-3,len($ARGS[0])) ! 'give') or $ARGS[0] = 'rimming':
-		if traits['buttslut_lvl'] = 3:
+		if pcs_traits['buttslut_lvl'] = 3:
 			stim['act'] += 20
 		end
 	end

locations/audition_sex1.qsrc

@@ -338,7 +338,7 @@ if $ARGS[0] = 'reluctant_bj2':
 						cla & *clr
 						'<center><video autoplay loop src="images/shared/sex/cum/mouth/gag1.mp4"></video></center>'
 						'With a deep breath through your nose, you try to swallow but just feel too disgusted to do it. You gag hard and cough it all back up. Instinctively, you put your hands up to catch some but the most spatters all down your neck and across your breasts.'
-						if trait['cumeater'] = 1:
+						if pcs_traits['cumeater'] = 1:
 							'It''s not that you''re unaccustomed to swallowing cum or even mind most of the time, you just don''t want to do it <i>this</i> time. Everything about this situation turns you off.'
 						elseif swallow > 0:
 							'You''ve swallowed a few times before but it''s still gross. <i>Ugh.</i> Even after spitting it out, the aftertaste still lingers.'
@@ -388,7 +388,7 @@ if $ARGS[0] = 'reluctant_bj2':
 						'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow2.mp4"></video></center>'
 						audition['cast_couch'] = 1
 						swallow += 1
-						if trait['cumeater'] = 1:
+						if pcs_traits['cumeater'] = 1:
 							'You swallow pretty regularly, so it''s not like this is any real big ask for you to do.'
 						elseif swallow > 0:
 							'You''ve swallowed a few times before but... this is still kind of...'

locations/booty_call.qsrc

@@ -6,30 +6,48 @@ if $ARGS[0] = 'scheduler':
 	i = 0
 	:booty_call_time_sched_loop
 	if i < ARRSIZE('$FuckBuddy'):
-		if (((rand(1,10) <= npc_sexdrive[$FuckBuddy[i]]) and (rand(1,npc_rel[$FuckBuddy[i]]) > 0)) or npc_booty_call[$FuckBuddy[i]] = daystart) and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_big_fight[$FuckBuddy[i]] < daystart - 7:
+		if ((rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and (rand(1,npc_rel[$FuckBuddy[i]]) > 0)) and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_big_fight[$FuckBuddy[i]] < daystart - 7:
 			if npc_start_free_time[$FuckBuddy[i]] = 0: 
 				$boy = $FuckBuddy[i]
 				gs 'saveupdater', 'npc_stat_update'
 			end
 			if npc_booty_call[$FuckBuddy[i]] = daystart:
-				npc_booty_call_time[$FuckBuddy[i]] = hour * 60
+				npc_booty_call_time[$FuckBuddy[i]] = hour * 60 + rand(0,120)
 			elseif week = npc_day_off[$FuckBuddy[i]]:
 				booty_call_time[$FuckBuddy[i]] = 600 + rand(0,720)
 			elseif week ! npc_day_off[$FuckBuddy[i]]:
 				booty_call_time[$FuckBuddy[i]] = rand((npc_start_free_time[$FuckBuddy[i]] * 60), (npc_end_free_time[$FuckBuddy[i]] - 1) * 60)
+			else
+				booty_call_time[$FuckBuddy[i]] = 2000
 !!			elseif week < 6:
 !!				booty_call_time[$FuckBuddy[i]] = 900 + rand(0,210)
 !!			else
 !!				booty_call_time[$FuckBuddy[i]] = 600 + rand(0,720)
 			end
-		else
-			booty_call_time[$FuckBuddy[i]] = 2000
 		end
 		i += 1
 		jump 'booty_call_time_sched_loop'
 	end
 end
 
+if $ARGS[0] = 'set_booty_call_date':
+	if booty_call['sleepover'] = 1:
+		npc_booty_call[$boy] = daystart
+	else
+		npc_booty_call[$boy] = daystart + 1
+	end
+	npc_booty_call_time[$boy] = npc_start_free_time[$boy]
+end
+
+if $ARGS[0] = 'block_booty_calls':
+	if booty_call['sleepover'] = 1:
+		npc_booty_call[$boy] = 0
+		npc_no_booty_call[$boy] = daystart
+	else
+		npc_no_booty_call[$boy] = daystart + 1
+	end
+end
+
 if $ARGS[0] = 'SMS raiser':
 	i = 0
 	:booty_call_sms_raiser_loop

locations/booty_call_after.qsrc

@@ -78,14 +78,23 @@ end
 
 if $ARGS[0] = 'stop_here':
 	act'Finish here?':
-		cla & *clr
-		if booty_call['blowjob_continue_ask'] = 1:
+		if booty_call['sleep_fuck'] > 0:
+			cla & *clr
+			$npc_apt_bedroom[$boy]
+			'"Satisfied?" you ask sleepily.'
+		elseif booty_call['blowjob_continue_ask'] = 1:
+			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/blowjob/play1.mp4"></video></center>'
 			'"There, happy now?" you ask, playing with his cock.'
 		elseif booty_call['keep_going_continue'] > 0:
+			cla & *clr
 			$npc_apt_bedroom[$boy]
 			'"Is that good enough for you now?" you ask.'
+		elseif booty_call['first_break'] = 1:
+			cla & *nl
+			'"Actually," you say. "I think I might be happy just to finish here. How about you?"'
 		else
+			cla & *clr
 			$npc_apt_bedroom[$boy]
 			'"I think I''m good here," you say. "How about you?"'
 		end
@@ -95,9 +104,16 @@ if $ARGS[0] = 'stop_here':
 			elseif booty_call['keep_going_continue'] > 0:
 				'"Just a couple more times?" <<$npc_firstname[$boy]>> begs. "I still want to get off a few more times with you."'
 				gs'booty_call_after', 'stop_here_options'
-			else
+			elseif npc_abusive[$boy] = 1 or npc_selfish[$boy] = 1 or (npc_caretaker[$boy] ! 1 and rand(1,3)):
 				'"You''re done already?" <<$npc_firstname[$boy]>> complains. "I still want to get off a few more times with you."'
 				gs'booty_call_after', 'stop_here_options'
+			elseif npc_caretaker[$boy] = 1:
+				'"I was actually hoping to go a few more times," <<$npc_firstname[$boy]>> says a bit wistfully. "But if you want to stop, that''s all right."'
+				gs'booty_call_after', 'stop_here_options'
+			elseif npc_caretaker[$boy] = 1:
+				
+				gs'booty_call_after', 'stop_here_options'
+				
 			end
 			
 		else
@@ -236,17 +252,42 @@ end
 if $ARGS[0] = 'well_continue':
 	act'Well...':
 		booty_call['blue_ball'] = 0
-		cla & *nl
-		if booty_call['no_time'] > 0:
-			'"Well... Maybe I could be a <i>little</i> late..." you say with a soft smile.'
-		else
+		cla
+		act'We can''t have that':
+			cla & *nl
+			'"Well, we can''t have you going unsatisfied now can we?" you say with a teasing smile.'
+			booty_call['keep_going_continue'] += 1
+			gs'booty_call_after', 'well_continue2'
+		end
+		
+		act'I have a <i>little</i> more time':
+			cla & *nl
 			'"Well... I guess I might be able to keep going a <i>little</i> longer," you say with a soft smile.'
+			gs'booty_call_after', 'well_continue2'
+		end
+		if booty_call['no_time'] = 0:
+			act'I can be late':
+				cla & *nl
+				'"Well... Maybe I could be a <i>little</i> late..." you say with a soft smile.'
+				gs'booty_call_after', 'well_continue2'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'well_continue2':
+	booty_call['keep_going_continue'] += 1
+	gs'booty_call_sex', 'reset'
+	act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
+	act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
+	act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
+	if booty_call['cock_remove'] = 0:
+		act'Keep fucking':
+			cla
+			gs 'booty_call_sex', 'reset'
+			gs 'booty_call_condoms', 'condoms'
+			gt 'booty_call_<<$booty_call[''reset_pos'']>>', $booty_call['pos_speed']
 		end
-		booty_call['keep_going_continue'] += 1
-		gs'booty_call_sex', 'reset'
-		act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
-		act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
-		act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
 	end
 end
 
@@ -267,19 +308,7 @@ if $ARGS[0] = 'keep_going':
 				act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
 				act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
 			else
-				cla & *nl
-				$booty_call['reset_pos'] = $booty_call['position']
-				minut += rand(1,2)
-				'"Think you can keep going?" you ask, flexing your pussy around his cock. It twitches inside in response, feeling a little stiffer than before. "That feels like a yes," you grin.'
-				gs'booty_call_sex', 'reset'
-				act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
-				act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
-				act'Keep fucking':
-					cla
-					gs 'booty_call_sex', 'reset'
-					gs 'booty_call_condoms', 'condoms'
-					gt 'booty_call_<<$booty_call[''reset_pos'']>>', $booty_call['pos_speed']
-				end
+				
 			end
 		else
 			cla & *clr
@@ -374,6 +403,7 @@ if $ARGS[0] = 'fucked_out':
 	else
 		'You realize with a start that he''s already going soft inside you.'
 	end
+	'"I think I might be all fucked out for the day..."'
 	act'Ugh':
 		cla & *clr
 		$booty_call['end_comment'] = '"Ugh..." you groan with a roll of your eyes.'
@@ -383,6 +413,7 @@ if $ARGS[0] = 'fucked_out':
 			gs'booty_call_after', 'after_sex1'
 		else
 			gs'booty_call_after', 'pull_apart'
+			gs'booty_call_after', 'after_sex2'
 		end
 	end
 	
@@ -415,6 +446,15 @@ if $ARGS[0] = 'fucked_out':
 			gs'booty_call_after', 'after_sex2'
 		end
 	end
+	if booty_call['force_harden'] = 0:
+		act'No you''re not':
+			cla
+			booty_call['force_harden'] = 1
+			booty_call['not_done'] = 1
+			gs'booty_call_sex', 'harden_hand'
+			gs'booty_call_sex', 'harden_mouth'
+		end
+	end
 	if booty_call['cum_count'] < 3:
 		act'"Seriously?"':
 			cla & *clr
@@ -582,8 +622,16 @@ if $ARGS[0] = 'wipe_tits':
 end
 
 if $ARGS[0] = 'finish':
+	$loc = 'booty_call_after'
+	$loc_arg = 'after_sex2'
 	if booty_call['orgasm_count'] = 0 and booty_call['fake_orgasm_count'] = 0 and booty_call['fuck'] = 0 and npc_selfish[$boy] = 0 and (npc_caretaker[$boy] = 1 or rand(0,1) = 1):
 		gs'booty_call_after', 'no_cum_end'
+	elseif booty_call['force_harden'] = 2:
+		booty_call['force_harden'] = 3
+		cla & *clr
+		$npc_apt_bedroom[$boy]
+		'"I really can''t... keep going... <<$npc_firstname[$boy]>> huffs exhaustedly.'
+		gs'booty_call_after', 'after_sex1'
 	elseif booty_call['cum_count'] >= npc_sexdrive[$boy]:
 		booty_call['sex_end'] = 1
 		'"Yeah," <<$npc_firstname[$boy]>> pants. "I''m totally tapped out."'
@@ -719,18 +767,18 @@ if $ARGS[0] = 'black_out':
 			'Your simultaneous orgasm was too much to handle and your knees give out underneath you, collapsing onto the bed in exhaustion as your vision begins to blur and fade. The last thing you''re aware of is <<$npc_firstname[$boy]>>''s cock slipping from your pussy, the tickling sensation of his cum leaking from your snatch, and then...'
 		elseif $booty_call['position'] = 'cowgirl':
 			'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/1.jpg"></center>'
-			'Your simultaneous orgasm was too much to handle and you collapse onto <<$npc_firstname[$boy]>>''s chest, no strength left to stay upright and your vision begins to blur. At the back of your mind, you realize that your body is succumbing to exhaustion. The last thing you''re aware of is your breasts pressed up against <<$npc_firstname[$boy]>>''s chest, his cock stuffed inside you and cum filling your pussy to the brim, and then...'
+			'Your simultaneous orgasm was too much to handle and you collapse, no strength left to stay upright and your vision begins to blur. At the back of your mind, you realize that your body is succumbing to exhaustion. The last thing you''re aware of is your breasts pressed up against <<$npc_firstname[$boy]>>''s chest, his cock stuffed inside you and cum filling your pussy to the brim, and then...'
 		end
 	elseif $booty_call['last_cum'] = 'creampie':
 		if $booty_call['position'] = 'miss':
 			'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/2.jpg"></center>'
-			'Exhaustion hits you in a sudden wave and your vision begins to blur. The last thing you''re aware of is <<$npc_firstname[$boy]>>''s inside you, his cock and cum filling your pussy to the brim, and then...'
+			'Exhaustion hits you in a sudden wave and your vision begins to blur. The last thing you''re aware of is <<$npc_firstname[$boy]>> inside you, his cock and cum filling your pussy to the brim, and then...'
 		elseif $booty_call['position'] = 'doggy':
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/doggy1.jpg"></center>'
 			'Exhaustion hits you in a sudden wave and your knees give out underneath you, collapsing onto the bed in exhaustion as your vision begins to blur and fade. The last thing you''re aware of is <<$npc_firstname[$boy]>>''s cock slipping from your pussy, the tickling sensation of his cum leaking from your snatch, and then...'
 		elseif $booty_call['position'] = 'cowgirl':
 			'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/1.jpg"></center>'
-			'Exhaustion hits you in a sudden wave and you collapse onto <<$npc_firstname[$boy]>>''s chest, no strength left to stay upright and your vision begins to blur. The last thing you''re aware of is your breasts pressed up against <<$npc_firstname[$boy]>>''s chest, his cock and cum filling your pussy to the brim, and then...'
+			'Exhaustion hits you in a sudden wave and you collapse, no strength left to stay upright and your vision begins to blur. The last thing you''re aware of is your breasts pressed up against <<$npc_firstname[$boy]>>''s chest, his cock and cum filling your pussy to the brim, and then...'
 		end
 	elseif $booty_call['last_cum'] = 'facial':
 		'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
@@ -768,6 +816,8 @@ if $ARGS[0] = 'black_out':
 			gs'stat'
 			!! eventually code in an option where girlfriend comes home and catches you in her boyfriend''s bed
 			gt'booty_call_after', 'black_out_wake'
+		elseif rand(1,10) < npc_sexdrive[$boy] - (booty_call['cum_count']/2) and (stat['think_virgin'] ! 1 or booty_call['fuck_count'] > 0) and booty_call['sleep_fuck'] = 0:
+			gt'booty_call_sex', 'sleep_sex'
 		else
 			if alko > 6:
 				booty_call['hangover'] = 1
@@ -909,8 +959,7 @@ if $ARGS[0] = 'cum_clean':
 			gs 'cum_cleanup', 'cleanloc'
 			stat['swallow'] += 1
 			cla & *clr
-			'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
-			$npc_apt_bedroom[$boy]
+			'<center><img <<$set_imgh>> src="images/shared/sex/cum/lick_fingers.jpg"></center>'
 			'Briefly making eye contact with <<$npc_firstname[$boy]>>, you use your fingers to gather up all the loose cum on you and stick out your tongue, running it up your hand, licking every drop from it and into your mouth. You give your hand a thorough tongue bath, sucking your fingers clean at the end. Once finished, you smack your lips, smiling at <<$npc_firstname[$boy]>> who stared at you the whole time.'
 			if booty_call['he_cleaned'] = 0:
 				'"Any chance I could get one of those?" he gestures towards his cock.'
@@ -1062,60 +1111,70 @@ if $ARGS[0] = 'pull_apart':
 end
 
 if $ARGS[0] = 'after_sex2':
-	act'Get dressed':gt'booty_call_after', 'dressing1'
-
-	if booty_call['shower'] = 0:
-		act'Take a shower':
+	if booty_call['sleep_fuck'] > 0:
+		act'Go back to sleep':
 			cla & *clr
-			NoShampoo = 1
-			$npc_apt_bedroom[$boy]
-			'"I''m gonna borrow your shower," you say, sliding out of the bed and padding towards the bathroom.'
-			if rand(1,10) < npc_sexdrive[$boy]:
-				'"Why don''t I join you?" <<$npc_firstname[$boy]>> says, a glimmer in his eyes that lets you know he wants to do more than just "join" you.'
-				act'I''d rather not':
-					cla & *nl
-					'"No thanks," you say, smiling back wryly as you keep going. "I like my alone time," you say, just before you shut the door behind you.'
-					act'Shower':gt'booty_call_shower', 'after_alone'
-				end
-				act'Sounds nice':
-					cla & *nl
-					'"That sounds like nice," you smile and you let him lead you into the bathroom.'
-					act'Go shower':gt'booty_call_shower', 'after_shower_together'
-				end
+			'<center><img <<$set_imgh>> src="images/shared/sex/after/cuddle2.jpg"></center>'
+			'Your midnight fuck over, you and <<$npc_firstname[$boy]>> cuddle up together and fall asleep again.'
+			act'Sleep':gt'booty_call_after', 'sleep_function'
+		end
+	else
+		act'Get dressed':gt'booty_call_after', 'dressing1'
+	end
+	
+	if booty_call['relax_after'] = 0:
+		act'Relax together':
+			cla & *clr
+			if npc_smoker[$boy] < 1:
+				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+				'You and <<$npc_firstname[$boy]>> both lay back, quietly relaxing together in the still bliss of your love-making.'
 			else
-				'"Sure thing. Don''t use up all my soap."'
-				act'Okay':
-					cla & *nl
-					'"Okay. I won''t," you promise and head into the bathroom.'
-					act'Shower':gt'booty_call_shower', 'after_alone'
-				end
-
-				act'I''ll try':
-					cla & *nl
-					'"I''ll try not to," you smile, padding your way into the bathroom.'
-					act'Shower':gt'booty_call_shower', 'after_alone'
-				end
-
-				act'We''ll see':
-					cla & *nl
-					'"We''ll see about that," you smirk and pad your way into the bathroom.'
-					act'Shower':gt'booty_call_shower', 'after_alone'
-				end
+				'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke2.jpg"></center>'
+				'You lay back, quietly relaxing beside <<$npc_firstname[$boy]>> in the still bliss of your love-making as he puffs away on his cigarette.'
 			end
+			gs'booty_call_after', 'relax_together'
+		end
+	end
+	
+	if booty_call['sleep_fuck'] = 0:
+		if booty_call['shower'] = 0:
+			act'Take a shower':gs'booty_call_shower', 'after_borrow_shower'
 		end
 	end
 
-	if booty_call['phone'] = 0 and booty_call['angry_after'] = 0:
-		act'Play with your phone':
-			booty_call['phone'] = 1
-			cla & *clr
-			minut += rand(2,5)
-			'<center><img <<$set_imgh>> src="images/shared/sex/after/phone.jpg"></center>'
-			'You play with your phone.'
-			gs'booty_call_after', 'after_sex2'
+	if $stat_cum_msg ! '':
+		if salfetka > 0:
+			act'Clean yourself up (use your own wipes)':
+				booty_call['wipes'] = 1
+				salfetka -= 1
+				gt'booty_call_after', 'wipes'
+			end
+		end
+
+		act'Clean yourself up (ask him for wipes)':
+			booty_call['wipes'] = 2
+			gt'booty_call_after', 'wipes'
 		end
 	end
+	
+	gs'booty_call_after', 'plan_b'
+	gs'booty_call_after', 'birth_control_pill_take'
+	gs'booty_call_after', 'spend_night_ask'
+end
 
+if $ARGS[0] = 'relax_together':
+	cla
+	booty_call['relax_after'] = 1
+	act'Stop relaxing':cla & gs'booty_call_after', 'after_sex2'
+	
+	if booty_call['after_kiss'] = 0:
+		act'Kiss <<$npc_firstname[$boy]>>':gt 'booty_call_after', 'kiss'
+	end
+	
+	if booty_call['pillow_talk'] = 0:
+		act'Pillow talk':gt'booty_call_pillow_talk', 'start'
+	end
+	
 	if siga > 0 and booty_call['cigarette'] = 0 and booty_call['pillow_talk'] = 0 and booty_call['angry_after'] = 0:
 		act'Have a smoke':booty_call['cigarette'] = 1 & gt'booty_call_after', 'smoke'
 
@@ -1126,7 +1185,7 @@ if $ARGS[0] = 'after_sex2':
 		end
 	end
 
-	if npc_smoker[$boy] > 0 and booty_call['annoyed'] = 0 and booty_call['bum_cigarette'] = 0 and booty_call['pillow_talk'] = 0 and booty_call['angry_after'] = 0:
+	if npc_smoker[$boy] > 0 and booty_call['annoyed'] = 0 and booty_call['bum_cigarette'] = 0 and booty_call['cigarette'] = 0 and booty_call['pillow_talk'] = 0 and booty_call['angry_after'] = 0:
 		act'Bum a cigarette':
 			booty_call['bum_cigarette'] = 1
 			siga += 1
@@ -1141,78 +1200,61 @@ if $ARGS[0] = 'after_sex2':
 			gt'booty_call_after', 'smoke'
 		end
 	end
-
-	if $stat_cum_msg ! '':
-		if salfetka > 0:
-			act'Clean yourself up (use your own wipes)':
-				booty_call['wipes'] = 1
-				salfetka -= 1
-				gt'booty_call_after', 'wipes'
-			end
-		end
-
-		act'Clean yourself up (ask him for wipes)':
-			booty_call['wipes'] = 2
-			gt'booty_call_after', 'wipes'
-		end
-	end
-
-	if booty_call['pillow_talk'] = 0:
-		act'Pillow talk':gt'booty_call_pillow_talk', 'start'
+	
+	if booty_call['sleep_fuck'] > 0:
+!!		gs'booty_call_pillow_talk', 'sleep_fucking_talk'
+	elseif pcs_sleep < 30 and booty_call['get_up'] = 0 and booty_call['angry_after'] = 0:
+		act'Rest your eyes':gt'booty_call_after', 'bed'
 	end
+	
+end
 
-	if (hour >= 20 or hour < 5) and booty_call['spend_night'] = 0 and booty_call['mom_kill'] = 0 and booty_call['no_time'] = 0 and booty_call['angry_after'] = 0:
-		act'Ask to spend the night':
-			booty_call['spend_night'] = 1
-			cla & *clr
-			$npc_apt_bedroom[$boy]
-			'"Mind if I spend the night?" you ask.'
-			
-			act'I don''t feel like going home':
+if $ARGS[0] = 'kiss':
+	cla & *clr
+	if cum_loc['face'] <= 0:
+		npc_rel[$boy] += 2
+		$orgasm_or = 'no'
+		booty_call['after_kiss'] = 1
+		'<center><img <<$set_imgh>> src="images/shared/sex/after/kiss1.jpg"></center>'
+		if npc_rel[$boy] < 50:
+			gs 'arousal', 'kiss', -2
+			'You lean over to kiss <<$npc_firstname[$boy]>>, gently pressing your lips against his.'
+			'"What was that for?" <<$npc_firstname[$boy]>> asks.'
+			act'Just felt like it':
 				cla & *clr
-				$npc_apt_bedroom[$boy]
-				'"Mind if I spend the night?" you ask. "I don''t feel like going home tonight."'
-				gs'booty_call_after', 'spend_night'
-			end
-
-			if mid($start_type,1,2) = 'sg':
-				act'I''m sick of my mom':
-					cla & *clr
-					$npc_apt_bedroom[$boy]
-					'"Mind if I spend the night?" you ask. "My mom has been such a bitch lately and I don''t want to see her."'
-					gs'booty_call_after', 'spend_night'
-				end
+				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+				'"I just felt like it," you shrug, giving <<$npc_firstname[$boy]>> a pleasant smile.'
+				gs 'booty_call_after', 'relax_together'
 			end
-			
-			if hour >= 22 or hour < 5:
-				act'It''s late':
-					cla & *clr
-					$npc_apt_bedroom[$boy]
-					'"Mind if I spend the night?" you ask. "It''s late and I don''t want to go."'
-					gs'booty_call_after', 'spend_night'
-				end
+			act'Cause I like you':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+				'"Cause I like you," you say, giving <<$npc_firstname[$boy]>> a pleasant smile.'
+				gs 'booty_call_after', 'relax_together'
 			end
-			
-			if pcs_lovers - pcs_girlfriends > 0 and living_with_npc > 0:
-				act'I don''t want to see my boyfriend(annoyed)':
+			if booty_call['orgasm_count'] > 0:
+				act'For making me come':
 					cla & *clr
-					$npc_apt_bedroom[$boy]
-					'"Mind if I spend the night?" you ask. "My boyfriend''s been pissing me off lately and I don''t want to go home to that."'
-					gs'booty_call_after', 'spend_night'
+					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+					'"A thank you," you smile gratefully. "For making me come."'
+					gs 'booty_call_after', 'relax_together'
 				end
-
-!!{				act'I don''t want to see my boyfriend(guilt)':
-
-
-				end}
 			end
+		else
+			gs 'arousal', 'kiss', -10, 'no_orgasm_msg'
+			gs 'arousal', 'kiss', rand(2,3)
+			'You lean over to kiss <<$npc_firstname[$boy]>>, gently pressing your lips against his. Instantly, it sparks something within you and the kiss takes on a passion of its own and you find yourself drinking him in; his taste, his scent, his tongue, feverishly pressing your faces together as if you might die at any second.'
+			*nl
+			'It''s several minutes before you finally break apart, panting breathlessly as you stare into each others eyes.'
+			gs 'booty_call_after', 'relax_together'
 		end
+		$orgasm_or = ''
+	else
+		'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+		'You lean over to kiss <<$npc_firstname[$boy]>> before his eyes widen and he shies away. It puzzles you for a moment before he draws a finger around his face in a circle.'
+		'"You''ve still got..." You blink before remembering. The cum. Right. He probably doesn''t want to kiss you with his own load blown all over your face.'
+		gs 'booty_call_after', 'relax_together'
 	end
-	if pcs_sleep < 30 and booty_call['get_up'] = 0 and booty_call['angry_after'] = 0:
-		act'Rest your eyes':gt'booty_call_after', 'bed'
-	end
-	gs'booty_call_after', 'plan_b'
-	gs'booty_call_after', 'birth_control_pill_take'
 end
 
 if $ARGS[0] = 'plan_b':
@@ -1350,7 +1392,7 @@ if $ARGS[0] = 'smoke':
 	elseif npc_smoker[$boy] > 0:
 		'Seeing <<$npc_firstname[$boy]>> grab a pack, you reach for your purse and pull out your own cigarettes and both of you light up together.'
 	else
-		'You pull a cigarette from your purse and place it in your mouth, sparking it with your lighter while you inhale deeply.'
+		'You pull a cigarette from your purse and place it in your mouth, sparking it with your lighter while inhaling deeply.'
 	end
 
 	act'Smoke':
@@ -1359,12 +1401,12 @@ if $ARGS[0] = 'smoke':
 		cla & *clr
 		if npc_smoker[$boy] > 0:
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
-			'Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it''s like all your stress goes with it and you sigh happily, relaxing into the bed. <<$npc_firstname[$boy]>> does the same and you both enjoy your post-fuck smokes, winding down together.'
+			'Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it''s like all your stress goes with it and you sigh happily, relaxing into the bed. <<$npc_firstname[$boy]>> does the same beside you.'
 		else
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke1.jpg"></center>'
 			'Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it''s like all your stress goes with it and you sigh happily, relaxing into the bed.'
 		end
-		gs'booty_call_after', 'after_sex2'
+		gs'booty_call_after', 'relax_together'
 	end
 end
 
@@ -1377,7 +1419,57 @@ if $ARGS[0] = 'smoke_phone':
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/phone_smoke.jpg"></center>'
 		'Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it''s like all your stress goes with it and you sigh happily, reaching for your phone before relaxing into the bed. You spend some time scrolling through feeds while you puff your way through the cigarette, fully unwinding.'
 	end
-	gs'booty_call_after', 'after_sex2'
+	gs'booty_call_after', 'relax_together'
+end
+
+if $ARGS[0] = 'spend_night_ask':
+	if (hour >= 20 or hour < 5) and booty_call['spend_night'] = 0 and booty_call['mom_kill'] = 0 and booty_call['no_time'] = 0 and booty_call['angry_after'] = 0:
+		act'Ask to spend the night':
+			booty_call['spend_night'] = 1
+			cla & *clr
+			$npc_apt_bedroom[$boy]
+			'"Mind if I spend the night?" you ask.'
+			
+			act'I don''t feel like going home':
+				cla & *clr
+				$npc_apt_bedroom[$boy]
+				'"Mind if I spend the night?" you ask. "I don''t feel like going home tonight."'
+				gs'booty_call_after', 'spend_night'
+			end
+
+			if mid($start_type,1,2) = 'sg':
+				act'I''m sick of my mom':
+					cla & *clr
+					$npc_apt_bedroom[$boy]
+					'"Mind if I spend the night?" you ask. "My mom has been such a bitch lately and I don''t want to see her."'
+					gs'booty_call_after', 'spend_night'
+				end
+			end
+			
+			if hour >= 22 or hour < 5:
+				act'It''s late':
+					cla & *clr
+					$npc_apt_bedroom[$boy]
+					'"Mind if I spend the night?" you ask. "It''s late and I don''t want to go."'
+					gs'booty_call_after', 'spend_night'
+				end
+			end
+			
+			if pcs_lovers - pcs_girlfriends > 0 and living_with_npc > 0:
+				act'I don''t want to see my boyfriend(annoyed)':
+					cla & *clr
+					$npc_apt_bedroom[$boy]
+					'"Mind if I spend the night?" you ask. "My boyfriend''s been pissing me off lately and I don''t want to go home to that."'
+					gs'booty_call_after', 'spend_night'
+				end
+
+!!{				act'I don''t want to see my boyfriend(guilt)':
+
+
+				end}
+			end
+		end
+	end
 end
 
 if $ARGS[0] = 'spend_night':
@@ -1482,6 +1574,7 @@ end
 
 if $ARGS[0] = 'leaving_soon':
 	act'Yeah':
+		booty_call['leaving'] = 1
 		cla & *nl
 		'"Yeah," you say, <<$booty_call[''dress_describe'']>>.'
 		gs 'booty_call_after', 'dressing2'
@@ -1773,7 +1866,7 @@ if $ARGS[0] = 'after_sex_dressed':
 
 		act'See ya':
 			cla & *nl
-			'"See you later," you wink and head out the door.'
+			'"See ya," you wink and head out the door.'
 			act'Leave':gt'booty_call_after', 'exit'
 		end
 		
@@ -1790,7 +1883,9 @@ if $ARGS[0] = 'after_sex_dressed':
 			act'Leave':gt'booty_call_after', 'exit'
 		end
 	end
-	act'Hang out':msg 'Work in progress! To be continued!'
+	if booty_call['leaving'] ! 1:
+		act'Hang out':msg 'Work in progress! To be continued!'
+	end
 	act'Break things off':
 		cla & *clr
 		$npc_apt_bedroom[$boy]
@@ -1822,6 +1917,10 @@ if $ARGS[0] = 'after_sex_dressed':
 end
 
 
+if $ARGS[0] = 'leaving_action':
+
+end
+
 if $ARGS[0] = 'unsatisfied_breakup':
 	act'You don''t satisfy me':
 		cla & *clr
@@ -2092,13 +2191,23 @@ if $ARGS[0] = 'npc_booty_call_invite':
 	if booty_call['dress_talk1'] = 0:
 		booty_call['dress_talk1'] = 1
 		if npc_day_off[$boy] = week + 1:
+			booty_call['tomorrow_invite'] = 1
 			if npc_girlfriend[$boy] = 1:
 				pc_know_npc_has_girlfriend[$boy] = 1
-				'"You busy tomorrow?" <<$npc_firstname[$boy]>> asks as you''re <<$booty_call[''dress_describe'']>>. "It''s my day off tomorrow and my girlfriend won''t be around. Want to come over and do this again?"'
+				'"You busy tomorrow?" <<$npc_firstname[$boy]>> asks as you''re <<$booty_call[''dress_describe'']>>. "It''ll be my day off and my girlfriend won''t be around. Want to come over and do this again?"'
 			else
-				'"You busy tomorrow?" <<$npc_firstname[$boy]>> asks as you''re <<$booty_call[''dress_describe'']>>. "It''s my day off tomorrow. Want to come by and do this again?"'
+				'"You busy tomorrow?" <<$npc_firstname[$boy]>> asks as you''re <<$booty_call[''dress_describe'']>>. "It''ll be my day off. Want to come by and do this again?"'
+			end
+		elseif npc_day_off[$boy] = week and (booty_call['sleepover'] = 1 or hour < 5):
+			booty_call['later_today_invite'] = 1
+			if npc_girlfriend[$boy] = 1:
+				pc_know_npc_has_girlfriend[$boy] = 1
+				'"You busy later?" <<$npc_firstname[$boy]>> asks as you''re <<$booty_call[''dress_describe'']>>. "Today''s my day off and my girlfriend won''t be around. Want to come over and do this again?"'
+			else
+				'"You busy later?" <<$npc_firstname[$boy]>> asks as you''re <<$booty_call[''dress_describe'']>>. "It''s my day off. Want to come by and do this again?"'
 			end
 		else
+			booty_call['tomorrow_invite'] = 1
 			if npc_girlfriend[$boy] = 1:
 				pc_know_npc_has_girlfriend[$boy] = 1
 				'"You busy tomorrow?" <<$npc_firstname[$boy]>> asks as you''re <<$booty_call[''dress_describe'']>>. "My girlfriend won''t be around. Want to come over and do this again?"'
@@ -2123,9 +2232,13 @@ end
 
 if $ARGS[0] = 'busy_tomorrow':
 	act'I''m busy':
-		npc_no_booty_call[$boy] = daystart + 1
+		gs 'booty_call', 'block_booty_calls'
 		cla & *nl
-		'"I can''t, sorry," you say, <<$booty_call[''dress_describe'']>>. "I''m busy tomorrow."'
+		if booty_call['tomorrow_invite'] = 1:
+			'"I can''t, sorry," you say, <<$booty_call[''dress_describe'']>>. "I''m busy tomorrow."'
+		else
+			'"I can''t, sorry," you say, <<$booty_call[''dress_describe'']>>. "I''m busy."'
+		end
 		'"Damn," <<$npc_firstname[$boy]>> says disappointedly.'
 		gs 'booty_call_after', 'dress_talk'
 	end
@@ -2133,7 +2246,7 @@ end
 
 if $ARGS[0] = 'busy_time':
 	act'I''m busy':
-		npc_no_booty_call[$boy] = daystart + 1
+		gs 'booty_call', 'block_booty_calls'
 		cla & *nl
 		'"I can''t, sorry," you say, <<$booty_call[''dress_describe'']>>. "I have something to do then."'
 		'"Damn," <<$npc_firstname[$boy]>> says disappointedly.'
@@ -2143,8 +2256,7 @@ end
 
 if $ARGS[0] = 'booty_call_plan':
 	act'Sounds good':
-		npc_booty_call[$boy] = daystart + 1
-		npc_booty_call_time[$boy] = npc_start_free_time[$boy]
+		gs 'booty_call', 'set_booty_call_date'
 		cla & *nl
 		'"Sounds good," you grin, <<$booty_call[''dress_describe'']>>. "I''ll see you then."'
 		'"Great," <<$npc_firstname[$boy]>> grins back.'
@@ -2152,8 +2264,7 @@ if $ARGS[0] = 'booty_call_plan':
 	end
 	
 	act'I''ve got nothing better to do':
-		npc_booty_call[$boy] = daystart + 1
-		npc_booty_call_time[$boy] = npc_start_free_time[$boy]
+		gs 'booty_call', 'set_booty_call_date'
 		cla & *nl
 		'"Sure," you smirk, <<$booty_call[''dress_describe'']>>. "I got nothing better to do."'
 		'"Great," <<$npc_firstname[$boy]>> grins back.'
@@ -2161,8 +2272,7 @@ if $ARGS[0] = 'booty_call_plan':
 	end
 	
 	act'I could fit it in':
-		npc_booty_call[$boy] = daystart + 1
-		npc_booty_call_time[$boy] = npc_start_free_time[$boy]
+		gs 'booty_call', 'set_booty_call_date'
 		cla & *nl
 		'"I think I can fit that in," you smirk, <<$booty_call[''dress_describe'']>>.'
 		if npc_humor[$boy] = 2:
@@ -2235,16 +2345,26 @@ if $ARGS[0] = 'sleep':
 end
 
 if $ARGS[0] = 'sleep_function':
-	booty_call['sleepover'] = 1
-	if alko > 6:
-		booty_call['hangover'] = 1
-		gs'sleep', 'simple'
-		gs'pain', 3, 'head', 'ache'
+	if rand(1,10) < npc_sexdrive[$boy] - (booty_call['cum_count']/2) and (stat['think_virgin'] ! 1 or booty_call['fuck_count'] > 0) and booty_call['sleep_fuck'] = 0:
+		booty_call['extra_cum'] += npc_sexdrive[$boy]/2
+		booty_call['sleep_time'] = rand(1,3)
+		minut += 60*booty_call['sleep_time']
+		pcs_sleep += 15*booty_call['sleep_time']
+		pcs_health += 5*booty_call['sleep_time']
+		gs'stat'
+		gt'booty_call_sex', 'sleep_sex'
 	else
-		gs'sleep', 'simple'
-	end
+		booty_call['sleepover'] = 1
+		if alko > 6:
+			booty_call['hangover'] = 1
+			gs'sleep', 'simple'
+			gs'pain', 3, 'head', 'ache'
+		else
+			gs'sleep', 'simple'
+		end
 
-	if mid($start_type,1,2) = 'sg' and func('homes_properties', 'has_access', 'parents_home'): sveta_punishment['no_come_home'] = 1
-	gt'booty_call_morning', 'morning'
+		if mid($start_type,1,2) = 'sg' and func('homes_properties', 'has_access', 'parents_home'): sveta_punishment['no_come_home'] = 1
+		gt'booty_call_morning', 'morning'
+	end
 end
 --- booty_call_after ---------------------------------

locations/booty_call_condoms.qsrc

@@ -163,6 +163,7 @@ if $ARGS[0] = 'pc_condom_ask':
 	act'Don''t say anything':
 		cla & *nl
 		booty_call['no_condom'] = 1
+		'<<$npc_firstname[$boy]>> takes your silence as consent and begins manuevering into position.'
 		gs 'booty_call_sex', 'position_choose'
 	end
 	act'Ask him to put on a condom':
@@ -745,7 +746,7 @@ if $ARGS[0] = 'temp_disable_condoms':
 			act'It''ll feel better':
 				cla & *clr
 				$npc_apt_bedroom[$boy]
-				'"Let''s skip the condom today," you smile. "It''ll feel good without the rubber."'
+				'"Let''s skip the condom today," you smile. "It''ll feel better without it."'
 				gs 'booty_call_condoms', 'npc_temp_no_condom_react'
 			end
 			
@@ -758,21 +759,23 @@ if $ARGS[0] = 'temp_disable_condoms':
 				end
 			elseif stat['safe_day'] = 1:
 				act'It''s a safe day':
+					booty_call['safe_day'] = 1
 					cla & *clr
 					$npc_apt_bedroom[$boy]
-					'"Let''s skip the condom today," you smile. "It''s a safe day for me. I won''t get pregnant."'
+					'"Let''s skip the condom," you smile. "It''s a safe day for me. I won''t get pregnant."'
 					gs 'booty_call_condoms', 'npc_temp_no_condom_react'
 				end
 			elseif stat['probably_safe_day'] = 1:
 				act'It''s probably safe day':
+					booty_call['probably_safe_day'] = 1
 					cla & *clr
 					$npc_apt_bedroom[$boy]
-					'"Let''s skip the condom today," you smile. "It should be a safe day for me. I won''t get pregnant."'
+					'"Let''s skip the condom," you smile. "It should be a safe day for me. I won''t get pregnant."'
 !!					if npc_childfree[$boy] = 1:
 !!						gs 'booty_call_condoms', 'npc_hesitate_childfree'
 !!					else
 						*nl
-						'<i>Probably...</i> you think guiltily to yourself.'
+						'<i>Probably...</i> you think quietly to yourself.'
 						gs 'booty_call_condoms', 'npc_temp_no_condom_react'
 !!					end
 				end
@@ -952,6 +955,8 @@ if $ARGS[0] = 'pc_safe_day':
 				if mesec > 0:
 					'"You can come inside me today," you smile at <<$npc_firstname[$boy]>>. "I don''t think I can get pregnant on my period."'
 				else
+					if stat['safe_day'] = 1:booty_call['safe_day'] = 1
+					if stat['probably_safe_day'] = 1:booty_call['probably_safe_day'] = 1
 					'"<<$booty_call[''safe_day_desc1'']>>," you smile at <<$npc_firstname[$boy]>>. "<<$booty_call[''safe_day_creampie_desc'']>>."'
 				end
 	!!				if stat['probably_safe_day'] = 1 and npc_childfree[$boy] = 1:

locations/booty_call_cowgirl.qsrc

@@ -86,6 +86,8 @@ if $ARGS[0] = 'cowgirl1':
 	booty_call['speed'] = 1
 	$booty_call['position'] = 'cowgirl'
 	$booty_call['pos_speed'] = 'cowgirl1'
+	!! booty_call['cowgirl_fuck'] tracks if you fuck in this position
+	booty_call['cowgirl_fuck'] = 1
 !!	if pcs_vag = 0:gt 'booty_call_virgin', 'cowgirl_virg_norm1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
 	gs 'stat'
@@ -185,6 +187,8 @@ if $ARGS[0] = 'cowgirl2':
 	booty_call['speed'] = 2
 	$booty_call['position'] = 'cowgirl'
 	$booty_call['pos_speed'] = 'cowgirl2'
+	!! booty_call['cowgirl_fuck'] tracks if you fuck in this position
+	booty_call['cowgirl_fuck'] = 1
 !!	if pcs_vag = 0:gt 'booty_call_virgin', 'cowgirl_virg_norm1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
 	gs 'stat'
@@ -283,6 +287,8 @@ if $ARGS[0] = 'cowgirl3':
 	booty_call['speed'] = 3
 	$booty_call['position'] = 'cowgirl'
 	$booty_call['pos_speed'] = 'cowgirl3'
+	!! booty_call['cowgirl_fuck'] tracks if you fuck in this position
+	booty_call['cowgirl_fuck'] = 1
 !!	if pcs_vag = 0:gt 'booty_call_virgin', 'cowgirl_virg_norm1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
 	gs 'stat'
@@ -401,21 +407,21 @@ end
 if $ARGS[0] = 'cowgirl_change_pace':
 	cla
 	if booty_call['speed'] = 1:
-		act'Pick up the pace a little': gt 'booty_call_cowgirl', 'cowgirl2'
+		act'Pick up the pace a little': gt 'booty_call_cowgirl', 'cowgirl2.1'
 
-		act'Ride ''em cowgirl!': gt 'booty_call_cowgirl', 'cowgirl3'
+		act'Ride ''em cowgirl!': gt 'booty_call_cowgirl', 'cowgirl3.1'
 	end
 
 	if booty_call['speed'] = 2:
-		act'Ride him gently': gt 'booty_call_cowgirl', 'cowgirl1'
+		act'Ride him gently': gt 'booty_call_cowgirl', 'cowgirl1.1'
 
-		act'Ride ''em cowgirl!': gt 'booty_call_cowgirl', 'cowgirl3'
+		act'Ride ''em cowgirl!': gt 'booty_call_cowgirl', 'cowgirl3.1'
 	end
 
 	if booty_call['speed'] = 3:
-		act'Ride him gently': gt 'booty_call_cowgirl', 'cowgirl1'
+		act'Ride him gently': gt 'booty_call_cowgirl', 'cowgirl1.1'
 
-		act'Slow it down a little': gt 'booty_call_cowgirl', 'cowgirl2'
+		act'Slow it down a little': gt 'booty_call_cowgirl', 'cowgirl2.1'
 	end
 end
 
@@ -471,7 +477,7 @@ end
 if $ARGS[0] = 'cowgirl1_start_desc':
 !!	'You gently roll your hips over his, grinding against his cock inside your pussy.'
 	if $npc_dick_desc[$boy] = 'tiny' or $npc_dick_desc[$boy] = 'short':
-		'You gently roll your hips over his, grinding his tiny dick against the inside your pussy..'
+		'You gently roll your hips over his, grinding his tiny dick against the inside your pussy.'
 	elseif $npc_dick_desc[$boy] = 'chode':
 		'You gently roll your hips over his, grinding his fat chode against the inside your pussy.'
 	elseif $npc_dick_desc[$boy] = 'skinny':
@@ -551,35 +557,31 @@ end
 if $ARGS[0] = 'cowgirl1.1_desc':
 !!	'<<$npc_firstname[$boy]>> slows down, pulling out of you until only his tip is still inside of you before smoothly pushing himself back in, filling you to your deepest depths.'
 	if $npc_dick_desc[$boy] = 'tiny' or $npc_dick_desc[$boy] = 'short':
-		'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only the tip of his tiny dick is still inside of you before smoothly pushing himself back into your pussy, pressing his hips against your ass.'
+		'You slow down to a to a crawl, gently rolling your hips over <<$npc_firstname[$boy]>>''s, focusing hard on making sure the feel of his tiny dick isn''t lost in the pounding of your bodies.'
 	elseif $npc_dick_desc[$boy] = 'chode':
-		'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his thick chode back into your pussy, pressing his hips against your ass.'
+		'You slow down to a to a crawl, gently rolling your hips over <<$npc_firstname[$boy]>>''s, focusing hard on making sure the feel of his thick chode isn''t lost in the pounding of your bodies.'
 	elseif $npc_dick_desc[$boy] = 'skinny':
-		'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his skinny dick back into your pussy, pressing his hips against your ass.'
+		'You slow down to a to a crawl, gently rolling your hips over <<$npc_firstname[$boy]>>''s, focusing hard on making sure the feel of his skinny dick isn''t lost in the pounding of your bodies.'
 	elseif $npc_dick_desc[$boy] = 'normal':
-		'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his dick back into your pussy, pressing his hips against your ass.'
+		'You slow down to a to a crawl, gently rolling your hips over <<$npc_firstname[$boy]>>''s, focusing on feeling the full shape of his dick inside you.'
 	elseif $npc_dick_desc[$boy] = 'thick':
 		if pcs_vag <= 10:
-			'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his cock back into your tight pussy, his thick girth forcing gasps from your mouth.'
+			'You slow down to a to a crawl, gently rolling your hips over <<$npc_firstname[$boy]>>''s, feeling every contour and vein of his thick cock inside your tight pussy.'
 		else
-			'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his cock back into your pussy, his thick girth <i>filling</i> you from wall to wall.'
+			'You slow down to a to a crawl, gently rolling your hips over <<$npc_firstname[$boy]>>''s, focusing on feeling every contour and vein of his thick cock inside your pussy.'
 		end
 	elseif $npc_dick_desc[$boy] = 'long':
-		'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his dick back into your pussy, filling you from end to end with his long shaft.'
+		'You slow down to a to a crawl, gently rolling your hips over <<$npc_firstname[$boy]>>''s, focusing depth of his cock inside you, grinding its length up against your cervix.'
 	elseif $npc_dick_desc[$boy] = 'huge':
-		'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his dick back into your pussy, eliciting mews of pleasure as his huge shaft <i>fills</i> you from end to end.'
+		'You slow down to a to a crawl, gently rolling your hips over <<$npc_firstname[$boy]>>''s, grinding yourself against the huge cock that fills you.'
 	elseif $npc_dick_desc[$boy] = 'enormous':
-		if pcs_vag <= 15:
-			'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his dick back into you, eliciting groans of pleasure as the length and girth of his enormous shaft <i>fills</i> you up, stretching your tight pussy in every conceivable manner.'
-		else
-			'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his dick back into you, eliciting moans of pleasure as the length and girth of his enormous shaft <i>fills</i> you.'
-		end
+		'You slow down to a to a crawl, gently rolling your hips over <<$npc_firstname[$boy]>>''s, grinding yourself against the enormous cock that stretches your pussy in both width and length.'
 	elseif $npc_dick_desc[$boy] = 'lengthy':
-		'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his dick back into you. His manhood is so insanely long that the time between those two moments is measured in seconds and goosebumps wash over your skin as you feel each centimeter of his magnificent length slide in until he bumps against your cervix.'
+		'You slow down to a to a crawl, carefully bouncing your hips up and down on <<$npc_firstname[$boy]>>''s cock, so lengthy that you feel it bounce off your cervix without ever being able to reach its base.'
 	elseif $npc_dick_desc[$boy] = 'gigantic':
-		'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his dick back into you. His manhood is so insanely long that the time between those two moments is measured in seconds and goosebumps wash over your skin as you feel each centimeter of his gigantic cock slide in until he bumps against your cervix and you feel full of dick.'
+		'You slow down to a to a crawl, carefully bouncing your hips up and down on <<$npc_firstname[$boy]>>''s gigantic cock, so big that you feel it bounce off your cervix without ever being able to reach its base.'
 	elseif $npc_dick_desc[$boy] = 'monster':
-		'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his dick back into you. His manhood is so insanely huge that the time between those two moments is measured in seconds and goosebumps wash over your skin as you feel each centimeter of his monstrous cock slide in, forcing your walls to stretch to accomodate it, until he bumps against your cervix and you feel <i>stuffed</i> with dick.'
+		'You slow down to a to a crawl, carefully bouncing your hips up and down on <<$npc_firstname[$boy]>>''s monstrous cock, so big that you feel it bounce off your cervix without ever being able to reach the bottom of its thick trunk.'
 	end
 end
 
@@ -589,21 +591,17 @@ if $ARGS[0] = 'cowgirl1.2_moan_desc':
 		'"<i>Mm~! Mn~! Mmm~! Nnn~!</i>"'
 		*nl
 		if $npc_dick_desc[$boy] = 'tiny' or $npc_dick_desc[$boy] = 'short':
-			'You mew softly as <<$npc_firstname[$boy]>> continues to fuck you. Slowly. Gently. His tiny dick driving as deep as it can inside you, finding the hidden secrets of your pussy that make you wetter and wetter with every thrust.'
+			'You mew softly as you keep grinding against <<$npc_firstname[$boy]>>''s tiny dick inside you, unable to keep your voice contained as it rubs up against your g-spot <i>just</i> right.'
 		elseif $npc_dick_desc[$boy] = 'chode':
-			'You mew softly as <<$npc_firstname[$boy]>> continues to fuck you. Slowly. Gently. His fat chode driving as deep as it can inside you, forcing you to feel his girth, making you wetter and wetter with every thrust.'
+			'You mew softly as you keep grinding against <<$npc_firstname[$boy]>>''s thick chode inside you, unable to keep your voice contained as it stretches your pussy <i>just</i> right.'
 		elseif $npc_dick_desc[$boy] = 'skinny':
-			'You mew softly as <<$npc_firstname[$boy]>> continues to fuck you. Slowly. Gently. His skinny dick driving as deep as it can inside you, finding the hidden secrets of your pussy that make you wetter and wetter with every thrust.'
+			'You mew softly as you keep grinding against <<$npc_firstname[$boy]>>''s skinny dick inside you, unable to keep your voice contained as it rubs up against your g-spot <i>just</i> right.'
 		elseif $npc_dick_desc[$boy] = 'normal':
-			'You mew softly as <<$npc_firstname[$boy]>> continues to fuck you. Slowly. Gently. His cock driving deep inside you, <i>filling</i> you, making you wetter and wetter with every thrust.'
+			'You mew softly as you keep grinding against <<$npc_firstname[$boy]>>''s dick inside you, unable to keep your voice contained as it rubs up against your g-spot <i>just</i> right.'
 		elseif $npc_dick_desc[$boy] = 'thick':
-			if pcs_vag <= 10:
-				'Tiny mews escape your lips as <<$npc_firstname[$boy]>> continues to fuck you with his thick cock. Slowly. Gently. He drives it deep inside you, <i>stretching</i> your tight pussy with its exceptional girth, making you wetter and wetter with every thrust.'
-			else
-				'Soft moans escape your lips as <<$npc_firstname[$boy]>> continues to fuck you with his thick cock. Slowly. Gently. He drives it deep inside you, <i>filling</i> you with its exceptional girth, making you wetter and wetter with every thrust.'
-			end
+			'You mew softly as you keep grinding against <<$npc_firstname[$boy]>>''s thick cock inside you, unable to keep your voice contained as it rubs up against your g-spot and stretches you out in the most satisfying way.'
 		elseif $npc_dick_desc[$boy] = 'long':
-			'You mew softly as <<$npc_firstname[$boy]>> continues to fuck you. Slowly. Gently. His long cock driving deep inside you until it''s plunged to the hilt, its presence felt even in the deepest parts of your pussy, making you wetter and wetter with every thrust.'
+			'You mew softly as you keep grinding against <<$npc_firstname[$boy]>>''s cock inside you, unable to keep your voice contained as it rubs up against your cervix in the most satisfying way.'
 		elseif $npc_dick_desc[$boy] = 'huge':
 			'You mew softly as <<$npc_firstname[$boy]>> continues to fuck you. Slowly. Gently. His huge cock driving deep inside you until it''s plunged to the hilt, its presence felt even in the deepest parts of your pussy, <i>filling</i> you, making you wetter and wetter with every thrust.'
 		elseif $npc_dick_desc[$boy] = 'enormous':

locations/booty_call_cum.qsrc

@@ -61,7 +61,7 @@ if $ARGS[0] = 'miss_cum':
 			end
 		end
 	end
-	gs'booty_call_cum', 'fuck_continue'
+	gs'booty_call_sex', 'fuck_continue'
 end
 
 if $ARGS[0] = 'doggy_cum':
@@ -82,14 +82,13 @@ if $ARGS[0] = 'doggy_cum':
 			'You groan loudly as your arms give out from underneath you. Your pussy spasms around the cock inside it <<$npc_firstname[$boy]>> shoves your head down into the mattress, fucking you head down, ass up, through the entirety of your orgasm.'
 		end
 	else
-		'<center><video autoplay loop src="images/shared/sex/vag/doggy/orgasm1.mp4"></video></center>'
+		cla & *clr
 		if booty_call['consecutive_orgasm'] > 1:
 			'"<i>Nmmnnghhhaaaaaaaaaa!</i>"'
-			*nl
 			if booty_call['consecutive_orgasm'] < 5:
+				'<center><video autoplay loop src="images/shared/sex/vag/doggy/orgasm1.mp4"></video></center>'
 				'<<$npc_firstname[$boy]>> keeps hitting all the right spots inside you, forcing your orgasm to keep going. You give a wordless groan, struggling to stay upright as he continues to fuck you from behind.'
 			else
-				cla & *clr
 				'<center><video autoplay loop src="images/shared/sex/vag/doggy/orgasm_rough1.mp4"></video></center>'
 				'You''ve been coming for so long now, it''s a wonder how you''re still managing to stay on your kne-'
 				'Oh. That''s funny.'
@@ -98,12 +97,21 @@ if $ARGS[0] = 'doggy_cum':
 				'<i>I wonder if I might</i> actually <i>die?</i> the last conscious part of your mind wonders...'
 			end
 		else
-			'"<i>Ah~!</i> I''m-! I''m gonna-"'
-			*nl
-			'You can''t even finish the sentence before you come. Your entire body convulses around <<$npc_firstname[$boy]>>''s cock, still sliding in and out of you even as you are caught in the throes of orgasm.'
+			if npc_spanker[$boy] = 1:
+				booty_call['spank'] += 1
+				'<center><video autoplay loop src="images/shared/sex/vag/doggy/orgasm_spank1.mp4"></video></center>'
+				'"<i>Ah~! Ah~!</i> I''m-! I''m gonna-!"'
+				*nl
+				'You can''t even finish the sentence before you come. Your entire body convulses, barely able to breathe as your pussy clamps down on <<$npc_firstname[$boy]>>''s <<$npc_dick_desc[$boy]>> cock. Even as you shudder in orgasm, <<$npc_firstname[$boy]>> mercilessly spanks your ass, drawing cries of pain or pleasure from your lips. Which one, even you''re not completely sure.'
+			else
+				'<center><video autoplay loop src="images/shared/sex/vag/doggy/orgasm2.mp4"></video></center>'
+				'"<i>Ah~! Ah~!</i> I''m-! I''m gonna-!"'
+				*nl
+				'You can''t even finish the sentence before you come. Your entire body convulses, barely able to breathe as you shudder uncontrollably and your pussy clamps down on <<$npc_firstname[$boy]>>''s <<$npc_dick_desc[$boy]>> cock.'
+			end
 		end
 	end
-	gs'booty_call_cum', 'fuck_continue'
+	gs'booty_call_sex', 'fuck_continue'
 end
 
 if $ARGS[0] = 'cowgirl_cum':
@@ -120,7 +128,7 @@ if $ARGS[0] = 'cowgirl_cum':
 	else
 		'The buildup of pressure inside you crashes over the edge. Your body goes taut, your pussy clenches tight, and you quiver on top of <<$npc_firstname[$boy]>>''s cock as waves of orgasm wash over you.'
 	end
-	gs'booty_call_cum', 'fuck_continue'
+	gs'booty_call_sex', 'fuck_continue'
 end
 
 if $ARGS[0] = 'fuck_cum_random':
@@ -136,6 +144,7 @@ if $ARGS[0] = 'fuck_cum_random':
 	end
 !!	if npc_generous[$boy] = 1 and booty_call['cum_choice'] <= 9:
 	if booty_call['cum_choice'] > 1 and booty_call['cum_choice'] < 10: booty_call['cum_warn'] = 1
+	
 	if booty_call['cum_choice'] = 10 and booty_call['extra_caution'] = 0:
 		$booty_call['cum_choice'] = 'creampie_surprise'
 	elseif booty_call['cum_choice'] > 7:
@@ -144,6 +153,12 @@ if $ARGS[0] = 'fuck_cum_random':
 		booty_call['cum_where'] = 1
 	elseif booty_call['cum_choice'] > 1:
 		$booty_call['cum_choice'] = $npc_cum_pref[$boy]
+		if $booty_call['cum_choice'] = 'creampie':
+			if (npc_free_creampies[$boy] = 1 and (booty_call['safe_day'] = 1 or booty_call['probably_safe_day'] = 1)) or npc_free_creampies[$boy] = 2 or npc_know_bc[$boy] = 1:
+				booty_call['cum_warn'] = 0
+				$booty_call['cum_choice'] = 'creampie_surprise'
+			end
+		end
 	else
 		booty_call['his_choice'] = 1
 		if rand(1,10) >= 9:
@@ -162,7 +177,12 @@ end
 
 if $ARGS[0] = 'random_cum_choice':
 	if rand(1,5) = 1 and (npc_childfree[$boy] ! 1 or npc_know_bc[$boy] = 1):
-		$booty_call['cum_choice'] = 'creampie'
+		if (npc_free_creampies[$boy] = 1 and (booty_call['safe_day'] = 1 or booty_call['probably_safe_day'] = 1)) or npc_free_creampies[$boy] = 2:
+			booty_call['cum_warn'] = 0
+			$booty_call['cum_choice'] = 'creampie_surprise'
+		else
+			$booty_call['cum_choice'] = 'creampie'
+		end
 	elseif rand(1,4) = 1:
 		$booty_call['cum_choice'] = 'mouth'
 	elseif rand(1,3) = 1:
@@ -175,6 +195,10 @@ if $ARGS[0] = 'random_cum_choice':
 end
 
 if $ARGS[0] = 'fuck_cum':
+	!! flags to remember what kind of fucking happened during sex
+	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
 	gs 'booty_call_sex', 'pain'
 	if booty_call['dirty_talk'] = 1: booty_call['dirty_talk_talk'] = 1
 	if booty_call['boy_cum'] < 1:booty_call['boy_cum'] = rand(-1,1)
@@ -187,7 +211,7 @@ if $ARGS[0] = 'fuck_cum':
 		else
 			booty_call['consecutive_orgasm'] = 0
 		end
-		gs'booty_call_cum', 'fuck_continue'
+		gs'booty_call_sex', 'fuck_continue'
 	end
 	
 	if booty_call['cum_warn'] = 1:
@@ -217,10 +241,12 @@ if $ARGS[0] = 'fuck_cum':
 		elseif $booty_call['cum_choice'] = 'creampie':
 			booty_call['he_ask'] = 1
 			booty_call['he_ask_creampie'] = 1
-			if booty_call['orgasm'] < orgasm:
+			if npc_free_creampies[$boy] = 1 and booty_call['safe_day'] = 0 and booty_call['probably_safe_day'] = 0 and mesec <= 0:
+				'"Can I come inside you? Is it safe today?" <<$npc_firstname[$boy]>> whimpers almost pleadingly.'
+			elseif booty_call['orgasm'] < orgasm:
 				'"Let''s come together," <<$npc_firstname[$boy]>> says, smiling at you.'
 			else
-				'"I wanna come inside you so bad," <<$npc_firstname[$boy]>> says'
+				'"I wanna come inside you so bad," <<$npc_firstname[$boy]>> says.'
 			end
 		elseif $booty_call['cum_choice'] = 'mouth':
 			booty_call['he_ask'] = 1
@@ -306,15 +332,50 @@ if $ARGS[0] = 'fuck_cum':
 					act'Let''s come together':booty_call['creampie_ask'] = 1 & gs 'booty_call_cum', 'cum_together'
 				end
 			elseif booty_call['he_ask_creampie'] = 1:
-				act'Let him come inside you':
-					booty_call['he_ask_creampie_yes'] = 1
-					npc_creampie_okay[$boy] = 1
-					gt 'booty_call_cum', 'cum_inside'
+				if npc_free_creampies[$boy] = 1 and booty_call['safe_day'] = 0 and booty_call['probably_safe_day'] = 0 and mesec <= 0:
+					if stat['safe_day'] = 1:
+						act'It''s a safe day':
+							cla & *nl
+							booty_call['safe_day'] = 1
+							npc_creampie_okay[$boy] = 1
+							'"It''s a safe day," you smile at him. "Go ahead."'
+							act'Continue':gt 'booty_call_cum', 'cum_inside'
+						end
+					elseif stat['probably_safe_day'] = 1:
+						act'It''s probably a safe day':
+							cla & *nl
+							booty_call['probably_safe_day'] = 1
+							npc_creampie_okay[$boy] = 1
+							'"It should be," you smile at him. "Go ahead."'
+							act'Continue':gt 'booty_call_cum', 'cum_inside'
+						end
+					else
+						act'It''s a safe day (lie)':
+							cla & *nl
+							booty_call['safe_day'] = 1
+							npc_creampie_okay[$boy] = 1
+							'"It''s a safe day," you say with a deceitful smile. "Go ahead."'
+							act'Continue':gt 'booty_call_cum', 'cum_inside'
+						end
+					end
+				else
+					act'Let him come inside you':
+						cla & *nl
+						booty_call['he_ask_creampie_yes'] = 1
+						npc_creampie_okay[$boy] = 1
+						'"Go ahead," you smile. "Fill me up."'
+						act'Continue':gt 'booty_call_cum', 'cum_inside'
+					end
+					
+					act'Let''s come together (fake orgasm)':gs 'booty_call_cum', 'cum_together_fake'
 				end
-				
-				act'Let''s come together (fake orgasm)':gs 'booty_call_cum', 'cum_together_fake'
 			else
-				act'Come inside me!':booty_call['creampie_ask'] = 1 & gt 'booty_call_cum', 'cum_inside'
+				act'Come inside me!':
+					cla & *nl
+					booty_call['creampie_ask'] = 1
+					'"Come inside me!" you cry. "Fill me up!"'
+					act'Continue':gt 'booty_call_cum', 'cum_inside'
+				end
 				
 				act'Let''s come together (fake orgasm)':gs 'booty_call_cum', 'cum_together_fake'
 			end
@@ -1103,7 +1164,9 @@ end
 if $ARGS[0] = 'creampie_code':
 	if (pcs_cp_safe_known + pcs_cp_notsafe_known + pcs_cp_risky_known) = 0:booty_call['first_creampie'] = 1
 	booty_call['creampie_count'] += 1
+	if booty_call['creampie_surprise'] = 1: booty_call['surprise_creampie_count'] += 1
 	booty_call['cum_pussy'] += 1
+	
 	if birth_control['think_safe'] = 0 and stat['dangerous_day'] = 1: booty_call['risky_creampie'] = 1
 !!	if birth_control['think_safe'] = 0: booty_call['risky_creampie'] = 1
 	
@@ -1120,19 +1183,13 @@ if $ARGS[0] = 'cum_inside':
 	!! differing descriptions based on position
 	if $booty_call['position'] = 'miss':
 		'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/creampie1.mp4"></video></center>'
-		if booty_call['creampie_ask'] = 1:
-			'"Come inside me!" you cry. "Fill me up!"'
-			*nl
-		elseif booty_call['he_ask_creampie'] = 1:
-			'"Go ahead," you smile.'
-			*nl
-		end
 		if pcs_horny > 90:
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 1, 'no_orgasm_msg'
 			gs'stat'
 			booty_call['came_together'] = 2
 			booty_call['orgasm_count'] += 1
+			booty_call['simultaneous_orgasm_count'] += 1
 			'<<$npc_firstname[$boy]>> drives himself inside you with a grunt and you feel cum spurting out inside you. The sensation pushes you over the edge, gasping as waves of orgasm wash through you. The two of come together, each of your orgasms fueling the other''s until eventually they''ve run their course, and both of you are breathing hard.'
 			gs 'booty_call_cum', 'cum_inside_pull_away'
 			gs 'booty_call_talk', 'creampie_react'
@@ -1161,7 +1218,7 @@ if $ARGS[0] = 'cum_inside':
 				gs'stat'
 				booty_call['came_together'] = 2
 				booty_call['orgasm_count'] += 1
-				booty_call['creampie_orgasm'] += 1
+				booty_call['simultaneous_orgasm_count'] += 1
 				'You gasp, the sensation triggering your own climax, and get sent over the edge yourself. The two of come together, each of your orgasms fueling the other''s until eventually they''ve run their course and both of you lay there panting.'
 				act'Continue':cla & gs'booty_call_sex', 'sex_end'
 				gs 'booty_call_cum', 'cum_inside_pull_away'
@@ -1207,7 +1264,7 @@ if $ARGS[0] = 'cum_inside':
 				gs'stat'
 				booty_call['came_together'] = 2
 				booty_call['orgasm_count'] += 1
-				booty_call['creampie_orgasm'] += 1
+				booty_call['simultaneous_orgasm_count'] += 1
 				'You gasp, the sensation triggering your own climax, and get sent over the edge yourself. The two of come together, each of your orgasms fueling the other''s until eventually they''ve run their course and both of you collapse.'
 				gs 'booty_call_cum', 'cum_inside_pull_away'
 				gs 'booty_call_talk', 'creampie_react'
@@ -1263,7 +1320,7 @@ if $ARGS[0] = 'cum_inside':
 					gs'stat'
 					booty_call['came_together'] = 2
 					booty_call['orgasm_count'] += 1
-					booty_call['creampie_orgasm'] += 1
+					booty_call['simultaneous_orgasm_count'] += 1
 					'You gasp, the sensation triggering your own climax, and get sent over the edge yourself. The two of come together, each of your orgasms fueling the other''s until eventually they''ve run their course and both of you collapse.'
 					gs 'booty_call_cum', 'cum_inside_pull_away'
 					gs 'booty_call_talk', 'creampie_react'
@@ -1343,7 +1400,7 @@ if $ARGS[0] = 'cum_together':
 	end
 	act'Orgasm':
 		booty_call['orgasm_count'] += 1
-		booty_call['creampie_orgasm'] += 1
+		booty_call['simultaneous_orgasm_count'] += 1
 		cla & *clr
 		if $booty_call['position'] = 'miss':
 			'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/creampie1.mp4"></video></center>'
@@ -1405,7 +1462,7 @@ if $ARGS[0] = 'cum_force':
 			gs'stat'
 			booty_call['came_together'] = 1
 			booty_call['orgasm_count'] += 1
-			booty_call['creampie_orgasm'] += 1
+			booty_call['simultaneous_orgasm_count'] += 1
 			'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/cumvaginal.mp4"></video></center>'
 			'With a devilish grin, you suddenly speed up your movements, riding <<$npc_firstname[$boy]>> as hard as you can. Seconds later, you feel him come inside the condom, pulsing within you, and it sends you over the edge. The two of come together, holding each other tight, both of your orgasms fueling the other''s. After some time, your orgasm fades, leaving both of you panting.'
 		else
@@ -1601,7 +1658,7 @@ if $ARGS[0] = 'creampie_surprise_react':
 	if orgasm = booty_call['orgasm']:
 		act'Creampie induced orgasm':
 			booty_call['orgasm_count'] += 1
-			booty_call['creampie_orgasm'] += 1
+			booty_call['simultaneous_orgasm_count'] += 1
 			booty_call['came_together'] = 2
 			$orgasm_or = 'yes'
 			gs'arousal', 'vaginal',-1,'no_orgasm_msg'
@@ -1667,7 +1724,8 @@ if $ARGS[0] = 'creampie_surprise_cum_together':
 	else
 		'"Did... did we... did you...?" he pants.'
 	end
-
+	
+	gs'booty_call_talk', 'bask_satisfaction'
 	gs'booty_call_talk', 'cum_together_yeah'
 	gs'booty_call_talk', 'feel_full'
 	gs'booty_call_talk', 'love_creampies'
@@ -1750,18 +1808,18 @@ if $ARGS[0] = 'cum_condom':
 	$booty_call['cum_choice'] = 'condom'
 	$booty_call['last_cum'] = 'condom'
 	!! remove later when reactions are written
-	booty_call['react'] = 1
+!!	booty_call['react'] = 1
 	if $booty_call['position'] = 'miss':
 		'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum61.jpg"></center>'
-		$booty_call['cum_describe2'] = 'looking between your legs as he removes his cock, the rubber casing around it bulging with liquid.'
+		$booty_call['cum_describe2'] = 'looking between your legs as he removes his cock, the rubber casing around it bulging with liquid'
 		booty_call['cock_remove'] = 1
 	elseif $booty_call['position'] = 'doggy':
 		'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum71.jpg"></center>'
-		$booty_call['cum_describe2'] = 'looking over your shoulder as you let his rubber encased cock slip from your pussy.'
+		$booty_call['cum_describe2'] = 'looking over your shoulder as you let his rubber encased cock slip from your pussy'
 		booty_call['cock_remove'] = 1
 	elseif $booty_call['position'] = 'cowgirl':
 		'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/cumvaginal.mp4"></video></center>'
-		$booty_call['cum_describe2'] = 'settling your self down onto his rubber encased cock.'
+		$booty_call['cum_describe2'] = 'settling your self down onto his rubber encased cock'
 	end
 	if condom_break > 0:
 		booty_call['broken_condom'] = 1
@@ -1885,43 +1943,6 @@ if $ARGS[0] = 'girl_cum_condom_react':
 
 end
 
-if $ARGS[0] = 'fuck_continue':
-	if booty_call['bored'] = 1:
-		act'Keep going':gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.bored'
-	elseif booty_call['virgin_enjoyment'] = -1:
-		if $booty_call['pos_speed'] = 'miss3' or $booty_call['pos_speed'] = 'doggy3':
-			act'Sob':booty_call['virgin_pain'] = 4 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-			act'Try to hold back tears':booty_call['virgin_pain'] = 3 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-		else
-			act'Hold back tears':booty_call['virgin_pain'] = 3 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-		end
-		act'Perservere':booty_call['virgin_pain'] = 2 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-		act'The pain is fading':booty_call['virgin_pain'] = 1 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-	elseif booty_call['virgin_enjoyment'] = 1:
-		act'Just keep fucking':booty_call['moan'] = 1 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-		act'Fake some moans':booty_call['moan'] = 2 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-		act'Starting to feel good':booty_call['virgin_feel_good'] = 1 & $orgasm_or = '' & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-	else
-		act'Focus on the sensations':$orgasm_or = '' & booty_call['dirty_talk'] = 0 & booty_call['moan'] = 0 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-		act'Moan softly':$orgasm_or = '' & booty_call['dirty_talk'] = 0 & booty_call['moan'] = 1 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-		act'Moan loudly':$orgasm_or = '' & booty_call['dirty_talk'] = 0 & booty_call['moan'] = 2 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-		act'Talk dirty':$orgasm_or = '' & booty_call['moan'] = 0 & booty_call['dirty_talk'] = 1 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-		if booty_call['virgin_enjoyment'] ! 2:
-			act'Fake enjoyment':booty_call['bored'] = 1 & booty_call['moan'] = 3 & $orgasm_or = 'no' & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-		end
-	end
-	
-	act'Change position':
-		cla
-		booty_call['change_pos'] = 1
-		gs 'booty_call_sex', 'position_change'
-	end
-	
-	if $booty_call['position'] = 'cowgirl':
-		act'Change pace':gs 'booty_call_cowgirl', 'cowgirl_change_pace'
-	end
-end
-
 if $ARGS[0] = 'orgasm_check':
 
 end

locations/booty_call_doggy.qsrc

@@ -19,8 +19,8 @@ if $ARGS[0] = 'doggy_start':
 	elseif booty_call['force_initiative'] = 2:
 		gs 'booty_call_sex', 'speed_select'
 		if $booty_call['position'] = 'miss':
-			'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/dog1.jpg"></center>'
-			'You''ve barely finished your orgasm when he rolls you onto your knees and pulls your hips back towards him. With one swift thrust, he plunges his cock into your still-quivering pussy, earning him an involuntary gasp before he begins fucking you again.'
+			'<center><video autoplay loop src="images/shared/sex/vag/doggy/orgasm1.mp4"></video></center>'
+			'You''ve barely finished your orgasm when he rolls you onto your knees and pulls your hips back towards him. With one swift thrust, he plunges his cock into your still-quivering pussy, earning him an involuntary gasp as he begins fucking you again.'
 		elseif $booty_call['position'] = 'doggy':
 			'<center><video autoplay loop src="images/shared/sex/vag/doggy/orgasm1.mp4"></video></center>'
 			'<<$npc_firstname[$boy]>> doesn''t give you a moment to rest, continuing to fuck you all the way through your orgasm. You quiver, your sensitive pussy spasming around his cock, driving your insane even after you''ve finished.'
@@ -67,6 +67,8 @@ if $ARGS[0] = 'doggy1':
 	if booty_call['condom'] ! 1: booty_call['no_condom'] = 1
 	$booty_call['position'] = 'doggy'
 	$booty_call['pos_speed'] = 'doggy1'
+	!! booty_call['doggy_fuck'] tracks if you fuck in this position
+	booty_call['doggy_fuck'] = 1
 !!	if pcs_vag = 0:gt 'booty_call_virgin', 'doggy_virg_norm1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
 	gs 'stat'
@@ -207,6 +209,8 @@ if $ARGS[0] = 'doggy2':
 	if booty_call['condom'] ! 1: booty_call['no_condom'] = 1
 	$booty_call['position'] = 'doggy'
 	$booty_call['pos_speed'] = 'doggy2'
+	!! booty_call['doggy_fuck'] tracks if you fuck in this position
+	booty_call['doggy_fuck'] = 1
 !!	if pcs_vag = 0:gt 'booty_call_virgin', 'doggy_virg_norm1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
 	gs 'stat'
@@ -349,6 +353,8 @@ if $ARGS[0] = 'doggy3':
 	if booty_call['condom'] ! 1: booty_call['no_condom'] = 1
 	$booty_call['position'] = 'doggy'
 	$booty_call['pos_speed'] = 'doggy3'
+	!! booty_call['doggy_fuck'] tracks if you fuck in this position
+	booty_call['doggy_fuck'] = 1
 !!	if pcs_vag = 0:gt 'booty_call_virgin', 'doggy_virg_norm1'
 	gs 'arousal', 'vaginal',1,'no_orgasm_msg', 'rough'
 	gs 'stat'

locations/booty_call_miss.qsrc

@@ -66,6 +66,8 @@ if $ARGS[0] = 'miss1':
 	if booty_call['condom'] ! 1: booty_call['no_condom'] = 1
 	$booty_call['position'] = 'miss'
 	$booty_call['pos_speed'] = 'miss1'
+	!! booty_call['missionary_fuck'] tracks if you fuck in this position
+	booty_call['missionary_fuck'] = 1
 	booty_call['kiss'] = 0
 !!	if pcs_vag = 0:gt 'booty_call_virgin', 'miss_virg_norm1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
@@ -92,7 +94,7 @@ if $ARGS[0] = 'miss1':
 !!		'You moan beneath <<$npc_firstname[$boy]>>, your breath hitching with every thrust. You love the way his cock stretches you out, how it makes you feel <i>full</i> when he''s inside you, and your hips buck every time he draws his away.'
 		gs 'booty_call_miss', 'miss1_enjoy_desc'
 		
-		if rand(0,2) = 2 and booty_call['kiss_skip'] = 0:
+		if rand(0,2) = 2 and booty_call['kiss_skip'] = 1 and cum_loc['face'] <= 0:
 			gs 'booty_call_miss', 'miss_kiss'
 		else
 			gs 'booty_call_cum', 'fuck_cum'
@@ -243,6 +245,8 @@ if $ARGS[0] = 'miss2':
 	booty_call['kiss'] = 0
 	$booty_call['position'] = 'miss'
 	$booty_call['pos_speed'] = 'miss2'
+	!! booty_call['missionary_fuck'] tracks if you fuck in this position
+	booty_call['missionary_fuck'] = 1
 !!	if pcs_vag = 0:gt 'booty_call_virgin', 'miss_virg_norm1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
 	gs 'stat'
@@ -330,7 +334,7 @@ if $ARGS[0] = 'miss2.1':
 	if $booty_call['pos_speed'] = 'miss1':
 		'With the new and improved pace, you find yourself enjoying it a lot more. Wet slapping sounds fill the room and you can''t help but giggle at how good it feels.'
 	elseif $booty_call['pos_speed'] = 'miss3':
-		'<<$npc_firstname[$boy]>> ramps down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more.'
+		'<<$npc_firstname[$boy]>> ramps down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more.'
 	end
 	$booty_call['pos_speed'] = 'miss2'
 	gs 'booty_call_miss', 'miss2.1_desc'
@@ -407,6 +411,8 @@ if $ARGS[0] = 'miss3':
 	!! fast/rough pace
 	$booty_call['position'] = 'miss'
 	$booty_call['pos_speed'] = 'miss3'
+	!! booty_call['missionary_fuck'] tracks if you fuck in this position
+	booty_call['missionary_fuck'] = 1
 	booty_call['kiss'] = 0
 !!	if pcs_vag = 0:gt 'booty_call_virgin', 'miss_virg_norm1'
 	gs 'arousal', 'vaginal',1,'no_orgasm_msg', 'rough'
@@ -635,7 +641,7 @@ if $ARGS[0] = 'miss_kiss':
 			'<i>At least this part feels good,</i> you think to yourself, allowing a small smile to break through.'
 		elseif booty_call['orgasm'] < orgasm:
 			if npc_smoker[$boy] > 0:
-				'You smile up at <<$npc_firstname[$boy]>> as his lips meet yours. His tongue, tasting vaguely of smoke and tabacco, spreads them apart to push up against yours, gently complimenting the pleasure of his cock inside you. You close your eyes, letting them roll back in your head, knowing that he''s about to make you come.'
+				'You smile up at <<$npc_firstname[$boy]>> as his lips meet yours. His tongue, tasting vaguely of smoke and tabacco, pushes up against yours, gently complimenting the pleasure of his cock inside you. You close your eyes, letting them roll back in your head, knowing that he''s about to make you come.'
 			else
 				'You smile up at <<$npc_firstname[$boy]>> as his lips meet yours. They press softly together and his tongue spreads them apart to push up against yours, gently complimenting the pleasure of his cock inside you. You close your eyes, letting them roll back in your head, knowing that he''s about to make you come.'
 			end
@@ -835,7 +841,7 @@ if $ARGS[0] = 'miss1.1_desc':
 	if $npc_dick_desc[$boy] = 'tiny' or $npc_dick_desc[$boy] = 'short':
 		'<<$npc_firstname[$boy]>> slows down, fucking you more gently with his small dick. The result is gratifying, allowing you to feel more of his meager length, no longer lost in the pounding of your hips together.'
 	elseif $npc_dick_desc[$boy] = 'chode':
-		'<<$npc_firstname[$boy]>> slows down, fucking you more gently with his small dick. The result is gratifying, allowing you to savor the way his thick chode strethes your pussy, rather than getting lost in constant pounding.'
+		'<<$npc_firstname[$boy]>> slows down, fucking you more gently with his small dick. The result is gratifying, allowing you to savour the way his thick chode stretches your pussy, rather than getting lost in constant pounding.'
 	elseif $npc_dick_desc[$boy] = 'skinny':
 		'<<$npc_firstname[$boy]>> slows down, fucking you more gently with his skinny dick. The result is gratifying, allowing you concentrate on his length instead of slipping in and out of you like a hotdog in a hallway.'
 	elseif $npc_dick_desc[$boy] = 'normal':
@@ -888,7 +894,7 @@ if $ARGS[0] = 'miss1.2_moan_desc':
 		'You moan softly as <<$npc_firstname[$boy]>> continues to pump his cock between your legs. Slowly. Gently. It reaches deep inside you, hitting pleasure points you didn''t even know could be hit with a dick. Your breath hitches with every thrust and it feels wonderful.'
 	elseif $npc_dick_desc[$boy] = 'huge':
 		if pcs_vag <= 15:
-			'You moan softly as <<$npc_firstname[$boy]>> continues to pump his huge cock between your legs. Slowly. Gently. Stretching your snug pussy in all the best ways and <i>filling</i> you with it. It''s so tight inside you that you literally <i>squeeze</i> plesaure from it and your breath hitches with every thrust.'
+			'You moan softly as <<$npc_firstname[$boy]>> continues to pump his huge cock between your legs. Slowly. Gently. Stretching your snug pussy in all the best ways and <i>filling</i> you with it. It''s so tight inside you that you literally <i>squeeze</i> pleasure from it and your breath hitches with every thrust.'
 		else
 			'You moan softly as <<$npc_firstname[$boy]>> continues to pump his huge cock between your legs. Slowly. Gently. It <i>fills</i> you time and time again and you can''t get enough, your breath hitching with every thrust.'
 		end
@@ -943,9 +949,9 @@ if $ARGS[0] = 'miss1.2_sensation_desc':
 	elseif $npc_dick_desc[$boy] = 'chode':
 		'His cock, small but thick, stretching your lips and rubbing directly against your g-spot, massaging the aching need of your pussy. You can feel your wetness spreading, heat radiating from your sex and from his. You breathe deeply as you sink further and further into the feelings of your own arousal.'
 	elseif $npc_dick_desc[$boy] = 'skinny':
-		'His skinny cock slipping in and out of your pussy with tantalizing ease, enflaming the aching need of your pussy. You can feel your wetness spreading, heat radiating from your sex and from his. You breathe deeply as you sink further and further into the feelings of your own arousal.'
+		'His skinny cock slipping in and out of your pussy with tantalizing ease, inflaming the aching need of your pussy. You can feel your wetness spreading, heat radiating from your sex and from his. You breathe deeply as you sink further and further into the feelings of your own arousal.'
 	elseif $npc_dick_desc[$boy] = 'normal':
-		'His cock, thrusting deep inside you. How perfectly fills you, enflaming the aching need of your pussy. You can feel your wetness spreading, heat radiating from your sex and from his. You breathe deeply as you sink further and further into the feelings of your own arousal.'
+		'His cock, thrusting deep inside you. How perfectly fills you, inflaming the aching need of your pussy. You can feel your wetness spreading, heat radiating from your sex and from his. You breathe deeply as you sink further and further into the feelings of your own arousal.'
 	elseif $npc_dick_desc[$boy] = 'thick':
 		'His thick cock, thrusting deep inside you, stretching your walls till <i>just</i> before the point of pain, a massage against the aching need of your pussy. You can feel your wetness spreading, heat radiating from your sex and from his. You breathe deeply as you sink further and further into the feelings of your own arousal.'
 	elseif $npc_dick_desc[$boy] = 'long':
@@ -1071,27 +1077,27 @@ if $ARGS[0] = 'miss2.1_desc':
 		end
 	elseif $booty_call['pos_speed'] = 'miss3':
 		if $npc_dick_desc[$boy] = 'tiny' or $npc_dick_desc[$boy] = 'short':
-			'<<$npc_firstname[$boy]>> slows down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust, but not so hard that he''s jackhammering you. Wet slaps echo around the room as <<$npc_firstname[$boy]>>''s hips crash into yours, unceasingly thrusting into you with his tiny dick. Wet slapping sounds fill the room and you can''t help but giggle at how good it feels.'
+			'<<$npc_firstname[$boy]>> slows down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust, but not so hard that he''s jackhammering you. Wet slaps echo around the room as <<$npc_firstname[$boy]>>''s hips crash into yours, unceasingly thrusting into you with his tiny dick. Wet slapping sounds fill the room and you can''t help but giggle at how good it feels.'
 		elseif $npc_dick_desc[$boy] = 'chode':
-			'<<$npc_firstname[$boy]>> slows down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust, but not so hard that he''s jackhammering you. Wet slaps echo around the room as <<$npc_firstname[$boy]>>''s hips crash into yours, unceasingly thrusting into you with his thick chode.'
+			'<<$npc_firstname[$boy]>> slows down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust, but not so hard that he''s jackhammering you. Wet slaps echo around the room as <<$npc_firstname[$boy]>>''s hips crash into yours, unceasingly thrusting into you with his thick chode.'
 		elseif $npc_dick_desc[$boy] = 'skinny':
-			'<<$npc_firstname[$boy]>> slows down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust, but not so hard that he''s jackhammering you. Wet slaps echo around the room as <<$npc_firstname[$boy]>>''s hips crash into yours, unceasingly thrusting into you with his skinny dick.'
+			'<<$npc_firstname[$boy]>> slows down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust, but not so hard that he''s jackhammering you. Wet slaps echo around the room as <<$npc_firstname[$boy]>>''s hips crash into yours, unceasingly thrusting into you with his skinny dick.'
 		elseif $npc_dick_desc[$boy] = 'normal':
-			'<<$npc_firstname[$boy]>> slows down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust, but not so hard that he''s jackhammering you. Wet slaps echo around the room with every thrust and <<$npc_firstname[$boy]>> drives his cock deep as deep as he can every time.'
+			'<<$npc_firstname[$boy]>> slows down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust, but not so hard that he''s jackhammering you. Wet slaps echo around the room with every thrust and <<$npc_firstname[$boy]>> drives his cock deep as deep as he can every time.'
 		elseif $npc_dick_desc[$boy] = 'thick':
-			'<<$npc_firstname[$boy]>> slows down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust, but not so hard that he''s jackhammering you. Wet slaps echo around the room as <<$npc_firstname[$boy]>>''s hips crash into yours, the sloppy squelching sounds of your pussy fucked by his thick shaft.'
+			'<<$npc_firstname[$boy]>> slows down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust, but not so hard that he''s jackhammering you. Wet slaps echo around the room as <<$npc_firstname[$boy]>>''s hips crash into yours, the sloppy squelching sounds of your pussy fucked by his thick shaft.'
 		elseif $npc_dick_desc[$boy] = 'long':
-			'<<$npc_firstname[$boy]>> slows down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust and <<$npc_firstname[$boy]>>''s long dick hammers deep inside you. Wet slaps echo around the room as his hips collide with yours, the sloppy sounds of your pussy squelching around his long shaft.'
+			'<<$npc_firstname[$boy]>> slows down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust and <<$npc_firstname[$boy]>>''s long dick hammers deep inside you. Wet slaps echo around the room as his hips collide with yours, the sloppy sounds of your pussy squelching around his long shaft.'
 		elseif $npc_dick_desc[$boy] = 'huge':
-			'<<$npc_firstname[$boy]>> slows down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust and <<$npc_firstname[$boy]>>''s dick hammers deep inside you. Wet slaps echo around the room as his hips collide with yours, the huge size of his cock forcing squelches from your cunt.'
+			'<<$npc_firstname[$boy]>> slows down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust and <<$npc_firstname[$boy]>>''s dick hammers deep inside you. Wet slaps echo around the room as his hips collide with yours, the huge size of his cock forcing squelches from your cunt.'
 		elseif $npc_dick_desc[$boy] = 'enormous':
-			'<<$npc_firstname[$boy]>> slows down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust and <<$npc_firstname[$boy]>>''s enormous dick fills you to the brim. Wet slaps echo around the room as his hips collide with yours, forcing loud squelches from your snatch with his long girthy cock.'
+			'<<$npc_firstname[$boy]>> slows down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust and <<$npc_firstname[$boy]>>''s enormous dick fills you to the brim. Wet slaps echo around the room as his hips collide with yours, forcing loud squelches from your snatch with his long girthy cock.'
 		elseif $npc_dick_desc[$boy] = 'lengthy':
-			'<<$npc_firstname[$boy]>> slows down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust and his dick batters your insides with its exceptional length. Wet slaps echo around the room as his hips collide with yours, the sloppy sounds of your pussy squelching around <<$npc_firstname[$boy]>>''s lengthy shaft.'
+			'<<$npc_firstname[$boy]>> slows down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust and his dick batters your insides with its exceptional length. Wet slaps echo around the room as his hips collide with yours, the sloppy sounds of your pussy squelching around <<$npc_firstname[$boy]>>''s lengthy shaft.'
 		elseif $npc_dick_desc[$boy] = 'gigantic':
-			'<<$npc_firstname[$boy]>> slows down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust and his gigantic dick fills you to the brim. Sloppy wet slaps echo around the room as <<$npc_firstname[$boy]>> batters your pussy with his long hard cock.'
+			'<<$npc_firstname[$boy]>> slows down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust and his gigantic dick fills you to the brim. Sloppy wet slaps echo around the room as <<$npc_firstname[$boy]>> batters your pussy with his long hard cock.'
 		elseif $npc_dick_desc[$boy] = 'monster':
-			'<<$npc_firstname[$boy]>> slows down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust. His dick fills you completely and then some, forcing your pussy to strain and stretch around his long, girthy shaft. Sloppy wet slaps echo around the room as <<$npc_firstname[$boy]>> repeatedly batters your pussy with his monstrous cock.'
+			'<<$npc_firstname[$boy]>> slows down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust. His dick fills you completely and then some, forcing your pussy to strain and stretch around his long, girthy shaft. Sloppy wet slaps echo around the room as <<$npc_firstname[$boy]>> repeatedly batters your pussy with his monstrous cock.'
 		end
 	end
 end

locations/booty_call_morning.qsrc

@@ -1,6 +1,8 @@
 # booty_call_morning
 
 if $ARGS[0] = 'morning':
+	if booty_call['sleep_fuck'] = 1:gt'booty_call_morning', 'sleep_fuck_wake'
+	if (npc_earlyriser[$boy] = 1 or hour >= 7) and (npc_humor[$boy] = 2 or $npc_cum_pref[$boy] = 'facial') and (rand(1,10) < npc_sexdrive[$boy] or ($npc_cum_pref[$boy] = 'facial' and rand(1,5) < npc_sexdrive[$boy])):gt'booty_call_morning', 'cumshot_wakeup1'
 	'<center><video autoplay loop src="images/shared/romance/misc/wakeup1.mp4"></video></center>'
 !!{	if hangover = daystart:
 		'A sharp lance of pain pierces your consciousness, bringing you out of sleep. You wake up blearily, head <i>pounding</i> with an awful hangover.'
@@ -20,7 +22,123 @@ if $ARGS[0] = 'morning':
 	if booty_call['pass_out'] = 1:
 		
 	end
-!!	if pcs_lovers > 0:act'Guilt':gt'booty_call_morning', 'guilt'
+	if booty_call['sleep_fuck'] = 2:
+		act'Nice night':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk4.jpg"></center>'
+			'"That was nice," you smile sleepily at <<$npc_firstname[$boy]>>. "Our little mid-night romp I mean. Slept like a baby after. How about you?"'
+			if npc_humor[$boy] = 3:
+				'"I would say that fucking you always puts me to sleep, but that feels like sending the wrong message," he smiles back.'
+			else
+				'"I sleep better after a good fuck too," he grins.'
+			end
+			gs'booty_call_morning', 'wakeup1'
+		end
+	end
+	if pcs_lovers > 0:act'Guilt':gt'booty_call_morning', 'guilt1'
+end
+
+if $ARGS[0] = 'sleep_fuck_wake':
+	'<center><video autoplay loop src="images/shared/romance/misc/wakeup1.mp4"></video></center>'
+	'Your mind stirs and you slowly come to consciousness. The first thing you notice...'
+	*nl
+	if cum_loc['vagina'] > booty_call['sleep_cum_vagina']:
+		'<i>Is that cum leaking out of your pussy?</i>'
+	elseif cum_loc['face'] > booty_call['sleep_cum_face']:
+		'<i>Is there cum on my face?</i>'
+	elseif cum_loc['tits'] > booty_call['sleep_cum_tits']:
+		'<i>Is there cum on my tits?</i>'
+	elseif cum_loc['stomach'] > booty_call['sleep_cum_stomach']:
+		'<i>Is that cum on me?</i>'
+!!	else
+!!		'<i>Was <<$npc_firstname[$boy]>> wearing a condom when you went to sleep last night?</i>'
+	end
+	act'Continue':
+		cla & *clr
+		if cum_loc['vagina'] > booty_call['sleep_cum_vagina']:
+			'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/miss1.jpg"></center>'
+			'You pull aside the covers and discover, yes, it is indeed fresh cum dripping from your pussy.'
+		elseif cum_loc['face'] > booty_call['sleep_cum_face']:
+			'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+			'You blink carefully, running your hand across your cheek to discover, yes, there is indeed fresh cum on your face.'
+		elseif cum_loc['tits'] > booty_call['sleep_cum_tits']:
+			'<center><img <<$set_imgh>> src="images/pc/body/cum/cumtits/cumtits8.jpg"></center>'
+			'You sit up, looking down to discover, yes, there is indeed fresh cum on your tits.'
+		elseif cum_loc['stomach'] > booty_call['sleep_cum_stomach']:
+			'<center><img <<$set_imgh>> src="images/pc/body/cum/cumbelly/cumbelly10.jpg"></center>'
+			'You sit up, looking down to discover, yes, there is indeed fresh cum on your belly.'
+!!		else
+!!			'<i>Was <<$npc_firstname[$boy]>> wearing a condom when you went to sleep last night?</i>'
+		end
+		
+		act'Someone had fun last night':
+		
+		end
+		
+		act'Someone had fun last night':
+			cla & *nl
+			'"Somebody had fun last night," you muse, looking over at <<$npc_firstname[$boy]>> who is also waking.'
+			if npc_sleep_sex_okay[$boy] = 0:
+				'"Yeah. Got horny while you were asleep. Is that okay?"'
+				act'Ask next time':
+					cla & *nl
+					npc_sleep_sex_okay[$boy] = 1
+					'"Just ask next time," you smirk.'
+					gs'booty_call_morning', 'wakeup1'
+				end
+				
+				act'That''s fine':
+					cla & *nl
+					npc_sleep_sex_okay[$boy] = 2
+					'"That''s fine," you smirk. "A guy''s gotta take care of his needs, doesn''t he?"'
+					gs'booty_call_morning', 'wakeup1'
+				end
+				
+				act'Sleep orgasms are the best':
+					cla & *nl
+					npc_sleep_sex_okay[$boy] = 2
+					'"Feel free to do it again," you grin. "I have the best orgasms when I''m sleeping."'
+					gs'booty_call_morning', 'wakeup1'
+				end
+			else
+				'"Yeah," he grins. "That okay?"'
+				if npc_sleep_sex_okay[$boy] = -1:
+					act'Get mad':
+						cla & *nl
+						'"No," you say, glaring daggers at him. "If I weren''t in a rush to get up, I''d rip your head off."'
+						gs'booty_call_morning', 'wakeup1'
+					end
+					
+					act'Let it slide':
+						cla & *nl
+						'"No," you say irritably. "But I can''t do much about it now."'
+						gs'booty_call_morning', 'wakeup1'
+					end
+				else
+					act'Of course':
+						cla & *nl
+						'"Of course it is," you smile. "I said you could."'
+						gs'booty_call_morning', 'wakeup1'
+					end
+					
+					act'Sleep orgasms are the best':
+						cla & *nl
+						npc_sleep_sex_okay[$boy] = 2
+						'"Feel free to do it again," you grin. "I have the best orgasms when I''m sleeping."'
+						gs'booty_call_morning', 'wakeup1'
+					end
+				end
+			end
+		end
+		
+		act'Thanks for not waking me':
+			cla & *nl
+			'"Thanks for not waking me," you yawn pleasantly. You roll your hips as you do, noting that your pussy <i>definitely</i> feels used. "I really needed the sleep."'
+			'"Thanks for letting me fuck you," he grins.'
+			'"Any time," you smile.'
+			gs'booty_call_morning', 'wakeup1'
+		end
+	end
 end
 
 if $ARGS[0] = 'late_for_school':
@@ -133,7 +251,9 @@ if $ARGS[0] = 'yawn_wake':
 end
 
 if $ARGS[0] = 'wakeup1':
-!!	if npc_earlyriser = 1:
+
+!!	if npc_earlyriser[$boy] = 1 and npc_caretaker[$boy] = 1:
+!!		making breakfast? making coffee?
 !!		gt'booty_call_morning', 'earlyriser1'
 !!	elseif npc_latesleeper = 1:
 !!		gt'booty_call_morning', 'latesleeper'
@@ -150,7 +270,9 @@ if $ARGS[0] = 'wakeup1':
 	end
 
 	if booty_call['morning_shower'] = 0:
-		act'Head to the shower':gt'booty_call_morning', 'shower'
+		act'Take a shower':gt'booty_call_morning', 'shower'
+	elseif npc_earlyriser[$boy] = 1 and booty_call['npc_morning_shower'] = 1:
+		act'Join <<$npc_firstname[$boy]>> in the shower':gt'booty_call_morning', 'shower'
 	end
 
 !!	act'Snuggle back into bed':
@@ -201,9 +323,29 @@ if $ARGS[0] = 'head_out':
 	else
 		cla & *clr
 		$npc_apt_hall[$boy]
-		'"Bye then."'
-		'You gather your things and give him a wave and head out the door.'
-		act'Leave':gt'booty_call_after', 'exit'
+		act'Bye':
+			cla & *clr
+			$npc_apt_hall[$boy]
+			'"Bye then."'
+			'You gather your things and give him a wave and head out the door.'
+			act'Leave':gt'booty_call_after', 'exit'
+		end
+
+		act'See ya':
+			cla & *clr
+			$npc_apt_hall[$boy]
+			'"Well, see ya."'
+			'You gather your things and give him a wave and head out the door.'
+			act'Leave':gt'booty_call_after', 'exit'
+		end
+
+		act'Blow him a kiss':
+			cla & *clr
+			$npc_apt_hall[$boy]
+			'"Until next time."'
+			'You give him a wink and blow him a kiss and head out the door.'
+			act'Leave':gt'booty_call_after', 'exit'
+		end
 	end
 end
 
@@ -416,10 +558,231 @@ end
 
 !! ------------------------------------ Morning Sex Stuff -------------------------------------------------------
 
+if $ARGS[0] = 'cumshot_wakeup1':
+	'<center><video autoplay loop src="images/shared/sex/sleep/cumshot_wake1.mp4"></video></center>'
+	'You gasp as you are suddenly awakened by the shock of liquid splashing across your skin. Your eyes flutter open just in time to see another spurt of cum exit <<$npc_firstname[$boy]>>''s cock and hit you square in the face.'
+	act'What the fuck!':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/sleep/cumshot_wake2.mp4"></video></center>'
+		'"What the fuck are you doing?!" you exclaim, sputtering as strands of semen dribble last your lips.'
+		'"You were so hot lying there," <<$npc_firstname[$boy]>> snickers, a lewd grin smeared across his face. "I got hard just looking at you."'
+		'"So you thought it would be a good idea to cum on my face?!"'
+		'"Come on, don''t be like that. Here, clean me off. Get the rest out." He lowers his cock, pushing it towards your lips.'
+		gs'booty_call_morning', 'cumshot_wakeup_clean1'
+	end
+	
+	act'Take it in stride':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/sleep/cumshot_wake2.mp4"></video></center>'
+		'You sputter briefly as some of the salty sperm slips past your lips, but can''t help but feel amusement when you see the lewd satisfaction on <<$npc_firstname[$boy]>>''s face.'
+		act'Guess that means no morning BJ':
+			cla & *nl
+			'"Guess that means it''s too late for a morning blowjob," you snicker.'
+			'"No it''s not," he grins back and pushes his cock towards your lips.'
+			gs'booty_call_morning', 'cumshot_wakeup_clean2'
+		end
+		
+		act'At least I haven''t put on makeup':
+			cla & *nl
+			'"At least I haven''t put on my makeup yet," you giggle.'
+			'"Clean me off too," he insists, pushing his cock towards your lips.'
+			gs'booty_call_morning', 'cumshot_wakeup_clean2'
+		end
+	end
+	
+	if npc_cumshot_wake[$boy] > 0:
+		act'Again?! (annoyed)':
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/sleep/cumshot_wake2.mp4"></video></center>'
+			'"Ugh, again?!" you moan, allowing the salty sperm to slip into your mouth.'
+			'"You know you love it. Come here, clean me off," he says, pushing his cock towards your lips.'
+			gs'booty_call_morning', 'cumshot_wakeup_clean1'
+		end
+	end
+	npc_cumshot_wake[$boy] += 1
+end
+
+if $ARGS[0] = 'cumshot_wakeup_clean1':
+	act'No way':
+		cla & *clr
+		$npc_apt_bedroom[$boy]
+		'"Ugh!" you grimace, turning your head away from the offending cock. "No way. I''m not giving you a blowjob as a reward for being a pervert."'
+		gs'booty_call_morning', 'wakeup1'
+	end
+	
+	act'Acquiesce':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/sleep/cumshot_wake3.mp4"></video></center>'
+		gs 'arousal', 'bj', 1, 'sub'
+		gs 'cum_call', 'mouth_swallow', $boy, 1, 0, 5
+		'Before you can make any more protest, <<$npc_firstname[$boy]>>''s cock pushes into your mouth. Your eyes accuse him of being a jerk but your lips suck obediently, drawing the last drops of cum from his shaft.'
+		gs'booty_call_morning', 'wakeup1'
+	end
+end
+
+if $ARGS[0] = 'cumshot_wakeup_clean2':
+	act'No way':
+		cla & *clr
+		$npc_apt_bedroom[$boy]
+		'"Nuh uh!" you giggle, turning your head away from his tip. "One face shot is all you get No double dipping."'
+		gs'booty_call_morning', 'wakeup1'
+	end
+	
+	act'Acquiesce':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/sleep/cumshot_wake3.mp4"></video></center>'
+		gs 'arousal', 'bj', 1, 'sub'
+		gs 'cum_call', 'mouth_swallow', $boy, 1, 0, 5
+		'"Oh fiiiine," you say, mock frowning as <<$npc_firstname[$boy]>>''s cock pushes past your lips and you subserviently suck out the last drops of cum from it.'
+		gs'booty_call_morning', 'wakeup1'
+	end
+end
 
 
 !! ------------------------------------ Misc Stuff -------------------------------------------------------
 
+if $ARGS[0] = 'guilt1':
+	cla & *clr
+	booty_call['guilt'] = 1
+	if stat['bf_cheated_on'] <= 10:
+		'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock1.mp4"></video></center>'
+		'You bolt upright as a lance of guilt pierces through you.'
+		'<i>My <<$booty_call[''cheat'']>>...</i> you think.'
+		act'Wallow':
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
+			'Throwing your legs over the side of the bed, you sit up, hands on your knees, breathing hard in your guilt-driven panic.'
+			*nl
+			'<i>I just cheated on my <<$booty_call[''cheat'']>>...</i>'
+			*nl
+			'Your thoughts wander through your night with <<$npc_firstname[$boy]>>...'
+			*nl
+			if booty_call['bj'] > 0:'<i>Sucking his cock...</i>'
+			if booty_call['fuck'] > 0:'<i>Fucking him on his bed...</i>'
+			if booty_call['orgasm_count'] > 5:
+				'<i>He made you come so many times...</i>'
+			elseif booty_call['orgasm_count'] > 0:
+				'<i>How he made you come...</i>'
+			end
+			
+			if booty_call['creampie_orgasm'] > 0:
+				'<i>You came together, orgasming as he filled you with his cum...</i>'
+			elseif booty_call['creampie_count'] > 3:
+				'<i>He filled you with his cum...</i>'
+			elseif booty_call['creampie_count'] > 0:
+				'<i>And he came inside you...</i>'
+			end
+			
+			if $booty_call['cum_choice'] = 'face': '<i>And he came on your face...</i>'
+			if $booty_call['cum_choice'] = 'mouth': 
+				'<i>And he came in your mouth...</i>'
+				if booty_call['swallow'] = 1:'<i>You even swallowed...</i>'
+			end
+			*nl
+			'You feel sick to your stomach...'
+			gs'booty_call_morning','guilt_excuses'
+		end
+	else
+		'<center><img <<$set_imgh>> src="images/shared/sex/after/wakeup1.jpg"></center>'
+		'Your eyes snap open as your thoughts settle on one thing.'
+		'<i>My <<$booty_call[''cheat'']>>...</i> you think.'
+		act'Wallow':
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
+			'You sit up, throwing your legs over the side of the bed as the shame flows through you.'
+			'It''s nothing you haven''t felt before. This isn''t the first time you''ve cheated. It''s not the second time. It''s not even the tenth time. You''ve lost count by now. But somehow, the crippling guilt always feels the same.'
+			gs'booty_call_morning','guilt_excuses'
+		end
+	end
+end
+
+if $ARGS[0] = 'guilt_excuses':
+	act'It''s not your fault':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
+		'<i>It''s not my fault,</i> you try to rationalize. <i>I have needs. Sexual needs. He preyed on that. He seduced me. I''m a victim here...</i>'
+		*nl
+		'They ring hollow in your ears.'
+		gs'booty_call_morning','guilt2'
+	end
+	
+	act'It''s just sex':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
+		'<i>It''s just sex,</i> you try to rationalize. <i>It''s not like I''m falling in love with <<$npc_firstname[$boy]>> or anything. It''s not cheating. It''s just sex..</i>.'
+		gs'booty_call_morning','guilt2'
+	end
+	
+	act'You''re a whore':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock3.mp4"></video></center>'
+		'You scold yourself internally, screaming insults that impale your own soul.'
+		*nl
+		'<i>You slut! Jumping any random cock that comes your way. You''re nothing but a filthy whore...</i>'
+		*nl
+		if stat['bf_cheated_on'] > 10:
+			'You breathe deeply, letting the pain take its course, waiting for it to subside. It''s nothing you haven''t felt before...'
+		end
+		act'Continue':gt'booty_call_morning','guilt3'
+	end
+end
+
+if $ARGS[0] = 'guilt2':
+	*nl
+	if stat['bf_cheated_on'] <= 10:
+		'The guilt continues to lance through you anyway.'
+	else
+		'You breathe deeply, letting the pain take its course, waiting for it to subside. It''s nothing you haven''t felt before...'
+	end
+	act'Continue':gt'booty_call_morning','guilt3'
+end
+
+if $ARGS[0] = 'guilt3':
+	'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
+!!{	if npc_earlyriser[$boy] = 1:
+		!! for later: create option for him to burst in with breakfast in bed
+		if npc_apt_type[$boy] = 2:
+			'The bed next to you is empty and the bathroom door is closed. You can hear the water running behind it.'
+		elseif npc_apt_type[$boy] = 3:
+			booty_call['npc_morning_shower'] = 1
+			'The bed next to you is empty but you can hear water running through the wall. He must be in the shower.'
+		else
+			'The bed next to you is empty. The man you were with last night, nowhere to be found.'
+		end
+		gs'booty_call_morning','wakeup1'
+	elseif npc_latesleeper[$boy] = 1:
+		'<<$npc_firstname[$boy]>>, the guy from last night, is still asleep next to you, completely ignorant to your internal strife, snoring softly.'
+		gs'booty_call_morning','wakeup1'
+	else}
+		'<<$npc_firstname[$boy]>> stirs next to you.'
+		if npc_selfish[$boy] ! 1 and npc_abusive[$boy] ! 1 and rand(1,3) = 3:
+			'"Hey." He yawns, glancing over at you before blinking, a look of concern on his face. "What''s up? Something wrong?"'
+			act'It''s nothing':
+				cla & *nl
+				'"It''s nothing," you mumble, trying to keep a straight face while you shove down your shameful feelings.'
+				gs'booty_call_morning','wakeup1'
+			end
+			
+			if npc_know_cheat[$boy] = 0:
+				act'Tell him you''re cheating':
+				
+				end
+			elseif npc_know_cheat[$boy] = 1:
+				act'Thinking about your <<$booty_call[''cheat'']>>':
+				
+				end
+			end
+		else
+			'"Hey," he stretches, looking over at you. "You just wake up too?"'
+			act'Yeah':
+				cla & *nl
+				'"Yeah," you mumble, trying to keep a straight face while you shove down your shameful feelings.'
+				gs'booty_call_morning','wakeup'
+			end
+		end
+!!	end
+end
+
 if $ARGS[0] = 'give_lift':
 	!! add in option later to give road head along the way
 	if booty_call['give_lift'] = 2:

locations/booty_call_pillow_talk.qsrc

@@ -14,11 +14,12 @@ end
 
 if $ARGS[0] = 'topics':
 	act'Stop talking':cla & gs'booty_call_after', 'after_sex2'
-	if booty_call['angry_after'] = 0:
+!!	if booty_call['angry_after'] = 0:
 !!		act'Small talk':cla & gs'booty_call_pillow_talk', 'small_talk'
 		act'Talk about the sex':cla & gs'booty_call_pillow_talk', 'sex_talk'
 !!		act'Play with his cock':cla & gs'booty_call_pillow_talk', 'dick_talk'
-	end
+		if booty_call['creampie_count'] > 0 and npc_free_creampies[$boy] < 1: gs'booty_call_pillow_talk', 'free_creampies'
+!!	end
 end
 
 
@@ -47,7 +48,7 @@ if $ARGS[0] = 'good_for_you':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 			minut += 1
-			'"Was it good for you?" you ask pleasantly.'	
+			'"Was it good for you?" you ask pleasantly.'
 			if booty_call['virgin'] ! 1:
 				if booty_call['cum_count'] = npc_sexdrive[$boy]:
 					'"Yeah, you were great" he says. "You practically drained my balls. I might not be able to come again for a week. What about you?"'
@@ -69,6 +70,276 @@ if $ARGS[0] = 'good_for_you':
 	end
 end
 
+if $ARGS[0] = 'good_for_you_WIP':
+	if booty_call['good_for_you'] = 0 and booty_call['mad'] ! 1 and booty_call['blue_ball'] ! 1:
+		act'Was it good for you?':
+			booty_call['good_for_you'] = 1
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+			minut += 1
+			'"Was it good for you?" you ask pleasantly.'
+!!{			if rand(0,1) = 1 and $npc_cum_pref[$boy] = 'creampie' and booty_call['creampie_count'] > 0:
+				$booty_call['boy_favorite'] = 'creampie'
+				gs'booty_call_pillow_talk', 'creampie_favorite'
+			elseif rand(0,1) = 1 and $npc_cum_pref[$boy] = 'mouth' and booty_call['mouth_cum'] > 0:
+				gs'booty_call_pillow_talk', 'cum_mouth_favorite'
+			elseif rand(0,1) = 1 and $npc_cum_pref[$boy] = 'face' and booty_call['facial'] > 0:
+				
+			elseif rand(0,1) = 1 and $npc_cum_pref[$boy] = 'tits' and booty_call['tit_cum'] > 0:
+				
+			else}
+				if booty_call['virgin'] ! 1:
+					if booty_call['cum_count'] >= npc_sexdrive[$boy]:
+						'"My dick hurts," he says grinning. "You drained my balls. So yeah, it was good. What about you?"'
+					elseif booty_call['cum_count'] < npc_sexdrive[$boy]/2:
+						'"I could''ve gone a few more times," he says. "But it wasn''t bad. How about you?"'
+					else
+						'"Yeah, it was," he says. "How about you?"'
+					end
+					gs'booty_call_pillow_talk', 'good_for_you_too'
+				else
+					if booty_call['cum_count'] >= npc_sexdrive[$boy]:
+						'"My dick hurts," he says grinning. "You drained my balls. So yeah, it was good."'
+					else
+						'"I could''ve gone a few more times," he says. "But it wasn''t bad."'
+					end
+					gs'booty_call_pillow_talk', 'topics'
+				end
+!!			end
+		end
+	end
+end
+
+if $ARGS[0] = 'creampie_favorite':
+	act'Glad you enjoyed it':
+		cla & *nl
+		'"I''m glad you found my pussy so satisfying," you smirk amusedly.'
+		'"What about you?" he asks. "What about you? What was your favorite part?"'
+		gs'booty_call_pillow_talk', 'pc_favorite_part'
+	end
+	
+	act'I liked it too':
+		cla & *nl
+		if booty_call['creampie_count'] = booty_call['simultaneous_orgasm_count']:
+			'"I liked it too," you say, beaming at him. "Your cock throbbing, your cum filling my pussy up, I could <i>feel</i> all of it. I think we came together every time."'
+		elseif booty_call['simultaneous_orgasm_count'] > 0:
+			'"I liked it too," you say, beaming at him. "Your cock throbbing, your cum filling my pussy up, I could <i>feel</i> all of it. It was so good I couldn''t help but come too."'
+		else
+			'"I liked it too," you say, beaming at him. "Every time you came, I could <i>feel</i> it inside me. Your cock throbbing, your cum filling my pussy up. It felt really good."'
+		end
+		gs'booty_call_pillow_talk', 'topics'
+	end
+	if booty_call['surprise_creampie_count'] >= 3:
+		'"Your pussy is amazing," <<$npc_firstname[$boy]>> says. "It''s like you were sucking me in, I couldn''t stop coming inside you."'
+		if npc_free_creampies[$boy] < 1:
+			act'Ask next time (tease)':
+				cla
+				'"It would be nice if you would ask before you do," you smile teasingly. "I''m not just a cum receptacle you know."'
+				'"Sorry," he replies, though he doesn''t look it. "What about you? What was your favorite part?"'
+				gs'booty_call_pillow_talk', 'pc_favorite_part'
+			end	
+			
+			act'Ask next time (annoyed)':
+				cla
+				'"It would be nice if you would ask first," you frown in annoyance. "I''m not just a cum receptacle you know."'
+				'"Sorry," he replies, though he doesn''t look it. "What about you? What was your favorite part?"'
+				gs'booty_call_pillow_talk', 'pc_favorite_part'
+			end
+		end
+	else
+		if npc_rel[$boy] < 100:
+			'"I loved coming inside you," <<$npc_firstname[$boy]>> says. "There''s just something hot about filling a girl with cum."'
+		else
+			'"I loved coming inside you," <<$npc_firstname[$boy]>> says. "There''s just something hot about filling a girl with cum. Especially you."'
+		end
+	end	
+end
+
+if $ARGS[0] = 'cum_mouth_favorite':
+	if booty_call['swallow_count'] > 0:
+		$booty_call['boy_favorite'] = 'swallowing'
+		'"It was so hot watching you swallow," <<$npc_firstname[$boy]>> says.'
+		act'I aim to please':
+			cla & *nl
+			'"Glad you liked it," you smile pleasantly. "I aim to please."'
+			'"So what about you? What did you like?"'
+			gs'booty_call_pillow_talk', 'pc_favorite_part'
+		end
+		
+		act'Not my favorite':
+			cla & *nl
+			'"Well I''m glad <i>someone</i> enjoyed it," you smile ruefully. "It''s not exactly my favorite flavour of syrup. But as long as it made you happy I guess."'
+			'"So what about you? What did you like?"'
+			gs'booty_call_pillow_talk', 'pc_favorite_part'
+		end
+		
+		
+		act'Your cum is disgusting':
+			npc_gross_cum[$boy] = 1
+			npc_rel[$boy] -= 2
+			cla & *nl
+			'"You could stand to eat some more fruit if you want me to keep doing it," you say, wrinkling your nose. "Your cum tastes <i>horrible</i>. It''s like drinking expired caviar."'
+			*nl
+			'You stick your tongue out, half retching at the lingering flavour.'
+			gs'booty_call_pillow_talk', 'topics'
+		end
+		
+		act'You''re delicious':
+			npc_tasty_cum[$boy] = 1
+			cla & *nl
+			if pcs_traits['cumeater'] > 0:
+				'"Your cum is delicious," you grin. "I like all cum, but yours is like a fine shot of vodka. Smooth and leaves you wanting more."'
+			else
+				'"Your cum is delicious," you grin. "I don''t usually like cum all that much, but yours is really nice. It''s almost sweet."'
+			end
+			'"What else did you like?"'
+			gs'booty_call_pillow_talk', 'pc_favorite_part'
+		end
+		
+		if pcs_traits['cumeater'] > 0:
+			act'I love cum':
+				cla & *nl
+				'"I love cum," you grin. "If it''s in my mouth, I can''t help but swallow."'
+				'"What else did you like?"'
+				gs'booty_call_pillow_talk', 'pc_favorite_part'
+			end
+		end
+	else
+		$booty_call['boy_favorite'] = 'cum_in_mouth'
+		'"Coming in your mouth felt great," <<$npc_firstname[$boy]>> says. "I wish you''d swallow though."'
+		act'I don''t like it':
+			cla & *nl
+			'"I don''t like it," you say, wrinkling your nose. "It''s just <i>weird</i> swallowing cum."'
+			'"Then what <i>do</i> you like?"'
+			gs'booty_call_pillow_talk', 'pc_favorite_part'
+		end
+		
+		act'It''s gross':
+			cla & *nl
+			'"Cum is gross," you say, wrinkling your nose. "I hate it. There''s no way I''m swallowing that vile shit."'
+			'"Then what <i>do</i> you like?"'
+			gs'booty_call_pillow_talk', 'pc_favorite_part'
+		end
+		
+		act'Don''t like you enough':
+			cla & *nl
+			'"I don''t like you enough for that yet," you say.'
+			'"So if you liked me more, you''d swallow for me?"'
+			act'No':
+				cla & *nl
+				'"No," you smirk teasingly. "Now that I know it''s what you want, maybe I''ll keep spitting just to fuck with you."'
+			end
+			
+			act'Maybe':
+				cla & *nl
+				'"Maybe," you smirk teasingly.'
+				gs'booty_call_pillow_talk', 'topics'
+			end
+			
+			act'Yes':
+				cla & *nl
+				'"Yes," you smirk, a mischievous twinkle in your eye. "Every drop."'
+				!! insert invite for date
+				gs'booty_call_pillow_talk', 'topics'
+			end
+		end
+		
+		act'Only for boyfriends':
+			cla & *nl
+			'"I only swallow for my boyfriend," you say.'
+			'"So if I were your boyfriend, you''d swallow for me?"'
+			act'No':
+				cla & *nl
+				'"No," you smirk teasingly. "Not now that I know how much you''d love it. I''d spit just to drive you crazy."'
+			end
+			
+			act'Maybe':
+				cla & *nl
+				'"Maybe," you smirk teasingly.'
+				gs'booty_call_pillow_talk', 'topics'
+			end
+			
+			act'Yes':
+				cla & *nl
+				'"Yes," you smirk, a mischievous twinkle in your eye. "Every drop."'
+				!! insert invite to start dating
+				gs'booty_call_pillow_talk', 'topics'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'pc_favorite_part':
+	act'Your cock':
+		cla & *clr
+		if pcs_pubes < 12:
+			'<center><img <<$set_imgh>> src="images/shared/sex/after/dick_play1.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/shared/sex/after/dick_play2.jpg"></center>'
+		end
+		'"Your cock," you grin, teasingly wrapping your fingers around his shaft. "This bad boy is the main reason I keep coming over all the time."'
+		gs'booty_call_pillow_talk', 'topics'
+	end
+	
+	if booty_call['bj_count'] > 0 and npc_gross_cum[$boy] ! 1:
+		act'Sucking your cock':
+		
+		end
+	end
+	
+	act'The sex':
+		cla
+		if booty_call['gentle_fuck'] = 1:
+			act'When you got rough with me':
+			
+			end
+		end
+		if booty_call['rough_fuck'] = 1:
+			act'When you got rough with me':
+			
+			end
+		end
+		if booty_call['rough_enjoy'] = 1:
+			act'When you got rough with me':
+				booty_call['rough_pillow_talk'] = 1
+				
+			end
+		end
+	end
+	
+	if booty_call['cuni_orgasm'] > 0:
+		act'Getting eaten out':
+			
+		end
+		
+		act'When I sat on your face':
+			
+		end
+	end
+	
+	if booty_call['creampie_count'] > 0:
+		
+	end
+	
+	if booty_call['mouth_cum'] > 0:
+		
+	end
+	
+	if booty_call['facial'] > 0:
+		
+	end
+	
+	if booty_call['tit_cum'] > 0:
+		
+	end
+	
+	if booty_call['creampie_eat'] > 0:
+		act'When you ate the creampie out of me':
+		
+		end
+	end
+end
+
 if $ARGS[0] = 'good_for_you_too':
 	act'Satisfied':
 		cla & *nl
@@ -137,7 +408,7 @@ if $ARGS[0] = 'good_for_you_too':
 	if booty_call['orgasm_count'] + booty_call['fake_orgasm_count'] > 3:
 		act'Lots of orgasms':
 			cla & *nl
-			'"You made me come so many times," you say, beaming at <<$npc_firstname[$boy]>>. "It was more than good."'
+			'"You made me come lots," you say, flashing a tired smile at <<$npc_firstname[$boy]>>. "It was more than good."'
 			gs'booty_call_pillow_talk', 'topics'
 		end
 	elseif booty_call['orgasm_count'] > 0:
@@ -187,8 +458,8 @@ if $ARGS[0] = 'keep_it_up':
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 			booty_call['keep_it_up'] = 1
 			minut += 1
-			'"You can really keep it up, huh?" you say, impressed with how many times he managed to come.'
-			'"Yeah, I guess I have a pretty high sex drive. Glad that you have one to match," he smiles back.'
+			'"You can really keep it up, huh?" you say, trying to count how many times he came.'
+			'"Yeah, I guess I have a pretty high sex drive," he smiles back.'
 			gs'booty_call_pillow_talk', 'topics'
 		end
 	end
@@ -221,8 +492,8 @@ if $ARGS[0] = 'long_time':
 			booty_call['keep_it_up'] = 1
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-			'"Damn," you pant, reaching over to check your phone. "We were at it for a long time."'
-			'"Yeah," he grins back. "You''re just too much fun to fuck."'
+			'"Wow," you pant, reaching over to check your phone. "We were at it for a long time."'
+			'"I just can''t stop fucking you," he grins back. "It''s too much fun."'
 			gs'booty_call_pillow_talk', 'sex_talk'
 		end
 	end
@@ -831,17 +1102,20 @@ if $ARGS[0] = 'so_many_creampies':
 			end
 			gs'booty_call_pillow_talk', 'topics'
 		end
-		
 		act'Did you have to come inside me so many times?':
 			booty_call['creampie_pillow_talk'] = 1
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 			if cum_loc['vagina'] > 0:
-				'"Did you have to come inside me so many times?" you ask, shivering in disgust as you feel <<$npc_firstname[$boy]>>''s warm cum continue to ooze from your sex.'
+				'"Did you have to come inside me so many times?" you ask, shivering as you feel <<$npc_firstname[$boy]>>''s warm cum continue to ooze from your sex.'
 			else
 				'"Did you have to come inside me so many times?" you ask in annoyance. "It took forever to clean out."'
 			end
-			if $npc_cum_pref[$boy] = 'creampie':
+			
+			if npc_free_creampies[$boy] > 0:
+				'"You said I didn''t have to ask anymore," he smirks amusedly.'
+				'"That doesn''t mean I want you to blow every single load inside me," you grumble back.'
+			elseif $npc_cum_pref[$boy] = 'creampie':
 				if cum_loc['vagina'] > 0:
 					'"I couldn''t help it," he says. "If I could, I''d fill you up with so much cum that you''d still be dripping next week."'
 				else
@@ -861,8 +1135,162 @@ if $ARGS[0] = 'so_many_creampies':
 	end
 end
 
+if $ARGS[0] = 'free_creampies':
+	if booty_call['creampie_count'] > booty_call['surprise_creampie_count']:
+		act'You don''t need to ask to come inside':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
+			'"Y''know," you say, gently looking into <<$npc_firstname[$boy]>>''s eyes. "You don''t need to ask if you want to come inside me..."'
+			act'I don''t mind':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
+				'"Y''know," you say, gently looking into <<$npc_firstname[$boy]>>''s eyes. "You don''t need to ask if you want to come inside me. I don''t mind."'
+				gs 'booty_call_pillow_talk','free_creampies2'
+			end
+			act'I love creampies':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
+				'"Y''know," you say, gently looking into <<$npc_firstname[$boy]>>''s eyes. "You don''t need to ask if you want to come inside me. I really like it. It makes me feel good."'
+				gs 'booty_call_pillow_talk','free_creampies2'
+			end
+			if pc_cum_pref_know[$boy] = 'creampie':
+				act'I know how much you like it':
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
+					'"Y''know," you say, gently looking into <<$npc_firstname[$boy]>>''s eyes. "You don''t need to ask if you want to come inside me. I know how much you like it. And I want you to feel good."'
+					gs 'booty_call_pillow_talk','free_creampies2'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'free_creampies2':
+!! npc_free_creampies[$boy] = 1: he will freely creampie you tell him its safe
+!! npc_free_creampies[$boy] = 2: he will creampie you whenever he wants
+	if npc_abusive[$boy] = 1 and npc_childfree[$boy] ! 1:
+		npc_free_creampies[$boy] = 2
+		if $npc_cum_pref[$boy] = 'creampie':
+			'<<$npc_firstname[$boy]>> gives you a predatory grin, so full of desire that it makes you involuntarily swallow.'
+			*nl
+			'"Good to know..."'
+		else
+			'"Good to know," he smirks amusedly.'
+		end
+		gs'booty_call_pillow_talk', 'topics'
+	elseif (npc_selfish[$boy] = 1 or npc_know_bc[$boy] = 1) and npc_childfree[$boy] ! 1:
+		npc_free_creampies[$boy] = 2
+		if $npc_cum_pref[$boy] = 'creampie':
+			'<<$npc_firstname[$boy]>> gives you a look like he might just burst inside you again before giving you a delighted grin.'
+			'"Next time, I''m gonna pump you full of so much cum, you''re going to still be dripping next week," he says excitedly and you can''t help but giggle at his boyish glee.'
+		else
+			'"Good to know," he smirks amusedly.'
+		end
+		gs'booty_call_pillow_talk', 'topics'
+	else
+		if npc_childfree[$boy] = 1 and npc_know_bc[$boy] ! 1:
+			'"Are you sure...?" <<$npc_firstname[$boy]>> asks hesitantly. "You''re not worried you''re going to get pregnant? I''m... I''m not really up for having kids..."'
+			!! add more options later
+		else
+			'"Is that really okay?" <<$npc_firstname[$boy]>> asks, wide-eyed.'
+		end
+		
+		act'I''ll be fine':
+			cla & *nl
+			'"I''ll be fine," you insist, smiling gently. "What could go wrong?"'
+			if npc_childfree[$boy] = 1 or rand(1,4) = 1:
+				npc_free_creampies[$boy] = -1
+				'"I''m not comfortable with it," <<$npc_firstname[$boy]>> says, shaking his head. "Maybe if you started birth control..."'
+			else
+				npc_free_creampies[$boy] = 2
+				'"Okay..." <<$npc_firstname[$boy]>> says hesitantly, but smiles back at you anyways.'
+			end
+			gs'booty_call_pillow_talk', 'topics'
+		end
+		
+		act'It feels good':
+			cla & *nl
+			'"It feels so good," you coo gently. "I <i>want</i> you to come inside me. I want you to fill me with your cum..."'
+			*nl
+			if ($npc_cum_pref[$boy] = 'creampie' and npc_childfree[$boy] = 1 and rand(npc_willpwr[$boy],100) <= pcs_persuas) or ($npc_cum_pref[$boy] = 'creampie' and npc_childfree[$boy] ! 1):
+				npc_free_creampies[$boy] = 2
+				'Desire wars with willpower within <<$npc_firstname[$boy]>>. You watch as he struggles back and forth until he leers at you with a hungry stare and you know which one won out.'
+				'"Okay." <<$npc_firstname[$boy]>> says. "I won''t ask anymore."'
+			elseif npc_childfree[$boy] = 1:
+				npc_free_creampies[$boy] = -1
+				'<<$npc_firstname[$boy]>> hesitates for a moment before shaking his head.'
+				'"I''m not comfortable with it," he says. "Maybe if you started birth control..."'
+			else
+				npc_free_creampies[$boy] = 2
+				'<<$npc_firstname[$boy]>> hesitates for a moment before nodding slowly.'
+				'"Okay," he says, smiling. "I won''t ask anymore."'
+			end
+			gs'booty_call_pillow_talk', 'topics'
+		end
+		
+		act'I''ll tell you when it''s safe':
+			npc_free_creampies[$boy] = 1
+			cla & *nl
+			if npc_childfree[$boy] = 1 and npc_know_bc[$boy] ! 1:
+				'"I don''t really want to get pregnant yet either," you smile wryly. "So... I''ll let you know when it''s a safe day. And then you can come inside me as much as you want."'
+			else
+				'"I''ll let you know when it''s a safe day," you smile gently. "And then you can come inside me as much as you want."'
+			end
+			'"Okay." <<$npc_firstname[$boy]>> smiles back, beaming at you.'
+			gs'booty_call_pillow_talk', 'topics'
+		end
+		
+		if birth_control['think_safe'] = 1:
+			act'I''m on birth control':
+				npc_free_creampies[$boy] = 2
+				cla & *nl
+				if npc_know_not_bc[$boy] = 1:
+					npc_know_not_bc[$boy] = 0
+					npc_know_bc[$boy] = 1
+					'"I started birth control," you smile gently. "And it should be effective now. So you can come inside me as much as you want."'
+				else
+					npc_know_bc[$boy] = 1
+					'"I''m on birth control," you smile gently. "So you can come inside me as much as you want."'
+				end
+				'"Okay." <<$npc_firstname[$boy]>> smiles back, beaming at you.'
+				gs'booty_call_pillow_talk', 'topics'
+			end
+		elseif pillcon2 >= 20000:
+			act'I''m on birth control':
+				npc_free_creampies[$boy] = 2
+				cla & *nl
+				if npc_know_not_bc[$boy] = 1:
+					npc_know_not_bc[$boy] = 0
+					npc_know_bc[$boy] = 1
+					'"I started birth control," you smile gently. "And it should be effective any day now. So you can come inside me as much as you want."'
+				else
+					npc_know_bc[$boy] = 1
+					'"I''m on birth control," you smile gently. "So you can come inside me as much as you want."'
+				end
+				'"Okay." <<$npc_firstname[$boy]>> smiles back, beaming at you.'
+				gs'booty_call_pillow_talk', 'topics'
+			end
+		else
+			act'I''m on birth control (lie)':
+				npc_free_creampies[$boy] = 2
+				cla & *nl
+				if npc_know_not_bc[$boy] = 1:
+					npc_know_not_bc[$boy] = 0
+					npc_know_bc[$boy] = 1
+					'"I started birth control," you lie with a seductively gentle smile. "And it should be effective now. So you can come inside me as much as you want."'
+				else
+					npc_know_bc[$boy] = 1
+					'"I''m on birth control," you lie with a seductively gentle smile. "So you can come inside me as much as you want."'
+				end
+				'"Okay." <<$npc_firstname[$boy]>> smiles back, beaming at you.'
+				gs'booty_call_pillow_talk', 'topics'
+			end
+		end		
+	end
+end
+
 if $ARGS[0] = 'broken_creampie_rule':
-	if npc_boyfriend_creampie_rule[$boy] <= 2 and npc_boyfriend_creampie_rule[$boy] > 0 and booty_call['creampie_count'] > 0 and booty_call['broken_creampie_rule'] = 0:
+	if npc_boyfriend_creampie_rule[$boy] <= 2 and npc_boyfriend_creampie_rule[$boy] > 0 and booty_call['creampie_count'] > 0 and booty_call['broken_creampie_rule'] = 0 and npc_free_creampies[$boy] = 0:
 		act'Broke my creampie rule':
 			booty_call['broken_creampie_rule'] = 1
 			cla			
@@ -1040,6 +1468,22 @@ if $ARGS[0] = 'fine_high_five':
 end
 
 
+if $ARGS[0] = 'sleep_fucking_talk':
+	act'Couldn''t sleep?':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+		'"So... couldn''t sleep?" you ask <<$npc_firstname[$boy]>> amusedly.'
+		if booty_call['cum_count'] >= npc_sexdrive[$boy] + booty_call['extra_cum']:
+			'"Hard to sleep with my cock snuggled up against your ass," he grins.'
+			'"Easy to get hard you mean," you snicker.'
+		else
+			'"I didn''t get enough earlier," he says. "Was still horny."'
+			'"I can tell," you giggle, rubbing your just-fucked pussy.'
+		end
+	end
+end
+
+!! ------------------------------ BOY INITIATED CONVERSATIONS -------------------------------------------------
 if $ARGS[0] = 'boy_talk':
 	if booty_call['boy_topic_check'] = 1: gs 'booty_call_pillow_talk', 'boy_topic_check'
 	

locations/booty_call_sex.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'sex_start':
 			act'Fuck <<$npc_firstname[$boy]>>':booty_call['must_fuck'] = 1 & booty_call['fuck_now'] = 1 & gs 'booty_call_sex', 'sex_pre'
 		else
 			act'Fuck again':
-				if booty_call['cum_count'] >= npc_sexdrive[$boy] + booty_call['force_harden']:
+				if booty_call['cum_count'] >= npc_sexdrive[$boy] + booty_call['extra_cum']:
 					booty_call['fuck_again'] = 1
 					gs 'booty_call_after', 'fucked_out'
 				else
@@ -23,7 +23,8 @@ if $ARGS[0] = 'sex_start':
 end
 
 if $ARGS[0] = 'sex_pre':
-	cla & *nl
+	cla & *clr
+	$npc_apt_bedroom[$boy]
 	if booty_call['fuck_count'] = 0:
 		if booty_call['about_time'] = 1:
 			'"It''s about fucking time," you say, scooting backwards onto the bed.'
@@ -68,8 +69,8 @@ if $ARGS[0] = 'position_choose':
 		gs 'booty_call_virgin', 'start_options'
 	!! initiative roll
 	elseif booty_call['no_sex'] = 0:
-		booty_call['initative'] = rand(0,1)
-		if (booty_call['initative'] = 1 and booty_call['force_initiative'] ! 2) or booty_call['force_initiative'] = 1:
+		booty_call['initiative'] = rand(0,1)
+		if (booty_call['initiative'] = 1 and booty_call['force_initiative'] ! 2) or booty_call['force_initiative'] = 1:
 			!! player wins initiative
 			if $booty_call['pos_speed'] = '':
 				act'Let him choose':
@@ -158,7 +159,7 @@ if $ARGS[0] = 'rand_position':
 	elseif booty_call['position_rand'] = 4 and booty_call['must_fuck'] ! 1:
 		!! blowjob
 		gs 'booty_call_start', 'bj_ask'
-	elseif booty_call['position_rand'] = 5 and booty_call['must_fuck'] ! 1:
+	elseif booty_call['position_rand'] = 5 and booty_call['must_fuck'] ! 1 and (booty_call['creampie_count'] < 1 or npc_pussyeater[$boy] = 1):
 		*nl
 		'<<$npc_firstname[$boy]>> starts leading a trail of kisses down your stomach towards your pussy.'
 		gs 'booty_call_start', 'kuni_start'
@@ -168,6 +169,51 @@ if $ARGS[0] = 'rand_position':
 	end
 end
 
+if $ARGS[0] = 'fuck_continue':
+	
+	
+	if booty_call['bored'] = 1:
+		act'Keep going':gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.bored'
+	elseif booty_call['virgin_enjoyment'] = -1:
+		if $booty_call['pos_speed'] = 'miss3' or $booty_call['pos_speed'] = 'doggy3':
+			act'Sob':booty_call['virgin_pain'] = 4 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+			act'Try to hold back tears':booty_call['virgin_pain'] = 3 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+		else
+			act'Hold back tears':booty_call['virgin_pain'] = 3 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+		end
+		act'Perservere':booty_call['virgin_pain'] = 2 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+		act'The pain is fading':booty_call['virgin_pain'] = 1 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+	elseif booty_call['virgin_enjoyment'] = 1:
+		act'Just keep fucking':booty_call['moan'] = 1 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+		act'Fake some moans':booty_call['moan'] = 2 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+		act'Starting to feel good':booty_call['virgin_feel_good'] = 1 & $orgasm_or = '' & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+	else
+		act'Focus on the sensations':$orgasm_or = '' & booty_call['dirty_talk'] = 0 & booty_call['moan'] = 0 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+		act'Moan softly':$orgasm_or = '' & booty_call['dirty_talk'] = 0 & booty_call['moan'] = 1 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+		act'Moan loudly':$orgasm_or = '' & booty_call['dirty_talk'] = 0 & booty_call['moan'] = 2 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+!!		act'Talk dirty':gs 'booty_call_sex', 'dirty_talk1'
+		act'Talk dirty':
+			$orgasm_or = ''
+			booty_call['moan'] = 0
+			booty_call['dirty_talk'] = 1
+			gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+		end
+		if booty_call['virgin_enjoyment'] ! 2:
+			act'Fake enjoyment':booty_call['bored'] = 1 & booty_call['moan'] = 3 & $orgasm_or = 'no' & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+		end
+	end
+	
+	act'Change position':
+		cla
+		booty_call['change_pos'] = 1
+		gs 'booty_call_sex', 'position_change'
+	end
+	
+	if $booty_call['position'] = 'cowgirl':
+		act'Change pace':gs 'booty_call_cowgirl', 'cowgirl_change_pace'
+	end
+end
+
 if $ARGS[0] = 'position_change':
 	booty_call['bored'] = 0
 	if $booty_call['position'] ! 'miss': gs 'booty_call_miss', 'missionary_start'
@@ -181,24 +227,30 @@ if $ARGS[0] = 'girl_cum_pre':
 end
 
 if $ARGS[0] = 'sex_end':
-	if booty_call['mad'] = 1:
-		gs'booty_call_after', 'bad_sex_end'
+	if booty_call['force_harden'] = 2:
+		gs 'booty_call_after', 'finish'
 	else
-		gs'booty_call_after', 'stop_here'
-	end
-	if booty_call['sex_stop'] = 0:
-		gs'booty_call_after', 'keep_going'
-		gs'booty_call_sex', 'harden_hand'
-		gs'booty_call_sex', 'harden_mouth'
-		gs'booty_call_sex', 'sex_start'
-	end
-	if booty_call['cleanup'] = 0:gs'booty_call_after', 'cum_clean'
-	if booty_call['react'] = 0:
-		gs'booty_call_after', 'facial_mouth_clean'
-		gs'booty_call_after', 'cum_kiss_cock'
-		gs'booty_call_talk', 'cum_react'
+		if booty_call['mad'] = 1:
+			gs'booty_call_after', 'bad_sex_end'
+		else
+			gs'booty_call_after', 'stop_here'
+		end
+		if booty_call['sex_stop'] = 0:
+			gs'booty_call_sex', 'keep_fucking'
+			gs'booty_call_sex', 'take_a_break'
+	!!		gs'booty_call_after', 'keep_going'
+			gs'booty_call_sex', 'harden_hand'
+			gs'booty_call_sex', 'harden_mouth'
+			gs'booty_call_sex', 'sex_start'
+		end
+		if booty_call['cleanup'] = 0:gs'booty_call_after', 'cum_clean'
+		if booty_call['react'] = 0:
+			gs'booty_call_after', 'facial_mouth_clean'
+			gs'booty_call_after', 'cum_kiss_cock'
+			gs'booty_call_talk', 'cum_react'
+		end
+		gs'booty_call_after', 'tap_out'
 	end
-	gs'booty_call_after', 'tap_out'
 end
 
 if $ARGS[0] = 'speed_select':
@@ -210,52 +262,457 @@ if $ARGS[0] = 'speed_select':
 		if booty_call['speed'] > 3: booty_call['speed'] = 3
 	end
 end
-if $ARGS[0] = 'reset':
-	$booty_call['cum_choice'] = ''
-	$booty_call['last_cum'] = ''
-	booty_call['orgasm'] = orgasm
-	booty_call['kiss'] = 0
-	booty_call['bored'] = 0
-	booty_call['he_ask'] = 0
+
+
+
+if $ARGS[0] = 'dirty_talk1':
+	cla
+	
+end
+
+if $ARGS[0] = 'dirty_talk2':
 	$orgasm_or = ''
-	booty_call['cock_remove'] = 0
-	booty_call['not_inside'] = 0
-	booty_call['pullout_ask'] = 0
-	booty_call['creampie_exit'] = 0
-	booty_call['no_cum'] = 0
-	$booty_call['position'] = ''
-!!	$booty_call['pos_speed'] = ''
-	booty_call['cleanup'] = 0
-	if booty_call['cum_together'] > 0:
-		booty_call['cum_together'] = 0
-		booty_call['creampie_orgasm'] = 1
+	booty_call['moan'] = 0
+	booty_call['dirty_talk'] = 1
+	gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+end
+
+if $ARGS[0] = 'keep_fucking':
+	if booty_call['cock_remove'] = 0 and $booty_call['position'] = 'miss' or  $booty_call['position'] = 'doggy' or  $booty_call['position'] = 'cowgirl':
+		act'Keep fucking':
+			cla & *nl
+			$booty_call['reset_pos'] = $booty_call['position']
+			minut += rand(1,2)
+			'"Think you can keep going?" you ask, flexing your pussy around his cock. It twitches inside in response, feeling a little stiffer than before, causing you to grin. "That feels like a yes."'
+			gs'booty_call_sex', 'reset'
+			act'Continue':
+				cla
+				gs 'booty_call_sex', 'reset'
+				gs 'booty_call_condoms', 'condoms'
+				gt 'booty_call_<<$booty_call[''reset_pos'']>>', $booty_call['pos_speed']
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'take_a_break':
+	act'Take a break':
+		cla & *clr
+		!! if Sveta came
+		minut += rand(1,3)
+		gs 'stat'
+		booty_call['react'] = 1
+		if $booty_call['last_cum'] = 'creampie':
+			if booty_call['cock_remove'] = 1:
+				'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/miss1.jpg"></center>'
+				gs 'booty_call_sex', 'break_ask'
+				*nl
+				'You flop down onto the bed beside <<$npc_firstname[$boy]>>, feeling his cum trickling from your pussy.'
+				*nl
+				'A few minutes pass and your breathing slowly calms, relaxing in a moment of quiet satisfaction.'
+			else
+				if $booty_call['position'] = 'miss':
+					'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/2.jpg"></center>'
+				elseif $booty_call['position'] = 'doggy':
+					'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/1.jpg"></center>'
+				elseif $booty_call['position'] = 'cowgirl':
+					'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/1.jpg"></center>'
+				end
+				
+				gs 'booty_call_sex', 'break_ask'
+				
+				act'Pull apart':
+					cla & *clr
+					if $booty_call['position'] = 'miss':
+						'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/after1.jpg"></center>'
+						'<<$npc_firstname[$boy]>> climbs off of you and flops down beside you. You breathe slowly, letting yourself sink into the bed as you feel <<$npc_firstname[$boy]>>''s cum trickle from your pussy.'
+					elseif $booty_call['position'] = 'doggy':
+						'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/doggy2.jpg"></center>'
+						'<<$npc_firstname[$boy]>> climbs off of you and flops down beside you. You barely move, breathing slowly and let your face sink into the pillow as <<$npc_firstname[$boy]>>''s cum trickles from your pussy.'
+					elseif $booty_call['position'] = 'cowgirl':
+						'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/after1.jpg"></center>'
+						'You climb off of <<$npc_firstname[$boy]>>, flopping down beside him and let yourself sink into the softness of the bed. His cum slowly oozes from your pussy.'
+					end
+					gs 'booty_call_sex', 'break_time'
+				end
+				
+				act'Stay like this':
+					cla & *nl
+					if $booty_call['position'] = 'miss':
+						'You lay still, leaving <<$npc_firstname[$boy]>>''s occasionally twitching cock stuffed inside you, your pussy full of his cum, taking deep breaths as you wind down.'
+					elseif $booty_call['position'] = 'doggy':
+						'You let your legs give out from under you, collapsing to the bed with <<$npc_firstname[$boy]>> still on top, his occasionally twitching cock stuffed inside you and your pussy full of his cum, taking deep breaths as you wind down.'
+					elseif $booty_call['position'] = 'cowgirl':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/1.jpg"></center>'
+						'You collapse onto <<$npc_firstname[$boy]>>, feeling his breathing through your breasts pressed up against his chest and the occasional twitch of his cock still stuffed inside your pussy.'
+					end
+					gs 'booty_call_sex', 'break_time'
+				end
+				*nl
+				if booty_call['speed'] <= 2:
+					'The two of you just stay like that for a while, basking in the afterglow of your love-making.'
+				else
+					'The two of you just stay like that for a while, basking in the afterglow of your rough fucking.'
+				end
+			end
+		elseif $booty_call['last_cum'] = 'condom':
+			if booty_call['cock_remove'] = 1:
+				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+				'You flop down onto the bed, breathing hard as your body slowly unwinds, relaxing as you let yourself sink into the bed. <<$npc_firstname[$boy]>> removes the condom from his cock, tossing it aside before laying down beside you.'
+				*nl
+				if booty_call['speed'] <= 2:
+					'The two of you just stay like that for a while, basking in the afterglow of your love-making.'
+				else
+					'The two of you just stay like that for a while, basking in the afterglow of your rough fucking.'
+				end
+			else
+				if $booty_call['position'] = 'miss':
+					'<<$npc_firstname[$boy]>> climbs off of you, removing the condom from his softening cock before flopping down beside you. You breathe slowly, letting yourself sink into the bed as your body relaxes.'
+				elseif $booty_call['position'] = 'doggy':
+					'<<$npc_firstname[$boy]>> climbs off of you, removing the condom from his softening cock before flopping down beside you. You turn over onto your back and breathe slowly, letting yourself sink into the bed as your body relaxes.'
+				elseif $booty_call['position'] = 'cowgirl':
+					'You climb off of <<$npc_firstname[$boy]>>, flopping down beside him as he removes the condom from his softening cock, and let yourself sink into the softness of the bed. He ties off the rubber and tosses it aside.'
+				end
+				*nl
+				if booty_call['speed'] <= 2:
+					'The two of you just stay like that for a while, basking in the afterglow of your love-making.'
+				else
+					'The two of you just stay like that for a while, basking in the afterglow of your rough fucking.'
+				end
+			end
+		else
+			if $booty_call['last_cum'] = 'face_mouth':
+				'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+				'You lay back, breathing slowly as you wind down, the warm mask of <<$npc_firstname[$boy]>>''s cum across your face, its salty taste on your tongue.'
+			elseif $booty_call['last_cum'] = 'spit':
+				'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+				'You lay back, breathing slowly as you wind down, the salty taste of <<$npc_firstname[$boy]>>''s sperm on your tongue as it dribbles down your chin.'
+			elseif $booty_call['last_cum'] = 'swallow':
+				'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+				'You lay back, breathing slowly as you wind down, the salty taste of <<$npc_firstname[$boy]>>''s sperm still on your lips.'
+			elseif $booty_call['last_cum'] = 'facial':
+				'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+				'You lay back, breathing slowly as you wind down, the warm mask of <<$npc_firstname[$boy]>>''s cum across your face already beginning to cool.'
+			elseif $booty_call['last_cum'] = 'tits':
+				$npc_apt_bedroom[$boy]
+				'You lay back, breathing slowly as you wind down, the warm glaze of <<$npc_firstname[$boy]>>''s cum across your chest already beginning to cool.'
+			elseif $booty_call['last_cum'] = 'pullout':
+				if $booty_call['position'] = 'miss' or $booty_call['position'] = 'cowgirl':
+					'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/sleep1.jpg"></center>'
+					'You lay back, breathing slowly as you wind down, feeling the warm cum on your belly already beginning to cool.'
+				elseif $booty_call['position'] = 'doggy':
+					'<center><img <<$set_imgh>> src="images/shared/sex/cum/back1.jpg"></center>'
+					'You just lay there, <<$npc_firstname[$boy]>>''s cum spattered across your ass, breathing slowly as you wind down.'
+				end				
+			end
+			*nl
+			'A few minutes pass and your breathing slowly calms, relaxing in a moment of quiet satisfaction.'
+			gs'booty_call_sex', 'break_time'
+		end
 		
 	end
-	booty_call['cum_together_fake'] = 0
-	booty_call['cum_react'] = 0
-	if booty_call['mad'] = 1:booty_call['mad'] = 2
-	booty_call['boy_cum'] = 0
-	booty_call['consecutive_cuni_orgasm'] = 0
-!!	booty_call['reluctant_bj'] = 0
-!!	booty_call['cum_mouth'] = 0
-!!	booty_call['cum_mouth_force'] = 0
-	booty_call['about_time'] = 0
-	booty_call['his_choice'] = 0
-	booty_call['cum_warn'] = 0
-	booty_call['cum_where'] = 0
-	booty_call['he_ask'] = 0
-	booty_call['he_ask_creampie'] = 0
-	booty_call['he_ask_creampie_yes'] = 0
-	booty_call['he_ask_mouth'] = 0
-	booty_call['he_ask_facial'] = 0
-	booty_call['he_ask_tits'] = 0
-	booty_call['cum_wherever'] = 0
-	booty_call['swallow'] = 0
-	booty_call['spit'] = 0
-	booty_call['gag'] = 0
-	booty_call['react'] = 0
-	booty_call['fuck_again'] = 0
-	booty_call['must_fuck'] = 0
+end
+
+if $ARGS[0] = 'break_ask':
+	if booty_call['orgasm'] < orgasm and booty_call['cum_together_fake'] ! 1:
+		!! if Sveta came
+		if booty_call['came_together'] > 0:
+			'"Can we take a quick break?," you gasp, still shivering in the throes of your simultaneous orgasm. "I need a breather."'
+		elseif orgasm - booty_call['orgasm'] > 1:
+			'"Can we take a quick break?," you gasp, quivering from your consecutive orgasms. "I need a breather."'
+		else
+			'"Can we take a quick break?," you gasp, quivering from your recent orgasms. "I need a breather."'
+		end
+	else
+		'"Can we take a quick break?," you gasp. "Can we take a quick break? I need a breather."'
+	end
+	if booty_call['cum_count'] - 2 >= npc_sexdrive[$boy]:
+		'"Yeah," he pants back. "I think I need one too."'
+	else
+!!		if npc_selfish[$boy] = 1:
+		
+!!		else
+		'"Sure," he nods.'
+!!		end
+	end
+end
+
+if $ARGS[0] = 'break_time':
+	if booty_call['first_break'] = 0 or rand(1,3) < 3 or booty_call['cum_count'] >= npc_sexdrive:
+		booty_call['first_break'] = 1
+		
+		gs 'booty_call_after', 'stop_here'
+		gs 'booty_call_sex', 'keep_going'
+		gs 'booty_call_sex', 'ciga_break'
+		gs 'booty_call_sex', 'birth_control_take'
+	else
+		act'Continue': gs 'booty_call_sex', 'he_end_break'
+	end
+end
+
+if $ARGS[0] = 'birth_control_take':
+	if birth_control['remind_icon'] = 1:
+		act'Take your birth control':
+			birth_control['message_skip'] = daystart
+			gs'din_bad', 'quick_takepill'
+			gs 'stat'
+			cla & *clr
+			$npc_apt_bedroom[$boy]
+			'"Wait," you say, noticing your phone blinking at you from your purse.'
+			*nl
+			'<i><font color="pink"><b>Take your vitamins!</b></font></i>'
+			*nl
+			'"Gimme a sec?" you ask. "I need to take my birth control."'
+			act'Take it shyly':
+				cla & *clr
+				$npc_apt_bedroom[$boy]
+				if booty_call['cock_remove'] = 0:
+					'You somehow manage to grab hold of your purse without extricating yourself from <<$npc_firstname[$boy]>> and pop a birth control pill from the packaging.'
+					*nl
+					'"This is what the pill is for after all," you blush, shyly placing it between your lips, feeling your pussy reflexively squeeze his cock as you swallow.'
+				elseif cumloc[0] > 0:
+					'With <<$npc_firstname[$boy]>>''s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.'
+					*nl
+					if booty_call['risky_creampie'] = 1:
+						'"Hopefully we won''t have to worry about this stuff soon," you smile, shyly placing the pill between your lips and swallowing.'
+					else
+						'"This is what the pill is for after all," you smile, shyly placing the pill between your lips and swallowing.'
+					end
+				else
+					'You reach down to your purse and pull out your birth control.'
+					*nl
+					if pillcon2 > 20000 and birth_control['think_safe'] ! 1:
+						npc_know_bc_not_effective[$boy] = 1
+						'"I think it''ll kick in soon," you smile, shyly placing the pill between your lips and swallowing.'
+					elseif pillcon2 > 10000 and birth_control['think_safe'] ! 1:
+						npc_know_bc_not_effective[$boy] = 1
+						'"It''s gonna be a while before it starts working," you smile, shyly placing the pill between your lips and swallowing.'
+					elseif pillcon2 > 0 and birth_control['think_safe'] ! 1:
+						npc_know_bc_not_effective[$boy] = 1
+						'"I only just started it," you smile, shyly placing the pill between your lips and swallowing.'
+					else
+						'"This is what the pill is for after all," you smile, shyly placing the pill between your lips and swallowing.'
+					end
+				end
+				gs'booty_call_sex', 'break_time'
+			end
+			
+			act'Take it sexily':
+				cla & *nl
+				if booty_call['cock_remove'] = 0:
+					'You somehow manage to grab hold of your purse without extricating yourself from <<$npc_firstname[$boy]>> and pop a birth control pill from the packaging.'
+					*nl
+					'"This is what the pill is for after all," you grin, placing it between your lips, feeling your pussy reflexively squeeze his cock as you swallow.'
+				elseif cumloc[0] > 0:
+					'With <<$npc_firstname[$boy]>>''s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.'
+					*nl
+					if booty_call['risky_creampie'] = 1:
+						'"You better hope this stuff kicks in soon," you say, placing the pill between your lips and swallowing with a grin.'
+					elseif birth_control['think_safe'] = 1:
+						'"My baby police pill," you say, placing the pill between your lips and swallowing with a grin. "So you can keep coming inside me without worry."'
+					else
+						'"This is what the pill is for after all," you say, placing the pill between your lips and swallowing with a grin.'
+					end
+				else
+					'You reach down to your purse and pull out your birth control.'
+					*nl
+					if pillcon2 > 20000 and birth_control['think_safe'] ! 1:
+						npc_know_bc_not_effective[$boy] = 1
+						'"Just a few more days and we''ll never have to worry about condoms again," you say, placing the pill between your lips and swallowing with a grin.'
+					elseif pillcon2 > 10000 and birth_control['think_safe'] ! 1:
+						npc_know_bc_not_effective[$boy] = 1
+						'"It''ll take a little while, but then we''ll never have to worry about condoms again," you say, placing the pill between your lips and swallowing with a grin.'
+					elseif pillcon2 > 0 and birth_control['think_safe'] ! 1:
+						npc_know_bc_not_effective[$boy] = 1
+						'"I only just started," you say, placing the pill between your lips and swallowing with a grin. "But in about a few weeks, we''ll be able to go condom free."'
+					else
+						'"Nothing sexier than safe sex," you say, placing the pill between your lips and swallowing with a grin.'
+					end
+				end
+				gs'booty_call_sex', 'break_time'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'he_end_break':
+	booty_call['position_rand'] = rand(1,5)
+	cla & *clr
+	$npc_apt_bedroom[$boy]
+	if booty_call['position_rand'] = 1 or $npc_fav_pos[$boy] = 'missionary':
+		!! missionary
+		'After a few minutes, you glance over at <<$npc_firstname[$boy]>> and find him hungrily staring at you. You realize what''s about to happen just before he jumps on top of you, eliciting...'
+		act'... giggles':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/miss3.jpg"></center>'
+			'After a few minutes, you glance over at <<$npc_firstname[$boy]>> and find him hungrily staring at you with a raging erection. You realize what''s about to happen just before he jumps on top of you, eliciting uncontrollable giggles from your lips as he forces your legs open and plunges his cock into your pussy.'
+			act'Get fucked':gt 'booty_call_miss', 'miss<<booty_call[''speed'']>>'
+		end
+		act'... a yelp of surprise':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/miss3.jpg"></center>'
+			'After a few minutes, you glance over at <<$npc_firstname[$boy]>> and find him hungrily staring at you with a raging erection. You realize what''s about to happen just before he jumps on top of you, eliciting a yelp of surprise from your lips as he forces your legs open and plunges his cock into your pussy.'
+			act'Get fucked':gt 'booty_call_miss', 'miss<<booty_call[''speed'']>>'
+		end
+	elseif booty_call['position_rand'] = 2 or $npc_fav_pos[$boy] = 'doggy':
+		!! doggy
+		'After a few minutes, you glance over at <<$npc_firstname[$boy]>> and find him hungrily staring at you. You realize what''s about to happen just before he jumps you, eliciting...'
+		act'... giggles':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/doggy1.jpg"></center>'
+			'After a few minutes, you glance over at <<$npc_firstname[$boy]>> and find him hungrily staring at you with a raging erection. You realize what''s about to happen just before he jumps on top of you, eliciting uncontrollable giggles from your lips as flips you onto your stomach, pulls you up by the hips, and slaps your ass before plunging his cock into your pussy.'
+			act'Get fucked':gt 'booty_call_doggy', 'doggy<<booty_call[''speed'']>>'
+		end
+		act'... a yelp of surprise':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/dog1.jpg"></center>'
+			'After a few minutes, you glance over at <<$npc_firstname[$boy]>> and find him hungrily staring at you with a raging erection. You realize what''s about to happen just before he jumps on top of you, eliciting a yelp of surprise from from your lips as flips you onto your stomach, pulls you up by the hips, and slaps your ass before plunging his cock into your pussy.'
+			act'Get fucked':gt 'booty_call_doggy', 'doggy<<booty_call[''speed'']>>'
+		end
+	elseif booty_call['position_rand'] = 3 and booty_call['must_fuck'] ! 1:
+		!! blowjob
+		'After a few minutes, you glance over at <<$npc_firstname[$boy]>> and find him hungrily staring at you.'
+		'"What...?" you ask hesitantly.'
+		'"I can''t stop thinking about you sucking my cock," he growls, his stare becoming even more predatory.'
+		gs 'booty_call_start', 'bj_ask2'
+	elseif booty_call['position_rand'] = 4 and (cum_loc['vagina'] = 0 or npc_pussyeater[$boy] = 1):
+		gs 'arousal','foreplay', -5, 'no_orgasm_msg'
+		'After a few minutes, <<$npc_firstname[$boy]>> climbs on top of you without saying anything.'
+		'"Hey, what are you-" you start to ask until his head descends to your stomach. He lightly kisses it, sending shivers across your skin, before kissing again and again and again, each kiss lower than the last, slowly heading towards your thighs.'
+		gs 'booty_call_start', 'kuni_start'
+	else
+		gs 'arousal','foreplay', -5, 'no_orgasm_msg'
+		'After a few minutes, <<$npc_firstname[$boy]>> climbs on top of you without saying anything.'
+		'"Hey, what are you-" you start to ask until his head descends to your neck. He lightly kisses your throat, sending shivers across your skin, before kissing again and again and again, each kiss lower than the last, blazing a trail down your collarbone to the breasts his hands are already thoroughly massaging.'
+		act'Continue':gs 'booty_call_start', 'nipple_play'
+	end
+end
+
+if $ARGS[0] = 'keep_going':
+	act'Keep going?':
+		if booty_call['cum_count'] >= npc_sexdrive[$boy]:
+			gs 'booty_call_after', 'fucked_out'
+		elseif $booty_call['position'] = 'miss' or $booty_call['position'] = 'doggy' or $booty_call['position'] = 'cowgirl':
+			if booty_call['cock_remove'] = 1:
+				cla & *clr
+				minut += rand(1,2)
+				'<center><video autoplay loop src="images/shared/sex/misc/wait.mp4"></video></center>'
+				'"Ready to keep going?" you ask, looking over at <<$npc_firstname[$boy]>>.'
+				'"Yeah, gimme a minute to get hard again."'
+				'While you wait, you consider what you want to do next...'
+				gs'booty_call_sex', 'reset'
+				act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
+				act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
+				act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
+			else
+				cla & *nl
+				$booty_call['reset_pos'] = $booty_call['position']
+				minut += rand(1,2)
+				'"Think you can keep going?" you ask, flexing your pussy around his cock. You grin when you feel it twitch in response, seeming a little stiffer inside you than before. "That feels like a yes."'
+				gs'booty_call_sex', 'reset'
+				act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
+				act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
+				act'Keep fucking':
+					cla
+					gs 'booty_call_sex', 'reset'
+					gs 'booty_call_condoms', 'condoms'
+					gt 'booty_call_<<$booty_call[''reset_pos'']>>', $booty_call['pos_speed']
+				end
+			end
+		else
+			cla & *clr
+			minut += rand(1,2)
+			'<center><video autoplay loop src="images/shared/sex/misc/wait.mp4"></video></center>'
+			'"Ready to keep going?" you ask eagerly.'
+			if $booty_call['cum_choice'] ! '':
+				'"Yeah, gimme a minute to get hard again."'
+			else
+				'"Definitely. What do you have in mind?"'
+			end
+			
+			gs'booty_call_sex', 'reset'
+			act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
+			act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
+			act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
+		end
+	end
+end
+
+if $ARGS[0] = 'ciga_break':
+	if booty_call['smoke_break'] = 0:
+		if siga > 0:
+			act'Have a smoke':
+				cla & *clr
+				booty_call['smoke_break'] = 1
+				gs 'drugs', 'smoke'
+				if npc_smoker[$boy] > 0:
+					'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
+					if booty_call['cock_remove'] = 1:
+						'You reach down and pull out your pack of cigarettes, placing one in your mouth and tossing the pack back into your purse. <<$npc_firstname[$boy]>> takes the opportunity to light up as well while you take your first drag.'
+					else
+						booty_call['cock_remove'] = 1
+						if $booty_call['last_cum'] = 'creampie':
+							'You finally pull apart, immediately feeling <<$npc_firstname[$boy]>>''s cum spill from inside you as his cock vacates your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. <<$npc_firstname[$boy]>> takes the opportunity to light up as well while you take your first drag.'
+						else
+							'You finally pull apart, letting <<$npc_firstname[$boy]>>''s rubber coated cock slip from your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. <<$npc_firstname[$boy]>> takes the opportunity to light up as well while you take your first drag.'
+						end
+					end
+					*nl
+					'Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it''s like all your stress goes with it and you sigh happily, and the two of you continue to puff away until there''s but the charred butts left.'
+				else
+					'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke1.jpg"></center>'
+					if $booty_call['last_cum'] = 'creampie':
+						'You finally pull apart, immediately feeling <<$npc_firstname[$boy]>>''s cum spill from inside you as his cock vacates your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. You spark your lighter, inhaling deeply as you take your first drag.'
+					else
+						'You finally pull apart, letting <<$npc_firstname[$boy]>>''s rubber coated cock slip from your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. You spark your lighter, inhaling deeply as you take your first drag.'
+					end
+					*nl
+					'Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it''s like all your stress goes with it and you sigh happily, puffing away until there''s nothing but a charred butt left.'
+				end
+				gs'booty_call_sex', 'break_time'
+			end
+		else
+			act'Got any smokes?':
+				cla & *clr
+				booty_call['smoke_break'] = 1
+				if npc_smoker[$boy] > 0 and rand(1,20) < 20:
+					siga += 1
+					siga_bum = 1
+					gs 'drugs', 'smoke'
+					'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
+					if booty_call['cock_remove'] = 1:
+						'"Got any smokes?" you ask. <<$npc_firstname[$boy]>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.'
+					else
+						booty_call['cock_remove'] = 1
+						if $booty_call['last_cum'] = 'creampie':
+							'"Got any smokes?" you ask, feeling the cum spill from your pussy as you finally let <<$npc_firstname[$boy]>>''s cock slip from your pussy before sitting up. <<$npc_firstname[$boy]>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.'
+						else
+							'"Got any smokes?" you ask as you pull apart, finally letting <<$npc_firstname[$boy]>>''s cock slip from your pussy before sitting up. <<$npc_firstname[$boy]>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.'
+						end
+					end
+					*nl
+					'Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it''s like all your stress goes with it and you sigh happily, and the two of you continue to puff away until there''s but the charred butts left.'
+				else
+					'<center><img <<$set_imgh>> src="images/shared/sex/after/annoyed1.jpg"></center>'
+					if booty_call['cock_remove'] = 1:
+						'"Got any smokes?" you ask but <<$npc_firstname[$boy]>> just shakes his head.'
+					elseif $booty_call['last_cum'] = 'creampie':
+						'"Got any smokes?" you ask, feeling the cum spill from your pussy as you finally let <<$npc_firstname[$boy]>>''s cock slip from your pussy before sitting up. Unfortunately, he just shakes his head.'
+					else
+						'"Got any smokes?" you ask as you pull apart, finally letting <<$npc_firstname[$boy]>>''s cock slip from your pussy before sitting up. Unfortunately, he just shakes his head.'
+					end
+					booty_call['cock_remove'] = 1
+					if npc_smoker[$boy] > 0:
+						'"Fresh out," he shrugs.'
+					else
+						'"I don''t smoke. It''s bad for you y''know."'
+					end
+					'"Damn," you sigh unhappily. "A cigarette is just what I need right now..."'
+				end
+				gs'booty_call_sex', 'break_time'
+			end
+		end
+	end
 end
 
 if $ARGS[0] = 'harden_hand':
@@ -263,9 +720,13 @@ if $ARGS[0] = 'harden_hand':
 		act'Try to get him hard again (hand)':
 			booty_call['cock_remove'] = 1
 			cla & *clr
-			if booty_call['cum_count'] >= npc_sexdrive[$boy]:
+			if booty_call['cum_count'] >= npc_sexdrive[$boy] and (booty_call['force_harden'] >= 2 or rand(1,3) = 1):
 				!! IMAGE HERE
 				$npc_apt_bedroom[$boy]
+				if booty_call['force_harden'] > 0:
+					'"Oh no you''re not," you growl lustfully.'
+					*nl
+				end
 				if $booty_call['cum_choice'] = 'creampie' or $booty_call['cum_choice'] = 'creampie_surprise':
 					'You pull away, pussy trailing semen as you get down in front of <<$npc_firstname[$boy]>> and grab his cock. You work his shaft furiously, trying to keep him hard. But despite your best efforts, his dick softens in your grasp and you can''t get it to rise again. '
 				else
@@ -277,6 +738,10 @@ if $ARGS[0] = 'harden_hand':
 				gs 'booty_call_after', 'after_sex1'
 			else
 				'<center><video autoplay loop src="images/shared/sex/handjob/hj3.mp4"></video></center>'
+				if booty_call['force_harden'] > 0:
+					'"Oh no you''re not," you growl lustfully.'
+					*nl
+				end
 				if $booty_call['cum_choice'] = 'creampie' or $booty_call['cum_choice'] = 'creampie_surprise':
 					'You pull away, pussy trailing semen as you get down in front of <<$npc_firstname[$boy]>> and grab his cock. You work his shaft furiously, trying to keep him hard. It doesn''t take long, only a minute or two, and before you know it <<$npc_firstname[$boy]>> is standing at attention once again.'
 				else
@@ -286,6 +751,8 @@ if $ARGS[0] = 'harden_hand':
 					'"Yeah, that''s right...  Just like that little guy..."'
 				end
 				booty_call['not_done'] = 0
+				if booty_call['force_harden'] > 0:booty_call['force_harden'] = 2
+				booty_call['extra_cum'] += 1
 				$booty_call['foreplay'] = ''
 				gs'booty_call_sex', 'reset'
 				gs 'booty_call_start', 'handjob_dom1'
@@ -305,15 +772,19 @@ if $ARGS[0] = 'harden_mouth':
 		act'Try to get him hard again (mouth)':
 			booty_call['cock_remove'] = 1
 			cla & *clr
-			if booty_call['cum_count'] >= npc_sexdrive[$boy]:
+			if booty_call['cum_count'] >= npc_sexdrive[$boy] and (booty_call['force_harden'] >= 2 or rand(1,3) = 1):
 				!! IMAGE HERE
 				$npc_apt_bedroom[$boy]
+				if booty_call['force_harden'] > 0:
+					'"Oh no you''re not," you growl lustfully.'
+					*nl
+				end
 				if ($booty_call['last_cum'] = 'creampie' or $booty_call['cum_choice'] = 'creampie_surprise') and booty_call['cock_remove'] ! 1:
-					'You pull away, pussy trailing semen as you get down in front of <<$npc_firstname[$boy]>>. You take him in your mouth, tasting of cum and your own juices, and suck gently on its head, licking, teasing, playing, with his cock in an attempt to keep him hard. But try as you might, you can feel his dick softening between your lips.'
+					'You pull away, pussy trailing semen as you get down in front of <<$npc_firstname[$boy]>>. You take him in your mouth, tasting of cum and your own juices, and suck gently on its head, licking, teasing, playing with his softening cock. But try as you might, it''s like trying to play billiards with a rope. You just can''t get him hard again.'
 				elseif $booty_call['last_cum'] = 'condom':
-					'You pull away and get down in front of <<$npc_firstname[$boy]>>. You slip the condom from his cock and take him in your mouth, you suck gently on its head, licking, teasing, playing, cleaning the cum from his shaft while trying to keep him hard. But try as you might, you can feel his dick softening between your lips.'
+					'You pull away and get down in front of <<$npc_firstname[$boy]>>. You slip the condom from his cock and take him in your mouth, you suck gently on its head, licking, teasing, playing, cleaning the cum from with his softening cock. But try as you might, it''s like trying to play billiards with a rope. You just can''t get him hard agains.'
 				else
-					'You pull away and get down in front of <<$npc_firstname[$boy]>>. Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing, trying to keep him hard. But try as you might, you can feel his dick softening between your lips.'
+					'You pull away and get down in front of <<$npc_firstname[$boy]>>. Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing with his softening cock. But try as you might, it''s like trying to play billiards with a rope. You just can''t get him hard again.'
 				end
 				if booty_call['not_done'] = 1:
 					'"Goddammit!" you growl. "I still wanted more out of you!"'
@@ -323,17 +794,28 @@ if $ARGS[0] = 'harden_mouth':
 				!! REPLACE
 				!! IMAGE HERE
 				 '<center><video autoplay loop src="images/shared/sex/blowjob/play1.mp4"></video></center>'
-				if ($booty_call['cum_choice'] = 'creampie' or $booty_call['cum_choice'] = 'creampie_surprise') and booty_call['cock_remove'] ! 1:
-					'You pull away, pussy trailing semen as you get down in front of <<$npc_firstname[$boy]>>. You take him in your mouth, tasting of cum and your own juices, and suck gently on its head, licking, teasing, playing, trying to keep him hard. As you do, the dick between your lips noticeably stiffens up and is ready to ride again.'
+				!! if ($booty_call['cum_choice'] = 'creampie' or $booty_call['cum_choice'] = 'creampie_surprise') and booty_call['cock_remove'] ! 1:
+				if booty_call['force_harden'] > 0:
+					'"Oh no you''re not," you growl lustfully.'
+					*nl
+				end
+				if $booty_call['last_cum'] = 'creampie' and booty_call['cock_remove'] ! 1:
+					'You pull away, pussy trailing semen as you get down in front of <<$npc_firstname[$boy]>>. You take him in your mouth, tasting of cum and your own juices, and suck gently on its head, licking, teasing, playing, trying to keep him hard. As you do, the dick between your lips begins to stiffen up again.'
+				elseif $booty_call['last_cum'] = 'creampie' and booty_call['cock_remove'] ! 1 and booty_call['force_harden'] > 0:
+					'You pull away, pussy trailing semen as you get down in front of <<$npc_firstname[$boy]>>. You take him in your mouth, tasting of cum and your own juices as you lick, tease, and play with his shaft. After a few moments of softness, <<$npc_firstname[$boy]>> groans in a way that sounds almost painful and the dick between your lips begins to stiffen up again..'
 				elseif $booty_call['last_cum'] = 'condom':
-					'You pull away and get down in front of <<$npc_firstname[$boy]>>. You slip the condom from his cock and take him in your mouth, you suck gently on its head, licking, teasing, playing, cleaning the cum from his shaft. As you do, the dick between your lips noticeably stiffens up and ready to ride again.'
+					'You pull away and get down in front of <<$npc_firstname[$boy]>>. You slip the condom from his cock and take him in your mouth, you suck gently on its head, licking, teasing, playing, cleaning the cum from his shaft. As you do, the dick between your lips begins to stiffen up again.'
+				elseif booty_call['force_harden'] > 0:
+					'Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing, with your lips and tongue across his shaft. After a few moments of softness, <<$npc_firstname[$boy]>> groans in a way that sounds almost painful and the dick between your lips begins to stiffen up again.'
 				else
-					'Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing, trying to keep him hard. After a few moments of softness, the dick between your lips noticeably stiffens up and is ready to ride again.'
+					'Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing, with your lips and tongue across his shaft. After a few moments of softness, the dick between your lips begins to stiffen up again.'
 				end
 				if booty_call['not_done'] = 1:
-					'"Yeah, that''s right...  Just like that little guy..."'
+					'"Yeah, that''s right...  Just like that little guy..." you whisper, pulling your mouth off with a pop and smiling wickedly as you continue slowly pumping him with your hand.'
 				end
 				booty_call['not_done'] = 0
+				if booty_call['force_harden'] > 0:booty_call['force_harden'] = 2
+				booty_call['extra_cum'] += 1
 				$booty_call['foreplay'] = ''
 				gs'booty_call_sex', 'reset'
 				act'Keep blowing him':cla & *clr & gs 'booty_call_start', 'bj_dom2'
@@ -405,6 +887,56 @@ if $ARGS[0] = 'no_sex_only':
 	end
 end
 
+if $ARGS[0] = 'reset':
+	$booty_call['cum_choice'] = ''
+	$booty_call['last_cum'] = ''
+	booty_call['orgasm'] = orgasm
+	booty_call['kiss'] = 0
+	booty_call['bored'] = 0
+	booty_call['he_ask'] = 0
+	$orgasm_or = ''
+	booty_call['cock_remove'] = 0
+	booty_call['not_inside'] = 0
+	booty_call['pullout_ask'] = 0
+	booty_call['creampie_exit'] = 0
+	booty_call['no_cum'] = 0
+	$booty_call['position'] = ''
+!!	$booty_call['pos_speed'] = ''
+	booty_call['cleanup'] = 0
+	if booty_call['cum_together'] > 0:
+		booty_call['cum_together'] = 0
+		booty_call['creampie_orgasm'] = 1
+		
+	end
+	booty_call['cum_together_fake'] = 0
+	booty_call['cum_react'] = 0
+	if booty_call['mad'] = 1:booty_call['mad'] = 2
+	booty_call['boy_cum'] = 0
+	booty_call['consecutive_cuni_orgasm'] = 0
+!!	booty_call['reluctant_bj'] = 0
+!!	booty_call['cum_mouth'] = 0
+!!	booty_call['cum_mouth_force'] = 0
+	booty_call['about_time'] = 0
+	booty_call['his_choice'] = 0
+	booty_call['cum_warn'] = 0
+	booty_call['cum_where'] = 0
+	booty_call['he_ask'] = 0
+	booty_call['he_ask_creampie'] = 0
+	booty_call['he_ask_creampie_yes'] = 0
+	booty_call['he_ask_mouth'] = 0
+	booty_call['he_ask_facial'] = 0
+	booty_call['he_ask_tits'] = 0
+	booty_call['cum_wherever'] = 0
+	booty_call['swallow'] = 0
+	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
+end
+
 if $ARGS[0] = 'pain':
 	if booty_call['speed'] ! 3:
 		if $npc_dick_desc[$boy] = 'lengthy':
@@ -455,4 +987,295 @@ if $ARGS[0] = 'pain':
 	end
 end
 
+if $ARGS[0] = 'sleep_sex':
+	booty_call['sleep_fuck'] = 1
+	gs'arousal', 'vaginal', rand(5,10), 'no_orgasm_msg'
+	if npc_sex_speed <= 2:
+		$booty_call['sleep_video1'] = '<center><video autoplay loop src="images/shared/sex/sleep/slow<<rand(1,2)>>.mp4"></video></center>'
+		$booty_call['sleep_video2'] = '<center><video autoplay loop src="images/shared/sex/sleep/slow2.mp4"></video></center>'
+	else
+		$booty_call['sleep_video1'] = '<center><video autoplay loop src="images/shared/sex/sleep/fast<<rand(1,2)>>.mp4"></video></center>'
+		$booty_call['sleep_video2'] = '<center><video autoplay loop src="images/shared/sex/sleep/fast2.mp4"></video></center>'
+	end
+	$booty_call['sleep_video1']
+	'<i>Mmmmmmm...</i>'
+	*nl
+	'You''re in a dream...'
+	*nl
+	'What kind of dream is it?'
+	act'Nice':
+		cla & *clr
+		$booty_call['sleep_video1']
+		'<i>Mmmmmmm...</i>'
+		*nl
+		'"It''s a nice dream. You''re rocking back and forth on a hammock on the water. There''s a thick pillow between your legs and everything feels so comfy.'
+		act'Keep dreaming':
+			cla & *clr
+			$booty_call['sleep_video2']
+			'You carry on with your pleasant dream, falling deeper and deeper into it, and don''t wake up until the morning.'
+			act'. . .':gt'booty_call_after', 'sleep_function'
+		end
+		
+		act'Wait a minute':
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/sleep/wake1.mp4"></video></center>'
+			'<i>Hang on a minute.</i>'
+			*nl
+			'Even in your sleep your brow wrinkles.'
+			*nl
+			'<i>Hammock on the water? That doesn''t make any sense. And it doesn''t feel like there''s a pillow between <b>my legs</b>, it feels like it''s...</i>'
+			*nl
+			'Your eyes flutter open and find <<$npc_firstname[$boy]>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.'
+			gs'booty_call_sex', 'sleep_wake_options'
+		end
+	end
+	
+	act'Bad':
+		cla & *clr
+		$booty_call['sleep_video1']
+		'<i>Nnngh...</i>'
+		*nl
+		'"It''s a horrid dream. The town has declared you''re a witch and are to be impaled and then burned at the stake. You can already feel it stabbing between your legs.'
+		act'Keep dreaming':
+			cla & *clr
+			$booty_call['sleep_video2']
+			'You toss back and forth, moaning incoherently in your sleep, and don''t wake up until the morning.'
+			act'. . .':gt'booty_call_after', 'sleep_function'
+		end
+		
+		act'Wait a minute':
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/sleep/wake1.mp4"></video></center>'
+			'<i>Hang on a minute.</i>'
+			*nl
+			'Even in your sleep your brow wrinkles.'
+			*nl
+			'<i>That doesn''t feel like wood. I''m not being impaled, I''m being...</i>'
+			*nl
+			'Your eyes flutter open and find <<$npc_firstname[$boy]>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.'
+			gs'booty_call_sex', 'sleep_wake_options'
+		end
+	end
+	
+	act'Sexy':
+		cla & *clr
+		$booty_call['sleep_video1']
+		'<i>Mmmmmmm...</i>'
+		*nl
+		'"It''s a <i>good</i> dream. You''re rocking back and forth on a your fuckbuddy''s cock, riding him like there''s no tomorrow as it fills your pussy in all the right ways.'
+		act'Keep dreaming':
+			cla & *clr
+			$booty_call['sleep_video2']
+			if orgasm > booty_call['orgasm']:
+				'You carry on with your pleasant dream, feeling your entire body quake in orgasm, even in sleep, and don''t wake up until the morning.'
+			else
+				'You carry on with your pleasant dream, moaning loudly even in your sleep, and don''t wake up until the morning.'
+			end
+			act'. . .':gt'booty_call_after', 'sleep_function'
+		end
+		
+		act'Wait a minute':
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/sleep/wake1.mp4"></video></center>'
+			'<i>Hang on a minute.</i>'
+			*nl
+			'You moan involuntarily as a spark of pleasure jumps through your chest.'
+			*nl
+			'<i>I''m not dreaming... I''m...</i>'
+			*nl
+			'Your eyes flutter open and find <<$npc_firstname[$boy]>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.'
+			gs'booty_call_sex', 'sleep_wake_options'
+		end
+	end
+	
+	act'Weird':
+		cla & *clr
+		$booty_call['sleep_video1']
+		'<i>Mmmmmmm...</i>'
+		*nl
+		'"It''s a weird dream. You''re suspended in a giant block of Jello. You can''t move your arms or your legs, but you can breath, and the jelly is alive somehow. You can feel it pulsing between your thighs. In fact, it almost feels like its inside you.'
+		act'Keep dreaming':
+			cla & *clr
+			$booty_call['sleep_video2']
+			'You carry on with your strange dream, falling deeper and deeper into it, and don''t wake up until the morning.'
+			act'. . .':gt'booty_call_after', 'sleep_function'
+		end
+		
+		act'Wait a minute':
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/sleep/wake1.mp4"></video></center>'
+			'<i>Hang on a minute.</i>'
+			*nl
+			'Even in your sleep your brow wrinkles.'
+			*nl
+			'<i>It <b>is</b> inside me! And that''s not jelly, that''s...</i>'
+			*nl
+			'Your eyes flutter open and find <<$npc_firstname[$boy]>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.'
+			gs'booty_call_sex', 'sleep_wake_options'
+		end
+	end
+end
+
+if $ARGS[0] = 'sleep_wake_options':
+	*nl
+	if npc_sleep_sex_okay[$boy] < 1:
+		act'What the fuck!':gt'booty_call_sex', 'sleep_wake_wtf'
+	elseif npc_sleep_sex_okay[$boy] = 1:
+		!! npc_sleep_sex_okay[$boy] = 2 means you''ve asked him to wake you up for sleep sex
+		'"You''re finally awake," <<$npc_firstname[$boy]>> smiles.'
+	end
+	
+	act'Moan':
+		cla & *clr
+		booty_call['sleep_fuck'] = 2
+		$booty_call['position'] = 'miss'
+		'<center><video autoplay loop src="images/shared/sex/sleep/wake1.mp4"></video></center>'
+		'<i>Ahh~! Aahn~!</i>'
+		*nl
+		'You moan with hoarse arousal, spreading your legs wider so <<$npc_firstname[$boy]>> can keep fucking you.'
+		if npc_sex_speed <= 2:
+			booty_call['speed'] = 1
+			act'Fuck <<$npc_firstname[$boy]>>':gs'booty_call_miss','miss1.2'
+		else
+			booty_call['speed'] = 3
+			act'Fuck <<$npc_firstname[$boy]>>':gs'booty_call_miss','miss3.1'
+		end
+	end
+	
+	act'Oh. (go back to sleep)':
+		cla & *nl
+		'"Hmm? Oh," you say flatly and lazily close your eyes, letting yourself drift back into dreamland.'
+		gs'booty_call_sex','sleep_cum'
+	end
+	
+	act'Don''t wake me up':
+		cla & *nl
+		'"Do whatever you want to me, just don''t wake me up," you murmur and promptly close your eyes, letting yourself drift back into dreamland.'
+		gs'booty_call_sex','sleep_cum'
+	end
+end
+
+if $ARGS[0] = 'sleep_wake_wtf':
+	cla & *clr
+	$npc_apt_bedroom[$boy]
+	'"<i>WHAT THE FUCK!</i>" you scream, kicking <<$npc_firstname[$boy]>> out of you and scrambling across the bed from him. "What the fuck do you think you''re doing?!"'
+	if (npc_caretaker[$boy] = 1 or rand(1,3) = 1) and npc_abusive[$boy] ! 1:
+		'<<$npc_firstname[$boy]>> looks deeply embarrassed.'
+		if booty_call['cum_count'] >= npc_sexdrive[$boy]:
+			'"I- I''m sorry," he stammers. "After you fell asleep, I woke up. You were right there and I was so hard. I just couldn''t get back to sleep. And since we just... you know... I thought I could...'
+		else
+			'"I- I''m sorry," he stammers. "After you fell asleep, I was still hard. I just couldn''t get to bed. And since we just... you know... I thought I could...'
+		end
+		act'Forgive him':
+			cla & *nl
+			'Your hard stare softens and you feel the anger slowly drain from your body.'
+			'"It''s fine, I guess," you say. "Just..."'
+			gs'booty_call_sex', 'sleep_wtf_forgive'
+		end
+	else
+		'"What?" he asks, unabashed. "It''s not like I was doing anything we hadn''t already done."'
+		act'Forgive him':
+			cla & *nl
+			'Your hard stare softens and you feel the anger slowly drain from your body.'
+			'"I guess you have a point," you admit reluctantly. "Just..."'
+			gs'booty_call_sex', 'sleep_wtf_forgive'
+		end
+	end
+end
+
+if $ARGS[0] = 'sleep_wtf_forgive':
+	act'Don''t do it again':
+		npc_sleep_sex_okay[$boy] = -1
+		cla & *nl
+		'"... don''t do it again, okay?" you warn.'
+		'"Okay..." he says. After a moment, still blushing, he says, "Since you''re awake... do you think we could...?"'
+		gs'booty_call_sex', 'sleep_wtf_forgive2'
+	end
+	
+	act'Ask next time':
+		npc_sleep_sex_okay[$boy] = 1
+		cla & *nl
+		'"... ask next time, okay?" you say with a soft smile.'
+		'"Ask?" he says hesitantly. "You mean, wake you up?"'
+		act'For permission':
+			cla & *nl
+			'"Just enough to get my permission," you reply. "I don''t like getting raped in my sleep. But if you have my consent, it''s not rape."'
+			'"Okay," he nods. After a moment, still blushing, he says, "Since you''re awake... do you think we could...?"'
+			gs'booty_call_sex', 'sleep_wtf_forgive2'
+		end
+		
+		act'Maybe I''ll be in the mood':
+			cla & *nl
+			'"Maybe I''ll be in the mood too," you smirk teasingly. "It''s not fair if you get all the fun."'
+			'"Okay," he nods. After a moment, still blushing, he says, "Since you''re awake... do you think we could...?"'
+			gs'booty_call_sex', 'sleep_wtf_forgive2'
+		end		
+	end
+end
+
+if $ARGS[0] = 'sleep_wtf_forgive2':
+	act'No way':
+		booty_call['sleep_fuck'] = -1
+		cla & *clr
+		npc_apt_bedroom[$boy]
+		'Your anger returns swiftly.'
+		'"No! Did you really think I was going to say yes after you were just <i>molesting</i> me in my sleep?"'
+		'<<$npc_firstname[$boy]>> sighs disappointedly and lays back in bed.'
+		act'Time to leave':
+			cla & *clr
+			npc_apt_bedroom[$boy]
+			'"Ugh." You sneer at him as you get up. "I see how it''s gonna be. Not gonna get a wink of sleep with you around. I''m leaving."'
+			*nl
+			'Quick as you can, you gather your things and get dressed and head out the door.'
+			act'Leave':gt'booty_call_after', 'exit'
+		end
+		
+		act'Back to sleep':
+			cla & *clr
+			npc_apt_bedroom[$boy]
+			'You crawl back under the sheets, closing your eyes, and try to get back to sleep.'
+			act'. . .':gt'booty_call_after', 'sleep_function'
+		end
+	end
+	
+	act'Oh alright':
+		booty_call['sleep_fuck'] = 2
+		cla & *clr
+		npc_apt_bedroom[$boy]
+		'You give him a look and after a brief pause, you sigh dramatically, rolling your eyes.'
+		*nl
+		'"Oh alright. Come here," you say, beckoning him towards you so you can do something about his raging hard-on.'
+		gs'booty_call_sex', 'reset'
+		act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
+		act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
+		act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
+	end
+	
+	act'Sure':
+		booty_call['sleep_fuck'] = 2
+		cla & *clr
+		npc_apt_bedroom[$boy]
+		'"Sure," you grin, beckoning him closer so you can put his raging erection to use.'
+		gs'booty_call_sex', 'reset'
+		act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
+		act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
+		act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
+	end
+end
+
+if $ARGS[0] = 'sleep_cum':
+	if $npc_cum_pref[$boy] = 'creampie' and ((npc_condom_conscious[$boy] ! 1 and npc_childfree[$boy] ! 1) or (npc_free_creampies[$boy] = 1 and (booty_call['safe_day'] = 1 or booty_call['probably_safe_day'] = 1)) or npc_free_creampies[$boy] = 2 or npc_know_bc[$boy] = 1):
+		gs'cum_call', '', $boy,1
+	elseif $npc_cum_pref[$boy] = 'mouth' or $npc_cum_pref[$boy] = 'face':
+		gs'cum_call', 'face',$boy,1
+	elseif $npc_cum_pref[$boy] = 'tits':
+		gs'cum_call', 'breasts',$boy,1
+	elseif $npc_cum_pref[$boy] = 'pullout':
+		gs'cum_call', 'stomach',$boy,1
+	else
+		gs'cum_call', 'stomach',$boy,1
+	end
+	act'. . .':gt'booty_call_after', 'sleep_function'
+end
+
 --- booty_call_sex ---------------------------------

locations/booty_call_shower.qsrc

@@ -5,7 +5,7 @@
 
 !! --------------------------------- Before Sex Showers ---------------------------------------
 
-if $ARGS[0] = 'borrow_shower':
+if $ARGS[0] = 'before_borrow_shower':
 	act'Borrow yours?':
 		cla & *nl
 		'"Can I borrow yours before we get started?" you ask.'
@@ -137,8 +137,8 @@ if $ARGS[0] = 'before_together2':
 				'<center><video autoplay loop src="images/shared/sex/shower/leg_up_enter1.mp4"></video></center>'
 				gs'arousal', 'massage',5,'no_orgasm_msg'
 				gs'stat'
-				'You turn to face <<$npc_firstname[$boy]>>'
-				if (booty_call['condom'] > 0 and booty_call['no_condom'] ! 1) or booty_call['danger_day'] = 1:
+				'You turn to face <<$npc_firstname[$boy]>>.'
+				if (booty_call['condom'] > 0 and booty_call['no_condom'] ! 1 and npc_free_creampies[$boy] < 1) or booty_call['danger_day'] = 1:
 					'"You won''t come inside me, will you?" you ask.'
 					'"Don''t worry, I won''t."'
 					*nl
@@ -427,7 +427,7 @@ if $ARGS[0] = 'before_shower_creampie':
 		*nl
 		'Eventually, his orgasm fades and his cock slips from inside you and a hot dribble of liquid runs down your leg.'
 		*nl
-		if booty_call['shower_no_condom'] > 0 or npc_boyfriend_creampie_rule[$boy] > 0 and npc_boyfriend_creampie_rule[$boy] <= 2 or npc_know_not_bc[$boy] = 1:
+		if (booty_call['shower_no_condom'] > 0 or (npc_boyfriend_creampie_rule[$boy] > 0 and npc_boyfriend_creampie_rule[$boy] <= 2) or npc_know_not_bc[$boy] = 1) and npc_free_creampies[$boy] < 1:
 			'"I thought..." <<$npc_firstname[$boy]>> pants. "You didn''t want me... to come inside you..."'
 			act'Changed my mind':
 				cla & *clr
@@ -494,6 +494,62 @@ end
 !! --------------------------------- After Sex Showers ---------------------------------------
 !! anything with the 'after_' prefix happens after the main content of a booty call
 
+if $ARGS[0] = 'after_borrow_shower':
+	cla & *clr
+	NoShampoo = 1
+	$npc_apt_bedroom[$boy]
+	'"I''m gonna borrow your shower," you say, sliding out of the bed.'
+	if rand(1,10) < npc_sexdrive[$boy]:
+		'"Why don''t I join you?" <<$npc_firstname[$boy]>> says, a glimmer in his eyes that lets you know he wants to do more than just "join" you.'
+		act'I''d rather not':
+			cla & *nl
+			'"No thanks," you say, smiling back wryly as you keep going. "I like my alone time," you say, just before you shut the door behind you.'
+			act'Shower':gt'booty_call_shower', 'after_alone'
+		end
+		act'Sounds nice':
+			cla & *nl
+			'"That sounds like nice," you smile and you let him lead you into the bathroom.'
+			act'Go shower':gt'booty_call_shower', 'after_shower_together'
+		end
+	elseif npc_selfish[$boy] = 1:
+		'"Don''t use up all my soap."'
+		act'Okay':
+			cla & *nl
+			'"Okay. I won''t," you promise and head into the bathroom.'
+			act'Shower':gt'booty_call_shower', 'after_alone'
+		end
+
+		act'I''ll try':
+			cla & *nl
+			'"I''ll try not to," you smile, padding your way into the bathroom.'
+			act'Shower':gt'booty_call_shower', 'after_alone'
+		end
+		
+		act'We''ll see':
+			cla & *nl
+			'"We''ll see about that," you smirk and pad your way into the bathroom.'
+			act'Shower':gt'booty_call_shower', 'after_alone'
+		end
+		
+		act'Roll your eyes':
+			cla & *nl
+			'"Yeah yeah," you say snarkily, rolling your eyes.'
+			act'Shower':gt'booty_call_shower', 'after_alone'
+		end
+	else
+		if npc_caretaker[$boy] = 1:
+			if npc_apt_type <= 2:
+				'"Okay. Feel free to use my towel when you''re done."'
+			else
+				'"Okay. Feel free to use any towel in there."'
+			end
+		else
+			'"Sure, whatever."'
+		end
+		act'Shower':gt'booty_call_shower', 'after_alone'
+	end
+end
+
 if $ARGS[0] = 'after_alone':
 	minut += 10
 	cla & *clr
@@ -1108,4 +1164,109 @@ if $ARGS[0] = 'after_shower_together_end':
 		gs'booty_call_shower', 'after_towel_skip2'
 	end
 end
+
+!! --------------------- MORNING SHOWERS ------------------------------
+
+if $ARGS[0] = 'morning_shower_join1':
+	booty_call['morning_shower'] = 1
+	'<center><video autoplay loop src="images/shared/sex/shower/join1.mp4"></video></center>'
+	'A blast of steam hits you in the face as you open the bathroom door. You pad your way inside, casually slipping into the shower with <<$npc_firstname[$boy]>>.'
+	'"Mind if I share?" you ask nonchalantly.'
+	'"Of course not," <<$npc_firstname[$boy]>> replies, his eyes sparkling with arousal.'
+	act'Shower with <<$npc_firstname[$boy]>>':gt'booty_call_shower', 'morning_shower_join2'
+end
+
+if $ARGS[0] = 'morning_shower_join2':
+	gs 'arousal', 'foreplay', 5
+	cla & *clr
+	'<center><video autoplay loop src="images/shared/sex/shower/join1.mp4"></video></center>'
+	'You join <<$npc_firstname[$boy]>> under the water, relaxing in the heat with him.'
+	*nl
+	'It isn''t long before his hands begin to roam your body, pawing your breasts and slipping between your thighs. Something hard pokes you in the back.'
+	act'Moan':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/shower/grope2.mp4"></video></center>'
+		'"<i>Aahhh~!</i>"'
+		*nl
+		'Your soft moans encourage him even more and he gropes your tits with both hands, giving them a hard squeeze, producing a gasp from your lips.'
+		gs'booty_call_shower', 'morning_together_sex1'
+	end
+	
+	act'Giggle':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/shower/grope2.mp4"></video></center>'
+		'You giggle uncontrollably at his rabid pawing, only serving to encourage him even more and he gropes your tits with both hands, giving them a hard squeeze, producing a gasp from your lips.'
+		gs'booty_call_shower', 'morning_together_sex1'
+	end
+	
+	act'"Just like that!"':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/shower/grope2.mp4"></video></center>'
+		'"<i>Aahhh~!</i> Just like that!"'
+		*nl
+		'You moan loudly, causing his groping to become energized and he grabs your tits with both hands, giving them a mighty squeeze, producing a gasp to go along with your moans.'
+		gs'booty_call_shower', 'morning_together_sex1'
+	end
+end
+
+if $ARGS[0] = 'morning_together_sex1':
+	act'Leave it there':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/shower/grope2.mp4"></video></center>'
+		gs 'arousal', 'foreplay', 10
+		noShampoo = 1
+		dynamic $showerdin
+		'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'
+	end
+	act'Jerk him off':gt'booty_call_shower', 'before_jerkoff1'
+	
+	act'Blow him':gt'booty_call_shower', 'before_bj1'
+
+	if stat['think_virgin'] = 0 or booty_call['fuck'] > 0:
+		act'Let him fuck you':
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/shower/leg_up_enter1.mp4"></video></center>'
+			gs'arousal', 'massage',5,'no_orgasm_msg'
+			gs'stat'
+			'You turn to face <<$npc_firstname[$boy]>>.'
+			if (booty_call['condom'] > 0 and booty_call['no_condom'] ! 1 and npc_free_creampies[$boy] < 1) or booty_call['danger_day'] = 1:
+				'"You won''t come inside me, will you?" you ask.'
+				'"Don''t worry, I won''t."'
+				*nl
+				'You gasp as without further warning, <<$npc_firstname[$boy]>> lifts your leg and pushes his cock inside you.'
+			else
+				'You look at <<$npc_firstname[$boy]>> and your expression tells him everything he needs to know. Without another word, he lifts your leg and pushes his cock inside you.'
+			end
+			act'Fuck':gt'booty_call_shower', 'after_shower_sex1'
+		end
+	end
+end
+
+if $ARGS[0] = 'morning_towel_on':
+	cla & *clr
+	booty_call['towel'] = 1
+	'<center><img <<$set_imgh>> src="images/shared/romance/lovers/misc/towel.jpg"></center>'
+	'You borrow a towel from <<$npc_firstname[$boy]>>''s cupboard and dry off with it before wrapping it around your chest and exit into the bedroom with him.'
+	act'Continue':gs'booty_call_morning', 'wakeup2'
+end
+
+if $ARGS[0] = 'morning_towel_borrow':
+	act'Borrow a towel':
+		cla & *nl
+		booty_call['towel'] = 1
+		'You accept gratefully it and towel off before wrapping it around your chest, exiting the bathroom with him.'
+		act'Continue':gs'booty_call_morning', 'wakeup2'
+	end
+end
+
+if $ARGS[0] = 'morning_towel_skip':
+	'<center><img <<$set_imgh>> src="images/shared/romance/lovers/misc/no_towel.jpg"></center>'
+	'You grab <<$npc_firstname[$boy]>>''s towel before he can and give yourself a quick wipe before handing it off to him with a mischievous smirk and head back to the bedroom naked.'
+	act'Continue':gs'booty_call_morning', 'wakeup2'
+end
+
 --- booty_call_shower ---------------------------------

locations/booty_call_start.qsrc

@@ -32,7 +32,7 @@ if $ARGS[0] = 'start':
 				cla & *nl
 				'"I didn''t have time," you smile. "I came as soon as I saw your message."'
 				gs 'booty_call_start', 'fuck_or_what'
-				gs 'booty_call_shower', 'borrow_shower'
+				gs 'booty_call_shower', 'before_borrow_shower'
 			end
 			if stat['dance_day'] = daystart:
 				act'Came from dance':
@@ -40,7 +40,7 @@ if $ARGS[0] = 'start':
 					'"I came straight from dance practice," you shrug.'
 					'"And you couldn''t take a shower first?"'
 					gs 'booty_call_start', 'couldnt_wait'
-					gs 'booty_call_shower', 'borrow_shower'
+					gs 'booty_call_shower', 'before_borrow_shower'
 				end
 			end
 			
@@ -49,7 +49,7 @@ if $ARGS[0] = 'start':
 				'"I was playing football when I saw your message," you shrug.'
 				'"And you couldn''t take a shower first?"'
 				gs 'booty_call_start', 'couldnt_wait'
-				gs 'booty_call_shower', 'borrow_shower'
+				gs 'booty_call_shower', 'before_borrow_shower'
 			end}
 			
 			if stat['volleyball_day'] = daystart:
@@ -58,7 +58,7 @@ if $ARGS[0] = 'start':
 					'"I came straight from volleyball practice," you shrug.'
 					'"And you couldn''t take a shower first?"'
 					gs 'booty_call_start', 'couldnt_wait'
-					gs 'booty_call_shower', 'borrow_shower'
+					gs 'booty_call_shower', 'before_borrow_shower'
 				end
 			end
 			if stat['run_day'] = daystart:
@@ -67,7 +67,7 @@ if $ARGS[0] = 'start':
 					'"I was on a run when I saw your message," you shrug.'
 					'"And you couldn''t take a shower first?"'
 					gs 'booty_call_start', 'couldnt_wait'
-					gs 'booty_call_shower', 'borrow_shower'
+					gs 'booty_call_shower', 'before_borrow_shower'
 				end
 			end
 			
@@ -75,7 +75,7 @@ if $ARGS[0] = 'start':
 				cla & *nl
 				'"I came straight from work," you shrug. "Didn''t want to go home and clean up first."'
 				gs 'booty_call_start', 'fuck_or_what'
-				gs 'booty_call_shower', 'borrow_shower'
+				gs 'booty_call_shower', 'before_borrow_shower'
 			end
 			
 			gs 'booty_call_start', 'couldnt_wait'
@@ -131,6 +131,7 @@ if $ARGS[0] = 'start':
 				else
 					'"Don''t mess up my makeup," you say, walking past him towards the bedroom.'
 				end
+				act'Undress':gt 'booty_call_start', 'undress'
 				if date = daystart and date_hour_meet <= hour + 1:
 					act'I have a date soon':
 						cla & *clr
@@ -155,7 +156,8 @@ if $ARGS[0] = 'start':
 						end
 						act'Undress':gt 'booty_call_start', 'undress'
 					end
-				elseif hour >= 18 and $region = 'pav' and (week = 5 or week = 6):
+				end
+				if hour >= 18 and $region = 'pav' and (week = 5 or week = 6):
 					act'I''m going to the disco':
 						cla & *clr
 						$npc_apt_hall[$boy]
@@ -167,8 +169,6 @@ if $ARGS[0] = 'start':
 						!!end
 						act'Undress':gt 'booty_call_start', 'undress'
 					end
-				else
-					act'Undress':gt 'booty_call_start', 'undress'
 				end
 			end
 		end
@@ -515,7 +515,14 @@ if $ARGS[0] = 'pussy_lick':
 	gs 'arousal', 'cuni',rand(5,10),'no_orgasm_msg'
 	gs 'stat'
 	$booty_call['position'] = 'kuni'
-	'You lay back on the bed, closing your eyes, letting them roll back in your skull, and focus on the sensation of <<$npc_firstname[$boy]>>''s tongue exploring your pussy. It playfully flicks across your clit, making you squirm. It runs up the lips of your snatch, sending shivers through your spine. Every once in a while, he licks the side of your thigh, tickling you and eliciting a giggle. It feels <i>so</i> good and you relax while he goes to work on you down there.'
+	if cum_loc['vagina'] > 0:
+		booty_call['creampie_eat'] += 1
+		cumspclnt = 0
+		gs 'cum_cleanup'
+		'You lay back on the bed, closing your eyes, letting them roll back in your skull, and focus on the sensation of <<$npc_firstname[$boy]>>''s tongue exploring your pussy. It playfully flicks across your clit, making you squirm. It runs up the lips of your snatch and you can feel <<$npc_firstname[$boy]>> slurping up the load he deposited inside you, sending shivers through your spine. Every once in a while, he licks the side of your thigh, prompting ticklish giggles. It feels <i>so</i> good and you relax while he goes to work on you down there.'
+	else
+		'You lay back on the bed, closing your eyes, letting them roll back in your skull, and focus on the sensation of <<$npc_firstname[$boy]>>''s tongue exploring your pussy. It playfully flicks across your clit, making you squirm. It runs up the lips of your snatch, sending shivers through your spine. Every once in a while, he licks the side of your thigh, prompting ticklish giggles. It feels <i>so</i> good and you relax while he goes to work on you down there.'
+	end
 	if booty_call['orgasm'] < orgasm:
 		act'Orgasm':
 			cla & *clr
@@ -617,7 +624,7 @@ if $ARGS[0] = 'cuni_too_sensitive':
 		$npc_apt_bedroom[$boy]
 		'"Stop! Stop! Stop!" you cry desperately, pushing his head away and snapping your legs closed, your entire body writhing uncontrollably on the bed as orgasmic tremors continue to quake through you.'
 		'"I can''t take it anymore!"'
-		'<<$npc_firstname[$boy]>> looks up at you, wet lips pulled back in a grin. You look at him from the corner of your eye, face half buried in the sheets, breathing hard as he stands up. You can see he''s still as hard as a rock, but something about his expression says to you that he got off on this anyways.'
+		'<<$npc_firstname[$boy]>> looks up at you, wet lips pulled back in a grin. You look at him from the corner of your eye, face half buried in the sheets, breathing hard as he stands up. You can see he''s still as hard as a rock, but something about his expression says to you that he got off on this anyway.'
 		act'I''m done':
 			cla & *clr
 			$npc_apt_bedroom[$boy]
@@ -680,6 +687,13 @@ if $ARGS[0] = 'bj_ask2':
 		act'Blow him':gt'booty_call_start', 'bj_sub1'
 	end
 	
+	act'Reluctant (joking)':
+		cla & *nl
+		booty_call['reluctant_bj'] = 1
+		'"Ugh, fiiine! If I really have to..." you mock sigh, letting him know you''re joking by flashing him a wide grin as you crawl down between his legs.'
+		act'Blow him':gt'booty_call_start', 'bj_sub1'
+	end
+	
 	act'Okay':
 		cla & *nl
 		'"Okay," you smile and crawl down between his legs.'
@@ -692,8 +706,27 @@ if $ARGS[0] = 'bj_ask2':
 		act'Blow him':gt'booty_call_start', 'bj_sub1'
 	end
 	
+	if stat['think_virgin'] ! 1 or booty_call['fuck_count'] > 0:
+		act'Fuck instead?':
+			cla & *nl
+			booty_call['must_fuck'] = 1
+			if booty_call['fuck_count'] > 0:
+				'"Hmmm... I couuuuld..." you hum, pretending to think before breaking into a wide grin. "Or we could just fuck again?"'
+			else
+				'"Hmmm... I couuuuld..." you hum, pretending to think before breaking into a wide grin. "Or we could just fuck?"'
+			end
+			if $npc_fav_pos[$boy] = 'doggy':
+				'Your eyes meet for just a moment before <<$npc_firstname[$boy]>> jumps you, eliciting uncontrollable giggles as he flips you onto your knees and plunges into your pussy.'
+				act'Get fucked':gt 'booty_call_doggy', 'doggy<<booty_call[''speed'']>>'
+			else
+				'Your eyes meet for just a moment before <<$npc_firstname[$boy]>> jumps you, eliciting uncontrollable giggles as he forces your legs apart and plunges into your pussy.'
+				act'Get fucked':gt 'booty_call_miss', 'miss<<booty_call[''speed'']>>'
+			end
+		end
+	end
+	
 !!{	if booty_call['fuck_count'] > 0:
-		act'Can''t we just fuck again?':
+		act'Can''t we just fuck again? (complain)':
 			cla & *nl
 			'"Ugh, do I have to?" you complain. "Can''t we just fuck again?"'
 			if npc_selfish[$boy] = 1:
@@ -704,6 +737,8 @@ if $ARGS[0] = 'bj_ask2':
 			
 			end
 		end
+		
+		
 	end}
 end
 
@@ -713,7 +748,7 @@ if $ARGS[0] = 'bj_sub1':
 	gs'stat'
 	if booty_call['reluctant_bj'] = 1:
 		'<center><video autoplay loop src="images/shared/sex/blowjob/bj46.mp4"></video></center>'
-		'You grumble internally but get to work anyways, spending a few minutes bobbing your head up and down on his cock. You weren''t really in the mood to begin with, so you get bored quickly, but hopefully he''ll want to do something else soon.'
+		'You grumble internally but get to work anyway, spending a few minutes bobbing your head up and down on his cock. You weren''t really in the mood to begin with, so you get bored quickly, but hopefully he''ll want to do something else soon.'
 	else
 		'<center><video autoplay loop src="images/shared/sex/blowjob/bj<<rand(46,50)>>.mp4"></video></center>'
 		'You lean forward and take him in your mouth, gently sucking his cock and bobbing your head up and down on it. You take pride in your work, doing your best to make <<$npc_firstname[$boy]>> feel good.'
@@ -784,7 +819,7 @@ if $ARGS[0] = 'bj_sub_cum_surprise':
 			gs 'stat'
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow5.mp4"></video></center>'
-			'You hum in surprise, but take it in stride anyways, continuing to suck as <<$npc_firstname[$boy]>> comes right down your throat. You swallow it all as best you can until his hips stop bucking beneath you and you slowly pull away, gulping one last time to get the last drops.'
+			'You hum in surprise, but take it in stride anyway, continuing to suck as <<$npc_firstname[$boy]>> comes right down your throat. You swallow it all as best you can until his hips stop bucking beneath you and you slowly pull away, gulping one last time to get the last drops.'
 			gs 'booty_call_talk', 'bj_warning_next_time'
 			gs 'booty_call_talk', 'bj_tasty'
 			gs 'booty_call_talk', 'bj_already'
@@ -797,7 +832,7 @@ if $ARGS[0] = 'bj_sub_cum_surprise':
 			gs 'stat'
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit6.mp4"></video></center>'
-			'You hum in surprise, but take it in stride anyways, continuing to suck as <<$npc_firstname[$boy]>> straight into the back of your throat. You carefully let it pool there, waiting until his hips stop bucking beneath you. When he finally stops, you gather it to the front of your mouth and spit it out, letting it spill past your lips and all over <<$npc_firstname[$boy]>>''s dick.'
+			'You hum in surprise, but take it in stride anyway, continuing to suck as <<$npc_firstname[$boy]>> straight into the back of your throat. You carefully let it pool there, waiting until his hips stop bucking beneath you. When he finally stops, you gather it to the front of your mouth and spit it out, letting it spill past your lips and all over <<$npc_firstname[$boy]>>''s dick.'
 			gs 'booty_call_talk', 'bj_warning_next_time'
 			gs 'booty_call_talk', 'bj_already'
 		end
@@ -809,7 +844,7 @@ if $ARGS[0] = 'bj_sub_cum_surprise':
 			gs 'cum_call', 'mouth', $boy, 1
 			gs 'stat'
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit3.mp4"></video></center>'
-			'The moment the cum touches your throat, you gag. Your eyes water and you cough involuntarily, mouth explosively erputing with cum and spilling all over <<$npc_firstname[$boy]>>''s cock and the floor.'
+			'The moment the cum touches your throat, you gag. Your eyes water and you cough involuntarily, mouth explosively erupting with cum and spilling all over <<$npc_firstname[$boy]>>''s cock and the floor.'
 			act'Sorry':
 				cla & *clr
 				!!'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum52.jpg"></center>'
@@ -919,7 +954,7 @@ if $ARGS[0] = 'bj_sub_cum_mouth1':
 	act'Reluctantly let him':
 		cla & *nl
 !!		'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow5.mp4"></video></center>'
-		'"Mmmrrrm mmm mmmmph~!" You grumble unintelligibly around his cock but keep sucking anyways. Not exactly your ideal way to finish, but if it''s what he wants...'
+		'"Mmmrrrm mmm mmmmph~!" You grumble unintelligibly around his cock but keep sucking anyway. Not exactly your ideal way to finish, but if it''s what he wants...'
 		gs 'booty_call_start', 'bj_sub_cum_mouth_spit'
 		gs 'booty_call_start', 'bj_sub_cum_mouth_swallow'
 	end
@@ -1032,7 +1067,7 @@ if $ARGS[0] = 'bj_sub_cum_mouth_swallow':
 		*nl
 		if booty_call['cum_swallow'] > 1:
 			'"Yeech!" you wince. "I''m never going to get used to that!"'
-			'"But you still keep doing it anyways," <<$npc_firstname[$boy]>> smirks.'
+			'"But you still keep doing it anyway," <<$npc_firstname[$boy]>> smirks.'
 			'"Yeah, yeah, shut up," you say, rolling your eyes and sticking out your tongue, trying to air it out.'
 			gs 'booty_call_sex', 'sex_end'
 		else
@@ -1872,6 +1907,7 @@ end
 if $ARGS[0] = 'bj_dom1':
 	act'Play with his cock (mouth)':
 		$booty_call['position'] = 'blowjob_tease'
+		booty_call['bj_tease'] += 1
 		gs'arousal', 'bj',rand(2,3),'no_orgasm_msg'
 		gs'stat'
 		cla & *clr
@@ -2203,6 +2239,7 @@ if $ARGS[0] = 'facesit_1':
 		cla & *clr
 		$npc_apt_bedroom[$boy]
 		$booty_call['position'] = 'facesit'
+		booty_call['facesit_count'] += 1
 		if booty_call['foreplay_change'] >= 1:
 			'You pull away from <<$npc_firstname[$boy]>>''s cock, crawling forward until your legs are over his head. You lower your pussy down onto his mouth with a dirty grin.'
 			'"I think it''s time for me to get a little tender loving care."'

locations/booty_call_stats.qsrc

@@ -27,11 +27,13 @@ if $ARGS[0] = 'starting_stats':
 	booty_call['orgasm'] = orgasm
 	booty_call['orgasm_limit'] = orgasm + 6
 	booty_call['pc_condom_count'] = prezik
+	if npc_fuckbuddy[$boy] ! 1: npc_fuckbuddy[$boy] = 1
 end
 
 if $ARGS[0] = 'save':
 	!! number of times you have initiated or responded to a booty call
 	npc_bootycalls[$boy] += 1
+	
 	!! number of times you have made your fuckbuddy cum
 	npc_cum_count[$boy] += booty_call['cum_count']
 	
@@ -73,6 +75,8 @@ if $ARGS[0] = 'save':
 	
 	!! number of times your fuckbuddy has cum in your mouth
 	npc_mouth_cum_count[$boy] += booty_call['mouth_cum']
+	
+	if booty_call['sleep_fuck'] > 0: npc_sleep_fuck += 1
 end
 
 if $ARGS[0] = 'dick_update':
@@ -110,8 +114,14 @@ if $ARGS[0] = 'dick_update':
 			$npc_dick_desc[$boy] = 'monster'
 		end
 	end
-
-
 end
 
+if $ARGS[0] = 'sleep_check':
+	booty_call['sleep_cum_vagina'] = cum_loc['vagina']
+	booty_call['sleep_cum_butt'] = cum_loc['butt']
+	booty_call['sleep_cum_face'] = cum_loc['face']
+	booty_call['sleep_cum_stomach'] = cum_loc['stomach']
+	booty_call['sleep_cum_tits'] = cum_loc['tits']
+	booty_call['sleep_cum_hair'] = cum_loc['hair']
+end
 --- booty_call_stats ---------------------------------

locations/booty_call_talk.qsrc

@@ -87,46 +87,6 @@ if $ARGS[0] = 'no_cum_inside':
 			'"Sorry," you say, <<$booty_call[''cum_describe2'']>>. "I don''t like you enough to let you do that yet."'
 			gs'booty_call_sex', 'sex_end'
 		end
-		if booty_call['danger_day'] = 1:
-			act'Danger day (apologetic)':
-				cla & *nl
-				!! IMAGE HERE
-				'"I''m sorry," you say wistfully, <<$booty_call[''cum_describe2'']>>. "I know how much you want to finish inside me, but it''s a danger day. I''ll get pregnant."'
-				gs'booty_call_sex', 'sex_end'
-			end
-			
-			act'Danger day (annoyed)':
-				cla & *nl
-				!! IMAGE HERE
-				'"Dumbass!" you scowl, <<$booty_call[''cum_describe2'']>>. "I told you it''s a danger day for me! Are you <i>trying</i> to get me pregnant?"'
-				gs'booty_call_sex', 'sex_end'
-			end
-		else
-			if birth_control['think_safe'] < 1 and npc_know_not_bc[$boy] = 0:
-				act'Not on birth control':
-					cla & *nl
-					!! IMAGE HERE
-					npc_know_not_bc[$boy] = 1
-					'"Sorry. I can''t let you come inside me," you say, <<$booty_call[''cum_describe2'']>>. "I''m not on birth control."'
-					gs'booty_call_sex', 'sex_end'
-				end
-			elseif birth_control['think_safe'] < 1 and npc_know_not_bc[$boy] = 1:
-				act'You know I''m not on birth control (apologetic)':
-					cla & *nl
-					!! IMAGE HERE
-					'"I''m sorry," you say wistfully, <<$booty_call[''cum_describe2'']>>. "I know how much you want to finish inside me, but I''m still not on birth control."'
-					gs'booty_call_sex', 'sex_end'
-				end
-				
-				act'You know I''m not on birth control (annoyed)':
-					cla & *nl
-					!! IMAGE HERE
-					'"Dumbass!" you scowl, <<$booty_call[''cum_describe2'']>>. "You know I''m not on birth control!"'
-					gs'booty_call_sex', 'sex_end'
-				end
-			end
-		end
-
 		
 		act'Only my boyfriend is allowed to come inside me':
 			cla & *nl
@@ -179,6 +139,49 @@ if $ARGS[0] = 'no_cum_inside':
 			end
 		end
 	end
+	
+	if birth_control['think_safe'] < 1:
+		if birth_control['think_safe'] < 1 and npc_know_not_bc[$boy] = 0:
+			act'Not on birth control':
+				cla & *nl
+				!! IMAGE HERE
+				npc_know_not_bc[$boy] = 1
+				'"Sorry. I can''t let you come inside me," you say, <<$booty_call[''cum_describe2'']>>. "I''m not on birth control."'
+				gs'booty_call_sex', 'sex_end'
+			end
+		elseif birth_control['think_safe'] < 1 and npc_know_not_bc[$boy] = 1:
+			act'You know I''m not on birth control (apologetic)':
+				cla & *nl
+				!! IMAGE HERE
+				'"I''m sorry," you say wistfully, <<$booty_call[''cum_describe2'']>>. "I know how much you want to finish inside me, but I''m still not on birth control."'
+				gs'booty_call_sex', 'sex_end'
+			end
+			
+			act'You know I''m not on birth control (annoyed)':
+				cla & *nl
+				!! IMAGE HERE
+				'"Dumbass!" you scowl, <<$booty_call[''cum_describe2'']>>. "You know I''m not on birth control!"'
+				gs'booty_call_sex', 'sex_end'
+			end
+		end
+		
+		if stat['dangerous_day'] = 1:
+			act'Danger day (apologetic)':
+				cla & *nl
+				!! IMAGE HERE
+				'"I''m sorry," you say wistfully, <<$booty_call[''cum_describe2'']>>. "I know how much you want to finish inside me, but it''s a danger day. I''ll get pregnant."'
+				gs'booty_call_sex', 'sex_end'
+			end
+			if booty_call['danger_day'] = 1:
+				act'Danger day (annoyed)':
+					cla & *nl
+					!! IMAGE HERE
+					'"Dumbass!" you scowl, <<$booty_call[''cum_describe2'']>>. "I told you it''s a danger day for me! Are you <i>trying</i> to get me pregnant?"'
+					gs'booty_call_sex', 'sex_end'
+				end
+			end
+		end
+	end
 end
 
 if $ARGS[0] = 'no_tits_cum':
@@ -274,21 +277,26 @@ if $ARGS[0] = 'creampie_react':
 						'"Did you... did we... together..?" you murmur. <<$npc_firstname[$boy]>> just nods.'
 					end
 					act'Continue':cla & gs 'booty_call_sex', 'sex_end'
+					gs'booty_call_talk', 'bask_satisfaction'
 					gs'booty_call_talk', 'feel_full'
 					gs'booty_call_talk', 'love_creampies'
 					gs'booty_call_talk', 'cum_together_kiss'
+					gs'booty_call_talk', 'free_creampies'
 				end
 			end
+			gs'booty_call_talk', 'bask_satisfaction'
 			gs'booty_call_talk', 'creampie_felt_great'
 			gs'booty_call_talk', 'feel_full'
 			gs'booty_call_talk', 'love_creampies'
 			gs'booty_call_talk', 'creampie_ask_next_time'
+			gs'booty_call_talk', 'free_creampies'
 			gs'booty_call_talk', 'told_you_not_to_creampie'
 			gs'booty_call_talk', 'thanks_for_asking'
 			gs'booty_call_talk', 'cum_together_kiss'
 			gs'booty_call_talk', 'thought_no_creampies'
 			gs'booty_call_talk', 'cum_together_no_bc'
 		else
+			gs'booty_call_talk', 'bask_satisfaction'
 			gs'booty_call_talk', 'creampie_enjoy_that'
 			gs'booty_call_talk', 'creampie_felt_great'
 			gs'booty_call_talk', 'creampie_gross'
@@ -341,7 +349,7 @@ if $ARGS[0] = 'creampie_enjoy_that':
 end
 
 if $ARGS[0] = 'creampie_ask_next_time':
-	if booty_call['he_ask_creampie'] ! 1 and booty_call['creampie_ask'] ! 1:
+	if booty_call['he_ask_creampie'] ! 1 and booty_call['creampie_ask'] ! 1 and npc_free_creampies[$boy] = 0:
 		if booty_call['creampie_surprise'] = 1 and npc_ask_creampie[$boy] = 0:
 			act'Ask next time (not mad)':
 				npc_ask_creampie[$boy] = 1
@@ -402,8 +410,232 @@ if $ARGS[0] = 'creampie_ask_next_time':
 		end
 	end
 end
+
+if $ARGS[0] = 'free_creampies':
+	if npc_free_creampies[$boy] = 0 and booty_call['he_ask_creampie'] > 0:
+		if $booty_call['position'] = 'miss':
+				$booty_call['temp_pic'] = '<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/2.jpg"></center>'
+			elseif $booty_call['position'] = 'doggy':
+				$booty_call['temp_pic'] = '<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/1.jpg"></center>'
+			elseif $booty_call['position'] = 'cowgirl':
+				$booty_call['temp_pic'] = '<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/1.jpg"></center>'
+			end
+		act'You don''t need to ask':
+			cla & *clr
+			$booty_call['temp_pic']
+			'"You don''t need to ask to come inside me y''know," you murmur.'
+			act'I don''t mind':
+				cla & *clr
+				$booty_call['temp_pic']
+				if birth_control['think_safe'] = 1:
+					npc_know_bc[$boy] = 1
+					'"You don''t need to ask to come inside me y''know," you murmur. "I don''t mind. Plus I''m on birth control, so it''s not like it really matters."'
+				else
+					'"You don''t need to ask to come inside me y''know," you murmur. "I don''t mind."'
+				end
+				gs 'booty_call_talk','free_creampies2'
+			end
+			act'I love creampies':
+				cla & *clr
+				$booty_call['temp_pic']
+				if birth_control['think_safe'] = 1:
+					npc_know_bc[$boy] = 1
+					'"You don''t need to ask to come inside me y''know," you murmur. "I love it when you come inside. It feels really good. Plus I''m on birth control. So you don''t need to ask permission."'
+				else
+					'"You don''t need to ask to come inside me y''know," you murmur. "I love it when you come inside. It feels really good. So you don''t need to ask permission."'
+				end
+				gs 'booty_call_talk','free_creampies2'
+			end
+			if pc_cum_pref_know[$boy] = 'creampie':
+				act'I know how much you like it':
+					cla & *clr
+					$booty_call['temp_pic']
+					if birth_control['think_safe'] = 1:
+						npc_know_bc[$boy] = 1
+						'"You don''t need to ask to come inside me y''know," you murmur. "I know how much you like it. Plus I''m on birth control. So you don''t need to ask permission."'
+					else
+						'"You don''t need to ask to come inside me y''know," you murmur. "I know how much you like it."'
+					end
+					gs 'booty_call_talk','free_creampies2'
+				end
+			end
+			if birth_control['think_safe'] = 1:
+				act'I''m on birth control':
+					cla & *clr
+					$booty_call['temp_pic']
+					if npc_know_bc[$boy] = 1:
+						'"You don''t need to ask to come inside me y''know," you murmur. "You know I''m on birth control. So if you want to come inside me, you should go right ahead."'
+					else
+						'"You don''t need to ask to come inside me y''know," you murmur. "I''m on birth control. So if you want to come inside me, you should go right ahead."'
+					end
+				end
+			end
+		end
+	elseif npc_free_creampies[$boy] = 1 and booty_call['safe_day'] = 0 and booty_call['probably_safe_day'] = 0 and mesec <= 0:
+		if stat['safe_day'] = 1:
+			act'It''s a safe day':
+				booty_call['safe_day'] = 1
+				cla & *clr
+				$booty_call['temp_pic']
+				'"Don''t worry," you smile. "It''s a safe day for me. You can come inside me as much as you want today."'
+				if npc_childfree[$boy] = 1: '<<$npc_firstname[$boy]>> lets out a sigh of relief.'
+				gs'booty_call_sex', 'sex_end'
+			end
+		elseif stat['probably_safe_day'] = 1:
+			act'It''s probably safe day':
+				booty_call['probably_safe_day'] = 1
+				cla & *clr
+				$booty_call['temp_pic']
+				'"Don''t worry," you smile. "I''m probably safe. It''s okay for you to come inside me today."'
+				if npc_childfree[$boy] = 1: '<<$npc_firstname[$boy]>> lets out a sigh of relief.'
+				*nl
+				'<i>Probably...</i> you quietly reiterate to yourself.'
+				gs'booty_call_sex', 'sex_end'
+			end
+		else
+			act'It''s a safe day (lie)':
+				booty_call['safe_day'] = 1
+				cla & *clr
+				$booty_call['temp_pic']
+				'"Don''t worry," you smile. "It''s a safe day for me. You can come inside me as much as you want."'
+				act'<i>I''ll be fine</i>':
+					cla & *nl
+					'<i>It''s fine,</i> you think to yourself. <i>A few creampies won''t kill me...</i>'
+					gs'booty_call_sex', 'sex_end'
+				end
+				
+				act'<i>I hope I get pregnant</i>':
+					cla & *nl
+					'<i>I really hope this gets me pregnant,</i> you think giddily to yourself. <i>I want <<$npc_firstname[$boy]>>''s babies swimming around inside me...</i>'
+					gs'booty_call_sex', 'sex_end'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'free_creampies2':
+!! npc_free_creampies[$boy] = 1: he will freely creampie you tell him its safe
+!! npc_free_creampies[$boy] = 2: he will creampie you whenever he wants
+	if npc_abusive[$boy] = 1 and npc_childfree[$boy] ! 1:
+		npc_free_creampies[$boy] = 2
+		if $npc_cum_pref[$boy] = 'creampie':
+			'<<$npc_firstname[$boy]>> gives you a predatory grin, so full of desire that it makes you involuntarily swallow.'
+			*nl
+			'"Good to know..."'
+		else
+			'"Good to know," he smirks amusedly.'
+		end
+		gs'booty_call_sex', 'sex_end'
+	elseif (npc_selfish[$boy] = 1 or npc_know_bc[$boy] = 1) and (npc_childfree[$boy] ! 1 or npc_know_bc[$boy] = 1):
+		npc_free_creampies[$boy] = 2
+		if $npc_cum_pref[$boy] = 'creampie':
+			'<<$npc_firstname[$boy]>> gives you a look like he might just burst inside you again before giving you a delighted grin.'
+			'"I''m gonna pump you full of so much cum, you''re going to still be dripping next week," he says excitedly and you can''t help but giggle at his boyish glee.'
+		else
+			'"Good to know," he smirks amusedly.'
+		end
+		gs'booty_call_sex', 'sex_end'
+	else
+		if npc_childfree[$boy] = 1 and npc_know_bc[$boy] ! 1:
+			'"Are you sure...?" <<$npc_firstname[$boy]>> asks hesitantly. "You''re not worried you''re going to get pregnant? I''m... I''m not really up for having kids..."'
+			!! add more options later
+		else
+			'"Is that really okay?" <<$npc_firstname[$boy]>> asks, wide-eyed.'
+		end
+		
+		act'I''ll be fine':
+			cla & *nl
+			'"I''ll be fine," you insist, smiling gently. "What could go wrong?"'
+			if npc_childfree[$boy] = 1 or rand(1,4) = 1:
+				npc_free_creampies[$boy] = -1
+				'"I''m not comfortable with it," <<$npc_firstname[$boy]>> says, shaking his head. "Maybe if you started birth control..."'
+			else
+				npc_free_creampies[$boy] = 2
+				'"Okay..." <<$npc_firstname[$boy]>> says hesitantly, but smiles back at you anyways.'
+			end
+			gs'booty_call_sex', 'sex_end'
+		end
+		
+		act'It feels good':
+			cla & *nl
+			'"It feels so good," you coo gently. "I <i>want</i> you to come inside me. I want you to fill me with your cum..."'
+			*nl
+			if ($npc_cum_pref[$boy] = 'creampie' and npc_childfree[$boy] = 1 and rand(npc_willpwr[$boy],100) <= pcs_persuas) or ($npc_cum_pref[$boy] = 'creampie' and npc_childfree[$boy] ! 1):
+				npc_free_creampies[$boy] = 2
+				'Desire wars with willpower within <<$npc_firstname[$boy]>>. You watch as he struggles back and forth until he leers at you with a hungry stare and you know which one won out.'
+				'"Okay." <<$npc_firstname[$boy]>> says. "I won''t ask anymore."'
+			elseif npc_childfree[$boy] = 1:
+				npc_free_creampies[$boy] = -1
+				'<<$npc_firstname[$boy]>> hesitates for a moment before shaking his head.'
+				'"I''m not comfortable with it," he says. "Maybe if you started birth control..."'
+			else
+				npc_free_creampies[$boy] = 2
+				'<<$npc_firstname[$boy]>> hesitates for a moment before nodding slowly.'
+				'"Okay," he says, smiling. "I won''t ask anymore."'
+			end
+			gs'booty_call_sex', 'sex_end'
+		end
+		
+		act'I''ll tell you when it''s safe':
+			npc_free_creampies[$boy] = 1
+			cla & *nl
+			'"I''ll let you know when it''s a safe day," you smile gently. "And then you can come inside me as much as you want."'
+			'"Okay." <<$npc_firstname[$boy]>> smiles back, beaming at you.'
+			gs'booty_call_sex', 'sex_end'
+		end
+		
+		if birth_control['think_safe'] = 1:
+			act'I''m on birth control':
+				npc_free_creampies[$boy] = 2
+				cla & *nl
+				if npc_know_not_bc[$boy] = 1:
+					npc_know_not_bc[$boy] = 0
+					npc_know_bc[$boy] = 1
+					'"I started birth control," you smile gently. "And it should be effective now. So you can come inside me as much as you want."'
+				else
+					npc_know_bc[$boy] = 1
+					'"I''m on birth control," you smile gently. "So you can come inside me as much as you want."'
+				end
+				'"Okay." <<$npc_firstname[$boy]>> smiles back, beaming at you.'
+				gs'booty_call_sex', 'sex_end'
+			end
+		elseif pillcon2 >= 20000:
+			act'I''m on birth control':
+				npc_free_creampies[$boy] = 2
+				cla & *nl
+				if npc_know_not_bc[$boy] = 1:
+					npc_know_not_bc[$boy] = 0
+					npc_know_bc[$boy] = 1
+					'"I started birth control," you smile gently. "And it should be effective any day now. So you can come inside me as much as you want."'
+				else
+					npc_know_bc[$boy] = 1
+					'"I''m on birth control," you smile gently. "So you can come inside me as much as you want."'
+				end
+				'"Okay." <<$npc_firstname[$boy]>> smiles back, beaming at you.'
+				gs'booty_call_sex', 'sex_end'
+			end
+		else
+			act'I''m on birth control (lie)':
+				npc_free_creampies[$boy] = 2
+				cla & *nl
+				if npc_know_not_bc[$boy] = 1:
+					npc_know_not_bc[$boy] = 0
+					npc_know_bc[$boy] = 1
+					'"I started birth control," you lie with a seductively gentle smile. "And it should be effective now. So you can come inside me as much as you want."'
+				else
+					npc_know_bc[$boy] = 1
+					'"I''m on birth control," you lie with a seductively gentle smile. "So you can come inside me as much as you want."'
+				end
+				'"Okay." <<$npc_firstname[$boy]>> smiles back, beaming at you.'
+				gs'booty_call_sex', 'sex_end'
+			end
+		end		
+	end
+end
+
 if $ARGS[0] = 'cum_together_no_bc':
-	if booty_call['risky_creampie'] = 1 and booty_call['creampie_ask'] = 0 and booty_call['he_ask_creampie_yes'] ! 1:
+	if booty_call['risky_creampie'] = 1 and booty_call['creampie_ask'] = 0 and booty_call['he_ask_creampie_yes'] ! 1 and npc_free_creampies[$boy] = 0:
 		act'Be careful (pregnancy)':
 			cla
 			if pillcon2 > 0:
@@ -518,7 +750,11 @@ end
 if $ARGS[0] = 'creampie_gross2':
 	act'Creampies are weird':
 		cla & *nl
-		'"I really don''t like creampies," you grimace. "They feel weird."'
+		if npc_free_creampies[$boy] > 0 and $pc_cum_pref_know[$boy] = 'creampie':
+			'"I really don''t like creampies. They feel weird," you grimace, before twisting your mouth in a wry smirk and shrug. "But I like you. So you better be happy."'
+		else
+			'"I really don''t like creampies," you grimace. "They feel weird."'
+		end
 		gs'booty_call_sex', 'sex_end'
 	end
 	if birth_control['think_safe'] ! 1:
@@ -532,7 +768,7 @@ if $ARGS[0] = 'creampie_gross2':
 end
 
 if $ARGS[0] = 'thanks_for_asking':
-	if booty_call['he_ask_creampie'] = 1:
+	if booty_call['he_ask_creampie'] = 1 and npc_free_creampies[$boy] = 0:
 		act'Thanks for asking':
 			cla & *clr
 			if $booty_call['position'] = 'miss':
@@ -584,7 +820,7 @@ if $ARGS[0] = 'thanks_for_asking':
 end
 
 if $ARGS[0] = 'told_you_not_to_creampie':
-	if booty_call['promise_no_creampie'] = 1 and booty_call['creampie_ask'] ! 1 and booty_call['he_ask_creampie_yes'] ! 1:
+	if booty_call['promise_no_creampie'] = 1 and booty_call['creampie_ask'] ! 1 and booty_call['he_ask_creampie_yes'] ! 1 and npc_free_creampies[$boy] = 0:
 		act'I said no creampies (not mad)':
 			cla & *clr
 			if $booty_call['position'] = 'miss':
@@ -613,7 +849,7 @@ if $ARGS[0] = 'told_you_not_to_creampie':
 end
 
 if $ARGS[0] = 'thought_no_creampies':
-	if booty_call['creampie_ask'] = 1 and npc_boyfriend_creampie_rule[$boy] > 0 and npc_boyfriend_creampie_rule[$boy] < 3:
+	if booty_call['creampie_ask'] = 1 and npc_boyfriend_creampie_rule[$boy] > 0 and npc_boyfriend_creampie_rule[$boy] < 3 and npc_free_creampies[$boy] = 0:
 		cla
 		act'Continue':
 			cla & *clr
@@ -758,11 +994,11 @@ if $ARGS[0] = 'bask_satisfaction':
 				if booty_call['cock_remove'] = 1:
 					'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/miss1.jpg"></center>'
 					if booty_call['came_together'] > 0:
-						'You lay back, panting as you wind down from your simultaneous orgasm, feeling <<$npc_firstname[$boy]>>''s cum seep from your pussy.'
+						'You lay back, shivering as you wind down from your simultaneous orgasm, feeling <<$npc_firstname[$boy]>>''s cum seep from your pussy.'
 					elseif orgasm - booty_call['orgasm'] > 1:
-						'You lay back, panting as you wind down from your string of multiple orgasms, feeling <<$npc_firstname[$boy]>>''s cum seep from your pussy.'
+						'You lay back, shivering as you wind down from your string of multiple orgasms, feeling <<$npc_firstname[$boy]>>''s cum seep from your pussy.'
 					else
-						'You lay back, panting as you wind down from your recent orgasm, feeling <<$npc_firstname[$boy]>>''s cum seep from your pussy.'
+						'You lay back, shivering as you wind down from your recent orgasm, feeling <<$npc_firstname[$boy]>>''s cum seep from your pussy.'
 					end
 					*nl
 					'A few minutes pass and your breathing slowly calms, relaxing in a moment of quiet satisfaction.'
@@ -770,20 +1006,20 @@ if $ARGS[0] = 'bask_satisfaction':
 					if $booty_call['position'] = 'miss':
 						'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/2.jpg"></center>'
 						if booty_call['came_together'] > 0:
-							'You lay back, panting as you wind down from your simultaneous orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>, his cock still twitching inside you.'
+							'You lay still, shivering as you wind down from your simultaneous orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>''s cock still twitching inside you.'
 						elseif orgasm - booty_call['orgasm'] > 1:
-							'You lay back, panting as you wind down from your string of multiple orgasms, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>, his cock still twitching inside you.'
+							'You lay still, shivering as you wind down from your string of multiple orgasms, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>''s cock still twitching inside you.'
 						else
-							'You lay back, panting as you wind down from your recent orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>, his cock still twitching inside you.'
+							'You lay still, shivering as you wind down from your recent orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>''s cock still twitching inside you.'
 						end
 					elseif $booty_call['position'] = 'doggy':
 						'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/1.jpg"></center>'
 						if booty_call['came_together'] > 0:
-							'You just lay there, panting from your simultaneous orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>> on top of you, his cock still twitching inside you.'
+							'You just lay there, shivering from your simultaneous orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>> on top of you, his cock still twitching inside you.'
 						elseif orgasm - booty_call['orgasm'] > 1:
-							'You just lay there, panting as you wind down from your string of multiple orgasms, enjoying the moment and relaxing with <<$npc_firstname[$boy]>> on top of you, his cock still twitching inside you.'
+							'You just lay there, shivering as you wind down from your string of multiple orgasms, enjoying the moment and relaxing with <<$npc_firstname[$boy]>> on top of you, his cock still twitching inside you.'
 						else
-							'You just lay there, panting as you wind down from your recent orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>> on top of you, his cock still twitching inside you.'
+							'You just lay there, shivering as you wind down from your recent orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>> on top of you, his cock still twitching inside you.'
 						end
 					elseif $booty_call['position'] = 'cowgirl':
 						'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/1.jpg"></center>'
@@ -799,7 +1035,7 @@ if $ARGS[0] = 'bask_satisfaction':
 					if booty_call['speed'] <= 2:
 						'The two of you just stay like that for a while, basking in the afterglow of your love-making.'
 					else
-						'The two of you just stay like that for a while, basking in the afterglow of your rough fucking.'
+						'The two of you just stay like that for a while, panting hard in the aftermath of your rough fucking.'
 					end
 				end
 			elseif $booty_call['last_cum'] = 'condom':
@@ -908,6 +1144,90 @@ if $ARGS[0] = 'bask_satisfaction':
 			end
 			gs'booty_call_sex', 'sex_end'
 		end
+	else
+		act'Quiet satisfaction':
+			cla & *clr
+			minut += rand(1,3)
+			gs 'stat'
+			booty_call['react'] = 1
+			if $booty_call['last_cum'] = 'creampie':
+				if booty_call['cock_remove'] = 1:
+					'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/miss1.jpg"></center>'
+					'You lay back, breathing hard and feeling <<$npc_firstname[$boy]>>''s cum seep from your pussy as you wind down.'
+					*nl
+					'A few minutes pass and your breathing slowly calms, relaxing in a moment of quiet satisfaction.'
+				else
+					if $booty_call['position'] = 'miss':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/2.jpg"></center>'
+						'You lay still, panting as you wind down, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>''s cock still twitching inside you.'
+					elseif $booty_call['position'] = 'doggy':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/1.jpg"></center>'
+						'You just lay there, panting with <<$npc_firstname[$boy]>> on top of you, winding down together with his cock still twitching inside you.'
+					elseif $booty_call['position'] = 'cowgirl':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/1.jpg"></center>'
+						'You collapse onto <<$npc_firstname[$boy]>>, breathing hard and letting your body melt into his, your breasts pressing against his chest while his cock still twitches inside you.'
+					end
+					*nl
+					if booty_call['speed'] <= 2:
+						'The two of you just stay like that for a while, basking in the afterglow of your love-making.'
+					else
+						'The two of you just stay like that for a while, basking in the afterglow of your rough fucking.'
+					end
+				end
+			elseif $booty_call['last_cum'] = 'condom':
+				if booty_call['cock_remove'] = 1:
+					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+					'You lay back, cuddled up against <<$npc_firstname[$boy]>>, panting as you wind down.'
+					*nl
+					'A few minutes pass and your breathing slowly calms, the two of you relaxing together in a moment of quiet satisfaction.'
+				else
+					if $booty_call['position'] = 'miss':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/2.jpg"></center>'
+						'You lay still, panting as you wind down, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>''s cock still twitching in the condom inside you.'
+					elseif $booty_call['position'] = 'doggy':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/1.jpg"></center>'
+						'You just lay there, panting with <<$npc_firstname[$boy]>> on top of you, winding down together with his cock still twitching in the condom inside you.'
+					elseif $booty_call['position'] = 'cowgirl':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/1.jpg"></center>'
+						'You collapse onto <<$npc_firstname[$boy]>>, breathing hard and letting your body melt into his, your breasts pressing against his chest while his cock still twitches in the condom inside you.'
+					end
+					*nl
+					if booty_call['speed'] <= 2:
+						'The two of you just stay like that for a while, basking in the afterglow of your love-making.'
+					else
+						'The two of you just stay like that for a while, basking in the afterglow of your rough fucking.'
+					end
+				end
+			else
+				if $booty_call['last_cum'] = 'face_mouth':
+					'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+					'You lay back, panting as you wind down, the warm mask of <<$npc_firstname[$boy]>>''s cum across your face, its salty taste on your tongue.'
+				elseif $booty_call['last_cum'] = 'spit':
+					'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+					'You lay back, panting as you wind down, the salty taste of <<$npc_firstname[$boy]>>''s sperm on your tongue as it dribbles down your chin.'
+				elseif $booty_call['last_cum'] = 'swallow':
+					'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+					'You lay back, panting as you wind down, the salty taste of <<$npc_firstname[$boy]>>''s sperm still on your lips.'
+				elseif $booty_call['last_cum'] = 'facial':
+					'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+					'You lay back, panting as you wind down, the warm mask of <<$npc_firstname[$boy]>>''s cum across your face already beginning to cool.'
+				elseif $booty_call['last_cum'] = 'tits':
+					$npc_apt_bedroom[$boy]
+					'You lay back, panting as you wind down, the warm glaze of <<$npc_firstname[$boy]>>''s cum across your chest already beginning to cool.'
+				elseif $booty_call['last_cum'] = 'pullout':
+					if $booty_call['position'] = 'miss' or $booty_call['position'] = 'cowgirl':
+						'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/sleep1.jpg"></center>'
+						'You lay back, panting as you wind down, feeling the warm cum on your belly already beginning to cool.'
+					elseif $booty_call['position'] = 'doggy':
+						'<center><img <<$set_imgh>> src="images/shared/sex/cum/back1.jpg"></center>'
+						'You just lay there, <<$npc_firstname[$boy]>>''s cum spattered across your ass, panting as you wind down.'
+					end				
+				end
+				*nl
+				'A few minutes pass and your breathing slowly calms, the two of you relaxing together in a moment of quiet satisfaction.'
+			end
+			gs'booty_call_sex', 'sex_end'
+		end
 	end
 end
 
@@ -1626,12 +1946,25 @@ if $ARGS[0] = 'facial_react1':
 				gs 'booty_call_sex', 'sex_end'
 			end
 		end
+		
 		act'It''s so warm':
 			cla & *clr
 			$booty_call['facial_pic']
 			'"It''s so warm..." you muse, <<$npc_firstname[$boy]>>''s sperm dribbling slowly down your cheeks.'
 			gs 'booty_call_sex', 'sex_end'
 		end
+		
+		act'Disgusting':
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/cum/facial/facial_after1.mp4"></video></center>'
+			if npc_facial_count[$boy] + booty_call['facial'] = 1:
+				'"Ugh, disgusting!" you groan, spitting the vile viscous fluid away from your lips. "It''s like getting sneezed on! Why did I let you do this?"'
+			else
+				'"Ugh, disgusting!" you groan, spitting the vile viscous fluid away from your lips. "It''s like getting sneezed on! Why do I let you do this?"'
+			end
+			gs 'booty_call_sex', 'sex_end'
+		end
+		
 		if cum_loc['hair'] > 0:
 			act'Got in my hair (annoyed)':
 				cla & *clr
@@ -1669,7 +2002,7 @@ end
 	
 
 if $ARGS[0] = 'cum_tasty':
-	if trait['cumeater'] = 1 and ($booty_call['last_cum'] = 'face_mouth' or $booty_call['cum_choice'] = 'mouth'):
+	if pcs_traits['cumeater'] = 1 and ($booty_call['last_cum'] = 'face_mouth' or $booty_call['cum_choice'] = 'mouth'):
 		act'Tasty':
 			cla & *clr
 			booty_call['react'] = 1

locations/drugs.qsrc

@@ -128,9 +128,9 @@ elseif $ARGS[0] = 'alcohol':
 	gs 'cum_cleanup'
 	pcs_breath = 0
 	if $ARGS[1] = 'beer':
-		if traits['alko_status'] = -1:
+		if pcs_traits['alko_status'] = -1:
 			alko += rand(1,2)
-		elseif traits['alko_status'] = 1:
+		elseif pcs_traits['alko_status'] = 1:
 			alko += rand(0,1)
 		else
 			alko += 1
@@ -142,11 +142,11 @@ elseif $ARGS[0] = 'alcohol':
 		else
 			pcs_hydra += 10
 		end
-		traits['alko_day'] += 1
+		pcs_traits['alko_day'] += 1
 	elseif $ARGS[1] = 'wine' or $ARGS[1] = 'champagne':
-		if traits['alko_status'] = -1:
+		if pcs_traits['alko_status'] = -1:
 			alko += 3
-		elseif traits['alko_status'] = 1:
+		elseif pcs_traits['alko_status'] = 1:
 			alko += 1
 		else
 			alko += 2
@@ -158,11 +158,11 @@ elseif $ARGS[0] = 'alcohol':
 		else
 			pcs_hydra += 10
 		end
-		traits['alko_day'] += 2
+		pcs_traits['alko_day'] += 2
 	elseif $ARGS[1] = 'vodka' or $ARGS[1] = 'whiskey' or $ARGS[1] = 'scotch' or $ARGS[1] = 'rum':
-		if traits['alko_status'] = -1:
+		if pcs_traits['alko_status'] = -1:
 			alko += rand(4,5)
-		elseif traits['alko_status'] = 1:
+		elseif pcs_traits['alko_status'] = 1:
 			alko += rand(1,2)
 		else
 			alko += 3
@@ -173,11 +173,11 @@ elseif $ARGS[0] = 'alcohol':
 		else
 			pcs_hydra -= 10
 		end
-		traits['alko_day'] += 3
+		pcs_traits['alko_day'] += 3
 	elseif $ARGS[1] = 'moonshine':
-		if traits['alko_status'] = -1:
+		if pcs_traits['alko_status'] = -1:
 			alko += rand(7,8)
-		elseif traits['alko_status'] = 1:
+		elseif pcs_traits['alko_status'] = 1:
 			alko += rand(2,3)
 		else
 			alko += 5
@@ -188,7 +188,7 @@ elseif $ARGS[0] = 'alcohol':
 		else
 			pcs_hydra -= 10
 		end
-		traits['alko_day'] += 5
+		pcs_traits['alko_day'] += 5
 	else
 		'<br><font color = red>Developer note: The type of alcohol is missing in this scene. Please report this and a small part of the text of the current scene as a bug.</font>'
 	end

locations/gschool_lessons1.qsrc

@@ -10,17 +10,17 @@ if $ARGS[0] = 'russian':
 	'You walk into the classroom and take a seat farthest to the right, next to a window. The rest of your classmates walk in one by one before Mr. Yenotin enters the classroom. Just as he''s about to close the door, one of your classmates grabs the door from outside the room. Mr. Yenotin turns to the tardy student and informs them that they are late and that next time he will have to report them. This instruction is followed by an awkward wink and the student is allowed in to find a seat. Everyone knows that he never reports the tardy students. As everyone settles in, Mr. Yenotin does a roll call before opening a grammar book, telling you to open your textbooks to where you left off last lesson.'
 	'After a while, he tells the class to do the assignments on the last page of the chapter as he starts walking up and down the classroom, mostly talking to the students about off topic things like how their time off was often disrupting them from their focus. He''s always trying to impress the students with his endeavors, but no one really believes what he says because most of it sounds exaggerated or simply not possible. When someone has a real question he''s quick to answer as fair as possible without being arrogant, no matter what kind of question it is.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Mr. Yenotin'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mr. Yenotin'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			grupvalue[4] -= 1
 			grupvalue[3] +=1
 			gs 'grades', 'class_activity_attributes', 'school', 'rus', pcs_intel
 			gs 'exp_gain', 'intel', rand(0,1)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
 			'You listen attentively to Mr. Yenotin for the duration of the class. He manages to make today''s lesson very interesting and informative, and you feel like you have learned something from actively taking part in the discussion.'
@@ -565,17 +565,17 @@ if $ARGS[0] = 'geography':
 	'You walk into the classroom and see Mrs. Sokoloff sitting by her desk. The rest of your classmates walk in one by one under her watchful eye. Some of them get a friendly smile while others get a stern look.'
 	'Without wasting any time, she sternly tells the class to open their textbooks. "I hope you have all done your homework." Mrs. Sokoloff is a no nonsense teacher. She expects discipline and hard work and the ones able to abide by her rules are treated very kindly.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Mrs. Sokoloff'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mrs. Sokoloff'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			grupvalue[4] -=1
 			grupvalue[3] += 1
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'school', 'geo', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
 			'You listen attentively to Mrs. Sokoloff for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned from taking part in class.'
@@ -1090,17 +1090,17 @@ if $ARGS[0] = 'history':
 	'You walk into the classroom and see Mrs. Sokoloff sitting by her desk. The rest of your classmates walk in one by one under her watchful eye. Some of the students get a friendly smile while others get a stern look.'
 	'Without wasting time, she sternly tells the class to open their textbooks. "I hope you all have done your homework." Mrs. Sokoloff is a no nonsense teacher. She expects discipline and hard work and the ones able to abide by her rules are treated very kindly.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Mrs. Sokoloff'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mrs. Sokoloff'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'school', 'his', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
 			'You listen attentively to Mrs. Sokoloff for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned from taking part in class.'

locations/gschool_lessons2.qsrc

@@ -12,18 +12,18 @@ if $ARGS[0] = 'computer':
 	'You go to your computer class and find a seat at one of the computer stations. Before long, all of your classmates file in and takes their seats as well. Once the bell rings, Mr. Ivanov takes roll call and then gets up and starts walking around the room explaining today''s lesson. He occasionally stops to look at the screens of various students to make sure they are doing it right.'
 	'If he has to correct one of the nerds, he will take his time and quietly explain it to them, giving them lots of encouragement. For everyone else, he loudly proclaims what they did wrong, drawing attention to them. He makes sure the whole class knows about their mistake and does it in a condescending manner, like he is trying to prove how much smarter he is than them.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Mr. Ivanov'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mr. Ivanov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			gs 'exp_gain', 'compskl', rand(1,2)
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'school', 'comp', pcs_intel
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
 			'You listen attentively to Mr. Ivanov for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned from taking part in class.'
@@ -589,17 +589,17 @@ if $ARGS[0] = 'science':
 	'You go to your science class and find a seat at your lab station. Before long all of your classmates file in and takes their seats as well. Miss Orlov takes roll call, then gets up and starts writing on the blackboard. She is wearing a fairly short skirt that nearly rides too high when she reaches up to write at the top of the blackboard, which the boys often encourage by asking her questions about whatever it is she has written at the top of the blackboard.'
     'She occasionally asks questions to the class and those that get them right receive heaps of praise while she takes the time to explain the answer to those that get them wrong. Once she is sure the student understands their mistake, she moves on with her lesson. She is quick to help anyone with a problem or answer questions and always does so with a shy smile.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Miss Orlov'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Miss Orlov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			gs 'grades', 'class_activity_attributes', 'school', 'sci', pcs_intel
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
 			gs 'exp_gain', 'intel', rand(0,1)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
 			'You listen attentively to Miss Orlov for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned from taking part in class.'
@@ -1012,10 +1012,10 @@ if $ARGS[0] = 'music':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/classmusic.jpg"></center>'
 	'You sit in the classroom and listen to Mr. Vasilyev go on about how great music is while you wait for class to start. He''s always upbeat and positive about teaching and encourages all of his students to take part.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Mr. Vasilyev'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mr. Vasilyev'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
@@ -1023,8 +1023,8 @@ if $ARGS[0] = 'music':
 			gs 'exp_gain', 'instrmusic', rand(1,2)
 			gs 'exp_gain', 'vokal', rand(1,2)
 			gs 'exp_gain', 'chrsm', rand(1,2)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
 			'You listen attentively to Mr. Vasilyev for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned a lot about the history of music and famous artists.'
@@ -1540,17 +1540,17 @@ if $ARGS[0] = 'biology':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/classbiology.jpg"></center>'
 	'You go to your biology class and find a seat at your lab station. Before long, all your classmates file in and take their seats as well. Miss Orlov takes roll call before she gets up and starts walking around the room explaining today''s lessons, occasionally stopping at each lab station to make sure the students are doing the work correctly. She often gives words of encouragement if things are going well or stops and helps the student understand what they are doing wrong.'
 	'She occasionally asks questions to the class and those that get them right receive heaps of praise while she takes the time to explain the answer to those that get them wrong. Once she is sure the student understands their mistake, she moves on with her lesson. She is quick to help anyone with a problem or answer questions and always does so with a shy smile.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Miss Orlov'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Miss Orlov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'school', 'bio', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
 			'You listen attentively to Miss Orlov for the duration of the class. Today''s lesson was interesting and informative and you feel you learned from taking part in class.'

locations/gschool_lessons3.qsrc

@@ -11,17 +11,17 @@ if $ARGS[0] = 'literature':
 	'"She''s always piling on the work and expects everyone to have it finished by the end of class!" you overhear a girl complain with a heavy sigh.'
 	'Clearing her throat, Ms. Braakman raises her voice to speak over the noise. "The sooner everyone takes out their textbooks, the quicker we can get started. Who knows, maybe we''ll finish early and you''ll have some free time." Hearing this, the room settles down and the lesson begins.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:
-		act 'Listen attentively'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:
+		act 'Listen attentively'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			grupvalue[4] -=1
 			grupvalue[3] += 1
 			gs 'grades', 'class_activity_attributes', 'school', 'lit', pcs_intel
-			gs 'exp_gain', 'intel', rand(0,1)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			intel_exp += rand(0,1)
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/work2.jpg"></center>'
 			*nl
@@ -373,18 +373,18 @@ if $ARGS[0] = 'art':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/classart.jpg"></center>'
 	'You sit in the classroom and listen to Mr. Vasilyev go on about how great art is. He''s always upbeat and positive about teaching and encourages all of his students to take part.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:
-		act 'Listen attentively to Mr. Vasilyev'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:
+		act 'Listen attentively to Mr. Vasilyev'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
 			gs 'grades', 'class_activity_attributes', 'school', 'art', pcs_intel
-			gs 'exp_gain', 'artskls', rand(1,2)
-			gs 'exp_gain', 'agil', rand(0,1)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			artskls_exp += rand(1,2)
+			agil_exp += rand(0,1)
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
 			'You listen attentively to Mr. Vasilyev for the duration of the class. Today''s lesson was interesting and informative and you feel you learned a lot.'
@@ -958,18 +958,18 @@ if $ARGS[0] = 'shop':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/classshop.jpg"></center>'
 	'You sit in the classroom and listen to Mr. Kuznetsov''s monotonous droning, doing your best not to fall asleep.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:		
-		act 'Listen attentively to Mr. Kuznetsov'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:		
+		act 'Listen attentively to Mr. Kuznetsov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
 			gs 'grades', 'class_activity_attributes', 'school', 'shop', pcs_intel
-			gs 'exp_gain', 'hndiwrk', rand(1,2)
-			gs 'exp_gain', 'agil', rand(0,1)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			hndiwrk_exp += rand(1,2)
+			agil_exp += rand(0,1)
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
 			'You listen attentively to Mr. Kuznetsov for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned from taking part in class.'

locations/gschool_lessons4.qsrc

@@ -88,17 +88,17 @@ if $ARGS[0] = 'math':
 	if dimaRevenge = 1:
 		act 'Continue': gt 'dimaRevenge', 1
 	else
-		gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-		if traits['nerd_status'] = 2: will_cost = will_cost / 2
-		if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-			act 'Focus on your school work'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+		gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+		if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+		if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+			act 'Focus on your school work'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 				*clr & cla
 				grupvalue[4] -= 1
 				grupvalue[3] += 1
 				gs 'grades', 'class_activity_attributes', 'school', 'math', pcs_intel
 				gs 'exp_gain', 'intel', rand(0,1)
-				traits['nerd_lessons'] += 1
-				if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+				pcs_traits['nerd_lessons'] += 1
+				if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
 				'You carefully follow today''s lesson, trying to take in as much as possible.'
@@ -360,17 +360,17 @@ if $ARGS[0] = 'english':
 	if dimaRevenge = 1:
 		act 'Continue': gt 'dimaRevenge', 1
 	else
-		gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-		if traits['nerd_status'] = 2: will_cost = will_cost / 2
-		if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-			act 'Listen attentively'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+		gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+		if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+		if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+			act 'Listen attentively'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 				*clr & cla
 				grupvalue[4] -= 1
 				grupvalue[3] += 1
 				gs 'grades', 'class_activity_attributes', 'school', 'mus', pcs_intel
 				gs 'exp_gain', 'intel', rand(0,1)
-				traits['nerd_lessons'] += 1
-				if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+				pcs_traits['nerd_lessons'] += 1
+				if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 				gs 'stat'				
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/work2.jpg"></center>'
 				'You actively take part in the lesson, raising your hand to answer questions, following along in your textbook and working quietly on the worksheets when given them.'

locations/intro_city_select.qsrc

@@ -367,9 +367,9 @@ if $ARGS[0] = 'nerd':
 	npc_rel['A29'] += 10
 	genbsize = 13 
 !!b cup for ideal bmi
-	traits['nerd_points'] = 60
-	traits['nerd_status'] = 2
-	traits['nerd_lernHome'] = 5
+	pcs_traits['nerd_points'] = 60
+	pcs_traits['nerd_status'] = 2
+	pcs_traits['nerd_lernHome'] = 5
 end
 
 if $ARGS[0] = 'nerdqueen':
@@ -439,8 +439,8 @@ if $ARGS[0] = 'goodstudent':
 	act 'Select another option': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
 		gs 'intro_city_select', 'nerd'
-		traits['nerd_points'] = 100
-		traits['nerd_status'] = 3
+		pcs_traits['nerd_points'] = 100
+		pcs_traits['nerd_status'] = 3
 		alterstrtimg = 9
 		if glass < 1 : glass = 1
 		pcs_intel = 70
@@ -1009,7 +1009,7 @@ if $ARGS[0] = 'troublemaker':
 	'Now you are in the big city, a whole new playground to find trouble in.'
 	act 'Select another': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = -50
+		pcs_traits['nerd_points'] = -50
 		gs 'intro_city_select', 'gopnik'
 		alterstrtimg = 19
 		pcs_stren = 65
@@ -1068,7 +1068,7 @@ if $ARGS[0] = 'alternative':
 	'That doesn''t matter now since you''re out in the city on your own, ready to do as you please.'
 	act 'Select another option': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = -20
+		pcs_traits['nerd_points'] = -20
 		pcs_exhib = 25
 		Exhibitionist_lvl = 1
 		addictive_exp = 1
@@ -1258,9 +1258,9 @@ if $ARGS[0] = 'goodgirl':
 	'Now you are in the big city and have suddenly found there are no teachers or adults to impress. In fact, it seems buttering up to the adults your entire life has become something of a hinderance.'
 	act 'Select another option': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = 100
-		traits['nerd_status'] = 3
-		traits['nerd_lernHome'] = 5
+		pcs_traits['nerd_points'] = 100
+		pcs_traits['nerd_status'] = 3
+		pcs_traits['nerd_lernHome'] = 5
 		gs 'intro_city_select', 'outcast'
 		gs 'npc_relationship', 'socialgroup_setting', -10, -5, 10, -20, 0, 20
 		npc_rel['A25'] -= 5
@@ -1315,8 +1315,8 @@ if $ARGS[0] = 'slut':
 	'However, your resultant addiction to sex made you a social pariah, and you were constantly mocked by your peers. Now you are in the big city where nobody knows you, giving you a chance to either start over or continue your life of debauchery.'
 	act 'Select another option': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
-		trait['commando_lvl'] = 2
-		trait['cumeater'] = 1 and cumeater_cheat = 1
+		pcs_traits['commando_lvl'] = 2
+		pcs_traits['cumeater'] = 1 and cumeater_cheat = 1
 		pcs_exhib = 40
 		Exhibitionist_lvl = 1
 		gs 'intro_city_select', 'outcast'
@@ -1382,7 +1382,7 @@ if $ARGS[0] = 'slut':
 		guy = 15
 		orgasm = 120
 		swallow = 40
-		trait['cumeater'] = 1
+		pcs_traits['cumeater'] = 1
 		willpowermax = 50
 		motherKnowWhore = 1
 		sisterknowslut = 1
@@ -1411,7 +1411,7 @@ if $ARGS[0] = 'goth':
 	'With school over, you''ve moved to the city, where you feel a lot more accepted, although people still give you the odd stare.'
     act 'Select another option': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = -10
+		pcs_traits['nerd_points'] = -10
 		gs 'intro_city_select', 'outcast'
 		gs 'npc_relationship', 'socialgroup_setting', 0, 0, 5, +20, 0, 0
         npc_rel['A28'] -= 20

locations/intro_sg_select.qsrc

@@ -440,9 +440,9 @@ if $ARGS[0] = 'nerd':
 	grupvalue[6] = 600
 	genbsize = 13 
 !!b cup for ideal bmi
-	traits['nerd_points'] = 60
-	traits['nerd_status'] = 2
-	traits['nerd_lernHome'] = 5
+	pcs_traits['nerd_points'] = 60
+	pcs_traits['nerd_status'] = 2
+	pcs_traits['nerd_lernHome'] = 5
 end
 
 if $ARGS[0] = 'nerdqueen':
@@ -514,8 +514,8 @@ if $ARGS[0] = 'goodstudent':
 	act 'Select another option': gt 'intro_sg_select', 'charselect'
 	act 'Confirm this option':
 		gs 'intro_sg_select', 'nerd'
-		traits['nerd_points'] = 100
-		traits['nerd_status'] = 3
+		pcs_traits['nerd_points'] = 100
+		pcs_traits['nerd_status'] = 3
 		alterstrtimg = 9
 		if glass < 1 : glass = 1
 		pcs_intel = 60
@@ -1106,7 +1106,7 @@ if $ARGS[0] = 'troublemaker':
 	'You have problems at home and school due to your antisocial behavior. This is especially true with your mother and stepfather, who see you going down the wrong path. You are well known to both your teachers and the police.'
 	act 'Select another option': gt 'intro_sg_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = -50
+		pcs_traits['nerd_points'] = -50
 		gs 'intro_sg_select', 'gopnik'
 		alterstrtimg = 19
 		pcs_stren = 60
@@ -1162,7 +1162,7 @@ if $ARGS[0] = 'vitekgf':
 	'As you developed, he started to take an interest in you as well and you soon started dating. You''re not technically a gopnik - you are considered more of a wannabe - but the rest of the gopniks seem to accept you anyways. You''re not sure what would happen if you ever broke up with <<$npc_nickname[''A9'']>>, however, as being his girlfriend and hanging out with the other gopniks has cost you any real, close friends outside of their group.'
 	act 'Select another option': gt 'intro_sg_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = -10
+		pcs_traits['nerd_points'] = -10
 		gs 'intro_sg_select', 'gopnik'
 		alterstrtimg = 20
 		pcs_chrsm = 40
@@ -1236,7 +1236,7 @@ if $ARGS[0] = 'alternative':
 	'However, you have problems at home and school due to your behavior. This is especially true with your mother and stepfather, who see you going down the wrong path.'
 	act 'Select another': gt 'intro_sg_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = -20
+		pcs_traits['nerd_points'] = -20
 		pcs_exhib = 25
 		Exhibitionist_lvl = 1
 		addictive_exp = 1
@@ -1434,9 +1434,9 @@ if $ARGS[0] = 'goodgirl':
 	'You love the attention you get from adults, and while you can feel lonely at times, you''re pretty happy knowing you''re a good girl. The nerds seem to tolerate you the most, likely because they almost never misbehave and always do their homework anyways.'
 	act 'Select another option': gt 'intro_sg_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = 100
-		traits['nerd_status'] = 3
-		traits['nerd_lernHome'] = 5
+		pcs_traits['nerd_points'] = 100
+		pcs_traits['nerd_status'] = 3
+		pcs_traits['nerd_lernHome'] = 5
 		gs 'intro_sg_select', 'outcast'
 		gs 'npc_relationship', 'socialgroup_setting', -10, -5, 10, -20, 0, 20
 		npc_rel['A25'] -= 5
@@ -1493,8 +1493,8 @@ if $ARGS[0] = 'slut':
 	'However, your sex addiction has made you a social pariah. The girls all despise you and the boys publicly mock you, although they don''t mind using you. The nerds completely avoid you, while the gopniks seem to tolerate you the most, likely because they enjoy taking advantage of you.'
 	act 'Select another option': gt 'intro_sg_select', 'charselect'
 	act 'Confirm this option':
-		trait['commando_lvl'] = 2
-		trait['cumeater'] = 1 and cumeater_cheat = 1
+		pcs_traits['commando_lvl'] = 2
+		pcs_traits['cumeater'] = 1 and cumeater_cheat = 1
 		pcs_exhib = 40
 		Exhibitionist_lvl = 1
 		motherKnowSpravka = 1
@@ -1567,7 +1567,7 @@ if $ARGS[0] = 'slut':
 		guy = 15
 		orgasm = 120
 		swallow = 40
-		trait['cumeater'] = 1
+		pcs_traits['cumeater'] = 1
 		grupvalue[4] = 100
 		willpowermax = 50
 		motherKnowWhore = 1
@@ -1598,7 +1598,7 @@ if $ARGS[0] = 'goth':
 	'Fortunately, not everyone listens to them. The nerds like your reading proclivity and that you are into some of the same things they are; you think they might even invite you to their game night one day. A few of the gopniks like your party attitude, specifically those in the band, who seem to respect your artistic disposition. Or their lead singer just wants to get in your panties. It''s hard to tell.'
     act 'Select another option': gt 'intro_sg_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = -10
+		pcs_traits['nerd_points'] = -10
 		gs 'intro_sg_select', 'outcast'
 		gs 'npc_relationship', 'socialgroup_setting', -5, 0, 0, +10, 0, -10
         npc_rel['A28'] -= 20

locations/intro_sg_select_custom.qsrc

@@ -6,11 +6,11 @@ if $ARGS[0] = 'start':
 	act 'Confirm these options':
 		dynamic 'grupvalue[<<grupTipe>>] = 600'
 		if $soc_grup = 'nerd':
-			traits['nerd_points'] = 60
-			traits['nerd_status'] = 2
-			traits['nerd_lernHome'] = 5
+			pcs_traits['nerd_points'] = 60
+			pcs_traits['nerd_status'] = 2
+			pcs_traits['nerd_lernHome'] = 5
 		elseif $soc_grup = 'gopnik':
-			traits['nerd_points'] = -20
+			pcs_traits['nerd_points'] = -20
 		end
 		if pcs_inhib < 10: pcs_inhib = 10
 		!!This line should get sveta to wear school uniform because she has no other clothing with > 50

locations/katja_uni.qsrc

@@ -1003,7 +1003,7 @@ if $ARGS[0] = 'studying_exam':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/studying_together.jpg"></center>'
 	!!Nerds like studying and so their mood improves a little. Everybody else gets in a worse mood by studying.
 	gs 'exp_gain', 'intel', max(0,rand(-1,1))
-	pcs_mood += (traits['nerd_status']*5 -10)
+	pcs_mood += (pcs_traits['nerd_status']*5 -10)
 	minut += 30
 	'You and Katja start studying for the <<$ARGS[2]>> exam. The library is mostly quiet, so you try to keep your voices down, though she can''t always help herself when she gets excited about the material before realizing her volume and turning red with embarrassment.'
 	if pcs_sleep < 5:

locations/model_mari.qsrc

@@ -509,7 +509,7 @@ if $ARGS[0] = 'mari_chat':
 			act'I buy from Fashionista':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading2.jpg"></center>'
-				'"I get most of my underwear from Pussy Kats," you tell her.'
+				'"I get most of my underwear from Fashionista," you tell her.'
 				'"Oh yeah? I''ve never shopped there before. What kind of stuff do they have?"'
 				'"Super stylish and fancy. Very lacy. I really like it."'
 				'"Oh. I''m not really into lace. A bit uncomfortable for me. Maybe I''ll try something else. Thanks for the suggestion though!"'
@@ -540,7 +540,7 @@ if $ARGS[0] = 'mari_chat':
 				end
 			end
 			
-			if trait['commando_lvl'] = 3:
+			if pcs_traits['commando_lvl'] = 3:
 				act'I don''t wear underwear':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading5.jpg"></center>'

locations/natkolEv.qsrc

@@ -830,7 +830,7 @@ end
 
 if $ARGS[0] = 'cumeater':
 	!! viable locations: face, tits, belly, labia, pussy, butt, anus
-	if trait['cumeater'] = 1 and brotherSex >= 6:
+	if pcs_traits['cumeater'] = 1 and brotherSex >= 6:
 		cla
 		$temp_loc = $ARGS[1]
 		*nl

locations/npcstatic6.qsrc

@@ -202,7 +202,7 @@ hotcat_rating['A<<npctemp>>'] = 8
 npctemp = 262
 $npc_dna['A<<npctemp>>'] = '0'
 $npc_firstname['A<<npctemp>>'] = 'Aliyyah'
-$npc_nickname['A<<npctemp>>'] = 'Aliyyah'
+$npc_nickname['A<<npctemp>>'] = 'Allie'
 $npc_lastname['A<<npctemp>>'] = 'Najjar'
 $npc_notes['A<<npctemp>>'] = 'Proprietor of the Hookah Lounge.'
 npc_dob['A<<npctemp>>'] = 19910314

locations/pav_disco_gopniks.qsrc

@@ -848,7 +848,7 @@ if $ARGS[0] = 'arkadi':
 		elseif grupTipe = 5:
 			'"Don''t even try it." he bluntly states when he sees you.'
 			act 'Do something else': gt 'pav_disco_classmates', 'classmates'
-		elseif npc_rel['A158'] >= 50 and fame['pav_slut'] < 300:		
+		elseif npc_rel['A156'] >= 50 and fame['pav_slut'] < 300:		
 			'"Hey Arkadi, I thought I''d come by and hang out with you for a bit."'
 			'"Oh yeah? Want a drink?" He offers you the bottle.'
 			gs 'willpower', 'drink', 'resist', 'medium'
@@ -878,7 +878,7 @@ if $ARGS[0] = 'arkadi':
 				'You know he loves the city, so you ask him questions about it and he''s more than happy to answer them.'
 				act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 			end
-		elseif npc_rel['A158'] <= 20 and fame['pav_slut'] < 300:
+		elseif npc_rel['A156'] <= 20 and fame['pav_slut'] < 300:
 			if grupTipe = 4:
 				'"Hey Arkadi, I thought I''d just come by and hang out with you for a bit."'
 				'He snorts and grabs his crotch. "Why don''t you suck my dick instead?"'
@@ -940,7 +940,7 @@ if $ARGS[0] = 'lavrenti':
 			elseif grupTipe = 5:
 				'You''re sure he seen you, but is ignoring you as he moves between a few girls who are dancing near him. He''s a very good dancer and they don''t seem to mind at all as they all start dancing together.'
 				act 'Do something else': gt 'pav_disco_classmates', 'classmates'
-			elseif npc_rel['A154'] <= 20 or fame['pav_slut'] >= 300:
+			elseif npc_rel['A155'] <= 20 or fame['pav_slut'] >= 300:
 				'You''re sure he seen you, but is ignoring you as he moves between a few girls who are dancing near him. He''s a very good dancer and they don''t seem to mind at all as they all start dancing together.'
 				act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 			else 

locations/pav_disco_sex.qsrc

@@ -684,7 +684,7 @@ if $ARGS[0] = 'handjob_end':
 		'"See you later!" you grin while waggling your cum covered fingers at him, leaving him with his cock hanging out and covered in his own cum.'
 		act 'Head back inside':gt'pav_disco'
 		
-		if trait['cumeater'] < 0:
+		if pcs_traits['cumeater'] < 0:
 			act 'Lick your hand clean on the way':
 				cla & *clr
 				stat['swallow'] += 1
@@ -1062,7 +1062,7 @@ if $ARGS[0] = 'disco_cum':
 		act 'Suck him off instead':gt'pav_disco_sex','disco_cum_mouth'
 	elseif gdk['cum'] = 4:
 		if gdk['condom'] = 1:
-			gs'cum_call','', $boy, 3
+			gs'cum_call','', $boy, 1, 3
 			$gdk['cum'] = 'condom'
 			act 'Continue':gt'pav_disco_sex','disco_condom1'
 		elseif gdk['condom'] = 2:

locations/pav_library.qsrc

@@ -127,18 +127,18 @@ if hour >= 8 and hour < 18:
 		'You read the book for an hour. Tolstoy is certainly a classic writer, no one denies this, but he used a shit-load of words.'
 		act 'Put the book back': gt 'pav_library'
 	end
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if lernHome > 0 and (will_cost <= pcs_willpwr or traits['nerd_status'] = 3):
-		act 'Do your homework (1:00'+iif(traits['nerd_status'] = 3, '', ' and <<will_cost>> Willpower')+')':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if lernHome > 0 and (will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3):
+		act 'Do your homework (1:00'+iif(pcs_traits['nerd_status'] = 3, '', ' and <<will_cost>> Willpower')+')':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/homework.jpg"></center>'
 			minut += 60
-			pcs_mood += 5 * traits['nerd_status']
+			pcs_mood += 5 * pcs_traits['nerd_status']
 			lern += 1
-			gs 'willpower', 'misc', 'self', iif(grupTipe = 4, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-			if traits['nerd_status'] = 2: will_cost = will_cost / 2
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			gs 'willpower', 'misc', 'self', iif(grupTipe = 4, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+			if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs'stat'
 			gs 'grades', 'homework', 'school', 'yes', 1, 0, 0
 			'You sit down at one of the tables with a a computer and use it to help you do your homework.'

locations/pav_parkev.qsrc

@@ -1752,7 +1752,7 @@ if $ARGS[0] = 'drinking_game':
 	player_tol = (pcs_health/4)/10
 	
 
-	if traits['alko_status'] ! 1:
+	if pcs_traits['alko_status'] ! 1:
 	 !lightweight
 		player_time = rand(player_tol,99) - 29
 	else 

locations/qwBarBilliard.qsrc

@@ -306,12 +306,12 @@ if $ARGS[0] = 'billiard_ev1':
 										'As Martin groans quietly, moments away from climax, you become acutely aware of the heat between your legs. The forbidden nature of what you''re doing apparently isn''t lost on your pussy, regardless of whether your conscious mind is turned on or scared.'
 										*nl
 										'Finally, your latin lover bends his head back as he empties his sperm into your mouth. You double your efforts, licking and sucking even harder.'
-										$orgasm_txt = 'Or at least you try: You moan around Martin''s cock when the first jet of his ' + iif(trait['cumeater']=1,'tasty ','') + 'cum lands on your tongue and pushes you over the edge, making it difficult to focus on his pleasure. You think you manage quite well, but you don''t have to look up to see the self-satisfied expression on Martin''s face when he realizes that you came from sucking his cock - from him cumming in your mouth, in fact.'
+										$orgasm_txt = 'Or at least you try: You moan around Martin''s cock when the first jet of his ' + iif(pcs_traits['cumeater']=1,'tasty ','') + 'cum lands on your tongue and pushes you over the edge, making it difficult to focus on his pleasure. You think you manage quite well, but you don''t have to look up to see the self-satisfied expression on Martin''s face when he realizes that you came from sucking his cock - from him cumming in your mouth, in fact.'
 										gs 'arousal', 'bj', 2, 'exhibitionism'
 										gs 'stat'
 										gs 'cum_call', 'mouth', $boy, 1
 										*nl
-										'When his orgasm subsides, you audibly swallow Martin''s ' + iif(trait['cumeater']=1,'delicious ','') + 'load and show him your clean tongue. The barkeeper smiles at how ' + iif(pcs_dom>=30,'bold','shy') + ' you are about this gesture.'
+										'When his orgasm subsides, you audibly swallow Martin''s ' + iif(pcs_traits['cumeater']=1,'delicious ','') + 'load and show him your clean tongue. The barkeeper smiles at how ' + iif(pcs_dom>=30,'bold','shy') + ' you are about this gesture.'
 										'After that, you quickly return to reality when the sound of breaking glass reminds you of the bar behind the curtain. Martin zips his pants back up and you barely have time to get up on your feet when two guys pull the veil aside, looking to play a game of billiards.'
 										*nl
 										'They seem just as surprised as you to see each other, but they just give Martin a friendly "hello" before the two of you leave. As Martin strides towards the source of the noise you heard, you stay back long enough to hear the guys at the pool table break into wild speculations.'

locations/saveupdater.qsrc

@@ -236,19 +236,19 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	!! ----- Mom, Luda & Olu stuff ----- 0.8.0
 
 	!!trait update
-	if traits['update_1'] = 0:
-		traits['update_1'] = 1
+	if pcs_traits['update_1'] = 0:
+		pcs_traits['update_1'] = 1
 
-		traits['alko_day'] = alko_trait_day
-		traits['alko_points'] = alko_trait_counter
-		traits['alko_status'] = alko_trait
+		pcs_traits['alko_day'] = alko_trait_day
+		pcs_traits['alko_points'] = alko_trait_counter
+		pcs_traits['alko_status'] = alko_trait
 
 		killvar 'alko_trait_day'
 		killvar 'alko_trait_counter'
 		killvar 'alko_trait'
 	end
 	
-	if trt_cumeater = 1:trait['cumeater'] = 1 & trt_cumeater = 7
+	if trt_cumeater = 1:pcs_traits['cumeater'] = 1 & trt_cumeater = 7
 
 	!! ----- Other bug fixes and cleanup ----- 0.8.0
 	if pcs_gaming_exp > 0: gs 'exp_gain', 'gaming', pcs_gaming_exp & killvar 'pcs_gaming_exp'
@@ -1506,6 +1506,23 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch <
 	if $wardrobeDefaultPagePref = 'savedOutfits':$wardrobeDefaultPagePref = 'default1'
 end
 
+if traits > 0 or trait > 0:
+	
+	pcs_traits['nerd_status'] = traits['nerd_status']
+	pcs_traits['cumeater'] = trait['cumeater']
+	pcs_traits['commando_lvl'] = trait['commando_lvl']
+	pcs_traits['commando_exp'] = trait['commando_exp']
+	pcs_traits['alko_status'] = traits['alko_status']
+	pcs_traits['alko_points'] = traits['alko_points']
+	pcs_traits['buttslut_lvl'] = traits['buttslut_lvl']
+	pcs_traits['nerd_lernHome'] = traits['nerd_lernHome']
+	pcs_traits['nerd_points'] = traits['nerd_points']
+	pcs_traits['nerd_lessons'] = traits['nerd_lessons']
+	
+	killvar 'traits'
+	killvar 'trait'
+end
+
 gs 'saveg'
 --- saveupdater ---------------------------------
 

locations/stat.qsrc

@@ -423,6 +423,8 @@ if sec >= 60:
 	if sec >= 60:jump 'loopsec'
 end
 
+!! Hourly Changes
+
 if minut >= 60:
 	:loopmin
 	hour += 1
@@ -483,6 +485,17 @@ if minut >= 60:
 		period['cramp'] = 0
 	end
 	
+	!! code to trigger vomitting based on morning sickness, hangovers, or just plain bad luck
+	if sleep = 1:
+		if alko > 4:
+			vomit['hangover'] = 1
+		elseif pregchem > 600 and pregchem < 2160 and rand(1,4) = 4:
+			vomit['morning_sick'] = 1
+		elseif rand(1,100) = 100: 
+			vomit['unlucky'] = 1
+		end
+	end
+	
 	if hypnoAddict > 0:dynamic $hypnoAddiction
 
 	!!mana regen
@@ -547,10 +560,10 @@ if minut >= 60:
 		end
 	end
 
-	if $pantyworntype = 'none' and PCloPants > 0 and PCloPanties = 0 and $clothingworntype ! 'nude' and trait['commando_lvl'] < 2:
-		if trait['commando_lvl'] < 1:
+	if $pantyworntype = 'none' and PCloPants > 0 and PCloPanties = 0 and $clothingworntype ! 'nude' and pcs_traits['commando_lvl'] < 2:
+		if pcs_traits['commando_lvl'] < 1:
 			mosol += 2
-		elseif trait['commando_lvl'] = 1:
+		elseif pcs_traits['commando_lvl'] = 1:
 			mosol += 1
 		end
 		
@@ -643,6 +656,8 @@ if minut >= 60:
 	if minut >= 60:jump 'loopmin'
 end
 
+!! End of Hourly Changes
+
 if hour >= 24: gs 'cikl'
 
 if minut < 10:
@@ -773,55 +788,60 @@ else
 		if $clothingworntype ! 'nude':
 			if $pantyworntype = 'none':
 !! Addition to trait exp/lvls
-				if trait['commando_lvl'] = 0:
+				if pcs_traits['commando_lvl'] = 0:
 					if PCloSkirt > 0:
-						trait['commando_exp'] += 2
+						pcs_traits['commando_exp'] += 2
 					else
-						trait['commando_exp'] += 1
+						pcs_traits['commando_exp'] += 1
 					end
-					if trait['commando_exp'] >= 1000:
-						trait['commando_exp'] = 50
-						trait['commando_lvl'] = 1
+					if pcs_traits['commando_exp'] >= 1000:
+						pcs_traits['commando_exp'] = 50
+						pcs_traits['commando_lvl'] = 1
 						msg'You have gained the Commando trait! You have become accustomed to the idea you don''t have to wear panties all the time and can now comfortably wear skirts without panties. Pants are still a little itchy though...'
 					end
-				elseif trait['commando_lvl'] = 1:
-					trait['commando_exp'] += 2
-					if trait['commando_exp'] >= 1000:
-						trait['commando_exp'] = 50
-						trait['commando_lvl'] = 2
+				elseif pcs_traits['commando_lvl'] = 1:
+					pcs_traits['commando_exp'] += 2
+					if pcs_traits['commando_exp'] >= 1000:
+						pcs_traits['commando_exp'] = 50
+						pcs_traits['commando_lvl'] = 2
 						msg'You have gained the 2nd level of the Commando trait! You have become very comfortable without panties and the raw insides of your pants no longer irritate your pussy.'
 					end
-				elseif trait['commando_lvl'] = 2:
+				elseif pcs_traits['commando_lvl'] = 2:
 					mosol = 0
-					trait['commando_exp'] += 2
-					if trait['commando_exp'] >= 1000:
-						trait['commando_exp'] = 500
-						trait['commando_lvl'] = 3
+					pcs_traits['commando_exp'] += 2
+					if pcs_traits['commando_exp'] >= 1000:
+						pcs_traits['commando_exp'] = 500
+						pcs_traits['commando_lvl'] = 3
 						msg'You have gained the 3rd level of the Commando trait! You have become so accustomed to going commando that any kind of underwear over your hips just feels <i>wrong</i>. You suffer mood penalties while wearing panties.'
 					end
-				elseif trait['commando_lvl'] = 3:
-					trait['commando_exp'] += 1
+				elseif pcs_traits['commando_lvl'] = 3:
+					pcs_traits['commando_exp'] += 1
 				end
-			elseif trait['commando_lvl'] > 0:
+			elseif pcs_traits['commando_lvl'] > 0:
 !!Reduction from exp/lvls
-				if trait['commando_lvl'] = 3:
-					trait['commando_exp'] -= 1
+				if pcs_traits['commando_lvl'] = 3:
+					pcs_traits['commando_exp'] -= 1
 					pcs_mood -= 1
-					if trait['commando_exp'] <= 0:
-						trait['commando_exp'] = 500
-						trait['commando_lvl'] = 2
+					if pcs_traits['commando_exp'] <= 0:
+						pcs_traits['commando_exp'] = 500
+						pcs_traits['commando_lvl'] = 2
 						msg'You have lost the 3rd level of the Commando trait! You are now only comfortable not wearing panties and will not suffer irritation from wearing pants while going commando.'
 					end
 				else
-					trait['commando_exp'] -= 1
-					if trait['commando_exp'] <= -0:
-						trait['commando_exp'] = 900
-						trait['commando_lvl'] -= 1
+					pcs_traits['commando_exp'] -= 1
+					if pcs_traits['commando_exp'] <= -0:
+						pcs_traits['commando_exp'] = 900
+						pcs_traits['commando_lvl'] -= 1
 					end
 				end
 			end
+!!{			
+			if $braworntype = 'none':
+				
+			end}
 		end
 
+
 !!	This is the Succubus non-direct injection (pun intented) sex to sexnutrition and the sexnutrition conversion handling
 		if succubusflag = 1:
 			if hypnoAddict > 0: dynamic $RestTherapyVariables

locations/stat_display.qsrc

@@ -548,19 +548,19 @@ if $pantyworntype = 'none' and PCloswimwear = 0 and PCloPanties = 0:
 	elseif PCloBimbo = 1 or bimbolevel > 0 and PCloSkirt > 3 and cheatBimbo = 0:
 		$stat_panty_msg = 'You like, totally forgot to put on any panties. You are such a bimbo.'
 		$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
-	elseif PCloSkirt > 3 and trait['commando_lvl'] > 0:
+	elseif PCloSkirt > 3 and pcs_traits['commando_lvl'] > 0:
 		$stat_panty_msg = 'You feel liberated not wearing panties as your naked ass flashes from under your short skirt.'
 		$stat_panty_text = '<BR><font color=#0064FF><<$stat_panty_msg>></font>'
-	elseif PCloSkirt > 3 and trait['commando_lvl'] < 1:
+	elseif PCloSkirt > 3 and pcs_traits['commando_lvl'] < 1:
 		if pcs_inhib <= 50:
 			$stat_panty_msg = 'Your face is flushed with shame. You are not wearing panties, and your naked ass flashes from under your short skirt.'
 		else
 			$stat_panty_msg = 'It feels odd and a bit uncomfortable not wearing panties with such a short skirt. Your naked ass flashes from under it.'
 		end
 		$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
-	elseif PCloPants > 0 and trait['commando_lvl'] = 2:
+	elseif PCloPants > 0 and pcs_traits['commando_lvl'] = 2:
 		$stat_panty_msg = 'You are comfortably commando, not bothered at all by your bare pussy rubbing against the inside of your pants.'
-	elseif PCloPants > 0 and trait['commando_lvl'] = 3:
+	elseif PCloPants > 0 and pcs_traits['commando_lvl'] = 3:
 		$stat_panty_msg = 'You are happily commando, feeling very comfortable with your ass and pussy touching the inside of your pants.'
 	elseif PCloPants > 0 and $braworntype = 'none':
 		$stat_panty_msg = 'You aren''t wearing underwear, and your bare pussy is rubbing against your clothing.'
@@ -571,7 +571,7 @@ if $pantyworntype = 'none' and PCloswimwear = 0 and PCloPanties = 0:
 	elseif towel = 1:
 		$stat_panty_msg = 'Your naked body is covered only by a short towel.'
 		$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
-	elseif $clothingworntype ! 'nude' and trait['commando_lvl'] < 1:
+	elseif $clothingworntype ! 'nude' and pcs_traits['commando_lvl'] < 1:
 		$stat_panty_msg = 'You are not wearing panties and it makes you uncomfortable.'
 		$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
 	elseif $clothingworntype ! 'nude':
@@ -587,11 +587,11 @@ elseif $pantyworntype = 'exhibitionist' and PCloswimwear = 0:
 	elseif PCloSkirt > 3 and pcs_inhib <= 50:
 		$stat_panty_msg = 'Your face is flushed with shame. You are wearing panties so thin they leave your ass clearly visible as it flashes from under your short skirt.'
 		$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
-	elseif PCloPants > 0 and trait['commando_lvl'] = 3:
+	elseif PCloPants > 0 and pcs_traits['commando_lvl'] = 3:
 		$stat_panty_msg = 'You wearing transparent panties, but that you''re wearing any at all is bringing down your mood.'
 		$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
 	end
-elseif $pantyworntype ! 'none' and trait['commando_lvl'] = 3:
+elseif $pantyworntype ! 'none' and pcs_traits['commando_lvl'] = 3:
 	$stat_panty_msg = 'You wearing panties and it makes you uncomfortable.'
 	$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
 end
@@ -1104,9 +1104,9 @@ if cheatStatusIcons = 0:
 
 	if $stat_visible_cum_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_visible_cum_msg"><img title="People can see the cum on your body!" height = <<set_siconht>> src="images/system/icons/status/visible_cum.png"></a></td>'
 
-	if stat_cumloc_check = 1 and trait['cumeater'] = 1 and cumeater_cheat = 0 and menu_off = 0:
+	if stat_cumloc_check = 1 and pcs_traits['cumeater'] = 1 and cumeater_cheat = 0 and menu_off = 0:
 		$statusIconBarTab += '<td><a href="exec: gs ''cum_manage'', ''cumeater_icon'' & gs ''stat''"><img title="Click to lick up all that delicious cum." height = <<set_siconht>> src="images/system/icons/status/cum_eater.png"></a></td>'
-	elseif stat_cumloc_check = 1 and trait['cumeater'] = 1 and cumeater_cheat = 0 and menu_off = 1:
+	elseif stat_cumloc_check = 1 and pcs_traits['cumeater'] = 1 and cumeater_cheat = 0 and menu_off = 1:
 		$statusIconBarTab += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = <<set_siconht>> src="images/system/icons/status/cum_eater.png"></a></td>'
 	end
 
@@ -1280,9 +1280,9 @@ if cheatStatusIcons = 0:
 
 	if $stat_bra_msg ! '' and $braworntype = 'none': $statusIconBarTab += '<td><a href="exec: msg $stat_bra_msg"><img title="<<$stat_bra_msg>>" height = <<set_siconht>> src="images/system/icons/status/boobs_'+iif(night_mode ! 3 and (($location_type = 'public_outdoors' and daystage = 5) or night_mode = 1 or night_mode = 2), 'white', 'black')+'.png"></a></td>'
 
-	if $stat_panty_msg ! '' and $pantyworntype ! 'none' and trait['commando_lvl'] < 3:
+	if $stat_panty_msg ! '' and $pantyworntype ! 'none' and pcs_traits['commando_lvl'] < 3:
 		$statusIconBarTab += '<td><a href="exec:msg $stat_panty_msg"><img title="<<$stat_panty_msg>>" height = <<set_siconht>> src="images/system/icons/status/panties.png"></a></td>'
-	elseif $stat_panty_msg ! '' and $pantyworntype ! 'none' and trait['commando_lvl'] = 3:
+	elseif $stat_panty_msg ! '' and $pantyworntype ! 'none' and pcs_traits['commando_lvl'] = 3:
 		$statusIconBarTab += '<td><a href="exec:msg $stat_panty_msg"><img title="<<$stat_panty_msg>>" height = <<set_siconht>> src="images/system/icons/status/panties_red.png"></a></td>'
 	end
 
@@ -2340,5 +2340,7 @@ if bimbowithdrawal > 14:
 	msg 'You suddenly feel as if your head is clear, instead of filled with pink thoughts.'
 end
 
---- stat_display ---------------------------------
-
+!! trigger to send you to vomitting code upon waking up
+!! coded out until content is in place
+if vomit['morning_sick'] = 1 or vomit['hangover'] = 1 or vomit['unlucky'] = 1:gs 'home_activity','vomiting_check'
+--- stat_display ---------------------------------

locations/stol.qsrc

@@ -148,19 +148,19 @@ if $ARGS[0] = 'stolPar':
 	if steroid_have > 0: '<a href="exec:dynamic $use_steroids & gt ''stol'', ''stolPar''"><b>Take steroids.</b></a> Uses left: <<steroid_have>>.'
 	if aphrodisiac_have > 0: '<a href="exec:dynamic $use_aphrodisiac & gt ''stol'', ''stolPar''"><b>Chew aphrodisiac gum.</b></a> Uses left: <<aphrodisiac_have>>.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if lernHome > 0 and (will_cost <= pcs_willpwr or traits['nerd_status'] = 3):
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if lernHome > 0 and (will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3):
 		'<br>You have homework to do. Finishing everything will take <<lernHome>> '+iif(lernHome = 1, 'hour.', 'hours.')
-		act 'Do some homework (1:00'+iif(traits['nerd_status'] = 3, '', ' and <<will_cost>> Willpower')+')':
+		act 'Do some homework (1:00'+iif(pcs_traits['nerd_status'] = 3, '', ' and <<will_cost>> Willpower')+')':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/shared/apartment/homework.jpg"></center>'
 			minut += 60
-			pcs_mood += 5 * traits['nerd_status']
+			pcs_mood += 5 * pcs_traits['nerd_status']
 			lern += 1
-			gs 'willpower', 'misc', 'self', iif(grupTipe = 4, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-			if traits['nerd_status'] = 2: will_cost = will_cost / 2
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			gs 'willpower', 'misc', 'self', iif(grupTipe = 4, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+			if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs'stat'
 			if komp = 1:
 				gs 'grades', 'homework', 'school', 'yes', 1, 0, 0
@@ -176,16 +176,16 @@ if $ARGS[0] = 'stolPar':
 	end
 	
 	will_cost = will_cost * lernHome
-	if lernHome > 1 and (will_cost <= pcs_willpwr or traits['nerd_status'] = 3):
-		act 'Finish all of your homework (<<lernHome>>:00'+iif(traits['nerd_status'] = 3, '', ' and <<will_cost>> Willpower')+')':
+	if lernHome > 1 and (will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3):
+		act 'Finish all of your homework (<<lernHome>>:00'+iif(pcs_traits['nerd_status'] = 3, '', ' and <<will_cost>> Willpower')+')':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/shared/apartment/homework.jpg"></center>'
 			'It took you <<temp>> hours to complete your homework.'
 			minut += 60 * lernHome
-			pcs_mood += 5 * traits['nerd_status'] *lernHome
+			pcs_mood += 5 * pcs_traits['nerd_status'] *lernHome
 			lern += 1 + lernHome/2
 			temp = lernHome
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs'stat'
 			if komp = 1:
 				gs 'grades', 'homework', 'school', 'yes', lernHome, 0, 0
@@ -420,7 +420,7 @@ if $ARGS[0] = 'studying_exam':
 	'<center><img <<$set_imgh>> src="images/locations/shared/apartment/homework.jpg"></center>'
 	!!Nerds likes studying and so their mood improves a little. Everbody else get in a worse mood by studying.
 	gs 'exp_gain', 'intel', max(0,rand(-1,1))
-	pcs_mood += (traits['nerd_status']*5 -10)
+	pcs_mood += (pcs_traits['nerd_status']*5 -10)
 	minut += 30
 	if pcs_sleep < 5:
 		no_study = 1

locations/succubus.qsrc

@@ -931,6 +931,7 @@ if $args[0] = 'sucwalkinggo':
 	minut += 180 + ((scfeed * 10) / succublvl)
 	pcs_health += 5 * (360 + ((scfeed * 10) / succublvl))
 	pcs_sleep += 15 * ((360 + ((scfeed * 10) / succublvl)) / 60)
+	pcs_condition['lack_of_sleep'] = 0
 	gs 'stat'
 	clr
 

locations/therapist.qsrc

@@ -1753,7 +1753,7 @@ if $ARGS[0] = 'hypnoRandom':
 		hypnoRandomCounter = 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
 		'"Cunt, It seems like you are still trying to resist my rules regarding panties. We need to change these rebelious behaviours as soon as possible. From now on you prefer not wearing panties than wearing panties. In fact, you <i>hate</i> wearing them! You find them to be restrictive and annoying. Just the thought of wearing panties make you feel uncomfortable"'
-		trait['commando_lvl'] = 3
+		pcs_traits['commando_lvl'] = 3
 		act 'Continue':
 		msg 'You have gained the 3rd level of the Commando trait! From now on any kind of underwear over your hips just feels <i>wrong</i>. You suffer mood penalties while wearing panties.'
 			gt 'therapist', 'hypnoEnd'

locations/traits.qsrc

@@ -73,18 +73,18 @@ if $ARGS[0] = 'menu':
 	
 	*nl
 	
-	if traits['nerd_status'] = 0:
+	if pcs_traits['nerd_status'] = 0:
 		'<center><b>Likes learning</b></center>'
-		'You don''t have this trait but have <<traits[''nerd_points'']>> points. You need to earn <<40 - traits[''nerd_points'']>> more points to get level 1 of this trait.'
-	elseif traits['nerd_status'] = 1:
+		'You don''t have this trait but have <<pcs_traits[''nerd_points'']>> points. You need to earn <<40 - pcs_traits[''nerd_points'']>> more points to get level 1 of this trait.'
+	elseif pcs_traits['nerd_status'] = 1:
 		'<center><b>Likes learning</b></center>'
-		'You have level 1 of this trait and <<traits[''nerd_points'']>> points. You need to earn <<60 - traits[''nerd_points'']>> more points to get level 2 of this trait. If you fall below 20 points, you''ll lose this trait.'
-	elseif traits['nerd_status'] = 2:
+		'You have level 1 of this trait and <<pcs_traits[''nerd_points'']>> points. You need to earn <<60 - pcs_traits[''nerd_points'']>> more points to get level 2 of this trait. If you fall below 20 points, you''ll lose this trait.'
+	elseif pcs_traits['nerd_status'] = 2:
 		'<center><b>Loves to learn</b></center>'
-		'You have level 2 of this trait and <<traits[''nerd_points'']>> points. You need to earn <<80 - traits[''nerd_points'']>> more points to get level 3 of this trait. If you fall below 40 points, you''ll fall back to level 1.'		
-	elseif traits['nerd_status'] = 3:
+		'You have level 2 of this trait and <<pcs_traits[''nerd_points'']>> points. You need to earn <<80 - pcs_traits[''nerd_points'']>> more points to get level 3 of this trait. If you fall below 40 points, you''ll fall back to level 1.'		
+	elseif pcs_traits['nerd_status'] = 3:
 		'<center><b>Teacher''s pet</b></center>'
-		'You have level 3 of this trait and <<traits[''nerd_points'']>> points. If you fall below 60 points, you''ll fall back to level 2.'		
+		'You have level 3 of this trait and <<pcs_traits[''nerd_points'']>> points. If you fall below 60 points, you''ll fall back to level 2.'		
 	end
 	'Listening to more than 80% of lessons and doing your homework regularly earns you points for this trait, but you''ll lose points if you listen to less than 60% of lessons or if you don''t do your homework.'
 	
@@ -111,11 +111,11 @@ if $ARGS[0] = 'menu':
 	*nl
 	
 	'<center><b>Cumeater</b></center>'
-	if trait['cumeater'] = 0 and cumeater_cheat = 0:
+	if pcs_traits['cumeater'] = 0 and cumeater_cheat = 0:
 		'You do not have this trait.'
 		'To gain this trait, you must swallow cum 10 times.'
 		'You have swallowed cum <<stat[''swallow'']>> times.'
-	elseif trait['cumeater'] = 0 and cumeater_cheat = 1:
+	elseif pcs_traits['cumeater'] = 0 and cumeater_cheat = 1:
 		'You do not have this trait.'
 	else
 		'You have this trait.'
@@ -124,26 +124,26 @@ if $ARGS[0] = 'menu':
 	end
 	
 	*nl
-	if trait['commando_exp'] > 0 or trait['commando_lvl'] > 0:'<center><b>Commando</b></center>'
-	if trait['commando_lvl'] = 0 and trait['commando_exp'] > 0:
+	if pcs_traits['commando_exp'] > 0 or pcs_traits['commando_lvl'] > 0:'<center><b>Commando</b></center>'
+	if pcs_traits['commando_lvl'] = 0 and pcs_traits['commando_exp'] > 0:
 		'You need to gain more experience not wearing panties with clothing to gain this trait.'
-	elseif trait['commando_lvl'] = 1:
+	elseif pcs_traits['commando_lvl'] = 1:
 		'You have this trait at level 1.'
 		'You''re starting to get used to not wearing panties. Skirts are quite comfortable without them, but you still find the friction of pants to be a bit irritating.'
-	elseif trait['commando_lvl'] = 2:
+	elseif pcs_traits['commando_lvl'] = 2:
 		'You have this trait at level 2.'
 		'You are perfectly comfortable wearing any kind of clothing without panties. Your pussy is no longer irritated when wearing pants without panties.'
-	elseif trait['commando_lvl'] = 3:
+	elseif pcs_traits['commando_lvl'] = 3:
 		'You have this trait at level 3.'
 		'You are more comfortable without panties than with them. In fact, you <i>hate</i> wearing them! They''re restrictive and annoying. You suffer mood penalties when wearing panties.'
 	end
 	
 	*nl
 	
-	if traits['alko_status'] = -1:
+	if pcs_traits['alko_status'] = -1:
 		'<center><b>Lightweight</b></center>'
 		'It doesn''t take much for you to get drunk. You don''t have to drink as much to feel the effects of alcohol.'
-	elseif traits['alko_status'] = 1:
+	elseif pcs_traits['alko_status'] = 1:
 		'<center><b>Heavyweight</b></center>'
 		'You''ve built up a tolerance, making it harder for you to feel the effects of alcohol.'
 	end
@@ -152,20 +152,20 @@ if $ARGS[0] = 'menu':
 
 	!!exp earned from anal sex but degrades over time. Level 3 can be lost but lvl1 and 2 cannot
 	'<center><b>Buttslut</b></center>'
-	if traits['buttslut_lvl'] = 0:
+	if pcs_traits['buttslut_lvl'] = 0:
 		'You need to have more anal orgasms to gain this trait. To reach lvl 1 you need to have more than 10 anal orgasms.'
 		'You currently have had <<orgasm_anal>> anal orgasms.'
-	elseif traits['buttslut_lvl'] = 1:
+	elseif pcs_traits['buttslut_lvl'] = 1:
 		'You have this trait at level 1. To reach lvl 2 you need to gain more anal orgasm exp.'
-		'You currently have <<traits[''buttslut_exp'']>> experience. Having more anal orgasms will increase this, otherwise it will degrade over time.'
+		'You currently have <<pcs_traits[''buttslut_exp'']>> experience. Having more anal orgasms will increase this, otherwise it will degrade over time.'
 		'You''re starting to enjoy anal sex ' + iif(stat['think_virgin'] = 0, 'almost as much as regular sex.', 'more than before.')
-	elseif traits['buttslut_lvl'] = 2:
+	elseif pcs_traits['buttslut_lvl'] = 2:
 		'You have this trait at level 2. To reach lvl 3 you need to gain more anal orgasm exp.'
-		'You currently have <<traits[''buttslut_exp'']>> experience. Having more anal orgasms will increase this, otherwise it will degrade over time.'
+		'You currently have <<pcs_traits[''buttslut_exp'']>> experience. Having more anal orgasms will increase this, otherwise it will degrade over time.'
 		'You''re enjoy anal sex ' + iif(stat['think_virgin'] = 0, 'as much as regular sex.', 'a great deal.')
-	elseif traits['buttslut_lvl'] = 3:
+	elseif pcs_traits['buttslut_lvl'] = 3:
 		'You have this trait at level 3. This is the highest level.'
-		'You currently have <<traits[''buttslut_exp'']>> experience. Having more anal orgasms will increase this, otherwise it will degrade over time.'
+		'You currently have <<pcs_traits[''buttslut_exp'']>> experience. Having more anal orgasms will increase this, otherwise it will degrade over time.'
 		if stat['think_virgin'] = 0:
 			'You now enjoy anal sex more than regular sex.'
 		else
@@ -178,114 +178,136 @@ if $ARGS[0] = 'menu':
 end
 
 if $ARGS[0] = 'hourly':
-	if stat['swallow'] >= 10 and trait['cumeater'] = 0 and cumeater_cheat = 0:
-		trait['cumeater'] = 1
+	if stat['swallow'] >= 10 and pcs_traits['cumeater'] = 0 and cumeater_cheat = 0:
+		pcs_traits['cumeater'] = 1
 		msg 'You have gained the trait "Cumeater"'
 	end
 end
 
+if $ARGS[0] = 'creampie_fetish':
+	pcs_traits['creampie_fetish'] = 1
+	msg 'You have gained the Creampie Fetish trait! Your desire for creampies are so strong that you can''t help but orgasm when a big load of spunk is poured into your pussy, whether you asked for it or not ;)'
+end
+
+if $ARGS[0] = 'fitness_freak':
+	pcs_traits['fitness_freak'] = 1
+	msg '"You don''t know if it''s something you learned or something is just wrong with your brain. You love exercise. It feels good. *Really* good. Yeah. *That* kind of good. You get turned on when you exercise and the people around you can subconsciously sense it.'
+	
+	'Exercise increases your arousal and for a short time after, you ignore the appearance penalties of sweat, adding them as a bonus to your appearance instead."'
+end
+
+if $ARGS[0] = 'stiff_nipples':
+	pcs_traits['pokies'] = 1
+	msg 'You have particularly stiff nipples. They''re always hard, even when you''re not aroused. So hard that they''ll give you pokies through a bra that other girls would get away with without one.'
+end
+
+if $ARGS[0] = 'wet_pussy':
+	pcs_traits['wet_pussy'] = 1
+	msg 'You get wetter than other girls, especially when aroused.'
+end
+
 if $ARGS[0] = 'overnight':
-	!!traits['alko_status']: light weight (-1), normal (0), heavy weight (+1)
-	!!traits['alko_points']: between -100 and 100, tracks if sveta is a light or heavy wight
-	!!traits['alko_day']: amount of alko sveta has drunk today
+	!!pcs_traits['alko_status']: light weight (-1), normal (0), heavy weight (+1)
+	!!pcs_traits['alko_points']: between -100 and 100, tracks if sveta is a light or heavy wight
+	!!pcs_traits['alko_day']: amount of alko sveta has drunk today
 	
 	!!Gains/Decay
-	if traits['alko_day'] > 0:
-		if traits['alko_day'] > 9:
-			traits['alko_points'] += 9
+	if pcs_traits['alko_day'] > 0:
+		if pcs_traits['alko_day'] > 9:
+			pcs_traits['alko_points'] += 9
 		else
-			traits['alko_points'] += traits['alko_day']
+			pcs_traits['alko_points'] += pcs_traits['alko_day']
 		end
-	elseif traits['alko_day'] = 0:
-		traits['alko_points'] -= 2
+	elseif pcs_traits['alko_day'] = 0:
+		pcs_traits['alko_points'] -= 2
 	end
 	
 	if kanikuli = 0 and week < 6:
 		if lernHome > 0:
-			traits['nerd_lernHome'] = 0
-			traits['nerd_points'] -= 1
-		elseif lernHome = 0 and traits['nerd_lernHome'] < 5:
-			traits['nerd_lernHome'] += 1
-		elseif traits['nerd_lernHome'] = 5:
-			traits['nerd_points'] += 1
+			pcs_traits['nerd_lernHome'] = 0
+			pcs_traits['nerd_points'] -= 1
+		elseif lernHome = 0 and pcs_traits['nerd_lernHome'] < 5:
+			pcs_traits['nerd_lernHome'] += 1
+		elseif pcs_traits['nerd_lernHome'] = 5:
+			pcs_traits['nerd_points'] += 1
 		end
 	elseif kanikuli = 0 and week = 6:
 		!!This check has to be changed if the number of non-sport lessons ever changes (27 right now)
-		if traits['nerd_lessons'] > 20:
-			traits['nerd_points'] += traits['nerd_lessons'] - 17
-		elseif traits['nerd_lessons'] < 14:
-			traits['nerd_points'] -= iif(traits['nerd_status'] > 0, 5, 10)
+		if pcs_traits['nerd_lessons'] > 20:
+			pcs_traits['nerd_points'] += pcs_traits['nerd_lessons'] - 17
+		elseif pcs_traits['nerd_lessons'] < 14:
+			pcs_traits['nerd_points'] -= iif(pcs_traits['nerd_status'] > 0, 5, 10)
 		end
-		traits['nerd_lessons'] = 0
+		pcs_traits['nerd_lessons'] = 0
 	elseif university['semester_week'] > 0 and university['student'] = 1 and week = 5:
 		!!This is for being a university student, with only 9 weekly classes and no homework the gain is a little more aggressive from classes.
-		if traits['nerd_lessons'] > 7:
-			traits['nerd_points'] += (traits['nerd_lessons']-7)*5
-		elseif traits['nerd_lessons'] < 4:
-			traits['nerd_points'] -= iif(traits['nerd_status'] > 0, 5, 10)
+		if pcs_traits['nerd_lessons'] > 7:
+			pcs_traits['nerd_points'] += (pcs_traits['nerd_lessons']-7)*5
+		elseif pcs_traits['nerd_lessons'] < 4:
+			pcs_traits['nerd_points'] -= iif(pcs_traits['nerd_status'] > 0, 5, 10)
 		end
-		traits['nerd_lessons'] = 0	
+		pcs_traits['nerd_lessons'] = 0	
 	end	
 	
 	!!Trait selection
-	if traits['alko_points'] > 50 and traits['alko_status'] < 1:
-		traits['alko_status'] = 1
+	if pcs_traits['alko_points'] > 50 and pcs_traits['alko_status'] < 1:
+		pcs_traits['alko_status'] = 1
 		msg 'You have gained the trait ''Heavyweight''.'
-	elseif traits['alko_points'] < -50 and traits['alko_status'] > -1:
-		traits['alko_status'] = -1	
+	elseif pcs_traits['alko_points'] < -50 and pcs_traits['alko_status'] > -1:
+		pcs_traits['alko_status'] = -1	
 		msg 'You have gained the trait ''Lightweight''.'
-	elseif traits['alko_status'] = -1 and traits['alko_points'] > 0:
-		traits['alko_status'] = 0
+	elseif pcs_traits['alko_status'] = -1 and pcs_traits['alko_points'] > 0:
+		pcs_traits['alko_status'] = 0
 		msg 'You have lost the trait ''Lightweight''.'
-	elseif traits['alko_status'] = 1 and traits['alko_points'] < 0:
-		traits['alko_status'] = 0
+	elseif pcs_traits['alko_status'] = 1 and pcs_traits['alko_points'] < 0:
+		pcs_traits['alko_status'] = 0
 		msg 'You have lost the trait ''Heavyweight''.'
 	end
 	
-	if traits['nerd_points'] > 80 and traits['nerd_status'] < 3:
-		traits['nerd_status'] = 3
+	if pcs_traits['nerd_points'] > 80 and pcs_traits['nerd_status'] < 3:
+		pcs_traits['nerd_status'] = 3
 		msg 'You have gained the trait ''Teacher''s pet''.'
-	elseif traits['nerd_points'] > 60 and traits['nerd_status'] < 2:
-		traits['nerd_status'] = 2
+	elseif pcs_traits['nerd_points'] > 60 and pcs_traits['nerd_status'] < 2:
+		pcs_traits['nerd_status'] = 2
 		msg 'You have gained the trait ''Loves to learn''.'		
-	elseif traits['nerd_points'] > 40 and traits['nerd_status'] < 1:
-		traits['nerd_status'] = 1
+	elseif pcs_traits['nerd_points'] > 40 and pcs_traits['nerd_status'] < 1:
+		pcs_traits['nerd_status'] = 1
 		msg 'You have gained the trait ''Likes learning''.'
-	elseif traits['nerd_points'] < 60 and traits['nerd_status'] = 3:
-		traits['nerd_status'] = 2
+	elseif pcs_traits['nerd_points'] < 60 and pcs_traits['nerd_status'] = 3:
+		pcs_traits['nerd_status'] = 2
 		msg 'You have lost the trait ''Teacher''s pet''.'
-	elseif traits['nerd_points'] < 40 and traits['nerd_status'] = 2:
-		traits['nerd_status'] = 1
+	elseif pcs_traits['nerd_points'] < 40 and pcs_traits['nerd_status'] = 2:
+		pcs_traits['nerd_status'] = 1
 		msg 'You have lost the trait ''Loves to learn''.'	
-	elseif traits['nerd_points'] < 20 and traits['nerd_status'] = 1:
-		traits['nerd_status'] = 0
+	elseif pcs_traits['nerd_points'] < 20 and pcs_traits['nerd_status'] = 1:
+		pcs_traits['nerd_status'] = 0
 		msg 'You have lost the trait ''Likes learning''.'		
 	end
 	
 	!!Trait effects
-	if traits['nerd_status'] = 3:
+	if pcs_traits['nerd_status'] = 3:
 		grupvalue[1] -= 1
 		grupvalue[3] += rand(1,2)
 		grupvalue[4] -= rand(1,2)		
-	elseif traits['nerd_status'] = 2:
+	elseif pcs_traits['nerd_status'] = 2:
 		grupvalue[3] += 1
 		grupvalue[4] -= 1
-	elseif traits['nerd_status'] = 1:
+	elseif pcs_traits['nerd_status'] = 1:
 		grupvalue[3] += rand(0,1)
 	end
 
 	!!Cleanup
-	traits['alko_day'] = 0
-	if traits['alko_points'] > 100: 
-		traits['alko_points'] = 100
-	elseif traits['alko_points'] < -100: 
-		traits['alko_points'] = -100
+	pcs_traits['alko_day'] = 0
+	if pcs_traits['alko_points'] > 100: 
+		pcs_traits['alko_points'] = 100
+	elseif pcs_traits['alko_points'] < -100: 
+		pcs_traits['alko_points'] = -100
 	end
 	
-	if traits['nerd_points'] > 100:
-		traits['nerd_points'] = 100
-	elseif traits['nerd_points'] < -100:
-		traits['nerd_points'] = -100
+	if pcs_traits['nerd_points'] > 100:
+		pcs_traits['nerd_points'] = 100
+	elseif pcs_traits['nerd_points'] < -100:
+		pcs_traits['nerd_points'] = -100
 	end
 end
 

locations/uni_lessons1.qsrc

@@ -18,15 +18,15 @@ if $ARGS[0] = 'general_education_101':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and take a seat next to a window. The rest of your classmates walk in one by one before Mr. Kovalyov enters the classroom and closes the door. He turns to the class and begins today''s lecture.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Mr. Kovalyov'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mr. Kovalyov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_1', 'general education 101', pcs_intel
 			gs 'exp_gain', 'intel', rand(0,1)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mr. Kovalyov for the duration of the class. He manages to make today''s lesson very interesting and informative, and you feel like you''ve learned something from actively taking part in the discussion.'
@@ -256,15 +256,15 @@ if $ARGS[0] = 'teaching_methods_101':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and see Mr. Pasternak standing by his desk as the rest of your classmates walk in one by one under his watchful eye. Some of them get a friendly smile while others get a stern look. Not wasting any time, he launches straight into his lecture.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Mr. Pasternak'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mr. Pasternak'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_1', 'teaching methods 101', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mr. Pasternak for the duration of the class. Today''s lesson was interesting and informative, and you feel like you''ve learned something from taking part in the class.'
@@ -509,15 +509,15 @@ if $ARGS[0] = 'learning_theories_101':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and see Mrs. Kovalchuk sitting behind her desk. The rest of your classmates walk in one by one and she smiles at each one as they enter.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Mrs. Kovalchuk'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mrs. Kovalchuk'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_1', 'learning theories 101', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mrs. Kovalchuk for the duration of the class. Today''s lesson was interesting and informative, and you feel like you''ve learned something from taking part in the class.'

locations/uni_lessons2.qsrc

@@ -13,15 +13,15 @@ if $ARGS[0] = 'general_education_102':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and take a seat next to a window. The rest of your classmates walk in one by one before Mr. Kovalyov enters the classroom and closes the door. He turns to the class and begins today''s lecture.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Mr. Kovalyov'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mr. Kovalyov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_2', 'general education 102', pcs_intel
 			gs 'exp_gain', 'intel', rand(0,1)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mr. Kovalyov for the duration of the class. He manages to make today''s lesson very interesting and informative, and you feel like you''ve learned something from actively taking part in the discussion.'
@@ -251,15 +251,15 @@ if $ARGS[0] = 'teaching_methods_102':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and see Mr. Pasternak standing by his desk as the rest of your classmates walk in one by one under his watchful eye. Some of them get a friendly smile while others get a stern look. Not wasting any time, he launches straight \into his lecture.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Mr. Pasternak'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mr. Pasternak'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_2', 'teaching methods 102', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mr. Pasternak for the duration of the class. Today''s lesson was interesting and informative, and you feel like you''ve learned something from taking part in the class.'
@@ -504,15 +504,15 @@ if $ARGS[0] = 'psychology_of_a_student_101':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and see Mrs. Kovalchuk sitting behind her desk. The rest of your classmates walk in one by one and she smiles at each one as they enter.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Mrs. Kovalchuk'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mrs. Kovalchuk'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_2', 'psychology of a student 101', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mrs. Kovalchuk for the duration of the class. Today''s lesson was interesting and informative, and you feel like you''ve learned something from taking part in the class.'

locations/uni_lessons3.qsrc

@@ -13,15 +13,15 @@ if $ARGS[0] = 'general_education_201':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and take a seat next to a window. The rest of your classmates walk in one by one before Mr. Kovalyov enters the classroom and closes the door. He turns to the class and begins today''s lecture.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Mr. Kovalyov'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mr. Kovalyov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_3', 'general education 201', pcs_intel
 			gs 'exp_gain', 'intel', rand(0,1)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mr. Kovalyov for the duration of the class. He manages to make today''s lesson very interesting and informative, and you feel like you''ve learned something from actively taking part in the discussion.'
@@ -251,15 +251,15 @@ if $ARGS[0] = 'assessment_201':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and see Mr. Pasternak standing by his desk as the rest of your classmates walk in one by one under his watchful eye. Some of them get a friendly smile while others get a stern look. Not wasting any time, he launches straight into his lecture.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Mr. Pasternak'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mr. Pasternak'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_3', 'assessment 201', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mr. Pasternak for the duration of the class. Today''s lesson was interesting and informative, and you feel like you''ve learned something from taking part in the class.'
@@ -504,15 +504,15 @@ if $ARGS[0] = 'learning_theories_201':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and see Mrs. Kovalchuk sitting behind her desk. The rest of your classmates walk in one by one and she smiles at each one as they enter.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Mrs. Kovalchuk'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mrs. Kovalchuk'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_3', 'learning theories 201', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mrs. Kovalchuk for the duration of the class. Today''s lesson was interesting and informative, and you feel like you''ve learned something from taking part in the class.'

locations/uni_lessons4.qsrc

@@ -13,15 +13,15 @@ if $ARGS[0] = 'general_education_202':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and take a seat next to a window. The rest of your classmates walk in one by one before Mr. Kovalyov enters the classroom and closes the door. He turns to the class and begins today''s lecture.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Mr. Kovalyov'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mr. Kovalyov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_4', 'general education 202', pcs_intel
 			gs 'exp_gain', 'intel', rand(0,1)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mr. Kovalyov for the duration of the class. He manages to make today''s lesson very interesting and informative, and you feel like you''ve learned something from actively taking part in the discussion.'
@@ -251,15 +251,15 @@ if $ARGS[0] = 'learning_theories_202':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and see Mr. Pasternak standing by his desk as the rest of your classmates walk in one by one under his watchful eye. Some of them get a friendly smile while others get a stern look. Not wasting any time, he launches straight into his lecture.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Mr. Pasternak'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mr. Pasternak'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_4', 'assessment 202', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mr. Pasternak for the duration of the class. Today''s lesson was interesting and informative, and you feel like you''ve learned something from taking part in the class.'
@@ -504,15 +504,15 @@ if $ARGS[0] = 'psychology_of_a_student_201':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and see Mrs. Kovalchuk sitting behind her desk. The rest of your classmates walk in one by one and she smiles at each one as they enter.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Mrs. Kovalchuk'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mrs. Kovalchuk'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_4', 'psychology of a student 201', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mrs. Kovalchuk for the duration of the class. Today''s lesson was interesting and informative, and you feel like you''ve learned something from taking part in the class.'

locations/uni_library.qsrc

@@ -116,7 +116,7 @@ if $ARGS[0] = 'studying_exam':
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/study' + rand(1,7) + '.jpg"></center>'
 	!!Nerds like studying and so their mood improves a little. Everybody else gets in a worse mood by studying.
 	gs 'exp_gain', 'intel', max(0,rand(-1,1))
-	pcs_mood += (traits['nerd_status']*5 -10)
+	pcs_mood += (pcs_traits['nerd_status']*5 -10)
 	minut += 30
 	'You open the books and start studying for your <<$ARGS[2]>> exam. The library is mostly quiet, but you hear occasional noises, some of them hard to make out and some of them fairly suspicious. Despite this, it is a good environment to study in and you can see a number of other students studying as well.'
 	if pcs_sleep < 5:

locations/willpower.qsrc

@@ -592,16 +592,16 @@ if $ARGS[0] = 'swallow':
 	
 	if $ARGS[1] = 'self':
 		if missCum >= timeTresh: will_calc = 0
-		if trait['cumeater'] = 1 or cumloc[12] > 0:
+		if pcs_traits['cumeater'] = 1 or cumloc[12] > 0:
 			will_cost = (10 + will_calc - will_arousal_mod)/10
 		else
 			will_cost = (100 + will_calc - will_arousal_mod)/10
 		end
 	elseif $ARGS[1] = 'force':
-		will_cost = (80 - will_enforced - trait['cumeater'] * 10 + will_calc - will_arousal_mod)/10
+		will_cost = (80 - will_enforced - pcs_traits['cumeater'] * 10 + will_calc - will_arousal_mod)/10
 	else
 		if missCum >= timeTresh: will_calc += 100
-		if trait['cumeater'] = 1 or cumloc[12] > 0:
+		if pcs_traits['cumeater'] = 1 or cumloc[12] > 0:
 			will_cost = (100 + will_calc + will_arousal_mod)/10
 		else
 			will_cost = (10 + will_calc + will_arousal_mod)/10