Browse Source

Merge branch 'morgolon/master' into Version-1.1.3-Integration

Conflicts:
	locations/dina
heromaster 10 years ago
parent
commit
77f8f40cf2
5 changed files with 51 additions and 176 deletions
  1. 1 0
      glife.qproj
  2. BIN
      glife.txt
  3. 28 0
      locations/_stock_item
  4. 2 2
      locations/dina
  5. 20 174
      locations/pharmacy

+ 1 - 0
glife.qproj

@@ -542,6 +542,7 @@
       <Location name="portnoi1"/>
       <Location name="portnoi2"/>
       <Location name="sexorg"/>
+      <Location name="$stock_item"/>
     </Folder>
     <Folder name="Etogame">
       <Location name="etoexhib"/>

BIN
glife.txt


+ 28 - 0
locations/_stock_item

@@ -0,0 +1,28 @@
+# $stock_item
+!! generic function to be used to stock items in stores
+!! see # pharmacy for an example of use
+
+count = ARGS[0]
+$item = $ARGS[1]
+price = ARGS[2]
+$variable_name = $ARGS[3]
+$location = $ARGS[4]
+dynamic 'in_inventory = <<$variable_name>>'
+
+*pl 'You have <<in_inventory>> <b><<$item>></b>'
+$template = "
+    act 'Buy <<count>> <b><<$item>></b> (<<price>> rubles)':
+        if money < price:
+            $message = '<font color=""red"">You do not have enough money.</font>'
+        else
+            set <<$variable_name>> += <<count>>
+            set money -= price
+            $message = '<font color=""blue"">You bought <<count>> <b><<$item>></b>.</font>'
+        end
+        gt $location, $message
+    end
+"
+
+dynamic $template
+
+--- $stock_item ---------------------------------

+ 2 - 2
locations/dina

@@ -561,8 +561,8 @@ $butikreiqdi = {
 	cls
 	minut += 5
 	gs 'stat'
-	'Starting to turn my head, you nobody unnoticed, but your actions have attracted prodovtsa, dealer young girl in a shirt with a little too narrow logotpom Boutique enough that her shirt was so testnovata and had to unbutton the top button (MDA-YOU think whether it is men''s boutique shirt obtyag would be understandable, but in the female? for what and what the administration is thinking?) coming to you a little bit inconsistent and quickly asked:'
-	'Seller:I can help you or what?'
+	'Starting to turn your head, you think nobody noticed, but your actions have attracted the saleswoman. The seller is a young girl in a little too narrow shirt with the logo of the Botique, not enough that her shirt was so tight, she had to unbutton the top button (Fashion-YOU think whether it is men´s boutique shirt would be understandable, but in the female? what is and what for the administration is thinking?) she came up to you a little bit inconsistent and quickly asked:'
+	'Seller:Can i help you with anything?'
 
 	act 'No, thank you':gt 'butik', 'start'
 	act 'Silently leave':gt 'down'

+ 20 - 174
locations/pharmacy

@@ -1,184 +1,30 @@
 # pharmacy
 !!!0.2.6 addition: Optimized flow of the code, updated descriptions - now lists everything the drugstore has to sell
-$regular_items = {
-    if money >= 100:
-		act 'Buy <b>condoms</b> (100 rubles) <<iif(prezik > 0, "[left:<b>" + prezik + "</b>]", "")>>':
-            cla
-            *clr
-			portion = input ("How many packages you want to buy?")
 
-			if portion * 100 <= money:
-				set prezik += portion * 5
-				set money -= portion * 100
-				'<center><img src="images/etogame/kassa.jpg"></center>'
-				'You bought condoms and paid the money to the cashier.'
-			else
-				'You do not have enough money.'
-			end
 
-			act 'Move away from the counter':gt 'pharmacy', 'start'
-		end
-	end
+cla
+*clr
+set minut += 5
+*pl '<center><b><font color="maroon">Pharmacy</font></b></center>'
+*pl '<center><img src="images/community/pharmacy.jpg"></center>'
 
-	if money >= 200:
-		act 'Buy a <b>pregnancy test</b> (200 rubles) <<iif(pregtest > 0, "[left:<b>" + pregtest + "</b>]", "")>>':
-			cla
-			*clr
-			set money -= 200
-			pregtest += 2
-			'<center><img src="images/pic/kassa.jpg"></center>'
-			'You bought a test and get paid in cash.'
+gs '$stock_item', 5, 'condoms', 100, 'prezik', $CURLOC
+gs '$stock_item', 1, 'pregnancy test', 200, 'pregtest', $CURLOC
+gs '$stock_item', 28, 'birth control pills', 500, 'tabletki', $CURLOC
+gs '$stock_item', 1, 'enema kit', 500, 'klisma', $CURLOC
+gs '$stock_item', 10, 'antibiotics', 500, 'lekarstvo', $CURLOC
+gs '$stock_item', 20, 'vitamin drinks', 500, 'vitamin', $CURLOC
+gs '$stock_item', 10, 'ointments for corns', 600, 'mosolmaz', $CURLOC
+!!gs '$stock_item', 1, 'antifungal pills', 600, 'mosolmaz', $CURLOC
+gs '$stock_item', 25, 'lip balm', 100, 'lipbalm', $CURLOC
+gs '$stock_item', 1, 'weight loss pill', 2000, 'fatdel', $CURLOC
 
-			act 'Move away from the counter':gt 'pharmacy', 'start'
-		end
-	end
+*p iif( $ARGS[0] = 'start', '', '<center><<$ARGS[0]>></center>')
 
-	if money >= 500:
-		act 'Buy birth control pills (500 rubles) <<iif(tabletki > 0, "[left:<b>" + tabletki + "</b>]", "")>>':
-            cla
-            *clr
-			portion = input ("How many packages you want to buy?")
+clr
+gs 'stat'
+gs 'time'
 
-			if portion * 500 > money:'You do not have enough money.'
-
-			if portion * 500 <= money:
-				set tabletki += portion * 28
-				set money -= portion * 500
-				'<center><img src="images/pic/kassa.jpg"></center>'
-				'You bought the pills and paid the money to the cashier.'
-			end
-
-			act 'Move away from the counter':gt 'pharmacy', 'start'
-		end
-
-		if klisma = 0:
-			act 'Buy enema (500 rubles)':
-				cla
-				*clr
-				set klisma = 1
-				set money -= 500
-				'<center><img src="images/pic/kassa.jpg"></center>'
-				'You bought an enema and paid the money to the cashier.'
-
-				act 'Move away from the counter':gt 'pharmacy', 'start'
-			end
-		end
-
-		act 'Buy <b>medicine</b> (500 rubles) <<iif(lekarstvo > 0, "[left:<b>" + lekarstvo + "</b>]", "")>>':
-			cla
-			*clr
-			portion = input ("How many packages you want to buy?")
-
-			if portion * 500 <= money:
-				set lekarstvo += portion * 10
-				set money -= portion * 500
-				'<center><img src="images/pic/kassa.jpg"></center>'
-				'You bought drugs and paid the money to the cashier.'
-			else
-				'You do not have enough money.'
-			end
-
-			act 'Move away from the counter':gt 'pharmacy', 'start'
-		 end
-
-		act 'Buy <b>vitamins</b> (500 rubles) <<iif(vitamin > 0, "[left:<b>" + vitamin + "</b>]", "")>>':
-			cla
-			*clr
-			portion = input ("How many packages you want to buy?")
-
-			if portion * 500 <= money:
-				set vitamin += portion * 20
-				set money -= portion * 500
-				'<center><img src="images/etogame/kassa.jpg"></center>'
-				'You bought vitamins and paid the money to the cashier.'
-			else
-				'You do not have enough money.'
-			end
-
-			act 'Move away from the counter':gt 'pharmacy', 'start'
-		end
-	end
-
-	if money >= 600:
-		act 'Buy <b>ointment for corns</b> (600 rubles) <<iif(mosolmaz > 0, "[left:<b>" + mosolmaz + "</b>]", "")>>':
-			cla
-			*clr
-			set money -= 600
-			mosolmaz += 10
-			'<center><img src="images/etogame/kassa.jpg"></center>'
-			'You bought tablets and paid the money to the cashier.'
-
-
-			act 'Move away from the counter':gt 'pharmacy', 'start'
-		 end
-	end
-
-	if money >= 1000:
-		act 'Buy <b>moisturizing lip balm</b> (1,000 rubles) <<iif(lipbalm > 0, "[left:<b>" + lipbalm + "</b>]", "")>>':
-			cla
-			*clr
-			set lipbalm += 25
-			set money -= 1000
-			'<center><img src="images/etogame/kassa.jpg"></center>'
-			'You bought some lip balm and paid the money to the cashier.'
-
-			act 'Move away from the counter':gt 'pharmacy', 'start'
-		end
-	end
-
-	if money >= 1500:
-		act '<b>Buy fat burners</b> (1,500 rubles) <<iif(fatdel > 0, "[left:<b>" + fatdel + "</b>]", "")>>':
-			cla
-			*clr
-			set fatdel += 1
-			set money -= 1500
-			'<center><img src="images/etogame/kassa.jpg"></center>'
-			'You bought a fat burning capsule and paid the money to the cashier.'
-
-			act 'Move away from the counter':gt 'pharmacy', 'start'
-		 end
-
-		if KandidNapr = 1:
-			act 'Buy cure pills for yeast infection (1,500 rubles)':
-				cla
-				*clr
-				set money -= 1500
-				Kandidoz = 0
-				'<center><img src="images/pic/kassa.jpg"></center>'
-				'You bought tablets and paid the money to the cashier.'
-				'Immediately about cash you drink tablet.'
-
-				act 'Move away from the counter':gt 'pharmacy', 'start'
-			end
-		end
-	end
-
-
-}
-
-if $ARGS[0] = 'start':
-	cla
-	*clr
-	set minut += 5
-	'<center><b><font color="maroon">Pharmacy</font></b></center>'
-	*nl
-	'<center><img src="images/community/pharmacy.jpg"></center>'
-	'Condoms - 100 rubles' & nl
-	'Pregnancy test - 200 rubles' & nl
-	'Birth control pills - 500 rubles' & nl
-	'Enema - 500 rubles' & nl
-	'Medicine - 500 rubles' & nl
-	'Vitamins - 500 rubles' & nl
-	'Ointment from corns - 600 rubles' & nl
-	'Moisturizing Lip Balm 1,000 rubles' & nl
-	'Fat burners - 1,500 rubles' & nl
-	'Cure pills for yeast infection - 1,500 rubles'
-	clr
-	gs 'stat'
-	gs 'time'
-
-	dynamic $regular_items
-end
-act 'Leave':gt $loc
+act 'Leave': gt $loc
 
 --- pharmacy ---------------------------------