16 Commits 860edaeacd ... ad7cfeb11f

Author SHA1 Message Date
  KevinSmarts ad7cfeb11f [text edit] Wrong location for sex shop 5 years ago
  julzor e54fa9c3ea [fixes] wrong price 5 years ago
  julzor aa022d92a8 [text edit] small text edits 5 years ago
  julzor eb6d2e7c11 [fixes] you are not longer forced to get ouside nude after going to the grandmothers sauna with mira and removed some unnecessary code 5 years ago
  julzor 6c0c0358a0 [text edit] small text edit because you can't really go outside if you are already outside 5 years ago
  julzor c595aecaa5 Revert "[text edit] small text edit because you can't really go outside if you are already outside" 5 years ago
  julzor 81d0e47fbe [fixes] removed the duplicate description if sunweather is 0 5 years ago
  julzor 68812df2a2 [text edit] small text edit because you can't really go outside if you are already outside 5 years ago
  KevinSmarts aed267c4b3 [fixes] Typo and using a dynamic where a gosub was more suitable in saunawhore 5 years ago
  KevinSmarts 47a605466f Merge branch 'master' of https://git.catrenelle.com/julzor/glife 5 years ago
  KevinSmarts 685b766afb [changed] Used the $locclass to label the bedrooms and added bedroom selfies using that variable 5 years ago
  julzor dd01244f79 [fixes] variable typo 5 years ago
  julzor 165fc367c0 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  KevinSmarts b9dc034364 [text edit] Typos and grammer mistakes spotted by ChiChi 5 years ago
  KevinSmarts 0be480f214 [fixes] Logic hole plugged in the shower masturbation. 5 years ago
  julzor 8f0104a0bc [fixes] missing end 5 years ago

+ 1 - 1
locations/AndreiHanter.qsrc

@@ -4,7 +4,7 @@ gs 'boystat', 'A172'
 harakBoy = 2
 boyage = npc_dob[$boy]
 boyage = (boyage - boyage mod 10000) / 10000
-
+boyage = year - boyage
 
 '<center><b><font color = maroon>Andrew</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andreihanter.jpg"></center>'

+ 15 - 12
locations/Gadbana.qsrc

@@ -17,6 +17,7 @@ gs 'stat'
 if mira = 0:
 	if $clothingworntype = 'nude':
 		act 'Get dressed':
+			minut += 1
 			gs 'clothing', 'wear_last_worn'
 			gs 'underwear', 'wear'
 			gt 'Gadbana'
@@ -63,11 +64,13 @@ if mira = 0:
 					'You strip, sit down and relax. After a proper banya session, you pick up a bucket filled with cold water and pour it over yourself and head over to the shower. You feel like a completely new person.'
 
 					act 'Get dressed':
+						minut += 1
 						gs 'clothing', 'wear_last_worn'
 						gs 'underwear', 'wear'
 						gt 'Gadbana'
 					end
-					act 'Go outside': minut += 1 & gt 'Gaddvor'
+					
+					act 'Go outside nude': minut += 1 & gt 'Gaddvor'
 				end
 			end
 		else
@@ -86,7 +89,7 @@ if mira = 0:
 
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mit.jpg"></center>'
-		'You lather your body washcloth and start scrubbing your body. You rinse off the soap and start to lather the hair with the shampoo. After rising off the shampoo you are completely clean.'
+		'You lather your body washcloth and start scrubbing your body. You rinse off the soap and start to lather your hair with the shampoo. After rinsing off the shampoo you are completely clean.'
 
 		act 'Leave':gt $loc, $metka
 	end
@@ -251,15 +254,6 @@ else
 			gs 'arousal', 'voyeur', 10
 			gs 'stat'
 			act 'Steam':
-				!{
-				dynamic $showerdin
-				vidageday += 1
-				pcs_mood += 20
-				pcs_health += healthmax/20
-				pcs_skin += 5
-				if pcs_skin >= 20:pcs_skin = 0 & skin += 1
-				}
-				!copy from 40~62, different sauna in Russian.
 				cls
 				dynamic $showerdin
 				pcs_hairbsh = 0
@@ -276,7 +270,16 @@ else
 				gs 'arousal', 'voyeur', 120
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Finish': mira = 0 & gt 'gaddvor'
+				
+				act 'Get dressed':
+					mira = 0
+					minut += 1
+					gs 'clothing', 'wear_last_worn'
+					gs 'underwear', 'wear'
+					gt 'Gadbana'
+				end
+				
+				act 'Go outside nude': mira = 0 & minut += 1 & gt 'Gaddvor'
 			end
 		end
 	end

+ 6 - 6
locations/Gaddvor.qsrc

@@ -44,9 +44,9 @@ if $ARGS[0]='':
 		end
 	end
 	if StoryLine = 1:
-		'A fenced yard behind your grandparents'' house. The yard is surrounded by a small barn packed with junk and a separate building that is used as a banya where you can take a bath. On the back porch there are a few chairs to sit in.'
+		'A fenced yard behind your grandparents'' house. The yard is surrounded by a small barn packed with junk and a separate building that is used as a banya where you can take a bath. On the back porch are a few chairs to sit in.'
 	else
-		'A fenced yard behind the house. The yard is surrounded by a small barn packed with junk and a separate building that is used as a banya where people take a bath. On the back porch there are a few chairs to sit in.'
+		'A fenced yard behind the house. The yard is surrounded by a small barn packed with junk and a separate building that is used as a banya where people take a bath. On the back porch are a few chairs to sit in.'
 	end
 
 
@@ -63,8 +63,8 @@ if $ARGS[0]='':
 
 		if mira_guest = 1: Miraloc = 7 & 'Your friend <a href="exec: gt ''Miroslava'', ''Start''">Mira</a> stands next to you.'
 
-		act 'Enter the barn':minut += 1 & gt 'Gadsarai'
-		act 'Enter garden':minut += 1 & gt'Gadgarden','garden'
+		act 'Go to the barn':minut += 1 & gt 'Gadsarai'
+		act 'Go to the garden':minut += 1 & gt'Gadgarden','garden'
 		if meadow > 0 and hour >= 6 and hour < 20 and month >= 4 and month <= 10:act 'Go to the meadow':minut += 20 & gt 'Meadow', 'start'
 		act '<b>Go to Gadukino</b>':minut += 5 & gt 'gadukino'
 
@@ -95,7 +95,7 @@ if $ARGS[0]='chickens':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/chickens1.jpg"></center>'
 	'Ordinary chickens clucking about their pen.'
-	minut += 5
+	minut += 1
 	gs 'stat'
 
 	!job Granny
@@ -113,7 +113,7 @@ if $ARGS[0]='chickens':
 			act 'Finish':gt'Gaddvor'
 		end
 	end
-	act 'Go': gt'Gaddvor'
+	act 'Leave': gt'Gaddvor'
 end
 !!125e
 

+ 3 - 3
locations/Gadgarden.qsrc

@@ -82,7 +82,7 @@ if $ARGS[0] = 'garden':
 			act 'Finish':gt'Gadgarden','garden'
 	    end    
 	end
-    act 'Go outside':minut += 1 & gt'Gaddvor'
+    act 'Leave':minut += 1 & gt'Gaddvor'
 end	
 
 if $ARGS[0] = 'strawberry':
@@ -151,7 +151,7 @@ if $ARGS[0] = 'strawberry':
 		end
 	end	
 
-	act 'Go':minut += 5 & gt'Gadgarden','garden'
+	act 'Leave':minut += 1 & gt'Gadgarden','garden'
 end	
 
 
@@ -212,7 +212,7 @@ if $ARGS[0] = 'fruit_garden':
 			act 'Finish':gt 'Gadgarden','fruit_garden'   
 		end
 	end	
-	act 'Go':minut += 5 & gt'Gadgarden','garden'
+	act 'Leave':minut += 1 & gt'Gadgarden','garden'
 end	
 
 --- Gadgarden ---------------------------------

+ 1 - 1
locations/Gadsarai.qsrc

@@ -316,7 +316,7 @@ if $ARGS[0] = '':
 		clr
 		gs 'stat'
 
-		act 'Go outside':minut += 1 & gt 'Gaddvor'
+		act 'Leave':minut += 1 & gt 'Gaddvor'
 
 		act 'Poke around in the barn':
 			if grigoryEV > 0 and grigory_barn ! daystart and hour > 8 and hour < 12: gt 'grigory', 'barn'

+ 2 - 2
locations/HanterLoveSex.qsrc

@@ -2915,7 +2915,7 @@ end &! --- din_hanters_sex_dog_bonus1 ---
 if $ARGS[0] = 'din_hanters_sex_dog_bonus2':
 	'<center><H4>Hut</H4></center>'
 	'<center><video autoplay loop src="images/shared/sex/sequence/kotovsexbonus21.mp4"></video></center>'
-	'The two of you hold eachother tightly, <<$boydesc>> supports you as he continues to violently batter away at your hole.'
+	'The two of you hold each other tightly, <<$boydesc>> supports you as he continues to violently batter away at your hole.'
 	*pl
 	gs 'arousal', 'vaginal', 5, 'sub'
 	gs 'stat'
@@ -2947,7 +2947,7 @@ if $ARGS[0] = 'din_hanters_sex_dog':
 	sexa += 1
 	'<center><H4>Hut</H4></center>'
 	'<center><video autoplay loop src="images/shared/sex/vag/doggy/kotovsex1'+rand(0,3)+'.mp4"></video></center>'
-	'<<$boydesc>> pulls you and you are a sexy ass in front of him.'
+	'<<$boydesc>> pulls you closer and you shake your sexy ass in front of him.'
 	*pl
 	gs 'arousal', 'vaginal', 5, 'sub'
 	gs 'stat'

+ 3 - 0
locations/MEastbed.qsrc

@@ -2,6 +2,7 @@
 
 if $ARGS[0] = 'guestB':
     $location_type = 'private'
+	$locclass = 'bedr'
 	cls
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/bedb.jpg"></center>'
@@ -64,6 +65,7 @@ end
 
 if $ARGS[0] = 'guestC':
     $location_type = 'private'
+	$locclass = 'bedr'
 	cls
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/bedc.jpg"></center>'
@@ -123,6 +125,7 @@ end
 
 if $ARGS[0] = 'guestD':
     $location_type = 'private'
+	$locclass = 'bedr'
 	cls
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/bedd.jpg"></center>'

+ 1 - 0
locations/MLanding.qsrc

@@ -1,5 +1,6 @@
 # MLanding
 $location_type = 'private'
+killvar '$locclass'
 
 if $ARGS[0] = 'west':
 	cls

+ 4 - 0
locations/MWestbed.qsrc

@@ -2,6 +2,8 @@
 $location_type = 'private'
 
 if $ARGS[0] = 'master':
+    $location_type = 'private'
+	$locclass = 'bedr'
 	cls
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/masterbed.jpg"></center>'
@@ -56,6 +58,8 @@ if $ARGS[0] = 'master':
 end
 
 if $ARGS[0] = 'guest':
+    $location_type = 'private'
+	$locclass = 'bedr'
 	cls
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/beda.jpg"></center>'

+ 148 - 142
locations/SoniaHome.qsrc

@@ -11,19 +11,21 @@ if $ARGS[0] = 'Aftermath':
 	pcs_sleep += 45
 	cumspclnt = 1
 	gs 'cum_cleanup'
-	pcs_sweat += 5	
+	pcs_sweat += 5
 	minut += 270
 	NikoAftermath = 1
+	$location_type = 'private'
+	$locclass = 'bedr'
 	gs'stat'
 	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/soniawake.jpg"></center>'
-	'You slowly open your eyes, and see Sonia Ivanko holding a weird doll, with a goofy look on her face, causing you to giggle. "Hello sleepy head. Did you sleep well?" You give Sonia a warm smile. "I guess but...Where am I?" Sonia replies, "After what happened at school, we couldn''t just leave you alone, to be abused by the boys, so we brought you back to my house." You scratch your head. "We?" Sonia giggles, as she points to her right. You turn to see Katja Meynold, and Julia Milov sitting on the seats right next to the bed. Katja says, "I''m so glad that you are ok. I was worried when you didn''t wake up after we kept splashed your face with water." Julia adds, "I also cleaned your hair for you."' 
+	'You slowly open your eyes, and see Sonia Ivanko holding a weird doll, with a goofy look on her face, causing you to giggle. "Hello sleepy head. Did you sleep well?" You give Sonia a warm smile. "I guess but...Where am I?" Sonia replies, "After what happened at school, we couldn''t just leave you alone, to be abused by the boys, so we brought you back to my house." You scratch your head. "We?" Sonia giggles, as she points to her right. You turn to see Katja Meynold, and Julia Milov sitting on the seats right next to the bed. Katja says, "I''m so glad that you are ok. I was worried when you didn''t wake up after we kept splashed your face with water." Julia adds, "I also cleaned your hair for you."'
 	*nl
 	'You look around the room then back at Sonia. "Thank you all, for helping me. I can''t believe what happened in school was not a dream. I want it to be a dream, so bad." You can feel tears forming under your eyes. Katja hugs you, as she says, "I don''t know what caused it, but we will find a way to make things better. You didn''t deserve what they did to you." Sonia whispers to herself, "Do any of us?" Julia downcasts her eyes, not knowing how to console Sonia while Katja sighs, "What is going at school these days, first Sonia then <<$pcs_firstname>>. These boys are vicious." You reply, "Yes they are." Julia places her hand on your leg, "<<$pcs_firstname>> what happened exactly?"'
 	'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja.jpg"></center>'
-	
-	act 'Tell them your story':	
+
+	act 'Tell them your story':
 		cls
 		minut += 5
 		gs'stat'
@@ -32,21 +34,21 @@ if $ARGS[0] = 'Aftermath':
 		'You take a deep breath, "It all stared when I met a boy named Nikolai. He..." Katja cuts you off, "Wait, do you mean that gopnik punk, Niko? You can''t trust that loser." Julia nods, "She''s right. That boy is bad news. He is always lying to everyone. Even the other boys know, not to trust him." You look up, surprised by their opinions of Niko. "But he treats me with such love and compassion. He always calls me his princess." Katja places her arms around you neck. "Listen <<$pcs_nickname>>, you can go out with whoever you want. I am just concerned that he will use you." You lay back, as you consider your options, Julia asks, "So how did you end up...naked at school?"'
 		*nl
 		'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/julia.jpg"></center>'	
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/julia.jpg"></center>'
 
-		act 'Continue your story':	
+		act 'Continue your story':
 			cls
 			minut += 5
 			gs'stat'
 			'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja2.jpg"></center>'
-			'"Niko is always teaching me how to be more confident, and daring. He tells me to do things that are very scary at first, but end up being very exciting. I don''t know why it excites me so much, but I feel so alive when I am with Niko. He always makes me feel safe, and he tells me..." Katja cuts you off. "Makes you feel safe? Like how he kept you safe today?" You lower your head, and remain silent, for a few seconds before Katja says, "I''m sorry <<$pcs_firstname>>, I just get so angry when I see good people getting used by assholes like him. Continue your story, please."' 
+			'"Niko is always teaching me how to be more confident, and daring. He tells me to do things that are very scary at first, but end up being very exciting. I don''t know why it excites me so much, but I feel so alive when I am with Niko. He always makes me feel safe, and he tells me..." Katja cuts you off. "Makes you feel safe? Like how he kept you safe today?" You lower your head, and remain silent, for a few seconds before Katja says, "I''m sorry <<$pcs_firstname>>, I just get so angry when I see good people getting used by assholes like him. Continue your story, please."'
 			*nl
 			'You take a second before continuing your story. "He helps me find my confidence, and break out of my safety bubble. I''m alway trying something new, and facing my fears. I...I just don''t know what to do without him. Niko always guides me in bettering myself, and feeling so alive." Sonia places her hand on your shoulder, "If Niko is the one in your heart then stay with him..." Katja immediately cuts Sonia off, "Stay with that freak who striped her down, and let those gopnik punks, rape her?" Julia calms her. "We might not like him, but it is <<$pcs_firstname>>''s decision, and we can''t control her. We can only give her our advice, and hope that she makes the right decision, on her own."'
 			'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/julia.jpg"></center>'	
-			
-			act 'Continue':	
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/julia.jpg"></center>'
+
+			act 'Continue':
 				cls
 				gs'stat'
 				'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
@@ -54,10 +56,10 @@ if $ARGS[0] = 'Aftermath':
 				'You lightly grip your hair, as you respond, "I just...need to think about this, for a while." Sonia stands up, and says, "Well I''ll make us something to eat, I hope you all have a sweet tooth." Sonia then walks to the door then motions the other girls to follow her. Katja gets up then tells you, "I''m sorry that I have been a bit stern, I just don''t want to see what happened today repeat itself. When you finish resting then come see me ok? We can have a nice chat together, and don''t worry, I won''t lecture you again." Julia adds, "Come see me too, I would like to speak with you. Now get some rest." The girls leave the room, and you lay down then close your eyes...'
 				'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja.jpg"></center>'
-				
+
 				act 'Rest':gt 'NikoDreams', 'Woods'
 			end
-		end	
+		end
 	end
 end
 
@@ -71,35 +73,37 @@ if $ARGS[0] = 'Aftermath 2':
 	gs'stat'
 	'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja.jpg"></center>'
-	'You quickly jump up, and see Katja with a concerned look on her face. "It''s ok <<$pcs_firstname>>. You were just having a bad dream." You look around the room, trying to get your bearings then turn to Katja, "Thank you Katja, I hope this doesn''t become a habit." Katja rubs your forehead, as she responds,"Everything will be alright. Don''t worry." You giggle when you notice the goofy doll that Sonia had was tucked in right next to you. Katja responds, "Now that''s what I like to see, a fresh smile."' 
+	'You quickly jump up, and see Katja with a concerned look on her face. "It''s ok <<$pcs_firstname>>. You were just having a bad dream." You look around the room, trying to get your bearings then turn to Katja, "Thank you Katja, I hope this doesn''t become a habit." Katja rubs your forehead, as she responds,"Everything will be alright. Don''t worry." You giggle when you notice the goofy doll that Sonia had was tucked in right next to you. Katja responds, "Now that''s what I like to see, a fresh smile."'
 	*nl
 	'You both giggle before Katja tells you, "Sonia should be done soon making whatever she''s cooking in there. Every time I ask, the only reply she gives me is: "All in good time." So I guess that it''s a mystery. You should wash up in the shower before we eat because Sonia told me that she wants us out before her mother gets home. You should also speak with Julia. She seems very worried about you." You give Katja a nod, as you climb out of bed.'
 
 	act 'Get up':gt 'SoniaHome', 'Hallway'
-end	
+end
 
-if $ARGS[0] = 'Hallway':	
+if $ARGS[0] = 'Hallway':
 	cls
 	if NikoAftermath = 0:minut += 5
+	$location_type = 'private'
+	killvar '$locclass'
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/hallway.jpg"></center>'
-	'This is the central hallway that connect the house. There is a lot of artwork on the walls, and the house smells lovely.'	
+	'This is the central hallway that connect the house. There is a lot of artwork on the walls, and the house smells lovely.'
 	if VKSoniaChat = 1 and SoniaCupcake = 2 and NikoAftermath = 1:
 		'<a href="exec:gt ''SoniaHome'', ''Sonia Chat''">Sonia</a> is standing next to the front door, as she adjusts her bra.'
 		'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/sonia.jpg"></center>'		
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/sonia.jpg"></center>'
 	elseif VKSoniaChat = 2 and SoniaCupcake = 2 and VKJuliaChat < 4 and NikoAftermath = 1:
 		'<a href="exec:gt ''SoniaHome'', ''Sonia Chat 2''">Sonia</a> is standing next to the front door, as she browses the web, on her phone.'
 		'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/sonia.jpg"></center>'	
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/sonia.jpg"></center>'
 	elseif VKJuliaChat = 4 and NikoAftermath = 1:
 		'Sonia is standing next to the front door, as she browses the web, on her phone.'
 		'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/sonia.jpg"></center>'		
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/sonia.jpg"></center>'
 	end
-	
+
 	act 'Bedroom':gt 'SoniaHome', 'Bedroom'
-	
+
 	act 'Kitchen':
 		if SoniaCupcake = 0 and NikoAftermath = 1:
 			gt 'SoniaHome', 'Sonia Cooking'
@@ -108,17 +112,19 @@ if $ARGS[0] = 'Hallway':
 		else
 			gt 'SoniaHome', 'Kitchen'
 		end
-	end	
+	end
 
 	act 'Livingroom':gt 'SoniaHome', 'Livingroom'
-end	
+end
 
-if $ARGS[0] = 'Bedroom':	
+if $ARGS[0] = 'Bedroom':
 	cls
 	$metka = 'Bedroom'
 	$loc = 'SoniaHome'
 	$metkaM = 'Bedroom'
-	$locM = 'SoniaHome'	
+	$locM = 'SoniaHome'
+	$location_type = 'private'
+	$locclass = 'bedr'
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/bedroom/bedroom.jpg"></center>'
 	'Sonia has such a cute bedroom, so clean and well organized. Sonia has an expensive standing <a href="exec:gt ''mirror'', ''start''">mirrors</a>, and she even has a packed <a href="exec:gt ''SoniaHome'', ''Shoe Closet''">shoe closet</a>.'
@@ -128,65 +134,65 @@ if $ARGS[0] = 'Bedroom':
 		'<a href="exec:gt ''SoniaHome'', ''Katja Chat''">Katja</a> is standing in front of a mirror, tweezing her eyes brows while humming a soothing tune.'
 	elseif SoniaCupcake = 2 and VKKatjaChat = 1 and NikoAftermath = 1:
 		'<a href="exec:gt ''SoniaHome'', ''Katja Chat 2''">Katja</a> is laying on the bed while humming a sweet melody.'
-	end	
-	
+	end
+
 	act 'Sonia Bathroom':
 		if VKKatjaChat = 0 and NikoAftermath = 1:
 			gt 'SoniaHome', 'Katja Chat'
 		elseif VKSoniaChat = 0 or VKJuliaChat = 0 and NikoAftermath = 1:
 			gt 'SoniaHome', 'Katja Reminder'
-		else	
+		else
 			gt 'SoniaHome', 'Sonia Bathroom'
-		end	
-	end	
-	
+		end
+	end
+
 	act 'Leave room':gt 'SoniaHome', 'Hallway'
-end	
+end
 
-if $ARGS[0] = 'Sonia Cooking':	
+if $ARGS[0] = 'Sonia Cooking':
 	cls
 	gs'stat'
 	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/kitchen/soniacupcake1.jpg"></center>'
 	if VKSoniaChat = 1:
 		'As soon, as you enter the kitchen Sonia shoos you away. "No peeking. It will be ready when it''s ready. Be patient."'
-	else			
+	else
 		'You walk into the kitchen, and smell something lovely, Sonia notices you enter then stands in front of a tray while saying, "Hey no peeking!" She giggles before saying, "I''m glad that you rested well, I am making us a special treat, and it won''t be ready for another 20 minutes, so why don''t you jump in the shower, and get washed up? I should be done by then." You give Sonia a warm smile as you walk out of the kitchen.'
 	end
 
 	act 'Leave':VKSoniaChat = 1 & gt 'SoniaHome', 'Hallway'
-end	
+end
 
-if $ARGS[0] = 'Cupcake Time':	
+if $ARGS[0] = 'Cupcake Time':
 	cls
 	minut += 15
 	pcs_health += 10
-	pcs_willpwr += 25	
+	pcs_willpwr += 25
 	pcs_mood += 25
 	pcs_energy += 40
 	pcs_hydra += 40
 	fat += 2
-	cumspclnt = 2		
+	cumspclnt = 2
 	gs'stat'
 	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/kitchen/soniacupcake2.jpg"></center>'
 	'You walk into the kitchen, as Katja, and Juila enter. You all take a seat at the table just as Sonia approaches with a tray of cupcakes. Katja says, "So.. cupcakes were your secret treat." Sonia responds, "Sometimes the most simple treat, can be the greatest surprise." Julia takes a bite of a cupcake then responds, "Thank you Sonia. These cupcakes are so tasty." Sonia nods with a warm smile on her face. "I''m glad that you like them. now eat up everyone." You all spend the next 15 minutes, eating cupcakes while chatting about various topics.'
-	
+
 	act 'Finish eating':
 		cls
 		SoniaCupcake = 2
 		gs'stat'
 		'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja2.jpg"></center>'	
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja2.jpg"></center>'
 		'After you all finish your cupcakes, Katja stands up and says, "I had a great time but it''s getting late. I better get going. I''m going to use the restroom before I go." Katja walks out of the room as she waves at everyone. Julia gets up next and says, "We should get going too <<$pcs_firstname>>. Sonia''s mom should be coming home soon, and we''d only disturb her." Sonia nods, as she responds, "I''ll be waiting by the front door when you are ready to go, and before you go, can you do me a favor and make sure that Katja doesn''t use all my hair care products. I told her she can use some, but that girl keeps "Sampling" each one." Julia adds, "When you have a moment please see me in the living room. I have something I would like to ask you." You nod at Julia, as she, and Sonia walk out of the kitchen.'
 		'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/soniasmile.jpg"></center>'	
-		
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/soniasmile.jpg"></center>'
+
 		act 'Stand up':gt 'SoniaHome', 'Kitchen'
-	end	
-end	
+	end
+end
 
-if $ARGS[0] = 'Kitchen':	
+if $ARGS[0] = 'Kitchen':
 	cls
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/kitchen/kitchen.jpg"></center>'
@@ -195,11 +201,11 @@ if $ARGS[0] = 'Kitchen':
 	else
 		'Sonia''s kitchen is nice, and clean with plenty of potted plants, and other decorations.'
 	end
-	
+
 	act 'Hallway':gt 'SoniaHome', 'Hallway'
-end		
-				
-if $ARGS[0] = 'Livingroom':	
+end
+
+if $ARGS[0] = 'Livingroom':
 	cls
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/livingroom/livingroom.jpg"></center>'
@@ -217,45 +223,45 @@ if $ARGS[0] = 'Livingroom':
 		'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/livingroom/julia3.jpg"></center>'
 	end
-	
+
 	act 'Hallway':gt 'SoniaHome', 'Hallway'
-end		
-					
-if $ARGS[0] = 'Sonia Bathroom':	
+end
+
+if $ARGS[0] = 'Sonia Bathroom':
 	cls
 	$metka = 'Sonia Bathroom'
 	$loc = 'SoniaHome'
 	$metkaM = 'Sonia Bathroom'
 	$locM = 'SoniaHome'
-	$location_type = 'Sonia Bathroom'		
+	$location_type = 'bathroom'
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/bathroom/bathroom.jpg"></center>'
 	'This bathroom is very clean, and well organized with a sink, a <a href="exec:gt ''mirror'', ''start''">mirror</a>, and a shower.'
-	
+
 	if SoniaCupcake = 0 and NikoAftermath = 1:
 		act 'Take a shower':SoniaCupcake = 1 & gt 'SoniaHome', 'Sonia Shower'
 	elseif NikoAftermath = 0:
 		act 'Take a shower':gt 'SoniaHome', 'Sonia Shower'
 	end
-	
+
 	act 'Bedroom':gt 'SoniaHome', 'Bedroom'
 end
 
-if $ARGS[0] = 'Sonia Shower':	
-	cls	
+if $ARGS[0] = 'Sonia Shower':
+	cls
 	pcs_hairbsh = 0
 	pcs_makeup = 1
 	minut += 20
 	cumspclnt = 1
 	gs 'cum_cleanup'
-	if sweat > 14: sweat = 10 + rand(0,4)	
+	if sweat > 14: sweat = 10 + rand(0,4)
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bathroom/shower/wash.jpg"></center>'
 	'You climb into the shower, and begin lathering your body, cleaning yourself, as thoroughly, as possible before turning off the water. You grab a spare towel, and begin drying yourself off before getting dressed then leaving the bathroom.'
-	
+
 	act 'Bedroom':gt 'SoniaHome', 'Bedroom'
-end	
-				
+end
+
 if $ARGS[0] = 'Shoe Closet':
 	cls
 	if SoniaShoesDay ! daystart:pcs_mood += 20 & SoniaShoesDay = daystart
@@ -264,27 +270,27 @@ if $ARGS[0] = 'Shoe Closet':
 	'Sonia has so many shoes. She must be very wealthy, and everything is so well organized. I wonder which is her favorite pair of heels.'
 
 	act 'Walk away':gt 'SoniaHome', 'Bedroom'
-end	
+end
 
-if $ARGS[0] = 'Sonia Chat':	
-	cls	
+if $ARGS[0] = 'Sonia Chat':
+	cls
 	VKSoniaChat = 2
 	gs'stat'
 	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/sonia.jpg"></center>'
-	'As you are approaching Sonia, she looks up from her phone then flashes you a warm smile, as she says, "I hope that you are holding up alright. I remember the time at the disco. I was so terrified when I got home, and the next day at school was...terrible. All of my friends turned on me. No one lent me a hand, or even cared about what happened to me. Imagine losing all of your friends overnight. I made sure that same didn''t happen to you. At least you will still have some of your friends to support you." You lightly grab onto Sonia''s arm, as you feel tears dripping down your cheeks. "Thank you Sonia. I''m...I''m so sorry for not helping you at the disco. I was so scared of the boys, and...I was a coward." Sonia brushes your tears away.' 
+	'As you are approaching Sonia, she looks up from her phone then flashes you a warm smile, as she says, "I hope that you are holding up alright. I remember the time at the disco. I was so terrified when I got home, and the next day at school was...terrible. All of my friends turned on me. No one lent me a hand, or even cared about what happened to me. Imagine losing all of your friends overnight. I made sure that same didn''t happen to you. At least you will still have some of your friends to support you." You lightly grab onto Sonia''s arm, as you feel tears dripping down your cheeks. "Thank you Sonia. I''m...I''m so sorry for not helping you at the disco. I was so scared of the boys, and...I was a coward." Sonia brushes your tears away.'
 	*nl
-	'"Don''t worry, there was nothing you could do anyway. I have come to terms with my situation, and even have fun sometimes. Everyone likes to be in control of their body, and make all choices themself, but sometimes letting someone else make choices for you, can lead to a much simpler, and exciting life. I never know what tomorrow will bring. That is why I believe that if you want to truly live your life then you need to throw caution to the wind, and accept any opportunities that come your way." You nod, as you reply, "I think I understand, By letting someone else choose my path then I can make things easier for me, and I will have the freedom to sleep with anyone I want, without worry of my reputation being ruined."' 
+	'"Don''t worry, there was nothing you could do anyway. I have come to terms with my situation, and even have fun sometimes. Everyone likes to be in control of their body, and make all choices themself, but sometimes letting someone else make choices for you, can lead to a much simpler, and exciting life. I never know what tomorrow will bring. That is why I believe that if you want to truly live your life then you need to throw caution to the wind, and accept any opportunities that come your way." You nod, as you reply, "I think I understand, By letting someone else choose my path then I can make things easier for me, and I will have the freedom to sleep with anyone I want, without worry of my reputation being ruined."'
 	*nl
 	'Sonia nods, "Exactly, living a life of freedom, and mystery with no fear of ever being bored." You think to yourself, <font color=#FF00FF>With Niko, I can live this life. A life of freedom and excitement. By destroying my reputation Niko may have freed me from my shackles. I have really enjoyed being fucked by all those boys. I just didn''t know it at the time. This could be my new life.</font> You smile, as you say, "Thank you again Sonia, I have much to think about." Sonia replies, "I''m sure you do."'
 	'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
-	*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'	
-	
+	*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
+
 	act 'Walk away':gt 'SoniaHome', 'Hallway'
-end	
+end
 
-if $ARGS[0] = 'Sonia Chat 2':	
-	cls	
+if $ARGS[0] = 'Sonia Chat 2':
+	cls
 	gs'stat'
 	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/sonia.jpg"></center>'
@@ -292,71 +298,71 @@ if $ARGS[0] = 'Sonia Chat 2':
 		'You walk up to Sonia, and she flashes you a warm smile. "So are you ready to go or would you like to talk to the other girls before leaving?"'
 		act 'Stay to chat with Julia, and Katja':gt 'SoniaHome', 'Hallway'
 		act 'Leave house':gt 'SoniaHome', 'Sonia Goodbye'
-	else	
+	else
 		'You walk up to Sonia, and she flashes you a warm smile. "So are you ready to go?"'
 		act 'Not yet':gt 'SoniaHome', 'Hallway'
-		act 'I''m ready':gt 'SoniaHome', 'Sonia Goodbye'		
+		act 'I''m ready':gt 'SoniaHome', 'Sonia Goodbye'
 	end
-end	
+end
 
-if $ARGS[0] = 'Sonia Goodbye':	
-	cls	
+if $ARGS[0] = 'Sonia Goodbye':
+	cls
 	if grupTipe[61] = 4:grupTipe[61] = 600
 	gs'stat'
 	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/soniasmile.jpg"></center>'
 	'You walk out of the door, as Sonia says, "Don''t forget what I said earlier. Whatever makes you happier, is the path you should follow. what''s the point of living a boring life?" You nod at Sonia, "Thank you for everything Sonia. I owe you all so much." Sonia replies, "It was no trouble at all. Goodbye <<$pcs_firstname>>." Sonia then closes the door.'
-	
+
 	act 'Walk toward town':NikoAftermath = 0 & gt 'pavResidential'
-end	
+end
 
-if $ARGS[0] = 'Katja Chat':	
-	cls	
+if $ARGS[0] = 'Katja Chat':
+	cls
 	gs'stat'
 	'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja2.jpg"></center>'
 	if VKKatjaChat = 0:
 		pcs_makeup = 3
-		'As you approach Katja, she waves you over. You stand next to her before she walks around you while keeping her eyes on the mirror. "Let''s gussy you up." Katja reaches into her hand bag then takes out her compact makeup case. She pulls out her brush then begins applying some makeup on you, for a few seconds before saying, "Look at that pretty girl in the mirror. Isn''t she lovely?" You reply, "I agree, she is so pretty, but what about me?" Katja smirks, as she places her fingertip on your nose. "I was referring to you, silly." You both giggle before Katja asks, "So, how are you holding up?" You reply, "I have a lot to think about." Katja responds, "Make sure that you take your time, and think carefully about your future because one wrong decision, can go a long way." You sarcastically reply, "Tell me about it." Katja lightly squeezes your shoulders,' 
+		'As you approach Katja, she waves you over. You stand next to her before she walks around you while keeping her eyes on the mirror. "Let''s gussy you up." Katja reaches into her hand bag then takes out her compact makeup case. She pulls out her brush then begins applying some makeup on you, for a few seconds before saying, "Look at that pretty girl in the mirror. Isn''t she lovely?" You reply, "I agree, she is so pretty, but what about me?" Katja smirks, as she places her fingertip on your nose. "I was referring to you, silly." You both giggle before Katja asks, "So, how are you holding up?" You reply, "I have a lot to think about." Katja responds, "Make sure that you take your time, and think carefully about your future because one wrong decision, can go a long way." You sarcastically reply, "Tell me about it." Katja lightly squeezes your shoulders,'
 		*nl
 		'"No one can change who you are beside you. Remember that. Anyway you should take a shower before Sonia finishes making her "Secret Treat." That she won''t tell me about. You would think that she is preparing human flesh...You don''t think...?" You poke Katja in her arm as you reply, "Oh stop." She giggles, as she pulls out her tweezers then begins plucking her eyebrows while telling you, "Oh, by the way, Julia wanted to speak to you, she seems very worried about you. She is such a sweet girl. It''s a shame that she isn''t more talkative in school." You reply, "I agree. I will go speak with her." You then give Katja a nod before stepping away.'
 		'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
-		*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'		
+		*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 		act 'Walk away':VKKatjaChat = 1 & gt 'SoniaHome', 'Bedroom'
 	else
 		'You approach Katja and she continues tweezing her eyebrow as she tells you, "You should talk to Julia then shower before Sonia''s mom gets home. You also check up on Sonia. I''m sure that she will be glad to see you walking around." You nod as you walk toward the hallway.'
 		act 'Walk away':gt 'SoniaHome', 'Hallway'
-	end	
-end	
+	end
+end
 
-if $ARGS[0] = 'Katja Chat 2':	
-	cls	
+if $ARGS[0] = 'Katja Chat 2':
+	cls
 	VKKatjaChat = 2
 	gs'stat'
 	'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja.jpg"></center>'
 	'You sit down next to Katja, and she turns to you. "I know that I said that I wouldn''t lecture you, but that boy Niko is not what he seems. He doesn''t care about you, he is just trying to use you. I only tell you this because I care about you. Don''t let this punk corrupt you." You look at your feet whie you consider what she said. Katja begins rubbing on your shoulders, "You can do better then him <<$pcs_firstname>>. Don''t let him trick you into believing otherwise. I just needed to tell you that before I left. Please stay safe <<$pcs_firstname>>. You are too good a girl to be used like that." Katja gets up then waves goodbye, as she walks out of the bedroom.'
-	
+
 	act 'Walk away':gt 'SoniaHome', 'Bedroom'
-end	
+end
 
-if $ARGS[0] = 'Katja Reminder':	
-	cls	
+if $ARGS[0] = 'Katja Reminder':
+	cls
 	gs'stat'
 	'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja.jpg"></center>'
 	'As you approach the bathroom door, Katja turns to you then says, "Have you spoken to Julia and Sonia? They were both worried about you, and would love to see you up and about." You reply, "I haven''t yet but I will visit them right now. i wouldn''t want to leave them to worry about me." You turn around, and walk away.'
-		
+
 	act 'Walk away':gt 'SoniaHome', 'Bedroom'
-end	
+end
 
-if $ARGS[0] = 'Julia Chat':	
-	cls	
+if $ARGS[0] = 'Julia Chat':
+	cls
 	gs'stat'
 	'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
 	if VKJuliaChat = 0:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/livingroom/julia3.jpg"></center>'
-		'As soon as you approach, Julia turns to you before flashing you a smile. "<<$pcs_firstname>> you''re up. How are you feeling?" You return the smile, as you reply, "I''m feeling much better. i hope I didn''t worry you." Julia giggles before replying, "I''m just glad that you''re ok. I have never seen anyone go through as much as you did today, but I''m sure everything will work out in the end." You reply, "I can only hope." Julia responds, "Try not to let things get to you." You reply, "Don''t worry I won''t." Julia says, "Good, I will always be around, if you want to talk."' 
+		'As soon as you approach, Julia turns to you before flashing you a smile. "<<$pcs_firstname>> you''re up. How are you feeling?" You return the smile, as you reply, "I''m feeling much better. i hope I didn''t worry you." Julia giggles before replying, "I''m just glad that you''re ok. I have never seen anyone go through as much as you did today, but I''m sure everything will work out in the end." You reply, "I can only hope." Julia responds, "Try not to let things get to you." You reply, "Don''t worry I won''t." Julia says, "Good, I will always be around, if you want to talk."'
 		*nl
 		'You respond, "Thank you, for everything you all have done for me. I shutter to think of what would have happened to me, if you weren''t around." Julia replies with a warm smile before saying, "You are very welcome. Now you should take a relaxing shower before Sonia finishes with her treats."'
 		act 'Walk away':VKJuliaChat = 1 & gt 'SoniaHome', 'Livingroom'
@@ -365,17 +371,17 @@ if $ARGS[0] = 'Julia Chat':
 		'When you approach Julia, she says, "Is there something else you need?" You reply, "I just wanted to know where the bathroom is." Julia points toward the bedroom. "Sonia''s bathroom is in her bedroom...I wish I had a bathroom in my bedroom." You reply, "As do I." You both giggle before you walk back into the hallway.'
 		act 'Walk away':gt 'SoniaHome', 'Hallway'
 	end
-end	
+end
 
-if $ARGS[0] = 'Julia Chat 2':	
-	cls	
+if $ARGS[0] = 'Julia Chat 2':
+	cls
 	gs'stat'
 	'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/livingroom/julia2.jpg"></center>'
 	'As you approach Julia, she asks, "How did you like the cupcakes? I found them very tasty." You reply, "They were super yummy, Sonia could win a cooking contest, if we had those, that is." Julia giggles before asking, "We are going to be leaving in a bit, and I wanted to ask you...Would you like to walk home with me?"'
 
 	act 'I would love too':
-		cls	
+		cls
 		VKJuliaChat = 4
 		gs'stat'
 		'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
@@ -383,67 +389,67 @@ if $ARGS[0] = 'Julia Chat 2':
 		'Julia''s eyes light up, as she responds, "Great are you ready to head out now or would you like to speak to Sonia, or Katja first?"'
 
 		act 'Stay to chat with Sonia, and Katja':gt 'SoniaHome', 'Livingroom'
-		
+
 		act 'Leave house with Julia':gt 'SoniaHome', 'Julia Walk'
-	end	
-	
+	end
+
 	act 'I can''t right now':
-		cls	
+		cls
 		VKJuliaChat = 3
 		gs'stat'
 		'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/livingroom/julia2.jpg"></center>'	
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/livingroom/julia2.jpg"></center>'
 		'"I would love too, but I have other places I need to be today, maybe next time." Julia lowers her head, "Ok I guess...Just stay safe <<$pcs_firstname>>. I...I''m concerned for you." You reply, "That is really sweet Julia, but I''m fine." Julia responds, "I''m glad to hear that. Goodbye <<$pcs_firstname>>." Julia then walks out of the house while giving both, you, and Sonia a friendly smile.'
-		
+
 		act 'Wave goodbye':gt 'SoniaHome', 'Livingroom'
-	end	
-end	
+	end
+end
 
-if $ARGS[0] = 'Julia Chat 3':	
-	cls	
+if $ARGS[0] = 'Julia Chat 3':
+	cls
 	gs'stat'
 	'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/livingroom/julia2.jpg"></center>'
 	'As you walk up to Julia, she asks, "Would you like to leave now?"'
 
 	act 'Leave house with Julia':gt 'SoniaHome', 'Julia Walk'
-	
+
 	act 'Not yet':gt 'SoniaHome', 'Livingroom'
-end	
+end
 
-if $ARGS[0] = 'Julia Walk':	
-	cls	
+if $ARGS[0] = 'Julia Walk':
+	cls
 	minut += 5
 	NikoAftermath = 0
 	gs'stat'
 	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/soniasmile.jpg"></center>'
 	'You, and Julia begin walking toward the front door. Sonia asks, "Are you two ready to head out?" You both nod simultaneously as Sonia holds the door open for you. As you are walking past Sonia, she leans forward then whispers in your ear, "Don''t forget what I said earlier. Whatever makes you happier, is the path you should follow. What''s the point of living a boring life?" She then gives you a wink, as you and Julia head into town.'
-	
+
 	act 'Continue walking':
-		cls	
+		cls
 		gs'stat'
 		'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/love/park/julia1.jpg"></center>'
-		'You and Julia continue walking in silence until you begin walking past the park when Julia asks, "Would you like to stop by the park?"'	
+		'You and Julia continue walking in silence until you begin walking past the park when Julia asks, "Would you like to stop by the park?"'
 
 		act 'Sure':gt 'SoniaHome', 'Julia Park'
-		
-		act 'It''s getting too late':			
-			cls	
+
+		act 'It''s getting too late':
+			cls
 			minut += 10
 			gs'stat'
 			'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/love/sad1.jpg"></center>'
-			'Julia lowers her head, "Oh, ok then, sorry for asking." You both walk home in silence. When you reach your door Julia says, "Stay safe <<$pcs_firstname>>, and remember to do whatever you feel is right. Goodbye." You wave goodbye to Julia, as she walks away.'	
+			'Julia lowers her head, "Oh, ok then, sorry for asking." You both walk home in silence. When you reach your door Julia says, "Stay safe <<$pcs_firstname>>, and remember to do whatever you feel is right. Goodbye." You wave goodbye to Julia, as she walks away.'
 
 			act 'Enter your apartment':gt 'korrPar'
 		end
-	end	
-end	
+	end
+end
 
-if $ARGS[0] = 'Julia Park':	
-	cls	
+if $ARGS[0] = 'Julia Park':
+	cls
 	minut += 5
 	gs'stat'
 	'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
@@ -454,48 +460,48 @@ if $ARGS[0] = 'Julia Park':
 		'"I..um..care for you, I..." Julia remains silent for a few seconds, as she rubs her arm while staring at the ground, in front of her.'
 		act 'Kiss her':VKJuliaKiss = 1 & gt 'SoniaHome', 'Julia Kiss'
 		act 'Change subject':gt 'SoniaHome', 'Julia Park 2'
-	else	
+	else
 		'"I just couldn''t leave you like that. You looked so scared, and helpless. I needed to help in any way I can." You place your hand on her knee, "Thank you Julia. You saved me." Julia''s face grows red, as she replies, "I didn''t do it alone, but you''re welcome." Julia gives you a meek smile.'
 		act 'Continue talking':gt 'SoniaHome', 'Julia Park 2'
-	end	
-end	
+	end
+end
 
-if $ARGS[0] = 'Julia Park 2':	
-	cls	
+if $ARGS[0] = 'Julia Park 2':
+	cls
 	minut += 15
 	gs'stat'
 	'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/12.jpg"></center>'
 	'You, and Julia continue chatting for a few minutes before Julia looks at her phone then says, "Wow, I can''t believe it gotten so late. We should really get home." You both walk home.  When you reach your door Julia says, "Stay safe <<$pcs_firstname>>, and remember to follow your heart. Have a good night." You then wave goodbye to Julia, as she walks away.'
-	
+
 	act 'Enter your apartment':gt 'korrPar'
-end	
+end
 
 if $ARGS[0] = 'Julia Kiss':
-	cls	
+	cls
 	gs'stat'
-	'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/julia/love/kiss1.mp4"></video></center>'	
+	'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/julia/love/kiss1.mp4"></video></center>'
 	'You place your hand on Julia''s cheek then gently pull her face to yours. You both share a passionate kiss for what feels like two minutes. After you finish, you both stare into each others eyes, as you whisper to her, "Thank you for saving me Julia. i will never forget what you have done for me." Julia''s face is very red, as she replies, "I would do anything for you. You only need to ask." You reply, "You''re so sweet Julia, and I am so lucky to have you." Julia gives you a trembling smile before she quickly darts forward, giving you another passionate kiss.'
 	*nl
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/julia/love/park/kiss1.mp4"></video></center>'
 	gs 'arousal', 'kiss', 5
-	gs'stat'	
-							
+	gs'stat'
+
 	act 'Finish kissing':
-		cls	
+		cls
 		gs'stat'
 		'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/love/park/julia1.jpg"></center>'	
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/love/park/julia1.jpg"></center>'
 		'After a long passionate kiss, Julia begins giggling playfully then checks her phone before saying, "It''s getting late, maybe we should start heading home." You reply, "Sure, let''s walk home." As you are walking home, Julia wraps her fingers around yours then gives you an innocent smile. When you arrive at your apartment, Julia says, "Please stay safe <<$pcs_firstname>>, I care for you so much... Just remember to follow your heart, and I''m sure that everything will work out for you. Have a good night." Julia then gives you a soft kiss before walking away while looking back at you with an innocent smile.'
 		*nl
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/julia/love/kiss1.mp4"></video></center>'
 		gs 'arousal', 'kiss', 10
 		gs 'arousal', 'end'
-		gs'stat'	
-							
+		gs'stat'
+
 		act 'Enter your apartment':gt 'korrPar'
-	end	
-end		
+	end
+end
 
 --- SoniaHome ---------------------------------
 

+ 4 - 0
locations/VolkovHome.qsrc

@@ -5,6 +5,8 @@ if $ARGS[0] = 'Niko Bedroom':
 	$metka = 'Niko Bedroom'
 	$loc = 'VolkovHome'
 	minut += 5
+	$location_type = 'private'
+	$locclass = 'bedr'
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/volkovhome/rooms/niko/bedroom.jpg"></center>'
 	'Niko''s room is very messy with two lamps, a bed, and various electronics scattered around.'
@@ -17,6 +19,8 @@ if $ARGS[0] = 'Hallway 2':
 	$metka = 'Niko Bedroom'
 	$loc = 'VolkovHome'
 	minut += 5
+	$location_type = 'private'
+	killvar '$locclass'
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/volkovhome/rooms/hallway2.jpg"></center>'
 	if NikoEv = 18:

+ 3 - 0
locations/anushapt.qsrc

@@ -132,6 +132,7 @@ if $ARGS[0] = 'home':
 end
 
 if $ARGS[0] = 'hallway':
+	killvar '$locclass'
 	CLOSE ALL
 	if sound = 0:PLAY 'sound/korr.mp3',30
 	$location_type = 'indoors'
@@ -254,6 +255,7 @@ if $ARGS[0] = 'bathroom':
 end
 
 if $ARGS[0] = 'anushroom':
+	$locclass = 'bedr'
 	CLOSE ALL
 	$track_loop = ''
 	music_loop = 1
@@ -593,6 +595,7 @@ end
 if $ARGS[0] = 'bed':
 	cla
 	*clr
+	gs 'stat'
 	if AnushkaLoc = 2:
 		'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/nushbed.jpg"></center>'
 		'Anushka sits on her bed and waves you over to sit next to her. You quickly jump up on the bed next to her.'

+ 1 - 1
locations/barbershop.qsrc

@@ -1078,7 +1078,7 @@ if $ARGS[0] = 'dyehair':
 			gs 'stat'
 			'"I want to try something really different." you tell him.'
 			'"And what would that be?" Mr. Syomin asks cheerfully.'
-			'"IA nice dark purple, like a dark wine." you announce.'
+			'"I want it nice dark purple, like a dark wine." you announce.'
 			'"As you wish, although I''ve not done too many like that. Please have a seat.", he says and turns around one of the chairs for you.'
 
 			act 'Sit down':

+ 1 - 0
locations/bedrPar2.qsrc

@@ -7,6 +7,7 @@ if $ARGS[0] = '':
 	$metka = $ARGS[0]
 	$loc = $CURLOC
     $location_type = 'private'
+	$locclass = 'bedr'
 	clr
 	minut += 1
 	gs 'stat'

+ 6 - 3
locations/bicycle.qsrc

@@ -11,9 +11,12 @@ if $ARGS[0] = 'sarai':
 	!gs'time'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel.jpg"></center>'
-	'You notice an old bike. But it looks like being in a good condition, you can probably ride it without any trouble.'
-	if sunWeather = 0:'You notice an old bike. You would love to take a ride with it but you decide not to while it''s raining.'
-
+	if sunWeather = 0:
+		'You notice an old bike. You would love to take a ride with it but you decide not to while it''s raining.'
+	else
+		'You notice an old bike. It looks like it''s still in a good condition, you can probably ride it without any trouble.'
+	end
+		
 	if hour >= 6 and hour <= 20 and sunWeather = 1 and month >= 4 and month <= 10:
 		if findvelday ! daystart:
 			act 'Ride the bike (1:00)':

+ 5 - 0
locations/dimaHome.qsrc

@@ -125,6 +125,7 @@ end
 
 if $ARGS[0] = 'hallway2':
 	$location_type = 'indoors'
+	killvar '$locclass'
 	cls
 	minut += 1
 	gs 'stat'
@@ -219,6 +220,7 @@ end
 if $ARGS[0] = 'dimkaparents':
 	*clr & cla
 	minut += 1
+	$locclass = 'bedr'
 	gs 'stat'
 	'<center><b><font color = maroon>Dimka''s parent''s room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/parentsroom.jpg"></center>'
@@ -238,6 +240,7 @@ if $ARGS[0] = 'dimkaparents':
 		$loc = 'dimaHome'
 		$metkaM = 'bathroom'
 		$locM = 'dimaHome'
+		killvar '$locclass'
 		gs 'stat'
 		$location_type = 'bathroom'
 		'<center><h4><font color="maroon">Master bathroom</font></h4></center>'
@@ -284,6 +287,8 @@ end
 if $ARGS[0] = 'guest':
 	cls
 	minut += 1
+	$locclass = 'bedr'
+	gs 'stat'
 	'<center><h4><font color="maroon">Guest Room</font></h4></center>'
 	'<center><img  src="images/locations/pavlovsk/resident/dimkahome/guestroom.jpg"></center>'
 	'You enter the guest bedroom and it just as clean and neat as the rest of the home. The furniture is all highly polished wood. You feel almost overwhelmed by how beautifully the room is decorated.'

+ 1 - 0
locations/foto.qsrc

@@ -738,6 +738,7 @@ if $ARGS[0] = 'showers':
 				if hypnoAddict > 0:
 					minut += 10
 					'You unconsciously avoid spraying water into your vagina.'
+					act 'Dry off':gt 'foto', 'showers'
 				else
 					if pcs_horny >= 70:
 						if exhibitionist_lvl > 0:

+ 23 - 20
locations/grigory.qsrc

@@ -1101,26 +1101,29 @@ if $ARGS[0] = 'drunk_late':
 				'After a  few seconds consideration, you pull remove your own shoes, then pull back the covers on the other side of the bed before crawling in beside him.'
 				'Snuggling up against the warmth of his big body, you feel him roll onto his side, one of his arms slipping around your middle.  "Love you Kiska,"  He mumbles in his drunken sleep.'
 				'Smiling to yourself, you close your eyes and drift off to sleep.'
-
-!!				--------------------------------------------
-!!				Scene break
-!!				--------------------------------------------
-
-				'You''re woken by the early morning sun peeking past the drapes of the bedroom.  You start to shy away from the light, but then realize that you''re alone in the bed.'
-				'Looking around the room, you see that Grigory is nowhere to be seen.  '
-				'"Grigory?"  You call softly when you finally motivate yourself to crawl out of bed, "Grigory?  Where''d you get off to?"'
-				'With no response, you exit the bedroom and start to look around.  The first thing you notice is that all of Grigory''s clothes have been picked up, and that the end table has been moved back to where it belongs.  The second is when you look out the living room window and notice that his truck is gone.'
-				'You sigh, then start back toward the bedroom to grab your shoes and tidy up before leaving.  You''re almost to the front door when you notice a note stuck to the door.  '
-				*nl
-				'<b>Sorry about last night.  I had a bit too much to drink.  Please forgive me.'  
-				'I was going to wake you this morning, but you looked like a sleeping angel and I couldn''t bring myself to wake you up.  I hope you slept well.'
-				'Help yourself to the fridge for breakfast, maybe I''ll see you a little later.'
-				'Love you Kiska,'
-				'Grigory</b>'
-				*nl
-				'Smiling to yourself, you take down the note.'
-
-				act 'Continue':gt 'grigory','dummy'
+				act 'Wake up':
+					*clr
+					cla
+					minut += ((33 - hour) * 60) - minut
+					pcs_energy += 100
+					pcs_hydra += 100
+					gs 'stat'
+					'You''re woken by the early morning sun peeking past the drapes of the bedroom.  You start to shy away from the light, but then realize that you''re alone in the bed.'
+					'Looking around the room, you see that Grigory is nowhere to be seen.  '
+					'"Grigory?"  You call softly when you finally motivate yourself to crawl out of bed, "Grigory?  Where''d you get off to?"'
+					'With no response, you exit the bedroom and start to look around.  The first thing you notice is that all of Grigory''s clothes have been picked up, and that the end table has been moved back to where it belongs.  The second is when you look out the living room window and notice that his truck is gone.'
+					'You sigh, then start back toward the bedroom to grab your shoes and tidy up before leaving.  You''re almost to the front door when you notice a note stuck to the door.  '
+					*nl
+					'<b>Sorry about last night.  I had a bit too much to drink.  Please forgive me.'  
+					'I was going to wake you this morning, but you looked like a sleeping angel and I couldn''t bring myself to wake you up.  I hope you slept well.'
+					'Help yourself to the fridge for breakfast, maybe I''ll see you a little later.'
+					'Love you Kiska,'
+					'Grigory</b>'
+					*nl
+					'Smiling to yourself, you take down the note.'
+
+					act 'Continue':gt 'grigory','dummy'
+				end
 			end
 		end
 	end

+ 1 - 1
locations/hairsalon.qsrc

@@ -981,7 +981,7 @@ if $ARGS[0] = 'dyehair':
 			gs 'stat'
 			'"I want to try something really different." you tell her.'
 			'"And what would that be?" The hairdresser asks cheerfully.'
-			'"IA nice dark purple, like a dark wine." you announce.'
+			'"I want it nice dark purple, like a dark wine." you announce.'
 			'"No problem, this''ll be fun. Please have a seat.", she says and turns around one of the chairs for you.'
 
 			act 'Sit down':

+ 11 - 11
locations/hanters.qsrc

@@ -112,9 +112,9 @@ elseif hour = 8 or hour = 14 or hour = 19:
 			gs 'stat'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters1.jpg"></center>'
-			'You enthusiasticly listen to the their hunting stories and even share some of your stories.'
+			'You enthusiastically listen to the their hunting stories and even share some of your stories.'
 			gs 'hanters', 'hanters_talk'
-			'You get caught up in the conversation, you don''t even notice how fast the time flies by.'
+			'You get so caught up in the conversation, you don''t even notice how fast the time flies by.'
 		end
 		act 'Move away': gt 'swamp_yard'
 	end
@@ -176,14 +176,14 @@ elseif hour = 8 or hour = 14 or hour = 19:
 						shootingday = daystart
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/claps_eyes.jpg"></center>'
-						'You approach the hunters sitting in a clearing "Guys, could you give me the rifle I want to try it out again?" you ask the hunters.'
+						'You approach the hunters sitting in a clearing. "Guys, could you give me the rifle? I want to try it out again." You ask the hunters.'
 						if shooting = 1:
 							shooting = 2
 							'"Okay, <<$pcs_nickname>>, just don''t end up like the first time," Andrei said jokingly.'
 						elseif pcs_shoot <= 10:
 							'"Sure, <<$pcs_nickname>>, just be careful." Andrei said smiling.'
 						else
-							'"Here, <<$pcs_nickname>>, just don''t shoot too much, the bullets are expansive." Andrei said smiling.'
+							'"Here, <<$pcs_nickname>>, just don''t shoot too much, the bullets are expensive." Andrei said smiling.'
 						end
 						if pcs_shoot >= 1 and pcs_shoot <= 10:
 
@@ -237,8 +237,8 @@ elseif hour = 8 or hour = 14 or hour = 19:
 						shootingday = daystart
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/claps_eyes.jpg"></center>'
-						'You approach the hunters sitting in a clearing "Guys, could you give me the rifle I want to try it out again?" you ask the hunters.'
-						'"You need to heal your forehead first." Andrei said smiling. "You''re like an amazon, you need to relax."'
+						'You approach the hunters sitting in a clearing. "Guys, could you give me the rifle? I want to try it out again." You ask the hunters.'
+						'"You need to heal your forehead first." Andrei says smiling. "You have the spirit of an Amazon, you need to relax."'
 
 						act'Further':gt 'swamp_yard'
 					end
@@ -3367,7 +3367,7 @@ if $ARGS[0]='hanterslutLEG2':
 	if pcs_health <= 50:act 'Lose consciousness':gt 'hanters', 'hantersgroupfaint'
 end
 
-if $ARGS[0]='hanters_talk':
+if $ARGS[0] = 'hanters_talk':
 	temp = rand(1,35)
 	if temp = 1:
 		'"What''s the difference between a dog and a fox?"'
@@ -3389,7 +3389,7 @@ if $ARGS[0]='hanters_talk':
 		'Not wanting to spook the little fella into spraying him, my dad slowly retreated toward the fence line, walking backwards and keeping the light trained on the skunk.'
 		'Suddenly, he felt something brush across his shoulders and back and quickly swung the flashlight around and shone it directly into the face of a scarecrow!'
 	elseif temp = 6:
-		'There once was politican that was going hunting. He drove out in his fancy jeep, dressed in camouflage and had a super fancy rifle with optical sight night vision... He walks into the forest, and met a man in sandals, a simple hat and a torn jacket, he looked like a typical village guy.'
+		'There once was politician that was going hunting. He drove out in his fancy jeep, dressed in camouflage and had a super fancy rifle with optical sight night vision... He walks into the forest, and met a man in sandals, a simple hat and a torn jacket, he looked like a typical village guy.'
 		'Man: "Where are you heading?"'
 		'Politician: "I''m gonna shoot a bear!"'
 		'Man: "Yes, you seem well prepared..."'
@@ -3408,9 +3408,9 @@ if $ARGS[0]='hanters_talk':
 	elseif temp = 9:
 		'The three hunters are talking:'
 		'"I once killed a whale with one shot."'
-		'"I strangled a bear with my bear hands."'
-		'"Have you ever heard of the Dead sea?"'
-		'"Who hasn??????t heard?"'
+		'"I strangled a bear with my bare hands."'
+		'"Have you ever heard of the Dead Sea?"'
+		'"Who hasn''t heard of it?"'
 		'"So I..."'
 	elseif temp = 10:
 		'"As I''m getting out of the house I see something resembling a eagle standing on the telephone pole."'

+ 3 - 0
locations/igorhome.qsrc

@@ -58,6 +58,7 @@ if $ARGS[0] = 'hallway':
 	$location_type = 'indoors'
 	cls
 	minut += 1
+	killvar '$locclass'
 	gs 'stat'
 	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
 	'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/resident/igorhome/kor.jpg"></center>'
@@ -111,6 +112,7 @@ end
 if $ARGS[0] = 'igorroom':
 	cls
 	minut += 1
+	$locclass = 'bedr'
 	gs 'stat'
 	'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
 	'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/resident/igorhome/kom.jpg"></center>'
@@ -1106,6 +1108,7 @@ end
 if $ARGS[0] = 'igorparents':
 	*clr & cla
 	minut += 1
+	$locclass = 'bedr'
 	gs 'stat'
 	'<center><b><font color = maroon>Igor''s parent''s room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/bedroom.jpg"></center>'

+ 4 - 2
locations/katspalnya.qsrc

@@ -2,8 +2,10 @@
 $sexloc = $CURLOC
 
 if $ARGS[0] = 'start':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$metka = 'start'
+	$loc = 'katspalnya'
+	$location_type = 'private'
+	$locclass = 'bedr'
 	cls
 	gs 'stat'
 	'<center><b><font color="maroon">Katja''s apartment</font></b></center>'

+ 10 - 6
locations/koncepod1.qsrc

@@ -15,7 +15,7 @@ end
 if $ARGS[0]='krr2x1':
     cla
     *clr
-    set minut = minut + 1
+    minut += 5
     gs'stat'
     '<center><B><font color=maroon>Stairs</font></B></center>'
     '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/koncepod3.jpg" ></center>'
@@ -34,8 +34,10 @@ end
 if $ARGS[0]='krr2x':
     cla
     *clr
-    set minut = minut + 1
+	killvar '$locclass'
+    minut += 5
     pavserpsiday = daystart
+	gs 'stat'
     '<center><B><font color=maroon>Corridor</font></B></center>'
     '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/corridor.jpg" ></center>'
 
@@ -64,7 +66,7 @@ end
 if $ARGS[0]='str2x':
     cla
     *clr
-    set minut = minut + 5
+    minut += 5
     gs'stat'
 
     '<center><B><font color=maroon>Hall</font></B></center>'
@@ -83,7 +85,7 @@ end
 if $ARGS[0]='khr2x':
     cla
     *clr
-    set minut = minut + 5
+    minut += 5
     gs'stat'
     '<center><B><font color=maroon>Kitchen</font></B></center>'
     '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/kitchen.jpg" ></center>'
@@ -102,7 +104,7 @@ if $ARGS[0] = 'vnr2x':
 	$metka = 'vnr2x'
 	$loc = 'koncepod1'
     cls
-    set minut += 5
+    minut += 5
     gs'stat'
     '<center><B><font color=maroon>Bathroom</font></B></center>'
     '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/bathroom.jpg" ></center>'
@@ -119,7 +121,9 @@ end
 if $ARGS[0]='bdr2x':
     cla
     *clr
-    set minut = minut + 5
+    minut += 5
+	$location_type = 'private'
+	$locclass = 'bedr'
     gs'stat'
     '<center><B><font color=maroon>Bedroom</font></B></center>'
     '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/bedroom.jpg" ></center>'

+ 1 - 0
locations/korr.qsrc

@@ -7,6 +7,7 @@ $locM = $CURLOC
 $metka = $ARGS[0]
 $loc = $CURLOC
 $location_type = 'private'
+killvar '$locclass'
 if sound = 0:PLAY 'sound/korr.mp3',30
 
 if lesbiday + 14 <= daystart and lesbiQW >= 11 and hour >= 19 and santehnikDolg = 0:

+ 1 - 0
locations/korr2x.qsrc

@@ -4,6 +4,7 @@ if sound = 0:PLAY 'sound/korr.mp3',30
 $metka = ''
 $loc = 'korr2x'
 $location_type = 'private'
+killvar '$locclass'
 clr
 popolaini = 0
 saunaYouRoom = 0

+ 1 - 0
locations/korrPar.qsrc

@@ -9,6 +9,7 @@ $locM = $CURLOC
 $metka = $ARGS[0]
 $loc = $CURLOC
 $location_type = 'private'
+killvar '$locclass'
 clr
 popolaini = 0
 saunaYouRoom = 0

+ 8 - 6
locations/kotovdom.qsrc

@@ -67,9 +67,10 @@ if $ARGS[0] = 'vann':
 end
 
 if $ARGS[0] = 'kor':
-	$metkaM = $ARGS[0]
-	$locM = $CURLOC
+	$metkaM = 'kor'
+	$locM = 'kotovdom'
 	$location_type = 'private'
+	killvar '$locclass'
 	*clr & cla
 	minut += 1
 	gs 'stat'
@@ -81,8 +82,9 @@ if $ARGS[0] = 'kor':
 end
 
 if $ARGS[0] = 'kotovkom':
-	$metkaM = $ARGS[0]
-	$locM = $CURLOC
+	$metkaM = 'kotovkom'
+	$locM = 'kotovdom'
+	$locclass = 'bedr'
 	*clr & cla
 	minut += 1
 	gs 'stat'
@@ -95,8 +97,8 @@ if $ARGS[0] = 'kotovkom':
 end
 
 if $ARGS[0] = 'kuh':
-	$metkaM = $ARGS[0]
-	$locM = $CURLOC
+	$metkaM = 'kuh'
+	$locM = 'kotovdom'
 	*clr & cla
 	minut += 1
 	gs 'stat'

+ 1 - 1
locations/lesbidomhouse.qsrc

@@ -2071,7 +2071,7 @@ if $ARGS[0] = 'QW11':
 		'She smiles mysteriously at you before guiding you to the living room, and invites you to take a seat at the dining table.'
 		'"I''m sorry Madam, this will only take a minute", she says... but not to you. Mistress has another guest you failed to notice until now. It''s a slightly older woman, fully dressed in leather.'
 		'You meekly wave at the other woman, while Mistress walks over to you. She barely acknowledges you, but gives you an amused little smirk. Does she know why you are here?'
-		'"So, slave... you know there is a sex shop in the city center, yes?" she asks, raising an eyebrow. Then she laughs: "Of course you know. Being the little minx that you are, there''s simply no way you haven''t been there already!"'
+		'"So, slave... you know there is a sex shop in the city red light district, yes?" she asks, raising an eyebrow. Then she laughs: "Of course you know. Being the little minx that you are, there''s simply no way you haven''t been there already!"'
 		'You smile defensively while Mistress mocks you in front of her guest, not daring to look her in the eye.'
 		'Mistress continues: "For your assignment, you will have to go there. To the basement, to be exact. I know you''re great at servicing women with your mouth... you''ve proven that to me first-hand! Now I need you to prove that you can suck a good cock as well. Do you think you can be a good little slut for me?"'
 		'Your face is a deep red by now. She''s talking about you pleasing her with your mouth, and making you suck dick... in front of this stranger! This is so embarrassing! Still, you nod despite yourself, you really want to please her.'

+ 3 - 3
locations/mitkabuh.qsrc

@@ -448,9 +448,9 @@ if $ARGS[0] = 'solo_10':
 		*clr & cla
 		minut += 5
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/drunkgirl.jpg"></center>'
-		'You stumble and fall to the ground, and giggle drunkenly. You just pissed yourself. Mitka watches you and laughs when he sees you fall and piss. Mitka walks over to you, barely able to stand himself and pulls you to your feet. "Listen, <<$pcs_nickname>>, come with me," Mitka says loudly. You want to hide from the hungary eyes of the village boys in bushes, anyway the guys already know what happened. "I''m going have you fucked like the whore you are. You pcs_dom''t not mind, do you?" Mitka grinned evilly.'
-		'He turns to his drunken friends, "Here," pointing to a drunken Kolyamba. "Get your ass over here and have some fun with this cunt," Kolyamba stumbles forward pulling his pants down as we approached. "We may be drunk, but we can still service this cunt''s pussy..."'
-		'"Well, that''s... Hic... a beautifully sight," Mitka stammered smugly. "So let''s get this party started... Hic!"'
+		'You stumble and fall to the ground, and giggle drunkenly. You just pissed yourself. Mitka watches you and laughs when he sees you fall and piss. Mitka stumbles over to you, barely able to stand himself and pulls you to your feet. "Listen, <<$pcs_nickname>>, come with me," Mitka says loudly. You want to hide from the hungry eyes of the village boys in the bushes, but the guys already know what happened. "I''m going have you fucked like the whore you are. You don''t mind, do you?" Mitka grins evilly.'
+		'He turns to his drunken friends, "Here," pointing to a drunken Kolyamba. "Get your ass over here and have some fun with this cunt," Kolyamba stumbles forward pulling his pants down as he approaches. "We may be drunk, but we can still service this cunt''s pussy..."'
+		'"Well, that''s... Hic... a beautifully sight," Mitka stammers smugly. "So let''s get this party started... Hic!"'
 
 		if sub > 0:
 			act 'Bend over and get fucked':

+ 2 - 0
locations/pavSharedApt.qsrc

@@ -199,6 +199,8 @@ if $ARGS[0] = 'start':
 	$metkaM = 'start'
 	$locM = 'pavSharedApt'
 	$loc = 'pavSharedApt'
+	$location_type = 'private'
+	killvar '$locclass'
 	gs 'pavSharedApt', 'update'
 	if introDone = 0:gt 'pavSharedApt', 'intro'
 	minut += 2

+ 1 - 0
locations/postoffice.qsrc

@@ -72,6 +72,7 @@ if $ARGS[0] = 'start':
 							$cum_face_image = 'blonde/' + rand(1,25)
 						else
 							$cum_face_image = 'custom/' + rand(1,20)
+						end
 						'<center><img <<$set_imgh>> src="images/pc/body/cum/cumface/<<$cum_face_image>>.jpg"></center>'
 						'The man cums on your face.'
 						spafinloc = 11

+ 6 - 0
locations/rolanapt.qsrc

@@ -47,6 +47,8 @@ if $ARGS[0] = 'hallway':
 	cla
 	*clr
 	minut += 1
+	$location_type = 'private'
+	killvar '$locclass'
 	gs 'stat'
 	!gs 'rolanapt' , 'rolanroute'
 	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
@@ -116,6 +118,8 @@ if $ARGS[0] = 'room':
 	cla
 	*clr
 	minut += 1
+	$location_type = 'private'
+	$locclass = 'bedr'
 	gs 'stat'
 	'<center><h4><font color="maroon">Rolan''s bedroom</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/bedroom.jpg"></center>'
@@ -135,6 +139,8 @@ if $ARGS[0] = 'guestroom':
 	cla
 	*clr
 	minut += 1
+	$location_type = 'private'
+	$locclass = 'bedr'
 	gs 'stat'
 	'<center><h4><font color="maroon">Guest Room</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/guestroom.jpg"></center>'

+ 51 - 49
locations/saunawhore.qsrc

@@ -1005,62 +1005,15 @@ if $ARGS[0] = 'bathroom':
 		''
 		'After taking off all of your clothes, you gather up your towel, washcloth and soap, then head to the shower. You wash yourself thoroughly to be as clean as possible for potential customers.'
 		if workDolg > 0:
-			dynamic $saunabrit
+			gs 'saunawhore', 'saunabrit'
 		else
 			dynamic $brit
 		end
 		act 'Get out and dry off':gt $locM, $metkaM
 	end
-	$saunabrit = {
-		'There are a handful of cheap razors you can use. At least they don''t make you pay for them, but only because they don''t know who has used which blades.'
-		if pcs_pubes > 3 or pcs_leghair > 3:
-			if pcs_pubes > 3 and pcs_leghair > 3:
-				act 'Shave legs and pussy (0:15)':
-					cla
-					*clr
-					minut += 15
-					pcs_leghair = 0
-					pcs_pubes = 0
-					pcs_horny += 10
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
-					'You lathered up and shaved your legs and pussy. Afterwards, you run your hands over your lower body to make sure its nice and smooth which makes you feel a bit horny.'
-	
-					act 'Get out and dry off':gt $locM, $metkaM
-				end
-			end
-	
-			if pcs_leghair > 3:
-				act 'Shave your legs (0:10)':
-					cla
-					*clr
-					minut += 10
-					pcs_leghair = 0
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave.jpg"></center>'
-					'You lathered up and shaved your legs.'
-	
-					aact 'Get out and dry off':gt $locM, $metkaM
-				end
-			end
 
-			if pcs_pubes > 3:
-				act 'Shave your pussy (0:10)':
-					cla
-					*clr
-					minut += 10
-					pcs_pubes = 0
-					pcs_horny += 10
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
-					'You lathered up and shaved your pussy. Afterwards, you run your hands over your lower body to make sure its nice and smooth which makes you feel a bit horny.'
-	
-					act 'Get out and dry off':gt $locM, $metkaM
-				end
-			end
-	
-			act 'Get out and dry off':gt $locM, $metkaM
-		end
-	}
 	if workDolg > 0:
-		dynamic $saunabrit
+		gs 'saunawhore', 'saunabrit'
 	elseif workDolg = 0 and stanok > 0:
 		dynamic $brit
 	elseif workDolg = 0 and stanok = 0:
@@ -1110,5 +1063,54 @@ if $ARGS[0] = 'bathroom':
 	dynamic $basin
 end
 
+if $ARGS[0] = 'saunabrit':
+	'There are a handful of cheap razors you can use. At least they don''t make you pay for them, but only because they don''t know who has used which blades.'
+	if pcs_pubes > 3 or pcs_leghair > 3:
+		if pcs_pubes > 3 and pcs_leghair > 3:
+			act 'Shave legs and pussy (0:15)':
+				cla
+				*clr
+				minut += 15
+				pcs_leghair = 0
+				pcs_pubes = 0
+				pcs_horny += 10
+				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
+				'You lathered up and shaved your legs and pussy. Afterwards, you run your hands over your lower body to make sure its nice and smooth which makes you feel a bit horny.'
+
+				act 'Get out and dry off':gt $locM, $metkaM
+			end
+		end
+
+		if pcs_leghair > 3:
+			act 'Shave your legs (0:10)':
+				cla
+				*clr
+				minut += 10
+				pcs_leghair = 0
+				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave.jpg"></center>'
+				'You lathered up and shaved your legs.'
+
+				act 'Get out and dry off':gt $locM, $metkaM
+			end
+		end
+
+		if pcs_pubes > 3:
+			act 'Shave your pussy (0:10)':
+				cla
+				*clr
+				minut += 10
+				pcs_pubes = 0
+				pcs_horny += 10
+				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
+				'You lathered up and shaved your pussy. Afterwards, you run your hands over your lower body to make sure its nice and smooth which makes you feel a bit horny.'
+
+				act 'Get out and dry off':gt $locM, $metkaM
+			end
+		end
+
+		act 'Get out and dry off':gt $locM, $metkaM
+	end
+end
+
 --- saunaWhore ---------------------------------
 

+ 1 - 1
locations/sexshop.qsrc

@@ -298,7 +298,7 @@ if $ARGS[0] = 'start':
 	end
 
 	if money >= 1100 and superdildo = 0:
-		act 'Buy 35cm long dildo (8,500 <b>₽</b>)':
+		act 'Buy 35cm long dildo (1,100 <b>₽</b>)':
 			cla
 			*clr
 			minut += 5

+ 3 - 0
locations/shulgabed.qsrc

@@ -3,6 +3,8 @@ CLOSE ALL
 $metka = ''
 $loc = 'shulgabed'
 $location_type = 'private'
+$locclass = 'bedr'
+
 if $ARGS[0] = '' or $ARGS[0] = 'wakeup':
 	*clr & cla
 	minut = minut + 1
@@ -21,6 +23,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'wakeup':
 	if RAND(0,100) <= 5 and soniaPS >= 1 and sexev_sonya_count > 0 and hour >= 15 and hour <= 23 and $ARGS[0] = '': gt 'shulgabed', 'sonya'
 	act 'Return to the hallway': gt'shulgahall'
 end
+
 if $ARGS[0] = 'sonya':
 	sexev_sonya_day = daystart
 	sexev_sonya_count -= 1

+ 1 - 0
locations/shulgahall.qsrc

@@ -4,6 +4,7 @@ CLOSE ALL
 $metka = ''
 $loc = 'shulgahall'
 $location_type = 'private'
+killvar '$locclass'
 
 if $ARGS[0] = '':
 	!count-in `s Event NPC can start with Mom a day

+ 1 - 0
locations/street.qsrc

@@ -5,6 +5,7 @@ CLOSE ALL
 $metka = ''
 $loc = 'street'
 $location_type = 'public_outdoors'
+killvar '$locclass'
 
 if sound = 0:
 	if month >=11 and month <= 12 or month >=1 and month <=3:

+ 2 - 0
locations/tanhouse.qsrc

@@ -10,6 +10,8 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 	*clr
 	tanhouse1 = 1
 	minut += 5
+	$location_type = 'private'
+	killvar '$locclass'
 	gs 'stat'
 	'<center><b>Nicholas'' Apartment</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/shared/house.jpg"></center>'

+ 2 - 0
locations/tanhozspal.qsrc

@@ -5,6 +5,8 @@ $metka = ''
 $loc = 'tanhozspal'
 
 $sexloc = 'tanhozspal'
+$location_type = 'private'
+$locclass = 'bedr'
 minut += 5
 gs 'stat'
 sexpartkno = 1

+ 6 - 4
locations/tanspalnya.qsrc

@@ -1,10 +1,12 @@
 # tanspalnya
 CLOSE ALL
 
-$metka = $ARGS[0]
-$loc = $CURLOC
-$metkaM = $ARGS[0]
-$locM = $CURLOC
+$metka = ''
+$loc = 'tanspalnya'
+$metkaM = ''
+$locM = 'tanspalnya'
+$location_type = 'private'
+$locclass = 'bedr'
 
 minut += 5
 tanhouse1 = 1

+ 38 - 2
locations/telefon.qsrc

@@ -776,6 +776,9 @@ if $ARGS[0] = 'Phone_selfie_totals':
 	bathroom_clotot = 20
 	bathroom_undtot = 20
 	bathroom_nudtot = 20
+	bedroom_clotot = 27
+	bedroom_undtot = 20
+	bedroom_nudtot = 20
 end
 
 
@@ -807,6 +810,24 @@ if $ARGS[0] = 'Phone_pictures':
 		bathroom_nudcnt += 1
 	if bathroom_nudcnt <= bathroom_nudtot: jump'bathroom_nudloop'
 
+	bedroom_clocnt = 1
+	:bedroom_cloloop
+		if bedroom_closelfie[bedroom_clocnt] = 1:pl'<a href="exec:view''images/pc/selfies/bedroom/clothed/<<bedroom_clocnt>>.jpg''"><b>Clothed bedroom selfie #<<bedroom_clocnt>></b></a>'
+		bedroom_clocnt += 1
+	if bedroom_clocnt <= bedroom_clotot: jump'bedroom_cloloop'
+
+	bedroom_undcnt = 1
+	:bedroom_undloop
+		if bedroom_undselfie[bedroom_undcnt] = 1:pl'<a href="exec:view''images/pc/selfies/bedroom/underwear/<<bedroom_undcnt>>.jpg''"><b>Underwear bedroom selfie #<<bedroom_undcnt>></b></a>'
+		bedroom_undcnt += 1
+	if bedroom_undcnt <= bedroom_undtot: jump'bedroom_undloop'
+
+	bedroom_nudcnt = 1
+	:bedroom_nudloop
+		if bedroom_nudselfie[bedroom_nudcnt] = 1:pl'<a href="exec:view''images/pc/selfies/bedroom/nude/<<bedroom_nudcnt>>.jpg''"><b>Nude bedroom selfie #<<bedroom_nudcnt>></b></a>'
+		bedroom_nudcnt += 1
+	if bedroom_nudcnt <= bedroom_nudtot: jump'bedroom_nudloop'
+
 	*nl
 	pl'<center><a href="exec:gs ''telefon'', ''Phone_menu'' "><img src="images/system/icon/back.png"></a></center>'
 end
@@ -814,8 +835,8 @@ end
 !!picking the selfie image when taking photos
 if $ARGS[0] = 'Phone_camera_selfie':
 	gs 'telefon', 'Phone_selfie_totals'
+	minut += RAND(5,7)
 	if $location_type = 'bathroom':
-		minut += RAND(5,7)
 		if $clothingworntype ! 'nude':
 			phone_rand = rand(1,bathroom_clotot)
 			bathroom_closelfie[phone_rand] = 1
@@ -831,8 +852,23 @@ if $ARGS[0] = 'Phone_camera_selfie':
 		end
 		gs 'stat'
 		gs 'telefon', 'Phone_pictures'
+	elseif $locclass = 'bedr':
+		if $clothingworntype ! 'nude':
+			phone_rand = rand(1,bedroom_clotot)
+			bedroom_closelfie[phone_rand] = 1
+			view 'images/pc/selfies/bedroom/clothed/<<phone_rand>>.jpg'
+		elseif $pantyworntype ! 'none':
+			phone_rand = rand(1,bedroom_undtot)
+			bedroom_undselfie[phone_rand] = 1
+			view 'images/pc/selfies/bedroom/underwear/<<phone_rand>>.jpg'
+		else
+			phone_rand = rand(1,bedroom_nudtot)
+			bedroom_nudselfie[phone_rand] = 1
+			view 'images/pc/selfies/bedroom/nude/<<phone_rand>>.jpg'
+		end
+		gs 'stat'
+		gs 'telefon', 'Phone_pictures'
 	else
-		minut += RAND(5,7)
 		phone_rand = RAND(1,2)
 		phone_selfie[phone_rand] = 1
 		gs 'stat'

+ 5 - 4
locations/ymans.qsrc

@@ -1,9 +1,10 @@
 # ymans
-$metkaM = $ARGS[0]
-$locM = $CURLOC
-$metka = $ARGS[0]
-$loc = $CURLOC
+$metkaM = ''
+$locM = 'ymans'
+$metka = ''
+$loc = 'ymans'
 $location_type = 'private'
+killvar '$locclass'
 clr
 gs 'stat'
 if night_mode = 1: