Merge branch 'master' of ssh://git.tfgamessite.com:9000/KevinSmarts/girllife-ecv

locations/FedorMisc

@@ -657,7 +657,7 @@ if $ARGS[0] =  'Strength':
 	minut += 30
 	stren_exp += rand(1, 4) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 	fat -= 1
-	pcs_mood -= 5
+	pcs_mood += 5
 	pcs_sweat += 30
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/gym/strength2.jpg"></center>'
@@ -701,7 +701,7 @@ if $ARGS[0] =  'Agility':
 	speed_exp += rand(1, 3)	
 	agil_exp += rand(1, 3)
 	fat -= 1
-	pcs_mood -= 5
+	pcs_mood += 5
 	pcs_sweat += 30		
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/gym/agility2.jpg"></center>'
@@ -744,7 +744,7 @@ if $ARGS[0] =  'Endurance':
 	minut += 30
 	vital_exp += rand(1, 4)
 	fat -= 1
-	pcs_mood -= 5
+	pcs_mood += 5
 	pcs_sweat += 30	
 	gs'stat'	
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/gym/endurance2.jpg"></center>'

locations/cikl

@@ -91,8 +91,8 @@ i += 1
 if i <= 147:jump 'loopprice'
 
 !!underwear rng
-cheap_panty_number = rand(0,37)
-!!cheap_bra_number = rand(0,37)
+cheap_panty_number = rand(1,37)
+!!cheap_bra_number = rand(1,37)
 
 if coatH[defaultcoat] <= 0: defaultcoat = 0
 

locations/cityTrain

@@ -153,9 +153,9 @@ if $ARGS[0] = 'communal':
 	$loc = 'train'
 	$metka = 'communal'
 	minut += 15
-	gs 'stat'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/oldplat.jpg" ></center>'
 	'After 15 minutes you arrive at an old railway platform near the communal village.'
 	act 'Get off the train':
@@ -168,9 +168,9 @@ if $ARGS[0] = 'village':
 	$loc = 'train'
 	$metka = 'village'
 	minut += 25
-	gs 'stat'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/gadplat.jpg" ></center>'
 	'After 25 minutes, the train stops at the small station near the village of Gadyukino.'
 	act 'Get off the train':
@@ -183,11 +183,11 @@ if $ARGS[0] = 'oldtown':
 	$loc = 'train'
 	$metka = 'oldtown'
 	minut += 35
-	gs 'stat'
 	if rand(1, 100) < 15: gt 'train', 'private'
 	if rand(1, 100) < 30: gt 'train', 'Gopnik'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pushplat.jpg" ></center>'
 	'After 35 minutes, the train stops at old platform by the old town of Pushkin. Famous for its extensive park and old historic buildings, the locals are known to be eccentric but that adds to the charm.'
 	act 'Get off the train':
@@ -200,11 +200,11 @@ if $ARGS[0] = 'pavlovsk':
 	$loc = 'vokzalperG'
 	$metka = ''
 	minut += 40
-	gs 'stat'
 	if rand(1, 100) < 15: gt 'train', 'private'
 	if rand(1, 100) < 30: gt 'train', 'Gopnik'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
+	gs 'stat'
 	if train_event = 0 and rand(1, 100) < 20: gt 'train', 'events'
 	'<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.'

locations/mainQW

@@ -7,6 +7,7 @@ minut += 15
 !!'(Tatiana) -'
 
 act 'Investigate':
+	*clr
 	cla
 	if night_mode = 1:
 		fcolor = rgb(255, 255, 255)
@@ -17,11 +18,14 @@ act 'Investigate':
 		bcolor = rgb(255, 255, 255)
 		lcolor = rgb(106, 90, 205)
 	end
+	'<center><img <<$set_imgh>> src="images/pre/shared/karinpre.jpg"></center>'
 	'"So I''m a magician now?"'
 	'"Sort of, but you''re not the 100m gold medallist just because you have legs or a juggler because you have hands. You''re full of magic but you have no concept of administering magic power, like a battery without an output.'
 
 	act 'Seek help':
+		*clr
 		cla
+		'<center><img <<$set_imgh>> src="images/pre/shared/karinpre.jpg"></center>'
 		'"Can you teach me?"'
 		'"Teach? I''m still learning myself. Besides, I only have knowledge only of body magics. I can boost other''s magic, shield people and modify organic life forms. My skill is innate I was only ever going to have this type of magic. I studied for many years to understand and use my gift.'
 		'"Well, could you teach me what you know."'
@@ -63,7 +67,7 @@ act 'Investigate':
 				'"We met Reinhold there, he represents the council of the highest order. They are the old ones and hold council on the highest matters of magic we must be careful not to upset them or attract the attention of demons."'
 				'"Woah! Demons?'
 				'"Demons, you know, creatures from other plains of existence. It''s possible that Rikudo was a demon, but demons unlike him are beings with terrible force, blunt and aggressive. Something like beasts woven from pure magic. Much like the fae, they have different types and they possess different magics and skills, but these are not cute or friendly."'
-				if StoryLine = 0:
+				if StoryLine = 0 and magikDostup = 0:
 					'"Got it. Hey, you can turn me back into a man?"'
 					'"I can''t. I drew the energy you were emitting from the amulet, I don''t hold anything like the energy required and you have only access to the smallest hint of the potential of the amulet. It might be possible if your magical energies are much higher and you somehow pass me all your energy that I can reverse the spell, but this is unlikely and could put you back in the position you were in when we met. I''m sorry."'
 				end

locations/panties

@@ -45,7 +45,7 @@ end
 if $ARGS[0] = 'fresh':
 	if $ARGS[1] = '':
 		$pantyworntype = 'cheap'
-		pantywornnumber = rand(0,37)
+		pantywornnumber = rand(1,37)
 		clrbelo -= 1
 	else
 		$pantyworntype = $ARGS[1]

locations/sister

@@ -370,7 +370,7 @@ if hour >= 7 and hour < 24:
 	!0 - ''t know about Vecherinka
 	!1 - knows about the parties
 	!2 - agreed to go to the party
-			if sisboytrio >= 5 and sisboyparty = 0 and sisboyparty_day ! daystart:
+			if sisboytrio >= 5 and sisboyparty = 0 and sisboyparty_day ! daystart and week >= 2:
 				cls
 				minut += 5
 				sisboyparty = 1

locations/stat_display

@@ -1051,7 +1051,11 @@ elseif $pantyworntype = 'none':
 	elseif PCloBimbo = 1 or bimbolevel > 0 and PCloSkirt > 3:
 		$stat_msg += '<BR><b><font color = #FF00FF>You like, totally forgot to put on any panties. You are such a bimbo.</font></b>'
 	elseif PCloSkirt > 3:
-		$stat_msg += '<BR><b><font color="red">Your face is flushed with shame, you are not wearing panties and your naked ass flashes from under your short skirt.</font></b>'
+		if pcs_exhibition > 50:
+			$stat_msg += '<BR><b><font color="red">You feel liberated not wearing panties as your naked ass flashes from under your short skirt.</font></b>'
+		else
+			$stat_msg += '<BR><b><font color="red">Your face is flushed with shame, you are not wearing panties and your naked ass flashes from under your short skirt.</font></b>'
+		end
 	elseif $clothingworntype ! 'nude':
 		$stat_msg += '<BR><b><font color="red">You are not wearing panties.</font></b>'
 	elseif towel = 1:

locations/street_event

@@ -611,7 +611,7 @@ if $ARGS[1] = 'main':
 			*clr
 			mainQW = 1
 			'<center><img src="images/locations/city/citycenter/lab/event/main.jpg"></center>'
-			'In front of your building you see Tatiana and Juugo. Tatiana adjusts her glasses and looks around, while Juugo seems to be distracted looking around with a strange look on his face as his tattoos are not visible.'
+			'In front of your building you see Tatiana and Gustav. Tatiana adjusts her glasses and looks around, while Gustav seems to be distracted looking around with a strange look on his face as his tattoos are not visible.'
 			'Tatiana looks at you closely, "I felt a burst of energy. Were you attacked by a magician?"'
 			act 'No':gt 'mainQW'
 			exit

locations/tobiQW

@@ -6,7 +6,7 @@ if $ARGS[0] = 'start':
 	tobiQW = 1
 	minut += 60
 	'<center><img <<$set_imgh>> src="images/pre/tg/reinholdpre.jpg"></center>'
-	if StoryLine = 0:
+	if StoryLine = 0 and MagikDostup = 0:
 		'"Hi Michael, how''s it going?"'
 	else
 		'"Hi <<$pcs_nickname>>, how''s it going?"'

locations/train

@@ -84,8 +84,8 @@ if $ARGS[0] = 'communal_ind':
 	$loc = 'vokzalholle'
 	$metka = ''
 	minut += 10
-	gs 'stat'
 	if rand(1, 100) < 20: gt 'train', 'events'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/indusplat.jpg" ></center>'
 	'After 10 minutes, the train stops at the St. Petersburg city industrial area station.'
 	act 'Get off the train':
@@ -98,8 +98,8 @@ if $ARGS[0] = 'communal_village':
 	$loc = 'train'
 	$metka = 'village'
 	minut += 10
-	gs 'stat'
 	if rand(1, 100) < 20: gt 'train', 'events'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/gadplat.jpg" ></center>'
 	'After 10 minutes, the train stops at the small station near the village of Gadyukino.'
 	act 'Get off the train':
@@ -112,9 +112,9 @@ if $ARGS[0] = 'communal_oldtown':
 	$loc = 'train'
 	$metka = 'oldtown'
 	minut += 20
-	gs 'stat'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pushplat.jpg" ></center>'
 	'After 20 minutes, the train stops at old platform by the old town of Pushkin. Famous for its extensive park and old historic buildings, the locals are known to be eccentric but that adds to the charm.'
 	act 'Get off the train':
@@ -127,9 +127,9 @@ if $ARGS[0] = 'communal_pavlovsk':
 	$loc = 'vokzalperG'
 	$metka = ''
 	minut += 25
-	gs 'stat'
 	if rand(1, 100) <= 20: gt 'train_incidental', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg" ></center>'
 	'After 5 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.'
 	act 'Get off the train': gt 'vokzalperG'
@@ -209,6 +209,8 @@ if $ARGS[0] = 'village_centre':
 	$loc = 'cityTrain'
 	$metka = 'inside'
 	minut += 25
+	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
+	if rand(1, 100) <= 20: gt 'train', 'events'
 	gs 'stat'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
@@ -224,6 +226,8 @@ if $ARGS[0] = 'village_ind':
 	$loc = 'vokzalholle'
 	$metka = ''
 	minut += 20
+	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
+	if rand(1, 100) <= 20: gt 'train', 'events'
 	gs 'stat'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
@@ -239,6 +243,7 @@ if $ARGS[0] = 'village_communal':
 	$loc = 'train'
 	$metka = 'communal'
 	minut += 10
+	if rand(1, 100) < 20: gt 'train', 'events'
 	gs 'stat'
 	if rand(1, 100) < 20: gt 'train', 'events'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/oldplat.jpg" ></center>'
@@ -253,6 +258,7 @@ if $ARGS[0] = 'village_oldtown':
 	$loc = 'train'
 	$metka = 'oldtown'
 	minut += 10
+	if rand(1, 100) < 20: gt 'train', 'events'
 	gs 'stat'
 	if rand(1, 100) < 20: gt 'train', 'events'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pushplat.jpg" ></center>'
@@ -270,9 +276,9 @@ if $ARGS[0] = 'village_pavlovsk':
 	money -= 75
 	train_dest = 6
 	minut += 15
-	gs 'stat'
 	if rand(1, 100) <= 20: gt 'train_incidental', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg" ></center>'
 	'After 15 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.'
 	act 'Get off the train':
@@ -351,6 +357,7 @@ if $ARGS[0] = 'oldtown_centre':
 	if rand(1, 100) < 30: gt 'train', 'Gopnik'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/cityplat.jpg" ></center>'
 	'After 35 minutes, the train stops at the St. Petersburg city center station. The large office blocks and shopping centers fill your view.'
 	act 'Get off the train':
@@ -363,9 +370,9 @@ if $ARGS[0] = 'oldtown_ind':
 	$loc = 'vokzalholle'
 	$metka = ''
 	minut += 30
-	gs 'stat'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/indusplat.jpg" ></center>'
 	'After 30 minutes, the train stops at the St. Petersburg city industrial area station.'
 	act 'Get off the train':
@@ -378,9 +385,9 @@ if $ARGS[0] = 'oldtown_communal':
 	$loc = 'train'
 	$metka = 'communal'
 	minut += 20
-	gs 'stat'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/oldplat.jpg" ></center>'
 	'After 20 minutes you arrive at an old railway platform near the communal village.'
 	act 'Get off the train':
@@ -393,8 +400,8 @@ if $ARGS[0] = 'oldtown_village':
 	$loc = 'train'
 	$metka = 'village'
 	minut += 10
-	gs 'stat'
 	if rand(1, 100) < 20: gt 'train', 'events'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/gadplat.jpg" ></center>'
 	'After 10 minutes, the train stops at the small station near the village of Gadyukino.'
 	act 'Get off the train':
@@ -407,9 +414,9 @@ if $ARGS[0] = 'oldtown_pavlovsk':
 	$loc = 'vokzalperG'
 	$metka = ''
 	minut += 5
-	gs 'stat'
 	if rand(1, 100) <= 20: gt 'train_incidental', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg" ></center>'
 	'After 5 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.'
 	act 'Get off the train':
@@ -908,9 +915,6 @@ if $ARGS[0] = 'young':
 end
 
 if $ARGS[0] = 'Gopnik':
-	*clr
-	cla
-	minut -= 30
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/ride3.jpg" ></center>'
 	'You are sitting in an empty seat by the window, looking outside, lost in thought, as others board the train. A gopnik boy sits down next to you, but you try to ignore him and keep staring outside. Unfazed by that, he gives you once-over, a lewd grin you only see from the corner of your eyes, and leans in close, putting his arm around you. You turn your head to tell him off but your mouth is immediately covered by his! And, not content with just kissing you, the gopnik''s hand starts roaming across your breasts.'
 	act 'Stop him':
@@ -924,12 +928,14 @@ if $ARGS[0] = 'Gopnik':
 	act 'Go with it':
 		*clr
 		cla
-		pav_slut += 5
+		minut -= 30
+		pav_sex += 5
 		'<center><img <<$set_imgh>> src="images/locations/shared/train/sex/gopnik.jpg" ></center>'
 		'He is pretty cute and you find yourself in the mood for a little tenderness, so you return his kiss and allow him to paw at your body. During the ride, you hear more than a few people comment on the two of you making out like this on the train; several seem to be of the opinion that this is not a proper place to show this level of affection. Instead of deterring you, however, all that does is tickle your rebellious streak and making you feel even more brazen.'
 		*nl
 		'Once the train stops at your destination, you get off the train with him but barely make it off onto the platform before he pulls you into another kiss. He is actually a pretty good kisser, and while his pawing hands might drive most innocent girls away, he seems to mostly know where he has to grope, too. Breaking the kiss and finding you breathing as heavily as him, he suggests: "Let''s go for a walk; you know, somewhere a little more private."'
 		gs 'arousal', 'foreplay', 5, 'unknown', 'exhibitionism'
+		gs 'stat'
 		act 'Decline':
 			*clr
 			cla
@@ -969,6 +975,7 @@ if $ARGS[0] = 'Gopnik':
 				'You know this is kind of slutty - a little more than just "kind of", actually - but the idea that you could get caught at any moment is making this a lot more arousing than it should be; so, here you are, sucking his cock right above the train platform. Plus, he is kinda cute and you like his cock, so who care''s if it is slutty? The things the people said on the train got you riled up, and this makes you feel like you''re getting back at their stuffy selves: You''re having fun and it''s your body to do with as you please, and that''s all that matters.'
 				'Well, that, and the hard cock you''re sucking with passion.'
 				gs 'arousal', 'bj', 10, 'exhibitionism', 'unknown'
+				gs 'stat'
 
 				act 'Let him fuck you':
 					*clr & cla
@@ -978,6 +985,7 @@ if $ARGS[0] = 'Gopnik':
 					*nl
 					'He meets no resistance when he turns you around and bends you over, up against the side of the walkway railings; by the time he has lined his cock up with your pussy, you are looking back at him with eager anticipation. Impatient as you expected him to be, he slips his <<dick>>cm <<$dick_girth>> cock into your sopping wet pussy. It slides in easily and he has no trouble at all bottoming out on the first thrust. Hearing your moan and feeling how wet and turned on you are, he starts fucking you hard right away. His hips slap against your butt cheeks with every thrust and he reaches up and grabs your shoulder with one hand to keep you from moving away, furiously fucking your pussy and putting you into a state of ecstatic bliss, right there on the skywalk.'
 					gs 'arousal', 'vaginal', 10, 'exhibitionism', 'rough', 'unknown'
+					gs 'stat'
 
 					act 'Have anal sex with him':
 						*clr & cla
@@ -987,13 +995,13 @@ if $ARGS[0] = 'Gopnik':
 						'He rushes down one of the access ramps of the skywalk to an older platform of the station that now serves as a storage siding. As soon as you turn the corner and not longer visible from the skywalk or other platforms anymore - so basically as soon as you turn the corner - he pushes you up against the graffiti-covered wall, pulls your clothes aside again and shoves his cock back into your pussy, fucking you like you hadn''t been interrupted. While you try to stifle your moans so passersby on the walkway won''t hear you, he leans forward and seductively whispers into your ear: "I''m going to fuck that tight little ass of yours."' 
 						*nl
 						'Without waiting for a response from you, the boy pulls his cock out once more and slides his <<dick>>cm <<$dick_girth>> cock up your ass. You gasp in pain, but it turns into a moan of pleasure along the way. You don''t have to consciously relax your asshole to enjoy this at this point; you are so turned on at the moment that you don''t really care where he sticks his cock as long as he just keeps fucking you.'
+						gs 'arousal', 'vaginal', 10, 'exhibitionism', 'unknown', 'rough'
 !!if Sveta has a orgasm then add below.
-						'Your ass is getting pounded almost as hard as your pussy; he is just rough enough to make it hurt a little, but in this strange state you''re in, it seems to hurt in a <i>good</i> way, adding more fuel to the mounting climax inside of you. And then, just like that, the pressure is released explosively, shaking you like a leaf in the wind as you have an anal orgasm, maybe five meters away from a skywalk. You cannot contain your moans at this point, and it doesn''t help that your lover redoubles his efforts and fucks your tight little asshole even harder when he realizes that you''re cumming.'
-						'Had anybody walked by and heard or seen you right now, you wouldn''t have even cared.'
+						$orgasm_txt = 'Your ass is getting pounded almost as hard as your pussy; he is just rough enough to make it hurt a little, but in this strange state you''re in, it seems to hurt in a <i>good</i> way, adding more fuel to the mounting climax inside of you. And then, just like that, the pressure is released explosively, shaking you like a leaf in the wind as you have an anal orgasm, maybe five meters away from a skywalk. You cannot contain your moans at this point, and it doesn''t help that your lover redoubles his efforts and fucks your tight little asshole even harder when he realizes that you''re cumming.'
 						$orgasm_or = 'yes'
-						gs 'arousal', 'vaginal', 10, 'exhibitionism', 'unknown', 'rough'
 						gs 'arousal', 'anal', 10, 'exhibitionism', 'unkown', 'rough'
 						minut -= 10
+						'Had anybody walked by and heard or seen you right now, you wouldn''t have even cared.'
 						gs 'stat'
 
 						act 'Take his cum':

locations/version

@@ -5,6 +5,9 @@ act 'Return': gt 'start'
 '* All changes from 0.3.0 onwards not otherwise credited are from Kevin Smarts'
 
 '0.6.2'
+'- image view changes from illume to allow multiple body/clothing images by moving them to the additional desc window'
+'- New start - New in Town - from Violet Kitten'
+'- Pill changes and menstrual calender added by rachels'
 '- Special thanks for all the hard work on the new wiki by polip1339 and 006802'
 '- Weekly and monthly train passes available from train station ticket offices'
 '- Community vote sees pain removed from the rubbing with no panties causing itching'

locations/vokzalGin

@@ -239,8 +239,8 @@ if $ARGS[0] = 'oldtown':
 	$loc = 'train'
 	$metka = 'oldtown'
 	minut += 5
-	gs 'stat'
 	if rand(1, 100) < 20: gt 'train', 'events'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pushplat.jpg" ></center>'
 	'After 5 minutes, the train stops at old platform by the old town of Pushkin. Famous for its extensive park and old historic buildings, the locals are known to be eccentric but that adds to the charm.'
 	act 'Get off the train':
@@ -253,9 +253,9 @@ if $ARGS[0] = 'village':
 	$loc = 'train'
 	$metka = 'village'
 	minut += 15
-	gs 'stat'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/gadplat.jpg" ></center>'
 	'After 15 minutes, the train stops at the small station near the village of Gadyukino.'
 	act 'Get off the train':
@@ -268,9 +268,9 @@ if $ARGS[0] = 'communal':
 	$loc = 'train'
 	$metka = 'communal'
 	minut += 25
-	gs 'stat'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/oldplat.jpg" ></center>'
 	'After 20 minutes you arrive at an old railway platform near the communal village.'
 	act 'Get off the train':
@@ -283,11 +283,11 @@ if $ARGS[0] = 'ind':
 	$loc = 'vokzalholle'
 	$metka = ''
 	minut += 35
-	gs 'stat'
 	if rand(1, 100) < 15: gt 'train', 'private'
 	if rand(1, 100) < 30: gt 'train', 'Gopnik'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/indusplat.jpg" ></center>'
 	'After 35 minutes, the train stops at the St. Petersburg city industrial area station.'
 	act 'Get off the train':
@@ -304,6 +304,7 @@ if $ARGS[0] = 'centre':
 	if rand(1, 100) < 30: gt 'train', 'Gopnik'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
+	gs 'stat'
 	'<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.'
 	act 'Get off the train':

locations/vokzalholle

@@ -114,8 +114,8 @@ if $ARGS[0] = 'communal':
 	$loc = 'train'
 	$metka = 'communal'
 	minut += 10
-	gs 'stat'
 	if rand(1, 100) < 20: gt 'train', 'events'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/oldplat.jpg" ></center>'
 	'After 10 minutes you arrive at an old railway platform near the communal village.'
 	act 'Get off the train':
@@ -128,9 +128,9 @@ if $ARGS[0] = 'village':
 	$loc = 'train'
 	$metka = 'village'
 	minut += 20
-	gs 'stat'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/gadplat.jpg" ></center>'
 	'After 20 minutes, the train stops at the small station near the village of Gadyukino.'
 	act 'Get off the train':
@@ -143,9 +143,9 @@ if $ARGS[0] = 'oldtown':
 	$loc = 'train'
 	$metka = 'oldtown'
 	minut += 30
-	gs 'stat'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pushplat.jpg" ></center>'
 	'After 30 minutes, the train stops at old platform by the old town of Pushkin. Famous for its extensive park and old historic buildings, the locals are known to be eccentric but that adds to the charm.'
 	act 'Get off the train':
@@ -158,14 +158,11 @@ if $ARGS[0] = 'pavlovsk':
 	$loc = 'vokzalperG'
 	$metka = ''
 	minut += 35
-	gs 'stat'
-	minut += 5
-	gs 'stat'
 	if rand(1, 100) < 15: gt 'train', 'private'
 	if rand(1, 100) < 30: gt 'train', 'Gopnik'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
-	if train_event = 0 and rand(1, 100) < 20: gt 'train', 'events'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg" ></center>'
 	'After 35 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.'
 	act 'Get off the train':