Merge remote-tracking branch 'hornguy6/master'

locations/booty_call.qsrc

@@ -8,13 +8,14 @@ if $ARGS[0] = 'scheduler':
 end
 
 if $ARGS[0] = 'scheduler2':
-	if i <= arrsize('$FuckBuddy'):
+	if i <= arrsize('$fuckbuddy'):
 		gs 'booty_call', 'npc_stat_update'
 !!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and npc_rel[$FuckBuddy[i]] > 0 and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_big_fight[$FuckBuddy[i]] < daystart - 7:
 
 !!		temporary removal of npc_rel requirement until boy initiated breakups can occur
 
-		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] 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 npc_no_booty_call[$FuckBuddy[i]] ! daystart and (npc_big_fight[$FuckBuddy[i]] < daystart - 7 and daystart > 7):
+		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and npc_no_booty_call[$FuckBuddy[i]] ! daystart:
 			gs 'booty_call', 'scheduler3'
 		else
 			npc_no_booty_call[$FuckBuddy[i]] = daystart

locations/booty_call_after.qsrc

@@ -44,6 +44,11 @@ if $ARGS[0] = 'ending':
 	if booty_call['fuck'] > 0: know_virgin[$boy] = 0
 	if booty_call['creampie_orgasm'] = 1: stat_memory['creampie_orgasm'] = daystart
 	npc_last_sex[$boy] = daystart
+	if booty_call['sleepover'] = 1 or hour < 7:
+		npc_last_booty_call[$boy] = daystart - 1
+	else
+		npc_last_booty_call[$boy] = daystart
+	end
 	killvar 'booty_call'
 end
 

locations/booty_call_condoms.qsrc

@@ -6,7 +6,7 @@
 !! booty_call['out_of_condoms'] = 2 - npc has run out of condoms, will use players
 
 if $ARGS[0] = 'setup':
-	if npc_condom_conscious[$boy] = 1:
+	if npc_condom_conscious[$boy] > 0:
 		booty_call['condom_count'] = 100
 	elseif booty_call['condom_count'] = 0 and booty_call['fuck_count'] = 0 and npc_no_condoms[$boy] ! 1:
 		if rand(1,5) = 1:

locations/booty_call_cum.qsrc

@@ -244,6 +244,7 @@ if $ARGS[0] = 'fuck_cum_random':
 			end
 		end
 	else
+		!! boy will cum where he wants without asking
 		booty_call['his_choice'] = 1
 		if rand(1,10) >= 9:
 			gs'booty_call_cum', 'cum_mouth'
@@ -323,7 +324,7 @@ if $ARGS[0] = 'fuck_cum':
 	end
 	
 !!	if (rand(0,1) = 1 or npc_selfish[$boy] = 1) and ($npc_cum_pref[$boy] = 'creampie' and booty_call['condom'] ! 1) and $npc_cum_pref[$boy] ! 'pullout' and $npc_cum_pref[$boy] ! '':
-	if booty_call['cum_warn'] = 1:	
+	if booty_call['cum_warn'] = 1 and booty_call['his_choice'] = 0:	
 		if booty_call['cum_where'] = 1:
 			'"What should I do?" <<$npc_firstname[$boy]>> asks.'
 		elseif $booty_call['cum_choice'] = 'creampie':

locations/booty_call_sex.qsrc

@@ -337,7 +337,7 @@ if $ARGS[0] = 'keep_fucking':
 end
 
 if $ARGS[0] = 'keep_fucking_act':
-	if booty_call['cock_remove'] = 0:
+	if booty_call['cock_remove'] = 0 and ($booty_call['position'] = 'miss' or $booty_call['position'] = 'doggy' or $booty_call['position'] = 'cowgirl'):
 		act'Keep fucking':
 			$booty_call['reset_pos'] = $booty_call['position']
 			cla
@@ -682,7 +682,7 @@ if $ARGS[0] = 'keep_going':
 				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_choose' & gs 'booty_call_condoms', 'condoms'
+				act'Sex':cla & gs 'booty_call_condoms', 'condoms'
 			else
 				cla & *nl
 				$booty_call['reset_pos'] = $booty_call['position']
@@ -830,8 +830,10 @@ 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
+				if booty_call['force_harden'] > 0:
+					booty_call['force_harden'] = 2
+					booty_call['extra_cum'] += 1
+				end
 				$booty_call['foreplay'] = ''
 				gs'booty_call_sex', 'reset'
 				gs 'booty_call_start', 'handjob_dom1'
@@ -963,6 +965,7 @@ if $ARGS[0] = 'reset':
 	booty_call['just_cum_inside_me'] = 0
 	booty_call['take_in_stride'] = 0
 	booty_call['sex_over'] = 0
+	if booty_call['no_condom'] = 1: booty_call['condom'] = 0
 end
 
 if $ARGS[0] = 'pain':

locations/booty_call_start.qsrc

@@ -63,9 +63,9 @@ end
 if $ARGS[0] = 'initiate':
 	gs 'boystat', $ARGS[1]
 	
-	if booty_call_invite[$boy] = daystart and npc_last_sex[$boy] ! daystart and npc_no_booty_call[$boy] ! daystart:
+	if booty_call_invite[$boy] = daystart and npc_last_booty_call[$boy] ! daystart:
 		gt 'booty_call_start', 'invited_start'
-	elseif npc_start_free_time[$boy] > hour and hour < npc_end_free_time[$boy] and npc_last_sex[$boy] ! daystart  and npc_no_booty_call[$boy] ! daystart:
+	elseif npc_start_free_time[$boy] >= hour and hour <= npc_end_free_time[$boy] and npc_last_sex[$boy] ! daystart and npc_no_booty_call[$boy] ! daystart and npc_last_booty_call[$boy] ! daystart:
 		gt 'booty_call_start', 'uninvited_start'
 	else
 		gs 'booty_call_start', 'neighborhood_image'
@@ -1015,6 +1015,7 @@ if $ARGS[0] = 'bj_sub_cum_surprise':
 			booty_call['bj_cum'] = 1
 			booty_call['swallow'] = 1
 			gs 'cum_call', 'mouth_swallow', $boy, 1
+			booty_call['cum_count'] += 1
 			gs 'stat'
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow5.mp4"></video></center>'
@@ -1028,6 +1029,7 @@ if $ARGS[0] = 'bj_sub_cum_surprise':
 			booty_call['bj_cum'] = 2
 			booty_call['spit'] = 1
 			gs 'cum_call', 'mouth', $boy, 1
+			booty_call['cum_count'] += 1
 			gs 'stat'
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit6.mp4"></video></center>'
@@ -1040,6 +1042,7 @@ if $ARGS[0] = 'bj_sub_cum_surprise':
 			cla & *clr
 			booty_call['bj_cum'] = 4
 			booty_call['gag'] = 1
+			booty_call['cum_count'] += 1
 			gs 'cum_call', 'mouth', $boy, 1
 			gs 'stat'
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit3.mp4"></video></center>'
@@ -1183,6 +1186,7 @@ if $ARGS[0] = 'bj_sub_cum_mouth2':
 	act'Make him come in your mouth':
 		booty_call['cum_mouth'] = 1
 		booty_call['swallow'] = 1
+		booty_call['cum_count'] += 1
 		gs 'cum_call', 'mouth_swallow', $boy, 1
 		$booty_call['cum_choice'] = 'swallow'
 		$booty_call['last_cum'] = 'mouth'
@@ -1204,6 +1208,7 @@ if $ARGS[0] = 'bj_sub_cum_mouth_spit':
 		booty_call['cum_mouth'] = 1
 		booty_call['spit'] = 1
 		booty_call['swallow'] = 0
+		booty_call['cum_count'] += 1
 		$booty_call['cum_choice'] = 'mouth'
 		$booty_call['last_cum'] = 'mouth'
 		gs 'cum_call', 'mouth', $boy, 1
@@ -1225,6 +1230,7 @@ if $ARGS[0] = 'bj_sub_cum_mouth_gag':
 	act'Let him (and gag)':
 		booty_call['cum_mouth'] = 1
 		booty_call['gag'] = 1
+		booty_call['cum_count'] += 1
 		$booty_call['cum_choice'] = 'mouth'
 		$booty_call['last_cum'] = 'mouth'
 		gs 'cum_call', 'mouth', $boy, 1
@@ -1243,6 +1249,7 @@ if $ARGS[0] = 'bj_sub_cum_mouth_swallow':
 		booty_call['cum_swallow'] += 1
 		$booty_call['last_cum'] = 'mouth'
 		booty_call['swallow'] = 1
+		booty_call['cum_count'] += 1
 		gs 'cum_call', 'mouth_swallow', $boy, 1
 		gs 'stat'
 		cla & *clr
@@ -1258,6 +1265,7 @@ if $ARGS[0] = 'bj_sub_cum_mouth_swallow':
 		$booty_call['last_cum'] = 'mouth'
 		booty_call['swallow'] = 1
 		booty_call['react'] = 1
+		booty_call['cum_count'] += 1
 		gs 'cum_call', 'mouth_swallow', $boy, 1
 		gs 'stat'
 		cla & *clr
@@ -1335,6 +1343,7 @@ if $ARGS[0] = 'bj_sub_cum_face1':
 	act'Let him (gross)':
 		booty_call['cum_face'] = 1
 		$booty_call['last_cum'] = 'facial'
+		booty_call['cum_count'] += 1
 		gs 'cum_call', 'face', $boy, 1
 		gs 'stat'
 		cla & *clr
@@ -1352,6 +1361,7 @@ if $ARGS[0] = 'bj_sub_cum_face1':
 	act'Let him (passive)':
 		booty_call['cum_face'] = 1
 		$booty_call['last_cum'] = 'facial'
+		booty_call['cum_count'] += 1
 		gs 'cum_call', 'face', $boy, 1
 		gs 'stat'
 		cla & *clr
@@ -1372,6 +1382,7 @@ if $ARGS[0] = 'bj_sub_cum_face1':
 		booty_call['cum_swallow'] += 1
 		$booty_call['last_cum'] = 'face_mouth'
 		booty_call['swallow'] = 1
+		booty_call['cum_count'] += 1
 		gs 'cum_call', 'face', $boy, 1
 		gs 'cum_call', 'mouth_swallow', $boy, 1
 		gs 'stat'
@@ -1398,6 +1409,7 @@ if $ARGS[0] = 'bj_sub_cum_face1':
 		booty_call['cum_face'] = 1
 		$booty_call['last_cum'] = 'face_mouth'
 		booty_call['spit'] = 1
+		booty_call['cum_count'] += 1
 		gs 'cum_call', 'face', $boy, 1
 		gs 'cum_call', 'hair', $boy, 1
 		gs 'cum_call', 'mouth', $boy, 1
@@ -1424,7 +1436,6 @@ end
 if $ARGS[0] = 'bj_sub_cum_face3':
 	!! player choosing to do it
 	act'How about my face instead?':
-		booty_call['cum_count'] += 1
 		cla & *clr
 		$npc_apt_bedroom[$boy]
 		
@@ -1434,6 +1445,7 @@ if $ARGS[0] = 'bj_sub_cum_face3':
 			booty_call['cum_face'] = 1
 			$booty_call['last_cum'] = 'facial'
 			gs 'cum_call', 'face', $boy, 1
+			booty_call['cum_count'] += 1
 			gs 'stat'
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/cum/facial/facial0,3.mp4"></video></center>'
@@ -1450,6 +1462,7 @@ if $ARGS[0] = 'bj_sub_cum_face3':
 		act'Stick our your tongue (swallow)':
 			booty_call['cum_face'] = 1
 			booty_call['cum_swallow'] += 1
+			booty_call['cum_count'] += 1
 			$booty_call['last_cum'] = 'face_mouth'
 			gs 'cum_call', 'face', $boy, 1
 			gs 'cum_call', 'mouth_swallow', $boy, 1
@@ -1474,6 +1487,7 @@ if $ARGS[0] = 'bj_sub_cum_face3':
 
 		act'Stick our your tongue (spit)':
 			booty_call['cum_face'] = 1
+			booty_call['cum_count'] += 1
 			$booty_call['last_cum'] = 'face_mouth'
 			gs 'cum_call', 'face', $boy, 1
 			gs 'cum_call', 'hair', $boy, 1
@@ -1505,6 +1519,7 @@ if $ARGS[0] = 'bj_sub_cum_tits1':
 
 	act'Jerk him over your tits':
 		booty_call['cum_tits'] = 1
+		booty_call['cum_count'] += 1
 		$booty_call['last_cum'] = 'tits'
 		gs 'cum_call', 'breasts', $boy, 1
 		gs 'stat'
@@ -1519,6 +1534,7 @@ if $ARGS[0] = 'bj_sub_cum_tits1':
 		act'Finish him with your tits':
 			booty_call['cum_tits'] = 1
 			$booty_call['last_cum'] = 'tits'
+			booty_call['cum_count'] += 1
 			gs 'cum_call', 'breasts', $boy, 1
 			gs 'cum_call', 'hands', $boy, 1
 			gs 'stat'
@@ -1537,6 +1553,7 @@ if $ARGS[0] = 'bj_sub_cum_tits2':
 	act'Jerk him over your tits':
 		booty_call['cum_tits'] = 1
 		$booty_call['last_cum'] = 'tits'
+		booty_call['cum_count'] += 1
 		gs 'cum_call', 'breasts', $boy, 1
 		gs 'stat'
 		cla & *clr
@@ -1550,6 +1567,7 @@ if $ARGS[0] = 'bj_sub_cum_tits2':
 	if tits > 1:
 		act'Finish him with your tits':
 			booty_call['cum_tits'] = 1
+			booty_call['cum_count'] += 1
 			$booty_call['last_cum'] = 'tits'
 			gs 'cum_call', 'breasts', $boy, 1
 			gs 'cum_call', 'hands', $boy, 1
@@ -1584,7 +1602,6 @@ end
 if $ARGS[0] = 'bj_force_cum_mouth':
 	booty_call['cum_mouth'] = 1
 	booty_call['cum_mouth_force'] = 1
-	booty_call['cum_count'] += 1
 	$booty_call['last_cum'] = 'mouth'
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow5.mp4"></video></center>'
@@ -1598,6 +1615,7 @@ if $ARGS[0] = 'bj_force_cum_mouth':
 	end
 	act'Gag':
 		gs 'cum_call', 'mouth', $boy, 1
+		booty_call['cum_count'] += 1
 		gs 'stat'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit3.mp4"></video></center>'
@@ -1610,6 +1628,7 @@ if $ARGS[0] = 'bj_force_cum_mouth':
 	act'Swallow!':
 		booty_call['cum_swallow'] += 1
 		$booty_call['last_cum'] = 'swallow'
+		booty_call['cum_count'] += 1
 		gs 'cum_call', 'mouth_swallow', $boy, 1
 		gs 'stat'
 		cla & *clr
@@ -1625,6 +1644,7 @@ if $ARGS[0] = 'bj_force_cum_mouth':
 	act'Swallow (take it in stride)':
 		booty_call['cum_swallow'] += 1
 		$booty_call['last_cum'] = 'swallow'
+		booty_call['cum_count'] += 1
 		gs 'cum_call', 'mouth_swallow', $boy, 1
 		gs 'stat'
 		cla & *clr
@@ -2288,7 +2308,6 @@ end
 
 if $ARGS[0] = 'bj_dom_swallow1':
 !!	booty_call['cum_mouth_ask'] += 1
-	booty_call['cum_count'] += 1
 	booty_call['swallow'] = 1
 	$booty_call['cum_choice'] = 'mouth'
 	cla & *clr
@@ -2297,6 +2316,7 @@ if $ARGS[0] = 'bj_dom_swallow1':
 	gs 'booty_call_start', 'bj_sub_cum_mouth_spit'
 	act'Gulp':
 		gs'cum_call', 'mouth_swallow',$boy,1
+		booty_call['cum_count'] += 1
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/mouth/deep2.mp4"></video></center>'
 		'Carefully, very carefully, you slowly draw your lips back up <<$npc_firstname[$boy]>>''s cock, sucking the whole time to make sure not a single drop of his cum spills around your lips. It''s really difficult to keep sucking and not choke on the cum pooling at the back of your throat. The effort makes your eyes water, but you still manage to draw all the way back up to his tip where you finally swallow his load and get your first gasp of clean air.'

locations/foto_nude_debut.qsrc

@@ -1,5 +1,15 @@
 # foto_nude_debut
 
+if $ARGS[0] = 'nude_debut_memory':
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+	'Hello, if you are seeing this page it is either because you were already doing nude modelling on a save before this content was added or the game has bugged out for some reason.'
+	*nl
+	'The following scene is a memory of your full frontal debut as a model and the creator encourages you to roleplay it as your character would have been at the time of their first nude shoot.'
+	*nl
+	'Please enjoy.'
+	act'Continue':gt'foto_nude_debut', 'nude_debut_pre'
+end
+
 if $ARGS[0] = 'nude_debut_pre':
 	if pcs_leghair > 3:$temp['model_shave'] = '"And your legs too."'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
@@ -761,6 +771,7 @@ if $ARGS[0] = 'debut_ending':
 	modelfoto['nip'] += 1
 	modelfoto['pussy'] += 1
 	modelfoto['fullnude'] += 1
+	modelfoto['nude_debut'] = 1
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	'All the pictures taken, the staff begin striking the set and a manager comes out with your pay.'

locations/foto_shoot.qsrc

@@ -435,7 +435,11 @@ if $ARGS[0] = 'nude_shoot':
 	
 	act 'Full nude':
 		$modelfoto['shoot_type'] = 'full_nude'
-		if modelfoto['fullnude'] = 0:gt'foto_nude_debut', 'nude_debut_pre'
+		if modelfoto['fullnude'] = 0:
+			gt'foto_nude_debut', 'nude_debut_pre'
+		elseif modelfoto['fullnude'] > 0 and $modelfoto['first_nude_pre'] = '':
+			gt'foto_nude_debut', 'nude_debut_memory'
+		end
 		*clr & cla
 		if pcs_inhib < 60:
 			if modelfoto['fullnude'] > 0:

locations/pav_residential.qsrc

@@ -196,17 +196,6 @@ if (hour > 20 or hour < 4) and succubusQW = 5 and suchuntday ! daystart:
 	end
 end
 
-if booty_call_time['A0'] = daystart :
-	i=0
-	*nl
-	:loopBC
-	if booty_call[$fuckbuddy[i]] = daystart and npc_residence[$fuckbuddy[i]] = 1 :
-		dynamic(' ''<a href="exec: minut += 2 & gt ''''booty_call_start'''',''''start'''',''''<<$fuckbuddy[i]>>'''' "><<$npc_firstname[$fuckbuddy[i]]>>''''s</a> apartment is nearby.'' ')
-	end
-	 i +=1
-	if i < arrsize('$fuckbuddy') : jump 'loopBC'
-end
-
 !!Uncle Misha is npcstatic number 54
 if mid($start_type,1,2) = 'sg' and (hour >= 8 or hour < 23) and cumloc[11] = 1 and rand(0, 3) = 0 and npcdaycheck[54] ! daystart:
 	menu_off = 1

locations/saveupdater.qsrc

@@ -354,20 +354,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 
 		krystal['saveupdate'] = 1
 	end
-
-	if mari > 0 and mari['status'] = 0 and mari['saveupdate'] = 0:
-		mari['status'] = mari
-		mari['busy'] = mari_busy
-		mari['farm_shoot'] = mari_farm_shoot
-		mari['cloth_shoot'] = mari_cloth_shoot
-		mari['convo'] = mari_convo
-		mari['sex'] = mari_sex
-		mari['model_exp'] = mari_model_exp
-		mari['model_ask'] = mari_modelling_exp
-		mari['fakepassport'] = mari_fakepassport
-		mari['saveupdate'] = 1
-	end
-
+	
 	if $model['firstname'] = '':
 		$model['firstname'] = $pcs_firstname
 		$model['nickname'] = $pcs_nickname