Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

glife.qproj

@@ -793,7 +793,7 @@
 		<Location name="hairsalon"/>
 		<Location name="shopdacha"/>
 		<Location name="sportShop"/>
-		<Location name="scandalicious"/>
+		<Location name="shop_scandalicious"/>
 		<Location name="torgcentr"/>
 		<Location name="yarik"/>
 		<Location name="zoomagazine"/>

locations/scandalicious.qsrc → locations/shop_scandalicious.qsrc

@@ -1,9 +1,9 @@
-# scandalicious
+# shop_scandalicious
 !2021/04/29
 
 if $ARGS[0] = 'start':
 	killvar 'clothingfilter'
-	$loc = 'scandalicious'
+	$loc = 'shop_scandalicious'
 	$loc_arg = 'start'
     $location_type = 'public_indoors'
 	cls
@@ -25,36 +25,36 @@ if $ARGS[0] = 'start':
 
 	act 'View clothing':
 		minut += 5
-		gt 'scandalicious', 'clothes'
+		gt 'shop_scandalicious', 'clothes'
 	end
 
 	act 'View dresses':
 		minut += 5
-		gt 'scandalicious', 'dresses'
+		gt 'shop_scandalicious', 'dresses'
 	end
 
 	act 'View shoes':
 		minut += 5
-		gt 'scandalicious', 'shoes'
+		gt 'shop_scandalicious', 'shoes'
 	end
 
 	act 'View swimsuits':
 		cla
 		minut += 5
-		gt 'scandalicious', 'swim'
+		gt 'shop_scandalicious', 'swim'
 	end
 
 	act 'View bikinis':
 		cla
 		minut += 5
-		gt 'scandalicious', 'bikinis'
+		gt 'shop_scandalicious', 'bikinis'
 	end
 end
 
 if $ARGS[0] = 'clothes':
 	$loc_arg = 'clothes'
-	$loc = 'scandalicious'
-	$menu_loc = 'scandalicious'
+	$loc = 'shop_scandalicious'
+	$menu_loc = 'shop_scandalicious'
 	$menu_arg = 'clothes'
 	menu_off = 0
 	*clr & cla
@@ -67,7 +67,7 @@ if $ARGS[0] = 'clothes':
 	act 'Return':
 		cla
 		minut += 1
-		gt 'scandalicious', 'start'
+		gt 'shop_scandalicious', 'start'
 	end
 
 	!!To filter just this set
@@ -83,7 +83,7 @@ if $ARGS[0] = 'clothes':
 
 				!!sort by filter
 				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
-					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''scandalicious'', ''scandalicious_outfits''"><img src="images/pc/items/scandalicious/outfits/<<i>>.jpg" 	height="250" /></a>'
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_scandalicious'', ''scandalicious_outfits''"><img src="images/pc/items/scandalicious/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
@@ -103,7 +103,7 @@ if $ARGS[0] = 'scandalicious_outfits':
 	menu_off = 1
 	if scandalicious_outfits[i] ! 0:
 		msg 'You already own these clothes.'
-		gt 'scandalicious', 'clothes'
+		gt 'shop_scandalicious', 'clothes'
 	end
 
 	gt 'clothing', 'view_clothing_item', 'scandalicious_outfits',i, 1500, 'shop'
@@ -111,8 +111,8 @@ end
 
 if $ARGS[0] = 'dresses':
 	$loc_arg = 'dresses'
-	$loc = 'scandalicious'
-	$menu_loc = 'scandalicious'
+	$loc = 'shop_scandalicious'
+	$menu_loc = 'shop_scandalicious'
 	$menu_arg = 'dresses'
 	menu_off = 0
 	*clr & cla
@@ -125,7 +125,7 @@ if $ARGS[0] = 'dresses':
 	act 'Return':
 		cla
 		minut += 1
-		gt 'scandalicious', 'start'
+		gt 'shop_scandalicious', 'start'
 	end
 
 	!!To filter just this set
@@ -141,11 +141,11 @@ if $ARGS[0] = 'dresses':
 
 				!!sort by filter
 				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
-					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''scandalicious'', ''scandalicious_dress''"><img src="images/pc/items/scandalicious/dress/<<i>>.jpg" 	height="250" /></a>'
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_scandalicious'', ''scandalicious_dress''"><img src="images/pc/items/scandalicious/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
-		if i <= 100:jump 'loopscandalicious_dress'
+		if i <= 150:jump 'loopscandalicious_dress'
 
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
@@ -160,7 +160,7 @@ if $ARGS[0] = 'scandalicious_dress':
 	menu_off = 1
 	if scandalicious_dress[i] ! 0:
 		msg 'You already own this dress.'
-		gt 'scandalicious', 'dresses'
+		gt 'shop_scandalicious', 'dresses'
 	end
 
 	gt 'clothing', 'view_clothing_item', 'scandalicious_dress',i, 1500, 'shop'
@@ -168,28 +168,28 @@ end
 
 if $ARGS[0] = 'shoes':
 	$loc_arg = 'shoes'
-	$loc = 'scandalicious'
+	$loc = 'shop_scandalicious'
 	cls
 	gs'stat'
 
 	act 'Return':
 		cla
 		minut += 1
-		gt 'scandalicious', 'start'
+		gt 'shop_scandalicious', 'start'
 	end
 
 	i = 1
 	:loopscandalicious_shoes
-		if scandalicious_shoe[i] = 0:*p '<a href="exec: i = <<i>> & gt ''scandalicious'', ''shoes2''"><img src="images/pc/items/scandalicious/shoes/<<i>>.jpg" height="250" /></a>'
+		if scandalicious_shoe[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_scandalicious'', ''shoes2''"><img src="images/pc/items/scandalicious/shoes/<<i>>.jpg" height="250" /></a>'
 		i += 1
 	if i <= 30:jump 'loopscandalicious_shoes'
 end
 
-if $ARGS[0] = 'shoes2': gt 'shoes', 'view_shoe_item', 'shop', 'scandalicious',i, 1500
+if $ARGS[0] = 'shoes2': gt 'shoes', 'view_shoe_item', 'shop', 'shop_scandalicious',i, 1500
 
 if $ARGS[0] = 'swim':
 	$loc_arg = 'swim'
-	$loc = 'scandalicious'
+	$loc = 'shop_scandalicious'
 	cls
 	gs'stat'
 	'<center><b><font color="maroon">Swimsuits - one size fits all</font></b></center>'
@@ -200,7 +200,7 @@ if $ARGS[0] = 'swim':
 	act 'Return':
 		cla
 		minut += 1
-		gt 'scandalicious', 'start'
+		gt 'shop_scandalicious', 'start'
 	end
 
 	!!To filter just this set
@@ -216,7 +216,7 @@ if $ARGS[0] = 'swim':
 
 				!!sort by filter
 				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
-					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''scandalicious'', ''swim1''"><img src="images/pc/items/scandalicious/swim/one/<<i>>.jpg" 	height="250" /></a>'
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_scandalicious'', ''swim1''"><img src="images/pc/items/scandalicious/swim/one/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
@@ -234,7 +234,7 @@ if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'scandalicious_swims
 
 if $ARGS[0] = 'bikinis':
 	$loc_arg = 'bikinis'
-	$loc = 'scandalicious'
+	$loc = 'shop_scandalicious'
 	cls
 	gs'stat'
 	'<center><b><font color="maroon">Bikinis - one size fits all</font></b></center>'
@@ -245,7 +245,7 @@ if $ARGS[0] = 'bikinis':
 	act 'Return':
 		cla
 		minut += 1
-		gt 'scandalicious', 'start'
+		gt 'shop_scandalicious', 'start'
 	end
 
 	!!To filter just this set
@@ -261,7 +261,7 @@ if $ARGS[0] = 'bikinis':
 
 				!!sort by filter
 				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
-					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''scandalicious'', ''bikini1''"><img src="images/pc/items/scandalicious/swim/two/<<i>>.jpg" 	height="250" /></a>'
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_scandalicious'', ''bikini1''"><img src="images/pc/items/scandalicious/swim/two/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
@@ -277,5 +277,5 @@ end
 
 if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'scandalicious_bikinis',i, 1750, 'shop'
 
---- scandalicious ---------------------------------
+--- shop_scandalicious ---------------------------------
 

locations/torgcentr.qsrc

@@ -53,7 +53,7 @@ if hour >= 8 and hour <= 20:
 	*p '<a href="exec: ml_boughtamp = 0 & ml_boughtguitar = 0 & minut += 3 & gt ''city_musicstore'', ''musicshop''"><img src="images/locations/city/citycenter/mall/musicstore.png"></a>'
 !! O''Skull music store
 		*p '   '
-	*p '<a href="exec: minut += 3 & gt ''scandalicious'',''start''"><img src="images/locations/city/citycenter/mall/scandalicious.png"></a>'
+	*p '<a href="exec: minut += 3 & gt ''shop_scandalicious'',''start''"><img src="images/locations/city/citycenter/mall/scandalicious.png"></a>'
 !! shop_fashionista - Shop for designer brands
 
 	*nl