Procházet zdrojové kódy

[added] Start of work on added SMS scheduling in the same way as calls.

anjuna krokus před 1 měsícem
rodič
revize
18739e5033

+ 1 - 1
locations/Katlake.qsrc

@@ -38,7 +38,7 @@ if $ARGS[0] = 'znakomstvo':
 		clr
 		katday = daystart
 		telkat += 1
-		gs 'telefon', 'AddContact', 'A219', 'icon_kat',"$telsob = 'Kate' & gt 'telefon', 'mobilaraz'","hour >= 8 and hour <= 20","",""
+		gs 'telefon', 'AddContact', 'A219', 'icon_kat',"$telsob = 'Kate' & gt 'telefon', 'mobilaraz'", "hour >= 8 and hour <= 20", "","0", "", "0", "", "0", 0
 		kat = 1
 		npc_rel['A219'] += 1
 		minut += 30

+ 1 - 1
locations/band_tour_anushka_SMS.qsrc

@@ -109,7 +109,7 @@ if $ARGS[0] = 'Week1':
 	elseif $ARGS[1] = 'Choice_a':
 		!! Add Anushka to the contact list if she isn''t in it yet.
 		!! Is here to add it after reading the text.
-		if arrpos('$contact', 'A144') = -1: gs 'telefon', 'AddContact', 'A144', 'images/characters/shared/headshots_main/big144.jpg', "", "1 = 0", "", "", 0
+		if arrpos('$contact', 'A144') = -1: gs 'telefon', 'AddContact', 'A144', 'images/characters/shared/headshots_main/big144.jpg', "", "0", "", "0", "", "0", "", "0", 0
 
 		gs 'SMStext_builder', 'start'
 			gs 'SMStext_builder', 'send', $SMSTree['a1']

+ 2 - 2
locations/hourly_events.qsrc

@@ -337,13 +337,13 @@ if (hour mod 2) = 0: gs 'outdoors', 'weather'
 if nerd_game['invite_day'] < daystart and week = 1 and hour >= 11 and hour <= 15:
 	if yearstart = 1 and (grupTipe = 3 or nerd_game['stage'] > 0 or rand(80,npc_rel['A152']) > 95):
 		!! hour = 15 forces SMS if it hasn''t triggered yet.
-		if rand(0, 2) = 0 or hour = 15: 
+		if rand(0, 2) = 0 or hour = 15:
 			gs 'nerd_game_night', 'summer_invite_sms', 'Add SMS'
 		end
 
 	elseif yearstart > 1 and nerd_game['fixed_uni_day'] = 0 and (nerd_game['stage'] > 0 or rand(80,npc_rel['A152']) > 95):
 		!! hour = 15 forces SMS if it hasn''t triggered yet.
-		if rand(0, 2) = 0 or hour = 15: 
+		if rand(0, 2) = 0 or hour = 15:
 			gs 'nerd_game_night', 'summer2_invite_sms', 'Add SMS'
 		end
 	end

+ 2 - 2
locations/lover.qsrc

@@ -158,7 +158,7 @@ if $ARGS[0] = 'add_fuckbuddy':
 	if arrpos('$fuckbuddy',$boy) = -1:
 		$fuckbuddy[] = $boy
 		$npc_rel_type[$boy] = 'fuckbuddy'
-		gs 'telefon', 'AddContact', $boy, $npc_pic[$boy],'',"hour >= 8 and hour <= 22",'', "hour >= 8 and hour <= 22", 0
+		gs 'telefon', 'AddContact', $boy, $npc_pic[$boy],"","hour >= 8 and hour <= 22", "", "hour >= 8 and hour <= 22", "", "0", "", "0", 0
 	end
 end
 
@@ -173,7 +173,7 @@ if $ARGS[0] = 'add_sugar_daddy':
 	if arrpos('$sugar_daddy',$boy) = -1:
 		$sugar_daddy[] = $boy
 		$npc_rel_type[$boy] = 'sugar_daddy'
-		gs 'telefon', 'AddContact', $boy, $npc_pic[$boy],'',"hour >= 8 and hour <= 22",'', "hour >= 8 and hour <= 22", 0
+		gs 'telefon', 'AddContact', $boy, $npc_pic[$boy],'',"hour >= 8 and hour <= 22",'', "hour >= 8 and hour <= 22", "", "0", "", "0", 0
 	end
 end
 

+ 6 - 6
locations/nastja.qsrc

@@ -44,7 +44,7 @@ if $ARGS[0] = 'pos1':
 			cla
 			*clr
 			npc_QW['A192'] = 1
-			gs 'telefon', 'AddContact', 'A192', 'icon_nastja', "gs 'nastja', 'start'", "hour >= 8 and hour < 20", "", ""
+			gs 'telefon', 'AddContact', 'A192', 'icon_nastja', "gs 'nastja', 'start'", "hour >= 8 and hour < 20", "", "0", "", "0", "", "0", 0
 			minut += 60
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/anastasia/nastja.jpg"></center>'
@@ -82,7 +82,7 @@ if $ARGS[0] = 'pos5':
 	*clr
 	minut += 60
 	npc_QW['A192'] = 2
-	gs 'telefon', 'AddContact', 'A192', 'icon_nastja', "gs 'nastja', 'start'", "hour >= 8 and hour < 20", "", ""
+	gs 'telefon', 'AddContact', 'A192', 'icon_nastja', "gs 'nastja', 'start'", "hour >= 8 and hour < 20", "", "0", "", "0", "", "0", 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/anastasia/1party0.jpg"></center>'
 	'You arrive at a karaoke cafe called "Mast".'
@@ -336,7 +336,7 @@ if $ARGS[0] = 'pos12':
 	minut += 10
 	pcs_mood += 40
 	npc_QW['A192'] = 3
-	gs 'telefon', 'AddContact', 'A192', 'icon_nastja', "gs 'nastja', 'start'", "hour >= 8 and hour < 20", "", ""
+	gs 'telefon', 'AddContact', 'A192', 'icon_nastja', "gs 'nastja', 'start'", "hour >= 8 and hour < 20", "", "0", "", "0", "", "0", 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/anastasia/tel_talk.jpg"></center>'
 	'It rings two, three, four times before Anastasia picks up.'
@@ -487,7 +487,7 @@ if $ARGS[0] = 'pos21':
 	*clr
 	minut += 20
 	npc_QW['A192'] = 5
-	gs 'telefon', 'AddContact', 'A192', 'icon_nastja', "gs 'nastja', 'start'", "hour >= 8 and hour < 20", "", ""
+	gs 'telefon', 'AddContact', 'A192', 'icon_nastja', "gs 'nastja', 'start'", "hour >= 8 and hour < 20", "", "0", "", "0", "", "0", 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/anastasia/2bslp.jpg"></center>'
 	'After running and jumping around like that in everybody''s plain view, sitting down and lying back topless isn''t enough to make you feel shy and neither you nor Nastya have any qualms about spreading your arms and showing off your bodies to everyone as you sunbathe once again.'
@@ -506,7 +506,7 @@ if $ARGS[0] = 'pos22':
 	minut += 10
 	pcs_mood += 50
 	npc_QW['A192'] = 6
-	gs 'telefon', 'AddContact', 'A192', 'icon_nastja', "gs 'nastja', 'start'", "hour >= 8 and hour < 20", "", ""
+	gs 'telefon', 'AddContact', 'A192', 'icon_nastja', "gs 'nastja', 'start'", "hour >= 8 and hour < 20", "", "0", "", "0", "", "0", 0
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/characters/city/anastasia/tel_talk.jpg"></center>'
@@ -686,7 +686,7 @@ if $ARGS[0] = 'pos31':
 	minut += 10
 	pcs_mood += 50
 	npc_QW['A192'] = 7
-	gs 'telefon', 'AddContact', 'A192', 'icon_nastja', "gs 'nastja', 'start'", "hour >= 8 and hour <= 20", "", ""
+	gs 'telefon', 'AddContact', 'A192', 'icon_nastja', "gs 'nastja', 'start'", "hour >= 8 and hour <= 20", "", "0", "", "0", "", "0", 0
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/characters/city/anastasia/tel_talk.jpg"></center>'

+ 6 - 6
locations/nerd_game_night.qsrc

@@ -1510,7 +1510,7 @@ if $ARGS[0] = 'summer_invite_sms':
 		!! Add Feofan to the contact list if he isn''t in it yet.
 		!! Is here to add it after reading the text.
 		if nerd_game['first_SMS_received'] = 0:
-			if arrpos('$contact', 'A152') = -1: gs 'telefon', 'AddContact', 'A152', 'images/characters/shared/headshots_main/big152.jpg', "", "1 = 0", "", "", 0
+			if arrpos('$contact', 'A152') = -1: gs 'telefon', 'AddContact', 'A152', 'images/characters/shared/headshots_main/big152.jpg', "", "0", "", "0", "", "0", "", "0", 0
 			nerd_game['first_SMS_received'] = 1
 		end
 
@@ -1528,7 +1528,7 @@ if $ARGS[0] = 'summer_invite_sms':
 		!! Add Feofan to the contact list if he isn''t in it yet.
 		!! Is here to add it after reading the text.
 		if nerd_game['first_SMS_received'] = 0:
-			if arrpos('$contact', 'A152') = -1: gs 'telefon', 'AddContact', 'A152', 'images/characters/shared/headshots_main/big152.jpg', "", "1 = 0", "", "", 0
+			if arrpos('$contact', 'A152') = -1: gs 'telefon', 'AddContact', 'A152', 'images/characters/shared/headshots_main/big152.jpg', "", "0", "", "0", "", "0", "", "0", 0
 			nerd_game['first_SMS_received'] = 1
 		end
 
@@ -1547,7 +1547,7 @@ if $ARGS[0] = 'summer_invite_sms':
 		!! Add Feofan to the contact list if he isn''t in it yet.
 		!! Is here to add it after reading the text.
 		if nerd_game['first_SMS_received'] = 0:
-			if arrpos('$contact', 'A152') = -1: gs 'telefon', 'AddContact', 'A152', 'images/characters/shared/headshots_main/big152.jpg', "", "1 = 0", "", "", 0
+			if arrpos('$contact', 'A152') = -1: gs 'telefon', 'AddContact', 'A152', 'images/characters/shared/headshots_main/big152.jpg', "", "0", "", "0", "", "0", "", "0", 0
 			nerd_game['first_SMS_received'] = 1
 		end
 
@@ -1617,7 +1617,7 @@ if $ARGS[0] = 'summer2_invite_sms':
 		!! Add Feofan to the contact list if he isn''t in it yet.
 		!! Is here to add it after reading the text.
 		if nerd_game['first_SMS_received'] = 0:
-			if arrpos('$contact', 'A152') = -1: gs 'telefon', 'AddContact', 'A152', 'images/characters/shared/headshots_main/big152.jpg', "", "1 = 0", "", "", 0
+			if arrpos('$contact', 'A152') = -1: gs 'telefon', 'AddContact', 'A152', 'images/characters/shared/headshots_main/big152.jpg', "", "0", "", "0", "", "0", "", "0", 0
 			nerd_game['first_SMS_received'] = 1
 		end
 
@@ -1635,7 +1635,7 @@ if $ARGS[0] = 'summer2_invite_sms':
 		!! Add Feofan to the contact list if he isn''t in it yet.
 		!! Is here to add it after reading the text.
 		if nerd_game['first_SMS_received'] = 0:
-			if arrpos('$contact', 'A152') = -1: gs 'telefon', 'AddContact', 'A152', 'images/characters/shared/headshots_main/big152.jpg', "", "1 = 0", "", "", 0
+			if arrpos('$contact', 'A152') = -1: gs 'telefon', 'AddContact', 'A152', 'images/characters/shared/headshots_main/big152.jpg', "", "0", "", "0", "", "0", "", "0", 0
 			nerd_game['first_SMS_received'] = 1
 		end
 
@@ -1654,7 +1654,7 @@ if $ARGS[0] = 'summer2_invite_sms':
 		!! Add Feofan to the contact list if he isn''t in it yet.
 		!! Is here to add it after reading the text.
 		if nerd_game['first_SMS_received'] = 0:
-			if arrpos('$contact', 'A152') = -1: gs 'telefon', 'AddContact', 'A152', 'images/characters/shared/headshots_main/big152.jpg', "", "1 = 0", "", "", 0
+			if arrpos('$contact', 'A152') = -1: gs 'telefon', 'AddContact', 'A152', 'images/characters/shared/headshots_main/big152.jpg', "", "0", "", "0", "", "0", "", "0", 0
 			nerd_game['first_SMS_received'] = 1
 		end
 

+ 15 - 0
locations/saveupdater.qsrc

@@ -2837,6 +2837,21 @@ if temp_current_save_version < 00090300:
 		end
 		killvar 'temp_pos'
 	end
+
+	!! sms scheduling added to addcontact in telefon:
+	if arrsize('$contact') > arrsize('contactOSMSCode'):
+		temp_maxi = arrsize('$contact')
+		temp_i = arrsize('contactOSMSCode')
+		:saveupdater_SMSCODE_scheduling_loop
+			$contactOSMSCode[temp_i] = ""
+			$contactOSMSSche[temp_i] = "0"
+			$contactISMSCode[temp_i] = ""
+			$contactISMSSche[temp_i] = "0"
+			temp_i += 1
+		if temp_i < temp_maxi: jump 'saveupdater_SMSCODE_scheduling_loop'
+		killvar 'temp_maxi'
+		killvar 'temp_i'
+	end
 end
 
 

+ 37 - 29
locations/telefon.qsrc

@@ -21,9 +21,9 @@
 !! contactLastCall[] = last time this Contact called
 !
 !! Add a contact with AddContact
-!!	gs 'telefon', 'AddContact', <NPC Code>, <Icon for NPC>, <Code for Incoming Call>, <Limiter for Incoming Call>, <Code for Outgoing Call>, <Limiter for Outgoign Call>, <Anonymous=1>
+!!	gs 'telefon', 'AddContact', <NPC Code>, <Icon for NPC>, <Code for Incoming Call>, <Limiter for Incoming Call>, <Code for Outgoing Call>, <Limiter for Outgoign Call>, <Code for Incoming SMS>, <Limiter for Incoming SMS>, <Code for Outgoing SMS>, <Limiter for Outgoign SMS>, <Anonymous=1>
 !!  Example, to Add Mother:
-!!	gs 'telefon', 'AddContact', 'A29', 'icon_npc1', "gs 'telefon', 'Phone_call'", "hour >= 8 and hour <= 20", "gs 'telefon', 'lover'", "hour >= 8 and hour <= 20", 0
+!!	gs 'telefon', 'AddContact', 'A29', 'icon_npc1', "gs 'telefon', 'Phone_call'", "hour >= 8 and hour <= 20", "gs 'telefon', 'lover'", "hour >= 8 and hour <= 20", "gs 'telefon', 'SMS_your_lover'", "hour >= 10 and hour <= 16", "gs 'telefon', 'lover_SMS'", "hour >= 10 and hour <= 16", 0
 !!
 !! Remove a contact with DeleteContact
 !!	gs 'telefon', 'DeleteContact', <NPC Code>
@@ -103,15 +103,23 @@ if $ARGS[0] = 'AddContact':
 	!! $ARGS[4] = If statement code to determine schedule for outbound calls
 	!! $ARGS[5] = Code to execute for Incoming call
 	!! $ARGS[6] = if statement code for schedule of incoming calls
-	!!  ARGS[7] = Anonymous? 0 if not, 1 if yes
+	!! $ARGS[7] = Code to execute for SMS out
+	!! $ARGS[8] = If statement code to determine schedule for outbound SMS
+	!! $ARGS[9] = Code to execute for Incoming SMS
+	!! $ARGS[10] = if statement code for schedule of incoming SMS
+	!!  ARGS[11] = Anonymous? 0 if not, 1 if yes
 	$telefonCon['NPC'] = $ARGS[1]
 	$telefonCon['Icon'] = $ARGS[2]
 	$telefonCon['OutCode'] = $ARGS[3]
 	$telefonCon['OutSched'] = $ARGS[4]
 	$telefonCon['InCode'] = $ARGS[5]
 	$telefonCon['InSched'] = $ARGS[6]
-	telefonCon['Anonymous'] = ARGS[7]
-	telefonCon['ContactListID'] = arrpos('$contact',$telefonCon['NPC'])
+	$telefonCon['OutSMSCode'] = $ARGS[7]
+	$telefonCon['OutSMSSched'] = $ARGS[8]
+	$telefonCon['InSMSCode'] = $ARGS[9]
+	$telefonCon['InSMSSched'] = $ARGS[10]
+	telefonCon['Anonymous'] = ARGS[11]
+	telefonCon['ContactListID'] = arrpos('$contact', $telefonCon['NPC'])
 	if telefonCon['ContactListID'] = -1:
 		telefonCon['ContactListID'] = arrsize('$contact')
 		$contact[telefonCon['ContactListID']] = $telefonCon['NPC']
@@ -121,6 +129,10 @@ if $ARGS[0] = 'AddContact':
 	$contactOSche[telefonCon['ContactListID']] = $telefonCon['OutSched']
 	$contactICode[telefonCon['ContactListID']] = $telefonCon['InCode']
 	$contactISche[telefonCon['ContactListID']] = $telefonCon['InSched']
+	$contactOSMSCode[telefonCon['ContactListID']] = $telefonCon['OutSMSCode']
+	$contactOSMSSche[telefonCon['ContactListID']] = $telefonCon['OutSMSSched']
+	$contactISMSCode[telefonCon['ContactListID']] = $telefonCon['InSMSCode']
+	$contactISMSSche[telefonCon['ContactListID']] = $telefonCon['InSMSSched']
 	contactAnon[telefonCon['ContactListID']] = telefonCon['Anonymous']
 
 	killvar 'telefonCon'
@@ -132,14 +144,23 @@ if $ARGS[0] = 'DeleteContact':
 	$telefonCon['NPC'] = $ARGS[1]
 	telefonCon['ContactListID'] = arrpos('$contact',$telefonCon['NPC'])
 	if telefonCon['ContactListID'] > -1:
-		killvar '$contact', telefonCon['ContactListID']
-		killvar '$contactIcon', telefonCon['ContactListID']
-		killvar '$contactCode', telefonCon['ContactListID']
+		killvar '$contact',			telefonCon['ContactListID']
+		killvar '$contactIcon',		telefonCon['ContactListID']
+		killvar '$contactOCode',	telefonCon['ContactListID']
+		killvar '$contactOSche',	telefonCon['ContactListID']
+		killvar '$contactICode',	telefonCon['ContactListID']
+		killvar '$contactISche',	telefonCon['ContactListID']
+		killvar '$contactOSMSCode',	telefonCon['ContactListID']
+		killvar '$contactOSMSSche',	telefonCon['ContactListID']
+		killvar '$contactISMSCode',	telefonCon['ContactListID']
+		killvar '$contactISMSSche',	telefonCon['ContactListID']
+		killvar 'contactAnon',		telefonCon['ContactListID']
+
 	end
 
 	killvar 'telefonCon'
 	killvar '$telefonCon'
-end &! --- AddContact ---
+end &! --- DeleteContact ---
 
 if $ARGS[0] = 'ContactList':
 	$telefon['body'] = '
@@ -678,7 +699,7 @@ end
 	gs 'telefon', 'add_sms_to_send', 'A1', 'Test message the text goes here'
 
 	To add a contact if it doesn't exist
-	if arrpos('$contact', 'A1') = -1: gs 'telefon', 'AddContact', 'A1', 'images/characters/shared/headshots_main/big1.jpg', "", "1 = 0", "", "", 0
+	if arrpos('$contact', 'A1') = -1: gs 'telefon', 'AddContact', 'A1', 'images/characters/shared/headshots_main/big1.jpg', "", "0", "", "0", "", "0", "", "0", 0
 
 	SMS Arrays storing received messages and messages that can be sent
 
@@ -1019,6 +1040,12 @@ if $ARGS[0] = 'delete_sms_send_id':
 	end
 end
 
+
+
+
+
+
+
 !!-----------------------------------end of sms------------------------------------------
 
 if $ARGS[0] = 'Phone_wheather':
@@ -1121,25 +1148,6 @@ end
 
 
 
-	!!=================================================================!!
-	!!                                                                 !!
-	!!                           SCHEDULING                            !!
-	!!                                                                 !!
-	!!=================================================================!!
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 	!!=================================================================!!
 	!!                                                                 !!
 	!!                      OLD STUFF and EVENTS                       !!

+ 4 - 4
locations/vladimirQW_loc.qsrc

@@ -73,7 +73,7 @@ if $ARGS[0] = 'qwnamedy':
 			cla
 			vladimirQW['stage'] = 20
 			vladimirQW['day'] = daystart
-			gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirQW['day'] ! daystart and hour >= 15 and hour <= 17", 1
+			gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "0", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirQW['day'] ! daystart and hour >= 15 and hour <= 17", "", "0", "", "0", 1
 			gs 'stat'
 			'You tell Vladmimir your phone number and he writes it down in a small notebook with a leather cover.'
 
@@ -106,7 +106,7 @@ if $ARGS[0] = '2':
 			cla
 			vladimirQW['stage'] = 21
 			vladimirQW['day'] = daystart
-			gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirQW['day'] ! daystart and hour >= 15 and hour <= 17 and week = 6", 1
+			gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "0", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirQW['day'] ! daystart and hour >= 15 and hour <= 17 and week = 6", "", "0", "", "0", 1
 			'"I would like that," you tell him.'
 			'"Wonderful!" says Vladimir. "Then I''ll meet you at the restaurant at 20:00."'
 			'"I''ll see you then!"'
@@ -132,7 +132,7 @@ if $ARGS[0] = '3':
 		cla
 		vladimirQW['stage'] = 30
 		vladimirQW['day'] = daystart
-		gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirQW['day'] ! daystart and hour >= 15 and hour <= 17 and week = 6", 1
+		gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "0", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirQW['day'] ! daystart and hour >= 15 and hour <= 17 and week = 6", "", "0", "", "0", 1
 		'"I''d like that." you tell him.'
 		'You can hear that Vladimir''s pleased over the phone. "Wonderful, my driver will come to pick you up."'
 
@@ -157,7 +157,7 @@ if $ARGS[0] = '4':
 		cla
 		vladimirQW['stage'] = 40
 		vladimirQW['day'] = daystart
-		gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirQW['day'] ! daystart and hour >= 15 and hour <= 17 and week = 6", 1
+		gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "0", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirQW['day'] ! daystart and hour >= 15 and hour <= 17 and week = 6", "", "0", "", "0", 1
 		'"I''d like that." you tell him.'
 		'You can hear that Vladimir''s pleased over the phone. "Wonderful, my driver will come to pick you up."'
 

+ 3 - 3
locations/worksalon.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0] = 'start':
 		gs 'willpower', 'sex', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Tell him no and go to your work station (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & salonslut = 0 & gt 'worksalon', 'start'
-        else
+		else
 			act 'Tell him no and go to your work station (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		act 'Do as he says':gt 'worksalon', '3'
@@ -417,7 +417,7 @@ if $ARGS[0] = '2':
 		*clr
 		girl += 1
 		telalla = 1
-		!gs 'telefon', 'AddContact', 'Axxx', 'icon_ira1', "$telsob = 'Alla' & gt 'telefon', 'mobilaraz'","hour >= 8 and hour <= 20","",""
+		!gs 'telefon', 'AddContact', 'Axxx', 'icon_ira1', "$telsob = 'Alla' & gt 'telefon', 'mobilaraz'","hour >= 8 and hour <= 20","","0", "", "0", "", "0", 0
 		alla += 1
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/sex/ira2.jpg"></center>'
 		'When you don''t object, she gets up and pushes you down in the chair. Pulling your clothes off, she exposes your pussy and pushes your legs apart. Dropping down to her hands and knees, her face goes between your legs, and her tongue darts out and starts licking you.'
@@ -427,7 +427,7 @@ if $ARGS[0] = '2':
 		gs 'arousal', 'cuni', 30, 'dom', 'lesbian'
 		gs 'arousal', 'end'
 		gs 'stat'
-						
+
 		act 'Let go':gt 'worksalon', 'start'
 
 		act 'Thank her':