1
0

29 Коміти 5e0aa5be1f ... 25f6387996

Автор SHA1 Опис Дата
  jhawkkaw 25f6387996 [added] Aleksandra to phone selfies 5 роки тому
  CroWke 238f977910 [fixed] Ok, so I added $npcSelfie to npc_data and the school selfies now work. (no content yet tho) 5 роки тому
  CroWke 2b0e2b75e3 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 роки тому
  KevinSmarts 64f1ff1a5c [fixed] wrong lines commented out, so reversed them for CroWke 5 роки тому
  CroWke 67f8639ec1 [edit] If you start in June the focus of the conversation will be on getting up early to help your grandparents instead of school. 5 роки тому
  KevinSmarts afd249bff1 [fixed] replacing the removed section to fix the unicode error 5 роки тому
  KevinSmarts 47f2c6694a [fixed] removing to repair unicode error, repairing in next commit 5 роки тому
  KevinSmarts 02623385ea Merge remote-tracking branch 'CroWke/master' 5 роки тому
  CroWke 89e414d9eb [edit] This includes all the school kids. I still need to figure out how to properly add the "if selfie is available" check. 5 роки тому
  julzor 1e01dd4f37 [changed] blocked virginity messages in obj_din 5 роки тому
  CroWke 3befba5f78 [fixed] This should be what sets Mikhail as a teacher, but I'm not sure when this part of the code actually gets triggered (It doesn't fix it for savegames as far as I know) 5 роки тому
  julzor 24053c7b18 [added] drinking water/tea and refill bottle to fedorev4 5 роки тому
  julzor a6f18b2afd [added] drinking water/tea and refill bottle to netbelapt 5 роки тому
  julzor 5b7372e494 [fixed] changed actions to kitchen dynamics, [added] refillable water bottle to mey_home 5 роки тому
  CroWke c49d86e652 [fixed] cleaned up the code for the anushka event 5 роки тому
  CroWke f941a683b1 [fixed] I fixed it so that it'll always show 6 results on the first row. 5 роки тому
  CroWke 426fc4db09 [fixed] Found some more repeated text in there and fixed it 5 роки тому
  CroWke f48532dda9 [fixed] More identical code placed into it's own args. And added an = I had forgotten. 5 роки тому
  CroWke fa7e6acceb [fixed] I took the part from where Sveta agrees to steel booze out and gave it it's own args as it was about 100 lines of identical code. 5 роки тому
  julzor a7b3c2376d [fixed] missing location variables in anushapt 5 роки тому
  julzor 2a36cb3dd0 [fixed] reduced grind in gaptek 5 роки тому
  julzor 351e995e58 [fixed] menu variables in rolanapt, drinking water and [added] refillable bottle 5 роки тому
  CroWke f723b81ea2 [changed] A few images were swapped to different locations (by order of nutluck) 5 роки тому
  CroWke 584f76b98e Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 роки тому
  CroWke 9d2f2bacff [added] cumresponse for when Natasha has sex with Kolka. Started on a way to let the player continue with Natasha's questline without having to force her through every step. 5 роки тому
  CroWke 9f2f7ac0af [added][fixed] a few more changes to natbelapt based on nutluck's comments. We'll have to pull the kolka and olu stuff out at some point as it's a bit too big. 5 роки тому
  KevinSmarts 7b7f64322d Merge remote-tracking branch 'jhawkkaw/master' 5 роки тому
  KevinSmarts 128b3f6e31 Merge remote-tracking branch 'CroWke/master' 5 роки тому
  CroWke c61b47ace4 [edit] I changed the name of the action to leave the changing room to fit Sveta's state of undress. 5 роки тому

+ 86 - 83
locations/FedorEv4.qsrc

@@ -114,7 +114,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'Home':
 	end
 end
 
-if $ARGS[0] =  'Hall Sex':
+if $ARGS[0] = 'Hall Sex':
 	*clr & cla
 	menu_off = 1
 	gs 'boyStat', 'A5'
@@ -195,7 +195,7 @@ if $ARGS[0] =  'Hall Sex':
 	end
 end
 
-if $ARGS[0] =  '3Way':
+if $ARGS[0] = '3Way':
 	*clr & cla
 	menu_off = 1
 	minut -= 5
@@ -255,7 +255,7 @@ if $ARGS[0] =  '3Way':
 	end
 end
 
-if $ARGS[0] =  '3way1':
+if $ARGS[0] = '3way1':
 	*clr & cla
 	menu_off = 1
 	minut -= 5
@@ -375,7 +375,7 @@ if $ARGS[0] =  '3way1':
 	end
 end
 
-if $ARGS[0] =  '3way2':
+if $ARGS[0] = '3way2':
 	*clr & cla
 	menu_off = 1
 	minut -= 10
@@ -464,7 +464,7 @@ if $ARGS[0] =  '3way2':
 	end
 end
 
-if $ARGS[0] =  '3way3':
+if $ARGS[0] = '3way3':
 	*clr & cla
 	menu_off = 1
 	minut -= 5
@@ -596,7 +596,7 @@ if $ARGS[0] =  '3way3':
 		end
 	end
 end
-if $ARGS[0] =  'Home 2':
+if $ARGS[0] = 'Home 2':
 	*clr & cla
 	menu_off = 1
 	minut += 5
@@ -669,7 +669,7 @@ if $ARGS[0] = 'Popcorn':
 	end
 end
 
-if $ARGS[0] =  'Snacks':
+if $ARGS[0] = 'Snacks':
 	*clr & cla
 	menu_off = 1
 	minut += 5
@@ -708,7 +708,7 @@ if $ARGS[0] =  'Snacks':
 	end
 end
 
-if $ARGS[0] =  'Movie Action':
+if $ARGS[0] = 'Movie Action':
 	*clr & cla
 	menu_off = 1
 	pcs_mood += 15
@@ -721,7 +721,7 @@ if $ARGS[0] =  'Movie Action':
 	act 'Finish movie':gt 'FedorEv4', 'Home 3'
 end
 
-if $ARGS[0] =  'Movie Sports':
+if $ARGS[0] = 'Movie Sports':
 	*clr & cla
 	menu_off = 1
 	pcs_mood += 15
@@ -734,7 +734,7 @@ if $ARGS[0] =  'Movie Sports':
 	act 'Finish watching TV':gt 'FedorEv4', 'Home 3'
 end
 
-if $ARGS[0] =  'Movie Family':
+if $ARGS[0] = 'Movie Family':
 	*clr & cla
 	menu_off = 1
 	pcs_mood += 15
@@ -747,7 +747,7 @@ if $ARGS[0] =  'Movie Family':
 	act 'Finish movie':gt 'FedorEv4', 'Home 3'
 end
 
-if $ARGS[0] =  'Movie Porn':
+if $ARGS[0] = 'Movie Porn':
 	*clr & cla
 	menu_off = 1
 	pcs_mood += 10
@@ -761,7 +761,7 @@ if $ARGS[0] =  'Movie Porn':
 	act 'Finish movie':gt 'FedorEv4', 'Home 3'
 end
 
-if $ARGS[0] =  'Home 3':
+if $ARGS[0] = 'Home 3':
 	*clr & cla
 	menu_off = 1
 	EndMovie = 1
@@ -811,7 +811,7 @@ if $ARGS[0] =  'Home 3':
 	end
 end
 
-if $ARGS[0] =  'Random Sex':
+if $ARGS[0] = 'Random Sex':
 	VK = rand(1,8)
 	if VK <= 1:
 		gt 'FedorEv4', 'Livingroom 1'
@@ -834,7 +834,7 @@ if $ARGS[0] =  'Random Sex':
 	end
 end
 
-if $ARGS[0] =  'Livingroom 1':
+if $ARGS[0] = 'Livingroom 1':
 	*clr & cla
 	menu_off = 1
 	WithFedor = 0
@@ -916,7 +916,7 @@ if $ARGS[0] =  'Livingroom 1':
 	end
 end
 
-if $ARGS[0] =  'Livingroom 2':
+if $ARGS[0] = 'Livingroom 2':
 	*clr & cla
 	menu_off = 1
 	WithFedor = 0
@@ -999,7 +999,7 @@ if $ARGS[0] =  'Livingroom 2':
 	end
 end
 
-if $ARGS[0] =  'Livingroom 3':
+if $ARGS[0] = 'Livingroom 3':
 	*clr & cla
 	menu_off = 1
 	WithFedor = 0
@@ -1108,7 +1108,7 @@ if $ARGS[0] =  'Livingroom 3':
 	end
 end
 
-if $ARGS[0] =  'Bathroom 1':
+if $ARGS[0] = 'Bathroom 1':
 	*clr & cla
 	menu_off = 1
 	minut += 5
@@ -1124,7 +1124,7 @@ if $ARGS[0] =  'Bathroom 1':
 	act 'Walk to bathroom':gt 'FedorEv4', 'Bathroom'
 end
 
-if $ARGS[0] =  'Bathroom Cam':
+if $ARGS[0] = 'Bathroom Cam':
 	*clr & cla
 	menu_off = 1
 	WithFedor = 0
@@ -1164,7 +1164,7 @@ if $ARGS[0] =  'Bathroom Cam':
 	end
 end
 
-if $ARGS[0] =  'Bathroom Cam 2':
+if $ARGS[0] = 'Bathroom Cam 2':
 	*clr & cla
 	menu_off = 1
 	FedorCam += 1
@@ -1355,7 +1355,7 @@ if $ARGS[0] =  'Bathroom Cam 2':
 	end
 end
 
-if $ARGS[0] =  'Bathroom 2':
+if $ARGS[0] = 'Bathroom 2':
 	*clr & cla
 	menu_off = 1
 	WithFedor = 0
@@ -1424,7 +1424,7 @@ if $ARGS[0] =  'Bathroom 2':
 	end
 end
 
-if $ARGS[0] =  'Bathroom 3':
+if $ARGS[0] = 'Bathroom 3':
 	*clr & cla
 	menu_off = 1
 	WithFedor = 0
@@ -1482,7 +1482,7 @@ if $ARGS[0] =  'Bathroom 3':
 	end
 end
 
-if $ARGS[0] =  'Kitchen 1':
+if $ARGS[0] = 'Kitchen 1':
 	*clr & cla
 	menu_off = 1
 	WithFedor = 0
@@ -1544,7 +1544,7 @@ if $ARGS[0] =  'Kitchen 1':
 	end
 end
 
-if $ARGS[0] =  'Kitchen 2':
+if $ARGS[0] = 'Kitchen 2':
 	*clr & cla
 	menu_off = 1
 	WithFedor = 0
@@ -1602,7 +1602,7 @@ if $ARGS[0] =  'Kitchen 2':
 	end
 end
 
-if $ARGS[0] =  'Bedroom Cam':
+if $ARGS[0] = 'Bedroom Cam':
 	*clr & cla
 	menu_off = 1
 	WithFedor = 0
@@ -1802,7 +1802,7 @@ if $ARGS[0] =  'Bedroom Cam':
 	end
 end
 
-if $ARGS[0] =  'Bedroom 1':
+if $ARGS[0] = 'Bedroom 1':
 	*clr & cla
 	menu_off = 1
 	WithFedor = 0
@@ -1982,7 +1982,7 @@ if $ARGS[0] =  'Bedroom 1':
 	end
 end
 
-if $ARGS[0] =  'Bedroom 2':
+if $ARGS[0] = 'Bedroom 2':
 	*clr & cla
 	menu_off = 1
 	gs 'boyStat', 'A5'
@@ -2190,7 +2190,7 @@ if $ARGS[0] =  'Bedroom 2':
 	end
 end
 
-if $ARGS[0] =  'Bedroom 3':
+if $ARGS[0] = 'Bedroom 3':
 	*clr & cla
 	menu_off = 1
 	minut -= 5
@@ -2445,7 +2445,7 @@ if $ARGS[0] = 'Bathroom Wash':
 	act 'Join Fedor in the livingroom':gt 'FedorEv4', 'Home 2'
 end
 
-if $ARGS[0] =  'Quick Wash':
+if $ARGS[0] = 'Quick Wash':
 	*clr & cla
 	menu_off = 1
 	EndMovie = 0
@@ -2466,7 +2466,7 @@ if $ARGS[0] =  'Quick Wash':
 	act 'Dry off':gt 'FedorEv4', 'Bathroom'
 end
 
-if $ARGS[0] =  'Shower':
+if $ARGS[0] = 'Shower':
 	*clr & cla
 	menu_off = 1
 	EndMovie = 0
@@ -2481,7 +2481,7 @@ if $ARGS[0] =  'Shower':
 	act 'Dry off':gt 'FedorEv4', 'Bathroom'
 end
 
-if $ARGS[0] =  'Toilet':
+if $ARGS[0] = 'Toilet':
 	*clr & cla
 	menu_off = 1
 	gs'stat'
@@ -2509,7 +2509,7 @@ if $ARGS[0] =  'Toilet':
 	end
 end
 
-if $ARGS[0] =  'Toilet 2':
+if $ARGS[0] = 'Toilet 2':
 	*clr & cla
 	menu_off = 1
 	Potty_Daystart = daystart
@@ -2523,7 +2523,7 @@ if $ARGS[0] =  'Toilet 2':
 	act 'Walk away':gt 'FedorEv4', 'Bathroom'
 end
 
-if $ARGS[0] =  'Toilet 3':
+if $ARGS[0] = 'Toilet 3':
 	*clr & cla
 	menu_off = 1
 	gs'stat'
@@ -2534,7 +2534,7 @@ if $ARGS[0] =  'Toilet 3':
 	act 'NOO!':gt 'FedorEv4', 'Bathroom'
 end
 
-if $ARGS[0] =  'Kitchen':
+if $ARGS[0] = 'Kitchen':
 	$loc = 'FedorEv4'
 	$metka = 'Kitchen'
 	$locclass = 'kitr'
@@ -2544,30 +2544,33 @@ if $ARGS[0] =  'Kitchen':
 	*clr & cla
 	if hour >= 20 and hour <= 22 and ReginaIntro = 0:gt 'FedorEv4', 'Regina Intro'
 	minut += 5
+	gs 'kit_din'
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/kitchen.jpg"></center>'
 	*nl
 	'This kitchen is very clean. Fedor''s parents must be very neat people.'
 	*nl
 	'There is a sink, a microwave, a stove and a <a href="exec:gt ''FedorEv4'', ''Fridge''">refrigerator</a> stocked with food.'
-	'If you''re thirsty, you can pour yourself a glass of <a href="exec:gt ''beverage'', ''bev_wat''">water</a> from the tap.'
-	if week <= 5 and hour >= 19 and hour < 20 or week > 5 and hour >= 12 and hour < 14:
-		'<a href="exec:gt ''FedorEv4'', ''Fedor Kitchen''">Fedor</a> is sitting down, eating dinner.'
-	end
 
-	if week <= 5 and hour >= 20 and hour <= 22 or week > 5 and hour >= 14 and hour < 16:
+	if week <= 5 and hour >= 19 and hour < 20 or week > 5 and hour >= 12 and hour < 14: 
+		'<a href="exec:gt ''FedorEv4'', ''Fedor Kitchen''">Fedor</a> is sitting down, eating dinner.'
+	elseif week <= 5 and hour >= 20 and hour <= 22 or week > 5 and hour >= 14 and hour < 16:
 		'<a href="exec:gt ''FedorEv4'', ''Regina Chat''">Regina</a> is sitting at the table, eating dinner.'
 	elseif week > 5 and hour >= 16 and hour <= 20:
 		'<a href="exec:gt ''FedorEv4'', ''Regina Chat''">Regina</a> is cleaning the kitchen.'
-	elseif week <= 5 and hour <= 11 and hour > 10:
+	elseif week <= 5 and hour = 11:
 		'<a href="exec:gt ''FedorEv4'', ''Regina Chat''">Regina</a> is getting ready to leave for work.'
 	end
 
 	act 'Return to the hallway':gt 'FedorEv4', 'Hallway'
 	act 'Enter the living room':gt 'FedorEv4', 'Livingroom'
+	
+	dynamic $driwater
+	dynamic $dritea
+	dynamic $fill_bottle
 end
 
-if $ARGS[0] =  'Livingroom':
+if $ARGS[0] = 'Livingroom':
 	*clr & cla
 	$menu_loc = 'FedorEv4'
 	$menu_arg = 'Livingroom'
@@ -2591,7 +2594,7 @@ if $ARGS[0] =  'Livingroom':
 	act 'Step into the kitchen':gt 'FedorEv4', 'Kitchen'
 end
 
-if $ARGS[0] =  'Hallway':
+if $ARGS[0] = 'Hallway':
 	*clr & cla
 	$menu_loc = 'FedorEv4'
 	$menu_arg = 'Hallway'
@@ -2645,7 +2648,7 @@ if $ARGS[0] =  'Hallway':
 	end
 end
 
-if $ARGS[0] =  'Bedroom':
+if $ARGS[0] = 'Bedroom':
 	*clr & cla
 	$metka = 'Bedroom'
 	$loc = 'FedorEv4'
@@ -2673,7 +2676,7 @@ if $ARGS[0] =  'Bedroom':
 	act 'Leave bedroom':gt 'FedorEv4', 'Hallway'
 end
 
-if $ARGS[0] =  'Nude':
+if $ARGS[0] = 'Nude':
 	*clr & cla
 	menu_off = 1
 	gs'stat'
@@ -2683,7 +2686,7 @@ if $ARGS[0] =  'Nude':
 	act 'Return to the hallway':gt 'FedorEv4', 'Hallway'
 end
 
-if $ARGS[0] =  'Picture':
+if $ARGS[0] = 'Picture':
 	*clr & cla
 	menu_off = 1
 	gs'stat'
@@ -2694,7 +2697,7 @@ if $ARGS[0] =  'Picture':
 	act 'Step away':gt 'FedorEv4', 'Bedroom'
 end
 
-if $ARGS[0] =  'Solo':
+if $ARGS[0] = 'Solo':
 	*clr & cla
 	menu_off = 1
 	pcs_horny += 20
@@ -2707,7 +2710,7 @@ if $ARGS[0] =  'Solo':
 	act 'Finish':gt 'FedorEv4', 'Livingroom'
 end
 
-if $ARGS[0] =  'Solo Caught':
+if $ARGS[0] = 'Solo Caught':
 	*clr & cla
 	menu_off = 1
 	if ReginaKozQW < 2: ReginaKozQW = 2
@@ -2719,7 +2722,7 @@ if $ARGS[0] =  'Solo Caught':
 	act 'Walk away':gt 'FedorEv4', 'Livingroom'
 end
 
-if $ARGS[0] =  'Fridge':
+if $ARGS[0] = 'Fridge':
 	*clr & cla
 	menu_off = 1
 	gs'stat'
@@ -2760,7 +2763,7 @@ if $ARGS[0] =  'Fridge':
 	end
 end
 
-if $ARGS[0] =  'Fedor Sleeping':
+if $ARGS[0] = 'Fedor Sleeping':
 	*clr & cla
 	menu_off = 1
 	gs'stat'
@@ -2773,7 +2776,7 @@ if $ARGS[0] =  'Fedor Sleeping':
 	act 'Spend the night':gt 'bed2'
 end
 
-if $ARGS[0] =  'End Date':
+if $ARGS[0] = 'End Date':
 	*clr & cla
 	menu_off = 1
 	gs'stat'
@@ -2791,7 +2794,7 @@ if $ARGS[0] =  'End Date':
 	end
 end
 
-if $ARGS[0] =  'End Date 2':
+if $ARGS[0] = 'End Date 2':
 	*clr & cla
 	menu_off = 1
 	minut += 5
@@ -2811,7 +2814,7 @@ if $ARGS[0] =  'End Date 2':
 	act 'Walk home':gt 'korrPar'
 end
 
-if $ARGS[0] =  'TV':
+if $ARGS[0] = 'TV':
 	*clr & cla
 	menu_off = 1
 	pcs_willpwr += rand(5, 10)
@@ -2851,7 +2854,7 @@ if $ARGS[0] =  'TV':
 	end
 end
 
-if $ARGS[0] =  'TV Action':
+if $ARGS[0] = 'TV Action':
 	*clr & cla
 	menu_off = 1
 	pcs_willpwr += rand(15, 25)
@@ -2865,7 +2868,7 @@ if $ARGS[0] =  'TV Action':
 	act 'Change channel':gt 'FedorEv4', 'TV'
 end
 
-if $ARGS[0] =  'TV Geographic':
+if $ARGS[0] = 'TV Geographic':
 	*clr & cla
 	menu_off = 1
 	pcs_willpwr += rand(5, 10)
@@ -2879,7 +2882,7 @@ if $ARGS[0] =  'TV Geographic':
 	act 'Change channel':gt 'FedorEv4', 'TV'
 end
 
-if $ARGS[0] =  'TV Sports':
+if $ARGS[0] = 'TV Sports':
 	*clr & cla
 	menu_off = 1
 	pcs_willpwr += rand(5, 20)
@@ -2893,7 +2896,7 @@ if $ARGS[0] =  'TV Sports':
 	act 'Change channel':gt 'FedorEv4', 'TV'
 end
 
-if $ARGS[0] =  'TV Family':
+if $ARGS[0] = 'TV Family':
 	*clr & cla
 	menu_off = 1
 	pcs_willpwr += rand(15, 25)
@@ -2907,7 +2910,7 @@ if $ARGS[0] =  'TV Family':
 	act 'Change channel':gt 'FedorEv4', 'TV'
 end
 
-if $ARGS[0] =  'TV Porn':
+if $ARGS[0] = 'TV Porn':
 	*clr & cla
 	menu_off = 1
 	pcs_willpwr += rand(5, 10)
@@ -2922,7 +2925,7 @@ if $ARGS[0] =  'TV Porn':
 	act 'Change channel':gt 'FedorEv4', 'TV'
 end
 
-if $ARGS[0] =  'Porn Caught':
+if $ARGS[0] = 'Porn Caught':
 	*clr & cla
 	menu_off = 1
 	minut += 5
@@ -2934,7 +2937,7 @@ if $ARGS[0] =  'Porn Caught':
 end
 
 
-if $ARGS[0] =  'Regina Intro':
+if $ARGS[0] = 'Regina Intro':
 	*clr & cla
 	menu_off = 1
 	minut += 5
@@ -2951,7 +2954,7 @@ if $ARGS[0] =  'Regina Intro':
 	act 'Only if it''s no trouble':gt 'FedorEv4', 'Dinner 1'
 end
 
-if $ARGS[0] =  'Regina Chat':
+if $ARGS[0] = 'Regina Chat':
 	*clr & cla
 	menu_off = 1
 	gs'stat'
@@ -2997,7 +3000,7 @@ if $ARGS[0] =  'Regina Chat':
 	end	
 end
 
-if $ARGS[0] =  'Regina Chat 2':
+if $ARGS[0] = 'Regina Chat 2':
 	*clr & cla
 	menu_off = 1
 	ReginaKozlov += 1
@@ -3026,7 +3029,7 @@ if $ARGS[0] =  'Regina Chat 2':
 	act 'Walk away':gt 'FedorEv4', 'Kitchen'
 end
 
-if $ARGS[0] =  'Dinner 1':
+if $ARGS[0] = 'Dinner 1':
 	*clr & cla
 	menu_off = 1
 	minut += 5
@@ -3040,7 +3043,7 @@ if $ARGS[0] =  'Dinner 1':
 	act 'Take a seat':gt 'FedorEv4', 'Dinner'
 end
 
-if $ARGS[0] =  'Dinner':
+if $ARGS[0] = 'Dinner':
 	*clr & cla
 	menu_off = 1
 	ReginaKoz_Daystart = daystart
@@ -3061,7 +3064,7 @@ if $ARGS[0] =  'Dinner':
 	act 'Finish':gt 'FedorEv4', 'Kitchen'
 end
 
-if $ARGS[0] =  'Check up':
+if $ARGS[0] = 'Check up':
 	*clr & cla
 	menu_off = 1
 	if pcs_health < 100:pcs_health = 150
@@ -3076,7 +3079,7 @@ if $ARGS[0] =  'Check up':
 	act 'Thank you':gt 'FedorEv4', 'Kitchen'
 end
 
-if $ARGS[0] =  'Fedor Livingroom':
+if $ARGS[0] = 'Fedor Livingroom':
 	*clr & cla
 	$metka = 'Fedor Livingroom'
 	$loc = 'FedorEv4'
@@ -3163,7 +3166,7 @@ if $ARGS[0] = 'Fedor Kitchen':
 	act 'Chat':gt 'FedorEv4', 'Fedor Kitchen Chat'	
 end
 
-if $ARGS[0] =  'Fedor Bedroom':
+if $ARGS[0] = 'Fedor Bedroom':
 	*clr & cla
 	$metka = 'Fedor Bedroom'
 	$loc = 'FedorEv4'
@@ -3222,7 +3225,7 @@ if $ARGS[0] =  'Fedor Bedroom':
 	end	
 end
 
-if $ARGS[0] =  'Fedor Bedroom 2':
+if $ARGS[0] = 'Fedor Bedroom 2':
 	*clr & cla
 	$metka = 'Fedor Bedroom 2'
 	$loc = 'FedorEv4'
@@ -3252,7 +3255,7 @@ if $ARGS[0] =  'Fedor Bedroom 2':
 	act 'Sure':gt 'FedorEv4', 'Fedor Bedroom Chat 2'
 end
 
-if $ARGS[0] =  'Love Talk':
+if $ARGS[0] = 'Love Talk':
 	*clr & cla
 	menu_off = 1
 	FedorLove = 1
@@ -3274,7 +3277,7 @@ if $ARGS[0] =  'Love Talk':
 	act 'Finish kissing':gt 'FedorEv4', 'Fedor Bedroom'
 end
 
-if $ARGS[0] =  'Love Talk Strela':
+if $ARGS[0] = 'Love Talk Strela':
 	*clr & cla
 	menu_off = 1
 	FedorLove = 1
@@ -3296,7 +3299,7 @@ if $ARGS[0] =  'Love Talk Strela':
 	act 'Finish kissing':gt 'FedorEv4', 'Fedor Bedroom'
 end
 
-if $ARGS[0] =  'Love Talk Strela 2':
+if $ARGS[0] = 'Love Talk Strela 2':
 	*clr & cla
 	menu_off = 1
 	FedorLove = 1
@@ -3317,7 +3320,7 @@ if $ARGS[0] =  'Love Talk Strela 2':
 	act 'Finish kissing':gt 'FedorEv4', 'Fedor Bedroom'
 end
 
-if $ARGS[0] =  'Future':
+if $ARGS[0] = 'Future':
 	*clr & cla
 	menu_off = 1
 	minut += 5
@@ -3380,7 +3383,7 @@ if $ARGS[0] =  'Future':
 	end
 end
 
-if $ARGS[0] =  'Fedor Livingroom Chat':
+if $ARGS[0] = 'Fedor Livingroom Chat':
 	*clr & cla
 	menu_off = 1
 	minut += 10
@@ -3392,7 +3395,7 @@ if $ARGS[0] =  'Fedor Livingroom Chat':
 	act 'Finish chatting':gt 'FedorEv4', 'Livingroom'
 end
 
-if $ARGS[0] =  'Fedor Kitchen Chat':
+if $ARGS[0] = 'Fedor Kitchen Chat':
 	*clr & cla
 	menu_off = 1
 	minut += 10
@@ -3404,7 +3407,7 @@ if $ARGS[0] =  'Fedor Kitchen Chat':
 	act 'Finish chatting':gt 'FedorEv4', 'Kitchen'
 end
 
-if $ARGS[0] =  'Fedor Bedroom Chat':
+if $ARGS[0] = 'Fedor Bedroom Chat':
 	*clr & cla
 	menu_off = 1
 	minut += 10
@@ -3416,7 +3419,7 @@ if $ARGS[0] =  'Fedor Bedroom Chat':
 	act 'Finish chatting':gt 'FedorEv4', 'Bedroom'
 end
 
-if $ARGS[0] =  'Fedor Bedroom Chat 2':
+if $ARGS[0] = 'Fedor Bedroom Chat 2':
 	*clr & cla
 	menu_off = 1
 	minut += 10
@@ -3433,7 +3436,7 @@ if $ARGS[0] =  'Fedor Bedroom Chat 2':
 	end
 end
 
-if $ARGS[0] =  'Private Chat':
+if $ARGS[0] = 'Private Chat':
 	*clr & cla
 	menu_off = 1
 	gs'stat'
@@ -3444,7 +3447,7 @@ if $ARGS[0] =  'Private Chat':
 	act 'Follow Fedor to his bedroom':gt 'FedorEv4', 'Dimka Help'
 end
 
-if $ARGS[0] =  'Fedor Shelter':
+if $ARGS[0] = 'Fedor Shelter':
 	*clr & cla
 	menu_off = 1
 	FedorShelter = 1
@@ -3457,7 +3460,7 @@ if $ARGS[0] =  'Fedor Shelter':
 	act 'Leave room':gt 'FedorEv4', 'Hallway'
 end
 
-if $ARGS[0] =  'Fedor Shelter 2':
+if $ARGS[0] = 'Fedor Shelter 2':
 	*clr & cla
 	menu_off = 1
 	FedorKozHome = 1
@@ -3472,7 +3475,7 @@ if $ARGS[0] =  'Fedor Shelter 2':
 	act 'Finish':gt 'FedorEv4', 'Kitchen'
 end
 
-if $ARGS[0] =  'Dimka Help':
+if $ARGS[0] = 'Dimka Help':
 	*clr & cla
 	menu_off = 1
 	minut += 5
@@ -3500,7 +3503,7 @@ if $ARGS[0] =  'Dimka Help':
 	end	
 end
 
-if $ARGS[0] =  'Dimka Aftermath':
+if $ARGS[0] = 'Dimka Aftermath':
 	*clr & cla
 	menu_off = 1
 	FedorvsDimka = 3
@@ -3526,7 +3529,7 @@ if $ARGS[0] =  'Dimka Aftermath':
 	end
 end
 
-if $ARGS[0] =  'Home Entrance':
+if $ARGS[0] = 'Home Entrance':
 	*clr & cla
 	$menu_loc = 'FedorEv4'
 	$menu_arg = 'Home Entrance'
@@ -3539,7 +3542,7 @@ if $ARGS[0] =  'Home Entrance':
 	act 'Knock on the door':gt 'FedorEv4', 'Home Entrance 2'
 end
 
-if $ARGS[0] =  'Home Entrance 2':
+if $ARGS[0] = 'Home Entrance 2':
 	*clr & cla
 	$menu_loc = 'FedorEv4'
 	$menu_arg = 'Home Entrance 2'
@@ -3551,7 +3554,7 @@ if $ARGS[0] =  'Home Entrance 2':
 		act 'Enter house':gt 'FedorEv4', 'Hallway'
 	elseif week <= 5 and hour >= 19:
 		gt 'FedorEv4', 'Home Entrance 3'
-	elseif  week > 5 and hour > 10:
+	elseif week > 5 and hour > 10:
 		'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></left>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></left>'
 		'You knock on the door until Regina opens it and invites you inside.'
@@ -3562,7 +3565,7 @@ if $ARGS[0] =  'Home Entrance 2':
 	end
 end
 
-if $ARGS[0] =  'Home Entrance 3':
+if $ARGS[0] = 'Home Entrance 3':
 	*clr & cla
 	menu_off = 1
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'

+ 20 - 4
locations/Gadhouse.qsrc

@@ -554,7 +554,11 @@ if $ARGS[0] = 'intro':
 		'You tiredly open your eyes seeing your <<$npc_nickname[''A29'']>> standing over you, "Fifteen more minutes..."'
 		'Your <<$npc_nickname[''A29'']>> lets out a loud sigh, "No, up now!" as she yanks the cover off...'
 		'"<<$npc_nickname[''A29'']>>!" you exclaim, as you feel a slight cold breeze hit your body.'
-		'"Listen!, I''m heading back to Pavlovsk this morning, and I don''t want to hear excuses, <<$pcs_nickname>>. The summer holidays will be over soon and you need to get used to waking up early, for when school starts. So, from now on set your alarm, so you can wake up at a reasonable time." <<$npc_nickname[''A29'']>> says as she stares at you expectantly.'
+		if month = 6:
+			'"Listen!, I''m heading back to Pavlovsk this morning, and I don''t want to hear excuses, <<$pcs_nickname>>. You said you''d help out your grandparents during the summer holidays. So, from now on set your alarm, so you can wake up at a reasonable time." <<$npc_nickname[''A29'']>> says as she stares at you expectantly.'
+		else
+			'"Listen!, I''m heading back to Pavlovsk this morning, and I don''t want to hear excuses, <<$pcs_nickname>>. The summer holidays will be over soon and you need to get used to waking up early, for when school starts. So, from now on set your alarm, so you can wake up at a reasonable time." <<$npc_nickname[''A29'']>> says as she stares at you expectantly.'
+		end
 		act 'Get up':
 			cla & *clr
 			minut += 2
@@ -562,7 +566,11 @@ if $ARGS[0] = 'intro':
 			'<center><H4>Your Grandparents'' Cottage</H4></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
 			*nl
-			'As soon as you get off your now coverless bed, your <<$npc_nickname[''A29'']>> is quick to resume her nagging, telling you again what you already heard from her a few moments ago. "Summer is almost over, you can''t sleep in anymore, not even for another fifteen minutes." She''s not even looking at you while she talks, but luckily for you that means she misses you rolling your eyes.'
+			if month = 6:
+				'As soon as you get off your now coverless bed, your <<$npc_nickname[''A29'']>> is quick to resume her nagging, telling you again what you already heard from her a few moments ago. "The work around the farm normally gets done in the morning, so you can''t sleep in anymore, not even for another fifteen minutes." She''s not even looking at you while she talks, but luckily for you that means she misses you rolling your eyes.'
+			else
+			'	As soon as you get off your now coverless bed, your <<$npc_nickname[''A29'']>> is quick to resume her nagging, telling you again what you already heard from her a few moments ago. "Summer is almost over, you can''t sleep in anymore, not even for another fifteen minutes." She''s not even looking at you while she talks, but luckily for you that means she misses you rolling your eyes.'
+			end
 			'"What are you going to do when school starts, or when you get a job? You better get into the habit of setting your alarm so you can wake up bright and early."'
 			act 'Continue':
 				cla & *clr
@@ -572,7 +580,11 @@ if $ARGS[0] = 'intro':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
 				*nl
 				'You let out an exasperated sigh, "Yeah, yeah I know, you told me that already. So, how early are we talking?"'
-				'Your <<$npc_nickname[''A29'']>> shoots you a sharp look and you know to fix your attitude or else. "Well, depends on what you plan to do in the morning. There''s showering and brushing your teeth, doing your hair and then makeup and shaving if you really need to. If I remember right...Anya used to wake up at 06:00 for school. Besides, while you are staying at your grandparents house, you should be up extra early helping them tend to the farm, this isn''t a holiday camp!"'
+				if month = 6:
+					'Your <<$npc_nickname[''A29'']>> shoots you a sharp look and you know to fix your attitude or else. "Well, depends on what you plan to do in the morning. There''s showering and brushing your teeth, doing your hair and then makeup and shaving if you really need to. If I remember right...Anya used to wake up at 06:00 when she slept here. Besides, while you are staying at your grandparents house, you should be up extra early helping them tend to the farm, this isn''t a holiday camp!"'
+				else
+					'Your <<$npc_nickname[''A29'']>> shoots you a sharp look and you know to fix your attitude or else. "Well, depends on what you plan to do in the morning. There''s showering and brushing your teeth, doing your hair and then makeup and shaving if you really need to. If I remember right...Anya used to wake up at 06:00 for school. Besides, while you are staying at your grandparents house, you should be up extra early helping them tend to the farm, this isn''t a holiday camp!"'
+				end
 				act 'Continue':
 					cla & *clr
 					minut += 2
@@ -581,7 +593,11 @@ if $ARGS[0] = 'intro':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
 					*nl
 					'"You want me to wake up that early?!" You huff. "Can''t I wake up at like... 07:00?"'
-					'Your <<$npc_nickname[''A29'']>> shrugs. "You could, but then you might have to cut corners or even end up running late to school, and I won''t be having any of that. Your teachers won''t either," she warns you before making her way outside. "Oh, don''t forget; when you get back to Pavlovsk, you need to head down to the clinic and see the gynecologist for a check up. Not just once, but every month," she adds quickly.'
+					if month = 6:
+						'Your <<$npc_nickname[''A29'']>> shrugs. "You could, but then you might have to cut corners or your grandparents will have started work without you, and I won''t be having any of that." she warns you before making her way outside. "Oh, don''t forget; when you get back to Pavlovsk, you need to head down to the clinic and see the gynecologist for a check up. Not just once, but every month," she adds quickly.'
+					else
+						'Your <<$npc_nickname[''A29'']>> shrugs. "You could, but then you might have to cut corners or even end up running late to school, and I won''t be having any of that. Your teachers won''t either," she warns you before making her way outside. "Oh, don''t forget; when you get back to Pavlovsk, you need to head down to the clinic and see the gynecologist for a check up. Not just once, but every month," she adds quickly.'
+					end
 					act 'But why do I--':
 						cla & *clr
 						minut += 2

+ 5 - 1
locations/NewCloShop.qsrc

@@ -120,7 +120,11 @@ if $ARGS[0] = 'changingroom':
 			act 'Get dressed and go back to the store': gt 'NewCloShop', 'changingend'
 		end
 	end
-	act 'Get dressed and go back to the store': gt 'NewCloShop', 'changingend'
+	if $clothingworntype = 'nude':
+		act 'Get dressed and go back to the store': gt 'NewCloShop', 'changingend'
+	else
+		act 'Go back to the store': gt 'NewCloShop', 'changingend'
+	end
 end
 
 if $ARGS[0] = 'dressingclothes':

+ 1 - 0
locations/Sgrup.qsrc

@@ -12,6 +12,7 @@ if $loc = 'gschool_grounds' or $loc = 'gschool_lunch':
 	'You stay in the cafeteria where some of the teachers are eating or watching over the kids making sure there is no trouble.'
 end
 *nl
+count1 = 0
 i = 0
 '<center><table cellspacing="3">'
 :markgruploop

+ 1 - 0
locations/Sgrup1.qsrc

@@ -12,6 +12,7 @@ if $loc = 'gschool_grounds' or $loc = 'gschool_lunch':
 	'You decide to spend your break in a classroom. As you enter, you find several of your classmates already sitting there: the smart kids decided to get an early start on their homework assignments, while the outcasts are mostly hiding away from everyone else, hoping that no one will pick on them today.'
 end
 *nl
+count1 = 0
 i = 0
 '<center><table cellspacing="3">'
 :markgruploop

+ 1 - 0
locations/Sgrup2.qsrc

@@ -12,6 +12,7 @@ if $loc = 'gschool_grounds' or $loc = 'gschool_lunch':
 	'When the break finally comes, the girls wander through the hallways of the school, gossiping about pretty much everyone they know. The guys are standing around in small groups, some of them sneaking off to have a smoke behind the school building. The cool kids are hanging out in one area, and on the other side of the hallway the sporty kids are talking about their upcoming competitions.'
 end
 *nl
+count1 = 0
 i = 0
 '<center><table cellspacing="3">'
 :markgruploop

+ 1 - 0
locations/Sgrup3.qsrc

@@ -12,6 +12,7 @@ if $loc = 'gschool_grounds' or $loc = 'gschool_lunch':
 	'When the break finally comes, the girls wander through the hallways of the school, gossiping about pretty much everyone they know. The guys are standing around in small groups, some of them sneaking off to have a smoke behind the school building. The cool kids are hanging out in one area, and on the other side of the hallway the sporty kids are talking about their upcoming competitions.'
 end
 *nl
+count1 = 0
 i = 0
 '<center><table cellspacing="3">'
 :markgruploop

+ 1 - 0
locations/Sgrup4.qsrc

@@ -12,6 +12,7 @@ if $loc = 'gschool_grounds' or $loc = 'gschool_lunch':
 	'You need to use the restroom and as you enter you notice a lot of beautiful girls from your school there. They check their make-up, doing minor touch-ups while they gossip about their classmates who happen to not be there. Some people are standing by the windows, smoking. The Gopniks from your class are standing near the toilets.'
 end
 *nl
+count1 = 0
 i = 0
 '<center><table cellspacing="3">'
 :markgruploop

+ 1 - 0
locations/Sgrup5.qsrc

@@ -12,6 +12,7 @@ if $loc = 'gschool_grounds' or $loc = 'gschool_lunch':
 	'You decide to spend your break in a classroom. As you enter, you find several of your classmates already sitting there: the smart kids decided to get an early start on their homework assignments, while the outcasts are mostly hiding away from everyone else, hoping that no one will pick on them today.'
 end
 *nl
+count1 = 0
 i = 0
 '<center><table cellspacing="3">'
 :markgruploop

+ 2 - 0
locations/SgrupDisco.qsrc

@@ -11,6 +11,8 @@ act 'Move away':gt $loc, $metka
 '<center><b><font color="maroon">Disco</font></b></center>'
 !'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_yaho.jpg"></center>'
 *nl
+count1 = 0
+count2 = 0
 i = 0
 '<center><table cellspacing="3">'
 :markgruploop

+ 2 - 0
locations/anushapt.qsrc

@@ -1331,6 +1331,8 @@ if $ARGS[0] = 'livingroom':
 end
 
 if $ARGS[0] = 'kitchen':
+	$loc = 'anushapt'
+	$metka = 'kitchen'
 	$menu_loc = 'anushapt'
 	$menu_arg = 'kitchen'
 	menu_off = 0

+ 5 - 3
locations/gaptek.qsrc

@@ -252,7 +252,7 @@ if $ARGS[0] = 'buy_condoms':
 		gap_condom_count += 1
 		gaprezikday = daystart
 		gs 'stat'
-		if npc_QW['A29'] < 3:gaogorod += gap_condom_count
+		if npc_QW['A29'] < 3:gaogorod += 5
 		$gardmess = '<center><font color="green">You bought 5 <b>Condoms</b>.</font></center><br>You pay for the condoms and quickly put them in your pocket, before anyone sees you buy them.'
 		*nl
 		gt 'gaptek', 'garden'
@@ -270,7 +270,7 @@ if $ARGS[0] = 'buy_preg_test':
 		gap_preg_count += 1
 		gapregday = daystart
 		gs 'stat'
-		if npc_QW['A29'] < 3:gaogorod += gap_preg_count
+		if npc_QW['A29'] < 3:gaogorod += 5
 		$gardmess = '<center><font color="green">You bought 1 <b>Pregnancy test</b>.</font></center><br>You pay for the pregnancy tests and quickly put them in your pocket, before anyone sees you buy them.'
 		*nl
 		gt 'gaptek', 'garden'
@@ -289,7 +289,7 @@ if $ARGS[0] = 'buy_lube':
 		gap_lub_count += 1
 		galubriday = daystart
 		gs 'stat'
-		if npc_QW['A29'] < 3:gaogorod += gap_lub_count
+		if npc_QW['A29'] < 3:gaogorod += 3
 		$gardmess = '<center><font color="green">You bought 1 <b>Lubricant</b>.</font></center><br>You pay for the lubricant and quickly put the tubes in your pocket, before anyone sees you buy them.'
 		*nl
 		gt 'gaptek', 'garden'
@@ -306,6 +306,7 @@ if $ARGS[0] = 'buy_birth_control':
 		money -= 1870
 		gap_bc_count += 1
 		gatabletkiday = daystart
+		if npc_QW['A29'] < 3:gaogorod += 5
 		gs 'stat'
 		$gardmess = '<center><font color="green">You bought 1 <b>Birth control pills</b>.</font></center><br>You pay for the birth control pills and quickly put the strips in your pocket, before anyone sees you buy them.'
 		*nl
@@ -318,6 +319,7 @@ if $ARGS[0] = 'buy_enema':
 	money -= 1250
 	$gardmess = '<center><font color="green">You bought an Enema kit</font></center><br>You pay for the enema kit and quickly ask your aunt to put it in a paper bag, before the other customers see it.'
 	*nl
+	if npc_QW['A29'] < 3:gaogorod += 10
 	gt 'gaptek', 'garden'
 end
 

+ 1 - 0
locations/gschool_lessons.qsrc

@@ -3441,6 +3441,7 @@ if $ARGS[0] = 'npc_data':
 	$npcGo[62] = '<a href="exec:numnpc = 62 & gt ''Snpc''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a>'
 	$npcSelfie[62] = '<a href="exec:numnpc = 62 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a>'
 
+
 !!
 !!===========================Teachers=======================
 !!

+ 119 - 263
locations/gschool_socialchg.qsrc

@@ -434,101 +434,8 @@ if $ARGS[0] = 'gopnik initiation':
 		minut += 10
 		gs 'stat'
 
-		act 'Agree':
-			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstorein.jpg"></center>'
-			'You nod your head. "Got it." Then you grin at them and add. "Lets go get some booze bitches."'
-			'Lena snorts a slight laugh and Lera smiles a bit, then they head inside. You wait a few minutes then follow them in.'
-			gs 'stat'
-
-			act 'Wait for distraction':
-				cla & *clr
-				'<center><video src="images/locations/pavlovsk/events/gopnikinvite/distraction.mp4"></center>'
-				'You make your way towards the back, keeping an eye on Lena and Lera who are standing near the checkout and then they start making out. Lera seems to be really into it, pulling Lena back in for further kisses having her hands roam all over Lena''s body. Well it seems to have worked as the only other customer and the man behind the counter are both staring at them.'
-				minut += 5
-				gs 'stat'
-
-				act 'Steal':
-					cla & *clr
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/steal.jpg"></center>'
-					grupvalue[4] += 5
-					gs 'gschool_socialchg', 'group_rel_change','gopniks', 5
-					minut += 5
-					gs 'stat'
-					LenaDis = 1 & LeraDis = 1
-
-					if bag = 1:
-						!!purse not sure the code
-						'You grab one bottle of the most expansive vodka on the shelf and stuff it into your purse, then you grab another and do the same. You take a last look around making sure no one is watching you. You make your way to the door, you can feel your heart pounding inside your chest. You walk up to the doors and push them open walking out, expecting at any moment for someone to yell that you''re stealing. Yet no one does, once outside you rush around the side of the building and await your accomplices. A few moments later Lera and Lena join you all smiles, you show them the bottles and the whoop.'
-						'Lena with a big grin starts to take off. "Come on they''re waiting for us by now." With that she takes off running with Lera right behind and you bringing up the rear.'
-
-						act 'Go to the party': gt 'gschool_socialchg', 'gopnik party'
-					elseif defaultcoat ! 0 and temper < 0:
-						!!no purse but wearing a coat
-						'You grab one bottle of the most expansive vodka on the shelf and hide it under your coat, then you grab another and do the same. You take a last look around making sure no one is watching you. You make your way to the door, you can feel your heart pounding inside your chest. You walk up to the doors and push them open walking out, expecting at any moment for someone to yell that you''re stealing. Yet no one does, once outside you rush around the side of the building and await your accomplices. A few moments later Lera and Lena join you all smiles, you show them the bottles and the whoop.'
-						'Lena with a big grin starts to take off. "Come on they''re waiting for us by now." With that she takes off running with Lera right behind and you bringing up the rear.'
-
-						act 'Go to the party': gt 'gschool_socialchg', 'gopnik party'
-					else
-						'You grab one bottle of the most expansive vodka on the shelf and hide it under your top, then you grab another and do the same. You take a last look around making sure no one is watching you. You make your way to the door, you can feel your heart pounding inside your chest. You walk up to the doors and push them open walking out, expecting at any moment for someone to yell that you''re stealing. Yet no one does, once outside you rush around the side of the building and await your accomplices. A few moments later Lera and Lena join you all smiles, you show them the bottles and the whoop.'
-						'Lena with a big grin starts to take off. "Come on they''re waiting for us by now." With that she takes off running with Lera right behind and you bringing up the rear.'
-
-						act 'Go to the party': gt 'gschool_socialchg', 'gopnik party'
-					end
-				end
-				act 'Change your mind':
-					cla & *clr
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
-					'Your heart is pounding so hard it feels like it is going to come out of your chest. You look around and decide that you can''t do this. So you turn and walk outside. A few minutes later Lena and Lera join you, they are looking at you. Obviously trying to see where you got the bottles hidden. You blush slightly and look down. "Sorry I couldn''t do it."'
-					'Lena goes red with rage and crowds you, pushing you up against the side of the building. "Are you fucking kidding me? You fucking useless bitch, why are you even here if all you''re going to do is waste our time. I should beat your fucking ass!" She looks around and notices some people are watching what''s going on with her yelling. She then looks back at you. "You''re fucking lucky bitch, stay the fuck away from us from now on or I will give you an epic ass beating." With that she turns and leaves, with Lera smirking at you, obviously looking forward to pick on you from now on.'
-					act 'Stay silent':
-						cla & *clr
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
-						'You stay silent and watch them walk away. You know you just painted a target on your back to the gopniks, but you just couldn''t bring yourself to steal. Sighing you walk back out to the street.'
-						grupvalue[4] -= 20
-						gs 'gschool_socialchg', 'group_rel_change','gopniks', -10
-						gs 'stat'
-
-						!!have this auto dump you after the text back onto the residential street of Pavlovsk
-						act 'Leave the gang': gt 'pavResidential'
-					end
-					act 'Beg for another chance':
-						cla & *clr
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
-						'As they start to walk off you catch up real quick. "Wait please, give me another chance."'
-						'Lera gives you a slight push away, while Lena says. "You had your chance and you blew it."'
-						'Feeling desperate you say. "Please! I''ll do anything!" you beg.'
-						'Finally they stop at those words and turn to look at you again. Lena gives you a once over, while Lera gets a devious look on her face then she leans over and whispers to Lena, who listens, laughs a bit then nods. "Ok slut, you want in that bad? And you''re willing to do anything for the gopniks to become ones of us?" You nod your head yes.'
-						'She crosses her arms and gives you a look of slight disdain. "Fine, then you can be the group bitch. We will take you to the party and you have to do anything anyone fucking tells you. If I tell you to lick my fucking boots, then you will lick my boots. If one of the guys tells you to suck his fucking dick, then you suck his fucking dick. If the guys decide to pull a train on you then you let them. Got it? You still want in that badly?" Lera is grinning like a wolf, as they wait for your reply.'
-						minut += 5
-						gs 'stat'
-
-						act 'Yes, I''ll do anything':
-							cla & *clr
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
-							'You nod your head yes. "Ok I''ll do anything, I will be anything you guys want me to be."'
-							'They exchange looks and then finally Lena shurgs and says to Lera. "You were right." Then she looks at you, "Well come on then slut." With that she turns and leads you toward the party as she texts something on her phone.'
-							gs 'stat'
-
-							act 'Go to the party': gt 'gschool_socialchg', 'gopnik slut'
-						end
-						act 'No':
-							cla & *clr
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
-							'You shake your head no. "I''m not a slut."'
-							'They turn around and start walking away again. "Then fuck you bitch!" and with that they leave you behind. You know you are a target for the gopniks now, but better than being their personal slut. You turn and make your way back to the street.'
-							grupvalue[4] -= 20
-							gs 'gschool_socialchg', 'group_rel_change','gopniks', -10
-							gs 'stat'
-
-							!!have this auto dump you after the text back onto the residential street of Pavlovsk
-							act 'Leave the gang': gt 'pavResidential'
-						end
-					end
-				end
-			end
-		end
+		act 'Agree': gt 'gschool_socialchg', 'agreesteal'
+			
 		act 'Refuse':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
@@ -536,97 +443,8 @@ if $ARGS[0] = 'gopnik initiation':
 			'Lena goes a bit red with anger, "Then why the fuck are you wasting our time? If you weren''t serious about joining us you should have never said you would." She takes a deep breath. "You going to do this or not?"'
 			gs 'stat'
 
-			act 'Agree':
-				cla & *clr
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstorein.jpg"></center>'
-				'You nod your head. "Got it." Then you grin at them and add. "Lets go get some booze bitches."'
-				'Lena snorts a slight laugh and Lera smiles a bit, then they head inside. You wait a few minutes then follow them in.'
-				gs 'stat'
-
-				act 'Wait for distraction':
-					cla & *clr
-					'<center><video src="images/locations/pavlovsk/events/gopnikinvite/distraction.mp4"></center>'
-					'You make your way towards the back, keeping an eye on Lena and Lera. Who are standing near the checkout and then they start making out. Lera seems to be really into it, pulling Lena back in for further kisses while her hands roam all over Lena''s body. Well it seems to have worked as the only other customer and the man behind the counter are both staring at them.'
-					minut += 5
-					gs 'stat'
-
-					act 'Steal':
-						cla & *clr
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/steal.jpg"></center>'
-						grupvalue[4] += 5
-						gs 'gschool_socialchg', 'group_rel_change','gopniks', 5
-						minut += 5
-						gs 'stat'
-						LenaDis = 1 & LeraDis = 1
-						if bag = 1:
-							'You grab one bottle of the most expansive vodka on the shelf and stuff it into your purse, then you grab another and do the same. You take a last look around making sure no one is watching you. You make your way to the door, you can feel your heart pounding inside your chest. You walk up to the doors and push them open walking out, expecting at any moment for someone to yell that you''re stealing. Yet no one does, once outside you rush around the side of the building and await your accomplices. A few moments later Lera and Lena join you all smiles, you show them the bottles and the whoop.'
-							'Lena with a big grin starts to take off. "Come on they''re waiting for us by now." With that she takes off running with Lera right behind and you bringing up the rear.'
-
-							act 'Go to the party': gt 'gschool_socialchg', 'gopnik party'
-						elseif defaultcoat ! 0 and temper < 0:
-							'You grab one bottle of the most expansive vodka on the shelf and hide it under your coat, then you grab another and do the same. You take a last look around making sure no one is watching you. You make your way to the door, you can feel your heart pounding inside your chest. You walk up to the doors and push them open walking out, expecting at any moment for someone to yell that you''re stealing. Yet no one does, once outside you rush around the side of the building and await your accomplices. A few moments later Lera and Lena join you all smiles, you show them the bottles and the whoop.'
-							'Lena with a big grin starts to take off. "Come on they''re waiting for us by now." With that she takes off running with Lera right behind and you bringing up the rear.'
-
-							act 'Go to the party': gt 'gschool_socialchg', 'gopnik party'
-						else
-							'You grab one bottle of the most expansive vodka on the shelf and hide it under your top, then you grab another and do the same. You take a last look around making sure no one is watching you. You make your way to the door, you can feel your heart pounding inside your chest. You walk up to the doors and push them open walking out, expecting at any moment for someone to yell that you''re stealing. Yet no one does, once outside you rush around the side of the building and await your accomplices. A few moments later Lera and Lena join you all smiles, you show them the bottles and the whoop.'
-							'Lena with a big grin starts to take off. "Come on they''re waiting for us by now." With that she takes off running with Lera right behind and you bringing up the rear.'
-
-							act 'Go to the party': gt 'gschool_socialchg', 'gopnik party'
-						end
-					end
-				end
-				act 'Change your mind':
-					cla & *clr
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
-					'Your heart is pounding so hard it feels like it is going to come out of your chest. You look around and decide that you can''t do this. So you turn and walk outside. A few minutes later Lena and Lera join you, they are looking at you. Obviously trying to see where you got the bottles hidden. You blush slightly and look down. "Sorry I couldn''t do it."'
-					'Lena goes red with rage and crowds you, pushing you up against the side of the building. "Are you fucking kidding me? You fucking useless bitch, why are you even here if all you''re going to do is waste our time. I should beat your fucking ass!" She looks around and notices some people are watching what''s going on with her yelling. She then looks back at you. "You''re fucking lucky bitch, stay the fuck away from us from now on or I will give you an epic ass beating." With that she turns and leaves, with Lera smirking at you, obviously looking forward to pick on you from now on.'
-					gs 'stat'
-
-					act 'Stay silent':
-						cla & *clr
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
-						'You stay silent and watch them walk away. You know you just painted a target on your back to the gopniks, but you just couldn''t bring yourself to steal. Sighing you walk back out to the street.'
-						grupvalue[4] -= 20
-						gs 'gschool_socialchg', 'group_rel_change','gopniks', -10
-						gs 'stat'
-						act 'Leave the gang': gt 'pavResidential'
-					end
-					act 'Beg for another chance':
-						cla & *clr
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
-						'As they start to walk off you catch up real quick. "Wait please, give me another chance."'
-						'Lera gives you a slight push away, while Lena says. "You had your chance and you blew it."'
-						'Feeling desperate you say. "Please! I''ll do anything!" you beg.'
-						'Finally they stop at those words and turn to look at you again. Lena gives you a once over, while Lera gets a devious look on her face then she leans over and whispers to Lena, who listens, laughs a bit then nods. "Ok slut, you want in that bad? And you''re willing to do anything for the gopniks to become ones of us?" You nod your head yes.'
-						'She crosses her arms and gives you a look of slight disdain. "Fine, then you can be the group bitch. We will take you to the party and you have to do anything anyone fucking tells you. If I tell you to lick my fucking boots, then you will lick my boots. If one of the guys tells you to suck his fucking dick, then you suck his fucking dick. If the guys decide to pull a train on you then you let them. Got it? You still want in that badly?" Lera is grinning like a wolf, as they wait for your reply.'
-						minut += 5
-						gs 'stat'
-
-						act 'Yes, I''ll do anything':
-							cla & *clr
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
-							'You nod your head yes. "Ok I''ll do anything, I will be anything you guys want me to be."'
-							'They exchange looks and then finally Lena shrugs and says to Lera. "You were right." Then she looks at you, "Well come on then slut." With that she turns and leads you toward the party as she texts something on her phone.'
-							gs 'stat'
-
-							act 'Go to the party': gt 'gschool_socialchg', 'gopnik slut'
-						end
-						act 'No':
-							cla & *clr
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
-							'You shake your head no. "I''m not a slut."'
-							'They turn around and start walking away again. "Then fuck you bitch!" and with that they leave you behind. You know you are a target for the gopniks now, but better than being their personal slut. You turn and make your way back to the street.'
-							grupvalue[4] -= 20
-							gs 'gschool_socialchg', 'group_rel_change','gopniks', -10
-							gs 'stat'
-
-							!!have this auto dump you after the text back onto the residential street of Pavlovsk
-							act 'Leave the gang': gt 'pavResidential'
-						end
-					end
-				end
-			end
+			act 'Agree': gt 'gschool_socialchg', 'agreesteal'
+			
 			act 'Offer to be a distraction':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
@@ -670,91 +488,129 @@ if $ARGS[0] = 'gopnik initiation':
 					'Lena shoves you. "Then stop wasting our fucking time bitch and get lost." You know you are about to lose all standing with the gopniks.'
 					gs 'stat'
 
-					act 'Walk off':
-						cla & *clr
-						grupvalue[4] -= 20
-						gs 'gschool_socialchg', 'group_rel_change','gopniks', -10
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
-						'You shake your head again. "Sorry I wasted your time then." With that you walk off, while Lena and Lera shout out all kind of names at you. You know you''ve made a target of yourself to the gopniks but you''re no thief. You don''t even know why you thought joining them was a good idea in the first place.'
-						!!have this auto dump you after the text back onto the residential street of Pavlovsk
-						act 'Leave the gang': gt 'pavResidential'
-					end
-					act 'Ask if there is something else you can do':
-						cla & *clr
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
-						'You know you''re about to blow your chance to be a gopnik and you are feeling desperate now. "Maybe there is something else I can do, some other way to be useful to you guys?"'
-						'They look at you as you utter those words. Lena gives you a once over, while Lera gets a devious look on her face as she leans over and whispers something to Lena, who listens, laughs a bit then nods. "Ok slut, you want in that bad? Are you willing to do anything for the gopniks to become one of us?" You nod your head yes.'
-						'She crosses her arms and gives you a look of slight disdain. "Fine, then you can be the group bitch. We will take you to the party and you have to do anything anyone fucking tells you. If I tell you to lick my fucking boots, then you will lick my boots. If one of the guys tells you to suck his fucking dick, then you suck his fucking dick. If the guys decide to pull a train on you then you let them. Got it? You still want in that badly?" Lera is grinning like a wolf, as they wait for your reply.'
-						gs 'stat'
-						act 'Yes, I''ll do anything':
-							cla & *clr
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
-							'You nod your head yes. "Ok I''ll do anything, I will be anything you guys want me to be."'
-							'They exchange looks and then finally Lena shrugs and says to Lera. "You were right." Then she looks at you, "Well come on then slut." With that she turns and leads you toward the party as she texts something on her phone.'
-							gs 'stat'
-
-							act 'Go to the party': gt 'gschool_socialchg', 'gopnik slut'
-						end
-						act 'No':
-							cla & *clr
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
-							'You shake your head no. "I''m not a slut."'
-							'They turn around and start walking away again. "Then fuck you bitch!" and with that they leave you behind. You know you are a target for the gopniks now, but better than being their personal slut. You turn and make your way back to the street.'
-							grupvalue[4] -= 20
-							gs 'gschool_socialchg', 'group_rel_change','gopniks', -10
-							gs 'stat'
-							!!have this auto dump you after the text back onto the residential street of Pavlovsk
-							act 'Leave the gang': gt 'pavResidential'
-						end
-					end
+					act 'Walk off': gt 'gschool_socialchg', 'walkoff'
+					act 'Ask if there is something else you can do': gt 'gschool_socialchg', 'somethingelse'
 				end
 			end
-			act 'Walk off':
-				cla & *clr
-				grupvalue[4] -= 20
-				gs 'gschool_socialchg', 'group_rel_change','gopniks', -10
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
-				'You shake your head again. "Sorry I wasted your time then." With that you walk off, while Lena and Lera shout out all kind of names at you. You know you''ve made a target of yourself to the gopniks but you''re no thief. You don''t even know why you thought joining them was a good idea in the first place.'
+			act 'Walk off': gt 'gschool_socialchg', 'walkoff'
+			act 'Ask if there is something else you can do': gt 'gschool_socialchg', 'somethingelse'
+		end
+	end
+end
 
-				!!have this auto dump you after the text back onto the residential street of Pavlovsk
-				act 'Leave the gang': gt 'pavResidential'
-			end
-			act 'Ask if there is something else you can do':
-				cla & *clr
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
-				'You know you''re about to blow your chance to be a gopnik and you are feeling desperate now. "Maybe there is something else I can do, some other way to be useful to you guys?"'
-				'They look at you as you utter those words. Lena gives you a once over, while Lera gets a devious look on her face as she leans over and whispers something to Lena, who listens, laughs a bit then nods. "Ok slut, you want in that bad? Are you willing to do anything for the gopniks to become one of us?" You nod your head yes.'
-				'She crosses her arms and gives you a look of slight disdain. "Fine, then you can be the group bitch. We will take you to the party and you have to do anything anyone fucking tells you. If I tell you to lick my fucking boots, then you will lick my boots. If one of the guys tells you to suck his fucking dick, then you suck his fucking dick. If the guys decide to pull a train on you then you let them. Got it? You still want in that badly?" Lera is grinning like a wolf, as they wait for your reply.'
-				gs 'stat'
+if $ARGS[0] = 'walkoff':
+	cla & *clr
+	grupvalue[4] -= 20
+	gs 'gschool_socialchg', 'group_rel_change','gopniks', -10
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
+	'You shake your head again. "Sorry I wasted your time then." With that you walk off, while Lena and Lera shout out all kind of names at you. You know you''ve made a target of yourself to the gopniks but you''re no thief. You don''t even know why you thought joining them was a good idea in the first place.'
 
-				act 'Yes, I''ll do anything':
-					cla & *clr
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
-					'You nod your head yes. "Ok I''ll do anything, I will be anything you guys want me to be."'
-					'They exchange looks and then finally Lena shrugs and says to Lera. "You were right." Then she looks at you, "Well come on then slut." With that she turns and leads you toward the party as she texts something on her phone.'
-					gs 'stat'
+	!!have this auto dump you after the text back onto the residential street of Pavlovsk
+	act 'Leave the gang': gt 'pavResidential'
+end
 
-					act 'Go to the party': gt 'gschool_socialchg', 'gopnik slut'
-				end
-				act 'No':
-					cla & *clr
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
-					'You shake your head no. "I''m not a slut."'
-					'They turn around and start walking away again. "Then fuck you bitch!" and with that they leave you behind. You know you are a target for the gopniks now, but better than being their personal slut. You turn and make your way back to the street.'
-					grupvalue[4] -= 20
-					gs 'gschool_socialchg', 'group_rel_change','gopniks', -10
-					gs 'stat'
+if $ARGS[0] =  'somethingelse':
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
+	'You know you''re about to blow your chance to be a gopnik and you are feeling desperate now. "Maybe there is something else I can do, some other way to be useful to you guys?"'
+	'They look at you as you utter those words. Lena gives you a once over, while Lera gets a devious look on her face as she leans over and whispers something to Lena, who listens, laughs a bit then nods. "Ok slut, you want in that bad? Are you willing to do anything for the gopniks to become one of us?" You nod your head yes.'
+	'She crosses her arms and gives you a look of slight disdain. "Fine, then you can be the group bitch. We will take you to the party and you have to do anything anyone fucking tells you. If I tell you to lick my fucking boots, then you will lick my boots. If one of the guys tells you to suck his fucking dick, then you suck his fucking dick. If the guys decide to pull a train on you then you let them. Got it? You still want in that badly?" Lera is grinning like a wolf, as they wait for your reply.'
+	gs 'stat'
 
-					!!have this auto dump you after the text back onto the residential street of Pavlovsk
-					act 'Leave the gang': gt 'pavResidential'
-				end
+	act 'Yes, I''ll do anything': gt 'gschool_socialchg', 'doanything'
+	act 'No': gt 'gschool_socialchg', 'noslut'
+end
+
+if $ARGS[0] = 'agreesteal':
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstorein.jpg"></center>'
+	'You nod your head. "Got it." Then you grin at them and add. "Lets go get some booze bitches."'
+	'Lena snorts a slight laugh and Lera smiles a bit, then they head inside. You wait a few minutes then follow them in.'
+	gs 'stat'
+
+	act 'Wait for distraction':
+		cla & *clr
+		'<center><video src="images/locations/pavlovsk/events/gopnikinvite/distraction.mp4"></center>'
+		'You make your way towards the back, keeping an eye on Lena and Lera. Who are standing near the checkout and then they start making out. Lera seems to be really into it, pulling Lena back in for further kisses while her hands roam all over Lena''s body. Well it seems to have worked as the only other customer and the man behind the counter are both staring at them.'
+		minut += 5
+		gs 'stat'
+
+		act 'Steal':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/steal.jpg"></center>'
+			grupvalue[4] += 5
+			gs 'gschool_socialchg', 'group_rel_change','gopniks', 5
+			minut += 5
+			gs 'stat'
+			LenaDis = 1 & LeraDis = 1
+			if bag = 1:
+				'You grab a bottle of the most expansive vodka on the shelf and stuff it into your purse, then you grab another and do the same. You take a last look around making sure no one is watching you. You make your way to the door, you can feel your heart pounding inside your chest. You walk up to the doors and push them open walking out, expecting at any moment for someone to yell that you''re stealing. Yet no one does, once outside you rush around the side of the building and await your accomplices. A few moments later Lera and Lena join you all smiles, you show them the bottles and the whoop.'
+			elseif defaultcoat ! 0 and temper < 0:
+				'You grab a bottle of the most expansive vodka on the shelf and hide it under your coat, then you grab another and do the same. You take a last look around making sure no one is watching you. You make your way to the door, you can feel your heart pounding inside your chest. You walk up to the doors and push them open walking out, expecting at any moment for someone to yell that you''re stealing. Yet no one does, once outside you rush around the side of the building and await your accomplices. A few moments later Lera and Lena join you all smiles, you show them the bottles and the whoop.'
+			else
+				'You grab a bottle of the most expansive vodka on the shelf and hide it under your top, then you grab another and do the same. You take a last look around making sure no one is watching you. You make your way to the door, you can feel your heart pounding inside your chest. You walk up to the doors and push them open walking out, expecting at any moment for someone to yell that you''re stealing. Yet no one does, once outside you rush around the side of the building and await your accomplices. A few moments later Lera and Lena join you all smiles, you show them the bottles and the whoop.'
 			end
+			'Lena with a big grin starts to take off. "Come on they''re waiting for us by now." With that she takes off running with Lera right behind and you bringing up the rear.'
+			act 'Go to the party': gt 'gschool_socialchg', 'gopnik party'
+		end
+	end
+	act 'Change your mind':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
+		'Your heart is pounding so hard it feels like it is going to come out of your chest. You look around and decide that you can''t do this. So you turn and walk outside. A few minutes later Lena and Lera join you, they are looking at you. Obviously trying to see where you got the bottles hidden. You blush slightly and look down. "Sorry I couldn''t do it."'
+		'Lena goes red with rage and crowds you, pushing you up against the side of the building. "Are you fucking kidding me? You fucking useless bitch, why are you even here if all you''re going to do is waste our time. I should beat your fucking ass!" She looks around and notices some people are watching what''s going on with her yelling. She then looks back at you. "You''re fucking lucky bitch, stay the fuck away from us from now on or I will give you an epic ass beating." With that she turns and leaves, with Lera smirking at you, obviously looking forward to pick on you from now on.'
+		gs 'stat'
+
+		act 'Stay silent':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
+			'You stay silent and watch them walk away. You know you just painted a target on your back to the gopniks, but you just couldn''t bring yourself to steal. Sighing you walk back out to the street.'
+			grupvalue[4] -= 20
+			gs 'gschool_socialchg', 'group_rel_change','gopniks', -10
+			gs 'stat'
+			act 'Leave the gang': gt 'pavResidential'
+		end
+		act 'Beg for another chance':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
+			'As they start to walk off you catch up real quick. "Wait please, give me another chance."'
+			'Lera gives you a slight push away, while Lena says. "You had your chance and you blew it."'
+			'Feeling desperate you say. "Please! I''ll do anything!" you beg.'
+			'Finally they stop at those words and turn to look at you again. Lena gives you a once over, while Lera gets a devious look on her face then she leans over and whispers to Lena, who listens, laughs a bit then nods. "Ok slut, you want in that bad? And you''re willing to do anything for the gopniks to become ones of us?" You nod your head yes.'
+			'She crosses her arms and gives you a look of slight disdain. "Fine, then you can be the group bitch. We will take you to the party and you have to do anything anyone fucking tells you. If I tell you to lick my fucking boots, then you will lick my boots. If one of the guys tells you to suck his fucking dick, then you suck his fucking dick. If the guys decide to pull a train on you then you let them. Got it? You still want in that badly?" Lera is grinning like a wolf, as they wait for your reply.'
+			minut += 5
+			gs 'stat'
+
+			act 'Yes, I''ll do anything': gt 'gschool_socialchg', 'doanything'
+			act 'No': gt 'gschool_socialchg', 'noslut'
 		end
 	end
 end
 
+if $ARGS[0] = 'doanything':
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
+	'You nod your head yes. "Ok I''ll do anything, I will be anything you guys want me to be."'
+	'They exchange looks and then finally Lena shrugs and says to Lera. "You were right." Then she looks at you, "Well come on then slut." With that she turns and leads you toward the party as she texts something on her phone.'
+	gs 'stat'
+
+	act 'Go to the party': gt 'gschool_socialchg', 'gopnik slut'
+end
+
+if $ARGS[0] = 'noslut':
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
+	'You shake your head no. "I''m not a slut."'
+	'They turn around and start walking away again. "Then fuck you bitch!" and with that they leave you behind. You know you are a target for the gopniks now, but better than being their personal slut. You turn and make your way back to the street.'
+	grupvalue[4] -= 20
+	gs 'gschool_socialchg', 'group_rel_change','gopniks', -10
+	gs 'stat'
+
+	!!have this auto dump you after the text back onto the residential street of Pavlovsk
+	act 'Leave the gang': gt 'pavResidential'
+end
+
 if $ARGS[0] = 'gopnik party':
 	menu_off = 1
 	grupvalue[2] -= 20
@@ -1103,7 +959,7 @@ if $ARGS[0] = 'tLera':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/21.jpg"></center>'
 				'"It was pretty wild kissing like that." you say.'
 				'Lera shrugs her shoulders, "It''s not the first time Lena and I pulled something like that off. We mostly do it to tease the guys as it makes them go crazy. You''re not a bad kisser <<$pcs_nickname>>. Hopefully it wasn''t the last time we do that." Lera slyly winks at you.'
-				'Immediately you start blushing as Lera starts to laugh, "Relax, tease each other all the time. It''s what we do, you will just have to get use to it." she teases you.'
+				'Immediately you start blushing as Lera starts to laugh, "Relax, we tease each other all the time. It''s what we do, you will just have to get use to it." she teases you.'
 				'You mumble something and quickly move away from her...'
 				minut += 2
 				npc_rel['A21'] += 1
@@ -1274,7 +1130,7 @@ if $ARGS[0] = 'Niko':
 			act 'Have a drink':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile2.jpg"></center>'
-				'You begin drinking as a few drops fall down your chin onto your shirt. Niko quickly grabs a napkin then begin slowly whipping the drops off of your shirt as he says, "Careful there, we wouldn''t want to that lovely shirt you''re wearing." You pause drinking to give him a light smile before saying, "Charmer are we?" Niko replies, "Only for one as beautiful as you." You shake your head before getting up and saying, "Well maybe we can do this again sometime." Niko gives you a wink before replying, "I''m looking forward to it."'
+				'You begin drinking as a few drops fall down your chin onto your shirt. Niko quickly grabs a napkin then begin slowly whipping the drops off of your shirt as he says, "Careful there, we wouldn''t want to ruin that lovely shirt you''re wearing." You pause drinking to give him a light smile before saying, "Charmer are we?" Niko replies, "Only for one as beautiful as you." You shake your head before getting up and saying, "Well maybe we can do this again sometime." Niko gives you a wink before replying, "I''m looking forward to it."'
 				gs 'stat'
 
 				act 'Head back': gt 'gschool_socialchg', 'explore'
@@ -1327,7 +1183,7 @@ if $ARGS[0] = 'office':
 				'You begin to blush as you stand there, "By the way what were you doing all alone in the room?"'
 				'"You looked fucking good tonight so I went away to rub one out." he answers while laughing.'
 				'Not sure what to say to that. "Oh... ok sorry to have bothered you then."'
-				'He laughs so more. "The real reason I''m is Vasily was pissing me off and I was about to cave his face in. Vitek always gets upset when I do that, so I came in her to cool off."'
+				'He laughs so more. "The real reason I''m here is that Vasily was pissing me off and I was about to cave his face in. Vitek always gets upset when I do that, so I came in here to cool off."'
 				minut += 2
 				gs 'stat'
 

+ 13 - 126
locations/mey_home.qsrc

@@ -131,13 +131,14 @@ end
 
 ! kitchen
 if $ARGS[0] = '1':
-	cls
+	*clr & cla
 	$loc = 'mey_home'
 	$metka = '1'
 	$locclass = 'kitr'
 	$menu_loc = 'mey_home'
 	$menu_arg = '1'
 	menu_off = 0
+	gs 'kit_din'
 	gs 'stat'
 	'<center><h4><font color="maroon">Kitchen</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/kitchen.jpg"></center>'
@@ -158,136 +159,22 @@ if $ARGS[0] = '1':
 			act 'Finish': gt 'mey_home', '1'
 		end
 	end
-	!copy acts from [gadhouse]
-	act 'Eat a full meal (0:30)':gs 'food', 'm_meal'
-
-	act 'Eat a light meal (0:20)':gs 'food', 's_meal'
-
-	act 'Have a snack (0:05)':gs 'food', 'snack'
-
-	act 'Drink some water (0:05)':gs 'beverage', 'bev_wat'
-
-	act 'Have a cup of tea (0:05)':
-		cls
-		if pcs_hydra >= 100:
-			'You don''t need any more tea.'
-		else
-			minut += 5
-			pcs_hydra += 80
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
-			pcs_mood += rand(3, 6)
-			'You make a refreshing cup of tea and everything seems a little better.'
-		end
-	
-		gs 'stat'
-
-		act 'Get up from the table':gt 'mey_home', '1'
-	end
-
-	if pranik > 0:
-		'You brought your <<pranik>> tea biscuits with you.'
 
-		act 'Drink tea with biscuits (0:05)':
-			menu_off = 1
-			cla
-			*clr
-			minut += 5
-			pranik -= 1
-			pcs_health += 30
-			pcs_mood += 30
-			pcs_energy += 20
-			pcs_hydra += 60
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
-			fat += 4
-			frost = 0
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/shared/food/food.jpg"></center>'
-			'You enjoy a cup of tea while you eat some tea biscuits. You know they''re too sweet and can''t be good for your figure, but they taste so good!'
+	act 'Eat a full meal (0:30)':gs 'food', 'm_meal'
 
-			act 'Get up from the table':gt 'mey_home', '1'
-		end
-	end
+	act 'Eat a light meal (0:25)':gs 'food', 's_meal'
 
-	if edaD > 0:
-		act 'Eat diet food (0:30)':
-			menu_off = 1
-			cla
-			*clr
-			frost = 0
-			minut += 30
-			pcs_health += 10
-			pcs_mood += 20
-			edaD -= 1
-			'<center><img <<$set_imgh>> src="images/shared/food/food.jpg"></center>'
-			if pcs_energy >= 100:
-				'You prepare a diet meal and try to eat it, but you''re really not hungry at all. You can''t finish the meal.'
-			elseif pcs_energy >= 80:
-				pcs_energy += 40
-				'You try to enjoy the diet meal, but half-way in you realize you weren''t all that hungry yet. You manage to finish the meal, but feel like it was kind of a waste to prepare it.'
-			else
-				pcs_energy += 80
-				'The diet meal is tasty, and you enjoy eating it.'
-			end
-
-			act 'Get up from the table':gt 'mey_home', '1'
-		end
-	end
+	act 'Have a snack (0:15)':gs 'food', 'snack'
 
+	dynamic $driwater
+	dynamic $dritea
+	dynamic $fill_bottle
+	dynamic $edaD
+	dynamic $pranik
 	dynamic $fatdel
-
-	if lekarstvo > 0:
-		'You have <<lekarstvo>> tablet(s) left.'
-
-		if sick > 0 and lekarday ! daystart:
-			act 'Take a pill (0:05)':
-				menu_off = 1
-				cla
-				*clr
-				minut += 5
-				lekarday = daystart
-				lekarstvo -= 1
-				sick -= sick * 20 / 100
-				if pcs_hydra < 50 : pcs_hydra += 30 else pcs_hydra +=15
-				if pcs_hydra > 100: pcs_hydra = 100
-
-				'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/lekr<<picrand>>.jpg"></center>'
-				'You swallow the pill, and shortly after you feel a bit better.'
-
-				act 'Continue':gt 'mey_home', '1'
-			end
-		end
-	end
-
-	if vitamin > 0:
-		'You have <<vitamin>> vitamin pills left.'
-
-		if vitaminday ! daystart:
-			act 'Take vitamins (0:05)':
-				menu_off = 1
-				cla
-				*clr
-
-				minut += 5
-				vitaminday = daystart
-				vitamin -= 1
-				frost = 0
-
-				if KandidozOnce = 1:Kandidoz -= 2
-				if GerpesOnce = 1:Gerpes -= 2
-				if SifacOnce = 1 and Sifilis >= 10:Sifilis -= rand(0, 1)
-
-				pcs_skin += 1
-
-				'You take some vitamins to stay healthy.'
-
-				act 'Continue':gt 'mey_home', '1'
-			end
-		end
-	end
+	dynamic $fatdel
+	dynamic $lekarstvo
+	dynamic $vitamin
 
 	gs 'events', 'read'
 

+ 81 - 0
locations/natbelEv.qsrc

@@ -2,6 +2,87 @@
 
 !! Events concerning Natasha Belova (and her mother)
 
+!! Event handling for Natasha''s storyline
+if $ARGS[0] = 'natbelQuest':
+	natbelXP += ARGS[1]
+	if NatashaQW < 10:
+		if natbelXP > 50:
+			NatashaQW = 10
+			natbelXP = 0
+		end
+	elseif NatashaQW < 20
+		if natbelXP > 10:
+			NatashaQW = 20
+			natbelXP = 0
+		end
+	elseif NatashaQW < 30
+		if natbelXP > 150:
+			NatashaQW = 30
+			natbelXP = 0
+		end
+	elseif NatashaQW < 40
+		if natbelXP > 200:
+			NatashaQW = 40
+			natbelXP = 0
+		end
+	elseif NatashaQW < 50
+		if natbelXP > 250:
+			NatashaQW = 50
+			natbelXP = 0
+		end
+	elseif NatashaQW < 60
+		if natbelXP > 300:
+			NatashaQW = 60
+			natbelXP = 0
+		end
+	elseif NatashaQW < 70
+		if natbelXP > 350:
+			NatashaQW = 70
+			natbelXP = 0
+		end
+	elseif NatashaQW < 80
+		if natbelXP > 400:
+			NatashaQW = 80
+			natbelXP = 0
+		end
+	elseif NatashaQW < 90
+		if natbelXP > 450:
+			NatashaQW = 90
+			natbelXP = 0
+		end
+	elseif NatashaQW < 100
+		if natbelXP > 500:
+			NatashaQW = 100
+			natbelXP = 0
+		end
+	elseif NatashaQW < 110
+		if natbelXP > 550:
+			NatashaQW = 110
+			natbelXP = 0
+		end
+	elseif NatashaQW < 120
+		if natbelXP > 600:
+			NatashaQW = 120
+			natbelXP = 0
+		end
+end
+
+if $ARGS[0] = 'natcumresponse':
+	if natcp = 0:
+		'Natasha suddenly tries to pull away from Kolka, saying "Pull out, not inside! I don''t want to end up pregnant!"'
+	elseif natpregday > 0 and (daystart-natpregday) > 20 and (daystart-natpregday) < 84:
+		'Natasha looks at you questioningly, whether will you let him cum inside of her. It doesn''t seems to bother her that Kolka may knock her up.'
+	elseif natpregday > 0 and (daystart-natpregday) >= 84:
+		'Natasha looks at you questioningly, whether will you let him cum inside of her. It doesn''t really matter now, since Kolka has already knocked her up.'
+	elseif natpregday = 0 and pregtalknat = 1 and natbabycount = 0:
+		'Natasha looks at you and almost inaudably whispers "Please let him cum inside me. I want a baby too."'
+	elseif natpregday = 0 and pregtalknat = 1 and natbabycount > 0:
+		'Natasha looks at you and moans "Please let him cum inside me. I need him to give me another baby."'		
+	else
+		'Natasha looks at you questioningly, whether will you let him cum inside of her and risking her getting pregnant with your niece or nephew, or letting her pull away from you brother.'
+	end
+end
+
 !! Check if Natasha''s mother is home from work so this can be called with: gs 'natbelEv', 'natmomhome'
 if $ARGS[0] = 'natmomhome':
 	if (hour >= 16 and hour < 21) or (week > 5 and hour >= 10 and hour < 21):

+ 47 - 33
locations/natbelapt.qsrc

@@ -92,11 +92,7 @@ if $ARGS[0] = 'home':
 	end
 	
 	!Check if Natasha''s mother isn''t at work
-	if (hour >= 16 and hour < 21) or (week > 5 and hour >= 10 and hour < 21):
-		NatashaMotherHome = 1
-	else
-		NatashaMotherHome = 0
-	end
+	gs 'natbelEv', 'natmomhome'
 	
 	! Random to check who opens the door: 0 = Natasha, 1 = Mother
 	if NatashaMotherHome = 1:
@@ -251,6 +247,8 @@ if $ARGS[0] = 'leave_apartment':
 	!NatashaMotherState set to default so next time you visit it is random again.
 	if NatashaMotherStateKeep = 0: NatashaMotherState = 0
 	NatNoTV = 0
+	natmomrobe = 0
+	natseehtroughkitchen = 0
 	gt 'pod_ezd', 'etaj_4'
 end
 
@@ -390,16 +388,16 @@ if $ARGS[0] = 'natroom':
 	if natseethroughwearing = 1 and natstayroom = 0:
 		NatashaLoc = 2
 		if natseethroughworn < 5:
-			'<center><img src="images/locations/pavlovsk/resident/apartment/natbelapt/seethrough01.jpg"></center>'
+			'<center><img src="images/characters/pavlovsk/school/girl/natasha/seethrough01.jpg"></center>'
 			'When you get back to Natasha''s room you see she''s under her blankets, reading a book.'
 			gs 'arousal', 'voyeur', 3
 			gs 'stat'
 		else
-			'<center><img src="images/locations/pavlovsk/resident/apartment/natbelapt/seethrough02.jpg"></center>'
+			'<center><img src="images/characters/pavlovsk/school/girl/natasha/seethrough02.jpg"></center>'
 			'When you get back to Natasha''s room you see she''s on her bed, reading a book.'
 			act 'Move closer':
 				*clr & cla
-				'<center><img src="images/locations/pavlovsk/resident/apartment/natbelapt/seethrough03.jpg"></center>'
+				'<center><img src="images/characters/pavlovsk/school/girl/natasha/seethrough03.jpg"></center>'
 				'It doesn''t look like she''s noticed you coming in so you move over to the bed and lay your hand on her ass.'
 				'The moment your hand touches her skin she lets out a yelp and rolls over to see who it is.'
 				'"Jesus <<$pcs_nickname>> you nearly gave me a heartattack. For a second I thought my mom walked in."'
@@ -409,7 +407,7 @@ if $ARGS[0] = 'natroom':
 			end
 		end
 	elseif natseethroughwearing = 1 and natstayroom = 1:
-		'<center><img src="images/locations/pavlovsk/resident/apartment/natbelapt/seethrough00.jpg"></center>'
+		'<center><img src="images/characters/pavlovsk/school/girl/natasha/seethrough00.jpg"></center>'
 		'Natasha is standing there in the lingerie you gave her, looking at you with interest.'
 	!elseif naked:
 	else
@@ -519,12 +517,11 @@ if $ARGS[0] = 'natroom':
 								'"F-Faster, I-I''m almost ..." You let out, to which Natasha starts building up the pace. Just as it seems she can''t go any faster the waves of pleasure crash down on you and you close your eyes letting the orgasm take up your whole world.'
 								'As you get back to yourself, Natasha is still leaning over you, now slowly sucking her fingers one by one. Licking your juices off.'
 								gs 'arousal', 'vaginal_finger', 10, 'lesbian'
-!!options, give the player a option to make Natasha eat her out and just pleasure Sveta instead of mutual 
 								act 'Give back':
 									*clr & cla
 									'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natashabedroomsex04.jpg"></center>'
 									'Not wanting this to end just yet you roll her onto her back and spread her legs wide. Her pussy is soaking wet as well. "Your turn." You say, still out of breath.'
-									'You start to dart your tongue around her pussy. Licking up the juices, slowly working your way towards het wet slit.'
+									'You start to dart your tongue around her pussy. Licking up the juices, slowly working your way towards her wet slit.'
 									'"Please <<$pcs_nickname>>, I really need it." She lets out in between her moans of pleasure. At this you part her pussy lips with your hand and start licking her furiously, occasionally switching from sucking her clit to tongue fucking her pussy.'
 									'The growing volume of her moans is rekindling the fire inside yourself. "A few touches and I might go over the top again." You think to yourself.'
 									gs 'arousal', 'cuni_give', 5, 'lesbian'
@@ -543,18 +540,21 @@ if $ARGS[0] = 'natroom':
 										gs 'stat'
 										act 'Continue': gt 'natbelapt', 'natroom'
 									end
-!!put place holders for option with notes in text
+!!NEW
 								act 'Eat me':
 									*clr & cla
-									'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natashabedroomsex04.jpg"></center>'
-									'text and image for Natasha eating out Sveta'
+									'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natashabedroomsex06.jpg"></center>'
+									'The only thing you can think of is your need for more as you push her head towards your soaking pussy. She obeys immediately and starts kissing all around your pussy and playing with your tits.'
+									'Overcome with the need to feel her tongue on your pussy you take her head in your hands and press her face down on your slit. A loud moan escapes your mouth as she starts lapping up your juices.'
+									'She keeps one hand on your breast, softly pinching and pulling on your hard nipple as she starts focusing on sucking your engorged clit. You feel one of her fingers slip inside you again, adding even more pleasure.'
 									gs 'arousal', 'cuni', 5, 'lesbian'
-									act 'More':
+									act 'Rub your pussy on hers':
 										*clr & cla
 										'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natashabedroomsex05.jpg"></center>'
-										'Just the next stage of the above, more of Natasha pleasuring Sveta in some way.'
+										'As you feel your orgasm near, you quickly get up from the bed and press Natasha down on her back, opening her legs wide. Her pussy is soaking wet as well. There are wet streaks on her inner thighs where her juices have been running down her legs.'
+										'After a moment of teasing her with your fingers, you straddle her, pressing your pussies together and quickly grinding them together. Natasha grabs your breasts and starts moaning "Yes <<$pcs_nickname>>... Please... Pleaaaaaah." The feeling of her body writhing underneath yours as she orgasms sends you over the top as well. You keep grinding for a few more seconds before you start bucking under the intensity of your orgasm and fall down on top of Natasha, exhausted.'
 										gs 'arousal', 'trib', 5, 'lesbian'
-										
+!!END NEW										
 										if succubusflag = 1:
 											scfeed = succublvl + rand(1,4)
 											sexnutrition += 30 * scfeed
@@ -610,7 +610,6 @@ if $ARGS[0] = 'study_together':
 	act 'Finish homework': gt 'natbelapt','natroom'
 end
 
-!!NEW
 ! Only if Natasha owes you money
 if $ARGS[0] = 'make_her_do_homework':
 	*clr & cla
@@ -651,7 +650,6 @@ if $ARGS[0] = 'hwundress':
 		act 'You can keep your underwear on':
 			*clr & cla
 			minut += 20
-!!this one had no time passing and 30 mins seems like a good amount of time for some homework to be done
 			natunderwear = 1
 			NatashaNakedHW += 1
 			'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/nakedhomework1.jpg"></center>'
@@ -665,7 +663,6 @@ if $ARGS[0] = 'hwundress':
 			act 'Strip down completely':
 				*clr & cla
 				minut += 20
-!!this one had little time passing and 30 mins seems like a good amount of time for some homework to be done, so I added some time to the arousal below so 30 mins should pass.
 				NatashaNakedHW += 1
 				'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/nakedhomework2.jpg"></center>'
 				'"Then your mom will see you naked, this is what happens when you borrow money from people and can''t pay them back. You pay it back in other ways. Now do as you''re told and take off your clothes, all of your clothes."'
@@ -687,7 +684,6 @@ if $ARGS[0] = 'undressedhw':
 	act 'Enjoy looking at Natasha':
 		*clr & cla
 		minut += 20
-	!!this one had little time passing and 30 mins seems like a good amount of time for some homework to be done, so I added some time to the arousal below so 30 mins should pass.
 		if natunderwear = 1:
 			'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/nakedhomework1.jpg"></center>'
 			'While you wait for Natasha to finish your homework you idly play with your breasts, occasionally looking over at her near naked body.'
@@ -706,7 +702,6 @@ if $ARGS[0] = 'undressedhw':
 	act 'Taunt Natasha':
 		*clr & cla
 		minut += 20
-!!this one had little time passing and 30 mins seems like a good amount of time for some homework to be done, so I added some time to the arousal below so 30 mins should pass.
 		if natunderwear = 1:
 			*clr & cla
 			if NatashaNakedHW < 5:
@@ -821,7 +816,6 @@ if $ARGS[0] = 'afterhomework':
 		end
 	end
 end
-!!END NEW
 
 if $ARGS[0] = 'lick_feet':
 	*clr & cla
@@ -2375,6 +2369,8 @@ if $ARGS[0] = 'livingroom':
 end
 
 if $ARGS[0] = 'kitchen':
+	$loc = 'natbelapt'
+	$metka = 'kitchen'
 	$menu_loc = 'natbelapt'
 	$menu_arg = 'kitchen'
 	menu_off = 0
@@ -2382,20 +2378,21 @@ if $ARGS[0] = 'kitchen':
 	*clr & cla
 	minut += 1
 	$locclass = 'kitr'
-	natkitseethrough = rand(0,4)
+	gs 'kit_din'
 	gs 'stat'
 	'<center><b><font color = maroon>Kitchen</font></b></center>'
-	if natkitseethrough = 0 and natseethroughwearing = 1:
-		'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/seethroughkitchen01.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/kitchen.jpg"></center>'
+	'The kitchen is small but has all the necessary things. There is a stove, a fridge, a sink and a tiny dining table. Everything looks sparkling clean.'
+	
+	!! Kitchen events
+	if rand(0,4) = 0 and natseethroughwearing = 1 and natseehtroughkitchen = 0:
+		'<center><img src="images/characters/pavlovsk/school/girl/natasha/seethroughkitchen01.jpg"></center>'
+		natseehtroughkitchen = 1
 		'As you walk into the kitchen you see Natasha pouring herself a glass of milk.'
 		'When she notices you standing there her face starts turning red immediately.'
 		'"I-I needed a drink." She stammers as she puts the milk back into the fridge and heads towards the door.'
 		'"You''re forgetting your milk." You tell her, unable to hold in your laughter as you watch her dart back to the table and grabbing her glass before leaving as quickly as she can. Her face crimson by now.'
-	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/kitchen.jpg"></center>'
-		'The kitchen is small but has all the necessary things. There is a stove, a fridge, a sink and a tiny dining table. Everything looks sparkling clean.'
-	end
-	if NatashaLoc = 3 and natseethroughwearing = 0:
+	elseif NatashaLoc = 3 and natseethroughwearing = 0:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/natfridge.jpg"></center>'
 		'Natasha is rummaging through the fridge. You can''t help but admire her cute ass in those shorts.'
@@ -2419,10 +2416,25 @@ if $ARGS[0] = 'kitchen':
 		end
 		act 'Leave': gt 'natbelapt','hallway'
 		act 'Let''s go to your room': NatashaLoc = 2 & gt 'natbelapt', 'natroom'
+	elseif NatashaMotherHome = 1 and rand(0,4) = 0 and natmomrobe = 0:
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/natmomkitchenrobe.jpg"></center>'
+		natmomrobe = 1
+		minut += 5
+		gs 'stat'
+		'As you walk into the kitchen you see <<$NatashaMotherNickname>> having a healthy snack, wearing only a thin robe.'
+		'"Hello <<$pcs_nickname>>." She greets you cheerfully without a hint of discomfort about the amount of skin she''s showing.'
+		'The two of you make some smalltalk while she finishes eating.'
+		act 'Leave': gt 'natbelapt','hallway'
+		act 'Look in the fridge': gt 'natbelapt', 'fridge'
 	else
 		act 'Leave': gt 'natbelapt','hallway'
 		act 'Look in the fridge': gt 'natbelapt', 'fridge'
 	end
+	
+	dynamic $driwater
+	dynamic $dritea
+	dynamic $fill_bottle
 end
 
 if $ARGS[0] = 'fridge':
@@ -2497,8 +2509,10 @@ if $ARGS[0] = 'natmother':
 			end
 		end
 	elseif hour < 7 or hour > 22:
-! I was hoping to find an image of a woman sleeping under her bedsheets to add for the cold months.
 		*clr & cla
+		if month < 4 or month > 9:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/natmomsleep3.jpg"></center>'
+			'You look into the bedroom and see <<$NatashaMotherNickname>>, sound asleep under the covers. Not wanting to disturb her you close the door and leave.'
 		imgrand = rand(1,2)
 		if imgrand = 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/natmomsleep1.jpg"></center>'
@@ -2552,7 +2566,7 @@ if $ARGS[0] = 'natmother':
 			*clr & cla
 			minut += 10
 			'<center><b><font color = maroon>Natasha''s mother''s room</font></b></center>'
-! Needs image (find hitachi)
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/findhitachi.jpg"></center>'
 			'You idly poke your head into her closet. Not much of interest there but a few dresses you wouldn''t mind trying on. Moving on to her bedside you poke through her drawers. The top one is filled with bras and panties. Some look pretty sexy.'
 			'When you open the next drawer you find the jackpot. There''s a bunch of sex toys in there. You pick up the biggest one in there.'
 			act 'Play with it':

+ 6 - 3
locations/obekt.qsrc

@@ -1,5 +1,7 @@
 # obekt
 
+$loc = 'obekt'
+$metka = ''
 $menu_loc = 'obekt'
 $menu_arg = ''
 menu_off = 0
@@ -15,10 +17,10 @@ if car > 0 and cardrive = 12:
 	'The <a href="exec:gs ''carF'', ''start''"> <<$car>></a> is standing in the parking.'
 end
 
-act 'Go to the road':minut += 15 & nroad = 16 & gt 'road'
+act 'Go to the road': minut += 15 & nroad = 16 & gt 'road'
 
 act 'Sneak into the construction site':
-	*clr & cla
+	cla
 	minut += 5
 	menu_off = 1
 	gs 'stat'
@@ -26,9 +28,10 @@ act 'Sneak into the construction site':
 	if ObjektOpen = 0:
 		if ObjektBil = 0: 
 			ObjektBil = 1
+			*nl
 			'Before you''re able to enter, you hear a voice asking you what you''re doing. It''s the guard that caught you. He points towards the direction you should be heading instead.'
 
-			act 'Leave':gt $curloc
+			act 'Leave':gt $loc, $metka
 		else
 			gt 'obekt2'
 		end

+ 3 - 8
locations/obekt2.qsrc

@@ -1,6 +1,7 @@
 # obekt2
 
-
+$loc = 'obekt2'
+$metka = ''
 $menu_loc = 'obekt2'
 $menu_arg = ''
 menu_off = 0
@@ -13,13 +14,7 @@ $location_type = 'secluded'
 '<center><img <<$set_imgh>> src="images/locations/construction/obekt.jpg"></center>'
 'There is not much to see at the construction site, only a trailer where a guard sits. The entrance is closed...'
 
-act 'Leave the construction site':
-	cla & *clr
-	menu_off = 1
-	minut += 5
-	gs 'stat'
-	gt 'obekt'
-end
+act 'Leave the construction site': minut += 5 & gt 'obekt'
 
 !!Access blocked until it is needed again
 !!act 'Try to sneak in':

+ 21 - 21
locations/obj_din.qsrc

@@ -2505,27 +2505,27 @@ if $ARGS[0] = 'records':
 	if haraklover[2] = 2 and loverrelation[2] > 1:'<<$obj_loverpron>>''s short-tempered and strict.'
 	*nl
 	
-!! Could someone move this is it''s in the wrong location?
-	if firstvag ! 0:
-		'Your hymen is broken:'
-		'<<$firstvagstat>>'
-	else
-		'Your vaginal virginity is intact'
-	end
-	
-	if firstanal ! 0:
-		'Your anal virginity has been taken:'
-		'<<$firstanalstat>>'
-	else
-		'Your anal virginity is intact'
-	end
-	
-	if firstoral ! 0:
-		'Your mouth has been used:'
-		'<<$firstoralstat>>'
-	else
-		'Your oral virginity is intact'
-	end
+!! Not implemented
+!!	if firstvag ! 0:
+!!		'Your hymen is broken:'
+!!		'<<$firstvagstat>>'
+!!	else
+!!		'Your vaginal virginity is intact'
+!!	end
+!!	
+!!	if firstanal ! 0:
+!!		'Your anal virginity has been taken:'
+!!		'<<$firstanalstat>>'
+!!	else
+!!		'Your anal virginity is intact'
+!!	end
+!!	
+!!	if firstoral ! 0:
+!!		'Your mouth has been used:'
+!!		'<<$firstoralstat>>'
+!!	else
+!!		'Your oral virginity is intact'
+!!	end
 	
 	*nl
 	gs'Menu.Create','zapisMenu'

+ 453 - 5
locations/phone_selfies.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'selfies':
 	!!default images that are used in any location not set
 	if phone_selfie[1] = 1:'<a href="exec:view''images/system/phone/selfie/phone_selfie1.jpg''"><b>Selfie number1</b></a>'
 	if phone_selfie[2] = 1:'<a href="exec:view''images/system/phone/selfie/phone_selfie2.jpg''"><b>Selfie number2</b></a>'
-
+	*nl
 	'<a href="exec:gt ''phone_selfies'', ''bathroom''">Bathroom selfies</a>'
 	'<a href="exec:gt ''phone_selfies'', ''bedroom''">Bedroom selfies</a>'
 	'<a href="exec:gt ''phone_selfies'', ''kitchen''">Kitchen selfies</a>'
@@ -29,7 +29,12 @@ if $ARGS[0] = 'selfies':
 	'<a href="exec:gt ''phone_selfies'', ''park''">Park selfies</a>'
 	'<a href="exec:gt ''phone_selfies'', ''lockerroom''">Lockerroom selfies</a>'
 	'<a href="exec:gt ''phone_selfies'', ''beach''">Beach selfies</a>'
-	
+	*nl
+	'Selfies with family and friends'
+	'<a href="exec:gt ''phone_selfies'', ''family''">Family selfies</a>'
+	'<a href="exec:gt ''phone_selfies'', ''school''">School selfies</a>'
+	'<a href="exec:gt ''phone_selfies'', ''pavlovsk''">Pavlovsk friends</a>'
+	'<a href="exec:gt ''phone_selfies'', ''city''">City friends</a>'
 	!gt $loc, $metka
 	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
 end
@@ -45,7 +50,6 @@ if $ARGS[0] = 'listretrieve':
 		:temp_loop
 			!!setting value to unmixed variable so it can be checked in the if below
 			dynamic '$phone_locval = <<$phone_loc>>_closelfie[<<temp_clocnt>>]'
-			!!if $phone_locval = 1: *p '<a href="exec:view''images/pc/selfies/<<$phone_loc>>/clothed/<<temp_clocnt>>.jpg''"><b>Selfie #<<temp_clocnt>></b></a>'
 			if $phone_locval = 1: *p '<a href="exec:view''images/pc/selfies/<<$phone_loc>>/clothed/<<temp_clocnt>>.jpg''"><img src="images/pc/selfies/<<$phone_loc>>/clothed/<<temp_clocnt>>.jpg"     height="150" /></a>  '
 			temp_clocnt += 1
 		if temp_clocnt <= temp_total: jump'temp_loop'
@@ -60,7 +64,6 @@ if $ARGS[0] = 'listretrieve':
 		dynamic 'temp_total = <<$phone_loc>>_undtot'
 		:temp_loop1
 			dynamic '$phone_locval = <<$phone_loc>>_undselfie[<<temp_undcnt>>]'
-			!!if $phone_locval = 1: *p '<a href="exec:view''images/pc/selfies/<<$phone_loc>>/<<$undname>>/<<temp_undcnt>>.jpg''"><b>Selfie #<<temp_undcnt>></b></a>'
 			if $phone_locval = 1: *p '<a href="exec:view''images/pc/selfies/<<$phone_loc>>/<<$undname>>/<<temp_undcnt>>.jpg''"><img src="images/pc/selfies/<<$phone_loc>>/<<$undname>>/<<temp_undcnt>>.jpg"     height="150" /></a>  '
 			temp_undcnt += 1
 		if temp_undcnt <= temp_total: jump'temp_loop1'
@@ -75,7 +78,6 @@ if $ARGS[0] = 'listretrieve':
 		dynamic 'temp_total = <<$phone_loc>>_nudtot'
 		:temp_loop2
 			dynamic '$phone_locval = <<$phone_loc>>_nudselfie[<<temp_nudcnt>>]'
-			!!if $phone_locval = 1: *p '<a href="exec:view''images/pc/selfies/<<$phone_loc>>/nude/<<temp_nudcnt>>.jpg''"><b>Selfie #<<temp_nudcnt>></b></a>'
 			if $phone_locval = 1: *p '<a href="exec:view''images/pc/selfies/<<$phone_loc>>/nude/<<temp_nudcnt>>.jpg''"><img src="images/pc/selfies/<<$phone_loc>>/nude/<<temp_nudcnt>>.jpg"     height="150" /></a>  '
 			temp_nudcnt += 1
 		if temp_nudcnt <= temp_total: jump'temp_loop2'
@@ -173,4 +175,450 @@ if $ARGS[0] = 'beach':
 	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
 end
 
+if $ARGS[0] = 'family':
+	'<center><h4><font color="maroon">Family members</font></h4></center>'
+	
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'school':
+	'<center><h4><font color="maroon">School friends</font></h4></center>'
+	gs 'gschool_lessons', 'npc_data'
+	$textgrup = ''
+	count1 = 0
+	i = 1
+	'<center><table cellspacing="3">'
+	:markgruploop	
+		if count1 = 6 : $textgrup += '<tr>'
+
+		if grupTipe[i] ! 6:
+			count1 += 1
+			$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/pavlovsk/school/head/<<i>>.jpg"><br>' + $npcSelfie[i]
+		end
+		if count1< 6 and grupTipe[i] ! 6 :
+			$textgrup += '</td>'
+		elseif count1 = 6 and grupTipe[i] ! 6:
+			$textgrup +='</td></tr><tr>' & count1 = 0
+		end
+		i += 1
+	if i <= ARRSIZE('school_static_num')-1:jump 'markgruploop'
+
+	'<<$textgrup>>'
+	
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'schoolselfies':
+	if numnpc = 1:
+		'<center><h4><font color="maroon">Dimka selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/dimka/selfies/'
+		$selfienpc = 'dimka'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 2:
+		'<center><h4><font color="maroon">Artem selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/artem/selfies/'
+		$selfienpc = 'artem'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 3:
+		'<center><h4><font color="maroon">Ivan selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/ivan/selfies/'
+		$selfienpc = 'ivan'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 4:
+		'<center><h4><font color="maroon">Igor selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/igor/selfies/'
+		$selfienpc = 'igor'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 5:
+		'<center><h4><font color="maroon">Fedor selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/fedor/selfies/'
+		$selfienpc = 'fedor'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 6:
+		'<center><h4><font color="maroon">Petka selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/petka/selfies/'
+		$selfienpc = 'petka'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 7:
+		'<center><h4><font color="maroon">Lesco selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/lesco/selfies/'
+		$selfienpc = 'lesco'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 8:
+		'<center><h4><font color="maroon">Svyatoslav selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/svyatoslav/selfies/'
+		$selfienpc = 'svyatoslav'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 9:
+		'<center><h4><font color="maroon">Vitek selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/vitek/selfies/'
+		$selfienpc = 'vitek'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 10:
+		'<center><h4><font color="maroon">Dan selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/dan/selfies/'
+		$selfienpc = 'dan'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 11:
+		'<center><h4><font color="maroon">Vasily selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/vasily/selfies/'
+		$selfienpc = 'vasily'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 12:
+		'<center><h4><font color="maroon">Julia selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/julia/selfies/'
+		$selfienpc = 'julia'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 13:
+		'<center><h4><font color="maroon">Lariska selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/lariska/selfies/'
+		$selfienpc = 'lariska'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 14:
+		'<center><h4><font color="maroon">Katja selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/katja/selfies/'
+		$selfienpc = 'katja'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 15:
+		'<center><h4><font color="maroon">Vicky selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/vicky/selfies/'
+		$selfienpc = 'vicky'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 16:
+		'<center><h4><font color="maroon">Natasha selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/natasha/selfies/'
+		$selfienpc = 'natasha'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 17:
+		'<center><h4><font color="maroon">Inna selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/inna/selfies/'
+		$selfienpc = 'inna'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 18:
+		'<center><h4><font color="maroon">Christina selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/christina/selfies/'
+		$selfienpc = 'christina'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 19:
+		'<center><h4><font color="maroon">Lina selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/lina/selfies/'
+		$selfienpc = 'lina'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 20:
+		'<center><h4><font color="maroon">Lena selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/lena/selfies/'
+		$selfienpc = 'lena'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 21:
+		'<center><h4><font color="maroon">Lera selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/lera/selfies/'
+		$selfienpc = 'lera'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 22:
+		'<center><h4><font color="maroon">Bella selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/bella/selfies/'
+		$selfienpc = 'bella'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 23:
+		'<center><h4><font color="maroon">Albina selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/albina/selfies/'
+		$selfienpc = 'albina'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 24:
+		'<center><h4><font color="maroon">Pauline selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/pauline/selfies/'
+		$selfienpc = 'pauline'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 25:
+		'<center><h4><font color="maroon">Sonia selfies</font></h4></center>'	
+		$imgloc = 'images/characters/pavlovsk/school/girl/sonia/selfies/'
+		$selfienpc = 'sonia'
+		loopmax = 45
+		loopmaxsveta = 25
+		loopmaxsex = 9
+	elseif numnpc = 27:
+		'<center><h4><font color="maroon">Marcus selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/marcus/selfies/'
+		$selfienpc = 'marcus'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 28:
+		'<center><h4><font color="maroon">Andrey selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/andrey/selfies/'
+		$selfienpc = 'andrey'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 29:
+		'<center><h4><font color="maroon">Mefodiy selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/mefodiy/selfies/'
+		$selfienpc = 'mefodiy'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 30:
+		'<center><h4><font color="maroon">Stasya selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/stasya/selfies/'
+		$selfienpc = 'stasya'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 31:
+		'<center><h4><font color="maroon">Lizaveta selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/lizaveta/selfies/'
+		$selfienpc = 'lizaveta'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 32:
+		'<center><h4><font color="maroon">Lazar selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/lazar/selfies/'
+		$selfienpc = 'lazar'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 33:
+		'<center><h4><font color="maroon">Erast selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/erast/selfies/'
+		$selfienpc = 'erast'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 34:
+		'<center><h4><font color="maroon">Veronika selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/veronika/selfies/'
+		$selfienpc = 'veronika'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 35:
+		'<center><h4><font color="maroon">Evgeny selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/evgeny/selfies/'
+		$selfienpc = 'evgeny'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 36:
+		'<center><h4><font color="maroon">Feofan selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/feofan/selfies/'
+		$selfienpc = 'feofan'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 37:
+		'<center><h4><font color="maroon">Gerasim selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/gerasim/selfies/'
+		$selfienpc = 'gerasim'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 38:
+		'<center><h4><font color="maroon">Zinaida selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/zinaida/selfies/'
+		$selfienpc = 'zinaida'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 39:
+		'<center><h4><font color="maroon">Radomir selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/radomir/selfies/'
+		$selfienpc = 'radomir'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 40:
+		'<center><h4><font color="maroon">Lavrenti selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/lavrenti/selfies/'
+		$selfienpc = 'lavrenti'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 41:
+		'<center><h4><font color="maroon">Arkadi selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/arkadi/selfies/'
+		$selfienpc = 'arkadi'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 42:
+		'<center><h4><font color="maroon">Roman selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/roman/selfies/'
+		$selfienpc = 'roman'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 43:
+		'<center><h4><font color="maroon">Valentin selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/valentin/selfies/'
+		$selfienpc = 'valentin'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 44:
+		'<center><h4><font color="maroon">Alyona selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/alyona/selfies/'
+		$selfienpc = 'alyona'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 45:
+		'<center><h4><font color="maroon">Anushka selfies</font></h4></center>'	
+		$imgloc = 'images/characters/pavlovsk/school/girl/anushka/selfies/'
+		$selfienpc = 'anushka'
+		loopmax = 22
+		loopmaxsveta = 0
+		loopmaxsex = 7
+	elseif numnpc = 46:
+		'<center><h4><font color="maroon">Ekaterina selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/ekaterina/selfies/'
+		$selfienpc = 'ekaterina'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 47:
+		'<center><h4><font color="maroon">Petia selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/petia/selfies/'
+		$selfienpc = 'petia'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 59:
+		'<center><h4><font color="maroon">Vanya selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/vanya/selfies/'
+		$selfienpc = 'vanya'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 61:
+		'<center><h4><font color="maroon">Nikolai selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/nikolai/selfies/'
+		$selfienpc = 'nikolai'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 62:
+		'<center><h4><font color="maroon">Aleksandra selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/girl/aleksandra/selfies/'
+		$selfienpc = 'aleksandra'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	
+	else
+		!! up to 62, based on the "head" folder
+	end
+	
+	if loopmax > 0:
+		*nl
+		'<center><b>Regular selfies</b></center>'
+		*nl
+		
+		i = 1
+		:temp_loopschoolselfies
+            dynamic '$selfie = <<$selfienpc>>[<<i>>]'
+            if $selfie = 1: *p '<a href="exec:view''<<$imgloc>><<i>>.jpg''"><img src="<<$imgloc>><<i>>.jpg"     height="150" /></a>  '
+            i += 1
+        if i <= loopmax: jump'temp_loopschoolselfies'
+	end
+	
+	if loopmaxsveta > 0:
+		*nl
+		'<center><b>Selfies with me</b></center>'
+		*nl
+		
+		i = 1
+		:temp_loopschoolselfiessveta
+			dynamic '$selfie = <<$selfienpc>>sveta[<<i>>]'
+			if $selfie = 1: *p '<a href="exec:view''<<$imgloc>>sveta/<<i>>.jpg''"><img src="<<$imgloc>>sveta/<<i>>.jpg"     height="150" /></a>  '
+			i += 1
+		if i <= loopmaxsveta: jump'temp_loopschoolselfiessveta'
+	end
+	
+	if loopmaxsex > 0:
+		*nl
+		'<center><b>Sex selfies</b></center>'
+		*nl
+		
+		i = 1
+		:temp_loopschoolselfiessex
+			dynamic '$selfie = <<$selfienpc>>sex[<<i>>]'
+			if $selfie = 1: *p '<a href="exec:view''<<$imgloc>>sex/<<i>>.jpg''"><img src="<<$imgloc>>sex/<<i>>.jpg"     height="150" /></a>  '
+			i += 1
+		if i <= loopmaxsex: jump'temp_loopschoolselfiessex'
+	end
+	
+	act 'Back': gt 'phone_selfies', 'school'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'pavlovsk':
+	'<center><h4><font color="maroon">Pavlovsk friends</font></h4></center>'
+	
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'city':
+	'<center><h4><font color="maroon">City friends</font></h4></center>'
+	
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
 --- phone_selfies ---------------------------------

+ 11 - 15
locations/rolanapt.qsrc

@@ -193,7 +193,12 @@ if $ARGS[0] = 'kitchen':
 	*clr
 	minut += 1
 	$locclass = 'kitr'
-	menu_off = 1
+	$loc = 'rolanapt'
+	$metka = 'kitchen'
+	$menu_loc = 'rolanapt'
+	$menu_arg = 'kitchen'
+	menu_off = 0
+	gs 'kit_din'
 	gs 'stat'
 	'<center><b><font color = maroon>Kitchen</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitchen.jpg"></center>'
@@ -219,6 +224,7 @@ if $ARGS[0] = 'kitchen':
 			act 'Approach Rolan':
 				*clr & cla
 				minut += 5
+				menu_off = 1
 				rolancooklesson = 1
 				rolan_cooklesson_day = daystart
 				gs 'stat'
@@ -255,6 +261,7 @@ if $ARGS[0] = 'kitchen':
 		elseif rolancooklesson = 2 and rolan_cooklesson_day ! daystart and $wornpantytype ! 'none':
 			act 'Approach Rolan':
 				*clr & cla
+				menu_off = 1
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro3.jpg"></center>'
@@ -268,6 +275,7 @@ if $ARGS[0] = 'kitchen':
 		elseif rolancooklesson > 2 and rolancooklesson <= 6 and rolan_cooklesson_day ! daystart and $wornpantytype ! 'none':
 			act 'Approach Rolan':
 				*clr & cla
+				menu_off = 1
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro3.jpg"></center>'
@@ -278,20 +286,8 @@ if $ARGS[0] = 'kitchen':
 	end
 !!	elseif rolancooklesson = 6:
 	act 'Look in the fridge': gt 'rolanapt', 'holodil'
-	act 'Drink water (0:05)':
-		cla
-		minut += 5
-		if water >= 80:
-			'You don''t need any more water.'
-		else
-			water += 80
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
-			'You gladly drink a glass of water.'
-		end
-		act 'Get up from the table':gt 'rolanapt','kitchen'
-	end
+	dynamic $driwater
+	dynamic $fill_bottle
 	!!FRIDGE!!
 	!!filling the refrigerator:
 	!!count-bottles of beer in a day