瀏覽代碼

[fixed] Fuel cans can be bought when car is not in petrol station as intended, limited them to 4 max and adjusted tank size to aid in the change.

KevinSmarts 3 年之前
父節點
當前提交
12781a6e22
共有 3 個文件被更改,包括 34 次插入33 次删除
  1. 1 1
      locations/carF.qsrc
  2. 4 4
      locations/succubus.qsrc
  3. 29 28
      locations/zaprF.qsrc

+ 1 - 1
locations/carF.qsrc

@@ -44,7 +44,7 @@ if $ARGS[0] = 'start':
 	if kanistra > 0:
 		'In the trunk there is <<kanistra>> canister/s of gasoline. Each canister contains 5 liters of gasoline.'
 
-		if benz <= 35:
+		if benz <= 45:
 			act 'Pour gasoline into the tank':
 				cla
 				menu_off = 1

+ 4 - 4
locations/succubus.qsrc

@@ -735,17 +735,17 @@ if $args[0] = 'sucwalkinggo':
 !!This picks the location where you end up and how you got there
 	if succublvl >= 4 and car > 0 and wrek ! 1:
 		if benz <= 4:
-			if money < (30 * (40 - benz)):
+			if money < (30 * (50 - benz)):
 				if kanistra > 0:
 					benz += 5 & kanistra -= 1
 				else
 					money = 0
 					scwalkmon = 0
-					benz += rand(10,40)
+					benz += rand(10,50)
 				end
 			else
-				money -= (30 * (40 - benz))
-				benz = 40
+				money -= (30 * (50 - benz))
+				benz = 50
 			end
 		end
 		sctemp = rand(1,11)

+ 29 - 28
locations/zaprF.qsrc

@@ -51,42 +51,43 @@ if $ARGS[0] = 'start':
 	end
 	act 'Go to the toilet':gt 'zaprF', 'toilet'
 
-	if car > 0 and cardrive = 6 or cardrive = 21:
-		'Your <a href="exec: gs ''carF'', ''start''"><<$car>></a> is parked here.'
-		act 'Buy a canister able to contain up to 5 liters of gasoline for 150 <b>₽</b>':
-			cla
-			kanistra += 1
-			money -= 150
-			'You bought a canister of gasoline. (It was automatically put in the trunk)'
-
-			act 'Disengage from the pump':gt 'zaprF', 'start'
-		end
-	end
+	if car > 0:
+		if cardrive = 6 or cardrive = 21: 'Your <a href="exec: gs ''carF'', ''start''"><<$car>></a> is parked here.'
+	
+		if kanistra < 5:
+			act 'Buy a canister and fill it with 5 liters of gasoline for 150 <b>₽</b>':
+				cla
+				kanistra += 1
+				money -= 150
+				'You bought a canister of gasoline. (It will automatically be put in the trunk of your car)'
 
-	zprbenz = 40 - benz
+				act 'Disengage from the pump':gt 'zaprF', 'start'
+			end
+		end
 
-	if benz < 40 and car > 0 and cardrive = 6 or benz < 40 and car > 0 and cardrive = 21:
-		zprbenz = 40 - benz
+		if benz < 50 and (cardrive = 6 or cardrive = 21):
+			zprbenz = 50 - benz
 
-		if zprbenz * 30 <= money:
-			act 'Fill the tank with petrol':
-				cla
-				*clr
-				benz = 40
-				zprpay = zprbenz * 30
-				money -= zprpay
+			if zprbenz * 30 <= money:
+				act 'Fill the tank with petrol':
+					cla
+					*clr
+					benz = 50
+					zprpay = zprbenz * 30
+					money -= zprpay
 
-				! WD: Uninitialised ~ 'pol'
-				! if pol > 0:'<center><img <<$set_imgh>> src="images/locations/shared/gas/zapr1.jpg"></center>'
+					! WD: Uninitialised ~ 'pol'
+					! if pol > 0:'<center><img <<$set_imgh>> src="images/locations/shared/gas/zapr1.jpg"></center>'
 
-				'<center><img <<$set_imgh>> src="images/locations/shared/gas/zapr1.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/shared/gas/zapr1.jpg"></center>'
 
-				'You filled the tank and paid <<zprpay>> <b>₽</b>.'
+					'You filled the tank and paid <<zprpay>> <b>₽</b>.'
 
-				act 'Disengage from the pump':gt 'zaprF', 'start'
+					act 'Disengage from the pump':gt 'zaprF', 'start'
+				end
+			else
+				'You do not have enough money to refuel your car.'
 			end
-		else
-			'You do not have enough money to refuel.'
 		end
 	end
 end