Merge remote-tracking branch 'origin/master' into planned-september-update

locations/Cheatmenu_din.qsrc

@@ -434,10 +434,11 @@ if $ARGS[0] = 'permanent':
 
 	*nl
 	'No dream chance: <a href="exec: cheatVars[''no_dream_chance''] = input(''Enter no dream chance (%)'') & dynamic $cheatmenu[$cheatmenu[''this_menu'']]">' + iif(cheatVars['no_dream_chance'] > 0, '<<cheatVars[''no_dream_chance'']>>%</a>, <a href="exec:cheatVars[''no_dream_chance''] = 0 & dynamic $cheatmenu[$cheatmenu[''this_menu'']]">Enabled</a>', 'Disabled</a>')
-
 	*nl
-	'<font color="red"><b>WARNING!</b></font>: Disabling states may cause some events not to trigger. Use at your own risk!'
+
 	$cheatmenu['table_end']
+
+	'<center><font color="red"><b>WARNING!</b></font>: Disabling states may cause some events not to trigger. Use at your own risk!</center>'
 end
 
 !!----------------------------------------------------------------------------------------------------------------------------
@@ -819,158 +820,170 @@ if $ARGS[0] = 'looks':
 	'<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>'
 	*nl
-	$cheatmenu['table_start']
-	'<<$pcs_firstname>> <<$pcs_lastname>> (<<$pcs_nickname>>). <a href="exec:dynamic $cheatmenu[''rename'']">Rename</a>'
-
-
-	if face_style['type'] = 1: '<a href="exec: dynamic $cheatmenu[''change_avatar_path'']">Change current profile path:</a> <<$face_style[''avatar_path'']>>'
-	if face_style['type'] ! 0: '<a href="exec: face_style[''type''] = 0 & dynamic $cheatmenu[''looks'']">Use the dynamic profile system</a>'
-	if face_style['type'] ! 1: '<a href="exec: face_style[''type''] = 1 & $face_style[''avatar_path''] += iif($face_style[''avatar_path''] = '''', ''images/avatar.jpg'', '''') & dynamic $cheatmenu[''looks'']">Use a fixed profile image</a>'
-	if face_style['type'] ! 2: '<a href="exec: face_style[''type''] = 2 & dynamic $cheatmenu[''looks'']">Use the rendered profile system</a>'
-
-	if $face_style['avatar_hair'] ! '':
-		'<a href="exec: $face_style[''avatar_hair''] = '''' & dynamic $cheatmenu[''looks'']">Custom Hair: ON</a>'
-		'<<$face_style[''avatar_hair'']>>'
-	else
-		'<a href="exec:dynamic $cheatmenu[''avatar_hair_set'']">Custom Hair: OFF</a>'
-	end
-	*nl
-	'<a href="exec:gs ''Cheatmenu_din'', ''parameters''">Show design parameters of body</a>'
-	'<a href="exec:gs ''Cheatmenu_din'', ''vneshpara''">Show beauty parameters</a>'
-	*nl
-	'You are <a href="exec: pcs_dob += 10000 & dynamic $cheatmenu[''age'']">(-1)</a> <<age>> <a href="exec: pcs_dob -= 10000 & dynamic $cheatmenu[''age'']">(+1)</a> years old'
-	*nl
-	'You look <<vidage>> years old'
-	'<a href="exec:dynamic $cheatmenu[''visualage'']">Change apparent age</a>'
-	*nl
-	'You are <<pcs_hgt>> centimetres tall'
-	'<a href="exec:pcs_hgt = input(''Enter <<$pcs_nickname>>s height in centimetres<br><br>(default 165, min 100, max 200, values below 150 and above 180 will cause problems in the calculation of BMI/weight the more you deviate from the default 170)'') & dynamic $cheatmenu[''looks'']">Change <<$pcs_nickname>>''s height</a>'
-	*nl
-	*p 'Musculature (<<stren_plus_lvl>>): ' & dynamic $cheatmenu['printLooksLinks'], 'stren_plus', 'Musculature'
-	*pl '<font color="grey">Allows strength to go past 100'
-	*pl'<font color="red">Negatively</font> affects appearance</font>'
-	*nl
-	*p 'Toned Butt (<<butt_tr_lvl>>): ' & dynamic $cheatmenu['printLooksLinks'], 'butt_tr', 'Toned Butt'
-	*nl
-	'You have <<$titsize>> breasts'
-	if tits < 11:'<a href="exec: bodyVars[''bust_silicone''] += 5 & dynamic $cheatmenu[''looks'']">Enlarge breasts(silicone)</a>'
-	if bodyVars['bust_silicone'] => 1:'<a href="exec: bodyVars[''bust_silicone''] = min(0, bodyVars[''bust_silicone'']-5) & dynamic $cheatmenu[''looks'']">Shrink breasts(silicone)</a>'
-	if tits < 11 and pcs_mass['bust_gen'] < 50:'<a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_bust'', 5">Enlarge breasts (natural)</a>'
-	if pcs_mass['bust'] => 6 and pcs_mass['bust_gen'] => 6: '<a href="exec: titreduc = 1 & gs ''Cheatmenu_din'', ''change_pcs_mass_bust'', -5">Shrink breasts (natural)</a>'
-	*nl
-	if pcs_buttsize <= 14:
-		$cmd_temp_butt_desc = 'flat'
-	elseif pcs_buttsize <= 25:
-		$cmd_temp_butt_desc = 'average'
-	elseif pcs_buttsize <= 40:
-		$cmd_temp_butt_desc = 'pert'
-	elseif pcs_buttsize <= 59:
-		$cmd_temp_butt_desc = 'heart-shaped'
-	else
-		$cmd_temp_butt_desc = 'bubble'
-	end
-	'You have a <<$cmd_temp_butt_desc>> butt'
-	if pcs_buttsize < 50: '<a href="exec: bodyVars[''butt_silicone''] += 10 & dynamic $cheatmenu[''looks'']">Enlarge butt (silicone)</a>'
-	if bodyVars['butt_silicone'] => 1: '<a href="exec: bodyVars[''butt_silicone''] = max(0, bodyVars[''butt_silicone'']-10) & dynamic $cheatmenu[''looks'']">Shrink butt (silicone)</a>'
-	if pcs_mass['butt'] < 50 and pcs_mass['butt_gen'] < 50: '<a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_butt'', 10">Enlarge butt (natural)</a>'
-	if pcs_mass['butt'] => 6 and pcs_mass['butt_gen'] => 6: '<a href="exec: assreduc = 1 & gs ''Cheatmenu_din'', ''change_pcs_mass_butt'', -10">Shrink butt (natural)</a>'
-	killvar '$cmd_temp_butt_desc'
-	!! if pcs_buttsize < 20:'<a href="exec: bodyVars[''butt_cheat''] += 2 & dynamic $cheatmenu[''looks'']">Enlarge butt</a>'
-	!! if pcs_buttsize > 1:'<a href="exec: bodyVars[''butt_cheat''] -= 2 & dynamic $cheatmenu[''looks'']">Shrink butt</a>'
-	!! if bodyVars['butt_cheat'] ! 0:'<a href="exec: bodyVars[''butt_cheat''] = 0 & dynamic $cheatmenu[''looks'']">Reset butt shape to default</a>'
-	*nl
-	'<<$pc_descFull[''lip'']>>'
-	if pcs_lip < 4:'<a href="exec:pcs_lip += 1 & dynamic $cheatmenu[''looks'']">Enlarge lips</a>'
-	if pcs_lip > 0:'<a href="exec:pcs_lip -= 1 & dynamic $cheatmenu[''looks'']">Shrink lips</a>'
-	*nl
-	'<<$pc_descFull[''skin'']>>'
-	if pcs_skin < 900: '<a href="exec:pcs_skin += 200 & gs ''AppearanceSystem'', ''UpdateBaseAppearance'' & dynamic $cheatmenu[''looks'']">Improve skin</a>'
-	if pcs_skin > 0: '<a href="exec:pcs_skin -= 200 & gs ''AppearanceSystem'', ''UpdateBaseAppearance'' & dynamic $cheatmenu[''looks'']">Worsen skin</a>'
-	if pcs_tan >= 0:'<a href="exec:pcs_tan += 10 & dynamic $cheatmenu[''looks'']">Become tanned</a>'
-	if pcs_tan > 0:'<a href="exec:pcs_tan = 0 & dynamic $cheatmenu[''looks'']">Remove tan</a>'
-	*nl
-	'<<$pc_descFull[''throat'']>>'
-	if pcs_throat <= 31:'<a href="exec:pcs_throat += 5 & dynamic $cheatmenu[''looks'']">Increase throat capacity</a>'
-	if pcs_throat >= 5:'<a href="exec:pcs_throat -= 5 & dynamic $cheatmenu[''looks'']">Decrease throat capacity</a>'
-	if dounspell = 1:
+	'<center><table width="1000" cellspacing="0" cellpadding="10" valign="top"><tr><td width="33%" valign="top">'
+		'<<$pcs_firstname>> <<$pcs_lastname>> (<<$pcs_nickname>>). <a href="exec:dynamic $cheatmenu[''rename'']">Rename</a>'
 		*nl
-		'<a href="exec:dounsplkil = 2 & gs ''body'', ''hardreset''">Hard Reset body shape</a>'
-	end
-
-	*nl
-	'<<$pcs_vag>>'
-	if pcs_vag > 0:'<a href="exec:pcs_vag = 0 & dynamic $cheatmenu[''looks'']">Reinstate virginity</a>'
-	if stat['think_virgin'] < 1:'<a href="exec:stat[''vaginal''] = 0 & stat[''vaginal_fist''] = 0 & stat[''vaginal_dildo''] = 0 & stat[''vaginal_strap''] = 0 & dynamic $cheatmenu[''looks'']">Make Sveta believe she is a virgin again (resets the related sex stats)</a>'
-	if pcs_vag <= 25:'<a href="exec:gs ''Cheatmenu_din'', ''vagenlarge''">Enlarge comfortable vaginal capacity</a>'
-	if pcs_vag >= 5:'<a href="exec:gs ''Cheatmenu_din'', ''vagreduce''">Reduce comfortable vaginal capacity</a>'
-	'Your comfortable vaginal capacity will reduce by <<vshrink>> every <<vshrinkdays>> days.'
-	if vshrink < 10:'<a href="exec:vshrink += 1 & dynamic $cheatmenu[''looks'']">Increase amount of reduction</a>'
-	if vshrink > 0:'<a href="exec:vshrink -= 1 & dynamic $cheatmenu[''looks'']">Reduce amount of reduction</a>'
-	if vshrinkdays < 10:'<a href="exec:vshrinkdays += 1 & dynamic $cheatmenu[''looks'']">Increase number of days it takes</a>'
-	if vshrinkdays > 1:'<a href="exec:vshrinkdays -= 1 & dynamic $cheatmenu[''looks'']">Reduce number of days it takes</a>'
-	'When gaped your vagina will reduce each stage (up to 4 for maximum gape) every <<vgape[4]>> minutes.'
-	if vgape[4] < 60:'<a href="exec:vgape[4] += 5 & dynamic $cheatmenu[''looks'']">Increase time by 5 minutes</a>'
-	if vgape[4] > 5:'<a href="exec:vgape[4] -= 5 & dynamic $cheatmenu[''looks'']">Reduce time by 5 minutes</a>'
-	*nl
-	'<<$pcs_ass>>'
-	if pcs_ass <= 25:'<a href="exec:gs ''Cheatmenu_din'', ''assenlarge''">Enlarge comfortable anal capacity</a>'
-	if pcs_ass >= 5:'<a href="exec:gs ''Cheatmenu_din'', ''assreduce''">Reduce comfortable anal capacity</a>'
-	'Your comfortable anal capacity will reduce by <<ashrink>> every <<ashrinkdays>> days.'
-	if ashrink < 10:'<a href="exec:ashrink += 1 & dynamic $cheatmenu[''looks'']">Increase amount of reduction</a>'
-	if ashrink > 0:'<a href="exec:ashrink -= 1 & dynamic $cheatmenu[''looks'']">Reduce amount of reduction</a>'
-	if ashrinkdays < 10:'<a href="exec:ashrinkdays += 1 & dynamic $cheatmenu[''looks'']">Increase number of days it takes</a>'
-	if ashrinkdays > 1:'<a href="exec:ashrinkdays -= 1 & dynamic $cheatmenu[''looks'']">Reduce number of days it takes</a>'
-	'When gaped your anus will reduce each stage (up to 4 for maximum gape) every <<agape[4]>> minutes.'
-	if agape[4] < 60:'<a href="exec:agape[4] += 5 & dynamic $cheatmenu[''looks'']">Increase time by 5 minutes</a>'
-	if agape[4] > 5:'<a href="exec:agape[4] -= 5 & dynamic $cheatmenu[''looks'']">Reduce time by 5 minutes</a>'
-	*nl
-	if dounspell = 0:
-		if fat ! 0: '<a href="exec:fat = 0 & dynamic $cheatmenu[''looks'']">Zero fat</a>'
-		'Body Fat = (<<pcs_mass[''body'']>>): <a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_body'', -10">-10</a> <a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_body'', -5">-5</a> <a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_body'', -1">-1</a> <a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_body'', 1">+1</a> <a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_body'', 5">+5</a> <a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_body'', 10">+10</a>'
-		'Note: You need some Body Fat to survive, any value under 11 is clasified as "starving" and a value of 0 can lead to a Game Over. <<func(''body'', ''CalcOptBodyMass'')>> gives a bmi of 22.5.'
-	end
-	*nl
-	'<a href="exec:dynamic $cheatmenu[''tatoo'']">Tattoo removal</a>'
-	*nl
-	'<<$hair>>'
-	if pcs_haircol = 0:
-		'Your hair is now (prev) <<$pcs_haircol>> <a href="exec:pcs_haircol +=1 & dynamic $cheatmenu[''looks''] & nathcol = pcs_haircol">(next)</a>'
-	elseif pcs_haircol > 0 and pcs_haircol < 3:
-		'Your hair is now <a href="exec:pcs_haircol -=1 & dynamic $cheatmenu[''looks'']" & nathcol = pcs_haircol>(prev)</a> <<$pcs_haircol>> <a href="exec:pcs_haircol +=1 & dynamic $cheatmenu[''looks'']" & pcs_haircol = nathcol>(next)</a>'
-	elseif pcs_haircol = 3:
-		'Your hair is now <a href="exec:pcs_haircol -=1 & dynamic $cheatmenu[''looks'']" & nathcol = pcs_haircol>(prev)</a> <<$pcs_haircol>> (next)'
-	else
-		'To change your natural hair color, you have to <a href="exec:pcs_haircol = nathcol & dynamic $cheatmenu[''looks'']">restore your natural hair color</a> first.'
-	end
-	if pcs_hairlng > 975:
-		'Hair length (<<pcs_hairlng>>)	<a href="exec:pcs_hairlng -= 100 & dynamic $cheatmenu[''looks'']">-100</a> <a href="exec:pcs_hairlng -= 25 & dynamic $cheatmenu[''looks'']">-25</a> <a href="exec:pcs_hairlng -= 5 & dynamic $cheatmenu[''looks'']">-5</a> <a href="exec:pcs_hairlng += 5 & dynamic $cheatmenu[''looks'']">+5</a>'
-	elseif pcs_hairlng > 900:
-		'Hair length (<<pcs_hairlng>>)	<a href="exec:pcs_hairlng -= 100 & dynamic $cheatmenu[''looks'']">-100</a> <a href="exec:pcs_hairlng -= 25 & dynamic $cheatmenu[''looks'']">-25</a> <a href="exec:pcs_hairlng -= 5 & dynamic $cheatmenu[''looks'']">-5</a> <a href="exec:pcs_hairlng += 5 & dynamic $cheatmenu[''looks'']">+5</a> <a href="exec:pcs_hairlng += 25 & dynamic $cheatmenu[''looks'']">+25</a>'
-	elseif pcs_hairlng >= 100:
-		'Hair length (<<pcs_hairlng>>)	<a href="exec:pcs_hairlng -= 100 & dynamic $cheatmenu[''looks'']">-100</a> <a href="exec:pcs_hairlng -= 25 & dynamic $cheatmenu[''looks'']">-25</a> <a href="exec:pcs_hairlng -= 5 & dynamic $cheatmenu[''looks'']">-5</a> <a href="exec:pcs_hairlng += 5 & dynamic $cheatmenu[''looks'']">+5</a> <a href="exec:pcs_hairlng += 25 & dynamic $cheatmenu[''looks'']">+25</a> <a href="exec:pcs_hairlng += 100 & dynamic $cheatmenu[''looks'']">+100</a>'
-	elseif pcs_hairlng >= 25:
-		'Hair length (<<pcs_hairlng>>)	<a href="exec:pcs_hairlng -= 25 & dynamic $cheatmenu[''looks'']">-25</a> <a href="exec:pcs_hairlng -= 5 & dynamic $cheatmenu[''looks'']">-5</a> <a href="exec:pcs_hairlng += 5 & dynamic $cheatmenu[''looks'']">+5</a> <a href="exec:pcs_hairlng += 25 & dynamic $cheatmenu[''looks'']">+25</a> <a href="exec:pcs_hairlng += 100 & dynamic $cheatmenu[''looks'']">+100</a>'
-	elseif pcs_hairlng >= 5:
-		'Hair length (<<pcs_hairlng>>)	<a href="exec:pcs_hairlng -= 5 & dynamic $cheatmenu[''looks'']">-5</a> <a href="exec:pcs_hairlng += 5 & dynamic $cheatmenu[''looks'']">+5</a> <a href="exec:pcs_hairlng += 25 & dynamic $cheatmenu[''looks'']">+25</a> <a href="exec:pcs_hairlng += 100 & dynamic $cheatmenu[''looks'']">+100</a>'
-	else
-		'Hair length (<<pcs_hairlng>>)	<a href="exec:pcs_hairlng += 5 & dynamic $cheatmenu[''looks'']">+5</a> <a href="exec:pcs_hairlng += 25 & dynamic $cheatmenu[''looks'']">+25</a> <a href="exec:pcs_hairlng += 100 & dynamic $cheatmenu[''looks'']">+100</a>'
-	end
-	if hairgrowcht = 0:'<a href="exec:hairgrowcht = 1 & dynamic $cheatmenu[''looks'']">Stop hair growth</a>'
-	if hairgrowcht = 1:'<a href="exec:hairgrowcht = 0 & dynamic $cheatmenu[''looks'']">Allow hair growth</a>'
-	*nl
-	'<<$pc_descFull[''eyes'']>>'
-	if pcs_naturallashes < 2:'<a href="exec:pcs_naturallashes += 1 & dynamic $cheatmenu[''looks'']">Enlarge lashes</a>'
-	if pcs_naturallashes > 0:'<a href="exec:pcs_naturallashes -= 1 & dynamic $cheatmenu[''looks'']">Shrink lashes</a>'
-	if pcs_eyesize < 3:'<a href="exec:pcs_eyesize += 1 & dynamic $cheatmenu[''looks'']">Increase the size of the eye</a>'
-	if pcs_eyesize > 0:'<a href="exec:pcs_eyesize -= 1 & dynamic $cheatmenu[''looks'']">Reduce the size of the eye</a>'
-	if pcs_eyecol <= 0:
-		'Your eyes are now (prev) <<$pcs_eyecol>> <a href="exec:pcs_eyecol +=1 & dynamic $cheatmenu[''looks'']">(next)</a>'
-	elseif pcs_eyecol > 0 and pcs_eyecol < 3:
-		'Your eyes are now <a href="exec:pcs_eyecol -=1 & dynamic $cheatmenu[''looks'']">(prev)</a> <<$pcs_eyecol>> <a href="exec:pcs_eyecol +=1 & dynamic $cheatmenu[''looks'']">(next)</a>'
-	elseif pcs_eyecol >= 3:
-		'Your eyes are now <a href="exec:pcs_eyecol -=1 & dynamic $cheatmenu[''looks'']">(prev)</a> <<$pcs_eyecol>> (next)'
-	end
-	$cheatmenu['table_end']
+		if face_style['type'] = 1: '<a href="exec: dynamic $cheatmenu[''change_avatar_path'']">Change current profile path:</a> <<$face_style[''avatar_path'']>>'
+		if face_style['type'] = 0:
+			'Using the dynamic profile system'
+		else
+			'<a href="exec: face_style[''type''] = 0 & dynamic $cheatmenu[''looks'']">Use the dynamic profile system</a>'
+		end
+		if face_style['type'] = 1:
+			'Using a fixed profile image'
+		else
+			'<a href="exec: face_style[''type''] = 1 & $face_style[''avatar_path''] += iif($face_style[''avatar_path''] = '''', ''images/avatar.jpg'', '''') & dynamic $cheatmenu[''looks'']">Use a fixed profile image</a>'
+		end
+		if face_style['type'] = 2:
+			'Using the rendered profile system'
+		else
+			'<a href="exec: face_style[''type''] = 2 & dynamic $cheatmenu[''looks'']">Use the rendered profile system</a>'
+		end
+		*nl
+		if $face_style['avatar_hair'] = '':
+			'<a href="exec:dynamic $cheatmenu[''avatar_hair_set'']">Custom Hair: OFF</a>'
+		else
+			'<a href="exec: $face_style[''avatar_hair''] = '''' & dynamic $cheatmenu[''looks'']">Custom Hair: ON</a>'
+			'<<$face_style[''avatar_hair'']>>'
+		end
+		*nl
+		'<a href="exec:gs ''Cheatmenu_din'', ''parameters''">Show design parameters of body</a>'
+		'<a href="exec:gs ''Cheatmenu_din'', ''vneshpara''">Show beauty parameters</a>'
+		*nl
+		'You are <a href="exec: pcs_dob += 10000 & dynamic $cheatmenu[''age'']">(-1)</a> <<age>> <a href="exec: pcs_dob -= 10000 & dynamic $cheatmenu[''age'']">(+1)</a> years old'
+		*nl
+		'You look <<vidage>> years old'
+		'<a href="exec:dynamic $cheatmenu[''visualage'']">Change apparent age</a>'
+		*nl
+		'You are <<pcs_hgt>> centimetres tall'
+		'<a href="exec:pcs_hgt = input(''Enter <<$pcs_nickname>>s height in centimetres<br><br>(default 165, min 100, max 200, values below 150 and above 180 will cause problems in the calculation of BMI/weight the more you deviate from the default 170)'') & dynamic $cheatmenu[''looks'']">Change <<$pcs_nickname>>''s height</a>'
+		*nl
+		'Musculature (<<stren_plus_lvl>>): ' & dynamic $cheatmenu['printLooksLinks'], 'stren_plus', 'Musculature'
+		'<font color="grey">Allows strength to go past 100'
+		'<font color="red">Negatively</font> affects appearance</font>'
+		*nl
+		'Toned Butt (<<butt_tr_lvl>>): ' & dynamic $cheatmenu['printLooksLinks'], 'butt_tr', 'Toned Butt'
+		*nl
+		'You have <<$titsize>> breasts'
+		if tits < 11:'<a href="exec: bodyVars[''bust_silicone''] += 5 & dynamic $cheatmenu[''looks'']">Enlarge breasts(silicone)</a>'
+		if bodyVars['bust_silicone'] => 1:'<a href="exec: bodyVars[''bust_silicone''] = min(0, bodyVars[''bust_silicone'']-5) & dynamic $cheatmenu[''looks'']">Shrink breasts(silicone)</a>'
+		if tits < 11 and pcs_mass['bust_gen'] < 50:'<a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_bust'', 5">Enlarge breasts (natural)</a>'
+		if pcs_mass['bust'] => 6 and pcs_mass['bust_gen'] => 6: '<a href="exec: titreduc = 1 & gs ''Cheatmenu_din'', ''change_pcs_mass_bust'', -5">Shrink breasts (natural)</a>'
+		*nl
+		if pcs_buttsize <= 14:
+			$cmd_temp_butt_desc = 'flat'
+		elseif pcs_buttsize <= 25:
+			$cmd_temp_butt_desc = 'average'
+		elseif pcs_buttsize <= 40:
+			$cmd_temp_butt_desc = 'pert'
+		elseif pcs_buttsize <= 59:
+			$cmd_temp_butt_desc = 'heart-shaped'
+		else
+			$cmd_temp_butt_desc = 'bubble'
+		end
+		'You have a <<$cmd_temp_butt_desc>> butt'
+		if pcs_buttsize < 50: '<a href="exec: bodyVars[''butt_silicone''] += 10 & dynamic $cheatmenu[''looks'']">Enlarge butt (silicone)</a>'
+		if bodyVars['butt_silicone'] => 1: '<a href="exec: bodyVars[''butt_silicone''] = max(0, bodyVars[''butt_silicone'']-10) & dynamic $cheatmenu[''looks'']">Shrink butt (silicone)</a>'
+		if pcs_mass['butt'] < 50 and pcs_mass['butt_gen'] < 50: '<a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_butt'', 10">Enlarge butt (natural)</a>'
+		if pcs_mass['butt'] => 6 and pcs_mass['butt_gen'] => 6: '<a href="exec: assreduc = 1 & gs ''Cheatmenu_din'', ''change_pcs_mass_butt'', -10">Shrink butt (natural)</a>'
+		killvar '$cmd_temp_butt_desc'
+		!! if pcs_buttsize < 20:'<a href="exec: bodyVars[''butt_cheat''] += 2 & dynamic $cheatmenu[''looks'']">Enlarge butt</a>'
+		!! if pcs_buttsize > 1:'<a href="exec: bodyVars[''butt_cheat''] -= 2 & dynamic $cheatmenu[''looks'']">Shrink butt</a>'
+		!! if bodyVars['butt_cheat'] ! 0:'<a href="exec: bodyVars[''butt_cheat''] = 0 & dynamic $cheatmenu[''looks'']">Reset butt shape to default</a>'
+		*nl
+		'<<$pc_descFull[''lip'']>>'
+		if pcs_lip < 4:'<a href="exec:pcs_lip += 1 & dynamic $cheatmenu[''looks'']">Enlarge lips</a>'
+		if pcs_lip > 0:'<a href="exec:pcs_lip -= 1 & dynamic $cheatmenu[''looks'']">Shrink lips</a>'
+	'</td><td width="33%" valign="top">'
+		!*nl
+		'<<$pc_descFull[''skin'']>>'
+		if pcs_skin < 900: '<a href="exec:pcs_skin += 200 & gs ''AppearanceSystem'', ''UpdateBaseAppearance'' & dynamic $cheatmenu[''looks'']">Improve skin</a>'
+		if pcs_skin > 0: '<a href="exec:pcs_skin -= 200 & gs ''AppearanceSystem'', ''UpdateBaseAppearance'' & dynamic $cheatmenu[''looks'']">Worsen skin</a>'
+		if pcs_tan >= 0:'<a href="exec:pcs_tan += 10 & dynamic $cheatmenu[''looks'']">Become tanned</a>'
+		if pcs_tan > 0:'<a href="exec:pcs_tan = 0 & dynamic $cheatmenu[''looks'']">Remove tan</a>'
+		*nl
+		'<<$pc_descFull[''throat'']>>'
+		if pcs_throat <= 31:'<a href="exec:pcs_throat += 5 & dynamic $cheatmenu[''looks'']">Increase throat capacity</a>'
+		if pcs_throat >= 5:'<a href="exec:pcs_throat -= 5 & dynamic $cheatmenu[''looks'']">Decrease throat capacity</a>'
+		if dounspell = 1:
+			*nl
+			'<a href="exec:dounsplkil = 2 & gs ''body'', ''hardreset''">Hard Reset body shape</a>'
+		end
+		*nl
+		'<<$pcs_vag>>'
+		if pcs_vag > 0:'<a href="exec:pcs_vag = 0 & dynamic $cheatmenu[''looks'']">Reinstate virginity</a>'
+		if stat['think_virgin'] < 1:'<a href="exec:stat[''vaginal''] = 0 & stat[''vaginal_fist''] = 0 & stat[''vaginal_dildo''] = 0 & stat[''vaginal_strap''] = 0 & dynamic $cheatmenu[''looks'']">Make Sveta believe she is a virgin again (resets the related sex stats)</a>'
+		if pcs_vag <= 25:'<a href="exec:gs ''Cheatmenu_din'', ''vagenlarge''">Enlarge comfortable vaginal capacity</a>'
+		if pcs_vag >= 5:'<a href="exec:gs ''Cheatmenu_din'', ''vagreduce''">Reduce comfortable vaginal capacity</a>'
+		'Your comfortable vaginal capacity will reduce by <<vshrink>> every <<vshrinkdays>> days.'
+		if vshrink < 10:'<a href="exec:vshrink += 1 & dynamic $cheatmenu[''looks'']">Increase amount of reduction</a>'
+		if vshrink > 0:'<a href="exec:vshrink -= 1 & dynamic $cheatmenu[''looks'']">Reduce amount of reduction</a>'
+		if vshrinkdays < 10:'<a href="exec:vshrinkdays += 1 & dynamic $cheatmenu[''looks'']">Increase number of days it takes</a>'
+		if vshrinkdays > 1:'<a href="exec:vshrinkdays -= 1 & dynamic $cheatmenu[''looks'']">Reduce number of days it takes</a>'
+		'When gaped your vagina will reduce each stage (up to 4 for maximum gape) every <<vgape[4]>> minutes.'
+		if vgape[4] < 60:'<a href="exec:vgape[4] += 5 & dynamic $cheatmenu[''looks'']">Increase time by 5 minutes</a>'
+		if vgape[4] > 5:'<a href="exec:vgape[4] -= 5 & dynamic $cheatmenu[''looks'']">Reduce time by 5 minutes</a>'
+		*nl
+		'<<$pcs_ass>>'
+		if pcs_ass <= 25:'<a href="exec:gs ''Cheatmenu_din'', ''assenlarge''">Enlarge comfortable anal capacity</a>'
+		if pcs_ass >= 5:'<a href="exec:gs ''Cheatmenu_din'', ''assreduce''">Reduce comfortable anal capacity</a>'
+		'Your comfortable anal capacity will reduce by <<ashrink>> every <<ashrinkdays>> days.'
+		if ashrink < 10:'<a href="exec:ashrink += 1 & dynamic $cheatmenu[''looks'']">Increase amount of reduction</a>'
+		if ashrink > 0:'<a href="exec:ashrink -= 1 & dynamic $cheatmenu[''looks'']">Reduce amount of reduction</a>'
+		if ashrinkdays < 10:'<a href="exec:ashrinkdays += 1 & dynamic $cheatmenu[''looks'']">Increase number of days it takes</a>'
+		if ashrinkdays > 1:'<a href="exec:ashrinkdays -= 1 & dynamic $cheatmenu[''looks'']">Reduce number of days it takes</a>'
+		'When gaped your anus will reduce each stage (up to 4 for maximum gape) every <<agape[4]>> minutes.'
+		if agape[4] < 60:'<a href="exec:agape[4] += 5 & dynamic $cheatmenu[''looks'']">Increase time by 5 minutes</a>'
+		if agape[4] > 5:'<a href="exec:agape[4] -= 5 & dynamic $cheatmenu[''looks'']">Reduce time by 5 minutes</a>'
+	'</td><td width="33%" valign="top">'
+		!*nl
+		if dounspell = 0:
+			if fat ! 0: '<a href="exec:fat = 0 & dynamic $cheatmenu[''looks'']">Zero fat</a>'
+			'Body Fat = (<<pcs_mass[''body'']>>): <a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_body'', -10">-10</a> <a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_body'', -5">-5</a> <a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_body'', -1">-1</a> <a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_body'', 1">+1</a> <a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_body'', 5">+5</a> <a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_body'', 10">+10</a>'
+			'Note: You need some Body Fat to survive, any value under 11 is clasified as "starving" and a value of 0 can lead to a Game Over. <<func(''body'', ''CalcOptBodyMass'')>> gives a bmi of 22.5.'
+		end
+		*nl
+		'<a href="exec:dynamic $cheatmenu[''tatoo'']">Tattoo removal</a>'
+		*nl
+		'<<$hair>>'
+		if pcs_haircol = 0:
+			'Your hair is now (prev) <<$pcs_haircol>> <a href="exec:pcs_haircol +=1 & dynamic $cheatmenu[''looks''] & nathcol = pcs_haircol">(next)</a>'
+		elseif pcs_haircol > 0 and pcs_haircol < 3:
+			'Your hair is now <a href="exec:pcs_haircol -=1 & dynamic $cheatmenu[''looks'']" & nathcol = pcs_haircol>(prev)</a> <<$pcs_haircol>> <a href="exec:pcs_haircol +=1 & dynamic $cheatmenu[''looks'']" & pcs_haircol = nathcol>(next)</a>'
+		elseif pcs_haircol = 3:
+			'Your hair is now <a href="exec:pcs_haircol -=1 & dynamic $cheatmenu[''looks'']" & nathcol = pcs_haircol>(prev)</a> <<$pcs_haircol>> (next)'
+		else
+			'To change your natural hair color, you have to <a href="exec:pcs_haircol = nathcol & dynamic $cheatmenu[''looks'']">restore your natural hair color</a> first.'
+		end
+		if pcs_hairlng > 975:
+			'Hair length (<<pcs_hairlng>>)	<a href="exec:pcs_hairlng -= 100 & dynamic $cheatmenu[''looks'']">-100</a> <a href="exec:pcs_hairlng -= 25 & dynamic $cheatmenu[''looks'']">-25</a> <a href="exec:pcs_hairlng -= 5 & dynamic $cheatmenu[''looks'']">-5</a> <a href="exec:pcs_hairlng += 5 & dynamic $cheatmenu[''looks'']">+5</a>'
+		elseif pcs_hairlng > 900:
+			'Hair length (<<pcs_hairlng>>)	<a href="exec:pcs_hairlng -= 100 & dynamic $cheatmenu[''looks'']">-100</a> <a href="exec:pcs_hairlng -= 25 & dynamic $cheatmenu[''looks'']">-25</a> <a href="exec:pcs_hairlng -= 5 & dynamic $cheatmenu[''looks'']">-5</a> <a href="exec:pcs_hairlng += 5 & dynamic $cheatmenu[''looks'']">+5</a> <a href="exec:pcs_hairlng += 25 & dynamic $cheatmenu[''looks'']">+25</a>'
+		elseif pcs_hairlng >= 100:
+			'Hair length (<<pcs_hairlng>>)	<a href="exec:pcs_hairlng -= 100 & dynamic $cheatmenu[''looks'']">-100</a> <a href="exec:pcs_hairlng -= 25 & dynamic $cheatmenu[''looks'']">-25</a> <a href="exec:pcs_hairlng -= 5 & dynamic $cheatmenu[''looks'']">-5</a> <a href="exec:pcs_hairlng += 5 & dynamic $cheatmenu[''looks'']">+5</a> <a href="exec:pcs_hairlng += 25 & dynamic $cheatmenu[''looks'']">+25</a> <a href="exec:pcs_hairlng += 100 & dynamic $cheatmenu[''looks'']">+100</a>'
+		elseif pcs_hairlng >= 25:
+			'Hair length (<<pcs_hairlng>>)	<a href="exec:pcs_hairlng -= 25 & dynamic $cheatmenu[''looks'']">-25</a> <a href="exec:pcs_hairlng -= 5 & dynamic $cheatmenu[''looks'']">-5</a> <a href="exec:pcs_hairlng += 5 & dynamic $cheatmenu[''looks'']">+5</a> <a href="exec:pcs_hairlng += 25 & dynamic $cheatmenu[''looks'']">+25</a> <a href="exec:pcs_hairlng += 100 & dynamic $cheatmenu[''looks'']">+100</a>'
+		elseif pcs_hairlng >= 5:
+			'Hair length (<<pcs_hairlng>>)	<a href="exec:pcs_hairlng -= 5 & dynamic $cheatmenu[''looks'']">-5</a> <a href="exec:pcs_hairlng += 5 & dynamic $cheatmenu[''looks'']">+5</a> <a href="exec:pcs_hairlng += 25 & dynamic $cheatmenu[''looks'']">+25</a> <a href="exec:pcs_hairlng += 100 & dynamic $cheatmenu[''looks'']">+100</a>'
+		else
+			'Hair length (<<pcs_hairlng>>)	<a href="exec:pcs_hairlng += 5 & dynamic $cheatmenu[''looks'']">+5</a> <a href="exec:pcs_hairlng += 25 & dynamic $cheatmenu[''looks'']">+25</a> <a href="exec:pcs_hairlng += 100 & dynamic $cheatmenu[''looks'']">+100</a>'
+		end
+		if hairgrowcht = 0:'<a href="exec:hairgrowcht = 1 & dynamic $cheatmenu[''looks'']">Stop hair growth</a>'
+		if hairgrowcht = 1:'<a href="exec:hairgrowcht = 0 & dynamic $cheatmenu[''looks'']">Allow hair growth</a>'
+		*nl
+		'<<$pc_descFull[''eyes'']>>'
+		if pcs_naturallashes < 2:'<a href="exec:pcs_naturallashes += 1 & dynamic $cheatmenu[''looks'']">Enlarge lashes</a>'
+		if pcs_naturallashes > 0:'<a href="exec:pcs_naturallashes -= 1 & dynamic $cheatmenu[''looks'']">Shrink lashes</a>'
+		if pcs_eyesize < 3:'<a href="exec:pcs_eyesize += 1 & dynamic $cheatmenu[''looks'']">Increase the size of the eye</a>'
+		if pcs_eyesize > 0:'<a href="exec:pcs_eyesize -= 1 & dynamic $cheatmenu[''looks'']">Reduce the size of the eye</a>'
+		if pcs_eyecol <= 0:
+			'Your eyes are now (prev) <<$pcs_eyecol>> <a href="exec:pcs_eyecol +=1 & dynamic $cheatmenu[''looks'']">(next)</a>'
+		elseif pcs_eyecol > 0 and pcs_eyecol < 3:
+			'Your eyes are now <a href="exec:pcs_eyecol -=1 & dynamic $cheatmenu[''looks'']">(prev)</a> <<$pcs_eyecol>> <a href="exec:pcs_eyecol +=1 & dynamic $cheatmenu[''looks'']">(next)</a>'
+		elseif pcs_eyecol >= 3:
+			'Your eyes are now <a href="exec:pcs_eyecol -=1 & dynamic $cheatmenu[''looks'']">(prev)</a> <<$pcs_eyecol>> (next)'
+		end
+	'</td></tr></table>'
 end
 
 $cheatmenu['change_avatar_path'] = "gs 'Cheatmenu_din', 'change_avatar_path'"
@@ -1161,42 +1174,96 @@ if $ARGS[0] = 'tatoo':
 	'<center><h1>Cheat Menu - Tattoos</h1></center>'
 	act 'Return to appearance menu':dynamic $cheatmenu['looks']
 	*nl
-	if tatarm = 0:'You do not have a tattoo on your arm</a>'
-	if tatarm >= 1:'<a href="exec:tattCount-=1 & tatarm = 0 & dynamic $cheatmenu[''tatoo'']">Remove your arm tattoo</a>'
-	if tatass = 0:'You do not have a tattoo on your ass</a>'
-	if tatass >= 1:'<a href="exec:tattCount-=1 & tatass = 0 & dynamic $cheatmenu[''tatoo'']">Remove your ass tattoo</a>'
-	if tatback = 0:'You do not have a tattoo on your back</a>'
-	if tatback >= 1:'<a href="exec:tattCount-=1 & tatback = 0 & dynamic $cheatmenu[''tatoo'']">Remove your back tattoo</a>'
-	if tatblly = 0:'You do not have a tattoo on your belly</a>'
-	if tatblly >= 1:'<a href="exec:tattCount-=1 & tatblly = 0 & dynamic $cheatmenu[''tatoo'']">Remove your belly tattoo</a>'
-	if tatbrst = 0:'You do not have a tattoo on your breast</a>'
-	if tatbrst >= 1:'<a href="exec:tattCount-=1 & tatbrst = 0 & dynamic $cheatmenu[''tatoo'']">Remove your breast tattoo</a>'
-	if tatchst = 0:'You do not have a tattoo on your chest</a>'
-	if tatchst >= 1:'<a href="exec:tattCount-=1 & tatchst = 0 & dynamic $cheatmenu[''tatoo'']">Remove your chest tattoo</a>'
-	if tatfce = 0:'You do not have a tattoo on your face</a>'
-	if tatfce >= 1:'<a href="exec:tattCount-=1 & tatfce = 0 & dynamic $cheatmenu[''tatoo'']">Remove your face tattoo</a>'
-	if tatankle = 0:'You do not have a tattoo on your ankle</a>'
-	if tatankle >= 1:'<a href="exec:tattCount-=1 & tatankle = 0 & dynamic $cheatmenu[''tatoo'']">Remove your ankle tattoo</a>'
-	if tatleg = 0:'You do not have a tattoo on your leg</a>'
-	if tatleg >= 1:'<a href="exec:tattCount-=1 & tatleg = 0 & dynamic $cheatmenu[''tatoo'']">Remove your leg tattoo</a>'
-	if tatlip = 0:'You do not have a tattoo on your lip</a>'
-	if tatlip >= 1:'<a href="exec:tattCount-=1 & tatlip = 0 & dynamic $cheatmenu[''tatoo'']">Remove your lip tattoo</a>'
-	if tatneck = 0:'You do not have a tattoo on your neck</a>'
-	if tatneck >= 1:'<a href="exec:tattCount-=1 & tatneck = 0 & dynamic $cheatmenu[''tatoo'']">Remove your neck tattoo</a>'
-	if tatvag = 0:'You do not have a pubic tattoo</a>'
-	if tatvag >= 1:'<a href="exec:tattCount-=1 & tatvag = 0 & dynamic $cheatmenu[''tatoo'']">Remove your pubic tattoo</a>'
-	if tatlech = 0:'You do not have a tattoo on your shoulder</a>'
-	if tatlech >= 1:'<a href="exec:tattCount-=1 & tatlech = 0 & dynamic $cheatmenu[''tatoo'']">Remove your shoulder tattoo</a>'
-	if tatside = 0:'You do not have a tattoo on your side</a>'
-	if tatside >= 1:'<a href="exec:tattCount-=1 & tatside = 0 & dynamic $cheatmenu[''tatoo'']">Remove your the tattoo on your side</a>'
-	if tatupb = 0:'You do not have a tramp stamp</a>'
-	if tatupb >= 1:'<a href="exec:tattCount-=1 & tatupb = 0 & dynamic $cheatmenu[''tatoo'']">Remove your tramp stamp</a>'
-	if tatunder = 0:'You do not have an under breast tattoo</a>'
-	if tatunder >= 1:'<a href="exec:tattCount-=1 & tatunder = 0 & dynamic $cheatmenu[''tatoo'']">Remove your under breast tattoo</a>'
-	if tatwrist = 0:'You do not have a tattoo on your wrist</a>'
-	if tatwrist >= 1:'<a href="exec:tattCount-=1 & tatwrist = 0 & dynamic $cheatmenu[''tatoo'']">Remove your wrist tattoo</a>'
-	if tathand = 0:'You do not have a tattoo on your hand</a>'
-	if tathand >= 1:'<a href="exec:tattCount-=1 & tathand = 0 & dynamic $cheatmenu[''tatoo'']">Remove your hand tattoo</a>'
+	if pcs_tattoos['ankle'] <= 0:
+		'You do not have a tattoo on your ankle'
+	else
+		'<a href="exec: gs ''tattoo_management'', ''remove'', ''ankle'' & gs ''Cheatmenu_din'', ''tatoo''">Remove your ankle tattoo</a>'
+	end
+	if pcs_tattoos['arm'] <= 0:
+		'You do not have a tattoo on your arm'
+	else
+		'<a href="exec: gs ''tattoo_management'', ''remove'', ''arm'' & gs ''Cheatmenu_din'', ''tatoo''">Remove your arm tattoo</a>'
+	end
+	if pcs_tattoos['ass'] <= 0:
+		'You do not have a tattoo on your ass'
+	else
+		'<a href="exec: gs ''tattoo_management'', ''remove'', ''ass'' & gs ''Cheatmenu_din'', ''tatoo''">Remove your ass tattoo</a>'
+	end
+	if pcs_tattoos['back'] <= 0:
+		'You do not have a tattoo on your back'
+	else
+		'<a href="exec: gs ''tattoo_management'', ''remove'', ''back'' & gs ''Cheatmenu_din'', ''tatoo''">Remove your back tattoo</a>'
+	end
+	if pcs_tattoos['belly'] <= 0:
+		'You do not have a tattoo on your belly'
+	else
+		'<a href="exec: gs ''tattoo_management'', ''remove'', ''belly'' & gs ''Cheatmenu_din'', ''tatoo''">Remove your belly tattoo</a>'
+	end
+	if pcs_tattoos['breast'] <= 0:
+		'You do not have a tattoo on your breast'
+	else
+		'<a href="exec: gs ''tattoo_management'', ''remove'', ''breast'' & gs ''Cheatmenu_din'', ''tatoo''">Remove your breast tattoo</a>'
+	end
+	if pcs_tattoos['chest'] <= 0:
+		'You do not have a tattoo on your chest'
+	else
+		'<a href="exec: gs ''tattoo_management'', ''remove'', ''chest'' & gs ''Cheatmenu_din'', ''tatoo''">Remove your chest tattoo</a>'
+	end
+	if pcs_tattoos['face'] <= 0:
+		'You do not have a tattoo on your face'
+	else
+		'<a href="exec: gs ''tattoo_management'', ''remove'', ''face'' & gs ''Cheatmenu_din'', ''tatoo''">Remove your face tattoo</a>'
+	end
+	if pcs_tattoos['leg'] <= 0:
+		'You do not have a tattoo on your leg'
+	else
+		'<a href="exec: gs ''tattoo_management'', ''remove'', ''leg'' & gs ''Cheatmenu_din'', ''tatoo''">Remove your leg tattoo</a>'
+	end
+	if pcs_tattoos['lip'] <= 0:
+		'You do not have a tattoo on your leg'
+	else
+		'<a href="exec: gs ''tattoo_management'', ''remove'', ''lip'' & gs ''Cheatmenu_din'', ''tatoo''">Remove your lip tattoo</a>'
+	end
+	if pcs_tattoos['neck'] <= 0:
+		'You do not have a tattoo on your neck'
+	else
+		'<a href="exec: gs ''tattoo_management'', ''remove'', ''neck'' & gs ''Cheatmenu_din'', ''tatoo''">Remove your neck tattoo</a>'
+	end
+	if pcs_tattoos['pussy'] <= 0:
+		'You do not have a pubic tattoo'
+	else
+		'<a href="exec: gs ''tattoo_management'', ''remove'', ''pussy'' & gs ''Cheatmenu_din'', ''tatoo''">Remove your pubic tattoo</a>'
+	end
+	if pcs_tattoos['shoulder'] <= 0:
+		'You do not have a tattoo on your shoulder'
+	else
+		'<a href="exec: gs ''tattoo_management'', ''remove'', ''shoulder'' & gs ''Cheatmenu_din'', ''tatoo''">Remove your shoulder tattoo</a>'
+	end
+	if pcs_tattoos['side'] <= 0:
+		'You do not have a tattoo on your side'
+	else
+		'<a href="exec: gs ''tattoo_management'', ''remove'', ''side'' & gs ''Cheatmenu_din'', ''tatoo''">Remove your the tattoo on your side</a>'
+	end
+	if pcs_tattoos['tramp'] <= 0:
+		'You do not have a tramp stamp'
+	else
+		'<a href="exec: gs ''tattoo_management'', ''remove'', ''tramp'' & gs ''Cheatmenu_din'', ''tatoo''">Remove your tramp stamp</a>'
+	end
+	if pcs_tattoos['under'] <= 0:
+		'You do not have an under breast tattoo'
+	else
+		'<a href="exec: gs ''tattoo_management'', ''remove'', ''under'' & gs ''Cheatmenu_din'', ''tatoo''">Remove your under breast tattoo</a>'
+	end
+	if pcs_tattoos['wrist'] <= 0:
+		'You do not have a tattoo on your wrist'
+	else
+		'<a href="exec: gs ''tattoo_management'', ''remove'', ''wrist'' & gs ''Cheatmenu_din'', ''tatoo''">Remove your wrist tattoo</a>'
+	end
+	if pcs_tattoos['hand'] <= 0:
+		'You do not have a tattoo on your hand'
+	else
+		'<a href="exec: gs ''tattoo_management'', ''remove'', ''hand'' & gs ''Cheatmenu_din'', ''tatoo''">Remove your hand tattoo</a>'
+	end
 	if cosmetic_tattoo = 0:'You do not have the makup tattoo</a>'
 	if cosmetic_tattoo >= 1:'<a href="exec:cosmetic_tattoo = 0 & dynamic $cheatmenu[''tatoo'']">Remove your makup tattoo</a>'
 end

locations/_face_image.qsrc

@@ -2,6 +2,11 @@
 
 !!use with - <img <<$set_imgh>> src="<<func(''$face_image'')>>">
 
+!! type = 1: custom image
+!! type = 2: 3D generated image
+!! type = 0: picture image
+
+
 if face_style['type'] = 1:
 	if $face_style['avatar_path'] = '': $face_style['avatar_path'] = 'images/avatar.jpg'
 	$result = $face_style['avatar_path']
@@ -296,6 +301,4 @@ else
 end
 
 
-
 --- $face_image ---------------------------------
-

locations/cikl.qsrc

@@ -596,8 +596,8 @@ gs 'stat_sklattrib', 'daycall'
 gs 'body', 'DailyUpdate'
 
 
-!! Set Mira''s schedule for the day
-!gs 'miroslava_schedule', 'cikl'
+!! Set the daily schedules for npc''s
+gs 'schedule', 'cikl'
 
 
 

locations/city_library.qsrc

@@ -31,7 +31,10 @@ if $ARGS[0] = '':
 			menu_off = 1
 			gs 'library_functions', 'read_book', 'splcstng'
 			gs 'stat'
-
+			'<center><b><font color="maroon">Grimoire Magicka</font></b></center>'
+			imageid = rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/library/mage_learning_<<imageid>>.jpg"></center>'
+			killvar 'imageid'
 			'You pick out one of the magic books you can actually read and sit down with it.'
 			'You discover that not only is the subject matter complex and mostly a mystery to you, but the descriptions and explanations are unnecessarily wordy, as if the writer had something to prove.'
 			'After about an hour, you decide to take a break from it and instead test your memory. You don''t remember much, but you understand magic a little better than before.'

locations/homes_properties.qsrc

@@ -1,5 +1,13 @@
 # homes_properties
 
+!! Easier to remember than which number is which.
+NO_ACCESS = 0
+RENTED = 1
+OWNED = 2
+TENANTS = 3
+ACCESSIBLE = 4
+PURCHASED = 5 // Used only for generic checks where both OWNED and TENANTS fulfill the criterion. 
+
 if ARRSIZE('homes') < 16 or ARRSIZE('home_name') < 7:
 	gs 'homes_properties_attr'
 end
@@ -75,11 +83,12 @@ end
 !!			- empty strying   ->  '' - will work as if a location was passed, but will use the actual value of $loc
 !!			- A number as str -> '1', '2' - this should be the id of the property
 !!			  					NOTE: only added in case someone really want to use the old ids
-!! ARGS[2]: ownership type
+!! ARGS[2]: ownership type -> access code
 !!			0: no acces  -> 'no access'
-!!			1: not owned but can live her - a rented property or living at some else''s place
+!!			1: rented - a rented property
 !!			2: owned     -> 'owned'
-!!			3: owned and rented out -> 'tenants'
+!!			3: tenants -> a property that is owned, but inaccessible because it has been rented out
+!!			4: accessible -> not owned, not rented, but can live there - parents, friends, dorm, etc.
 !! ARGS[3]: construction status - optional
 !!			0: land only
 !!			1: foundation, frames built, utilities are connected
@@ -88,115 +97,144 @@ end
 !!			0: not renovated
 !!			1: fully renovated
 if $ARGS[0] = 'set_access':
-	$propcode = iif($ARGS[1] = '', $home_name[$loc], $home_name[$ARGS[1]])
-	orig_status_code = accessible_property[$propcode]
-	new_status_code = ARGS[2]
-	if orig_status_code ! new_status_code:
-		if $accessible_property[$propcode] = '' or $accessible_property['<<$propcode>>-display'] = '' or $accessible_property['<<$propcode>>-name'] = '':
-			if $property['code'] ! $propcode:
-				gs 'homes_properties_attr', 'get_property_attr', $propcode
+
+	$property_code =  iif($ARGS[1] = '', $home_name[$loc], $home_name[$ARGS[1]])
+	original_access_code = accessible_property[$property_code]
+	new_access_code = ARGS[2]
+
+
+
+	if original_access_code ! new_access_code:
+		!! Should only run if the access code has changed
+
+		!! seems unnecessary, but cuts down on typo related bugs.
+		$_display = $property_code+"-display"
+		$_name = $property_code+"-name"
+		$_type = $property_code+"-type"
+		$_construction_state = $property_code+"-construction-status"
+		$_is_home = $property_code+"-is-home"
+		$_is_rental = $property_code+"-rental"
+		$_renovated = $property_code+"-renovated"
+		$_sales_price = $property_code+"-sales-price"
+		$_rent = $property_code+"-rent"
+		$_tenant_day = $property_code+"-tenant-day"
+		$_tenant_month = $property_code+"-tenant-month"
+
+		!! If the below is true, then Sveta never had access to property (or something wiped out the accessible property/home list).
+		if $accessible_property[$property_code] = '' or $accessible_property[$_display] = '' or $accessible_property[$_name] = '':
+			!! This should happen only the first time Sveta gets access to the property.
+			!! Adds the property - with all of its attributes - to the accessible_property list.
+			if $property['code'] ! $property_code: 
+				gs 'homes_properties_attr', 'get_property_attr', $property_code
 			else
 				nokill = 1
 			end
-			if ARGS[2] = 1 and property['rental'] = 0: new_status_code = 4
-			accessible_property[$propcode] = new_status_code
-			$accessible_property[$propcode] = $propcode
-			$accessible_property['<<$propcode>>-name'] = $property['name']
-			$accessible_property['<<$propcode>>-type'] = $property['type']
+
+			$accessible_property[$property_code] = $property_code
+			$accessible_property[$_name] = $property['name']
+			$accessible_property[$_type] = $property['type']
 
 			if property['construction_needed'] = 1:
-				accessible_property['<<$propcode>>-construction-status'] = ARGS[3]
-				$accessible_property['<<$propcode>>-display'] = $property['display_<<ARGS[3]>>']
+				accessible_property[$_construction_state] = ARGS[3]
+				$accessible_property[$_display] = $property['display_<<ARGS[3]>>']
 			else
-				accessible_property['<<$propcode>>-construction-status'] = 2
-				$accessible_property['<<$propcode>>-display'] = $property['display']
+				accessible_property[$_construction_state] = 2
+				$accessible_property[$_display] = $property['display']
 			end
 
-			if INSTR($property['type'], 'residence') > 0: accessible_property['<<$propcode>>-is-home'] = 1
-			accessible_property['<<$propcode>>-rental'] = property['rental']
-			accessible_property['<<$propcode>>-renovated'] = ARGS[4]
-			accessible_property['<<$propcode>>-sales-price'] = property['price']
-			accessible_property['<<$propcode>>-rent'] = property['rent']
+			if INSTR($property['type'], 'residence') > 0: accessible_property[$_is_home] = 1
+			accessible_property[$_is_rental] = property['rental']
+			accessible_property[$_renovated] = ARGS[4]
+			accessible_property[$_sales_price] = property['price']
+			accessible_property[$_rent] = property['rent']
 		end
+		!! If the property code is 4 (ACCESSIBLE) but it is a rental property, then the code should be 1 (RENTED).
+		if new_access_code = 1 and property['rental'] = 1: new_access_code = 1
+		accessible_property[$property_code] = new_access_code
 
-		if accessible_property[$propcode] = 0:
+		if accessible_property[$property_code] = NO_ACCESS:
 			!! If this was the current home then killing it
-			if $home['current'] = $propcode: killvar '$home'
-
+			if $home['current'] = $property_code: killvar '$home'
 			!! Updating home counts
 			!! NOTE: Valid transitions: 1 -> 0, 2 -> 0, 4 -> 0
-			if accessible_property['<<$propcode>>-is-home'] = 1:
-				if orig_status_code = 1:
+			if accessible_property[$_is_home] = 1:
+				if original_access_code = RENTED:
 					accessible_property['rental_home_count'] -= 1
 					accessible_property['available_for_rent_home_count'] += 1
 				end
-				if orig_status_code = 2: accessible_property['owned_home_count'] -= 1
-				if accessible_property['<<$propcode>>-construction-status'] = 2: accessible_property['furnishable_home_count'] -= 1
+				if original_access_code = OWNED: accessible_property['owned_home_count'] -= 1
+				if accessible_property[$_construction_state] = 2: accessible_property['furnishable_home_count'] -= 1
 				accessible_property['accessible_home_count'] -= 1
 				$city_homes[$property['town']] -= 1
 			end
 			if accessible_property['accessible_home_count'] = 1:
 				gs 'homes_properties', 'get_accessible_properties', 'home'
-				if accessible_property['<<$ARGS[1]>>-is-home'] = 1: gs 'homes_properties', 'set_home', $property_code
+				if accessible_property[$_is_home] = 1: gs 'homes_properties', 'set_home', $property_code
 				gs 'homes_properties', 'clean_up_property_data'
 			end
 		!! Property is rented
-		elseif accessible_property[$propcode] = 1:
+		elseif accessible_property[$property_code] = RENTED:
 			!! Updating home counts
 			!! NOTE: Only valid transition is 0 -> 1
-			if accessible_property['<<$propcode>>-is-home'] = 1:
+			if accessible_property[$_is_home] = 1:
 				accessible_property['rental_home_count'] += 1
 				accessible_property['accessible_home_count'] += 1
 				accessible_property['available_for_rent_home_count'] -= 1
-				if accessible_property['<<$propcode>>-construction-status'] = 2: accessible_property['furnishable_home_count'] +=1 
+				if accessible_property[$_construction_state] = 2: accessible_property['furnishable_home_count'] +=1
 				$city_homes[$property['town']] += 1
 			end
 		!! Property is owned
-		elseif accessible_property[$propcode] = 2:
+		elseif accessible_property[$property_code] = OWNED:
 			!! Updating home counts
 			!! NOTE: Valid transitions: 0 -> 2, 1 -> 2, 3-> 2
-			if accessible_property['<<$propcode>>-is-home'] = 1:
-				if orig_status_code = 0:
+			if accessible_property[$_is_home] = 1:
+				if original_access_code = 0:
 					accessible_property['accessible_home_count'] += 1
 					$city_homes[$property['town']] += 1
-				elseif orig_status_code = 1: 
-					accessible_property['rental_home_count'] -= 1 
+				elseif original_access_code = RENTED:
+					accessible_property['rental_home_count'] -= 1
 					accessible_property['available_for_rent_home_count'] += 1
-				elseif orig_status_code = 3:
+				elseif original_access_code = TENANTS:
 					accessible_property['tenant_home_count'] -= 1
-					accessible_property['<<$propcode>>-tenant-day'] = -1
-					accessible_property['<<$propcode>>-tenant-month'] = -1
-					if accessible_property['<<$propcode>>-construction-status'] = 2: accessible_property['furnishable_home_count'] += 1
+					accessible_property[$_tenant_day] = -1
+					accessible_property[$_tenant_month] = -1
+					if accessible_property[$_construction_state] = 2: accessible_property['furnishable_home_count'] += 1
 				end
-				if accessible_property['<<$propcode>>-construction-status'] = 2 and orig_status_code ! 1: accessible_property['furnishable_home_count'] += 1
+				if accessible_property[$_construction_state] = 2 and original_access_code ! 1: accessible_property['furnishable_home_count'] += 1
 				accessible_property['owned_home_count'] += 1
 			end
 		!! Property has tenants
-		elseif accessible_property[$propcode] = 3:
+		elseif accessible_property[$property_code] = TENANTS:
 			!! Updating home counts
 			!! NOTE: Valid transitions: 2 -> 3
-			if accessible_property['<<$propcode>>-is-home'] = 1:
-				if $home['current'] = $propcode: killvar '$home'
+			if accessible_property[$_is_home] = 1:
+				if $home['current'] = $property_code: killvar '$home'
 
 				accessible_property['tenant_home_count'] += 1
 				accessible_property['owned_home_count'] -= 1
 				accessible_property['accessible_home_count'] -= 1
 
-				if accessible_property['<<$propcode>>-construction-status'] = 2: accessible_property['furnishable_home_count'] -= 1
+				if accessible_property[$_construction_state] = 2: accessible_property['furnishable_home_count'] -= 1
 				$city_homes[$property['town']] -= 1
 			end
-		!! Property is just accessible
-		elseif accessible_property[$propcode] = 4:
+		!! Property is just accessible - like the parents' home, or the Meynold's home, etc.
+		elseif accessible_property[$property_code] = ACCESSIBLE:
 			!! Updating home counts
 			!! NOTE: Valid transitions: 0 -> 4
-			if accessible_property['<<$propcode>>-is-home'] = 1:
+			if accessible_property[$_is_home] = 1:
 				accessible_property['accessible_home_count'] += 1
 				$city_homes[$property['town']] += 1
 			end
 		end
 		if nokill = 0 : killvar 'property'
+		
+		killvar '_display' & killvar '_name' & killvar '_type' & killvar '_construction_state'
+		killvar '_is_home' & killvar '_is_rental' & killvar '_renovated' & killvar '_sales_price'
+		killvar '_rent' & 	killvar '_tenant_day' & killvar '_tenant_month' & killvar 'nokill'
 	end
-	killvar 'propcode' & killvar 'orig_status_code' & killvar 'new_status_code' & killvar 'nokill'
+
+	!! Killvar segment
+	killvar 'property_code' & killvar 'original_access_code' & killvar 'new_access_code'
 end
 
 !! Call: dyneval($is_homeless)
@@ -217,7 +255,7 @@ $is_homeless = {
 !!			  					NOTE: only added in case someone really want to use the old ids
 if $ARGS[0] = 'can_live_here':
 	$canlivecode = iif($ARGS[1] = '', $home_name[$loc], $home_name[$ARGS[1]])
-	RESULT = accessible_property[$canlivecode] > 0 and accessible_property[$canlivecode] ! 3 and func('homes_properties', 'get_property_construction_status', $canlivecode) = 2
+	result = accessible_property[$canlivecode] ! NO_ACCESS and accessible_property[$canlivecode] ! TENANTS and func('homes_properties', 'get_property_construction_status', $canlivecode) = 2
 	killvar 'canlivecode'
 end
 
@@ -258,7 +296,7 @@ end
 !! Tells if the location passed in $ARGS[1] or if empty the $loc is of the  queried status.
 !! If true then returns -1, if false 0.
 !!
-!! $ARGS[1]: the status that is checked
+!! $ARGS[1]: the status that is checked as a string
 !!			 Accepted values
 !!			 'rented' -> is the property rented?
 !!			 'owned'  -> is the property is owned (bought by Sveta) ?
@@ -266,8 +304,15 @@ end
 !!			 'purchased' -> both 'owned' and 'tenants'
 !!			 'blocked' -> is the property blocked?
 !!			 'hasaccess' -> can Sveta use the property (without owning or renting it)?
-!!
-!! $ARGS[2]: the location for which the access is set
+!! ARGS[1]: the status that is checked as a number
+!!			 Accepted values
+!!			 RENTED or 1 -> is the property rented?
+!!			 OWNED or 2  -> is the property is owned (bought by Sveta) ?
+!!			 TENANTS or 3 -> are there tenants in the property?
+!!			 NO_ACCESS or 0  -> is the property blocked?
+!!			 ACCESSIBLE or 4 -> can Sveta use the property (without owning or renting it)?
+!!			 PURCHASED or 5 -> both 'owned' and 'tenants'
+!! $ARGS[2]: the location for which the access is checked
 !!			Accepted values
 !!			- property code   -> 'city_apartment', 'parents_home'
 !!			- a location      ->  'bedrPar', 'koo2x' - A value that can shop up in $loc
@@ -277,18 +322,18 @@ end
 if $ARGS[0] = 'is_property_of_status':
 	$propstatcode = iif($ARGS[2] = '', $home_name[$loc], $home_name[$ARGS[2]])
 
-	if $ARGS[1] = 'rented':
-		RESULT = accessible_property[$propstatcode] = 1
-	elseif $ARGS[1] = 'owned':
-		RESULT = accessible_property[$propstatcode] = 2
-	elseif $ARGS[1] = 'tenants':
-		RESULT = accessible_property[$propstatcode] = 3
-	elseif $ARGS[1] = 'blocked':
-		RESULT = accessible_property[$propstatcode] = 0
-	elseif $ARGS[1] = 'hasacces':
-		RESULT = accessible_property[$propstatcode] = 4
-	elseif $ARGS[1] = 'purchased':
-		RESULT = accessible_property[$propstatcode] = 2 or accessible_property[$propstatcode] = 3
+	if $ARGS[1] = 'rented' or ARGS[1] = RENTED:
+		result = accessible_property[$propstatcode] = RENTED
+	elseif $ARGS[1] = 'owned' or ARGS[1] = OWNED:
+		result = accessible_property[$propstatcode] = OWNED
+	elseif $ARGS[1] = 'tenants' or ARGS[1] = TENANTS:
+		result = accessible_property[$propstatcode] = TENANTS
+	elseif $ARGS[1] = 'blocked' or ARGS[1] = NO_ACCESS:
+		result = accessible_property[$propstatcode] = NO_ACCESS
+	elseif $ARGS[1] = 'hasacces' or ARGS[1] = ACCESSIBLE:
+		result = accessible_property[$propstatcode] = ACCESSIBLE
+	elseif $ARGS[1] = 'purchased' or ARGS[1] = PURCHASED:
+		result = accessible_property[$propstatcode] = OWNED or accessible_property[$propstatcode] = TENANTS
 	else
 		RESULT = 0
 	end
@@ -448,7 +493,7 @@ if $ARGS[0] = 'get_owned_properties':
 		:get_owned_properties_loop
 			$getownedpropcode = iif( $ARGS[2] = '', $accessible_property[hp_i], $ARGS[2] )
 			!!'  Index: <b><<hp_i>></b> Code: <b><<$getownedpropcode>></b> Status: <b><<accessible_property[hp_i]>></b>'
-			if $home_name[$getownedpropcode] ! '' and (accessible_property[$getownedpropcode] = 2 or accessible_property[$getownedpropcode] = 3):
+			if $home_name[$getownedpropcode] ! '' and (accessible_property[$getownedpropcode] = OWNED or accessible_property[$getownedpropcode] = TENANTS):
 				!!'    $ARGS[1]: <b><<$ARGS[hp_i]>></b> Is home: <b><<accessible_property[''<<$getownedpropcode>>-is-home'']>></b>'
 				if ($type ! 'home' and accessible_property['<<$getownedpropcode>>-is-home'] = 0) or ($type ! 'business' and accessible_property['<<$getownedpropcode>>-is-home'] = 1):
 					$property_code[hp_j] = $getownedpropcode
@@ -461,7 +506,7 @@ if $ARGS[0] = 'get_owned_properties':
 					end
 
 					$property_type[hp_j] = $accessible_property['<<$getownedpropcode>>-type']
-					if accessible_property[$getownedpropcode] = 3:
+					if accessible_property[$getownedpropcode] = TENANTS:
 						$property_status_display[hp_j] = 'A(n) <<$property_display[hp_j]>> which is currently occupied by your tenants'
 					else
 						$property_status_display[hp_j] = 'A(n) <<$property_display[hp_j]>> ' + iif($accessible_property[$getownedpropcode] = $home['current'], 'where you currently live.', 'which is currently empty.')
@@ -509,11 +554,11 @@ if $ARGS[0] = 'get_accessible_properties':
 					else
 						$property_display[hp_j] = iif($accessible_property[$getaccessiblepropcode] = '', $property['display'], $accessible_property['<<$getaccessiblepropcode>>-display'])
 					end
-					if accessible_property[$getaccessiblepropcode] = 1:
+					if accessible_property[$getaccessiblepropcode] = RENTED:
 						$property_status_display[hp_j] = 'You rent the <<$property_display[hp_j]>> '+iif($accessible_property[$getaccessiblepropcode] = $home['current'], 'where you currently live.', 'which is currently  empty.')
-					elseif accessible_property[$getaccessiblepropcode] = 2:
+					elseif accessible_property[$getaccessiblepropcode] = OWNED:
 						$property_status_display[hp_j] = 'You own the <<$property_display[hp_j]>> ' + iif($accessible_property[$getaccessiblepropcode] = $home['current'], 'where you currently live.', 'which is currently  empty.')
-					elseif accessible_property[$getaccessiblepropcode] = 3:
+					elseif accessible_property[$getaccessiblepropcode] = TENANTS:
 						$property_status_display[hp_j] = 'You own the <<$property_display[hp_j]>> which is currently occupied by your tenants'
 					else
 						$property_status_display[hp_j] = 'You can stay at the <<$property_display[hp_j]>> which is currently occupied by your tenants'
@@ -730,8 +775,8 @@ end
 !!			  					NOTE: only added in case someone really want to use the old ids
 if $ARGS[0] = 'give_access':
 	$accesscode = iif($ARGS[1] = '', $home_name[$loc], $ARGS[1])
-	gs 'homes_properties', 'set_access', $accesscode, 1
-	if accessible_property['accessible_home_count'] = 1 and accessible_property['<<$accesscode>>-is-home'] = 1 and $home['current'] = '': gs 'homes_properties', 'set_home', $accesscode
+	gs 'homes_properties', 'set_access', $accesscode, ACCESSIBLE
+	if accessible_property['accessible_home_count'] = 1 and accessible_property['<<$accesscode>>-is-home'] = 1 and ($home['current'] = '' or dyneval($is_homeless)): gs 'homes_properties', 'set_home', $accesscode
 	killvar '$accesscode'
 end
 
@@ -744,7 +789,7 @@ end
 !!			  					NOTE: only added in case someone really want to use the old ids
 if $ARGS[0] = 'block_access':
 	$blockcode = iif($ARGS[1] = '', $home_name[$loc], $ARGS[1])
-	gs 'homes_properties', 'set_access', $blockcode, 0
+	gs 'homes_properties', 'set_access', $blockcode, NO_ACCESS
 	if accessible_property['accessible_home_count'] = 1 and ($home['current'] = '' or dyneval($is_homeless)):
 		gs 'homes_properties', 'get_accessible_properties', 'home'
 		if accessible_property['<<$property_code>>-is-home'] = 1: gs 'homes_properties', 'set_home', $property_code
@@ -768,7 +813,7 @@ end
 !!			  					NOTE: only added in case someone really want to use the old ids
 if $ARGS[0] = 'has_access':
 	$hasaccesscode = iif($ARGS[1] = '', $home_name[$loc], $ARGS[1])
-	RESULT = accessible_property[$hasaccesscode] > 0 and accessible_property[$hasaccesscode] ! 3
+	result = accessible_property[$hasaccesscode] ! NO_ACCESS and accessible_property[$hasaccesscode] ! TENANTS
 	killvar 'hasaccesscode'
 end
 !! Call: `func('homes_properties', 'homes_in_town', $ARGS[1], ..., $ARGS[N])
@@ -815,7 +860,7 @@ end
 !! $ARGS[1] = the code of the property, e.g. 'city_apartment'
 !! ARGS[2] = the final sales price in the transaction
 if $ARGS[0] = 'buy_property':
-	gs 'homes_properties', 'set_access', $ARGS[1], 2
+	gs 'homes_properties', 'set_access', $ARGS[1], OWNED
 	accessible_property['<<$ARGS[1]>>-sales-price'] = ARGS[2]
 end
 
@@ -826,7 +871,7 @@ end
 !! $ARGS[1] = the code name of the property, e.g. 'city_apartment'
 !! ARGS[2] = the final sales price in the transaction
 if $ARGS[0] = 'sell_property':
-	gs 'homes_properties', 'set_access',$ARGS[1], 0
+	gs 'homes_properties', 'set_access',$ARGS[1], NO_ACCESS
 	accessible_property['<<$ARGS[1]>>-sales-price'] = ARGS[2]
 end
 
@@ -837,10 +882,10 @@ end
 !!  ARGS[2] - the tenancy end day
 !!  ARGS[3] - the tenancy end month
 if $ARGS[0] = 'tenants_move_in':
-	gs 'homes_properties', 'set_access', $ARGS[1], 3
+	gs 'homes_properties', 'set_access', $ARGS[1], TENANTS
 	accessible_property['<<$ARGS[1]>>-tenant-day'] = ARGS[2]
 	accessible_property['<<$ARGS[1]>>-tenant-month'] = ARGS[3]
-	if $home['current'] = '' and accessible_property['accessible_home_count'] = 1:
+	if ($home['current'] = '' or dyneval($is_homeless)) and accessible_property['accessible_home_count'] = 1:
 		gs 'homes_properties', 'get_accessible_properties', 'home'
 		if accessible_property['<<$property_code>>-is-home']: gs 'homes_properties', 'set_home', $property_code
 		gs 'homes_properties', 'clean_up_property_data'
@@ -872,7 +917,7 @@ if $ARGS[0] = 'tenant_move_out_check':
 			$tenantcode = $accessible_property[hp_i]
 			if $home_name[$tenantcode] ! '' and accessible_property[$tenantcode] = 3:
 				if accessible_property['<<$tenantcode>>-tenant-day'] = day and accessible_property['<<$tenantcode>>-tenant-month'] = month:
-					gs 'homes_properties', 'set_access', $tenantcode, 2
+					gs 'homes_properties', 'set_access', $tenantcode, OWNED
 					$result[hp_j] = '<b><font color="red">Your tenants have moved out from your <<$accessible_property[''<<$tenantcode>>-display'']>> and your apartment is now vacant.</font></b>'
 					hp_j += 1
 				end
@@ -881,7 +926,8 @@ if $ARGS[0] = 'tenant_move_out_check':
 			killvar 'property'
 		if hp_i < count: jump 'tenantloop'
 	end
-	if accessible_property['accessible_home_count'] = 1 and $home['current'] = '':
+
+	if accessible_property['accessible_home_count'] = 1 and ($home['current'] = '' or dyneval($is_homeless)):
 		gs 'homes_properties', 'get_accessible_properties', 'home'
 		if accessible_property['<<$property_code>>-is-home'] = 1: gs 'homes_properties', 'set_home', $property_code
 		gs 'homes_properties', 'clean_up_property_data'
@@ -914,9 +960,11 @@ end
 !! Rents a property. For now with immediate effect.
 !!
 !! $ARGS[1] = the code name of the property, e.g. 'city_apartment'
-!!  ARGS[2] = the number of days the rent is paid for, optional
+!!  ARGS[2] = the number of days the rent is paid for, optional.
+!!			  If not set or the value is zero, it will be set to the length of the month 
+!!			  (ie. 28,29,30 or 31 days)
 if $ARGS[0] = 'rent_property':
-	gs 'homes_properties', 'set_access', $ARGS[1], 1
+	gs 'homes_properties', 'set_access', $ARGS[1], RENTED
 	gs 'homes_properties', 'set_rent_days', $ARGS[1], ARGS[2]
 end
 
@@ -925,7 +973,7 @@ end
 !!
 !! $ARGS[1] = the code name of the property, e.g. 'city_apartment'
 if $ARGS[0] = 'cancel_rent':
-	gs 'homes_properties', 'set_access', $ARGS[1], 0
+	gs 'homes_properties', 'set_access', $ARGS[1], NO_ACCESS
 	gs 'homes_properties', 'set_rent_days', $ARGS[1], -1
 	if accessible_property['accessible_home_count'] > 0 and $home['current'] = '':
 		gs 'homes_properties', 'get_accessible_properties', 'home'

locations/pav_train_hall.qsrc

@@ -72,7 +72,7 @@ if $ARGS[0] = '':
 		act 'Go to the ticket office': gt 'pav_train_hall', 'ticket'
 	end
 
-	if drugVars['pav_dropoff'] = 1 and drugVars['heroin_day'] ! daystart and money >= 1500: act 'Find the drug dealer':gs 'events', 'pav_drug_dropoff'
+	if drugVars['pav_dropoff'] = 1 and drugVars['heroin_day'] ! daystart: act 'Find the drug dealer':gs 'events', 'pav_drug_dropoff'
 
 	if vokzalVork >= 1:
 		if cleZalDay ! daystart or cleMTDay ! daystart or cleWTDay ! daystart:

locations/piercing_management.qsrc

@@ -1,21 +1,21 @@
 # piercing_management
 
 if $ARGS[0] = 'totals':
-	if $ARSG[1] = 'ears':
+	if $ARGS[1] = 'ears':
 		result = 24
-	elseif $ARSG[1] = 'nose':
+	elseif $ARGS[1] = 'nose':
 		result = 7
-	elseif $ARSG[1] = 'brow':
+	elseif $ARGS[1] = 'brow':
 		result = 2
-	elseif $ARSG[1] = 'lip':
+	elseif $ARGS[1] = 'lip':
 		result = 7
 	elseif $ARGS[1] = 'tongue':
 		result = 4
-	elseif $ARSG[1] = 'navel':
+	elseif $ARGS[1] = 'navel':
 		result = 4
-	elseif $ARSG[1] = 'nipples':
+	elseif $ARGS[1] = 'nipples':
 		result = 7
-	elseif $ARSG[1] = 'pussy':
+	elseif $ARGS[1] = 'pussy':
 		result = 10
 	end
 	exit
@@ -350,13 +350,9 @@ if $ARGS[0] = 'ears':
 end
 
 if $ARGS[0] = 'ears_image':
-	if ARGS[1] = 0:
-		if pcs_piercings['ears'] > 0:
-			ARGS[1] = pcs_piercings['ears']
-		else
-			ARGS[1] = -pcs_piercings['ears']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_piercings['ears']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/piercings/c<<ARGS[1]>>.jpg'
 	exit
 end
@@ -375,13 +371,9 @@ if $ARGS[0] = 'nose':
 end
 
 if $ARGS[0] = 'nose_image':
-	if ARGS[1] = 0:
-		if pcs_piercings['nose'] > 0:
-			ARGS[1] = pcs_piercings['nose']
-		else
-			ARGS[1] = -pcs_piercings['nose']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_piercings['nose']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/piercings/d<<ARGS[1]>>.jpg'
 	exit
 end
@@ -400,13 +392,9 @@ if $ARGS[0] = 'brow':
 end
 
 if $ARGS[0] = 'brow_image':
-	if ARGS[1] = 0:
-		if pcs_piercings['brow'] > 0:
-			ARGS[1] = pcs_piercings['brow']
-		else
-			ARGS[1] = -pcs_piercings['brow']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_piercings['brow']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/piercings/e<<ARGS[1]>>.jpg'
 	exit
 end
@@ -425,13 +413,9 @@ if $ARGS[0] = 'lip':
 end
 
 if $ARGS[0] = 'lip_image':
-	if ARGS[1] = 0:
-		if pcs_piercings['lip'] > 0:
-			ARGS[1] = pcs_piercings['lip']
-		else
-			ARGS[1] = -pcs_piercings['lip']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_piercings['lip']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/piercings/b<<ARGS[1]>>.jpg'
 	exit
 end
@@ -450,13 +434,9 @@ if $ARGS[0] = 'tongue':
 end
 
 if $ARGS[0] = 'tongue_image':
-	if ARGS[1] = 0:
-		if pcs_piercings['tongue'] > 0:
-			ARGS[1] = pcs_piercings['tongue']
-		else
-			ARGS[1] = -pcs_piercings['tongue']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_piercings['tongue']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/piercings/a<<ARGS[1]>>.jpg'
 	exit
 end
@@ -475,13 +455,9 @@ if $ARGS[0] = 'navel':
 end
 
 if $ARGS[0] = 'navel_image':
-	if ARGS[1] = 0:
-		if pcs_piercings['navel'] > 0:
-			ARGS[1] = pcs_piercings['navel']
-		else
-			ARGS[1] = -pcs_piercings['navel']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_piercings['navel']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/piercings/n<<ARGS[1]>>.jpg'
 	exit
 end
@@ -500,13 +476,9 @@ if $ARGS[0] = 'nipples':
 end
 
 if $ARGS[0] = 'nipples_image':
-	if ARGS[1] = 0:
-		if pcs_piercings['nipples'] > 0:
-			ARGS[1] = pcs_piercings['nipples']
-		else
-			ARGS[1] = -pcs_piercings['nipples']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_piercings['nipples']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/piercings/f<<ARGS[1]>>.jpg'
 	exit
 end
@@ -525,13 +497,9 @@ if $ARGS[0] = 'pussy':
 end
 
 if $ARGS[0] = 'pussy_image':
-	if ARGS[1] = 0:
-		if pcs_piercings['pussy'] > 0:
-			ARGS[1] = pcs_piercings['pussy']
-		else
-			ARGS[1] = -pcs_piercings['pussy']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_piercings['pussy']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/piercings/g<<ARGS[1]>>.jpg'
 	exit
 end

locations/pirsingsalon.qsrc

@@ -946,7 +946,7 @@ if $ARGS[0] = 'tattoo_arm':
 	menu_off = 1
 	gs 'stat'
 
-	if tattoos['arm'] <= 0:
+	if pcs_tattoos['arm'] <= 0:
 		ps_total = func('tattoo_management', 'totals', 'arm')
 		ps_i = 1
 		:looptatarm

locations/pushkin_ballet_class.qsrc

@@ -34,12 +34,8 @@ if $ARGS[0] = 'start':
 
 	!! Random trivia - Terpsichore is one of the nine Greecian muses. Her sphere was dance, rhythm and choral music.
 
-	if (balletqw['daystart'] + 7 = daystart) and hour = 7:
+	if (month=7 and day = 9) and (hour =  6 or hour = 7):
 		gt $loc, 'assessment'
-	elseif ( daystart >= balletqw['daystart'] + 8 ) or (balletqw['daystart'] + 7 = daystart and hour > 7):
-		mod_grade_score['class'] -= 500
-		'You were late or did not attend the exam. You have failed the course.'
-		act 'Return home' : gt 'pav_commcenter'
 	elseif ballet_day = 6 and balletqw['school'] = 1:
 		gs 'stat'
 		gs 'core_library', 'stage_title'
@@ -63,7 +59,9 @@ if $ARGS[0] = 'start':
 		'You grab a shower before you leave to catch the bus that is waiting for you outside. Standing next to it is <<$npc_firstname[''A284'']>>, who addresses you all once you''ve gathered. "I wish you all the best for your future." With that, Birserka returns back into the school.'
 		dynamic $showerdin
 		gs 'stat'
+		gs 'homes_properties', 'set_home', 'parents_home'
 		act 'Return home' : gt 'pav_commcenter'
+
 	elseif balletqw['school'] ! 1 and ballet_day = 1:
 		'You are chaperoned to your school by <<$npc_firstname[''A284'']>>. After a short journey, you were standing outside a classroom and told to wait by <<$npc_firstname[''A284'']>>. You look around you at various photographs and artwork of dancers and performances.'
 		'You look at the girls you are with, with a few of them trying to catch your attention, but before you can talk to them, <<$npc_firstname[''A284'']>> has come back from the classroom. "You can enter now, girls."'
@@ -71,6 +69,10 @@ if $ARGS[0] = 'start':
 	elseif balletqw['school'] ! 1 and ballet_day > 1:
 		'You head to school with your group, and you can see a few of your classmates gossiping up front, but you are left to your own thoughts. Before you realize it, you''re standing at the doors to your first lesson.'
 		act 'Attend class': gt $loc, 'pilates'
+	elseif month ! 7 or ((month = 7 and day = 9) and hour >= 8):
+		mod_grade_score['class'] -= 500
+		'You were late or did not attend the exam. You have failed the course.'
+		act 'Return home' : gt 'pav_commcenter'
 	end
 end
 

locations/pushkin_ballet_init.qsrc

@@ -78,6 +78,14 @@ if $ARGS[0] = 'start':
 	end
 end
 
+if $ARGS[0] = 'reputation':
+	!! Check reputation to have a conversation with the warden
+	if fame['pav_modelling'] >= 10 or fame['pav_slut'] > 9  or fame['city_prostitute'] > 0 or fame['ciy_sexind'] > 0 or fame['city_modelling'] >= 10 or fame['city_slut'] > 30  or fame['city_prostitute'] > 19 or fame['city_sexind'] > 19 or fame['pushkin_modelling'] >= 10 or fame['pushkin_slut'] > 0  fame['pushkin_sex'] > 0 or fame['pushkin_prostitute'] > 0 or fame['pushkin_sexind'] > 0:
+
+		!! gt 'pushkin_ballet_res', 'warden', 'reputation'
+	end
+end
+
 if $ARGS[0] = 'daily_assessment':
 	!! Grade appearance, behaviour and other factors.
 	!! Daily Appearance

locations/pushkin_ballet_res.qsrc

@@ -124,9 +124,9 @@ if $ARGS[0] = 'hallway':
 	nclass = 0
 	gs 'shortgs', 'clothing_status'
 	if $apparel['status'] ! 'nude' and ($apparel['status'] = 'sport' or $apparel['status'] = 'dance'):
-		if (hour = 6 or (hour = 7 and minut <= 30)) and $apparel['status'] = 'sport':
+		if hour = 7 and minut <= 30 and $apparel['status'] = 'sport':
 			act '<b>Attend Ballet Classes</b>': gt 'pushkin_ballet_class', 'start'
-		elseif hour = 7 and (minut > 30 and minut <= 59):
+		elseif (hour = 7 and (minut > 30 and minut <= 59)) or hour >=8 :
 			$balletEv['trigger'] = 'late'
 			gs 'npc_274_init', 'summer_school'
 		else
@@ -268,6 +268,10 @@ if $ARGS[0] = 'warden_room':
 	gs 'stat'
 	gs 'core_library', 'stage_title'
 
+	if $ARGS[1] = 'reputation':
+		!! TODO:
+		"That Talk"
+	end
 	! Punishment or plot
 	act 'Go to the hallway': minut += 5 & ballet_awol = 0 & gt $loc, 'hallway'
 end

locations/sex_ev_after.qsrc

@@ -2237,7 +2237,7 @@ if $ARGS[0] = 'smoke_phone':
 		end
 	end
 	sex_ev['cigarette'] = 1
-	gs'sex_ev_after', 'smoke_phone'
+	gs'sex_ev_after', 'smoke_ciga_react'
 end
 
 if $ARGS[0] = 'smoke_ciga_react':

locations/tattoo_management.qsrc

@@ -1,41 +1,42 @@
 # tattoo_management
 
 if $ARGS[0] = 'totals':
-	if $ARSG[1] = 'ankle':
+	result = 0
+	if $ARGS[1] = 'ankle':
 		result = 25
-	elseif $ARSG[1] = 'arm':
+	elseif $ARGS[1] = 'arm':
 		result = 77
-	elseif $ARSG[1] = 'ass':
+	elseif $ARGS[1] = 'ass':
 		result = 25
-	elseif $ARSG[1] = 'back':
+	elseif $ARGS[1] = 'back':
 		result = 61
-	elseif $ARSG[1] = 'belly':
+	elseif $ARGS[1] = 'belly':
 		result = 21
-	elseif $ARSG[1] = 'breast':
+	elseif $ARGS[1] = 'breast':
 		result = 11
-	elseif $ARSG[1] = 'chest':
+	elseif $ARGS[1] = 'chest':
 		result = 15
-	elseif $ARSG[1] = 'face':
+	elseif $ARGS[1] = 'face':
 		result = 8
-	elseif $ARSG[1] = 'hand':
+	elseif $ARGS[1] = 'hand':
 		result = 9
-	elseif $ARSG[1] = 'leg':
+	elseif $ARGS[1] = 'leg':
 		result = 47
-	elseif $ARSG[1] = 'lip':
+	elseif $ARGS[1] = 'lip':
 		result = 9
-	elseif $ARSG[1] = 'neck':
+	elseif $ARGS[1] = 'neck':
 		result = 30
-	elseif $ARSG[1] = 'pussy':
+	elseif $ARGS[1] = 'pussy':
 		result = 53
-	elseif $ARSG[1] = 'shoulder':
+	elseif $ARGS[1] = 'shoulder':
 		result = 25
-	elseif $ARSG[1] = 'side':
+	elseif $ARGS[1] = 'side':
 		result = 23
-	elseif $ARSG[1] = 'tramp':
+	elseif $ARGS[1] = 'tramp':
 		result = 32
-	elseif $ARSG[1] = 'under':
+	elseif $ARGS[1] = 'under':
 		result = 22
-	elseif $ARSG[1] = 'wrist':
+	elseif $ARGS[1] = 'wrist':
 		result = 51
 	end
 	exit
@@ -88,218 +89,146 @@ end
 
 
 if $ARGS[0] = 'ankle_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['ankle'] > 0:
-			ARGS[1] = pcs_tattoos['ankle']
-		else
-			ARGS[1] = -pcs_tattoos['ankle']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['ankle']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/foot/tatankle<<ARGS[1]>>.jpg'
 	exit
 end
 
 
 if $ARGS[0] = 'arm_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['arm'] > 0:
-			ARGS[1] = pcs_tattoos['arm']
-		else
-			ARGS[1] = -pcs_tattoos['arm']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['arm']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/arms/tatarm<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'ass_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['ass'] > 0:
-			ARGS[1] = pcs_tattoos['ass']
-		else
-			ARGS[1] = -pcs_tattoos['ass']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['ass']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/ass/tatass<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'back_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['back'] > 0:
-			ARGS[1] = pcs_tattoos['back']
-		else
-			ARGS[1] = -pcs_tattoos['back']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['back']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/back/tatback<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'belly_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['belly'] > 0:
-			ARGS[1] = pcs_tattoos['belly']
-		else
-			ARGS[1] = -pcs_tattoos['belly']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['belly']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/belly/tatblly<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'breast_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['breast'] > 0:
-			ARGS[1] = pcs_tattoos['breast']
-		else
-			ARGS[1] = -pcs_tattoos['breast']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['breast']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/breasts/tatbrst<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'chest_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['chest'] > 0:
-			ARGS[1] = pcs_tattoos['chest']
-		else
-			ARGS[1] = -pcs_tattoos['chest']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['chest']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/chest/tatchst<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'face_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['face'] > 0:
-			ARGS[1] = pcs_tattoos['face']
-		else
-			ARGS[1] = -pcs_tattoos['face']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['face']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/face/tatfce<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'hand_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['hand'] > 0:
-			ARGS[1] = pcs_tattoos['hand']
-		else
-			ARGS[1] = -pcs_tattoos['hand']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['hand']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/hand/tathnd<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'leg_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['leg'] > 0:
-			ARGS[1] = pcs_tattoos['leg']
-		else
-			ARGS[1] = -pcs_tattoos['leg']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['leg']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/legs/tatleg<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'lip_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['lip'] > 0:
-			ARGS[1] = pcs_tattoos['lip']
-		else
-			ARGS[1] = -pcs_tattoos['lip']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['lip']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/lip/tatlip<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'neck_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['neck'] > 0:
-			ARGS[1] = pcs_tattoos['neck']
-		else
-			ARGS[1] = -pcs_tattoos['neck']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['neck']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/neck/tatnck<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'pussy_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['pussy'] > 0:
-			ARGS[1] = pcs_tattoos['pussy']
-		else
-			ARGS[1] = -pcs_tattoos['pussy']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['pussy']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/pubic/tatvag<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'shoulder_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['shoulder'] > 0:
-			ARGS[1] = pcs_tattoos['shoulder']
-		else
-			ARGS[1] = -pcs_tattoos['shoulder']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['shoulder']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/shoulder/tatshldr<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'side_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['side'] > 0:
-			ARGS[1] = pcs_tattoos['side']
-		else
-			ARGS[1] = -pcs_tattoos['side']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['side']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/side/tatside<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'tramp_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['tramp'] > 0:
-			ARGS[1] = pcs_tattoos['tramp']
-		else
-			ARGS[1] = -pcs_tattoos['tramp']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['tramp']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/trampStamp/tatlowbck<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'under_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['under'] > 0:
-			ARGS[1] = pcs_tattoos['under']
-		else
-			ARGS[1] = -pcs_tattoos['under']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['under']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/underBreast/tatundbreast<<ARGS[1]>>.jpg'
 	exit
 end
 
 if $ARGS[0] = 'wrist_image':
-	if ARGS[1] = 0:
-		if pcs_tattoos['wrist'] > 0:
-			ARGS[1] = pcs_tattoos['wrist']
-		else
-			ARGS[1] = -pcs_tattoos['wrist']
-		end
-	end
+	if ARGS[1] = 0: ARGS[1] = pcs_tattoos['wrist']
+	if ARGS[1] < 0: ARGS[1] = -ARGS[1]
+
 	$result = 'images/pc/body/tattoos/wrists/tatwrst<<ARGS[1]>>.jpg'
 	exit
 end

locations/telefon.qsrc

@@ -47,7 +47,6 @@ $telefon['header'] = {
 				<td><img src="images/system/icons/icon_statusbar_left.png"></td>
 				<td><<$telefon[''SMSstatus'']>></td>
 				<td align="right"><img src="images/system/icons/icon_statusbar_right.png"></td>
-				end
 			</tr>
 		</table><br>'
 	else
@@ -1987,4 +1986,3 @@ end
 
 
 --- telefon ---------------------------------
-