浏览代码

Merge remote-tracking branch 'hornguy6/master'

Kevin_Smarts 3 年之前
父节点
当前提交
131cd61a79
共有 3 个文件被更改,包括 295 次插入1334 次删除
  1. 8 6
      locations/hookup.qsrc
  2. 109 1182
      locations/hookup_after.qsrc
  3. 178 146
      locations/hookup_sex.qsrc

+ 8 - 6
locations/hookup.qsrc

@@ -1,9 +1,9 @@
 # hookup
 !! 2021/05/06
 if $ARGS[0] = 'start':
+	hookup['orgasm_count'] = orgasm
 	$location_type = 'indoors'
 	if CloDress > 0:hookup['dress'] = 1
-	gs 'boystat', $npclastsaved
 	gs 'clothing', 'strip'
 	gs 'underwear', 'remove'
 	gs 'stat'
@@ -1552,7 +1552,7 @@ if $ARGS[0] = 'no_condom1':
 		$npc_apt_bedroom[$npclastsaved]
 		'"If you don''t want a condom, then I don''t want to fuck!"'
 		'You push him off of you, jumping off the bed and throwing your clothes on.'
-		if hookup_rape_chance > 0:
+		if hookup['rape_chance'] > 0:
 			!!put in chance he rapes you
 		elseif rand(1,10) > 8:
 			'"Okay, okay, I didn''t realize how important it is to you. I''ll use a condom."'
@@ -1595,7 +1595,7 @@ if $ARGS[0] = 'no_condom1':
 	act'Just don''t cum inside me':
 		hookup['condom'] = 3
 		cla & *nl
-		'"Well..." you say. "Alright... But just don''t cum inside me okay?"'
+		'"Well... Alright..." you say heistantly. "But don''t you dare cum inside me, okay?"'
 		gs'hookup','position_choose'
 	end
 end
@@ -1620,7 +1620,7 @@ if $ARGS[0] = 'no_condom2':
 		'"You''re out of condoms? Then we''re done here." You push him away from you, climbing off the bed and begin reaching for your clothes.'
 		'"Wait, where are you going?"'
 		'"I just told you, if you don''t have any condoms, then I don''t want to have sex'
-		if hookup_rape_chance > 80:
+		if hookup['rape_chance'] > 80:
 			!! put in chance he rapes you
 		else
 			if rand(1,3) > 2:
@@ -1655,7 +1655,7 @@ if $ARGS[0] = 'no_condom2':
 					'"That''s not what I''m worried about!" you snap at him. "I can still get an STD even if you don''t finish inside me!"'
 					'"What? Are you kidding? I don''t have STDs! I promise, I''m clean!"'
 					act'No way!':
-						!!if hookup_rape_chance > 80:
+						!!if hookup['rape_chance'] > 80:
 							!! put in chance he rapes you
 						!!else
 							'"Nuh uh, no way! I''m not taking any chances!"'
@@ -1686,14 +1686,16 @@ if $ARGS[0] = 'no_condom2':
 	end
 	
 	act'Maybe just this once':
+		cla & *nl
 		hookup['condom'] = 2
 		'"Well... Maybe just this once..." you say.'
 		gs'hookup','position_choose'
 	end
 	
 	act'Just don''t cum inside me':
+		cla & *nl
 		hookup['condom'] = 3
-		'"Well..." you say. "Alright... But just don''t cum inside me okay?"'
+		'"Well... Alright..." you say heistantly. "But don''t you dare cum inside me, okay?"'
 		gs'hookup','position_choose'
 	end
 end

文件差异内容过多而无法显示
+ 109 - 1182
locations/hookup_after.qsrc


文件差异内容过多而无法显示
+ 178 - 146
locations/hookup_sex.qsrc


部分文件因为文件数量过多而无法显示