Browse Source

Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

Lusticon 5 months ago
parent
commit
1172b3e0b7
3 changed files with 75 additions and 71 deletions
  1. 35 35
      locations/Cheatmenu_din.qsrc
  2. 32 28
      locations/telefon.qsrc
  3. 8 8
      locations/wardrobe.qsrc

+ 35 - 35
locations/Cheatmenu_din.qsrc

@@ -1,7 +1,7 @@
 # Cheatmenu_din
 # Cheatmenu_din
 if settingmode = 0: settingmode = 69
 if settingmode = 0: settingmode = 69
 menu_off = 1
 menu_off = 1
-cls
+cla & *clr
 
 
 $cheatmenu['empty'] = {
 $cheatmenu['empty'] = {
 	!Yes, intentionally empty, do not remove it
 	!Yes, intentionally empty, do not remove it
@@ -23,7 +23,7 @@ $cheatmenu['music'] = {
 }
 }
 
 
 $cheatmenu['setting'] = {
 $cheatmenu['setting'] = {
-	cls
+	cla & *clr
 	$cheatmenu['this_menu'] = 'setting'
 	$cheatmenu['this_menu'] = 'setting'
 	$BACKIMAGE = ''
 	$BACKIMAGE = ''
 	if $theme['name'] = 'Custom': gs 'themes', 'check_custom_vars' & gs 'themes', 'set_custom' & gs '$menu_obnovit'
 	if $theme['name'] = 'Custom': gs 'themes', 'check_custom_vars' & gs 'themes', 'set_custom' & gs '$menu_obnovit'
@@ -79,7 +79,7 @@ $cheatmenu['quicktime'] = {
 	gs 'outdoors', 'weather'
 	gs 'outdoors', 'weather'
 	gs 'stat'
 	gs 'stat'
 	gs 'fertility', 'cum_arrcheat'
 	gs 'fertility', 'cum_arrcheat'
-	cls
+	cla & *clr
 }
 }
 
 
 $cheatmenu['dynamic'] = {
 $cheatmenu['dynamic'] = {
@@ -91,7 +91,7 @@ $cheatmenu['dynamic'] = {
 
 
 $cheatmenu['vartracker'] = {
 $cheatmenu['vartracker'] = {
 	gs'stat'
 	gs'stat'
-	cls
+	cla & *clr
 	act 'Return to cheat index': dynamic $cheatmenu['index']
 	act 'Return to cheat index': dynamic $cheatmenu['index']
 	'<center><h1>Cheat menu</h1></center>'
 	'<center><h1>Cheat menu</h1></center>'
 	'<center>For testing purposes.<br>If reporting a bug only the lines in red are neccessary.</center>'
 	'<center>For testing purposes.<br>If reporting a bug only the lines in red are neccessary.</center>'
@@ -233,7 +233,7 @@ $cheatmenu['index'] = {
 	currhour = (daystart-1) * 24 + hour
 	currhour = (daystart-1) * 24 + hour
 	currday = daystart
 	currday = daystart
 	temp_week = week & temp_day = day & $temp_month = $month & temp_month = month & temp_year = year & temp_hour = hour & temp_minut = minut
 	temp_week = week & temp_day = day & $temp_month = $month & temp_month = month & temp_year = year & temp_hour = hour & temp_minut = minut
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Index</h1></center>'
 	'<center><h1>Cheat Menu - Index</h1></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
@@ -363,7 +363,7 @@ $cheatmenu['slutshot'] = {
 
 
 $cheatmenu['permanent'] = {
 $cheatmenu['permanent'] = {
 	gs'stat'
 	gs'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	gs 'obj_din', 'cheattabs'
 	$cheatmenu['this_menu'] = 'permanent'
 	$cheatmenu['this_menu'] = 'permanent'
 
 
@@ -444,7 +444,7 @@ $cheatmenu['therapist_reset'] = {
 }
 }
 
 
 $cheatmenu['cycle'] = {
 $cheatmenu['cycle'] = {
-	cls
+	cla & *clr
 	if cycle ! 5:
 	if cycle ! 5:
 		EggRH = 0
 		EggRH = 0
 		LutH = 0
 		LutH = 0
@@ -520,7 +520,7 @@ $cheatmenu['remove_preg'] = {
 
 
 $cheatmenu['state'] = {
 $cheatmenu['state'] = {
 	gs'stat'
 	gs'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	gs 'obj_din', 'cheattabs'
 
 
 	'<center><h1>Cheat Menu - Character State Changes</h1></center>'
 	'<center><h1>Cheat Menu - Character State Changes</h1></center>'
@@ -613,7 +613,7 @@ $cheatmenu['set_body_class'] = {
 }
 }
 
 
 $cheatmenu['bodyMod'] = {
 $cheatmenu['bodyMod'] = {
-	cls
+	cla & *clr
 	act 'Return to last menu': dynamic $cheatmenu['state']
 	act 'Return to last menu': dynamic $cheatmenu['state']
 
 
 	'<center><h1>Cheat Menu - Body Modification</h1></center>'
 	'<center><h1>Cheat Menu - Body Modification</h1></center>'
@@ -776,7 +776,7 @@ $cheatmenu['looks'] = {
 		pcs_hgt = 200
 		pcs_hgt = 200
 	end
 	end
 	gs'stat'
 	gs'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Character Appearance</h1></center>'
 	'<center><h1>Cheat Menu - Character Appearance</h1></center>'
 	'<center><font color="red"><b>WARNING!</b></font>: Using cheats can cause bugs and break your save, use them with care. When reporting bugs, please mention any cheats you used.</center>'
 	'<center><font color="red"><b>WARNING!</b></font>: Using cheats can cause bugs and break your save, use them with care. When reporting bugs, please mention any cheats you used.</center>'
@@ -1028,7 +1028,7 @@ if $ARGS[0] = 'assreduce':
 end
 end
 
 
 if $ARGS[0] = 'vneshpara':
 if $ARGS[0] = 'vneshpara':
-	cls
+	cla & *clr
 	'<center><h1>Cheat Menu - ?</h1></center>'
 	'<center><h1>Cheat Menu - ?</h1></center>'
 	act 'Return to appearance menu':dynamic $cheatmenu['looks']
 	act 'Return to appearance menu':dynamic $cheatmenu['looks']
 	*nl
 	*nl
@@ -1074,7 +1074,7 @@ if $ARGS[0] = 'vneshpara':
 end
 end
 
 
 if $ARGS[0] = 'parameters':
 if $ARGS[0] = 'parameters':
-	cls
+	cla & *clr
 	'<center><h1>Cheat Menu - Appearance Stats</h1></center>'
 	'<center><h1>Cheat Menu - Appearance Stats</h1></center>'
 	act 'Return to appearance menu':dynamic $cheatmenu['looks']
 	act 'Return to appearance menu':dynamic $cheatmenu['looks']
 	*nl
 	*nl
@@ -1123,7 +1123,7 @@ end
 
 
 $cheatmenu['tatoo'] = {
 $cheatmenu['tatoo'] = {
 	gs'stat'
 	gs'stat'
-	cls
+	cla & *clr
 	'<center><h1>Cheat Menu - Tattoos</h1></center>'
 	'<center><h1>Cheat Menu - Tattoos</h1></center>'
 	act 'Return to appearance menu':dynamic $cheatmenu['looks']
 	act 'Return to appearance menu':dynamic $cheatmenu['looks']
 	*nl
 	*nl
@@ -1247,7 +1247,7 @@ $cheatmenu['printStatLinksInverted'] = {
 
 
 $cheatmenu['stats'] = {
 $cheatmenu['stats'] = {
 	gs 'stat'
 	gs 'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	gs 'obj_din', 'cheattabs'
 
 
 	!Set a floor and ceiling for all attributes and skills
 	!Set a floor and ceiling for all attributes and skills
@@ -1380,7 +1380,7 @@ $cheatmenu['stats'] = {
 
 
 $cheatmenu['reputation'] = {
 $cheatmenu['reputation'] = {
 	gs'stat'
 	gs'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Relationships and Renown</h1></center>'
 	'<center><h1>Cheat Menu - Relationships and Renown</h1></center>'
 	'<center>Relationship values are from 0 - 100.</center>'
 	'<center>Relationship values are from 0 - 100.</center>'
@@ -1684,7 +1684,7 @@ $cheatmenu['reputation'] = {
 
 
 $cheatmenu['documents'] = {
 $cheatmenu['documents'] = {
 	gs'stat'
 	gs'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Diplomas, Licences, and Certificates</h1></center>'
 	'<center><h1>Cheat Menu - Diplomas, Licences, and Certificates</h1></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
@@ -1722,7 +1722,7 @@ $cheatmenu['input_time'] = {
 
 
 $cheatmenu['week'] = {
 $cheatmenu['week'] = {
 	gs'stat'
 	gs'stat'
-	cls
+	cla & *clr
 	'<center><a href="exec:dynamic $cheatmenu[''index'']"><b>Cheat menu</b></a> - <a href="exec:dynamic $cheatmenu[''time'']"><b>Time</b></a></center>'
 	'<center><a href="exec:dynamic $cheatmenu[''index'']"><b>Cheat menu</b></a> - <a href="exec:dynamic $cheatmenu[''time'']"><b>Time</b></a></center>'
 	*nl
 	*nl
 	'Current time: <b><<day>></b>. day of <b><<$month>></b>, <b><<year>></b>, <<$tempcurtime>>'
 	'Current time: <b><<day>></b>. day of <b><<$month>></b>, <b><<year>></b>, <<$tempcurtime>>'
@@ -1739,7 +1739,7 @@ $cheatmenu['week'] = {
 
 
 $cheatmenu['month'] = {
 $cheatmenu['month'] = {
 	gs'stat'
 	gs'stat'
-	cls
+	cla & *clr
 	'<center><a href="exec:dynamic $cheatmenu[''index'']"><b>Cheat menu</b></a> - <a href="exec:dynamic $cheatmenu[''time'']"><b>Time</b></a></center>'
 	'<center><a href="exec:dynamic $cheatmenu[''index'']"><b>Cheat menu</b></a> - <a href="exec:dynamic $cheatmenu[''time'']"><b>Time</b></a></center>'
 	*nl
 	*nl
 	'Current time: <b><<day>></b>. day of <b><<$month>></b>, <b><<year>></b>, <<$tempcurtime>>'
 	'Current time: <b><<day>></b>. day of <b><<$month>></b>, <b><<year>></b>, <<$tempcurtime>>'
@@ -1809,7 +1809,7 @@ $cheatmenu['time'] = {
 		:femcycloop
 		:femcycloop
 		if femcycloop > 0:gs 'femcyc' & femcycloop -= 1 & jump 'femcycloop'
 		if femcycloop > 0:gs 'femcyc' & femcycloop -= 1 & jump 'femcycloop'
 	end
 	end
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Manipulate Time and Weather</h1></center>'
 	'<center><h1>Cheat Menu - Manipulate Time and Weather</h1></center>'
 	'<center><font color="red"><b>WARNING!</b></font>: Using cheats to manipulate time can <b>easily</b> break quests and cause bugs. Do not use them unless'
 	'<center><font color="red"><b>WARNING!</b></font>: Using cheats to manipulate time can <b>easily</b> break quests and cause bugs. Do not use them unless'
@@ -1983,7 +1983,7 @@ $cheatmenu['sucresetdo'] = {
 }
 }
 
 
 $cheatmenu['succubreset'] = {
 $cheatmenu['succubreset'] = {
-	cls
+	cla & *clr
 	'Are you sure you want to reset your Succubus status? You will lose all levels, saved power, and succubus skill levels.'
 	'Are you sure you want to reset your Succubus status? You will lose all levels, saved power, and succubus skill levels.'
 	*nl
 	*nl
 	'<a href="exec:dynamic $cheatmenu[''magic'']"><b>No, nevermind.</b></a>'
 	'<a href="exec:dynamic $cheatmenu[''magic'']"><b>No, nevermind.</b></a>'
@@ -1993,7 +1993,7 @@ $cheatmenu['succubreset'] = {
 
 
 $cheatmenu['magic'] = {
 $cheatmenu['magic'] = {
 	gs'stat'
 	gs'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Magic</h1></center>'
 	'<center><h1>Cheat Menu - Magic</h1></center>'
 	'<center>Is magical: <a href="exec:pcs_magik += 1 & dynamic $cheatmenu[''magic'']">+1<<pcs_magik>></a></center>'
 	'<center>Is magical: <a href="exec:pcs_magik += 1 & dynamic $cheatmenu[''magic'']">+1<<pcs_magik>></a></center>'
@@ -2047,7 +2047,7 @@ $cheatmenu['magic'] = {
 !!----------------------------------------------------------------------------------------------------------------------------
 !!----------------------------------------------------------------------------------------------------------------------------
 
 
 $cheatmenu['display'] = {
 $cheatmenu['display'] = {
-	cls
+	cla & *clr
 	gs 'obj_din', 'settingtabs'
 	gs 'obj_din', 'settingtabs'
 	'<center><h1>Display Setting</h1></center>'
 	'<center><h1>Display Setting</h1></center>'
 	*p '<center><table cellspacing="0" cellpadding="20" valign="top"><tr><td cellspacing="0" cellpadding="20" valign="top">'
 	*p '<center><table cellspacing="0" cellpadding="20" valign="top"><tr><td cellspacing="0" cellpadding="20" valign="top">'
@@ -2103,7 +2103,7 @@ $cheatmenu['display'] = {
 	if Enable_Android = 1:
 	if Enable_Android = 1:
 		'Set Fontsize for Status: Unsupported'
 		'Set Fontsize for Status: Unsupported'
 		'Android Mode:Currently ON - <a href="exec:Enable_Android = 0 & dynamic $cheatmenu[''display'']">Turn OFF</a>'
 		'Android Mode:Currently ON - <a href="exec:Enable_Android = 0 & dynamic $cheatmenu[''display'']">Turn OFF</a>'
-		! 'click <a href="exec:cls & FUNC (''$menu_obnovit'')">refresh</a> to refresh status window.'
+		! 'click <a href="exec:cla & *clr & FUNC (''$menu_obnovit'')">refresh</a> to refresh status window.'
 		'click <B>refresh</B> on top of status window to renew.'
 		'click <B>refresh</B> on top of status window to renew.'
 	else
 	else
 		'Android Mode: Currently OFF - <a href="exec:Enable_Android = 1 & dynamic $cheatmenu[''display'']">Turn ON</a>'
 		'Android Mode: Currently OFF - <a href="exec:Enable_Android = 1 & dynamic $cheatmenu[''display'']">Turn ON</a>'
@@ -2257,7 +2257,7 @@ $cheatmenu['theme_presets_copy'] = {
 }
 }
 
 
 $cheatmenu['theme_export'] = {
 $cheatmenu['theme_export'] = {
-	cls
+	cla & *clr
 	act 'Return': dynamic $cheatmenu['theme_customize']
 	act 'Return': dynamic $cheatmenu['theme_customize']
 	"$custom_theme['fname'] = '<<$custom_theme['fname']>>'"
 	"$custom_theme['fname'] = '<<$custom_theme['fname']>>'"
 	"custom_theme['fsize'] = <<custom_theme['fsize']>>"
 	"custom_theme['fsize'] = <<custom_theme['fsize']>>"
@@ -2423,7 +2423,7 @@ $cheatmenu['theme_customize'] = {
 
 
 $cheatmenu['status'] = {
 $cheatmenu['status'] = {
 	gs 'stat'
 	gs 'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'settingtabs'
 	gs 'obj_din', 'settingtabs'
 	'<center><h1>Status Window Settings</h1></center>'
 	'<center><h1>Status Window Settings</h1></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
@@ -2572,7 +2572,7 @@ $cheatmenu['status'] = {
 !!----------------------------------------------------------------------------------------------------------------------------
 !!----------------------------------------------------------------------------------------------------------------------------
 
 
 $cheatmenu['theme'] = {
 $cheatmenu['theme'] = {
-	cls
+	cla & *clr
 	gs 'obj_din', 'settingtabs'
 	gs 'obj_din', 'settingtabs'
 	'<center><h1>Phone Theme Menu</h1></center>'
 	'<center><h1>Phone Theme Menu</h1></center>'
 	'<center><table width="90%" cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<center><table width="90%" cellspacing="0" cellpadding="20" valign="top"><tr>'
@@ -2661,7 +2661,7 @@ $cheatmenu['pain'] = {
 	if pain['clitoris'] < 0: pain['clitoris'] = 0
 	if pain['clitoris'] < 0: pain['clitoris'] = 0
 	if pain['urethra'] < 0: pain['urethra'] = 0
 	if pain['urethra'] < 0: pain['urethra'] = 0
 	if pain['cervix'] < 0: pain['cervix'] = 0
 	if pain['cervix'] < 0: pain['cervix'] = 0
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Pain Management</h1></center>'
 	'<center><h1>Cheat Menu - Pain Management</h1></center>'
 	'<center><a href="exec:killvar ''pain'' & dynamic $cheatmenu[''pain'']">No pain</a></center>'
 	'<center><a href="exec:killvar ''pain'' & dynamic $cheatmenu[''pain'']">No pain</a></center>'
@@ -2740,7 +2740,7 @@ $cheatmenu['DNAC'] = {
 }
 }
 
 
 $cheatmenu['DNA'] = {
 $cheatmenu['DNA'] = {
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - DNA Generation</h1></center>'
 	'<center><h1>Cheat Menu - DNA Generation</h1></center>'
 	'<center><table width="90%" cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<center><table width="90%" cellspacing="0" cellpadding="20" valign="top"><tr>'
@@ -2925,7 +2925,7 @@ $cheatmenu['DNA'] = {
 !!----------------------------------------------------------------------------------------------------------------------------
 !!----------------------------------------------------------------------------------------------------------------------------
 
 
 $cheatmenu['fame'] = {
 $cheatmenu['fame'] = {
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Fame</h1></center>'
 	'<center><h1>Cheat Menu - Fame</h1></center>'
 	$table['fame'] = '<center><table width="90%" cellspacing="0" cellpadding="5" valign="top" border="1">'
 	$table['fame'] = '<center><table width="90%" cellspacing="0" cellpadding="5" valign="top" border="1">'
@@ -3074,7 +3074,7 @@ $cheatmenu['bdimcstaddpro'] = {
 }
 }
 
 
 $cheatmenu['bdimcstadd'] = {
 $cheatmenu['bdimcstadd'] = {
-	cls
+	cla & *clr
 	'<center><b>Body Image Set Addition</b></center>'
 	'<center><b>Body Image Set Addition</b></center>'
 	'<a href="exec:killvar ''klsetask'' & dynamic $cheatmenu[''bdimmain'']"><b>Go Back</b></a>'
 	'<a href="exec:killvar ''klsetask'' & dynamic $cheatmenu[''bdimmain'']"><b>Go Back</b></a>'
 	*nl
 	*nl
@@ -3100,7 +3100,7 @@ $cheatmenu['bdimcstdesed'] = {
 
 
 $cheatmenu['bdimdisplay'] = {
 $cheatmenu['bdimdisplay'] = {
 	gs 'stat'
 	gs 'stat'
-	cls
+	cla & *clr
 	'<center><h1>Cheat menu</h1></center>'
 	'<center><h1>Cheat menu</h1></center>'
 	*nl
 	*nl
 	'<center><b>Body Image Set Display</b></center>'
 	'<center><b>Body Image Set Display</b></center>'
@@ -3201,7 +3201,7 @@ $cheatmenu['bdimdisplay'] = {
 }
 }
 
 
 $cheatmenu['bdimcstdel'] = {
 $cheatmenu['bdimcstdel'] = {
-	cls
+	cla & *clr
 	'<center><b>Body Image Set Removal</b></center>'
 	'<center><b>Body Image Set Removal</b></center>'
 	'<a href="exec:killvar ''klsetask'' & dynamic $cheatmenu[''bdimdisplay'']"><b>Go Back</b></a>'
 	'<a href="exec:killvar ''klsetask'' & dynamic $cheatmenu[''bdimdisplay'']"><b>Go Back</b></a>'
 	*nl
 	*nl
@@ -3255,7 +3255,7 @@ $cheatmenu['bdimcstdel'] = {
 
 
 $cheatmenu['bdimmain'] = {
 $cheatmenu['bdimmain'] = {
 	gs 'stat'
 	gs 'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Body Image Sets</h1></center>'
 	'<center><h1>Cheat Menu - Body Image Sets</h1></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
@@ -3330,7 +3330,7 @@ $cheatmenu['bdimmain'] = {
 
 
 $cheatmenu['about'] = {
 $cheatmenu['about'] = {
 	gs 'stat'
 	gs 'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'settingtabs'
 	gs 'obj_din', 'settingtabs'
 	gs 'saveg'
 	gs 'saveg'
 	gs 'addbuilddate'
 	gs 'addbuilddate'
@@ -3350,7 +3350,7 @@ $cheatmenu['about'] = {
 
 
 $cheatmenu['items'] = {
 $cheatmenu['items'] = {
 	gs'stat'
 	gs'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Items</h1></center>'
 	'<center><h1>Cheat Menu - Items</h1></center>'
 
 

+ 32 - 28
locations/telefon.qsrc

@@ -62,7 +62,11 @@ $telefon['footer'] = {
 !! ''''This is how we print the screen on to the Additional Dscription window
 !! ''''This is how we print the screen on to the Additional Dscription window
 $telefon['print'] = {
 $telefon['print'] = {
 	clr
 	clr
-	pl func('cleanHTML',dyneval($telefon['header']) + $telefon['body'] + dyneval($telefon['footer']))
+	if menu_off = 0:
+		pl func('cleanHTML', dyneval($telefon['header']) + $telefon['body'] + dyneval($telefon['footer']))
+	else
+		pl func('cleanHTML', dyneval($telefon['header']) + $telefon['body'])
+	end
 }
 }
 
 
 !! This is the formatting function for a row in the Contact List. SHould be run as a DYNEVAL()
 !! This is the formatting function for a row in the Contact List. SHould be run as a DYNEVAL()
@@ -340,7 +344,7 @@ if $ARGS[0] = 'IncomingCallChooser':
 	if i < 3 and hour > 5 and hour < 20:
 	if i < 3 and hour > 5 and hour < 20:
 		if pcs_lovers[i] = 1 and svidanie[i] = 0 and loverday[i] ! daystart and rand(1,100) > 95:
 		if pcs_lovers[i] = 1 and svidanie[i] = 0 and loverday[i] ! daystart and rand(1,100) > 95:
 			j = arrsize('$telefIncCall')
 			j = arrsize('$telefIncCall')
-			$telefIncCall[j] = "cls & gs 'telefon', 'lover', <<i>>"
+			$telefIncCall[j] = "gs 'telefon', 'lover', <<i>>"
 			$telefIncIcon[j] = 'images/characters/shared/headshots_generic/<<lover_picture[i]>>.jpg'
 			$telefIncIcon[j] = 'images/characters/shared/headshots_generic/<<lover_picture[i]>>.jpg'
 			$telefIncName[j] = $loverdesc[i]
 			$telefIncName[j] = $loverdesc[i]
 		end
 		end
@@ -754,8 +758,8 @@ end
 !{
 !{
 	Send SMS lists the current contacts, then clicking on a contact gives a list of messages that can be sent.
 	Send SMS lists the current contacts, then clicking on a contact gives a list of messages that can be sent.
 	Receive messages lists the sms messages sent to the player, these can be deleted, they will be in bold until read.
 	Receive messages lists the sms messages sent to the player, these can be deleted, they will be in bold until read.
-	
-	To add an incoming message 
+
+	To add an incoming message
 	gs 'telefon', 'add_sms', 'A1', 'Test message the text goes here', 'images/pc/activities/phone/selfies/bathroom/underwear/1.jpg', 'images/pc/activities/phone/selfies/school_bathroom/pussyflash/1.jpg'
 	gs 'telefon', 'add_sms', 'A1', 'Test message the text goes here', 'images/pc/activities/phone/selfies/bathroom/underwear/1.jpg', 'images/pc/activities/phone/selfies/school_bathroom/pussyflash/1.jpg'
 	A1 is the NPC code (A1 is Dmitriy Nosov "Dimka")
 	A1 is the NPC code (A1 is Dmitriy Nosov "Dimka")
 	You can have up to 4 pictures attached to the message
 	You can have up to 4 pictures attached to the message
@@ -780,19 +784,19 @@ end
 	$SMSPicture4[] = url for fourth picture sent as part of the message
 	$SMSPicture4[] = url for fourth picture sent as part of the message
 	SMSMessageRead[] = 0 unread, 1 read
 	SMSMessageRead[] = 0 unread, 1 read
 
 
-	Send Messages 
+	Send Messages
 	$SMSSendContact[] = NPC code for contact. ('A129', 'A29', 'B13', 'C14') that sent the sms
 	$SMSSendContact[] = NPC code for contact. ('A129', 'A29', 'B13', 'C14') that sent the sms
 	$SMSSendMessage[] = text for the sms message
 	$SMSSendMessage[] = text for the sms message
 	$SMSSendCode[] = Code to execute for Incoming call
 	$SMSSendCode[] = Code to execute for Incoming call
 	SMSSendRepeatable[] = 0 delete option after send, 1 don't delete option
 	SMSSendRepeatable[] = 0 delete option after send, 1 don't delete option
-	$SMSSendDeleteId[] = id passed by the caller 
+	$SMSSendDeleteId[] = id passed by the caller
 }
 }
 
 
 if $ARGS[0] = 'Phone_sms':
 if $ARGS[0] = 'Phone_sms':
 	$telefon['body'] = '
 	$telefon['body'] = '
 	<font size=6>SMS</font><br>
 	<font size=6>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>'
 	<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'] += '<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>'
 
 
@@ -810,7 +814,7 @@ if $ARGS[0] = 'Phone_sms':
 		else
 		else
 			$telefonCon['NPCName'] = $npc_nickname[$contact[telefon['contactid']]]
 			$telefonCon['NPCName'] = $npc_nickname[$contact[telefon['contactid']]]
 			$telefonCon['Icon'] = $contactIcon[telefon['contactid']]
 			$telefonCon['Icon'] = $contactIcon[telefon['contactid']]
-		end 
+		end
 
 
 		if SMSMessageRead[i] = 0: telefon['UnreadSMS'] += 1
 		if SMSMessageRead[i] = 0: telefon['UnreadSMS'] += 1
 		$telefon['body'] += dyneval($telefon['SMS'],i,$telefonCon['Icon'],$telefonCon['NPCName'],$SMSTime[i],SMSMessageRead[i])
 		$telefon['body'] += dyneval($telefon['SMS'],i,$telefonCon['Icon'],$telefonCon['NPCName'],$SMSTime[i],SMSMessageRead[i])
@@ -824,7 +828,7 @@ if $ARGS[0] = 'Phone_sms':
 	killvar 'i'
 	killvar 'i'
 end &! --- Phone_sms ---
 end &! --- Phone_sms ---
 
 
-!{ 
+!{
 	New SMS Message
 	New SMS Message
 	If NPC is not in the contacts list of the phone it will be displayed as unknown until the contact has been added
 	If NPC is not in the contacts list of the phone it will be displayed as unknown until the contact has been added
 	$ARGS[1] = NPC code for contact. ('A129', 'A29', 'B13', 'C14')
 	$ARGS[1] = NPC code for contact. ('A129', 'A29', 'B13', 'C14')
@@ -863,7 +867,7 @@ if $ARGS[0] = 'delete_sms':
 	telefon['SMSCount'] -= 1
 	telefon['SMSCount'] -= 1
 	if $ARGS[2] = 'all' and telefon['SMSCount'] > 0 :
 	if $ARGS[2] = 'all' and telefon['SMSCount'] > 0 :
 		gs 'telefon','delete_sms','0','all'
 		gs 'telefon','delete_sms','0','all'
-	end	
+	end
 	gs 'telefon', 'Phone_sms'
 	gs 'telefon', 'Phone_sms'
 end
 end
 
 
@@ -883,7 +887,7 @@ if $ARGS[0] = 'show_sms':
 	else
 	else
 		$telefonCon['NPCName'] = $npc_nickname[$contact[telefon['contactid']]]
 		$telefonCon['NPCName'] = $npc_nickname[$contact[telefon['contactid']]]
 		$telefonCon['Icon'] = $contactIcon[telefon['contactid']]
 		$telefonCon['Icon'] = $contactIcon[telefon['contactid']]
-	end 
+	end
 
 
 	!!If file extension is not given, .png is assumed
 	!!If file extension is not given, .png is assumed
 	if instr($telefonCon['Icon'],'.') = 0:
 	if instr($telefonCon['Icon'],'.') = 0:
@@ -924,9 +928,9 @@ if $ARGS[0] = 'show_sms':
 end
 end
 
 
 !! This is the formatting function for a row in the SMS message table. SHould be run as a DYNEVAL()
 !! This is the formatting function for a row in the SMS message table. SHould be run as a DYNEVAL()
-!{	
+!{
 	SMS Row in messages table
 	SMS Row in messages table
-	ARGS[0] = message id 
+	ARGS[0] = message id
 	$ARGS[1] = NPC icon
 	$ARGS[1] = NPC icon
 	$ARGS[2] = NPC Nickname
 	$ARGS[2] = NPC Nickname
 	$ARGS[3] = Time received
 	$ARGS[3] = Time received
@@ -969,12 +973,12 @@ if $ARGS[0] = 'send_sms':
 	$telefon['body'] = '
 	$telefon['body'] = '
 	<font size=6>Send SMS</font><br>
 	<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>'
 	<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>'
-	if subscription['metered_calls'] = 1 and subscription['sms_limit'] > 0: 
+	if subscription['metered_calls'] = 1 and subscription['sms_limit'] > 0:
 		$telefon['body'] += '<br/>'
 		$telefon['body'] += '<br/>'
 		$telefon['body'] += '<b>You still can send <<subscription[''sms_limit'']>> text messages on your contract</b>'
 		$telefon['body'] += '<b>You still can send <<subscription[''sms_limit'']>> text messages on your contract</b>'
 	end
 	end
 !! Colour correction for editor ''''
 !! Colour correction for editor ''''
-	
+
 	$telefon['body'] += '<TABLE cellspacing="0" width="80%">'
 	$telefon['body'] += '<TABLE cellspacing="0" width="80%">'
 	!!iterating all Contacts
 	!!iterating all Contacts
 	i=0
 	i=0
@@ -1256,7 +1260,7 @@ end &! --- phone_call_receive ---
 
 
 if $ARGS[0] = 'phone_balance':
 if $ARGS[0] = 'phone_balance':
 	if subscription['monthly_calls'] = 0 and subscription['metered_calls'] < 4:
 	if subscription['monthly_calls'] = 0 and subscription['metered_calls'] < 4:
-		if subscription['monthly_calls'] = 0 and subscription['monthly_calls-date'] > 0: 
+		if subscription['monthly_calls'] = 0 and subscription['monthly_calls-date'] > 0:
 			$contractmessage = '<font size=6>Your mobile contract has expired, you have renew it or buy some minutes.</font><br>'
 			$contractmessage = '<font size=6>Your mobile contract has expired, you have renew it or buy some minutes.</font><br>'
 		elseif subscription['metered_calls'] < 4 and subscription['metered_calls-date'] > 0:
 		elseif subscription['metered_calls'] < 4 and subscription['metered_calls-date'] > 0:
 			$contractmessage = '<font size=6>Not enough minutes left on your contract to make a call</font><br>'
 			$contractmessage = '<font size=6>Not enough minutes left on your contract to make a call</font><br>'
@@ -1300,11 +1304,11 @@ if $ARGS[0] = 'phone_call_reject':
 end &! --- phone_call_reject ---
 end &! --- phone_call_reject ---
 
 
 if $ARGS[0] = 'Phone_megafon':
 if $ARGS[0] = 'Phone_megafon':
-	if subscription['monthly_calls'] = 1: 
-		$contractmessage = 'You have a valid monthly contract that will renew on <<subscription[''monthly_calls-date'']>>/<<month+1>>' 
+	if subscription['monthly_calls'] = 1:
+		$contractmessage = 'You have a valid monthly contract that will renew on <<subscription[''monthly_calls-date'']>>/<<month+1>>'
 	elseif subscription['metered_calls'] = 1:
 	elseif subscription['metered_calls'] = 1:
-		$contractmessage = 'You have a valid minutes based contract that still has <<subscription[''metered_calls'']>> minuets left' 
-	elseif subscription['monthly_calls'] = 0 and subscription['monthly_calls-date'] > 0: 
+		$contractmessage = 'You have a valid minutes based contract that still has <<subscription[''metered_calls'']>> minuets left'
+	elseif subscription['monthly_calls'] = 0 and subscription['monthly_calls-date'] > 0:
 		$contractmessage = '<font size=6>Your mobile contract has expired, you have renew it or buy some minutes.</font><br>'
 		$contractmessage = '<font size=6>Your mobile contract has expired, you have renew it or buy some minutes.</font><br>'
 	elseif subscription['metered_calls'] < 4 and subscription['metered_calls-date'] > 0:
 	elseif subscription['metered_calls'] < 4 and subscription['metered_calls-date'] > 0:
 		$contractmessage = '<font size=6>You have a minute based plan, but it doesn''t have enough minutes left to make a call</font><br>'
 		$contractmessage = '<font size=6>You have a minute based plan, but it doesn''t have enough minutes left to make a call</font><br>'
@@ -1669,13 +1673,13 @@ if $ARGS[0] = 'callingTheLover' and loverGender[ARGS[1]] = 0:
 end
 end
 
 
 if $ARGS[0] = 'lover' and loverGender[ARGS[1]] = 0:
 if $ARGS[0] = 'lover' and loverGender[ARGS[1]] = 0:
-	cla
-	clr
+	cls
+	menu_off = 1
 	lover_number = ARGS[1]
 	lover_number = ARGS[1]
 	ring = 0
 	ring = 0
 	lover_days = daystart - loverday[lover_number]
 	lover_days = daystart - loverday[lover_number]
-	!gs 'stat'
-	!gs 'telefon','phone_call_receive'
+	gs 'stat'
+	gs 'telefon', 'phone_call_receive'
 	svetrand = rand(0, 5)
 	svetrand = rand(0, 5)
 
 
 	if svetrand = 0:$sveta = 'cutie'
 	if svetrand = 0:$sveta = 'cutie'
@@ -1815,13 +1819,13 @@ if $ARGS[0] = 'lover' and loverGender[ARGS[1]] = 0:
 end
 end
 
 
 if $ARGS[0] = 'lover' and loverGender[ARGS[1]] = 1:
 if $ARGS[0] = 'lover' and loverGender[ARGS[1]] = 1:
-	cla
-	clr
+	cls
+	menu_off = 1
 	lover_number = ARGS[1]
 	lover_number = ARGS[1]
 	ring = 0
 	ring = 0
 	lover_days = daystart - loverday[lover_number]
 	lover_days = daystart - loverday[lover_number]
-	!gs 'stat'
-	!gs 'telefon','phone_call_receive'
+	gs 'stat'
+	gs 'telefon', 'phone_call_receive'
 	svetrand = rand(0, 5)
 	svetrand = rand(0, 5)
 
 
 	if svetrand = 0:$sveta = 'cutie'
 	if svetrand = 0:$sveta = 'cutie'

+ 8 - 8
locations/wardrobe.qsrc

@@ -595,19 +595,19 @@ if $ARGS[0] = 'default_entry_wear':
 
 
 	!! default school girl uniform is always allowed to be worn if still in school
 	!! default school girl uniform is always allowed to be worn if still in school
 	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and $temp1 = 'gm_school' and temp2 = 6:
 	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and $temp1 = 'gm_school' and temp2 = 6:
-		cls
+		cla & *clr
 		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
 		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
 		'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
 		'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
 		act 'Return': gt 'wardrobe', $wloc
 		act 'Return': gt 'wardrobe', $wloc
 	!! do not own this clothing anymore
 	!! do not own this clothing anymore
 	elseif dyneval('RESULT = <<$temp1>>[<<temp2>>]') = 0 and temp2 ! 0:
 	elseif dyneval('RESULT = <<$temp1>>[<<temp2>>]') = 0 and temp2 ! 0:
-		cls
+		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/strip/strip2.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/strip/strip2.jpg"></center>'
 		'As you go to pull your <<$def_clothing_name[default_entry]>> outfit out of your wardrobe you remember you don''t own that piece of clothing anymore. Maybe you should buy it again? Guess you will have to find something else to wear.'
 		'As you go to pull your <<$def_clothing_name[default_entry]>> outfit out of your wardrobe you remember you don''t own that piece of clothing anymore. Maybe you should buy it again? Guess you will have to find something else to wear.'
 		act 'Return': gt 'wardrobe', $wloc
 		act 'Return': gt 'wardrobe', $wloc
 	!! strength of clothing is less than or equal to 0
 	!! strength of clothing is less than or equal to 0
 	elseif dyneval('RESULT = <<$temp1>>_h[<<temp2>>]') <= 0 and $temp1 ! 'nude':
 	elseif dyneval('RESULT = <<$temp1>>_h[<<temp2>>]') <= 0 and $temp1 ! 'nude':
-		cls
+		cla & *clr
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/vicky/event/vika_game_strip16.mp4"></video></center>'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/vicky/event/vika_game_strip16.mp4"></video></center>'
 		'Your <<$def_clothing_name[default_entry]>> outfit has worn out and can''t be used anymore. Guess you will have to find something else to wear.'
 		'Your <<$def_clothing_name[default_entry]>> outfit has worn out and can''t be used anymore. Guess you will have to find something else to wear.'
 		act 'Strip out of worn out clothing':
 		act 'Strip out of worn out clothing':
@@ -639,7 +639,7 @@ if $ARGS[0] = 'default_entry_wear':
 		end
 		end
 	!! clothing exhibition is greater than player exhibition
 	!! clothing exhibition is greater than player exhibition
 	elseif CloInhibit > pcs_inhib:
 	elseif CloInhibit > pcs_inhib:
-		cls
+		cla & *clr
 		'<center><video autoplay loop src="images/locations/pavlovsk/trainstation/bimbo.strip6.mp4"></video></center>'
 		'<center><video autoplay loop src="images/locations/pavlovsk/trainstation/bimbo.strip6.mp4"></video></center>'
 		'You don''t feel daring enough to wear your <<$def_clothing_name[default_entry]>> outfit. Maybe you will be confident enough in the future? Guess you will have to find something else to wear.'
 		'You don''t feel daring enough to wear your <<$def_clothing_name[default_entry]>> outfit. Maybe you will be confident enough in the future? Guess you will have to find something else to wear.'
 		act 'Strip out of revealing clothing':
 		act 'Strip out of revealing clothing':
@@ -653,7 +653,7 @@ if $ARGS[0] = 'default_entry_wear':
 		!! check for if the hipsize is too far from your hipsize
 		!! check for if the hipsize is too far from your hipsize
 		dynamic 'RESULT = <<$temp1>>_b[<<temp2>>]'
 		dynamic 'RESULT = <<$temp1>>_b[<<temp2>>]'
 		if RESULT < pcs_hips - 8 or RESULT > pcs_hips + 8:
 		if RESULT < pcs_hips - 8 or RESULT > pcs_hips + 8:
-			cls
+			cla & *clr
 			iif(RESULT < pcs_hips - 8,'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>','<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/stripping<<rand(1,4)>>.mp4"></video></center>')
 			iif(RESULT < pcs_hips - 8,'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>','<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/stripping<<rand(1,4)>>.mp4"></video></center>')
 			'As you put on your <<$def_clothing_name[default_entry]>> outfit you notice it doesn''t fit correctly anymore. It''s ' + iif(RESULT < pcs_hips - 8,'unbearably tight and uncomfortable to wear.','extremely loose and won''t stay in place no matter how hard you try.') + ' You must have ' + iif(RESULT < pcs_hips - 8,'gained','lost') + ' some weight since this was purchased or last tailored. You will have to get this clothing resized before you can wear it again.'
 			'As you put on your <<$def_clothing_name[default_entry]>> outfit you notice it doesn''t fit correctly anymore. It''s ' + iif(RESULT < pcs_hips - 8,'unbearably tight and uncomfortable to wear.','extremely loose and won''t stay in place no matter how hard you try.') + ' You must have ' + iif(RESULT < pcs_hips - 8,'gained','lost') + ' some weight since this was purchased or last tailored. You will have to get this clothing resized before you can wear it again.'
 			act 'Strip out of ill-fitting clothing':
 			act 'Strip out of ill-fitting clothing':
@@ -664,14 +664,14 @@ if $ARGS[0] = 'default_entry_wear':
 			end
 			end
 		!! clothing ok to wear after passing hip check
 		!! clothing ok to wear after passing hip check
 		else
 		else
-			cls
+			cla & *clr
 			'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
 			'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
-			'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
+			'You put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
 			act 'Return': gt 'wardrobe', $wloc
 			act 'Return': gt 'wardrobe', $wloc
 		end
 		end
 	!! clothing ok to wear without needing hip check and passing all other checks
 	!! clothing ok to wear without needing hip check and passing all other checks
 	else
 	else
-		cls
+		cla & *clr
 		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
 		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
 		'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
 		'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
 		act 'Return': gt 'wardrobe', $wloc
 		act 'Return': gt 'wardrobe', $wloc