浏览代码

fix: stop repeatedly asking for condoms

Insomniac 3 周之前
父节点
当前提交
151968f70e
共有 1 个文件被更改,包括 11 次插入3 次删除
  1. 11 3
      locations/sex_ev_condoms.qsrc

+ 11 - 3
locations/sex_ev_condoms.qsrc

@@ -37,7 +37,7 @@ if $ARGS[0] = 'condoms':
 !!	if sex_ev['no_condom'] ! 1 and sex_ev['skip_condom'] ! 1:
 	if sex_ev['no_condom'] ! 1:
 		if npc_bareback[$boy] = 1 and sex_ev['condom'] ! 1:
-	!!		if npc_know_bc[$boy] = 1 and npc_condom_conscious[$boy] ! 2: sex_ev['no_condom'] = 1
+			!! if npc_know_bc[$boy] = 1 and npc_condom_conscious[$boy] ! 2: sex_ev['no_condom'] = 1
 			'You agreed to stop using condoms with <<$npc_firstname[$boy]>> and he makes no move to get one.'
 			if npc_free_creampies[$boy] = 1 or npc_creampie_permission[$boy] = 1:
 				gs 'sex_ev_condoms', 'safeday_check'
@@ -106,7 +106,11 @@ 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'
 			end
@@ -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