Browse Source

some changes in the SMS phone section + theme simplification

rachels 2 years ago
parent
commit
4934b5609f

+ 1 - 0
changes from 0_8_5 to 0_8_6.txt

@@ -36,6 +36,7 @@ rex_party_events
 rex_party_boys_events
 rex_party_girls_events
 rex_party_sister_events
+$phone_theme
 
 
 

+ 0 - 1
glife.qproj

@@ -190,7 +190,6 @@
 		<Location name="telefon"/>
 		<Location name="phone_selfies"/>
 		<Location name="phone_selfies_popup"/>
-		<Location name="$phone_theme"/>
 	</Folder>
 	<Folder name="Prostitution">
 		<Location name="street_walker"/>

+ 1 - 1
locations/Cheatmenu_din.qsrc

@@ -2202,7 +2202,7 @@ $cheatmenu['status'] = {
 		end
 	end
 
-	!<a href="exec:gs ''Cheatmenu_din'' & dynamic $cheatmenu[''status''] & gs ''stat''"><img src="<<FUNC(''$phone_theme'')>>icon_settings.png"></a>
+	!<a href="exec:gs ''Cheatmenu_din'' & dynamic $cheatmenu[''status''] & gs ''stat''"><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_settings.png"></a>
 	'</tr></table></b></center>'
 }
 

+ 2 - 2
locations/stat_display.qsrc

@@ -104,7 +104,7 @@ if menu_off = 0:
 	$menuBarTab += '<td><a href="exec:killvar ''menu_page'' & gs ''obj_din'', ''description''"><img title="Character description" height = <<set_miconht>> src="images/system/icons/menu/icon_character.png"></a></td>'
 	$menuBarTab += '<td><a href="exec:killvar ''menu_page'' & gs ''obj_din'', ''face''"><img title="Looks (Face, body, clothing,...)"height = <<set_miconht>> src="images/system/icons/menu/icon_lookself.png"></a></td>'
 	if bag > 0: $menuBarTab += '<td><a href="exec:gs ''din_bad'', ''d_bag''"><img title="Your purse"height = <<set_miconht>> src="images/system/icons/menu/icon_purse.png"></a></td>'
-	$menuBarTab += '<td><a href="exec:gs ''telefon'',''Phone_menu''"><img title="Your phone" height = <<set_miconht>> src="images/system/icons/menu/icon_phone.png"></a></td>'
+	$menuBarTab += '<td><a href="exec:gs ''telefon'',''Phone_menu''"><img title="Your phone" height = <<set_miconht>> src="images/system/icons/menu/<<iif(telefon[''UnreadSMS'']=0,''icon_phone.png'',''icon_phone_sms.gif'')>>"></a></td>'
 	$menuBarTab += '<td><a href="exec:gs ''obj_din'', ''records''"><img title="<<$journal_tooltip>>" height = <<set_miconht>> src="images/system/icons/menu/<<$journalIcon>>"></a></td>'
 	$menuBarTab += '<td><a href="exec:killvar ''menu_page'' & gs''$menu_setting''"><img title="Menu & Cheatmenu" height = <<set_miconht>> src="images/system/icons/menu/icon_menu.png"></a></td>'
 	$menuBarTab += '</tr></table>'
@@ -117,7 +117,7 @@ elseif menu_off = 1:
 	if bag > 0:
 		$menuBarTab += '<td><a href="exec:gs ''obj_din'', ''menu_disabled''"><img title="<<$stat_disable_msg>>" height = <<set_miconht>> src="images/system/icons/menu/icon_purse.png"></a></td>'
 	end
-	$menuBarTab += '<td><a href="exec:gs ''telefon'',''Phone_menu''"><img title="<<$stat_disable_msg>>" height = <<set_miconht>> src="images/system/icons/menu/icon_phone.png"></a></td>'
+	$menuBarTab += '<td><a href="exec:gs ''telefon'',''Phone_menu''"><img title="<<$stat_disable_msg>>" height = <<set_miconht>> src="images/system/icons/menu/<<iif(telefon[''UnreadSMS'']=0,''icon_phone.png'',''icon_phone_sms.gif'')>>"></a></td>'
 	$menuBarTab += '<td><a href="exec:gs ''obj_din'', ''menu_disabled''"><img title="<<$stat_disable_msg>>" height = <<set_miconht>> src="images/system/icons/menu/<<$journalIcon>>"></a></td>'
 	$menuBarTab += '<td><a href="exec:killvar ''menu_page'' & gs''obj_din'', ''menu_disabled''"><img title="<<$stat_disable_msg>>" height = <<set_miconht>> src="images/system/icons/menu/icon_menu.png"></a></td>'
 	$menuBarTab += '</tr></table>'

+ 22 - 22
locations/telefon.qsrc

@@ -144,7 +144,7 @@ end &! --- AddContact ---
 if $ARGS[0] = 'ContactList':
 	$telefon['body'] = '
 	<font size=6>Contacts</font><br>
-	<img src="<<FUNC(''$phone_theme'')>>icon_call.png" height="80" width="80"><br><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%">'
 
 	!!iterating all Contacts
@@ -705,7 +705,7 @@ end &! --- phone_call_reject ---
 if $ARGS[0] = 'Phone_megafon':
 	$telefon['body'] = '
 	<font size=6>MegaFon</font><br>
-	<img src="<<FUNC(''$phone_theme'')>>icon_megafon.png" height="80" width="80"><br><br>
+	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_megafon.png" height="80" width="80"><br><br>
 	<b>The balance in the account:</b>
 	<font size=5><<balans>> ₽.</font><br>'
 	dynamic $telefon['print']
@@ -1211,7 +1211,7 @@ if $ARGS[0] = 'Phone_notebook':
 	gs 'housing', 'rent'
 	$telefon['body'] = '
 	<font size=6>Planner</font><br>
-	<img src="<<FUNC(''$phone_theme'')>>icon_notebook.png" height="80" width="80"><br>
+	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_notebook.png" height="80" width="80"><br>
 	<<year>>-<<$month>>-<<day>>, <<$week[week]>><br><br>'
 	rent1 = -1
 	rent4 = -1
@@ -1541,7 +1541,7 @@ if $ARGS[0] = 'Phone_camera':
 		$phone_loc = ''
 	end
 	$telefon['body'] = '<font size=6>Camera</font><br>
-	<img src="<<FUNC(''$phone_theme'')>>icon_camera.png" height="80" width="80"><br><br>'
+	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_camera.png" height="80" width="80"><br><br>'
 	!! Take a selfie depending on which clothes you are wearing
 	$telefon['body'] += '<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''Phone_camera_selfie'', ''<<$phone_loc>>'' "><b>Take a selfie</b></a><br>'
 	!! Flashing selfie
@@ -1606,7 +1606,7 @@ end
 if $ARGS[0] = 'Phone_sms':
 	$telefon['body'] = '
 	<font size=6>SMS</font><br>
-	<img src="<<FUNC(''$phone_theme'')>>icon_sms.png" height="80" width="80"><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'] += '<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>'
@@ -1704,7 +1704,7 @@ if $ARGS[0] = 'show_sms':
 
 	$telefon['body'] = '
 	<font size=6>SMS</font><br>
-	<img src="<<FUNC(''$phone_theme'')>>icon_sms.png" height="80" width="80"><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'] += '<TR><TD><img src="<<$telefonCon[''Icon'']>>"></TD><TD><<$telefonCon[''NPCName'']>></TD></TR>'
@@ -1771,7 +1771,7 @@ if $ARGS[0] = 'send_sms':
 	$telefon['backButton'] = 'gs ''telefon'', ''Phone_sms'''
 	$telefon['body'] = '
 	<font size=6>Send SMS</font><br>
-	<img src="<<FUNC(''$phone_theme'')>>icon_sms.png" height="80" width="80"><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%">'
 	!!iterating all Contacts
@@ -1819,7 +1819,7 @@ if $ARGS[0] = 'npcSendListSms':
 	$telefon['backButton'] = 'gs ''telefon'', ''send_sms'''
 	$telefon['body'] = '
 	<font size=6>Send SMS</font><br>
-	<img src="<<FUNC(''$phone_theme'')>>icon_sms.png" height="80" width="80"><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%">'
 	!!iterating all send sms messages
@@ -1907,7 +1907,7 @@ end
 if $ARGS[0] = 'Phone_wheather':
 	$telefon['body'] = '
 	<font size=6>Weather</font><br>
-	<img src="<<FUNC(''$phone_theme'')>>icon_weather.png" height="80" width="80"><br><br>
+	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_weather.png" height="80" width="80"><br><br>
 	<b>Temperature:</b><br>
 	<<$temperature>>. <<$osadki>><br>
 	P.O.P. today is <<weatherFall>>%<br>'
@@ -1917,7 +1917,7 @@ end &! --- Phone_wheather ---
 if $ARGS[0] = 'Phone_calendar':
 	$telefon['body'] = '
 	<font size=6>Calendar</font><br>
-	<img src="<<FUNC(''$phone_theme'')>>icon_calendar.png" height="80" width="80"><br><br>
+	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_calendar.png" height="80" width="80"><br><br>
 	<B>Today:</B><br>
 	<<$week[week]>>, <<day>> <<$month>> <<year>><br>'
 	dynamic $telefon['print']
@@ -1926,7 +1926,7 @@ end &! --- Phone_calendar ---
 if $ARGS[0] = 'Phone_media':
 	$telefon['body'] = '
 	<font size=6>Media</font><br>
-	<img src="<<FUNC(''$phone_theme'')>>icon_music.png" height="80" width="80"><br>
+	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_music.png" height="80" width="80"><br>
 	<b>This option is not active</b><br>'
 	dynamic $telefon['print']
 end &! --- Phone_media ---
@@ -1934,22 +1934,22 @@ end &! --- Phone_media ---
 if $ARGS[0] = 'Phone_menu':
 	if phone_off = 0:
 		$telefon['body'] = '
-		<a href="exec:gs ''telefon'', ''Phone_camera'' "><img src="<<FUNC(''$phone_theme'')>>icon_camera.png" height="80" width="80"></a>
-		<a href="exec:gs ''telefon'', ''Phone_calendar'' "><img src="<<FUNC(''$phone_theme'')>>icon_calendar.png" height="80" width="80"></a>
-		<a href="exec:gs ''telefon'', ''Phone_pictures'' "><img src="<<FUNC(''$phone_theme'')>>icon_pictures.png" height="80" width="80"></a>
+		<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>
+		<a href="exec:gs ''telefon'', ''Phone_pictures'' "><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_pictures.png" height="80" width="80"></a>
 		<br>
-		<a href="exec:gs ''telefon'', ''Phone_media'' "><img src="<<FUNC(''$phone_theme'')>>icon_music.png" height="80" width="80"></a>
-		<a href="exec:gs ''telefon'', ''Phone_notebook'' "><img src="<<FUNC(''$phone_theme'')>>icon_notebook.png" height="80" width="80"></a>
-		<a href="exec:gs ''telefon'', ''Phone_wheather'' "><img src="<<FUNC(''$phone_theme'')>>icon_weather.png" height="80" width="80"></a>
+		<a href="exec:gs ''telefon'', ''Phone_media'' "><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_music.png" height="80" width="80"></a>
+		<a href="exec:gs ''telefon'', ''Phone_notebook'' "><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_notebook.png" height="80" width="80"></a>
+		<a href="exec:gs ''telefon'', ''Phone_wheather'' "><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_weather.png" height="80" width="80"></a>
 		<br>
-		<a href="exec:gs ''telefon'', ''ContactList'' "><img src="<<FUNC(''$phone_theme'')>>icon_call.png" height="80" width="80"></a>
-		<a href="exec:gs ''telefon'', ''Phone_sms'' "><img src="<<FUNC(''$phone_theme'')>>icon_sms.png" height="80" width="80"></a>
-		<a href="exec:gs ''telefon'', ''Phone_megafon'' "><img src="<<FUNC(''$phone_theme'')>>icon_megafon.png" height="80" width="80"></a>
+		<a href="exec:gs ''telefon'', ''ContactList'' "><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_call.png" height="80" width="80"></a>
+		<a href="exec:gs ''telefon'', ''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"></a>
+		<a href="exec:gs ''telefon'', ''Phone_megafon'' "><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_megafon.png" height="80" width="80"></a>
 		<br>'
 		if menu_off = 1:
-			$telefon['body'] += '<a href="exec:gs ''obj_din'', ''menu_disabled''"><img src="<<FUNC(''$phone_theme'')>>icon_settings.png" height="80" width="80"></a><br>'
+			$telefon['body'] += '<a href="exec:gs ''obj_din'', ''menu_disabled''"><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_settings.png" height="80" width="80"></a><br>'
 		else
-			$telefon['body'] += '<a href="exec:killvar ''menu_page'' & gs ''Cheatmenu_din'' & dynamic $cheatmenu[''setting'']"><img src="<<FUNC(''$phone_theme'')>>icon_settings.png" height="80" width="80"></a><br>'
+			$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

+ 0 - 0
locations/_phone_theme.qsrc → locations/unused/_phone_theme.qsrc