1
0
Преглед на файлове

[fixed] more stat and consistency fixes

hornguy6 преди 1 година
родител
ревизия
385827a216
променени са 4 файла, в които са добавени 57 реда и са изтрити 34 реда
  1. 3 6
      locations/sex_ev_after.qsrc
  2. 18 15
      locations/sex_ev_cum.qsrc
  3. 1 1
      locations/sex_ev_pillow_talk.qsrc
  4. 35 12
      locations/sex_ev_shower.qsrc

+ 3 - 6
locations/sex_ev_after.qsrc

@@ -1251,6 +1251,7 @@ if $ARGS[0] = 'after_sex1':
 		act'Pull apart':
 			cla & *clr
 			gs'sex_ev_after', 'pull_apart'
+			sex_ev['cock_inserted'] = 0
 			if (npc_humor[$boy] = 1 or npc_humor[$boy] = 2) and (sex_ev['fuck_count'] >= npc_sexdrive[$boy] - 1) and rand(0,1) = 1:
 				gs'sex_ev_pillow_talk', 'high_five1'
 			else
@@ -1833,14 +1834,10 @@ if $ARGS[0] = 'plan_b2':
 	act'Take it sexily':
 		cla & *nl
 		'As <<$npc_firstname[$boy]>> watches you pull the pill from its packaging, you stick out your tongue at him, popping the pill onto it and swallowing with a wide grin.'
-		if sex_ev['accidental_creampie_convo'] = 1:
-			'"There," you smirk. "Problem solved."'
-		elseif $sex_ev['last_cum'] = 'swallow':
+		if $sex_ev['last_cum'] = 'swallow':
 			'"Chaser," you wink.'
-		elseif age < 20:
-			'"Not really looking to become a teen mom," you smirk.'
 		else
-			'"I''m not ready to be a mom," you smirk.'
+			'"There," you smirk. "Problem solved."'
 		end
 		gs 'medical_din', 'morning_after_pill_function'
 		gs'sex_ev_after', 'after_sex2'

+ 18 - 15
locations/sex_ev_cum.qsrc

@@ -221,7 +221,8 @@ if $ARGS[0] = 'doggy_cum':
 			end
 		end
 	end
-		if sex_ev['boy_cum'] > 0:
+	
+	if sex_ev['boy_cum'] > 0:
 		act'Continue':
 			if $sex_ev['cum_choice'] = 'creampie_surprise':
 				gs 'sex_ev_cum', 'surprise_cum_together'
@@ -264,7 +265,8 @@ if $ARGS[0] = 'cowgirl_cum':
 			'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
 	end
-		if sex_ev['boy_cum'] > 0:
+	
+	if sex_ev['boy_cum'] > 0:
 		act'Continue':
 			if $sex_ev['cum_choice'] = 'creampie_surprise':
 				gs 'sex_ev_cum', 'surprise_cum_together'
@@ -308,6 +310,7 @@ if $ARGS[0] = 'cum_decider':
 !!	if the boy is selfish but also doesn''t want kids, he will be more careful
 !!	boys who are both diligent and prefer to pull out have "pullout game"
 	sex_ev['cum_choice'] = rand(1,10)
+	if sex_ev['cycle_limit'] < npc_sex_stamina[$boy]: sex_ev['cum_choice'] = 10
 	if sex_ev['danger_day'] = 1 and npc_selfish[$boy] = 1 and npc_childfree[$boy] ! 1:
 		sex_ev['extra_caution'] = 0
 	elseif (sex_ev['danger_day'] = 1 or (npc_diligent[$boy] > 0 and $npc_cum_pref[$boy] = 'pullout')) and sex_ev['no_condom'] = 1:
@@ -321,7 +324,7 @@ if $ARGS[0] = 'cum_decider':
 	
 !!	if sex_ev['cum_choice'] = 10 and sex_ev['fuck'] = 1:
 	
-!! if the boy has the two-pump chump trait or loses concentration, he will unexpectedly finish inside without warning
+!! if the boy has the two-pump chump trait or loses concentration, he will unexpectedly finish inside without warning or barely manage to pull out in time
 	if sex_ev['cum_choice'] = 10 or sex_ev['two_pump'] = 1 or sex_ev['cant_hold_cum'] = 1:
 		sex_ev['cum_warn'] = 0
 		if sex_ev['two_pump'] = 1: sex_ev['two_pump'] = 2
@@ -674,9 +677,9 @@ if $ARGS[0] = 'fuck_cum2':
 			act'Continue':gt 'sex_ev_cum', 'creampie_surprise'
 !!		end
 	elseif $sex_ev['cum_choice'] = 'pullout':
-		act'Continue':gt 'sex_ev_cum', 'cum_pullout'
+		act'Continue':gs 'sex_ev_cum', 'cum_pullout'
 	elseif sex_ev['his_choice'] = 2:
-		act'Continue':gt 'sex_ev_cum', 'cum_his_choice'
+		act'Continue':gs 'sex_ev_cum', 'cum_his_choice'
 !!	elseif sex_ev['boy_cum'] > 0:
 !!		*nl
 !!		'Tell hornguy6 that the fuck_cum failsafe activated.'
@@ -689,7 +692,7 @@ if $ARGS[0] = 'fuck_cum2':
 end
 
 if $ARGS[0] = 'cum_his_choice':
-	if rand(1,5) = 5 or sex_ev['his_choice'] = 2:gt'sex_ev_cum', 'cum_his_choice2'
+	if rand(1,5) = 5 or sex_ev['his_choice'] = 2:gs'sex_ev_cum', 'cum_his_choice2'
 	if sex_ev['kiss'] = 1:
 		if $npc_cum_pref[$boy] = 'creampie':
 			gt'sex_ev_cum', 'creampie_surprise'
@@ -706,7 +709,7 @@ if $ARGS[0] = 'cum_his_choice':
 				gt'sex_ev_cum', 'cum_pullout'
 			end
 		else
-			gt'sex_ev_cum', 'cum_his_choice2'
+			gs'sex_ev_cum', 'cum_his_choice2'
 		end
 	else
 		if $npc_cum_pref[$boy] = 'creampie':
@@ -724,7 +727,7 @@ if $ARGS[0] = 'cum_his_choice':
 				gt'sex_ev_cum', 'cum_pullout'
 			end
 		else
-			gt'sex_ev_cum', 'cum_his_choice2'
+			gs'sex_ev_cum', 'cum_his_choice2'
 		end
 	end
 end
@@ -857,7 +860,7 @@ if $ARGS[0] = 'cum_facial':
 		if sex_ev['where'] = 1 and sex_ev['cum_wherever'] ! 1:
 			'"Come on my face!"'
 		elseif sex_ev['he_ask_facial'] = 1:
-			'"Okay," you say. "Go ahead.'
+			'"Okay," you say. "Go ahead."'
 		elseif sex_ev['not_inside'] = 1:
 			'"Not inside me!" you yelp frantically.'
 		elseif sex_ev['he_ask'] = 1 and sex_ev['he_ask_facial'] ! 1:
@@ -997,7 +1000,7 @@ if $ARGS[0] = 'facial_tongue_cum':
 				'"In my mouth!"'
 			elseif sex_ev['he_ask_mouth'] = 1:
 				'"Okay," you say.'
-			elseif sex_ev['he_ask'] = 1:
+			elseif sex_ev['he_ask'] = 1 and sex_ev['he_ask_facial'] ! 1:
 				'"Cum in my mouth instead!"'
 			elseif sex_ev['not_inside'] = 1:
 				'"Not inside me!" you yelp frantically.'
@@ -1770,7 +1773,7 @@ if $ARGS[0] = 'creampie_menu':
 				end
 			end
 		end
-		if pcs_horny > 90 or sex_ev['orgasm'] < orgasm:
+		if (pcs_horny > 90 or sex_ev['orgasm'] < orgasm) and sex_ev['he_ask_creampie'] = 0:
 			act'"Let''s come together"':sex_ev['creampie_ask'] = 1 & gs 'sex_ev_cum', 'cum_together'
 		end
 		if $sex_ev['position'] = 'miss' or $sex_ev['position'] = 'cowgirl':
@@ -1804,8 +1807,8 @@ if $ARGS[0] = 'cum_inside':
 				gs 'stat'
 				sex_ev['came_together'] = 2
 				sex_ev['orgasm_count'] += 1
-				sex_ev['creampie_orgasm'] += 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 fuelling the other''s until eventually they''ve run their course, and both of you are breathing hard.'
+				sex_ev['creampie_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 'sex_ev_cum', 'cum_inside_pull_away'
 				gs'sex_ev_reactions', 'react_menu'
 			else
@@ -1829,8 +1832,8 @@ if $ARGS[0] = 'cum_inside':
 					gs'stat'
 					sex_ev['came_together'] = 2
 					sex_ev['orgasm_count'] += 1
-					sex_ev['creampie_orgasm'] += 1
-					'<<$npc_firstname[$boy]>>''s cum pours into you and you gasp as you get sent over the edge and trigger your own climax. The two of come together, each of your orgasms fuelling the other''s until eventually they''ve run their course and both of you lay there panting.'
+					sex_ev['creampie_orgasm_count'] += 1
+					'<<$npc_firstname[$boy]>>''s cum pours into you and you gasp as you get sent over the edge and trigger your own climax. 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.'
 					gs 'sex_ev_cum', 'cum_inside_pull_away'
 					gs 'sex_ev_reactions', 'react_menu'
 				else

+ 1 - 1
locations/sex_ev_pillow_talk.qsrc

@@ -17,7 +17,7 @@ if $ARGS[0] = 'stop_talk':
 	act'Stop talking':
 		cla 
 		if sex_ev['sex_over'] = 1:
-			gs'sex_ev_after', 'after_sex2'
+			gs'sex_ev_after', 'relax_together'
 		else
 			gs'sex_ev_sex', 'break_time'
 		end

+ 35 - 12
locations/sex_ev_shower.qsrc

@@ -296,7 +296,7 @@ if $ARGS[0] = 'before_shower_fuck1':
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/shower/leg_up1.mp4"></video></center>'
 	'You put your foot against the wall to stabilize as <<$npc_firstname[$boy]>> fucks you, hot water still streaming down your bodies. It interferes with the lubrication of your pussy if you''re being honest, but it''s so hot right now that you can''t bring yourself to care.'
-	if rand(1,10) > 1:
+	if rand(1,20) > 1:
 		*nl
 		'After what seems like an eternity of pleasure, <<$npc_firstname[$boy]>> moans into your ear.'
 		gs'sex_ev_shower', 'before_shower_cum_ask'
@@ -398,7 +398,7 @@ if $ARGS[0] = 'before_shower_creampie_surprise':
 			$orgasm_or = 'yes'
 			gs'arousal', 'vaginal',1, 'no_orgasm_msg', $sex_ev['prostitution_flag']
 		end
-		sex_ev['creampie_orgasm'] += 1
+		sex_ev['creampie_orgasm_count'] += 1
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/shower/creampie1.mp4"></video></center>'
 		'You gasp in surprise, feeling <<$npc_firstname[$boy]>> pulse inside you. You were already close yourself and his orgasm sends you over the edge. He holds you tight and you clench on to him with all your might, both of you riding out your orgasms completely intertwined.'
@@ -640,6 +640,7 @@ if $ARGS[0] = 'after_towel_skip2':
 end
 
 if $ARGS[0] = 'after_shower_join':
+	cla & *clr
 	sex_ev['join_shower'] = 1
 	sex_ev['boy_shower'] = 1
 	'<center><video autoplay loop src="images/shared/sex/shower/join2.mp4"></video></center>'
@@ -877,7 +878,7 @@ if $ARGS[0] = 'after_shower_sex1':
 	'<center><video autoplay loop src="images/shared/sex/shower/leg_up2.mp4"></video></center>'
 	'Water streams down your bodies as <<$npc_firstname[$boy]>> presses you up against the wall right underneath the showerhead, fucking you vigorously. Your erotic moans echo off the tile, someone reinforcing the idea that there''s nothing else in the world besides you, this shower, and <<$npc_firstname[$boy]>>''s cock inside you.'
 !	if sex_ev['condom'] > 0:
-		if rand(1,10) > 1:
+		if rand(1,20) > 1:
 			*nl
 			'After what seems like an eternity of pleasure, <<$npc_firstname[$boy]>> grunts into your ear.'
 			gs'sex_ev_shower', 'after_shower_cum_ask'
@@ -898,10 +899,15 @@ if $ARGS[0] = 'after_shower_cum_ask':
 	'"<<$pcs_nickname>>-! I''m almost there!"'
 	if sex_ev['orgasm'] < orgasm:
 		'"Me too-!" you gasp.'
-		act'Come together':gt'sex_ev_shower', 'after_shower_creampie'
+		act'Come together':
+			if sex_ev['creampie_allowance'] < 1 or sex_ev['no_condom'] < 1 or npc_condom_conscious[$boy] > 0:
+				gt'sex_ev_shower', 'after_shower_fun4'
+			else
+				gt'sex_ev_shower', 'after_shower_creampie'
+			end
+		end
 	else
 		'"Mmmm-!" you hum back.'
-		act'Let him come inside you':gt'sex_ev_shower', 'after_shower_creampie'
 	end
 	act'Jerk him off':gt'sex_ev_shower', 'after_shower_fuck_jerkoff'
 		
@@ -909,10 +915,16 @@ if $ARGS[0] = 'after_shower_cum_ask':
 
 		act'Not inside!':sex_ev['not_inside'] = 1 & gt'sex_ev_shower', 'after_shower_fuck_jerkoff'
 !!	end
+	if sex_ev['creampie_allowance'] < 1 or sex_ev['no_condom'] < 1 or npc_condom_conscious[$boy] > 0:
+		cla
+		act'Continue':gt'sex_ev_shower', 'after_shower_fuck_jerkoff'
+	else
+		act'Let him come inside you':gt'sex_ev_shower', 'after_shower_creampie'
+	end
 end
 
 if $ARGS[0] = 'after_shower_creampie_surprise':
-	if sex_ev['condom'] > 0:
+	if sex_ev['condom'] > 0 or sex_ev['creampie_allowance'] = 0 or sex_ev['promise_no_creampie'] = 0:
 		act'Asshole!':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/shower/creampie1.mp4"></video></center>'
@@ -983,7 +995,7 @@ if $ARGS[0] = 'after_shower_creampie_surprise':
 			$orgasm_or = 'yes'
 			gs'arousal', 'vaginal',1, 'no_orgasm_msg', $sex_ev['prostitution_flag']
 		end
-		sex_ev['creampie_orgasm'] += 1
+		sex_ev['creampie_orgasm_count'] += 1
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/shower/creampie1.mp4"></video></center>'
 		'You gasp in surprise, feeling <<$npc_firstname[$boy]>> pulse inside you. You were already close yourself and his orgasm sends you over the edge. He holds you tight and you clench on to him with all your might, both of you riding out your orgasms completely intertwined.'
@@ -1097,10 +1109,18 @@ if $ARGS[0] = 'after_shower_fuck_jerkoff':
 		*nl
 		'"Not inside!" you yelp.'
 	end
-	if sex_ev['orgasm'] < orgasm:
-		'You barely manage to slip <<$npc_firstname[$boy]>> from your pussy and grab his cock with your hand before he explodes, managing to get you off at the same time. You both come together and euphoria washes over you as his cum -somehow still warm to your skin despite the heat of the shower- spatters across your stomach.'
+	if sex_ev['creampie_allowance'] < 1 or sex_ev['no_condom'] < 1 or npc_condom_conscious[$boy] > 0:
+		if sex_ev['orgasm'] < orgasm:
+			'<<$npc_firstname[$boy]>> slips from your pussy and you barely manage to grab hold of his cock before he explodes. At the same time, he jams his fingers into your pussy and fingerblasts you, sending orgasmic convulsions rocking through your body. Euphoria washes over you as you and he come together and his fat load -somehow still warm to your skin despite the heat of the shower- spatters across your belly.'
+		else
+			'<<$npc_firstname[$boy]>> slips from your pussy and you barely manage to grab hold of his cock before he explodes, spraying a fat load of cum all over your belly.'
+		end
 	else
-		'You barely manage to slip <<$npc_firstname[$boy]>> from your pussy and grab his cock with your hand before he explodes. A sense of euphoria washes over you as his cum -somehow still warm to your skin despite the heat of the shower- spatters across your stomach.'
+		if sex_ev['orgasm'] < orgasm:
+			'You barely manage to slip <<$npc_firstname[$boy]>> from your pussy and grab his cock with your hand before he explodes, managing to get you off at the same time. You both come together and euphoria washes over you as his cum -somehow still warm to your skin despite the heat of the shower- spatters across your stomach.'
+		else
+			'You barely manage to slip <<$npc_firstname[$boy]>> from your pussy and grab his cock with your hand before he explodes. A sense of euphoria washes over you as his cum -somehow still warm to your skin despite the heat of the shower- spatters across your stomach.'
+		end
 	end
 	act'Recover':gt'sex_ev_shower', 'after_shower_fuck_jerkoff_end'
 end
@@ -1337,6 +1357,7 @@ end
 
 if $ARGS[0] = 'morning_together1':
 	sex_ev['npc_morning_shower'] = 0
+	sex_ev['morning_shower'] = 1
 	sex_ev['boy_in_shower'] = 0
 	sex_ev['morning_shower_together'] = 1
 	gs'arousal', 'massage',5, 'no_orgasm_msg', $sex_ev['prostitution_flag']
@@ -1561,7 +1582,7 @@ if $ARGS[0] = 'morning_shower_fuck2':
 	'<center><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,3)>>.mp4"></video></center>'
 	'<<$npc_firstname[$boy]>> slams his cock into you from behind, sending shock waves of pleasure rippling through your body. Your erotic moans echo off the tile in time with the wet slap of skin on skin.'
 !	if sex_ev['condom'] > 0:
-		if rand(1,10) > 1:
+		if rand(1,20) > 1:
 			*nl
 			'After what seems like an eternity of pleasure, <<$npc_firstname[$boy]>> grunts.'
 			gs'sex_ev_shower', 'morning_shower_cum_ask'
@@ -1672,7 +1693,7 @@ if $ARGS[0] = 'morning_shower_creampie_surprise':
 			$orgasm_or = 'yes'
 			gs'arousal', 'vaginal',1, 'no_orgasm_msg', $sex_ev['prostitution_flag']
 		end
-		sex_ev['creampie_orgasm'] += 1
+		sex_ev['creampie_orgasm_count'] += 1
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/shower/creampie1.mp4"></video></center>'
 		'You gasp in surprise, feeling <<$npc_firstname[$boy]>> pulse inside you. You were already close yourself and his orgasm sends you over the edge. He holds you tight and you clench on to him with all your might, both of you riding out your orgasms completely intertwined.'
@@ -1816,6 +1837,7 @@ if $ARGS[0] = 'morning_shower_fuck_jerkoff_end':
 end
 
 if $ARGS[0] = 'morning_shower_together_end':
+	sex_ev['boy_in_shower'] = 0
 	noshampoo = 1
 	dynamic $showerdin
 	act'Finish up':
@@ -1829,6 +1851,7 @@ end
 if $ARGS[0] = 'morning_sex_end':
 	sex_ev['npc_morning_shower'] = 2
 	sex_ev['boy_shower'] = 1
+	sex_ev['boy_in_shower'] = 0
 	gs 'sex_ev_shower', 'morning_shower_together_end'
 	if sex_ev['morning_fuck'] = 0:
 		if sex_ev['morning_shower_cum'] = 1: