16 Commits 9de9b7aaba ... 73430141be

Author SHA1 Message Date
  anjuna krokus 73430141be [fixed/changed] fixed two small bugs in the active content in `booty_call_sms`. Changed the wait time to 0.25s 4 weeks ago
  anjuna krokus 5c131ee50b [added/fixed/changed] Added new content to the fuckbudy and sugar daddy stuff. An entirely new dialogue written by HornGuy (most of it is currently still not available in game, but the content is added in preparation). Added a new dialogue after declining a booty call (50% chance of triggering) where they will ask for a nudie :). Bug fixes to `SMS_selfies` (caught by debugging the new content). Changed some parts of the telefon selfie system that did not need to be dynamic code. 4 weeks ago
  anjuna krokus a19f59b037 [changed] moved the SMS schedules to their dedicated file on BGK's request 1 month ago
  anjuna krokus a7866ead93 Merge remote-tracking branch 'master/master' 1 month ago
  Kevin_Smarts f0ad1b196b Merge remote-tracking branch 'Lusticon/master' 1 month ago
  anjuna krokus acdd28a784 [changed] moved the `SMS_selfies_popup` to `phone_selfies_popup`. Resulting file remains small (since its called often), but reduces the file count. 1 month ago
  Lusticon 8e88ffe94e [fixed] Igor crossdressing know 1 month ago
  anjuna krokus ec286de0b1 [added/changed] Implemented the new sms schedule system for the band tour and the nerd game night invites, which moved the schedule from `hourly_events` to `cikl` (and technically `stat`). Made some layout updates. Added a fourth option to the nerd game invite, allowing for the option to skip a week and quit entirely 1 month ago
  Kevin_Smarts 92eb9379b0 Merge remote-tracking branch 'Anjuna/master' 1 month ago
  Kevin_Smarts 619eca217d Merge remote-tracking branch 'Hornguy6/master' 1 month ago
  anjuna krokus 00c1e640a9 [fixed] Some bugfixes to blackmailer and natbel_chat 1 month ago
  anjuna krokus d08698a74b Merge remote-tracking branch 'master/master' 1 month ago
  Kevin_Smarts 77f4c9f5f4 [fixed] message about leaving needed to be after choosing to leave 1 month ago
  anjuna krokus 1749068d7b [fixed] big ol' whoepsie by forgetting to include the npc_ID 1 month ago
  anjuna krokus d4e6a6e365 [fixed] forgotten "AddContact" in blackmailer 1 month ago
  hornguy6 c2228405e5 [fixed] sugar daddies have been added to their own array to make it easier to track and hopefully fix the issue with them not contacting you 1 month ago

+ 1 - 1
glife.qproj

@@ -246,7 +246,7 @@
 		<Location name="phone_selfies_popup"/>
 		<Location name="SMStext_builder"/>
 		<Location name="SMS_selfies"/>
-		<Location name="SMS_selfies_popup"/>
+		<Location name="SMS_schedules"/>
 	</Folder>
 	<Folder name="Prostitution">
 		<Location name="street_walker"/>

+ 27 - 0
locations/SMS_schedules.qsrc

@@ -0,0 +1,27 @@
+# SMS_schedules
+
+if $ARGS[0] = 'cikl':
+	if nerd_game['invite_day'] < daystart and week = 1:
+		if nerd_game['first_SMS_received'] = 0: if arrpos('$contact', 'A152') = -1: gs 'telefon', 'AddContact', 'A152', 'icon_na', 1
+		gs 'telefon', 'SetSMSSchedule', 'A152', "", "0", "gs 'nerd_game_night', 'game_invite_sms_switch'", "totminut > <<totminut + (11 - hour) * 60 + rand(20, 280) - minut>>"
+	end
+
+	if year = 2017 and month = 6 and gopnikbandQW['on_tour'] = 0:
+		gopnikbandQW['on_tour'] = 1
+		if npc_rel['A144'] >= 50 and arrpos('$contact', 'A144') < 0: gs 'telefon', 'AddContact', 'A144', 'icon_na', 1
+	elseif gopnikbandQW['on_tour'] = 1 and year = 2017 and month = 8 and day => 19:
+		gopnikbandQW['on_tour'] = 0
+	end
+
+	if gopnikbandQW['on_tour'] = 1 and npc_rel['A144'] >= 50 and anushkaQW['tour_SMS_send'] < daystart and anushkaQW['num_tour_SMS_send'] < 11:
+		if anushkaQW['num_tour_SMS_send'] <= 9 and week = 6:
+			gs 'telefon', 'SetSMSSchedule', 'A144', "", "0", "gs 'band_tour_anushka_SMS', 'start'", "totminut > <<totminut + (12 - hour) * 60 + rand(20, 100) - minut>>"
+
+		elseif anushkaQW['num_tour_SMS_send'] = 10 and week = 2:
+			gs 'telefon', 'SetSMSSchedule', 'A144', "", "0", "gs 'band_tour_anushka_SMS', 'start'", "totminut > <<totminut + (19 - hour) * 60 + rand(20, 100) - minut>>"
+		end
+	end
+end
+
+
+--- SMS_schedules ------------------------------------------

+ 256 - 14
locations/SMS_selfies.qsrc

@@ -54,6 +54,16 @@ if $ARGS[0] = 'exit':
 	gs 'telefon', 'show_sms', ARGS[1]
 end
 
+
+
+
+	!!===========================================================!!
+	!!                                                           !!
+	!!                     RETREIVE A SELFIE                     !!
+	!!                                                           !!
+	!!===========================================================!!
+
+
 ! $ARGS[1] = control string
 !  ARGS[2] = telefon['SMSid']
 ! $ARGS[3] -> onward = return string
@@ -82,8 +92,8 @@ if $ARGS[0] = 'selfie_menu':
 		temp_locationCnt += 1
 	if temp_locationCnt < arrsize('$selfieLoc'): jump 'LocationLoop'
 
-	$temp_SMS_selfietext += '<a href="exec: gs ''SMS_selfies'', ''exit''">Exit</a></td></tr></table>'
-	gs 'SMS_selfies', 'show_sms', ARGS[3]
+	$temp_SMS_selfietext += '<a href="exec: gs ''SMS_selfies'', ''exit'', <<ARGS[2]>>">Exit</a></td></tr></table>'
+	gs 'SMS_selfies', 'show_sms', ARGS[2]
 
 	killvar 'temp_locationCnt'
 	killvar '$temp_return_string'
@@ -113,10 +123,10 @@ if $ARGS[0] = 'showlocation':
 
 	gs 'SMS_selfies', 'listretrieve', ARGS[1], $selfieLoc[ARGS[1]], $ARGS[2], ARGS[3], $temp_return_string
 
-	$temp_SMS_selfietext += '<tr><td colspan=3><a href="exec: gs ''SMS_selfies'', ''selfie_menu'', ''<<$ARGS[2]>>'', ''<<ARGS[3]>>'', <<$temp_return_string>>">Go Back</a></td></tr>'
-	$temp_SMS_selfietext += '<tr><td colspan=3><a href="exec: gs ''SMS_selfies'', ''exit''">Exit</a></td></tr></table>'
+	$temp_SMS_selfietext += '<tr><td colspan=3><a href="exec: gs ''SMS_selfies'', ''selfie_menu'', ''<<$ARGS[2]>>'', <<ARGS[3]>>, <<$temp_return_string>>">Go Back</a></td></tr>'
+	$temp_SMS_selfietext += '<tr><td colspan=3><a href="exec: gs ''SMS_selfies'', ''exit'', <<ARGS[3]>>">Exit</a></td></tr></table>'
 
-	gs 'SMS_selfies', 'show_sms', ARGS[4]
+	gs 'SMS_selfies', 'show_sms', ARGS[3]
 
 	killvar '$temp_return_string'
 	killvar 'sms_s_i'
@@ -158,7 +168,7 @@ if $ARGS[0] = 'retrieve_clothed_selfies':
 			if phone_locval = 1:
 				if temp_cnum = 3: $temp_SMS_selfietext += '</tr><tr>' & temp_cnum = 0
 				temp_cnum += 1
-				$temp_SMS_selfietext += '<td width="33%">' + func('SMS_selfies_popup', 'set_selfie', $ARGS[3], ARGS[4], $ARGS[2], 'clothed', ARGS[1], temp_clocnt) + '</td>'
+				$temp_SMS_selfietext += '<td width="33%">' + func('phone_selfies_popup', 'SMS_set_selfie', $ARGS[3], ARGS[4], $ARGS[2], 'clothed', ARGS[1], temp_clocnt) + '</td>'
 			end
 			temp_clocnt += 1
 		if temp_clocnt <= selfieClotot[ARGS[1]]: jump 'temp_loop'
@@ -182,7 +192,7 @@ elseif $ARGS[0] = 'retrieve_swim_selfies':
 			if phone_locval = 1:
 				if temp_cnum = 2: $temp_SMS_selfietext += '</tr><tr>' & temp_cnum = 0
 				temp_cnum += 1
-				$temp_SMS_selfietext += '<td width="33%">' + func('SMS_selfies_popup', 'set_selfie', $ARGS[3], ARGS[4], $ARGS[2], 'bikini', ARGS[1], temp_swicnt) + '</td>'
+				$temp_SMS_selfietext += '<td width="33%">' + func('phone_selfies_popup', 'SMS_set_selfie', $ARGS[3], ARGS[4], $ARGS[2], 'bikini', ARGS[1], temp_swicnt) + '</td>'
 			end
 			temp_swicnt += 1
 		if temp_swicnt <= selfieClotot[ARGS[1]]: jump 'temp_loop1'
@@ -204,7 +214,7 @@ elseif $ARGS[0] = 'retrieve_underwear_selfies':
 			if phone_locval = 1:
 				if temp_cnum = 2: $temp_SMS_selfietext += '</tr><tr>' & temp_cnum = 0
 				temp_cnum += 1
-				$temp_SMS_selfietext += '<td width="33%">' + func('SMS_selfies_popup', 'set_selfie', $ARGS[3], ARGS[4], $ARGS[2], 'underwear', ARGS[1], temp_undcnt) + '</td>'
+				$temp_SMS_selfietext += '<td width="33%">' + func('phone_selfies_popup', 'SMS_set_selfie', $ARGS[3], ARGS[4], $ARGS[2], 'underwear', ARGS[1], temp_undcnt) + '</td>'
 			end
 			temp_undcnt += 1
 		if temp_undcnt <= selfieUndtot[ARGS[1]]: jump 'temp_loop2'
@@ -227,7 +237,7 @@ elseif $ARGS[0] = 'retrieve_nude_selfies':
 			if phone_locval = 1:
 				if temp_cnum = 2: $temp_SMS_selfietext += '</tr><tr>' & temp_cnum = 0
 				temp_cnum += 1
-				$temp_SMS_selfietext += '<td width="33%">' + func('SMS_selfies_popup', 'set_selfie', $ARGS[3], ARGS[4], $ARGS[2], 'nude', ARGS[1], temp_nudcnt) + '</td>'
+				$temp_SMS_selfietext += '<td width="33%">' + func('phone_selfies_popup', 'SMS_set_selfie', $ARGS[3], ARGS[4], $ARGS[2], 'nude', ARGS[1], temp_nudcnt) + '</td>'
 			end
 			temp_nudcnt += 1
 		if temp_nudcnt <= selfieNudtot[ARGS[1]]: jump 'temp_loop3'
@@ -250,7 +260,7 @@ elseif $ARGS[0] = 'retrieve_bath_selfies':
 			if phone_locval = 1:
 				if temp_cnum = 2: $temp_SMS_selfietext += '</tr><tr>' & temp_cnum = 0
 				temp_cnum += 1
-				$temp_SMS_selfietext += '<td width="33%">' + func('SMS_selfies_popup', 'set_selfie', $ARGS[3], ARGS[4], $ARGS[2], 'bath', ARGS[1], temp_bathcnt) + '</td>'
+				$temp_SMS_selfietext += '<td width="33%">' + func('phone_selfies_popup', 'SMS_set_selfie', $ARGS[3], ARGS[4], $ARGS[2], 'bath', ARGS[1], temp_bathcnt) + '</td>'
 			end
 			temp_bathcnt += 1
 		if temp_bathcnt <= selfieBathtot[ARGS[1]]: jump 'temp_loop4'
@@ -273,7 +283,7 @@ elseif $ARGS[0] = 'retrieve_shower_selfies':
 			if phone_locval = 1:
 				if temp_cnum = 2: $temp_SMS_selfietext += '</tr><tr>' & temp_cnum = 0
 				temp_cnum += 1
-				$temp_SMS_selfietext += '<td width="33%">' + func('SMS_selfies_popup', 'set_selfie', $ARGS[3], ARGS[4], $ARGS[2], 'shower', ARGS[1], temp_showercnt) + '</td>'
+				$temp_SMS_selfietext += '<td width="33%">' + func('phone_selfies_popup', 'SMS_set_selfie', $ARGS[3], ARGS[4], $ARGS[2], 'shower', ARGS[1], temp_showercnt) + '</td>'
 			end
 			temp_showercnt += 1
 		if temp_showercnt <= selfieShowertot[ARGS[1]]: jump 'temp_loop5'
@@ -296,7 +306,7 @@ elseif $ARGS[0] = 'retrieve_titflash_selfies':
 			if phone_locval = 1:
 				if temp_cnum = 2: $temp_SMS_selfietext += '</tr><tr>' & temp_cnum = 0
 				temp_cnum += 1
-				$temp_SMS_selfietext += '<td width="33%">' + func('SMS_selfies_popup', 'set_selfie', $ARGS[3], ARGS[4], $ARGS[2], 'titflash', ARGS[1], temp_flashtitscnt) + '</td>'
+				$temp_SMS_selfietext += '<td width="33%">' + func('phone_selfies_popup', 'SMS_set_selfie', $ARGS[3], ARGS[4], $ARGS[2], 'titflash', ARGS[1], temp_flashtitscnt) + '</td>'
 			end
 			temp_flashtitscnt += 1
 		if temp_flashtitscnt <= selfieTitflash[ARGS[1]]: jump 'temp_loop6'
@@ -319,7 +329,7 @@ elseif $ARGS[0] = 'retrieve_assflash_selfies':
 			if phone_locval = 1:
 				if temp_cnum = 2: $temp_SMS_selfietext += '</tr><tr>' & temp_cnum = 0
 				temp_cnum += 1
-				$temp_SMS_selfietext += '<td width="33%">' + func('SMS_selfies_popup', 'set_selfie', $ARGS[3], ARGS[4], $ARGS[2], 'assflash', ARGS[1], temp_flashasscnt) + '</td>'
+				$temp_SMS_selfietext += '<td width="33%">' + func('phone_selfies_popup', 'SMS_set_selfie', $ARGS[3], ARGS[4], $ARGS[2], 'assflash', ARGS[1], temp_flashasscnt) + '</td>'
 			end
 			temp_flashasscnt += 1
 		if temp_flashasscnt <= selfieAssflash[ARGS[1]]: jump 'temp_loop7'
@@ -342,7 +352,7 @@ elseif $ARGS[0] = 'retrieve_pussyflash_selfies':
 			if phone_locval = 1:
 				if temp_cnum = 2: $temp_SMS_selfietext += '</tr><tr>' & temp_cnum = 0
 				temp_cnum += 1
-				$temp_SMS_selfietext += '<td width="33%">' + func('SMS_selfies_popup', 'set_selfie', $ARGS[3], ARGS[4], $ARGS[2], 'pussyflash', ARGS[1], temp_flashpussycnt) + '</td>'
+				$temp_SMS_selfietext += '<td width="33%">' + func('phone_selfies_popup', 'SMS_set_selfie', $ARGS[3], ARGS[4], $ARGS[2], 'pussyflash', ARGS[1], temp_flashpussycnt) + '</td>'
 			end
 			temp_flashpussycnt += 1
 		if temp_flashpussycnt <= selfiePussyflash[ARGS[1]]: jump 'temp_loop8'
@@ -356,4 +366,236 @@ end
 
 
 
+
+	!!===========================================================!!
+	!!                                                           !!
+	!!                       TAKE A SELFIE                       !!
+	!!                                                           !!
+	!!===========================================================!!
+
+!{
+if $ARGS[0] = 'take_selfie_menu':
+	gs 'phone_selfies', 'Phone_selfie_totals'
+	if $locclass = 'bedr':
+		$phone_loc = 'bedroom'
+	elseif $locclass = 'kitr':
+		$phone_loc = 'kitchen'
+	elseif $locclass = 'livingr':
+		$phone_loc = 'livingroom'
+	elseif $locclass = 'changingroom':
+		$phone_loc = 'changingroom'
+	elseif $locclass = 'city_park':
+		$phone_loc = 'park'
+	elseif $locclass = 'locker':
+		$phone_loc = 'locker'
+	elseif $locclass = 'beach':
+		$phone_loc = 'beach'
+	elseif $locclass = 'classroom':
+		$phone_loc = 'classroom'
+	elseif $locclass = 'school_bathroom':
+		$phone_loc = 'school_bathroom'
+	elseif $locclass = 'restroom':
+		$phone_loc = 'restroom'
+	elseif $location_type = 'bathroom':
+		$phone_loc = 'bathroom'
+	else
+		$phone_loc = ''
+	end
+
+	!! Create the return string
+	$temp_return_string = ''
+	sms_s_n_args = arrsize('$ARGS')
+	sms_s_i = 3
+	:add_rest_ARGS_loop
+	if sms_s_i < sms_s_n_args:
+		$temp_return_string += '''<<$ARGS[sms_s_i]>>'', '
+		sms_s_i += 1
+		jump 'add_rest_ARGS_loop'
+	end
+	$temp_return_string = mid($temp_return_string, 1, len($temp_return_string)-2)
+
+
+	$temp_SMS_selfietext = '<table width=80%><th>Camera</th><tr><td>'
+	if $phone_loc ! '' or strpos($ARGS[1], 'c') > 0:
+		$temp_SMS_selfietext += '<a href="exec:gs ''exp_gain'', ''photoskl'', 1 & gs ''SMS_selfies'', ''Phone_camera_selfie'', ''<<$phone_loc>>'', '''', ''<<$ARGS[1]>>'', ARGS[2], <<$temp_return_string>>"><b>Take a selfie</b></a>'
+		$temp_SMS_selfietext += '</tr></td><tr><td>'
+	end
+	!! Flashing selfie
+	if $clothingworntype ! 'nude' and $phone_loc <> '':
+		if Enable_Android = 1:
+			locIndex = arrpos('$selfieLoc', $phone_loc, 1)
+		else
+			locIndex = arrpos(1, '$selfieLoc', $phone_loc)
+		end
+		if strpos($ARGS[1], 'ft') > 0 and (pcs_inhib >= 35 or exhibitionist_lvl > 0 or $phone_loc = 'bedroom') and selfieTitflash[locIndex] > 0:
+			$temp_SMS_selfietext += '<a href="exec:gs ''exp_gain'', ''photoskl'', 1 & gs ''SMS_selfies'', ''Phone_camera_selfie'', ''<<$phone_loc>>'', ''tits'', ''<<$ARGS[1]>>'', ARGS[2], <<$temp_return_string>> "><b>Flash your tits for a selfie</b></a><br>'
+			$temp_SMS_selfietext += '</tr></td><tr><td>'
+		end
+		if strpos($ARGS[1], 'fa') > 0 and (exhibitionist_lvl > 0 or $phone_loc = 'bedroom') and selfieAssflash[locIndex] > 0:
+			$temp_SMS_selfietext += '<a href="exec:gs ''exp_gain'', ''photoskl'', 1 & gs ''SMS_selfies'', ''Phone_camera_selfie'', ''<<$phone_loc>>'', ''ass'', ''<<$ARGS[1]>>'', ARGS[2], <<$temp_return_string>> "><b>Flash your ass for a selfie</b></a><br>'
+			$temp_SMS_selfietext += '</tr></td><tr><td>'
+		end
+		if strpos($ARGS[1], 'fp') > 0 and (exhibitionist_lvl > 1 or $phone_loc = 'bedroom') and selfiePussyflash[locIndex] > 0:
+			$temp_SMS_selfietext += '<a href="exec:gs ''exp_gain'', ''photoskl'', 1 & gs ''SMS_selfies'', ''Phone_camera_selfie'', ''<<$phone_loc>>'', ''pussy'', ''<<$ARGS[1]>>'', ARGS[2], <<$temp_return_string>> "><b>Flash your pussy for a selfie</b></a><br>'
+			$temp_SMS_selfietext += '</tr></td><tr><td>'
+		end
+	end
+
+	$temp_SMS_selfietext += '<a href="exec: gs ''SMS_selfies'', ''exit'', <<ARGS[2]>>">Exit</a></td></tr></table>'
+	gs 'SMS_selfies', 'show_sms', ARGS[3]
+end
+
+if $ARGS[0] = 'Phone_camera_selfie':
+	$temp_return_string = ''
+	sms_s_n_args = arrsize('$ARGS')
+	sms_s_i = 5
+	:add_rest_ARGS_loop2
+	if sms_s_i < sms_s_n_args:
+		$temp_return_string += '''<<$ARGS[sms_s_i]>>'', '
+		sms_s_i += 1
+		jump 'add_rest_ARGS_loop2'
+	end
+	$temp_return_string = mid($temp_return_string, 1, len($temp_return_string)-2)
+
+
+	if $ARGS[1] ! '':
+		if Enable_Android = 1:
+			temp_pos = arrpos('$selfieLoc', $ARGS[1], 1)
+		else
+			temp_pos = arrpos(1, '$selfieLoc', $ARGS[1])
+		end
+		dynamic 'gs ''SMS_selfies'', ''Phone_selfie_image'', ''<<$ARGS[1]>>'', ''<<$ARGS[2]>>'', <<temp_pos>>, ''<<$ARGS[3]>>'', <<ARGS[4]>>, <<$temp_return_string>>'
+		killvar 'temp_pos'
+	else
+		phone_rand = rand(1, selfieClotot[0])
+		dynamic '<<$selfieLoc[0]>>_closelfie[<<phone_rand>>] = 1'
+		gs 'stat'
+		$temp_imloc = 'images/pc/activities/phone/selfies/<<$selfieLoc[0]>>/clothed/<<$selfieFilePrefix[0]>><<phone_rand>>.jpg'
+		dynamic 'gs <<$temp_return_string>>, <<ARGS[4]>>, ''<<$temp_imloc>>'', ''<<$selfieLoc[0]>>'', ''clothed'', 0, <<phone_rand>>'
+		killvar 'phone_rand'
+		killvar 'temp_imloc'
+	end
+	!if cumsumbod-cumsumvag-cumsumass > 0: phone_rand = RAND (m,n) - for SELF in the semen
+	!if photo_event_pic = x: phone_rand = RAND (x,y) - for photos during the events (by heart)
+	!msg '<img src="images/system/phone/phone_selfie<<phone_rand>>.jpg">'
+end
+
+if $ARGS[0] = 'Phone_selfie_image':
+	$temp_return_string = ''
+	sms_s_n_args = arrsize('$ARGS')
+	sms_s_i = 6
+	:add_rest_ARGS_loop2
+	if sms_s_i < sms_s_n_args:
+		$temp_return_string += '''<<$ARGS[sms_s_i]>>'', '
+		sms_s_i += 1
+		jump 'add_rest_ARGS_loop2'
+	end
+	$temp_return_string = mid($temp_return_string, 1, len($temp_return_string)-2)
+
+
+	if $ARGS[2] = '':
+		if PCloswimwear = 1:
+			!!changing to and unmixed variable so the rng will work
+			
+			temp_swim = selfieSwimtot[ARGS[3]]
+			if temp_swim > 0:
+				phone_rand = rand(1, temp_swim)
+				!!Setting the image owned flag to 1
+				dynamic '<<$ARGS[1]>>_swim[<<phone_rand>>] = 1'
+				gs 'stat'
+				$temp_imloc = 'images/pc/activities/phone/selfies/<<$ARGS[1]>>/bikini/<<$selfieFilePrefix[ARGS[3]]>><<phone_rand>>.jpg'
+				dynamic 'gs <<$temp_return_string>>, <<ARGS[5]>>, ''<<$temp_imloc>>'', ''<<$ARGS[1]>>'', ''bikini'', <<ARGS[3]>>, <<phone_rand>>'
+				killvar 'phone_rand'
+				killvar 'temp_imloc'
+			end
+			killvar 'temp_swim'
+
+		elseif $clothingworntype ! 'nude':
+			!!changing to and unmixed variable so the rng will work
+			temp_clotot = selfieClotot[ARGS[3]]
+			if temp_clotot > 0:
+				phone_rand = rand(1, temp_clotot)
+				!!Setting the image owned flag to 1
+				dynamic '<<$ARGS[1]>>_closelfie[<<phone_rand>>] = 1'
+				gs 'stat'
+				$temp_imloc = 'images/pc/activities/phone/selfies/<<$ARGS[1]>>/clothed/<<$selfieFilePrefix[ARGS[3]]>><<phone_rand>>.jpg'
+				dynamic 'gs <<$temp_return_string>>, <<ARGS[5]>>, ''<<$temp_imloc>>'', ''<<$ARGS[1]>>'', ''clothed'', <<ARGS[3]>>, <<phone_rand>>'
+				killvar 'phone_rand'
+				killvar 'temp_imloc'
+			end
+			killvar 'temp_clotot'
+
+		elseif $pantyworntype ! 'none':
+			temp_undtot = selfieUndtot[ARGS[3]]
+			if temp_undtot > 0:
+				phone_rand = rand(1, temp_undtot)
+				dynamic '<<$ARGS[1]>>_undselfie[<<phone_rand>>] = 1'
+				gs 'stat'
+				$temp_imloc = 'images/pc/activities/phone/selfies/<<$ARGS[1]>>/underwear/<<$selfieFilePrefix[ARGS[3]]>><<phone_rand>>.jpg'
+				dynamic 'gs <<$temp_return_string>>, <<ARGS[5]>>, ''<<$temp_imloc>>'', ''<<$ARGS[1]>>'', ''underwear'', <<ARGS[3]>>, <<phone_rand>>'
+				killvar 'phone_rand'
+				killvar 'temp_imloc'
+			end
+			killvar 'temp_undtot'
+
+		else
+			temp_nudtot = selfieNudtot[ARGS[3]]
+			if temp_nudtot > 0:
+				phone_rand = rand(1, temp_nudtot)
+				dynamic '<<$ARGS[1]>>_nudselfie[<<phone_rand>>] = 1'
+				gs 'stat'
+				$temp_imloc = 'images/pc/activities/phone/selfies/<<$ARGS[1]>>/nude/<<$selfieFilePrefix[ARGS[3]]>><<phone_rand>>.jpg'
+				dynamic 'gs <<$temp_return_string>>, <<ARGS[5]>>, ''<<$temp_imloc>>'', ''<<$ARGS[1]>>'', ''nude'', <<ARGS[3]>>, <<phone_rand>>'
+				killvar 'phone_rand'
+				killvar 'temp_imloc'
+			end
+			killvar 'temp_nudtot'
+		end
+	else
+		if $ARGS[2] = 'tits':
+			temp_titflash = selfieTitflash[ARGS[3]]
+			if temp_titflash > 0:
+				phone_rand = rand(1, temp_titflash)
+				dynamic '<<$ARGS[1]>>_titflash[<<phone_rand>>] = 1'
+				gs 'stat'
+				$temp_imloc = 'images/pc/activities/phone/selfies/<<$ARGS[1]>>/titflash/<<$selfieFilePrefix[ARGS[3]]>><<phone_rand>>.jpg'
+				dynamic 'gs <<$temp_return_string>>, <<ARGS[5]>>, ''<<$temp_imloc>>'', ''<<$ARGS[1]>>'', ''titflash'', <<ARGS[3]>>, <<phone_rand>>'
+				killvar 'phone_rand'
+				killvar 'temp_imloc'
+			end
+			killvar 'temp_titflash'
+
+		elseif $ARGS[2] = 'ass':
+			temp_assflash = selfieAssflash[ARGS[3]]
+			if temp_assflash > 0:
+				phone_rand = rand(1, temp_assflash)
+				dynamic '<<$ARGS[1]>>_assflash[<<phone_rand>>] = 1'
+				gs 'stat'
+				if usePopUps = 1:
+					msg '<img src="images/pc/activities/phone/selfies/<<$ARGS[1]>>/assflash/<<phone_rand>>.jpg">'
+				else
+					view 'images/pc/activities/phone/selfies/<<$ARGS[1]>>/assflash/<<phone_rand>>.jpg'
+				end
+			end
+		elseif $ARGS[2] = 'pussy':
+			if Enable_Android = 1:
+				temp_pussyflash = selfiePussyflash[arrpos('$selfieLoc', $ARGS[1], 1)]
+			else
+				temp_pussyflash = selfiePussyflash[arrpos(1, '$selfieLoc', $ARGS[1])]
+			end
+			if temp_pussyflash > 0:
+				phone_rand = rand(1, temp_pussyflash)
+				dynamic '<<$ARGS[1]>>_pussyflash[<<phone_rand>>] = 1'
+				gs 'stat'
+				if usePopUps = 1:
+					msg '<img src="images/pc/activities/phone/selfies/<<$ARGS[1]>>/pussyflash/<<phone_rand>>.jpg">'
+				else
+					view 'images/pc/activities/phone/selfies/<<$ARGS[1]>>/pussyflash/<<phone_rand>>.jpg'
+				end
+			end
+		end
+	end
+end
+}
+
 --- SMS_selfies ---------------------------------

+ 0 - 21
locations/SMS_selfies_popup.qsrc

@@ -1,21 +0,0 @@
-# SMS_selfies_popup
-
-
-!	$ARGS[1] = Return string
-!	$ARGS[2] = telefon['SMSid']
-!!	$ARGS[3] = Location where the selfie is taken
-!!	$ARGS[4] = State of dress in the selfie
-!!	 ARGS[5] = is the index of the location in $selfieLoc[] and $selfieFilePrefix
-!!	 ARGS[6] = the selfie number
-if $ARGS[0] = 'set_selfie':
-	$temp_imloc = func('SMS_selfies_popup', 'get_imloc', $ARGS[3], $ARGS[4], ARGS[5], ARGS[6])
-	$result = '<a href="exec: gs <<$ARGS[1]>>, <<ARGS[2]>>, ''<<$temp_imloc>>'', ''<<$ARGS[3]>>'', ''<<$ARGS[4]>>'', <<ARGS[5]>>, <<ARGS[6]>>"><img src="<<$temp_imloc>>" style="horizontal-align:center; max-height:90%; max-width:90%"></a>'
-	killvar '$temp_imloc'
-end
-
-if $ARGS[0] = 'get_imloc':
-	$result = 'images/pc/activities/phone/selfies/<<$ARGS[1]>>/<<$ARGS[2]>>/<<$selfieFilePrefix[ARGS[3]]>><<ARGS[4]>>.jpg'
-end
-
-
---- SMS_selfies_popup ---------------------------------

+ 32 - 1
locations/SMStext_builder.qsrc

@@ -89,7 +89,7 @@
 !				gs 'SMStext_builder', 'show_sms', ARGS[2]
 !				wait 500
 !
-!				$ARGS[5] is the state of dress:
+!				!$ARGS[5] is the state of dress:
 !				if $ARGS[5] = 'clothed':
 !					gs 'SMStext_builder', 'receive', 'disapointing, but better than nothin i sup'
 !				elseif $ARGS[5] = 'nude' or $ARGS[5] = 'pussyflash':
@@ -321,5 +321,36 @@ if $ARGS[0] = 'send_selfie':
 end
 
 
+!!	Might add directly taking a selfie in the future.
+!{
+! $ARGS[1] = displayed text
+! $ARGS[2] = control string = 'c|sw|u|n|b|sh|ft|fa|fp'
+!		c: clothed | sw: swim | u: underwear
+!		n: nude | b: bath | sh: shower
+!		ft: flash tits | fa: flash ass | fp: flash pussy
+! $ARGS[3] -> onward = the return location.
+! gs 'SMStext_builder', 'take_selfie', 'Send a sexy selfie', 'c|b|ft', 'band_tour_anushka_SMS', 'Week8', 'Choice_a'
+if $ARGS[0] = 'take_selfie':
+	$temp_reply_str = '[Selfie] <a href="exec: gs ''SMS_selfies'', ''take_selfie_menu'', ''<<lcase($ARGS[2])>>'', telefon[''SMSid'']'
+
+	stb_n_args = arrsize('$ARGS')
+	stb_i = 3
+	:SMS_build_send_selfie_loop
+	if stb_i < stb_n_args:
+		$temp_reply_str += ', ''<<$ARGS[stb_i]>>'''
+		stb_i += 1
+		jump 'SMS_build_send_selfie_loop'
+	end
+
+	$temp_reply_str += '"><<$ARGS[1]>></a>'
+	$temp_SMSreplies[] = $temp_reply_str
+
+	killvar 'temp_reply_str'
+	killvar 'stb_i'
+	killvar 'stb_n_args'
+end
+}
+
+
 
 --- SMStext_builder ---------------------------------

+ 5 - 2
locations/band_tour_anushka_SMS.qsrc

@@ -76,8 +76,9 @@ if $ARGS[0] = 'start':
 
 	elseif anushkaQW['num_tour_SMS_send'] = 11:
 		gs 'band_tour_anushka_SMS', 'Week11', 'Add SMS'
-
+		gopnikbandQW['on_tour'] = 0
 	end
+	gs 'telefon', 'SetSMSSchedule', 'A144', "", "0", "", "0"
 end
 
 
@@ -109,7 +110,9 @@ 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', 0
+		temp_pos = arrpos('$contact', 'A144')
+		if temp_pos = -1 or contactAnon[temp_pos] = 1: gs 'telefon', 'AddContact', 'A144', 'images/characters/shared/headshots_main/big144.jpg', 0
+		killvar 'temp_pos'
 
 		gs 'SMStext_builder', 'start'
 			gs 'SMStext_builder', 'send', $SMSTree['a1']

+ 18 - 43
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

+ 141 - 14
locations/booty_call.qsrc

@@ -6,12 +6,13 @@ if $ARGS[0] = 'scheduler':
 	killvar 'npc_booty_call'
 	killvar 'npc_booty_call_time'
 	i = 0
-	gs 'booty_call', 'scheduler2'
+	gs 'booty_call', 'fuckbuddy_scheduler2'
 end
 
-if $ARGS[0] = 'scheduler2':
+if $ARGS[0] = 'fuckbuddy_scheduler2':
 	if i <= arrsize('$fuckbuddy'):
-		gs 'booty_call', 'npc_stat_update'
+		$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:
 
 !!		temporary removal of npc_rel requirement until boy initiated breakups can occur
@@ -23,24 +24,57 @@ if $ARGS[0] = 'scheduler2':
 				
 			elseif (npc_booty_call_date[$FuckBuddy[i]] = daystart or rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or rand(1,100) <= npc_rel[$FuckBuddy[i]]) and npc_no_booty_call[$FuckBuddy[i]] ! daystart:
 				sugar_daddy_call[$FuckBuddy[i]] = 1
-				gs 'booty_call', 'scheduler3'
+				gs 'booty_call', 'fuckbuddy_scheduler3'
 			else
 				npc_no_booty_call[$FuckBuddy[i]] = daystart
 			end
 		else
 			if (npc_booty_call_date[$FuckBuddy[i]] = daystart or rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or rand(1,100) <= npc_rel[$FuckBuddy[i]]) and npc_no_booty_call[$FuckBuddy[i]] ! daystart:
-				gs 'booty_call', 'scheduler3'
+				gs 'booty_call', 'fuckbuddy_scheduler3'
 			else
 				npc_no_booty_call[$FuckBuddy[i]] = daystart
 			end
 		end
 		i += 1
-		gs 'booty_call', 'scheduler2'
+		gs 'booty_call', 'fuckbuddy_scheduler2'
+	else
+		i = 0
+		gs 'booty_call', 'sugar_daddy_scheduler2'
 	end
 end
 
 
-if $ARGS[0] = 'scheduler3':
+if $ARGS[0] = 'sugar_daddy_scheduler2':
+	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:
+
+!!		temporary removal of npc_rel requirement until boy initiated breakups can occur
+
+!!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$sugar_daddy[i]] = daystart) and npc_no_booty_call[$sugar_daddy[i]] ! daystart and (npc_big_fight[$sugar_daddy[i]] < daystart - 7 and daystart > 7):
+		if $npc_rel_type[$sugar_daddy[i]] = 'sugar_daddy':
+			if npc_sugar_daddy_timer[$sugar_daddy[i]] - (npc_rel[$sugar_daddy[i]] / 10) > daystart:
+				npc_no_booty_call[$sugar_daddy[i]] = daystart
+				
+			elseif (npc_booty_call_date[$sugar_daddy[i]] = daystart or rand(1,10) <= npc_sexdrive[$sugar_daddy[i]] or rand(1,100) <= npc_rel[$sugar_daddy[i]]) and npc_no_booty_call[$sugar_daddy[i]] ! daystart:
+				sugar_daddy_call[$sugar_daddy[i]] = 1
+				gs 'booty_call', 'sugar_daddy_scheduler3'
+			else
+				npc_no_booty_call[$sugar_daddy[i]] = daystart
+			end
+		else
+			if (npc_booty_call_date[$sugar_daddy[i]] = daystart or rand(1,10) <= npc_sexdrive[$sugar_daddy[i]] or rand(1,100) <= npc_rel[$sugar_daddy[i]]) and npc_no_booty_call[$sugar_daddy[i]] ! daystart:
+				gs 'booty_call', 'sugar_daddy_scheduler3'
+			else
+				npc_no_booty_call[$sugar_daddy[i]] = daystart
+			end
+		end
+		i += 1
+		gs 'booty_call', 'sugar_daddy_scheduler2'
+	end
+end
+
+if $ARGS[0] = 'fuckbuddy_scheduler3':
 	if npc_booty_call[$FuckBuddy[i]] = daystart:
 		booty_call_time[$FuckBuddy[i]] = ((npc_booty_call_time[$FuckBuddy[i]] * 60) + rand(0,180))
 	elseif week = npc_day_off[$FuckBuddy[i]]:
@@ -52,6 +86,18 @@ if $ARGS[0] = 'scheduler3':
 	end
 end
 
+if $ARGS[0] = 'sugar_daddy_scheduler3':
+	if npc_booty_call[$sugar_daddy[i]] = daystart:
+		booty_call_time[$sugar_daddy[i]] = ((npc_booty_call_time[$sugar_daddy[i]] * 60) + rand(0,180))
+	elseif week = npc_day_off[$sugar_daddy[i]]:
+		booty_call_time[$sugar_daddy[i]] = (600 + rand(0,720))
+	elseif week ! npc_day_off[$sugar_daddy[i]]:
+		booty_call_time[$sugar_daddy[i]] = (rand(npc_start_free_time[$sugar_daddy[i]],(npc_end_free_time[$sugar_daddy[i]] - 1)) * 60) + rand(0,180)
+	else
+		booty_call_time[$sugar_daddy[i]] = 2000
+	end
+end
+
 !!	if npc_start_free_time[$FuckBuddy[i]] = 0 or npc_day_off[$FuckBuddy[i]] = 0 or npc_end_free_time[$FuckBuddy[i]] = 0: 
 !!		$boy = $FuckBuddy[i]
 		
@@ -89,7 +135,7 @@ end
 
 if $ARGS[0] = 'SMS raiser':
 	i = 0
-	:booty_call_sms_raiser_loop
+	:fuckbuddy_sms_raiser_loop
 	if i < arrsize('$FuckBuddy'):
 		if booty_call_time[$FuckBuddy[i]] < ((hour * 60) + minut) and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_last_booty_call[$FuckBuddy[i]] ! daystart:
 			gs 'booty_call_sms', 'start', $FuckBuddy[i]
@@ -98,14 +144,27 @@ if $ARGS[0] = 'SMS raiser':
 			booty_call_invite[$FuckBuddy[i]] = daystart
 		end
 		i += 1
-		jump 'booty_call_sms_raiser_loop'
+		jump 'fuckbuddy_sms_raiser_loop'
+	end
+	
+	i = 0
+	:sugar_daddy_sms_raiser_loop
+	if i < arrsize('$sugar_daddy'):
+		if booty_call_time[$sugar_daddy[i]] < ((hour * 60) + minut) and npc_no_booty_call[$sugar_daddy[i]] ! daystart and npc_last_booty_call[$sugar_daddy[i]] ! daystart:
+			gs 'booty_call_sms', 'start', $sugar_daddy[i]
+			booty_call_time[$sugar_daddy[i]] = 2399
+			!! this is a bit superfluous, but it makes the code run faster.
+			booty_call_invite[$sugar_daddy[i]] = daystart
+		end
+		i += 1
+		jump 'sugar_daddy_sms_raiser_loop'
 	end
 end
 
 if $ARGS[0] = 'home_links':
 	i=0
 	*nl
-	:loopBC_homes
+	: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.'' ')
 		!! ''''
@@ -113,20 +172,43 @@ if $ARGS[0] = 'home_links':
 	!!		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 'loopBC_homes'
+	if i < arrsize('$Fuckbuddy') : jump 'loopFB_homes'
+	
+	i=0
+	*nl
+	: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.'' ')
+		!! ''''
+	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
-	:loopBC_hotel
+	: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.'' ')
 		!! ''''
 	end
 	
 	i +=1
-	if i < arrsize('$Fuckbuddy') : jump 'loopBC_hotel'
+	if i < arrsize('$Fuckbuddy') : jump 'loopFB_hotel'
+	
+	i=0
+	*nl
+	: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.'' ')
+		!! ''''
+	end
+	
+	i +=1
+	if i < arrsize('$sugar_daddy') : jump 'loopSD_hotel'
 end
 
 !! booty_call_invite['B0']
@@ -400,7 +482,7 @@ end
 
 !! ------------ NPC Stat Updater ------------------------
 
-if $ARGS[0] = 'npc_stat_update':
+if $ARGS[0] = 'fb_npc_stat_update':
 	if npc_start_free_time[$FuckBuddy[i]] = 0 or npc_day_off[$FuckBuddy[i]] = 0:
 		if npc_finance[$FuckBuddy[i]] = 0:
 			if rand(1,3) = 1:
@@ -445,6 +527,51 @@ if $ARGS[0] = 'npc_stat_update':
 	end
 end
 
+if $ARGS[0] = 'sd_npc_stat_update':
+	if npc_start_free_time[$sugar_daddy[i]] = 0 or npc_day_off[$sugar_daddy[i]] = 0:
+		if npc_finance[$sugar_daddy[i]] = 0:
+			if rand(1,3) = 1:
+				npc_start_free_time[$sugar_daddy[i]] = 9
+				npc_end_free_time[$sugar_daddy[i]] = 12
+			elseif rand(1,2) = 1:
+				npc_start_free_time[$sugar_daddy[i]] = 16
+				npc_end_free_time[$sugar_daddy[i]] = 20
+			else
+				npc_start_free_time[$sugar_daddy[i]] = 20
+				npc_end_free_time[$sugar_daddy[i]] = 23
+			end
+		elseif npc_finance[$sugar_daddy[i]] = 1:
+			if rand(1,2) = 1:
+				npc_start_free_time[$sugar_daddy[i]] = 9
+				npc_end_free_time[$sugar_daddy[i]] = 12
+			else
+				npc_start_free_time[$sugar_daddy[i]] = 20
+				npc_end_free_time[$sugar_daddy[i]] = 23
+			end
+		elseif npc_finance[$sugar_daddy[i]] = 2:
+			if rand(1,2) = 1:
+				npc_start_free_time[$npclastgenerated] = 8
+				npc_end_free_time[$npclastgenerated] = 12
+				
+				npc_work_start[$npclastgenerated] = 13
+				npc_work_end[$npclastgenerated] = 21
+			else
+				npc_start_free_time[$npclastgenerated] = 18
+				npc_end_free_time[$npclastgenerated] = 22
+				
+				npc_work_start[$npclastgenerated] = 9
+				npc_work_end[$npclastgenerated] = 17
+			end
+			npc_apt_type[$sugar_daddy[i]] = 5
+			!!npc_apt_type[$npclastgenerated] = rand(5,6)
+			!! apt_type 6 is disabled until pictures are added
+			npc_occupation[$sugar_daddy[i]] = rand(14,18)
+			npc_car[$sugar_daddy[i]] = rand(0,1)
+		end
+		npc_day_off[$sugar_daddy[i]] = rand(1,7)
+	end
+end
+
 !! ------------ Legacy Backup ------------------------
 
 if $ARGS[0] = 'draw':

+ 444 - 93
locations/booty_call_sms.qsrc

@@ -34,13 +34,25 @@ if $ARGS[0] = 'start':
 		gs 'booty_call_sms', 'Add SMS2', 'pre_planned_booty_call', $ARGS[1]
 	elseif sugar_daddy_call[$ARGS[1]] = 1:
 		gs 'booty_call_sms', 'Add SMS', 'sugar_daddy_booty_call', $ARGS[1]
+		!gs 'booty_call_sms', 'Add SMS3', 'new_booty_call_sms', $ARGS[1]
 	elseif npc_std_test[$ARGS[1]] = 1:
 		gs 'booty_call_sms', 'Add SMS', 'std_free', $ARGS[1]
 	else
 		gs 'booty_call_sms', 'Add SMS', 'default_booty_call', $ARGS[1]
+		!gs 'booty_call_sms', 'Add SMS3', 'new_booty_call_sms', $ARGS[1]
 	end
 end
 
+
+
+
+	!!===============================================================!!
+	!!                                                               !!
+	!!                            SMSTREE                            !!
+	!!                                                               !!
+	!!===============================================================!!
+
+
 if $ARGS[0] = 'default_booty_call':
 !!	Structure:
 !!		0: boy
@@ -370,6 +382,197 @@ if $ARGS[0] = 'sugar_daddy_booty_call':
 end
 
 
+if $ARGS[0] = 'new_booty_call_sms':
+!!	Structure:
+!!		0: boy
+!!			1: player
+!!				2: player
+!!					3: player
+!!
+!!
+
+
+	!!==============   PART 1   ==============!!
+
+	$SMSTree['0'] = 'hey <<$pcs_nickname>>'
+		$SMSTree['1'] = 'hey <<$npc_nickname[$ARGS[1]]>>'
+			$SMSTree['a2'] = 'what''s up?'
+			$SMSTree['b2'] = 'hey sexy'
+
+			!! hour > 20 or hour < 4
+			$SMSTree['c2'] = 'its late. but ive always got time for you :)'
+			$SMSTree['d2'] = 'its late. what do you want?'
+			$SMSTree['e2'] = 'its late. text me earlier next time.'
+
+			!! hour - message_received_hour >= 3
+			$SMSTree['f2'] = 'sorry'
+				$SMSTree['fa3'] = 'didn''t see your message until now'
+					$SMSTree['fa4'] = 'whatsup?'
+				$SMSTree['fb3'] = 'i was doing something'
+					$SMSTree['fb4'] = $SMSTree['fa3']
+				$SMSTree['fc3'] = 'i was at the gym'
+					$SMSTree['fc4'] = $SMSTree['fa3']
+				$SMSTree['fd3'] = 'i was in class'
+					$SMSTree['fd4'] = $SMSTree['fa3']
+
+
+	!!==============   PART 2   ==============!!
+
+	if 0:
+		! Date invite
+
+	elseif npc_rel_type[$ARGS[1]] = 'sugar_daddy':
+		$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':
+		$SMSTree['10'] = 'ive been thinking about you'
+				!! player response 1 option 1
+			$SMSTree['a11'] = 'what were you thinking about?'
+					!! boy response 1
+				if npc_finance[$ARGS[1]] = 2 and func('homes_properties_attr', 'get_property_attribute', '$town', $home['current']) ! 'city' and npc_residence[$ARGS[1]] >= 3:
+					$SMSTree['a12'] = 'i booked a hotel room in Pav. why dont you come by?'
+				else
+					if $npc_fav_pos[$ARGS[1]] = 'blowjob' and rand(0, 2) = 0:
+						$SMSTree['a12'] = 'your mouth around my cock'
+					elseif npc_know_virgin[$ARGS[1]] ! 1:
+						if $npc_cum_pref[$ARGS[1]] = 'creampie' and (npc_condom_conscious[$ARGS[1]] = 0 or npc_bareback[$ARGS[1]] = 1) and rand(0, 2) = 0:
+							$SMSTree['a12'] = 'your pussy filled with my cum'
+						elseif npc_sex_speed[$ARGS[1]] = 3 and rand(0, 2) = 0:
+							$SMSTree['a12'] = 'fucking you bowlegged'
+						elseif $npc_cum_pref[$ARGS[1]] = 'facial' and rand(0, 2) = 0:
+							$SMSTree['a12'] = 'your pretty face covered in my cum'
+						elseif $npc_cum_pref[$ARGS[1]] = 'mouth' and rand(0, 2) = 0:
+							$SMSTree['a12'] = 'watching you swallow my cum'
+						elseif $npc_cum_pref[$ARGS[1]] = 'tits' and rand(0, 2) = 0:
+							$SMSTree['a12'] = 'my cum all over your tits'
+						elseif $npc_fav_pos[$ARGS[1]] = 'doggy' and rand(0, 2) = 0:
+							$SMSTree['a12'] = 'pounding you on all fours'
+						elseif $npc_fav_pos[$ARGS[1]] = 'cowgirl' and rand(0, 2) = 0:
+							$SMSTree['a12'] = 'you riding my cock like crazy'
+						else
+							if rand(0, 1) = 0:
+								$SMSTree['a12'] = 'you naked on my bed'
+							else
+								$SMSTree['a12'] = 'want to come over and have some fun?'
+							end
+						end
+					end
+				end
+
+				!! player response 1 option 2
+			$SMSTree['b11'] = 'me too'
+					!! boy response 2
+				if npc_finance[$ARGS[1]] = 2 and func('homes_properties_attr', 'get_property_attribute', '$town', $home['current']) ! 'city' and npc_residence[$ARGS[1]] >= 3: 
+					$SMSTree['b12'] = 'i booked a hotel room in Pav. why dont you come by?'
+				else
+					if $npc_fav_pos[$ARGS[1]] = 'blowjob' and rand(0, 2) = 0:
+						$SMSTree['b12'] = 'i want to feel your mouth around my cock'
+					elseif npc_know_virgin[$ARGS[1]] ! 1:
+						if $npc_cum_pref[$ARGS[1]] = 'creampie' and (npc_condom_conscious[$ARGS[1]] = 0 or npc_bareback[$ARGS[1]] = 1) and rand(0, 2) = 0:
+							$SMSTree['b12'] = 'i want to pump you full of cum'
+						elseif npc_sex_speed[$ARGS[1]] = 3 and rand(0, 2) = 0:
+							$SMSTree['b12'] = 'come over i want to hear you screaming my name'
+						elseif $npc_cum_pref[$ARGS[1]] = 'facial' and rand(0, 2) = 0:
+							$SMSTree['b12'] = 'i want to cum all over your face'
+						elseif $npc_cum_pref[$ARGS[1]] = 'mouth' and rand(0, 2) = 0:
+							$SMSTree['b12'] = 'i want to watch you swallow my cum'
+						elseif $npc_cum_pref[$ARGS[1]] = 'tits' and rand(0, 2) = 0:
+							$SMSTree['b12'] = 'let me glaze your tits with my cum'
+						elseif $npc_fav_pos[$ARGS[1]] = 'doggy' and rand(0, 2) = 0:
+							$SMSTree['b12'] = 'i want to pound you on all fours'
+						elseif $npc_fav_pos[$ARGS[1]] = 'cowgirl' and rand(0, 2) = 0:
+							$SMSTree['b12'] = 'i want you to ride my cock like theres no tomorrow'
+						else
+							if rand(0, 1) = 0:
+								$SMSTree['b12'] = 'lets fuck like bunnies today'
+							else
+							end
+						end
+					end
+				end
+
+	elseif npc_rel_type[$ARGS[1]] = 'boyfriend' or npc_rel_type[$ARGS[2]] = 'girlfriend' or npc_rel_type[$ARGS[2]] = 'husband' or npc_rel_type[$ARGS[2]] = 'wife':
+		if 0:
+			!living with husband/wife
+		else
+			if npc_dirty_lover[$ARGS[1]] = 1:
+				$SMSTree['a10'] = 'come over'
+					$SMSTree['a11'] = 'i want to fuck you senseless'
+			elseif npc_snesual_lover[$ARGS[1]] = 1:
+				$SMSTree['a10'] = 'i want to see you'
+					$SMSTree['a11'] = 'lets make love'
+			else
+				$SMSTree['a10'] = 'you should come over'
+					$SMSTree['a11'] = 'lets get naughty'
+			end
+		end
+	end
+
+
+
+	!!==============   PART 3   ==============!!
+
+	!! Final Choice
+			!! player response 2 option 1
+	if hour < 21:
+		$SMSTree['a20'] = 'sorry, i cant. i have stuff to do'
+	else
+		$SMSTree['a20'] = 'its late. text me sooner if you want me to come over.'
+	end
+				!! boy response 2 option 1
+			$SMSTree['a21'] = 'shit, maybe next time then'
+
+			!! player response 2 option 2
+		$SMSTree['b20'] = 'ill come right now ;)'
+				!! boy response 2 option 1
+			if npc_humor[$ARGS[1]] <= 1 and rand(0, 1) = 0:
+				$SMSTRee['b21'] = 'im already hard'
+			elseif npc_humor[$ARGS[1]] = 2 and rand(0, 1) = 0:
+				if rand(0, 1) = 0:
+					$SMSTRee['b21'] = 'in the street?? damn! keep it in your pants till you get here!'
+				else
+					$SMSTRee['b21'] = 'as long as you make me cum later'
+				end
+			elseif npc_humor[$ARGS[1]] = 3 and rand(0, 1) = 0:
+				$SMSTRee['b21'] = 'phrasing'
+			else
+				$SMSTRee['b21'] = 'cant wait'
+			end
+	
+	$SMSTree['c20'] = 'its kind of late'
+		$SMSTree['c21'] = 'sorry'
+			$SMSTree['c22'] = 'maybe another time?'
+end
+
+if $ARGS[0] = 'new_sexting':
+	$SMSTree['0'] = 'send me a pic then?'
+		$SMSTree['a1'] = 'refuse'
+			$SMSTree['a2'] = 'no'
+		$SMSTree['b1'] = 'next time tiger'
+		$SMSTree['c1'] = 'im not at home!'
+			if npc_dirty_lover[$ARGS[1]] = 1:
+				if rand(0, 1) = 0:
+					$SMSTree['c2'] = 'hot'
+				else
+					$SMSTree['c2'] = 'so?'
+				end
+			else
+				$SMSTree['c2'] = 'ill use my imagination then'
+			end
+		$SMSTree['s1'] = 'Send a selfie from your gallery'
+end
+
+
+
+
+	!!===============================================================!!
+	!!                                                               !!
+	!!                           BUILD SMS                           !!
+	!!                                                               !!
+	!!===============================================================!!
+
+
 !Does not work with pre-planned?
 if $ARGS[0] = 'Add SMS':
 	gs 'booty_call_sms', $ARGS[1], $ARGS[2]
@@ -387,178 +590,252 @@ if $ARGS[0] = 'SMS_Base':
 	gs 'SMStext_builder', 'start'
 		gs 'SMStext_builder', 'send', $SMSTree['1']
 		gs 'SMStext_builder', 'show_sms', ARGS[3]
-		wait 500
+
+		wait 250
 
 		gs 'SMStext_builder', 'receive', $SMSTree['2']
-		gs 'SMStext_builder', 'add_reply', $SMSTree['a3'], 'booty_call_sms', 'Choice_a', $ARGS[1], $ARGS[2]
-		gs 'SMStext_builder', 'add_reply', $SMSTree['b3'], 'booty_call_sms', 'Choice_b', $ARGS[1], $ARGS[2]
+		gs 'SMStext_builder', 'add_reply', $SMSTree['a3'], 'booty_call_sms', 'bc_choice1', $ARGS[1], $ARGS[2], 'a'
+		gs 'SMStext_builder', 'add_reply', $SMSTree['b3'], 'booty_call_sms', 'bc_choice1', $ARGS[1], $ARGS[2], 'b'
 		gs 'SMStext_builder', 'show_sms', ARGS[3]
 	gs 'SMStext_builder', 'end'
 end
 
-
-if $ARGS[0] = 'Choice_a':
+if $ARGS[0] = 'bc_choice1':
 	gs 'booty_call_sms', $ARGS[1], $ARGS[2]
 	gs 'SMStext_builder', 'start'
-		gs 'SMStext_builder', 'send', $SMSTree['a3']
-		gs 'SMStext_builder', 'show_sms', ARGS[3]
-		wait 500
-
-		gs 'SMStext_builder', 'receive', $SMSTree['a4']
-		gs 'SMStext_builder', 'add_reply', $SMSTree['aa5'], 'booty_call_sms', 'Choice_aa', $ARGS[1], $ARGS[2]
-		gs 'SMStext_builder', 'add_reply', $SMSTree['ab5'], 'booty_call_sms', 'Choice_ab', $ARGS[1], $ARGS[2]
-		gs 'SMStext_builder', 'show_sms', ARGS[3]
-	gs 'SMStext_builder', 'end'
+		gs 'SMStext_builder', 'send', $SMSTree[$ARGS[3] + '3']
+		gs 'SMStext_builder', 'show_sms', ARGS[4]
 
+		wait 250
 
-elseif $ARGS[0] = 'Choice_aa':
-	!! booty call is declined
+		gs 'SMStext_builder', 'receive', $SMSTree[$ARGS[3] + '4']
+		gs 'SMStext_builder', 'add_reply', $SMSTree[$ARGS[3] + 'a5'], 'booty_call_sms', 'bc_choice2', $ARGS[1], $ARGS[2], $ARGS[3] + 'a', 'decline_booty_call'
+		gs 'SMStext_builder', 'add_reply', $SMSTree[$ARGS[3] + 'b5'], 'booty_call_sms', 'bc_choice2', $ARGS[1], $ARGS[2], $ARGS[3] + 'b', 'accept_booty_call'
+		gs 'SMStext_builder', 'show_sms', ARGS[4]
+	gs 'SMStext_builder', 'end'
 
+elseif $ARGS[0] = 'bc_choice2':
 	gs 'booty_call_sms', $ARGS[1], $ARGS[2]
 	gs 'SMStext_builder', 'start'
-		gs 'SMStext_builder', 'send', $SMSTree['aa5']
-		gs 'SMStext_builder', 'show_sms', ARGS[3]
-		wait 500
+		gs 'SMStext_builder', 'send', $SMSTree[$ARGS[3] + '5']
+		gs 'SMStext_builder', 'show_sms', ARGS[5]
 
-		gs 'SMStext_builder', 'receive', $SMSTree['aa6']
-		gs 'SMStext_builder', 'show_sms', ARGS[3]
+		wait 250
+
+		gs 'SMStext_builder', 'receive', $SMSTree[$ARGS[3] + '6']
+		gs 'SMStext_builder', 'show_sms', ARGS[5]
 	gs 'SMStext_builder', 'end'
 
-	gs 'booty_call_sms', 'decline_booty_call', $ARGS[2]
+	gs 'booty_call_sms', $ARGS[4], $ARGS[2], ARGS[5]
+end
 
-elseif $ARGS[0] = 'Choice_ab':
-	!! booty call is accepted
 
-	gs 'booty_call_sms', $ARGS[1], $ARGS[2]
-	gs 'SMStext_builder', 'start'
-		gs 'SMStext_builder', 'send', $SMSTree['ab5']
-		gs 'SMStext_builder', 'show_sms', ARGS[3]
 
-		wait 500
 
-		gs 'SMStext_builder', 'receive', $SMSTree['ab6']
-		gs 'SMStext_builder', 'show_sms', ARGS[3]
-	gs 'SMStext_builder', 'end'
 
-	gs 'booty_call_sms', 'accept_booty_call', $ARGS[2]
+! For pre-planned
+if $ARGS[0] = 'Add SMS2':
+	gs 'booty_call_sms', $ARGS[1], $ARGS[2]
+	gs 'SMStext_builder', 'start'
+		gs 'SMStext_builder', 'receive', $SMSTree['0']
+		gs 'SMStext_builder', 'add_reply', $SMSTree['a1'], 'booty_call_sms', 'Choice2_a', $ARGS[1], $ARGS[2]
+		gs 'SMStext_builder', 'add_reply', $SMSTree['b1'], 'booty_call_sms', 'Choice2_b', $ARGS[1], $ARGS[2]
+		gs 'SMStext_builder', 'add_sms', $ARGS[2]
+	gs 'SMStext_builder', 'end'
 end
 
 
-
-if $ARGS[0] = 'Choice_b':
+if $ARGS[0] = 'Choice2_a':
 	gs 'booty_call_sms', $ARGS[1], $ARGS[2]
 	gs 'SMStext_builder', 'start'
-		gs 'SMStext_builder', 'send', $SMSTree['b3']
-		gs 'SMStext_builder', 'show_sms', ARGS[3]
-		wait 500
-
-		gs 'SMStext_builder', 'receive', $SMSTree['b4']
-		gs 'SMStext_builder', 'add_reply', $SMSTree['ba5'], 'booty_call_sms', 'Choice_ba', $ARGS[1], $ARGS[2]
-		gs 'SMStext_builder', 'add_reply', $SMSTree['bb5'], 'booty_call_sms', 'Choice_bb', $ARGS[1], $ARGS[2]
+		gs 'SMStext_builder', 'send', $SMSTree['a1']
 		gs 'SMStext_builder', 'show_sms', ARGS[3]
 	gs 'SMStext_builder', 'end'
+end
 
 
-elseif $ARGS[0] = 'Choice_ba':
-	!! booty call is declined
 
+if $ARGS[0] = 'Choice2_b':
 	gs 'booty_call_sms', $ARGS[1], $ARGS[2]
 	gs 'SMStext_builder', 'start'
-		gs 'SMStext_builder', 'send', $SMSTree['ba5']
+		gs 'SMStext_builder', 'send', $SMSTree['b1']
 		gs 'SMStext_builder', 'show_sms', ARGS[3]
-		wait 500
 
-		gs 'SMStext_builder', 'receive', $SMSTree['ba6']
+		wait 250
+
+		gs 'SMStext_builder', 'receive', $SMSTree['b2']
+		gs 'SMStext_builder', 'add_reply', $SMSTree['ba3'], 'booty_call_sms', 'Choice2_b2', $ARGS[1], $ARGS[2], 'ba', 'decline_booty_call'
+		gs 'SMStext_builder', 'add_reply', $SMSTree['bb3'], 'booty_call_sms', 'Choice2_b2', $ARGS[1], $ARGS[2], 'bb', 'accept_booty_call'
 		gs 'SMStext_builder', 'show_sms', ARGS[3]
 	gs 'SMStext_builder', 'end'
 
-	gs 'booty_call_sms', 'decline_booty_call', $ARGS[2]
-
-elseif $ARGS[0] = 'Choice_bb':
-	!! booty call is accepted
+elseif $ARGS[0] = 'Choice2_b2':
+	!! booty call is declined
 
 	gs 'booty_call_sms', $ARGS[1], $ARGS[2]
 	gs 'SMStext_builder', 'start'
-		gs 'SMStext_builder', 'send', $SMSTree['bb5']
-		gs 'SMStext_builder', 'show_sms', ARGS[3]
-		wait 500
+		gs 'SMStext_builder', 'send', $SMSTree[$ARGS[3] + '3']
+		gs 'SMStext_builder', 'show_sms', ARGS[5]
 
-		gs 'SMStext_builder', 'receive', $SMSTree['bb6']
-		gs 'SMStext_builder', 'show_sms', ARGS[3]
+		wait 250
+
+		gs 'SMStext_builder', 'receive', $SMSTree[$ARGS[3] + '4']
+		gs 'SMStext_builder', 'show_sms', ARGS[5]
 	gs 'SMStext_builder', 'end'
 
-	gs 'booty_call_sms', 'accept_booty_call', $ARGS[2]
+	gs 'booty_call_sms', $ARGS[4], $ARGS[2], ARGS[5]
 end
 
 
 
 
-! For pre-planned
-if $ARGS[0] = 'Add SMS2':
+	!!=====================================================================!!
+	!!                                                                     !!
+	!!                           NEW BOOTY CALLS                           !!
+	!!                                                                     !!
+	!!=====================================================================!!
+
+
+if $ARGS[0] = 'Add SMS3':
 	gs 'booty_call_sms', $ARGS[1], $ARGS[2]
 	gs 'SMStext_builder', 'start'
 		gs 'SMStext_builder', 'receive', $SMSTree['0']
-		gs 'SMStext_builder', 'add_reply', $SMSTree['a1'], 'booty_call_sms', 'Choice2_a', $ARGS[1], $ARGS[2]
-		gs 'SMStext_builder', 'add_reply', $SMSTree['b1'], 'booty_call_sms', 'Choice2_b', $ARGS[1], $ARGS[2]
+		gs 'SMStext_buider', 'add_reply', $SMSTree['1'], 'booty_call_sms', 'new_routing1', $ARGS[1], $ARGS[2], '<<totminut>>'
 		gs 'SMStext_builder', 'add_sms', $ARGS[2]
 	gs 'SMStext_builder', 'end'
 end
 
-
-if $ARGS[0] = 'Choice2_a':
+if $ARGS[0] = 'new_routing1':
 	gs 'booty_call_sms', $ARGS[1], $ARGS[2]
 	gs 'SMStext_builder', 'start'
-		gs 'SMStext_builder', 'send', $SMSTree['a1']
-		gs 'SMStext_builder', 'show_sms', ARGS[3]
+		gs 'SMStext_builder', 'send', $SMSTree['1']
+		if totminut >= ARGS[3] + 180:
+			gs 'SMStext_builder', 'add_reply', $SMSTree['f2'], 'booty_call_sms', 'new_delayed', '1', $ARGS[1], $ARGS[2]
+		elseif hour > 20 or hour < 4:
+			gs 'SMStext_builder', 'add_reply', $SMSTree['c2'], 'booty_call_sms', 'new_routing2', $ARGS[1], $ARGS[2], 'c2', 'npc_rel[''<<$ARGS[2]>>''] += 2'
+			gs 'SMStext_builder', 'add_reply', $SMSTree['d2'], 'booty_call_sms', 'new_routing2', $ARGS[1], $ARGS[2], 'd2', 'npc_rel[''<<$ARGS[2]>>''] -= 2'
+			gs 'SMStext_builder', 'add_reply', $SMSTree['e2'], 'booty_call_sms', 'end', $ARGS[1], $ARGS[2], 'e2', 'decline_booty_call', ''
+		else
+			gs 'SMStext_builder', 'add_reply', $SMSTree['a2'], 'booty_call_sms', 'new_routing2', $ARGS[1], $ARGS[2], 'a2', ''
+			gs 'SMStext_builder', 'add_reply', $SMSTree['b2'], 'booty_call_sms', 'new_routing2', $ARGS[1], $ARGS[2], 'b2', ''
+		end
+		gs 'SMStext_builder', 'show_sms', ARGS[4]
 	gs 'SMStext_builder', 'end'
 end
 
+if $ARGS[0] = 'new_delayed1':
+	gs 'booty_call_sms', $ARGS[2], $ARGS[3]
+	gs 'SMStext_builder', 'start'
+		if $ARGS[1] = '1':
+			gs 'SMStext_builder', 'send', $SMSTree['f2']
+			gs 'SMStext_builder', 'add_reply', $SMSTree['f3'], 'booty_call_sms', 'new_delayed1', '2', $ARGS[2], $ARGS[3]
+		elseif $ARGS[2] = '2':
+			gs 'SMStext_builder', 'send', $SMSTree['f3']
+			gs 'SMStext_builder', 'add_reply', $SMSTree['fa4'], 'booty_call_sms', 'new_routing2', $ARGS[2], $ARGS[3], 'fa4', ''
+			gs 'SMStext_builder', 'add_reply', $SMSTree['fb4'], 'booty_call_sms', 'new_routing2', $ARGS[2], $ARGS[3], 'fb4', ''
+			gs 'SMStext_builder', 'add_reply', $SMSTree['fc4'], 'booty_call_sms', 'new_routing2', $ARGS[2], $ARGS[3], 'fc4', ''
+			gs 'SMStext_builder', 'add_reply', $SMSTree['fd4'], 'booty_call_sms', 'new_routing2', $ARGS[2], $ARGS[3], 'fd4', ''
+		end
+		gs 'SMStext_builder', 'show_sms', ARGS[4]
+	gs 'SMStext_builder', 'end'
+end
 
-
-if $ARGS[0] = 'Choice2_b':
+if $ARGS[0] = 'new_routing2':
 	gs 'booty_call_sms', $ARGS[1], $ARGS[2]
+	dynamic $ARGS[4]
 	gs 'SMStext_builder', 'start'
-		gs 'SMStext_builder', 'send', $SMSTree['b1']
-		gs 'SMStext_builder', 'show_sms', ARGS[3]
-		wait 500
+		gs 'SMStext_builder', 'send', $SMSTree[$ARGS[3]]
+
+		if 0:
+			! Date invite
+			gs 'SMStext_builder', 'receive', $SMSTree['10']
+			gs 'SMStext_builder', 'receive', $SMSTree['11']
+			gs 'SMStext_builder', 'add_reply', $SMSTree['a20'], 'booty_call_sms', 'new_routing3', $ARGS[1], $ARGS[2], 'a', 'decline_booty_call', 'npc_rel[''<<$ARGS[2]>>''] -= 2'
+			gs 'SMStext_builder', 'add_reply', $SMSTree['b20'], 'booty_call_sms', 'new_routing3', $ARGS[1], $ARGS[2], 'b', 'accept_booty_call', ''
+			if hour > 20 or hour <= 4: gs 'SMStext_builder', 'add_reply', $SMSTree['c20'], 'booty_call_sms', 'late_apology', '1', $ARGS[1], $ARGS[2], 'c20'
+
+		elseif npc_rel_type[$ARGS[1]] = 'sugar_daddy':
+			gs 'SMStext_builder', 'receive', $SMSTree['10']
+			gs 'SMStext_builder', 'receive', $SMSTree['11']
+			gs 'SMStext_builder', 'add_reply', $SMSTree['a20'], 'booty_call_sms', 'new_routing3', $ARGS[1], $ARGS[2], 'a', 'decline_booty_call', 'npc_rel[''<<$ARGS[2]>>''] -= 2'
+			gs 'SMStext_builder', 'add_reply', $SMSTree['b20'], 'booty_call_sms', 'new_routing3', $ARGS[1], $ARGS[2], 'b', 'accept_booty_call', ''
+			if hour > 20 or hour <= 4: gs 'SMStext_builder', 'add_reply', $SMSTree['c20'], 'booty_call_sms', 'late_apology', '1', $ARGS[1], $ARGS[2], 'c20'
+
+		elseif npc_rel_type[$ARGS[1]] = 'casual_date' or npc_rel_type[$ARGS[2]] = 'fuckbuddy':
+			gs 'SMStext_builder', 'receive', $SMSTree['10']
+			gs 'SMStext_builder', 'add_reply', $SMSTree['a11'], 'booty_call_sms', 'new_bootycall1', $ARGS[1], $ARGS[2], 'a'
+			gs 'SMStext_builder', 'add_reply', $SMSTree['b11'], 'booty_call_sms', 'new_bootycall1', $ARGS[1], $ARGS[2], 'b'
+
+		elseif npc_rel_type[$ARGS[1]] = 'boyfriend' or npc_rel_type[$ARGS[2]] = 'girlfriend' or npc_rel_type[$ARGS[2]] = 'husband' or npc_rel_type[$ARGS[2]] = 'wife':
+			if 0:
+				!living with husband/wife
+			else
 
-		gs 'SMStext_builder', 'receive', $SMSTree['b2']
-		gs 'SMStext_builder', 'add_reply', $SMSTree['ba3'], 'booty_call_sms', 'Choice2_ba', $ARGS[1], $ARGS[2]
-		gs 'SMStext_builder', 'add_reply', $SMSTree['bb3'], 'booty_call_sms', 'Choice2_bb', $ARGS[1], $ARGS[2]
-		gs 'SMStext_builder', 'show_sms', ARGS[3]
+			end
+		end
+		gs 'SMStext_builder', 'show_sms', ARGS[5]
 	gs 'SMStext_builder', 'end'
+end
 
+if $ARGS[0] = 'new_bootycall1':
+	gs 'booty_call_sms', $ARGS[1], $ARGS[2]
+	gs 'SMStext_builder', 'start'
+		gs 'SMStext_builder', 'send', $SMSTree[$ARGS[3] + '11']
+		gs 'SMStext_builder', 'show_sms', ARGS[4]
 
-elseif $ARGS[0] = 'Choice2_ba':
-	!! booty call is declined
+		wait 250
 
-	gs 'booty_call_sms', $ARGS[1], $ARGS[2]
+		gs 'SMStext_builder', 'receive', $SMSTree[$ARGS[3] + '12']
+		gs 'SMStext_builder', 'add_reply', $SMSTree['a20'], 'booty_call_sms', 'new_routing3', $ARGS[1], $ARGS[2], 'a', 'decline_booty_call', ''
+		gs 'SMStext_builder', 'add_reply', $SMSTree['b20'], 'booty_call_sms', 'new_routing3', $ARGS[1], $ARGS[2], 'b', 'accept_booty_call', ''
+		gs 'SMStext_builder', 'show_sms', ARGS[4]
+	gs 'SMStext_builder', 'end'
+end
+
+if $ARGS[0] = 'late apology':
+	gs 'booty_call_sms', $ARGS[2], $ARGS[3]
 	gs 'SMStext_builder', 'start'
-		gs 'SMStext_builder', 'send', $SMSTree['ba3']
-		gs 'SMStext_builder', 'show_sms', ARGS[3]
-		wait 500
+		gs 'SMStext_builder', 'send', $SMSTree[$ARGS[4]]
+		gs 'SMStext_builder', 'show_sms', ARGS[5]
 
-		gs 'SMStext_builder', 'receive', $SMSTree['ba4']
-		gs 'SMStext_builder', 'show_sms', ARGS[3]
+		wait 250
+
+		if $ARGS[1] = '1':
+			gs 'SMStext_builder', 'add_reply', $SMSTree['c22'], 'booty_call_sms', 'late_apology', '2', $ARGS[2], $ARGS[3], 'c22'
+		elseif $ARGS[1] = '2':
+			gs 'SMStext_builder', 'add_reply', $SMSTree['c23'], 'booty_call_sms', 'new_routing3', $ARGS[2], $ARGS[3], 'c23'
+		end
+		gs 'SMStext_builder', 'show_sms', ARGS[5]
 	gs 'SMStext_builder', 'end'
+end
 
-	gs 'booty_call_sms', 'decline_booty_call', $ARGS[2]
 
-elseif $ARGS[0] = 'Choice2_bb':
-	!! booty call is accepted
 
+if $ARGS[0] = 'new_routing3':
 	gs 'booty_call_sms', $ARGS[1], $ARGS[2]
-
+	dynamic $ARGS[5]
 	gs 'SMStext_builder', 'start'
-		gs 'SMStext_builder', 'send', $SMSTree['bb3']
-		gs 'SMStext_builder', 'show_sms', ARGS[3]
-		wait 500
+		gs 'SMStext_builder', 'send', $SMSTree[$ARGS[3] + '20']
+		gs 'SMStext_builder', 'show_sms', ARGS[6]
 
-		gs 'SMStext_builder', 'receive', $SMSTree['bb4']
-		gs 'SMStext_builder', 'show_sms', ARGS[3]
+		wait 250
+
+		gs 'SMStext_builder', 'receive', $SMSTree[$ARGS[3] + '21']
+		gs 'SMStext_builder', 'show_sms', ARGS[6]
 	gs 'SMStext_builder', 'end'
+	gs 'booty_call_sms', $ARGS[4], $ARGS[2], ARGS[6]
+end
+
 
-	gs 'booty_call_sms', 'accept_booty_call', $ARGS[2]
+
+if $ARGS[0] = 'end':
+	gs 'booty_call_sms', $ARGS[1], $ARGS[2]
+	dynamic $ARGS[5]
+	gs 'SMStext_builder', 'start'
+		gs 'SMStext_builder', 'send', $SMSTree[$ARGS[3]]
+		gs 'SMStext_builder', 'show_sms', ARGS[6]
+	gs 'SMStext_builder', 'end'
+	gs 'booty_call_sms', $ARGS[4], $ARGS[2], ARGS[6]
 end
 
 
@@ -579,10 +856,84 @@ elseif $ARGS[0] = 'decline_booty_call':
 		npc_rel[$ARGS[1]] -= 2
 		sugar_daddy_call[$ARGS[1]] = 0
 	end
+
+	if rand(0, 1) = 0: gs 'booty_call_sms', 'sexting1', 'new_sexting', $ARGS[1], ARGS[2]
+end
+
+
+if $ARGS[0] = 'sexting1':
+	gs 'booty_call_sms', $ARGS[1], $ARGS[2]
+	gs 'SMStext_builder', 'start'
+		gs 'SMStext_builder', 'receive', $SMSTree['0']
+		gs 'SMStext_builder', 'add_reply', $SMSTree['a1'], 'booty_call_sms', 'sexting_refuse', $ARGS[1], $ARGS[2], 'refuse'
+		gs 'SMStext_builder', 'add_reply', $SMSTree['b1'], 'booty_call_sms', 'sexting_refuse', $ARGS[1], $ARGS[2], 'next'
+		if strpos($location_type, 'outdoors') > 0 or strpos($location_type, 'public') > 0:
+			gs 'SMStext_builder', 'add_reply', $SMSTree['c1'], 'booty_call_sms', 'sexting_public', $ARGS[1], $ARGS[2]
+		end
+		gs 'SMStext_builder', 'send_selfie', $SMSTree['s1'], 'n|b|sh|ft|fa|fp', 'booty_call_sms', 'sexting_send', $ARGS[1], $ARGS[2]
+		gs 'SMStext_builder', 'show_sms', ARGS[3]
+	gs 'SMStext_builder', 'end'
+end
+
+if $ARGS[0] = 'sexting_public':
+	gs 'booty_call_sms', $ARGS[1], $ARGS[2]
+	gs 'SMStext_builder', 'start'
+		gs 'SMStext_builder', 'send', $SMSTree['c1']
+		gs 'SMStext_builder', 'show_sms', ARGS[2]
+
+		wait 250
+
+		gs 'SMStext_builder', 'receive', $SMSTree['c2']
+		if npc_dirty_lover[$ARGS[1]] = 1:
+			gs 'SMStext_builder', 'add_reply', $SMSTree['a1'], 'booty_call_sms', 'sexting_refuse', $ARGS[1], $ARGS[2], 'refuse'
+			gs 'SMStext_builder', 'add_reply', $SMSTree['b1'], 'booty_call_sms', 'sexting_refuse', $ARGS[1], $ARGS[2], 'next'
+			gs 'SMStext_builder', 'send_selfie', $SMSTree['s1'], 'n|b|sh|ft|fa|fp', 'booty_call_sms', 'sexting_send', $ARGS[1], $ARGS[2]
+		end
+		gs 'SMStext_builder', 'show_sms', ARGS[3]
+	gs 'SMStext_builder', 'end'
 end
 
+if $ARGS[0] = 'sexting_refuse':
+	gs 'booty_call_sms', $ARGS[1], $ARGS[2]
+	gs 'SMStext_builder', 'start'
+		if $ARGS[3] = 'refuse':
+			gs 'SMStext_builder', 'send', $SMSTree['a2']
+			npc_rel[$ARGS[1]] -= 1
+		else
+			gs 'SMStext_builder', 'send', $SMSTree['b1']
+		end
+		gs 'SMStext_builder', 'show_sms', ARGS[4]
+	gs 'SMStext_builder', 'end'
+end
+
+
+if $ARGS[0] = 'sexting_send':
+	gs 'booty_call_sms', $ARGS[1], $ARGS[2]
+	gs 'SMStext_builder', 'start'
+		gs 'SMStext_builder', 'send_img', $ARGS[4]
+		gs 'SMStext_builder', 'show_sms', ARGS[3]
+
+		wait 250
+
+		gs 'SMStext_builder', 'receive', 'damn!!'
+		gs 'SMStext_builder', 'show_sms', ARGS[3]
+
+		wait 250
+		gs 'SMStext_builder', 'send', ':)'
+		! Add responses based on the result??
+		!{
+		if $ARGS[5] = 'clothed':
+		elseif $ARGS[5] = 'nude' or $ARGS[5] = 'pussyflash':
+		end
+		}
+		gs 'SMStext_builder', 'show_sms', ARGS[3]
+	gs 'SMStext_builder', 'end'
+end
+
+
+
 
-if $ARGS[0] ! 'default_booty_call' and $ARGS[0] ! 'pre_planned_booty_call' and $ARGS[0] ! 'std_free' and $ARGS[0] ! 'sugar_daddy_booty_call':
+if $ARGS[0] ! 'default_booty_call' and $ARGS[0] ! 'pre_planned_booty_call' and $ARGS[0] ! 'std_free' and $ARGS[0] ! 'sugar_daddy_booty_call' and $ARGS[0] ! 'new_booty_call' and $ARGS[0] ! 'new_sexting':
 	killvar '$SMSTree'
 end
 

+ 46 - 43
locations/cikl.qsrc

@@ -124,7 +124,7 @@ end
 !! terminate tour gide job when its off season
 if emp_job_status[1] = 1 and month < 6 and month > 8:
 	if work = 1: work = 0
-	emp_job_status[1]  = 4
+	emp_job_status[1] = 4
 end
 
 dynamic $hypnoDaychange
@@ -234,7 +234,7 @@ if bimbo >= 40: bimbo = 40
 
 !!Bimbo levels. They use custom variables so they won''t permanently change character stats
 if bimbolevel = 0: supnatvnesh = 0 & bimbostupidity = 0
-if  CheatBimbo2 = 0:
+if CheatBimbo2 = 0:
 	if bimbolevel = 1: supnatvnesh = 2 & bimbostupidity = (pcs_intel / 6)
 	if bimbolevel = 2: supnatvnesh = 2 & bimbostupidity = (pcs_intel / 4)
 	if bimbolevel = 3: supnatvnesh = 4 & bimbostupidity = (pcs_intel / 3)
@@ -420,8 +420,8 @@ else
 	isprok_lastday = 0
 end
 
-if Enable_auto_tampons =  0 and isprok = 1: isprok = 0 & 'You threw away your used tampon.'
-if Enable_auto_tampons =  0 and isprokp = 1:isprokp = 0 & 'You threw away your used sanitary pad.'
+if Enable_auto_tampons = 0 and isprok = 1:  isprok  = 0 & 'You threw away your used tampon.'
+if Enable_auto_tampons = 0 and isprokp = 1: isprokp = 0 & 'You threw away your used sanitary pad.'
 
 if lactation['nipgrowth'] > 0:
 	tmp = rand(0,2)
@@ -632,7 +632,7 @@ if GspravkaT = 1:Gspravka -= 1
 if BurgerQW['IlyQW'] = 2 and BurgerQW['IlyQWPoliceDayCount'] > 0 and BurgerQW['IlyQWPoliceDayCount'] < 30: 
 	BurgerQW['IlyQWPoliceDayCount'] += 1
 elseif BurgerQW['IlyQW'] = 2 and BurgerQW['IlyQWPoliceDayCount'] = 30: 
-	BurgerQW['IlyQW']  = 3
+	BurgerQW['IlyQW'] = 3
 end
 
 !!Remove degradation for inhibition
@@ -798,7 +798,7 @@ if mid($start_type, 1, 2) = 'sg':
 			killvar 'first_time_outside_in_cold_weather'
 			killvar 'first_time_doing_basketball'
 			killvar 'first_time_spring_football_match'
-!! end inc  
+!! end inc
 		elseif month = 10 and day >= 29:
 			$holyday = '<b>Autumn Break starts in <<35-day>> days.</b>'
 		elseif month = 11:
@@ -952,12 +952,15 @@ if natholi = 1:
 end
 
 
-!! Anushka''s band is on tour from Thursday 01-06 until Saturday 19-08. Blame Nutluck
-if year = 2017 and ( month = 6 or month = 7 or (month = 8 and day < 19) ):
-	gopnikbandQW['on_tour'] = 1
-else
-	gopnikbandQW['on_tour'] = 0
-end
+
+
+	!!====================================================================!!
+	!!                                                                    !!
+	!!                      Setting story SMS times                       !!
+	!!                                                                    !!
+	!!====================================================================!!
+
+gs 'SMS_schedules', 'cikl'
 
 
 
@@ -1051,7 +1054,7 @@ end
 !!------------------------------------------------------------------------------------------------------------
 
 !!---------- School related schedule -------------------------------------------------------------------------
-starlets_on     = iif( ( (week = 5 and odd_week = 0) or (week = 1 or week = 3 or week >= 6) ) and natholi = 0,1,0)
+starlets_on		= iif( ( (week = 5 and odd_week = 0) or (week = 1 or week = 3 or week >= 6) ) and natholi = 0,1,0)
 cheerleaders_on = iif( ( (week = 5 and odd_week = 1) or (week = 2 or week = 4) ) and (natholi = 0 and (month >9 or month <6)) ,1,0)
 
 if starlets['late_message'] = 1: starlets['late_message'] = 0
@@ -1069,7 +1072,7 @@ end
 
 if month = 9 and day = 16 and AlbinaQW['ParkRally'] = 0: AlbinaQW['ParkRally'] = 1
 if month = 10 and day = 16 and AlbinaQW['ParkRally'] = 1: AlbinaQW['ParkRally'] = 2
-if month  = 11 and day = 19 and (AlbinaQW['StarletsJoined'] <= 0 or (AlbinaQW['StarletsJoined'] = 1 and npc_pregtalk['A23'] = 1)) and AlbinaQW['StarletsShutDown'] = 0: AlbinaQW['StarletsShutDown'] = 1
+if month = 11 and day = 19 and (AlbinaQW['StarletsJoined'] <= 0 or (AlbinaQW['StarletsJoined'] = 1 and npc_pregtalk['A23'] = 1)) and AlbinaQW['StarletsShutDown'] = 0: AlbinaQW['StarletsShutDown'] = 1
 
 !!------------------------------------------------------------------------------------------------------------
 
@@ -1098,9 +1101,9 @@ end
 if ml_onlinesongcount > 0:
 	i = 0
 	j = -1
-    
-	:looponlinesongs        
-!!      this so every song counts only every 7 days and only for a limited number of weeks 
+
+	:looponlinesongs
+!!		this so every song counts only every 7 days and only for a limited number of weeks 
 		if ml_onlinesong_freshness[i] > 0:		
 			j += 1
 			ml_tempsong_freshness[j] = ml_onlinesong_freshness[i]
@@ -1186,7 +1189,7 @@ if $lib_book_loaned ! '': lib_debt += 50
 !!------------- Preliminary npc_uni_eduTipe  ------------------------------------------
 !! 
 !!npc_uni_eduType = '', 'professor', 'teaching_studies', 'business_studies', 'science_studies', 'fashion_studies'
-!!                  'nursing_studies', 'psychology_studies', 'programming_studies', 'other_studies'
+!!				'nursing_studies', 'psychology_studies', 'programming_studies', 'other_studies'
 !!
 !!Will eventually need to be moved to the npcstatic and npcstaticdefault files for eternal uni npcs
 !!To specific event checks for pav_uni npcs
@@ -1253,31 +1256,31 @@ if will_counter >= 20: will_counter -= 20 & willpowermax += 1
 
 !!-----------------webcam follower loss due to inactivity ------------------------------------------
 if camwhore = 1:
-    if cam_daystart < daystart:
-        engagementFactor = 1 + (CamBonus / 100)
-        popularityFactor = webpopular / 1000
-
-        if regviewReset < 3:
-            if regview >= 500:
-                FollowersLost = rand(regview / (100 * engagementFactor), regview / (50 * engagementFactor)) + popularityFactor
-            else
-                FollowersLost = rand(1, 3) + popularityFactor
-            end
-            cam_daystart = daystart + max(1, 3 - (CamBonus / 50))
-        else
-            if regview >= 300:
-                FollowersLost = rand(regview / (80 * engagementFactor), regview / (40 * engagementFactor)) + popularityFactor
-            else
-                FollowersLost = rand(2, 6) + popularityFactor
-            end
-            cam_daystart = daystart + max(1, 2 - (CamBonus / 50))
-        end
-        regviewReset += 1
-        FollowersLost = func('shortgs', 'clamp', FollowersLost, 0, regview)
-        totFollowersLost += FollowersLost
-        regview -= FollowersLost
-        killvar 'FollowersLost'
-    end
+	if cam_daystart < daystart:
+		engagementFactor = 1 + (CamBonus / 100)
+		popularityFactor = webpopular / 1000
+
+		if regviewReset < 3:
+			if regview >= 500:
+				FollowersLost = rand(regview / (100 * engagementFactor), regview / (50 * engagementFactor)) + popularityFactor
+			else
+				FollowersLost = rand(1, 3) + popularityFactor
+			end
+			cam_daystart = daystart + max(1, 3 - (CamBonus / 50))
+		else
+			if regview >= 300:
+				FollowersLost = rand(regview / (80 * engagementFactor), regview / (40 * engagementFactor)) + popularityFactor
+			else
+				FollowersLost = rand(2, 6) + popularityFactor
+			end
+			cam_daystart = daystart + max(1, 2 - (CamBonus / 50))
+		end
+		regviewReset += 1
+		FollowersLost = func('shortgs', 'clamp', FollowersLost, 0, regview)
+		totFollowersLost += FollowersLost
+		regview -= FollowersLost
+		killvar 'FollowersLost'
+	end
 end
 
 

+ 0 - 45
locations/hourly_events.qsrc

@@ -321,49 +321,4 @@ gs 'katja_procedural', 'hourly'
 
 if (hour mod 2) = 0: gs 'outdoors', 'weather'
 
-
-
-
-
-!!===========================================================================!!
-!!                                                                           !!
-!!                             ?Story triggers?                              !!
-!!                                                                           !!
-!!===========================================================================!!
-
-
-!! I do not think that this should be here, but I put it here temporaly - rachels
-!! generate SMS for nerd games
-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:
-			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:
-			gs 'nerd_game_night', 'summer2_invite_sms', 'Add SMS'
-		end
-	end
-end
-
-
-!! Generate SMS for anushka''s band tour. Blame Nutluck
-if gopnikbandQW['on_tour'] = 1 and npc_rel['A144'] >= 50 and anushkaQW['tour_SMS_send'] < daystart and anushkaQW['num_tour_SMS_send'] < 11:
-	if anushkaQW['num_tour_SMS_send'] <= 9 and week = 6 and (hour = 12 or hour = 13):
-		if rand(0, 1) = 0 or hour = 13:
-			gs 'band_tour_anushka_SMS', 'start'
-		end
-
-	elseif anushkaQW['num_tour_SMS_send'] = 10 and week = 2 and (hour = 19 or hour = 20):
-		if rand(0, 1) = 0 or hour = 20:
-			gopnikbandQW['on_tour'] = 0
-			gs 'band_tour_anushka_SMS', 'start'
-		end
-	end
-end
-
 --- hourly_events ---------------------------------
-

+ 1 - 2
locations/igorev.qsrc

@@ -730,7 +730,6 @@ if $ARGS[0] = 'din_sisterkom':
 							*clr & cla
 							igor_eqwtday = daystart
 							minut += 15
-							igor_krossdress = 1
 							gs 'stat'
 							'<center><b><font color = maroon>Igor''s sister''s room</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/crossdress/ystala.jpg"></center>'
@@ -863,7 +862,7 @@ if $ARGS[0] = 'din_sisterkom_krossdress':
 													gs 'stat'
 													act 'Finish':
 														*clr & cla
-														igor_krossdresssex = 1
+														igor_krossdresssex += 1
 														igor_eqwtday = daystart
 														gs 'stat'
 														'<center><b><font color = maroon>Igor''s sister''s room</font></b></center>'

+ 1 - 1
locations/igorhome.qsrc

@@ -217,7 +217,7 @@ if $ARGS[0] = 'chat':
 	act 'Keep talking': gt 'igorhome', 'chat'
 	act 'Excuse yourself': gt 'igorhome', 'hallway'
 	!!this is extra options that show up only if certain things have happened.
-	if sisunlock = 1 and igor_krossdress < 1:
+	if sisunlock = 1 and igor_eqwtday ! daystart:
 		act 'Clothes':
 			*clr & cla
 			'"So your sister has that many clothes?" you ask Igor.'

+ 14 - 13
locations/korrPar.qsrc

@@ -68,19 +68,20 @@ else
 		minut += 5
 		gt'pod_ezd','etaj_2'
 	end
-	if hour < 5 and motherWorry = 0 and age < 18 and locat['Fam_inGad'] = 0:
-		'<font color=red>Are you sure? Your mother will worry.</b></font>'
-		cla
-		act '<font color=red><b>Yes, go outside</b></font>': 
-			minut += 5 
-			!! Reset vars - temp until other parts of game migrated
-			killvar '$default_img_path'
-			killvar '$mother_img_path'
-			gt'pav_complex', 'start'
-		end
-		act 'No, stay inside':gt 'korrPar'
-	else
-		act '<b>Leave and go to the courtyard</b>':
+	act '<b>Leave and go to the courtyard</b>':
+		if hour < 5 and motherWorry = 0 and age < 18 and locat['Fam_inGad'] = 0:
+			*nl
+			'<font color=red>Are you sure? Your mother will worry.</b></font>'
+			cla
+			act '<font color=red><b>Yes, go outside</b></font>': 
+				minut += 5 
+				!! Reset vars - temp until other parts of game migrated
+				killvar '$default_img_path'
+				killvar '$mother_img_path'
+				gt'pav_complex', 'start'
+			end
+			act 'No, stay inside':gt 'korrPar'
+		else
 			minut += 5
 			!! Reset vars - temp until other parts of game migrated
 			killvar '$default_img_path'

+ 3 - 4
locations/lover.qsrc

@@ -148,7 +148,7 @@ if $ARGS[0] = 'remove':
 end
 
 if $ARGS[0] = 'add_fuckbuddy':
-	if mid($ARGS[1],1,1) = 'C' :
+	if mid($ARGS[1],1,1) = 'C':
 		gs 'npcpreservec', $ARGS[1]
 		gs 'boyStat', $npclastsaved
 	else
@@ -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
 
@@ -216,7 +216,6 @@ if $ARGS[0] = 'clear_all':
 		gs 'lover', 'remove_sugar_daddy', $sugar_daddy[0]
 		jump 'clear_sd_loop'
 	end
-	
 end
 
 

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

+ 8 - 0
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

+ 117 - 87
locations/nerd_game_night.qsrc

@@ -1467,8 +1467,24 @@ if $ARGS[0] = 'zinaida':
 end
 
 
-if $ARGS[0] = 'summer_invite_sms':
+if $ARGS[0] = 'game_invite_sms_switch':
+	if $start_type['loc'] = 'sg' and (grupTipe = 3 or nerd_game['stage'] > 0 or rand(80, npc_rel['A152']) > 95):
+		gs 'nerd_game_night', 'summer_invite_sms', 'Add SMS'
+	elseif ($start_type['loc'] = 'uni' or $start_type['loc'] = 'city') and nerd_game['fixed_uni_day'] = 0 and (nerd_game['stage'] > 0 or rand(80, npc_rel['A152']) > 95):
+		gs 'nerd_game_night', 'summer2_invite_sms', 'Add SMS'
+	end
+	gs 'telefon', 'SetSMSSchedule', 'A152', "", "0", "", "0"
+end
+
+if $ARGS[0] = 'first_text':
+	temp_pos = arrpos('$contact', 'A152')
+	if temp_pos = -1 or contactAnon[temp_pos] = 1: gs 'telefon', 'AddContact', 'A152', 'images/characters/shared/headshots_main/big152.jpg', 0
+	killvar 'temp_pos'
+	nerd_game['first_SMS_received'] = 1
+end
 
+
+if $ARGS[0] = 'summer_invite_sms':
 	if $ARGS[1] = 'Add SMS':
 		nerd_game['lot'] = func('shortgs', 'rand_pick', '', 12, 13, 14, 23, 24, 34)
 	end
@@ -1480,17 +1496,22 @@ if $ARGS[0] = 'summer_invite_sms':
 		$SMSTree[ '0'] = 'Hey <<$pcs_nickname>>, would you like to join us for our weekly game night? We have a few nights free this week and were wondering which one works best for you. We can do it either on <<$week[val(mid(nerd_game[''lot''],1,1))]>> or <<$week[val(mid(nerd_game[''lot''],2,1))]>>.'
 	end
 
-		$SMSTree['ca1'] = 'Not interested'
-			$SMSTree['a1'] = 'Sorry, but I''m just not interested in stuff like that. Thanks for the invite though.'
-				$SMSTree['a2'] = ':-( Oh... okay yeah I get it. Guess we''ll see you around.'
+		$SMSTree['ca1'] = '<<$week[val(mid(nerd_game[''lot''],1,1))]>>'
+			$SMSTree['a1'] = 'Sure, I can make it on <<$week[val(mid(nerd_game[''lot''],1,1))]>>.'
+				$SMSTree['a2'] = ':-) Great! I''ll see you on <<$week[val(mid(nerd_game[''lot''],1,1))]>> at 20:00 in the library then! Be ready to get your nerd on, because we''re going to rock it so hard! We also meet for board games on Saturday and Sunday if you want to show up for those.'
+
+		$SMSTree['cb1'] = '<<$week[val(mid(nerd_game[''lot''],2,1))]>>'
+			$SMSTree['b1'] = 'Sure, I can make it on <<$week[val(mid(nerd_game[''lot''],2,1))]>>.'
+				$SMSTree['b2'] = ':-) Great! I''ll see you on <<$week[val(mid(nerd_game[''lot''],2,1))]>> at 20:00 in the library then! Be ready to get your nerd on, because we''re going to rock it so hard! We also meet for board games on Saturday and Sunday if you want to show up for those.'
 
-		$SMSTree['cb1'] = '<<$week[val(mid(nerd_game[''lot''],1,1))]>>'
-			$SMSTree['b1'] = 'Sure, I can make it on <<$week[val(mid(nerd_game[''lot''],1,1))]>>.'
-				$SMSTree['b2'] = ':-) Great! I''ll see you on <<$week[val(mid(nerd_game[''lot''],1,1))]>> at 20:00 in the library then! Be ready to get your nerd on, because we''re going to rock it so hard! We also meet for board games on Saturday and Sunday if you want to show up for those.'
+		$SMSTree['cc1'] = 'Not this week'
+			$SMSTree['c1'] = 'Sorry I don''t have time this week, but next week I should be able too.'
+				$SMSTree['c2'] = ':-( Oh... okay yeah I get it. Guess we''ll see you next week.'
 
-		$SMSTree['cc1'] = '<<$week[val(mid(nerd_game[''lot''],2,1))]>>'
-			$SMSTree['c1'] = 'Sure, I can make it on <<$week[val(mid(nerd_game[''lot''],2,1))]>>.'
-				$SMSTree['c2'] = ':-) Great! I''ll see you on <<$week[val(mid(nerd_game[''lot''],2,1))]>> at 20:00 in the library then! Be ready to get your nerd on, because we''re going to rock it so hard! We also meet for board games on Saturday and Sunday if you want to show up for those.'
+		$SMSTree['cd1'] = 'Not interested'
+			$SMSTree['cd2'] = '<font color="red">This ends the D&D Campaign - Forever</font>'
+				$SMSTree['d2'] = 'Sorry, but I''m just not interested in stuff like that. Thanks for the invite though.'
+					$SMSTree['d3'] = ':-( Oh... okay yeah I get it. Guess we''ll see you around.'
 
 
 	if $ARGS[1] = 'Add SMS':
@@ -1502,103 +1523,102 @@ if $ARGS[0] = 'summer_invite_sms':
 			gs 'SMStext_builder', 'add_reply', $SMSTree['ca1'], 'nerd_game_night', 'summer_invite_sms', 'Choice_a'
 			gs 'SMStext_builder', 'add_reply', $SMSTree['cb1'], 'nerd_game_night', 'summer_invite_sms', 'Choice_b'
 			gs 'SMStext_builder', 'add_reply', $SMSTree['cc1'], 'nerd_game_night', 'summer_invite_sms', 'Choice_c'
+			gs 'SMStext_builder', 'add_reply', $SMSTree['cd1'], 'nerd_game_night', 'summer_invite_sms', 'Choice_d'
 
 			gs 'SMStext_builder', 'add_sms', 'A152'
 		gs 'SMStext_builder', 'end'
-	
-	elseif $ARGS[1] = 'Choice_a':
+	else
 		!! 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', 0
-			nerd_game['first_SMS_received'] = 1
+			gs 'nerd_game_night', 'first_text'
 		end
+	end
 
+	if $ARGS[1] = 'Choice_a':
 		gs 'SMStext_builder', 'start'
 			gs 'SMStext_builder', 'send', $SMSTree['a1']
 			gs 'SMStext_builder', 'show_sms', ARGS[2]
-			wait 1000
+			nerd_game['game_day'] = daystart - week + val(mid(nerd_game['lot'], 1, 1))
+
+			wait 100
 
 			gs 'SMStext_builder', 'receive', $SMSTree['a2']
 			gs 'SMStext_builder', 'show_sms', ARGS[2]
 		gs 'SMStext_builder', 'end'
-!!		nerd_game['invite_day'] = 2147483647 & ! block the event
-	
-	elseif $ARGS[1] = 'Choice_b':
-		!! 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', 0
-			nerd_game['first_SMS_received'] = 1
-		end
-
-		nerd_game['game_day'] = daystart - week + val(mid(nerd_game['lot'],1,1))
 
+	elseif $ARGS[1] = 'Choice_b':
 		gs 'SMStext_builder', 'start'
 			gs 'SMStext_builder', 'send', $SMSTree['b1']
 			gs 'SMStext_builder', 'show_sms', ARGS[2]
-			wait 1000
+			nerd_game['game_day'] = daystart - week + val(mid(nerd_game['lot'], 2, 1))
+
+			wait 100
 
 			gs 'SMStext_builder', 'receive', $SMSTree['b2']
 			gs 'SMStext_builder', 'show_sms', ARGS[2]
 		gs 'SMStext_builder', 'end'
 
 	elseif $ARGS[1] = 'Choice_c':
-		!! 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', 0
-			nerd_game['first_SMS_received'] = 1
-		end
-
-		nerd_game['game_day'] = daystart - week + val(mid(nerd_game['lot'],2,1))
-
 		gs 'SMStext_builder', 'start'
 			gs 'SMStext_builder', 'send', $SMSTree['c1']
 			gs 'SMStext_builder', 'show_sms', ARGS[2]
-			wait 1000
+
+			wait 100
 
 			gs 'SMStext_builder', 'receive', $SMSTree['c2']
 			gs 'SMStext_builder', 'show_sms', ARGS[2]
 		gs 'SMStext_builder', 'end'
-	end
 
-	killvar '$SMSTree'
-end
+	elseif $ARGS[1] = 'Choice_d':
+		gs 'SMStext_builder', 'start'
+			gs 'SMStext_builder', 'add_reply', $SMSTree['ca1'], 'nerd_game_night', 'summer_invite_sms', 'Choice_a'
+			gs 'SMStext_builder', 'add_reply', $SMSTree['cb1'], 'nerd_game_night', 'summer_invite_sms', 'Choice_b'
+			gs 'SMStext_builder', 'add_reply', $SMSTree['cc1'], 'nerd_game_night', 'summer_invite_sms', 'Choice_c'
+			gs 'SMStext_builder', 'add_reply', $SMSTree['cd2'], 'nerd_game_night', 'summer_invite_sms', 'Choice_d1'
+			gs 'SMStext_builder', 'show_sms', ARGS[2]
+		gs 'SMStext_builder', 'end'
 
-if $ARGS[0] = 'summer2_invite_sms':
-	$SMS_open_receiving = '<table width=80%><tr><td collspan=2 bgcolor="#D4CEF9"><font color=black>'
-	$SMS_close_receiving = '</font></td><td width=10%></td></tr></table>'
+	elseif $ARGS[1] = 'Choice_d1':
+		gs 'SMStext_builder', 'start'
+			gs 'SMStext_builder', 'send', $SMSTree['d2']
+			gs 'SMStext_builder', 'show_sms', ARGS[2]
+			nerd_game['invite_day'] += 7305		& ! Next campaign in 20 years.
 
-	!! Open and close sending text
-	$SMS_open_sending = '<table width=80%><tr><td width=10%></td><td collspan=2 bgcolor=pink><font color=black>'
-	$SMS_close_sending = '</font></td></tr></table>'
+			wait 100
 
-	!! Start reply
-	$SMS_open_replies = '<table><tr><th> Reply</th></tr><tr><td>'
-	$SMS_next_reply = '</td></tr><tr><td>'
-	$SMS_close_replies = '</td></tr></table>'
-	
-	$temp_SMStext = ''
+			gs 'SMStext_builder', 'receive', $SMSTree['d3']
+			gs 'SMStext_builder', 'show_sms', ARGS[2]
+		gs 'SMStext_builder', 'end'
+	end
 
+	killvar '$SMSTree'
+end
 
+if $ARGS[0] = 'summer2_invite_sms':
 	if nerd_game['first_SMS_received'] = 0:
 		$SMSTree[ '0'] = 'Hey <<$pcs_nickname>> this is Feofan. We are doing our weekly game night at the Coffee Hole, coffee shop now. We will mostly be playing Dungeons and Dragons and board games. I was talking to the others and we were wondering if you was going to keep playing with us? We have a few nights free this week and were wondering which night works best for you. We can do it either on Tuesday or Thursday.'
 	else
 		$SMSTree[ '0'] = 'Hey <<$pcs_nickname>>, would you like to join us for our weekly game night at the Coffee Hole? We have a few nights free this week and were wondering which night works best for you. We can do it either on Tuesday or Thursday.'
 	end
 
-		$SMSTree['ca1'] = 'Not interested'
-			$SMSTree['a1']  = 'Sorry, but I''m just not interested in stuff like that anymore. Thanks for the invite though.'
-				$SMSTree['a2'] = ':-( Oh... Okay, yeah I get it. Guess we''ll see you around.'
+		$SMSTree['ca1'] = 'Tuesday'
+			$SMSTree['a1'] = 'Sure, I can make it on Tuesday.'
+				$SMSTree['a2'] = ':-) Great! I''ll see you on Tuesday at 18:00 at the Coffee Hole then! Be ready to get your nerd on, because we''re going to rock it so hard! We also meet for board games on Saturday and Sunday if you want to show up for those.'
+
+		$SMSTree['cb1'] = 'Thursday'
+			$SMSTree['b1'] = 'Sure, I can make it on Thursday.'
+				$SMSTree['b2'] = ':-) Great! I''ll see you on Thursday at 18:00 at the Coffee Hole then! Be ready to get your nerd on, because we''re going to rock it so hard! We also meet for board games on Saturday and Sunday if you want to show up for those.'
 
-		$SMSTree['cb1'] = 'Tuesday'
-			$SMSTree['b1'] = 'Sure, I can make it on Tuesday.'
-				$SMSTree['b2'] = ':-) Great! I''ll see you on Tuesday at 18:00 at the Coffee Hole then! Be ready to get your nerd on, because we''re going to rock it so hard! We also meet for board games on Saturday and Sunday if you want to show up for those.'
+		$SMSTree['cc1'] = 'Not this week'
+			$SMSTree['c1']  = 'Sorry I don''t have time this week, but next week I should be able too.'
+				$SMSTree['c2'] = ':-( Oh... Okay, yeah I get it. Guess we''ll see you next week.'
+
+		$SMSTree['cd1'] = 'Not interested'
+			$SMSTree['cd2'] = '<font color="red">This ends the D&D Campaign - Forever</font>'
+				$SMSTree['d2'] = 'Sorry, but I''m just not interested in stuff like that. Thanks for the invite though.'
+					$SMSTree['d3'] = ':-( Oh... okay yeah I get it. Guess we''ll see you around.'
 
-		$SMSTree['cc1'] = 'Thursday'
-			$SMSTree['c1'] = 'Sure, I can make it on Thursday.'
-				$SMSTree['c2'] = ':-) Great! I''ll see you on Thursday at 18:00 at the Coffee Hole then! Be ready to get your nerd on, because we''re going to rock it so hard! We also meet for board games on Saturday and Sunday if you want to show up for those.'
 
 	if $ARGS[1] = 'Add SMS':
 		nerd_game['invite_day'] = daystart
@@ -1609,67 +1629,77 @@ if $ARGS[0] = 'summer2_invite_sms':
 			gs 'SMStext_builder', 'add_reply', $SMSTree['ca1'], 'nerd_game_night', 'summer2_invite_sms', 'Choice_a'
 			gs 'SMStext_builder', 'add_reply', $SMSTree['cb1'], 'nerd_game_night', 'summer2_invite_sms', 'Choice_b'
 			gs 'SMStext_builder', 'add_reply', $SMSTree['cc1'], 'nerd_game_night', 'summer2_invite_sms', 'Choice_c'
+			gs 'SMStext_builder', 'add_reply', $SMSTree['cd1'], 'nerd_game_night', 'summer2_invite_sms', 'Choice_d'
 
 			gs 'SMStext_builder', 'add_sms', 'A152'
 		gs 'SMStext_builder', 'end'
-
-	elseif $ARGS[1] = 'Choice_a':
+	else
 		!! 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', 0
-			nerd_game['first_SMS_received'] = 1
+			gs 'nerd_game_night', 'first_text'
 		end
+	end
+
 
+	if $ARGS[1] = 'Choice_a':
 		gs 'SMStext_builder', 'start'
 			gs 'SMStext_builder', 'send', $SMSTree['a1']
 			gs 'SMStext_builder', 'show_sms', ARGS[2]
-			wait 1000
+			nerd_game['fixed_uni_day'] = 2
+
+			wait 100
 
 			gs 'SMStext_builder', 'receive', $SMSTree['a2']
 			gs 'SMStext_builder', 'show_sms', ARGS[2]
 		gs 'SMStext_builder', 'end'
-!!		nerd_game['invite_day'] = 2147483647 & ! block the event
 
 	elseif $ARGS[1] = 'Choice_b':
-		!! 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', 0
-			nerd_game['first_SMS_received'] = 1
-		end
-
-		nerd_game['fixed_uni_day'] = 2
-		
 		gs 'SMStext_builder', 'start'
 			gs 'SMStext_builder', 'send', $SMSTree['b1']
 			gs 'SMStext_builder', 'show_sms', ARGS[2]
-			wait 1000
+			nerd_game['fixed_uni_day'] = 4
+
+			wait 100
 
 			gs 'SMStext_builder', 'receive', $SMSTree['b2']
 			gs 'SMStext_builder', 'show_sms', ARGS[2]
 		gs 'SMStext_builder', 'end'
 
 	elseif $ARGS[1] = 'Choice_c':
-		!! 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', 0
-			nerd_game['first_SMS_received'] = 1
-		end
-
-		nerd_game['fixed_uni_day'] = 4
-		
 		gs 'SMStext_builder', 'start'
 			gs 'SMStext_builder', 'send', $SMSTree['c1']
 			gs 'SMStext_builder', 'show_sms', ARGS[2]
-			wait 1000
+
+			wait 100
 
 			gs 'SMStext_builder', 'receive', $SMSTree['c2']
 			gs 'SMStext_builder', 'show_sms', ARGS[2]
 		gs 'SMStext_builder', 'end'
+
+		elseif $ARGS[1] = 'Choice_d':
+		gs 'SMStext_builder', 'start'
+			gs 'SMStext_builder', 'add_reply', $SMSTree['ca1'], 'nerd_game_night', 'summer_invite_sms', 'Choice_a'
+			gs 'SMStext_builder', 'add_reply', $SMSTree['cb1'], 'nerd_game_night', 'summer_invite_sms', 'Choice_b'
+			gs 'SMStext_builder', 'add_reply', $SMSTree['cc1'], 'nerd_game_night', 'summer_invite_sms', 'Choice_c'
+			gs 'SMStext_builder', 'add_reply', $SMSTree['cd2'], 'nerd_game_night', 'summer_invite_sms', 'Choice_d1'
+			gs 'SMStext_builder', 'show_sms', ARGS[2]
+		gs 'SMStext_builder', 'end'
+
+	elseif $ARGS[1] = 'Choice_d1':
+		gs 'SMStext_builder', 'start'
+			gs 'SMStext_builder', 'send', $SMSTree['d2']
+			gs 'SMStext_builder', 'show_sms', ARGS[2]
+			nerd_game['invite_day'] += 7305		& ! Next campaign in 20 years.
+
+			wait 100
+
+			gs 'SMStext_builder', 'receive', $SMSTree['d3']
+			gs 'SMStext_builder', 'show_sms', ARGS[2]
+		gs 'SMStext_builder', 'end'
 	end
 
+
 	killvar '$SMSTree'
 end
 

+ 19 - 0
locations/phone_selfies_popup.qsrc

@@ -44,5 +44,24 @@ end
 
 
 
+
+!	$ARGS[1] = Return string
+!	$ARGS[2] = telefon['SMSid']
+!!	$ARGS[3] = Location where the selfie is taken
+!!	$ARGS[4] = State of dress in the selfie
+!!	 ARGS[5] = is the index of the location in $selfieLoc[] and $selfieFilePrefix
+!!	 ARGS[6] = the selfie number
+if $ARGS[0] = 'SMS_set_selfie':
+	$temp_imloc = func('phone_selfies_popup', 'SMS_get_imloc', $ARGS[3], $ARGS[4], ARGS[5], ARGS[6])
+	$result = '<a href="exec: gs <<$ARGS[1]>>, <<ARGS[2]>>, ''<<$temp_imloc>>'', ''<<$ARGS[3]>>'', ''<<$ARGS[4]>>'', <<ARGS[5]>>, <<ARGS[6]>>"><img src="<<$temp_imloc>>" style="horizontal-align:center; max-height:90%; max-width:90%"></a>'
+	killvar '$temp_imloc'
+end
+
+if $ARGS[0] = 'SMS_get_imloc':
+	$result = 'images/pc/activities/phone/selfies/<<$ARGS[1]>>/<<$ARGS[2]>>/<<$selfieFilePrefix[ARGS[3]]>><<ARGS[4]>>.jpg'
+end
+
+
+
 --- phone_selfies_popup ---------------------------------
 

+ 2 - 0
locations/saveupdater.qsrc

@@ -2882,6 +2882,8 @@ if temp_current_save_version < 00090204:
 
 		blackmailQW['total_material'] = 1
 	end
+
+	if igor_krossdress > 0 and igor_eqwtday > 0 and igor_progulkaday = 0: igor_krossdress = 0
 end
 
 

+ 1 - 6
locations/sex_ev_leave.qsrc

@@ -123,12 +123,7 @@ if $ARGS[0] = 'fuckbuddy_add':
 end
 
 if $ARGS[0] = 'sugar_daddy_add':
-	if $npc_rel_type[$boy] ! 'fuckbuddy':
-		gs 'lover', 'add_sugar_daddy', $boy
-		npc_fuckbuddy[$boy] = 1
-		npc_no_booty_call[$boy] = daystart
-		sex_ev['sugar_daddy_count'] += 1
-	end
+	gs 'lover', 'add_sugar_daddy', $boy
 	npc_sugar_daddy_price[$boy] = sex_ev['sugar_daddy_offer'] * 100
 	if $npc_rel_type[$boy] ! 'sugar_daddy':
 		$npc_rel_type[$boy] = 'sugar_daddy'

+ 4 - 4
locations/stat.qsrc

@@ -263,10 +263,6 @@ end
 ! Execute time based spells
 gs 'spellTimer', prevtotmin, totminut
 
-! Determine Incoming Telephone Calls and SMS
-gs 'telefon', 'IncomingCheck', prevtotmin, totminut
-gs 'telefon', 'IncomingSMSCheck'
-
 !! deodorant
 if deodorant_on = 1 and totminut > deodorant_time: gs 'sweat', 'remove_deo'
 
@@ -435,6 +431,10 @@ end
 
 if hour >= 24: gs 'cikl'
 
+! Determine Incoming Telephone Calls and SMS
+gs 'telefon', 'IncomingCheck', prevtotmin, totminut
+gs 'telefon', 'IncomingSMSCheck'
+
 if minut < 10:
 	$nilmin = '0'
 else

+ 32 - 33
locations/telefon.qsrc

@@ -539,12 +539,12 @@ if $ARGS[0] = 'Phone_selfie_image':
 		if PCloswimwear = 1:
 			!!changing to and unmixed variable so the rng will work
 			if Enable_Android = 1:
-				dynamic 'temp_swim = <<selfieSwimtot[arrpos(''$selfieLoc'', $ARGS[1],1)]>>'
+				temp_swim = selfieSwimtot[arrpos('$selfieLoc', $ARGS[1], 1)]
 			else
-				dynamic 'temp_swim = <<selfieSwimtot[arrpos(1, ''$selfieLoc'', $ARGS[1])]>>'
+				temp_swim = selfieSwimtot[arrpos(1, '$selfieLoc', $ARGS[1])]
 			end
 			if temp_swim > 0:
-				phone_rand = rand(1,temp_swim)
+				phone_rand = rand(1, temp_swim)
 				!!Setting the image owned flag to 1
 				dynamic '<<$ARGS[1]>>_swim[<<phone_rand>>] = 1'
 				gs 'stat'
@@ -557,12 +557,12 @@ if $ARGS[0] = 'Phone_selfie_image':
 		elseif $clothingworntype ! 'nude':
 			!!changing to and unmixed variable so the rng will work
 			if Enable_Android = 1:
-				dynamic 'temp_clotot = <<selfieClotot[arrpos(''$selfieLoc'', $ARGS[1],1)]>>'
+				temp_clotot = selfieClotot[arrpos('$selfieLoc', $ARGS[1], 1)]
 			else
-				dynamic 'temp_clotot = <<selfieClotot[arrpos(1, ''$selfieLoc'', $ARGS[1])]>>'
+				temp_clotot = selfieClotot[arrpos(1, '$selfieLoc', $ARGS[1])]
 			end
 			if temp_clotot > 0:
-				phone_rand = rand(1,temp_clotot)
+				phone_rand = rand(1, temp_clotot)
 				!!Setting the image owned flag to 1
 				dynamic '<<$ARGS[1]>>_closelfie[<<phone_rand>>] = 1'
 				gs 'stat'
@@ -574,12 +574,12 @@ if $ARGS[0] = 'Phone_selfie_image':
 			end
 		elseif $pantyworntype ! 'none':
 			if Enable_Android = 1:
-				dynamic 'temp_undtot = <<selfieUndtot[arrpos(''$selfieLoc'', $ARGS[1],1)]>>'
+				temp_undtot = selfieUndtot[arrpos('$selfieLoc', $ARGS[1], 1)]
 			else
-				dynamic 'temp_undtot = <<selfieUndtot[arrpos(1, ''$selfieLoc'', $ARGS[1])]>>'
+				temp_undtot = selfieUndtot[arrpos(1, '$selfieLoc', $ARGS[1])]
 			end
 			if temp_undtot > 0:
-				phone_rand = rand(1,temp_undtot)
+				phone_rand = rand(1, temp_undtot)
 				dynamic '<<$ARGS[1]>>_undselfie[<<phone_rand>>] = 1'
 				gs 'stat'
 				if usePopUps = 1:
@@ -590,12 +590,12 @@ if $ARGS[0] = 'Phone_selfie_image':
 			end
 		else
 			if Enable_Android = 1:
-				dynamic 'temp_nudtot = <<selfieNudtot[arrpos(''$selfieLoc'', $ARGS[1],1)]>>'
+				temp_nudtot = selfieNudtot[arrpos('$selfieLoc', $ARGS[1], 1)]
 			else
-				dynamic 'temp_nudtot = <<selfieNudtot[arrpos(1, ''$selfieLoc'', $ARGS[1])]>>'
+				temp_nudtot = selfieNudtot[arrpos(1, '$selfieLoc', $ARGS[1])]
 			end
 			if temp_nudtot > 0:
-				phone_rand = rand(1,temp_nudtot)
+				phone_rand = rand(1, temp_nudtot)
 				dynamic '<<$ARGS[1]>>_nudselfie[<<phone_rand>>] = 1'
 				gs 'stat'
 				if usePopUps = 1:
@@ -608,12 +608,12 @@ if $ARGS[0] = 'Phone_selfie_image':
 	else
 		if $ARGS[2] = 'tits':
 			if Enable_Android = 1:
-				dynamic 'temp_titflash = <<selfieTitflash[arrpos(''$selfieLoc'', $ARGS[1],1)]>>'
+				temp_titflash = selfieTitflash[arrpos('$selfieLoc', $ARGS[1], 1)]
 			else
-				dynamic 'temp_titflash = <<selfieTitflash[arrpos(1, ''$selfieLoc'', $ARGS[1])]>>'
+				temp_titflash = selfieTitflash[arrpos(1, '$selfieLoc', $ARGS[1])]
 			end
 			if temp_titflash > 0:
-				phone_rand = rand(1,temp_titflash)
+				phone_rand = rand(1, temp_titflash)
 				dynamic '<<$ARGS[1]>>_titflash[<<phone_rand>>] = 1'
 				gs 'stat'
 				if usePopUps = 1:
@@ -624,12 +624,12 @@ if $ARGS[0] = 'Phone_selfie_image':
 			end
 		elseif $ARGS[2] = 'ass':
 			if Enable_Android = 1:
-				dynamic 'temp_assflash = <<selfieAssflash[arrpos(''$selfieLoc'', $ARGS[1],1)]>>'
+				temp_assflash = selfieAssflash[arrpos('$selfieLoc', $ARGS[1], 1)]
 			else
-				dynamic 'temp_assflash = <<selfieAssflash[arrpos(1, ''$selfieLoc'', $ARGS[1])]>>'
+				temp_assflash = selfieAssflash[arrpos(1, '$selfieLoc', $ARGS[1])]
 			end
 			if temp_assflash > 0:
-				phone_rand = rand(1,temp_assflash)
+				phone_rand = rand(1, temp_assflash)
 				dynamic '<<$ARGS[1]>>_assflash[<<phone_rand>>] = 1'
 				gs 'stat'
 				if usePopUps = 1:
@@ -640,12 +640,12 @@ if $ARGS[0] = 'Phone_selfie_image':
 			end
 		elseif $ARGS[2] = 'pussy':
 			if Enable_Android = 1:
-				dynamic 'temp_pussyflash = <<selfiePussyflash[arrpos(''$selfieLoc'', $ARGS[1],1)]>>'
+				temp_pussyflash = selfiePussyflash[arrpos('$selfieLoc', $ARGS[1], 1)]
 			else
-				dynamic 'temp_pussyflash = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', $ARGS[1])]>>'
+				temp_pussyflash = selfiePussyflash[arrpos(1, '$selfieLoc', $ARGS[1])]
 			end
 			if temp_pussyflash > 0:
-				phone_rand = rand(1,temp_pussyflash)
+				phone_rand = rand(1, temp_pussyflash)
 				dynamic '<<$ARGS[1]>>_pussyflash[<<phone_rand>>] = 1'
 				gs 'stat'
 				if usePopUps = 1:
@@ -664,13 +664,13 @@ if $ARGS[0] = 'Phone_selfie_image_bathing':
 	if $ARGS[1] = 'shower':
 		!!changing to and unmixed variable so the rng will work
 		if Enable_Android = 1:
-			dynamic 'temp_showertot = <<selfieShowertot[arrpos(''$selfieLoc'', ''bathroom'',1)]>>'
+			temp_showertot = selfieShowertot[arrpos('$selfieLoc', 'bathroom', 1)]
 		else
-			dynamic 'temp_showertot = <<selfieShowertot[arrpos(1, ''$selfieLoc'', ''bathroom'')]>>'
+			temp_showertot = selfieShowertot[arrpos(1, '$selfieLoc', 'bathroom')]
 		end
-		phone_rand = rand(1,temp_showertot)
+		phone_rand = rand(1, temp_showertot)
 		!!Setting the image owned flag to 1
-		dynamic 'bathroom_showerselfie[<<phone_rand>>] = 1'
+		bathroom_showerselfie[phone_rand] = 1
 		gs 'stat'
 		if usePopUps = 1:
 			msg '<img src="images/pc/activities/phone/selfies/bathroom/shower/<<phone_rand>>.jpg">'
@@ -679,12 +679,12 @@ if $ARGS[0] = 'Phone_selfie_image_bathing':
 		end
 	elseif $ARGS[1] = 'bath':
 		if Enable_Android = 1:
-			dynamic 'temp_bathtot = <<selfieBathtot[arrpos(''$selfieLoc'', ''bathroom'',1)]>>'
+			temp_bathtot = selfieBathtot[arrpos('$selfieLoc', 'bathroom', 1)]
 		else
-			dynamic 'temp_bathtot = <<selfieBathtot[arrpos(1, ''$selfieLoc'', ''bathroom'')]>>'
+			temp_bathtot = selfieBathtot[arrpos(1, '$selfieLoc', 'bathroom')]
 		end
-		phone_rand = rand(1,temp_bathtot)
-		dynamic 'bathroom_bathselfie[<<phone_rand>>] = 1'
+		phone_rand = rand(1, temp_bathtot)
+		bathroom_bathselfie[phone_rand] = 1
 		gs 'stat'
 		if usePopUps = 1:
 			msg '<img src="images/pc/activities/phone/selfies/bathroom/bath/<<phone_rand>>.jpg">'
@@ -733,13 +733,13 @@ if $ARGS[0] = 'Phone_camera':
 		else
 			locIndex = arrpos(1, '$selfieLoc', $phone_loc)
 		end
-		if (pcs_inhib >= 35 or exhibitionist_lvl > 0 or $phone_loc = 'bedroom') and dyneval("result = <<selfieTitflash[locIndex]>>") > 0:
+		if (pcs_inhib >= 35 or exhibitionist_lvl > 0 or $phone_loc = 'bedroom') and selfieTitflash[locIndex] > 0:
 			$telefon['body'] += '<a href="exec:gs ''exp_gain'', ''photoskl'', 1 & gs ''telefon'', ''Phone_camera_selfie'', ''<<$phone_loc>>'', ''tits'' "><b>Flash your tits for a selfie</b></a><br>'
 		end
-		if (exhibitionist_lvl > 0 or $phone_loc = 'bedroom') and dyneval("result = <<selfieAssflash[locIndex]>>") > 0:
+		if (exhibitionist_lvl > 0 or $phone_loc = 'bedroom') and selfieAssflash[locIndex] > 0:
 			$telefon['body'] += '<a href="exec:gs ''exp_gain'', ''photoskl'', 1 & gs ''telefon'', ''Phone_camera_selfie'', ''<<$phone_loc>>'', ''ass'' "><b>Flash your ass for a selfie</b></a><br>'
 		end
-		if (exhibitionist_lvl > 1 or $phone_loc = 'bedroom') and dyneval("result = <<selfiePussyflash[locIndex]>>") > 0:
+		if (exhibitionist_lvl > 1 or $phone_loc = 'bedroom') and selfiePussyflash[locIndex] > 0:
 			$telefon['body'] += '<a href="exec:gs ''exp_gain'', ''photoskl'', 1 & gs ''telefon'', ''Phone_camera_selfie'', ''<<$phone_loc>>'', ''pussy'' "><b>Flash your pussy for a selfie</b></a><br>'
 		end
 	end
@@ -1117,7 +1117,6 @@ if $ARGS[0] = 'IncomingSMSCheck':
 		jump 'telefonIncSMSLoop'
 	end
 
-
 	killvar 'i'
 end
 

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