[added] Market clothing added to both city and pav markets

locations/_attributes_market_clothes.qsrc

@@ -0,0 +1,72 @@
+# $attributes_market_clothes
+!2021/01/20
+!price range from 1 to 3, please avoid adding too many 3s
+
+if ARGS[1] = 1:
+	CloQuality = 1
+	CloThinness = 3
+	CloTopCut = 2
+	CloPantsShortness = 1
+
+elseif ARGS[1] = 2:
+	CloQuality = 1
+	CloThinness = 3
+	CloTopCut = 2
+	CloPantsShortness = 4
+
+elseif ARGS[1] = 3:
+	CloQuality = 1
+	CloThinness = 5
+	CloTopCut = 3
+	CloPantsShortness = 5
+
+elseif ARGS[1] = 4:
+	CloQuality = 1
+	CloThinness = 5
+	CloBra = 1
+	CloPantsShortness = 5
+	CloStyle = 4
+	
+elseif ARGS[1] = 5:
+	CloQuality = 1
+	CloThinness = 5
+	CloBra = 1
+	CloPantsShortness = 5
+	CloStyle = 4
+	
+elseif ARGS[1] = 6:
+	CloQuality = 1
+	CloThinness = 4
+	CloBra = 1
+	CloSkirtShortness = 5
+
+elseif ARGS[1] = 7:
+	CloQuality = 1
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 5
+	
+elseif ARGS[1] = 8:
+	CloQuality = 1
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 5
+	
+elseif ARGS[1] = 9:
+	CloQuality = 1
+	CloThinness = 5
+	CloTopCut = 2
+	CloSkirtShortness = 5
+	CloStyle = 4
+	
+elseif ARGS[1] = 10:
+	CloQuality = 1
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 6
+	CloStyle = 4
+	
+end
+
+--- $attributes_market_clothes ---------------------------------
+

locations/_clothing_image.qsrc

@@ -61,6 +61,8 @@ elseif $ARGS[0] = 'scandalicious_bikinis':
 	$RESULT = 'images/pc/items/scandalicious/swim/two/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'danilovich_swimsuit':
 	$RESULT = 'images/pc/items/danliovich/swimwear/<<ARGS[1]>>.jpg'
+elseif $ARGS[0] = 'market_outfits':
+	$RESULT = 'images/pc/items/market/clothes/<<ARGS[1]>>.jpg'
 end
 
 --- $clothing_image ---------------------------------

locations/city_market.qsrc

@@ -171,11 +171,6 @@ if $ARGS[0] = 'start' or $loc_arg = 'start':
 		act 'Leave':gt'city_market','start'
 	end
 
-	if coat[5] < 1:
-		'On the market you see winter jackets for sale - 4,000 <b>₽</b>'
-		if coat[5] = 0:dynamic 'act ''Look at cheap coat 5'':gt ''clothing'', ''view_clothing_item'', ''shop'', ''coat'', 5, 4000'
-	end
-
 	act 'View clothing':
 		cla
 		minut += 5
@@ -198,22 +193,22 @@ if $ARGS[0] = 'clo':
 		gt 'city_market', 'start'
 	end
 
-	i = 15
-	:loopgm_outfits
-	if gm_outfits[i] = 0:*p '<a href="exec: i = <<i>> & gt ''city_market'', ''marketclo''"><img <<$set_imgh>> src="images/pc/items/gm/outfits/<<i>>.jpg" 	height="400" /></a>'
+	i = 1
+	:loopmarket_outfits
+	if market_outfits[i] = 0:*p '<a href="exec: i = <<i>> & gt ''city_market'', ''marketclo''"><img <<$set_imgh>> src="images/pc/items/market/clothes/<<i>>.jpg" 	height="400" /></a>'
 	i += 1
-	if i <= 20:jump 'loopgm_outfits'
+	if i <= 10:jump 'loopmarket_outfits'
 end
 
 if $ARGS[0] = 'marketclo':
 	cla
 
-	if gm_outfits[i] ! 0:
+	if market_outfits[i] ! 0:
 		msg 'You already own these clothes.'
 		gt 'city_market', 'clo'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'gm_outfits',i, 750
+	gt 'clothing', 'view_clothing_item', 'shop', 'market_outfits',i, 750
 
 end
 

locations/clothing.qsrc

@@ -160,6 +160,10 @@ if $ARGS[0] = 'view_clothing_list':
 	elseif $ARGS[2] = 'allure':
 		!'<center><b><font color="maroon">Viewing Swimwear from allure</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/commercial/allure/shop_name.png"></center>'
+	elseif $ARGS[2] = 'market':
+		!'<center><b><font color="maroon">Viewing Swimwear from allure</font></b></center>'
+		'<center>Clothing from the market</center>'
+		*nl
 	else
 		'<center><b><font color="maroon">Click on a shop name to view clothes from that shop</font></b></center>'
 
@@ -223,6 +227,7 @@ if $ARGS[0] = 'view_clothing_list':
 
 		if ARRSIZE('exercise') > 0:'<center><a href="exec:$ward_list_store = ''sports'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''sports''"><img src="images/locations/city/citycenter/mall/sports.png"></a></center>'
 
+		if ARRSIZE('market_outfits') > 0:'<center><a href="exec:$ward_list_store = ''market'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''market''">Clothes from the market</a></center>'
 	else
 
 
@@ -569,6 +574,18 @@ if $ARGS[0] = 'view_clothing_list':
 			gs 'clothing', 'clothwidth'
 		end
 
+		if $ARGS[2] = 'market':
+			$ward_list_store = $ARGS[2]
+			i = 1
+			:loopmarket_outfits
+				if market_outfits[i] = 1 and market_outfits_s[i] = cloc and ($clothingworntype ! 'market_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'market_outfits', i)
+				i += 1
+			if i <= ARRSIZE('market_outfits'):jump 'loopmarket_outfits'
+
+			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
+			gs 'clothing', 'clothwidth'
+		end
+
 		'</table>'
 	end
 end
@@ -721,6 +738,8 @@ if $ARGS[0] = 'view_clothing_item':
 							dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 90 + <<h>>'
 						elseif $ARGS[2] = 'moncheri':
 							dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 15 + <<h>>'
+						elseif $ARGS[2] = 'market':
+							dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 10 + <<h>>'
 						elseif $ARGS[2] = 'fetish' or $ARGS[2] = 'exhibit' or $ARGS[2] = 'fancy_burlesque':
 							dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 35 + <<h>>'
 						elseif $ARGS[2] = 'gm_school' or $ARGS[2] = 'gm_uniform':

locations/clothing_QV.qsrc

@@ -25,11 +25,11 @@ if $ARGS[0] = 'list':
 		end
 	end
 
-	'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm''"><img src="images/locations/city/citycenter/mall/gm.png"></a></center>'
-
 	if ARRSIZE('gm_school') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_school''"><img src="images/locations/city/citycenter/mall/s.uniform2.png"></a></center>'
  
-	if ARRSIZE('cats_outfits') > 0 or ARRSIZE('cats_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''kats''"><img src="images/locations/city/citycenter/mall/pussycat.png"></a></center>'
+	if ARRSIZE('gm_outfits') > 0 or ARRSIZE('gm_dress') or ARRSIZE('gm_office') or ARRSIZE('gm_uniform'):'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_school''"><img src="images/locations/city/citycenter/mall/gm.png"></a></center>'
+
+	if ARRSIZE('cats_outfits') > 0 or ARRSIZE('cats_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm''"><img src="images/locations/city/citycenter/mall/pussycat.png"></a></center>'
 
 	if ARRSIZE('flamingos_outfits') > 0 or ARRSIZE('flamingos_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''flamingos''"><img src="images/locations/city/island/flamingos/shop_name.png"></a></center>'
 
@@ -54,23 +54,6 @@ if $ARGS[0] = 'list':
 	if ARRSIZE('exercise') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''sports''"><img src="images/locations/city/citycenter/mall/sports.png"></a></center>'
 
 	if $ARGS[1] = 'gm':
-		*clr & cla
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
-		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
-		*nl
-
-		if ARRSIZE('gm_outfits') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_outfits''">G&M clothing</a></center>'
-
-		if ARRSIZE('gm_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_dress''">G&M dresses</a></center>'
-
-		if ARRSIZE('gm_office') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_office''">Office wear</a></center>'
-
-		if ARRSIZE('gm_uniform') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_uniform''">Work uniforms</a></center>'
-
-		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
-	end
-
-	if $ARGS[1] = 'gm_outfits':
 		$ward_list_store = $ARGS[1]
 		*clr & cla
 		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
@@ -97,19 +80,6 @@ if $ARGS[0] = 'list':
 		i += 1
 		if i <= ARRSIZE('gm_outfits'):jump 'loopgm_outfits'
 
-		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
-	end
-
-	if $ARGS[1] = 'gm_dress':
-		$ward_list_store = $ARGS[1]
-		*clr & cla
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
-		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
-		'<center>Regular G&M clothing</center>'
-		*nl
-		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
-		*nl
-		'<center>These are the clothes that are currently available for you to wear.</center><br>'
 		*nl
 
 		i = 1
@@ -127,19 +97,6 @@ if $ARGS[0] = 'list':
 		i += 1
 		if i <= ARRSIZE('gm_dress'):jump 'loopgm_dress'
 
-		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
-	end
-
-	if $ARGS[1] = 'gm_office':
-		$ward_list_store = $ARGS[1]
-		*clr & cla
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
-		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
-		'<center>Office wear</center>'
-		*nl
-		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
-		*nl
-		'<center>These are the clothes that are currently available for you to wear.</center><br>'
 		*nl
 		i = 1
 		:loopoffice
@@ -152,19 +109,6 @@ if $ARGS[0] = 'list':
 		i += 1
 		if i <= ARRSIZE('gm_office'):jump 'loopoffice'
 
-		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
-	end
-
-	if $ARGS[1] = 'gm_uniform':
-		$ward_list_store = $ARGS[1]
-		*clr & cla
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
-		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
-		'<center>Work uniforms</center>'
-		*nl
-		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
-		*nl
-		'<center>These are the clothes that are currently available for you to wear.</center><br>'
 		*nl
 		i = 1
 		:loopuniform
@@ -625,6 +569,31 @@ if $ARGS[0] = 'list':
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
+	if $ARGS[1] = 'market':
+		*clr & cla
+		$ward_list_store = $ARGS[1]
+		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+		'<center>Clothing from the market</center>'
+		*nl
+		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
+		*nl
+		'<center>These are the clothes that are currently available for you to wear.</center><br>'
+		*nl
+
+		i = 1
+		:loopmarket_outfits
+		if market_outfits[i] = 1:
+			gs 'clothing_attributes', 'market_outfits', i
+			if CloInhibit <= pcs_inhib:
+				if market_outfits_s[i] = 0 and market_outfits_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''market_outfits'', <<i>>"><img src="images/pc/items/market/clothing/<<i>>.jpg" 	height="250" /></a>'
+			end
+		end
+		i += 1
+		if i <= ARRSIZE('market_outfits'):jump 'loopmarket_outfits'
+
+		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
+	end
+
 	if $clothingworntype ! 'nude':
 		act 'Strip':gt 'clothing_QV', 'strip'
 	end

locations/clothing_attributes.qsrc

@@ -148,6 +148,8 @@ elseif $ARGS[0] = 'allure_swimsuit':
 	*P FUNC('$attributes_allure_swim_one', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'allure_bikinis':
 	*P FUNC('$attributes_allure_swim_two', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'market_outfits':
+	*P FUNC('$attributes_market_clothes', $ARGS[0], ARGS[1])
 end
 
 if $ARGS[0] ! 'allure_swimsuit' and $ARGS[0] ! 'allure_bikinis' and $ARGS[0] ! 'scandalicious_swimsuit' and $ARGS[0] ! 'danilovich_swimsuits' and $ARGS[0] ! 'coat' and $ARGS[0] ! 'exercise':

locations/pav_train_market.qsrc

@@ -216,12 +216,52 @@ if $ARGS[0] = 'start':
 			'You look around the market for the boy from the Chinese stall, but you can''t find him. You decide to look for him another day.'
 			act 'Leave': gt 'pav_train_market', 'start'
 		end
+
+		act 'View clothing':
+			cla
+			minut += 5
+			gt 'pav_train_market', 'clo'
+		end
 	else
 		'The market stalls are empty. The market is only open between 08:00 and 19:00.'
 		act 'Go back to the station': minut += 3 & gt 'pav_train'
 	end
 end
 
+if $ARGS[0] = 'clo':
+	$loc_arg = 'clo'
+	$loc = 'pav_train_market'
+	cls
+	gs'stat'
+	gs 'themes', 'indoors'
+	'<center><b><font color="maroon">Clothes.</font></b></center>'
+	'Cheap clothing on the market stall.'
+
+	act 'Return':
+		cla
+		minut += 5
+		gt 'pav_train_market', 'start'
+	end
+
+	i = 1
+	:loopmarket_outfits
+	if market_outfits[i] = 0:*p '<a href="exec: i = <<i>> & gt ''pav_train_market'', ''marketclo''"><img <<$set_imgh>> src="images/pc/items/market/clothes/<<i>>.jpg" 	height="400" /></a>'
+	i += 1
+	if i <= 10:jump 'loopmarket_outfits'
+end
+
+if $ARGS[0] = 'marketclo':
+	cla
+
+	if market_outfits[i] ! 0:
+		msg 'You already own these clothes.'
+		gt 'pav_train_market', 'clo'
+	end
+
+	gt 'clothing', 'view_clothing_item', 'shop', 'market_outfits',i, 750
+
+end
+
 if $ARGS[0] = 'events':
 	*clr & cla
 	minut += 10

locations/portnoi.qsrc

@@ -195,6 +195,12 @@ selltot = 0
 		i += 1
 	if i <= ARRSIZE('fancy_burlesque'):jump 'fancy_burlesquemet'
 
+	i = 1
+	:market_outfitsmet
+		if market_outfits[i] = 1 and market_outfits_s[i] = 2:dynamic($batch_sell, 'market_outfits', i)
+		i += 1
+	if i <= ARRSIZE('market_outfits'):jump 'market_outfitsmet'
+
 killvar 'batch_sell'
 
 'You sold <<poshvalldrop>> items of unwanted clothing for a total of <<selltot>> <b>₽</b>.'

locations/portnoi2.qsrc

@@ -146,6 +146,12 @@ i = 1
 	i += 1
 if i <= ARRSIZE('bomba_dress'):jump 'ybomba_dressmet'
 
+i = 1
+:ymarket_outfitsmet
+	if market_outfits[i] = 1 and ((market_outfits_b[i] > pcs_hips + 8) or (market_outfits_b[i] < pcs_hips - 8)):poshvalldrop += 1
+	i += 1
+if i <= ARRSIZE('market_outfits'):jump 'ymarket_outfitsmet'
+
 poshvalldrop = 500 * poshvalldrop
 
 if money < poshvalldrop:
@@ -306,6 +312,12 @@ elseif money >= poshvalldrop:
 		i += 1
 	if i <= ARRSIZE('bomba_dress'):jump 'xbomba_dressmet'
 
+	i = 1
+	:xmarket_outfitsmet
+		if market_outfits[i] = 1 and ((market_outfits_b[i] > pcs_hips + 8) or (market_outfits_b[i] < pcs_hips - 8)):market_outfits_b[i] = pcs_hips
+		i += 1
+	if i <= ARRSIZE('market_outfits'):jump 'xmarket_outfitsmet'
+
 	'You resize all clothing for <<poshvalldrop>> <b>₽</b>.'
 end
 

locations/starenie.qsrc

@@ -36,6 +36,7 @@ $loc_clothestypes[33]='danilovich_coats'
 $loc_clothestypes[34]='danilovich_swimsuit'
 $loc_clothestypes[35]='allure_bikinis'
 $loc_clothestypes[36]='allure_swimsuit'
+$loc_clothestypes[37]='market_outfits'
 
 ! disable wearing base school form
 schoolW[6] = 0