Browse Source

[fixed] Weed event is only triggered in Pav when getting th etrain to the city as was intended and teh destination is fixed so that you do end up in the city. Only triggered if you buy a ticket and not if you have a pass for now.

KevinSmarts 4 years ago
parent
commit
89029b59af
2 changed files with 10 additions and 10 deletions
  1. 1 0
      locations/pavtrainhall.qsrc
  2. 9 10
      locations/train.qsrc

+ 1 - 0
locations/pavtrainhall.qsrc

@@ -283,6 +283,7 @@ if $ARGS[0] = 'buy_ticket':
 	if money >= 150:
 	if money >= 150:
 		act 'Buy a ticket to city center (150 <b>₽</b>)':
 		act 'Buy a ticket to city center (150 <b>₽</b>)':
 			money -= 150
 			money -= 150
+			if rand(0,10) = 0: gt 'train', 'weed'
 			gt 'pavtrainhall', 'centre'
 			gt 'pavtrainhall', 'centre'
 		end
 		end
 	end
 	end

+ 9 - 10
locations/train.qsrc

@@ -307,13 +307,12 @@ if $ARGS[0] = 'events':
 		gt 'train', 'fit'
 		gt 'train', 'fit'
 	elseif event_random < 70:
 	elseif event_random < 70:
 		gt 'train', 'young'
 		gt 'train', 'young'
-	elseif event_random < 100:
-		gt 'train', 'weed'
 	else
 	else
 		gt $loc, $metka
 		gt $loc, $metka
 	end
 	end
 end
 end
 
 
+!!only triggered direct from Pav when going to the city center
 if $ARGS[0] = 'weed':
 if $ARGS[0] = 'weed':
 	train_event = 1
 	train_event = 1
 	menu_off = 1
 	menu_off = 1
@@ -350,11 +349,11 @@ if $ARGS[0] = 'weed':
 					*clr & cla
 					*clr & cla
 					minut += 40
 					minut += 40
 					gs 'stat'
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg" ></center>'
-					'After 40 minutes, you see the town of Pavlovsk approaching. Pavlovsk Castle is an impressive sight, even from a long distance. The train stops at its final destination, a platform in Pavlovsk station.'
+					'<center><img <<$set_imgh>> src="images/locations/shared/train/cityplat.jpg" ></center>'
+					'After 40 minutes, the train stops at the St. Petersburg city center station. The large office blocks and shopping centers fill your view. This is the train''s final destination.'
 					act 'Get off the train':
 					act 'Get off the train':
 						if rand(1, 100) <= 5: gt 'train_incidental', 'end'
 						if rand(1, 100) <= 5: gt 'train_incidental', 'end'
-						gt 'pavtrainhall', 'platform'
+						gt 'cityTrain', 'inside'
 					end
 					end
 				end
 				end
 			end
 			end
@@ -390,11 +389,11 @@ if $ARGS[0] = 'weed':
 						*clr & cla
 						*clr & cla
 						minut += 40
 						minut += 40
 						gs 'stat'
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg" ></center>'
-						'After 40 minutes, you see the town of Pavlovsk approaching. Pavlovsk Castle is an impressive sight, even from a long distance. The train stops at its final destination, a platform in Pavlovsk station.'
+						'<center><img <<$set_imgh>> src="images/locations/shared/train/cityplat.jpg" ></center>'
+						'After 40 minutes, the train stops at the St. Petersburg city center station. The large office blocks and shopping centers fill your view. This is the train''s final destination.'
 						act 'Get off the train':
 						act 'Get off the train':
 							if rand(1, 100) <= 5: gt 'train_incidental', 'end'
 							if rand(1, 100) <= 5: gt 'train_incidental', 'end'
-							gt 'pavtrainhall', 'platform'
+							gt 'cityTrain', 'inside'
 						end
 						end
 					end
 					end
 				end		
 				end		
@@ -450,10 +449,10 @@ if $ARGS[0] = 'weed':
 								gs 'stat'
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/shared/train/ride.jpg"></center>'
 								'<center><img <<$set_imgh>> src="images/locations/shared/train/ride.jpg"></center>'
 								'Once on the train, you look around but you don''t see the young man. Perhaps he got on a different car? You go looking for him, passing through a few different sections, hoping to continue what you started and deal with your overwhelming horniness, but after checking the entire train without seeing a hint of him, you give up and find a seat.'
 								'Once on the train, you look around but you don''t see the young man. Perhaps he got on a different car? You go looking for him, passing through a few different sections, hoping to continue what you started and deal with your overwhelming horniness, but after checking the entire train without seeing a hint of him, you give up and find a seat.'
-								'After 40 minutes, you see the town of Pavlovsk approaching. Pavlovsk Castle is an impressive sight, even from a long distance. The train stops at its final destination, a platform in Pavlovsk station.'
+								'<center><img <<$set_imgh>> src="images/locations/shared/train/cityplat.jpg" ></center>'
+								'After 40 minutes, the train stops at the St. Petersburg city center station. The large office blocks and shopping centers fill your view. This is the train''s final destination.'
 								act 'Get off the train':
 								act 'Get off the train':
 									if rand(1, 100) <= 5: gt 'train_incidental', 'end'
 									if rand(1, 100) <= 5: gt 'train_incidental', 'end'
-									gt 'pavtrainhall', 'platform'
 								end
 								end
 							end
 							end
 						end
 						end