8 次代码提交 3dfe1acafa ... 7328128f7b

作者 SHA1 备注 提交日期
  Kevin_Smarts 7328128f7b Merge remote-tracking branch 'hornguy6/master' 1 年之前
  Kevin_Smarts 764daab0dd [fixed] Wrong link spotted by yanzaqw1 1 年之前
  Kevin_Smarts 2dfc704ce4 [fixed] Bodysuit thickness descriptions were reversed and some adjustments to Mon Chéi bodysuits 1 年之前
  Kevin_Smarts 2770c4a916 [fixed] Skiing had bad link for retuning to main park chunk 1 年之前
  hornguy6 9df6af5ed4 [fixed] something that goes towards addressing so many stranger is in the game 1 年之前
  hornguy6 bd39558be3 [fixed] another missing flag 1 年之前
  hornguy6 11b375a850 [fixed] "not on" not "on on" 1 年之前
  hornguy6 c652409817 [fixed] a few missing gosubs and flags 1 年之前

+ 10 - 10
locations/_attributes_moncheri_bodysuit.qsrc

@@ -30,8 +30,8 @@ elseif ARGS[1] = 2:
 	BraThinness = 5
 	BraCover = 3
 	PanThinness = 5
-	PanCoverFront = 3
-	PanCoverBack = 3
+	PanCoverFront = 1
+	PanCoverBack = 2
 
 elseif ARGS[1] = 3:
 	BraType = 4
@@ -41,8 +41,8 @@ elseif ARGS[1] = 3:
 	BraThinness = 5
 	BraCover = 3
 	PanThinness = 5
-	PanCoverFront = 3
-	PanCoverBack = 3
+	PanCoverFront = 2
+	PanCoverBack = 2
 
 elseif ARGS[1] = 4:
 	BraType = 6
@@ -52,8 +52,8 @@ elseif ARGS[1] = 4:
 	BraThinness = 5
 	BraCover = 3
 	PanThinness = 5
-	PanCoverFront = 3
-	PanCoverBack = 3
+	PanCoverFront = 1
+	PanCoverBack = 1
 
 elseif ARGS[1] = 5:
 	BraType = 7
@@ -511,11 +511,11 @@ elseif ARGS[1] = 46:
 	BraMaterial = 6
 	BraFun = 1
 	BraQuality = 6
-	BraThinness = 6
+	BraThinness = 5
 	BraCover = 3
-	PanThinness = 6
-	PanCoverFront = 3
-	PanCoverBack = 3
+	PanThinness = 4
+	PanCoverFront = 1
+	PanCoverBack = 1
 
 elseif ARGS[1] = 47:
 	BraType = 7

+ 1 - 1
locations/anushka.qsrc

@@ -331,7 +331,7 @@ if $ARGS[0] = 'wedgie fight':
 									gt 'anushapt', 'livingroom'
 								else
 									AnushkaLoc = 2
-									gt 'anushapt', 'anushroom'
+									gt 'anush_bedroom', 'anushroom'
 								end
 							end
 						end

+ 6 - 2
locations/booty_call_cum.qsrc

@@ -1683,7 +1683,7 @@ if $ARGS[0] = 'cum_force':
 	booty_call['creampie_force'] = 1
 	
 	!! differing descriptions based on position
-	if booty_call['condom'] = 1:
+	if booty_call['condom'] = 1 and booty_call['no_condom'] = 0:
 		gs'cum_call', '',$boy,1,3
 		if pcs_horny > 90:
 			$orgasm_or = 'yes'
@@ -1988,7 +1988,8 @@ if $ARGS[0] = 'creampie_surprise_cum_together':
 		'"Did... did we... did you...?" he pants.'
 	end
 	
-	gs'booty_call_reactions', 'creampie_react'
+!!	gs'booty_call_reactions', 'creampie_react'
+	gs'booty_call_reactions', 'react_menu'
 
 	if (booty_call['orgasm_count'] >= 5 or pcs_sleep < 20) and (hour >= 20 or hour =< 4):
 		act'Collapse':gt'booty_call_after', 'black_out'
@@ -2097,6 +2098,7 @@ if $ARGS[0] = 'cum_condom':
 		$booty_call['cum_describe2'] = 'settling your self down onto his rubber encased cock'
 	end
 	if condom_break > 0:
+		$booty_call['last_cum'] = 'broken_condom'
 		booty_call['broken_condom'] = 1
 		if booty_call['orgasm'] < orgasm:
 			booty_call['came_together'] = 2
@@ -2145,6 +2147,7 @@ if $ARGS[0] = 'broken_condom1':
 		end
 		gs'booty_call_reactions', 'oh_shit_options'
 		gs'booty_call_reactions', 'creampie_accident_birth_control'
+		gs'booty_call_reactions', 'creampie_safe_day'
 	end
 	
 	act'Come':
@@ -2177,6 +2180,7 @@ if $ARGS[0] = 'broken_condom1':
 			end
 			gs'booty_call_reactions', 'oh_shit_options'
 			gs'booty_call_reactions', 'creampie_accident_birth_control'
+			gs'booty_call_reactions', 'creampie_safe_day'
 		end
 	end
 end

+ 1 - 1
locations/booty_call_favorite_part.qsrc

@@ -1345,7 +1345,7 @@ if $ARGS[0] = 'pc_creampie_fav1':
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 			if $booty_call['boy_favorite'] = 'creampie' and npc_free_creampies[$boy] < 1 and booty_call['surprise_creampie_count'] > 0:
 				if npc_know_not_bc[$boy] = 1:
-					'"I... liked it when you came inside me," you admit, quickly holding up your finger before <<$npc_firstname[$boy]>> can say anything. "But you still need to ask before you do it! You know I''m on on birth control so it''s extra important!"'
+					'"I... liked it when you came inside me," you admit, quickly holding up your finger before <<$npc_firstname[$boy]>> can say anything. "But you still need to ask before you do it! You know I''m not on birth control so it''s extra important!"'
 				elseif birth_control['think_safe'] ! 1:
 					gs'booty_call_stats', 'no_birth_control_know'
 					'"I... liked it when you came inside me," you admit, quickly holding up your finger before <<$npc_firstname[$boy]>> can say anything. "But you still need to ask before you do it! I''m not on birth control so it''s dangerous."'

+ 1 - 0
locations/booty_call_reactions.qsrc

@@ -1660,6 +1660,7 @@ if $ARGS[0] = 'no_cum_inside':
 				act'Danger day':
 					cla
 					if stat['dangerous_day'] = 1:
+						booty_call['danger_day'] = 1
 						act'(Apologetic)':
 							cla & *clr
 							gs'booty_call_reactions', 'no_cum_inside_pic'

+ 10 - 3
locations/npcgeneratec.qsrc

@@ -25,9 +25,12 @@ npctempgage = ARGS[2]
 !! 4 - St. Petersburg City Center
 temp_location = ARGS[3]
 
+
+dont_know_npc_name = ARGS[4]
+
 !! For example
-!! gs 'npcgeneratec', 0, 'stranger', rand(18,45)
-!! Which would generate a male named stranger between ages of 18 and 45
+!! gs 'npcgeneratec', 0, 'stranger', rand(18,45), 3, 1
+!! Which would generate a male named stranger between ages of 18 and 45 who lives in the St. Petersburg Residential Area who will be remembered as ''stranger''
 
 
 if temp_location = 0:
@@ -209,7 +212,11 @@ gs 'npcrnamefile', 'rusSur'
 $npc_firstname[$npclastgenerated] = $npctempgn[1]
 $npc_nickname[$npclastgenerated] = $npctempgn[2]
 $npc_lastname[$npclastgenerated] = $npctempgn[3]
-$npc_usedname[$npclastgenerated] = $npctempgn[0]
+if dont_know_npc_name = 0 or $npctempgn[0] = '':
+	$npc_usedname[$npclastgenerated] = $npctempgn[1]
+else
+	$npc_usedname[$npclastgenerated] = $npctempgn[0]
+end
 npc_intel[$npclastgenerated] = rand(1,npctempc2)
 
 !! set them to sober

+ 2 - 2
locations/pav_lake.qsrc

@@ -195,7 +195,7 @@ if $ARGS[0] = '':
 				'You can''t believe your time skiing is already over. It feels like you just put on your ski boots and started around the lake. But now, as you sit down on the bench to take them off, your legs are tired and sore from a day of skiing. You unlace your boots and wiggle your toes, relieved to finally be able to stretch them out. You stand up and take a few steps, savouring the feeling of being barefoot after a day in stiff ski boots before you put your regular shoes back on.'
 				act'Continue':gt'pav_lake'
 			end
-			act'Ski around the park (30 mins)': gt 'pav_lake', 'ski'
+			act'Ski around the lake (30 mins)': gt 'pav_lake', 'ski'
 		elseif pcs_ski_owned > 0 and hour >= 8 and hour <= 17 and konki_cloth = 0:
 			act'Put your skis on':
 				*clr & cla
@@ -509,7 +509,7 @@ if $ARGS[0] = 'ski':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skiing_2.jpg"></center>'
 	'As you ski, you take in the breathtaking views of the snow-covered trees, the crisp blue sky above and all the people ice skating out on the lake. The sound of your skis slices through the snow filled air. You feel a sense of freedom and exhilaration as you carve your way around the lake. The cold air fills your lungs and you can''t help but smile, feeling alive and free.'
-	act 'Finish skiing':  gt 'pav_lake', 'start'
+	act 'Finish skiing':  gt 'pav_lake'
 end
 
 if $ARGS[0] = 'car_sex': 

+ 12 - 12
locations/underwear_descriptions.qsrc

@@ -223,33 +223,33 @@ elseif $ARGS[0] = 'bodysuit':
 
 	$description += ' bodysuit is '
 
-	if BraThinness = 1:
+	if BraThinness = 6:
 		$description += 'transparent'
-	elseif BraThinness = 2:
+	elseif BraThinness = 5:
 		$description += 'semi-transparent'
-	elseif BraThinness = 3:
-		$description += 'slightly transparent'
 	elseif BraThinness = 4:
+		$description += 'slightly transparent'
+	elseif BraThinness = 3:
 		$description += 'thin'
-	elseif BraThinness = 5:
+	elseif BraThinness = 2:
 		$description += 'not particularly thick or thin'
-	elseif BraThinness = 6:
+	elseif BraThinness = 1:
 		$description += 'thick'
 	end
 
 	$description += ' on top and '
 
-	if PanThinness = 1:
+	if PanThinness = 6:
 		$description += ' transparent'
-	elseif PanThinness = 2:
+	elseif PanThinness = 5:
 		$description += ' semi-transparent'
-	elseif PanThinness = 3:
-		$description += ' slightly transparent'
 	elseif PanThinness = 4:
+		$description += ' slightly transparent'
+	elseif PanThinness = 3:
 		$description += ' thin'
-	elseif PanThinness = 5:
+	elseif PanThinness = 2:
 		$description += ' not particularly thick or thin'
-	elseif PanThinness = 6:
+	elseif PanThinness = 1:
 		$description += ' thick'
 	end