Browse Source

Merge remote-tracking branch 'julzor/master'

KevinSmarts 4 years ago
parent
commit
702c6b5419

+ 1 - 0
glife.qproj

@@ -694,6 +694,7 @@
 		<Location name="pavtrainhall"/>
 		<Location name="pavtrainhall_events"/>
 		<Location name="pavtrain_market"/>
+		<Location name="pavstation"/>
 		<Location name="katalkin"/>
 		<Location name="katalkinSex"/>
 		<Location name="katalkinAlko"/>

+ 1 - 1
locations/HotelHole.qsrc

@@ -174,7 +174,7 @@ if HotelRoom > 0:
 end
 
 act 'Kill some time in the hotel lobby':
-	gs 'obj_din', 'rest'
+	gs 'obj_din', 'wait'
 	hotwait = 1
 	gt 'hotelhole'
 end

+ 8 - 8
locations/Voltrener.qsrc

@@ -1,8 +1,5 @@
 # Voltrener
-!{Change log
-31 March 2016
-Completed translation of machine translation
-}
+
 CLOSE ALL
 gs 'stat'
 
@@ -178,9 +175,9 @@ if $ARGS[0] = 'talk':
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener6.jpg"></center>'
 						'You tell him its not true and that some of the kids have been spreading false rumours about you.'
 						'He doesn''t appear to be convinced the only options are to go aggressive or leave it.'
+						act 'Leave it': gt 'gdksport', 'start'
 						gs 'willpower', 'misc', 'self', 'hard'
 						gs 'stat'
-						act 'Leave it': gt 'gdksport', 'start'
 						if will_cost <= pcs_willpwr:
 							act 'Persuade him to let you join the team (<<will_cost>> Willpower)':
 								*clr & cla
@@ -197,7 +194,7 @@ if $ARGS[0] = 'talk':
 								act 'Leave':gt 'gdksport', 'start'
 							end
 						else
-							act 'Persuade him to let you join the team (<font color="red"><will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to persuade him to join the team.'
+							act 'Persuade him to let you join the team (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to persuade him to join the team.'
 						end
 					end
 					act 'Okay, it''s true, I am a <<$gnikname>>': gt'Voltrener', 'gorslut'
@@ -207,18 +204,21 @@ if $ARGS[0] = 'talk':
 					if will_cost <= pcs_willpwr:
 						act 'Persuade him (<<will_cost>> Willpower)':
 							*clr & cla
+							minut += rand(20,30)
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
 
 							if npc_rel['A69'] >= 60:
-								minut += rand(20,30)
 								volleysostav = 1
 								'You appeal to the coach and ask him to at least give you a chance to prove yourself. Since he likes you, he decides to give you a break. "Okay, <<$pcs_nickname>>, I do have an opening for a sub. You''re on the team as a substitute player.'
 								act 'Leave':gt 'gdksport', 'start'
+							else
+								'You try to prove the coach that he should let you on the team, but he countered all your arguments, denying you a place on the team.'
+								act 'Leave':gt 'gdksport', 'start'
 							end
 						end
 					else
-						act 'Persuade him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red"> You try to prove the coach that he should let you on the team, but you are don''t have enough willpower and the coach countered all your arguments, denying you a place on the team.'
+						act 'Persuade him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to persuade him to join the team.'
 					end
 				end
 				act 'Leave':gt 'gdksport', 'start'

+ 51 - 1
locations/gskver.qsrc

@@ -98,7 +98,14 @@ if $ARGS[0] = 'start':
 
 	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''">commercial</a> the other to the <a href="exec:minut += 5 & gt ''pavresidential''">residential</a> area.'
-
+	if ((month > 7 and day > 20) or month = 9 and day < 16) and week > 5 and hour > 8 and hour < 20 and alb_father_meeting = 0: 
+		'<br>You overhear someone speaking in front of a crowd. The crowd is quite rowdy, with lots of yelling and clapping throughout the <a href="exec: minut += 2 & gt ''gskver'', ''alb_father_meeting_1''">meeting</a>.'
+	elseif ((month > 8 and day > 20) or month = 10 and day < 16) and week > 5 and hour > 8 and hour < 20 and alb_father_meeting = 1 and alb_father_day < daystart:
+		'Once again a large crowd has gathered in the town center. You can hear Albina''s father holding a public <a href="exec: minut += 2 & gt ''gskver'', ''alb_father_meeting_2''">meeting</a>.'
+	elseif ((month > 9 and day > 20) or month = 11 and day < 16) and week > 5 and hour > 8 and hour < 20 and alb_father_meeting = 2 and alb_father_day < daystart:
+		'By this time you''re well aware that it''s Albina''s father that is holding a <a href="exec: minut += 2 & gt ''gskver'', ''alb_father_meeting_3''">meeting</a>, this time though they have erected a big stage.'
+	end
+	
 	*nl
 	if $clothingworntype = 'nude': 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!"'
 
@@ -218,5 +225,48 @@ if $ARGS[0] = 'start':
 	end
 end
 
+if $ARGS[0] = 'alb_father_meeting_1':
+	cla & *clr
+	alb_father_meeting = 1
+	alb_father_day = daystart + 2
+	minut += 5
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/meeting/meeting1.jpg"></center>'
+	'<i>"First of all, we need to take care of the corruption originating from the police force!!!"</i> the speech is ringing out to the crowd that are cheering on...'
+	'You take a closer look to see that is Albina''s father holding the speech. He''s really going hard on the authorities while the crowd is getting more and more rowdy.'
+	'<i>"Calm down everyone, don''t take out your anger now, instead go and show them at the ballots how upset you truly are!!!"</i> Albina''s father finishes to cheers from the crowd.'
+
+	act 'Go on with your day': gt 'gskver', 'start'
+end
+
+if $ARGS[0] = 'alb_father_meeting_2':
+	cla & *clr
+	alb_father_meeting = 2
+	alb_father_day = daystart + 2
+	minut += 5
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/meeting/meeting2.jpg"></center>'
+	'<i>"Don''t believe the ridiculous accusations thrown against me! They''re just trying to smear me!"</i> he''s slamming the speaking booth as he passionately speaks.'
+	'The crowd is keeping calm except his most die hard supporters that are yelling profanities against the current administration.'
+	'Albina''s father continues on, <i>"I''m just a regular guy, just like the rest of you! My opponents are jealous of my self-made fortune! Why would I be corrupt if I''m already well-off?! No one can pay me off!"</i> he slams the booth again.'
+	
+	act 'Go on with your day': gt 'gskver', 'start'
+end
+
+if $ARGS[0] = 'alb_father_meeting_3':
+	cla & *clr
+	alb_father_meeting = 3
+	alb_father_day = daystart + 2
+	minut += 5
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/meeting/meeting3.jpg"></center>'
+	'You walk over to see what the commotion is about and you see Albina''s father speaking to the crowd as usual, the difference this time is that he seems a bit nervous and stutters a lot while speaking to the crowd. He continues on for a couple more minutes and by the end of the speech he''s profoundly sweating.'
+	'Just as he''s about to finish you hear him say, <i>And now for some entrainment, my daughter and her dance group and if you look at the right there are some refreshments for you all.</i>'
+	'The music starts and the dance group steps out, they''re all wearing really skimpy clothes and directly you can hear the hollering from the men while the females at the gathering are whispering amongst each other that they can''t believe that someone would walk out in those type of outfits...'
+	'You stay for a little while and watch the performance and after you get tired of it you move away while the music is still loudly playing in the background.'
+
+	act 'Leave': gt 'gskver', 'start'
+end
+
 --- gskver ---------------------------------
 

+ 1 - 1
locations/journal.qsrc

@@ -28,7 +28,7 @@ if $ARGS[0] = 'records':
 	if home_owned[4] > 0:$tab_text += dyneval($NoteBookLine,'You rent a two-room apartment, in Pushkin. Rent for the apartment is subtracted automatically, in sum of <<home_rent[4]>> <b>₽</b> us electric bill on 25th of each month. You are currently paid up for <b><<ArendHouseSL4>></b> days')
 	if home_owned[5] = 1:$tab_text += dyneval($NoteBookLine,'You own a vacant block, in the city suburbs. Utility bills are on the 25th of each month.')
 	if home_owned[5] = 2:$tab_text += dyneval($NoteBookLine,'You own a block in the city suburbs, upon which, you are building a house. Utility bills are on the 25th of each month.')
-	if home_owned[5] = 3:$tab_text += dyneval($NoteBookLine,'You own an impressive manion in the suburbs of St. Petersburg. Utility bills are on the 25th of each month.')
+	if home_owned[5] = 3:$tab_text += dyneval($NoteBookLine,'You own an impressive mansion in the suburbs of St. Petersburg. Utility bills are on the 25th of each month.')
 	$tab_text += '<center><h2>Work</h2></center>'
 	if workPTU > 2:$tab_text += dyneval($NoteBookLine,'You work as a teacher at the Lycée. Working days Mon-Sat, with 14.00 to 16.00. Salary 300r/day. Dress code - office clothes, Strict. The road from the apartment to the Lyceum takes 2 hours 10 minutes.')
 	if (work = 1 or cheatWork = 1) and workKafe > 0:$tab_text += dyneval($NoteBookLine,'You are working as a waitress at The Roadhouse cafe. You need to come to work between 11 and 12, working days: Tuesday, Wednesday and Thursday. At work, you can receive tips from customers, and payment is received on 25th of each month.')

+ 17 - 22
locations/katalkin.qsrc

@@ -1,18 +1,17 @@
 # katalkin
-gs 'stat'
 
-if hour >= 8:'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
-'The police station is a small room in the corner of the Pavlovsk station building. For some reason the windows are blinded, so people can''t see what''s happening inside.'
+gs 'stat'
 
 if hour >= 8 and hour < 22:
 	'Captain Katalkin is currently handling some cases.'
-
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
+	
 	if katalkinSexOnce = 0:
 		if schtraf = 0:
 			'Captain Katalkin looks at you with some interest. He gives you a smile and says: "Hello miss. I was just about to have a break, would you like to join me for a cup of tea?"'
 
 			act 'Drink tea':
-				cls
+				*clr & cla
 				minut += 5
 				katalkinNoexit = 0
 				gs 'stat'
@@ -38,7 +37,7 @@ if hour >= 8 and hour < 22:
 
 			if money >= schtraf:
 				act 'Pay the fine':
-					cls
+					*clr & cla
 					money -= schtraf
 					schtraf = 0
 					katalkinNoexit = 0
@@ -50,7 +49,7 @@ if hour >= 8 and hour < 22:
 				end
 			else
 				act 'You can''t pay the fine':
-					cls
+					*clr & cla
 					money = 0
 					schtraf = 0
 					katalkinNoexit = 0
@@ -66,7 +65,7 @@ if hour >= 8 and hour < 22:
 			end
 
 			act 'Beg':
-				cls
+				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
 				'You can''t go to jail! You try to look cute and innocent for him when you say: "Please sir, I can''t go to jail! Can''t you let me go just this once?"'
@@ -76,7 +75,7 @@ if hour >= 8 and hour < 22:
 					'You think to yourself: "Do I really have sex with him, just to avoid a fine? I do have the money, so I could just pay..."'
 
 					act 'Pay the fine after all':
-						cls
+						*clr & cla
 						money -= schtraf
 						schtraf = 0
 						katalkinNoexit = 0
@@ -99,7 +98,7 @@ if hour >= 8 and hour < 22:
 			'From your previous experience with him, you know he''s probably not just talking about tea.'
 
 			act 'Drink tea':
-				cls
+				*clr & cla
 				minut += 5
 				katalkinNoexit = 0
 				gs 'stat'
@@ -114,7 +113,7 @@ if hour >= 8 and hour < 22:
 
 			if money >= schtraf:
 				act 'Give him the money':
-					cls
+					*clr & cla
 					money -= schtraf
 					schtraf = 0
 					katalkinNoexit = 0
@@ -135,7 +134,7 @@ if hour >= 8 and hour < 22:
 			'Captain Katalkin pretends he''s looking through some files, and then rips up a piece of paper while he grins at you: "Good news! It seems like your fine has been paid in full, miss <<$pcs_lastname>>."'
 
 			act 'Say goodbye':
-				cls
+				*clr & cla
 				schtraf = 0
 				katalkinNoexit = 0
 				gs 'stat'
@@ -155,7 +154,7 @@ elseif hour >= 22:
 			'When Katalkin sees you walk by, he waves you over and drunkenly says: "<<$pcs_nickname>>! Come here, let me fuckin'' introduce you to my boys!"'
 
 			act 'Sit down with them':
-				cls
+				*clr & cla
 				minut += 5
 				katalkinNoexit = 0
 				katGangMeet = 1
@@ -169,7 +168,7 @@ elseif hour >= 22:
 			'When Katalkin sees you walk by, he waves you over and drunkenly says: <<$pcs_nickname>>! Come here, have a drink with me and my boys!"'
 
 			act 'Sit down with them':
-				cls
+				*clr & cla
 				minut += 5
 				katalkinNoexit = 0
 				gs 'stat'
@@ -184,7 +183,7 @@ elseif hour >= 22:
 			'When Katalkin sees you walk by, he waves you over and drunkenly says: <<$pcs_nickname>>! Come here, join me for a drink!"'
 
 			act 'Sit down with him':
-				cls
+				*clr & cla
 				minut += 5
 				katalkinNoexit = 0
 				gs 'stat'
@@ -210,7 +209,7 @@ elseif hour >= 22:
 
 			if money >= schtraf:
 				act 'Pay the fine':
-					cls
+					*clr & cla
 					money -= schtraf
 					schtraf = 0
 					katalkinNoexit = 0
@@ -222,7 +221,7 @@ elseif hour >= 22:
 				end
 			else
 				act 'You can''t pay the fine':
-					cls
+					*clr & cla
 					money = 0
 					schtraf = 0
 					katalkinNoexit = 0
@@ -238,13 +237,9 @@ elseif hour >= 22:
 			end
 		end
 	end
-elseif hour < 8:
-	'The door to the police station is locked.'
-
-	act 'Leave the police station':minut += 1 & gt 'pavtrainhall'
 end
 
-if katalkinNoexit = 0:act 'Leave the police station':minut += 1 & gt 'pavtrainhall'
+if katalkinNoexit = 0:act 'Leave his office': minut += 1 & gt 'pavstation', 'station_inside'
 
 --- katalkin ---------------------------------
 

+ 1 - 0
locations/medical_din.qsrc

@@ -54,6 +54,7 @@ if $ARGS[0] = 'abortion':
 	if nextbaby > 0:
 		jump 'poliabortloop'
 	end
+	killvar 'abortrand'
 elseif $ARGS[0] = 'birthControlShot':
 	!! Gives Sveta the effects of a birth control shot. Usage: gs 'medical_din','birthControlShot'
 	!! Note: You have to make sure that she is not pregnant beforehead.

+ 12 - 12
locations/mother.qsrc

@@ -872,7 +872,7 @@ if $ARGS[0] = 'pregreactbrother':
 		'"But"'
 		'"Get. Out."'
 		'You run out of the apartment and slump to the floor as soon as you''re outside. What are you going to do now? Can you even afford your own apartment? You continue to sob in the same position for several minutes, too distraught to even notice if anyone else was around.'
-		gs 'kickedout', 'kolka'
+		gs 'mother', 'kickedout', 'kolka'
 	elseif npc_rel['A29'] >= 60 and npc_rel['A29'] <= 80 and npc_pregtalk['A34'] = 1 and brothersecret = 0:
 		'Before you can even finish the second syllable of your brother''s name, you see the rage building in your mother''s face. She balls her fists and visibly shakes, making it clear that she is using all of her strength to stop herself from transferring that strength from her open palm to your face.. '
 		'When she finally speaks, it''s through gritted teeth, and she just says "Get out."'
@@ -882,7 +882,7 @@ if $ARGS[0] = 'pregreactbrother':
 		'"Where am I supposed to go?" you manage to ask through quivering lips, tears welling in your eyes.'
 		'"I don''t care, just get out of my sight. You''re not welcome here anymore."'
 		'Once you''re out of the apartment, the door slams behind you. You slump to the floor. What are you going to do now? Can you even afford your own apartment? You continue to sob in the same position for several minutes, too distraught to even notice if anyone else was around.'
-		gs 'kickedout', 'kolka'
+		gs 'mother', 'kickedout', 'kolka'
 	elseif npc_rel['A29'] > 80 and npc_pregtalk['A34'] = 1 and brothersecret = 0:
 		'Your mother stares in stunned silence as you utter Kolka''s name. Her knees seem to give out, and she barely manages to hold herself up by leaning on the counter.'
 		'After several moments of silence that feel like an eternity, your mother says "Please tell me I just misheard you. Did you really just say your brother''s name?"'
@@ -902,7 +902,7 @@ if $ARGS[0] = 'pregreactbrother':
 		'"Why not?" Your mother repeats indignantly, anger rising in her voice.'
 		'"Because you fucked your own brother and that is unacceptable. I can''t believe I''m even having to explain this. Now leave, before things get worse for you."'
 		'You reluctantly leave the apartment, closing the door behind you. You slump to the floor. What are you going to do now? Can you even afford your own apartment? You continue to sob in the same position for several minutes, too distraught to even notice if anyone else was around.'
-		gs 'kickedout', 'kolka'
+		gs 'mother', 'kickedout', 'kolka'
 	elseif npc_rel['A29'] < 60 and (npc_pregtalk['A34'] = 0 or brothersecret = 1):
 		'As soon as your brother''s name crosses your lips, your mother''s face visibly reddens. Her mouth curls into a snarl and she reaches up and grips you by your hair. '
 		'"What the fuck is wrong with you?" she screams in your face. "I knew you were a worthless whore, but this? Even I didn''t think you’d go so far as to try corrupting your brother, too."'
@@ -914,7 +914,7 @@ if $ARGS[0] = 'pregreactbrother':
 		'"But"'
 		'"Get. Out."'
 		'You run out of the apartment and slump to the floor as soon as you''re outside. What are you going to do now? Can you even afford your own apartment? You continue to sob in the same position for several minutes, too distraught to even notice if anyone else was around.'
-		gs 'kickedout', 'kolka'
+		gs 'mother', 'kickedout', 'kolka'
 	elseif npc_rel['A29'] >= 60 and npc_rel['A29'] <= 80 and (npc_pregtalk['A34'] = 0 or brothersecret = 1):
 		'Before you can even finish the second syllable of your brother''s name, you see the rage building in your mother''s face. She balls her fists and visibly shakes, making it clear that she is using all of her strength to stop herself from transferring that strength from her open palm to your face.. '
 		'When she finally speaks, it''s through gritted teeth, and she just says "Get out."'
@@ -923,7 +923,7 @@ if $ARGS[0] = 'pregreactbrother':
 		'"Where am I supposed to go?" you manage to ask through quivering lips, tears welling in your eyes.'
 		'"I don''t care, just get out of my sight. You''re not welcome here anymore."'
 		'Once you''re out of the apartment, the door slams behind you. You slump to the floor. What are you going to do now? Can you even afford your own apartment? You continue to sob in the same position for several minutes, too distraught to even notice if anyone else was around.'
-		gs 'kickedout', 'kolka'
+		gs 'mother', 'kickedout', 'kolka'
 	elseif npc_rel['A29'] > 80 and (npc_pregtalk['A34'] = 0 or brothersecret = 1):
 		'Your mother stares in stunned silence as you utter Kolka''s name. Her knees seem to give out, and she barely manages to hold herself up by leaning on the counter.'
 		'After several moments of silence that feel like an eternity, your mother says "Please tell me I just misheard you. Did you really just say your brother''s name?"'
@@ -938,7 +938,7 @@ if $ARGS[0] = 'pregreactbrother':
 		'"Why not?" Your mother repeats indignantly, anger rising in her voice.'
 		'"Because you fucked your own brother and that is unacceptable. I can''t believe I''m even having to explain this. Now leave, before things get worse for you."'
 		'You reluctantly leave the apartment, closing the door behind you. You slump to the floor. What are you going to do now? Can you even afford your own apartment? You continue to sob in the same position for several minutes, too distraught to even notice if anyone else was around.'
-		gs 'kickedout', 'kolka'
+		gs 'mother', 'kickedout', 'kolka'
 	end
 end
 
@@ -961,7 +961,7 @@ if $ARGS[0] = 'pregreactstepdad':
 		'You try to reason with her, "But..."'
 		'"Get! Out!" she abruptly cuts you off.'
 		'You quickly run out of the apartment with tears running down your face and as soon you''re outside you slump to the floor. <i>What are you going to do now, where will you go? Can you even afford your own apartment?</i> You continue to sob in the same position for several minutes, too distraught to even notice if anyone else is around.'
-		gs 'kickedout', 'stepdad'
+		gs 'mother', 'kickedout', 'stepdad'
 	elseif npc_rel['A29'] >= 60 and npc_rel['A29'] <= 80 and npc_pregtalk['A34'] = 1 and brothersecret = 0:
 		'Before you''re able to finish the second syllable of your step-father''s name, you see the rage building in your mother''s face. She tightens her fist and is visibly shaking, making it clear that she is using all of her might to hinder herself from attacking you...'
 		'When she finally manages to speak up, through gritted teeth, only saying, "Get out!"'
@@ -972,7 +972,7 @@ if $ARGS[0] = 'pregreactstepdad':
 		'"Where am I supposed to go?" you ask through quivering lips, tears welling in your eyes...'
 		'"I don''t care, you should have thought about that before fucking your step-father. Just get out of my sight. You''re not welcome here anymore..."'
 		'Once you''re out of the apartment, she door slams behind you. You slump to the floor. <i>What are you going to do now, where will you go? Can you even afford your own apartment?</i> You continue to sob in the same position for several minutes, too distraught to even notice if anyone else is around.'
-		gs 'kickedout', 'stepdad'
+		gs 'mother', 'kickedout', 'stepdad'
 	elseif npc_rel['A29'] > 80 and npc_pregtalk['A28'] = 1 and stepdadSecret = 0:
 		'Your mother stares at you in stunned silence as you utter Vladimir''s name. Her knees seem to give out, as she barely manages to hold herself up by leaning on the counter.'
 		'After long period of silence that feels like an eternity, your mother finally manages to speak up, "Please tell me I just misheard you. Did I really hear you just say your step-father''s name?"'
@@ -994,7 +994,7 @@ if $ARGS[0] = 'pregreactstepdad':
 		'"Why you can''t stay?" your mother repeats indignantly, and you feel her getting annoyed by your stupid question.'
 		'"You''re really asking me that? Maybe it''s because you fucked your step-father, a man that raised you since you were this small!" she points and pauses staring angrily at you. "I can''t believe I''m even having to explain why I want you out of this house. Now leave, before things get worse for you."'
 		'Dejected, you reluctantly leave the apartment, closing the door behind you. You slump to the floor. <i>What are you going to do now, where will you go? Can you even afford your own apartment?</i> You continue to sob in the same position for several minutes, too distraught to even notice if anyone else is around.'
-		gs 'kickedout', 'stepdad'
+		gs 'mother', 'kickedout', 'stepdad'
 	elseif npc_rel['A29'] < 60 and (npc_pregtalk['A28'] = 0 or stepdadSecret = 1):
 		'As soon as your step-father''s name crosses your lips, your mother''s face visibly reddens. Her mouth curls into a snarl and she reaches up and grips you by your hair and starts draging you around.'
 		'"What the fuck is wrong with you?" she screams in your face. "I know you are a worthless whore, but this? Even I didn''t think you''d stoop this low as seducting your own step-father... What kind of sick people are you two?"'
@@ -1011,7 +1011,7 @@ if $ARGS[0] = 'pregreactstepdad':
 		'You try to reason with her, "But..."'
 		'"Get! Out!" she abruptly cuts you off.'
 		'You quickly run out of the apartment with tears running down your face and as soon you''re outside you slump to the floor. <i>What are you going to do now, where will you go? Can you even afford your own apartment?</i> You continue to sob in the same position for several minutes, too distraught to even notice if anyone else is around.'
-		gs 'kickedout', 'stepdad'
+		gs 'mother', 'kickedout', 'stepdad'
 	elseif npc_rel['A29'] >= 60 and npc_rel['A29'] <= 80 and (npc_pregtalk['A28'] = 0 or stepdadSecret = 1):
 		'Before you''re able to finish the second syllable of your step-father''s name, you see the rage building in your mother''s face. She tightens her fist and is visibly shaking, making it clear that she is using all of her might to hinder herself from attacking you...'
 		'When she finally manages to speak up, through gritted teeth, only saying, "Get out!"'
@@ -1022,7 +1022,7 @@ if $ARGS[0] = 'pregreactstepdad':
 		'"Where am I supposed to go?" you ask through quivering lips, tears welling in your eyes...'
 		'"I don''t care, you should have thought about that before fucking your step-father. Just get out of my sight. You''re not welcome here anymore..."'
 		'Once you''re out of the apartment, she door slams behind you. You slump to the floor. <i>What are you going to do now, where will you go? Can you even afford your own apartment?</i> You continue to sob in the same position for several minutes, too distraught to even notice if anyone else is around.'
-		gs 'kickedout', 'stepdad'
+		gs 'mother', 'kickedout', 'stepdad'
 	elseif npc_rel['A29'] > 80 and (npc_pregtalk['A28'] = 0 or stepdadSecret = 1):
 		'Your mother stares at you in stunned silence as you utter Vladimir''s name. Her knees seem to give out, as she barely manages to hold herself up by leaning on the counter.'
 		'After long period of silence that feels like an eternity, your mother finally manages to speak up, "Please tell me I just misheard you. Did I really hear you just say your step-father''s name?"'
@@ -1044,7 +1044,7 @@ if $ARGS[0] = 'pregreactstepdad':
 		'"Why you can''t stay?" your mother repeats indignantly, and you feel her getting annoyed by your stupid question.'
 		'"You''re really asking me that? Maybe it''s because you fucked your step-father, a man that raised you since you were this small!" she points and pauses staring angrily at you. "I can''t believe I''m even having to explain why I want you out of this house. Now leave, before things get worse for you."'
 		'Dejected, you reluctantly leave the apartment, closing the door behind you. You slump to the floor. <i>What are you going to do now, where will you go? Can you even afford your own apartment?</i> You continue to sob in the same position for several minutes, too distraught to even notice if anyone else is around.'
-		gs 'kickedout', 'stepdad'
+		gs 'mother', 'kickedout', 'stepdad'
 	end
 end
 

+ 70 - 0
locations/pavstation.qsrc

@@ -0,0 +1,70 @@
+# pavstation
+
+if $ARGS[0] = 'station_outside':
+	*clr & cla
+	$menu_loc = 'pavstation'
+	$menu_arg = 'station_outside'
+	menu_off = 0
+	$location_type = 'public_indoors'
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/police/pavext.jpg" ></center>'
+	'The police station is gleaming in a bright yellow color, clearly making it clear that it can''t be missed by anyone in Pavlovsk.'
+	'The police officers are usually often misusing their power since no one further up the chain is giving a damn about a sleepy little town.'
+	
+	act 'Return to the train station area': minut += 3 & gt 'pavtrainhall'
+	act 'Enter the police station': minut += 1 & gt 'pavstation', 'station_inside'
+end
+
+if $ARGS[0] = 'station_inside':
+	*clr & cla
+	$menu_arg = 'station_inside'
+	menu_off = 0
+	gs 'stat'
+	$location_type = 'public_indoors'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/police/pavrec.jpg" ></center>'
+	'You are welcomed by a tiny reception area with someone always just lazily hanging around waiting for something to happen. The whole interior has seen better days and you''re reminded by the stories you''ve heard from your parents about how everything used to look run-down during their younger days.'
+	
+	act 'Leave the station': minut += 1 & gt 'pavstation', 'station_outside'
+	act 'Approach the reception area': minut += 2 & gt 'pavstation', 'reception'
+	if katalkinSexOnce = 1 and hour >= 8: minut += 1 & act 'Visit Captain Katalkin': gt 'katalkin'
+end
+		
+if $ARGS[0] = 'reception':
+	*clr & cla
+	menu_off = 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/police/pavrec.jpg" ></center>'
+	'As you approach the reception the clerk looks at you with disdain in their eyes, "So what do you want?"'
+	'You can''t just stand around looking like a fool you need to say something before they think you''re crazy or something.'
+	
+	act 'N-Nothing, just looking around':
+		*clr & cla
+		minut += 5
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/police/pavrec.jpg" ></center>'
+		'"Just looking around." you jokingly say.'
+		'The clerk looks sternly towards you, "Does this looks like a place to be messing around with?"'
+		'You become quiet and think for a moment, "I guess not... Just wanted to see how the inside of a police station looks like..."'
+		'"Said no one ever," the clerk quickly counters, "Listen, I don''t know what you''re up to but you need to leave quickly before I have one of the officers come out here and lock you up."'
+		'Hearing those words you quickly turn around and head towards the door...'
+		
+		act 'Walk away from the clerk': minut += 2 & gt 'pavstation', 'station_inside'
+	end
+	
+	act 'Report a crime':
+		*clr & cla
+		minut += 5
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/police/pavrec.jpg" ></center>'
+		'"I-I would like to report a crime..." you whisper.'
+		'"Say what?! Speak louder, girl! I can''t hear what you''re sayin''!" the clerk yells out.'
+		'You take a deep breath, "I need to report a crime..."'
+		'The clerk looks towards you, "Oh, what has happened? Your teddybear ran away or something?! Listen here I don''t have time with your petty stuff so leave before I have you thrown into a cell, you hear!"'
+		'"B-But I-I..." you stutter.'
+		'"No nothing, there''s the door." he points toward the door.'
+		
+		act 'Walk away from the clerk': minut += 2 & gt 'pavstation', 'station_inside'
+	end
+end
+
+--- pavstation ---------------------------------

+ 1 - 1
locations/pavtrain.qsrc

@@ -22,7 +22,7 @@ gs 'stat'
 '<center><h2>Pavlovsk''s train station</h2></center>'
 '<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/vokzal.jpg"></center>'
 *nl
-'Pavlovsk''s modest train station. You can enter the central hall of the <a href="exec:minut += 3 & gt ''pavtrainhall''">train station</a>, in which you can find Pavlovsk''s police station. Also attached to the train station is the <a href="exec:minut += 5 & gt ''gkafe''">Borislav''s cafe</a>' + iif(storyline = 1,' where your mother works','') + '.'
+'Pavlovsk''s modest train station. You can enter the central hall of the <a href="exec:minut += 3 & gt ''pavtrainhall''">train station</a>. Attached to the train station is the <a href="exec:minut += 5 & gt ''gkafe''">Borislav''s cafe</a>' + iif(storyline = 1,' where your mother works','') + '. Also nearby is the small <a href="exec:minut += 3 & gt ''pavstation'', ''station_outside''">police station</a> of Pavlovsk. '
 *nl
 'The front of the train station has a large square, where you can find a <a href="exec:minut += 1 & gt ''pavtrain_market'', ''start''">market</a> on most days.'
 *nl

+ 1 - 1
locations/pavtrainhall.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = '':
 	*nl
 	'The long-distance trains are at the station platforms between 11:00-11:30 and 18:00-18:30.'
 	*nl
-	if katalkinSexOnce = 1:'There is a small <a href="exec:minut += 5 & gt ''katalkin''">police station</a> inside the station building.'
+	
 	*nl
 	if StoryLine = 1 and SchoolAtestat = 0:
 		if (sunWeather = 0 or temper <= 0) and hour >= 18 and hour < 20 and week < 6:

+ 7 - 7
locations/pirsingsalon.qsrc

@@ -136,7 +136,7 @@ if $ARGS[0] = 'tongue_pir':
 			pirsA = i
 			dynamic 'pirsA<<i>>_owned = 1'
 			pierWearCount += 1
-			gs 'pain', 7, 'tongue', 'pierce'
+			gs 'pain', 5, 'tongue', 'pierce'
 			'<center><img src="images/locations/city/industrial/salon/pirsing.jpg"></center>'
 			gs 'stat'
 			'The tattooist disinfected the area, pierced your tongue and inserted your chosen piercing.'
@@ -194,7 +194,7 @@ if $ARGS[0] = 'lip_pir':
 			pirsB = i
 			dynamic 'pirsB<<i>>_owned = 1'
 			pierWearCount += 1
-			gs 'pain', 7, 'lips', 'pierce'
+			gs 'pain', 2, 'lips', 'pierce'
 			'<center><img src="images/locations/city/industrial/salon/pirsing2.jpg"></center>'
 			gs 'stat'
 			'The tattooist disinfected the area, pierced your lip and inserted your chosen piercing.'
@@ -252,7 +252,7 @@ if $ARGS[0] = 'ears_pir':
 			pirsC = i
 			dynamic 'pirsC<<i>>_owned = 1'
 			pierWearCount += 1
-			gs 'pain', 7, 'ears', 'pierce'
+			gs 'pain', 1, 'ears', 'pierce'
 			'<center><img src="images/pc/body/piercings/c<<i>>.jpg"></center>'
 			gs 'stat'
 			'The tattooist disinfected the area, pierced your ears and inserted your chosen earrings.'
@@ -310,7 +310,7 @@ if $ARGS[0] = 'nose_pir':
 			pirsD = i
 			dynamic 'pirsD<<i>>_owned = 1'
 			pierWearCount += 1
-			gs 'pain', 7, 'nose', 'pierce'
+			gs 'pain', 2, 'nose', 'pierce'
 			'<center><img src="images/pc/body/piercings/d<<i>>.jpg"></center>'
 			gs 'stat'
 			'The tattooist disinfected the area, pierced your nose and inserted your chosen piercing.'
@@ -368,7 +368,7 @@ if $ARGS[0] = 'brow_pir':
 			pirsE = i
 			dynamic 'pirsE<<i>>_owned = 1'
 			pierWearCount += 1
-			gs 'pain', 7, 'eyebrows', 'pierce'
+			gs 'pain', 3, 'eyebrows', 'pierce'
 			'<center><img src="images/pc/body/piercings/e<<i>>.jpg"></center>'
 			gs 'stat'
 			'The tattooist disinfected the area, pierced your brow and inserted your chosen piercing.'
@@ -484,7 +484,7 @@ if $ARGS[0] = 'belly_pir':
 			pirsN = i
 			dynamic 'pirsN<<i>>_owned = 1'
 			pierWearCount += 1
-			gs 'pain', 7, 'tummy', 'pierce'
+			gs 'pain', 1, 'tummy', 'pierce'
 			'<center><img src="images/pc/body/piercings/n<<i>>.jpg"></center>'
 			gs 'stat'
 			'The tattooist disinfected the area, pierced your belly button and inserted your chosen piercing.'
@@ -542,7 +542,7 @@ if $ARGS[0] = 'pubic_pir':
 			pirsG = i
 			dynamic 'pirsG<<i>>_owned = 1'
 			pierWearCount += 1
-			gs 'pain', 7, 'pubic', 'pierce'
+			gs 'pain', 9, 'pubic', 'pierce'
 			'<center><img src="images/pc/body/piercings/g<<i>>.jpg"></center>'
 			gs 'stat'
 			'The tattooist disinfected the area, pierced your pussy and inserted your chosen piercing.'

+ 31 - 29
locations/stat_display.qsrc

@@ -722,7 +722,6 @@ killvar 'cumloc'
 
 $stat_cum_msg = ''
 $stat_cum_text = ''
-$stat_visible_cum_temp = ''
 stat_visible_cum = 0
 stat_cumloc_check = 0
 
@@ -747,19 +746,10 @@ i = 0
 		$txtloc = 'the back of your panties'
 		$icon_txtloc = $txtloc
 	elseif i = 6:
-		if cumvolume['<<i>>:<<j>>'] > 0:
-			stat_visible_cum = 1
-			if $stat_visible_cum_temp ! '': $stat_visible_cum_temp += ', '
-			$stat_visible_cum_temp += 'your clothes near your groin'
-		end
+
 		$icon_txtloc = 'your clothes near your groin'
 		$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumclothes/'+rand(1,3)+'.jpg''">clothes near your groin</a>'
 	elseif i = 7:
-		if cumvolume['<<i>>:<<j>>'] > 0:
-			stat_visible_cum = 1
-			if $stat_visible_cum_temp ! '': $stat_visible_cum_temp += ', '
-			$stat_visible_cum_temp += 'your clothes'
-		end
 		$icon_txtloc = 'your clothes'
 		$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumclothes/cumclothes'+rand(1,21)+'.jpg''">clothes</a>'
 	elseif i = 8:
@@ -788,20 +778,10 @@ i = 0
 			$cum_face_image = 'custom/'
 			$cum_face_image += rand(1, 20)
 		end
-		if cumvolume['<<i>>:<<j>>'] > 0:
-			stat_visible_cum = 1
-			if $stat_visible_cum_temp ! '': $stat_visible_cum_temp += ', '
-			$stat_visible_cum_temp += 'your face'
-		end
 		$icon_txtloc = 'your face'
 		$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumface/<<$cum_face_image>>.jpg''">face</a>'
 		killvar 'cum_face_image'
 	elseif i = 13:
-		if cumvolume['<<i>>:<<j>>'] > 0:
-			stat_visible_cum = 1
-			if $stat_visible_cum_temp ! '': $stat_visible_cum_temp += ', '
-			$stat_visible_cum_temp += 'your hands'
-		end
 		$txtloc = 'your hands'
 		$icon_txtloc = $txtloc
 	elseif i = 14:
@@ -811,11 +791,6 @@ i = 0
 		$icon_txtloc = 'your breasts'
 		$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumtits/cumtits'+rand(1,19)+'.jpg''">breasts</a>'
 	elseif i = 16:
-		if cumvolume['<<i>>:<<j>>'] > 0:
-			stat_visible_cum = 1
-			if $stat_visible_cum_temp ! '': $stat_visible_cum_temp += ', '
-			$stat_visible_cum_temp += 'your hair'
-		end
 		$icon_txtloc = 'your hair'
 		$txtloc = 'your hair</a>'
 	elseif i = 17:
@@ -989,10 +964,37 @@ killvar 'cumcount'
 killvar 'knownguy'
 killvar 'cumowner'
 
-if $stat_visible_cum_temp ! '':
+$stat_visible_cum_temp = ''
+$stat_visible_cum_msg = ''
+
+if cumloc[6] = 1 or cumloc[7] = 1 or cumloc[11] = 1 or cumloc[13] = 1 or cumloc[16] = 1:
+	if cumloc[6] = 1:
+		stat_visible_cum = 1
+		if $stat_visible_cum_temp ! '': $stat_visible_cum_temp += ', '
+		$stat_visible_cum_temp += 'your clothes near your groin'
+	end
+	if cumloc[7] = 1:
+		stat_visible_cum = 1
+		if $stat_visible_cum_temp ! '': $stat_visible_cum_temp += ', '
+		$stat_visible_cum_temp += 'your clothes'
+	end
+	if cumloc[11] = 1:
+		stat_visible_cum = 1
+		if $stat_visible_cum_temp ! '': $stat_visible_cum_temp += ', '
+		$stat_visible_cum_temp += 'your face'
+	end
+	if cumloc[13] = 1:
+		stat_visible_cum = 1
+		if $stat_visible_cum_temp ! '': $stat_visible_cum_temp += ', '
+		$stat_visible_cum_temp += 'your hands'
+	end
+	if cumloc[16] = 1:
+		stat_visible_cum = 1
+		if $stat_visible_cum_temp ! '': $stat_visible_cum_temp += ', '
+		$stat_visible_cum_temp += 'your hair'
+	end
+
 	$stat_visible_cum_msg = 'People can see the cum on '+ $stat_visible_cum_temp + '.'
-else
-	$stat_visible_cum_msg = ''
 end
 
 !!------ Cum management (End) ------