Selaa lähdekoodia

More bugfixes

Looks good now
heromaster 10 vuotta sitten
vanhempi
commit
608f6203f4
9 muutettua tiedostoa jossa 93 lisäystä ja 88 poistoa
  1. 1 1
      locations/Sgrup
  2. 1 1
      locations/Sgrup1
  3. 1 1
      locations/Sgrup2
  4. 1 1
      locations/Sgrup3
  5. 1 1
      locations/Sgrup4
  6. 1 1
      locations/Sgrup5
  7. 3 2
      locations/SgrupDisco
  8. 0 2
      locations/etoexhib
  9. 84 78
      locations/gaptek

+ 1 - 1
locations/Sgrup

@@ -6,7 +6,7 @@ i = 0
 :markgruploop
 i += 1
 
-if grupTipe[i] = 0:$textgrup + = '' + $npcGo[i]
+if grupTipe[i] = 0:$textgrup += '' + $npcGo[i]
 if i < 26:jump 'markgruploop'
 
 '<<$textgrup>>'

+ 1 - 1
locations/Sgrup1

@@ -6,7 +6,7 @@ i = 0
 :markgruploop
 i += 1
 
-if grupTipe[i] = 1:$textgrup + = '' + $npcGo[i]
+if grupTipe[i] = 1:$textgrup += '' + $npcGo[i]
 if i < 26:jump 'markgruploop'
 
 '<<$textgrup>>'

+ 1 - 1
locations/Sgrup2

@@ -6,7 +6,7 @@ i = 0
 :markgruploop
 i += 1
 
-if grupTipe[i] = 2:$textgrup + = '' + $npcGo[i]
+if grupTipe[i] = 2:$textgrup += '' + $npcGo[i]
 
 if i < 26:jump 'markgruploop'
 

+ 1 - 1
locations/Sgrup3

@@ -6,7 +6,7 @@ i = 0
 :markgruploop
 i += 1
 
-if grupTipe[i] = 3:$textgrup + = '' + $npcGo[i]
+if grupTipe[i] = 3:$textgrup += '' + $npcGo[i]
 
 if i < 26:jump 'markgruploop'
 

+ 1 - 1
locations/Sgrup4

@@ -6,7 +6,7 @@ i = 0
 :markgruploop
 i += 1
 
-if grupTipe[i] = 4:$textgrup + = '' + $npcGo[i]
+if grupTipe[i] = 4:$textgrup += '' + $npcGo[i]
 if i < 26:jump 'markgruploop'
 
 '<<$textgrup>>'

+ 1 - 1
locations/Sgrup5

@@ -6,7 +6,7 @@ i = 0
 :markgruploop
 i += 1
 
-if grupTipe[i] = -1:$textgrup + = '' + $npcGo[i]
+if grupTipe[i] = -1:$textgrup += '' + $npcGo[i]
 if i < 26:jump 'markgruploop'
 
 '<<$textgrup>>'

+ 3 - 2
locations/SgrupDisco

@@ -6,11 +6,12 @@ i = 0
 :markgruploop
 i += 1
 
-if grupTipe[i] = 3:$textgrup + = '' + $npcGo[i]
-if grupTipe[i] = 4:$textgrup2 + = '' + $npcGo[i]
+if grupTipe[i] = 3:$textgrup += '' + $npcGo[i]
+if grupTipe[i] = 4:$textgrup2 += '' + $npcGo[i]
 if i < 26:jump 'markgruploop'
 
 'Dancing on the dance floor <<$textgrup>>'
+''
 'In one corner stand <<$textgrup2>>'
 
 act 'Move away':gt $loc, $metka

+ 0 - 2
locations/etoexhib

@@ -188,11 +188,9 @@ if $ARGS[0] = 'pos6':
 	'Spring water.'
 
 	act 'Have a drink':
-		if water >= 20:
 		if water >= 20:
 			'Water in you no longer climbs.'
 		elseif water < 20:
-			'You gladly drank spring water.'
 			water += 20
 			'You gladly drank spring water.'
 		end

+ 84 - 78
locations/gaptek

@@ -26,7 +26,6 @@ if $ARGS[0] = 'start':
 		'Fat burners - 1500 rubles'
 
 		if KandidNapr = 1:'Cure pills for yeast infection - 1,500 rubles'
-
 		if StoryLine = 1:'Behind the counter, as always, sits aunt Luda. "Hi <<$name>>. How are you?"'
 
 		if motherQW >= 2:
@@ -37,6 +36,7 @@ if $ARGS[0] = 'start':
 				gs 'stat'
 				'<center><b><font color="maroon">Pharmacy</font></b></center>'
 				'<center><img src="images/pic/aptek.jpg"></center>'
+
 				if motherQW = 2 and gaogorod + gaogorodrand < 40:
 					if gaptekfirst = 0:
 						gaptekfirst = 1
@@ -86,7 +86,7 @@ if $ARGS[0] = 'start':
 						if oluuosegunrand = 10 and oluuosegunday ! day:
 							gt 'motherQW', 'olu'
 						elseif oluuosegunrand < 10 or oluuosegunday = day:
-							'You waited in line and approached the counter.'
+								'You waited in line and approached the counter.'
 						end
 					elseif gaprezikday = day and gatabletkiday = day and galubriday = day:
 						minut += rand(5, 15)
@@ -115,7 +115,7 @@ if $ARGS[0] = 'start':
 						'<center><img src="images/etogame/kassa.jpg"></center>'
 						'You bought condoms and paid the money to the cashier.'
 
-						if motherQW < 3:gaogorod = gaogorod + portion
+						if motherQW < 3:gaogorod += portion
 					else
 						'You do not have enough money.'
 					end
@@ -151,7 +151,8 @@ if $ARGS[0] = 'start':
 					cla
 					*clr
 					portion = input("How many packages you want to buy? (One package contains two testers)")
-						if portion <= 0:portion = 1
+
+					if portion <= 0:portion = 1
 
 					if portion * 200 <= money:
 						pregtest += portion * 2
@@ -159,7 +160,6 @@ if $ARGS[0] = 'start':
 						money -= portion * 200
 						'<center><img src="images/etogame/kassa.jpg"></center>'
 						'You bought pregnancy tests and paid the money to the cashier.'
-
 					else
 						'You do not have enough money.'
 					end
@@ -198,6 +198,7 @@ if $ARGS[0] = 'start':
 
 					if portion <= 0:portion = 1
 					if portion > 10:portion = 10 & '"<<$nickname>>, I sell only 10 pieces, no longer brought, I`m_sorry."'
+
 					if portion * 300 <= money:
 						lubri += portion * 5
 						minut += 5 + (portion / 5)
@@ -211,38 +212,23 @@ if $ARGS[0] = 'start':
 
 					act 'Move away from the counter':gt 'gaptek', 'start'
 				end
+			end
 		end
 
 		if money >= 500:
 			if gatabletkiday ! day:
 				act 'Buy <b>birth control pills</b> (500 rubles) <<iif(tabletki > 0, ''[left:<b>'' + tabletki + ''</b>]'', '''')>>':
-
-				portion = input ("How many packages you want to buy?")
-
-				if portion < 0 or (portion > 1 and motherQW < 3):portion = 1 & '"First package I still have enough. It is better not to buy a lot at once, and then Aunt may become suspicious."'
-
-				if portion * 500 <= money:
-					tabletki += portion * 28
-					minut += 5 + (portion / 5)
-					money -= portion * 500
-					gatabletkiday = day
-					'<center><img src="images/etogame/kassa.jpg"></center>'
-					'You bought some lubricant and paid the money to the cashier.'
-				else
-					'You do not have enough money.'
-				end
-
-				act 'Move away from the counter':gt 'gaptek', 'start'
-			elseif StoryLine = 0:
-				act 'Buy <b>birth control pills</b> (500 rubles) <<iif(tabletki > 0, ''[left:<b>'' + tabletki + ''</b>]'', '''')>>':
+					cla
+					*clr
 					portion = input ("How many packages you want to buy?")
 
-					if portion < 0:portion = 1
+					if portion < 0 or (portion > 1 and motherQW < 3):portion = 1 & '"First package I still have enough. It is better not to buy a lot at once, and then Aunt may become suspicious."'
 
 					if portion * 500 <= money:
 						tabletki += portion * 28
 						minut += 5 + (portion / 5)
 						money -= portion * 500
+						gatabletkiday = day
 						'<center><img src="images/etogame/kassa.jpg"></center>'
 						'You bought some lubricant and paid the money to the cashier.'
 					else
@@ -250,73 +236,93 @@ if $ARGS[0] = 'start':
 					end
 
 					act 'Move away from the counter':gt 'gaptek', 'start'
+				elseif StoryLine = 0:
+					act 'Buy <b>birth control pills</b> (500 rubles) <<iif(tabletki > 0, ''[left:<b>'' + tabletki + ''</b>]'', '''')>>':
+						cla
+						*clr
+						portion = input ("How many packages you want to buy?")
+
+						if portion < 0:portion = 1
+
+						if portion * 500 <= money:
+							tabletki += portion * 28
+							minut += 5 + (portion / 5)
+							money -= portion * 500
+							'<center><img src="images/etogame/kassa.jpg"></center>'
+							'You bought some lubricant and paid the money to the cashier.'
+						else
+							'You do not have enough money.'
+						end
+
+						act 'Move away from the counter':gt 'gaptek', 'start'
+					end
 				end
-			end
 
-			if klisma = 0 and motherQW >= 2 and gaptekfirst = 1:
-				act 'Buy <b>enema</b> (500 rubles)':
-					cla
-					*clr
-					klisma = 1
-					minut += 5
-					money -= 500
-					'<center><img src="images/etogame/kassa.jpg"></center>'
-					'You bought an enema and paid the money to the cashier.'
+				if klisma = 0 and motherQW >= 2 and gaptekfirst = 1:
+					act 'Buy <b>enema</b> (500 rubles)':
+						cla
+						*clr
+						klisma = 1
+						minut += 5
+						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 'gaptek', 'start'
+						act 'Move away from the counter':gt 'gaptek', 'start'
+					end
+				elseif klisma = 0 and StoryLine = 0:
+					act 'Buy <b>enema</b> (500 rubles)':
+						cla
+						*clr
+						klisma = 1
+						minut += 5
+						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 'gaptek', 'start'
+					end
 				end
-			elseif klisma = 0 and StoryLine = 0:
-				act 'Buy <b>enema</b> (500 rubles)':
+
+				act 'Buy <b>medicine</b> (500 rubles) <<iif(lekarstvo > 0, ''[left:<b>'' + lekarstvo + ''</b>]'', '''')>>':
 					cla
 					*clr
-					klisma = 1
-					minut += 5
-					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 'gaptek', 'start'
-				end
-			end
+					portion = input("How many packages you want to buy? (One package contains 10 pills)")
 
-			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? (One package contains 10 pills)")
+					if portion <= 0:portion = 1
 
-				if portion <= 0:portion = 1
+					if portion * 500 <= money:
+						money -= portion * 500
+						minut += 5 + (portion / 5)
+						lekarstvo += portion * 10
+						'<center><img src="images/etogame/kassa.jpg"></center>'
+						'You bought drugs and paid the money to the cashier.'
+					else
+						'You do not have enough money.'
+					end
 
-				if portion * 500 <= money:
-					money -= portion * 500
-					minut += 5 + (portion / 5)
-					lekarstvo += portion * 10
-					'<center><img src="images/etogame/kassa.jpg"></center>'
-					'You bought drugs and paid the money to the cashier.'
-				else
-					'You do not have enough money.'
+					act 'Move away from the counter':gt 'aptek', 'start'
 				end
 
-				act 'Move away from the counter':gt 'aptek', '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? (One package contains 20 pills)")
 
-			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? (One package contains 20 pills)")
+					if portion <= 0:portion = 1
 
-				if portion <= 0:portion = 1
+					if portion * 500 <= money:
+						vitamin += portion * 20
+						minut += 5 + (portion / 5)
+						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
 
-				if portion * 500 <= money:
-					vitamin += portion * 20
-					minut += 5 + (portion / 5)
-					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.'
+					act 'Move away from the counter':gt 'aptek', 'start'
 				end
-
-				act 'Move away from the counter':gt 'aptek', 'start'
 			end
 		end
 
@@ -339,7 +345,7 @@ if $ARGS[0] = 'start':
 				end
 
 				act 'Move away from the counter':gt 'aptek', 'start'
-			 end
+			end
 		end
 
 		if money >= 1000: