Browse Source

Panty ref in bras fix and added new default outfit system (still pretty raw)

KevinSmarts 6 years ago
parent
commit
563e9a4d13
3 changed files with 71 additions and 5 deletions
  1. 3 3
      locations/bras
  2. 62 0
      locations/clothing
  3. 6 2
      locations/wardrobe

+ 3 - 3
locations/bras

@@ -184,19 +184,19 @@ end
 if $ARGS[0] = 'dest0':
 	*clr
 	dynamic '<<$ARGS[2]>>_brasS[<<ARGS[3]>>] = 0'
-	gt 'panties', 'view_panty_item', $ARGS[1], $ARGS[2], ARGS[3]
+	gt 'bras', 'view_bra_item', $ARGS[1], $ARGS[2], ARGS[3]
 end
 
 if $ARGS[0] = 'dest1':
 	*clr
 	dynamic '<<$ARGS[2]>>_brasS[<<ARGS[3]>>] = 1'
-	gt 'panties', 'view_panty_item', $ARGS[1], $ARGS[2], ARGS[3]
+	gt 'bras', 'view_bra_item', $ARGS[1], $ARGS[2], ARGS[3]
 end
 
 if $ARGS[0] = 'dest2':
 	*clr
 	dynamic '<<$ARGS[2]>>_brasS[<<ARGS[3]>>] = 2'
-	gt 'panties', 'view_panty_item', $ARGS[1], $ARGS[2], ARGS[3]
+	gt 'bras', 'view_bra_item', $ARGS[1], $ARGS[2], ARGS[3]
 end
 
 if $ARGS[0] = 'descriptions':

+ 62 - 0
locations/clothing

@@ -765,6 +765,68 @@ if $ARGS[0] = 'wear_last_worn':
 	gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 end
 
+if $ARGS[0] = 'default':
+	gs 'stat'
+	if ARRSIZE('defclothingnumber') = 0:
+		'You have no default outfits set.'
+	else
+		i = 0
+		:loopdefclothing
+		'<<$def_clothing_name[i]>> <a href="exec:gs ''clothing'', ''defaul_entry_wear'', <<i>>">Wear this default outfit</a>'
+		i += 1
+		if i < ARRSIZE('defclothingnumber'):jump 'loopdefclothing'
+	end
+	act 'Return': gt 'wardrobe'
+end
+
+if $ARGS[0] = 'defaul_entry_wear':
+	i = ARGS[1]
+	$clothingworntype[i] = $defclothingtype
+	clothingwornnumber[i] = defclothingnumber
+	$braworntype[i] = $defbratype
+	brawornnumber[i] = defbranumber
+	$pantyworntype[i] = $defpantytype
+	pantywornnumber[i] = defpantynumber
+	$shoeworntype[i] = $defshoetype
+	shoewornnumber[i] = defshoenumber
+	$currentpursetype[i] = $defpursetype
+	currentpursenumber[i] = defpursenumber
+	defaultcoat[i] = defcoat
+	gs 'stat'
+end
+
+if $ARGS[0] = 'default_set':
+	gs 'stat'
+	if ARRSIZE('defclothingnumber') ! 0:
+		i = 0
+		:loopdefclothing_set
+		'<<$def_clothing_name[i]>> <a href="exec:gt ''clothing'', ''defaul_entry_set'', <<i>>">Overwrite this</a>'
+		i += 1
+		if i < ARRSIZE('defclothingnumber'):jump 'loopdefclothing_set'
+	end
+	act 'Add as new default': gt 'clothing', 'defaul_entry_set', ARRSIZE('defclothingnumber')
+	act 'Return': gt 'wardrobe'
+end
+
+if $ARGS[0] = 'defaul_entry_set':
+	gs 'stat'
+	i = ARGS[1]
+	$defclothingtype[i] = $clothingworntype
+	defclothingnumber[i] = clothingwornnumber
+	$defbratype[i] = $braworntype
+	defbranumber[i] = brawornnumber
+	$defpantytype[i] = $pantyworntype
+	defpantynumber[i] = pantywornnumber
+	$defshoetype[i] = $shoeworntype
+	defshoenumber[i] = shoewornnumber
+	$defpursetype[i] = $currentpursetype
+	defpursenumber[i] = currentpursenumber
+	defcoat[i] = defaultcoat
+	
+	$def_clothing_name[i] = 'default <<i>>'
+	$def_clothing_name[i] = input ('Enter name for for this outfit (Leave blank for default)')
+	gt 'clothing', 'default_set'
+end
 
 --- clothing ---------------------------------
 

+ 6 - 2
locations/wardrobe

@@ -5,7 +5,7 @@ if ward_img_hgt = 0:ward_img_hgt = 250
 
 '<center><table border=0 cellspacing=<<ward_img_hgt/25>> cellpadding=5>'
 *p '<TH>Bra worn</TH><TH>Outfit worn</TH><TH>Coat (only worn outside when cold)</TH>'
-*P '<TR><TD><center><a href="exec:gt ''bras'', ''view_bra_list'', ''clean''"><img Height = <<ward_img_hgt>> src="<<FUNC(''$body_image'',''bra'')>>"></a></center></TD><TD><center><a href="exec:gt ''clothing_QV'', ''list''"><img Height = <<ward_img_hgt * 2>> src="<<FUNC(''$body_image'',''clothes'')>>"></a></center></TD><TD><center>'
+*P '<TR><TD><center><a href="exec:gt ''bras'', ''view_bra_list'', ''wardrobe''"><img Height = <<ward_img_hgt>> src="<<FUNC(''$body_image'',''bra'')>>"></a></center></TD><TD><center><a href="exec:gt ''clothing_QV'', ''list''"><img Height = <<ward_img_hgt * 2>> src="<<FUNC(''$body_image'',''clothes'')>>"></a></center></TD><TD><center>'
 if defaultcoat = 0:
 	'<a href="exec:gt ''cloakroom'', ''view_coat_list''"><img Height = <<ward_img_hgt * 2>> src="images/pc/noitemdh.png"></a>'
 else
@@ -34,7 +34,7 @@ end
 '</center></TD>'
 
 *p '<TR><TH>Panties worn</TH><TH>Shoes (Only worn outside)</TH><TH>Purse worn</TH>'
-*P '<TR><TD><center><a href="exec:gt ''panties'', ''view_panty_list'', ''clean''"><img Height = <<ward_img_hgt>> src="<<FUNC(''$body_image'',''panties'')>>"></a></center></TD><TD><center><a href="exec:gt ''shoes'', ''view_shoe_list'', ''wardrobe''"><img Height = <<ward_img_hgt>> src="<<FUNC(''$body_image'', ''shoes'')>>"></a></center></TD><TD><center>'
+*P '<TR><TD><center><a href="exec:gt ''panties'', ''view_panty_list'', ''wardrobe''"><img Height = <<ward_img_hgt>> src="<<FUNC(''$body_image'',''panties'')>>"></a></center></TD><TD><center><a href="exec:gt ''shoes'', ''view_shoe_list'', ''wardrobe''"><img Height = <<ward_img_hgt>> src="<<FUNC(''$body_image'', ''shoes'')>>"></a></center></TD><TD><center>'
 if bag = 1:
 	'<a href="exec:gt ''purses'', ''view_purse_list''"><img Height = <<ward_img_hgt>> src="<<FUNC(''$purse_image'',  $currentpursetype, currentpursenumber)>>"></a>'
 else
@@ -83,6 +83,10 @@ act 'Remove everything':
 	gt 'wardrobe'
 end
 
+act 'Set outfit as a default': gt 'clothing', 'default_set'
+
+act 'Choose a default outfit': gt 'clothing', 'default'
+
 act 'Set image height for this view':
 	cla
 	*clr