0
0
فهرست منبع

Merge branch 'master' of Ethan99/glife into master

[added] create tabs common function [tabhead] auto calculate tab width and Code simplification for begin UI
Kevin_Smarts 1 سال پیش
والد
کامیت
974c731e00
6فایلهای تغییر یافته به همراه191 افزوده شده و 186 حذف شده
  1. 4 3
      glife.qproj
  2. 33 33
      locations/Cheatmenu_din.qsrc
  3. 29 75
      locations/begin.qsrc
  4. 90 63
      locations/obj_din.qsrc
  5. 13 12
      locations/sleep.qsrc
  6. 22 0
      locations/tabhead.qsrc

+ 4 - 3
glife.qproj

@@ -53,6 +53,7 @@
 		<Location name="homes_properties_attr"/>
 	</Folder>
 	<Folder name="Functions">
+		<Location name="tabhead"/>
 		<Location name="indik"/>
 		<Location name="indiktab"/>
 		<Location name="shortgs"/>
@@ -553,7 +554,7 @@
 		<Location name="anushapt"/>
 		<Location name="anush_bedroom"/>
 		<Location name="anush_bedroom_city"/>
-		<Location name="anushaptbr"/> 
+		<Location name="anushaptbr"/>
 		<Location name="anushkachat"/>
 		<Location name="anushkachat_city"/>
 		<Location name="anushkamaksim"/>
@@ -848,7 +849,7 @@
 		<Location name="music_bedroompractice"/>
 		<Location name="music_onlinemusic"/>
  		<Location name="music_gigstarts"/>
-   		<Location name="music_guitarlesson"/>   
+   		<Location name="music_guitarlesson"/>
    		<Location name="music_buskingevents"/>
 		<Location name="music_delparco"/>
 		<Location name="music_checks"/>
@@ -982,7 +983,7 @@
 		<Location name="cfnm"/>
 		<Location name="stwork"/>
 		<Location name="stwork2"/>
-		<Location name="hookahlounge"/>	
+		<Location name="hookahlounge"/>
 	</Folder>
 	<Folder name="City_Island">
 		<Location name="city_island"/>

+ 33 - 33
locations/Cheatmenu_din.qsrc

@@ -606,9 +606,9 @@ $cheatmenu['permanent'] = {
 	else
 		'Allow any clothing for school: <a href="exec:Enable_sforma = 1 & dynamic $cheatmenu[''permanent'']">Currently OFF</a>'
 	end
-	
+
 	*nl
-	
+
 	'Random boyfriend/girlfriend events: <a href="exec:dynamic $cheatmenu[''random_bf_gf'']"><<$random_bf_gf_cheat>></a>'
 	'Random robbers in the streets: <a href="exec:dynamic $cheatmenu[''street_robbers'']"><<$cheat_street_robbers>></a>'
 	'Random rapists in the streets: <a href="exec:dynamic $cheatmenu[''street_rapists'']"><<$cheat_street_rapists>></a>'
@@ -633,7 +633,7 @@ $cheatmenu['permanent'] = {
 
 	'Who says bimbos can''t be smart? Smart bimbo mode: <a href="exec:dynamic $cheatmenu[''SmartBimbo'']"><<$cheatBimbo2>></a>'
 	'Succubus bimbo mode: <a href="exec:dynamic $cheatmenu[''SuccuBimbo'']"><<$cheatBimbo3>></a>'
-	
+
 	*nl
 
 	'Set arousal to always be at 50 or more: <a href="exec:dynamic $cheatmenu[''cheatHorny'']"><<$cheatHorny>></a>'
@@ -733,7 +733,7 @@ $cheatmenu['state'] = {
 				'Cap Lactate Rate: <a href="exec:lactation[''caplactaterate''] -= 24 & dynamic $cheatmenu[''state'']">-24h</a> <<lactation[''caplactaterate'']>>h'
 			else
 				'Cap Lactate Rate: <a href="exec:lactation[''caplactaterate''] -= 24 & dynamic $cheatmenu[''state'']">-24h</a> <<lactation[''caplactaterate'']>>h <a href="exec:lactation[''caplactaterate''] += 24 & dynamic $cheatmenu[''state'']">+24h</a>'
-			end	
+			end
 			'<font color="grey">Cap lactate rate makes lactate rate stop growing if <<$pcs_firstname>> needs milking more often.</font>'
 		end
 		'Milk in Breasts: <<lactation[''breastmv'']/1000>>ml'
@@ -1976,7 +1976,7 @@ $cheatmenu['force_preg'] = {
 $cheatmenu['remove_preg'] = {
 	gs 'medical_din', 'remove_preg'
 	knowpregloss = 2
-	
+
 	if FertEgg > 0: FertEgg = 0
 }
 
@@ -2722,7 +2722,7 @@ $cheatmenu['fame'] = {
 	$table['fame'] += '<td><<fame[''pushkin_media'']>>   <a href="exec:gs ''fame'', ''pushkin'', ''media'', 10 & dynamic $cheatmenu[''fame'']">+10</a> <a href="exec:gs ''fame'', ''pushkin'', ''media'', 100 & dynamic $cheatmenu[''fame'']">+100</a> <a href="exec:gs ''fame'', ''pushkin'', ''media'', -10 & dynamic $cheatmenu[''fame'']">-10</a> <a href="exec:gs ''fame'', ''pushkin'', ''media'', -100 & dynamic $cheatmenu[''fame'']">-100</a> </td>'
 	$table['fame'] += '<td><<fame[''village_media'']>>   <a href="exec:gs ''fame'', ''village'', ''media'', 10 & dynamic $cheatmenu[''fame'']">+10</a> <a href="exec:gs ''fame'', ''village'', ''media'', 100 & dynamic $cheatmenu[''fame'']">+100</a> <a href="exec:gs ''fame'', ''village'', ''media'', -10 & dynamic $cheatmenu[''fame'']">-10</a> <a href="exec:gs ''fame'', ''village'', ''media'', -100 & dynamic $cheatmenu[''fame'']">-100</a> </td>'
 	$table['fame'] += '</table></center>'
-	
+
 	$table['fame']
 
 }
@@ -2816,7 +2816,7 @@ $cheatmenu['vartracker'] = {
 	'children: <<kid>>'
 	!! BabyEmbryo is for how many unborn babies inside PC.
 	'fetus number: <<BabyEmbryo>>'
-	!! preg is your pregnancy state. 0 is not pregnant, 1 is pregnant in general, 2 is in labor. 
+	!! preg is your pregnancy state. 0 is not pregnant, 1 is pregnant in general, 2 is in labor.
 	'pregnancy state: <<preg>>'
 	!! thinkpreg is if svetka thinks she is pregnant
 	'thinkpreg: <<thinkpreg>>'
@@ -2824,9 +2824,9 @@ $cheatmenu['vartracker'] = {
 	'knowpreg: <<knowpreg>>'
 	!! knowpregrecover is for Svetlanas knowledge that she just gave birth.
 	'knowpregrecover: <<knowpregrecover>>'
-	!! knowpregloss is for Svetlanas knowledge that she lost a baby. 1 is for an abortion, 2 is for a miscarrage. 
+	!! knowpregloss is for Svetlanas knowledge that she lost a baby. 1 is for an abortion, 2 is for a miscarrage.
 	'knowpregloss: <<knowpregloss>>'
-	!! cycle is Svetlanas current fertility cycle. 5 is pregnant, 4 is recovering, 3 is luteal, 2 is ovulation, 1 is foccular, 0 is menstration. 
+	!! cycle is Svetlanas current fertility cycle. 5 is pregnant, 4 is recovering, 3 is luteal, 2 is ovulation, 1 is foccular, 0 is menstration.
 	'cycle: <<cycle>>'
 	!! menoage is the age Svetlana will be when she goes through menopause.
 	'menoage: <<menoage>>'
@@ -2838,7 +2838,7 @@ $cheatmenu['vartracker'] = {
 	'FocH: <<FocH>>'
 	!! EggRH is for the level of egg release that Svetlana has for her ovulation event. 150 generates a single egg, higher amounts might release more.
 	'EggRH: <<EggRH>>'
-	!! Ovulate is the amount of hours remaining in Svetlanas ovulation period of her current fertility cycle. 
+	!! Ovulate is the amount of hours remaining in Svetlanas ovulation period of her current fertility cycle.
 	'Ovulate: <<Ovulate>>'
 	!! UnfertEgg is how many unfertilized eggs Svetlana has in her for fertilization during her Ovulation period. Unfertilized eggs are removed at the end of her Ovulation period.
 	'UnfertEgg: <<UnfertEgg>>'
@@ -2854,11 +2854,11 @@ $cheatmenu['vartracker'] = {
 		killvar 'i'
 		killvar 'imax'
 	end
-	!! BabyEmbryo is for implanted babies. These are solid pregnancies. 
+	!! BabyEmbryo is for implanted babies. These are solid pregnancies.
 	'Implanted Embryos: <<BabyEmbryo>>'
 	!! ferteggage is for the time since the ovulation event. They last 330 hours before they die if not implanted.
 	'ferteggage: <<ferteggage>>'
-	!! PregChem is the level of pregnancy, measured in hour parts. 
+	!! PregChem is the level of pregnancy, measured in hour parts.
 	'PregChem: <<PregChem>>'
 	!! pillcon is the level of birth control to prevent svetlana from getting pregnant. Higher concentrations increase effectivity until it reaches it''s ideal level.
 	'pillcon: <<pillcon>>'
@@ -3254,7 +3254,7 @@ $cheatmenu['items'] = {
 	if showPharmacyItems = 0:
 		'<a href = "exec: showPharmacyItems = 1 & dynamic $cheatmenu[''items'']">Show Details </a>'
 	end
-	
+
 	if showPharmacyItems = 1:
 		'<a href = "exec: showPharmacyItems = 0 & dynamic $cheatmenu[''items'']">Hide Details </a>'
 		*pl 'Morning after pill: <a href="exec:morning_after_pill=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<morning_after_pill>> </b></a>'
@@ -3283,12 +3283,12 @@ $cheatmenu['items'] = {
 		end
 		if breastpump = 1:
 			*pl 'Breast pump: <a href="exec:breastpump = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
-		end		
+		end
 
 		*pl 'Breastmilk bottle S: <a href="exec:bpbottles=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<bpbottles>> </b></a>'
 		*pl 'Breastmilk bottle M: <a href="exec:bpbottlem=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<bpbottlem>> </b></a>'
 	end
-	
+
 	'<h4>Food items</h4>'
 	if showFoodItems = 0:
 		'<a href = "exec: showFoodItems = 1 & dynamic $cheatmenu[''items'']">Show Details </a>'
@@ -3313,14 +3313,14 @@ $cheatmenu['items'] = {
 			end
 			if buterbrod = 1:
 				*pl 'Sandwich: <a href="exec:buterbrod = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
-			end	
+			end
 
 			if wine = 0:
 				*pl 'Cheap Bottle of wine: <a href="exec:wine = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 			end
 			if wine = 1:
 				*pl 'Cheap Bottle of wine: <a href="exec:wine = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
-			end	
+			end
 		end
 	end
 
@@ -3349,40 +3349,40 @@ $cheatmenu['items'] = {
 			*pl 'Wipes: <a href="exec:salfetka=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<salfetka>> </b></a>'
 			*pl 'Portable makeup: <a href="exec:kosmetitka=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<kosmetitka>> </b></a>'
 			*pl 'Mouthwash: <a href="exec:mouthwash=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mouthwash>> </b></a>'
-			
+
 			if greben = 0:
 				*pl 'Comb: <a href="exec:greben = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 			end
 			if greben = 1:
 				*pl 'Comb: <a href="exec:greben = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
-			end	
+			end
 
 			if compact_mirror = 0:
 				*pl 'Compact mirror: <a href="exec:compact_mirror = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 			end
 			if compact_mirror = 1:
 				*pl 'Compact mirror: <a href="exec:compact_mirror = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
-			end	
+			end
 		end
 	end
 
 	'<h4>Hardware items</h4>'
 	if showHardwareItems = 0:
 		'<a href = "exec: showHardwareItems = 1 & dynamic $cheatmenu[''items'']">Show Details </a>'
-	end 
+	end
 	if showHardwareItems = 1:
 		'<a href = "exec: showHardwareItems = 0 & dynamic $cheatmenu[''items'']">Hide Details </a>'
 		*pl 'Dishwashing detergent: <a href="exec:fairy=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<fairy>> </b></a>'
 		*pl 'Clothing detergent: <a href="exec:poroshok=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<poroshok>> </b></a>'
 		*pl 'Plates: <a href="exec:cltarelka=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<cltarelka>> </b></a>'
 		*pl 'Fabric: <a href="exec:tkan=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<tkan>> </b></a>'
-	
+
 		if sewing_kit = 0:
 			*pl 'Sewing kit: <a href="exec:sewing_kit = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 		end
 		if sewing_kit = 1:
 			*pl 'Sewing kit: <a href="exec:sewing_kit = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
-		end	
+		end
 
 		if bag = 1:
 			if umbrella = 0:
@@ -3390,7 +3390,7 @@ $cheatmenu['items'] = {
 			end
 			if umbrella = 1:
 				*pl 'Umbrella: <a href="exec:umbrella = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
-			end	
+			end
 		end
 	end
 
@@ -3421,30 +3421,30 @@ $cheatmenu['items'] = {
 		end
 		if pornMagazine = 1:
 			*pl 'Porn magazine: <a href="exec:pornMagazine = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
-		end	
+		end
 
 		if vibrator = 0:
 			*pl 'Vibrator: <a href="exec:vibrator = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 		end
 		if vibrator = 1:
 			*pl 'Vibrator: <a href="exec:vibrator = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
-		end	
+		end
 
 		if analplug = 0:
 			*pl 'Butt plug: <a href="exec:analplug = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 		end
 		if analplug = 1:
 			*pl 'Butt plug: <a href="exec:analplug = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
-		end	
+		end
+
+		*pl '15cm suction dildo: <a href="exec:suction_dildo=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<suction_dildo>> </b></a>'
 
-		*pl '15cm suction dildo: <a href="exec:suction_dildo=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<suction_dildo>> </b></a>'	
-	
 		if strapon = 0:
 			*pl 'Strap-on harness: <a href="exec:strapon = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 		end
 		if strapon = 1:
 			*pl 'Strap-on harness: <a href="exec:strapon = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
-		end	
+		end
 
 		if dildo = 0:
 			*pl '10cm dildo: <a href="exec:dildo = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
@@ -3458,14 +3458,14 @@ $cheatmenu['items'] = {
 		end
 		if middildo = 1:
 			*pl '15cm dildo: <a href="exec:middildo = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
-		end	
+		end
 
 		if largedildo = 0:
 			*pl '20cm dildo: <a href="exec:largedildo = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
 		end
 		if largedildo = 1:
 			*pl '20cm dildo: <a href="exec:largedildo = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
-		end	
+		end
 
 		if bigdildo = 0:
 			*pl '25cm dildo: <a href="exec:bigdildo = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'
@@ -3479,7 +3479,7 @@ $cheatmenu['items'] = {
 		end
 		if extradildo = 1:
 			*pl '30cm dildo: <a href="exec:extradildo = 0 & dynamic $cheatmenu[''items'']"><b>owned</b></a>'
-		end	
+		end
 
 		if superdildo = 0:
 			*pl '35cm dildo: <a href="exec:superdildo = 1 & dynamic $cheatmenu[''items'']"><b>none</b></a>'

+ 29 - 75
locations/begin.qsrc

@@ -8,7 +8,13 @@ if $ARGS[0] = 'start':
 	timer = 6
 	timerM = 30
 	settingmode = 0
-
+	$checkimg = {
+		if $ARGS[0]=$ARGS[1]:
+			$result = '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD>'
+		else
+			$result = '<TD><center><a href="exec:$start_type = ''<<$ARGS[1]>>'' & gt ''begin'',''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
+		end
+	}
 	gs 'Cheatmenu_din'
 	showstat 1
 	'<center><b><font color="maroon">CHOOSE GAME START</font></b></center>'
@@ -27,90 +33,36 @@ if $ARGS[0] = 'start':
 	*nl
 	*nl
 
-	'<center><table><TH>Start Type</TH><TH>Standard</TH><TH>Magical</TH><TH>M2F</TH><TR>'
-
-	$start_text = '<TD>School</TD>'
-
-	if $start_type = 'sg':
-		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD>'
-	else
-		$start_text += '<TD><center><a href="exec:$start_type = ''sg'' & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
-	end
-
-	if $start_type = 'sg_m':
-		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD>'
-	else
-		$start_text += '<TD><center><a href="exec:$start_type = ''sg_m'' & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
-	end
-
-	if $start_type = 'sg_tg':
-		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD><TR>'
-	else
-		$start_text += '<TD><center><a href="exec:$start_type = ''sg_tg'' & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD><TR>'
-	end
-
-	$start_text += '<TD>City</TD>'
-
-	if $start_type = 'city':
-		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD>'
-	else
-		$start_text += '<TD><center><a href="exec:$start_type = ''city'' & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
-	end
+	'<center><table><TH width="100"><p align="center">Start Type</p></TH><TH width="80"><p align="center">Standard</p></TH><TH width="80"><p align="center">Magical</p></TH><TH width="80"><p align="center">M2F</p></TH>'
 
-	if $start_type = 'city_m':
-		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD>'
-	else
-		$start_text += '<TD><center><a href="exec:$start_type = ''city_m'' & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
-	end
+	$start_text = '<TR><TD><p align="center">School</p></TD>'
 
-	if $start_type = 'city_tg':
-		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD><TR>'
-	else
-		$start_text += '<TD><center><a href="exec:$start_type = ''city_tg'' & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD><TR>'
-	end
+	$start_text += $dyneval($checkimg,$start_type,'sg')
+	$start_text += $dyneval($checkimg,$start_type,'sg_m')
+	$start_text += $dyneval($checkimg,$start_type,'sg_tg')
 
-	$start_text += '<TD>University</TD>'
+	$start_text += '<TR><TD><p align="center">City</p></TD>'
 
-	if $start_type = 'uni':
-		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD>'
-	else
-		$start_text += '<TD><center><a href="exec:$start_type = ''uni'' & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
-	end
+	$start_text += $dyneval($checkimg,$start_type,'city')
+	$start_text += $dyneval($checkimg,$start_type,'city_m')
+	$start_text += $dyneval($checkimg,$start_type,'city_tg')
 
-	if $start_type = 'uni_m':
-		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD>'
-	else
-		$start_text += '<TD><center><a href="exec:$start_type = ''uni_m'' & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
-	end
+	$start_text += '<TR><TD><p align="center">University</p></TD>'
 
-	if $start_type = 'uni_tg':
-		$start_text += '<TD><img src="images/system/icons/check.png" height="50"></center></TD>'
-	else
-		$start_text += '<TD><center><a href="exec:$start_type = ''uni_tg'' & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
-	end
+	$start_text += $dyneval($checkimg,$start_type,'uni')
+	$start_text += $dyneval($checkimg,$start_type,'uni_m')
+	$start_text += $dyneval($checkimg,$start_type,'uni_tg')
 
 	$start_text
 
 	'</table></center>'
-	
+
 	if $start_type = 'sg' or $start_type = 'sg_m':
 		act '<center><b>Start</b></center>': gt 'intro_sg', 'start'
-	elseif $start_type = 'sg_tg':
-		act '<center><b>Start</b></center>': gt 'intro_sg_tg', 'start'
-	elseif $start_type = 'city':
-		act '<center><b>Start</b></center>': gt 'intro_city', 'start'
-	elseif $start_type = 'city_m':
-		act '<center><b>Start</b></center>': gt 'intro_city_m', 'start'
-	elseif $start_type = 'city_tg':
-		act '<center><b>Start</b></center>': gt 'intro_city_tg', 'start'
-	elseif $start_type = 'uni':
-		act '<center><b>Start</b></center>': gt 'intro_uni', 'start'
-	elseif $start_type = 'uni_m':
-		act '<center><b>Start</b></center>': gt 'intro_uni_m', 'start'
-	elseif $start_type = 'uni_tg':
-		act '<center><b>Start</b></center>': gt 'intro_uni_tg', 'start'
+	elseif $start_type ! '':
+		act '<center><b>Start</b></center>': gt 'intro_'+$start_type, 'start'
 	end
-	
+
 	act '<center><b>Change game settings</b></center>': settingmode = 1 & gs '$menu_setting'
 end
 
@@ -123,15 +75,15 @@ if $ARGS[0] = 'warning':
 	*nl
 	*nl
 	'<center><img <<$set_imgh>> src="images/system/1_openings/warning.jpg" ></center>'
-	
+
 	act '<center><b>Continue</b></center>': gt 'begin','real_character'
 end
-	
+
 if $ARGS[0] = 'real_character':
 	$BACKIMAGE = ''
 	cls
 	'<center><b><font color = maroon>CHARACTER SELECTION</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/character_creation_1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/character_creation_1.jpg"></center><center>'
 	*nl
 	'This game has two ways to display your character''s face, either dynamically depending on your hair style and colour or a fixed image of your choice.'
 	'To use a fixed image, replace the image "avatar" in the "images" folder of the game with a file of the same name and format (.jpg) and select "Use a fixed image".'
@@ -146,6 +98,8 @@ if $ARGS[0] = 'real_character':
 	   *P '<a href="exec:Enable_Android = 1 & gt ''begin'',''real_character''">Here</a> (Current: <B>No</B>)'
 	end
 
+	'</center>'
+
 	act'<center><b>Use the dynamic profile system</b></center>':
 		cls
 		gt 'begin', 'start'

+ 90 - 63
locations/obj_din.qsrc

@@ -9,15 +9,23 @@ if $ARGS[0] = 'chartabs':
 	!5: Traits
 	!6: Renown
 	!7: Magic
-	'<center><b><table width="90%" cellspacing="0" cellpadding="0" valign="top"><tr>'
-	if menu_page = 0:'<th>Character</th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''skills''">Skills</a></th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''stats''">Statistics</a></th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''pain''">Pain</a></th><th><a href="exec:menu_page = 4 & gs ''traits'', ''menu''">Traits</a></th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''reputation''">Renown</a></th>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 6 & gs ''obj_din'', ''magic''">Magic</a></th>')+''
-	if menu_page = 1:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''description''">Character</a></th><th>Skills</th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''stats''">Statistics</a></th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''pain''">Pain</a></th><th><a href="exec:menu_page = 4 & gs ''traits'', ''menu''">Traits</a></th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''reputation''">Renown</a></th>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 6 & gs ''obj_din'', ''magic''">Magic</a></th>')+''
-	if menu_page = 2:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''description''">Character</a></th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''skills''">Skills</a></th><th>Statistics</th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''pain''">Pain</a></th><th><a href="exec:menu_page = 4 & gs ''traits'', ''menu''">Traits</a></th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''reputation''">Renown</a></th>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 6 & gs ''obj_din'', ''magic''">Magic</a></th>')+''
-	if menu_page = 3:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''description''">Character</a></th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''skills''">Skills</a></th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''stats''">Statistics</a></th><th>Pain</th><th><a href="exec:menu_page = 4 & gs ''traits'', ''menu''">Traits</a></th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''reputation''">Renown</a></th>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 6 & gs ''obj_din'', ''magic''">Magic</a></th>')+''
-	if menu_page = 4:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''description''">Character</a></th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''skills''">Skills</a></th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''stats''">Statistics</a></th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''pain''">Pain</a></th><th>Traits</th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''reputation''">Renown</a></th>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 6 & gs ''obj_din'', ''magic''">Magic</a></th>')+''
-	if menu_page = 5:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''description''">Character</a></th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''skills''">Skills</a></th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''stats''">Statistics</a></th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''pain''">Pain</a></th><th><a href="exec:menu_page = 4 & gs ''traits'', ''menu''">Traits</a></th><th>Renown</th>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 6 & gs ''obj_din'', ''magic''">Magic</a></th>')+''
-	if menu_page = 6:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''description''">Character</a></th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''skills''">Skills</a></th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''stats''">Statistics</a></th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''pain''">Pain</a></th><th><a href="exec:menu_page = 4 & gs ''traits'', ''menu''">Traits</a></th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''reputation''">Renown</a></th>'+iif($start_type[1] = 'nomagic','','<th>Magic</th>')+''
-	'</tr></table></b></center>'
+	$tabsname[] = 'Character'
+	$tabsaction[] = 'menu_page = 0 & gs ''obj_din'', ''description'''
+	$tabsname[] = 'Skills'
+	$tabsaction[] = 'menu_page = 1 & gs ''obj_din'', ''skills'''
+	$tabsname[] = 'Statistics'
+	$tabsaction[] = 'menu_page = 2 & gs ''obj_din'', ''stats'''
+	$tabsname[] = 'Pain'
+	$tabsaction[] = 'menu_page = 3 & gs ''obj_din'', ''bra'''
+	$tabsname[] = 'Traits'
+	$tabsaction[] = 'menu_page = 4 & gs ''traits'', ''menu'''
+	$tabsname[] = 'Renown'
+	$tabsaction[] = 'menu_page = 5 & gs ''obj_din'', ''reputation'''
+	if $start_type[1] ! 'nomagic':
+		$tabsname[] = 'Magic'
+		$tabsaction[] = 'menu_page = 6 & gs ''obj_din'', ''magic'''
+	end
+	gs 'tabhead',menu_page
 	act 'Exit the menu': killvar 'menu_page' & gt 'obj_din', 'menu_exit'
 end
 
@@ -31,16 +39,23 @@ if $ARGS[0] = 'bodytabs':
 	!5: Shoes
 	!6: Tattoos
 	!7: Magic
-	'<center><b><table width="90%" cellspacing="0" cellpadding="0" valign="top"><tr>'
-	if menu_page = 0:'<th>Looks</th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''body''">Body</a></th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''clothes''">Clothes</a></th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''bra''">Bra</a></th><th><a href="exec:menu_page = 4 & gs ''obj_din'', ''panties''">Panties</a></th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''shoes''">Shoes</a></th><th><a href="exec:menu_page = 6 & gs ''obj_din'', ''tattoos''">Tattoos</a></th><th><a href="exec:menu_page = 7 & gs ''obj_din'', ''piercing''">Piercings</a></th>'
-	if menu_page = 1:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''face''">Looks</a></th><th>Body</th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''clothes''">Clothes</a></th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''bra''">Bra</a></th><th><a href="exec:menu_page = 4 & gs ''obj_din'', ''panties''">Panties</a></th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''shoes''">Shoes</a></th><th><a href="exec:menu_page = 6 & gs ''obj_din'', ''tattoos''">Tattoos</a></th><th><a href="exec:menu_page = 7 & gs ''obj_din'', ''piercing''">Piercings</a></th>'
-	if menu_page = 2:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''face''">Looks</a></th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''body''">Body</a></th><th>Clothes</th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''bra''">Bra</a></th><th><a href="exec:menu_page = 4 & gs ''obj_din'', ''panties''">Panties</a></th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''shoes''">Shoes</a></th><th><a href="exec:menu_page = 6 & gs ''obj_din'', ''tattoos''">Tattoos</a></th><th><a href="exec:menu_page = 7 & gs ''obj_din'', ''piercing''">Piercings</a></th>'
-	if menu_page = 3:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''face''">Looks</a></th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''body''">Body</a></th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''clothes''">Clothes</a></th><th>Bra</th><th><a href="exec:menu_page = 4 & gs ''obj_din'', ''panties''">Panties</a></th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''shoes''">Shoes</a></th><th><a href="exec:menu_page = 6 & gs ''obj_din'', ''tattoos''">Tattoos</a></th><th><a href="exec:menu_page = 7 & gs ''obj_din'', ''piercing''">Piercings</a></th>'
-	if menu_page = 4:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''face''">Looks</a></th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''body''">Body</a></th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''clothes''">Clothes</a></th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''bra''">Bra</a></th><th>Panties</th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''shoes''">Shoes</a></th><th><a href="exec:menu_page = 6 & gs ''obj_din'', ''tattoos''">Tattoos</a></th><th><a href="exec:menu_page = 7 & gs ''obj_din'', ''piercing''">Piercings</a></th>'
-	if menu_page = 5:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''face''">Looks</a></th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''body''">Body</a></th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''clothes''">Clothes</a></th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''bra''">Bra</a></th><th><a href="exec:menu_page = 4 & gs ''obj_din'', ''panties''">Panties</a></th><th>Shoes</th><th><a href="exec:menu_page = 6 & gs ''obj_din'', ''tattoos''">Tattoos</a></th><th><a href="exec:menu_page = 7 & gs ''obj_din'', ''piercing''">Piercings</a></th>'
-	if menu_page = 6:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''face''">Looks</a></th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''body''">Body</a></th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''clothes''">Clothes</a></th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''bra''">Bra</a></th><th><a href="exec:menu_page = 4 & gs ''obj_din'', ''panties''">Panties</a></th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''shoes''">Shoes</a></th><th>Tattoos</th><th><a href="exec:menu_page = 7 & gs ''obj_din'', ''piercing''">Piercings</a></th>'
-	if menu_page = 7:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''face''">Looks</a></th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''body''">Body</a></th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''clothes''">Clothes</a></th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''bra''">Bra</a></th><th><a href="exec:menu_page = 4 & gs ''obj_din'', ''panties''">Panties</a></th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''shoes''">Shoes</a></th><th><a href="exec:menu_page = 6 & gs ''obj_din'', ''tattoos''">Tattoos</a></th><th>Piercings</th>'
-	'</tr></table></b></center>'
+	$tabsname[] = 'Looks'
+	$tabsaction[] = 'menu_page = 0 & gs ''obj_din'', ''face'''
+	$tabsname[] = 'Body'
+	$tabsaction[] = 'menu_page = 1 & gs ''obj_din'', ''body'''
+	$tabsname[] = 'Clothes'
+	$tabsaction[] = 'menu_page = 2 & gs ''obj_din'', ''clothes'''
+	$tabsname[] = 'Bra'
+	$tabsaction[] = 'menu_page = 3 & gs ''obj_din'', ''bra'''
+	$tabsname[] = 'Panties'
+	$tabsaction[] = 'menu_page = 4 & gs ''obj_din'', ''panties'''
+	$tabsname[] = 'Shoes'
+	$tabsaction[] = 'menu_page = 5 & gs ''obj_din'', ''shoes'''
+	$tabsname[] = 'Tattoos'
+	$tabsaction[] = 'menu_page = 6 & gs ''obj_din'', ''tattoos'''
+	$tabsname[] = 'Piercings'
+	$tabsaction[] = 'menu_page = 7 & gs ''obj_din'', ''piercing'''
+	gs 'tabhead',menu_page
 	act 'Exit the menu': killvar 'menu_page' & gt 'obj_din', 'menu_exit'
 end
 
@@ -52,14 +67,26 @@ if $ARGS[0] = 'settingtabs':
 	!3: Phone
 	!4: Mods
 	!5: About
-	'<center><b><table width="90%" cellspacing="0" cellpadding="0" valign="top"><tr>'
-	if menu_page = 0:'<th>Gameplay Settings</th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''display'']">Display Settings</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''status'']">Status Window Settings</a></th>'+iif(settingmode = 1,'','<th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''theme'']">Phone Theme Settings</a></th>')+'<th><a href="exec:menu_page = 4 & gt ''mod_setting''">Mods</a></th>'+'<th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''about'']">About</a></th>'
-	if menu_page = 1:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu[''setting'']">Gameplay Settings</a></th><th>Display Settings</th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''status'']">Status Window Settings</a></th>'+iif(settingmode = 1,'','<th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''theme'']">Phone Theme Settings</a></th>')+'<th><a href="exec:menu_page = 4 & gt ''mod_setting''">Mods</a></th>'+'<th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''about'']">About</a></th>'
-	if menu_page = 2:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu[''setting'']">Gameplay Settings</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''display'']">Display Settings</a></th><th>Status Window Settings</th>'+iif(settingmode = 1,'','<th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''theme'']">Phone Theme Settings</a></th>')+'<th><a href="exec:menu_page = 4 & gt ''mod_setting''">Mods</a></th>'+'<th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''about'']">About</a></th>'
-	if menu_page = 3:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu[''setting'']">Gameplay Settings</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''display'']">Display Settings</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''status'']">Status Window Settings</a></th>'+iif(settingmode = 1,'','<th>Phone Theme Settings</th>')+'<th><a href="exec:menu_page = 4 & gt ''mod_setting''">Mods</a></th>'+'<th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''about'']">About</a></th>'
-	if menu_page = 4:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu[''setting'']">Gameplay Settings</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''display'']">Display Settings</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''status'']">Status Window Settings</a></th>'+iif(settingmode = 1,'','<th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''theme'']">Phone Theme Settings</a></th>')+'<th>Mods</th>'+'<th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''about'']">About</a></th>'
-	if menu_page = 5:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu[''setting'']">Gameplay Settings</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''display'']">Display Settings</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''status'']">Status Window Settings</a></th>'+iif(settingmode = 1,'','<th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''theme'']">Phone Theme Settings</a></th>')+'<th><a href="exec:menu_page = 4 & gt ''mod_setting''">Mods</a></th>'+'<th>About</th>'
-	'</tr></table></b></center>'
+	$tabsname[] = 'Gameplay Settings'
+	$tabsaction[] = 'menu_page = 0 & dynamic $cheatmenu[''setting'']'
+	$tabsname[] = 'Display Settings'
+	$tabsaction[] = 'menu_page = 1 & dynamic $cheatmenu[''display'']'
+	$tabsname[] = 'Status Window Settings'
+	$tabsaction[] = 'menu_page = 2 & dynamic $cheatmenu[''status'']'
+	if settingmode ! 1:
+		$tabsname[] = 'Phone Theme Settings'
+		$tabsaction[] = 'menu_page = 3 & dynamic $cheatmenu[''theme'']'
+		$tabsname[] = 'Mods'
+		$tabsaction[] = 'menu_page = 4 & gt ''mod_setting'''
+		$tabsname[] = 'About'
+		$tabsaction[] = 'menu_page = 5 & dynamic $cheatmenu[''about'']'
+	else
+		$tabsname[] = 'Mods'
+		$tabsaction[] = 'menu_page = 3 & gt ''mod_setting'''
+		$tabsname[] = 'About'
+		$tabsaction[] = 'menu_page = 4 & dynamic $cheatmenu[''about'']'
+	end
+	gs 'tabhead',menu_page
 	if settingmode = 1:
 		act '<center><b>Return to character creation</b></center>':
 			killvar 'menu_page'
@@ -94,7 +121,7 @@ if $ARGS[0] = 'cheattabs':
 	!13: Items
 	!14: fame
 	'<center><b><table width="90%" cellspacing="0" cellpadding="10" align="center" valign="top"><tr>'
-	
+
 	if menu_page = 0:
 		$cheat_tab_list = '<th>Index</th>'
 	else
@@ -164,7 +191,7 @@ if $ARGS[0] = 'cheattabs':
 	else
 		$cheat_tab_list += '<th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th>'
 	end
-	
+
 	if menu_page = 15:
 		$cheat_tab_list += '<th>NPC Finder</th>'
 	else
@@ -360,7 +387,7 @@ if $ARGS[0] = 'current_home':
 	*nl
 	'Your current home is <<$home[''name'']>>.'
 	*nl
-	act 'Return to main description': gt 'obj_din', 'description'	
+	act 'Return to main description': gt 'obj_din', 'description'
 !!This is correct it just looks wrong
 	if func('homes_properties', 'can_live_here', 'city_apartment'): 'Set current home as <a href="exec:gs ''homes_properties'', ''set_home'', ''city_apartment'' & gs ''obj_din'', ''current_home''">City residential apartment</a>'
 	if func('homes_properties', 'can_live_here', 'parents_home'): 'Set current home as <a href="exec:gs ''homes_properties'', ''set_home'', ''parents_home'' & gs ''obj_din'', ''current_home''">Parent''s home in Pavlovsk</a>'
@@ -378,7 +405,7 @@ if $ARGS[0] = 'current_home':
 	if func('homes_properties', 'can_live_here', 'grandparents_house'): 'Set current home as <a href="exec:gs ''homes_properties'', ''set_home'', ''grandparents_house'' & gs ''obj_din'', ''current_home''">Grandparent''s house in Gadukino</a>'
 	if func('homes_properties', 'can_live_here', 'city_house'): 'Set current home as <a href="exec:gs ''homes_properties'', ''set_home'', ''city_house'' & gs ''obj_din'', ''current_home''">My house in the City residential district</a>'
 	if func('homes_properties', 'can_live_here', 'meynold_household'): 'Set current home as <a href="exec:gs ''homes_properties'', ''set_home'', ''meynold_household'' & gs ''obj_din'', ''current_home''">Meynold Houshold</a>'
-	
+
 !!Apostrophe colour correction - KS ''''
 	'</td></tr></table></center>'
 end
@@ -516,7 +543,7 @@ if $ARGS[0] = 'stats':
 
 	if SchoolAtestat = 0 and mid($start_type,1,2) = 'sg':
 		gs 'grades', 'assing_grade_description', 'school'
-	
+
 		gs 'grades', 'grade above', 'school', 90
 		gs 'grades', 'grade above', 'school', 70
 		gs 'grades', 'grade above', 'school', 50
@@ -524,39 +551,39 @@ if $ARGS[0] = 'stats':
 
 		if class['school_grades_above_90'] = 13:
 			'You are getting top marks in all your classes. You are one of the best student in the school, maybe even the best student in school.'
-		elseif class['school_grades_above_90'] > 6 and class['school_grades_above_40'] = 13: 
+		elseif class['school_grades_above_90'] > 6 and class['school_grades_above_40'] = 13:
 			'You are getting top marks in more that half of your classes and not failing any of the others. You are one of the best students in the school.'
-		elseif class['school_grades_above_90'] > 6: 
+		elseif class['school_grades_above_90'] > 6:
 			'You are getting top marks in more that half of your classes and even if you are failing some of the others you are still one of the best students in the school and should have no problem getting into the university if you want.'
-		elseif class['school_grades_above_90'] > 0 and class['school_grades_above_70'] = 13: 
+		elseif class['school_grades_above_90'] > 0 and class['school_grades_above_70'] = 13:
 			'You are only getting top marks in a few of your classes but the rest of you grades are still good. You should have no trouble getting into university if you want.'
-		elseif class['school_grades_above_90'] > 0 and class['school_grades_above_70'] > 10 and class['school_grades_above_40'] =13: 
+		elseif class['school_grades_above_90'] > 0 and class['school_grades_above_70'] > 10 and class['school_grades_above_40'] =13:
 			'You are only getting top marks in a few of your classes but only a few of your grades are bad and you are not failing any classes. You should probably have no trouble getting into university if you want, but improving the bad grades would not be a bad idea.'
-		elseif class['school_grades_above_90'] > 0 and class['school_grades_above_70'] > 10: 
+		elseif class['school_grades_above_90'] > 0 and class['school_grades_above_70'] > 10:
 			'You are only getting top marks in a few of your classes but only a few of your grades are bad and you are failing some classes. If you want to get into university you should probably try to improve the failing and bad grades.'
-		elseif class['school_grades_above_90'] > 0 and class['school_grades_above_40'] > 6: 
+		elseif class['school_grades_above_90'] > 0 and class['school_grades_above_40'] > 6:
 			'You are getting top marks in a few of your classes but failing a lot of classes. If you want to get into university you need to do something about your failing and bad grades.'
-		elseif class['school_grades_above_90'] > 0: 
+		elseif class['school_grades_above_90'] > 0:
 			'Even a top mark or two is not helping when you are failing more than half your classes. It will require a lot of work if you want to go to a university after school.'
-		elseif class['school_grades_above_70'] = 13: 
+		elseif class['school_grades_above_70'] = 13:
 			'You are getting good grades in all of your classes but no excellent grades. You should probably have no trouble getting into university if you want, but getting some of those excellent marks will not hurt.'
-		elseif class['school_grades_above_70'] > 6 and class['school_grades_above_40'] =13: 
+		elseif class['school_grades_above_70'] > 6 and class['school_grades_above_40'] =13:
 			'You are getting good grades in over half of your classes but no excellent grades, at least you are not failing any classes. If you want to get into university it would not hurt to improve some of the bad grades.'
-		elseif class['school_grades_above_70'] > 6 and class['school_grades_above_40'] >10: 
+		elseif class['school_grades_above_70'] > 6 and class['school_grades_above_40'] >10:
 			'You are getting good grades in over half of your classes but no excellent grades and you are failing a few classes. If you want to get into university you need to improve some of the bad grades.'
-		elseif class['school_grades_above_70'] > 0 and class['school_grades_above_40'] = 13: 
+		elseif class['school_grades_above_70'] > 0 and class['school_grades_above_40'] = 13:
 			'You are getting good grades in a few of your classes and no excellent grades. At least you are not failing any classes. If you want to get into university you need to improve some of the bad grades.'
-		elseif class['school_grades_above_70'] > 0 and class['school_grades_above_40'] >10: 
+		elseif class['school_grades_above_70'] > 0 and class['school_grades_above_40'] >10:
 			'You are getting good grades in a few of your classes but no excellent grades and you are failing a few classes. If you want to get into university you need to improve some of the bad grades.'
-		elseif class['school_grades_above_70'] > 0 and class['school_grades_above_40'] >6: 
+		elseif class['school_grades_above_70'] > 0 and class['school_grades_above_40'] >6:
 			'You are getting good grades in a few of your classes but no excellent grades and you are failing a lot of classes. If you want to get into university you really need to improve your grade in some of your classes you are failing.'
-		elseif class['school_grades_above_70'] > 0: 
+		elseif class['school_grades_above_70'] > 0:
 			'A good grade or two is not not enough when you are failing more than half your classes. It will require a lot of work to turn this one around.'
-		elseif class['school_grades_above_40'] = 13: 
+		elseif class['school_grades_above_40'] = 13:
 			'You are not getting any good grades, but at least you are not failing any. It will require a lot of work if you want to go to a university after school.'
-		elseif class['school_grades_above_40']  > 10: 
+		elseif class['school_grades_above_40']  > 10:
 			'With you general bad grades failing a few as you do puts you in danger of not graduation high school.'
-		elseif class['school_grades_above_40']  > 6: 
+		elseif class['school_grades_above_40']  > 6:
 			'With failing a lot of classes and barely passing the rest you will not graduate high school unless you can get your grades up before graduation.'
 		else
 			'You are failing high school, you need to do something about this right now, if you want to graduate.'
@@ -656,7 +683,7 @@ if $ARGS[0] = 'stats':
 	end
 	if workPTU > 1: 'Reputation as a teacher <<teachlevel>>'
 	*nl
-	
+
 	'<center><b>Sports Career</b></center>'
 	if KikWinPro > 0 or KikLossPro > 0 or KikDrawPro > 0:
 		'Professional Kickboxing Record:Win (Victory KO) - Loss (Defeat KO) - Draw'
@@ -714,7 +741,7 @@ if $ARGS[0] = 'stats':
 	*nl
 	!!!
 	'<center><b>Job Statistics</b></center>'
-	
+
 	if model['status'] = 1:
 		if modelfoto['shoots'] > 0:
 			'<b>Modelling</b>'
@@ -730,7 +757,7 @@ if $ARGS[0] = 'stats':
 			*nl
 			if modelfoto['catalog']  > 0: '<<modelfoto[''catalog'']>> - Number of catalog shoots you''ve done'
 			if modelfoto['fashion'] > 0: '<<modelfoto[''fashion'']>> - Number of fashion shoots you''ve done'
-			
+
 			if modelfoto['bikini'] > 0: '<<modelfoto[''bikini'']>> - Number of swimsuit shoots you''ve done'
 			if modelfoto['lingerie'] > 0: '<<modelfoto[''lingerie'']>> - Number of lingerie shoots you''ve done'
 			if modelfoto['trans_ling'] > 0: '	<<modelfoto[''trans_ling'']>> of those were with transparent lingerie'
@@ -751,7 +778,7 @@ if $ARGS[0] = 'stats':
 		end
 	end
 	*nl
-	
+
 	if masseuse['jobtype'] ! 0:
 		'<b>Masseuse</b>'
 		masseuse['money_earned'] += masseuse['paycheck']
@@ -871,7 +898,7 @@ if $ARGS[0] = 'stats':
 		if stat['gloryhole'] > 0 or stat['hidden_gloryhole'] > 0: 'Sucked cock in a gloryhole (known/unknown): <<stat[''gloryhole'']>>/<<stat[''hidden_gloryhole'']>>'
 		if furibj > 0: 'Sucked off truckers for a ride <<furibj>> times'
 		if furi['road_head_girl'] = 1: 'The truckers who drive the lorries nicknamed you "Road Head Girl".'
-		
+
 	end
 
 	if sex > 0 or stat['vaginal'] > 0 or stat['hidden_vaginal'] > 0: 'Vaginal sex (known/unknown): <<stat[''vaginal'']>>/<<stat[''hidden_vaginal'']>>'
@@ -1745,7 +1772,7 @@ if $ARGS[0] = 'show_tits':
 	else
 		view 'images/pc/body/tits/t<<tits>>.jpg'
 	end
-	
+
 end
 
 if $ARGS[0] = 'show_body':
@@ -2237,19 +2264,19 @@ if $ARGS[0] = 'old':
 				else
 					dynamic 'tmp = <<$ObjDebugVars[i]>>'
 					addobj '<<$ObjDebugVars[i]>>: <<tmp>>'
-				end 
+				end
 				i += 1
 				jump 'AddDebugVarLoop'
-			end 
-		end 
-	end 
+			end
+		end
+	end
 end
 
 if $ARGS[0] = "AddDebugVar":
 	if $ARGS[1] <> '':
 		i = ARRSIZE('$ObjDebugVars')
 		$ObjDebugVars[i] = '<<$ARGS[1]>>'
-	end 
+	end
 end
 
 if $ARGS[0] = "DeleteDebugVar":
@@ -2265,9 +2292,9 @@ if $ARGS[0] = "DeleteDebugVar":
 					i += 1
 				end
 				jump 'DeleteDebugVarLoop'
-			end 
-		end 
-	end 
+			end
+		end
+	end
 end
 
 if $ARGS[0] = 'wait':

+ 13 - 12
locations/sleep.qsrc

@@ -15,10 +15,10 @@ if $ARGS[0] = 'simple':
 	if varsleep['time_now'] >= varsleep['alarm_time_end']: varsleep['alarm_time_end'] += 1440
 	varsleep['alarm_time'] = daystart*1440 + timer * 60 + timerM
 	if varsleep['time_now'] >= varsleep['alarm_time']: varsleep['alarm_time'] += 1440
-	if budilnikOn = 1: 
+	if budilnikOn = 1:
 		varsleep['minutes to wakeup'] = min(varsleep['time_to_full'], varsleep['alarm_time'] - varsleep['time_now'])
 		varsleep['minutes to wakeup end'] = min(varsleep['time_to_full'], varsleep['alarm_time_end'] - varsleep['time_now'])
-	else 
+	else
 		varsleep['minutes to wakeup'] = varsleep['time_to_full']
 		varsleep['minutes to wakeup end'] = varsleep['time_to_full']
 	end
@@ -28,13 +28,13 @@ if $ARGS[0] = 'simple':
 	minut += 1
 	stime += 1
 	if recuperation = 0:pcs_health += 5
-	
+
 	if stime >= 60:
 		stime = 0
 		pcs_sleep += 15
 		gs 'stat'
 	end
-	
+
 	varsleep['minutes to wakeup'] -= 1
 	varsleep['minutes to wakeup end'] -= 1
 
@@ -43,10 +43,10 @@ if $ARGS[0] = 'simple':
 		varsleep['alarm_time'] = daystart*1440 + timerEnd * 60 + timerEndM
 		if varsleep['minutes to wakeup end'] > 0:jump 'loopson_sleep'
 	elseif week > 5:
-	!! use weeken time alarm 
+	!! use weeken time alarm
 		varsleep['alarm_time'] = daystart*1440 + timerEnd * 60 + timerEndM
 		if varsleep['minutes to wakeup end'] > 0:jump 'loopson_sleep'
-	else 
+	else
 		varsleep['alarm_time'] = daystart*1440 + timer * 60 + timerM
 		if varsleep['minutes to wakeup'] > 0:jump 'loopson_sleep'
 	end
@@ -304,10 +304,10 @@ if $ARGS[0] = 'dream':
 	if varsleep['time_now'] >= varsleep['alarm_time_end']: varsleep['alarm_time_end'] += 1440
 	varsleep['alarm_time'] = daystart*1440 + timer * 60 + timerM
 	if varsleep['time_now'] >= varsleep['alarm_time']: varsleep['alarm_time'] += 1440
-	if budilnikOn = 1: 
+	if budilnikOn = 1:
 		varsleep['minutes to wakeup'] = min(varsleep['time_to_full'], varsleep['alarm_time'] - varsleep['time_now'])
 		varsleep['minutes to wakeup end'] = min(varsleep['time_to_full'], varsleep['alarm_time_end'] - varsleep['time_now'])
-	else 
+	else
 		varsleep['minutes to wakeup'] = varsleep['time_to_full']
 		varsleep['minutes to wakeup end'] = varsleep['time_to_full']
 	end
@@ -366,7 +366,8 @@ if $ARGS[0] = 'dream':
 			gs 'stat'
 		end
 
-		
+		if minut = 60: gs 'stat'
+
 		varsleep['minutes to wakeup'] -= 1
 		varsleep['minutes to wakeup end'] -= 1
 
@@ -375,10 +376,10 @@ if $ARGS[0] = 'dream':
 			varsleep['alarm_time'] = daystart*1440 + timerEnd * 60 + timerEndM
 			if varsleep['minutes to wakeup end'] = 0: wake_up = 1
 		elseif week > 5:
-		!! use weeken time alarm 
+		!! use weeken time alarm
 			varsleep['alarm_time'] = daystart*1440 + timerEnd * 60 + timerEndM
 			if varsleep['minutes to wakeup end'] = 0: wake_up = 1
-		else 
+		else
 			varsleep['alarm_time'] = daystart*1440 + timer * 60 + timerM
 			if varsleep['minutes to wakeup'] = 0: wake_up = 1
 		end
@@ -744,7 +745,7 @@ if $ARGS[0] = 'succubinit':
 
 	if preg = 1:
 		gs 'medical_din', 'remove_preg'
-		RecovH = 0		
+		RecovH = 0
 	end
 
 	act 'Finish': gt $loc, $loc_arg

+ 22 - 0
locations/tabhead.qsrc

@@ -0,0 +1,22 @@
+#tabhead
+'<center><b><table width="90%" cellspacing="0" cellpadding="0" valign="top"><tr>'
+tabscount = ARRSIZE('$tabsname')
+trwidth = 90 / tabscount
+i = 0
+:tabs_loop
+if ARGS[0] = i:
+	'<th width="<<trwidth>>%"><<$tabsname[i]>></th>'
+else
+	'<th width="<<trwidth>>%"><a href="exec:<<$tabsaction[i]>>"><<$tabsname[i]>></a></th>'
+end
+i = i + 1
+if i < tabscount:
+jump 'tabs_loop'
+end
+'</tr></table></b></center>'
+killvar 'i'
+killvar 'tabscount'
+killvar 'trwidth'
+killvar '$tabsname'
+killvar '$tabsaction'
+--- tabhead ---------------------------------