[added] description if you try to buy prezik in _stock_item_info, menu variables to gadmarket, stol and pharmacy, time moving between gadmarkt and gadukino

[fixes] pharmacy and gadmarket show correct number of condoms

locations/_stock_item_info.qsrc

@@ -3,9 +3,9 @@
 !base medical item and icon from Russian 1.2.5, code by illume
 !useage: '<td align="center"><<FUNC(''$stock_item_info'', $ARGS[3])>></td>' + _
 
-
 !medical item
 $item_info['prezikcount'] = '<center><b>Condoms</b></center><br>Condoms prevent the exchange of body fluids during sexual activity, thereby preventing infection and conception. Condoms cannot be used again.'
+$item_info['prezik'] = '<center><b>Condoms</b></center><br>Condoms prevent the exchange of body fluids during sexual activity, thereby preventing infection and conception. Condoms cannot be used again.'
 $item_info['pregtest'] = '<center><b>Pregnancy test</b></center><br>Pregnancy test is strip that you hold in the urine stream or dip into a sample of urine. An area on the end of the test strip changes color if hCG is present, meaning you are pregnant. The test strip can only be used once.'
 $item_info['tabletki'] = '<center><b>Birth control pills</b></center><br>Combination pills contain synthetic forms of the hormones estrogen and progestin. Most pills in each cycle are active, which means they contain hormones. The remaining pills are inactive, which means they don’t contain hormones<br>Application: one pill a day.'
 $item_info['vitamin'] = '<center><b>Vitamin drinks</b></center><br>A complete multivitamin in a fun-to-chew gummy, specially formulated to provide nutritional support for growing teenage girls.<br>Application: one pill a day.'

locations/gadmarket.qsrc

@@ -1,9 +1,15 @@
 # gadmarket
 
+*clr & cla
+$loc = 'gadmarket'
+$metka = ''
+$menu_loc = 'gadmarket'
+$menu_arg = ''
+menu_off = 0
 $location_type = 'public_indoors'
 
 frost = 0
-set minut += 5
+
 *pl '<center><h1><font color="maroon">Village Shop</font></h1></center>'
 *pl '<center><img <<$set_imgh>> src="images/locations/gadukino/village/market.jpg"></center>'
 
@@ -21,18 +27,19 @@ $gadmarkettab += FUNC ('$single_stock_item', 1, 'Computer magazine', 450, 'compm
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Biographical magazine', 450, 'biomag', 'gadmarket')
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Cooking magazine', 450, 'cookmag', 'gadmarket')
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Knitting magazine', 450, 'knitmag', 'gadmarket')
-$gadmarkettab += FUNC ('$stock_item', 5, 'Condoms', 600, 'prezikcount', 'gadmarket')
+if preziktype = 0: $gadmarkettab += FUNC ('$stock_item', 5, 'Condoms', 600, 'prezik', 'gadmarket')
+if preziktype = 1 or preziktype = 2: $gadmarkettab += FUNC ('$stock_item', 5, 'Condoms', 600, 'prezikcount', 'gadmarket')
 $gadmarkettab += FUNC ('$stock_item', 20, 'Tampons', 250, 'tampon', 'gadmarket')
 $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 handbag')
-$gadmarkettab += FUNC ('$single_stock_item', 1, 'Sandwich', 100, 'buterbrod', 'gadmarket', '', iif(bag > 0, 0, 1), 'You need a handbag')
-$gadmarkettab += FUNC ('$single_stock_item', 1, 'Cheap Bottle of wine', 200, 'wine', 'gadmarket', '', iif(bag > 0, 0, 1), 'You need a handbag')
+$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 += '</table></center>'
 *pl $gadmarkettab
 killvar '$gadmarkettab'
 gs 'stat'
 
-act 'Leave the market': gt $loc
+act 'Leave the market': minut += 5 & gt 'gadukino'
 
 --- gadmarket ---------------------------------
 

locations/gadukino.qsrc

@@ -105,7 +105,7 @@ if $ARGS[0] = '':
 		*nl
 		if hour >= 8 and hour < 20:
 			'In the center of the village is a small grass covered square where villagers gather to meet and discuss or argue politics or village life.'
-			'One of the building facing the square has a sign saying <a href="exec: gt ''gadmarket''">General Store</a>. A sign in the door proclaims it "OPEN". It looks like the only place in the village to buy goods.'
+			'One of the building facing the square has a sign saying <a href="exec: minut += 5 & gt ''gadmarket''">General Store</a>. A sign in the door proclaims it "OPEN". It looks like the only place in the village to buy goods.'
 		else
 			'In the center of the village is a small grass covered square where villagers gather to meet and discuss or argue politics or village life.'
 			'One of the building facing the square has a sign saying General Store. A sign in the door proclaims it "CLOSED". It looks like the only place in the village to buy goods.'

locations/pharmacy.qsrc

@@ -1,30 +1,34 @@
 # pharmacy
-!!!0.2.6 addition: Optimized flow of the code, updated descriptions - now lists everything the drugstore has to sell
-!! now lists everything the drugstore has to sell
-!!0.2.7 add item_info, wait in line, new pic
-$location_type = 'public_indoors'
-cls
-if $ARGS[0] = 'start' :
+
+if $ARGS[0] = 'start':
+	*clr & cla
+	menu_off = 1
 	minut += 5
 	gs 'stat' & ! Update the information about the past tense
 	!a time limit of work pharmacies in Pavlovo
-	people = RAND(1,15) & !We define the size of the queue in the pharmacy
+	people = rand(1,15) & !We define the size of the queue in the pharmacy
 	if people <= 5:
 		*pl '<center><b><font color="maroon">Pharmacy</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/aptekabusy<<people>>.jpg"></center>'
 		'When you go up to check out their is <<people>> ' + iif(people < 2 or people > 4, 'people' , 'man' ) + ' in line before you.'
+		act 'Leave': minut += 5 & gt $loc, $metka
 		act 'Wait for your turn' :
-			minut += RAND(1,4) * people & people = 0
+			minut += rand(1,4) * people
+			people = 0
 			gs 'stat'
 			gt 'pharmacy', 'shop'
 		end
 	else
 		gt 'pharmacy', 'shop'
 	end
-	act 'Leave': minut += 5 & gt $loc, $metka
 end
 
 if $ARGS[0] = 'shop' or $ARGS[0] = '':
+	*clr & cla
+	$location_type = 'public_indoors'
+	$menu_loc = 'pharmacy'
+	$menu_arg = 'shop'
+	menu_off = 0
 	gs 'stat'
 	*pl '<center><b><font color="maroon">Pharmacy</font></b></center>'
 	!*pl '<center><img <<$set_imgh>> src="images/unused/pharmacy.jpg"></center>'
@@ -48,7 +52,8 @@ if $ARGS[0] = 'shop' or $ARGS[0] = '':
 	iif($ARGS[1] = '', '', '<center><<$ARGS[1]>></center>')
 
 	*pl '<center><table align="center">'
-	*P FUNC ('$stock_item', 5, 'condoms', 500, 'prezikcount', $CURLOC, $ARGS[0])
+	if preziktype = 0: *P FUNC ('$stock_item', 5, 'condoms', 500, 'prezik', $CURLOC, $ARGS[0])
+	if preziktype = 1 or preziktype = 2: *P FUNC ('$stock_item', 5, 'condoms', 500, 'prezikcount', $CURLOC, $ARGS[0])
 	*P FUNC ('$stock_item', 1, 'pregnancy test', 530, 'pregtest', $CURLOC, $ARGS[0])
 	*P FUNC ('$stock_item', 1, 'birth control pills', 1870, 'tabletki', $CURLOC, $ARGS[0])
 	*P FUNC ('$stock_item', 10, 'antibiotics', 580, 'lekarstvo', $CURLOC, $ARGS[0])
@@ -72,12 +77,13 @@ if $ARGS[0] = 'shop' or $ARGS[0] = '':
 	end
 !!added this from the pav pharmacy as it makes sense they sell this as well, but not sure the code is right, as it was not done the same way.
 	*P '</table></center>'
+	*nl
 	if KandidNapr = 1:'Cure for yeast infection - 1,050 <b>₽</b>'
 	*nl
+	act 'Leave': minut += 5 & gt $loc, $metka
 	if KandidNapr = 1:
 		act 'Buy tablets for your yeast infection (1,050 <b>₽</b>)':
-			cla
-			*clr
+			*clr & cla
 			money -= 1050
 			Kandidoz = 0
 			'<center><img <<$set_imgh>> src="images/locations/shared/store/kassa.jpg"></center>'
@@ -85,8 +91,7 @@ if $ARGS[0] = 'shop' or $ARGS[0] = '':
 
 			act 'Move away from the counter':gt 'pharmacy', 'start'
 		end
-	end
-	act 'Leave': minut += 5 & gt $loc, $metka
+	end	
 end
 
 --- pharmacy ---------------------------------

locations/shop.qsrc

@@ -8,22 +8,18 @@ if $ARGS[0] = 'start':
 	$shoplocation = 'main'
 end
 
-if $ARGS[0] = 'start' or $ARGS[0] = 'move':
-	minut += 1
-end
+if $ARGS[0] = 'start' or $ARGS[0] = 'move': minut += 1
 
 !! Main area
 if $shoplocation = 'main':
-	cla
-	*clr
-
+	*clr & cla
 	'<center><b><font color="maroon">Supermarket</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/store/shop.jpg"></center>'
 
 	if hour < 8 or hour > 20:
 		'The supermarket is currently closed.'
 
-		act 'Leave the store':minut += 1 & gt $loc
+		act 'Leave the store':minut += 3 & gt $loc
 		exit
 	end
 
@@ -31,15 +27,11 @@ if $shoplocation = 'main':
 	'There is a branch of communication giants <a href="exec:$shoplocation = ''megafon'' & gt ''shop'', ''move''">MegaFon</a>.'
 	'On the other side is on the wall <a href="exec: gs ''noticeboard'',''start''">Public notice board</a>, where you can check various private and official advertisement.'
 	'<br>Most of the space in the supermarket is taken up by the <a href="exec:$shoplocation = ''grocery'' & gt ''shop'', ''move''">grocery department</a>, but the store has many smaller departments as well. <a href="exec:$shoplocation=''cosmetics'' & gt ''shop'', ''move''">Cosmetics</a>, <a href="exec:$shoplocation = ''hardware'' & gt ''shop'', ''move''">hardware</a>, <a href="exec:$shoplocation = ''clothing'' & gt ''shop'', ''move''">clothing</a> and the department of <a href="exec:$shoplocation = ''tech'' & gt ''shop'', ''move''">household appliances</a>. Not far from the entrance is a <a href="exec:$shoplocation = ''icecream'' & gt ''shop'', ''move''">counter selling ice cream</a>.'
-	clr
 	gs 'stat'
 	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.'
-		end
-	end
+	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.'
 
 	!! Store in the residential district
 	if $loc = 'street':
@@ -61,8 +53,7 @@ if $shoplocation = 'main':
 					act 'Fuck no':gt 'shop', 'start'
 
 					act 'I deserve this':
-						cla
-						*clr
+						*clr & cla
 
 						if rand(1, 2) = 1:
 							cla
@@ -109,11 +100,11 @@ if $shoplocation = 'main':
 		!! the location of the shop hasn''t been done today
 		if ($loc = 'street' and StreetShopTPday ! daystart) or ($loc = 'Nord' and nordShopTPday ! daystart) or ($loc = 'torgcentr' and downShopTPday ! daystart):
 			act 'Arrange products':
+				*clr & cla
 				if $loc = 'street':StreetShopTPday = daystart
 				if $loc = 'Nord':nordShopTPday = daystart
 				if $loc = 'torgcentr':downShopTPday = daystart
 
-				cls
 				mtprand = rand(40, 130)
 				minut += mtprand
 				TorgPredZ -= 1
@@ -132,7 +123,6 @@ if $shoplocation = 'main':
 	exit
 end
 
-!! ATM
 if $shoplocation = 'ATM':
 	'<center><b><font color="maroon">ATM</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/store/atm.jpg"></center>'
@@ -204,11 +194,8 @@ if $shoplocation = 'ATM':
 	act 'Move away':gt 'shop', 'start'
 end
 
-!! Grocery
 if $shoplocation = 'grocery':
-	cla
-	*clr
-
+	*clr & cla
 	'<center><b><font color="maroon">Grocery</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/store/shop1.jpg"></center>'
 
@@ -242,11 +229,8 @@ if $shoplocation = 'grocery':
 	act 'Leave the grocery':gt 'shop', 'start'
 end
 
-!! Cosmetics
-!! The scrunchies and hairpins sold here are from the Maruda Hair Mod
 if $shoplocation= 'cosmetics':
-	cla
-	*clr
+	*clr & cla
 
 	'<center><b><font color="maroon">Cosmetics Department</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/store/shop2.jpg"></center>'
@@ -284,17 +268,12 @@ if $shoplocation= 'cosmetics':
 	gs 'stat'
 	gs 'themes', 'indoors'
 
-	act 'Leave the cosmetics department':
-		gt 'shop', 'start'
-	end
+	act 'Leave the cosmetics department': gt 'shop', 'start'
 	if $loc = 'torgcentr': gs 'shoplifting', 'city'
 end
 
-!! Hardware
 if $shoplocation = 'hardware':
-	cla
-	*clr
-
+	*clr & cla
 	'<center><b><font color="maroon">Division of household goods</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/store/shop3.jpg"></center>'
 
@@ -326,42 +305,38 @@ if $shoplocation = 'hardware':
 
 	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'
+			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':
-		cls
-		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'
+			*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
 end
 
-!! Women''s clothing
 if $shoplocation = 'clothing':
-	cla
-	*clr
-
+	*clr & cla
 	'<center><b><font color="maroon">Department of Women''s Clothing</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/store/shop4.jpg"></center>'
 
@@ -390,8 +365,7 @@ if $shoplocation = 'clothing':
 
 		if swimwear[4] = 0:
 			act 'View swimwear':
-				cla
-				*clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/pc/clothing/12swimwear/4.jpg"></center>'
 				gs 'clothing_attributes', 'swimwear', 4
 				'Swimwear 4'
@@ -415,8 +389,7 @@ if $shoplocation = 'clothing':
 
 		if coat[1] = 0:
 			act 'View coats':
-				cla
-				*clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/pc/clothing/11coat/1.jpg"></center>'
 				gs 'clothing_attributes', 'coat', 1
 				'Coat 1'
@@ -441,9 +414,8 @@ if $shoplocation = 'clothing':
 			'A pair of ice-skates are available for 3000 <b>₽</b>.'
 			if money >= 3000:
 				act 'Buy ice skates (3000 <b>₽</b>)':
-					cla
-					*clr
-					money = money - 3000
+					*clr & cla
+					money -= 3000
 					konki = 1
 
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/konki_shop.jpg"></center>'
@@ -456,10 +428,8 @@ if $shoplocation = 'clothing':
 	end
 end
 
-!! Women''s clothing outfit viewer
 if $shoplocation = 'clothing1':
-	*clr
-	cla
+	*clr & cla
 	if $loc ! 'shop': $loc_bak = $loc
 	$loc = 'shop'
 	'<center><B>Click on an outfit to view details</B></center>'
@@ -486,13 +456,11 @@ end
 
 !! Women''s clothing underwear viewer
 if $shoplocation = 'underwear':
-	*clr
-	cla
+	*clr & cla
 	if $loc ! 'shop': $loc_bak = $loc
 	$loc = 'shop'
 	'<center><B>Click on an item to view details</B></center>'
 
-
 	if basic_panties[7] = 0:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''shop'', ''cheap'', 7, 300"><img src="images/pc/panties/basic/7.jpg" 	height="250" /></a>'
 	if basic_panties[9] = 0:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''shop'', ''cheap'', 9, 300"><img src="images/pc/panties/basic/9.jpg" 	height="250" /></a>'
 	if basic_panties[12] = 0:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''shop'', ''cheap'', 12, 300"><img src="images/pc/panties/basic/12.jpg" 	height="250" /></a>'
@@ -504,7 +472,6 @@ if $shoplocation = 'underwear':
 	if basic_bras[16] = 0:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''shop'', ''cheap'', 16, 300"><img src="images/pc/bras/basic/16.jpg" 	height="250" /></a>'
 	if basic_bras[18] = 0:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''shop'', ''cheap'', 18, 300"><img src="images/pc/bras/basic/18.jpg" 	height="250" /></a>'
 
-
 	act 'Return':
 		$loc = $loc_bak
 		$shoplocation = 'clothing'
@@ -514,9 +481,7 @@ end
 
 !! Household appliances
 if $shoplocation = 'tech':
-	cla
-	*clr
-
+	*clr & cla
 	'<center><b><font color="maroon">Department of household appliances</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/store/shop5.jpg"></center>'
 
@@ -558,7 +523,7 @@ if $shoplocation = 'icecream':
 
 	if money >= 50:
 		act 'Buy ice cream':
-			cls
+			*clr & cla
 			money -= 50
 			fat += 3
 			pcs_mood += 50
@@ -577,7 +542,7 @@ if $shoplocation = 'icecream':
 end
 
 if $shoplocation = 'megafon':
-	cls
+	*clr & cla
 	minut+=3
 	gs'stat'
 	i = 0

locations/stol.qsrc

@@ -1,18 +1,14 @@
 # stol
-!{change log
-31 March, 2016
-Added birth control control options to desk in Pavlovsk and "Bric-a-Brac drawer"
-}
+
 if $ARGS[0] = 'start':
-	cla
-	*clr
+	*clr & cla
+	menu_off = 1
 	'<center><h1>Desk</h1></center>'
 	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
 	*nl
 	gs 'stat'
 	'Bric-a-brac drawer.'
 
-	act 'Check birth control': gt 'stol', 'bc'
 	if lubri > 0:'Lubricant, enough for <<lubri>> time(s).'
 	if krem > 0:'Sunblock, enough for <<krem>> more application(s).'
 	if abonement > 0:'Fitness center subscription, valid for <<abonement>> more visit(s)'
@@ -28,10 +24,9 @@ if $ARGS[0] = 'start':
 		'<a href="exec:dynamic $use_aphrodisiac & gt ''stol'', ''start''"><b>Chew aphrodisiac gum.</b></a> Uses left: <<aphrodisiac_have>>.'
 	end
 
-	act 'Close the drawer':
-		cla
-		gt 'stol', 'fin'
-	end
+	act 'Close the drawer':	gt $loc, $metka
+	
+	act 'Check birth control': gt 'stol', 'bc'
 
 	if money > 0:
 		act 'Put some money in the drawer':
@@ -45,7 +40,7 @@ if $ARGS[0] = 'start':
 				money -= stolIN
 			end
 
-			gt 'stol', 'fin'
+			gt 'stol', 'start'
 		end
 	end
 
@@ -62,18 +57,14 @@ if $ARGS[0] = 'start':
 				!!'You debited <<kartaOUT>> <b>₽</b>, now on your account <<karta>> <b>₽</b>.'
 			end
 
-			gt 'stol', 'fin'
+			gt 'stol', 'start'
 		end
 	end
 end
 
-if $ARGS[0] = 'fin':
-	cla
-	gt $loc, $metka
-end
-
 if $ARGS[0] = 'stolPar':
 	*clr & cla
+	menu_off = 1
 	gs'stat'
 	'<center><h1>Desk</h1></center>'
 	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
@@ -161,7 +152,7 @@ if $ARGS[0] = 'bc':
 			'You have <<iif(preziktype = 2, prezikcount, prezikcount+prezik)>> normal, and <<iif(preziktype = 2, prezik+preziksabo, preziksabo)>> sabotaged <a href="exec:dynamic $din_Table_Condom_Menu"><b>condoms.</b></a>'
 		elseif preziktype < 2 and preziksabo = 0:
 			'You have <<prezik+prezikcount>> <a href="exec:dynamic $din_Table_Condom_Menu"><b>condoms.</b></a>'
-		END
+		end
 		*nl
 	else
 		'You are out of condoms.'