Browse Source

[changed] edited 'intro_customization' to use the generalized display loops for the clothing selector

f95Lok 2 weeks ago
parent
commit
4507d1ea49
1 changed files with 135 additions and 133 deletions
  1. 135 133
      locations/intro_customization.qsrc

+ 135 - 133
locations/intro_customization.qsrc

@@ -3,13 +3,13 @@
 if $ARGS[0] = 'start':
 if $ARGS[0] = 'start':
 	'If you want to set your skills and attributes to a certain number, use the cheat menu to do it, the options to do it here were removed.'	
 	'If you want to set your skills and attributes to a certain number, use the cheat menu to do it, the options to do it here were removed.'	
 
 
-	intro_custom_temp_money = -1
-	$intro_custom_temp_loc = ''
-	$intro_custom_temp_loc_arg = ''
-	$intro_custom_temp_loc_s = ''
-	$intro_custom_temp_args_s = ''
-	$intro_custom_temp_menu_loc = ''
-	$intro_custom_temp_menu_arg = ''
+	intro_custom['money'] = -1
+	$intro_custom['loc'] = ''
+	$intro_custom['loc_arg'] = ''
+	$intro_custom['loc_s'] = ''
+	$intro_custom['args_s'] = ''
+	$intro_custom['menu_loc'] = ''
+	$intro_custom['menu_arg'] = ''
 	
 	
 	if pcs_mass['butt_gen'] = 0: pcs_mass['butt_gen'] = 22
 	if pcs_mass['butt_gen'] = 0: pcs_mass['butt_gen'] = 22
 	if pcs_mass['bust_gen'] = 0: pcs_mass['bust_gen'] = 22
 	if pcs_mass['bust_gen'] = 0: pcs_mass['bust_gen'] = 22
@@ -25,17 +25,8 @@ if $ARGS[0] = 'start':
 		gs 'intro_sg_select_custom', 'start'
 		gs 'intro_sg_select_custom', 'start'
 	else
 	else
 		act 'Confirm these options':
 		act 'Confirm these options':
-			killvar $menu_name
-			killvar intro_custom_temp_money
-			killvar $intro_custom_temp_loc
-			killvar $intro_custom_temp_loc_arg
-			killvar $intro_custom_temp_loc_s
-			killvar $intro_custom_temp_args_s
-			killvar $intro_custom_temp_menu_loc
-			killvar $intro_custom_temp_menu_arg
-			killvar intro_custom_step
-			killvar intro_custom_noexcept
-			killvar intro_custom_shop_return
+			killvar 'intro_custom'
+			killvar 'menu_name'
 			if bag = 1:
 			if bag = 1:
 				!!using current combination should prevent having more than 1 bag at the start of game.
 				!!using current combination should prevent having more than 1 bag at the start of game.
 				dynamic $currentpursetype + '_purses[<<currentpursenumber>>] = 1'
 				dynamic $currentpursetype + '_purses[<<currentpursenumber>>] = 1'
@@ -54,44 +45,42 @@ if $ARGS[0] = 'modclo_menu':
 	gs 'tattoo_management', 'count'
 	gs 'tattoo_management', 'count'
 	gs 'piercing_management', 'count'
 	gs 'piercing_management', 'count'
 	
 	
-	intro_custom_step = 1
-	intro_custom_noexcept = 1
-	intro_custom_shop_return = 1
-	if intro_custom_temp_money = -1: 
-		intro_custom_temp_money = money
+	if intro_custom['money'] = -1: 
+		intro_custom['money'] = money
 		money = 999999999
 		money = 999999999
 	end
 	end
-	if $intro_custom_temp_loc = '':
-		$intro_custom_temp_loc = $loc
-		$intro_custom_temp_loc_arg = $loc_arg
-		$intro_custom_temp_loc_s = $loc_s
-		$intro_custom_temp_args_s = $args_s
-		$intro_custom_temp_menu_loc = $menu_loc
-		$intro_custom_temp_menu_arg = $menu_arg
+	if $intro_custom['loc'] = '':
+		$intro_custom['loc'] = $loc
+		$intro_custom['loc_arg'] = $loc_arg
+		$intro_custom['loc_s'] = $loc_s
+		$intro_custom['args_s'] = $args_s
+		$intro_custom['menu_loc'] = $menu_loc
+		$intro_custom['menu_arg'] = $menu_arg
+
+		intro_custom_shop_return = 1
+		intro_custom_step = 1
 	end
 	end
 
 
 	act 'Return': 
 	act 'Return': 
-		money = intro_custom_temp_money
-		intro_temp_money = -1
-		
-		intro_custom_step = 0
-		intro_custom_noexcept = 0
-		intro_custom_shop_return = 0
+		money = intro_custom['money']
+		intro_custom['money'] = -1
 		
 		
-		$loc = $intro_custom_temp_loc
-		$loc_arg = $intro_custom_temp_loc_arg
-		$intro_custom_temp_loc = ''
-		$intro_custom_temp_loc_arg = ''
+		$loc = $intro_custom['loc']
+		$loc_arg = $intro_custom['loc_arg']
+		$intro_custom['loc'] = ''
+		$intro_custom['loc_arg'] = ''
 		
 		
-		$menu_loc = $intro_custom_temp_menu_loc
-		$menu_arg = $intro_custom_temp_menu_arg
-		$intro_custom_temp_menu_loc = ''
-		$intro_custom_temp_menu_arg = ''
-
-		$loc_s = $intro_custom_temp_loc_s
-		$args_s = $intro_custom_temp_args_s
-		$intro_custom_temp_loc_s = ''
-		$intro_custom_temp_args_s = ''
+		$menu_loc = $intro_custom['menu_loc']
+		$menu_arg = $intro_custom['menu_arg']
+		$intro_custom['menu_loc'] = ''
+		$intro_custom['menu_arg'] = ''
+
+		$loc_s = $intro_custom['loc_s']
+		$args_s = $intro_custom['args_s']
+		$intro_custom['loc_s'] = ''
+		$intro_custom['args_s'] = ''
+
+		intro_custom_shop_return = 0
 	
 	
 		gt 'intro_customization', 'start'
 		gt 'intro_customization', 'start'
 	end
 	end
@@ -145,7 +134,6 @@ end
 
 
 if $ARGS[0] = 'modclo':
 if $ARGS[0] = 'modclo':
 	'Make sure to finalize appearance stats before choosing clothing otherwise they might not fit once the game starts.'
 	'Make sure to finalize appearance stats before choosing clothing otherwise they might not fit once the game starts.'
-	'<<$curloc>>'
 
 
 	$loc_s = 'intro_customization'
 	$loc_s = 'intro_customization'
 	$args_s = 'modclo'
 	$args_s = 'modclo'
@@ -162,7 +150,7 @@ if $ARGS[0] = 'modclo':
 		act 'Flamingo''s':		$menu_name = 'flamingos' 	 & gt 'intro_customization', 'modclo'
 		act 'Flamingo''s':		$menu_name = 'flamingos' 	 & gt 'intro_customization', 'modclo'
 		act 'G&M': 				$menu_name = 'gm' 			 & gt 'intro_customization', 'modclo'
 		act 'G&M': 				$menu_name = 'gm' 			 & gt 'intro_customization', 'modclo'
 		act 'Lusso Intimo': 	$menu_name = 'lusso' 		 & gt 'intro_customization', 'modclo'
 		act 'Lusso Intimo': 	$menu_name = 'lusso' 		 & gt 'intro_customization', 'modclo'
-		act 'Market': 										   gt 'pav_train_market'   , 'clo'
+		act 'Market': 										   gt 'intro_customization', 'modclo_loop', 'display_clothes', 'market_outfits', 'market/clothes'
 		act 'Mommy Style':		$menu_name = 'materinstvo' 	 & gt 'intro_customization', 'modclo'
 		act 'Mommy Style':		$menu_name = 'materinstvo' 	 & gt 'intro_customization', 'modclo'
 		act 'Mon Cheri':		$menu_name = 'moncheri' 	 & gt 'intro_customization', 'modclo'
 		act 'Mon Cheri':		$menu_name = 'moncheri' 	 & gt 'intro_customization', 'modclo'
 		act 'Nerdvana':			$menu_name = 'nerdvana' 	 & gt 'intro_customization', 'modclo'
 		act 'Nerdvana':			$menu_name = 'nerdvana' 	 & gt 'intro_customization', 'modclo'
@@ -176,8 +164,8 @@ if $ARGS[0] = 'modclo':
 
 
 	elseif $menu_name = 'allure':
 	elseif $menu_name = 'allure':
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
-		act 'View swimsuits': 			gt 'shop_allure', 'swim'
-		act 'View bikinis': 			gt 'shop_allure', 'bikinis'
+		act 'View swimsuits': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 'allure_swimsuit', 'allure/one'
+		act 'View bikinis': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 'allure_bikinis',  'allure/two'
 
 
 		'<center><b><font color="maroon">shop_allure</font></b></center>'
 		'<center><b><font color="maroon">shop_allure</font></b></center>'
 		'<center><img src="images/locations/city/residential/lake/allure/shop.jpg"></center>'
 		'<center><img src="images/locations/city/residential/lake/allure/shop.jpg"></center>'
@@ -185,9 +173,9 @@ if $ARGS[0] = 'modclo':
 		
 		
 	elseif $menu_name = 'coco_carmen':
 	elseif $menu_name = 'coco_carmen':
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
-		act 'View dresses': 			gt 'shop_coco_carmen', 'dress'
-		act 'View other outfits': 		gt 'shop_coco_carmen', 'outfits'
-		act 'View purses': 				gt 'shop_coco_carmen', 'purses'
+		act 'View dresses': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 'coco_dress', 	'coco/dress'
+		act 'View other outfits': 		gt 'intro_customization', 'modclo_loop', 'display_clothes', 'coco_outfits', 'coco/outfits'
+		act 'View purses': 				gt 'intro_customization', 'modclo_loop', 'display_purses', 	'coco', 		'coco/purses'
 
 
 		'<center><b><font color="maroon">Coco Carmen</font></b></center>'
 		'<center><b><font color="maroon">Coco Carmen</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/coco/shop.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/coco/shop.jpg"></center>'
@@ -195,13 +183,13 @@ if $ARGS[0] = 'modclo':
 		
 		
 	elseif $menu_name = 'danilovich':
 	elseif $menu_name = 'danilovich':
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
-		act 'View sports clothing': 	gt 'shop_danilovich', 'clo'
-		act 'View sports bras': 		gt 'shop_danilovich', 'bras'
-		act 'View sports panties': 		gt 'shop_danilovich', 'panties'
-		act 'View exercise shoes': 		gt 'shop_danilovich', 'shoes'
-		act 'View swimwear': 			gt 'shop_danilovich', 'swim'
-		act 'View purses': 				gt 'shop_danilovich', 'purses'
-		act 'View coats': 				gt 'shop_danilovich', 'coats'
+		act 'View sports clothing': 	gt 'intro_customization', 'modclo_loop', 'display_clothes', 'danilovich_outfits', 	'danilovich/outfits'
+		act 'View swimwear': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 'danilovich_swimsuit', 	'danilovich/swimwear'
+		act 'View sports bras': 		gt 'intro_customization', 'modclo_loop', 'display_bras', 	'danilovich', 			'danilovich/bras'
+		act 'View sports panties': 		gt 'intro_customization', 'modclo_loop', 'display_panties', 'danilovich', 			'danilovich/panties'
+		act 'View exercise shoes': 		gt 'intro_customization', 'modclo_loop', 'display_shoes', 	'danilovich', 			'danilovich/shoes'
+		act 'View purses': 				gt 'intro_customization', 'modclo_loop', 'display_purses', 	'danilovich', 			'danilovich/purses'
+		act 'View coats': 				gt 'intro_customization', 'modclo_loop', 'display_coats', 	'danilovich', 			'danilovich/coats'
 
 
 		'<center><b><font color="maroon">Danilovich sporting goods</font></b></center>'
 		'<center><b><font color="maroon">Danilovich sporting goods</font></b></center>'
 		'<center><img src="images/locations/city/citycenter/mall/sportshop/sportshop.jpg"></center>'
 		'<center><img src="images/locations/city/citycenter/mall/sportshop/sportshop.jpg"></center>'
@@ -212,12 +200,12 @@ if $ARGS[0] = 'modclo':
 	elseif $menu_name = 'erotomaniac':
 	elseif $menu_name = 'erotomaniac':
 		act 'Return': $menu_name = '' & 			gt 'intro_customization', 'modclo'
 		act 'Return': $menu_name = '' & 			gt 'intro_customization', 'modclo'
 		act 'Adult toys & items': 					gt 'shop_erotomaniac', 'sexshop_menu'
 		act 'Adult toys & items': 					gt 'shop_erotomaniac', 'sexshop_menu'
-		act 'Look through the fetish dresses':  	gt 'shop_erotomaniac', 'dress'
-		act 'Look through the fetish outfits':  	gt 'shop_erotomaniac', 'outfits'
-		act 'Look through the stripper clothing':	gt 'shop_erotomaniac', 'strip'
-		act 'Look through the panties': 			gt 'shop_erotomaniac', 'panties'
-		act 'Look through the bras': 				gt 'shop_erotomaniac', 'bras'
-		act 'Look through the fetish shoes': 		gt 'shop_erotomaniac', 'shoes'
+		act 'Look through the fetish dresses':  	gt 'intro_customization', 'modclo_loop', 'display_clothes', 'eroto_dress', 	 'eroto/dress'
+		act 'Look through the fetish outfits':  	gt 'intro_customization', 'modclo_loop', 'display_clothes', 'eroto_outfits', 'eroto/outfits'
+		act 'Look through the stripper clothing':	gt 'intro_customization', 'modclo_loop', 'display_clothes', 'eroto_strip', 	 'eroto/strip'
+		act 'Look through the bras': 				gt 'intro_customization', 'modclo_loop', 'display_bras', 	'eroto', 		 'eroto/bras'
+		act 'Look through the panties': 			gt 'intro_customization', 'modclo_loop', 'display_panties', 'eroto', 		 'eroto/panties'
+		act 'Look through the fetish shoes': 		gt 'intro_customization', 'modclo_loop', 'display_shoes', 	'eroto', 		 'eroto/shoes'
 
 
 		$backimage=''
 		$backimage=''
 		'<center><b><font color="maroon">The Erotomaniac</font></b></center>'
 		'<center><b><font color="maroon">The Erotomaniac</font></b></center>'
@@ -231,7 +219,7 @@ if $ARGS[0] = 'modclo':
 	
 	
 	elseif $menu_name = 'fancy_pancy':
 	elseif $menu_name = 'fancy_pancy':
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
-		act 'View clothing': 			gt 'shop_fancy_pancy', 'clothes'
+		act 'View clothing': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 'fancy_burlesque', 'fancy/burlesque'
 
 
 		'<center><b><font color="maroon">Fancy Pancy</font></b></center>'
 		'<center><b><font color="maroon">Fancy Pancy</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pushkin/fancypancy/shop.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pushkin/fancypancy/shop.jpg"></center>'
@@ -240,11 +228,11 @@ if $ARGS[0] = 'modclo':
 	
 	
 	elseif $menu_name = 'fashionista':
 	elseif $menu_name = 'fashionista':
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
-		act 'View purses': 				gt 'shop_fashionista', 'purses'
-		act 'Try on dresses': 			gt 'shop_fashionista', 'dressingclothes'
-		act 'Try on outfits': 			gt 'shop_fashionista', 'dressingoutfit'
-		act 'Try on bra': 	  			gt 'shop_fashionista', 'dressingbra'
-		act 'Try on panties': 			gt 'shop_fashionista', 'dressingpanties'
+		act 'Try on dresses': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 'fashionista_dress', 	'fashionista/dress'
+		act 'Try on outfits': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 'fashionista_outfits', 	'fashionista/outfits'
+		act 'Try on bra': 	  			gt 'intro_customization', 'modclo_loop', 'display_bras', 	'fashionista', 			'fashionista/bras'
+		act 'Try on panties': 			gt 'intro_customization', 'modclo_loop', 'display_panties', 'fashionista', 			'fashionista/panties'
+		act 'View purses': 				gt 'intro_customization', 'modclo_loop', 'display_purses', 	'fashionista', 			'fashionista/purses'
 
 
 		'<center><b><font color="maroon">Fashionista</font></b></center>'
 		'<center><b><font color="maroon">Fashionista</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/fashionista/fashionista.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/fashionista/fashionista.jpg"></center>'
@@ -253,9 +241,9 @@ if $ARGS[0] = 'modclo':
 	
 	
 	elseif $menu_name = 'flamingos':
 	elseif $menu_name = 'flamingos':
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
-		act 'View dresses': 			gt 'shop_flamingos', 'dresses'
-		act 'View other clothing': 		gt 'shop_flamingos', 'clothes'
-		act 'View purses': 				gt 'shop_flamingos', 'purses'
+		act 'View dresses': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 'flamingos_dress', 	 'flamingos/dress'
+		act 'View other clothing': 		gt 'intro_customization', 'modclo_loop', 'display_clothes', 'flamingos_outfits', 'flamingos/outfits'
+		act 'View purses': 				gt 'intro_customization', 'modclo_loop', 'display_purses', 	'flamingos', 		 'flamingos/purses'
 
 
 		'<center><b><font color="maroon">Flamingo''s</font></b></center>'
 		'<center><b><font color="maroon">Flamingo''s</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/island/flamingos/shop.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/island/flamingos/shop.jpg"></center>'
@@ -263,17 +251,17 @@ if $ARGS[0] = 'modclo':
 	
 	
 	elseif $menu_name = 'gm':
 	elseif $menu_name = 'gm':
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
-		act 'View clothing': 			gt 'shop_gm', 'clothes'
-		act 'View dresses': 			gt 'shop_gm', 'dresses'
-		act 'View office wear': 		gt 'shop_gm', 'office'
-		act 'View maid outfits': 		gt 'shop_gm', 'gm_maid'
-		act 'View server uniforms': 	gt 'shop_gm', 'gm_server'
-		act 'View school uniforms': 	gt 'shop_gm', 'school'
-		act 'View regular shoes': 		gt 'shop_gm', 'shoes'
-		act 'View panties': 			gt 'shop_gm', 'panties'
-		act 'View bras': 				gt 'shop_gm', 'bras'
-		act 'View purses': 				gt 'shop_gm', 'purses'
-		act 'View coats': 				gt 'shop_gm', 'coats'
+		act 'View clothing': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 'gm_outfits', 	'gm/outfits'
+		act 'View dresses': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 'gm_dress',		'gm/dress'
+		act 'View office wear': 		gt 'intro_customization', 'modclo_loop', 'display_clothes', 'gm_office', 	'gm/office'
+		act 'View maid outfits': 		gt 'intro_customization', 'modclo_loop', 'display_clothes', 'gm_maid', 		'gm/maid'
+		act 'View server uniforms': 	gt 'intro_customization', 'modclo_loop', 'display_clothes', 'gm_server', 	'gm/server'
+		act 'View school uniforms': 	gt 'intro_customization', 'modclo_loop', 'display_clothes', 'gm_school', 	'gm/school'
+		act 'View bras': 				gt 'intro_customization', 'modclo_loop', 'display_bras', 	'gm', 			'gm/bras'
+		act 'View panties': 			gt 'intro_customization', 'modclo_loop', 'display_panties', 'gm', 			'gm/panties'
+		act 'View shoes': 				gt 'intro_customization', 'modclo_loop', 'display_shoes', 	'gm', 			'gm/shoes'
+		act 'View purses': 				gt 'intro_customization', 'modclo_loop', 'display_purses',	'gm', 			'gm/purses'
+		act 'View coats': 				gt 'intro_customization', 'modclo_loop', 'display_coats', 	'gm', 			'gm/coats'
 
 
 		'<center><b><font color="maroon">Welcome to G & M - Clothes for all your needs</font></b></center>'
 		'<center><b><font color="maroon">Welcome to G & M - Clothes for all your needs</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/gandm/shop.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/gandm/shop.jpg"></center>'
@@ -281,9 +269,9 @@ if $ARGS[0] = 'modclo':
 	
 	
 	elseif $menu_name = 'lusso':
 	elseif $menu_name = 'lusso':
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
-		act 'View panties': 			gt 'shop_lusso', 'panties'
-		act 'View bras': 				gt 'shop_lusso', 'bras'
-		act 'View bodysuits':			gt 'shop_lusso', 'bodysuit'
+		act 'View bras': 				gt 'intro_customization', 'modclo_loop', 'display_bras', 		'lusso', 'lusso/bras'
+		act 'View panties': 			gt 'intro_customization', 'modclo_loop', 'display_panties',		'lusso', 'lusso/panties'
+		act 'View bodysuits':			gt 'intro_customization', 'modclo_loop', 'display_bodysuits', 	'lusso', 'lusso/bodysuits'
 
 
 		'<center><b><font color="maroon">Lusso Intimo</font></b></center>'
 		'<center><b><font color="maroon">Lusso Intimo</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/lusso/lusso.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/lusso/lusso.jpg"></center>'
@@ -292,20 +280,20 @@ if $ARGS[0] = 'modclo':
 	
 	
 	elseif $menu_name = 'materinstvo':
 	elseif $menu_name = 'materinstvo':
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
-		act 'View clothes': 			gt 'shop_materinstvo', 'clothes'
+		act 'View clothes': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 'materinstvo_dress', 'mommy'
 
 
 		'<center><b><font color="maroon">Mommy Style</font></b></center>'
 		'<center><b><font color="maroon">Mommy Style</font></b></center>'
 		'<center><img src="images/locations/city/citycenter/mall/mommy/shop.jpg"></center>'
 		'<center><img src="images/locations/city/citycenter/mall/mommy/shop.jpg"></center>'
-		'This is a shop dedicated to all things pregnancy related.  Here you can buy Pregnancy Clothing or items to aid the process of getting through the day.'
+		'This is a shop dedicated to all things pregnancy related. Here you can buy Pregnancy Clothing or items to aid the process of getting through the day.'
 	
 	
 	elseif $menu_name = 'moncheri':
 	elseif $menu_name = 'moncheri':
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
-		act 'View shoes': gt 'shop_moncheri', 'shoes'
-		act 'View purses': gt 'shop_moncheri', 'purses'
-		act 'View coats': gt 'shop_moncheri', 'coats'
-		act 'Try on dresses': gt 'shop_moncheri', 'dresses'
-		act 'Try on gowns': gt 'shop_moncheri', 'gowns'
-		act 'Try on bodysuits': gt 'shop_moncheri', 'bodysuit'
+		act 'Try on gowns': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 	'moncheri_gown', 	'moncheri/gown'
+		act 'Try on dresses': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 	'moncheri_dress', 	'moncheri/dress'
+		act 'Try on bodysuits': 		gt 'intro_customization', 'modclo_loop', 'display_bodysuits', 	'moncheri', 		'moncheri/bodysuits'
+		act 'View shoes': 				gt 'intro_customization', 'modclo_loop', 'display_shoes', 		'moncheri', 		'moncheri/shoes'
+		act 'View purses': 				gt 'intro_customization', 'modclo_loop', 'display_purses', 		'moncheri', 		'moncheri/purses'
+		act 'View coats': 				gt 'intro_customization', 'modclo_loop', 'display_coats', 		'moncheri', 		'moncheri/coats'
 
 
 		'<center><b><font color="maroon">Mon Chéri</font></b></center>'
 		'<center><b><font color="maroon">Mon Chéri</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/boutique/butik.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/boutique/butik.jpg"></center>'
@@ -314,11 +302,11 @@ if $ARGS[0] = 'modclo':
 	
 	
 	elseif $menu_name = 'nerdvana':
 	elseif $menu_name = 'nerdvana':
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
-		act 'View cosplay outfits': 	gt 'shop_nerdvana', 'cosplay'
-		act 'View other outfits':  		gt 'shop_nerdvana', 'outfits'
-		act 'View swimsuits': 			gt 'shop_nerdvana', 'swim'
-		act 'View bikinis': 			gt 'shop_nerdvana', 'bikinis'
-		act 'View purses': 				gt 'shop_nerdvana', 'purses'
+		act 'View cosplay outfits': 	gt 'intro_customization', 'modclo_loop', 'display_clothes', 'nerdvana_cosplay',  'nerdvana/cosplay'
+		act 'View other outfits':  		gt 'intro_customization', 'modclo_loop', 'display_clothes', 'nerdvana_outfits',  'nerdvana/outfits'
+		act 'View swimsuits': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 'nerdvana_swimsuit', 'nerdvana/swim/one'
+		act 'View bikinis': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 'nerdvana_bikinis',  'nerdvana/swim/two'
+		act 'View purses': 				gt 'intro_customization', 'modclo_loop', 'display_purses', 	'nerdvana', 		 'nerdvana/purses'
 
 
 		'<center><b><font color="maroon">Nerdvana</font></b></center>'
 		'<center><b><font color="maroon">Nerdvana</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/island/nerdvana/shop.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/island/nerdvana/shop.jpg"></center>'
@@ -326,11 +314,11 @@ if $ARGS[0] = 'modclo':
 	
 	
 	elseif $menu_name = 'dolls':
 	elseif $menu_name = 'dolls':
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
-		act 'View dresses': 			gt 'shop_dolls', 'dress'
-		act 'View other outfits': 		gt 'shop_dolls', 'clothing'
-		act 'View shoes': 				gt 'shop_dolls', 'shoes'
-		act 'View purses': 				gt 'shop_dolls', 'purses'
-		act 'View coats': 				gt 'shop_dolls', 'coats'
+		act 'View dresses': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 'dolls_dress', 	 'dolls/dress'
+		act 'View other outfits': 		gt 'intro_customization', 'modclo_loop', 'display_clothes', 'dolls_outfits', 'dolls/outfits'
+		act 'View shoes': 				gt 'intro_customization', 'modclo_loop', 'display_shoes', 	'dolls', 		 'dolls/shoes'
+		act 'View purses': 				gt 'intro_customization', 'modclo_loop', 'display_purses', 	'dolls', 		 'dolls/purses'
+		act 'View coats': 				gt 'intro_customization', 'modclo_loop', 'display_coats', 	'dolls', 		 'dolls/coats'
 
 
 		'<center><b><font color="maroon">Patch Work Dolls</font></b></center>'
 		'<center><b><font color="maroon">Patch Work Dolls</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/island/dolls/dollsshop.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/island/dolls/dollsshop.jpg"></center>'
@@ -338,13 +326,13 @@ if $ARGS[0] = 'modclo':
 
 
 	elseif $menu_name = 'pussycats':
 	elseif $menu_name = 'pussycats':
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
-		act 'View dresses': 			gt 'shop_pussycats', 'dress'
-		act 'View other outfits': 		gt 'shop_pussycats', 'clothes'
-		act 'View panties': 			gt 'shop_pussycats', 'panties'
-		act 'View bras': 				gt 'shop_pussycats', 'bras'
-		act 'View shoes': 				gt 'shop_pussycats', 'shoes'
-		act 'View purses': 				gt 'shop_pussycats', 'purses'
-		act 'View coats': 				gt 'shop_pussycats', 'coats'
+		act 'View dresses': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 'cats_dress', 	'cats/dress'
+		act 'View other outfits': 		gt 'intro_customization', 'modclo_loop', 'display_clothes', 'cats_outfits', 'cats/outfits'
+		act 'View bras': 				gt 'intro_customization', 'modclo_loop', 'display_bras', 	'cats', 		'cats/bras'
+		act 'View panties': 			gt 'intro_customization', 'modclo_loop', 'display_panties', 'cats', 		'cats/panties'
+		act 'View shoes': 				gt 'intro_customization', 'modclo_loop', 'display_shoes', 	'cats', 		'cats/shoes'
+		act 'View purses': 				gt 'intro_customization', 'modclo_loop', 'display_purses', 	'cats', 		'cats/purses'
+		act 'View coats': 				gt 'intro_customization', 'modclo_loop', 'display_coats', 	'cats', 		'cats/coats'
 
 
 		'<b><center><font size="4">Pussy-Cats</font></center></b>'
 		'<b><center><font size="4">Pussy-Cats</font></center></b>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/young_shop.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/young_shop.jpg"></center>'
@@ -352,12 +340,12 @@ if $ARGS[0] = 'modclo':
 	
 	
 	elseif $menu_name = 'scandalicious':
 	elseif $menu_name = 'scandalicious':
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
-		act 'View clothing': 			gt 'shop_scandalicious', 'clothes'
-		act 'View dresses': 			gt 'shop_scandalicious', 'dresses'
-		act 'View shoes': 				gt 'shop_scandalicious', 'shoes'
-		act 'View swimsuits': 			gt 'shop_scandalicious', 'swim'
-		act 'View bikinis': 			gt 'shop_scandalicious', 'bikinis'
-		act 'View bodysuits': 			gt 'shop_scandalicious', 'bodysuit'
+		act 'View clothing': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 	'scandalicious_outfits',  	'scandalicious/outfits'
+		act 'View dresses': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 	'scandalicious_dress',  	'scandalicious/dress'
+		act 'View swimsuits': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 	'scandalicious_swimsuit', 	'scandalicious/swim/one'
+		act 'View bikinis': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 	'scandalicious_bikinis',  	'scandalicious/swim/two'
+		act 'View bodysuits': 			gt 'intro_customization', 'modclo_loop', 'display_bodysuits', 	'scandalicious', 		  	'scandalicious/bodysuits'
+		act 'View shoes': 				gt 'intro_customization', 'modclo_loop', 'display_shoes', 		'scandalicious', 	  	  	'scandalicious/shoes'
 
 
 		'<center><b><font color="maroon">Scandalicious</font></b></center>'
 		'<center><b><font color="maroon">Scandalicious</font></b></center>'
 		'<center><img src="images/locations/city/citycenter/mall/scandalicious/shop.jpg"></center>'
 		'<center><img src="images/locations/city/citycenter/mall/scandalicious/shop.jpg"></center>'
@@ -366,11 +354,11 @@ if $ARGS[0] = 'modclo':
 	
 	
 	elseif $menu_name = 'exhibitionist':
 	elseif $menu_name = 'exhibitionist':
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
-		act 'View outfits': 			gt 'shop_exhibitionist', 'outfits'
-		act 'View dresses': 			gt 'shop_exhibitionist', 'dresses'
-		act 'View panties': 			gt 'shop_exhibitionist', 'panties'
-		act 'View bras': 				gt 'shop_exhibitionist', 'bras'
-		act 'View bodysuits': 			gt 'shop_exhibitionist', 'bodysuit'
+		act 'View outfits': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 	'salacious_dress', 	 'salacious/dress'
+		act 'View dresses': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 	'salacious_outfits', 'salacious/outfits'
+		act 'View bras': 				gt 'intro_customization', 'modclo_loop', 'display_bras', 		'salacious', 		 'salacious/bras'
+		act 'View panties': 			gt 'intro_customization', 'modclo_loop', 'display_panties', 	'salacious', 		 'salacious/panties'
+		act 'View bodysuits': 			gt 'intro_customization', 'modclo_loop', 'display_bodysuits', 	'salacious', 		 'salacious/bodysuits'
 
 
 		'<center><b><font color="maroon">Simply Salacious</font></b></center>'
 		'<center><b><font color="maroon">Simply Salacious</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pushkin/exhibitshop/shop.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pushkin/exhibitshop/shop.jpg"></center>'
@@ -378,11 +366,11 @@ if $ARGS[0] = 'modclo':
 	
 	
 	elseif $menu_name = 'tsar_bomba':
 	elseif $menu_name = 'tsar_bomba':
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
 		act 'Return': $menu_name = '' & gt 'intro_customization', 'modclo'
-		act 'View dresses': 			gt 'shop_tsar_bomba', 'dresses'
-		act 'View outfits': 			gt 'shop_tsar_bomba', 'clothes'
-		act 'View shoes': 				gt 'shop_tsar_bomba', 'shoes'
-		act 'View purses': 				gt 'shop_tsar_bomba', 'purses'
-		act 'View coats': 				gt 'shop_tsar_bomba', 'coats'
+		act 'View dresses': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 'bomba_dress', 	 'bomba/dress'
+		act 'View outfits': 			gt 'intro_customization', 'modclo_loop', 'display_clothes', 'bomba_outfits', 'bomba/outfits'
+		act 'View shoes': 				gt 'intro_customization', 'modclo_loop', 'display_shoes', 	'bomba', 		 'bomba/shoes'
+		act 'View purses': 				gt 'intro_customization', 'modclo_loop', 'display_purses', 	'bomba', 		 'bomba/purses'
+		act 'View coats': 				gt 'intro_customization', 'modclo_loop', 'display_coats', 	'bomba', 		 'bomba/coats'
 
 
 		'<center><b><font color="maroon">Tsar Bomba</font></b></center>'
 		'<center><b><font color="maroon">Tsar Bomba</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pushkin/bomba/shop.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pushkin/bomba/shop.jpg"></center>'
@@ -395,6 +383,20 @@ if $ARGS[0] = 'modclo':
 	end
 	end
 end
 end
 
 
+if $ARGS[0] = 'modclo_loop':
+	if $intro_custom_shop['loop'] = '':
+		$intro_custom_shop['loop'] = $ARGS[1]
+		$intro_custom_shop['shop'] = $ARGS[2]
+		$intro_custom_shop['path'] = $ARGS[3]
+
+		gs 'shortgs', 'setloc', 'intro_customization', 'modclo_loop'
+	end
+
+	gs 'shop_utils', $intro_custom_shop['loop'], $intro_custom_shop['shop'], 1, $intro_custom_shop['path'], 'shop'
+
+	act 'Return': killvar '$intro_custom_shop' & gt 'intro_customization', 'modclo'
+end
+
 if $ARGS[0] = 'modapp':
 if $ARGS[0] = 'modapp':
 	cla & *clr
 	cla & *clr
 	if pcs_mass['bust_gen'] = 0: pcs_mass['bust_gen'] = 12
 	if pcs_mass['bust_gen'] = 0: pcs_mass['bust_gen'] = 12