1
0

7 Коммитууд 829a61ef65 ... 809f8bc04d

Эзэн SHA1 Мессеж Огноо
  Kevin_Smarts 809f8bc04d Merge remote-tracking branch 'LadyAlexa/master' 2 жил өмнө
  Kevin_Smarts ca7c062ce1 Merge remote-tracking branch 'hornguy6/master' 2 жил өмнө
  Kevin_Smarts fd20ee4e5f Merge remote-tracking branch 'Anya/master' 2 жил өмнө
  Kevin_Smarts 818da5a76c [fixed] Too many tables, needs to just be one big one 2 жил өмнө
  hornguy6 5320dd3f32 [added] additional Luda dialogue for morning after pills at the pharmacy 2 жил өмнө
  hornguy6 5906e39471 [fixed] array name needs to be different or additional booty calls will be inacessible on the same day 2 жил өмнө
  Anya b9763c945c [fixed] bad image calls (again) 2 жил өмнө

+ 7 - 7
locations/beg1.qsrc

@@ -414,7 +414,7 @@ if $ARGS[0] = 'Family extension':
 			gs 'stat'	
 			act 'Go meet your family':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/desk.jpg>"</center>'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/desk.jpg"></center>'
 				'Meeting your mother and sister in the reception, you propose your idea. "How about a special treat if I can arrange it? How about the three of us head over to Babel and try to get in for a meal?"'
 				'Both your mother and Anya look at you as if you''ve gone mad before your mother answers. "<<$pcs_nickname>>! First off, we aren''t dressed for that place. It''s too posh and even if we were, there''s no way we could afford it."'
 				'Still grinning you answer "Well that''s why I said ''if I can arrange it''. Let''s try and if it doesn''t work we can always head over to the diner."'
@@ -424,7 +424,7 @@ if $ARGS[0] = 'Family extension':
 				gs 'stat'
 				act 'Go to the restaurant':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/expensiverest/restoran.jpg>"</center>'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/expensiverest/restoran.jpg"></center>'
 					'You approach the maître d''.'
 					'As expected, he initially refuses your party entry to the restaurant. You briefly explain that you''ve just become the Saint Petersburg track champion for the 400 meter event and show him your gold medal as proof, but he remains doubtful. "Okay young lady, can you please tell me your name?"'
 					'"<<$pcs_firstname>> <<$pcs_lastname>>," you reply.'
@@ -433,7 +433,7 @@ if $ARGS[0] = 'Family extension':
 					gs 'stat'
 					act 'Convince him':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/expensiverest/maitredseat.jpg>"</center>'
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/expensiverest/maitredseat.jpg"></center>'
 						'After a brief conversation with him, he disappears for a few minutes before returning and beckoning your mother and Anya to join you. Once they are with you, he smiles. "Normally we wouldn''t allow entry as we have a strict dress code. However, given the circumstances, I''m pleased to tell you that you are all most welcome to eat here as it''s such a special occasion. After all it''s not every day that we have the Saint Petersburg 400 meter track champion eating in our fine establishment".'
 						'He continues "The manager has also asked me to let you know that you''ll all eat free tonight with a complimentary bottle of champagne. There is one condition though..."'
 						*nl
@@ -441,14 +441,14 @@ if $ARGS[0] = 'Family extension':
 						'He breaks into a grin. "Well now, that''s very simple. We take a photo of you displaying your gold medal to include in our advertising to say that you ate here with your lovely sisters after winning the race."'
 						'At this point your mother blushes and goes bright red as you answer. "No problem, it''ll be our pleasure... That is once my <<$npc_nickname[''A29'']>> stops blushing and my sister stops giggling!"'
 						'"Your mother?" he enquires.'
-						'"Yes," you reply, although you can tell by how red she''s gone she clearly likes your compliment.'
+						'"Yes," you reply, "although I guess you can tell by how red she''s gone she clearly likes your compliment."'
 						'He continues. "Also one photo of you which I''ll ask you to sign so I can show my kids."'
 						'"Of course! Let''s get that done while my mother recovers her poise."'
 						minut += 5
 						gs 'stat'
 						act 'Have dinner':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/expensiverest/seated.jpg>"</center>'
+							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/expensiverest/seated.jpg"></center>'
 							'After the photo is taken, the maître d'' leads you to your table where you all sit down.'
 							'Having enjoyed a lovely meal and having a light buzz from the champagne, you all head out and you pause to thank the maître d'' for his kindness and ask him to pass on your thanks to the manager for offering the meal for free.'
 							'Outside, you all share another hug and you thank them both for coming before you part ways.'
@@ -498,12 +498,12 @@ if $ARGS[0] = 'Family extension':
 				minut += 10
 				gs 'stat'	
 				act 'Go to the bar':
-					'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/metro.jpg"></center>'
 					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/metro.jpg"></center>'
 					'You take the metro to the industrial area and head towards the Rabotnik bar.'
 					minut += 20
 					gs 'stat'	
-					act 'Hava a drink':
+					act 'Have a drink':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/bar.jpg"></center>'
 						'You both make your way to the bar and order some beers, which you drink at the bar.'

+ 1 - 1
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'

+ 1 - 1
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

+ 1 - 1
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

+ 187 - 188
locations/obj_din.qsrc

@@ -1005,200 +1005,199 @@ if $ARGS[0] = 'reputation':
 	!'<center><img src="images/system/icons/reputation.png"><br></center>'
 	'<center><h1>Renown</h1></center>'
 	'<center><table width="90%" cellspacing="0" cellpadding="20" valign="top">'
-		'<tr><td width="50%" cellspacing="0" cellpadding="0" valign="top">'
-		'<center>Family Renown</center>'
-		if Enable_family_Reputation = 0:
-			'<center><a href="exec:Enable_family_Reputation = 1 & gs ''obj_din'', ''reputation''">Show details</a></center>'
-		end
-		if Enable_family_Reputation = 1:
-			'<center><a href="exec:Enable_family_Reputation = 0 & gs ''obj_din'', ''reputation''">Hide details</a></center>'
-			if rinslut > 0 or kavslut > 0:'In the residential area of ​​you are known as a whore that sleeps with Caucasians.'
-			if opusk > 0 or gnewQW >= 5: 'In the residential area it is well known by all the guys that you are a whore.'
-			if mid($start_type,1,2) = 'sg':
-				*nl
-				if motherKnowWhore > 0:
-					'Your mother knows that you are sexually active and considers you a whore.'
-				elseif motherKnowSpravka > 0:
-					'Your mother knows that you are sexually active.'
-				elseif motherKnowDildo > 0:
-					'Your mother knows you masturbate with a dildo.'
-				else
-					'Your mother thinks that you are a virgin.'
-				end
-				if brotherSex = 10:
-					'You and your brother have professed forbidden love to each other.'
-				elseif brotherSex = 9:
-					'You and your brother are siblings with benefits.'
-				elseif evgenQW >= 4 and fame['pav_slut'] >= 250:
-					'Your brother thinks you are a total whore.'
-				elseif evgenQW >= 3:
-					'Your brother thinks you are a slut.'
-				elseif brotherSex > 4:
-					'You are in a sexual relationship with your brother'
-				elseif brotherknowslut = 1:
-					'Your brother saw semen on your body and thinks that you fuck around.'
-				elseif brotherknowslut >= 2:
-					'Your brother saw you in the park screwing Gopniks.'
-				else
-					'Your brother has a good opinion of you.'
-				end
-
-				if sisterknowslut > 1 and sisboypartyQW >= 2:
-					'Your sister thinks you are a slut'
-				elseif sisterknowslut > 0:
-					'Your sister knows that you sleep around.'
-				else
-					'Your sister has a good opinion of you.'
-				end
-
-				if brothershowertalk > 0:'<<brothershowertalk>> - Number of conversations you''ve had with your brother in the shower.'
-				if brothershowerlook = 1:'You let your brother look at you when you''re shower'
-				if brothershave > 0:'<<brothershave>> - Number of times you''ve let your brother watch you shave your pussy'
-				if brotherkiss > 0: '<<brotherkiss>> - Number of times you and your brother have kissed'
-				if brotherbj > 0:'<<brotherbj>> - Number of times you''ve given your brother blowjobs'
-				if brotherfuck > 0:'<<brotherfuck>> - Number of times you''ve had sex with your brother'
-			end
-		*nl
-		end
-
-		'<center><table width="225" cellspacing="0" cellpadding="20" valign="top"><tr><td>'
-			'<center>Renown in Pavlovsk</center>'
-			if Enable_pav_Reputation = 0:
-				'<center><a href="exec:Enable_pav_Reputation = 1 & gs ''obj_din'', ''reputation''">Show details</a></center>'
-			end
-			if Enable_pav_Reputation = 1:
-				'<center><a href="exec:Enable_pav_Reputation = 0 & gs ''obj_din'', ''reputation''">Hide details</a></center>'
-				'<b>Performer = <<fame[''pav_performer'']>></b>'
-				'  Actor = <<fame[''pav_acting'']>>'
-				'  Dancer = <<fame[''pav_dance'']>>'
-				'  Glamour model = <<fame[''pav_modelling'']>>'
-				'  Painter = <<fame[''pav_painting'']>>'
-				'  Musician = <<fame[''pav_music'']>>'
-				'  Ballet dancer = <<fame[''pav_ballet'']>>'
-				'<b>Sex Industry = <<fame[''pav_sexind'']>></b>'
-				'  Porn actor = <<fame[''pav_porn'']>>'
-				'  Stripper = <<fame[''pav_stripping'']>>'
-				'<b>Slut = <<fame[''pav_slut'']>></b>'
-				'  Sex = <<fame[''pav_sex'']>>'
-				'  Prostitution = <<fame[''pav_prostitute'']>>'
-				'<b>Sports = <<fame[''pav_sport'']>></b>'
-				'  Kickboxer = <<fame[''pav_kickboxing'']>>'
-				'  Runner = <<fame[''pav_running'']>>'
-				'  Volleyball player = <<fame[''pav_volleyball'']>>'
-				'<b>Intellectual = <<fame[''pav_int'']>></b>'
-				'  Chess player = <<fame[''pav_chess'']>>'
-				'  Teacher = <<fame[''pav_teaching'']>>'
-				'<b>Social = <<fame[''pav_social'']>></b>'
-				'  Social media = <<fame[''pav_media'']>>'
-				*nl
-			end
-			'<center>Renown in the city</center>'
-			if Enable_city_Reputation = 0:
-				'<center><a href="exec:Enable_city_Reputation = 1 & gs ''obj_din'', ''reputation''">Show details</a></center>'
-			end
-			if Enable_city_Reputation = 1:
-				'<center><a href="exec:Enable_city_Reputation = 0 & gs ''obj_din'', ''reputation''">Hide details</a></center>'
-				'<b>Performer = <<fame[''city_performer'']>></b>'
-				'  Actor = <<fame[''city_acting'']>>'
-				'  Dancer = <<fame[''city_dance'']>>'
-				'  Glamour model = <<fame[''city_modelling'']>>'
-				'  Painter = <<fame[''city_painting'']>>'
-				'  Musician = <<fame[''city_music'']>>'
-				'  Ballet dancer = <<fame[''city_ballet'']>>'
-				'<b>Sex Industry = <<fame[''city_sexind'']>></b>'
-				'  Porn actor = <<fame[''city_porn'']>>'
-				'  Stripper = <<fame[''city_stripping'']>>'
-				'<b>Slut = <<fame[''city_slut'']>></b>'
-				'  Sex = <<fame[''city_sex'']>>'
-				'  Prostitution = <<fame[''city_prostitute'']>>'
-				'<b>Sports = <<fame[''city_sport'']>></b>'
-				'  Kickboxer = <<fame[''city_kickboxing'']>>'
-				'  Runner = <<fame[''city_running'']>>'
-				'  Volleyball player = <<fame[''city_volleyball'']>>'
-				'<b>Intellectual = <<fame[''city_int'']>></b>'
-				'  Chess player = <<fame[''city_chess'']>>'
-				'  Teacher = <<fame[''city_teaching'']>>'
-				'<b>Social = <<fame[''city_social'']>></b>'
-				'  Social media = <<fame[''city_media'']>>'
-				*nl
-			end
-			'<center>Renown in the old town</center>'
-			if Enable_oldtown_Reputation = 0:
-				'<center><a href="exec:Enable_oldtown_Reputation = 1 & gs ''obj_din'', ''reputation''">Show details</a></center>'
-			end
-			if Enable_oldtown_Reputation = 1:
-				'<center><a href="exec:Enable_oldtown_Reputation = 0 & gs ''obj_din'', ''reputation''">Hide details</a></center>'
-				'<b>Performer = <<fame[''pushkin_performer'']>></b>'
-				'  Actor = <<fame[''pushkin_acting'']>>'
-				'  Dancer = <<fame[''pushkin_dance'']>>'
-				'  Glamour model = <<fame[''pushkin_modelling'']>>'
-				'  Painter = <<fame[''pushkin_painting'']>>'
-				'  Musician = <<fame[''pushkin_music'']>>'
-				'  Ballet dancer = <<fame[''pushkin_ballet'']>>'
-				'<b>Sex Industry = <<fame[''pushkin_sexind'']>></b>'
-				'  Porn actor = <<fame[''pushkin_porn'']>>'
-				'  Stripper = <<fame[''pushkin_stripping'']>>'
-				'<b>Slut = <<fame[''pushkin_slut'']>></b>'
-				'  Sex = <<fame[''pushkin_sex'']>>'
-				'  Prostitution = <<fame[''pushkin_prostitute'']>>'
-				'<b>Sports = <<fame[''pushkin_sport'']>></b>'
-				'  Kickboxer = <<fame[''pushkin_kickboxing'']>>'
-				'  Runner = <<fame[''pushkin_running'']>>'
-				'  Volleyball player = <<fame[''pushkin_volleyball'']>>'
-				'<b>Intellectual = <<fame[''pushkin_int'']>></b>'
-				'  Chess player = <<fame[''pushkin_chess'']>>'
-				'  Teacher = <<fame[''pushkin_teaching'']>>'
-				'<b>Social = <<fame[''pushkin_social'']>></b>'
-				'  Social media = <<fame[''pushkin_media'']>>'
-				*nl
-			end
-			'<center>Renown in the village</center>'
-			if Enable_village_Reputation = 0:
-				'<center><a href="exec:Enable_village_Reputation = 1 & gs ''obj_din'', ''reputation''">Show details</a></center>'
+	*nl
+	'<center>Family Renown</center>'
+	if Enable_family_Reputation = 0:
+		'<center><a href="exec:Enable_family_Reputation = 1 & gs ''obj_din'', ''reputation''">Show details</a></center>'
+	end
+	if Enable_family_Reputation = 1:
+		'<center><a href="exec:Enable_family_Reputation = 0 & gs ''obj_din'', ''reputation''">Hide details</a></center>'
+		if rinslut > 0 or kavslut > 0:'In the residential area of ​​you are known as a whore that sleeps with Caucasians.'
+		if opusk > 0 or gnewQW >= 5: 'In the residential area it is well known by all the guys that you are a whore.'
+		if mid($start_type,1,2) = 'sg':
+			*nl
+			if motherKnowWhore > 0:
+				'Your mother knows that you are sexually active and considers you a whore.'
+			elseif motherKnowSpravka > 0:
+				'Your mother knows that you are sexually active.'
+			elseif motherKnowDildo > 0:
+				'Your mother knows you masturbate with a dildo.'
+			else
+				'Your mother thinks that you are a virgin.'
 			end
-			if Enable_village_Reputation = 1:
-				'<center><a href="exec:Enable_village_Reputation = 0 & gs ''obj_din'', ''reputation''">Hide details</a></center>'
-				'<b>Performer = <<fame[''village_performer'']>></b>'
-				'  Actor = <<fame[''village_acting'']>>'
-				'  Dancer = <<fame[''village_dance'']>>'
-				'  Glamour model = <<fame[''village_modelling'']>>'
-				'  Painter = <<fame[''village_painting'']>>'
-				'  Musician = <<fame[''village_music'']>>'
-				'  Ballet dancer = <<fame[''village_ballet'']>>'
-				'<b>Sex Industry = <<fame[''village_sexind'']>></b>'
-				'  Porn actor = <<fame[''village_porn'']>>'
-				'  Stripper = <<fame[''village_stripping'']>>'
-				'<b>Slut = <<fame[''village_slut'']>></b>'
-				'  Sex = <<fame[''village_sex'']>>'
-				'  Prostitution = <<fame[''village_prostitute'']>>'
-				'<b>Sports = <<fame[''village_sport'']>></b>'
-				'  Kickboxer = <<fame[''village_kickboxing'']>>'
-				'  Runner = <<fame[''village_running'']>>'
-				'  Volleyball player = <<fame[''village_volleyball'']>>'
-				'<b>Intellectual = <<fame[''village_int'']>></b>'
-				'  Chess player = <<fame[''village_chess'']>>'
-				'  Teacher = <<fame[''village_teaching'']>>'
-				'<b>Social = <<fame[''village_social'']>></b>'
-				'  Social media = <<fame[''village_media'']>>'
+			if brotherSex = 10:
+				'You and your brother have professed forbidden love to each other.'
+			elseif brotherSex = 9:
+				'You and your brother are siblings with benefits.'
+			elseif evgenQW >= 4 and fame['pav_slut'] >= 250:
+				'Your brother thinks you are a total whore.'
+			elseif evgenQW >= 3:
+				'Your brother thinks you are a slut.'
+			elseif brotherSex > 4:
+				'You are in a sexual relationship with your brother'
+			elseif brotherknowslut = 1:
+				'Your brother saw semen on your body and thinks that you fuck around.'
+			elseif brotherknowslut >= 2:
+				'Your brother saw you in the park screwing Gopniks.'
+			else
+				'Your brother has a good opinion of you.'
 			end
-		'</tr></td></table></center>'
-		'</td><td width="50%" cellspacing="0" cellpadding="0" valign="top">'
-		if film > 0:
-			'<b>Pornographic Filmography</b>'
-			gs 'pornhist', 'short'
-			if pfilmSTOP = 0:
-				*nl
-				'<font color="magenta"><<$pfname>></font> has starred in <b><<film>></b> porn films:'
-				*nl
+
+			if sisterknowslut > 1 and sisboypartyQW >= 2:
+				'Your sister thinks you are a slut'
+			elseif sisterknowslut > 0:
+				'Your sister knows that you sleep around.'
 			else
-				*nl
-				'<font color="magenta"><<$pfname>></font> retired after <b><<film>></b> porn films:'
-				*nl
+				'Your sister has a good opinion of you.'
 			end
-			'<a href="exec:gs ''pornhist'', ''pdetail''">View detailed Filmography</a>'
+
+			if brothershowertalk > 0:'<<brothershowertalk>> - Number of conversations you''ve had with your brother in the shower.'
+			if brothershowerlook = 1:'You let your brother look at you when you''re shower'
+			if brothershave > 0:'<<brothershave>> - Number of times you''ve let your brother watch you shave your pussy'
+			if brotherkiss > 0: '<<brotherkiss>> - Number of times you and your brother have kissed'
+			if brotherbj > 0:'<<brotherbj>> - Number of times you''ve given your brother blowjobs'
+			if brotherfuck > 0:'<<brotherfuck>> - Number of times you''ve had sex with your brother'
+		end
+	*nl
+	end
+
+	'<center>Renown in Pavlovsk</center>'
+	if Enable_pav_Reputation = 0:
+		'<center><a href="exec:Enable_pav_Reputation = 1 & gs ''obj_din'', ''reputation''">Show details</a></center>'
+	end
+	if Enable_pav_Reputation = 1:
+		'<center><a href="exec:Enable_pav_Reputation = 0 & gs ''obj_din'', ''reputation''">Hide details</a></center>'
+		'<b>Performer = <<fame[''pav_performer'']>></b>'
+		'  Actor = <<fame[''pav_acting'']>>'
+		'  Dancer = <<fame[''pav_dance'']>>'
+		'  Glamour model = <<fame[''pav_modelling'']>>'
+		'  Painter = <<fame[''pav_painting'']>>'
+		'  Musician = <<fame[''pav_music'']>>'
+		'  Ballet dancer = <<fame[''pav_ballet'']>>'
+		'<b>Sex Industry = <<fame[''pav_sexind'']>></b>'
+		'  Porn actor = <<fame[''pav_porn'']>>'
+		'  Stripper = <<fame[''pav_stripping'']>>'
+		'<b>Slut = <<fame[''pav_slut'']>></b>'
+		'  Sex = <<fame[''pav_sex'']>>'
+		'  Prostitution = <<fame[''pav_prostitute'']>>'
+		'<b>Sports = <<fame[''pav_sport'']>></b>'
+		'  Kickboxer = <<fame[''pav_kickboxing'']>>'
+		'  Runner = <<fame[''pav_running'']>>'
+		'  Volleyball player = <<fame[''pav_volleyball'']>>'
+		'<b>Intellectual = <<fame[''pav_int'']>></b>'
+		'  Chess player = <<fame[''pav_chess'']>>'
+		'  Teacher = <<fame[''pav_teaching'']>>'
+		'<b>Social = <<fame[''pav_social'']>></b>'
+		'  Social media = <<fame[''pav_media'']>>'
+		*nl
+	end
+	'<center>Renown in the city</center>'
+	if Enable_city_Reputation = 0:
+		'<center><a href="exec:Enable_city_Reputation = 1 & gs ''obj_din'', ''reputation''">Show details</a></center>'
+	end
+	if Enable_city_Reputation = 1:
+		'<center><a href="exec:Enable_city_Reputation = 0 & gs ''obj_din'', ''reputation''">Hide details</a></center>'
+		'<b>Performer = <<fame[''city_performer'']>></b>'
+		'  Actor = <<fame[''city_acting'']>>'
+		'  Dancer = <<fame[''city_dance'']>>'
+		'  Glamour model = <<fame[''city_modelling'']>>'
+		'  Painter = <<fame[''city_painting'']>>'
+		'  Musician = <<fame[''city_music'']>>'
+		'  Ballet dancer = <<fame[''city_ballet'']>>'
+		'<b>Sex Industry = <<fame[''city_sexind'']>></b>'
+		'  Porn actor = <<fame[''city_porn'']>>'
+		'  Stripper = <<fame[''city_stripping'']>>'
+		'<b>Slut = <<fame[''city_slut'']>></b>'
+		'  Sex = <<fame[''city_sex'']>>'
+		'  Prostitution = <<fame[''city_prostitute'']>>'
+		'<b>Sports = <<fame[''city_sport'']>></b>'
+		'  Kickboxer = <<fame[''city_kickboxing'']>>'
+		'  Runner = <<fame[''city_running'']>>'
+		'  Volleyball player = <<fame[''city_volleyball'']>>'
+		'<b>Intellectual = <<fame[''city_int'']>></b>'
+		'  Chess player = <<fame[''city_chess'']>>'
+		'  Teacher = <<fame[''city_teaching'']>>'
+		'<b>Social = <<fame[''city_social'']>></b>'
+		'  Social media = <<fame[''city_media'']>>'
+		*nl
+	end
+	'<center>Renown in the old town</center>'
+	if Enable_oldtown_Reputation = 0:
+		'<center><a href="exec:Enable_oldtown_Reputation = 1 & gs ''obj_din'', ''reputation''">Show details</a></center>'
+	end
+	if Enable_oldtown_Reputation = 1:
+		'<center><a href="exec:Enable_oldtown_Reputation = 0 & gs ''obj_din'', ''reputation''">Hide details</a></center>'
+		'<b>Performer = <<fame[''pushkin_performer'']>></b>'
+		'  Actor = <<fame[''pushkin_acting'']>>'
+		'  Dancer = <<fame[''pushkin_dance'']>>'
+		'  Glamour model = <<fame[''pushkin_modelling'']>>'
+		'  Painter = <<fame[''pushkin_painting'']>>'
+		'  Musician = <<fame[''pushkin_music'']>>'
+		'  Ballet dancer = <<fame[''pushkin_ballet'']>>'
+		'<b>Sex Industry = <<fame[''pushkin_sexind'']>></b>'
+		'  Porn actor = <<fame[''pushkin_porn'']>>'
+		'  Stripper = <<fame[''pushkin_stripping'']>>'
+		'<b>Slut = <<fame[''pushkin_slut'']>></b>'
+		'  Sex = <<fame[''pushkin_sex'']>>'
+		'  Prostitution = <<fame[''pushkin_prostitute'']>>'
+		'<b>Sports = <<fame[''pushkin_sport'']>></b>'
+		'  Kickboxer = <<fame[''pushkin_kickboxing'']>>'
+		'  Runner = <<fame[''pushkin_running'']>>'
+		'  Volleyball player = <<fame[''pushkin_volleyball'']>>'
+		'<b>Intellectual = <<fame[''pushkin_int'']>></b>'
+		'  Chess player = <<fame[''pushkin_chess'']>>'
+		'  Teacher = <<fame[''pushkin_teaching'']>>'
+		'<b>Social = <<fame[''pushkin_social'']>></b>'
+		'  Social media = <<fame[''pushkin_media'']>>'
+		*nl
+	end
+	'<center>Renown in the village</center>'
+	if Enable_village_Reputation = 0:
+		'<center><a href="exec:Enable_village_Reputation = 1 & gs ''obj_din'', ''reputation''">Show details</a></center>'
+	end
+	if Enable_village_Reputation = 1:
+		'<center><a href="exec:Enable_village_Reputation = 0 & gs ''obj_din'', ''reputation''">Hide details</a></center>'
+		'<b>Performer = <<fame[''village_performer'']>></b>'
+		'  Actor = <<fame[''village_acting'']>>'
+		'  Dancer = <<fame[''village_dance'']>>'
+		'  Glamour model = <<fame[''village_modelling'']>>'
+		'  Painter = <<fame[''village_painting'']>>'
+		'  Musician = <<fame[''village_music'']>>'
+		'  Ballet dancer = <<fame[''village_ballet'']>>'
+		'<b>Sex Industry = <<fame[''village_sexind'']>></b>'
+		'  Porn actor = <<fame[''village_porn'']>>'
+		'  Stripper = <<fame[''village_stripping'']>>'
+		'<b>Slut = <<fame[''village_slut'']>></b>'
+		'  Sex = <<fame[''village_sex'']>>'
+		'  Prostitution = <<fame[''village_prostitute'']>>'
+		'<b>Sports = <<fame[''village_sport'']>></b>'
+		'  Kickboxer = <<fame[''village_kickboxing'']>>'
+		'  Runner = <<fame[''village_running'']>>'
+		'  Volleyball player = <<fame[''village_volleyball'']>>'
+		'<b>Intellectual = <<fame[''village_int'']>></b>'
+		'  Chess player = <<fame[''village_chess'']>>'
+		'  Teacher = <<fame[''village_teaching'']>>'
+		'<b>Social = <<fame[''village_social'']>></b>'
+		'  Social media = <<fame[''village_media'']>>'
+	end
+
+	if film > 0:
+		*nl
+		'<b>Pornographic Filmography</b>'
+		gs 'pornhist', 'short'
+		if pfilmSTOP = 0:
+			*nl
+			'<font color="magenta"><<$pfname>></font> has starred in <b><<film>></b> porn films:'
+			*nl
+		else
+			*nl
+			'<font color="magenta"><<$pfname>></font> retired after <b><<film>></b> porn films:'
 			*nl
-			*p '<<$pfilmhistory>>'
 		end
+		'<a href="exec:gs ''pornhist'', ''pdetail''">View detailed Filmography</a>'
+		*nl
+		*p '<<$pfilmhistory>>'
+	end
 	'</td></tr></table></center>'
 end
 

+ 48 - 2
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>'

+ 1 - 1
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