Market Clothes

outfits_convert.py

@@ -95,7 +95,10 @@ def file_convert(filename):
                     subtype = vendor
                     vendor = 'gm'
                     itemtype = 'clothes'
-                else:
+                elif vendor == 'market':
+                    itemtype = 'clothes'
+                    subtype = 'outfit'
+                else:                
                     if(len(idParts) < 2):
                         print("Error: "+destination_filepath)
                     else:

sugarcube/src/locations/pavlov/pav_train_market.tw

@@ -224,11 +224,11 @@
 			<<actCLA 'Leave'>>
 				<<gt 'pav_train_market' 'start'>>
 			<</actCLA>>
-		<</if>>
-		<<actCLA 'View clothing'>>
-			<<set $time.minutes += 5>>
-			<<gt 'pav_train_market' 'clo'>>
-		<</actCLA>>*/
+		<</if>>*/
+		<<set _shopDevisions to [
+			{label:'View clothing',type:'clothes',subtype:'outfit', baseprice: 750},
+		]>>
+		<<shop `{vendor:'market',baseprice:300}` _shopDevisions>>
 	<<else>>
 		The market stalls are empty. The market is only open between 08:00 and 19:00.
 		<<actCLA 'Leave the market'>>
@@ -236,65 +236,6 @@
 		<</actCLA>>
 	<</if>>
 
-/*:: pav_market_clothes[deprecated]
-<<if $location_var[$here][0] == 'clo'>>
-	<<set $loc_arg = 'clo'>>
-	<<set $loc = 'pav_train_market'>>
-	
-	<h2>Clothes.</h2>
-	Cheap clothing on the market stall.
-	<<gs 'clothing_QV' 'shop_filter_header'>>
-	<<actCLA 'Return'>>
-		<<set $time.minutes += 5>>
-		<<gt 'pav_train_market' 'start'>>
-	<</actCLA>>
-	<!-- !!To filter just this set-->
-	<<set $clo_i = 0>>
-	<<warn 'JUMP MARKER ENCOUNTERED: :loopmarket_outfits_filter'>>
-	<<set $i = 1>>
-	<<warn 'JUMP MARKER ENCOUNTERED: :loopmarket_outfits'>>
-	<<if getvar("$market_outfits["+$i+"]") == 0>>
-		<<gs 'clothing_attributes' 'market_outfits' $i>>
-		<<gs 'clothing_QV' 'shop_filter'>>
-		<!-- !!sort by filter-->
-		<<if (getvar("$clothingfilter['quality']") == 0 and $CloQuality == $clo_i) or (getvar("$clothingfilter['inhibition']") == 0 and $CloInhibit == $clo_i) or getvar("$clothingfilter['number']") == 0>>
-			<!-- FAILED TO CONVERT
-				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1:*p '<a href="exec: i = <<i>> & gt ''pav_train_market'', ''marketclo''"><img <<$set_imgh>> src="images/pc/items/market/clothes/<<i>>.jpg" 	height="250" /></a>'
-			-----
-				<<if getvar("$clothingfilter['inc']") == 1 and getvar("$clothingfilter['only']") == 1>>
-				<!-- FAILED TO CONVERT
-	*p '<a href="exec: i = <<i>> & gt ''pav_train_market'', ''marketclo''"><img <<$set_imgh>> src="images/pc/items/market/clothes/<<i>>.jpg" 	height="250" /></a>'
------
-	<<set  * ERROR: FAILED TO CONVERT LITERAL: """p '<a href""" = ERROR: FAILED TO CONVERT LITERAL: """"exec: i = <<i>>""">> <<set gt ''pav_train_market'' , ERROR: FAILED TO CONVERT LITERAL: """''marketclo''"><img $set_imgh src""" = "images / $pc / $items / $market / $clothes / ERROR: FAILED TO CONVERT LITERAL: """<<i>>.jpg" 	height="250"""" / ERROR: FAILED TO CONVERT LITERAL: """><""" / ERROR: FAILED TO CONVERT LITERAL: """a>'""">>
-
--->
-<<warn "CONVERSION ERROR 1cbefe148e973364b573d94cde7c8bac">>
-
-			<</if>>
-
-			-->
-			<<warn "CONVERSION ERROR 808764ffc8238dd5fe911b67bd1320da">>
-		<</if>>
-	<</if>>
-	<<set $i += 1>>
-	<<if getvar("$i") <= 40>>
-		<<warn 'JUMP COMMAND ENCOUNTERED: jump loopmarket_outfits'>>
-
-	<</if>>
-	<<set $clo_i += 1>>
-	<<if getvar("$clothingfilter['quality']") == 0 and getvar("$clo_i") <= 7>>
-		<<warn 'JUMP COMMAND ENCOUNTERED: jump loopmarket_outfits_filter'>>
-	<<elseif getvar("$clothingfilter['inhibition']") == 0 and getvar("$clo_i") <= 40>>
-		<<warn 'JUMP COMMAND ENCOUNTERED: jump loopmarket_outfits_filter'>>
-	<</if>>
-<</if>>
-<<if $location_var[$here][0] == 'marketclo'>>
-	<<if getvar("$market_outfits["+$i+"]") != 0>>
-		<<msg 'You already own these clothes.'>>
-		<<gt 'pav_train_market' 'clo'>>
-	<</if>>
-	<<gt 'clothing' 'view_clothing_item' 'market_outfits' $i 750 'shop'>>
-<</if>> */
 :: pav_market_event_wander_actions[include]
 	<<actCLA 'Stop wandering'>>
 		<<gt 'pav_train_market'>>

sugarcube/src/outfits/compiled/_attributes_gm_pantiescompiled.js

@@ -170,8 +170,8 @@ Object.assign(setup.outfits,{
 		'index':'19',
 		"subtype": 1,
 		"fun": 1,
-		"material": 1,
-		"quality": 5,
+		"material": 6,
+		"quality": 2,
 		"thinness": 3,
 	},
 	'gm_panties_20':{

sugarcube/src/outfits/compiled/_attributes_market_clothescompiled.js

@@ -4,6 +4,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_1':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'1',
 		"quality": 2,
 		"thinness": 2,
@@ -13,6 +14,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_2':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'2',
 		"quality": 2,
 		"thinness": 4,
@@ -22,6 +24,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_3':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'3',
 		"quality": 1,
 		"thinness": 4,
@@ -31,6 +34,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_4':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'4',
 		"quality": 1,
 		"thinness": 4,
@@ -40,6 +44,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_5':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'5',
 		"quality": 1,
 		"thinness": 5,
@@ -49,6 +54,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_6':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'6',
 		"quality": 2,
 		"thinness": 5,
@@ -59,6 +65,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_7':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'7',
 		"quality": 1,
 		"thinness": 4,
@@ -68,6 +75,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_8':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'8',
 		"quality": 1,
 		"thinness": 4,
@@ -77,6 +85,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_9':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'9',
 		"quality": 2,
 		"thinness": 4,
@@ -87,6 +96,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_10':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'10',
 		"quality": 2,
 		"thinness": 4,
@@ -96,6 +106,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_11':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'11',
 		"quality": 2,
 		"thinness": 5,
@@ -106,6 +117,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_12':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'12',
 		"quality": 1,
 		"thinness": 5,
@@ -116,6 +128,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_13':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'13',
 		"quality": 2,
 		"thinness": 4,
@@ -125,6 +138,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_14':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'14',
 		"quality": 2,
 		"thinness": 4,
@@ -135,6 +149,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_15':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'15',
 		"quality": 2,
 		"thinness": 4,
@@ -145,6 +160,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_16':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'16',
 		"quality": 2,
 		"thinness": 4,
@@ -155,6 +171,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_17':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'17',
 		"quality": 1,
 		"thinness": 4,
@@ -165,6 +182,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_18':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'18',
 		"quality": 1,
 		"thinness": 4,
@@ -175,6 +193,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_19':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'19',
 		"quality": 1,
 		"thinness": 4,
@@ -186,6 +205,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_20':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'20',
 		"quality": 1,
 		"thinness": 4,
@@ -196,6 +216,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_21':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'21',
 		"quality": 2,
 		"thinness": 3,
@@ -206,6 +227,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_22':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'22',
 		"quality": 2,
 		"thinness": 4,
@@ -215,6 +237,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_23':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'23',
 		"quality": 1,
 		"thinness": 4,
@@ -224,6 +247,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_24':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'24',
 		"quality": 1,
 		"thinness": 4,
@@ -233,6 +257,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_25':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'25',
 		"quality": 2,
 		"thinness": 5,
@@ -243,6 +268,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_26':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'26',
 		"quality": 2,
 		"thinness": 4,
@@ -252,6 +278,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_27':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'27',
 		"quality": 2,
 		"thinness": 4,
@@ -263,6 +290,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_28':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'28',
 		"quality": 2,
 		"thinness": 4,
@@ -273,6 +301,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_29':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'29',
 		"quality": 1,
 		"thinness": 4,
@@ -282,6 +311,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_30':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'30',
 		"quality": 2,
 		"thinness": 4,
@@ -292,6 +322,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_31':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'31',
 		"quality": 1,
 		"thinness": 4,
@@ -301,6 +332,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_32':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'32',
 		"quality": 1,
 		"thinness": 4,
@@ -311,6 +343,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_33':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'33',
 		"quality": 1,
 		"thinness": 4,
@@ -320,6 +353,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_34':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'34',
 		"quality": 1,
 		"thinness": 5,
@@ -330,6 +364,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_35':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'35',
 		"quality": 1,
 		"thinness": 4,
@@ -340,6 +375,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_36':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'36',
 		"quality": 1,
 		"thinness": 5,
@@ -351,6 +387,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_37':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'37',
 		"quality": 1,
 		"thinness": 4,
@@ -361,6 +398,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_38':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'38',
 		"quality": 1,
 		"thinness": 5,
@@ -371,6 +409,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_39':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'39',
 		"quality": 1,
 		"thinness": 4,
@@ -380,6 +419,7 @@ Object.assign(setup.outfits,{
 	'market_clothes_40':{
 		'vendor':'market',
 		'type':'clothes',
+		'subtype':'outfit',
 		'index':'40',
 		"quality": 1,
 		"thinness": 5,

sugarcube/src/outfits/compiled/_attributes_schoolcompiled.js

@@ -518,7 +518,7 @@ Object.assign(setup.outfits,{
 		'index':'47',
 		"quality": 3,
 		"thinness": 3,
-		"topcut": 4,
+		"topcut": 1,
 		"skirtShortness": 4,
 		"style2": 4,
 	},
@@ -540,8 +540,8 @@ Object.assign(setup.outfits,{
 		'index':'49',
 		"quality": 3,
 		"thinness": 5,
-		"topcut": 4,
-		"skirtShortness": 4,
+		"topcut": 2,
+		"skirtShortness": 5,
 		"style2": 4,
 	},
 	'school_50':{