[changed] rename of files and added new attributes file to .qproj

glife.qproj

@@ -103,6 +103,7 @@
 		<Location name="$short_description"/>
 		<Location name="$attributes_cheap"/>
 		<Location name="$attributes_expensive"/>
+		<Location name="$attributes_fashionista"/>
 		<Location name="$attributes_formal"/>
 		<Location name="$attributes_office"/>
 		<Location name="$attributes_school"/>

locations/_attributes_fashionista_dress.qsrc → locations/_attributes_fashionista.qsrc

@@ -1,4 +1,4 @@
-# $attributes_fashionista_dress
+# $attributes_fashionista
 !2020/11/18
 !prince range from 4 to 6, please avoid adding too many 4s
 if ARGS[1] = 1:
@@ -1189,5 +1189,5 @@ elseif ARGS[1] = 200:
 	CloBimbo = 1
 end
 
---- $attributes_fashionista_dress ---------------------------------
+--- $attributes_fashionista ---------------------------------
 

locations/NewCloShop.qsrc → locations/shop_fashionista.qsrc

@@ -1,10 +1,10 @@
-# NewCloShop
+# shop_fashionista
 $location_type = 'event'
 
 if $ARGS[0] = 'start':
 	$loc_arg = 'start'
-	$loc = 'NewCloShop'
-	$menu_loc = 'NewCloShop'
+	$loc = 'shop_fashionista'
+	$menu_loc = 'shop_fashionista'
 	$menu_arg = 'start'
 	killvar '$locclass'
 	menu_off = 0
@@ -15,7 +15,7 @@ if $ARGS[0] = 'start':
 
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Fashionista</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/fashionista/fashinista.jpg"</center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/fashionista/fashionista.jpg"</center>'
 	'This shop features many big name brands and designer clothing. Even their bags look cool.'
 	
 	act 'Leave':
@@ -24,22 +24,22 @@ if $ARGS[0] = 'start':
 		gt 'torgcentr'
 	end
 	
-	act 'View clothing': minut += 5 & gt 'NewCloShop', 'clothes'
+	act 'View clothing': minut += 5 & gt 'shop_fashionista', 'clothes'
 
-	act 'View panties': minut += 5 & gt 'NewCloShop', 'panties'
+	act 'View panties': minut += 5 & gt 'shop_fashionista', 'panties'
 
-	act 'View bras': minut += 5 & gt 'NewCloShop', 'bras'
+	act 'View bras': minut += 5 & gt 'shop_fashionista', 'bras'
 
-	act 'View purses': minut += 5 & gt 'NewCloShop', 'purses'
+	act 'View purses': minut += 5 & gt 'shop_fashionista', 'purses'
 	
-	act 'Try on some clothes': gt 'NewCloShop', 'changingroom'
+	act 'Try on some clothes': gt 'shop_fashionista', 'changingroom'
 end
 
 if $ARGS[0] = 'changingroom':
 	$locclass = 'changingroom'
 	$loc_arg = 'changingroom'
-	$loc = 'NewCloShop'
-	$menu_loc = 'NewCloShop'
+	$loc = 'shop_fashionista'
+	$menu_loc = 'shop_fashionista'
 	$menu_arg = 'changingroom'
 	gs 'stat'
 	menu_off = 0
@@ -49,7 +49,7 @@ if $ARGS[0] = 'changingroom':
 	'As you walk through the store you notice that there''s nobody in the changing rooms. Feeling a bit bored you go look at some clothes and grab several items to try on before heading into one of the changing rooms.'
 	
 	if $clothingworntype = 'nude':
-		act 'Try on clothes': gt 'NewCloShop', 'dressingclothes'
+		act 'Try on clothes': gt 'shop_fashionista', 'dressingclothes'
 		act 'Try on bra':
 			if NatbelQW['seethrough'] = 0 and NatbelQW['QWstage'] > 5 and NatbelQW['underwearShop'] = 0:
 				*clr & cla
@@ -62,28 +62,28 @@ if $ARGS[0] = 'changingroom':
 					'You put the underwear aside for now so that you can take it to the register with you.'
 					money -= 750
 					NatbelQW['seethrough'] = 1
-					act 'Stay in the changingroom': gt 'NewCloShop', 'changingroom'
-					act 'Get dressed and go back to the store': gt 'NewCloShop', 'changingend'
+					act 'Stay in the changingroom': gt 'shop_fashionista', 'changingroom'
+					act 'Get dressed and go back to the store': gt 'shop_fashionista', 'changingend'
 				end			
 				act 'Don''t buy it':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/fashionista/nude.jpg"</center>'
 					'Deciding against it, you look through the rest of the underwear for something that would fit you better.'
 					NatbelQW['underwearShop'] = 1
-					act 'Stay in the changingroom': gt 'NewCloShop', 'changingroom'
-					act 'Get dressed and go back to the store': gt 'NewCloShop', 'changingend'
+					act 'Stay in the changingroom': gt 'shop_fashionista', 'changingroom'
+					act 'Get dressed and go back to the store': gt 'shop_fashionista', 'changingend'
 				end
 			else
-				gt 'NewCloShop', 'dressingbra'
+				gt 'shop_fashionista', 'dressingbra'
 				!*clr & cla
 				!clorand = rand(1, 38)
-				!gt 'bras', 'view_bra_item', 'shop', 'fashionista',clorand, 750
+				!gt 'bras', 'view_bra_item', 'shop', 'shop_fashionista',clorand, 750
 			end
 		end
-		act 'Try on panties': gt 'NewCloShop', 'dressingpanties'
+		act 'Try on panties': gt 'shop_fashionista', 'dressingpanties'
 			!*clr & cla
 			!clorand = rand(1, 75)
-			!gt 'panties', 'view_panty_item', 'shop', 'fashionista',clorand, 750
+			!gt 'panties', 'view_panty_item', 'shop', 'shop_fashionista',clorand, 750
 		!end
 	end
 	if $clothingworntype = 'nude':
@@ -91,8 +91,8 @@ if $ARGS[0] = 'changingroom':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/fashionista/dressed.jpg"</center>'
 			gs 'clothing', 'wear_last_worn'
-			act 'Stay in the changingroom': gt 'NewCloShop', 'changingroom'
-			act 'Get dressed and go back to the store': gt 'NewCloShop', 'changingend'
+			act 'Stay in the changingroom': gt 'shop_fashionista', 'changingroom'
+			act 'Get dressed and go back to the store': gt 'shop_fashionista', 'changingend'
 		end
 	end
 	if $clothingworntype ! 'nude' and $pantyworntype ! 'none':
@@ -100,8 +100,8 @@ if $ARGS[0] = 'changingroom':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/fashionista/underwear.jpg"</center>'
 			gs 'clothing', 'strip'
-			act 'Stay in the changingroom': gt 'NewCloShop', 'changingroom'
-			act 'Get dressed and go back to the store': gt 'NewCloShop', 'changingend'
+			act 'Stay in the changingroom': gt 'shop_fashionista', 'changingroom'
+			act 'Get dressed and go back to the store': gt 'shop_fashionista', 'changingend'
 		end
 	end
 	if $clothingworntype = 'nude' and $pantyworntype = 'none':
@@ -109,8 +109,8 @@ if $ARGS[0] = 'changingroom':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/fashionista/underwear.jpg"</center>'
 			gs 'underwear', 'wear'
-			act 'Stay in the changingroom': gt 'NewCloShop', 'changingroom'
-			act 'Get dressed and go back to the store': gt 'NewCloShop', 'changingend'
+			act 'Stay in the changingroom': gt 'shop_fashionista', 'changingroom'
+			act 'Get dressed and go back to the store': gt 'shop_fashionista', 'changingend'
 		end
 	end
 	if $clothingworntype ! 'nude' or $pantyworntype ! 'none':
@@ -119,34 +119,34 @@ if $ARGS[0] = 'changingroom':
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/fashionista/nude.jpg"</center>'
 			gs 'clothing', 'strip'
 			gs 'underwear', 'remove'
-			act 'Stay in the changingroom': gt 'NewCloShop', 'changingroom'
-			act 'Get dressed and go back to the store': gt 'NewCloShop', 'changingend'
+			act 'Stay in the changingroom': gt 'shop_fashionista', 'changingroom'
+			act 'Get dressed and go back to the store': gt 'shop_fashionista', 'changingend'
 		end
 	end
 	if $clothingworntype = 'nude':
-		act 'Get dressed and go back to the store': gt 'NewCloShop', 'changingend'
+		act 'Get dressed and go back to the store': gt 'shop_fashionista', 'changingend'
 	else
-		act 'Go back to the store': gt 'NewCloShop', 'changingend'
+		act 'Go back to the store': gt 'shop_fashionista', 'changingend'
 	end
 end
 
 if $ARGS[0] = 'dressingclothes':
 	*clr & cla
 	$loc_arg = 'dressingclothes'
-	$loc = 'NewCloShop'
+	$loc = 'shop_fashionista'
 	!clorand = rand(1,ARRSIZE('expensive'))
 	!gt 'clothing', 'view_clothing_item', 'shop', 'expensive', clorand, 8000
 	menu_off = 1
 	*clr & cla
 	gs'stat'
-	'<center><b><font color="maroon">Viewing Fashionista clothing</font></b></center>'
+	'<center><b><font color="maroon">Viewing shop_fashionista clothing</font></b></center>'
 	*nl
 
 	gs 'clothing_QV', 'shop_header'
 
 	act 'Return':
 		minut += 1
-		gt 'NewCloShop', 'changingroom'
+		gt 'shop_fashionista', 'changingroom'
 	end
 
 	clothingfilter['qualitycheck'] = 7
@@ -162,7 +162,7 @@ if $ARGS[0] = 'dressingclothes':
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''NewCloShop'', ''dressingshmotmag''"><img src="images/pc/clothing/3expensive/<<i>>.jpg" 	height="250" /></a>  '
+					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''dressingshmotmag''"><img src="images/pc/clothing/3expensive/<<i>>.jpg" 	height="250" /></a>  '
 				end
 			end
 			i += 12
@@ -175,7 +175,7 @@ if $ARGS[0] = 'dressingshmotmag':
 	
 	if expensive[i] ! 0:
 		msg 'You already own these clothes.'
-		gt 'NewCloShop', 'dressingclothes'
+		gt 'shop_fashionista', 'dressingclothes'
 	end
 
 	gt 'clothing', 'view_clothing_item', 'shop', 'expensive',i, 8000
@@ -183,7 +183,7 @@ end
 
 if $ARGS[0] = 'dressingbra':
 	$loc_arg = 'dressingbra'
-	$loc = 'NewCloShop'
+	$loc = 'shop_fashionista'
 	menu_off = 1
 	*clr & cla
 	gs'stat'
@@ -191,26 +191,26 @@ if $ARGS[0] = 'dressingbra':
 	act 'Return':
 		cla
 		minut += 1
-		gt 'NewCloShop', 'changingroom'
+		gt 'shop_fashionista', 'changingroom'
 	end
 
 	i = 1
 
-	:loopfashionista_bras2
-		if fashionista_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''NewCloShop'', ''dressingbras2''"><img src="images/pc/bras/fashionista/<<i>>.jpg" 	height="150" /></a> '
+	:loopshop_fashionista_bras2
+		if shop_fashionista_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''dressingbras2''"><img src="images/pc/bras/fashionista/<<i>>.jpg" 	height="150" /></a> '
 		i += 1
-	if i <= 42:jump 'loopfashionista_bras2'
+	if i <= 42:jump 'loopshop_fashionista_bras2'
 end
 
 if $ARGS[0] = 'dressingbras2':
 	cla
 	
-	if fashionista_bras[i] ! 0:
+	if shop_fashionista_bras[i] ! 0:
 		msg 'You already own this bra.'
-		gt 'NewCloShop', 'bras'
+		gt 'shop_fashionista', 'bras'
 	end
 
-	gt 'bras', 'view_bra_item', 'shop', 'fashionista',i, 750
+	gt 'bras', 'view_bra_item', 'shop', 'shop_fashionista',i, 750
 end
 
 
@@ -219,12 +219,12 @@ if $ARGS[0] = 'changingend':
 	!! Sveta dresses again
 	gs 'underwear', 'wear'
 	gs 'clothing', 'wear_last_worn'
-	gt 'NewCloShop', 'start'
+	gt 'shop_fashionista', 'start'
 end
 
 if $ARGS[0] = 'dressingpanties':
 	$loc_arg = 'dressingpanties'
-	$loc = 'NewCloShop'
+	$loc = 'shop_fashionista'
 	menu_off = 1
 	*clr & cla
 	gs'stat'
@@ -232,37 +232,37 @@ if $ARGS[0] = 'dressingpanties':
 	act 'Return':
 		cla
 		minut += 1
-		gt 'NewCloShop', 'changingroom'
+		gt 'shop_fashionista', 'changingroom'
 	end
 
 	i = 1
 
-	:loopfashionista_panties2
-		if fashionista_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''NewCloShop'', ''dressingpanties2''"><img src="images/pc/panties/fashionista/<<i>>.jpg" 	height="150" /></a> '
+	:loopshop_fashionista_panties2
+		if shop_fashionista_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''dressingpanties2''"><img src="images/pc/panties/fashionista/<<i>>.jpg" 	height="150" /></a> '
 		i += 1
-	if i <= 79:jump 'loopfashionista_panties2'
+	if i <= 79:jump 'loopshop_fashionista_panties2'
 end
 
 if $ARGS[0] = 'dressingpanties2':
 	cla
 	
-	if fashionista_panties[i] ! 0:
+	if shop_fashionista_panties[i] ! 0:
 		msg 'You already own these panties.'
-		gt 'NewCloShop', 'dressingpanties'
+		gt 'shop_fashionista', 'dressingpanties'
 	end
 
-	gt 'panties', 'view_panty_item', 'shop', 'fashionista',i, 750
+	gt 'panties', 'view_panty_item', 'shop', 'shop_fashionista',i, 750
 end
 
 
 !! Old code
 if $ARGS[0] = 'clothes':
 	$loc_arg = 'clothes'
-	$loc = 'NewCloShop'
+	$loc = 'shop_fashionista'
 	menu_off = 1
 	*clr & cla
 	gs'stat'
-	'<center><b><font color="maroon">Viewing Fashionista clothing</font></b></center>'
+	'<center><b><font color="maroon">Viewing shop_fashionista clothing</font></b></center>'
 	*nl
 
 	gs 'clothing_QV', 'shop_header'
@@ -270,7 +270,7 @@ if $ARGS[0] = 'clothes':
 	act 'Return':
 		cla
 		minut += 1
-		gt 'NewCloShop', 'start'
+		gt 'shop_fashionista', 'start'
 	end
 	
 	i = Clothingstock +1
@@ -282,7 +282,7 @@ if $ARGS[0] = 'clothes':
 			gs 'clothing_attributes', 'expensive', i
 			gs 'clothing_QV', 'shop_filter'
 				
-			if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''NewCloShop'', ''shmotmag''"><img src="images/pc/clothing/3expensive/<<i>>.jpg" 	height="250" /></a>'
+			if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''shmotmag''"><img src="images/pc/clothing/3expensive/<<i>>.jpg" 	height="250" /></a>'
 		end
 		i += 12
 	if i <= 442:jump 'loopexpensive'
@@ -293,7 +293,7 @@ if $ARGS[0] = 'shmotmag':
 	
 	if expensive[i] ! 0:
 		msg 'You already own these clothes.'
-		gt 'NewCloShop', 'clothes'
+		gt 'shop_fashionista', 'clothes'
 	end
 
 	gt 'clothing', 'view_clothing_item', 'shop', 'expensive',i, 8000
@@ -301,7 +301,7 @@ end
 
 if $ARGS[0] = 'panties':
 	$loc_arg = 'panties'
-	$loc = 'NewCloShop'
+	$loc = 'shop_fashionista'
 	menu_off = 1
 	*clr & cla
 	gs'stat'
@@ -309,32 +309,32 @@ if $ARGS[0] = 'panties':
 	act 'Return':
 		cla
 		minut += 1
-		gt 'NewCloShop', 'start'
+		gt 'shop_fashionista', 'start'
 	end
 
 	i = 1
 
-	:loopfashionista_panties
-		if fashionista_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''NewCloShop'', ''panties2''"><img src="images/pc/panties/fashionista/<<i>>.jpg" 	height="150" /></a> '
+	:loopshop_fashionista_panties
+		if shop_fashionista_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''panties2''"><img src="images/pc/panties/fashionista/<<i>>.jpg" 	height="150" /></a> '
 		i += 1
-	if i <= 79:jump 'loopfashionista_panties'
+	if i <= 79:jump 'loopshop_fashionista_panties'
 end
 
 if $ARGS[0] = 'panties2':
 	cla
 	
-	if fashionista_panties[i] ! 0:
+	if shop_fashionista_panties[i] ! 0:
 		msg 'You already own these panties.'
-		gt 'NewCloShop', 'panties'
+		gt 'shop_fashionista', 'panties'
 	end
 
-	gt 'panties', 'view_panty_item', 'shop', 'fashionista',i, 750
+	gt 'panties', 'view_panty_item', 'shop', 'shop_fashionista',i, 750
 
 end
 
 if $ARGS[0] = 'bras':
 	$loc_arg = 'bras'
-	$loc = 'NewCloShop'
+	$loc = 'shop_fashionista'
 	menu_off = 1
 	*clr & cla
 	gs'stat'
@@ -342,31 +342,31 @@ if $ARGS[0] = 'bras':
 	act 'Return':
 		cla
 		minut += 1
-		gt 'NewCloShop', 'start'
+		gt 'shop_fashionista', 'start'
 	end
 
 	i = 1
 
-	:loopfashionista_bras
-		if fashionista_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''NewCloShop'', ''bras2''"><img src="images/pc/bras/fashionista/<<i>>.jpg" 	height="150" /></a> '
+	:loopshop_fashionista_bras
+		if shop_fashionista_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''bras2''"><img src="images/pc/bras/fashionista/<<i>>.jpg" 	height="150" /></a> '
 		i += 1
-	if i <= 42:jump 'loopfashionista_bras'
+	if i <= 42:jump 'loopshop_fashionista_bras'
 end
 
 if $ARGS[0] = 'bras2':
 	cla
 	
-	if fashionista_bras[i] ! 0:
+	if shop_fashionista_bras[i] ! 0:
 		msg 'You already own this bra.'
-		gt 'NewCloShop', 'bras'
+		gt 'shop_fashionista', 'bras'
 	end
 
-	gt 'bras', 'view_bra_item', 'shop', 'fashionista',i, 750
+	gt 'bras', 'view_bra_item', 'shop', 'shop_fashionista',i, 750
 end
 
 if $ARGS[0] = 'purses':
 	$loc_arg = 'purses'
-	$loc = 'NewCloShop'
+	$loc = 'shop_fashionista'
 	menu_off = 1
 	*clr & cla
 	gs'stat'
@@ -374,18 +374,18 @@ if $ARGS[0] = 'purses':
 	act 'Return':
 		cla
 		minut += 1
-		gt 'NewCloShop', 'start'
+		gt 'shop_fashionista', 'start'
 	end
 
 	i = 1
 
-	:loopfashionista_purses
-		if fashionista_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''NewCloShop'', ''purses2''"><img src="images/pc/purses/fashionista/<<i>>.jpg" 	height="150" /></a> '
+	:loopshop_fashionista_purses
+		if shop_fashionista_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''purses2''"><img src="images/pc/purses/fashionista/<<i>>.jpg" 	height="150" /></a> '
 		i += 1
-	if i <= 15:jump 'loopfashionista_purses'
+	if i <= 15:jump 'loopshop_fashionista_purses'
 end
 
-if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'fashionista',i, 3000
+if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'shop_fashionista',i, 3000
 
---- NewCloShop ---------------------------------
+--- shop_fashionista ---------------------------------
 

locations/torgcentr.qsrc

@@ -21,8 +21,8 @@ if hour >= 8 and hour <= 20:
 	*p'<a href="exec: minut += 3 & gt ''lusso'', ''start''"><img src="images/locations/city/citycenter/mall/lusso.png"></a>'
 !!Lusso Intimo - European style expensive underwear
 		*p '   '
-	*p '<a href="exec: minut += 3 & gt ''NewCloShop'',''start''"><img src="images/locations/city/citycenter/mall/fashionistat.png"></a>'
-!! Fashionista - Shop for designer brands
+	*p '<a href="exec: minut += 3 & gt ''shop_fashionista'',''start''"><img src="images/locations/city/citycenter/mall/fashionista.png"></a>'
+!! shop_fashionista - Shop for designer brands
 	
 	*nl
 	*nl
@@ -54,7 +54,7 @@ if hour >= 8 and hour <= 20:
 !! O''Skull music store
 		*p '   '
 	*p '<a href="exec: minut += 3 & gt ''scandalicious'',''start''"><img src="images/locations/city/citycenter/mall/scandalicious.png"></a>'
-!! Fashionista - Shop for designer brands
+!! shop_fashionista - Shop for designer brands
 
 
 	act 'Leave': minut += 5 & gt 'city_center'
@@ -84,7 +84,7 @@ end
 		*p ' - '
 	*p '<a href="exec:torg = 1 & gt ''budgetclothes'',''start''">G&M Store</a>'
 		*p ' - '
-	*p '<a href="exec:gt ''NewCloShop'',''start''">Fashionista</a>'
+	*p '<a href="exec:gt ''shop_fashionista'',''start''">shop_fashionista</a>'
 	
 	*nl
 	*nl