[fixed] issues with Lariska volleyball progression, non-clearing actions and grammar in LariskaHome and Voltrener

locations/LariskaHome.qsrc

@@ -83,7 +83,7 @@ if $ARGS[0] = 'in':
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big13.jpg"></center>'
 		'You talked with Lariska about whatever came to mind.'
-		
+
 		act 'Continue':gt 'LariskaHome','in'
 	end
 	if hour = 17 and minut <= 40:
@@ -139,7 +139,7 @@ if $ARGS[0] = 'in':
 	end
 !!	if lariskaMotherKnown > 0:
 !!		act 'Go to my mother Lariska':
-			
+
 !!			act 'Return':gt 'LariskaHome','in'
 !!		end
 !!	end
@@ -152,16 +152,20 @@ if $ARGS[0] = 'in':
 			'You decided to talk to Lariska about joining the professional volleyball team.'
 			'"Lariska, you are an excellent volleyball player. Coach Mikheil Nikolayevich has a professional team, why don''t you ask to join it?" you ask your friend.'
 			'"Well, I guess I''m afraid he''ll tell me I''m not good enough. I''ve seen him tell other good players they aren''t good enough to play for him."'
-			if pcs_vball < 100:
+			if pcs_vball < 100 and volleysostav < 2:
 				act 'Drop the subject':gt 'LariskaHome','in'
-				act 'Tell you that you''ll go with her for support.':lariskaTrenerTalk = 1 & minut += 15 & gt 'Voltrener', 'start'
-			elseif volleysostav = 0:
+				act 'Tell her you''ll go with her for support.':lariskaTrenerTalk = 1 & minut += 15 & gt 'Voltrener', 'start'
+			elseif pcs_vball >= 100 and volleysostav = 1:
 				act 'Drop the subject':gt 'LariskaHome','in'
-				act 'Tell you that you''ll go with her for support.':lariskaTrenerTalk = 2 & minut += 15 & gt 'Voltrener', 'start'
+				act 'Tell her you''ll go with her for support.':lariskaTrenerTalk = 2 & minut += 15 & gt 'Voltrener', 'start'
+			elseif pcs_vball >= 100 and volleysostav = 0:
 				act 'Tell her that you should both go together and ask to be on the team.':lariskaTrenerTalk = 3 & minut += 15 & gt 'Voltrener', 'start'
+			elseif volleysostav >= 2:
+				act 'Drop the subject':gt 'LariskaHome','in'
+				act 'Tell her you''ll go with her and since you''re already on the team, you can help convince the coach.':lariskaTrenerTalk = 4 & minut += 15 & gt 'Voltrener', 'start'
 			else
 				act 'Drop the subject':gt 'LariskaHome','in'
-				act 'Tell you that you''ll go with her and since you''re already on the team, you can help convince the coach.':lariskaTrenerTalk = 4 & minut += 15 & gt 'Voltrener', 'start'
+				act 'Tell her you''ll go with her for support.':lariskaTrenerTalk = 1 & minut += 15 & gt 'Voltrener', 'start'
 			end
 		end
 	end

locations/Voltrener.qsrc

@@ -9,6 +9,7 @@ gs 'stat'
 if $ARGS[0] = 'start':
 
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener6.jpg"></center>'
+	*nl
 	'You enter the coach''s office in which there are cups, balls, sports equipment, a massage table, and a desk where the coach sometimes sits and does paperwork. Coach Mikhail Vlasov does not only teach amateur volleyball but he also coaches a professional volleyball team.'
 
 	if npc_rel['A69'] <= 0:
@@ -52,6 +53,8 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'Lariska':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener6.jpg"></center>'
+	*nl
 	'"Ah, <<$pcs_lastname>> and Gruzdev, what do you want?"'
 	if lariskaTrenerTalk = 1:
 		'You and Lariska tried to persuade the coach to take Lariska, but he refused to consider your arguments.'
@@ -59,10 +62,15 @@ if $ARGS[0] = 'Lariska':
 		gs 'willpower', 'misc', 'force'
 		if will_cost <= pcs_willpwr:
 			act 'Convince coach to let Lariska play (<<will_cost>> Willpower)':
+				cla
+				LariskaProfi = 1
+				npc_rel['A13'] += 20
 				gs 'willpower', 'pay', 'force'
 				gs'stat'
+				*nl
 				'You managed to convince the coach to let Lariska join the team.'
-				gs 'Voltrener' ,'LariskaProfi'
+				$npc_notes['A13'] = 'Lariska is an athletic girl, but she is very dependent on other people''s opinions. Lariska has changed a lot; she has a sparkle in her eyes, and is almost always in a good mood. After joining the team, she quickly got into playing and is now one of the best players.'
+				'When you came out of the coach''s office, Lariska hugs you and says,: "Thank you, <<$pcs_nickname>>!"'
 				act 'Leave':gt 'gdksport', 'start'
 			end
 		else
@@ -71,13 +79,18 @@ if $ARGS[0] = 'Lariska':
 	elseif lariskaTrenerTalk = 3:
 		gs 'willpower', 'misc', 'force', 'hard'
 		if will_cost <= pcs_willpwr:
-			act 'Convince coach to let both of you join the team (<<will_cost>> Willpower)': 
+			act 'Convince coach to let both of you join the team (<<will_cost>> Willpower)':
+				cla
+				volleysostav = 1
+				LariskaProfi = 1
+				npc_rel['A13'] += 20
+				if npc_rel['A69'] > 30:npc_rel['A69'] = 30
 				gs 'willpower', 'pay', 'force'
 				gs 'stat'
-				volleysostav = 1
+				*nl
 				'You take an agressive approach and, although he doesn''t like it, you managed to convince the coach to let you both play.'
-				if npc_rel['A69'] > 30:npc_rel['A69'] = 30
-				gs 'Voltrener' ,'LariskaProfi'
+				$npc_notes['A13'] = 'Lariska is an athletic girl, but she is very dependent on other people''s opinions. Lariska has changed a lot; she has a sparkle in her eyes, and is almost always in a good mood. After joining the team, she quickly got into playing and is now one of the best players.'
+				'When you came out of the coach''s office, Lariska hugs you and says,: "Thank you, <<$pcs_nickname>>!"'
 				act 'Leave':gt 'gdksport', 'start'
 			end
 		else
@@ -87,10 +100,15 @@ if $ARGS[0] = 'Lariska':
 		gs 'willpower', 'misc', 'force'
 		if will_cost <= pcs_willpwr:
 			act 'Convince coach to let Lariska play (<<will_cost>> Willpower)':
+				cla
+				LariskaProfi = 1
+				npc_rel['A13'] += 20
 				gs 'willpower', 'pay', 'force'
 				gs 'stat'
+				*nl
 				'You managed to convince the coach to let Lariska join the team.'
-				gs 'Voltrener' ,'LariskaProfi'
+				$npc_notes['A13'] = 'Lariska is an athletic girl, but she is very dependent on other people''s opinions. Lariska has changed a lot; she has a sparkle in her eyes, and is almost always in a good mood. After joining the team, she quickly got into playing and is now one of the best players.'
+				'When you came out of the coach''s office, Lariska hugs you and says,: "Thank you, <<$pcs_nickname>>!"'
 				act 'Leave':gt 'gdksport', 'start'
 			end
 		else
@@ -105,19 +123,13 @@ if $ARGS[0] = 'Lariska':
 	act 'Leave':gt 'gdksport', 'start'
 end
 
-if $ARGS[0] = 'LariskaProfi':
-	LariskaProfi = 1
-	$npc_notes['A13'] = 'Lariska is an athletic girl, but she is very dependent on other people''s opinions. Lariska has changed a lot; she has a sparkle in her eyes, and is almost always in a good mood. After joining the team, she quickly got into playing and is now one of the best players.'
-	'When you came out of the coach''s office, Lariska hugs you and says,: "Thank you, <<$pcs_nickname>>!"'
-	npc_rel['A13'] += 20
-end
-
 if $ARGS[0] = 'talk':
 	*clr & cla
 	gs 'stat'
 	npc_rel['A69'] += rand(0,1)
-	if pcs_apprnc >= 60: trenerlust += rand(0,1) 
+	if pcs_apprnc >= 60: trenerlust += rand(0,1)
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener6.jpg"></center>'
+	*nl
 	if volleysostav < 0:
 		if trenerSex = 0:
 			'Coach looked up at you, "<<$pcs_lastname>>. Do not even come near me. You are no longer on the team!"'
@@ -148,7 +160,7 @@ if $ARGS[0] = 'talk':
 						'You ask the coach about joining the team, he smiles and says, "<<$pcs_nickname>>, honey. I can do that, but you''ll have to start as a sub or people might be suspicious."'
 					elseif pcs_vball >= 65:
 						'You ask the coach about joining the team, the coach thinks for a minute. "You have good skills for an amateur but you''re still not good enough to start on the team. However, I have a spot for a substitute and we can put you there. How does that sound?"'
-						
+
 						act 'Accept the substitute position':
 							*clr & cla
 							gs 'stat'
@@ -164,7 +176,7 @@ if $ARGS[0] = 'talk':
 						*clr & cla
 						gs 'willpower', 'misc', 'self', 'hard'
 						gs 'stat'
-						act 'Leave': gt 'gdksport', 'start'						
+						act 'Leave': gt 'gdksport', 'start'
 						if will_cost <= pcs_willpwr:
 							act 'Persuade him to let you join the team (<<will_cost>> Willpower)':
 								*clr & cla
@@ -204,7 +216,7 @@ if $ARGS[0] = 'talk':
 								'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'
 							end
-						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.'
 					end
@@ -224,7 +236,7 @@ if $ARGS[0] = 'talk':
 		else
 			'Coach looks at you "Hey <<$pcs_nickname>>. Checking up on your stats?."'
 			'"Your volleyball skill is <<pcs_vball>>, the team has played <<volsesongame>> games: Won - <<volsesonwin>>, lost - <<volsesonloss>>."'
-			if pcs_sleep < 30 and $pantyworntype ! 'none': 
+			if pcs_sleep < 30 and $pantyworntype ! 'none':
 				gt 'Voltrenersex', 'masaj'
 			else
 				act 'Put your hand on coach''s knee':
@@ -284,6 +296,7 @@ if $ARGS[0] = 'trener_speak':
 	gs 'stat'
 	cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener6.jpg"></center>'
+	*nl
 	if npc_rel['A69'] > 40 and VoltrenerVoyeur = 2:
 		'"Coach, don''t you like me? You like to spy on me in the shower, and cum on me, but do you like me?" You look at coach adoringly, with big enthusiastic eyes.'
 		'Coach takes your hand in his, and says, "<<$pcs_nickname>>, you are very beautiful girl, and will be a great athlete, as long as you stay focused, but I told you I''m a married man, and I am worried about what we have done."'
@@ -349,7 +362,7 @@ if $ARGS[0] = 'trener_speak':
 			trenerlust += 2
 			if Discoclose = 1:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak1.jpg"></center>'
-				'You spun around and your skirt flared up, giving coach a glimpse of your upper thighs and even a little ass. Coach''s eyes chased your ass and legs.' 
+				'You spun around and your skirt flared up, giving coach a glimpse of your upper thighs and even a little ass. Coach''s eyes chased your ass and legs.'
 				'"The ball is in your court so watch carefully." you said noticing his interest.'
 				'Coach, looking a bit confused, turned away.'
 				'"Aren''t beautiful legs more interesting than trees, Coach?" you said and smiled to yourself, and then you thought, "Hopefully you''ll get the hint".'
@@ -382,8 +395,8 @@ if $ARGS[0] = 'trener_speak':
 				'You undid your top enough that your breasts fell out then you turned to the coach, arching your back thrusting your juicy melons forward. Coach''s eyes immediately focused on them, Swallowing hard, the coach looked up from your tits. "I''ll have to do something more to tease him, maybe not to wear panties during our workout." the thought flashed in your head, and with the thought, the quivery feeling in the pit of your stomach intensified.'
 			else
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak4.jpg"></center>'
-				'You pulled on your shorts as if you were adjusting them, and pulled them so hard that your pussy is clearly outlined in a camel-toe. It''s easy to see the opinion of the coach as he stared at your crotch.' 
-				'"The ball is in your court so watch carefully." you noted. Mikhail, a bit confused, turned away.' 
+				'You pulled on your shorts as if you were adjusting them, and pulled them so hard that your pussy is clearly outlined in a camel-toe. It''s easy to see the opinion of the coach as he stared at your crotch.'
+				'"The ball is in your court so watch carefully." you noted. Mikhail, a bit confused, turned away.'
 				'"I''ll have to do something more to tease him, maybe not wear panties during our next workout." the thought flashed in your head, and with the thought, the quivery feeling in the pit of your stomach intensified.'
 			end
 			act 'Say goodbye':
@@ -403,8 +416,8 @@ if $ARGS[0] = 'trener_speak':
 		act 'Humbly listen':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak20.jpg"></center>'
-			'But, it seems, the coach did not like your return to this topic.' 
-			'"<<$pcs_lastname>>, I will not be drawn into talking about the championship. And, no, coaches don''t get paid a lot. I spend my Sunday mornings training rich women in the fitness center, one lesson there pays more than a month working as a coach in our town." Coach replied gruffly.' 
+			'But, it seems, the coach did not like your return to this topic.'
+			'"<<$pcs_lastname>>, I will not be drawn into talking about the championship. And, no, coaches don''t get paid a lot. I spend my Sunday mornings training rich women in the fitness center, one lesson there pays more than a month working as a coach in our town." Coach replied gruffly.'
 			'"Still got nothing out of him there <<$pcs_lastname>>, although he did mention about the classes in the fitness center, that''s got to be worth investigating." you thought to yourself'
 			npc_rel['A69'] += 3
 			'Seeing coach is a little upset by your questions, you decide to cheer him up.'
@@ -423,7 +436,7 @@ if $ARGS[0] = 'trener_speak':
 						centr = 1
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenerspeak10.jpg"></center>'
-						'But as soon as your lips wrapped around his hard cock, Coach pushed your head away and hastily tucked his cock back into his pants.' 
+						'But as soon as your lips wrapped around his hard cock, Coach pushed your head away and hastily tucked his cock back into his pants.'
 						'"<<$pcs_nickname>>, stop trying to molest me. I explained everything so be good. I can''t allow this to happen, especially after what happened in the championship..." He abruptly broke off and walked away.'
 						'You watched him walk with interest and decided that you must go to the fitness center and try to learn something about the damn championship because something definitely did happen.'
 						act 'Say goodbye':
@@ -444,12 +457,12 @@ if $ARGS[0] = 'trener_speak':
 		centr = 3 & ! to close the fitness center encounters
 		trener_Speak = 6
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak19.jpg"></center>'
-		'You took the hand of the coach in your''s, "Mikhail, I want to tell you, that I will never betray you, I certainly like to gossip, but human relationships are not the reason for the chatter. I''m not like the girl from the national team." having blurted this out, you stared at the coach and waited for his reaction.' 
+		'You took the hand of the coach in your''s, "Mikhail, I want to tell you, that I will never betray you, I certainly like to gossip, but human relationships are not the reason for the chatter. I''m not like the girl from the national team." having blurted this out, you stared at the coach and waited for his reaction.'
 		'"That damn Chinaman just can''t help but gossip." the coach smiled and continued, "And you''re a stubborn wench <<$pcs_lastname>>, I will think about your words, now go home".'
 	elseif trener_Speak = 6 and trenerSex >= 1:
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak21.jpg"></center>'
-		'You decided to ask the coach whether he will let you be a starter for the team while trying to look as sexy as possible. But Mikhail Nikolaevich for some reason frowned and said, "You''re not acting like a starter, <<$pcs_lastname>>. Starters work hard and don''t fool around."' 
+		'You decided to ask the coach whether he will let you be a starter for the team while trying to look as sexy as possible. But Mikhail Nikolaevich for some reason frowned and said, "You''re not acting like a starter, <<$pcs_lastname>>. Starters work hard and don''t fool around."'
 		'You sucked in your breath at the insult, you''ve been working your ass off.'
 		act 'Threaten to reveal relationship':
 			cla & *clr
@@ -486,7 +499,7 @@ if $ARGS[0] = 'trener_speak':
 				'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voltrenerspeak23.mp4"></video></center>'
 				'Putting a hand on your ass, the coach pulled the crotch of your panties to the side and spread your ass. You felt his fingers, strong and rough from years of athletic training, massaging your holes.'
 			end
-			'"If it makes you interested, then I think it is good behaviour." you think to yourself.' 
+			'"If it makes you interested, then I think it is good behaviour." you think to yourself.'
 			'"<<$pcs_nickname>>, I am not taking about your training. Why does it always come to this with you?" the coach sighed.'
 			'You chuckled and decided to be patient, you know the coach''s quirks now and how far you can push with him. Based on previous experience, it seems you won''t be getting him this time, but next time...'
 			act 'Leave':
@@ -503,8 +516,8 @@ if $ARGS[0] = 'trener_speak':
 		cla
 		*clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener5.jpg"></center>'
-		'The coach smiled at you and, giving you a thumbs up, said: "<<$pcs_nickname>>, I want to congratulate you, I think. I''ve decided to make you a first string regular, from now on, you''ll be starting."' 
-		'"But," he added, shaking his finger at you admonishingly, "You will still need to keep practicing, and less booze-gadding!"' 
+		'The coach smiled at you and, giving you a thumbs up, said: "<<$pcs_nickname>>, I want to congratulate you, I think. I''ve decided to make you a first string regular, from now on, you''ll be starting."'
+		'"But," he added, shaking his finger at you admonishingly, "You will still need to keep practicing, and less booze-gadding!"'
 		'You squealed happily and threw your arms around the coach''s neck. "Now we have them... I always... Yes we like..." The excitement of the unexpected anouncement left you unable to speak and the coach just smiled at you and said, "Go."'
 		volleysostav = 2
 	else