Bläddra i källkod

Merge remote-tracking branch 'hornguy6/master'

Kevin_Smarts 1 år sedan
förälder
incheckning
7328128f7b

+ 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