Merge remote-tracking branch 'Lusticon/master'

locations/brother_shower_sex.qsrc

@@ -242,16 +242,16 @@ if $ARGS[0] = 'brother_shower_fuck_first2':
 		'<center><video autoplay loop src="images/shared/home/bathroom/broshowervirgin.mp4"></center>'
 		'Holding your breath, you push back on Kolka, feeling his tip stretch your pussy. He eventually pushes the entire length of his cock inside causing you to gasp in pain as his <<npc_dick[''A34'']>> cm dick tears through your hymen. Despite your pain, neither of you stop moving, continuing to thrust against each other.'
 		!!elseif stat['hidden_vaginal'] > 0:
-		!!	'<center><video autoplay loop src="images/shared/sex/shower/doggy5.mp4"></center>'
+		!!	'<center><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,3)>>.mp4"></center>'
 		!!	'Kolka slides inside you with surprising ease. Though his dick still stretches your pussy, you find it to be pleasant instead of painful. Of course you''ve heard stories that say it doesn''t hurt for some girls, but you always thought it was a myth or at least a rare occurrence. <i>I must be pretty lucky!<</i> you think to yourself.'
 	else
-		'<center><video autoplay loop src="images/shared/sex/shower/doggy5.mp4"></center>'
+		'<center><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,3)>>.mp4"></center>'
 		'Your pussy easily swallows your brother''s <<npc_dick[''A34'']>> cm cock and you immediately start building into a rhythm, pushing back on him in time with his thrusts for maximum depth of penetration.'
 	end
 
 	act'Continue':
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/shower/doggy5.mp4"></center>'
+		'<center><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,3)>>.mp4"></center>'
 		if pcs_vag = 0:
 			'Several minutes pass and your pain is long forgotten. The only thing you can feel now is the ecstasy of Kolka''s cock pumping in and out of your pussy. His hands come up to grope your breasts and you moan in pleasure. Is this what sex is? How did you live your life without it? Why did you wait so long to lose your virginity? Why didn''t you jump on your brother''s cock sooner?!'
 		elseif stat['hidden_vaginal'] > 0 and stat['vaginal'] = 0:
@@ -299,7 +299,7 @@ if $ARGS[0] = 'brother_shower_fuck_first3':
 	eff_contra = iif(argc > 1,ARGS[1],sexcontra)
 	tmp = func('pregriskeval',eff_contra)
 	cla & *clr
-	'<center><video autoplay loop src="images/shared/sex/shower/doggy5.mp4"></center>'
+	'<center><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,3)>>.mp4"></center>'
 	'Barely giving him any time at all to recover from your sudden start, you immediately break into a hard rhythm, thrusting your hips back and giving it your all. He''s your little brother after all. You should try to make his first time special. Soon enough, you start giving him tips.'
 	'"Hold my hips so you have more control."'
 	'"Grab my boobs if you like. Boobs are meant to be grabbed during sex.'
@@ -651,7 +651,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 	elseif brothercumchoice = 5:
 		act'Continue':
 			cla & *clr
-			'<center><video autoplay loop src="images/shared/sex/shower/doggy5.mp4"></center>'
+			'<center><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,3)>>.mp4"></center>'
 			gs 'cum_call', '', 'A34', 1
 			*nl
 			'Suddenly Kolka grabs you tight, thrusting his cock into you as deep as it can go and you can feel him pulsating inside you.'
@@ -1156,7 +1156,7 @@ end
 
 if $ARGS[0] = 'shower_creampie':
 	cla & *clr
-	'<center><video autoplay loop src="images/shared/sex/shower/doggy5.mp4"></center>'
+	'<center><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,3)>>.mp4"></center>'
 	'You don''t respond verbally but pick up the pace, slapping your ass back against Kolka''s cock until he grabs you tight and you can feel his cock pulsating, spurts of cum pouring out inside you.'
 	$orgasm_txt = 'The sensation sends you over the edge and you orgasm as well, your pussy gripping him and squeezing every last drop of cum from his cock.'
 	gs 'arousal', 'vaginal', 1
@@ -1197,7 +1197,7 @@ end
 
 if $ARGS[0] = 'shower_forced_creampie':
 	cla & *clr
-	'<center><video autoplay loop src="images/shared/sex/shower/doggy5.mp4"></center>'
+	'<center><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,3)>>.mp4"></center>'
 	gs 'cum_call', '', 'A34', 1
 	gs 'stat'
 	if pcs_horny >= 90:
@@ -1283,7 +1283,7 @@ end
 
 if $ARGS[0] = 'shower_fill_me_up':
 	cla & *clr
-	'<center><video autoplay loop src="images/shared/sex/shower/doggy5.mp4"></center>'
+	'<center><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,3)>>.mp4"></center>'
 	gs 'cum_call', '', 'A34', 1
 	gs 'stat'
 	'"Yes! Yes!" you cry out. "Fill me up!"'

locations/model_krystal.qsrc

@@ -802,7 +802,7 @@ if $ARGS[0] = 'krystalshower':
 			pcs_makeup = 1
 			gs 'arousal', 'voyeur_sex', 15
 			dynamic $showerdin
-			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video><video autoplay loop src="images/shared/sex/shower/doggy5.mp4"></video></center>'
+			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,3)>>.mp4"></video></center>'
 			'You step into a stall and turn on the shower, trying your best to ignore what is going on while Krystal starts getting fucked from behind.'
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 			if pcs_horny >= 40:

locations/sex_ev_condoms.qsrc

@@ -1834,11 +1834,11 @@ if $ARGS[0] = 'father_check':
 	'List of potential fathers:'
 	:potfather_loop
 	if $wombpotfath[potfather_counter] ! 'unknown':
-		potfather_temp[2] = '<a href="exec: $wombthfath = ''<<$npc_usedname[$wombpotfath[potfather_counter]]>>'' & $wombthfathID = ''<<$wombpotfath[potfather_counter]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''"><<$npc_usedname[$wombpotfath[potfather_counter]]>> (<<$wombpotfath[potfather_counter]>>)</a>'
+		$potfather_temp[2] = '<a href="exec: $wombthfath = ''<<$npc_usedname[$wombpotfath[potfather_counter]]>>'' & $wombthfathID = ''<<$wombpotfath[potfather_counter]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''"><<$npc_usedname[$wombpotfath[potfather_counter]]>> (<<$wombpotfath[potfather_counter]>>)</a>'
 	else
-		potfather_temp[2] = '<a href="exec: $wombthfath = ''<<$npc_usedname[$wombpotfath[potfather_counter]]>>'' & $wombthfathID = ''<<$wombpotfath[potfather_counter]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''">Unknown (-)</a>'
+		$potfather_temp[2] = '<a href="exec: $wombthfath = ''<<$npc_usedname[$wombpotfath[potfather_counter]]>>'' & $wombthfathID = ''<<$wombpotfath[potfather_counter]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''">Unknown (-)</a>'
 	end
-	if $boy = potfather_temp[2]: potfather_counter += 1
+	if $boy = $potfather_temp[2]: potfather_counter += 1
 	if potfather_counter < arrsize('$wombpotfath'): jump 'potfather_loop'
 end
 

locations/sex_ev_dress_talking.qsrc

@@ -1226,9 +1226,7 @@ if $ARGS[0] = 'isnt_going_to_work':
 			end
 		end
 	end
-end
 
-if $ARGS[0] = 'isnt_going_to_work':
 	act'Grab your things':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'

locations/sex_ev_foreplay.qsrc

@@ -2097,14 +2097,14 @@ end
 if $ARGS[0] = 'bj_dom_swallow_react':
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/blowjob/play1.mp4"></video></center>'
-	if $npc_cum_pref[$boy] = 'mouth' and npc_cum_pref_know[$boy] = 0:
+	if $npc_cum_pref[$boy] = 'mouth' and $npc_cum_pref_know[$boy] = '':
 		'"Holy..." <<$npc_firstname[$boy]>> lets his head fall back onto his pillow, his mind seemingly blown by your blowjob skills. Taking satisfaction in a job well done, you continue teasing his cock, running your lips up and down its shaft, peppering it with kisses. "That was incredible..."'
 		'"Mmmm?" you hum pleasantly. "You liked it that much?"'
 		'"Like you sucked the soul outta me," he smiles tiredly. "I love the feeling of blowing a load in a girl''s mouth like that, but that was something else."'
 
 		act'You like oral creampies?':
 			cla & *nl
-			npc_cum_pref_know[$boy]= $npc_cum_pref[$boy]
+			$npc_cum_pref_know[$boy] = $npc_cum_pref[$boy]
 			'"You really like to come in my mouth that much?" you ask, giving his shaft another kiss.'
 			'"Yeah," he sighs. "Even better than nutting inside a pussy."'
 			act'Good to know':
@@ -2136,7 +2136,7 @@ if $ARGS[0] = 'bj_dom_swallow_react':
 			gs 'sex_ev_sex', 'sex_end'
 		end
 	else
-		if $npc_cum_pref[$boy] = 'mouth' and npc_cum_pref_know[$boy] = $npc_cum_pref[$boy]:
+		if $npc_cum_pref[$boy] = 'mouth' and $npc_cum_pref_know[$boy] = $npc_cum_pref[$boy]:
 			'"Woah," <<$npc_firstname[$boy]>>''s head flops onto the pillow, while you continue to play with his cock, still twitching in the throes of post-orgasm bliss. "Your mouth is so fucking good."'
 			act'I know you love oral creampies':
 				cla & *nl

locations/sex_ev_pillow_talk2.qsrc

@@ -339,7 +339,7 @@ if $ARGS[0] = 'relationship_talk':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk5.jpg"></center>'
 			'"So," you say casually. "Got a girlfriend?"'
-			if npc_girlfriend[$boy] = 1:
+			if npc_girlfriend[$boy] = 2:
 				gs'sex_ev_stats', 'npc_is_married'
 				if $npc_goal[$boy] = 'sex':
 					'"Nah," <<$npc_firstname[$boy]>> replies. "I don''t want to be tied down. I like to keep things loose."'

locations/sex_ev_shower.qsrc

@@ -664,7 +664,7 @@ if $ARGS[0] = 'together_fuck_doggy2':
 	gs'arousal', 'vaginal',rand(10,15), 'no_orgasm_msg', $sex_ev['prostitution_flag']
 	gs'stat'
 	cla & *clr
-	'<center><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,5)>>.mp4"></video></center>'
+	'<center><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,4)>>.mp4"></video></center>'
 	'<<$npc_firstname[$boy]>>''s hips slap against your ass as he eagerly fucks your pussy, helping you get hot and steamy in every sense of the phrase. Which is a good thing because it''s pretty chilly, bent over like this so far outside the range of the shower. But the sex is more than making up for it.'
 	if rand(1,20) > 1:
 		*nl