ソースを参照

[added] some failsafe options for condom conditions

hornguy6 5 ヶ月 前
コミット
4dd67073a9
1 ファイル変更38 行追加21 行削除
  1. 38 21
      locations/sex_ev_condoms.qsrc

+ 38 - 21
locations/sex_ev_condoms.qsrc

@@ -26,7 +26,7 @@ end
 
 if $ARGS[0] = 'check_count':
 	if sex_ev['condoms_used'] >= sex_ev['condom_count'] and sex_ev['condom_count'] > 0: 
-		sex_ev['out_of_condoms'] = 1
+		sex_ev['npc_used_all_condoms'] = 1
 	end
 end
 
@@ -105,6 +105,17 @@ if $ARGS[0] = 'condoms':
 				act'Continue':gs 'sex_ev_condoms', 'npc_condom_use'
 			end
 		end
+	elseif sex_ev['pc_out_of_condoms'] = 1 and sex_ev['npc_used_all_condoms'] = 0:
+		if sex_ev['sleepover'] > 0:
+			'You''re about to get into position when you suddenly remember you ran out of condoms last night.'
+			'"Uhm... do you have any condoms?"'
+			gs'sex_ev_condoms', 'pc_no_condoms_left2'
+		else
+			'"I think that was my last condom..." you say.'
+			gs'sex_ev_condoms', 'pc_no_condoms_left'
+		end
+	elseif sex_ev['npc_used_all_condoms'] > 0:
+		gs 'sex_ev_condoms', 'npc_out_of_condoms'
 	end
 end
 
@@ -278,27 +289,31 @@ if $ARGS[0] = 'pc_no_condoms_left':
 		else
 			'"But I''m not ready to stop," you say. "Have you got any?"'
 		end
-		if npc_condom_conscious[$boy] = 1:
-			'"I always have condoms," <<$npc_firstname[$boy]>> says. "You don''t have to keep buying them if you don''t want to, you know. I order in bulk."'
-			gs'sex_ev_sex', 'reset'
-			gs'sex_ev_condoms', 'bulk_condoms'
-			
-			
-		elseif sex_ev['condom_count'] > 0 and sex_ev['condoms_used'] < sex_ev['condom_count']:
-			'"Yeah, I have some," <<$npc_firstname[$boy]>> says.'
-			gs'sex_ev_sex', 'reset'
-			act'Continue':gs 'sex_ev_condoms', 'npc_condom_use'
+		gs'sex_ev_condoms', 'pc_no_condoms_left2'
+	end
+end
+
+if $ARGS[0] = 'pc_no_condoms_left2':
+	if npc_condom_conscious[$boy] = 1:
+		'"I always have condoms," <<$npc_firstname[$boy]>> says. "You don''t have to keep buying them if you don''t want to, you know. I order in bulk."'
+		gs'sex_ev_sex', 'reset'
+		gs'sex_ev_condoms', 'bulk_condoms'
+		
+		
+	elseif sex_ev['condom_count'] > 0 and sex_ev['condoms_used'] < sex_ev['condom_count']:
+		'"Yeah, I have some," <<$npc_firstname[$boy]>> says.'
+		gs'sex_ev_sex', 'reset'
+		act'Continue':gs 'sex_ev_condoms', 'npc_condom_use'
+	else
+		if npc_no_condoms_know[$boy] = 1:
+			'"Come on," <<$npc_firstname[$boy]>> says, rolling his eyes. "You know I hate using condoms. Lucky you can even talk me into using yours."'
 		else
-			if npc_no_condoms_know[$boy] = 1:
-				'"Come on," <<$npc_firstname[$boy]>> says, rolling his eyes. "You know I hate using condoms. Lucky you can even talk me into using yours."'
-			else
-				'<<$npc_firstname[$boy]>> shakes his head.'
-				'"I don''t."'
-			end
-			gs'sex_ev_after', 'no_condom_end'
-			gs'sex_ev_condoms', 'pc_skip_the_condom'
-			gs'sex_ev_condoms', 'no_sex_only'
+			'<<$npc_firstname[$boy]>> shakes his head.'
+			'"I don''t."'
 		end
+		gs'sex_ev_after', 'no_condom_end'
+		gs'sex_ev_condoms', 'pc_skip_the_condom'
+		gs'sex_ev_condoms', 'no_sex_only'
 	end
 end
 
@@ -2093,7 +2108,7 @@ if $ARGS[0] = 'pc_dangerous_day_condom_insist2':
 			gs'sex_ev_after', 'no_condom_end'
 			gs'sex_ev_condoms', 'no_sex_only'
 		else
-			gs 'sex_ev_condoms', 'pc_condoms'
+			gs 'sex_ev_condoms', 'pc_use_condoms'
 		end
 	elseif npc_no_condoms[$boy] > 0:
 		'"Come on, do we really have to? I promise I won''t come inside."'
@@ -2352,6 +2367,7 @@ if $ARGS[0] = 'started_bc1':
 			cla & *nl
 			npc_bareback[$boy] = 1
 			sex_ev['no_condom'] = 1
+			sex_ev['creampie_allowance'] = 1
 			gs 'sex_ev_stats', 'birth_control_know'
 			if sex_ev['pullout_game'] = 1:
 				'"Why bother?" you ask in a mischievous tone. ' + iif(tabletkishot > 0, '"I''m on the shot now."', '"I''m on the pill now."')
@@ -2367,6 +2383,7 @@ if $ARGS[0] = 'started_bc1':
 			cla & *nl
 			npc_bareback[$boy] = 1
 			sex_ev['no_condom'] = 1
+			sex_ev['creampie_allowance'] = 1
 			if sex_ev['pullout_game'] = 1:
 				'"You better not," you say in a mischievous tone. ' + iif(tabletkishot > 0, '"I''m on the shot now."', '"I''m on the pill now."')
 			else