Merge remote-tracking branch 'Anjuna/master'

locations/blackmailer.qsrc

@@ -85,17 +85,17 @@ end
 if $ARGS[0] = 'cikl':
 	if blackmailQW['stage'] = 3 and blackmailQW['smsday'] = 0:
 		blackmailQW['smsday'] = blackmailQW['dreamday'] + 3
-		gs 'telefon', 'Blackmailer', 'icon_na', 1
-		gs 'telefon', 'SetSMSSchedule', "", "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)"
+		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', "", "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)"
+		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', "", "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)"
+		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) + 6
-		gs 'telefon', 'SetSMSSchedule', "", "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)"
+		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)"
 	end
 end
 
@@ -151,7 +151,7 @@ elseif $ARGS[0] = 'photo_dream2':
 		blackmailQW['stage'] = 3
 		blackmailQW['smsday'] = daystart + 6
 		gs 'telefon', 'Blackmailer', 'icon_na', 1
-		gs 'telefon', 'SetSMSSchedule', "", "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)"
+		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)"
 	end
 	blackmailQW['dreamday'] = daystart + 3
 	gs 'arousal', 'flash', -5
@@ -263,7 +263,7 @@ if $ARGS[0] = 'Add_SMS1':
 	blackmailQW['smsday'] = daystart + 2
 	blackmailQW['next_payment'] = rand(50, 100) * 10
 
-	$SMSTree['0'] = '"Hello <<pcs_firstname>>!"'
+	$SMSTree['0'] = '"Hello <<$pcs_firstname>>!"'
 
 		if motherKnowWhore = 0 and npc_rel['A29'] > 0:
 			$SMSTree['1'] = '"If you don''t want your mother to see this image you will do exactly as I say"'
@@ -282,7 +282,7 @@ if $ARGS[0] = 'Add_SMS1':
 		gs 'SMStext_builder', 'receive', $SMSTree['1']
 		gs 'SMStext_builder', 'receive', $SMSTree['2']
 		gs 'SMStext_builder', 'receive', $SMSTree['3']
-		gs 'SMStext_builder', 'send', 'Blackmailer'
+		gs 'SMStext_builder', 'add_sms', 'Blackmailer'
 	gs 'SMStext_builder', 'end'
 	killvar '$SMSTree'
 end
@@ -290,12 +290,12 @@ end
 if $ARGS[0] = 'Add_SMS1_reminder':
 	gs 'telefon', 'ClearSMSSchedule', 'Blackmailer'
 
-	$SMSTree['0'] = '"Don''t forget, if you don''t leave <<blackmailQW[''next_payment'']>> <b>₽</b> beneath the fourth park bench, you will regret it"'
+	$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['init_flashimage'] + '.jpg'
-		gs 'SMStext_builder', 'send', 'Blackmailer'
+		gs 'SMStext_builder', 'add_sms', 'Blackmailer'
 	gs 'SMStext_builder', 'end'
 	killvar '$SMSTree'
 end
@@ -312,7 +312,7 @@ if $ARGS[0] = 'Add_SMS_failure':
 		gs 'SMStext_builder', 'receive', $SMSTree['0']
 		gs 'SMStext_builder', 'receive', $SMSTree['1']
 		gs 'SMStext_builder', 'receive', $SMSTree['2']
-		gs 'SMStext_builder', 'send', 'Blackmailer'
+		gs 'SMStext_builder', 'add_sms', 'Blackmailer'
 	gs 'SMStext_builder', 'end'
 
 	if blackmailQW['stage'] < 5:
@@ -327,37 +327,6 @@ if $ARGS[0] = 'Add_SMS_failure':
 end
 
 
-if $ARGS[0] = 'Add_SMS_repeat':
-	gs 'telefon', 'ClearSMSSchedule', 'Blackmailer'
-	blackmailQW['stage'] = blackmailQW['stage'] * 10 + 1
-	blackmailQW['smsday'] = daystart + 2
-	blackmailQW['next_payment'] = rand(50, 100) * 10
-
-	$SMSTree['0'] = '"You know what we want"'
-
-		if motherKnowWhore = 0 and npc_rel['A29'] > 0:
-			$SMSTree['1'] = '"If you don''t want your mother to see this image you will do exactly as I say"'
-		elseif $start_type['loc'] = 'sg' and gruptipe ! 5:
-			$SMSTree['1'] = '"If you don''t want your friends to see this image you will do exactly as I say"'
-		else
-			$SMSTree['1'] = '"If you don''t want the world to see this image you will do exactly as I say"'
-		end
-
-				$SMSTree['2'] = '"Leave <<blackmailQW[''next_payment'']>> <b>₽</b> beneath the fourth park bench, I know you know which one."'
-					$SMSTree['3'] = '"You have three days"'
-
-	gs 'SMStext_builder', 'start'
-		gs 'SMStext_builder', 'receive', $SMSTree['0']
-		gs 'SMSText_builder', 'receive_img', $blackmailQW['init_flashimage'] + '.jpg'
-		gs 'SMStext_builder', 'receive', $SMSTree['1']
-		gs 'SMStext_builder', 'receive', $SMSTree['2']
-		gs 'SMStext_builder', 'receive', $SMSTree['3']
-		gs 'SMStext_builder', 'send', 'Blackmailer'
-	gs 'SMStext_builder', 'end'
-	killvar '$SMSTree'
-end
-
-
 
 	!!=============================================!!
 	!!                                             !!
@@ -400,6 +369,9 @@ if $ARGS[0] = 'park1':
 			minut += 1
 			gs 'stat'
 
+			'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
+			'You descretely hide the money near the base of the bench.'
+
 			act 'Quickly walk away': gt $loc, $loc_arg
 		end
 	end
@@ -440,7 +412,7 @@ if $ARGS[0] = 'Add_SMS_repeat':
 		gs 'SMStext_builder', 'receive', $SMSTree['1']
 		gs 'SMStext_builder', 'receive', $SMSTree['2']
 		gs 'SMStext_builder', 'receive', $SMSTree['3']
-		gs 'SMStext_builder', 'send', 'Blackmailer'
+		gs 'SMStext_builder', 'add_sms', 'Blackmailer'
 	gs 'SMStext_builder', 'end'
 	killvar '$SMSTree'
 end
@@ -465,6 +437,9 @@ if $ARGS[0] = 'park_repeat':
 			minut += 1
 			gs 'stat'
 
+			'<center><img <<$set_imgh>> src="images/system/image_needed.png" ></center>'
+			'You descretely hide the money near the base of the bench.'
+
 			act 'Quickly walk away': gt $loc, $loc_arg
 		end
 	end

locations/lover.qsrc

@@ -159,7 +159,7 @@ if $ARGS[0] = 'add_fuckbuddy':
 		$fuckbuddy[] = $boy
 		$npc_rel_type[$boy] = 'fuckbuddy'
 		gs 'telefon', 'AddContact', $boy, $npc_pic[$boy], 0
-		gs 'telefon', 'SetCallSchedule', "", "hour >= 8 and hour <= 22", "", "hour >= 8 and hour <= 22"
+		gs 'telefon', 'SetCallSchedule', $boy, "", "hour >= 8 and hour <= 22", "", "hour >= 8 and hour <= 22"
 	end
 end
 
@@ -175,7 +175,7 @@ if $ARGS[0] = 'add_sugar_daddy':
 		$sugar_daddy[] = $boy
 		$npc_rel_type[$boy] = 'sugar_daddy'
 		gs 'telefon', 'AddContact', $boy, $npc_pic[$boy], 0
-		gs 'telefon', 'SetCallSchedule', "", "hour >= 8 and hour <= 22", "", "hour >= 8 and hour <= 22"
+		gs 'telefon', 'SetCallSchedule', $boy, "", "hour >= 8 and hour <= 22", "", "hour >= 8 and hour <= 22"
 	end
 end
 

locations/nastja.qsrc

@@ -45,7 +45,7 @@ if $ARGS[0] = 'pos1':
 			*clr
 			npc_QW['A192'] = 1
 			gs 'telefon', 'AddContact', 'A192', 'icon_nastja', 0
-			gs 'telefon', 'SetCallSchedule', "gs 'nastja', 'start'", "hour >= 8 and hour < 20", "", "0"
+			gs 'telefon', 'SetCallSchedule', 'A192', "gs 'nastja', 'start'", "hour >= 8 and hour < 20", "", "0"
 			minut += 60
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/anastasia/nastja.jpg"></center>'

locations/natbel_chat.qsrc

@@ -727,18 +727,24 @@ if $ARGS[0] = 'job_questions_runner':
 					'You both head to the bathroom and undress. Natasha turns the shower on pausing for a passionate kiss before getting in and lathering each other.'
 
 					act 'Escalation':
+						*clr & cla
+						minut += 5
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/kissing_games/natasha37.jpg"></center>'
 						'Unable to keep your hands off each other the kissing quickly escalates.'
 						'Natasha''s hand is soon between your legs as her fingers begin to work their magic.'
 						'You, in turn, push your leg between Natasha''s as she starts to ride your leg.'
 
 						act 'Grind':
+							*clr & cla
+							minut += 5
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/kissing_games/natasha38.jpg"></center>'
 							'It''s not long before you lean forward and push your arse back into Natasha''s pussy and start grinding on her.'
 							'Oh! Fuck! <<$pcs_nickname>>! I''m going to..."'
 							'You decide to pull back at the last second...'
 
 							act 'Licking':
+								*clr & cla
+								minut += 5
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/kissing_games/natasha39.jpg"></center>'
 								'You push Natasha''s head down to your pussy and hold it there'
 								'Your legs start to feel like jelly so you sit on the small ledge.'
@@ -885,6 +891,8 @@ if $ARGS[0] = 'job_questions_natbel_returns':
 
 			killvar 'temp_city_work'
 			killvar 'temp_pav_work'
+			natbelQW['StP_trip_daystart'] = daystart + 14 + (13-week) mod 7		& ! Saturday 2 weeks from now
+			natbelQW['FriendLover'] = 9
 			act 'Keep talking': gt 'natbel_chat', 'chat'
 			act 'Stop talking': gt 'natbelapt', 'natroom'
 		end

locations/telefon.qsrc

@@ -1117,7 +1117,6 @@ if $ARGS[0] = 'IncomingSMSCheck':
 		jump 'telefonIncSMSLoop'
 	end
 
-
 	killvar 'i'
 end
 

locations/vladimirQW_loc.qsrc

@@ -74,7 +74,7 @@ if $ARGS[0] = 'qwnamedy':
 			vladimirQW['stage'] = 20
 			vladimirQW['day'] = daystart
 			gs 'telefon', 'AddContact', 'A108', 'icon_na', 1
-			gs 'telefon', 'SetCallSchedule', "", "0", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirQW['day'] ! daystart and hour >= 15 and hour <= 17"
+			gs 'telefon', 'SetCallSchedule', 'A108', "", "0", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirQW['day'] ! daystart and hour >= 15 and hour <= 17"
 			gs 'stat'
 			'You tell Vladmimir your phone number and he writes it down in a small notebook with a leather cover.'