Browse Source

[fix] reimplement check for stopping use of condoms

Insomniac 1 week ago
parent
commit
7780b2b468
1 changed files with 11 additions and 3 deletions
  1. 11 3
      locations/sex_ev_condoms.qsrc

+ 11 - 3
locations/sex_ev_condoms.qsrc

@@ -106,9 +106,13 @@ if $ARGS[0] = 'condoms':
 		elseif sex_ev['condom'] = 1:
 			cla
 			if sex_ev['condoms_used'] >= sex_ev['condom_count']:
-				act 'Continue':gs 'sex_ev_condoms', 'npc_out_of_condoms'
+				if sex_ev['no_condom'] > 0 and sex_ev['pc_skip_the_condom'] > 0:
+					act'Continue':gs 'sex_ev_sex', 'position_choose'
+				else
+					act'Continue':gs 'sex_ev_condoms', 'npc_out_of_condoms'
+				end
 			else
-				act 'Continue':gs 'sex_ev_condoms', 'npc_condom_use'
+				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:
@@ -121,7 +125,11 @@ if $ARGS[0] = 'condoms':
 			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'
+		if sex_ev['no_condom'] > 0 and sex_ev['pc_skip_the_condom'] > 0:
+			act'Continue':gs 'sex_ev_sex', 'position_choose'
+		else
+			act'Continue':gs 'sex_ev_condoms', 'npc_out_of_condoms'
+		end
 	end
 end