[removed] umbrella from player start.

[added] umbrella to general stores, supermarkets and kiosk.
[changed] fabric and sewing kit to be a normal stock_item.
gadmarket, kiosk, korr, korrPar, preCUST, rinok, shop

locations/gadmarket.qsrc

@@ -34,6 +34,7 @@ $gadmarkettab += FUNC ('$stock_item', 40, 'Razors', 700, 'stanok', 'gadmarket')
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Bottle of water', 100, 'bottle', 'gadmarket', '', iif(bag > 0, 0, 1), 'You need a purse')
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Sandwich', 100, 'buterbrod', 'gadmarket', '', iif(bag > 0, 0, 1), 'You need a purse')
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Cheap Bottle of wine', 200, 'wine', 'gadmarket', '', iif(bag > 0, 0, 1), 'You need a purse')
+$gadmarkettab += FUNC ('$single_stock_item', 1, 'Umbrella', 1000, 'umbrella', 'gadmarket', '', iif(bag > 0, 0, 1), 'You need a purse')
 $gadmarkettab += '</table></center>'
 *pl $gadmarkettab
 killvar '$gadmarkettab'

locations/kiosk.qsrc

@@ -133,6 +133,7 @@ if $ARGS[0] = 'counter':
 	*P FUNC ('$single_stock_item', 1, 'Cooking magazine', 430, 'cookmag', 'kiosk', 'counter')
 	*P FUNC ('$single_stock_item', 1, 'Knitting magazine', 430, 'knitmag', 'kiosk', 'counter')
 	*P FUNC ('$single_stock_item', 1, 'Fitness magazine', 430, 'fitmag', 'kiosk', 'counter')
+	*P FUNC ('$single_stock_item', 1, 'Umbrella', 1000, 'umbrella', 'kiosk', 'counter', '', iif(bag > 0, 0, 1), 'You need a purse')
 	'</table></center>'
 	*pl
 

locations/korr.qsrc

@@ -82,7 +82,7 @@ else
 	'Modern hall with stylish furniture, a wall-mounted <a href="exec:gt ''mirror'', ''start''">mirror</a>.'
 end
 
-if umbrella > 0:'An umbrella hangs on a hook.'
+if umbrella > 0:'On a hook hangs a umbrella.'
 if sobaka = 1:'Your dog, <a href="exec:gt ''soba'', ''start''"><<$namesob>></a>, is lying on the floor near the entrance.'
 if krolik = 1:'Resting on the floor your rabbit <a href="exec:gt ''krol'', ''start''"><<$namekrol>></a>.'
 if popugai = 1:'In the cage sits your parrot <a href="exec:gt ''popu'', ''start''"><<$namepopu>></a>.'

locations/korrPar.qsrc

@@ -74,8 +74,10 @@ end
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/korrpar.jpg"></center>'
 *nl
 'The corridor of your parent''s apartment. There are several doors which lead to the other rooms of the apartment, as well as the front door which leads outside to the stairwell.'
+*nl
+if umbrella > 0:'On a hook hangs a umbrella.'
 'A <a href="exec:gt ''mirror'', ''start''">mirror</a> hangs on the wall near the front door.'
-
+*nl
 gs 'family'
 
 if indorf = 1:'With your parents being away to visit your grandparents, the apartment seems quiet and empty.'

locations/preCUST.qsrc

@@ -302,7 +302,6 @@ if $ARGS[0] = 'Done':
 !!	SG Start Specific Variable Setting
 	if $ARGS[1] = 'SGS' or $ARGS[1] = 'CSB':
 		school[6] = 1
-		umbrella = 1
 		sisboyday = -2
 		home_owned[1] = 0
 		cltarelka = 0

locations/rinok.qsrc

@@ -38,7 +38,7 @@ if $ARGS[0] = 'start' or $metka = 'start':
 	*P FUNC ('$stock_item', 30, 'Razors', 600, 'stanok', 'rinok')
 	*P FUNC ('$stock_item', 10, 'Tampons', 160, 'tampon', 'rinok')
 	*P FUNC ('$stock_item', 10, 'Sanitary napkins', 80, 'sanpad', 'rinok')
-	*P iif(umbrella = 0, FUNC ('$single_stock_item', 1, 'Umbrella', 1000, 'umbrella', 'rinok'), '')
+	*P FUNC ('$single_stock_item', 1, 'Umbrella', 1000, 'umbrella', 'rinok', '', iif(bag > 0, 0, 1), 'You need a purse')
 	'</table></center>'
 	*pl
 	if analplugIN = 1 and $pantyworntype = 'none' and PCloSkirt > 2:

locations/shop.qsrc

@@ -31,7 +31,12 @@ if $shoplocation = 'main':
 	gs 'themes', 'indoors'
 	
 	!! The store in the town and in the altstart only
-	if $loc = 'pavCommercial' and StoryLine = 1: if week < 6 and hour >= 8 and hour < 16: 'Your sister <a href="exec:$shoplocation = ''Anya'' & gt ''shop'', ''move''">Anya</a> is sitting at the cash register.'
+	if $loc = 'pavCommercial' and StoryLine = 1:
+		if week < 6 and hour >= 8 and hour < 16:
+			*nl
+			'Your sister <a href="exec:$shoplocation = ''Anya'' & gt ''shop'', ''move''">Anya</a> is sitting at the cash register.'
+		end
+	end
 
 	!! Store in the residential district
 	if $loc = 'street':
@@ -295,6 +300,9 @@ if $shoplocation = 'hardware':
 	*P FUNC ('$stock_item', 20, 'Dishwashing detergent', 500, 'fairy', $CURLOC)
 	*P FUNC ('$stock_item', 30, 'Clothing detergent', 500, 'poroshok', $CURLOC)
 	*P FUNC ('$stock_item', 5, 'Plates', 450, 'cltarelka', $CURLOC)
+	*P FUNC ('$stock_item', 5, 'Fabric', 250, 'tkan', $CURLOC)
+	*P FUNC ('$single_stock_item', 1, 'Sewing kit', 500, 'sewing_kit', $CURLOC)
+	*P FUNC ('$single_stock_item', 1, 'Umbrella', 1000, 'umbrella', $CURLOC, '', iif(bag > 0, 0, 1), 'You need a purse')
 	*P '</table></center>'
 	*nl
 
@@ -303,36 +311,7 @@ if $shoplocation = 'hardware':
 
 	act 'Leave the hardware department':gt 'shop', 'start'
 
-	if sewing_kit = 0 and money >= 500:
-		act'Buy sewing kit for 500 <b>₽</b>':
-			cla & *clr
-			sewing_kit = 1
-			money -= 500
-			'You buy a sewing kit'
-			act'Move away from the counter':gt'shop'
-		end
-	end
-
-	'<left>On the counter you can see fabric suitable for sewing. It''s sold in large squares costing 50 <b>₽</b> each.</left>'
-	if tkan <= 0:'You have <<tkan>> squares of fabric.'
-	if tkan > 0:'You have <<tkan>> squares of fabric.'
-
-	if money >= 50:
-		act'Buy fabric':
-			*clr & cla
-			portion = input ("How much do you want to buy?")
-			if portion <= 0:portion = 1
-			if portion*50 > money:'You do not have enough money.'
-				if portion*50 <= money:
-					tkan += portion
-					money = money - portion*50
-					'<center><img <<$set_imgh>> src="images/locations/shared/store/kassa.jpg"></center>'
-					'You paid the cashier and bought cloth.'
-				end
-				gs'stat'
-			act 'Move away from the counter':gt'shop'
-		end
-	end
+	'On the counter you can see fabric suitable for sewing. It''s sold in large squares costing 50 <b>₽</b> each. You have <<tkan>> squares of fabric.'
 end
 
 if $shoplocation = 'clothing':