Merge remote-tracking branch 'Anjuna/master'

locations/bedrPar.qsrc

@@ -128,7 +128,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 					if parfixrand = 3:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Here kitty, kitty!</b>"'
 					if parfixrand = 4:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>I just met you, and this is crazy!</b>"'
 					if parfixrand = 5:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Bow before me!</b>"'
-					if parfixrand = 6:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>He’s just a friend, honest!</b>"'
+					if parfixrand = 6:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>He''s just a friend, honest!</b>"'
 					if parfixrand = 7:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>What did you do to my socks?</b>"'
 					if parfixrand = 8:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>That''s what she said!</b>"'
 					if parfixrand = 9:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Help! They''ve turned me into a parrot!</b>"'

locations/booty_call.qsrc

@@ -3,6 +3,7 @@ if $ARGS[0] = 'scheduler':
 	!! clear SMS
 	!! clear schedule
 	killvar 'booty_call_time'
+	killvar 'sugar_daddy_call'
 	killvar 'npc_booty_call'
 	killvar 'npc_booty_call_time'
 	gs 'booty_call', 'booty_call_scheduler'
@@ -13,6 +14,7 @@ if $ARGS[0] = 'booty_call_scheduler':
 	:bc_fb_sched_loop
 	if temp_bc_i < arrsize('$fuckbuddy'):
 		$temp_bc_id = $FuckBuddy[temp_bc_i]
+		gs 'telefon', 'ClearSMSSchedule', $temp_bc_id
 		gs 'booty_call', 'bc_npc_stat_update', $temp_bc_id
 !!		if (rand(1, 10) <= npc_sexdrive[$temp_bc_id] or npc_booty_call[$temp_bc_id] = daystart) and npc_rel[$temp_bc_id] > 0 and npc_no_booty_call[$temp_bc_id] ! daystart and npc_big_fight[$temp_bc_id] < daystart - 7:
 
@@ -20,10 +22,8 @@ if $ARGS[0] = 'booty_call_scheduler':
 
 !!		if (rand(1, 10) <= npc_sexdrive[$temp_bc_id] or npc_booty_call[$temp_bc_id] = daystart) and npc_no_booty_call[$temp_bc_id] ! daystart and (npc_big_fight[$temp_bc_id] < daystart - 7 and daystart > 7):
 
-		if npc_no_booty_call[$temp_bc_id] ! daystart and (npc_booty_call_date[$temp_bc_id] = daystart or rand(1, 10) <= npc_sexdrive[$temp_bc_id] or rand(1, 100) <= npc_rel[$temp_bc_id]):
-			gs 'booty_call', 'schedule_sms_time', $temp_bc_id
-		else
-			npc_no_booty_call[$temp_bc_id] = daystart
+		if daystart > npc_no_booty_call[$temp_bc_id] and (npc_booty_call_date[$temp_bc_id] = daystart or rand(1, 10) <= npc_sexdrive[$temp_bc_id] or rand(1, 100) <= npc_rel[$temp_bc_id]):
+			gs 'booty_call', 'schedule_sms', $temp_bc_id
 		end
 		temp_bc_i += 1
 		jump 'bc_fb_sched_loop'
@@ -34,6 +34,7 @@ if $ARGS[0] = 'booty_call_scheduler':
 	:bc_sd_sched_loop
 	if temp_bc_i < arrsize('$sugar_daddy'):
 		$temp_bc_id = $sugar_daddy[temp_bc_i]
+		gs 'telefon', 'ClearSMSSchedule', $temp_bc_id
 		gs 'booty_call', 'bc_npc_stat_update', $temp_bc_id
 !!		if (rand(1, 10) <= npc_sexdrive[$temp_bc_id] or npc_booty_call[$temp_bc_id] = daystart) and npc_rel[$temp_bc_id] > 0 and npc_no_booty_call[$temp_bc_id] ! daystart and npc_big_fight[$temp_bc_id] < daystart - 7:
 
@@ -41,14 +42,9 @@ if $ARGS[0] = 'booty_call_scheduler':
 
 !!		if (rand(1, 10) <= npc_sexdrive[$temp_bc_id] or npc_booty_call[$temp_bc_id] = daystart) and npc_no_booty_call[$temp_bc_id] ! daystart and (npc_big_fight[$temp_bc_id] < daystart - 7 and daystart > 7):
 
-		if daystart + npc_rel[$temp_bc_id] / 10 < npc_sugar_daddy_timer[$temp_bc_id]:
-			npc_no_booty_call[$temp_bc_id] = daystart
-
-		elseif npc_no_booty_call[$temp_bc_id] = daystart and (npc_booty_call_date[$temp_bc_id] = daystart or rand(1, 10) <= npc_sexdrive[$temp_bc_id] or rand(1, 100) <= npc_rel[$temp_bc_id]):
+		if daystart > npc_no_booty_call[$temp_bc_id] and (daystart + npc_rel[$temp_bc_id] / 10 >= npc_sugar_daddy_timer[$temp_bc_id]) and (npc_booty_call_date[$temp_bc_id] = daystart or rand(1, 10) <= npc_sexdrive[$temp_bc_id] or rand(1, 100) <= npc_rel[$temp_bc_id]):
 			sugar_daddy_call[$sugar_daddy[temp_bc_i]] = 1
-			gs 'booty_call', 'schedule_sms_time', $temp_bc_id
-		else
-			npc_no_booty_call[$temp_bc_id] = daystart
+			gs 'booty_call', 'schedule_sms', $temp_bc_id
 		end
 		temp_bc_i += 1
 		jump 'bc_sd_sched_loop'
@@ -59,15 +55,18 @@ if $ARGS[0] = 'booty_call_scheduler':
 end
 
 !! $ARGS[1] = $npc_id
-if $ARGS[0] = 'schedule_sms_time':
+if $ARGS[0] = 'schedule_sms':
 	if npc_booty_call[$ARGS[1]] = daystart:
-		booty_call_time[$ARGS[1]] = 60 * npc_booty_call_time[$ARGS[1]] + rand(0, 180)
+		gs 'telefon', 'SetSMSSchedule', $ARGS[1], "", "0", "gs 'booty_call_sms', 'start', '<<$ARGS[1]>>'", "totminut > <<totminut + 60 * (npc_booty_call_time[$ARGS[1]] - hour) + rand(0, 180) - minut>>"
+		!booty_call_time[$ARGS[1]] = 60 * npc_booty_call_time[$ARGS[1]] + rand(0, 180)
 	elseif week = npc_day_off[$ARGS[1]]:
-		booty_call_time[$ARGS[1]] = 600 + rand(0, 720)
+		gs 'telefon', 'SetSMSSchedule', $ARGS[1], "", "0", "gs 'booty_call_sms', 'start', '<<$ARGS[1]>>'", "totminut > <<totminut + 60 * (10 - hour) + rand(0, 240) + rand(0, 240) + rand(0, 240) - minut>>"
+		!booty_call_time[$ARGS[1]] = 600 + rand(0, 720)
 	elseif week ! npc_day_off[$ARGS[1]]:
-		booty_call_time[$ARGS[1]] = 60 * rand(npc_start_free_time[$ARGS[1]], (npc_end_free_time[$ARGS[1]] - 1)) + rand(0, 180)
+		gs 'telefon', 'SetSMSSchedule', $ARGS[1], "", "0", "gs 'booty_call_sms', 'start', '<<$ARGS[1]>>'", "totminut > <<totminut + 60 * (rand(npc_start_free_time[$ARGS[1]], npc_end_free_time[$ARGS[1]] - 1) - hour) + rand(0, 180) - minut>>"
+		!booty_call_time[$ARGS[1]] = 60 * rand(npc_start_free_time[$ARGS[1]], (npc_end_free_time[$ARGS[1]] - 1)) + rand(0, 180)
 	else
-		booty_call_time[$ARGS[1]] = 2000
+		!booty_call_time[$ARGS[1]] = 2000
 	end
 end
 
@@ -160,42 +159,6 @@ if $ARGS[0] = 'block_booty_calls':
 	end
 end
 
-if $ARGS[0] = 'SMS raiser':
-	temp_bc_i = 0
-	:fuckbuddy_sms_raiser_loop
-	if temp_bc_i < arrsize('$FuckBuddy'):
-		$temp_bc_id = $FuckBuddy[temp_bc_i]
-		if booty_call_time[$temp_bc_id] < ((hour * 60) + minut) and npc_no_booty_call[$temp_bc_id] ! daystart and npc_last_booty_call[$temp_bc_id] ! daystart:
-			!$booty_call_daily_id[temp_bc_i] = $temp_bc_id
-			gs 'booty_call_sms', 'start', $temp_bc_id
-			booty_call_time[$temp_bc_id] = 2399
-			!! this is a bit superfluous, but it makes the code run faster.
-			booty_call_invite[$temp_bc_id] = daystart
-		end
-		temp_bc_i += 1
-		jump 'fuckbuddy_sms_raiser_loop'
-	end
-
-
-	temp_bc_i = 0
-	:sugar_daddy_sms_raiser_loop
-	if temp_bc_i < arrsize('$sugar_daddy'):
-		$temp_bc_id = $sugar_daddy[temp_bc_i]
-		if booty_call_time[$temp_bc_id] < ((hour * 60) + minut) and npc_no_booty_call[$temp_bc_id] ! daystart and npc_last_booty_call[$temp_bc_id] ! daystart:
-			!$booty_call_daily_id[i] = $temp_bc_id
-			gs 'booty_call_sms', 'start', $temp_bc_id
-			booty_call_time[$temp_bc_id] = 2399
-			!! this is a bit superfluous, but it makes the code run faster.
-			booty_call_invite[$temp_bc_id] = daystart
-		end
-		temp_bc_i += 1
-		jump 'sugar_daddy_sms_raiser_loop'
-	end
-
-	killvar 'temp_bc_i'
-	killvar '$temp_bc_id'
-end
-
 if $ARGS[0] = 'home_links':
 	temp_bc_i = 0
 	:loopFB_homes
@@ -555,4 +518,41 @@ if $ARGS[0] = 'draw':
 end
 
 
---- booty_call ---------------------------------
+if $ARGS[0] = 'SMS raiser':
+	temp_bc_i = 0
+	:fuckbuddy_sms_raiser_loop
+	if temp_bc_i < arrsize('$FuckBuddy'):
+		$temp_bc_id = $FuckBuddy[temp_bc_i]
+		if booty_call_time[$temp_bc_id] < ((hour * 60) + minut) and npc_no_booty_call[$temp_bc_id] ! daystart and npc_last_booty_call[$temp_bc_id] ! daystart:
+			!$booty_call_daily_id[temp_bc_i] = $temp_bc_id
+			gs 'booty_call_sms', 'start', $temp_bc_id
+			booty_call_time[$temp_bc_id] = 2399
+			!! this is a bit superfluous, but it makes the code run faster.
+			booty_call_invite[$temp_bc_id] = daystart
+		end
+		temp_bc_i += 1
+		jump 'fuckbuddy_sms_raiser_loop'
+	end
+
+
+	temp_bc_i = 0
+	:sugar_daddy_sms_raiser_loop
+	if temp_bc_i < arrsize('$sugar_daddy'):
+		$temp_bc_id = $sugar_daddy[temp_bc_i]
+		if booty_call_time[$temp_bc_id] < ((hour * 60) + minut) and npc_no_booty_call[$temp_bc_id] ! daystart and npc_last_booty_call[$temp_bc_id] ! daystart:
+			!$booty_call_daily_id[i] = $temp_bc_id
+			gs 'booty_call_sms', 'start', $temp_bc_id
+			booty_call_time[$temp_bc_id] = 2399
+			!! this is a bit superfluous, but it makes the code run faster.
+			booty_call_invite[$temp_bc_id] = daystart
+		end
+		temp_bc_i += 1
+		jump 'sugar_daddy_sms_raiser_loop'
+	end
+
+	killvar 'temp_bc_i'
+	killvar '$temp_bc_id'
+end
+
+
+--- booty_call ---------------------------------

locations/booty_call_sms.qsrc

@@ -28,6 +28,7 @@
 
 
 if $ARGS[0] = 'start':
+	gs 'telefon', 'ClearSMSSchedule', $ARGS[1]
 	if npc_booty_call[$ARGS[1]] = daystart:
 		gs 'booty_call_sms', 'Add SMS2', 'pre_planned_booty_call', $ARGS[1]
 	elseif sugar_daddy_call[$ARGS[1]] = 1:
@@ -837,7 +838,7 @@ end
 ! $ARGS[3] = npc_code
 ! $ARGS[4] = code reply send
 !  ARGS[5] = smsID
-if $ARGS[0] = 'late apology':
+if $ARGS[0] = 'late_apology':
 	gs 'booty_call_sms', $ARGS[2], $ARGS[3]
 	gs 'SMStext_builder', 'start'
 		gs 'SMStext_builder', 'send', $SMSTree[$ARGS[4]]

locations/gopskver.qsrc

@@ -143,7 +143,7 @@ if $ARGS[0] = '':
 					minut += 15
 					gs 'stat'
 					'You''re walking down the street, feeling a bit wobbly from the alcohol while Dan supports your weight. He tells you funny stories and anecdotes along the way, and before you know it you''re at your apartment building. When you open the door and enter the building, Dan suddenly pulls you to the side. He''s quite rough about it, and shoves you into a dark corner of the stairwell. He takes your hand by the chin and whispers in your ear: "Your turn to make me feel good, slut. Otherwise I''m telling everyone."'
-					act 'Do as he says':gt 'gopskver', 'dan_blowjob'
+					act 'Do as he says': xgt 'gopskver', 'dan_blowjob'
 					gs 'willpower', 'bj', 'resist', 'medium'
 					if will_cost <= pcs_willpwr:
 						act 'Push him away(<<will_cost>> Willpower)':
@@ -196,7 +196,7 @@ if $ARGS[0] = '':
 						pcs_horny += 10
 						gs 'stat'
 						'You return his kiss, unsure why he''s kissing you... he never seemed to be that interested in you. Then you feel his hands on your shoulders, and Dan firmly presses down on them trying to get you to drop to your knees. He whispers reassuringly: "Don''t worry, <<$pcs_nickname>>... I didn''t tell anyone about all the things you did. Do a good job, and your secret will stay safe."'
-						act 'Do as he says':gt 'gopskver', 'dan_blowjob'
+						act 'Do as he says': xgt 'gopskver', 'dan_blowjob'
 						gs 'willpower', 'bj', 'resist', 'medium'
 						if will_cost <= pcs_willpwr:
 							act 'Push him away(<<will_cost>> Willpower)':

locations/lover.qsrc

@@ -12,14 +12,14 @@ if $ARGS[0] = 'add':
 	loverfacerand[i] = boyfacerand						& !boy/girl
 	$loverface[i] = $boyface							& !boy/girl
 	loverdick[i] = npc_dick[$boy]
-	$loverdick_girth[i] = $npc_thdick[$npclastsaved]
-	loversilaVag[i] = npc_sexskill[$npclastsaved]
-	loverfinance[i] = npc_finance[$npclastsaved]
-	vneshlover[i] = npc_apprnc[$npclastsaved] / 3
+	$loverdick_girth[i] = $npc_thdick[$boy]
+	loversilaVag[i] = npc_sexskill[$boy]
+	loverfinance[i] = npc_finance[$boy]
+	vneshlover[i] = npc_apprnc[$boy] / 3
 	$loverClo[i] = $boyClo								& !boy/girl
 	figurlover[i] = figurBoy							& !boy/girl
-	titlover[i] = npc_bust[$npclastsaved]
-	hairlover[i] = npc_haircol[$npclastsaved]
+	titlover[i] = npc_bust[$boy]
+	hairlover[i] = npc_haircol[$boy]
 	haraklover[i] = harakBoy							& !boy/girl
 	loverday[i] = daystart
 	loverrelation[i] = 3
@@ -30,7 +30,7 @@ if $ARGS[0] = 'add':
 	giftNum[i] = 0
 	loverlove[i] = 0
 	loverscompliance[i] = 0
-	lover_picture[i] = lover_picrand[$npclastsaved]
+	lover_picture[i] = lover_picrand[$boy]
 	meethour[i] = 0
 	svidanie[i] = 0
 	meetday[i] = 0
@@ -48,7 +48,7 @@ if $ARGS[0] = 'add':
 	bodyPref[i] = bodyPrefTmp							& !boy/girl
 	makePref[i] = makePrefTmp							& !boy/girl
 	IQPref[i] = IQPrefTmp								& !boy/girl
-	loverGender[i] = npc_gender[$npclastsaved]
+	loverGender[i] = npc_gender[$boy]
 
 	!! making sure lover has pronouns
 	gs 'pronouns', loverGender[i], 0
@@ -72,11 +72,15 @@ if $ARGS[0] = 'add':
 	else
 		stat['boyfriends_current'] += 1
 	end
+
+	gs 'telefon', 'AddContact', $boy, $npc_pic[$boy], 0
 end
 
 if $ARGS[0] = 'remove':
 	i = ARGS[1]
 
+	gs 'telefon', 'DeleteContact', $lover[i]
+
 	killvar '$lover', i
 	killvar '$loverdesc', i
 	killvar 'loverbodyrand', i
@@ -159,7 +163,6 @@ if $ARGS[0] = 'add_fuckbuddy':
 		$fuckbuddy[] = $boy
 		$npc_rel_type[$boy] = 'fuckbuddy'
 		gs 'telefon', 'AddContact', $boy, $npc_pic[$boy], 0
-		gs 'telefon', 'SetCallSchedule', $boy, "", "hour >= 8 and hour <= 22", "", "hour >= 8 and hour <= 22"
 	end
 end
 
@@ -175,7 +178,6 @@ 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', $boy, "", "hour >= 8 and hour <= 22", "", "hour >= 8 and hour <= 22"
 	end
 end
 

locations/saveupdater.qsrc

@@ -3545,29 +3545,30 @@ if temp_current_save_version < 00090303:
 	end
 
 
-
 	!!Sonia Variable migration:
-	if soniafall 			! 0: 		soniaQW['soniafall'] 		= soniafall			 & killvar 'soniafall'
-	if soniaPS 				! 0: 		soniaQW['slut'] 			= soniaPS			 & killvar 'soniaPS'
-	if soniafallDay 		! 0: 		soniaQW['fallDay'] 			= soniafallDay		 & killvar 'soniafallDay'
-	if soniaPSdays 			! 0: 		soniaQW['slutdays'] 		= soniaPSdays		 & killvar 'soniaPSdays'
-	if soniahelp 			! 0: 		soniaQW['help'] 			= soniahelp			 & killvar 'soniahelp'
-	if soniaencourage 		! 0: 		soniaQW['encourage'] 		= soniaencourage	 & killvar 'soniaencourage'
-	if soniasex 			! 0: 		soniaQW['sex'] 				= soniasex			 & killvar 'soniasex'
-	if soniasextime 		! 0: 		soniaQW['sextime'] 			= soniasextime		 & killvar 'soniasextime'
-
-	if ivankosup_count 		! 0:	 	ivanko['soup'] 				= ivankosup_count	 & killvar 'ivankosup_count'
-	if ivankowater_count 	! 0:	 	ivanko['water'] 			= ivankowater_count	 & killvar 'ivankowater_count'
-	if ivankolefto_count 	! 0:	 	ivanko['leftovers'] 		= ivankolefto_count	 & killvar 'ivankolefto_count'
-	if ivankosanw_count 	! 0:	 	ivanko['sandwich'] 			= ivankosanw_count	 & killvar 'ivankosanw_count'
-	if ivankofood_day		! 0:	 	ivanko['food_day'] 			= ivankofood_day	 & killvar 'ivankofood_day'
-	if $ivanko_lefto 		! '':	 	$ivanko['leftover_txt'] 	= $ivanko_lefto		 & killvar '$ivanko_lefto'
-	if $ivanko_sup 			! '':	 	$ivanko['soup_txt'] 		= $ivanko_sup		 & killvar '$ivanko_sup'
-	if $ivanko_water 		! '':	 	$ivanko['water_txt'] 		= $ivanko_water		 & killvar '$ivanko_water'
-	if $ivanko_sanw 		! '':	 	$ivanko['sandwich_txt'] 	= $ivanko_sanw		 & killvar '$ivanko_sanw'
+	if soniafall			! 0:		soniaQW['soniafall']		= soniafall				& killvar 'soniafall'
+	if soniaPS				! 0:		soniaQW['slut']				= soniaPS				& killvar 'soniaPS'
+	if soniafallDay			! 0:		soniaQW['fallDay']			= soniafallDay			& killvar 'soniafallDay'
+	if soniaPSdays			! 0:		soniaQW['slutdays']			= soniaPSdays			& killvar 'soniaPSdays'
+	if soniahelp			! 0:		soniaQW['help']				= soniahelp				& killvar 'soniahelp'
+	if soniaencourage		! 0:		soniaQW['encourage']		= soniaencourage		& killvar 'soniaencourage'
+	if soniasex				! 0:		soniaQW['sex']				= soniasex				& killvar 'soniasex'
+	if soniasextime			! 0:		soniaQW['sextime']			= soniasextime			& killvar 'soniasextime'
+
+	if ivankosup_count		! 0:		ivanko['soup']				= ivankosup_count		& killvar 'ivankosup_count'
+	if ivankowater_count	! 0:		ivanko['water']				= ivankowater_count		& killvar 'ivankowater_count'
+	if ivankolefto_count	! 0:		ivanko['leftovers']			= ivankolefto_count		& killvar 'ivankolefto_count'
+	if ivankosanw_count		! 0:		ivanko['sandwich']			= ivankosanw_count		& killvar 'ivankosanw_count'
+	if ivankofood_day		! 0:		ivanko['food_day']			= ivankofood_day		& killvar 'ivankofood_day'
+	if $ivanko_lefto		! '':		$ivanko['leftover_txt']		= $ivanko_lefto			& killvar '$ivanko_lefto'
+	if $ivanko_sup			! '':		$ivanko['soup_txt']			= $ivanko_sup			& killvar '$ivanko_sup'
+	if $ivanko_water		! '':		$ivanko['water_txt']		= $ivanko_water			& killvar '$ivanko_water'
+	if $ivanko_sanw			! '':		$ivanko['sandwich_txt']		= $ivanko_sanw			& killvar '$ivanko_sanw'
 
 
 end
+
+
 killvar 'temp_current_save_version'
 gs 'saveg'
 

locations/stat.qsrc

@@ -986,9 +986,5 @@ if hypnoSchedule = 1:
 	end
 end
 
-!!--------------------------Booty Call SMSs--------------------------------
-
-if (arrsize('$FuckBuddy') + arrsize('$sugar_daddy')) > 0 and hour > 1: gs 'booty_call', 'SMS raiser'
 
 --- stat ---------------------------------
-

locations/telefon.qsrc

@@ -39,30 +39,44 @@ $telefon['header'] = {
 	else
 		$telefon['SMSstatus'] = ''
 	end
-	$result = '<center>
-	<b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b><br>
-	<TABLE cellspacing="0" width="80%">
-		<TR>
-			<TD><img src="images/system/icons/icon_statusbar_left.png"></TD>
-			<TD><<$telefon[''SMSstatus'']>></TD>
-			<TD align="right"><img src="images/system/icons/icon_statusbar_right.png"></TD>
-		</TR>
-	</TABLE><br>'
+	if 1:
+		$result = '<center>
+		<b><<$mid(100 + hour, 2, 2)>>:<<$mid(100 + minut, 2, 2)>></b><br>
+		<table cellspacing="0" width="80%">
+			<tr>
+				<td><img src="images/system/icons/icon_statusbar_left.png"></td>
+				<td><<$telefon[''SMSstatus'']>></td>
+				<td align="right"><img src="images/system/icons/icon_statusbar_right.png"></td>
+				end
+			</tr>
+		</table><br>'
+	else
+		$result = '<center>
+		<b><<$mid(100 + hour, 2, 2)>>:<<$mid(100 + minut, 2, 2)>></b><br>
+		<table cellspacing="0" width="80%">
+			<tr>
+				<td><img src="images/system/icons/icon_statusbar_left.png"></td>
+				<td><<$telefon[''SMSstatus'']>></td>
+				<td align="right"><img src="images/system/icons/icon_statusbar_right<<min(max(0, (pcs_sleep + 10) / 20), 5)>>.png"></td>
+			</tr>
+		</table><br>'
+	end
 }
 
 !! Footer for phone screen.  Body should be between these two
 $telefon['footer'] = {
-	if $telefon['backButton'] = '': $telefon['backButton'] = 'gs ''telefon'', ''Phone_menu'''
+	if $telefon['backButton'] = '': $telefon['backButton'] = 'gs ''telefon'', ''Phone_menu'' '
 	$result = '	<a href="exec:<<$telefon[''backButton'']>>"><img src="images/system/icons/back.png"></a><br><br>
 		<a href="exec:gs''stat''">Put Phone Away.</a><br>
 	</center>'
-	$telefon['backButton'] = 'gs ''telefon'', ''Phone_menu'''
+	$telefon['backButton'] = 'gs ''telefon'', ''Phone_menu'' '
 }
 
 !! ''''This is how we print the screen on to the Additional Dscription window
 $telefon['print'] = {
 	clr
 	if menu_off = 0:
+		if ARGS[0] ! 0: $telefon['backButton'] = 'gs ''stat'' '
 		pl func('cleanHTML', dyneval($telefon['header']) + $telefon['body'] + dyneval($telefon['footer']))
 	else
 		pl func('cleanHTML', dyneval($telefon['header']) + $telefon['body'])
@@ -92,11 +106,11 @@ $telefon['contact'] = {
 	if dyneval('result = iif(<<$telefon["ContactCallSchedule"]>>,1,0)') = 0:
 		$telefon['ContactCallCode'] = "gs 'telefon', 'phone_call_reject'"
 	end
-	$result = '<TR>
-		<TD><img src="<<$telefon[''ContactIcon'']>>" width="75"></TD>
-		<TD><<$telefon[''ContactNickName'']>></TD>
-		<TD align="right"><a href="exec:$callerid = ''<<$telefon[''ContactIcon'']>>'' & <<$telefon[''ContactCallCode'']>>"><b>Call</b></a></TD>
-	</TR>'
+	$result = '<tr>
+		<td><img src="<<$telefon[''ContactIcon'']>>" width="75"></td>
+		<td><<$telefon[''ContactNickName'']>></td>
+		<td align="right"><a href="exec:$callerid = ''<<$telefon[''ContactIcon'']>>'' & <<$telefon[''ContactCallCode'']>>"><b>Call</b></a></td>
+	</tr>'
 }
 
 
@@ -235,7 +249,7 @@ if $ARGS[0] = 'ContactList':
 	$telefon['body'] = '
 	<font size=6>Contacts</font><br>
 	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_call.png" height="80" width="80"><br><br>
-	<TABLE cellspacing="0" width="80%">'
+	<table cellspacing="0" width="80%">'
 
 	!!iterating all Contacts
 	i=0
@@ -265,7 +279,7 @@ if $ARGS[0] = 'ContactList':
 	lover_number += 1
 	if lover_number < arrsize('pcs_lovers'): jump 'loverloop2'
 
-	$telefon['body'] += '</TABLE><br>'
+	$telefon['body'] += '</table><br>'
 	dynamic $telefon['print']
 	killvar 'i'
 	killvar 'lover_number'
@@ -573,7 +587,7 @@ if $ARGS[0] = 'Phone_sms':
 	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>" height="80" width="80"><br>'
 
 	$telefon['body'] += '<b><a href="exec:gs ''telefon'', ''send_sms''">Send new SMS</a></b><br>'
-	$telefon['body'] += '<TABLE cellspacing="0" width="80%"><TR><TH>Icon</TH><TH>Name</TH><TH align="right">Received</TH><TH></TH></TR>'
+	$telefon['body'] += '<table cellspacing="0" width="80%"><tr><th>Icon</th><th>Name</th><th align="right">Received</th><th></th></tr>'
 
 	!!iterating all Messages
 	!!reset and recalculate unread messages count, in case they get out of sync
@@ -597,7 +611,7 @@ if $ARGS[0] = 'Phone_sms':
 		jump 'smsloop'
 	end
 	$telefon['body'] += '<b><a href="exec:gs ''telefon'', ''delete_sms'',''0'',''all''">Delete All</a></b><br>'
-	$telefon['body'] += '</TABLE><br>'
+	$telefon['body'] += '</table><br>'
 
 	dynamic $telefon['print']
 	killvar 'i'
@@ -734,12 +748,12 @@ $telefon['SMS'] = {
 		$telefon['SMSstyle2'] = ''
 	end
 
-	$result = '<TR>
-		<TD><img height=100 src="<<$telefon[''ContactIcon'']>>"></TD>
-		<TD><<$telefon[''SMSstyle1'']>><<$telefon[''ContactNickName'']>><<$telefon[''SMSstyle2'']>></TD>
-		<TD align="right"><<$telefon[''SMSstyle1'']>><a href="exec:gs ''telefon'', ''show_sms'', <<telefon[''SMSid'']>>"><<$telefon[''SMSTime'']>></a><<$telefon[''SMSstyle2'']>></TD>
-		<TD><<$telefon[''SMSstyle1'']>><a href="exec:gs ''telefon'', ''delete_sms'', <<telefon[''SMSid'']>>">Delete</a><<$telefon[''SMSstyle2'']>></TD>
-	</TR>'
+	$result = '<tr>
+		<td><img height=100 src="<<$telefon[''ContactIcon'']>>"></td>
+		<td><<$telefon[''SMSstyle1'']>><<$telefon[''ContactNickName'']>><<$telefon[''SMSstyle2'']>></td>
+		<td align="right"><<$telefon[''SMSstyle1'']>><a href="exec:gs ''telefon'', ''show_sms'', <<telefon[''SMSid'']>>"><<$telefon[''SMSTime'']>></a><<$telefon[''SMSstyle2'']>></td>
+		<td><<$telefon[''SMSstyle1'']>><a href="exec:gs ''telefon'', ''delete_sms'', <<telefon[''SMSid'']>>">Delete</a><<$telefon[''SMSstyle2'']>></td>
+	</tr>'
 }
 
 !! List of Contacts that you can send sms messages to
@@ -754,7 +768,7 @@ if $ARGS[0] = 'send_sms':
 	end
 !! Colour correction for editor ''''
 
-	$telefon['body'] += '<TABLE cellspacing="0" width="80%">'
+	$telefon['body'] += '<table cellspacing="0" width="80%">'
 	!!iterating all Contacts
 	i=0
 	:smscontactloop
@@ -765,7 +779,7 @@ if $ARGS[0] = 'send_sms':
 		i += 1
 		jump 'smscontactloop'
 	end
-	$telefon['body'] += '</TABLE><br>'
+	$telefon['body'] += '</table><br>'
 
 	dynamic $telefon['print']
 	killvar 'i'
@@ -787,11 +801,11 @@ $telefon['contactsms'] = {
 	end
 
 	$result = '
-	<TR>
-		<TD><img src="<<$telefon[''ContactIcon'']>>" width="75"></TD>
-		<TD><<$npc_nickname[$telefon[''ContactNPCcode'']]>></TD>
-		<TD><a href="exec:gs ''telefon'', ''npcSendListSms'', ''<<$telefon[''ContactNPCcode'']>>''">New Message</a></TD>
-	</TR>'
+	<tr>
+		<td><img src="<<$telefon[''ContactIcon'']>>" width="75"></td>
+		<td><<$npc_nickname[$telefon[''ContactNPCcode'']]>></td>
+		<td><a href="exec:gs ''telefon'', ''npcSendListSms'', ''<<$telefon[''ContactNPCcode'']>>''">New Message</a></td>
+	</tr>'
 }
 
 !! List of SMS messages available to be sent to an NPC
@@ -802,7 +816,7 @@ if $ARGS[0] = 'npcSendListSms':
 	<font size=6>Send SMS</font><br>
 	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>" height="80" width="80"><br>'
 
-	$telefon['body'] += '<TABLE cellspacing="0" width="80%">'
+	$telefon['body'] += '<table cellspacing="0" width="80%">'
 	!!iterating all send sms messages
 	i=0
 	:npcSendListSmsLoop
@@ -813,7 +827,7 @@ if $ARGS[0] = 'npcSendListSms':
 		i += 1
 		jump 'npcSendListSmsLoop'
 	end
-	$telefon['body'] += '</TABLE><br>'
+	$telefon['body'] += '</table><br>'
 
 	dynamic $telefon['print']
 	killvar 'i'
@@ -824,10 +838,10 @@ end
 $telefon['smsMessageToSend'] = {
 	$telefon['ContactNPCcode'] = $SMSSendContact[ARGS[0]]
 	$result = '
-	<TR>
-		<TD><<$npc_nickname[$telefon[''ContactNPCcode'']]>></TD>
-		<TD><a href="exec: gs ''telefon'', ''smsSendMessage'', ''<<ARGS[0]>>''"><<$SMSSendMessage[ARGS[0]]>></a></TD>
-	</TR>'
+	<tr>
+		<td><<$npc_nickname[$telefon[''ContactNPCcode'']]>></td>
+		<td><a href="exec: gs ''telefon'', ''smsSendMessage'', ''<<ARGS[0]>>''"><<$SMSSendMessage[ARGS[0]]>></a></td>
+	</tr>'
 }
 
 if $ARGS[0] = 'smsSendMessage':
@@ -934,7 +948,11 @@ if $ARGS[0] = 'Phone_media':
 end &! --- Phone_media ---
 
 if $ARGS[0] = 'Phone_menu':
-	if phone_off = 0:
+	if phone_off = 1:
+		'<font color="red"><b>Your phone is disabled for this event</b></font>'
+	elseif menu_off = 1 and phone_on = 0:
+		gs 'obj_din', 'menu_disabled'
+	else
 		$telefon['body'] = '
 		<a href="exec:gs ''telefon'', ''Phone_camera'' "><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_camera.png" height="80" width="80"></a>
 		<a href="exec:gs ''telefon'', ''Phone_calendar'' "><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_calendar.png" height="80" width="80"></a>
@@ -953,9 +971,7 @@ if $ARGS[0] = 'Phone_menu':
 		else
 			$telefon['body'] += '<a href="exec:killvar ''menu_page'' & gs ''Cheatmenu_din'' & dynamic $cheatmenu[''setting'']"><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_settings.png" height="80" width="80"></a><br>'
 		end
-		dynamic $telefon['print']
-	else
-		'<font color="red"><b>Your phone is disabled for this event</b></font>'
+		dynamic $telefon['print'], 1
 	end
 end &! --- Phone_menu ---