1
0
Prechádzať zdrojové kódy

[changed] Some cahnges to the default clothing setup, will change some of the links to buttons and might fiddle about a bt more but basically this

Kevin_Smarts 2 rokov pred
rodič
commit
e0eedd45ef
1 zmenil súbory, kde vykonal 80 pridanie a 33 odobranie
  1. 80 33
      locations/wardrobe.qsrc

+ 80 - 33
locations/wardrobe.qsrc

@@ -146,30 +146,79 @@ end
 
 !!---------------------------Oufit stuff----------------------------------
 
+$default_clothing_line = {
+	!! a single line in a clothing list (wardrobe, etc)
+	!! ARGS 0 - action type (wardrobe, sell, resize, store, forsale)
+	!! ARGS 1 - clothing type
+	!! ARGS 2 - clothing index
+
+	gs 'themes', 'clothing', 1
+
+	$RESULT = '<TR bgcolor='+$bgcolor+'>'
+
+	$RESULT +='<TD><b><<$def_clothing_name[default_entry]>></b></TD>'
+	
+	$RESULT +='<TD><img width="100" src="<<FUNC(''$clothing_image'', $defclothingtype[default_entry], defclothingnumber[default_entry])>>"></TD>'
+	$RESULT +='<TD><img width="100" src="<<FUNC(''$panty_image'',  $defpantytype[default_entry], defpantynumber[default_entry])>>"></TD>'
+	$RESULT +='<TD><img width="100" src="<<FUNC(''$bra_image'',  $defbratype[default_entry], defbranumber[default_entry])>>"></TD>'
+	$RESULT +='<TD><img width="100" src="<<FUNC(''$shoe_image'', $defshoetype[default_entry], defshoenumber[default_entry])>>"></TD>'
+	$RESULT +='<TD><img width="100" src="<<FUNC(''$coat_image'',  $defcoattype[default_entry], defcoatnumber[default_entry])>>"</TD>'
+	$RESULT +='<TD><img width="100" src="<<FUNC(''$purse_image'',  $defpursetype[default_entry], defpursenumber[default_entry])>>"></TD>'
+
+	$RESULT +='<TD><a href="exec:gs ''wardrobe'', ''default_entry_wear'', <<default_entry>>">Wear</a></TD>'
+	$RESULT +='<TD><a href="exec:gs ''wardrobe'', ''default_entry_set'', <<default_entry>>">Overwrite</a></TD>'
+	$RESULT +='<TD><a href="exec:gs ''wardrobe'', ''default_entry_rename'', <<default_entry>>">Rename</a></TD>'
+	$RESULT +='<TD><a href="exec:gs ''wardrobe'', ''default_entry_delete'', <<default_entry>>">Delete</a></TD><TR>'
+}
+
+$default_sports_line = {
+	!! a single line in a clothing list (wardrobe, etc)
+	!! ARGS 0 - action type (wardrobe, sell, resize, store, forsale)
+	!! ARGS 1 - clothing type
+	!! ARGS 2 - clothing index
+
+	gs 'themes', 'clothing', 1
+
+	$RESULT = '<TR bgcolor='+$bgcolor+'>'
+
+	$RESULT +='<TD><b><<$sports_clothing_name>></b></TD>'
+	
+	$RESULT +='<TD><img width="100" src="<<FUNC(''$clothing_image'', ''danilovich_outfits'', sportsclothingnumber)>>"></TD>'
+	$RESULT +='<TD><img width="100" src="<<FUNC(''$panty_image'',  $sportspantytype, sportspantynumber)>>"></TD>'
+	$RESULT +='<TD><img width="100" src="<<FUNC(''$bra_image'',  $sportsbratype, sportsbranumber)>>"></TD>'
+	$RESULT +='<TD><img width="100" src="<<FUNC(''$shoe_image'', ''danilovich'', sportsshoenumber)>>"></TD>'
+	$RESULT +='<TD><img width="100" src="<<FUNC(''$coat_image'',  $sportscoattype, sportscoatnumber)>>"></TD>'
+	$RESULT +='<TD><img width="100" src="<<FUNC(''$purse_image'',  $sportspursetype, sportspursenumber)>>"></TD>'
+
+	$RESULT +='<TD><a href="exec:gs ''wardrobe'', ''sports_entry_wear''">Wear</a></TD>'
+	$RESULT +='<TD><a href="exec:gs ''wardrobe'', ''sports_entry_set''">Overwrite</a></TD>'
+	$RESULT +='<TD><a href="exec:gs ''wardrobe'', ''sports_clothing_name''">Rename</a></TD>'
+	$RESULT +='<TD></TD><TR>'
+}
+
 if $ARGS[0] = 'default':
 	gs 'stat'
-	'<center><b>Default outfits</b></center>'
-	'<center><font color="grey">You can overwrite and rename default outfits, but you cannot delete a default outfit.</font></center>'
-	*nl
-	'<center><table width="600">'
-	'<tr><td>'
-	'<b><<$sports_clothing_name>>:</b> <a href="exec:gs ''wardrobe'', ''sports_entry_wear''">Wear</a> | <a href="exec:gs ''wardrobe'', ''sports_entry_set''">Overwrite</a> | <a href="exec:$sports_clothing_name = ''default sports outfit'' & gt ''wardrobe'', ''default''">Reset name</a>'
-	'</td></tr>'
-	'</table></center>'
-	'<center><b>Custom outfits</b></center>'
-	'<center><font color="grey">Choose your clothing, then select "Add as a new custom set" to save your clothing choice</font></center>'
-	*nl
-	'<center><table width="600">'
-	'<tr><td>'
-	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: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
-	'</td></tr>'
+	'<center><table><TH>Name</TH><TH>Outfit</TH><TH>Panties</TH><TH>Bra</TH><TH>Shoes</TH><TH>Coat</TH><TH>Purse</TH><TH></TH><TH></TH><TH></TH><TH></TH><TR>'
+	
+	'<TD></TD><TD></TD><TD></TD><TD><b>Sports outfit</b></TD><TR>'
+
+	*p dyneval($default_sports_line)
+
+	'<TR><TD></TD><TD></TD><TD></TD><TD><b>Default outfits</b></TD><TR>'
+	
+	default_entry = 1
+
+	:loopdefault_entry
+		
+		*p dyneval($default_clothing_line)
+		
+		default_entry += 1
+
+	if default_entry <= 10:jump 'loopdefault_entry'
+	
 	'</table></center>'
+	
+		
 	act 'Return':
 		if quick_dress = 1:
 			killvar '$wloc'
@@ -179,10 +228,8 @@ if $ARGS[0] = 'default':
 			gt $loc, $loc_arg
 		end
 	end
-	act 'Add as a new custom set': gt 'wardrobe', 'default_entry_set', ARRSIZE('defclothingnumber')
-	'<center>Note: Selecting an outfit will show the bonus for equipped shoes, this is only applied when outside.</center>'
-	
-	'</table></center>'
+	act 'Choose items to wear': gt 'wardrobe', 'main'
+	act 'Organise your outfits': org_loc = 1 & gt 'clothing', 'view_clothing_list', 'wardrobe'
 end
 
 if $ARGS[0] = 'default_entry_wear':
@@ -246,7 +293,7 @@ if $ARGS[0] = 'default_entry_wear':
 		'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
 		act 'Return':
 			if $wloc = 'wardrobe':
-				gt 'wardrobe', 'main'
+				gt 'wardrobe', 'default'
 			elseif $wloc = 'workout':
 				gt 'exercise', 'workout'
 			else
@@ -262,7 +309,7 @@ if $ARGS[0] = 'default_entry_wear':
 			gs 'clothing', 'strip'
 			killvar 'default_entry'
 			gs 'stat'
-			gt 'wardrobe', 'main'
+			gt 'wardrobe', 'default'
 		end
 	!! strength of clothing is less than or equal to 0
 	elseif dyneval('RESULT = <<$defclothingtype[default_entry]>>_h[<<defclothingnumber[default_entry]>>]') <= 0:
@@ -273,7 +320,7 @@ if $ARGS[0] = 'default_entry_wear':
 			gs 'clothing', 'strip'
 			killvar 'default_entry'
 			gs 'stat'
-			gt 'wardrobe', 'main'
+			gt 'wardrobe', 'default'
 		end
 	!! clothing exhibition is greater than player exhibition
 	elseif CloInhibit > pcs_inhib:
@@ -284,7 +331,7 @@ if $ARGS[0] = 'default_entry_wear':
 			gs 'clothing', 'strip'
 			killvar 'default_entry'
 			gs 'stat'
-			gt 'wardrobe', 'main'
+			gt 'wardrobe', 'default'
 		end
 	!! not exercise clothing, and not loose fitting
 	elseif $defclothingtype[default_entry] ! 'danilovich_outfits' and CloStyle ! 5:
@@ -298,7 +345,7 @@ if $ARGS[0] = 'default_entry_wear':
 				gs 'clothing', 'strip'
 				killvar 'default_entry'
 				gs 'stat'
-				gt 'wardrobe', 'main'
+				gt 'wardrobe', 'default'
 			end
 		!! clothing ok to wear after passing hip check
 		else
@@ -307,7 +354,7 @@ if $ARGS[0] = 'default_entry_wear':
 			'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
 			act 'Return':
 				if $wloc = 'wardrobe':
-					gt 'wardrobe', 'main'
+					gt 'wardrobe', 'default'
 				elseif $wloc = 'workout':
 					gt 'exercise', 'workout'
 				else
@@ -322,7 +369,7 @@ if $ARGS[0] = 'default_entry_wear':
 		'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
 		act 'Return':
 			if $wloc = 'wardrobe':
-				gt 'wardrobe', 'main'
+				gt 'wardrobe', 'default'
 			elseif $wloc = 'workout':
 				gt 'exercise', 'workout'
 			else
@@ -616,7 +663,7 @@ if $ARGS[0] = 'sports_entry_wear':
 	
 	act 'Return':
 		if $wloc = 'wardrobe':
-			gt 'wardrobe', 'main'
+			gt 'wardrobe', 'default'
 		elseif $wloc = 'workout':
 			gt 'exercise', 'workout'
 		else