浏览代码

Merge remote-tracking branch 'Hornguy6/master'

Kevin_Smarts 1 年之前
父节点
当前提交
bfa2c42d58
共有 2 个文件被更改,包括 28 次插入3 次删除
  1. 25 1
      locations/sex_ev_condoms.qsrc
  2. 3 2
      locations/sex_ev_cum.qsrc

+ 25 - 1
locations/sex_ev_condoms.qsrc

@@ -1981,7 +1981,10 @@ end
 
 
 if $ARGS[0] = 'virgin_condom_pc_ask1':
+	gs 'willpower', 'sex', 'resist', 'medium'
 	if will_cost <= pcs_willpwr and (prezikcount + prezik > 0):
+!!	if prezikcount + prezik > 0:
+		
 		act'Pull out a condom (<<will_cost>> Willpower)':
 			cla & *clr
 			sex_ev['using_pc_condoms'] = 1
@@ -2099,7 +2102,28 @@ if $ARGS[0] = 'virgin_condom_ask2':
 		'<i>Well... Maybe it''s okay?</i> you rationalize. It''s your first time. If he doesn''t use condoms, maybe he knows better? You can always change your mind in the future. But it''s just once. What could go wrong?'
 		sex_ev['no_condom'] = 1
 		gs'sex_ev_condoms', 'virgin_condom2'
-	end	
+	end
+	
+	if prezik > 0:
+		act'Get one from your bag':
+			sex_ev['using_pc_condoms'] = 1
+			gs 'sex_ev_condoms', 'pc_use_condoms'
+			cla & *clr
+			$sex_ev['bed_room']
+			if prezik > 1:
+				'"That''s okay, I''ve got some."'
+			elseif prezik = 1:
+				'"That''s okay, I''ve got one."'
+			end
+			if LudaQW['free_condoms'] = 1:
+				'You reach into your bag and pull out one of the condoms your aunt gave you and hand it to <<$npc_firstname[$boy]>>.'
+			else
+				'You reach into your bag and pull out one of the condoms you bought and hand it to <<$npc_firstname[$boy]>>.'
+			end
+			'He takes it and opens the packaging, rolling it onto his cock.'
+			gs 'sex_ev_virgin', 'start_with_condom'
+		end
+	end
 end
 
 if $ARGS[0] = 'virgin_condom_ask3':

+ 3 - 2
locations/sex_ev_cum.qsrc

@@ -278,9 +278,10 @@ if $ARGS[0] = 'fuck_cum_random':
 	elseif sex_ev['virgin_creampie_request'] = 1 and sex_ev['creampie_count'] = 0 and sex_ev['no_condom'] = 1:
 		sex_ev['cum_where'] = 1
 		!! add something later?
-	elseif sex_ev['cum_choice'] > 7:
+	elseif sex_ev['cum_choice'] > 6:
 		gs'sex_ev_cum', 'random_cum_choice'
-	elseif sex_ev['cum_choice'] > 5:
+	elseif sex_ev['cum_choice'] > 3:
+		sex_ev['cum_warn'] = 1
 		sex_ev['cum_where'] = 1
 	elseif sex_ev['cum_choice'] > 1:
 		$sex_ev['cum_choice'] = $npc_cum_pref[$boy]