Преглед на файлове

Menu changes and new functions from illume

KevinSmarts преди 6 години
родител
ревизия
f70ae8050a
променени са 9 файла, в които са добавени 244 реда и са изтрити 151 реда
  1. 1 0
      glife.qproj
  2. 82 53
      locations/Cheatmenu_din
  3. 1 1
      locations/LOCA
  4. 8 0
      locations/_menu_setting
  5. 10 1
      locations/begin
  6. 2 0
      locations/obj_din
  7. 6 3
      locations/onobjsel
  8. 133 92
      locations/stat_display
  9. 1 1
      locations/telefon

+ 1 - 0
glife.qproj

@@ -880,6 +880,7 @@
       <Location name="Menu.Treatment"/>
     </Folder>
     <Folder name="Game Menu">
+      <Location name="$menu_setting"/>
       <Location name="$menu_skills"/>
       <Location name="$menu_descrip"/>
       <Location name="$menu_statistika"/>

+ 82 - 53
locations/Cheatmenu_din

@@ -1270,43 +1270,60 @@ $cheatmenu['cycle'] = {
 	end
 }
 $cheatmenu['display'] = {
-	gs'stat'
-	clr
-	pl'<center> <a href="exec:dynamic $cheatmenu"><b>Cheat Menu</b></a></center>'
-	nl
-	if Enable_faceturn = 1:
-		pl' <a href="exec:Enable_faceturn = 0 & dynamic $cheatmenu[''display'']">Always show face: ON</a>'
+	!call this for pre-game setting
+	if Enable_settingmode = 0:
+		!call from cheatmenu - Status Display
+		gs'stat'
+		clr
+		pl'<center> <a href="exec:dynamic $cheatmenu"><b>Cheat Menu</b></a></center>'
 	else
-		pl' <a href="exec:Enable_faceturn = 1 & dynamic $cheatmenu[''display'']">Always show face: OFF</a>'
+		clr
+		if Enable_settingmode = 1:
+			!call from Menu - Game settings
+			pl'<center> <a href="exec:Enable_settingmode = 0 & dynamic $cheatmenu"><b>Cheat Menu</b></a></center>'
+			nl
+			pl '<center><a href="exec:FUNC (''$menu_obnovit'')"><b>Return</b></a></center>'
+			pl '<center><B>Game Play Setting</B></center>'
+		else
+			!value= 2, call from Character creation
+			pl '<center><B>Game Play Setting</B></center>'
+		end
+		if Enable_nogameover = 1:
+			pl' <a href="exec:Enable_nogameover = 0 & dynamic $cheatmenu[''display'']">Prevent Non-Drama GAMEOVER: ON</a>'
+		else
+			pl' <a href="exec:Enable_nogameover = 1 & dynamic $cheatmenu[''display'']">Prevent Non-Drama GAMEOVER: OFF</a>'
+		end
+		if sound = 1:
+			pl' <a href="exec:sound = 0 & dynamic $cheatmenu[''display'']">Music: OFF</a>'
+		else
+			pl' <a href="exec:sound = 1 & dynamic $cheatmenu[''display'']">Music: ON</a>'
+		end
+		if disable_autosave = 1:
+			pl' <a href="exec:disable_autosave = 0 & dynamic $cheatmenu[''display'']">AutoSave: ON</a>'
+		else
+			pl' <a href="exec:disable_autosave = 1 & dynamic $cheatmenu[''display'']">AutoSave: OFF</a>'
+		end		
 	end
 	nl
-	if ETOmenu = 1:
-		pl' <a href="exec:ETOmenu = 0 & dynamic $cheatmenu[''display'']">Display: Text</a>'
-	else
-		pl' <a href="exec:ETOmenu = 1 & dynamic $cheatmenu[''display'']">Display: Bar</a>'
-	end
-	if Enable_showattr = 1:
-		pl' <a href="exec:Enable_showattr = 0 & dynamic $cheatmenu[''display'']">More attribute: ON</a>'
+	pl '<center><B>Display Setting</B></center>'
+	if set_imgh > 0:
+		pl'Force Image height: <a href="exec:set_imgh=1+input(''Enter the height of the images'') & dynamic $cheatmenu[''display'']"><<set_imgh-1>></a>, <a href="exec:set_imgh=0 & dynamic $cheatmenu[''display'']">ON</a>'
+		$set_imgh = 'height = <<set_imgh>>'
 	else
-		pl' <a href="exec:Enable_showattr = 1 & dynamic $cheatmenu[''display'']">More attribute: OFF</a>'
+		pl'Force Image height: <a href="exec:set_imgh=1+input(''Enter the height of the images'') & dynamic $cheatmenu[''display'']">OFF</a>'
+		$set_imgh = ''
 	end
-	if Enable_showskill = 1:
-		pl' <a href="exec:Enable_showskill = 0 & dynamic $cheatmenu[''display'']">Show skill: ON</a>'
+	if night_mode = 1:
+		pl 'Night Mode: <a href="exec:night_mode = 0 & dynamic $cheatmenu[''display'']">ON</a>'
 	else
-		pl' <a href="exec:Enable_showskill = 1 & dynamic $cheatmenu[''display'']">Show skill: OFF</a>'
-	end
-	if Enable_showrelation = 1:
-		pl' <a href="exec:Enable_showrelation = 0 & dynamic $cheatmenu[''display'']">Show relations: ON</a>'
+		pl 'Night Mode: <a href="exec:night_mode = 1 & dynamic $cheatmenu[''display'']">OFF</a>'
+	end	
+	if Enable_faceturn = 1:
+		pl' <a href="exec:Enable_faceturn = 0 & dynamic $cheatmenu[''display'']">Always show face: ON</a>'
 	else
-		pl' <a href="exec:Enable_showrelation = 1 & dynamic $cheatmenu[''display'']">Show relations: OFF</a>'
+		pl' <a href="exec:Enable_faceturn = 1 & dynamic $cheatmenu[''display'']">Always show face: OFF</a>'
 	end
 	nl
-	if Enable_clothwidth<0:Enable_clothwidth=0
-	if Enable_clothwidth > 0:
-		pl'Set Wardrobe cloth image width: <a href="exec:Enable_clothwidth=input(''Input wardrobe cloth image width'') & dynamic $cheatmenu[''display'']"><<Enable_clothwidth>></a>, <a href="exec:Enable_clothwidth=0 & dynamic $cheatmenu[''display'']">ON</a>'
-	else
-		pl'Set Wardrobe cloth image width: <a href="exec:Enable_clothwidth=input(''Input wardrobe cloth image width'') & dynamic $cheatmenu[''display'']">OFF</a>'
-	end
 	if Enable_tablemap = 1:
 		pl' <a href="exec:Enable_tablemap = 0 & dynamic $cheatmenu[''display'']">List friends in table: ON</a>'
 	else
@@ -1316,25 +1333,53 @@ $cheatmenu['display'] = {
 		pl' <a href="exec:Enable_towntable = 0 & dynamic $cheatmenu[''display'']">Display Pavlovsk description in table: ON</a>'
 	else
 		pl' <a href="exec:Enable_towntable = 1 & dynamic $cheatmenu[''display'']">Display Pavlovsk description in table: OFF</a>'
-	end
+	end	
 	nl
-	if Enable_statfsize<0:Enable_statfsize=0
+	if Enable_clothwidth<0:Enable_clothwidth=0
+	if Enable_clothwidth > 0:
+		pl'Set Wardrobe cloth image width: <a href="exec:Enable_clothwidth=input(''Input wardrobe cloth image width'') & dynamic $cheatmenu[''display'']"><<Enable_clothwidth>></a>, <a href="exec:Enable_clothwidth=0 & dynamic $cheatmenu[''display'']">ON</a>'
+	else
+		pl'Set Wardrobe cloth image width: <a href="exec:Enable_clothwidth=input(''Input wardrobe cloth image width'') & dynamic $cheatmenu[''display'']">OFF</a>'
+	end
+	nl	
 	if Enable_Android = 1:
 		pl 'Set Fontsize for Status: Unsupported'
 		pl '<a href="exec:Enable_Android = 0 & dynamic $cheatmenu[''display'']">Android Mode :ON</a>'
-		pl 'Quest player for Android by Nex does not support autosave, remember to <B>save</B> from player setting!'
-		pl 'click <a href="exec:clr & pl $stat_android">refresh</a> on menu to refresh status.'
+		!pl 'click <a href="exec:clr & FUNC (''$menu_obnovit'')">refresh</a> to refresh status window.'
+		pl 'click <B>refresh</B> on top of status window to renew.'
 	else
+		pl '<a href="exec:Enable_Android = 1 & dynamic $cheatmenu[''display'']">Android Mode :OFF</a>'
+	end
+	nl	
+	pl '<center><B>Status Window Display</B></center>'
+		if Enable_statfsize<0:Enable_statfsize=0
 		if Enable_statfsize > 0:
 			pl 'Set Fontsize for Status: <a href="exec:Enable_statfsize=input(''Enter Fontsize'') & dynamic $cheatmenu[''display'']"><<Enable_statfsize>></a>, <a href="exec:Enable_statfsize=0 & dynamic $cheatmenu[''display'']">ON</a>'
 		else
 			pl 'Set Fontsize for Status: <a href="exec:Enable_statfsize=input(''Enter fontsize'') & dynamic $cheatmenu[''display'']">OFF</a>'
 		end
-		pl '<a href="exec:Enable_Android = 1 & dynamic $cheatmenu[''display'']">Android Mode :OFF</a>'
+	if ETOmenu = 1:
+		pl' <a href="exec:ETOmenu = 0 & dynamic $cheatmenu[''display'']">Status Display mode: Text</a>'
+	else
+		pl' <a href="exec:ETOmenu = 1 & dynamic $cheatmenu[''display'']">Status Display mode: Scale Bar</a>'
+	end
+	if Enable_showattr = 1:
+		pl' <a href="exec:Enable_showattr = 0 & dynamic $cheatmenu[''display'']">Show More attribute: ON</a>'
+	else
+		pl' <a href="exec:Enable_showattr = 1 & dynamic $cheatmenu[''display'']">Show More attribute: OFF</a>'
+	end
+	if Enable_showskill = 1:
+		pl' <a href="exec:Enable_showskill = 0 & dynamic $cheatmenu[''display'']">Show skill: ON</a>'
+	else
+		pl' <a href="exec:Enable_showskill = 1 & dynamic $cheatmenu[''display'']">Show skill: OFF</a>'
+	end
+	if Enable_showrelation = 1:
+		pl' <a href="exec:Enable_showrelation = 0 & dynamic $cheatmenu[''display'']">Show relations: ON</a>'
+	else
+		pl' <a href="exec:Enable_showrelation = 1 & dynamic $cheatmenu[''display'']">Show relations: OFF</a>'
 	end
-	nl
 	if Enable_scalepic = 1:
-		pl 'Scalebar is now as <b>Character</b>, you can switch to <a href="exec:Enable_scalepic = 0 & dynamic $cheatmenu[''display'']">Image</a> or <a href="exec:Enable_scalepic = 2 & dynamic $cheatmenu[''display'']">Table</a>'
+		pl 'Scalebar is now as <b>Image</b>, you can switch to <a href="exec:Enable_scalepic = 0 & dynamic $cheatmenu[''display'']">Image</a> or <a href="exec:Enable_scalepic = 2 & dynamic $cheatmenu[''display'']">Table</a>'
 		if Enable_scalewidth > 0:
 			pl'Scalebar Width: <a href="exec:input(''Input Scalebar Width (default to 120)'') & dynamic $cheatmenu[''display'']"><<Enable_scalewidth-1>></a>, Set is currently <a href="exec:Enable_scalewidth = 0 & dynamic $cheatmenu[''display'']">ON</a>'
 		else
@@ -1346,7 +1391,7 @@ $cheatmenu['display'] = {
 			pl'Scalebar Height: Lock is currently <a href="exec:Enable_scaleheight=1+input(''InputS calebar Height (default to 15)'') & dynamic $cheatmenu[''display'']">OFF</a>'
 		end
 	elseif Enable_scalepic = 0:
-		pl 'Scalebar is now as <b>Image</b>, you can switch to <a href="exec:Enable_scalepic = 1 & dynamic $cheatmenu[''display'']">Character</a> or <a href="exec:Enable_scalepic = 2 & dynamic $cheatmenu[''display'']">Table</a>'
+		pl 'Scalebar is now as <b>Character</b>, you can switch to <a href="exec:Enable_scalepic = 1 & dynamic $cheatmenu[''display'']">Character</a> or <a href="exec:Enable_scalepic = 2 & dynamic $cheatmenu[''display'']">Table</a>'
 		if cheatStatusBars = 1:
 			pl ' <a href="exec:cheatStatusBars = 0 & dynamic $cheatmenu[''display'']">Switch to larger status bars</a>'
 		else
@@ -1355,9 +1400,6 @@ $cheatmenu['display'] = {
 	elseif Enable_scalepic = 2:
 		pl 'Scalebar is now as <b>Table</b>, you can switch to <a href="exec:Enable_scalepic = 0 & dynamic $cheatmenu[''display'']">Image</a> or <a href="exec:Enable_scalepic = 1 & dynamic $cheatmenu[''display'']">Character</a>'
 	end
-	
-	
-
 }
 
 $cheatmenu['pain'] = {
@@ -1541,7 +1583,7 @@ $cheatmenu = {
 	pl'<a href="exec:dynamic $cheatmenu[''reputation'']"><b>Relationships and Reputation</b></a>'
 	pl'<a href="exec:dynamic $cheatmenu[''documents'']"><b>Documents</b></a>'
 	pl'<a href="exec:dynamic $cheatmenu[''time'']"><b>Manipulating time and temperature</b></a>'
-	pl'<a href="exec:dynamic $cheatmenu[''display'']"><b>Status Display</b></a>'
+	pl'<a href="exec:Enable_settingmode = 0 & dynamic $cheatmenu[''display'']"><b>Status Display</b></a>'
 	if MagikDostup = 0: pl'<a href="exec:dynamic $cheatmenu[''magic'']"><b>Magic</b></a>'
 	pl'<a href="exec:gt ''NPCChanger'', ''Start''"><b>NPC Editor</b></a>'
 	pl'<a href="exec:dynamic $cheatmenu[''pain'']"><b>Pain management panel</b></a>'
@@ -1585,23 +1627,10 @@ $cheatmenu = {
    	pl'<a href="exec:gt''dachi''">Teleport to Suburban Cooperative</a>'
 	pl'<b>Warning!</b> Teleporting while in event is likely to break your game!'
     pl''
-	if set_imgh > 0:
-		pl'Set Image height: <a href="exec:set_imgh=1+input(''Enter the height of the images'') & dynamic $cheatmenu"><<set_imgh-1>></a>, <a href="exec:set_imgh=0 & dynamic $cheatmenu">O</a>'
-		$set_imgh = 'height = <<set_imgh>>'
-	else
-		pl'Set Image height: <a href="exec:set_imgh=1+input(''Enter the height of the images'') & dynamic $cheatmenu">X</a>'
-		$set_imgh = ''
-	end
-	pl''
 	pl'Pregnancy speed multiplier: <a href="exec:if pregspeedcheat < 3:pregspeedcheat += 1 & dynamic $cheatmenu else pregspeedcheat = 0 & dynamic $cheatmenu"><b><<pregspeedcheat+1>></b></a>'
 	pl''
 	pl'<a href="exec:dynamic $cheatmenu[''vartracker'']"><b>Variable tracker</b></a>'
 	nl
-	if night_mode = 1:
-		pl 'Night Mode: <a href="exec:night_mode = 0 & dynamic $cheatmenu">ON</a>'
-	else
-		pl 'Night Mode: <a href="exec:night_mode = 1 & dynamic $cheatmenu">OFF</a>'
-	end
 	nl
 }
 

+ 1 - 1
locations/LOCA

@@ -1,6 +1,6 @@
 # LOCA
 
-killvar '$cheatmenu'
+if Enable_settingmode!2: killvar '$cheatmenu'
 
 --- LOCA ---------------------------------
 

+ 8 - 0
locations/_menu_setting

@@ -0,0 +1,8 @@
+# $menu_setting
+
+gs 'Cheatmenu_din'
+Enable_settingmode = 1
+dynamic $cheatmenu['display']
+
+--- $menu_setting ---------------------------------
+

+ 10 - 1
locations/begin

@@ -1,7 +1,10 @@
 # begin
 
 if $ARGS[0] = 'start':
-
+	gs 'Cheatmenu_din'
+	showstat 1
+	Enable_settingmode = 2
+	dynamic $cheatmenu['display']
 	'<center><b><font color="maroon">CHOOSE GAME START</font></b></center>'
 	*nl
 	'<b>Transgendered Start:</b>'
@@ -14,6 +17,8 @@ if $ARGS[0] = 'start':
 	'Marvel as we recklessly squish both of the above into one start. You are a school girl who finds the amulet and not much changes, except the magic, actually that''s quite a big change.'
 	
 	act '<center><b>Transgendered start</b></center>':
+		Enable_settingmode = 0
+		showstat 0
 		cla
 		act '<center>Show intro (recommended)</center>':
 			gt 'preSYS', 'TGStart'
@@ -26,6 +31,8 @@ if $ARGS[0] = 'start':
 
 	act '<center><b>School girl Start</b></center>':
 		cla
+		Enable_settingmode = 0
+		showstat 0
 		MagikDostup = 1
 		gt 'preSYS', 'SGStart'
 		
@@ -33,6 +40,8 @@ if $ARGS[0] = 'start':
 
 	act '<center><b>Cursed Schoolgirl Start</b></center>':
 		cla
+		Enable_settingmode = 0
+		showstat 0
 		altQS = 1
 		gt 'preSYS', 'SGStart'
 	end

+ 2 - 0
locations/obj_din

@@ -1734,6 +1734,7 @@ if $ARGS[0] = 'old':
 	addobj 'Notebook'
 	addobj 'Refresh'
 	addobj 'The new menu'
+	addobj 'Game Setting'
 	addobj 'Cheat menu'
 	addobj 'Emergency exit'
 	if disable_autosave = 1:
@@ -1764,3 +1765,4 @@ if $ARGS[0] = 'autosave':
 	gs'stat'
 end
 --- obj_din ---------------------------------
+

+ 6 - 3
locations/onobjsel

@@ -20,8 +20,9 @@ $menu_lookon[5] = 'Piercing:$menu_pirs'
 
 killvar 'menu_view'
 $menu_view[0] = 'The old menu:$menu_addoldmenu'
-$menu_view[1] = 'Cheat menu:$menu_cheat'
-$menu_view[2] = 'Refresh:$menu_obnovit'
+$menu_view[1] = 'Game Setting:$menu_setting'
+$menu_view[2] = 'Cheat menu:$menu_cheat'
+$menu_view[3] = 'Refresh:$menu_obnovit'
 
 killvar 'menu_other'
 $menu_other[0] = 'Notebook:$menu_bloknot'
@@ -51,7 +52,9 @@ if $selobj = 'Phone':gs 'telefon','Phone_menu'
 if $selobj = 'Notebook':gs 'obj_din', 'records'
 if $selobj = 'Refresh':gs '$menu_obnovit'
 if $selobj = 'The new menu':menu_option = 0 & gs 'obj_din', 'new'
-if $selobj = 'Cheat menu':gs 'Cheatmenu_din' & dynamic $cheatmenu
+if $selobj = 'Cheat menu':gs '$menu_cheat'
+if $selobj = 'Game Setting':gs '$menu_setting'
+
 if $selobj = 'Emergency exit':gs 'obj_din', 'exit'
 if disable_autosave = 1:
 	if $selobj = 'Enable autosave':gs 'obj_din', 'autosave'

+ 133 - 92
locations/stat_display

@@ -74,14 +74,31 @@ if Enable_statfsize>0:$stat_msg = '<font size=<<Enable_statfsize>>><<$stat_msg>>
 
 $stat_android = '<b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>'
 
-$stat_msg += '<<$weather>><BR>'
+$stat_msg += '<table><tr><td><a href="exec:msg ''<<$weather>>''"><<$weatherImage>></a></td><td><<$temperature>></td></tr>'
+!$stat_msg += '<<$weather>><BR>'
+!pl '<<$weatherImage>>'
 $stat_msg += '<BR><<$stat_android>> <<$week[week]>> <<day>> <<$month>> <<year>>'
 $stat_android += '<<$week[week]>> <<day>>/<<month>>, <<money>> ₽, <a href="exec:clr & pl $stat_android">Status</a>'
 ! $stat_android for short desc in android mode, $stat_msg for status bar.
-
-$stat_msg += '<BR>'
+if StoryLine > 0 and SchoolAtestat = 0 and $holyday ! '': $stat_msg += '<BR><<$holyday>>' & $stat_msg += '<BR>'
+if birthday = day and birthmonth = month: $stat_msg += '<BR><b>Today is your birthday.</b>' & $stat_msg += '<BR>'
 $pockets = 'pockets'
 if bag > 0: $pockets = 'purse'
+if bankAccount = 0 and stolmoney = 0:
+	$stat_msg += '<BR>You have <b><<money>> ₽</b> in your <<$pockets>>.'
+else
+	!combine money status to single line
+	$stat_msg += '<BR><<$pockets>>: <b><<money>> ₽</b>'
+	if stolmoney > 0: $stat_msg += ', drawer <b><<stolmoney>> ₽</b>'	
+	if bankAccount = 1:
+		if karta >= 0:
+			$stat_msg += ', bank: <b><<karta>> ₽</b>'
+		else
+			$stat_msg += '<BR><font color="red">Your bank account is overdrawn by <b><<karta>> ₽</b>!!</font>'
+		end
+	end
+end
+!{
 $stat_msg += '<BR>You have <b><<money>> ₽</b> in your <<$pockets>>.'
 if bankAccount = 1:
 	if karta >= 0:
@@ -91,7 +108,8 @@ if bankAccount = 1:
 	end
 end
 if stolmoney > 0: $stat_msg += '<BR>You have <b><<stolmoney>> ₽</b> in your desk drawer.'
-$stat_msg += '<BR>'
+}
+!$stat_msg += '<BR>'
 
 if ETOmenu = 1:
 	$stat_msg += '<BR><b><<$pcs_health>></b>'
@@ -134,13 +152,20 @@ else
 	gs 'indik', '1', pcs_sleep, pcs_sleep
 	$stat_msg += '<BR><<$ind>> Sleep'
 end
-$stat_msg += '<BR>'
 
+
+
+!!----------------Extra messages, start--------------------------
+
+!!----------------▽Attributes--------------------------
+$stat_tool_msg=''
+$stat_extra_msg=''
 if Enable_showattr = 0:
-	$stat_msg += '<BR> <a href="exec:Enable_showattr = 1 & FUNC (''$menu_obnovit'')">Attributes</a><BR>'
-end
-if Enable_showattr = 1:
-	$stat_msg += '<BR> <a href="exec:Enable_showattr = 0 & FUNC (''$menu_obnovit'')">Attributes:</a>'
+	$stat_tool_msg += '<a href="exec:Enable_showattr = 1 & FUNC (''$menu_obnovit'')">▽Attributes</a>'
+else
+	$stat_tool_msg += '<a href="exec:Enable_showattr = 0 & FUNC (''$menu_obnovit'')">▲Attributes</a>'
+	!skip if this is first message
+	if $stat_extra_msg ! null: $stat_extra_msg += '<br><a href="exec:Enable_showattr = 0 & FUNC (''$menu_obnovit'')">▲Attributes:</a>'
 	if Enable_scalepic = 2:
 		if pcs_dom > 10:
 			$dom_stat_msg = 'dominant'
@@ -150,85 +175,85 @@ if Enable_showattr = 1:
 			$dom_stat_msg = 'neutral'
 		end
 
-		$stat_msg += '<font color="<<$st_temp>>"><TABLE cellpadding="1" cellspacing="0" width="300"><TR><TD width="85%">'+FUNC('indiktab', '3', 100+pcs_dom-sub, 100+pcs_dom-sub,$dom_stat_msg)+'</TD><TD> Dominance</TD></TR>  <TR><TD width="85%">'+FUNC('indiktab', '1', pcs_stren, pcs_stren)+'</TD><TD> Strength</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_agil, pcs_agil)+'</TD><TD> Agility</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_vital, pcs_vital)+'</TD><TD> Endurance</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_intel, pcs_intel)+'</TD><TD> Intelligence</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_sprt, pcs_sprt)+'</TD><TD> Spirit</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_react, pcs_react)+'</TD><TD nowrap> Mental Agility</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_chrsm, pcs_chrsm)+'</TD><TD> Charisma</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_prcptn, pcs_prcptn)+'</TD><TD> Perception</TD></TR>'
-		if MagikDostup = 0: $stat_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_magik, pcs_magik)+'</TD><TD> Magic</TD></TR>'
-		$stat_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_apprnc / 2, pcs_apprnc)+'</TD><TD> Attractiveness</TD></TR>'
-		if SchoolAtestat = 0 and StoryLine > 0:$stat_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_grades, pcs_grades)+'</TD><TD nowrap> School Grades</TD></TR>'
-		if pcs_exhibition > 0:$stat_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_exhibition, pcs_exhibition)+'</TD><TD> Exhibitionism</TD></TR>'
-		if pcs_heels > 0:$stat_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_heels, pcs_heels)+'</TD><TD> Heels skill</TD></TR>'
-		$stat_msg += '</TABLE></font>'
+		$stat_extra_msg += '<font color="<<$st_temp>>"><TABLE cellpadding="1" cellspacing="0" width="300"><TR><TD width="85%">'+FUNC('indiktab', '3', 100+pcs_dom-sub, 100+pcs_dom-sub,$dom_stat_msg)+'</TD><TD> Dominance</TD></TR>  <TR><TD width="85%">'+FUNC('indiktab', '1', pcs_stren, pcs_stren)+'</TD><TD> Strength</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_agil, pcs_agil)+'</TD><TD> Agility</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_vital, pcs_vital)+'</TD><TD> Endurance</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_intel, pcs_intel)+'</TD><TD> Intelligence</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_sprt, pcs_sprt)+'</TD><TD> Spirit</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_react, pcs_react)+'</TD><TD nowrap> Mental Agility</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_chrsm, pcs_chrsm)+'</TD><TD> Charisma</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_prcptn, pcs_prcptn)+'</TD><TD> Perception</TD></TR>'
+		if MagikDostup = 0: $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_magik, pcs_magik)+'</TD><TD> Magic</TD></TR>'
+		$stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_apprnc / 2, pcs_apprnc)+'</TD><TD> Attractiveness</TD></TR>'
+		if SchoolAtestat = 0 and StoryLine > 0:$stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_grades, pcs_grades)+'</TD><TD nowrap> School Grades</TD></TR>'
+		if pcs_exhibition > 0:$stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_exhibition, pcs_exhibition)+'</TD><TD> Exhibitionism</TD></TR>'
+		if pcs_heels > 0:$stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_heels, pcs_heels)+'</TD><TD> Heels skill</TD></TR>'
+		$stat_extra_msg += '</TABLE></font>'
 		killvar '$dom_stat_msg'
 	else
 		gs 'indik','3', 50+(pcs_dom-sub)/2, 50+(pcs_dom-sub)/2
-		$stat_msg += '<BR><<$ind>> Dominance'
+		$stat_extra_msg += '<BR><<$ind>> Dominance'
 		if pcs_dom > 10:
-			$stat_msg += ' (dominant)'
+			$stat_extra_msg += ' (dominant)'
 		elseif sub > 10:
-			$stat_msg += ' (submissive)'
+			$stat_extra_msg += ' (submissive)'
 		else
-			$stat_msg += ' (natural)'
+			$stat_extra_msg += ' (natural)'
 		end
-!		$stat_msg += '<BR>'
+!		$stat_extra_msg += '<BR>'
 		gs 'indik', '1', pcs_stren, pcs_stren
-		$stat_msg += '<BR><<$ind>> Strength'
+		$stat_extra_msg += '<BR><<$ind>> Strength'
 		gs 'indik', '1', pcs_agil, pcs_agil
-		$stat_msg += '<BR><<$ind>> Agility'
+		$stat_extra_msg += '<BR><<$ind>> Agility'
 		gs 'indik', '1', pcs_vital, pcs_vital
-		$stat_msg += '<BR><<$ind>> Endurance'
+		$stat_extra_msg += '<BR><<$ind>> Endurance'
 		gs 'indik', '1', pcs_intel, pcs_intel
-		$stat_msg += '<BR><<$ind>> Intelligence'
+		$stat_extra_msg += '<BR><<$ind>> Intelligence'
 		gs 'indik', '1', pcs_sprt, pcs_sprt
-		$stat_msg += '<BR><<$ind>> Spirit'
+		$stat_extra_msg += '<BR><<$ind>> Spirit'
 		gs 'indik', '1', pcs_react, pcs_react
-		$stat_msg += '<BR><<$ind>> Mental Agility'
+		$stat_extra_msg += '<BR><<$ind>> Mental Agility'
 		gs 'indik', '1', pcs_chrsm, pcs_chrsm
-		$stat_msg += '<BR><<$ind>> Charisma'
+		$stat_extra_msg += '<BR><<$ind>> Charisma'
 		gs 'indik', '1', pcs_prcptn, pcs_prcptn
-		$stat_msg += '<BR><<$ind>> Perception'
+		$stat_extra_msg += '<BR><<$ind>> Perception'
 		if MagikDostup = 0:
 			gs 'indik', '1', pcs_magik, pcs_magik
-			$stat_msg += '<BR><<$ind>> Magic'
+			$stat_extra_msg += '<BR><<$ind>> Magic'
 		end
 		gs 'indik', '1', pcs_apprnc / 2, pcs_apprnc
-		$stat_msg += '<BR><<$ind>> Attractiveness'
+		$stat_extra_msg += '<BR><<$ind>> Attractiveness'
 	
 		if SchoolAtestat = 0 and StoryLine > 0:
 			gs 'indik', '1', pcs_grades, pcs_grades
-			$stat_msg += '<BR><<$ind>> School Grades'
+			$stat_extra_msg += '<BR><<$ind>> School Grades'
 		end
 		if pcs_exhibition > 0:
 			gs 'indik', '1', pcs_exhibition, pcs_exhibition
-			$stat_msg += '<BR><<$ind>> exhibitionism'
+			$stat_extra_msg += '<BR><<$ind>> exhibitionism'
 		end
 		if pcs_heels > 0:
 			gs 'indik', '1', pcs_heels, pcs_heels
-			$stat_msg += '<BR><<$ind>> Heels skill'
+			$stat_extra_msg += '<BR><<$ind>> Heels skill'
 		end
-		$stat_msg += '<BR>' 
+		$stat_extra_msg += '<BR>' 
 	end
 end
 killvar '$st_temp'
+
+!!----------------▽Skills--------------------------
+$stat_sktool_msg=''
+st_count=0
+$show_table=''
 !!----------------Mental skills--------------------------
 if Enable_show_mental_skill = 0:
-	$stat_msg += ' <a href="exec:Enable_show_mental_skill = 1 & FUNC (''$menu_obnovit'')">Mental Skills</a>'
-end
-if Enable_show_mental_skill = 1:
-	st_count=0
-	$show_table=''
+	$stat_sktool_msg += ' <a href="exec:Enable_show_mental_skill = 1 & FUNC (''$menu_obnovit'')">◇Mental</a>'
+else
+	$stat_sktool_msg += ' <a href="exec:Enable_show_mental_skill = 0 & FUNC (''$menu_obnovit'')">◆Mental</a>'
 	if pcs_splcstng > 0: gs 'show_table', '<<pcs_splcstng>> Spell Casting', '2'
 	if pcs_humint > 0: gs 'show_table', '<<pcs_humint>> People skills', '2'
 	if pcs_persuas > 0: gs 'show_table', '<<pcs_persuas>> Persuasion', '2'
 	if pcs_observ > 0: gs 'show_table', '<<pcs_observ>> Observation', '2'
-	if st_count > 0 :$stat_msg += ' <a href="exec:Enable_show_mental_skill = 0 & FUNC (''$menu_obnovit'')">Mental Skills:</a> <TABLE BORDER=1><<$show_table>></TR></TABLE>'
 end
 
 !!-----------------Sport skills--------------------------
 if Enable_show_sport_skill = 0:
-	$stat_msg += '<BR> <a href="exec:Enable_show_sport_skill = 1 & FUNC (''$menu_obnovit'')">Sport Skills</a>'
-end
-if Enable_show_sport_skill = 1:
-	st_count=0
-	$show_table=''
+	$stat_sktool_msg += ' <a href="exec:Enable_show_sport_skill = 1 & FUNC (''$menu_obnovit'')">◇Sport</a>'
+else
+	$stat_sktool_msg += ' <a href="exec:Enable_show_sport_skill = 0 & FUNC (''$menu_obnovit'')">◆Sport</a>'
 	if pcs_jab > 0: gs 'show_table', '<<pcs_jab>> Jabs', '2'
 	if pcs_punch > 0: gs 'show_table', '<<pcs_punch>> Power Strikes', '2'
 	if pcs_kick > 0: gs 'show_table', '<<pcs_kick>> Kicks', '2'
@@ -241,45 +266,36 @@ if Enable_show_sport_skill = 1:
 	if pcs_chess > 0: gs 'show_table', '<<pcs_chess>> Chess', '2'
 	if pcs_icesktng > 0: gs 'show_table', '<<pcs_icesktng>> Ice Skating', '2'
 	if pcs_ttgmng > 0: gs 'show_table', '<<pcs_ttgmng>> Gaming', '2'
-	if st_count > 0 :$stat_msg += '<BR> <a href="exec:Enable_show_sport_skill = 0 & FUNC (''$menu_obnovit'')">Sport Skills:</a> <TABLE BORDER=1><<$show_table>></TR></TABLE>'
 end
 
 !!-----------------Beauty/Modelling skills---------------
 if Enable_show_beauty_skill = 0:
-	$stat_msg += '<BR> <a href="exec:Enable_show_beauty_skill = 1 & FUNC (''$menu_obnovit'')">Beauty/Modelling Skills</a>'
-end
-if Enable_show_beauty_skill = 1:
-	st_count=0
-	$show_table=''
+	$stat_sktool_msg += ' <a href="exec:Enable_show_beauty_skill = 1 & FUNC (''$menu_obnovit'')">◇Beauty</a>'
+else
+	$stat_sktool_msg += ' <a href="exec:Enable_show_beauty_skill = 0 & FUNC (''$menu_obnovit'')">◆Beauty</a>'
 	if pcs_makupskl > 0: gs 'show_table', '<<pcs_makupskl>> Makeup Skill', '2'
 	if pcs_danc > 0: gs 'show_table', '<<pcs_danc>> Modern Dancing', '2'
 	if pcs_dancero > 0: gs 'show_table', '<<pcs_dancero>> Erotic Dancing', '2'
 	if pcs_dancpol > 0: gs 'show_table', '<<pcs_dancpol>> Pole Dancing', '2'
 	if pcs_mdlng > 0: gs 'show_table', '<<pcs_mdlng>> Modelling', '2'
-	if st_count > 0 :$stat_msg += '<BR> <a href="exec:Enable_show_beauty_skill = 0 & FUNC (''$menu_obnovit'')">Beauty/Modelling Skills:</a> <TABLE BORDER=1><<$show_table>></TR></TABLE>'
 end
 
 !!---------------------Artistic skills-------------------
 if Enable_show_art_skill = 0:
-	$stat_msg += '<BR> <a href="exec:Enable_show_art_skill = 1 & FUNC (''$menu_obnovit'')">Artistic Skills</a>'
-end
-if Enable_show_art_skill = 1:
-	st_count=0
-	$show_table=''
+	$stat_sktool_msg += ' <a href="exec:Enable_show_art_skill = 1 & FUNC (''$menu_obnovit'')">◇Artistic</a>'
+else
+	$stat_sktool_msg += ' <a href="exec:Enable_show_art_skill = 0 & FUNC (''$menu_obnovit'')">◆Artistic</a>'
 	if pcs_vokal > 0: gs 'show_table', '<<pcs_vokal>> Singing', '2'
 	if pcs_instrmusic > 0: gs 'show_table', '<<pcs_instrmusic>> Instrumental Music', '2'
 	if pcs_photoskl > 0: gs 'show_table', '<<pcs_photoskl>> Photography', '2'
 	if pcs_artskls > 0: gs 'show_table', '<<pcs_artskls>> Artistic Skills', '2'
-	if st_count > 0 :$stat_msg += '<BR> <a href="exec:Enable_show_art_skill = 0 & FUNC (''$menu_obnovit'')">Artistic Skills:</a> <TABLE BORDER=1><<$show_table>></TR></TABLE>'
 end
 
 !!----------------------Job skills------------------------
 if Enable_show_job_skill = 0:
-	$stat_msg += '<BR> <a href="exec:Enable_show_job_skill = 1 & FUNC (''$menu_obnovit'')">Job Skills</a>'
-end
-if Enable_show_job_skill = 1:
-	st_count=0
-	$show_table=''
+	$stat_sktool_msg += ' <a href="exec:Enable_show_job_skill = 1 & FUNC (''$menu_obnovit'')">◇Job</a>'
+else
+	$stat_sktool_msg += ' <a href="exec:Enable_show_job_skill = 0 & FUNC (''$menu_obnovit'')">◆Job</a>'
 	if pcs_compskl > 0: gs 'show_table', '<<pcs_compskl>> Computer Skill', '2'
 	if pcs_comphckng > 0: gs 'show_table', '<<pcs_comphckng>> Hacking', '2'
 	if pcs_hndiwrk > 0: gs 'show_table', '<<pcs_hndiwrk>> Handy-work', '2'
@@ -287,13 +303,33 @@ if Enable_show_job_skill = 1:
 	if pcs_servng > 0: gs 'show_table', '<<pcs_servng>> Serving', '2'
 	if pcs_medcn > 0: gs 'show_table', '<<pcs_medcn>> Medicine', '2'
 	if workPTU > 1: gs 'show_table','<<teachlevel>> Teacher credibility','2'
-	if st_count > 0 :$stat_msg += '<BR> <a href="exec:Enable_show_job_skill = 0 & FUNC (''$menu_obnovit'')">Job Skills:</a> <TABLE BORDER=1><<$show_table>></TR></TABLE>'
 end
 
-if Enable_showrelation = 0:
-	$stat_msg += '<BR> <a href="exec:Enable_showrelation = 1 & FUNC (''$menu_obnovit'')">Relations</a>'
+!!----------------------▲Skills display------------------------
+
+if Enable_showskill = 0:
+	$stat_tool_msg += ' <a href="exec:Enable_showskill = 1 & FUNC (''$menu_obnovit'')">▽Skills</a>'
+else
+	$stat_tool_msg += ' <a href="exec:Enable_showskill = 0 & FUNC (''$menu_obnovit'')">▲Skills</a>'
+	!skip if this is first message
+	if $stat_extra_msg ! null: 
+		$stat_extra_msg += '<br><a href="exec:Enable_showskill = 0 & FUNC (''$menu_obnovit'')">▲Skills:</a> <<$stat_sktool_msg>>'
+	else
+		$stat_extra_msg += '<br><<$stat_sktool_msg>>'
+	end
+	if st_count > 0 :
+		$stat_extra_msg += '<BR><TABLE BORDER=1><<$show_table>></TR></TABLE>'
+	end	
 end
-if Enable_showrelation = 1:
+
+killvar 'stat_sktool_msg'
+killvar 'stat_skextra_msg'
+
+!!----------------▽relations--------------------------
+if Enable_showrelation = 0:
+	$stat_tool_msg += ' <a href="exec:Enable_showrelation = 1 & FUNC (''$menu_obnovit'')">▽Relations</a>'
+else
+	$stat_tool_msg += ' <a href="exec:Enable_showrelation = 0 & FUNC (''$menu_obnovit'')">▲Relations</a>'
 	st_count=0
 	$show_table=''
 	if npc_QW['A192'] > 0:gs'show_table','Nastja: <<npc_QW[''A192'']>>','2'
@@ -309,7 +345,6 @@ if Enable_showrelation = 1:
 	if Dmitry > 0:gs'show_table','Dima: <<Dmitry>>','2'
 	if afra > 0:gs'show_table','Blacks: <<afra>>','2'
 	if Rex > 0:gs'show_table','Rex: <<Rex>>','2'
-	if Pavlin > 0:gs'show_table','Pavlin: <<Pavlin>>','2'
 	if npc_rel['A69'] > 0:gs'show_table','Mikhail Nikolaevich: <<npc_rel[''A69'']>>','2'
 	if npc_rel['A89'] > 0:gs'show_table','Eugene: <<npc_rel[''A89'']>>','2'
 	if npc_rel['A112'] > 0:gs'show_table','Sergei Shulgin: <<npc_rel[''A112'']>>','2'
@@ -326,34 +361,46 @@ if Enable_showrelation = 1:
 		if npc_rel['A33'] > 0:gs'show_table','Sister: <<npc_rel[''A33'']>>','2'
 		if npc_rel['A34'] > 0:gs'show_table','Brother: <<npc_rel[''A34'']>>','2'
 	end
-	if st_count > 0 :$stat_msg += '<BR> <a href="exec:Enable_showrelation = 0 & FUNC (''$menu_obnovit'')">Relations:</a> <BR><TABLE BORDER=1> <<$show_table>></TR></TABLE>'
+	if st_count > 0 :
+		!skip if this is first message
+		if $stat_extra_msg ! null: $stat_extra_msg += '<BR><a href="exec:Enable_showrelation = 0 & FUNC (''$menu_obnovit'')">▲Relations:</a>'
+		$stat_extra_msg += '<BR><TABLE BORDER=1> <<$show_table>></TR></TABLE>'
+	end
 end
-	$stat_msg += '<BR>'
+
+!all end, push back and clean up
+$stat_msg += '<br><br><<$stat_tool_msg>>'
+if $stat_extra_msg ! NULL : $stat_msg += '<<$stat_extra_msg>>'
+$stat_msg += '<br>'
+killvar 'stat_tool_msg'
+killvar 'stat_extra_msg'
+
+!!----------------Extra messages, End--------------------------
 
 if BuyHous = 2 and ArendHouseSL <= 0:
-	'<font color="red"><b>The rent on your apartment is due today.</b></font>'
+	$stat_msg += '<br><font color="red"><b>The rent on your apartment is due today.</b></font>'
 	if money >= 6000 or stolmoney >= 6000 or money + stolmoney >= 6000 or karta + bankDebtLimit >= 6000:
-		*P ' Renew with '
+		$stat_msg += ' Renew with '
 		if money >= 6000:
-			*P ' <a href="exec:money -= 6000 & housr = 1 & BuyHous = 2 & ArendHouseSL += 30" & FUNC (''$menu_obnovit'')>cash</a>'
+			$stat_msg += ' <a href="exec:money -= 6000 & housr = 1 & BuyHous = 2 & ArendHouseSL += 30" & FUNC (''$menu_obnovit'')>cash</a>'
 		elseif stolmoney >= 6000:
-			*P ' <a href="exec:stolmoney -= 6000 & housr = 1 & BuyHous = 2 & ArendHouseSL += 30" & FUNC (''$menu_obnovit'')>cash from drawer</a>'
+			$stat_msg += ' <a href="exec:stolmoney -= 6000 & housr = 1 & BuyHous = 2 & ArendHouseSL += 30" & FUNC (''$menu_obnovit'')>cash from drawer</a>'
 		elseif money + stolmoney >= 6000:
 			!both < 6000, so money = money - 6000 + stolmoney
-			*P ' <a href="exec:money -= 6000 - stolmoney & stolmoney = 0 & housr = 1 & BuyHous = 2 & ArendHouseSL += 30" & FUNC (''$menu_obnovit'')>cash from purse and drawer</a>'
+			$stat_msg += ' <a href="exec:money -= 6000 - stolmoney & stolmoney = 0 & housr = 1 & BuyHous = 2 & ArendHouseSL += 30" & FUNC (''$menu_obnovit'')>cash from purse and drawer</a>'
 		end
 		!from purse, drawer or both
 		if karta >= 6000: 
-			*P ' <a href="exec:karta -= 6000 & housr = 1 & BuyHous = 2 & ArendHouseSL += 30 & FUNC (''$menu_obnovit'')">bank account</a>'
+			$stat_msg += ' <a href="exec:karta -= 6000 & housr = 1 & BuyHous = 2 & ArendHouseSL += 30 & FUNC (''$menu_obnovit'')">bank account</a>'
 		elseif karta + bankDebtLimit >= 6000: 
-			*P ' <a href="exec:karta -= 6000 & housr = 1 & BuyHous = 2 & ArendHouseSL += 30 & FUNC (''$menu_obnovit'')">bank account, but you will be overdrawn.</a>'
+			$stat_msg += ' <a href="exec:karta -= 6000 & housr = 1 & BuyHous = 2 & ArendHouseSL += 30 & FUNC (''$menu_obnovit'')">bank account, but you will be overdrawn.</a>'
 		end	
 	else
-		*P ' But you can''t afford to pay the rent.'
+		$stat_msg += ' But you can''t afford to pay the rent.'
 	end
 end
 
-if opPRE = 0: $stat_msg += '<BR><<$pcs_makeup>> and your hair is <<$pcs_hairbsh>>.' & $stat_msg += '<BR>'
+if opPRE = 0: $stat_msg += '<BR><<$pcs_makeup>> and your hair is <<$pcs_hairbsh>>.' & !$stat_msg += '<BR>'
 
 if thinkpreg = 0 and knowpreg = 0 and cycle ! 6 and pillcon2 <= 30000 and succubusflag ! 1 and cheatSlut = 0 and mesec = 0:
 	if abortionbirthdate = 0 and daystart - lastmens > 21:
@@ -389,14 +436,11 @@ if mesec > 0:
 	end
 	$stat_msg += '</font>'
 end
-$stat_msg += '<BR><a href="exec:dynamic $d_cycreport_choice"><<$cycreport_txt>></a><br>'
-
-if StoryLine > 0 and SchoolAtestat = 0 and $holyday ! '': $stat_msg += '<BR><<$holyday>>' & $stat_msg += '<BR>'
-if birthday = day and birthmonth = month: $stat_msg += '<BR><b>Today is your birthday.</b>' & $stat_msg += '<BR>'
+if $cycreport_txt ! null: $stat_msg += '<BR><a href="exec:dynamic $d_cycreport_choice"><<$cycreport_txt>></a><br>'
 
 !!if shame > 0:$stat_msg += '<BR><<$shame>>' & $stat_msg += '<BR>'
 
-if $pcs_mood ! '':$stat_msg += '<BR><font color="green"><b><<$pcs_mood>></b></font>' & $stat_msg += '<BR>'
+if $pcs_mood ! '':$stat_msg += '<BR><font color="green"><b><<$pcs_mood>></b></font>'
 
 if mentats_dose >= 1:$stat_msg += '<BR><font color = green>You feel sharp and focused.</font>'
 if bcream_used = 1:$stat_msg += '<BR><font color = #DB7093>Your breasts are feeling hot and tingly.</font>'
@@ -476,7 +520,7 @@ if pcs_sweat < 0 : pcs_sweat = 0
 if pcs_sweat > 69 : pcs_sweat = 69
 jump 'statDswt<<pcs_sweat/10>>'
 :statDswt0
-	if arrsize('sparrvol') = 0 : $stat_msg += '<BR><b><font color="green">You are sparkling clean.</font></b><BR>'
+	if arrsize('sparrvol') = 0 : $stat_msg += '<BR><b><font color="green">You are sparkling clean.</font></b>'
 	jump 'statDswtEnd'
 :statDswt1
 	jump 'statDswtEnd'
@@ -881,12 +925,10 @@ elseif Sifilis >= 21:
 end
 
 if Triper > 2:$stat_msg += '<BR><b><font color="red">From your vagina a white discharge comes out strong and stinging when urinating. Also from your vagina there''s a hard and nasty smell.</font></b>'
-if TriperOral > 2 and TriperOralSigns = 1:$stat_msg += '<BR><b><font color="red">Your throat is sore and covered with white spots.</font></b>'
 if Kandidoz > 30:$stat_msg += '<BR><b><font color="red">You have thrush.</font></b>'
 if SLomka > 0:$stat_msg += '<BR><b><font color="red">You are very weak and hurt to the bone. You''re in withdrawal.</font></b>'
 if narkday ! daystart and narkoman = 1:$stat_msg += '<BR><b><font color="red">You are very weak and hurt to the bone. Urgently need pale lady.</font></b>'
 if fingal > 0:$stat_msg += '<BR><b><font color="red">You have a black eye.</font></b>'
-if recuperation = 1:$stat_msg += '<BR><b><font color="red">You are recovering from a medical surgery</font></b>'
 
 ! WD: Bimbo look
 if bimbolevel > 0: $stat_msg += '<BR><<$bimbostatus>>'
@@ -916,7 +958,7 @@ elseif tanga = 0:
 		$stat_msg += '<BR><b><font color = #FF00FF>You are completely naked. It''s exciting and you feel tingly inside.</font></b>'
 	end
 end
-$stat_msg += '<BR>'
+!$stat_msg += '<BR>'
 
 if mosol >= 50:
 	$stat_msg += '<BR><b><font color="red">Your pussy hurts and each step causes more pain, it''s crimson and visibly scuffed from walking without underwear.</font></b>'
@@ -926,7 +968,7 @@ end
 
 if analplugIN = 1:$stat_msg += '<BR><b><font color="red">You have a butt plug inserted in your ass.</font></b>'
 if vibratorin = 1:$stat_msg += '<BR><b><font color="red">You have a vibrator inserted in your vagina.</font></b>'
-$stat_msg += '<BR>'
+!$stat_msg += '<BR>'
 if young_shop_work = 1:
 	if hour = 15 and minut <= 5 and week < 6 and inWorkYoungShop = 0:
 		'You are late for work at Pussy-Cats.'
@@ -1101,10 +1143,9 @@ $stat_msg += '<br><a href="exec:savegame ''quicksave.sav'' && pl''Quicksave Done
 
 $stat_android +=  ' <a href="exec:savegame ''quicksave.sav'' && pl''Quicksave Done''">Q.S</a>  <a href="exec:if input(''Input Anything to confirm Quick Load'') ! null: opengame ''quicksave.sav''">Q.L</a>'
 
-if Enable_statfsize > 0: $stat_msg += '<BR></font>' & !disable this, all texts comes from pl will have the same font size, like[time]
+if Enable_statfsize > 0: $stat_msg += '</font>' & !disable this, all texts comes from pl will have the same font size, like[time]
 if Enable_faceturn = 1:	view FUNC('$face_image')
 if Enable_Android = 0:
-        pl '<<$weatherImage>>'
 	pl '<<$stat_msg>>'
 else
 	'<<$stat_android>>'

+ 1 - 1
locations/telefon

@@ -1156,7 +1156,7 @@ if $ARGS[0] = 'Phone_menu':
 	pl'<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
 	pl'<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
 	pl'<center><a href="exec:gs ''telefon'', ''Phone_camera'' "><img src="images/system/icon/icon_camera.png"></a><a href="exec:gs ''telefon'', ''Phone_calendar'' "><img src="images/system/icon/icon_calendar.png"></a><a href="exec:gs ''telefon'', ''Phone_pictures'' "><img src="images/system/icon/icon_pictures.png"></a></center>'
-	pl'<center><a href="exec:gs ''telefon'', ''Phone_noactive'' "><img src="images/system/icon/icon_music.png"></a><a href="exec:gs ''Cheatmenu_din'' & dynamic $cheatmenu[main]"><img src="images/system/icon/icon_settings.png"></a><a href="exec:gs ''telefon'', ''Phone_wheather'' "><img src="images/system/icon/icon_weather.png"></a></center>'
+	pl'<center><a href="exec:gs ''telefon'', ''Phone_noactive'' "><img src="images/system/icon/icon_music.png"></a><a href="exec:gs ''Cheatmenu_din'' & Enable_settingmode = 1 & dynamic $cheatmenu[''display'']"><img src="images/system/icon/icon_settings.png"></a><a href="exec:gs ''telefon'', ''Phone_wheather'' "><img src="images/system/icon/icon_weather.png"></a></center>'
 	pl'<center><a href="exec:gs ''telefon'', ''Phone_contactlist'' "><img src="images/system/icon/icon_call.png"></a><a href="exec:gs ''telefon'', ''Phone_noactive'' "><img src="images/system/icon/icon_sms.png"></a><a href="exec:gs ''telefon'', ''Phone_megafon'' "><img src="images/system/icon/icon_megafon.png"></a></center>'
 	pl'<center><a href="exec:gs ''telefon'', ''Phone_notebook'' "><img src="images/system/icon/icon_notebook.png"></a></center>'
 	pl'<center><a href="exec:gs''stat''"><img src="images/system/icon/back.png"></a></center>'