Merge remote-tracking branch 'hornguy6/master'

locations/booty_call.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = 'SMS raiser':
 			gs 'booty_call_sms', 'Add SMS', $FuckBuddy[i]
 			booty_call_time[$FuckBuddy[i]] = 2000
 			!! this is a bit superfluous, but it makes the code run fater.
-			booty_call['A0'] = daystart
+			booty_call_time['A0'] = daystart
 		end
 		i += 1
 		jump 'booty_call_sms_raiser_loop'

locations/city_center.qsrc

@@ -291,7 +291,7 @@ end
 
 gs 'camera', 'check_location'
 
-if booty_call['A0'] = daystart:
+if booty_call_time['A0'] = daystart:
 	i=0
 	*nl
 	:loopBC

locations/city_residential.qsrc

@@ -194,7 +194,7 @@ if hour >= 20 or hour <= 4:
 	end
 end
 
-if booty_call['A0'] = daystart:
+if booty_call_time['A0'] = daystart:
 	i=0
 	*nl
 	:loopBC

locations/pav_pharmacy.qsrc

@@ -821,8 +821,10 @@ if $ARGS[0] = 'buy_morning_after':
 	gs 'stat'
 	'<center><B><font color="maroon">Pharmacy</font></B></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_aunt_1.jpg"></center>'
-	'You look at the goods positioned on the shelves, while you consider how to best approach your aunt. Your aunt notices you staring at the shelves, and comes from behind the counter when she''s done helping her last customer.'
-	'"Hi <<$pcs_nickname>>, are you looking for something?"'
+	if pharmacy['first_purchase'] = 0:
+		pharmacy['first_purchase'] = 1
+		'You awkwardly avoid eye contact, letting your gaze "wander" around the pharmacy, pretending you don''t know what you''re here for.'
+	end
 	act'Meekly ask':
 		cla
 		if pharmacy['morning_after'] = 0:
@@ -847,6 +849,10 @@ if $ARGS[0] = 'buy_morning_after':
 		end
 		act'It''s for emergencies':gt 'pav_pharmacy', 'morning_after_emergency_embarrassed'
 		act'I made a mistake':gt 'pav_pharmacy', 'morning_after_mistake_embarrassed'
+		if stat['broken_condoms'] > 0:
+			act'The condom broke':gt 'pav_pharmacy', 'buy_morning_after_condom_broke_meek'
+		end
+		act'Condom broke':gt 'pav_pharmacy', 'morning_after_mistake_embarrassed'
 		if birth_control['condom_stealth'] >= daystart - 3:
 			act'I got stealthed':gs 'pav_pharmacy', 'morning_after_stealth_meek'
 		end
@@ -869,6 +875,9 @@ if $ARGS[0] = 'buy_morning_after':
 			end
 			act'It''s for emergencies':gt 'pav_pharmacy', 'morning_after_emergency_open'
 			act'I made a mistake':gt 'pav_pharmacy', 'morning_after_mistake_open'
+			if stat['broken_condoms'] > 0:
+				act'The condom broke':gt 'pav_pharmacy', 'buy_morning_after_condom_broke_meek'
+			end
 			if birth_control['condom_stealth'] >= daystart - 3:
 			act'I got stealthed':gs 'pav_pharmacy', 'morning_after_stealth_open'
 		end
@@ -882,6 +891,9 @@ if $ARGS[0] = 'buy_morning_after':
 			end
 			'"How many times are you going to make the same mistake <<$pcs_nickname>>?" She shakes her head as she puts the box into the bag and hands it to you. "You need to buy some birth control already. It really isn''t that hard to just take a pill every day you know."'
 			act 'Continue':gt 'pav_pharmacy', 'start'
+			if stat['broken_condoms'] > 0:
+				act'The condom broke':gt 'pav_pharmacy', 'buy_morning_after_condom_broke_meek'
+			end
 			if birth_control['condom_stealth'] >= daystart - 3:
 				act'I got stealthed':gs 'pav_pharmacy', 'morning_after_stealth_open'
 			end
@@ -1052,6 +1064,40 @@ if $ARGS[0] = 'morning_after_stealth_open':
 	act 'Take the bag':gt 'pav_pharmacy', 'start'
 end
 
+if $ARGS[0] = 'buy_morning_after_condom_broke_meek':
+	cla & *nl
+	if LudaQW['broken_condoms'] = 0:
+		'"The condom broke," you mumble embarrassedly.'
+		'"Well, I suppose that''s not your fault," Luda sighs as she hands over the bag. "But that''s why it''s better to double up your protection."'
+	else
+		'"The condom broke again," you mumble embarrassedly.'
+		if LudaQW['broken_condoms'] <= 5:
+			'"You must have some bad luck," Luda says, shaking her head as she hands over the bag. "Are you sure you don''t want to start the pill?"'
+		else
+			'"This is just getting ridiculous," Luda huffs in exhasperation as she hands over the bag. "Just start the bloody pill already <<$pcs_firstname>>!"'
+		end
+	end
+	LudaQW['broken_condoms'] += 1
+	act 'Take the bag':gt 'pav_pharmacy', 'start'
+end
+
+if $ARGS[0] = 'buy_morning_after_condom_broke_open':
+	cla & *nl
+	if LudaQW['broken_condoms'] = 0:
+		'"It''s not my fault," you shrug. "Condom broke."'
+		'"Well, I suppose that''s does happen from time to time," Luda sighs as she hands over the bag. "But that''s why it''s better to double up your protection."'
+	else
+		'"The condom broke again," you shrug.'
+		if LudaQW['broken_condoms'] <= 5:
+			'"You must have some bad luck," Luda says, shaking her head as she hands over the bag. "Are you sure you don''t want to start the pill?"'
+		else
+			'"This is just getting ridiculous," Luda huffs in exhasperation as she hands over the bag. "Just start the bloody pill already <<$pcs_firstname>>!"'
+		end
+	end
+	LudaQW['broken_condoms'] += 1
+	act 'Take the bag':gt 'pav_pharmacy', 'start'
+end
+
 if $ARGS[0] = 'buy_morning_after_raped':
 	cla & *clr
 	'<center><B><font color="maroon">Pharmacy</font></B></center>'

locations/pav_residential.qsrc

@@ -194,7 +194,7 @@ if (hour > 20 or hour < 4) and succubusQW = 5 and suchuntday ! daystart:
 	end
 end
 
-if booty_call['A0'] = daystart :
+if booty_call_time['A0'] = daystart :
 	i=0
 	*nl
 	:loopBC