18 Commits cfc60e48e3 ... 8d60658c23

Autor SHA1 Mensagem Data
  KevinSmarts 8d60658c23 Merge remote-tracking branch 'hornguy6/master' 4 anos atrás
  KevinSmarts 5e463c4013 Merge remote-tracking branch 'Violet_Kitten/master' 4 anos atrás
  hornguy6 ea1e1e4a85 [fixed] willpower call in Anya Roma threesome 4 anos atrás
  VioletKitten bea0a0da18 [fixes] Wrong code for mp4 video. 4 anos atrás
  KevinSmarts e3c2b3d7b2 [Fixed] Music didn't stop when leaving disco with trainer. 4 anos atrás
  KevinSmarts f56cbfaa66 [Added] Some extra meeting Djibril when he's with Olu content from nutluck 4 anos atrás
  KevinSmarts 1cadadc6fb [text edit] Getting interupted while shaving in uni text translated by Deleted member 397458 4 anos atrás
  KevinSmarts f0286b96c1 [change] winter image call for sport field from September to November and then back to summer image in April 4 anos atrás
  KevinSmarts 30c5760114 [fixed] Artem thanking loop after he deleted Dimka's film 4 anos atrás
  KevinSmarts 0e4caf79f3 Merge remote-tracking branch 'Violet_Kitten/master' 4 anos atrás
  VioletKitten dcd211a4d7 [text edit] Niko asking Sveta to meet him at the disco at a day that it is closed. 4 anos atrás
  KevinSmarts 092aac3f1d [fixed] Mom both tidying away and eating breakfast plus no gosub for salon so Mom scene wouldn't activate 4 anos atrás
  KevinSmarts d0095d846f [added] Missing image call from nutluck 4 anos atrás
  KevinSmarts bc2471bf5c [fixed] added the storage and unwanted locations to bags so those in limbo can be saved and tidied up a code snipet in placer_sex 4 anos atrás
  KevinSmarts 1ed695d4fc [fixed] No action after tell sis you're pregnant and lots of Finish changed to Cotinue for consistancy 4 anos atrás
  KevinSmarts c9910ad986 Merge remote-tracking branch 'Violet_Kitten/master' 4 anos atrás
  VioletKitten e49a9b7f03 [fixes] Corrected wrong image calls. 4 anos atrás
  VioletKitten 7751970f99 [fixes] Wrong image paths, missing image, wrong variable and broken scene corrections. 4 anos atrás

+ 1 - 1
locations/NikoDates.qsrc

@@ -1197,7 +1197,7 @@ if $ARGS[0] = 'After School':
 										NikoEv = 7
 										gs'stat'									
 										'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss2.mp4"></video></center>'
-										'Niko kneels down in front of you then removes the collar from your neck before kissing your lips passionately for a few seconds then gently rubbing your cheek. "You will always be my perfect little princess. I have an important test to take tomorrow, so I will be very busy, but feel free to stop by the <font color=#c600ff>disco tomorrow</font> and we can have a good time." Niko then stands up and walks away.'
+										'Niko kneels down in front of you then removes the collar from your neck before kissing your lips passionately for a few seconds then gently rubbing your cheek. "You will always be my perfect little princess. I have an important test to take tomorrow, so I will be very busy, but feel free to stop by the <font color=#c600ff>disco</font> and we can have a good time." Niko then stands up and walks away.'
 										
 										act 'Stand up':gt 'pavResidential'
 									end

+ 1 - 1
locations/NikoDreams.qsrc

@@ -485,7 +485,7 @@ if $ARGS[0] =  'Classroom Dream':
 			act 'Move closer':	
 				*clr & cla
 				gs'stat'
-				'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/blowjob1.gif"></center>'
+				'<center><video autoplay loop src="images/shared/sex/blowjob/blowjob1.mp4"></video></center>'
 				'As soon as you get close the teacher grabs you then pushes you onto your knees. He pushes his penis against your lips and says, "Open up, for your reward." You open your mouth, allowing his penis to enter. You begin sucking his dick eagerly, for what feels like a few minutes before he grabs your waist then lifts you up, dropping you on top of his desk.' 
 
 				act 'See what he does':	

+ 4 - 4
locations/NikoEv2.qsrc

@@ -258,7 +258,7 @@ if $ARGS[0] =  'Lunch Chat':
 			minut += 5
 			gs'stat'
 			'<center><b><h4><font color=#9b5800><<"Petia Alkaev">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/47.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/159.jpg"></center>'
 			'As soon as you enter the locker room, you see Petia Alkaev waiting for you. Niko says, "Here she is." Petia responds, "I heard some things about you <<$pcs_nickname>>. Are they true?" You lower your head then ask, "What have you heard?" Petia replies, "I heard that you are Niko''s whore and that you do anything Niko tells you too. At least that is what Niko said." You look to Niko, who has a wide smile on his face. Niko nods to you, "No need to be shy <<$pcs_nickname>>, tell him." You lower your head again then say, "Yes it''s true." Niko responds, "What''s true?" with a confident smile on his face.' 
 
 			act 'Tell them':	
@@ -606,14 +606,14 @@ if $ARGS[0] =  'Diner 1':
 		act 'Continue':	
 			*clr & cla
 			gs'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/npc/1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/npc/1.jpg"></center>'
 			'The biker responds, "Of course I''m not interested because I''m not a fucking faggot!" Niko pauses for a second then bursts into laughter. "Oh  no. i didn''t mean....I meant my girl here, will take care of you...for a price of course." The biker chuckles for a few seconds before responding. "I see now. I thought you were hitting on me, kid. You''re lucky you weren''t, but let me take a look at her."'
 			
 			act 'Let the biker examine you':	
 				*clr & cla
 				minut += 5
 				gs'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/npc/1.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/npc/1.jpg"></center>'
 				'You step forward then wait to see what the biker will do. The biker begins looking you up and down then asks Niko, "Can I touch her a bit? I just want to make sure that she isn''t hiding anything down there." The biker points toward your vagina. Niko chuckles, "Fine, make it quick." The biker begins rubbing on your vagina, for a few seconds before saying, "I''m interested. How much?" Niko responds, "2000 <b>₽</b>" the biker scratches his beard as he replies, "She better be real good, for that price."' 
 				*nl
 				'Niko replies, "She certainly is." the biker responds, "So you say, but what guarantee do I have that you are telling the truth? She could be a breathing blow up doll, for all I know." Niko responds, "How about this, For this time only, you can use her now then pay me afterward? Doesn''t that sound fair?" The biker nods, "You have yourself a deal. Come on girl, we''re doing this in the bathroom." The man grabs you by your arm then leads you to the restroom, where he takes off his pants then points to his dick as he says, "Alright girl, get to work."'
@@ -640,7 +640,7 @@ if $ARGS[0] =  'Diner 1':
 							*clr & cla
 							minut += 5
 							gs'stat'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/npc/1.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/npc/1.jpg"></center>'
 							'You see the biker shake hands with Niko then give him the money. Niko counts the money then gives the biker an approving nod before the biker takes his seat again. Niko turns to you and says, "Good job <<$pcs_nickname>>. We are making some good progre..."' 
 							
 							act 'Turn around':	

+ 11 - 12
locations/NikoSlut.qsrc

@@ -1434,33 +1434,32 @@ if $ARGS[0] = 'Wash':
 end
 
 if $ARGS[0] = 'Diner Exit':
-	*clr & cla
+	cls
 	gs'stat'
-	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/interior2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/Interior2.jpg"></center>'
 	'You look around the diner and notice that everyone has left. Niko turns to you then says, "I guess we''re done for the day. Great work." Niko then leads you out of the diner.'
 
 	if NikoEv = 19:
 		act 'Leave Diner':gt 'NikoEv2', 'Diner Exit 2'
-	else
+	else	
 		act 'Leave Diner':
-			*clr & cla
+			cls
 			minut += 15
 			if NikoSlut = 2:NikoSlut = 1
 			if NikoSlut < 3:
 				money += NikoProfit * 400
 			else
 				money += NikoProfit * 1000
-			end
+			end	
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/payment.jpg"></center>'
-			'Once you both leave the diner, Niko gives you a kiss on the cheek then says, "You have done some great work today, keep it up." Niko hands you your cut of the profit. He takes your hand in his and starts to walk you home.'
-			act 'Walk home':
-				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss1.mp4"></video></center>'
-				'As you walk back home, the two of you chat about various topics. When you reach your apartment build, he opens the door for you and then walks you up the stairs. Once at your door, Niko gives you a soft passionate kiss then he turns around and walks away. You watch him until he is out of sight walking down the stairs and then go into your apartment.'
-				act 'Wave goodbye':NikoProfit = 0 & gt 'korrPar'
-			end
+			'Once you both leave the diner, Niko gives you a kiss on the cheek then says, "You have done some great work today. Keep it up." Niko hands you your cut of the profit then walks you back home while chatting with you about various topics. When you reach your apartment, Niko gives you a soft kiss then he turns around and walks away.'	
+			*nl
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss1.gif"></center>'
+			
+			act 'Wave goodbye':NikoProfit = 0 & gt 'korrPar'
 		end
-	end
+	end	
 end
 
 --- NikoSlut ---------------------------------

+ 2 - 0
locations/NikoWhore.qsrc

@@ -180,6 +180,8 @@ if $ARGS[0] = 'Locker Room':
 																*clr & cla
 																inhib_exp += 2
 																gs'stat'
+																'<center><b><h4><font color=#FF00CC><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+																*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'										
 																'Your heart is pounding and you can feel tears streaming down your eyes. <font color=#FF00FF>I''m going to lose everything. My life will never be the same again. Please let this be a bad dream. PLEEEEEEASE!</font> You close your eyes, trying to wake up when you hear the sounds of chatting and laughter, informing you that you are passing the cafeteria.'
 																*nl
 																if fedorkozlovQW > 1 or fedorKozlovQW < -10:

+ 2 - 0
locations/VolleyTrenerSpeak.qsrc

@@ -26,6 +26,8 @@ if volleysostav > 0:
 
 		act 'Go with the coach':
 			Discoclose = 1 &!closing disco on this day not to forget stat
+			music_loop = 0
+			close all
 			minut += 20
 			gs 'stat'
 			*clr & cla

+ 1 - 1
locations/artemhome.qsrc

@@ -1230,7 +1230,7 @@ if $ARGS[0] = 'chat':
 		'He continues: "Ever since I''ve seen that video... Now I can''t even look at you, how could you?" He looks away from you in disgust. "Please leave, I never want to see you again."'
 		'You don''t know what to say, you just nod your head and then get up and walk out.'
 		act 'Leave his apartment': gt'pod_ezd','etaj_1'
-	elseif artlie = -1 and artdimhelp ! daystart:
+	elseif artlie = -1 and artdim ! 1 and artdimhelp ! daystart:
 		artdim = 1
 		DimaRudeBlock = 1
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'

+ 1 - 1
locations/gschool_cheerleading.qsrc

@@ -292,7 +292,7 @@ if $ARGS[0] = 'practice':
 		killvar 'temp_time'
 		
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/practice.mp4"></center>'
+		'<center><video autoplay loop src="images/locations/pavlovsk/school/afterschool/cheerleading/practice.mp4"></video></center>'
 		
 		!! First time scene
 		if cheerleadingQW['practice_count'] = 1:

+ 1 - 1
locations/gschool_grounds.qsrc

@@ -330,7 +330,7 @@ if $ARGS[0] = 'sports':
 	menu_off = 0
 	*clr & cla
 	gs 'stat'
-	if month > 2 and month < 9:
+	if month > 3 and month < 11:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/field.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/fieldwinter.jpg"></center>'

+ 1 - 1
locations/gschool_lunch.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] = 'cafeteria':
 		elseif NikoVolkovQW = 10 and NikoEv = 13 and NikoDate_Day ! daystart:
 			school_lunch = 1
 			gt 'NikoEv2', 'Lunch Chat'
-		elseif NikoVolkovQW = 10 and NikoEv = 14 and NikoDate_Day ! daystart:
+		elseif NikoVolkovQW = 10 and NikoEv = 15 and NikoDate_Day ! daystart:
 			school_lunch = 1
 			gt 'NikoEv2', 'Lunch Chat 2'
 		elseif NikoVolkovQW = 10 and NikoEv = 21 and NikoDate_Day ! daystart:

+ 9 - 4
locations/kuhrPar.qsrc

@@ -27,6 +27,9 @@ gs 'stat'
 gs 'kit_din'
 gs 'themes', 'indoors'
 gs 'family_schedule'
+'<center><b><font color="maroon">Kitchen</font></b></center>'
+'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/kuhrpar.jpg"></center>'
+
 if momloc = 4:
 	if momloc[1] = 1:
 		'You <<$npc_nickname[''A29'']>> is here, busy making breakfast.'
@@ -40,15 +43,17 @@ if momloc = 4:
 		act 'set the table for breakfast': gt 'kuhrPar'
 		exit
 	elseif momloc[1] = 4:
+		$mombreak = ''
 		'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here clearing away the breakfast dishes.'
+	else
+		$mombreak = ', <a href="exec:gt''mother''">mother</a>'
 	end
 end
-'<center><b><font color="maroon">Kitchen</font></b></center>'
-'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/kuhrpar.jpg"></center>'
+
 if hour = 7 and week < 6 and indorf = 0:
-	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''">mother</a>, <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating breakfast. You could sit down and join them for breakfast or just grab something and go.'
+	'<a href="exec:gt''father''">Your stepfather</a><<$mombreak>>, <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating breakfast. You could sit down and join them for breakfast or just grab something and go.'
 elseif hour = 7 and week > 5 and indorf = 0:
-	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''">mother</a>, and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating breakfast. It seems your sister is sleeping in again. You could sit down and join them for breakfast or just grab something and go.'
+	'<a href="exec:gt''father''">Your stepfather</a><<$mombreak>>, and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating breakfast. It seems your sister is sleeping in again. You could sit down and join them for breakfast or just grab something and go.'
 elseif hour = 18 and minut <= 30 and indorf = 0 and anyaloc ! 25:
 	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''">mother</a>, <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating dinner. You could sit down and join them for dinner or just grab something and go.'
 elseif hour = 18 and minut <= 30 and indorf = 0:

+ 14 - 10
locations/olutaxi.qsrc

@@ -6,10 +6,19 @@ if $ARGS[0] = 'station':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big55.jpg"></center>'
 	if djibril_taxi = 1:
-		'Once he sits back down on the bench you walk over to him and take a seat on the bench next to him. "No luck finding customers?"'
-		'He shakes his head but smiles. "Not yet but I will, you will see, some always take Olu up on offer." He seems confident and undeterred by being turned down. Then he adds. "This is my nephew Djibril, he goes to the University in Saint Petersburg." Djibril smiles to you and he looks a lot like his uncle when he does that.'
-		'You can''t help but smile back to him. "Hello Djibril."'
-		'"Hello <<$pcs_nickname>>, my uncle has told me about you. The niece of Luda." His Russian is very good, he doesn''t have much of a accent at all. Maybe they have time to talk, or perhaps you should let Olu work. Maybe Olu would even give you a ride locally and save you from walking.'
+		if meet_djibril = 1
+			'Once he sits back down on the bench you walk over to him and take a seat on the bench next to him. "No luck finding customers?"'
+			'He shakes his head but smiles. "Not yet but I will, you will see, some always take Olu up on offer." He seems confident and undeterred by being turned down.'
+			'Djibril smiles to you and he looks a lot like his uncle when he does that. "Hello again <<$pcs_nickname>>."'
+			'You can''t help but smile back to him. "Hello Djibril."'
+			'Maybe they have time to talk, or perhaps you should let Olu work. Maybe Olu would even give you a ride locally and save you from walking.'
+		else
+			meet_djibril = 1
+			'Once he sits back down on the bench you walk over to him and take a seat on the bench next to him. "No luck finding customers?"'
+			'He shakes his head but smiles. "Not yet but I will, you will see, some always take Olu up on offer." He seems confident and undeterred by being turned down. Then he adds. "This is my nephew Djibril, he goes to the University in Saint Petersburg." Djibril smiles to you and he looks a lot like his uncle when he does that.'
+			'You can''t help but smile back to him. "Hello Djibril."'
+			'"Hello <<$pcs_nickname>>, my uncle has told me about you. The niece of Luda." His Russian is very good, he doesn''t have much of a accent at all. Maybe they have time to talk, or perhaps you should let Olu work. Maybe Olu would even give you a ride locally and save you from walking.'
+		end
 		act 'Tell Olu good luck':
 			*clr & cla
 			gs 'stat'
@@ -30,7 +39,6 @@ if $ARGS[0] = 'station':
 				gs 'stat'
 				'<center><img src="images/characters/pavlovsk/resident/olu/taxi_parked.jpg"></center>'
 				'As you walk into the alleyway you see his van he converted into a taxi sitting there.'
-!!if first time seeing van in alleyway
 				if first_taxi = 0:
 					first_taxi = 1
 					'You wonder why he parked here. "Why is your van parked here?" You ask him'
@@ -42,7 +50,6 @@ if $ARGS[0] = 'station':
 					'You shake your head in disgust, knowing why he has to park his van in the alleyway, so to keep the local police from harassing him.'
 					'He unlocks the van and gets in it, once you climb inside he turns to you and says. "Where you need go?" As Djibril climbs into the back seat.'
 				end
-!!add a list of all the street hubs in pav and pushkin as places he can drive her. regardless which is picked it goes to the following. Each choice goes to the text below.
 				act 'Ride along':
 					*clr & cla
 					gs 'stat'
@@ -54,7 +61,6 @@ if $ARGS[0] = 'station':
 					'Olu returns the smile. "Any time, good bye." Once he you close the door and he is sure you are safely on the sidewalk he pulls away and drives off.'
 					act 'Go to Pavlovsk Residential area': gt 'pavResidential'
 					act 'Go to the Old Town': gt 'liam'
-!!this then dumps Sveta onto what ever street hub she asked him to drive her too.
 				end
 			end
 		end
@@ -107,7 +113,6 @@ if $ARGS[0] = 'station':
 				gs 'stat'
 				'<center><img src="images/characters/pavlovsk/resident/olu/taxi_parked.jpg"></center>'
 				'As you walk into the alleyway you see his van he converted into a taxi sitting there.'
-!!if first time seeing van in alleyway
 				if first_taxi = 0:
 					first_taxi = 1
 					'You wonder why he parked here. "Why is your van parked here?" You ask him'
@@ -118,7 +123,6 @@ if $ARGS[0] = 'station':
 					'You shake your head in disgust, knowing why he has to park his van in the alleyway, so to keep the local police from harassing him.'
 					'He unlocks the van and gets in it, once you climb inside he turns to you and says. "Where you need go?"'
 				end
-!!add a list of all the street hubs in pav and pushkin as places he can drive her. regardless which is picked it goes to the following. Each choice goes to the text below.
 				act 'Ride along':
 					*clr & cla
 					gs 'stat'
@@ -128,7 +132,6 @@ if $ARGS[0] = 'station':
 					'He returns the smile. "Any time, good bye." Once he you close the door and he is sure you are safely on the sidewalk he pulls away and drives off.'
 					act 'Go to Pavlovsk Residential area': gt 'pavResidential'
 					act 'Go to the Old Town': gt 'liam'
-!!this then dumps Sveta onto what ever street hub she asked him to drive her too.  act '':gt '', ''
 				end
 			end
 		end
@@ -246,6 +249,7 @@ if $ARGS[0] = 'djibril_taxi_sex':
 			act 'Blow him':
 				*clr & cla
 				npc_rel['A82'] +=1
+				djibril_sex += 1
 				gs 'stat'
 				'<center><img src="images/characters/city/university/boy/djibril/sex/taxi/taxi3.jpg"></center>'
 				'You climb off him as he pulls down his pants and underwear, his massive cock springs free. He is not as big as his uncle but he is not a lot smaller either, huge cocks must run in the family. You grab ahold of it and can''t even wrap your fingers all the way around it, you start jerking him off then you lean over and start sucking on the head of his dick. You slowly work your mouth lower, his monstrous dick causes your jaws to stretch as you take him into your mouth. He moans as you suck his cock and jerk it off with one hand. He reaches over your body with one arm and starts rubbing and fingering your pussy.'

+ 5 - 2
locations/pavtrainhall.qsrc

@@ -33,8 +33,11 @@ if $ARGS[0] = '':
 			VK = rand (1,5)
 			if week = 1 and VK = 1:
 				djibril_taxi = 1
-				!!or what ever code you want to use it will get reset for next act
-				'You see your aunts boyfriend <a href="exec:minut += 1 & gt ''olutaxi'', ''station''">Olu</a> sitting on one of the benches, dressed fairly nicely, next to him sits a younger man that looks similar enough to them that they might be related. When some people head for the exit Olu gets up and walks up to them, asking them if they need a taxi, so far it doesn''t look like anyone is taking him up on his offer.'
+				if meet_djibril = 1
+					'You see your aunts boyfriend <a href="exec:minut += 1 & gt ''olutaxi'', ''station''">Olu</a> sitting on one of the benches, dressed fairly nicely, next to him sits his nephew Djibril. When some people head for the exit Olu gets up and walks up to them, asking them if they need a taxi, so far it doesn''t look like anyone is taking him up on his offer.'
+				else
+					'You see your aunts boyfriend <a href="exec:minut += 1 & gt ''olutaxi'', ''station''">Olu</a> sitting on one of the benches, dressed fairly nicely, next to him sits a younger man that looks similar enough to them that they might be related. When some people head for the exit Olu gets up and walks up to them, asking them if they need a taxi, so far it doesn''t look like anyone is taking him up on his offer.'
+				end
 			else
 				'You see your aunts boyfriend <a href="exec:minut += 1 & gt ''olutaxi'', ''station''">Olu</a> sitting on one of the benches, dressed fairly nicely. When some people head for the exit he gets up and walks up to them, asking them if they need a taxi, so far it doesn''t look like anyone is taking him up on his offer.'
 			end

+ 2 - 4
locations/placer_sex.qsrc

@@ -1419,9 +1419,7 @@ if $args[0] = 'stay':
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/placer_sex29.jpg"></center>'
 	'The guys are happy that you decided to stay the night, and <<$boydesc2>> goes to another room to fetch a guitar. He''s fairly good at playing it, and you all happily sing along to the songs he''s plays. Afterwards, you all enjoy another glass of vodka while you exchange stories. Before you know it, it''s getting late.'
-	act 'Go to bed':
-		gt 'placer_sex', 'sleep'
-	end
+	act 'Go to bed': gt 'placer_sex', 'sleep'
 end
 
 if $args[0] = 'sleep':
@@ -1432,7 +1430,7 @@ if $args[0] = 'sleep':
 			SAVEGAME 'autosave_alt.sav'
 		end
 	end
-	cls
+	*clr & cla
 	clr
 	notathomesleep=0
 	pcs_health += 5

+ 15 - 0
locations/purses.qsrc

@@ -18,6 +18,21 @@ if $ARGS[0] = 'view_purse_list':
 	end
 
 	act 'Return' :gt 'wardrobe', 'start'
+	
+	$clothing_header = '<center><table border=1>'
+	if $ARGS[1] ! 'wardrobe': $clothing_header += '<TH><a href="exec:gt ''purses'', ''view_purse_list'', ''wardrobe'', ''<<$ARGS[1]>>''">Switch to wardrobe list</a></TH>'
+	if $ARGS[1] ! 'store': $clothing_header += '<TH><a href="exec:gt ''purses'', ''view_purse_list'', ''store'', ''<<$$ARGS[2]>>''">Switch to stored clothing list</a></TH>'
+	if $ARGS[1] ! 'unwanted': $clothing_header += '<TH><a href="exec:gt ''purses'', ''view_purse_list'', ''unwanted'', ''<<$$ARGS[3]>>''">Switch to unwanted clothing list</a></TH></center>'
+
+	if $ARGS[1] = 'wardrobe':
+		'<h3><center><b><font color="maroon">Wardrobe list</font></b></center></h3>'
+	elseif $ARGS[1] = 'store':
+		'<h3><center><b><font color="maroon">Stored purses list</font></b></center></h3>'
+	elseif $ARGS[1] = 'unwanted':
+		'<h3><center><b><font color="maroon">Unwanted purses list</font></b></center></h3>'
+	elseif $ARGS[1] = 'sell':
+		'<h3><center><b><font color="maroon">Choose an item to sell</font></b></center></h3>'
+	end
 
 	'<center><img src="images/locations/city/island/dolls.png"></center>'
 

+ 1 - 0
locations/salon.qsrc

@@ -2,6 +2,7 @@
 $location_type = 'public_indoors'
 
 if $ARGS[0] = 'start':
+	gs 'family_schedule'
 	if momloc = 15 and momloc[11] ! daystart: gt 'salon', 'mom'
 	$sexloc = $CURLOC
 	if week = 1 and hour >= 9 and hour <= 10 and worksalon = 1:gt 'salon', 'beginwork'

+ 1 - 1
locations/sisterQW.qsrc

@@ -424,7 +424,7 @@ if $ARGS[0] = 'flash_boobs':
 									gs 'arousal', 'vaginal', 5, 'lesbian', 'incest', 'group'
 									gs 'arousal', 'cuni_give', -5, 'lesbian', 'incest', 'group'
 									gs 'stat'
-									gs 'willpower', 'action', 'resist', 'medium'
+									gs 'willpower', 'anal', 'resist', 'medium'
 									if will_cost <= pcs_willpwr:
 										act 'No anal (<<will_cost>> Willpower)':
 											*clr & cla

+ 6 - 5
locations/sister_chat.qsrc

@@ -280,6 +280,7 @@ if $ARGS[0] = 'sister_chat':
 					'"Oh, sister, <<$tmpstr>>I think the father is <<$tmpstr2>>"'
 				end
 			end
+			act 'Continue': gt 'sister_chat', 'sister_chat'
 		elseif week < 5 and week > 1 and (daystart - (daystart mod 7)) mod 2 = 0 and pcs_vag > 0 and npc_rel['A33'] >= 80 and (sisterQW['party'] = 0 or sisterQW['party'] = 2) and daystart - sisterQW['partyday'] > 3:
 			*clr & cla
 			minut += 5
@@ -305,7 +306,7 @@ if $ARGS[0] = 'sister_chat':
 				'You refuse to go to the party.'
 				'"Sorry Anya, I would love to, but I can''t get behind at school. I have homework and books to read, you know what it''s like."'
 				'She smiles to you. "My nerdy little sister, well have fun studying."'
-				act 'Finish': gt 'sister_chat', 'sister_chat'
+				act 'Continue': gt 'sister_chat', 'sister_chat'
 			end
 			if razradbeg > 0:
 !!Not exactly sure if this is the correct variable to check if Sveta runs track
@@ -316,7 +317,7 @@ if $ARGS[0] = 'sister_chat':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_4.jpg"></center>'
 					'You refuse to go to the party.'
 					'"I would love to, but I have a competition to prepare for. I have to train. One day I could be a great athlete, not like you lazy bones." You tell her with a teasing laugh.'
-					act 'Finish': gt 'sister_chat', 'sister_chat'
+					act 'Continue': gt 'sister_chat', 'sister_chat'
 				end
 			end
 			if volleysostav = 1 or volleysostav = 2:
@@ -327,7 +328,7 @@ if $ARGS[0] = 'sister_chat':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_5.jpg"></center>'
 					'You refuse to go to the party.'
 					'"I can''t, the coach does not allow my to stay out late, and drinking is also prohibited."'
-					act 'Finish': gt 'sister_chat', 'sister_chat'
+					act 'Continue': gt 'sister_chat', 'sister_chat'
 				end
 			end
 			act 'Yes':
@@ -340,7 +341,7 @@ if $ARGS[0] = 'sister_chat':
 				'You agree to go to the party.'
 				'"Awesome <<$pcs_nickname>>, it''ll be fun! We will meet at the community center this friday, don''t forget to be there before 18:00, otherwise we will leave without you."'
 				'With these words, your sister hugs you and kisses you on the cheek.'
-				act 'Finish': gt 'sister_chat', 'sister_chat'
+				act 'Continue': gt 'sister_chat', 'sister_chat'
 			end
 		! If you missed the party
 		elseif (sisterQW['party'] = 1 and daystart > sisterQW['partyday'] and week > 5) or (sisterQW['party'] = 1 and daystart - sisterQW['partyday'] > 3):
@@ -374,7 +375,7 @@ if $ARGS[0] = 'sister_chat':
 				'Anya is bouncing with joy and loosens her grip just enough to kiss you on the cheek.'
 				sisboytrioQW = 0
 			end
-			act 'Finish': gt 'sister_chat', 'sister_chat'
+			act 'Continue': gt 'sister_chat', 'sister_chat'
 			exit
 		elseif sisboytrioQW = 1 and ((sisboyday + 1 = daystart and hour > 18) or (sisboyday + 1 < daystart)) and $loc = 'bedrPar':
 			*clr & cla

+ 1 - 1
locations/vann.qsrc

@@ -39,7 +39,7 @@ if $ARGS[0] = 'brit1':
     $location_type = 'event'
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/sex/bathroom/brit1.jpg"></center>'
-	'While you smeared pubis foam in bath guy came, you were so passionate about what did not even notice it and only when he turned on the shaver socket looked up and saw him standing in front of you with a smile and treat your crotch. A few seconds later, he looked up from your feet, and said, "Hey, do you mind that I''m here, too, shave." and noticing your not very deft movement, which still continued to put foam on pussy, he added, "I can help, if necessary, when I have an older sister flew four years ago, so the bride from her fled, that had sometimes help shave. And then with a belly that does the most. " You and presented as a boy, who was still thirteen years probably was squatting in front of the pregnant girl and shaves her pussy, it''s probably had his first sexual experience.'
+	'While you applied shaving foam to your pubis in the bath, a guy comes in. You were so engrossed in what you were doing that you didn''t notice it, and only when he turned on the electric shaver he plugged in, did you look up and see him standing in front of you with a smile while you treated your crotch. A few seconds later, he looks up at your face and says, "Hey, do you mind that I''m in here to shave?" and noticing your inept movements, while you continue to apply shaving foam on your pussy, he adds, "I can help, if you want. I have an older sister who was supposed to get married four years ago. Her groom used to help her shave but he fled while she was pregnant. I took over that role and I''m pretty good at it." You can''t help but imagine this hunk of a man at thirteen, squatting in front of a pregnant woman and shaving her pussy. It was probably his first sexual experience.'
 
 	gs 'willpower', 'exhib', 'resist', 'easy'
 	if will_cost <= pcs_willpwr:

+ 1 - 0
locations/vanrPar.qsrc

@@ -63,6 +63,7 @@ if $ARGS[0] = 'peek':
 	elseif ((hour >= 18 and hour < 23 and week < 6) or (hour >= 20 and hour < 23 and week >= 6)) and brother_ev1 ! daystart and rand(0,4) < 2 and indorf = 0:
 		*clr & cla
 		brother_ev1 = daystart
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/shower/spotkolka.jpg"></center>'
 		'Despite the clattering noise of water, you hear the bathroom door creaking open slightly. Through a small opening in the doorway, you notice your brother Kolka watching you.'
 		gs 'willpower', 'exhib', 'resist', 'easy'
 		if will_cost <= pcs_willpwr: