Merge remote-tracking branch 'Anjuna/master'

locations/Cheatmenu_din.qsrc

@@ -4,7 +4,7 @@ menu_off = 1
 $cheatmenu['table_start'] = '<center><table width="80%" cellspacing="0" cellpadding="20" valign="top"><tr><td width="500" cellspacing="0" cellpadding="20" valign="top">'
 $cheatmenu['table_second'] = '</td><td width="500" cellspacing="0" cellpadding="20" valign="top">'
 $cheatmenu['table_end'] = '</td></tr></table></center>'
-cla & *clr
+!*clr & cla
 
 $cheatmenu['empty'] = "gs 'Cheatmenu_din', 'empty'"
 if $ARGS[0] = 'empty':
@@ -29,7 +29,7 @@ end
 
 $cheatmenu['setting'] = "gs 'Cheatmenu_din', 'setting'"
 if $ARGS[0] = 'setting':
-	cla & *clr
+	*clr & cla
 	$cheatmenu['this_menu'] = 'setting'
 	$BACKIMAGE = ''
 	if $theme['name'] = 'Custom': gs 'themes', 'check_custom_vars' & gs 'themes', 'set_custom' & gs '$menu_obnovit'
@@ -77,14 +77,14 @@ end
 !! Index
 !!----------------------------------------------------------------------------------------------------------------------------
 
-$cheatmenu['quicktime'] = "gs 'Cheatmenu_din', 'quicktime'"
+$cheatmenu['quicktime'] = "gs 'Cheatmenu_din', 'quicktime', ARGS[0]"
 if $ARGS[0] = 'quicktime':
-	minut += ARGS[0]
+	minut += ARGS[1]
 	gs 'daystart'
 	gs 'outdoors', 'weather'
 	gs 'stat'
 	gs 'fertility', 'cum_arrcheat'
-	cla & *clr
+	*clr & cla
 end
 
 $cheatmenu['dynamic'] = "gs 'Cheatmenu_din', 'dynamic'"
@@ -97,8 +97,8 @@ end
 
 $cheatmenu['vartracker'] = "gs 'Cheatmenu_din', 'vartracker'"
 if $ARGS[0] = 'vartracker':
-	gs'stat'
-	cla & *clr
+	*clr & cla
+	gs 'stat'
 	act 'Return to cheat index': dynamic $cheatmenu['index']
 	'<center><h1>Cheat menu</h1></center>'
 	'<center>For testing purposes.<br>If reporting a bug only the lines in red are neccessary.</center>'
@@ -236,14 +236,14 @@ end
 
 $cheatmenu['index'] = "gs 'Cheatmenu_din', 'index'"
 if $ARGS[0] = 'index':
+	*clr & cla
 	$cheatmenu['this_menu'] = 'index'
-	gs'stat'
 	currhour = (daystart-1) * 24 + hour
 	currday = daystart
 	temp_daystart = daystart
 	temp_hour = hour
 	temp_minut = minut
-	cla & *clr
+	gs 'stat'
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Index</h1></center>'
 	$cheatmenu['table_start']
@@ -382,8 +382,8 @@ end
 
 $cheatmenu['permanent'] = "gs 'Cheatmenu_din', 'permanent'"
 if $ARGS[0] = 'permanent':
-	gs'stat'
-	cla & *clr
+	*clr & cla
+	gs 'stat'
 	gs 'obj_din', 'cheattabs'
 	$cheatmenu['this_menu'] = 'permanent'
 
@@ -467,7 +467,7 @@ end
 
 $cheatmenu['cycle'] = "gs 'Cheatmenu_din', 'cycle'"
 if $ARGS[0] = 'cycle':
-	cla & *clr
+	*clr & cla
 	if cycle ! 5:
 		EggRH = 0
 		LutH = 0
@@ -546,8 +546,8 @@ end
 
 $cheatmenu['state'] = "gs 'Cheatmenu_din', 'state'"
 if $ARGS[0] = 'state':
-	gs'stat'
-	cla & *clr
+	*clr & cla
+	gs 'stat'
 	gs 'obj_din', 'cheattabs'
 
 	'<center><h1>Cheat Menu - Character State Changes</h1></center>'
@@ -622,19 +622,19 @@ if $ARGS[0] = 'state':
 	$cheatmenu['table_end']
 end
 
-$cheatmenu['set_preg_body'] = "gs 'Cheatmenu_din', 'set_preg_body'"
+$cheatmenu['set_preg_body'] = "gs 'Cheatmenu_din', 'set_preg_body', ARGS[0]"
 if $ARGS[0] = 'set_preg_body':
-	pregchem = ARGS[0]
-	pregtime = ARGS[0] / 24
+	pregchem = ARGS[1]
+	pregtime = ARGS[1] / 24
 	gs 'body', 'reset_preg_mass'
 	gs 'body', 'softreset'
 	gs 'stat'
 	dynamic $cheatmenu['bodyMod']
 end
 
-$cheatmenu['set_body_class'] = "gs 'Cheatmenu_din', 'set_body_class'"
+$cheatmenu['set_body_class'] = "gs 'Cheatmenu_din', 'set_body_class', ARGS[0]"
 if $ARGS[0] = 'set_body_class':
-	pcs_mass['body'] = func('body', 'CalcOptBodyMass', ARGS[0])
+	pcs_mass['body'] = func('body', 'CalcOptBodyMass', ARGS[1])
 	gs 'body', 'softreset'
 	gs 'stat'
 	dynamic $cheatmenu['bodyMod']
@@ -642,7 +642,7 @@ end
 
 $cheatmenu['bodyMod'] = "gs 'Cheatmenu_din', 'bodyMod'"
 if $ARGS[0] = 'bodyMod':
-	cla & *clr
+	*clr & cla
 	act 'Return to last menu': dynamic $cheatmenu['state']
 
 	'<center><h1>Cheat Menu - Body Modification</h1></center>'
@@ -775,17 +775,17 @@ if $ARGS[0] = 'rename':
 	killvar '$temp_nickname'
 end
 
-$cheatmenu['setLooks'] = "gs 'Cheatmenu_din', 'setLooks'"
+$cheatmenu['setLooks'] = "gs 'Cheatmenu_din', 'setLooks', $ARGS[0], ARGS[1]"
 if $ARGS[0] = 'setLooks':
-	gs 'shortgs', 'setStat', $ARGS[0], ARGS[1]
+	gs 'shortgs', 'setStat', $ARGS[1], ARGS[2]
 	dynamic $cheatmenu['looks']
 end
 
-$cheatmenu['setLooksInput'] = "gs 'Cheatmenu_din', 'setLooksInput'"
+$cheatmenu['setLooksInput'] = "gs 'Cheatmenu_din', 'setLooksInput', $ARGS[0], $ARGS[1]"
 if $ARGS[0] = 'setLooksInput':
-	$temp_input = $input("Set your <<$ARGS[1]>> level:")
+	$temp_input = $input("Set your <<$ARGS[2]>> level:")
 	if isnum($temp_input) ! 0:
-		gs 'shortgs', 'setStat', $ARGS[0], val($temp_input)
+		gs 'shortgs', 'setStat', $ARGS[1], val($temp_input)
 	elseif $temp_input ! '':
 		msg 'invalid input'
 	end
@@ -793,15 +793,15 @@ if $ARGS[0] = 'setLooksInput':
 	dynamic $cheatmenu['looks']
 end
 
-$cheatmenu['printLooksLinks'] = "gs 'Cheatmenu_din', 'printLooksLinks'"
+$cheatmenu['printLooksLinks'] = "gs 'Cheatmenu_din', 'printLooksLinks', $ARGS[0], $ARGS[1]"
 if $ARGS[0] = 'printLooksLinks':
-	*p '<a href="exec:dynamic $cheatmenu[''setLooks''], ''<<$ARGS[0]>>'', 100">Max</a>  '
-	*p '<a href="exec:dynamic $cheatmenu[''setLooks''], ''<<$ARGS[0]>>'', <<$ARGS[0]>>_lvl + 1">+1</a> '
-	*p '<a href="exec:dynamic $cheatmenu[''setLooks''], ''<<$ARGS[0]>>'', <<$ARGS[0]>>_lvl + 10">+10</a> '
-	*p '<a href="exec:dynamic $cheatmenu[''setLooks''], ''<<$ARGS[0]>>'', <<$ARGS[0]>>_lvl - 1">-1</a> '
-	*p '<a href="exec:dynamic $cheatmenu[''setLooks''], ''<<$ARGS[0]>>'', <<$ARGS[0]>>_lvl - 10">-10</a>  '
-	*p '<a href="exec:dynamic $cheatmenu[''setLooks''], ''<<$ARGS[0]>>'', 0">Min</a>  '
-	*pl '<a href="exec:dynamic $cheatmenu[''setLooksInput''], ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>''">Set</a>'
+	*p '<a href="exec:dynamic $cheatmenu[''setLooks''], ''<<$ARGS[1]>>'', 100">Max</a>  '
+	*p '<a href="exec:dynamic $cheatmenu[''setLooks''], ''<<$ARGS[1]>>'', <<$ARGS[1]>>_lvl + 1">+1</a> '
+	*p '<a href="exec:dynamic $cheatmenu[''setLooks''], ''<<$ARGS[1]>>'', <<$ARGS[1]>>_lvl + 10">+10</a> '
+	*p '<a href="exec:dynamic $cheatmenu[''setLooks''], ''<<$ARGS[1]>>'', <<$ARGS[1]>>_lvl - 1">-1</a> '
+	*p '<a href="exec:dynamic $cheatmenu[''setLooks''], ''<<$ARGS[1]>>'', <<$ARGS[1]>>_lvl - 10">-10</a>  '
+	*p '<a href="exec:dynamic $cheatmenu[''setLooks''], ''<<$ARGS[1]>>'', 0">Min</a>  '
+	*pl '<a href="exec:dynamic $cheatmenu[''setLooksInput''], ''<<$ARGS[1]>>'', ''<<$ARGS[2]>>''">Set</a>'
 end
 
 $cheatmenu['looks'] = "gs 'Cheatmenu_din', 'looks'"
@@ -811,8 +811,8 @@ if $ARGS[0] = 'looks':
 	elseif pcs_hgt > 200:
 		pcs_hgt = 200
 	end
-	gs'stat'
-	cla & *clr
+	*clr & cla
+	gs 'stat'
 	gs 'obj_din', 'cheattabs'
 	'<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>'
@@ -1062,7 +1062,7 @@ if $ARGS[0] = 'assreduce':
 end
 
 if $ARGS[0] = 'vneshpara':
-	cla & *clr
+	*clr & cla
 	'<center><h1>Cheat Menu - ?</h1></center>'
 	act 'Return to appearance menu':dynamic $cheatmenu['looks']
 	*nl
@@ -1108,7 +1108,7 @@ if $ARGS[0] = 'vneshpara':
 end
 
 if $ARGS[0] = 'parameters':
-	cla & *clr
+	*clr & cla
 	'<center><h1>Cheat Menu - Appearance Stats</h1></center>'
 	act 'Return to appearance menu':dynamic $cheatmenu['looks']
 	*nl
@@ -1154,8 +1154,8 @@ end
 
 $cheatmenu['tatoo'] = "gs 'Cheatmenu_din', 'tatoo'"
 if $ARGS[0] = 'tatoo':
-	gs'stat'
-	cla & *clr
+	*clr & cla
+	gs 'stat'
 	'<center><h1>Cheat Menu - Tattoos</h1></center>'
 	act 'Return to appearance menu':dynamic $cheatmenu['looks']
 	*nl
@@ -1203,17 +1203,17 @@ end
 !! Attributes and Skills
 !!----------------------------------------------------------------------------------------------------------------------------
 
-$cheatmenu['setStat'] = "gs 'Cheatmenu_din', 'setStat'"
+$cheatmenu['setStat'] = "gs 'Cheatmenu_din', 'setStat', $ARGS[0], ARGS[1]"
 if $ARGS[0] = 'setStat':
-	gs 'shortgs', 'setStat', $ARGS[0], ARGS[1]
+	gs 'shortgs', 'setStat', $ARGS[1], ARGS[2]
 	dynamic $cheatmenu['stats']
 end
 
-$cheatmenu['setStatInput'] = "gs 'Cheatmenu_din', 'setStatInput'"
+$cheatmenu['setStatInput'] = "gs 'Cheatmenu_din', 'setStatInput', $ARGS[0], $ARGS[1]"
 if $ARGS[0] = 'setStatInput':
-	$temp_input = $input("Set your <<$ARGS[1]>> level:")
+	$temp_input = $input("Set your <<$ARGS[2]>> level:")
 	if isnum($temp_input) ! 0:
-		gs 'shortgs', 'setStat', $ARGS[0], val($temp_input)
+		gs 'shortgs', 'setStat', $ARGS[1], val($temp_input)
 	elseif $temp_input ! '':
 		msg 'invalid input'
 	end
@@ -1221,11 +1221,11 @@ if $ARGS[0] = 'setStatInput':
 	dynamic $cheatmenu['stats']
 end
 
-$cheatmenu['setStatInputInverted'] = "gs 'Cheatmenu_din', 'setStatInputInverted'"
+$cheatmenu['setStatInputInverted'] = "gs 'Cheatmenu_din', 'setStatInputInverted', $ARGS[0], $ARGS[1]"
 if $ARGS[0] = 'setStatInputInverted':
-	$temp_input = $input("Set your <<$ARGS[1]>> level:")
+	$temp_input = $input("Set your <<$ARGS[2]>> level:")
 	if isnum($temp_input) ! 0:
-		gs 'shortgs', 'setStat', $ARGS[0], (100 - val($temp_input))
+		gs 'shortgs', 'setStat', $ARGS[1], (100 - val($temp_input))
 	elseif $temp_input ! '':
 		msg 'invalid input'
 	end
@@ -1233,7 +1233,7 @@ if $ARGS[0] = 'setStatInputInverted':
 	dynamic $cheatmenu['stats']
 end
 
-$cheatmenu['setAttrs'] = "gs 'Cheatmenu_din', 'setAttrs'"
+$cheatmenu['setAttrs'] = "gs 'Cheatmenu_din', 'setAttrs', ARGS[0]"
 if $ARGS[0] = 'setAttrs':
 	loop_index = 0
 	!! skip stren_plus and butt_tr
@@ -1241,53 +1241,53 @@ if $ARGS[0] = 'setAttrs':
 	!! skip magik in nonmagic starts
 	if $start_type[1] = 'nomagic': loop_index_max -= 1
 	:set_attrs_loop
-		gs 'shortgs', 'setStat', $att_name[loop_index], ARGS[0]
+		gs 'shortgs', 'setStat', $att_name[loop_index], ARGS[1]
 		loop_index += 1
 		if loop_index < loop_index_max: jump 'set_attrs_loop'
 	killvar 'loop_index' & killvar 'loop_index_max'
 	dynamic $cheatmenu['stats']
 end
 
-$cheatmenu['setSkills'] = "gs 'Cheatmenu_din', 'setSkills'"
+$cheatmenu['setSkills'] = "gs 'Cheatmenu_din', 'setSkills', ARGS[0]"
 if $ARGS[0] = 'setSkills':
 	loop_index = 0
 	loop_index_max = arrsize('$skl_name')
 	:set_skills_loop
 		!! Inhibition (number 33) isn''t a skill so we''ll skip it
 		if loop_index = 33: loop_index += 1 & jump 'set_skills_loop'
-		gs 'shortgs', 'setStat', $skl_name[loop_index], ARGS[0]
+		gs 'shortgs', 'setStat', $skl_name[loop_index], ARGS[1]
 		loop_index += 1
 		if loop_index < loop_index_max: jump 'set_skills_loop'
 	killvar 'loop_index' & killvar 'loop_index_max'
 	dynamic $cheatmenu['stats']
 end
 
-$cheatmenu['printStatLinks'] = "gs 'Cheatmenu_din', 'printStatLinks'"
+$cheatmenu['printStatLinks'] = "gs 'Cheatmenu_din', 'printStatLinks', $ARGS[0], $ARGS[1]"
 if $ARGS[0] = 'printStatLinks':
-	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[0]>>'', 100">Max</a>  '
-	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[0]>>'', <<$ARGS[0]>>_lvl + 1">+1</a> '
-	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[0]>>'', <<$ARGS[0]>>_lvl + 10">+10</a> '
-	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[0]>>'', <<$ARGS[0]>>_lvl - 1">-1</a> '
-	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[0]>>'', <<$ARGS[0]>>_lvl - 10">-10</a>  '
-	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[0]>>'', 0">Min</a>  '
-	*pl '<a href="exec:dynamic $cheatmenu[''setStatInput''], ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>''">Set</a>'
+	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[1]>>'', 100">Max</a>  '
+	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[1]>>'', <<$ARGS[1]>>_lvl + 1">+1</a> '
+	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[1]>>'', <<$ARGS[1]>>_lvl + 10">+10</a> '
+	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[1]>>'', <<$ARGS[1]>>_lvl - 1">-1</a> '
+	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[1]>>'', <<$ARGS[1]>>_lvl - 10">-10</a>  '
+	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[1]>>'', 0">Min</a>  '
+	*pl '<a href="exec:dynamic $cheatmenu[''setStatInput''], ''<<$ARGS[1]>>'', ''<<$ARGS[2]>>''">Set</a>'
 end
 
-$cheatmenu['printStatLinksInverted'] = "gs 'Cheatmenu_din', 'printStatLinksInverted'"
+$cheatmenu['printStatLinksInverted'] = "gs 'Cheatmenu_din', 'printStatLinksInverted', $ARGS[0], $ARGS[1]"
 if $ARGS[0] = 'printStatLinksInverted':
-	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[0]>>'', 0">Max</a>  '
-	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[0]>>'', <<$ARGS[0]>>_lvl - 1">+1</a> '
-	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[0]>>'', <<$ARGS[0]>>_lvl - 10">+10</a> '
-	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[0]>>'', <<$ARGS[0]>>_lvl + 1">-1</a> '
-	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[0]>>'', <<$ARGS[0]>>_lvl + 10">-10</a>  '
-	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[0]>>'', 100">Min</a>  '
-	*pl '<a href="exec:dynamic $cheatmenu[''setStatInputInverted''], ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>''">Set</a>'
+	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[1]>>'', 0">Max</a>  '
+	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[1]>>'', <<$ARGS[1]>>_lvl - 1">+1</a> '
+	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[1]>>'', <<$ARGS[1]>>_lvl - 10">+10</a> '
+	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[1]>>'', <<$ARGS[1]>>_lvl + 1">-1</a> '
+	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[1]>>'', <<$ARGS[1]>>_lvl + 10">-10</a>  '
+	*p '<a href="exec:dynamic $cheatmenu[''setStat''], ''<<$ARGS[1]>>'', 100">Min</a>  '
+	*pl '<a href="exec:dynamic $cheatmenu[''setStatInputInverted''], ''<<$ARGS[1]>>'', ''<<$ARGS[2]>>''">Set</a>'
 end
 
 $cheatmenu['stats'] = "gs 'Cheatmenu_din', 'stats'"
 if $ARGS[0] = 'stats':
+	*clr & cla
 	gs 'stat'
-	cla & *clr
 	gs 'obj_din', 'cheattabs'
 
 	'<center><h1>Cheat Menu - Attributes and Skills</h1></center>'
@@ -1396,8 +1396,8 @@ end
 
 $cheatmenu['reputation'] = "gs 'Cheatmenu_din', 'reputation'"
 if $ARGS[0] = 'reputation':
-	gs'stat'
-	cla & *clr
+	*clr & cla
+	gs 'stat'
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Relationships and Renown</h1></center>'
 	'<center>Relationship values are from 0 - 100.</center>'
@@ -1699,8 +1699,8 @@ end
 
 $cheatmenu['documents'] = "gs 'Cheatmenu_din', 'documents'"
 if $ARGS[0] = 'documents':
-	gs'stat'
-	cla & *clr
+	*clr & cla
+	gs 'stat'
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Diplomas, Licences, and Certificates</h1></center>'
 	$cheatmenu['table_start']
@@ -1737,8 +1737,8 @@ end
 
 $cheatmenu['week'] = "gs 'Cheatmenu_din', 'week'"
 if $ARGS[0] = 'week':
-	gs'stat'
-	cla & *clr
+	*clr & cla
+	gs 'stat'
 	'<center><a href="exec:dynamic $cheatmenu[''index'']"><b>Cheat menu</b></a> - <a href="exec:dynamic $cheatmenu[''time'']"><b>Time</b></a></center>'
 	*nl
 	'Current time: <b><<$week[week]>></b>, <b><<day>></b>. day of <b><<$month>></b>, <b><<year>></b>, <<$tempcurtime>>'
@@ -1755,8 +1755,8 @@ end
 
 $cheatmenu['month'] = "gs 'Cheatmenu_din', 'month'"
 if $ARGS[0] = 'month':
-	gs'stat'
-	cla & *clr
+	*clr & cla
+	gs 'stat'
 	'<center><a href="exec:dynamic $cheatmenu[''index'']"><b>Cheat menu</b></a> - <a href="exec:dynamic $cheatmenu[''time'']"><b>Time</b></a></center>'
 	*nl
 	'Current time: <b><<$week[week]>></b>, <b><<day>></b>. day of <b><<$month>></b>, <b><<year>></b>, <<$tempcurtime>>'
@@ -1776,9 +1776,9 @@ if $ARGS[0] = 'month':
 	'<a href="exec:dynamic $cheatmenu[''month2''], 12">December</a>'
 end
 
-$cheatmenu['month2'] = "gs 'Cheatmenu_din', 'month2'"
+$cheatmenu['month2'] = "gs 'Cheatmenu_din', 'month2', $ARGS[0]"
 if $ARGS[0] = 'month2':
-	gs 'daystart', 'to_daystart', 1, ARGS[0], temp_year
+	gs 'daystart', 'to_daystart', 1, ARGS[1], temp_year
 	temp_daystart = dateVars['daystart']
 	dynamic $cheatmenu['time']
 end
@@ -1813,7 +1813,7 @@ if $ARGS[0] = 'time':
 			if femcycloop > 0: jump 'femcycloop'
 		end
 	end
-	cla & *clr
+	*clr & cla
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Manipulate Time and Weather</h1></center>'
 	'<center><font color="red"><b>WARNING!</b></font>: Using cheats to manipulate time can <b>easily</b> break quests and cause bugs. Do not use them unless'
@@ -1876,14 +1876,14 @@ end
 !! Magic
 !!----------------------------------------------------------------------------------------------------------------------------
 
-$cheatmenu['magicTable'] = "gs 'Cheatmenu_din', 'magicTable'"
+$cheatmenu['magicTable'] = "gs 'Cheatmenu_din', 'magicTable', $ARGS[0], $ARGS[1]"
 if $ARGS[0] = 'magicTable':
 	!Build a cheat table for spells with a given Array of spell names.
-	!	ARGS[0] = Friendly name for table
-	!	ARGS[1] = the name of the arraay to use
+	!	ARGS[1] = Friendly name for table
+	!	ARGS[2] = the name of the arraay to use
 
-	$SpellTabName = $ARGS[0]
-	$ThisArrName = $ARGS[1]
+	$SpellTabName = $ARGS[1]
+	$ThisArrName = $ARGS[2]
 	maxArrSizeC = dyneval("result=arrsize('<<$ThisArrName>>')")
 
 	! make the header for the table
@@ -1972,7 +1972,7 @@ end
 
 $cheatmenu['succubreset'] = "gs 'Cheatmenu_din', 'succubreset'"
 if $ARGS[0] = 'succubreset':
-	cla & *clr
+	*clr & cla
 	'Are you sure you want to reset your Succubus status? You will lose all levels, saved power, and succubus skill levels.'
 	*nl
 	'<a href="exec:dynamic $cheatmenu[''magic'']"><b>No, nevermind.</b></a>'
@@ -1982,8 +1982,8 @@ end
 
 $cheatmenu['magic'] = "gs 'Cheatmenu_din', 'magic'"
 if $ARGS[0] = 'magic':
-	gs'stat'
-	cla & *clr
+	*clr & cla
+	gs 'stat'
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Magic</h1></center>'
 	$cheatmenu['table_start']
@@ -2040,7 +2040,7 @@ end
 
 $cheatmenu['display'] = "gs 'Cheatmenu_din', 'display'"
 if $ARGS[0] = 'display':
-	cla & *clr
+	*clr & cla
 	gs 'obj_din', 'settingtabs'
 	'<center><h1>Display Setting</h1></center>'
 	$cheatmenu['table_start']
@@ -2110,12 +2110,14 @@ if $ARGS[0] = 'display':
 	$cheatmenu['table_end']
 end
 
-$cheatmenu['theme_customize_input'] = "gs 'Cheatmenu_din', 'theme_customize_input'"
+
+! BROKEN
+$cheatmenu['theme_customize_input'] = "iif($ARGS[1] = '', dynamic 'gs ''Cheatmenu_din'', ''theme_customize_input'', $ARGS[0], ARGS[1], dynamic 'gs ''Cheatmenu_din'', ''theme_customize_input'', $ARGS[0], $ARGS[1], ARGS[2])"
 if $ARGS[0] = 'theme_customize_input':
-	if $ARGS[0] = 'fname':
+	if $ARGS[1] = 'fname':
 		$temp_input = $trim($input('Enter Font name:'))
 		if $temp_input ! '': $custom_theme['fname'] = $temp_input
-	elseif $ARGS[0] = 'fsize':
+	elseif $ARGS[1] = 'fsize':
 		$temp_input = $trim($input('Enter Font size:'))
 		if $temp_input ! '':
 			if isnum($temp_input):
@@ -2124,7 +2126,7 @@ if $ARGS[0] = 'theme_customize_input':
 				msg 'invalid input'
 			end
 		end
-	elseif $ARGS[0] = 'increment':
+	elseif $ARGS[1] = 'increment':
 		$temp_input = $trim($input('Enter increment:'))
 		if $temp_input ! '':
 			if isnum($temp_input):
@@ -2133,9 +2135,9 @@ if $ARGS[0] = 'theme_customize_input':
 				msg 'invalid input'
 			end
 		end
-	elseif $ARGS[0] = 'rgb':
-		result = ARGS[2]
-		$temp_input = $ucase($trim($input('Enter <<$ARGS[1]>> color component in 0 - 255 or 00 - FF format')))
+	elseif $ARGS[1] = 'rgb':
+		result = ARGS[3]
+		$temp_input = $ucase($trim($input('Enter <<$ARGS[2]>> color component in 0 - 255 or 00 - FF format')))
 		if $temp_input ! '':
 			if isnum($temp_input) ! 0:
 				if val($temp_input) < 0 or val($temp_input) > 255:
@@ -2152,17 +2154,17 @@ if $ARGS[0] = 'theme_customize_input':
 			end
 		end
 		if arrsize('temp_result') = 1:
-			if $ARGS[1] = 'red':
-				result = ((ARGS[2] and (-256)) or temp_result)
-			elseif $ARGS[1] = 'green':
-				result = ((ARGS[2] and (-65281)) or (temp_result * 256))
-			elseif $ARGS[1] = 'blue':
-				result = ((ARGS[2] and (-16711681)) or (temp_result * 65536))
+			if $ARGS[2] = 'red':
+				result = ((ARGS[3] and (-256)) or temp_result)
+			elseif $ARGS[2] = 'green':
+				result = ((ARGS[3] and (-65281)) or (temp_result * 256))
+			elseif $ARGS[2] = 'blue':
+				result = ((ARGS[3] and (-16711681)) or (temp_result * 65536))
 			end
 		end
 		killvar 'temp_result'
-	elseif $ARGS[0] = 'hex':
-		result = ARGS[1]
+	elseif $ARGS[1] = 'hex':
+		result = ARGS[2]
 		$temp_input = $ucase($trim($input('Enter color in ABC or AABBCC format')))
 		if $temp_input ! '':
 			$temp_input = $replace($temp_input, '#')
@@ -2199,41 +2201,41 @@ if $ARGS[0] = 'theme_customize_input':
 	killvar '$temp_input'
 end
 
-$cheatmenu['extract_color_component'] = "gs 'Cheatmenu_din', 'extract_color_component'"
+$cheatmenu['extract_color_component'] = "gs 'Cheatmenu_din', 'extract_color_component', $ARGS[0], ARGS[1]"
 if $ARGS[0] = 'extract_color_component':
-	if $ARGS[0] = 'red':
-		result = (ARGS[1] and 255)
-	elseif $ARGS[0] = 'green':
-		result = ((ARGS[1] and 65280) / 256)
-	elseif $ARGS[0] = 'blue':
-		result = ((ARGS[1] and 16711680) / 65536)
+	if $ARGS[1] = 'red':
+		result = (ARGS[2] and 255)
+	elseif $ARGS[1] = 'green':
+		result = ((ARGS[2] and 65280) / 256)
+	elseif $ARGS[2] = 'blue':
+		result = ((ARGS[2] and 16711680) / 65536)
 	end
 end
 
-$cheatmenu['theme_customize_increment'] = "gs 'Cheatmenu_din', 'theme_customize_increment'"
+$cheatmenu['theme_customize_increment'] = "gs 'Cheatmenu_din', 'theme_customize_increment', $ARGS[0], $ARGS[1], ARGS[2], ARGS[3]"
 if $ARGS[0] = 'theme_customize_increment':
-	if $ARGS[0] = 'rgb':
-		result = dyneval($cheatmenu['extract_color_component'], $ARGS[1], ARGS[2]) + ARGS[3]
+	if $ARGS[1] = 'rgb':
+		result = dyneval($cheatmenu['extract_color_component'], $ARGS[2], ARGS[3]) + ARGS[4]
 		result = iif(result > 255, result - 256, iif(result < 0, 256 + result, result))
-		if $ARGS[1] = 'red':
-			result = ((ARGS[2] and (-256)) or result)
-		elseif $ARGS[1] = 'green':
-			result = ((ARGS[2] and (-65281)) or (result * 256))
-		elseif $ARGS[1] = 'blue':
-			result = ((ARGS[2] and (-16711681)) or (result * 65536))
+		if $ARGS[2] = 'red':
+			result = ((ARGS[3] and (-256)) or result)
+		elseif $ARGS[2] = 'green':
+			result = ((ARGS[3] and (-65281)) or (result * 256))
+		elseif $ARGS[2] = 'blue':
+			result = ((ARGS[3] and (-16711681)) or (result * 65536))
 		else
 			result = ARGS[2]
 		end
 	end
 end
 
-$cheatmenu['theme_customize_print_color_line'] = "gs 'Cheatmenu_din', 'theme_customize_print_color_line'"
+$cheatmenu['theme_customize_print_color_line'] = "gs 'Cheatmenu_din', 'theme_customize_print_color_line', $ARGS[0], $ARGS[1]"
 if $ARGS[0] = 'theme_customize_print_color_line':
-	$result = '<a href="exec: <<$ARGS[1]>> = dyneval($cheatmenu[''theme_customize_increment''], ''rgb'', ''<<$ARGS[0]>>'', <<$ARGS[1]>>, -custom_theme[''increment'']) & dynamic $cheatmenu[''theme_customize'']"><img src="images/system/ui/less<<$icon_selector>>.png" height="<<icon_height>>"></img></a>'
-	$result += '&nbsp;<<dyneval($cheatmenu[''extract_color_component''], ''<<$ARGS[0]>>'', dyneval(''result = <<$ARGS[1]>>''))>>&nbsp;'
-	$result += '<a href="exec: <<$ARGS[1]>> = dyneval($cheatmenu[''theme_customize_increment''], ''rgb'', ''<<$ARGS[0]>>'', <<$ARGS[1]>>, custom_theme[''increment'']) & dynamic $cheatmenu[''theme_customize'']"><img src="images/system/ui/more<<$icon_selector>>.png" height="<<icon_height>>"></img></a>'
+	$result = '<a href="exec: <<$ARGS[2]>> = dyneval($cheatmenu[''theme_customize_increment''], ''rgb'', ''<<$ARGS[1]>>'', <<$ARGS[2]>>, -custom_theme[''increment'']) & dynamic $cheatmenu[''theme_customize'']"><img src="images/system/ui/less<<$icon_selector>>.png" height="<<icon_height>>"></img></a>'
+	$result += '&nbsp;<<dyneval($cheatmenu[''extract_color_component''], ''<<$ARGS[1]>>'', dyneval(''result = <<$ARGS[2]>>''))>>&nbsp;'
+	$result += '<a href="exec: <<$ARGS[2]>> = dyneval($cheatmenu[''theme_customize_increment''], ''rgb'', ''<<$ARGS[1]>>'', <<$ARGS[2]>>, custom_theme[''increment'']) & dynamic $cheatmenu[''theme_customize'']"><img src="images/system/ui/more<<$icon_selector>>.png" height="<<icon_height>>"></img></a>'
 	$result += '&nbsp;'
-	$result += '<a href="exec: <<$ARGS[1]>> = dyneval($cheatmenu[''theme_customize_input''], ''rgb'', ''<<$ARGS[0]>>'', <<$ARGS[1]>>) & dynamic $cheatmenu[''theme_customize'']"><img src="images/system/ui/pencil<<$icon_selector>>.png" height="<<icon_height>>"></img></a>'
+	$result += '<a href="exec: <<$ARGS[2]>> = dyneval($cheatmenu[''theme_customize_input''], ''rgb'', ''<<$ARGS[1]>>'', <<$ARGS[2]>>) & dynamic $cheatmenu[''theme_customize'']"><img src="images/system/ui/pencil<<$icon_selector>>.png" height="<<icon_height>>"></img></a>'
 end
 
 $cheatmenu['theme_presets_copy'] = "gs 'Cheatmenu_din', 'theme_presets_copy'"
@@ -2256,7 +2258,7 @@ end
 
 $cheatmenu['theme_export'] = "gs 'Cheatmenu_din', 'theme_export'"
 if $ARGS[0] = 'theme_export':
-	cla & *clr
+	*clr & cla
 	act 'Return': dynamic $cheatmenu['theme_customize']
 	"$custom_theme['fname'] = '<<$custom_theme['fname']>>'"
 	"custom_theme['fsize'] = <<custom_theme['fsize']>>"
@@ -2424,8 +2426,8 @@ end
 
 $cheatmenu['status'] = "gs 'Cheatmenu_din', 'status'"
 if $ARGS[0] = 'status':
+	*clr & cla
 	gs 'stat'
-	cla & *clr
 	gs 'obj_din', 'settingtabs'
 	'<center><h1>Status Window Settings</h1></center>'
 	$cheatmenu['table_start']
@@ -2574,7 +2576,7 @@ end
 
 $cheatmenu['theme'] = "gs 'Cheatmenu_din', 'theme'"
 if $ARGS[0] = 'theme':
-	cla & *clr
+	*clr & cla
 	gs 'obj_din', 'settingtabs'
 	'<center><h1>Phone Theme Menu</h1></center>'
 	$cheatmenu['table_start']
@@ -2664,7 +2666,7 @@ if $ARGS[0] = 'pain':
 	if pain['clitoris'] < 0: pain['clitoris'] = 0
 	if pain['urethra'] < 0: pain['urethra'] = 0
 	if pain['cervix'] < 0: pain['cervix'] = 0
-	cla & *clr
+	*clr & cla
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Pain Management</h1></center>'
 	'<center><a href="exec:killvar ''pain'' & dynamic $cheatmenu[''pain'']">No pain</a></center>'
@@ -2746,7 +2748,7 @@ end
 
 $cheatmenu['DNA'] = "gs 'Cheatmenu_din', 'DNA'"
 if $ARGS[0] = 'DNA':
-	cla & *clr
+	*clr & cla
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - DNA Generation</h1></center>'
 	$cheatmenu['table_start']
@@ -2931,7 +2933,7 @@ end
 
 $cheatmenu['fame'] = "gs 'Cheatmenu_din', 'fame'"
 if $ARGS[0] = 'fame':
-	cla & *clr
+	*clr & cla
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Fame</h1></center>'
 	$table['fame'] = '<center><table width="90%" cellspacing="0" cellpadding="5" valign="top" border="1">'
@@ -3082,7 +3084,7 @@ end
 
 $cheatmenu['bdimcstadd'] = "gs 'Cheatmenu_din', 'bdimcstadd'"
 if $ARGS[0] = 'bdimcstadd':
-	cla & *clr
+	*clr & cla
 	'<center><b>Body Image Set Addition</b></center>'
 	'<a href="exec:killvar ''klsetask'' & dynamic $cheatmenu[''bdimmain'']"><b>Go Back</b></a>'
 	*nl
@@ -3109,8 +3111,8 @@ end
 
 $cheatmenu['bdimdisplay'] = "gs 'Cheatmenu_din', 'bdimdisplay'"
 if $ARGS[0] = 'bdimdisplay':
+	*clr & cla
 	gs 'stat'
-	cla & *clr
 	'<center><h1>Cheat menu</h1></center>'
 	*nl
 	'<center><b>Body Image Set Display</b></center>'
@@ -3212,7 +3214,7 @@ end
 
 $cheatmenu['bdimcstdel'] = "gs 'Cheatmenu_din', 'bdimcstdel'"
 if $ARGS[0] = 'bdimcstdel':
-	cla & *clr
+	*clr & cla
 	'<center><b>Body Image Set Removal</b></center>'
 	'<a href="exec:killvar ''klsetask'' & dynamic $cheatmenu[''bdimdisplay'']"><b>Go Back</b></a>'
 	*nl
@@ -3266,8 +3268,8 @@ end
 
 $cheatmenu['bdimmain'] = "gs 'Cheatmenu_din', 'bdimmain'"
 if $ARGS[0] = 'bdimmain':
+	*clr & cla
 	gs 'stat'
-	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Body Image Sets</h1></center>'
 	$cheatmenu['table_start']
@@ -3341,8 +3343,8 @@ end
 
 $cheatmenu['about'] = "gs 'Cheatmenu_din', 'about'"
 if $ARGS[0] = 'about':
+	*clr & cla
 	gs 'stat'
-	cla & *clr
 	gs 'obj_din', 'settingtabs'
 	gs 'saveg'
 	gs 'addbuilddate'
@@ -3362,8 +3364,8 @@ end
 
 $cheatmenu['items'] = "gs 'Cheatmenu_din', 'items'"
 if $ARGS[0] = 'items':
-	gs'stat'
-	cla & *clr
+	*clr & cla
+	gs 'stat'
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Items</h1></center>'