Explorar o código

fix typo and purse stuff

rachels %!s(int64=3) %!d(string=hai) anos
pai
achega
0acc788c50
Modificáronse 2 ficheiros con 24 adicións e 15 borrados
  1. 22 13
      locations/purses.qsrc
  2. 2 2
      locations/wardrobe.qsrc

+ 22 - 13
locations/purses.qsrc

@@ -20,9 +20,10 @@ if $ARGS[0] = 'view_purse_list':
 	act 'Return' :gt 'wardrobe', 'start'
 	
 	$clothing_header = '<center><table border=1>'
-	if $ARGS[1] ! 'wardrobe': $clothing_header += '<TH><a href="exec:gt ''purses'', ''view_purse_list'', ''wardrobe'', ''<<$ARGS[1]>>''">Switch to wardrobe list</a></TH>'
-	if $ARGS[1] ! 'store': $clothing_header += '<TH><a href="exec:gt ''purses'', ''view_purse_list'', ''store'', ''<<$$ARGS[2]>>''">Switch to stored clothing list</a></TH>'
-	if $ARGS[1] ! 'unwanted': $clothing_header += '<TH><a href="exec:gt ''purses'', ''view_purse_list'', ''unwanted'', ''<<$$ARGS[3]>>''">Switch to unwanted clothing list</a></TH></center>'
+	if $ARGS[1] ! 'wardrobe': $clothing_header += '<TH><a href="exec:gt ''purses'', ''view_purse_list'', ''wardrobe''">Switch to wardrobe list</a></TH>'
+	if $ARGS[1] ! 'store': $clothing_header += '<TH><a href="exec:gt ''purses'', ''view_purse_list'', ''store''">Switch to stored clothing list</a></TH>'
+	if $ARGS[1] ! 'unwanted': $clothing_header += '<TH><a href="exec:gt ''purses'', ''view_purse_list'', ''unwanted''">Switch to unwanted clothing list</a></TH></center>'
+    '<<$clothing_header>>'
 
 	if $ARGS[1] = 'wardrobe':
 		'<h3><center><b><font color="maroon">Wardrobe list</font></b></center></h3>'
@@ -38,7 +39,7 @@ if $ARGS[0] = 'view_purse_list':
 
 	i = 1
 	:loopdollspurses
-	if dolls_purses[i] = 1 and dolls_pursesS[i] = ploc:*p '<a href="exec:gt ''purses'', ''view_purse_item'', ''home'', ''dolls'', <<i>>"><img src="images/pc/purses/dolls/<<i>>.jpg" 	height="300" /></a>'
+	if dolls_purses[i] = 1 and dolls_pursesS[i] = ploc:*p '<a href="exec:gt ''purses'', ''view_purse_item'', ''<<$ARGS[1]>>'', ''dolls'', <<i>>"><img src="images/pc/purses/dolls/<<i>>.jpg" 	height="300" /></a>'
 	i += 1
 	if i <= ARRSIZE('dolls_purses'):jump 'loopdollspurses'
 
@@ -46,7 +47,7 @@ if $ARGS[0] = 'view_purse_list':
 
 	i = 1
 	:loopfashionistapurses
-	if fashionista_purses[i] = 1 and fashionista_pursesS[i] = ploc:*p '<a href="exec:gt ''purses'', ''view_purse_item'', ''home'', ''fashionista'', <<i>>"><img src="images/pc/purses/fashionista/<<i>>.jpg" 	height="300" /></a>'
+	if fashionista_purses[i] = 1 and fashionista_pursesS[i] = ploc:*p '<a href="exec:gt ''purses'', ''view_purse_item'',  ''<<$ARGS[1]>>'', ''fashionista'', <<i>>"><img src="images/pc/purses/fashionista/<<i>>.jpg" 	height="300" /></a>'
 	i += 1
 	if i <= ARRSIZE('fashionista_purses'):jump 'loopfashionistapurses'
 
@@ -54,7 +55,7 @@ if $ARGS[0] = 'view_purse_list':
 
 	i = 1
 	:loopcheappurses
-	if cheap_purses[i] = 1 and cheap_pursesS[i] = ploc:*p '<a href="exec:gt ''purses'', ''view_purse_item'', ''home'', ''cheap'', <<i>>"><img src="images/pc/purses/cheap/<<i>>.jpg" 	height="300" /></a>'
+	if cheap_purses[i] = 1 and cheap_pursesS[i] = ploc:*p '<a href="exec:gt ''purses'', ''view_purse_item'', ''<<$ARGS[1]>>'', ''cheap'', <<i>>"><img src="images/pc/purses/cheap/<<i>>.jpg" 	height="300" /></a>'
 	i += 1
 	if i <= ARRSIZE('cheap_purses'):jump 'loopcheappurses'
 
@@ -62,7 +63,7 @@ if $ARGS[0] = 'view_purse_list':
 
 	i = 1
 	:loopkatspurses
-	if kats_purses[i] = 1 and kats_pursesS[i] = ploc:*p '<a href="exec:gt ''purses'', ''view_purse_item'', ''home'', ''kats'', <<i>>"><img src="images/pc/purses/kats/<<i>>.jpg" 	height="300" /></a>'
+	if kats_purses[i] = 1 and kats_pursesS[i] = ploc:*p '<a href="exec:gt ''purses'', ''view_purse_item'',  ''<<$ARGS[1]>>'', ''kats'', <<i>>"><img src="images/pc/purses/kats/<<i>>.jpg" 	height="300" /></a>'
 	i += 1
 	if i <= ARRSIZE('kats_purses'):jump 'loopkatspurses'
 
@@ -70,7 +71,7 @@ if $ARGS[0] = 'view_purse_list':
 
 	i = 1
 	:loopboutiquepurses
-	if boutique_purses[i] = 1 and boutique_pursesS[i] = ploc:*p '<a href="exec:gt ''purses'', ''view_purse_item'', ''home'', ''boutique'', <<i>>"><img src="images/pc/purses/moncheri/<<i>>.jpg" 	height="300" /></a>'
+	if boutique_purses[i] = 1 and boutique_pursesS[i] = ploc:*p '<a href="exec:gt ''purses'', ''view_purse_item'', ''<<$ARGS[1]>>'', ''boutique'', <<i>>"><img src="images/pc/purses/moncheri/<<i>>.jpg" 	height="300" /></a>'
 	i += 1
 	if i <= ARRSIZE('boutique_purses'):jump 'loopboutiquepurses'
 end
@@ -126,8 +127,7 @@ if $ARGS[0] = 'view_purse_item':
 				'You do not have enough money in your bank to buy this purse.'
 			end
 		end
-	elseif $ARGS[1] = 'home':
-
+	else
 		act 'Return':gt 'purses', 'view_purse_list', $ARGS[1]
 		
 		if $currentpursetype = $ARGS[2] and currentpursenumber = ARGS[3]:
@@ -152,6 +152,15 @@ if $ARGS[0] = 'view_purse_item':
 			if sloc ! 1:$RESULT += 'Move this purse to <a href="exec:gt ''purses'', ''dest1'', ''<<$ARGS[1]>>'', ''<<$ARGS[2]>>'', <<ARGS[3]>>">Storage</a><BR>'
 			if sloc ! 0:$RESULT += 'Move this purse to  <a href="exec:gt ''purses'', ''dest0'', ''<<$ARGS[1]>>'', ''<<$ARGS[2]>>'', <<ARGS[3]>>">Wardrobe</a><BR>'
 			if sloc ! 2:$RESULT += 'Move this purse to  <a href="exec:gt ''purses'', ''dest2'', ''<<$ARGS[1]>>'', ''<<$ARGS[2]>>'', <<ARGS[3]>>">Unwanted</a>'
+			if $ARGS[1] ! 'store':
+				act 'Move to storage': gt 'purses', 'dest1', $ARGS[1], $ARGS[2], ARGS[3]
+			end
+			if $ARGS[1] ! 'unwanted':
+				act 'Move to unwanted': gt 'purses', 'dest2', $ARGS[1], $ARGS[2], ARGS[3]
+			end
+			if $ARGS[1] ! 'wardrobe':
+				act 'Move to wardrobe': gt 'purses', 'dest0', $ARGS[1], $ARGS[2], ARGS[3]
+			end
 
 		end
 	end
@@ -160,19 +169,19 @@ end
 if $ARGS[0] = 'dest0':
 	*clr
 	dynamic '<<$ARGS[2]>>_pursesS[<<ARGS[3]>>] = 0'
-	gt 'purses', 'view_purse_item', $ARGS[1], $ARGS[2], ARGS[3]
+	gt 'purses', 'view_purse_list', $ARGS[1], $ARGS[2], ARGS[3]
 end
 
 if $ARGS[0] = 'dest1':
 	*clr
 	dynamic '<<$ARGS[2]>>_pursesS[<<ARGS[3]>>] = 1'
-	gt 'purses', 'view_purse_item', $ARGS[1], $ARGS[2], ARGS[3]
+	gt 'purses', 'view_purse_list', $ARGS[1], $ARGS[2], ARGS[3]
 end
 
 if $ARGS[0] = 'dest2':
 	*clr
 	dynamic '<<$ARGS[2]>>_pursesS[<<ARGS[3]>>] = 2'
-	gt 'purses', 'view_purse_item', $ARGS[1], $ARGS[2], ARGS[3]
+	gt 'purses', 'view_purse_list', $ARGS[1], $ARGS[2], ARGS[3]
 end
 
 if $ARGS[0] = 'descriptions':

+ 2 - 2
locations/wardrobe.qsrc

@@ -53,9 +53,9 @@ if $ARGS[0] = 'start':
 	*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'', ''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>'
+		'<a href="exec:gt ''purses'', ''view_purse_list'',''wardrobe''"><img Height = <<ward_img_hgt>> src="<<FUNC(''$purse_image'', $currentpursetype, currentpursenumber)>>"></a>'
 	else
-		'<a href="exec:gt ''purses'', ''view_purse_list''">Search the wardrobe</a>'
+		'<a href="exec:gt ''purses'', ''view_purse_list'',''wardrobe''">Search the wardrobe</a>'
 	end
 	'</center></TD><TR><TD><center>'
 	if $pantyworntype ! 'none':