Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/obj_din.qsrc

@@ -2065,6 +2065,7 @@ if $ARGS[0] = 'old':
 	addobj '<center>Toggle Debug Variables</center>'
 	addobj '<center>Add Debug Variable</center>'
 	addobj '<center>Delete Debug Variable</center>'
+	addobj '<center>Switch HTML</center>'
 	if cheatTime = 1:
 		addobj '<center>-1 Hour</center>'
 		addobj '<center>+1 Hour</center>'

locations/onobjsel.qsrc

@@ -30,6 +30,9 @@ if $selobj = '<center>Delete Debug Variable</center>':
 	killvar '$tmpVar'
 end
 
+if $selobj = '<center>Switch HTML</center>':
+	usehtml = iif(usehtml,0,1)
+end
 
 
 

locations/wardrobe.qsrc

@@ -138,7 +138,7 @@ if $ARGS[0] = 'default':
 	if ARRSIZE('defclothingnumber') > 0:
 		i = 0
 		:loopdefclothing
-		'<b><<$def_clothing_name[i]>>:</b> <a href="exec:gs ''wardrobe'', ''default_entry_wear'', <<i>>">Wear</a> | <a href="exec:gs ''wardrobe'', ''default_entry_set'', <<i>>">Overwrite</a> | <a href="exec:$def_clothing_name[<<i>>] = ''Custom <<i>>'' & gt ''wardrobe'', ''default''">Reset name</a> | <a href="exec:gs ''wardrobe'', ''default_entry_delete'', <<i>>">Delete</a>'
+		'<b><<$def_clothing_name[i]>>:</b> <a href="exec:gs ''wardrobe'', ''default_entry_wear'', <<i>>">Wear</a> | <a href="exec:gs ''wardrobe'', ''default_entry_set'', <<i>>">Overwrite</a> | <a href="exec:gs ''wardrobe'', ''default_entry_rename'', <<i>>">Rename</a> | <a href="exec:gs ''wardrobe'', ''default_entry_delete'', <<i>>">Delete</a> | <a href="exec:gs ''wardrobe'', ''default_entry_up'', <<i>>">↑</a> | <a href="exec:gs ''wardrobe'', ''default_entry_down'', <<i>>">↓</a>'
 		i += 1
 		if i < ARRSIZE('defclothingnumber'):jump 'loopdefclothing'
 	end
@@ -301,6 +301,124 @@ if $ARGS[0] = 'default_entry_set':
 	gt 'wardrobe', 'default'
 end
 
+if $ARGS[0] = 'default_entry_rename':
+	gs 'stat'
+	i = ARGS[1]
+
+	$def_clothing_temp = '<<$def_clothing_name[i]>>'
+	$def_clothing_name[i] = input ('<center>Enter a name for this outfit set<br><font color="grey">Leaving blank will reuse current name.</font></center>')
+	if $def_clothing_name[i] = '' and $def_clothing_temp = '':
+		$def_clothing_name[i] = 'Custom <<i>>'
+	elseif $def_clothing_name[i] = '':
+		$def_clothing_name[i] = '<<$def_clothing_temp>>'
+	end
+	gt 'wardrobe', 'default'
+end
+
+if $ARGS[0] = 'default_entry_up':
+	gs 'stat'
+	i = ARGS[1]
+
+	if i = 0:
+		j = ARRSIZE('defclothingnumber') - 1
+	else
+		j = i - 1
+	end
+
+	$tempclothingworntype = $defclothingtype[i]
+	tempclothingwornnumber = defclothingnumber[i]
+	$tempbraworntype = $defbratype[i]
+	tempbrawornnumber = defbranumber[i]
+	$temppantyworntype = $defpantytype[i]
+	temppantywornnumber = defpantynumber[i]
+	$tempshoeworntype = $defshoetype[i]
+	tempshoewornnumber = defshoenumber[i]
+	$tempcurrentpursetype = $defpursetype[i]
+	tempcurrentpursenumber = defpursenumber[i]
+	tempdefaultcoat = defcoat[i]
+	$def_clothing_temp = '<<$def_clothing_name[i]>>'
+
+	$defclothingtype[i] = $defclothingtype[j]
+	defclothingnumber[i] = defclothingnumber[j]
+	$defbratype[i] = $defbratype[j]
+	defbranumber[i] = defbranumber[j]
+	$defpantytype[i] = $defpantytype[j]
+	defpantynumber[i] = defpantynumber[j]
+	$defshoetype[i] = $defshoetype[j]
+	defshoenumber[i] = defshoenumber[j]
+	$defpursetype[i] = $defpursetype[j]
+	defpursenumber[i] = defpursenumber[j]
+	defcoat[i] = defcoat[j]
+	$def_clothing_name[i] = '<<$def_clothing_name[j]>>'
+
+	$defclothingtype[j] = $tempclothingworntype
+	defclothingnumber[j] = tempclothingwornnumber
+	$defbratype[j] = $tempbraworntype
+	defbranumber[j] = tempbrawornnumber
+	$defpantytype[j] = $temppantyworntype
+	defpantynumber[j] = temppantywornnumber
+	$defshoetype[j] = $tempshoeworntype
+	defshoenumber[j] = tempshoewornnumber
+	$defpursetype[j] = $tempcurrentpursetype
+	defpursenumber[j] = tempcurrentpursenumber
+	defcoat[j] = tempdefaultcoat
+	$def_clothing_name[j] = '<<$def_clothing_temp>>'
+
+	gt 'wardrobe', 'default'
+end
+
+if $ARGS[0] = 'default_entry_down':
+	gs 'stat'
+	i = ARGS[1]
+
+	if i = ARRSIZE('defclothingnumber') - 1:
+		j = 0
+	else
+		j = i + 1
+	end
+
+	$tempclothingworntype = $defclothingtype[i]
+	tempclothingwornnumber = defclothingnumber[i]
+	$tempbraworntype = $defbratype[i]
+	tempbrawornnumber = defbranumber[i]
+	$temppantyworntype = $defpantytype[i]
+	temppantywornnumber = defpantynumber[i]
+	$tempshoeworntype = $defshoetype[i]
+	tempshoewornnumber = defshoenumber[i]
+	$tempcurrentpursetype = $defpursetype[i]
+	tempcurrentpursenumber = defpursenumber[i]
+	tempdefaultcoat = defcoat[i]
+	$def_clothing_temp = '<<$def_clothing_name[i]>>'
+
+	$defclothingtype[i] = $defclothingtype[j]
+	defclothingnumber[i] = defclothingnumber[j]
+	$defbratype[i] = $defbratype[j]
+	defbranumber[i] = defbranumber[j]
+	$defpantytype[i] = $defpantytype[j]
+	defpantynumber[i] = defpantynumber[j]
+	$defshoetype[i] = $defshoetype[j]
+	defshoenumber[i] = defshoenumber[j]
+	$defpursetype[i] = $defpursetype[j]
+	defpursenumber[i] = defpursenumber[j]
+	defcoat[i] = defcoat[j]
+	$def_clothing_name[i] = '<<$def_clothing_name[j]>>'
+
+	$defclothingtype[j] = $tempclothingworntype
+	defclothingnumber[j] = tempclothingwornnumber
+	$defbratype[j] = $tempbraworntype
+	defbranumber[j] = tempbrawornnumber
+	$defpantytype[j] = $temppantyworntype
+	defpantynumber[j] = temppantywornnumber
+	$defshoetype[j] = $tempshoeworntype
+	defshoenumber[j] = tempshoewornnumber
+	$defpursetype[j] = $tempcurrentpursetype
+	defpursenumber[j] = tempcurrentpursenumber
+	defcoat[j] = tempdefaultcoat
+	$def_clothing_name[j] = '<<$def_clothing_temp>>'
+
+	gt 'wardrobe', 'default'
+end
+
 if $ARGS[0] = 'default_entry_delete':
 	gs 'stat'
 	i = ARGS[1]