Merge remote-tracking branch 'Awesome/master'

locations/katja_lake.qsrc

@@ -139,7 +139,7 @@ if $ARGS[0] = 'lake_activities':
 				if will_cost <= pcs_willpwr:
 					act 'Go in the nude!':
 						*clr & cla
-						gs 'willpower', 'pay', 'selft'
+						gs 'willpower', 'pay', 'self'
 						if PCloSwimwear = 0 and $clothingworntype ! 'nude':
 							$lastwornclothingtype['swim'] = $clothingworntype
 							lastwornclothingnumber['swim'] = clothingwornnumber
@@ -234,7 +234,7 @@ if $ARGS[0] = 'sauna_time':
 					if will_cost <= pcs_willpwr:
 						act 'Go in the nude!':
 							*clr & cla
-							gs 'willpower', 'pay', 'selft'
+							gs 'willpower', 'pay', 'self'
 							if PCloSwimwear = 0 and $clothingworntype ! 'nude':
 								$lastwornclothingtype['swim'] = $clothingworntype
 								lastwornclothingnumber['swim'] = clothingwornnumber
@@ -272,7 +272,7 @@ if $ARGS[0] = 'sauna_time':
 			if will_cost <= pcs_willpwr:
 				act 'Go in the nude!':
 					*clr & cla
-					gs 'willpower', 'pay', 'selft'
+					gs 'willpower', 'pay', 'self'
 					if PCloSwimwear = 0 and $clothingworntype ! 'nude':
 						$lastwornclothingtype['swim'] = $clothingworntype
 						lastwornclothingnumber['swim'] = clothingwornnumber
@@ -532,7 +532,7 @@ if $ARGS[0] ='winter_activities':
 					'You smile tiredly as the crowd returns to their own skating, but there is more than a good share of wonderment at your demonstration. In general, you must say that it has been a great time, but it is time to look for something else to do.'
 
 					act 'Continue':npc_rel['A14'] += 5 & npc_rel['A141'] += 5 & gs 'exp_gain', 'stren', 1 & gs 'exp_gain', 'agil', 1 & gs 'exp_gain', 'react', 1 & gs 'exp_gain', 'icesktng', 1 & grupvalue[1] += 10 & grupvalue[2] += 5 & gt 'katjaEv','kathan'
-				
+
 				elseif dummy >50:
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS4.jpg"></center>'
 					'"Oh god! <<$pcs_nickname>>! Oh god! What are you doing to me! Oh god!"'
@@ -541,7 +541,7 @@ if $ARGS[0] ='winter_activities':
 					'Smiling, she grabs your hand and pulls, taking the lead and skating towards the crowd, this time without flourishing moves. You both enjoy some well-deserved distraction from your everyday problems.'
 					'And that is how you pass the next half hour. Skating, giggling and in general just showing off, before it is time to look for something else to do.'
 
-					act 'Continue':npc_rel['A14'] += 1 & gt 'katjaEv','kathan'	
+					act 'Continue':npc_rel['A14'] += 1 & gt 'katjaEv','kathan'
 
 				else
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS3.jpg"></center>'
@@ -552,7 +552,7 @@ if $ARGS[0] ='winter_activities':
 					'You hold each other, laughing, as you try to dance over the ice and in general, have a great time on this winter day, showing off and being "cool" and "pretty", things that a "popularity" conscientious Katja enjoys. Of course, the fact that the two of you are having a great time is a bonus, but after a great half hour, you are both a little weary and decide that it is time to look for something else to do.'
 
 					act 'Continue':npc_rel['A14'] += 1 & gt 'katjaEv','kathan'
-				end	
+				end
 			end
 		end
 	end
@@ -622,7 +622,7 @@ if $ARGS[0] = 'hockey_match':
 	'"Seriously, your boyfriend sucks, and you''re only embarrassing yourselves!"'
 	'Some girls next to you appear less than thrilled with the Meynold''s spirited cheering. Katja appears offended, while Vicky playfully sticks her tongue out before resuming her cheers. On the other side, the other girls scoff at your group and, after deeming your little gang "childish," return their focus to the match. Hm... Maybe you should do something.'
 
-	
+
 	act 'Who cares? Continue watching the match.':
 		*clr & cla
 		menu_off = 1
@@ -1007,7 +1007,7 @@ if $ARGS[0] = 'ivan_interaction':
 			cla
 			npc_rel['A14'] += 1
 			npc_rel['A3'] += 1
-			minut += 10 
+			minut += 10
 			pcs_mood += 10
 			gs 'stat'
 			'"Hey Ivan! Why not sit with Katja and me for a while?"'
@@ -1021,12 +1021,12 @@ if $ARGS[0] = 'ivan_interaction':
 			cla
 			npc_rel['A14'] += 1
 			npc_rel['A3'] += 1
-			minut += 10  
+			minut += 10
 			gs 'stat'
 			'Talking with Ivan, King of the Lone Wolves, is an uphill battle. He is evidently not interested in the sort of things Katja likes to talk about and would probably prefer to jump back into his swimming. Alas, Ivan is too polite to just tell you to fuck off, and that is a weakness you and Katja can exploit.'
 			'After some pestering, Ivan finally resigns to sit with you and pass the time in "civilized" conversation. The minutes pass, with him primarily listening to your endless rants, but after a while, between Katja''s shyness and Ivan''s apathy, silence falls over the three of you, leaving your little trio observing the lake in tranquillity.'
 			'"Ehm... Girls, I must return to my training."'
-			'You blink. Ivan''s words take you by surprise and before you or Katja can say something, he quickly returns to the lake. Time to look for something else to do.'			
+			'You blink. Ivan''s words take you by surprise and before you or Katja can say something, he quickly returns to the lake. Time to look for something else to do.'
 		end
 
 		if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
@@ -1117,7 +1117,7 @@ if $ARGS[0] = 'ivan_interaction':
 								'"Ok Katja, relax. We have done this before. Ivan isn''t going to hurt you."'
 								'The girl closes her eyes, relaxes and raises a leg over the bench to give Ivan better access to her asshole. A moan escapes her lips as the jock slowly pushes his cock beyond the closely guarded aperture.'
 								'"Uff! Fuck! <<$pcs_nickname>>! Ivan! It''s... It''s big!"'
-								'You silence her moans with a kiss and lead a hand towards her crotch so you can begin to finger her really wet and hot cunt as Ivan slowly fucks her asshole, the room quickly filling with a mix of excited moans and painful grunts coming from between your linked tongues.'									
+								'You silence her moans with a kiss and lead a hand towards her crotch so you can begin to finger her really wet and hot cunt as Ivan slowly fucks her asshole, the room quickly filling with a mix of excited moans and painful grunts coming from between your linked tongues.'
 							end
 							if npc_ass['A14'] < dick: npc_ass['A14'] += 1
 							if npc_ass['A14']*2 < dick: npc_ass['A14'] += 1
@@ -1362,7 +1362,7 @@ if $ARGS[0] = 'saune_time':
 
 					act 'Ice dipping!':
 						*clr & cla
-						gs 'willpower', 'pay', 'force'					
+						gs 'willpower', 'pay', 'force'
 						gs 'stat'
 						gt 'katja_lake','ice_dipping'
 					end
@@ -1532,9 +1532,9 @@ if $ARGS[0] = 'sauna_sex1':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KS11.jpg"></center>'
 				'"You want more Katja? Ok, but first..."'
 				'You rise and caress Katja''s flaming red hair. She appears overwhelmed by lust, and, understanding your unspoken request, she readily gets up from her seat and kneels, making way for you to take her spot. Her eager gaze conveys an insatiable desire.'
-				'"<<$pcs_nickname>>... how do you make me want to do this so much?"' 
-				'Katja spreads your legs so she has free access to your pussy, and with a deep sigh, begins to give you small loving kisses all over your thighs. You sit back and attempt to relax, biting your lips as the burning sensation in your cunt becomes greater with Katja''s slow performance.' 
-				'"Katja! Just... Fuck! Use your tongue!"' 
+				'"<<$pcs_nickname>>... how do you make me want to do this so much?"'
+				'Katja spreads your legs so she has free access to your pussy, and with a deep sigh, begins to give you small loving kisses all over your thighs. You sit back and attempt to relax, biting your lips as the burning sensation in your cunt becomes greater with Katja''s slow performance.'
+				'"Katja! Just... Fuck! Use your tongue!"'
 				'The redhead obeys your demand and licks your pussy passionately, her cold tongue causing your body to tremble in pleasure. Your voice can''t be contained and soon, moans fill the sauna, announcing to those beyond the debauched act occurring within, but it''s not enough. You grab Katja by the hair and make her kiss you.'
 
 				act 'You devour each other':gt 'katja_lake','sauna_sex2'
@@ -1576,9 +1576,9 @@ if $ARGS[0] = 'sauna_sex1':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KS11.jpg"></center>'
 			'"You want more Katja? Ok, but first..."'
 			'You rise and caress Katja''s flaming red hair. She appears overwhelmed by lust, and, understanding your unspoken request, she readily gets up from her seat and kneels, making way for you to take her spot. Her eager gaze conveys an insatiable desire.'
-			'"<<$pcs_nickname>>... how do you make me want to do this so much?"' 
-			'Katja spreads your legs so she has free access to your pussy, and with a deep sigh, begins to give you small loving kisses all over your thighs. You sit back and attempt to relax, biting your lips as the burning sensation in your cunt becomes greater with Katja''s slow performance.' 
-			'"Katja! Just... Fuck! Use your tongue!"' 
+			'"<<$pcs_nickname>>... how do you make me want to do this so much?"'
+			'Katja spreads your legs so she has free access to your pussy, and with a deep sigh, begins to give you small loving kisses all over your thighs. You sit back and attempt to relax, biting your lips as the burning sensation in your cunt becomes greater with Katja''s slow performance.'
+			'"Katja! Just... Fuck! Use your tongue!"'
 			'The redhead obeys your demand and licks your pussy passionately, her cold tongue causing your body to tremble in pleasure. Your voice can''t be contained and soon, moans fill the sauna, announcing to those beyond the debauched act occurring within, but it''s not enough. You grab Katja by the hair and make her kiss you.'
 			act 'You devour each other':gt 'katja_lake','sauna_sex2'
 		end

locations/pav_parkev.qsrc

@@ -685,6 +685,7 @@ if $ARGS[0] = 'gopboys':
 	'Vitek, Dan, Lavrenti, Niko, Roman, Arkadi, Vasily and Pauline are sitting at a picnic table, drinking beers and smoking cigarettes and weed. They''re getting wasted and having a good time, laughing and messing around.'
 	act 'Move away':gt 'pav_park', 'deeper_park'
 	act 'Join them':
+		cla
 		'You walk over to them. "Hey guys."'
 		if grupTipe = 5:
 			'They give you a look of disgust. "Get lost, loser!"'
@@ -754,6 +755,7 @@ if $ARGS[0] = 'gopniks':
 	'Vitek, Dan, Lavrenti, Roman, Arkadi, Niko, Valentin, Radomir, Vasily, Pauline, Lena, Lera, Anushka and Alyona are all sitting at a picnic table, drinking beers and smoking cigarettes & weed. They''re getting wasted and having a good time, laughing and messing around.'
 	act 'Move away': gt 'pav_park', 'deeper_park'
 	act 'Join them':
+		cla
 		'You walk over to them. "Hey guys."'
 		if grupTipe = 5:
 			'They give you a look of disgust. "Get lost, loser!"'

locations/stripclub.qsrc

@@ -895,7 +895,7 @@ if $ARGS[0] = 'albina_dance':
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/private_room.jpg"></center>'
 	'You hand over the money and are taken to one of the private rooms, where you take a seat and wait for Albina to arrive.'
 	if npc_rel['A23'] >= 70 or AlbinaQW['Friends'] = 2:
-		if AlbinaQW{'special_lapdance'] = 0:
+		if AlbinaQW['special_lapdance'] = 0:
 			'Albina walks into the room and her face lights up when she sees you. "<<$pcs_nickname>>! I should have known that it was you!"'
 			'All you can do is grin as she seductively struts over to you. "What if we make this dance more interesting?"'
 			'"Oh?" you ask while raising an eyebrow.'

locations/therapist_reminder.qsrc

@@ -75,7 +75,7 @@ if $ARGS[0] = '':
 	
 			act 'Continue':
 				gs 'therapist_reminder', 'clear_vars'
-				gt 'therapist'
+				gt 'therapist', 'start'
 			end
 		end
 	else