morgolon 10 лет назад
Родитель
Сommit
275867e6a6
3 измененных файлов с 36 добавлено и 73 удалено
  1. BIN
      glife.txt
  2. 6 6
      locations/kitchen
  3. 30 67
      locations/pharmacy

+ 6 - 6
locations/kitchen

@@ -19,7 +19,7 @@ act 'Eat Meal (0:30)':
 
 
 	if energy >= 30:
 	if energy >= 30:
 		set fat += 5
 		set fat += 5
-		'You can no longer have.'
+		'You can no longer eat.'
 	end
 	end
 
 
 	if energy >= 20 and energy < 30:
 	if energy >= 20 and energy < 30:
@@ -321,7 +321,7 @@ act 'Drink':
 	cla
 	cla
 	set minut += 5
 	set minut += 5
 
 
-	if water >= 20:'Water in you no longer climbs.'
+	if water >= 20:'You don''t need any more water.'
 
 
 	if water < 20:
 	if water < 20:
 		'You gladly drank a glass of water.'
 		'You gladly drank a glass of water.'
@@ -354,7 +354,7 @@ if lekarstvo > 0:
 			if lekrand = 7:'<center><img src="images/inBed/lekr8.jpg"></center>'
 			if lekrand = 7:'<center><img src="images/inBed/lekr8.jpg"></center>'
 			if lekrand = 8:'<center><img src="images/inBed/lekr9.jpg"></center>'
 			if lekrand = 8:'<center><img src="images/inBed/lekr9.jpg"></center>'
 
 
-			'You drank the pill'
+			'You took a pill'
 
 
 			act 'Move away':gt 'kitchen'
 			act 'Move away':gt 'kitchen'
 		end
 		end
@@ -362,9 +362,9 @@ if lekarstvo > 0:
 end
 end
 
 
 if vitamin > 0:
 if vitamin > 0:
-	'You have <<vitamin>> vitaminok.'
+	'You have <<vitamin>> vitamines.'
 	if vitaminday ! day:
 	if vitaminday ! day:
-		act 'Drink Vitamins (0:05)':
+		act 'Take Vitamins (0:05)':
 			cla
 			cla
 			*clr
 			*clr
 			set minut += 5
 			set minut += 5
@@ -375,7 +375,7 @@ if vitamin > 0:
 
 
 			if skinvan = 20:set skinvan = 0 & set skin += 1
 			if skinvan = 20:set skinvan = 0 & set skin += 1
 
 
-			'You drank Vitaminki'
+			'You took some vitamins'
 
 
 			act 'Move away':gt 'kitchen'
 			act 'Move away':gt 'kitchen'
 
 

+ 30 - 67
locations/pharmacy

@@ -1,8 +1,27 @@
 # pharmacy
 # pharmacy
 !!!0.2.6 addition: Optimized flow of the code, updated descriptions - now lists everything the drugstore has to sell
 !!!0.2.6 addition: Optimized flow of the code, updated descriptions - now lists everything the drugstore has to sell
 $regular_items = {
 $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
+
 	if money >= 200:
 	if money >= 200:
-		act 'Buy a pregnancy test (200 rubles)':
+		act 'Buy a <b>pregnancy test</b> (200 rubles) <<iif(pregtest > 0, "[left:<b>" + pregtest + "</b>]", "")>>':
 			cla
 			cla
 			*clr
 			*clr
 			set money -= 200
 			set money -= 200
@@ -15,7 +34,9 @@ $regular_items = {
 	end
 	end
 
 
 	if money >= 500:
 	if money >= 500:
-		act 'Buy birth control pills (500 rubles)':
+		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?")
 			portion = input ("How many packages you want to buy?")
 
 
 			if portion * 500 > money:'You do not have enough money.'
 			if portion * 500 > money:'You do not have enough money.'
@@ -43,7 +64,7 @@ $regular_items = {
 			end
 			end
 		end
 		end
 
 
-		act 'Buy <b>medicine</b> (500 rubles) <<iif(lekarstvo > 0, ''[left:<b>'' + lekarstvo + ''</b>]'', '''')>>':
+		act 'Buy <b>medicine</b> (500 rubles) <<iif(lekarstvo > 0, "[left:<b>" + lekarstvo + "</b>]", "")>>':
 			cla
 			cla
 			*clr
 			*clr
 			portion = input ("How many packages you want to buy?")
 			portion = input ("How many packages you want to buy?")
@@ -60,7 +81,7 @@ $regular_items = {
 			act 'Move away from the counter':gt 'pharmacy', 'start'
 			act 'Move away from the counter':gt 'pharmacy', 'start'
 		 end
 		 end
 
 
-		act 'Buy <b>vitamins</b> (500 rubles) <<iif(vitamin > 0, ''[left:<b>'' + vitamin + ''</b>]'', '''')>>':
+		act 'Buy <b>vitamins</b> (500 rubles) <<iif(vitamin > 0, "[left:<b>" + vitamin + "</b>]", "")>>':
 			cla
 			cla
 			*clr
 			*clr
 			portion = input ("How many packages you want to buy?")
 			portion = input ("How many packages you want to buy?")
@@ -79,7 +100,7 @@ $regular_items = {
 	end
 	end
 
 
 	if money >= 600:
 	if money >= 600:
-		act 'Buy <b>ointment for corns</b> (600 rubles) <<iif(mosolmaz > 0, ''[left:<b>'' + mosolmaz + ''</b>]'', '''')>>':
+		act 'Buy <b>ointment for corns</b> (600 rubles) <<iif(mosolmaz > 0, "[left:<b>" + mosolmaz + "</b>]", "")>>':
 			cla
 			cla
 			*clr
 			*clr
 			set money -= 600
 			set money -= 600
@@ -93,7 +114,7 @@ $regular_items = {
 	end
 	end
 
 
 	if money >= 1000:
 	if money >= 1000:
-		act 'Buy <b>moisturizing lip balm</b> (1,000 rubles) <<iif(lipbalm > 0, ''[left:<b>'' + lipbalm + ''</b>]'', '''')>>':
+		act 'Buy <b>moisturizing lip balm</b> (1,000 rubles) <<iif(lipbalm > 0, "[left:<b>" + lipbalm + "</b>]", "")>>':
 			cla
 			cla
 			*clr
 			*clr
 			set lipbalm += 25
 			set lipbalm += 25
@@ -106,7 +127,7 @@ $regular_items = {
 	end
 	end
 
 
 	if money >= 1500:
 	if money >= 1500:
-		act '<b>Buy fat burners</b> (1,500 rubles) <<iif(fatdel > 0, ''[left:<b>'' + fatdel + ''</b>]'', '''')>>':
+		act '<b>Buy fat burners</b> (1,500 rubles) <<iif(fatdel > 0, "[left:<b>" + fatdel + "</b>]", "")>>':
 			cla
 			cla
 			*clr
 			*clr
 			set fatdel += 1
 			set fatdel += 1
@@ -131,6 +152,8 @@ $regular_items = {
 			end
 			end
 		end
 		end
 	end
 	end
+
+
 }
 }
 
 
 if $ARGS[0] = 'start':
 if $ARGS[0] = 'start':
@@ -154,66 +177,6 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	gs 'stat'
 	gs 'time'
 	gs 'time'
 
 
-	if money >= 100:
-		act 'Buy <b>condoms</b> (100 rubles) <<iif(prezik > 0, ''[left:<b>'' + prezik + ''</b>]'', '''')>>':
-			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
-
-	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 two pregnancy tests and paid the money to the cashier.'
-
-			act 'Move away from the counter':gt 'pharmacy', 'start'
-		end
-	end
-
-	if money >= 500:
-		act 'Buy birth control pills (500 rubles) <<iif(tabletki > 0, ''[left:<b>'' + tabletki + ''</b>]'', '''')>>':
-			portion = input ("How many packages you want to buy?")
-
-			if portion * 500 <= money:
-				set tabletki += portion * 28
-				set money -= portion * 500
-				'<center><img src="images/etogame/kassa.jpg"></center>'
-				'You bought the pills 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
-
-		if klisma = 0:
-			act 'Buy <b>enema</b> (500 rubles)':
-				cla
-				*clr
-				set klisma = 1
-				set money -= 500
-				'<center><img src="images/etogame/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
-	end
-
 	dynamic $regular_items
 	dynamic $regular_items
 end
 end
 act 'Leave':gt $loc
 act 'Leave':gt $loc