Merge remote-tracking branch 'julzor/master'

locations/gskver.qsrc

@@ -72,25 +72,22 @@ if $ARGS[0] = 'start':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.winter.jpg"></center>'
 			'The main square of Pavlovsk Park. It''s winter, and the park is quite busy with locals and tourists alike.'
 			'There''s snow everywhere, and kids from the whole town have gathered here to make snowmen and enjoy snowball fights. Some of the adults are joining them, happy to play like kids again for just a moment.'
-			''
+			*nl
 		else
 			'<center><h2>Pavlovsk Park</h2></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.winter.night.jpg"></center>'
 			'The main square of Pavlovsk Park. It''s winter, and the nights in Pavlovsk are very cold.'
 			'As you expected, the park is mostly deserted at this time of day. You occasionally see a wild animal, scrounging for food.'
-			''
+			*nl
 		end
 	end
-
+	
+	if hour > 8 and hour < 19:'There''s a small <a href="exec:minut += 5 & gt ''gskino''">movie theater</a> in the park. It only has a single screen.'
+	'The newly opened cafe <a href="exec:gt''cafe_parco'',''start''">"Del Parco"</a>, with eye-catching facade, lots of tables and a summer terrace. Two paths lead out of the park. One brings you to the <a href="exec:minut += 5 & gt ''pavcommercial''">commerical</a> the other to the <a href="exec:minut += 5 & gt ''pavresidential''">residential</a> area.'
+	
 	*nl
-
 	if $clothingworntype = 'nude':pcs_willpwr -= 15 & pcs_mood -= 15 & 'You notice passers-by in the park pointing at you as you walk, and overhear one older lady telling her friend: "Look at her... it''s that <<$pcs_lastname>> girl. Youth these days, they have no shame at all!"'
-
-	*nl
-
-	if hour > 8 and hour < 19:'There''s a small <a href="exec:minut += 5 & gt ''gskino''">movie theater</a> in the park. It only has a single screen.'
-	'The newly opened cafe <a href="exec:gt''cafe_parco'',''start''">"Del Parco"</a>, with eye-catching facade, lots of tables and a summer terrace.'
-
+		
 	if GvstreBoy = 1:'You see <a href="exec:numnpc = SkverBoy & gt ''Gnpc''"><<$nameBoyfrend[SkverBoy]>></a> walking across the main square of Pavlovsk Park. He doesn''t look like he''s going anywhere in particular, and seems to just be enjoying his walk.'
 	!!if kotovLoveQW > 0 and hour >= 18 and hour < 20 and week < 6 or week >= 6 and kotovLoveQW > 0 and hour >= 9 and hour < 20:'You see <a href="exec:minut += 3 & gt ''kotovEv''">Vitek Kotov</a> sitting on a bench in the park, drinking beer by himself. Judging from the empty bottles near the bench, he''s already had a few.'
 	if StoryLine = 1 and SchoolAtestat = 0:
@@ -104,20 +101,21 @@ if $ARGS[0] = 'start':
 	elseif week <= 5 and hour >= 16 and hour < 20 and strelaQW = -2 and fedorKozlovQW <= -10 and FedorOutcast = 1:
 		'You can see the train tracks where <a href="exec:gt ''FedorMisc'', ''Outcast''">Fedor</a> spends his time.'
 	end
-
+	
 	if rexPark = 1 and rexParkDay = daystart and hour >= 16 and hour < 18:
 		'You see Rex walking in the park.'
 		act 'Go and see Rex':gt 'reks', 'skver'
 	end
 
-
-	if hour >= 20 or hour < 6 :
+	if (hour >= 20 or hour < 6) and pcs_sleep <= 40:
 		if home_owned[2] = 0 and workPTU <= 2 and HotelRoom < 1:
 			!nowhere to live in town
 			'It''s quite dark now, and you have no where to stay nearby. Maybe you should try to sleep on a bench?'
-			if StoryLine = 1:*P 'Or try your luck and go to Uncle Shulgin''s Apartment?'
+			if StoryLine = 1: 'Or try your luck and go to Uncle Shulgin''s Apartment?'
+		elseif home_owned[2] = 1 and (hour >= 22 or hour < 6):
+			'It''s quite dark outside, and you feel tired. Maybe you should head home.'
 		else
-			'It''s quite dark now, and you don''t feel like walking. Maybe you should try sleeping on a bench?'
+			'It''s quite dark now, and you feel tired. Maybe you should try sleeping on a bench?'
 		end
 		act 'Sleep on a bench': gt'placer_sex','sleeping_park_bench'
 	end
@@ -132,24 +130,22 @@ if $ARGS[0] = 'start':
 			gs 'stat'
 			if mey_vika['qw_day'] = daystart: delact 'Looking for Vika'
 		else
-			cla
-			*clr
+			*clr & cla
 			minut += 15
 			place = 1
 			Frend_num = 0
 			if MagikDostup ! 1:
-				if rand (1, 4) <= pcs_magik and (hour <=6 or hour >=19):
-					gt 'MagEncounterFairy'
-				end
+				if rand (1, 4) <= pcs_magik and (hour <=6 or hour >=19): gt 'MagEncounterFairy'
 			end
 			gt 'placer'
 		end
 	end
 
+	gs 'parkivent', 'run'
+	
 	if hour >= 8 and hour < 22:
 		act 'Distribute flyers to earn money (50 <b>₽</b>) (1:00)':
-			cla
-			*clr
+			*clr & cla
 			minut += 60
 			money += 50
 			pcs_mood -= 5
@@ -162,22 +158,20 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	gs 'parkivent', 'run'
-
 	! meynold`s events
 	if mey_vika['mey_vika_qw'] > 0 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart:
 		!disable after can access home
-		act 'Look for Vika':
+		act 'Look for Vika (0:05)':
+			minut += 5
 			gs 'mey_vika_events', 'park_meet'
 			gs 'stat'
-			if mey_vika['qw_day'] = daystart: delact 'Looking for Vika'
 		end
 	end
-
+	
 	if pcs_inhib >= 35 or exhibitionist_lvl > 0:
-		act 'Flash your tits':
+		act 'Flash your tits (0:05)':
 			if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
-			cls
+			*clr & cla
 			gs 'exhibitionism', 1
 			gs 'flash', 'tits', 'outdoors', 5
 			gs 'stat'
@@ -189,9 +183,9 @@ if $ARGS[0] = 'start':
 	gs 'kseniyaQW', 'events'
 
 	if exhibitionist_lvl > 1:
-		act 'Flash your pussy':
+		act 'Flash your pussy (0:05)':
 			if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
-			cls
+			*clr & cla
 			gs 'exhibitionism', 3
 			gs 'flash', 'pussy', 'outdoors', 5
 			gs 'stat'
@@ -199,9 +193,9 @@ if $ARGS[0] = 'start':
 			act 'Continue': gt 'gskver', 'start'
 		end
 	end
-
-	act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-	act 'Go to the high street':minut += 5 & gt 'pavCommercial'
+	
+	act 'Walk to the residential area':minut += 5 & gt 'pavResidential'
+	act 'Walk to the commercial area':minut += 5 & gt 'pavCommercial'
 end
 
 --- gskver ---------------------------------

locations/preCSB.qsrc

@@ -369,10 +369,16 @@ if $ARGS[0] = 'intro_9':
 	lcolor = rgb(106, 90, 205)
 	'<center><img <<$set_imgh>> src="images/pre/csb/dyingforest.jpg"></center>'
 	'...'
-	wait 3000
+	wait 1500
 	*nl
 	'...'
-	wait 3000
+	wait 1500
+	*nl
+	'...'
+	wait 1500
+	*nl
+	'...'
+	wait 1500
 	*nl
 	'Darkness consumes your thoughts for some time. Eventually, images begin to form in your mind and you soon find yourself in a middle of a dream. The strange amulet stands before you and out of it comes a ghost of some sort. Before you even realize what you are doing, you find yourself staring deep into the ghost''s eyes which then turn into two planet earths.'
 	'"Most who look at the world see only the mundane, but there is more to it. Much more. Now you see that too. You have the potential to shape it all, but first, you have company."'
@@ -515,6 +521,40 @@ if $ARGS[0] = 'intro_9':
 end
 
 if $ARGS[0] = 'intro_end':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/system/schoolboy.jpg"></center>'
+	*nl
+	'You can choose from two starting locations:'
+	*nl
+	'In the Pavlovsk start you awaken at your parent''s home in the provincial town of Pavlovsk <i>(Recommended for new players)</i>. In the Gadukino start you are visiting your grandparent''s house in the small farming village of Gadukino.'
+
+	act 'Pavlovsk Start': gt 'preCSB', 'pav_start'
+	act 'Gadukino Start': gt 'preCSB', 'gad_start'
+end
+
+if $ARGS[0] = 'pav_start':
+	*clr & cla
+	'<center><h2>Pavlovsk</h2></center>'
+	'<center><img <<$set_imgh>> src="images/pre/alt/gorodok.jpg"></center>'
+	*nl
+	'<center>A provincial town in a rural area of Russia, it looks much like all the other towns in the region. Population: about 15000 inhabitants.</center>'
+	
+	act 'Continue': $starting_location = 'pavlovsk' & gt 'preCSB', 'game_start'
+	act 'Change location': gt 'preCSB', 'gad_start'
+end
+
+if $ARGS[0] = 'gad_start':
+	*clr & cla
+	'<center><h2>Gadukino</h2></center>'
+	'<center><img <<$set_imgh>> src="images/pre/alt/gadukino.jpg"></center>'
+	*nl
+	'<center>A small farming village with many rickety wooden houses and even more ruins of houses. This village has seen better times.</center>'
+	
+	act 'Continue': $starting_location = 'gadyukino' & gt 'preCSB', 'game_start'
+	act 'Change location': gt 'preCSB', 'pav_start'
+end
+
+if $ARGS[0] = 'game_start':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 	'Shortly after Tatiana left, your new mother showed up to take you to your new home. You met your new family and did the best you could to fit in, afraid of them figuring out that you are not <<$pcs_firstname>>. They seem to have bought Tatiana''s explanation of amnesia and mental trauma, going out of their way to reintroduce you to your new life.'
@@ -534,7 +574,8 @@ if $ARGS[0] = 'intro_end':
 		
 		act 'Continue':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/bedrpar.jpg"></center>'
+			if $starting_location = 'pavlovsk': '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/bedrpar.jpg"></center>'
+			if $starting_location = 'gadukino': '<center><img <<$set_imgh>> src="images/pre/alt/gadukino.jpg"></center>'
 			'It will take some more time for you to get completely used to your new body and life as <<$pcs_firstname>>. For now, you should just focus on getting out of bed.'
 			
 			act 'Continue':
@@ -555,46 +596,15 @@ if $ARGS[0] = 'intro_end':
 				
 				gs 'stat'
 				
-				act 'Continue': gt 'preCSB', 'game_start'
+				act 'Start your new life': 
+					if $starting_location = 'pavlovsk': gt 'bedrPar'
+					if $starting_location = 'gadukino': gt 'gadhouse'
+				end
 			end
 		end
 	end
 end
 
-if $ARGS[0] = 'game_start':
-	*clr & cla
-	'<center><img <<$set_imgh>> src="images/system/schoolboy.jpg"></center>'
-	*nl
-	'You can choose from two starting locations:'
-	*nl
-	'In the Pavlovsk start you awaken at your parent''s home in the provincial town of Pavlovsk <i>(Recommended for new players)</i>. In the Gadukino start you are visiting your grandparent''s house in the small farming village of Gadukino.'
-
-	act 'Pavlovsk Start': gt 'preCSB', 'pav_start'
-	act 'Gadukino Start': gt 'preCSB', 'gad_start'
-end
-
-if $ARGS[0] = 'pav_start':
-	*clr & cla
-	'<center><h2>Pavlovsk</h2></center>'
-	'<center><img <<$set_imgh>> src="images/pre/alt/gorodok.jpg"></center>'
-	*nl
-	'<center>A provincial town in a rural area of Russia, it looks much like all the other towns in the region. Population: about 15000 inhabitants.</center>'
-	
-	act 'Get out of bed and get dressed': gt 'bedrPar'
-	act 'Change location': gt 'preCSB', 'game_start'
-end
-
-if $ARGS[0] = 'gad_start':
-	*clr & cla
-	'<center><h2>Gadukino</h2></center>'
-	'<center><img <<$set_imgh>> src="images/pre/alt/gadukino.jpg"></center>'
-	*nl
-	'<center>A small farming village with many rickety wooden houses and even more ruins of houses. This village has seen better times.</center>'
-	
-	act 'Get out of bed and get dressed': gt 'gadhouse'
-	act 'Change location': gt 'preCSB', 'game_start'
-end
-
 !!------------------------
 !! Character Customization
 !!------------------------