Browse Source

[added] Lipbalm now in the supermarket too and changed case of some code for better formatting.

KevinSmarts 4 years ago
parent
commit
beb5d5f72e
2 changed files with 21 additions and 20 deletions
  1. 20 20
      locations/pharmacy.qsrc
  2. 1 0
      locations/shop.qsrc

+ 20 - 20
locations/pharmacy.qsrc

@@ -44,35 +44,35 @@ if $ARGS[0] = 'shop' or $ARGS[0] = '':
 	else
 		'<center>Their is a young woman behind the counter in a white coat,as you approach she asks. "Hello, what can I help you with?"</center>'
 	end
-	
+
 	act 'Leave the pharmacy': minut += 5 & gt 'street'
 
 	!! output for purchased item
 	iif($ARGS[1] = '', '', '<center><<$ARGS[1]>></center>')
 	*nl
 	*pl '<center><table align="center" width=80%>'
-	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])
-	*P FUNC ('$stock_item', 30, 'Vitamins', 130, 'vitamin', $CURLOC, $ARGS[0])
-	*P FUNC ('$stock_item', 50, 'Painkillers', 435, 'painkiller', $CURLOC, $ARGS[0])
-	*P FUNC ('$stock_item', 10, 'Ointments for chafing', 372, 'mosolmaz', $CURLOC, $ARGS[0])
-	*P FUNC ('$stock_item', 20, 'Lubricant', 145, 'lubri', $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])
+	*P func ('$stock_item', 30, 'Vitamins', 130, 'vitamin', $curloc, $ARGS[0])
+	*P func ('$stock_item', 50, 'Painkillers', 435, 'painkiller', $curloc, $ARGS[0])
+	*P func ('$stock_item', 10, 'Ointments for chafing', 372, 'mosolmaz', $curloc, $ARGS[0])
+	*P func ('$stock_item', 20, 'Lubricant', 145, 'lubri', $curloc, $ARGS[0])
 	!!tube of 5 uses as far as I can tell, price is set to that
-	*P FUNC ('$stock_item', 30, 'Lip balm', 127, 'lipbalm', $CURLOC, $ARGS[0])
-	*P FUNC ('$stock_item', 12, 'Weight loss pill', 248, 'fatdel', $CURLOC, $ARGS[0])
-	*P FUNC ('$stock_item', 20, 'Tampons', 200, 'tampon', $CURLOC, $ARGS[0])
-	*P FUNC ('$stock_item', 20, 'Sanitary napkins', 100, 'sanpad', $CURLOC, $ARGS[0])
-	*P FUNC ('$single_stock_item', 1, 'Enema kit', 1250, 'klisma', $CURLOC, $ARGS[0])
-	*P FUNC ('$single_stock_item', 1, 'Breast pump', 2200, 'breastpump', $CURLOC, $ARGS[0])
-	*P FUNC ('$stock_item', 3, 'Breastmilk bottle S', 930, 'bpbottles', $CURLOC, $ARGS[0])
-	*P FUNC ('$stock_item', 2, 'Breastmilk bottle M', 930, 'bpbottlem', $CURLOC, $ARGS[0])
+	*P func ('$stock_item', 30, 'Lip balm', 127, 'lipbalm', $curloc, $ARGS[0])
+	*P func ('$stock_item', 12, 'Weight loss pill', 248, 'fatdel', $curloc, $ARGS[0])
+	*P func ('$stock_item', 20, 'Tampons', 200, 'tampon', $curloc, $ARGS[0])
+	*P func ('$stock_item', 20, 'Sanitary napkins', 100, 'sanpad', $curloc, $ARGS[0])
+	*P func ('$single_stock_item', 1, 'Enema kit', 1250, 'klisma', $curloc, $ARGS[0])
+	*P func ('$single_stock_item', 1, 'Breast pump', 2200, 'breastpump', $curloc, $ARGS[0])
+	*P func ('$stock_item', 3, 'Breastmilk bottle S', 930, 'bpbottles', $curloc, $ARGS[0])
+	*P func ('$stock_item', 2, 'Breastmilk bottle M', 930, 'bpbottlem', $curloc, $ARGS[0])
 	if pcs_knows_nipplecream > 0:
-		*P FUNC ('$stock_item', 20, 'Nipplebalm', 600, 'bpnipplebalm', $CURLOC, $ARGS[0])
+		*P func ('$stock_item', 20, 'Nipplebalm', 600, 'bpnipplebalm', $curloc, $ARGS[0])
 	end
-	if KandidNapr = 1: *P FUNC ('$single_stock_item', 1, 'Antifungal medication', 1050, 'Kandidoz', $CURLOC, $ARGS[0], StoryLine, '(you have 0)',''+iif(money >= 1050,'<a href="exec:gs ''pharmacy'', ''buy_antifungal''">buy</a>','')+'')
+	if KandidNapr = 1: *P func ('$single_stock_item', 1, 'Antifungal medication', 1050, 'Kandidoz', $curloc, $ARGS[0], StoryLine, '(you have 0)',''+iif(money >= 1050,'<a href="exec:gs ''pharmacy'', ''buy_antifungal''">buy</a>','')+'')
 	*P '</table></center>'
 end
 

+ 1 - 0
locations/shop.qsrc

@@ -276,6 +276,7 @@ if $shoplocation= 'cosmetics':
 	end
 	*pl '<center><table align="center" width=80%>'
 	*p func ('$stock_item', 50, 'Cosmetics', 1300, 'kosmetica', $curloc)
+	*P func ('$stock_item', 30, 'Lip balm', 127, 'lipbalm', $curloc)
 	*p func ('$stock_item', 10, 'Plain false lashes', 1500, 'falselashesplain',$curloc)
 	*p func ('$stock_item', 3, 'Mink false lashes', 900, 'falselashesmink',$curloc)
 	*p func ('$stock_item', 25, 'Razors (number of shaves)', 350, 'stanok', $curloc)