Merge remote-tracking branch 'Anjuna/master'

locations/blackmailer.qsrc

@@ -72,6 +72,16 @@ if $ARGS[0] = 'init_blackmail':
 	end
 end
 
+
+
+
+	!!=============================================!!
+	!!                                             !!
+	!!                  FUNCTIONS                  !!
+	!!                                             !!
+	!!=============================================!!
+
+
 if $ARGS[0] = 'add_blackmail_selfie':
 	temp_i = 0
 	if blackmailQW['total_material'] <= 10:
@@ -116,19 +126,27 @@ end
 
 
 if $ARGS[0] = 'cikl':
-	if blackmailQW['stage'] = 3 and blackmailQW['smsday'] = 0:
-		blackmailQW['smsday'] = blackmailQW['dreamday'] + 3
-		gs 'telefon', 'AddContact', 'Blackmailer', 'icon_na', 1
-		gs 'telefon', 'SetSMSSchedule', 'Blackmailer', "", "0", "gs 'blackmailer', 'Add_SMS1'", "daystart > blackmailQW['smsday'] and (hour >= 14 and hour <= 19 and rand(0, 100) = 0 or hour = 19 and minut >= 22 or hour = 20)"
-	elseif daystart = blackmailQW['smsday'] and blackmailQW['next_payment'] > 0:
-		gs 'telefon', 'SetSMSSchedule', 'Blackmailer', "", "0", "gs 'blackmailer', 'Add_SMS1_reminder'", "(hour >= 14 and hour <= 19 and rand(0, 100) = 0 or hour = 19 and minut >= 22 or hour = 20)"
-	elseif daystart > blackmailQW['smsday'] and blackmailQW['next_payment'] > 0:
-		gs 'telefon', 'SetSMSSchedule', 'Blackmailer', "", "0", "gs 'blackmailer', 'Add_SMS_failure'", "(hour >= 14 and hour <= 19 and rand(0, 100) = 0 or hour = 19 and minut >= 22 or hour = 20)"
-
-	!Currently repeating content
-	elseif blackmailQW['stage'] >= 5 and blackmailQW['smsday'] = 0:
-		blackmailQW['smsday'] = daystart + rand(0, 13 - 5 * min(blackmailQW['stage'] - 5, 2)) + 6
-		gs 'telefon', 'SetSMSSchedule', 'Blackmailer', "", "0", "gs 'blackmailer', 'Add_SMS_repeat'", "daystart > blackmailQW['smsday'] and (hour >= 14 and hour <= 19 and rand(0, 100) = 0 or hour = 19 and minut >= 22 or hour = 20)"
+	if blackmailQW['next_payment'] > 0:
+		if daystart = blackmailQW['smsday']:
+			gs 'telefon', 'SetSMSSchedule', 'Blackmailer', "", "0", "gs 'blackmailer', 'Add_SMS1_reminder'", "(hour >= 14 and hour <= 19 and rand(0, 100) = 0 or hour = 19 and minut >= 22 or hour = 20)"
+		elseif daystart > blackmailQW['smsday']:
+			gs 'telefon', 'SetSMSSchedule', 'Blackmailer', "", "0", "gs 'blackmailer', 'Add_SMS_failure'", "(hour >= 14 and hour <= 19 and rand(0, 100) = 0 or hour = 19 and minut >= 22 or hour = 20)"
+		end
+	else
+		if blackmailQW['smsday'] = 0:
+			if blackmailQW['stage'] = 3:
+				blackmailQW['smsday'] = blackmailQW['dreamday'] + 4
+				gs 'telefon', 'AddContact', 'Blackmailer', 'icon_na', 1
+			elseif blackmailQW['stage'] >= 5:
+				blackmailQW['smsday'] = daystart + 6 + rand(0, 12 - 5 * (min(blackmailQW['stage'], 7) - 5))
+			end
+		elseif daystart >= blackmailQW['smsday']:
+			if blackmailQW['stage'] = 3:
+				gs 'telefon', 'SetSMSSchedule', 'Blackmailer', "", "0", "gs 'blackmailer', 'Add_SMS1'", "(hour >= 14 and hour <= 19 and rand(0, 100) = 0 or hour = 19 and minut >= 22 or hour = 20)"
+			elseif blackmailQW['stage'] >= 5:
+				gs 'telefon', 'SetSMSSchedule', 'Blackmailer', "", "0", "gs 'blackmailer', 'Add_SMS_repeat'", "(hour >= 14 and hour <= 19 and rand(0, 100) = 0 or hour = 19 and minut >= 22 or hour = 20)"
+			end
+		end
 	end
 end
 
@@ -291,8 +309,8 @@ end
 
 
 if $ARGS[0] = 'Add_SMS1':
+	if blackmailQW['stage'] = 3: blackmailQW['stage'] = 4
 	gs 'telefon', 'ClearSMSSchedule', 'Blackmailer'
-	blackmailQW['stage'] = 4
 	blackmailQW['smsday'] = daystart + 2
 	blackmailQW['next_payment'] = rand(50, 100) * 10
 	$blackmailQW['blackmail_image_chosen'] = $blackmailQW['init_flashimage']
@@ -324,39 +342,48 @@ end
 if $ARGS[0] = 'Add_SMS1_reminder':
 	gs 'telefon', 'ClearSMSSchedule', 'Blackmailer'
 
-	$SMSTree['0'] = '<<$pcs_firstname>> don''t forget, if you don''t leave <<blackmailQW[''next_payment'']>> <b>₽</b> beneath the fourth park bench, you will regret it'
-
-	gs 'SMStext_builder', 'start'
-		gs 'SMStext_builder', 'receive', $SMSTree['0']
-		gs 'SMSText_builder', 'receive_img', $blackmailQW['blackmail_image_chosen']
-		gs 'SMStext_builder', 'add_sms', 'Blackmailer'
-	gs 'SMStext_builder', 'end'
-	killvar '$SMSTree'
+	if blackmailQW['next_payment'] > 0:
+		if blackmailQW['escape'] = -1: blackmailQW['escape'] = 0
+		$SMSTree['0'] = '<<$pcs_firstname>> don''t forget, if you don''t leave <<blackmailQW[''next_payment'']>> <b>₽</b> beneath the fourth park bench, you will regret it'
+
+		gs 'SMStext_builder', 'start'
+			gs 'SMStext_builder', 'receive', $SMSTree['0']
+			gs 'SMSText_builder', 'receive_img', $blackmailQW['blackmail_image_chosen']
+			gs 'SMStext_builder', 'add_sms', 'Blackmailer'
+		gs 'SMStext_builder', 'end'
+		killvar '$SMSTree'
+	end
 end
 
 if $ARGS[0] = 'Add_SMS_failure':
 	gs 'telefon', 'ClearSMSSchedule', 'Blackmailer'
-	blackmailQW['stage'] = -1
-
-	$SMSTree['0'] = 'Guess you like it when people know you''re a whore'
-		$SMSTree['1'] = 'or you didn''t think I''d go through with it'
-			$SMSTree['2'] = 'we''ll see'
-
-	gs 'SMStext_builder', 'start'
-		gs 'SMStext_builder', 'receive', $SMSTree['0']
-		gs 'SMStext_builder', 'receive', $SMSTree['1']
-		gs 'SMStext_builder', 'receive', $SMSTree['2']
-		gs 'SMStext_builder', 'add_sms', 'Blackmailer'
-	gs 'SMStext_builder', 'end'
+	blackmailQW['smsday'] = 0
 
-	if blackmailQW['stage'] < 6:
-		if blackmailQW['init_flashregion'] = 'city':
-			fame['city_sex'] += 2 * blackmailQW['total_material']
-		elseif blackmailQW['init_flashregion'] = 'gad':
-			fame['gad_sex'] += 10 * blackmailQW['total_material']
-		else
-			fame['pav_sex'] += 5 * blackmailQW['total_material']
+	if blackmailQW['next_payment'] > 0:
+		if blackmailQW['escape'] = -1: blackmailQW['escape'] = 0
+		blackmailQW['next_payment'] = 0
+
+		$SMSTree['0'] = 'Guess you like it when people know you''re a whore'
+			$SMSTree['1'] = 'or you didn''t think I''d go through with it'
+				$SMSTree['2'] = 'we''ll see'
+
+		gs 'SMStext_builder', 'start'
+			gs 'SMStext_builder', 'receive', $SMSTree['0']
+			gs 'SMStext_builder', 'receive', $SMSTree['1']
+			gs 'SMStext_builder', 'receive', $SMSTree['2']
+			gs 'SMStext_builder', 'add_sms', 'Blackmailer'
+		gs 'SMStext_builder', 'end'
+
+		if blackmailQW['stage'] < 6:
+			if blackmailQW['init_flashregion'] = 'city':
+				fame['city_sex'] += 2 * blackmailQW['total_material']
+			elseif blackmailQW['init_flashregion'] = 'gad':
+				fame['gad_sex'] += 10 * blackmailQW['total_material']
+			else
+				fame['pav_sex'] += 5 * blackmailQW['total_material']
+			end
 		end
+		blackmailQW['stage'] = -1
 	end
 end
 
@@ -394,11 +421,12 @@ if $ARGS[0] = 'park1':
 	else
 		act 'Hide the money (<<blackmailQW[''next_payment'']>> <b>₽</b>)':
 			*clr & cla
+			if blackmailQW['stage'] = 4: blackmailQW['stage'] = 5
+			gs 'telefon', 'ClearSMSSchedule', 'Blackmailer'
+			blackmailQW['smsday'] = 0
 			money -= blackmailQW['next_payment']
 			blackmailQW['total_payment'] += blackmailQW['next_payment']
 			blackmailQW['next_payment'] = 0
-			blackmailQW['stage'] = 5
-			blackmailQW['smsday'] = 0
 
 			minut += 1
 			gs 'stat'
@@ -416,15 +444,147 @@ end
 
 
 
+	!!=============================================!!
+	!!                                             !!
+	!!                   POLICE                    !!
+	!!                                             !!
+	!!=============================================!!
+
+
+if $ARGS[0] = 'set_police_act':
+	if blackmailQW['stage'] >= 3 and blackmailQW['escape'] = 0:
+		act 'Report that you''re being blackmailed':
+			menu_off = 1
+			minut += 5
+			gs 'stat'
+			gt 'blackmailer', 'police1'
+		end
+	end
+end
+
+if $ARGS[0] = 'police1':
+	if $region = 'pav':
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/police/pavrec.jpg" ></center>'
+		'You walk up to a bored looking cop shuffling about some paperwork.'
+	else:
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/police/cityrec.jpg"></center>'
+		'You walk up to a window, you pick up the phone and hear a buzzer sound on the other side. One of the officers picks it up without hesitation and looks at you.'
+	end
+	'"Can I help you?"'
+	'"I-I''m being blackmailed" you stammer. The cops eyebrow raises slightly, but other than that his expression doesn''t change.'
+	if $region = 'pav':
+		'"Follow me, we can take your statement over here."'
+	else
+		'"Someone will come out to meet you. Follow them and they''ll take your statement in the back."'
+	end
+	act 'Continue':
+		*clr & cla
+		minut += 5
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogation1.jpg"></center>'
+		if $region = 'pav':
+			'You sit down at a shoddy looking desk and another officer who looks only marginally more competent than the one who greeted you sits down across from you.'
+		else
+			'As promised, someone comes out and takes you into their office space behind. You sit down at a shoddy looking desk and the officer takes his place on the other side of it.'
+		end
+		'"Alright ma''am, you stated that you were being blackmailed. Could you please explain the situation?"'
+		gs 'willpower', 'flash', 'self'
+		if pcs_willpwr < will_cost:
+			act 'Tell them that somebody caught you flashing your <<$blackmailQW[''init_flashaction'']>> <<$blackmailQW[''init_flashloc_desc'']>> and has been demanding money (<font color="red"><<will_cost>> willpower</font>)':'<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		else
+			act 'Tell them that somebody caught you flashing your <<$blackmailQW[''init_flashaction'']>> <<$blackmailQW[''init_flashloc_desc'']>> and has been demanding money.':
+				*clr & cla
+				minut += 5
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogation2.jpg"></center>'
+				'"Some creep took a picture of me and is demanding money or he''ll release the picture!"'
+				'"Hmm, how did this person contact you?"'
+				'"He texted me."'
+				'You see a stark of hope flash through the officers eyes, if you could show us the texts we might be able to locate him."'
+				
+				if arrpos('$SMSContact', 'Blackmailer') >= 0:
+					act 'Show them the messages':
+						*clr & cla
+						if $blackmailQW['blackmail_image_chosen'] = '': $blackmailQW['blackmail_image_chosen'] = $blackmailQW['init_flashimage']
+						blackmailQW['escape'] = 1
+						minut += 10
+						gs 'stat'
+
+						'<center><img <<$set_imgh>> src="<<$blackmailQW[''blackmail_image_chosen'']>>"></center>'
+						'You open your phone and show the police officers the messages, and the images that you were send. You see the officer raise his eyebrow and you think you can almost hear him mutter "accidentally?" under his breath.'
+						'The officer fuddles around with you phone for a few minutes, his expression darkning with every bygone moment.'
+						'"Ma''am, we''re taking this very seriously, but the perp was smart and hid his telephone number. We''ll try our best, stake out this drop-off location, but I don''t have high hopes that we''ll catch him quick enough."'
+						'"I''m so sorry."'
+						'A sense of defeat and humiliation fills you, the need to remove yourself from this situation is almost unbearable.'
+						'"We will do everything we can, and here, take my card. Anything you need."'
+						'You pocket the card without even looking at it, and quickly hurry out the station.'
+						act 'Leave': gt $loc, $loc_arg
+
+					end
+					act 'Claim you deleted the messages': gt 'blackmailer', 'police_deleted'
+				else
+					act 'Say you deleted the messages': gt 'blackmailer', 'police_deleted'
+				end
+			end
+		end
+		act 'This is too embarrassing, flee the police station':
+			*clr & cla
+			blackmailQW['escape'] = -1
+			minut += 10
+			gs 'stat'
+
+			if $region = 'pav':
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/police/pavext.jpg" ></center>'
+			else:
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/police/cityext.jpg"></center>'
+			end
+			'Sitting in the interrogation room with the police officer, the situation suddenly comes crashing into you. You''re going to have to show some proof. That you were flashing your <<$blackmailQW[''init_flashaction'']>> <<$blackmailQW[''init_flashloc_desc'']>>. They will see the texts, the photos. They will see you for who you must be on the inside. You can already feel their eyes judging you.'
+			'"I-I-I can''t, I can''t, I can''t..." you manage to push out, nearly hyper-ventilating.'
+			'You nearly jump up out of the chair, backing up towards the door. Your eyes wide with panic "I''m sorry, I was mistaken".'
+			'The police officer just sighs and moves towards the door "If you change your mind, you kn..."'
+			'The remainder of the officers words fall on deaths ear as you rush out of the police station.'
+
+			act 'Leave the station': gt $loc, $loc_arg
+		end
+	end
+end
+
+if $ARGS[0] = 'police_deleted':
+	minut += 10
+	blackmailQW['escape'] = -1
+	gs 'stat'
+
+	if $region = 'pav':
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/police/pavext.jpg" ></center>'
+	else:
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/police/cityext.jpg"></center>'
+	end
+	'"Uhhmm" you stammer. "I, uhh, I deleted them."'
+	'The hope in the officers eyes is immediately extinguised, replaced with a distrusting and tired look. "I''m sorry ma''am, we''ll try our best but without any evidence we really can''t help you."'
+	'"If the suspect contacts you again, please don''t delete the messages. Okay?"'
+	'You nod your head dejectedly.'
+	'The officer stands up and escorts you back to the lobby. You briefly think to inform the officer about the drop-off location, but before you can even open your mouth you''re already outside the station.'
+	'Seems like you''ll need some proof before they''ll take you seriously.'
+
+	act 'Leave': gt $loc, $loc_arg
+end
+
+
+
+
 	!!=============================================!!
 	!!                                             !!
 	!!                  REPEATING                  !!
 	!!                                             !!
 	!!=============================================!!
 
+
 if $ARGS[0] = 'Add_SMS_repeat':
 	gs 'telefon', 'ClearSMSSchedule', 'Blackmailer'
 	blackmailQW['smsday'] = daystart + 2
+	if blackmailQW['escape'] = -1: blackmailQW['escape'] = 0
 	blackmailQW['next_payment'] = (rand(50, 100) + (blackmailQW['total_payment'] / 50 ) / (1 + blackmailQW['total_payment'] / 20000)) * 10
 	$blackmailQW['blackmail_image_chosen'] = func('blackmailer', 'choose_blackmail_image')
 
@@ -598,6 +758,8 @@ if $ARGS[0] = 'park_repeat':
 	else
 		act 'Hide the money (<<blackmailQW[''next_payment'']>> <b>₽</b>)':
 			*clr & cla
+			gs 'telefon', 'ClearSMSSchedule', 'Blackmailer'
+			blackmailQW['smsday'] = 0
 			money -= blackmailQW['next_payment']
 			blackmailQW['total_payment'] += blackmailQW['next_payment']
 			blackmailQW['next_payment'] = 0

locations/booty_call.qsrc

@@ -10,7 +10,7 @@ if $ARGS[0] = 'scheduler':
 end
 
 if $ARGS[0] = 'fuckbuddy_scheduler2':
-	if i <= arrsize('$fuckbuddy'):
+	if i < arrsize('$fuckbuddy'):
 		$temp = 'FuckBuddy'
 		gs 'booty_call', 'fb_npc_stat_update'
 !!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and npc_rel[$FuckBuddy[i]] > 0 and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_big_fight[$FuckBuddy[i]] < daystart - 7:
@@ -45,7 +45,7 @@ end
 
 
 if $ARGS[0] = 'sugar_daddy_scheduler2':
-	if i <= arrsize('$sugar_daddy'):
+	if i < arrsize('$sugar_daddy'):
 		gs 'booty_call', 'sd_npc_stat_update'
 !!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and npc_rel[$FuckBuddy[i]] > 0 and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_big_fight[$FuckBuddy[i]] < daystart - 7:
 
@@ -146,7 +146,7 @@ if $ARGS[0] = 'SMS raiser':
 		i += 1
 		jump 'fuckbuddy_sms_raiser_loop'
 	end
-	
+
 	i = 0
 	:sugar_daddy_sms_raiser_loop
 	if i < arrsize('$sugar_daddy'):
@@ -162,53 +162,57 @@ if $ARGS[0] = 'SMS raiser':
 end
 
 if $ARGS[0] = 'home_links':
-	i=0
-	*nl
+	i = 0
 	:loopFB_homes
-	if (npc_residence[$Fuckbuddy[i]] = 1 and $loc = 'pav_residential') or (npc_residence[$Fuckbuddy[i]] = 3 and $loc = 'city_residential')or (npc_residence[$Fuckbuddy[i]] = 4 and $loc = 'city_center'):
-		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>>''''s</a> apartment is nearby.'' ')
-		!! ''''
+	if i < arrsize('$Fuckbuddy'):
+		*nl
+		if (npc_residence[$Fuckbuddy[i]] = 1 and $loc = 'pav_residential') or (npc_residence[$Fuckbuddy[i]] = 3 and $loc = 'city_residential')or (npc_residence[$Fuckbuddy[i]] = 4 and $loc = 'city_center'):
+			dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>>''''s</a> apartment is nearby.'' ')
+			!! ''''
+		end
+		!!		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''fb_npc_home_start'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>>''''s</a> apartment is nearby.'' ')
+		i += 1
+		jump 'loopFB_homes'
 	end
-	!!		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''fb_npc_home_start'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>>''''s</a> apartment is nearby.'' ')
 
-	i +=1
-	if i < arrsize('$Fuckbuddy') : jump 'loopFB_homes'
-	
-	i=0
-	*nl
+	i = 0
 	:loopSD_homes
-	if (npc_residence[$sugar_daddy[i]] = 1 and $loc = 'pav_residential') or (npc_residence[$sugar_daddy[i]] = 3 and $loc = 'city_residential')or (npc_residence[$sugar_daddy[i]] = 4 and $loc = 'city_center'):
-		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$sugar_daddy[i]>>'''' "><<$npc_firstname[$sugar_daddy[i]]>>''''s</a> apartment is nearby.'' ')
-		!! ''''
+	if i < arrsize('$sugar_daddy'):
+		*nl
+		if (npc_residence[$sugar_daddy[i]] = 1 and $loc = 'pav_residential') or (npc_residence[$sugar_daddy[i]] = 3 and $loc = 'city_residential')or (npc_residence[$sugar_daddy[i]] = 4 and $loc = 'city_center'):
+			dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$sugar_daddy[i]>>'''' "><<$npc_firstname[$sugar_daddy[i]]>>''''s</a> apartment is nearby.'' ')
+			!! ''''
+		end
+		!!		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''fb_npc_home_start'''',''''<<$sugar_daddy[i]>>'''' "><<$npc_firstname[$sugar_daddy[i]]>>''''s</a> apartment is nearby.'' ')
+		i += 1
+		jump 'loopSD_homes'
 	end
-	!!		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''fb_npc_home_start'''',''''<<$sugar_daddy[i]>>'''' "><<$npc_firstname[$sugar_daddy[i]]>>''''s</a> apartment is nearby.'' ')
-
-	i +=1
-	if i < arrsize('$sugar_daddy') : jump 'loopSD_homes'
 end
 
 if $ARGS[0] = 'hotel_links':
-	i=0
-	*nl
+	i = 0
 	:loopFB_hotel
-	if $booty_call_hotel[$Fuckbuddy[i]] = $region and booty_call_invite[$FuckBuddy[i]] = daystart:
-		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>></a> booked a hotel room to meet you in.'' ')
-		!! ''''
+	if i < arrsize('$Fuckbuddy'):
+		*nl
+		if $booty_call_hotel[$Fuckbuddy[i]] = $region and booty_call_invite[$FuckBuddy[i]] = daystart:
+			dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>></a> booked a hotel room to meet you in.'' ')
+			!! ''''
+		end
+		i += 1
+		jump 'loopFB_hotel'
 	end
-	
-	i +=1
-	if i < arrsize('$Fuckbuddy') : jump 'loopFB_hotel'
-	
-	i=0
-	*nl
+
+	i = 0
 	:loopSD_hotel
-	if $booty_call_hotel[$sugar_daddy[i]] = $region and booty_call_invite[$sugar_daddy[i]] = daystart:
-		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$sugar_daddy[i]>>'''' "><<$npc_firstname[$sugar_daddy[i]]>></a> booked a hotel room to meet you in.'' ')
-		!! ''''
+	if i < arrsize('$sugar_daddy'):
+		*nl
+		if $booty_call_hotel[$sugar_daddy[i]] = $region and booty_call_invite[$sugar_daddy[i]] = daystart:
+			dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$sugar_daddy[i]>>'''' "><<$npc_firstname[$sugar_daddy[i]]>></a> booked a hotel room to meet you in.'' ')
+			!! ''''
+		end
+		i += 1
+		jump 'loopSD_hotel'
 	end
-	
-	i +=1
-	if i < arrsize('$sugar_daddy') : jump 'loopSD_hotel'
 end
 
 !! booty_call_invite['B0']

locations/booty_call_sms.qsrc

@@ -425,7 +425,7 @@ if $ARGS[0] = 'new_booty_call':
 		$SMSTree['10'] = 'i want to see you'
 			$SMSTree['11'] = 'ive booked a hotel room'
 
-	elseif $npc_rel_type[$ARGS[1]] = 'casual_date' or $npc_rel_type[$ARGS[2]] = 'fuckbuddy':
+	elseif $npc_rel_type[$ARGS[1]] = 'casual_date' or $npc_rel_type[$ARGS[1]] = 'fuckbuddy':
 		$SMSTree['10'] = 'ive been thinking about you'
 				!! player response 1 option 1
 			$SMSTree['a11'] = 'what were you thinking about?'
@@ -457,6 +457,8 @@ if $ARGS[0] = 'new_booty_call':
 								$SMSTree['a12'] = 'want to come over and have some fun?'
 							end
 						end
+					else
+						$SMSTree['a12'] = 'PLACEHOLDER 1'
 					end
 				end
 
@@ -517,6 +519,16 @@ if $ARGS[0] = 'new_booty_call':
 					$SMSTree['11'] = 'lets get naughty'
 			end
 		end
+
+	elseif $npc_rel_type[$ARGS[1]] = 'lover':
+		!! temp
+		$SMSTree['10'] = '$npc_rel_type = lover!!'
+			$SMSTree['11'] = 'PLACEHOLDER2'
+
+	else
+		!! temp
+		$SMSTree['10'] = 'PLACEHOLDER3'
+			$SMSTree['11'] = 'PLACEHOLDER4'
 	end
 
 

locations/pav_station.qsrc

@@ -3,8 +3,9 @@
 if $ARGS[0] = 'station_outside':
 	$menu_loc = 'pav_station'
 	$menu_arg = 'station_outside'
-	menu_off = 0
 	$location_type = 'public_indoors'
+	$region = 'pav'
+	menu_off = 0
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/police/pavext.jpg" ></center>'
@@ -17,10 +18,12 @@ end
 
 
 if $ARGS[0] = 'station_inside':
+	$menu_loc = 'pav_station'
 	$menu_arg = 'station_inside'
+	$location_type = 'public_indoors'
+	$region = 'pav'
 	menu_off = 0
 	gs 'stat'
-	$location_type = 'public_indoors'
 
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/police/pavrec.jpg" ></center>'
 	'You are welcomed by a tiny reception area with someone always just lazily hanging around waiting for something to happen. The whole interior has seen better days and you''re reminded by the stories you''ve heard from your parents about how everything used to look run-down during their younger days.'
@@ -55,6 +58,7 @@ if $ARGS[0] = 'reception':
 	end
 
 	if rape_count > 0 and rape_day+2 > daystart: act 'Report a rape': gt 'pav_station', 'rape_report'
+	gs 'blackmailer', 'set_police_act'
 end
 
 temp_tot_booked_pav = policeQW['shoplift_booked_pav'] + policeQW['prostitution_booked_pav']

locations/police_station.qsrc

@@ -3,6 +3,7 @@
 if $ARGS[0] = 'start':
 	$menu_loc = 'police_station'
 	$menu_arg = 'start'
+	$region = 'city'
 	menu_off = 0
 
 	'<center><h1><font color="maroon">Police station Entrance</font></h1></center>'
@@ -17,13 +18,14 @@ end
 if $ARGS[0] = 'reception':
 	$menu_loc = 'police_station'
 	$menu_arg = 'reception'
+	$region = 'city'
 	menu_off = 0
 
-	'<center><h1><font color="maroon">Reception area</font></h1></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/police/cityrec.jpg"></center>'
 	'Upon entering the station you''re welcomed by a reception desk. The officers sitting here are protected by thick glass and you see several monitors and computers keeping an eye on everything that''s happening inside and outside the building.'
 	
 	if rape_count > 0 and rape_day+2 > daystart: act 'Report a rape': gt'police_station','rape_report'
+	gs 'blackmailer', 'set_police_act'
 	act 'Return to the center': gt 'city_center'
 end