Browse Source

[fixed] being able to buy products requiring bag > 0, without owning a bag in shop and gadmarket.
[added] razors to gadmarket.

3xpurt 6 years ago
parent
commit
8bf04cb029
2 changed files with 8 additions and 8 deletions
  1. 5 3
      locations/gadmarket.qsrc
  2. 3 5
      locations/shop.qsrc

+ 5 - 3
locations/gadmarket.qsrc

@@ -21,10 +21,12 @@ $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')
+$gadmarkettab += FUNC ('$stock_item', 5, 'Condoms', 600, 'prezikcount', 'gadmarket')
 $gadmarkettab += FUNC ('$stock_item', 20, 'Tampons', 250, 'tampon', 'gadmarket')
-$gadmarkettab += FUNC ('$single_stock_item', 1, 'Sandwich', 200, 'buterbrod', 'gadmarket')
-$gadmarkettab += FUNC ('$single_stock_item', 1, 'Bottle of wine', 700, 'wine', 'gadmarket')
+$gadmarkettab += FUNC ('$stock_item', 10, 'Razors', 1000, '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 += '</table></center>'
 *pl $gadmarkettab
 killvar '$gadmarkettab'

+ 3 - 5
locations/shop.qsrc

@@ -240,11 +240,9 @@ if $shoplocation = 'grocery':
 	*P FUNC ('$stock_item', 1, 'Diet food', 300, 'edaD', $CURLOC)
 	*P FUNC ('$stock_item', 10, 'Diet food', 3000, 'edaD', $CURLOC)
 	*P FUNC ('$stock_item', 10, 'Tea biscuits', 400, 'pranik', $CURLOC)
-	*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Bottle of water', 100, 'bottle', $CURLOC), '<tr><td></td><td>Bottle of water</td><td colspan=2>You need a handbag</td><td>for 50 <b>₽</b></td></tr>')
-	*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Sandwich', 100, 'buterbrod', $CURLOC), '<tr><td></td><td>Sandwich</td><td colspan=2>You need a handbag</td><td>for 100 <b>₽</b></td></tr>')
-	*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Cheap Bottle of wine', 200, 'wine', $CURLOC), '<tr><td></td><td>Bottle of wine</td><td colspan=2>You need a handbag</td><td>for 500 <b>₽</b></td></tr>')
-	!!*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Average Bottle of wine', 500, 'wine', $CURLOC), '<tr><td></td><td>Bottle of wine</td><td colspan=2>You need a handbag</td><td>for 500 <b>₽</b></td></tr>')
-	!!*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Quality Bottle of wine', 1000, 'wine', $CURLOC), '<tr><td></td><td>Bottle of wine</td><td colspan=2>You need a handbag</td><td>for 500 <b>₽</b></td></tr>')
+	*P FUNC ('$single_stock_item', 1, 'Bottle of water', 100, 'bottle', $CURLOC, '', iif(bag > 0, 0, 1), 'You need a handbag')
+	*P FUNC ('$single_stock_item', 1, 'Sandwich', 100, 'buterbrod', $CURLOC, '', iif(bag > 0, 0, 1), 'You need a handbag')
+	*P FUNC ('$single_stock_item', 1, 'Cheap Bottle of wine', 200, 'wine', $CURLOC, '', iif(bag > 0, 0, 1), 'You need a handbag')
 	*P '</table></center>'
 	gs 'stat'
 	if night_mode = 1: