locations/KatjaHomeTalk.qsrc

@@ -1984,13 +1984,21 @@ end
 if $ARGS[0] = 'uni_tell':
 	*clr & cla
 	minut += 15
-	katjaQW['know_going_to_teaching_degree'] = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-	if katjaQW['know_katja_uni'] = 0:
-		'You tell Katja that you have enrolled at the university to study to become a teacher. She replies that she also plans to do the same and that it will be fun studying at the university together. She bombards you with questions about how your enrolment process went.'
+	if $university['enrolled_in'] = 'teaching_studies':
+		katjaQW['know_going_to_teaching_degree'] = 1
+		if katjaQW['know_katja_uni'] = 0:
+			'You tell Katja that you have enrolled at the university to study to become a teacher. She replies that she also plans to do the same and that it will be fun studying at the university together. She bombards you with questions about how your enrolment process went.'
+		else
+			'You tell Katja that you have also enrolled to study teaching at the university. She replies that it will be fun studying at the university together before you spend the next few minutes talking excitedly about what you know about the program.'
+		end
 	else
-		'You tell Katja that you have also enrolled to study teaching at the university. She replies that it will be fun studying at the university together before you spend the next few minutes talking excitedly about what you know about the program.'
+		if katjaQW['know_katja_uni'] = 0:
+			'You tell Katja that you have enrolled at the university to study <<func(''uni_programs'', ''program_name'')>>. She replies that she plans to enroll to study to become a teacher, but that you will probably still see each other often there.'
+		else
+			'You tell Katja that you have also enrolled to study  <<func(''uni_programs'', ''program_name'')>>. She replies that she is enrolled in the program to study become a teacher, but that you will probably still see each other often there.'
+		end	
 	end
 	if $loc = 'mey_home':
 		act 'Talk about something else': gt 'KatjaHomeTalk'
@@ -2006,16 +2014,16 @@ if $ARGS[0] = 'katja_uni_tell':
 	*clr & cla
 	minut += 15
 	katjaQW['know_katja_uni'] = 1
-	katjaQW['knows_dorm_room_number'] = 1
+	if katjaQW['QWstage'] = 2: katjaQW['knows_dorm_room_number'] = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	if katjaQW['know_going_to_teaching_degree'] = 0:
-		'Katja excitedly tells you that she has been accepted into the university to study teaching. She then tells you about how great the program is. She also tells you that she is going to move into room 26 at the university dorm at the beginning of August.' 
-		if university['student'] = 1 and $university['enrolled_in'] = 'teaching_studies':
+		'Katja excitedly tells you that she has been accepted into the university to study teaching. She then tells you about how great the program is.'+iif(katjaQW['QWstage'] = 2, 'She also tells you that she is going to move into room 26 at the university dorm at the beginning of August.', '')
+		if university['student'] = 1:
 			act 'Tell Katja that you''re going to the university': gt 'KatjaHomeTalk', 'uni_tell'
 		end	
 	else
-		'Katja excitedly tells you that she has also been accepted into the university to study teaching and that it will be fun studying at the university together. She also tells you that she is going to move into room 26 at the university dorm at the beginning of August. You then spend the next few minutes talking excitedly about what you know about the program.'
+		'Katja excitedly tells you that she has also been accepted into the university to study teaching and that it will be fun studying at the university together.'+iif(katjaQW['QWstage'] = 2, 'She also tells you that she is going to move into room 26 at the university dorm at the beginning of August.', '')+'  You then spend the next few minutes talking excitedly about what you know about the program.'
 	end
 	if $loc = 'mey_home':
 		act 'Talk about something else': gt 'KatjaHomeTalk'

locations/Komp.qsrc

@@ -17,7 +17,7 @@ if $ARGS[0] = 'start':
 	act 'Play Solitaire (0:20)': gt 'komp', 'pasians'
 	
 	if AlbinaQW['flashdrive'] = 1:
-		if $loc = 'dachain' or $loc = 'sitr' or $loc = 'bedr' or $loc = 'bedr2x' or ($loc = 'uni_dorm' and $loc_arg = 'dorm_room') or ($loc = 'city_mansion_residence_2' and $loc_arg = 'yoffice') or ($loc = 'pav_shared_apt' and $loc_arg = 'pcsRoom') or ($loc = 'mey_home' and $loc_arg = '3') or ($loc = 'city_house_res_misc' and $loc_arg = 'livroom') or $loc = 'nichBedroomServant' or (locat['Anya_inroom'] = 0 and $loc = 'bedrPar'):
+		if $loc = 'dachain' or $loc = 'sitr' or $loc = 'bedr' or $loc = 'bedr2x' or ($loc = 'uni_dorm' and $loc_arg = 'dorm_room') or ($loc = 'city_mansion_residence_2' and $loc_arg = 'yoffice') or ($loc = 'pav_shared_apt' and $loc_arg = 'pcsRoom') or ($loc = 'mey_home' and $loc_arg = 'guest_bedroom') or ($loc = 'city_house_res_misc' and $loc_arg = 'livroom') or $loc = 'nichBedroomServant' or (locat['Anya_inroom'] = 0 and $loc = 'bedrPar'):
 			act 'Check Albina''s flash drive': gt 'albina_house_events', 'flash_drive'
 		end
 	end

locations/_attributes_cats_dress.qsrc

@@ -1404,6 +1404,7 @@ elseif ARGS[1] = 207:
 	CloDress = 1
 
 elseif ARGS[1] = 208:
+!! Duplicate of Coco 210
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4

locations/bedrPar.qsrc

@@ -95,8 +95,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		if func('homes_properties', 'can_live_here'):
 			$setloc['StageTitle'] = 'Your bedroom'
 		else		
-			$setloc['StageTitle'] = 'Your old bedroom'
-			
+			$setloc['StageTitle'] = 'Your old bedroom'			
 		end
 		!! Display header and banner image
 		! WD: Correct Image path ~ "images/qwest/alter/<<$loc>>.jpg"

locations/bedrPar2.qsrc

@@ -6,8 +6,7 @@
 !! 
 !! Desc: Paernts bedroom links to family flat corridor
 
-!! Call in location default actions
-gs 'home_family_init', 'init'
+
 
 !! Set location header - img path is set in init
 $setloc['StageTitle'] = 'Parents Bedroom'
@@ -18,9 +17,10 @@ $setloc['StageImage'] = '<<$default_img_path>>/bedrpar2.jpg'
 
 !! Set up game location data
 $locclass = 'bedr'
-gs 'shortgs', 'setloc', 'bedrPar2', $ARGS[0]
+gs 'shortgs', 'setloc', 'bedrPar2', 'start'
 !! End location initialisation
-
+!! Call in location default actions
+gs 'home_family_init', 'init'
 
 !! Begin location content
 
@@ -74,7 +74,7 @@ if $ARGS[0] = 'kamasutra':
 	*clr & cla
 	menu_off = 1
 	minut += 1
-	'<center><img <<$set_imgh>> src="<<$default_img_path>>book.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/<<$default_img_path>>/book.jpg"></center>'
 	'The cover says "Kama Sutra"'
 	act 'Leave': gt $loc, $loc_arg
 	act 'Read': kamasutra_page = 0 & kamasutra_day = daystart & gt 'bedrPar2', 'read_book'
@@ -95,7 +95,7 @@ end
 ! parent''s wardrobe
 if $ARGS[0] = 'parents_wardrobe':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="<<$default_img_path>>wardrobe.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/<<$default_img_path>>/wardrobe.jpg"></center>'
 	'An old looking wardrobe, probably from the Soviet times.'
 	act 'Leave ': gt $loc, $loc_arg
 	act 'Rummage': gt 'bedrPar2', 'wardrobe_search'
@@ -109,14 +109,14 @@ if $ARGS[0] = 'wardrobe_search':
 		exit
 	end
 	if rand(1,100) > 75:
-		'<center><img <<$set_imgh>> src="<<$default_img_path>>wardrobesearch'+rand(1,4)+'.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/<<$default_img_path>>/wardrobesearch'+rand(1,4)+'.jpg"></center>'
 		$failwords[0]= 'You don''t find anything interesting.'
 		$failwords[1]= 'You find some clothes and underwear.'
 		$failwords[2]= 'You dig through your mother''s closet, but find nothing interesting except underwear.'
 		*pl $failwords[rand(0,2)]
 		killvar '$failwords'
 	else
-		'<center><img <<$set_imgh>> src="<<$default_img_path>>wardrobetoy.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/<<$default_img_path>>/wardrobetoy.jpg"></center>'
 		$findmomtoy[0]= 'Digging through the closet, you find a <a href="exec: gt ''bedrPar2'',''momtoy_play''">dildo</a>.'
 		$findmomtoy[1]= 'Rummaging through your mother''s lingerie, you find a small <a href="exec: gt ''bedrPar2'',''momtoy_play''">dildo</a>.'
 		$findmomtoy[2]= 'You find your mother''s <a href="exec: gt ''bedrPar2'',''momtoy_play''">toy</a>.'

locations/brother_voyeur.qsrc

@@ -8,6 +8,10 @@ if (npc_dob['A34'] mod 10000)/100 = month and (npc_dob['A34'] mod 100) > day: br
 dick = npc_dick['A<<34>>']
 if npc_QW['A34'] > 20 and npc_QW['A34'] < 25: npc_QW['A34'] = 20
 
+razors_to_use['all']   = min(3, max(1, (pcs_leghair*4 + max(0, pcs_pubes-shave_length))/20))
+razors_to_use['pussy'] = min(2, max(1, (max(0, pcs_pubes-shave_length))/20))
+razors_to_use['legs']  = min(3, max(1, (pcs_leghair*4)/20))
+
 !! Variables used
 !! brothersawpirsF: Flag 0/1 Have your brother seen your nipple piercings
 !! npc_rel['A34']: relationship
@@ -687,7 +691,7 @@ if $ARGS[0] = 'brother_wash':
 			'As you rinse off, your brother gives a meaningful look at your lower body and you follow his gaze to your <<$pc_desc[''pubes'']>> pussy.'
 		end
 		'"Aren''t you going to shave?"'
-		if mc_inventory['razor'] =  0:
+		if mc_inventory['razor'] = 0:
 			act'"I can''t. I don''t have any razors"':
 				cla & *nl
 				brothershave[1] = daystart + 2
@@ -779,7 +783,7 @@ if $ARGS[0] = 'brother_shower_shave':
 		'"Yeah, you''re probably right. I should shave," you say looking down at yourself, frowning at the growing body hair.'
 	end
 	
-	if pcs_leghair > 3 and pcs_pubes > 3 and mc_inventory['razor'] =  1:
+	if pcs_leghair > 3 and pcs_pubes > 3 and mc_inventory['razor'] < razors_to_use['all']:
 		msg'As you pick up your razor, you realize that it''s probably only sharp enough for one more use. You''ll have to decide between a <<$pc_desc[''pubes'']>> pussy or <<$pc_desc[''legs'']>> legs.'
 	else
 		*nl
@@ -797,7 +801,7 @@ if $ARGS[0] = 'brother_shower_shave':
 end
 
 if $ARGS[0] = 'shave_both':
-	if mc_inventory['razor'] >= 2:
+	if mc_inventory['razor'] >= razors_to_use['all']:
 		if pcs_leghair > 3 and pcs_pubes > 3:
 			act 'Shave your legs and pussy (0:15)':
 				npc_rel['A34'] += 3
@@ -807,7 +811,7 @@ if $ARGS[0] = 'shave_both':
 				pcs_pubes = 0
 				pcs_horny += 5
 				brothershave += 1
-				mc_inventory['razor'] -=  2
+				mc_inventory['razor'] -= razors_to_use['all']
 				'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
 				'"Yeah, sure. Why not?" you smile.'
 				'You lather up your legs and crotch and then start carefully shaving them. Kolka stares at you and watches the process intently.'
@@ -846,21 +850,21 @@ if $ARGS[0] = 'shave_both':
 end
 
 if $ARGS[0] = 'shave_legs':
-	if pcs_leghair > 3:
+	if pcs_leghair > 3 and mc_inventory['razor'] >= razors_to_use['legs']:
 		act 'Shave your legs (0:05)':
 			npc_rel['A34'] += 2
 			cla & *clr
 			minut += 5
 			pcs_leghair = 0
 			pcs_horny += 5
-			mc_inventory['razor'] -=  1
+			mc_inventory['razor'] -= razors_to_use['legs']
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
 			'You lather up your legs and then start carefully shaving them.'
 			*nl
 			if pcs_pubes > 3:
 				'Kolka frowns. "You''re not going to shave your '+iif(pcs_pubes <= 20, 'pussy?"', 'bush?"')
-				if mc_inventory['razor'] =  0:
+				if mc_inventory['razor'] < razors_to_use['pussy']:
 					act'"I can''t. Razor''s gone dull"':
 						cla & *nl
 						'"I couldn''t even if I wanted to," you say to him wistfully. He looks at you in confusion. "Razor''s gone dull." You thumb the razor to show him. Need a sharp razor to shave. <i>Especially</i> down there," you smile.'
@@ -890,7 +894,7 @@ if $ARGS[0] = 'shave_legs':
 
 						if brotherfuck > 0 or brotherbj > 0 or brotherwash > 5: gs 'brother_voyeur', 'get_frisky'
 					end
-					if pcs_pubes < 21:
+					if pcs_pubes < 21 or shave_length > 0:
 						act'"Nope! I''m thinking of growing it out"':
 							cla & *nl
 							'"Nope! I''m thinking about growing it out," you say cheerfully, smiling at him.'
@@ -956,7 +960,7 @@ if $ARGS[0] = 'shave_legs':
 						pcs_horny += 5
 						brothershave += 1
 						minut += 5
-						mc_inventory['razor'] -=  1
+						mc_inventory['razor'] -= razors_to_use['pussy']
 						gs 'stat'
 						'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
 						'"Hmm..." You think to yourself for a moment. "Maybe you''re right after all," you say and start lathering up your crotch.'
@@ -988,7 +992,7 @@ if $ARGS[0] = 'shave_legs':
 end
 
 if $ARGS[0] = 'shave_pussy':
-	if pcs_pubes > shave_trigger:
+	if pcs_pubes > shave_trigger and mc_inventory['razor'] >= razors_to_use['pussy']:
 		act 'Shave your pussy (0:05)':
 			npc_rel['A34'] += 3
 			cla & *clr
@@ -999,7 +1003,7 @@ if $ARGS[0] = 'shave_pussy':
 				pcs_pubes = 0
 			end
 			pcs_horny += 5
-			mc_inventory['razor'] -=  1
+			mc_inventory['razor'] -= razors_to_use['pussy']
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
 			if brother_shower['shave_ask2'] = daystart:
@@ -1011,7 +1015,7 @@ if $ARGS[0] = 'shave_pussy':
 			
 			if pcs_leghair > 3:
 				'Kolka frowns. "You''re not going to shave your legs?"'
-				if mc_inventory['razor'] =  0:
+				if mc_inventory['razor'] < razors_to_use['legs']:
 					act'"I can''t. Razor''s gone dull"':
 						cla & *nl
 						'"I couldn''t even if I wanted to," you say to him wistfully. He looks at you in confusion. "Razor''s gone dull." You thumb the razor to show him. Need a sharp razor to shave. <i>Especially</i> down there," you smile.'
@@ -1032,7 +1036,7 @@ if $ARGS[0] = 'shave_pussy':
 						pcs_horny += 5
 						brothershave += 1
 						minut += 5
-						mc_inventory['razor'] -=  1
+						mc_inventory['razor'] -= razors_to_use['legs']
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
 						'"Hmm..." You think to yourself for a moment. "Maybe you''re right after all," you say and start lathering up your legs and begin carefully shaving them.'
@@ -1253,7 +1257,7 @@ if $ARGS[0] = 'shave':
 		elseif pcs_leghair > 3 and pcs_pubes <= 3:
 			'His lips twisted in thought, he says, "You''re looking a little hairy down there." You follow his gaze to look at your <<$pc_desc[''legs'']>> legs. "Aren''t you going to shave?"'
 		end
-		if mc_inventory['razor'] =  0:
+		if mc_inventory['razor'] = 0:
 			act'"I can''t. I don''t have any razors"':
 				cla
 				*nl
@@ -1263,7 +1267,7 @@ if $ARGS[0] = 'shave':
 			end
 
 		else
-			if pcs_leghair > 3 and pcs_pubes > 3 and mc_inventory['razor'] =  1:
+			if pcs_leghair > 3 and pcs_pubes > 3 and mc_inventory['razor'] < razors_to_use['all']:
 				msg 'As you pick up your razor, you realize that it''s probably only sharp enough for shaving one set of things. If you want to shave you''ll have to decide between keeping a <<$pc_desc[''pubes'']>> pussy or <<$pc_desc[''legs'']>> legs.'
 			end
 
@@ -1315,7 +1319,7 @@ if $ARGS[0] = 'shave':
 				end
 			end
 
-			if pcs_leghair > 3 and pcs_pubes > 3 and mc_inventory['razor'] > 1:
+			if pcs_leghair > 3 and pcs_pubes > 3 and mc_inventory['razor'] >= razors_to_use['all']:
 				act 'Shave your legs and pussy (0:15)':
 					cla & *clr
 					minut += 15
@@ -1323,7 +1327,7 @@ if $ARGS[0] = 'shave':
 					pcs_pubes = 0
 					pcs_horny += 5
 					brothershave += 1
-					mc_inventory['razor'] -=  2
+					mc_inventory['razor'] -= razors_to_use['all']
 					inhib_exp += rand(1,3)
 					gs 'stat'
 					'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
@@ -1340,13 +1344,13 @@ if $ARGS[0] = 'shave':
 				end
 			end
 
-			if pcs_leghair > 3:
+			if pcs_leghair > 3 and mc_inventory['razor'] >= razors_to_use['legs']:
 				act 'Shave your legs (0:05)':
 					*clr & cla
 					minut += 5
 					pcs_leghair = 0
 					pcs_horny += 5
-					mc_inventory['razor'] -=  1
+					mc_inventory['razor'] -= razors_to_use['legs']
 					inhib_exp += rand(1,2)
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
@@ -1354,7 +1358,7 @@ if $ARGS[0] = 'shave':
 					'You lather up your legs and then start carefully shaving them.'
 					if pcs_pubes > 3:
 						'Kolka frowns. "You''re not going to shave your pussy?"'
-						if mc_inventory['razor'] =  0:
+						if mc_inventory['razor'] < razors_to_use['pussy']:
 							act'"I can''t. Razor''s gone dull"':
 								cla
 								*nl
@@ -1371,7 +1375,7 @@ if $ARGS[0] = 'shave':
 								act'Dry off':gt'brother_voyeur','dryoff'
 							end
 
-							if pcs_pubes < 21:
+							if pcs_pubes < 21 or shave_length > 0:
 								act'"Nope! I''m thinking of growing it out"':
 									cla
 									*nl
@@ -1413,7 +1417,7 @@ if $ARGS[0] = 'shave':
 								pcs_horny += 5
 								brothershave += 1
 								minut += 5
-								mc_inventory['razor'] -=  1
+								mc_inventory['razor'] -= razors_to_use['pussy']
 								'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
 								if pcs_pubes < 11:
 									'<br>"Hmm..." You think to yourself for a moment. "Maybe you''re right after all," you say and start lathering up your crotch.<br>Kolka stares at you intensely as you carefully remove the bits of stubble from around your pussy.'
@@ -1436,8 +1440,8 @@ if $ARGS[0] = 'shave':
 					end
 				end
 			end
-			if pcs_pubes > shave_trigger:
-				act'"Hmm, maybe you''re right"':
+			if pcs_pubes > shave_trigger and mc_inventory['razor'] >= razors_to_use['pussy']:
+				act'Shave your pussy (0:10)':
 					cla & *clr
 					if pubestyle > 0 or pubestyle = 10:
 						pcs_pubes = shave_length
@@ -1447,7 +1451,7 @@ if $ARGS[0] = 'shave':
 					pcs_horny += 5
 					brothershave += 1
 					minut += 5
-					mc_inventory['razor'] -=  1
+					mc_inventory['razor'] -= razors_to_use['pussy']
 					inhib_exp += 1
 					gs 'stat'
 					'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
@@ -1500,11 +1504,11 @@ if $ARGS[0] = 'shave':
 		end
 	else
 		'<center><video autoplay loop src="images/shared/home/bathroom/brothershowertalk.mp4"></center>'
-		if pcs_leghair >= 4 and pcs_pubes >= shave_trigger and mc_inventory['razor'] > 0:
+		if pcs_leghair >= 4 and pcs_pubes >= shave_trigger and mc_inventory['razor'] >= razors_to_use['all']:
 			'While rinsing off, you notice your legs and pussy could use a shave. You look up and Kolka is still looking at the wall.'
-		elseif pcs_leghair < 4 and pcs_pubes >= shave_trigger and mc_inventory['razor'] > 0:
+		elseif pcs_leghair < 4 and pcs_pubes >= shave_trigger and mc_inventory['razor'] >= razors_to_use['pussy']:
 			'While rinsing off, you notice that your pussy could use a shave. You look up and Kolka is still looking at the wall.'
-		elseif pcs_leghair >= 4 and pcs_pubes < shave_trigger and mc_inventory['razor'] > 0:
+		elseif pcs_leghair >= 4 and mc_inventory['razor'] >= razors_to_use['legs']:
 			'While rinsing off, you notice your legs could use a shave. You look up and Kolka is still looking at the wall.'
 		end
 		'Do you want to shave right now?'
@@ -1515,7 +1519,7 @@ if $ARGS[0] = 'shave':
 			act'Dry off':gt'brother_voyeur','dryoff'
 		end
 
-		if mc_inventory['razor'] > 1 and pcs_leghair > 3 and pcs_pubes > 3:
+		if mc_inventory['razor'] >= razors_to_use['all'] and pcs_leghair > 3 and pcs_pubes > 3:
 			act'Shave your legs and pussy (0:15)':
 				cla & *clr
 				minut += 15
@@ -1526,7 +1530,7 @@ if $ARGS[0] = 'shave':
 					pcs_pubes = 0
 				end
 				pcs_horny += 5
-				mc_inventory['razor'] -=  2
+				mc_inventory['razor'] -= razors_to_use['all']
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
 				'You casually continue the conversation with your brother while lathering up your legs and crotch before starting to carefully shave them. You notice your brother make a few curious peeks but decide not to say anything and simply continue on with your business and the conversation.'
@@ -1535,13 +1539,13 @@ if $ARGS[0] = 'shave':
 			end
 		end
 
-		if mc_inventory['razor'] > 0 and pcs_leghair > 3:
+		if mc_inventory['razor'] >= razors_to_use['legs'] and pcs_leghair > 3:
 			act'Shave your legs (0:05)':
 				*clr & cla
 				minut += 5
 				pcs_leghair = 0
 				pcs_horny += 5
-				mc_inventory['razor'] -=  1
+				mc_inventory['razor'] -= razors_to_use['legs']
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
 				'You casually continue the conversation with your brother while lathering up your legs before starting to carefully shave them. You notice your brother make a few curious peeks but decide not to say anything and simply continue on with your business and the conversation.'
@@ -1550,7 +1554,7 @@ if $ARGS[0] = 'shave':
 			end
 		end
 
-		if mc_inventory['razor'] > 0 and pcs_pubes > 3:
+		if mc_inventory['razor'] >= razors_to_use['pussy'] and pcs_pubes > 3:
 			act'Shave your pussy (0:10)':
 				cla
 				*clr
@@ -1561,7 +1565,7 @@ if $ARGS[0] = 'shave':
 					pcs_pubes = 0
 				end
 				pcs_horny += 5
-				mc_inventory['razor'] -=  1
+				mc_inventory['razor'] -= razors_to_use['pussy']
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
 				'You casually continue the conversation with your brother while lathering up the area between your legs before starting to carefully shave it. You notice your brother make a few curious peeks but you decide not to say anything and simply continue on with your business and the conversation.'

locations/city_clinic.qsrc

@@ -9,6 +9,8 @@ if $ARGS[0] = 'start':
 	$location_type = 'indoors'
 	$menu_loc = 'city_clinic'
 	$menu_arg = 'start'
+	killvar 'temp_small_mbottle_ids'
+	killvar 'temp_medium_mbottle_ids'
 	menu_off = 0
 	*clr & cla
 	hosprand = rand(0, 10)
@@ -1668,14 +1670,10 @@ if $ARGS[0] = 'milk_bank':
 		'<br>----------------------------------------'
 		if lact_ev['poli_totalmilkdonation_count'] > 0:
 			'Total breast milk donation statistics'
-			if lact_ev['poli_totalmilkdonated'] < 100:
-				'Donated milk volume in liter: <<lact_ev[''poli_totalmilkdonated'']/1000>>.0<<lact_ev[''poli_totalmilkdonated''] mod 1000>>l'
-			else
-				'Donated milk volume in liter: <<lact_ev[''poli_totalmilkdonated'']/1000>>.<<lact_ev[''poli_totalmilkdonated''] mod 1000>>l'
-			end
+			'Donated milk volume in liter: <<lact_ev[''poli_totalmilkdonated'']/1000>>.<<$mid(1000 + (lact_ev[''poli_totalmilkdonated''] mod 1000), 2, 3)>>l'
 			'Donation count: <<lact_ev[''poli_totalmilkdonation_count'']>>'
-			'Average milk volume per donation in ml: <<lact_ev[''poli_totalmilkdonated'']/lact_ev[''poli_totalmilkdonation_count'']>>'
-			'Paid money: <<((lact_ev[''poli_totalmilkdonated'']/50)*100)>><b>₽</b>'
+			'Average milk volume per donation in ml: <<lact_ev[''poli_totalmilkdonated'']/lact_ev[''poli_totalmilkdonation_count'']>>.<<$mid(100 + ((100 * lact_ev[''poli_totalmilkdonated''] / lact_ev[''poli_totalmilkdonation_count'']) mod 100), 2, 2)>>'
+			'Paid money: <<lact_ev[''poli_totaldonatemoney'']>><b>₽</b>'
 			'<br>----------------------------------------'
 		end
 		act 'Leave': gt 'city_clinic', 'milk_donation_room'
@@ -1706,6 +1704,109 @@ if $ARGS[0] = 'milk_bank':
 			end
 		end
 	end
+
+	vmb_i = 0
+	:vmbloop
+	if vmb_i <= temp_var:
+		if mbarrloca[vmb_i] = 2 or mbarrloca[vmb_i] = 1:
+			gs 'lact_bp', 'update_mbottle', vmb_i
+			if $mbarrstat[vmb_i] = 'fresh' or $mbarrstat[vmb_i] = 'normal':
+				if mbarrfill[vmb_i] > 0:
+					if mbarrfill[vmb_i] <= 1500:
+						temp_small_mbottle_ids[] = vmb_i
+					else
+						temp_medium_mbottle_ids[] = vmb_i
+					end
+				end
+			end
+		end
+		vmb_i += 1
+		jump 'vmbloop'
+	end
+	killvar 'vmb_i'
+
+	if arrsize('temp_small_mbottle_ids') > 0:
+		act 'Donate a small bottle of milk':
+			*clr & cla
+			minut += 5
+			temp_total_pay = 0
+			temp_total_milk = 0
+			gs 'city_clinic', 'donate_milk_bottle', 'small'
+			gs 'stat'
+
+			!! IMAGE
+			!! TEXT
+			'You donated a <<temp_total_milk>> ml of milk and got paid <<temp_total_pay>><b>₽</b>.'
+
+			killvar 'temp_total_pay'
+			killvar 'temp_total_milk'
+			act 'Leave': minut += 5 & gt 'city_clinic', 'milk_donation_room'
+		end
+	end
+	if arrsize('temp_small_mbottle_ids') > 4:
+		act 'Donate 5 small bottles of milk':
+			*clr & cla
+			minut += 10
+			temp_total_pay = 0
+			temp_total_milk = 0
+			gs 'city_clinic', 'donate_milk_bottle', 'small'
+			gs 'city_clinic', 'donate_milk_bottle', 'small'
+			gs 'city_clinic', 'donate_milk_bottle', 'small'
+			gs 'city_clinic', 'donate_milk_bottle', 'small'
+			gs 'city_clinic', 'donate_milk_bottle', 'small'
+			gs 'stat'
+
+			!! IMAGE
+			!! TEXT
+			'You donated a <<temp_total_milk>> ml of milk and got paid <<temp_total_pay>><b>₽</b>.'
+
+			killvar 'temp_total_pay'
+			killvar 'temp_total_milk'
+			act 'Leave': minut += 5 & gt 'city_clinic', 'milk_donation_room'
+		end
+	end
+	if arrsize('temp_medium_mbottle_ids') > 0:
+		act 'Donate a medium bottle of milk':
+			*clr & cla
+			minut += 5
+			temp_total_pay = 0
+			temp_total_milk = 0
+			gs 'city_clinic', 'donate_milk_bottle', 'medium'
+			gs 'stat'
+
+			!! IMAGE
+			!! TEXT
+			'You donated a <<temp_total_milk>> ml of milk and got paid <<temp_total_pay>><b>₽</b>.'
+
+			killvar 'temp_total_pay'
+			killvar 'temp_total_milk'
+			act 'Leave': minut += 5 & gt 'city_clinic', 'milk_donation_room'
+		end
+	end
+	if arrsize('temp_medium_mbottle_ids') > 4:
+		act 'Donate 5 medium bottles of milk':
+			*clr & cla
+			minut += 10
+			temp_total_pay = 0
+			temp_total_milk = 0
+			gs 'city_clinic', 'donate_milk_bottle', 'medium'
+			gs 'city_clinic', 'donate_milk_bottle', 'medium'
+			gs 'city_clinic', 'donate_milk_bottle', 'medium'
+			gs 'city_clinic', 'donate_milk_bottle', 'medium'
+			gs 'city_clinic', 'donate_milk_bottle', 'medium'
+			gs 'stat'
+
+			!! IMAGE
+			!! TEXT
+			'You donated a <<temp_total_milk>> ml of milk and got paid <<temp_total_pay>><b>₽</b>.'
+
+			killvar 'temp_total_pay'
+			killvar 'temp_total_milk'
+			act 'Leave': minut += 5 & gt 'city_clinic', 'milk_donation_room'
+		end
+	end
+
+
 	act 'Leave': gt 'city_clinic','start'
 end
 
@@ -1761,7 +1862,7 @@ if $ARGS[0] = 'milk_donation':
 			end
 			lact_ev['poli_milkedvolume'] = 0
 			if lact_ev['poli_donationsessioncount'] > 0:
-				lact_ev['poli_donatemoney'] = (lact_ev['poli_donationsessioncount']*5)/10*10
+				lact_ev['poli_donatemoney'] = (lact_ev['poli_donationsessioncount'] / 2) * 10
 			else
 				lact_ev['poli_donatemoney'] = 0
 			end
@@ -1779,6 +1880,7 @@ if $ARGS[0] = 'milk_donation':
 				gs 'stat'
 				if lact_ev['poli_donationsessioncount'] > 0:
 					money += lact_ev['poli_donatemoney']
+					lact_ev['poli_totaldonatemoney'] += lact_ev['poli_donatemoney']
 					'You put your top back on and the employee hands you <<lact_ev[''poli_donatemoney'']>><b>₽</b> for your donated breast milk.'
 				else
 					'You put your top back on.'
@@ -1799,5 +1901,38 @@ if $ARGS[0] = 'milk_donation':
 	end
 end
 
---- city_clinic ---------------------------------
+if $ARGS[0] = 'donate_milk_bottle':
+	if $ARGS[1] = 'small':
+		temp_id = temp_small_mbottle_ids[0]
+	else
+		temp_id = temp_medium_mbottle_ids[0]
+	end
 
+	!! CHANGE PAY HERE
+	temp_pay = mbarrfill[temp_id] / 10			& !! Base pay = 1 rbl / ml for fresh milk
+	if $mbarrstat[temp_id] = 'normal': temp_pay = temp_pay / 2		& !! And 0.5 rbl / ml for normal milk
+	!!	if $mbarrtemp[temp_id] = 'hot' / 'warm' / 'lukewarm' / 'cold' / 'frozen':
+
+
+	temp_total_pay += temp_pay
+	money += temp_pay
+	lact_ev['poli_totaldonatemoney'] += temp_pay
+
+	temp_total_milk += mbarrfill[temp_id]
+	lact_ev['poli_totalmilkdonated'] += mbarrfill[temp_id]
+
+	gs 'lact_bp', 'empty_milk_bottle', temp_id
+
+	killvar 'temp_don_pay'
+	killvar 'temp_id'
+
+	if $ARGS[1] = 'small':
+		killvar 'temp_small_mbottle_ids', 0
+	else
+		killvar 'temp_medium_mbottle_ids', 0
+	end
+end
+
+
+
+--- city_clinic ---------------------------------

locations/core_library.qsrc

@@ -1,6 +1,4 @@
 # core_library
-
-
 !! Date Created: 17th Sept, 2022
 !! Modified date: 
 !! Version: .01 - initial release

locations/din_van.qsrc

@@ -8,6 +8,10 @@
 !!mc_inventory['razor'] =  razor
 !!$brit = shaving dynamic
 
+razors_to_use['all']   = min(3, max(1, (pcs_leghair*4 + max(0, pcs_pubes-shave_length))/20))
+razors_to_use['pussy'] = min(2, max(1, (max(0, pcs_pubes-shave_length))/20))
+razors_to_use['legs']  = min(3, max(1, (pcs_leghair*4)/20))
+
 $showerdin = {
 	menu_off = 1
 	if hypnoAddict = 0:
@@ -310,9 +314,9 @@ $SkinCare = {
 }
 
 $brit = {
-	if lashair ! 1 and (pcs_shave['free_razor'] = 1 or mc_inventory['razor'] > 0):
+	if lashair ! 1 and pcs_shave['free_razor'] + mc_inventory['razor'] > 0:
 		!! if shave_menu = 1: legs and pussy
-		if shave_menu = 1 and mc_inventory['razor'] > 2:
+		if shave_menu = 1 and mc_inventory['razor'] >= razors_to_use['all']:
 			if pcs_leghair >= 3 or (pubestyle > 0 and pcs_pubes >= shave_trigger):
 				if pcs_leghair >= 3 and (pubestyle > 0 and pcs_pubes >= shave_trigger):
 					if daystart < 10 and $start_type[1] = 'tg':
@@ -392,7 +396,7 @@ $brit = {
 							if pcs_shave['free_razor'] = 1:
 								pcs_shave['free_razor'] = 0
 							else
-								mc_inventory['razor'] -= 3
+								mc_inventory['razor'] -= razors_to_use['all']
 							end
 							dynamic $dryOff
 							gs 'selfplay', 'bathtub_dildo_check'
@@ -406,7 +410,7 @@ $brit = {
 		end
 
 		!! if shave_menu = 2: pussy only
-		if (shave_menu = 2 or shave_menu = 1):
+		if (shave_menu = 2 or shave_menu = 1) and mc_inventory['razor'] >= razors_to_use['pussy']:
 			if pubestyle > 0 and pcs_pubes >= shave_trigger:
 				if pubestyle = 1:
 					$shave_act = 'Shave your pussy'
@@ -471,7 +475,7 @@ $brit = {
 						if pcs_shave['free_razor'] = 1:
 							pcs_shave['free_razor'] = 0
 						else
-							mc_inventory['razor'] -= 1
+							mc_inventory['razor'] -= razors_to_use['pussy']
 						end
 						'<<$shave_txt1>>'
 						*nl
@@ -485,7 +489,7 @@ $brit = {
 		end
 
 		!! if shave_menu = 3: legs only
-		if (shave_menu = 3 or shave_menu = 1) and mc_inventory['razor'] > 1:
+		if (shave_menu = 3 or shave_menu = 1) and mc_inventory['razor'] >= razors_to_use['legs']:
 			if pcs_leghair >= 3:
 				act 'Shave your legs (0:05)':
 					menu_off = 1
@@ -498,7 +502,7 @@ $brit = {
 					if pcs_shave['free_razor'] = 1:
 						pcs_shave['free_razor'] = 0
 					else
-						mc_inventory['razor'] -= 2
+						mc_inventory['razor'] -= razors_to_use['legs']
 					end
 					!! if $locM = 'uni_dorm' and rand(0, 5) = 5:gt 'vann', 'brit1'
 					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave.jpg"></center>'
@@ -576,14 +580,14 @@ $quickwash = {
 
 	if cumloc[0]+cumloc[3] > 0 and hypnoAddict = 0:
 		if FUNC('Cum_Manage', 'check_innards', 0) = 1 or FUNC('Cum_Manage', 'check_innards', 3) = 1:
-			act 'Let the cum drain from your (0:10)':
+			act 'Let the cum drain from you (0:10)':
 				menu_off = 1
 				*clr & cla
 				cumspclnt = 15 & gs 'cum_cleanup'
 				minut += 10
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/pc/body/pee/wiping/no<<rand(3,4)>>.jpg"></center>'
-				'You spend minutes waiting between the sudden gushes of semen pouring out of your.'
+				'You spend minutes waiting between the sudden gushes of semen pouring out of you.'
 
 				act 'Finish':menu_off = 0 & gt $loc, $loc_arg
 			end
@@ -826,14 +830,14 @@ $basin = {
 
 	if cumloc[0]+cumloc[3] > 0 and hypnoAddict = 0:
 		if FUNC('Cum_Manage', 'check_innards', 0) = 1 or FUNC('Cum_Manage', 'check_innards', 3) = 1:
-			act 'Let the cum drain from your (0:10)':
+			act 'Let the cum drain from you (0:10)':
 				menu_off = 1
 				*clr & cla
 				cumspclnt = 15 & gs 'cum_cleanup'
 				minut += 10
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/pc/body/pee/wiping/no<<rand(3,4)>>.jpg"></center>'
-				'You spend minutes waiting between the sudden gushes of semen pouring out of your.'
+				'You spend minutes waiting between the sudden gushes of semen pouring out of you.'
 
 				act 'Finish':menu_off = 0 & gt $loc, $loc_arg
 			end

locations/femcyc.qsrc

@@ -848,7 +848,7 @@ if $ARGS[0] = 'cyc3':
 			!! the setting of the max_time can be here although it can be changed in the future
 			FocH_Max = rand(312,360) & !! 13-15 days including menstruation
 			temprand = rand(0,10)
-			if pillcon >= 38000 or rand(1,24) = 1:
+			if pillcon >= 38000 or (pillcon > 0 and rand(1,24) = 1):
 				EggRH = 0
 				cycle = 1
 				mesec = 0

locations/homes_properties_attr.qsrc

@@ -313,6 +313,7 @@ if $ARGS[0] = 'get_property_attr':
 		$property['display_0'] = 'plot of land in the St. Petersburg''s suburbs'
 		$property['display_1'] = 'impressive mansion under construction in the St. Petersburg''s suburbs'
 		$property['display_2'] = 'impressive mansion in the St. Petersburg''s suburbs'
+		$property['display'] = $property['display_<<accessible_property["<<$args[1]>>-construction-status"]>>']
 		$property['region'] = 'city'
 		$property['town'] = 'city'
 		$property['location'] = 'city_mansion_entrance'

locations/hotel_anna.qsrc

@@ -10,7 +10,7 @@ gs'stat'
 !minut += 10
 
 !!Check to prevent advancing beyond the current end of content
-if IgorevnaBDSM > 9: IgorevnaBDSM = 9
+if IgorevnaBDSM > 10: IgorevnaBDSM = 10
 
 if $ARGS[0] = 'meeting':
 	!gt'hotel_anna','meeting'
@@ -524,8 +524,8 @@ if ARGS[0] = 5:
 			end
 			act'Politely decline':
 				minut += 5
-				*clr & cla
 				gs 'stat'
+				*clr & cla
 				'"I''m sorry Anna, its a bit much for me." You do your best excuse to explain to Anna that you don''t feel comfortable with this proposal.'
 				'She seems to understand your apologies, and instead talks you through how the session would have gone.'
 				'She explains about the order of a proper intercourse, and the different way to approach it with the same results. Also, she gives you some more tips about D/s relationship, the correct way to refer to each partner and the behaviour that has to be assumed within the relationship.'
@@ -538,82 +538,175 @@ if ARGS[0] = 5:
 end
 
 if ARGS[0] = 6:
+	IgorevnaBDSM += 1
+	minut += 5
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract03b.jpg"></center>'
-	'<font color = blue> "Ok party pooper...as you wish... . Feel free to move around, I''ll be back in no time</font> Anna seems a little disappointed, but doesn''t seem sad; she wink at you while she move to her room...maybe she really like your company....'
+	'Anna is waiting for you when you arrive: "Hello Sweetie!" She gives you a quick hug.'
+	'"Last time was a bit intense for me to just spring on you without warning but I didn''t know if I could set it up and when you''d visit. I have to setup the other room for a special client, can you wait here for about 15 minutes?"'
+	'You are getting free training so a 15 minute wait doesn''t seem too bad.'
+	'"Great, there''s another girl in there, don''t untie her. Or do, but then I will have to punish you." She flashes you a wicked smile before going to the next room.'
 
-	act'Move to the main room':
+	act 'Enter the room':
+		minut += 2
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract04b.jpg"></center>'
-		'<font color = #DC143C> "OH! That''s a surprise...." </font> A middle age woman stands on the sofa bounded with ropes and with a tape that blocks her mouth'
-		act'Move the tape away':
+		'There is a woman bound and gagged on a chair in the room. A few weeks ago this would have been shocking to you but it''s become a lot more normal now that you are training with Anna.'
+		'The woman is tied in rope to restrict her movements, the knots are not great and look a bit rushed. She has gaffer tape across her mouth.'
+		'You sit down as you study her situation, she murmurs trying to communicate.'
+		act 'Move the tape away':
+			minut += 3
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05b0a.jpg"></center>'
-			'The tape was really glued to her mouth and it takes you a lot of your force to move it away; you best solution is to pull it away with a single hard pull. "Thank''s Ma''am..." She doesn''t seems to suffer about that anyway... <font color = #DC143C> "Hi...." </font>.'
-			act'Listen what she has to say':
+			'The tape was really stuck to her mouth and it takes a lot of force to remove. Slowly peeling it would probably be agony so you brace yourself and just rip it off.'
+			'"Thank you Ma''am." She doesn''t seems to react to the pain but the red mark shows you it must be sore.'
+			'"Hi, I''m <<$pcs_firstname>>" You say as introduction and think it might have been polite to have done so before tearing gaffer tape off her face.'
+			act 'Listen to her':
+				minut += 3
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05b1b.jpg"></center>'
-				'She doesn''t seem to be looking for you and she carefully avoids to look directly in your eyes. After some moment she speaks to you... "Ma''am...I think my arm got a cramp..."'
-				act'Try to free her':
-					*clr & cla
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05b1c.jpg"></center>'
-					'<font color = #DC143C> "Let me see what I can do...I''m <<$pcs_nickname>> anyway...who are you?" </font> You work on the ropes trying to set her free; it doesn''t seem a complicated pattern but the knots are quite tight; it will take some time for sure..."Thank you Ma''am <<$pcs_nickname>>; this slut''s name is Jeanine. this slut hope it will be no problem for Ma''am <<$pcs_nickname>>..."<br><font color = #DC143C> "....Uh??? Ahhh....ok.... . Jeanine, a beautiful name.... No...no...it seems I can handle them; they are tight for sure but it seems to be a simple wrap afterall...." </font><br>"...this slut...Ma''am <<$pcs_nickname>>...means... ....M-Mistress!...."'
-					act 'Turn': gt'hotel_anna_sex','spectator'
+				'She carefully avoids to look directly in your eyes mostly with her eyes cast downward.'
+				'After some time she speaks. "Ma''am. I think I have a cramp in my arm, could you untie me so I can stretch it out?"'
+				if AnnaQW['sub'] > 1:
+					act 'Free her':
+						AnnaQW['sub'] += 1
+						minut += 3
+						*clr & cla
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05b1c.jpg"></center>'
+						'"Let me see what I can do, What''s your name?", You ask as you work on the ropes trying to set her free.'
+						'It doesn''t take long as the knots are so poorly tied. "Thank you <<$pcs_nickname>> this slut''s name is Jeanine."'
+						'"Jeanine, what a beautiful name, how did you end up like this?"'
+						'"Oh, I made a bet. I bet Anna I could get you in trouble. Didn''t I Anna?"'
+						act 'Turn around': gt'hotel_anna','spank'
+					end
 				end
-				act'I don''t think I should, I''m sorry':
-					*clr & cla
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05b1c.jpg"></center>'
-					'"...of course Ma''am..." You feel a little sorry about her, but probably this is the best choice for both of you...'
-					wait 400
-					act 'Wait': gt'hotel_anna_sex','spectator'
+				if AnnaQW['dom'] > 1:
+					act 'Fix her bindings':
+						AnnaQW['sub'] += 1
+						minut += 5
+						*clr & cla
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05b1c.jpg"></center>'
+						'Instead of doing as she asks you decide it''d be a lot more comfortable if she was tied properly and re-do her bids correctly.'
+						'"Oh, that is much better. Thank you ma''am." Realising you had forgotten one thing, you reattach her tape gag and give her a kiss on her taped mouth.'
+						'You sit and wait for Anna to return.'
+						act 'Anna':
+							minut += 5
+							*clr & cla
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract03b.jpg"></center>'
+							'"Sorry Sweetie, that took a little longer than I expected. Oh, you''ve fixed her ropes. That''s wonderful work and now Mistress Jeanie will have to stay tied up while I spend an hour with my client and regret betting against you."'
+							'Anna laughs for some time, clearly finding her friend''s misfortune far more amusing than you do. Perhaps they have some kind of rivalry?'
+							'"As you might have guessed this was something of a test for you Sweetie and it could not have gone better. Now I have work to do, I look forward to our next session."'
+							'Anna gives you a friendly kiss on the cheek as you pass her on your way to the door.'
+							act 'Leave': gt'pav_hotel'
+						end
+					end
 				end
-				act'Tape her again':
+				act 'Tape her mouth shut again':
+					minut += 5
 					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05b1a.jpg"></center>'
-					'"...Thank you Ma''am to remind this slu.... " You immediately put the tape back on her mouth...<font color = #DC143C> "....That''s it. Babushka always tells me ''...if you find a stray dog on a leash never let it free, you will never know'' ...." </font>'
-					wait 400
-					act 'Wait': gt'hotel_anna_sex','spectator'
+					'"No, no. Please do..." You put the tape back on her mouth cutting her protest short and sit down to wait for Anna.'
+					'"Babushka always tells me ''If you find a stray dog on a leash never let it free, you will never know'' " You quote to her. It is an odd saying but common enough to the area that she will understand.'
+					act 'Finally':
+						minut += 5
+						*clr & cla
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract03b.jpg"></center>'
+						'"Sorry Sweetie, that took a little longer than I expected. I hope Mistress Jeanie enjoyed your company as she will have to stay tied up while I spend an hour with my client and regret betting against you."'
+						'Anna laughs for some time, clearly finding her friend''s misfortune far more amusing than you do. Perhaps they have some kind of rivalry?'
+						'"As you might have guessed this was something of a test for you Sweetie and I will at least fix those bindings as it must be uncomfortable. Now I have work to do, I look forward to our next session."'
+						'You make your way to the door.'
+						act 'Leave': gt'pav_hotel'
+					end
 				end
 			end
-			act'Tape her again':
+		end
+		if AnnaQW['dom'] > 1:
+			act 'Leave her taped up and wait for Anna':
+				minut += 5
 				*clr & cla
 				gs 'stat'
-				AnnaQW['dom'] += 1
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05b1a.jpg"></center>'
-				'"...Thank you Ma''am to remind this slu.... " You immediately put the tape back again on her mouth...<font color = #DC143C> "....That''s it. Babushka always tells me ''...if you find a stray dog on a leash never let it free, you will never know'' ...." </font>'
-				wait 800
-				act 'Finally': gt'hotel_anna_sex','spectator'
+				AnnaQW['trust'] += 1
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05b0b.jpg"></center>'
+				'You sit and wait for Anna trying to ignore the woman tied up on the chair near you but you keep hearing a rustling sound coming from her direction.'
+				'You look at the woman wriggling around trying to get comfortable.'
+				act'"Stop moving!"':
+					minut += 5
+					*clr & cla
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract04b.jpg"></center>'
+					'You shout at her to stop moving and she sits back upright as she was when you entered and does not move again'
+					'You play around on your phone as you wait for Anna to get back from whatever she is doing next door.'
+					act 'Finally':
+						minut += 5
+						*clr & cla
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract03b.jpg"></center>'
+						'Anna returns, she looks to you and then to the woman, "Exactly as a I left her, no punishment for you Sweetie."'
+						'She walks over to the woman, "As for you Jeanie, you''ve got another hour of this while I entertain my client. Maybe spend that time reconsidering betting against <<$pcs_firstname>> again?"'
+						'Anna is laughing, "Well you''ve done well Sweetie but this little test was our session, I have to get to work so I will see you next time and we''ll do something a bit more hands on"'
+						'This was pretty disappointing but Anna has her ways and did seem very busy, you make your way to the door.'
+						act 'Leave': gt'pav_hotel'
+					end
+				end
 			end
 		end
-		act'Ummm.... maybe this is a test... better not touch her.':
-			*clr & cla
-			gs 'stat'
-			AnnaQW['trust'] += 1
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05b0b.jpg"></center>'
-			'You look at the woman trying to find a better position for herself...that''s your impression at least...'
-			act'...she keeps struggling...':
-				*clr & cla
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05b1a.jpg"></center>'
-				'<font color = #DC143C> "....Well I can see it''s quite hard for her to find some relief ...." </font>'
-				wait 1200
-				act 'Finally': gt'hotel_anna_sex','spectator'
+	end
+end
+
+if $ARGS[0] = 'spank':
+	minut += 2
+	*clr & cla
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract03b.jpg"></center>'
+	'Anna is standing there looking at you holding the ropes you had just untied from Jeanie, if that is even her name.'
+	'Well <<$pcs_firstname>>, I wonder if you did this because you wanted to be punished of if you simply don''t listen. Either way I gave you fair warning so get on my knee. Now!"'
+	'Anna has sat down and Jeanie is standing right behind you, her breath on your neck. It doesn''t look like you have a choice.'
+	act 'Comply':
+		*clr & cla
+		if $pantyworntype = 'none':
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract09a3b.jpg"></center>'
+			if PCloPanties = 0:
+				if CloDress  =  1:
+					'As you move toward Anna, Jeanie grabs the hem of your dress and pulls it over your head leaving you exposed.'
+				else
+					'As you move toward Anna, Jeanie grabs your ' + iif(CloSkirtShortness > 0, 'skirt and pulls it', 'pants and pulls them') + ' down, leaving you exposed.'
+				end
+			end
+		else
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract09a3a.jpg"></center>'
+			if PCloPanties = 0:
+				if CloDress  =  1:
+					'As you move toward Anna, Jeanie grabs the hem of your dress and pulls it over your head leaving you in just your underwear.'
+				else
+					'As you move toward Anna, Jeanie grabs your ' + iif(CloSkirtShortness > 0, 'skirt and pulls it', 'pants and pulls them') + ' down, leaving your panties exposed.'
+				end
 			end
 		end
-		act'Wait':
+		'Anna lays you across her lap and starts spanking your butt, hard. After the first 5 she stops and says, "You have to count them Sweetie, or they don''t count and I can''t be smacking you all night."'
+		'She resumes and you starting counting each strike hoping to end the humiliation and pain as quickly as you can.'
+		gs 'pain', 5, 'asscheeks', 'spank'
+		gs 'arousal', 'BDSM', 3, 'sub'
+		gs 'stat'
+		act 'Endure':
 			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract09a3c.jpg"></center>'
+			if $pantyworntype ! 'none': 'Jeanie interrupts Anna and loudly states: "A smack must be on a bare butt." She proceeds to pull down your panties before Anna continues.'
+			'Eventually as you count to 30 Anna stops. "That''s enough for now Sweetie. I hope you have learnt more about how our world works. You will need time to think about it I''m sure."'
+			gs 'pain', 5, 'asscheeks', 'spank'
+			gs 'arousal', 'BDSM', 5, 'sub'
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05b1a.jpg"></center>'
-			'You really don''t know what to do. To find someone bounded and gagged normally means it''s a kidnapping; that''s not the case of course...'
-			wait 1800
-			act'Finally': gt'hotel_anna_sex','spectator'
+			'You get up and quickly re-dress, you butt really stings from the spanking. There is also some arousal building as a result and you realise Anna is correct it will take time to understand that mixed feeling.'
+			'Anna guides you to the door: "I look forward to our next session Sweetie." She then gives you a gentle pat on the butt reminding you of the pain as you walk past her.'
+			act 'Leave': gt'pav_hotel'
 		end
 	end
 end

locations/hotel_anna_sex.qsrc

@@ -476,16 +476,16 @@ if $ARGS[0] = 'dresscontest_end':
 		'<font color = #DC143C>"Anna...is everything fine?"</font>'
 		if IgorevnaBDSM_statusdress_a = 1:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractic1/Annapract17.jpg"></center>'
-			'<font color = blue>"Yes yes <<$pcs_nickname>>>...it''s only the film...you won''t believe it...They...uh? Wow! Stunning! It''s marvelous on you! But I didn''t remember to have the key...come here."</font> You approach Anna...<br><font color = #DC143C>"Is there something wrong?"</font><br><font color = blue>"Maybe...or maybe not. Let me check your wrist..."</font> With few simple movements Anna free your hands from the cuffs...<font color = blue>"I see...you are a difficult one...it should be interesting seeing you managing with high class restraint. Anyway, do you like it?"</font><br><font color = #DC143C>"Well...i didn''t see too much, wearing those clothes it''s time consuming..."</font><br><font color = Blue>"Haha...silly, i meant the dress... . About the film...you lost nothing..."</font><br><font color = #DC143C>"Mmmm...it''s not really comfortable, but it seem nice looking."</font><br> There were a couple of seconds of silence, without the film filling the empty space between your dialogue and then...<font color = blue>"Mmmm...say <<$pcs_nickname>>, do you think you will be comfortable to try a session with me? Much more light than the one with Jeanine and no sex allowed."</font>'
+			'<font color = blue>"Yes yes <<$pcs_nickname>>...it''s only the film...you won''t believe it...They...uh? Wow! Stunning! It''s marvelous on you! But I didn''t remember to have the key...come here."</font> You approach Anna...<br><font color = #DC143C>"Is there something wrong?"</font><br><font color = blue>"Maybe...or maybe not. Let me check your wrist..."</font> With few simple movements Anna free your hands from the cuffs...<font color = blue>"I see...you are a difficult one...it should be interesting seeing you managing with high class restraint. Anyway, do you like it?"</font><br><font color = #DC143C>"Well...i didn''t see too much, wearing those clothes it''s time consuming..."</font><br><font color = Blue>"Haha...silly, i meant the dress... . About the film...you lost nothing..."</font><br><font color = #DC143C>"Mmmm...it''s not really comfortable, but it seem nice looking."</font><br> There were a couple of seconds of silence, without the film filling the empty space between your dialogue and then...<font color = blue>"Mmmm...say <<$pcs_nickname>>, do you think you will be comfortable to try a session with me? Much more light than the one with Jeanine and no sex allowed."</font>'
 		elseif IgorevnaBDSM_statusdress_b = 1:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractic1/Annapract17.jpg"></center>'
-			'<font color = blue>"Yes yes <<$pcs_nickname>>>...it''s only the film...you won''t believe it...They...uh? Wow! Stunning! It''s marvelous on you!"</font> <br><font color = #DC143C>"You saw nothing hehehe... "</font>You try to impress Anna swinging the whip, but with a poor result...<br><font color = blue>"<<$pcs_nickname>>>...pay attention to the eyes...even yours..."</font><br><font color = #DC143C>"Ok ok... "</font><br><font color = blue>"Hehehe...i assume you have fun right now. Anyway, do you like it?"</font><br><font color = #DC143C>"Well...i didn''t see too much, wearing those clothes it''s time consuming..."</font><br><font color = Blue>"Haha...silly, i meant the dress... . About the film...you lost nothing..."</font><br><font color = #DC143C>"Well...it''s sexy and nice looking; it will catch unwanted eyes outside this room i think...hehehe... that''s for sure."</font><br><font color = blue>"You got a point."</font> You both laugh for a couple of second then suddenly...<font color = blue>"Say <<$pcs_nickname>>, do you think you will be comfortable to try a session with me? Much more light than the one with Jeanine and no sex allowed."</font>'
+			'<font color = blue>"Yes yes <<$pcs_nickname>>...it''s only the film...you won''t believe it...They...uh? Wow! Stunning! It''s marvelous on you!"</font> <br><font color = #DC143C>"You saw nothing hehehe... "</font>You try to impress Anna swinging the whip, but with a poor result...<br><font color = blue>"<<$pcs_nickname>>...pay attention to the eyes...even yours..."</font><br><font color = #DC143C>"Ok ok... "</font><br><font color = blue>"Hehehe...i assume you have fun right now. Anyway, do you like it?"</font><br><font color = #DC143C>"Well...i didn''t see too much, wearing those clothes it''s time consuming..."</font><br><font color = Blue>"Haha...silly, i meant the dress... . About the film...you lost nothing..."</font><br><font color = #DC143C>"Well...it''s sexy and nice looking; it will catch unwanted eyes outside this room i think...hehehe... that''s for sure."</font><br><font color = blue>"You got a point."</font> You both laugh for a couple of second then suddenly...<font color = blue>"Say <<$pcs_nickname>>, do you think you will be comfortable to try a session with me? Much more light than the one with Jeanine and no sex allowed."</font>'
 		elseif IgorevnaBDSM_hooble_dressNO = 1 and IgorevnaBDSM_harness_dressNO = 1 and IgorevnaBDSM_statusdress_dressNO = 1:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractic1/Annapract17a.jpg"></center>'
-			'<font color = blue>"Yes yes <<$pcs_nickname>>>...it''s only the film...you won''t believe it...They...uh? Well...just remember me to think twice before calling you to go shopping...ok?"</font><br><font color = #DC143C>"I''m sorry Anna at the end...i was thinking...and then..."</font><br><font color = blue>"Do not worry...but you own me a dress contest...  hehehe... . Anyway, i''m curious about your impressions..."</font><br><font color = #DC143C>"Well...i didn''t see too much, and you keep yelling...i think it''s not worth it..."</font><br><font color = blue>"Haha...silly, i meant the dresses... . About the film...you lost nothing..."</font><br><font color = #DC143C>"Ah...they seem sexy and nice looking; you will catch unwanted eyes outside this room i think...hehehe... that''s for sure."</font><br><font color = blue>"You got a point."</font> You both laugh for a couple of second then suddenly...<font color = blue>"Say <<$pcs_nickname>>, do you think you will be comfortable to try a session with me? Much more light than the one with Jeanine and no sex allowed."</font>'
+			'<font color = blue>"Yes yes <<$pcs_nickname>>...it''s only the film...you won''t believe it...They...uh? Well...just remember me to think twice before calling you to go shopping...ok?"</font><br><font color = #DC143C>"I''m sorry Anna at the end...i was thinking...and then..."</font><br><font color = blue>"Do not worry...but you own me a dress contest...  hehehe... . Anyway, i''m curious about your impressions..."</font><br><font color = #DC143C>"Well...i didn''t see too much, and you keep yelling...i think it''s not worth it..."</font><br><font color = blue>"Haha...silly, i meant the dresses... . About the film...you lost nothing..."</font><br><font color = #DC143C>"Ah...they seem sexy and nice looking; you will catch unwanted eyes outside this room i think...hehehe... that''s for sure."</font><br><font color = blue>"You got a point."</font> You both laugh for a couple of second then suddenly...<font color = blue>"Say <<$pcs_nickname>>, do you think you will be comfortable to try a session with me? Much more light than the one with Jeanine and no sex allowed."</font>'
 		else
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractic1/Annapract17a.jpg"></center>'
-			'<font color = blue>"Yes yes <<$pcs_nickname>>>...it''s only the film...you won''t believe it...They...uh? Well...i assume you didn''t want to try them..."</font><br><font color = #DC143C>"Well...i was thinking...but then..."</font><br><font color = blue>"Do not worry... Anyway, i''m curious about your impressions...what do you think?"</font><br><font color = #DC143C>"Well...i didn''t see too much, and you keep yelling...i think it''s not worth it..."</font><br><font color = blue>"Haha...silly, i meant the dresses... . About the film...you lost nothing..."</font><br><font color = #DC143C>"Ah...they seem sexy and nice looking; you will catch unwanted eyes outside this room i think...hehehe... that''s for sure."</font><br><font color = blue>"You got a point."</font> You both laugh for a couple of second then suddenly...<font color = blue>"Say <<$pcs_nickname>>, do you think you will be comfortable to try a session with me? Much more light than the one with Jeanine and no sex allowed."</font>'
+			'<font color = blue>"Yes yes <<$pcs_nickname>>...it''s only the film...you won''t believe it...They...uh? Well...i assume you didn''t want to try them..."</font><br><font color = #DC143C>"Well...i was thinking...but then..."</font><br><font color = blue>"Do not worry... Anyway, i''m curious about your impressions...what do you think?"</font><br><font color = #DC143C>"Well...i didn''t see too much, and you keep yelling...i think it''s not worth it..."</font><br><font color = blue>"Haha...silly, i meant the dresses... . About the film...you lost nothing..."</font><br><font color = #DC143C>"Ah...they seem sexy and nice looking; you will catch unwanted eyes outside this room i think...hehehe... that''s for sure."</font><br><font color = blue>"You got a point."</font> You both laugh for a couple of second then suddenly...<font color = blue>"Say <<$pcs_nickname>>, do you think you will be comfortable to try a session with me? Much more light than the one with Jeanine and no sex allowed."</font>'
 		end
 		act'...':
 			*clr & cla
@@ -677,7 +677,7 @@ if $ARGS[0] = 'Anna_path_choice':
 		!	IgorevnaBDSM -= 1
 		!	minut += 61
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/session_start0a.jpg"></center>'
-			'<font color = blue> "Understandable. Well in that case we can only talk about how things are going in the world..." </font> Both you and Anna spend an hour speaking of various thing, sometimes the arguments drop on the BDSM but mostly it''s unrelated to it... . It seems that Anna couldn''t teach you nothing more without practice... . At the end she lead you to the exit letting you know she''s avaible for further experimentation... <font color = blue> "...oh...<$pcs_nickname>>, the work will not be avaible anymore but we could find something else. Do not forget the all the roles will be avaible... ."</font> Then she give you two great kisses on your cheeck and you go on your own way...'
+			'<font color = blue> "Understandable. Well in that case we can only talk about how things are going in the world..." </font> Both you and Anna spend an hour speaking of various thing, sometimes the arguments drop on the BDSM but mostly it''s unrelated to it... . It seems that Anna couldn''t teach you nothing more without practice... . At the end she lead you to the exit letting you know she''s avaible for further experimentation... <font color = blue> "...oh...<<$pcs_nickname>>, the work will not be avaible anymore but we could find something else. Do not forget the all the roles will be avaible... ."</font> Then she give you two great kisses on your cheeck and you go on your own way...'
 			act'Thanks Anna, see you...': gt'HotelHole'
 		end
 	elseif IgorevnaBDSM_session_librarian = 2:
@@ -736,7 +736,7 @@ if $ARGS[0] = 'Anna_path_choice':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/session_start0Na.jpg"></center>'
-			'<font color = blue> "Hehehe...<$pcs_nickname>>, it''s not the we are on the cafe''..." </font><br><font color = #DC143C> "No...but...if i chose something i pleclude the other and the contrary...i don''t know...and we don''t have the time to do both...right?"</font><br><font color = blue> "It''s true that we don''t have the time rigth now to do both, but you won''t preclude nothing on the long term...well if that''s your intention... . Ummmhh...let me help you. Do you like my bum? Would you like the chance to squeeze it a little while giving me a good spanking? Or maybe you prefer to feel a soft flog that crawl on your butt..."</font><br>Anna is teasing you to know what could be better for you...your answer will lead you to the right choice...if something could be wrong... . But your though run to something else...<font color = #DC143C> "Oh! I see...but....mmmm...emmhh...what about boobs?"</font><br><font color = blue> "Uhmmm...I don''t think you will be able to fine "tune" them...yet... . And remember: no sex allowed."</font>'
+			'<font color = blue> "Hehehe...<<$pcs_nickname>>, it''s not the we are on the cafe''..." </font><br><font color = #DC143C> "No...but...if i chose something i pleclude the other and the contrary...i don''t know...and we don''t have the time to do both...right?"</font><br><font color = blue> "It''s true that we don''t have the time rigth now to do both, but you won''t preclude nothing on the long term...well if that''s your intention... . Ummmhh...let me help you. Do you like my bum? Would you like the chance to squeeze it a little while giving me a good spanking? Or maybe you prefer to feel a soft flog that crawl on your butt..."</font><br>Anna is teasing you to know what could be better for you...your answer will lead you to the right choice...if something could be wrong... . But your though run to something else...<font color = #DC143C> "Oh! I see...but....mmmm...emmhh...what about boobs?"</font><br><font color = blue> "Uhmmm...I don''t think you will be able to fine "tune" them...yet... . And remember: no sex allowed."</font>'
 			act'Well...how could the flog be "soft"?...':gt'hotel_anna','Anna_sub_session'
 			act'Well...you really have a great bum...':gt'hotel_anna_sex','Anna_dom_session'
 		end
@@ -746,7 +746,7 @@ if $ARGS[0] = 'Anna_path_choice':
 		!	IgorevnaBDSM -= 1
 		!	minut += 61
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/session_start0a.jpg"></center>'
-			'<font color = blue> "Well in that case we can only talk about how things are going in the world..." </font> Both you and Anna spend an hour speaking of various thing, sometimes the arguments drop on the BDSM but mostly it''s unrelated to it... . It seems that Anna couldn''t teach you nothing more without practice... . At the end she lead you to the exit letting you know she''s avaible for further experimentation... <font color = blue> "...Ok...<$pcs_nickname>>, take your time...i won''t run... . Do not forget: "Know Thy Yourself""</font> Then she give you two great kisses on your cheeck and you go on your own way...'
+			'<font color = blue> "Well in that case we can only talk about how things are going in the world..." </font> Both you and Anna spend an hour speaking of various thing, sometimes the arguments drop on the BDSM but mostly it''s unrelated to it... . It seems that Anna couldn''t teach you nothing more without practice... . At the end she lead you to the exit letting you know she''s avaible for further experimentation... <font color = blue> "...Ok...<<$pcs_nickname>>, take your time...i won''t run... . Do not forget: "Know Thy Yourself""</font> Then she give you two great kisses on your cheeck and you go on your own way...'
 			act'Thanks Anna, see you...': gt'HotelHole'
 		end
 	end	
@@ -759,7 +759,7 @@ if $ARGS[0] = 'slaveM':
 	AnnaQW['trust'] += 1
 	BDSM_Knowledge += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM0.jpg"></center>'
-	'<font color = blue> "...You look good <<$pcs_nickname>>..." </font><br><font color = #DC143C> "...Oh thanks. Do you think that pink doesn''t suit with the session?"</font><br><font color = blue> "...Absolutely not: if another color could make you more confident with your self you could use it as a little help. Honestly it doesn''t matter: you could be dress as a farie and nonetheless subs have to obey; no matter what." </font><br><font color = #DC143C> "Got it."</font><br><font color = blue> "Before presentation <<$pcs_nickname>...is there something you would like to ask? Something you may want to improve ... or a last minutes tip?"</font>'
+	'<font color = blue> "...You look good <<$pcs_nickname>>..." </font><br><font color = #DC143C> "...Oh thanks. Do you think that pink doesn''t suit with the session?"</font><br><font color = blue> "...Absolutely not: if another color could make you more confident with your self you could use it as a little help. Honestly it doesn''t matter: you could be dress as a farie and nonetheless subs have to obey; no matter what." </font><br><font color = #DC143C> "Got it."</font><br><font color = blue> "Before presentation <<$pcs_nickname>>...is there something you would like to ask? Something you may want to improve ... or a last minutes tip?"</font>'
 	act'Control': 
 		*clr & cla
 		gs 'stat'
@@ -784,14 +784,14 @@ if $ARGS[0] = 'slaveM':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM1b.jpg"></center>'
-		'<font color = blue> "<<$pcs_nickname> this is worm, worm She is <<$pcs_nickname>, a new Mistress... . Obedience you said uh?</font> Without stop speaking Anna bend the man''s back with her knees...<font color = blue> Well there''s a lot to talk about that, we''ll limits for the moment... . I can quickly tell you that''s the result the Dom usually look for and obtain through Discipline: one of the basic of BDSM. Discipline, in short, stand on two pillars: to private for something, for example restriction, or to give something, for example a punishment. There''s also the reward system, but for the moment we''ll stop here...i''d like to start if you don''t mind..." </font><br><font color = #DC143C> "Wait...you said that obedience is what Dominant "usually" is looking for in a sub...what else could you want from a sub?"</font><br><font color = blue> "Well there are situation where Dominant isn''t looking for obedience. For example a sub who''s looking for a Dom, but Dom is full of obedient subs but lack in subbie workers...or within a couple to fullfill one part wish to be dominated...etc. Nothing incredible to be honest...it''s more for completness... . Shall we start?" </font> You nod'
+		'<font color = blue> "<<$pcs_nickname>> this is worm, worm She is <<$pcs_nickname>>, a new Mistress... . Obedience you said uh?</font> Without stop speaking Anna bend the man''s back with her knees...<font color = blue> Well there''s a lot to talk about that, we''ll limits for the moment... . I can quickly tell you that''s the result the Dom usually look for and obtain through Discipline: one of the basic of BDSM. Discipline, in short, stand on two pillars: to private for something, for example restriction, or to give something, for example a punishment. There''s also the reward system, but for the moment we''ll stop here...i''d like to start if you don''t mind..." </font><br><font color = #DC143C> "Wait...you said that obedience is what Dominant "usually" is looking for in a sub...what else could you want from a sub?"</font><br><font color = blue> "Well there are situation where Dominant isn''t looking for obedience. For example a sub who''s looking for a Dom, but Dom is full of obedient subs but lack in subbie workers...or within a couple to fullfill one part wish to be dominated...etc. Nothing incredible to be honest...it''s more for completness... . Shall we start?" </font> You nod'
 		act'Warm up...': gt'hotel_anna_sex','slaveM1'
 	end
 	act'Punishment': 
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM1c.jpg"></center>'
-		'<font color = blue> "Punishment you said uh? Ok: show your ass and stop breathing." </font>Anna look at the man and give him an order. The man execute...<br><font color = #DC143C> "...Oh...well...i assume this is part of the punishment...but really: does she has to stop breating? "</font><br><font color = blue> "Uh? Honestly...that''s a little reward...it likes breath play. By the way, <<$pcs_nickname> this is worm, worm She is <<$pcs_nickname>, a new Mistress... . Punishment punishment...well: we''ll have fun! I can add something to your theory anyway... Not only punishment is used to dicipline a sub; you know a masochist love being punished...what you don''t know is that there''s a state called subspace that subs search while being punished: it''s an altered status that enhance all sub''s sensations...but we don''t have enough time right now to speak about it; and the existance of the so called painslut...subbies that can cum with punishment...again...we should really start right now. We''ll eventually return to those arguments...when you are ready order it to breath again...i don''t want it to cum..." </font>'
+		'<font color = blue> "Punishment you said uh? Ok: show your ass and stop breathing." </font>Anna look at the man and give him an order. The man execute...<br><font color = #DC143C> "...Oh...well...i assume this is part of the punishment...but really: does she has to stop breating? "</font><br><font color = blue> "Uh? Honestly...that''s a little reward...it likes breath play. By the way, <<$pcs_nickname>> this is worm, worm She is <<$pcs_nickname>>, a new Mistress... . Punishment punishment...well: we''ll have fun! I can add something to your theory anyway... Not only punishment is used to dicipline a sub; you know a masochist love being punished...what you don''t know is that there''s a state called subspace that subs search while being punished: it''s an altered status that enhance all sub''s sensations...but we don''t have enough time right now to speak about it; and the existance of the so called painslut...subbies that can cum with punishment...again...we should really start right now. We''ll eventually return to those arguments...when you are ready order it to breath again...i don''t want it to cum..." </font>'
 		act'"worm...start breath."': gt'hotel_anna_sex','slaveM1'
 	end
 	act'Nothing...': 
@@ -799,7 +799,7 @@ if $ARGS[0] = 'slaveM':
 		gs 'stat'
 		Anna_see_abrat += 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/male/slaveM1d.jpg"></center>'
-		'<font color = blue> "Right to the point uh? Do not forget you don''t have to rush things." </font><br><font color = #DC143C> "Ok...ok...he''s your toy afterall..."</font><br><font color = blue> "By the way, <<$pcs_nickname> this is worm, worm She is <<$pcs_nickname>, a new Mistress... . We can start..." </font>Anna start to pull down the man''s pants...<br><font color = #DC143C> "...Hey...it''s shaved..."</font><br><font color = blue> "...Well it''s a worm but it''s registered as a human being...yet... . You know the bear problem..." </font><br><font color = #DC143C> "I mean his butt..."</font><br><font color = blue> "Oh! its butt...well...BDSM session usually has actors play in "blend" modality, expecially subs. To be honest it''s almost a not written rule: only Dominant can let intimate area unshaved...that''s according personal a taste of course. While subbie should be always being shaved: the deep the relationship the silkiest (skin has to be silk) have to be skin. Into a M/s relationship, intimate cannot be less than silk at contact. Anyway, for completeness, any treatment that will have permanet effect must have both agreement, like the electrolisys body depilation. But stop talking..."  </font>'
+		'<font color = blue> "Right to the point uh? Do not forget you don''t have to rush things." </font><br><font color = #DC143C> "Ok...ok...he''s your toy afterall..."</font><br><font color = blue> "By the way, <<$pcs_nickname>> this is worm, worm She is <<$pcs_nickname>>, a new Mistress... . We can start..." </font>Anna start to pull down the man''s pants...<br><font color = #DC143C> "...Hey...it''s shaved..."</font><br><font color = blue> "...Well it''s a worm but it''s registered as a human being...yet... . You know the bear problem..." </font><br><font color = #DC143C> "I mean his butt..."</font><br><font color = blue> "Oh! its butt...well...BDSM session usually has actors play in "blend" modality, expecially subs. To be honest it''s almost a not written rule: only Dominant can let intimate area unshaved...that''s according personal a taste of course. While subbie should be always being shaved: the deep the relationship the silkiest (skin has to be silk) have to be skin. Into a M/s relationship, intimate cannot be less than silk at contact. Anyway, for completeness, any treatment that will have permanet effect must have both agreement, like the electrolisys body depilation. But stop talking..."  </font>'
 		act'Warm up...': gt'hotel_anna_sex','slaveM1'
 	end
 end

locations/hourly_events.qsrc

@@ -138,7 +138,7 @@ elseif pcs_period['period_warning'] = 1 and LutH_Max-LutH <= 2:
 		msg'Your stomach twinges again. Another cramp of pain. It must mean your period is about to start. You really need to get a tampon in there ASAP.'
 	end
 elseif mesec > 0:
-	period['cramp'] = 0
+	pcs_period['period_warning'] = 0
 end
 
 

locations/katja_dorm.qsrc

@@ -1162,7 +1162,7 @@ if $ARGS[0] = 'movie_talk2':
 end
 
 if $ARGS[0] = 'watch_movie':
-	if katjaQW['relationship_count_start'] + 350/(1+ katjaQW['boy_block']) < daystart and hour < 21 and katjaQW['relationship_talk'] = 0:
+	if katjaQW['relationship_count_start'] + 350/(1+ katjaQW['boy_block']) < daystart and hour < 21 and katjaQW['relationship_talk'] = 0 and katjaQW['relationship_count_start'] > 0:
 		gt 'katja_dorm', 'relationship_talk'
 	end
 	cla & *clr

locations/katja_uni.qsrc

@@ -1212,6 +1212,7 @@ if $ARGS[0] = 'dorm_room_walk':
 			act 'Go to Katja''s room':
 				cla & *clr
 				katjaQW['QWstage'] = 2
+				katjaQW['knows_dorm_room_number'] = 1
 				gs 'arousal', 'voyeur', 3, 'lesbian'
 				gs 'arousal', 'end'
 				katjaQW['horny'] = 70

locations/korrPar.qsrc

@@ -6,13 +6,13 @@
 !! 
 !! Desc: Family home kitchen links to family flat corridor
 
-!! Call in location default actions
-gs 'home_family_init', 'init'
-
 !! Set location header - img path is set in init
 $setloc['StageTitle'] = 'Corridor'
 $setloc['StageImage'] = '<<$default_img_path>>/korrpar.jpg'
 
+!! Call in location default actions
+gs 'home_family_init', 'init'
+
 !! Set location vars:
 killvar '$locclass'
 !! Unique vars - unknown status, legacy code

locations/kuhrPar.qsrc

@@ -7,8 +7,7 @@
 !! Desc: Family home kitchen links to family flat corridor
 
 !! Start location initialisation
-!! Call in location default actions
-gs 'home_family_init', 'init'
+
 !! Set location header - img path is set in init
 $setloc['StageTitle'] = 'Parents Kitchen'
 $setloc['StageImage'] = '<<$default_img_path>>/kuhrpar.jpg'
@@ -22,7 +21,8 @@ gs 'kit_din'
 gs 'shortgs', 'setloc', 'kuhrpar', $ARGS[0]
 !! End location initialisation
 
-
+!! Call in location default actions
+gs 'home_family_init', 'init'
 !! Begin location content
 
 if fullmorrout = 1:
@@ -151,7 +151,7 @@ if func('homes_properties', 'can_live_here'):
 				npc_rel['A29'] += 1
 				dinner_day = daystart
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="<<$default_img_path>>/dinnerhome.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/<<$default_img_path>>/dinnerhome.jpg"></center>'
 				'You sit down and join your family for dinner and your stepfather starts teasing you. "So, do you have a boyfriend yet <<$pcs_nickname>>?"'
 				if fame['pav_slut'] > 150 and motherKnowSpravka = 0:
 					'You''re about to respond when your mother interrupts you. "Of course not! She''s still too young to be thinking about boys!"'

locations/lact_bp.qsrc

@@ -128,7 +128,7 @@ if $ARGS[0] = 'view_milk_bottles':
 		jump 'vmbloop'
 	end
 	if milkedvolume > 0:
-		'<br><a href="exec:gt''lact_bp'',''empty_milk_bottles''">Pour the milk into the sink</a>'
+		'<br><a href="exec:gt''lact_bp'',''empty_all_milk_bottles''">Pour the milk into the sink</a>'
 	end
 	act 'Back':gt 'lact_bp', 'bp_milking'
 end
@@ -145,30 +145,31 @@ if $ARGS[0] = 'drink_milk_bottles':
 	pcs_hydra += mbarrfill[ARGS[1]] / iif(pcs_hydra>=100,200,100)
 	minut += max(1,(mbarrfill[ARGS[1]]/1000) + 3)
 	act 'Finish':
-		mbarrfill[ARGS[1]] = 0
-		mbarrmage[ARGS[1]] = 0
-		mbarrcool[ARGS[1]] = 0
-		$mbarrstat[ARGS[1]] = 'none'
-		$mbarrtemp[ARGS[1]] = 'none'
+		gs 'lact_bp', 'empty_milk_bottle', ARGS[1]
 		gs 'stat'
 		menu_off = 0 & gs 'lact_bp', 'view_milk_bottles', 1
 	end
 end
 
+if $ARGS[0] = 'empty_milk_bottle':
+	mbarrfill[ARGS[1]] = 0
+	mbarrmage[ARGS[1]] = 0
+	mbarrcool[ARGS[1]] = 0
+	$mbarrstat[ARGS[1]] = 'none'
+	$mbarrtemp[ARGS[1]] = 'none'
+end
+
+
 !! empty bottle function
-if $ARGS[0] = 'empty_milk_bottles':
-	!! use gt 'lact_bp', 'empty_milk_bottles'
+if $ARGS[0] = 'empty_all_milk_bottles':
+	!! use gt 'lact_bp', 'empty_all_milk_bottles'
 	*clr
 	cla
 	temp_var = (mc_inventory['bottle_m'] + mc_inventory['bottle_s']) - 1
 	emb_i = 0
 	:emb_loop
 	if emb_i <= temp_var:
-		mbarrfill[emb_i] = 0
-		mbarrmage[emb_i] = 0
-		mbarrcool[emb_i] = 0
-		$mbarrstat[emb_i] = 'none'
-		$mbarrtemp[emb_i] = 'none'
+		gs 'lact_bp', 'empty_milk_bottle', emb_i
 		emb_i += 1
 		jump 'emb_loop'
 	end
@@ -239,7 +240,7 @@ if $ARGS[0] = 'update_mbottle':
 	!! mbarrmage: timestamp the milk was pumped.
 	!! mbarrcool: Is the milk cooled? 0 = no, 1 = normal cooler, 2 = deep freezer
 	!! $mbarrstat: State of the milk: fresh, normal, old, rancid
-	!! $mbarrtemp: Temperature of the milk: hot, warm, normal temparture, cold, frozen
+	!! $mbarrtemp: Temperature of the milk: hot, warm, lukewarm, cold, frozen
 	!! mbarrloca: Location of the bottle.
 	if mbarrfill[ARGS[1]] > 0:
 		if mbarrfill[ARGS[1]] > mbarrtype[ARGS[1]]: mbarrfill[ARGS[1]] = mbarrtype[ARGS[1]]
@@ -249,13 +250,13 @@ if $ARGS[0] = 'update_mbottle':
 				$mbarrtemp[ARGS[1]] = 'warm'
 				$mbarrstat[ARGS[1]] = 'fresh'
 			elseif (mbarrmage[ARGS[1]] + 60) < func('lact_bp','time_stamp') and (mbarrmage[ARGS[1]] + 360) >= func('lact_bp','time_stamp'):
-				$mbarrtemp[ARGS[1]] =  'normal temparture'
+				$mbarrtemp[ARGS[1]] =  'lukewarm'
 				$mbarrstat[ARGS[1]] = 'normal'
 			elseif (mbarrmage[ARGS[1]] + 360) < func('lact_bp','time_stamp') and (mbarrmage[ARGS[1]] + 1440) >= func('lact_bp','time_stamp'):
-				$mbarrtemp[ARGS[1]] = 'normal temparture'
+				$mbarrtemp[ARGS[1]] = 'lukewarm'
 				$mbarrstat[ARGS[1]] = 'old'
 			else
-				$mbarrtemp[ARGS[1]] = 'normal temparture'
+				$mbarrtemp[ARGS[1]] = 'lukewarm'
 				$mbarrstat[ARGS[1]] = 'rancid'
 			end
 		elseif mbarrcool[ARGS[1]] = 1:
@@ -291,10 +292,7 @@ if $ARGS[0] = 'update_mbottle':
 			$mbarrstat[ARGS[1]] = 'fresh'
 		end
 	else
-		$mbarrtemp[ARGS[1]] = 'none'
-		$mbarrstat[ARGS[1]] = 'none'
-		mbarrmage[ARGS[1]] = 0
-		mbarrfill[ARGS[1]] = 0
+		gs 'lact_bp', 'empty_milk_bottle', ARGS[1]
 	end
 end
 
@@ -751,11 +749,7 @@ if $ARGS[0] = 'reg_bottle_count':
 			reg_bottles_count += 1
 			rbc_index = (reg_bottlem_count + reg_bottles_count) - 1
 			mbarrtype[rbc_index] = 1500
-			mbarrfill[rbc_index] = 0
-			mbarrmage[rbc_index] = 0
-			mbarrcool[rbc_index] = 0
-			$mbarrstat[rbc_index] = 'none'
-			$mbarrtemp[rbc_index] = 'none'
+			gs 'lact_bp', 'empty_milk_bottle', rbc_index
 			mbarrloca[rbc_index] = 1
 			jump 'rbc_loop'
 		end
@@ -763,11 +757,7 @@ if $ARGS[0] = 'reg_bottle_count':
 			reg_bottlem_count += 1
 			rbc_index = (reg_bottlem_count + reg_bottles_count) - 1
 			mbarrtype[rbc_index] = 2500
-			mbarrfill[rbc_index] = 0
-			mbarrmage[rbc_index] = 0
-			mbarrcool[rbc_index] = 0
-			$mbarrstat[rbc_index] = 'none'
-			$mbarrtemp[rbc_index] = 'none'
+			gs 'lact_bp', 'empty_milk_bottle', rbc_index
 			mbarrloca[rbc_index] = 1
 			jump 'rbc_loop'
 		end

locations/marisha_ev.qsrc

@@ -161,7 +161,7 @@ if $ARGS[0] = 'Mall':
 				$loc_arg = 'start'
 				MarishaQW["marisha_sleepover"] = 1
 				gs 'stat'
-				gt 'sleep_simple', 'simple'
+				gt 'pre_sleep', 'prepare_sleep'
 			end
 		end
 

locations/pav_disco_classmates.qsrc

@@ -196,7 +196,7 @@ if $ARGS[0] = 'atdisco':
 !!Andrey
 	gs 'pav_disco_classmates', 'atdisco10', 147
 !!Katja
-	if loact['Katja'] = 8:
+	if locat['Katja'] = 8:
 		gs 'pav_disco_classmates', 'atdisco10', 14
 	else
 		discoenable['A14'] = 0

locations/saveupdater.qsrc

@@ -2806,6 +2806,8 @@ if temp_current_save_version < 00090300:
 	if pants_out_full			> 0:	killvar 'pants_out_full'
 	if pants_out_full_hairy		> 0:	killvar 'pants_out_full_hairy'
 
+	!! Introduction of lact_ev['poli_totaldonatemoney']
+	if lact_ev['poli_totaldonatemoney'] <= 0 and lact_ev['poli_totalmilkdonated'] >= 5: lact_ev['poli_totaldonatemoney'] = (lact_ev['poli_totalmilkdonated'] / 5) * 10
 
 
 end

locations/uni_dorm.qsrc

@@ -165,7 +165,7 @@ if $ARGS[0] = 'second_floor':
 
 	act 'Elevator': gt 'uni_dorm', 'elevator'
 
-	if katjaQW['knows_dorm_room_number'] > 0 and yearstart > 1:
+	if katjaQW['knows_dorm_room_number'] > 0 and yearstart > 1 and katjaQW['QWstage'] >= 2:
 		act 'Katja''s room':
 			*clr & cla 
 			if locat['katja'] = 24 or locat['katja']  = 31 or locat['katja']  = 35 or locat['katja']  = 51 or locat['katja']  = 52:
@@ -644,6 +644,9 @@ if $ARGS[0] = 'dorm_room':
 			$vikatext = '<a href="exec:gt''Vika''">Vika</a> is sleeping in her bed after working hard in the brothel all night.'
 		end
 		gs 'music_actions', 'no_music'
+	else
+		vika_inroom = 0
+		vika_sleep = 0
 	end
 
 	if mc_inventory['tech_computer'] = 1: