Browse Source

Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

Blatte 6 years ago
parent
commit
ab9856aea7
87 changed files with 3488 additions and 2773 deletions
  1. 0 1
      glife.qproj
  2. 1 1
      locations/BelSex.qsrc
  3. 645 633
      locations/Cheatmenu_din.qsrc
  4. 74 107
      locations/Gadbana.qsrc
  5. 4 4
      locations/Gadsarai.qsrc
  6. 1 1
      locations/LOCA.qsrc
  7. 7 7
      locations/MagEncounterFairy.qsrc
  8. 6 4
      locations/NPCChanger.qsrc
  9. 1 2
      locations/_body_image.qsrc
  10. 0 7
      locations/_menu_addoldmenu.qsrc
  11. 1 1
      locations/_menu_avariya.qsrc
  12. 1 1
      locations/_menu_body.qsrc
  13. 1 1
      locations/_menu_descrip.qsrc
  14. 1 1
      locations/_menu_face.qsrc
  15. 1 2
      locations/_menu_setting.qsrc
  16. 3 1
      locations/abduction.qsrc
  17. 0 2
      locations/arturend.qsrc
  18. 6 1
      locations/bed2.qsrc
  19. 20 0
      locations/bedrPar.qsrc
  20. 7 8
      locations/begin.qsrc
  21. 24 26
      locations/body.qsrc
  22. 3 84
      locations/brothel.qsrc
  23. 1 1
      locations/brother2.qsrc
  24. 2 6
      locations/brother_voyeur.qsrc
  25. 1 0
      locations/butoilet.qsrc
  26. 1 0
      locations/club.qsrc
  27. 3 9
      locations/cum_arrcheat.qsrc
  28. 1 0
      locations/dimaHome.qsrc
  29. 198 129
      locations/din_bad.qsrc
  30. 322 434
      locations/din_van.qsrc
  31. 1 1
      locations/events.qsrc
  32. 15 9
      locations/femcyc.qsrc
  33. 1 1
      locations/gadforest.qsrc
  34. 19 17
      locations/gadforest_event.qsrc
  35. 1 1
      locations/gadriver.qsrc
  36. 70 70
      locations/gadukino.qsrc
  37. 1 0
      locations/gdktoilet.qsrc
  38. 145 128
      locations/gpoli.qsrc
  39. 1 0
      locations/gschool_grounds.qsrc
  40. 1 1
      locations/gschool_lunch.qsrc
  41. 13 6
      locations/gskver.qsrc
  42. 29 28
      locations/igorhome.qsrc
  43. 1 0
      locations/kafe2.qsrc
  44. 1 0
      locations/koncepod1.qsrc
  45. 291 22
      locations/lact_lib.qsrc
  46. 1 0
      locations/laketoilet.qsrc
  47. 1 0
      locations/leonid.qsrc
  48. 0 6
      locations/mainQW.qsrc
  49. 7 7
      locations/metro.qsrc
  50. 2 3
      locations/mod_setting.qsrc
  51. 339 315
      locations/mother.qsrc
  52. 733 241
      locations/obj_din.qsrc
  53. 29 81
      locations/onobjsel.qsrc
  54. 2 0
      locations/parkdin.qsrc
  55. 200 0
      locations/parkivent.qsrc
  56. 2 0
      locations/pavComplex.qsrc
  57. 1 1
      locations/pavComplexOld.qsrc
  58. 5 17
      locations/pavResidential.qsrc
  59. 34 30
      locations/pornhist.qsrc
  60. 3 15
      locations/preALT.qsrc
  61. 2 12
      locations/preNT.qsrc
  62. 2 4
      locations/preSYS.qsrc
  63. 2 3
      locations/preSYS2.qsrc
  64. 1 6
      locations/preTG.qsrc
  65. 0 4
      locations/purses.qsrc
  66. 1 0
      locations/qwBarPoletToilet.qsrc
  67. 3 58
      locations/rolanbath.qsrc
  68. 5 18
      locations/saunawhore.qsrc
  69. 43 0
      locations/saveupdater.qsrc
  70. 1 0
      locations/sexshop.qsrc
  71. 0 2
      locations/shop.qsrc
  72. 3 63
      locations/shulgabath.qsrc
  73. 10 0
      locations/sitrPar.qsrc
  74. 1 5
      locations/stat.qsrc
  75. 18 15
      locations/stat_display.qsrc
  76. 22 16
      locations/stol.qsrc
  77. 3 19
      locations/stwork.qsrc
  78. 1 1
      locations/swamphouse.qsrc
  79. 2 2
      locations/telefon.qsrc
  80. 60 57
      locations/traits.qsrc
  81. 1 0
      locations/vokmantoiev.qsrc
  82. 6 0
      locations/vokzalGin.qsrc
  83. 0 7
      locations/vokzalperG.qsrc
  84. 2 1
      locations/vokzaltoilet.qsrc
  85. 0 2
      locations/wardrobe.qsrc
  86. 1 0
      locations/zaprF.qsrc
  87. 13 4
      locations/zaprFWash.qsrc

+ 0 - 1
glife.qproj

@@ -995,7 +995,6 @@
 		<Location name="$menu_obnovit"/>
 		<Location name="$menu_bloknot"/>
 		<Location name="$menu_avariya"/>
-		<Location name="$menu_addoldmenu"/>
 		<Location name="$menu_autosave"/>
 		<Location name="$menu_cheat"/>
 	</Folder>

+ 1 - 1
locations/BelSex.qsrc

@@ -360,7 +360,7 @@ if $ARGS[0] = 'analdoggy':
 	belact -= 1
 	anal_temp += 1
 	picrand = rand(0,12)
-	'<center><video autoplay loop src="images/shared/sex/anal/doggy<<picrand>>.mp4"></video></center>'
+	'<center><video autoplay loop src="images/shared/sex/anal/doggy/anal<<picrand>>.mp4"></video></center>'
 	'<<$boydesc>> pulls his cock out of your pussy and begins to slowly rub against your asshole. "Don''t worry, <<$pcs_nickname>>. I''ll be gentle," he says grinning as he has you on all fours, wide spread.'
 	'"Enough foreplay. Your ass is ready me!" he shouts as <<$boydesc>> starts pounding himself balls deep into you immediately. You bury your face into a pillow as he pounds your asshole roughly. The pain is unbearable and you flop with your legs trying to get away, but it only encourages <<$boydesc>> on as he keep pummeling your anus.'
 

File diff suppressed because it is too large
+ 645 - 633
locations/Cheatmenu_din.qsrc


+ 74 - 107
locations/Gadbana.qsrc

@@ -13,25 +13,34 @@ frost = 0
 'Grandma''s enema bulb is hidden behind some stuff on the shelf.'
 gs 'stat'
 
-
 if mira = 0:
 	if $clothingworntype = 'nude':
-		act 'Get dressed':
+		act 'Get dressed and leave':
 			minut += 1
 			gs 'clothing', 'wear_last_worn'
 			gs 'underwear', 'wear'
-			gt 'Gadbana'
+			gt 'Gaddvor'
 		end
 	end
-
-	act 'Go outside':
-		if $clothingworntype ! 'nude':
-			minut += 1 & gt'Gaddvor'
-		else
+	if $clothingworntype ! 'nude':
+		act 'Go outside':minut += 1 & gt'Gaddvor'
+	elseif $clothingworntype = 'nude' and ($pantyworntype ! 'none' or $braworntype ! 'none'):
+		act 'Go outside in your underwear':
+			cls
+			minut += 1
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
+			'Luckily no one saw you outside in your underwear, but there''s a thrill in almost getting caught'
+			gs 'arousal', 'voyeur', 10
+			act 'Continue': gt 'Gaddvor'
+		end
+	elseif $clothingworntype = 'nude':
+		act 'Go outside naked':
 			cls
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/noundress.jpg"></center>'
-			'You can''t go out without any clothes on.'
-			act 'Back':gt'Gadbana'
+			minut += 1
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/Gaddvor_nude.jpg"></center>'
+			'Luckily no one saw you outside naked, but there''s a thrill in almost getting caught'
+			gs 'arousal', 'voyeur', 10
+			act 'Continue': gt 'Gaddvor'
 		end
 	end
 
@@ -62,15 +71,7 @@ if mira = 0:
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/par.jpg"></center>'
 					'You strip, sit down and relax. After a proper banya session, you pick up a bucket filled with cold water and pour it over yourself and head over to the shower. You feel like a completely new person.'
-
-					act 'Get dressed':
-						minut += 1
-						gs 'clothing', 'wear_last_worn'
-						gs 'underwear', 'wear'
-						gt 'Gadbana'
-					end
-					
-					act 'Go outside nude': minut += 1 & gt 'Gaddvor'
+					act 'Finish': gt $loc, $metka
 				end
 			end
 		else
@@ -79,25 +80,37 @@ if mira = 0:
 	elseif week < 6:
 		'The banya is not used during the week, it is usually ready to use from 19:00 during the weekend.'
 	end
+	*nl
 
 	act 'Wash your body (0:25)':
 		cls
 		minut += 25
 		dynamic $showerdin
-
 		if frost > 0:frost = 0
-
+		gs 'clothing', 'strip'
+		gs 'underwear', 'remove'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mit.jpg"></center>'
 		'You lather your body washcloth and start scrubbing your body. You rinse off the soap and start to lather the hair with the shampoo. After rising off the shampoo you are completely clean.'
 
-		act 'Leave':gt $loc, $metka
+		act 'Finish':gt $loc, $metka
 	end
 
 	dynamic $bteeth
 	gs 'din_van', 'prvt_pee'
 	dynamic $tampon
+
+	if $clothingworntype ! 'nude':
+		act 'Remove clothes':
+			minut += 1
+			gs 'clothing', 'strip'
+			gs 'stat'
+			gt 'Gadbana'
+		end
+	end
+
 	dynamic $wearpan
+	dynamic $removepan
 	dynamic $basin
 
 	if painkiller > 0:
@@ -119,6 +132,29 @@ if mira = 0:
 			end
 		end
 	end
+	if stanok > 0:'Your razor will last for <b><<stanok>></b> more shavings. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
+
+	!WD: heal chafe
+	if mosolmaz>0:'On a shelf is a tube of ointment for chafing, which will be enough for <b><<mosolmaz>></b> applications.'
+
+	if tampon = 0 and sanpad = 0:
+		'<b><font color="red">You have no tampons left.</font></b>'
+	elseif tampon = 1:
+		'<font color="red">You have only <b><<tampon>></b> tampon left.</font>'
+	else
+		'You have <b><<tampon>></b> tampons.'
+	end
+	if sanpad = 0 and tampon = 0:
+		'<b><font color="red">You have no pads left.</font></b>'
+	elseif sanpad = 1:
+		'<font color="red">You have only <b><<sanpad>></b> pads left.</font>'
+	else
+		'You have <b><<sanpad>></b> pads.'
+	end
+
+	if bcream_have > 0:
+		'<a href="exec:dynamic $use_bcream & gt $loc, $metka">Apply breast cream.</a> Uses left: <<bcream_have>>.'
+	end
 
 	if (cumloc[6] = 1 or cumloc[7] = 1):
 		act 'Rinse the cum stains off your clothes in luke warm water(0:10)':
@@ -156,76 +192,14 @@ if mira = 0:
 			act 'Finish':gt $loc, $metka
 		end
 	end
-	if breastpump > 0:
+	if breastpump > 0 and bp_unbox >= 1:
 		act 'Use breast pump':
 			gt 'lact_lib', 'bp_milking'
 		end
 	end
-	if analplug = 1 and analplugin = 1:
-		act 'Remove your butt plug (0:05)':
-			cla
-			*clr
-			minut += 5
-			analplugIN = 0
-
-			if pcs_ass < 30:pcs_ass += 1
-
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			*nl
-			'You squat and tug gently at the butt plug, gasping as you push it out of you. You can''t help but feel a bit empty, now that it''s out.' & !!0.2.6: Removed unneccessary var check
-
-			act 'Finish':gt $loc, $metka
-		end
-	elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
-		act 'Insert your butt plug (0:05)':
-			cla
-			*clr
-			minut += 5
-			analplugIN = 1
-
-			if pcs_ass < 10:pcs_ass += 5
-			if pcs_ass >= 10 and pcs_ass < 20:pcs_ass += rand(1, 2)
-			if pcs_ass >= 20 and pcs_ass < 30:pcs_ass += rand(0, 1)
-
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			*nl
-			if butpluguse > 0:'You squat and gently rub the butt plug against your anus, after lubricating it with a bit of saliva. After a short while, you''ve relaxed enough to be able to push it in. Once it''s in you give it a few gentle tugs, wondering if anyone will catch you wearing it today.'
-			if butpluguse = 0:butpluguse = 1 & '"If I''m not going to use it, then why did I buy it?" you ask yourself. You look at the butt plug for a while, thinking "It is necessary to start developing my ass, so I could have great adventures someday... you could even say huge and thick adventures with crimson heads, uh, now I got carried away..." You''re slightly embarrassed at the thought for a second, but are then overcome by your horny fantasies. Determined to get the plug all the way in, you slowly press it against your asshole after lubricating it with a bit of saliva. It hurts a bit at first, but once the thickest part is in the rest follows rather easily. Patting yourself on your ass once it''s in, you wonder if anyone will notice you''re wearing it today and then immediately feel naughty for even having thought that.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	end
-	if vibrator = 1 and vibratorIN = 1:
-		act 'Remove the vibrator (0:05)':
-			cla
-			*clr
-			minut += 5
-			vibratorIN = 0
-
-			if pcs_vag < 30:pcs_vag += 1
-
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			*nl
-			'You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	elseif vibrator = 1 and vibratorIN = 0 and pcs_vag ! 0:
-		act 'Insert the vibrator in your vagina (0:05)':
-			cla
-			*clr
-			minut += 5
-			vibratorIN = 1
-
-			if pcs_vag < 30:pcs_vag += 2
-
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			*nl
-			'You spread your legs and slowly insert the vibrator in your pussy, wondering if anyone will notice you wearing it today.'
 
-			act 'Finish':gt $loc, $metka
-		end
-	end
+	dynamic $toymanage
+	dynamic $enema
 
 	if mosolmaz > 0 and mosol > 0 and mosal_time ! (daystart * 100) + hour:
 		act 'Rub ointment onto your pussy (0:05)':
@@ -239,20 +213,6 @@ if mira = 0:
 			act 'Finish':gt $loc, $metka
 		end
 	end
-	if (klismaday ! daystart or arrpos('sparrloc', 3) ! -1):
-		act 'Give yourself an enema (0:05)':
-			cla
-			*clr
-			cumspclnt = 7
-			gs 'cum_cleanup'
-			minut += 5
-			klismaday = daystart
-			klismaday1= 1
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/klisma.jpg"></center>'
-			'You use Baba''s enema to clean yourself out down there. Your ass is now ready for anal sex without any awkward surprises.'
-			act 'Finish':gt 'Gadbana'
-		end
-	end
 else
 	!125st
 	act 'Undress':
@@ -290,16 +250,23 @@ else
 				gs 'arousal', 'voyeur', 120
 				gs 'arousal', 'end'
 				gs 'stat'
-				
-				act 'Get dressed':
+
+				act 'Get dressed and leave':
 					mira = 0
 					minut += 1
 					gs 'clothing', 'wear_last_worn'
 					gs 'underwear', 'wear'
-					gt 'Gadbana'
+					act 'Continue': gt 'Gaddvor'
+				end
+
+				act 'Go outside naked':
+					mira = 0
+					minut += 1
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/Gaddvor_nude.jpg"></center>'
+					'Luckily no one saw you outside naked, but there''s a thrill in almost getting caught'
+					gs 'arousal', 'voyeur', 10
+					act 'Continue': gt 'Gaddvor'
 				end
-				
-				act 'Go outside nude': mira = 0 & minut += 1 & gt 'Gaddvor'
 			end
 		end
 	end

+ 4 - 4
locations/Gadsarai.qsrc

@@ -360,15 +360,15 @@ if $ARGS[0] = '':
 					cheap_purses[5] = 1
 					$currentpursetype = 'cheap'
 					currentpursenumber = 5
-					bag = 1
-					if menu_option = 1:gs 'obj_din', 'old'
-					if menu_option = 0:gs 'obj_din', 'new'
 					'You can use this cool looking bag as a handbag.'
 				else
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
 					'In the barn you find many mouldy magazines, rusty tools and equipment, toys and many dusty, yellowed books. The entire barn reeks of mould and decay.'
 				end
-				act 'Leave and get some fresh air':gt 'Gadsarai'
+				act 'Leave and get some fresh air':
+					if findbag = 1: bag = 1
+					gt 'Gadsarai'
+				end
 			elseif findbraclet = 0:
 				*clr & cla
 				if RAND(0,15) >= 14:

+ 1 - 1
locations/LOCA.qsrc

@@ -1,6 +1,6 @@
 # LOCA
 
-if Enable_settingmode!2: killvar '$cheatmenu'
+if settingmode!0: killvar '$cheatmenu'
 
 if mod_list > 0:
 	mod_i=1

+ 7 - 7
locations/MagEncounterFairy.qsrc

@@ -22,14 +22,14 @@ if $ARGS[0] = '':
 end
 
 if $ARGS[0] = 'fairy_chat_no1':
-	cls
+	cla
 	gs 'stat'
 	knowsfairy = 1
 	'You take a closer look at the floating glowing orb. What you mistook for a large firefly is actually a small woman with translucent wings on her back: A fairy!'
 	'"Hello, biggie!", she says in a high pitched voice. "You can see me, right?'
 	'"It''s so nice to meet you! Finally someone who can see me!", she goes on before you have a chance to answer. "Finally someone to chat with!!! You have no idea how annoying it is to be here and nobody recognizes you. It''s sooo BORING!!!"'
 	act 'Chat with the fairy':
-		cls
+		cla
 		minut += 30
 		fairychat = 1
 		pcs_manna += 25 * pcs_magik
@@ -54,7 +54,7 @@ if $ARGS[0] = 'fairy_chat_no1':
 end
 
 if $ARGS[0] = 'fairy_shoo':
-	cls
+	cla
 	minut += 1
 	if knowsfairy < 1:
 		knowsfairy = 1
@@ -78,11 +78,11 @@ if $ARGS[0] = 'fairy_shoo':
 end
 
 if $ARGS[0] = 'fairy_chat':
-	cls
+	cla
 	gs 'stat'
 	'You take the few steps over to the glowing orb that apparently only you can recognize as what it truly is: a fairy.'
 	act 'Chat with the fairy':
-		cls
+		cla
 		minut += 30
 		if fairyshoo = 1 and rand (1, 3) = 2:
 			fairyshoo = 0
@@ -120,13 +120,13 @@ if $ARGS[0] = 'fairy_chat':
 			gs 'stat'
 			'The fairy takes another quick look at you, rubs her chin, and says "Hmm, since you''ve been a little nice to me, maybe I could be a little nice to you."'
 			act 'Huh?':
-				cls
+				cla
 				*nl
 				'You look at her, puzzled, wondering if you heard her right.  She just shrugs her shoulders and says "Okay, if you''re not interested"'
 				act 'Go on your way': gt $loc, $metka
 			end
 			act 'Sure':
-				cls
+				cla
 				fday_surprise += 1
 				fairy_surprise = RAND(1,9)
 				if fairy_surprise =< 2:

+ 6 - 4
locations/NPCChanger.qsrc

@@ -7,9 +7,11 @@ if $ARGS[0] = 'Start':
 end
 
 if $ARGS[0] = 'NPCLoop':
-	*clr
-	clr
-	cla
+	*clr & cla
+	gs 'obj_din', 'cheattabs'
+	'<center><h2>Cheat Menu - NPC Editor</h2></center>'
+	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td width="400" cellspacing="0" cellpadding="20" valign="top">'
 	'*** THIS IS A WORK IN PROGRESS ***'
 	if n = 0:
 	n = 1
@@ -34,7 +36,7 @@ if $ARGS[0] = 'NPCLoop':
 	*nl
 	*p '<a href="exec:gt ''NPCChanger'', ''selection'' ">Select an NPC to modify</a>'
 	*nl '*** THIS IS A WORK IN PROGRESS ***'
-	act 'Done':gt $loc
+	'</td></tr></table></center>'
 end
 if $ARGS[0] = 'next10':
 	o += 10

+ 1 - 2
locations/_body_image.qsrc

@@ -27,7 +27,6 @@ if $ARGS[0] = 'body':
 end
 
 if $ARGS[0] = 'coat':
-	clr
 	if defaultcoat = 0:
 		$RESULT = ''
 		$body_image_msg += 'You have no default coat set.'
@@ -70,7 +69,7 @@ if $ARGS[0] = 'clothes':
 		else
 			$body_image_msg += FUNC('$clothing_name', $clothingworntype, clothingwornnumber)
 		end
-		nl
+		*nl
 		if $clothingworntype = 'uniform':
 			if PCloStyle2 = 1:
 				$body_image_msg += '<br>This outfit is considered to be a maid uniform.'

+ 0 - 7
locations/_menu_addoldmenu.qsrc

@@ -1,7 +0,0 @@
-# $menu_addoldmenu
-
-menu_option = 1
-gs 'obj_din', 'old'
-
---- $menu_addoldmenu ---------------------------------
-

+ 1 - 1
locations/_menu_avariya.qsrc

@@ -1,5 +1,5 @@
 # $menu_avariya
-gs 'obj_din', 'exit'
+gs 'obj_din', 'emergency'
 
 --- $menu_avariya ---------------------------------
 

+ 1 - 1
locations/_menu_body.qsrc

@@ -1,5 +1,5 @@
 # $menu_body
-gs 'obj_din', 'menubody'
+gs 'obj_din', 'body'
 
 --- $menu_body ---------------------------------
 

+ 1 - 1
locations/_menu_descrip.qsrc

@@ -1,5 +1,5 @@
 # $menu_descrip
-gs 'obj_din', 'descrip'
+gs 'obj_din', 'description'
 
 --- $menu_descrip ---------------------------------
 

+ 1 - 1
locations/_menu_face.qsrc

@@ -1,5 +1,5 @@
 # $menu_face
-gs 'obj_din', 'menuface'
+gs 'obj_din', 'face'
 
 --- $menu_face ---------------------------------
 

+ 1 - 2
locations/_menu_setting.qsrc

@@ -1,8 +1,7 @@
 # $menu_setting
 
 gs 'Cheatmenu_din'
-Enable_settingmode = 1
-dynamic $cheatmenu['display']
+dynamic $cheatmenu['setting']
 
 --- $menu_setting ---------------------------------
 

+ 3 - 1
locations/abduction.qsrc

@@ -74,6 +74,8 @@ if $ARGS[0] = 'abdRoomFirstChaining':
 end
 
 if $ARGS[0] = 'abdRoom':
+	$loc = 'abduction'
+	$metka = 'abdRoom'
 	*clr
 	cla
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/basement1.jpg"></center>'
@@ -579,7 +581,7 @@ if $ARGS[0] = 'abdFood':
 
 	if abdTools = 1:
 		act 'Train with dildos':gt 'abduction', 'abdTrainDildos'
-		if breastpump > 0:
+		if breastpump > 0 and bp_unbox >= 1:
 			act 'Use breast pump':gt 'lact_lib', 'bp_milking'
 		end
 	end

+ 0 - 2
locations/arturend.qsrc

@@ -38,8 +38,6 @@ act 'Brush up':
 		$currentpursetype = 'cheap'
 		currentpursenumber = 13
 		bag = 1
-		if menu_option = 1:gs 'obj_din', 'old'
-		if menu_option = 0:gs 'obj_din', 'new'
 		'Arthur gives you a quality handbag. You take it, feeling a mixture of joy and guilt welling up inside you. "Did I really just sleep with a stranger for a purse? Does this make me a whore, or a slut?" You think to yourself'
 	end
 

+ 6 - 1
locations/bed2.qsrc

@@ -184,16 +184,20 @@ if $ARGS[0] = 'sleep':
 	end
 
 	if slept_in = 1:
+		gs 'stat'
 		$waketext = 'You wake up at <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>, after sleeping-in a little longer than planned, but at least you''ve had plenty of sleep.'
 		gs 'bed2', 'wake'
 	elseif pcs_sleep >= 100 and budilnikOn = 0:
+		gs 'stat'
 		$waketext = 'You wake up at <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>, no longer tired and ready to start the day with plenty of sleep.'
 		gs 'bed2', 'wake'
 	elseif pcs_sleep >= 100 and budilnikOn = 1 and alarm_now >= alarm_set:
+		gs 'stat'
 		$waketext = 'You wake up at <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>, just before your alarm goes off. You''ve had plenty of sleep.'
 		gs 'bed2', 'wake'
 	elseif budilnikOn = 1 and alarm_now = alarm_time:
 		pcs_mood -= 10
+		gs 'stat'
 		$waketext = 'Your alarm goes off at <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>, '+iif(pcs_sleep < 90, 'but you could do with some extra sleep.', 'and you''ve had plenty of sleep.')+''
 		gs 'bed2', 'extra'
 		gs 'bed2', 'wake'
@@ -262,7 +266,8 @@ if $ARGS[0] = 'wake':
 	if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9:
 		if slept_in = 1 and hour >= 8 and hour < 9:
 			pcs_mood -= 10
-			msg '<center>Damn, you''ve slept too long! You''re going to be late for school!</center>'
+			gs 'stat'
+			msg '<center>Damn it''s <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>, you''ve slept too long! You''re going to be late for school!</center>'
 		end
 		act 'Get up out of bed and get dressed for school (0:15)':
 			slept_in = 0

+ 20 - 0
locations/bedrPar.qsrc

@@ -236,6 +236,26 @@ if pcs_sewng >= 80:
 	end
 end
 
+if sisterHere = 0 and breastpump = 1 and bp_unbox <= 0:
+	'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Unbox</a> your breast pump'
+elseif kid >= 1 and breastpump = 1 and bp_unbox <= 0:
+	'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Unbox</a> your breast pump'
+elseif sisterHere = 0 and breastpump = 1 and bp_unbox = 1 and pcs_inbition < 40:
+	'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Try out</a> your breast pump'
+elseif kid >= 1 and breastpump = 1 and bp_unbox = 1 and pcs_inbition > 30:
+	'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Try out</a> your breast pump'
+end
+if breastcounter <= 0:
+	temp_var = 50
+else
+	temp_var = (50/breastcounter)
+end
+if breastpump <= 0 and pcs_horny >= temp_var:
+	act 'Massage your breasts': gt 'lact_lib','man_milking'
+end
+
+end
+
 if pcs_sleep <= 80:
 	if $clothingworntype = 'nude':
 		$sleep_txt = 'Go to sleep'

+ 7 - 8
locations/begin.qsrc

@@ -5,11 +5,9 @@ if $ARGS[0] = 'start':
 	$loc = 'begin'
 	gs 'Cheatmenu_din'
 	showstat 1
-	Enable_settingmode = 2
-	dynamic $cheatmenu['display']
 	'<center><b><font color="maroon">CHOOSE GAME START</font></b></center>'
 	*nl
-	'<b>Transgendered Start:</b>'
+	'<b>Transformation Start:</b>'
 	'You are Michael Kuznetsov, a fairly average, 35 year old businessman who finds an artefact that changes everything about him and his life. Features magic.'
 	*nl
 	'<b>School girl Start:</b>'
@@ -21,8 +19,8 @@ if $ARGS[0] = 'start':
 	'<b>New in Town Start:</b>'
 	'You''re controlled by your overbearing mother and can''t take it any more. It is time to find a new life in the city away from her influence. For the first time you can make your own decisions and mistakes. No magic.'
 	
-	act '<center><b>Transgendered start</b></center>':
-		Enable_settingmode = 0
+	act '<center><b>Transformation Start</b></center>':
+		settingmode = 0
 		showstat 0
 		cla
 		act '<center>Show intro (recommended)</center>':
@@ -36,7 +34,7 @@ if $ARGS[0] = 'start':
 
 	act '<center><b>School Girl Start</b></center>':
 		cla
-		Enable_settingmode = 0
+		settingmode = 0
 		showstat 0
 		MagikDostup = 1
 		gt 'preSYS', 'SGStart'
@@ -45,7 +43,7 @@ if $ARGS[0] = 'start':
 
 	act '<center><b>Cursed Schoolgirl Start</b></center>':
 		cla
-		Enable_settingmode = 0
+		settingmode = 0
 		showstat 0
 		altQS = 1
 		gt 'preSYS', 'SGStart'
@@ -53,11 +51,12 @@ if $ARGS[0] = 'start':
 
 	act '<center><b>New in Town Start</b></center>':
 		cla
-		Enable_settingmode = 0
+		settingmode = 0
 		showstat 0
 		MagikDostup = 1
 		gt 'preSYS', 'TGStart'
 	end
+	act '<center><b>Change game settings</b></center>': settingmode = 1 & gs '$menu_setting'
 end
 
 if $ARGS[0] = 'real_character':

+ 24 - 26
locations/body.qsrc

@@ -806,10 +806,10 @@ else
 end
 
 if avatar_hair = 1:
-   $hair = $av_hair
-   !! I do not really understand how the avatar system works in terms of hair growth and such, so these descriptors will just have to do
-   $pcdesc_hairlength = 'normal length'
-   $pcdesc_hairlengthwordy = 'normal length'
+	$hair = $av_hair
+	!! I do not really understand how the avatar system works in terms of hair growth and such, so these descriptors will just have to do
+	$pcdesc_hairlength = 'normal length'
+	$pcdesc_hairlengthwordy = 'normal length'
 else
 	if pcs_hairlng <= 30:
 		$hair = 'You have very short <<$pcs_haircol>> hair. It doesn''t cover your ears, and looks a little masculine. Nevertheless, some people like this style as it''s easy to take care of.'
@@ -1575,51 +1575,49 @@ if lashair = 0:
 		if rand_pubes = 2:$pcdesc_pubesrandom = 'roughly-stubbled'
 		$pcdesc_pubes = 'stubbly'
 		$pcdesc_pubeswordy = 'scratchy, roughly-stubbled'
-	elseif pcs_pubes <= 15 and pcs_bush = 1:
+	elseif pcs_pubes <= 15:
 		lobkoef = 0
-		$pcs_pubes = 'You have stubble growing at the edges of your <a href="exec:view''images/pc/body/pussy/bpussy.jpg''">trimmed pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+		$pcs_pubes = 'You have a tidy patch of hair growing above your '+iif(pubestyle >= 2 and pubestyle <=7,'<a href="exec:view''<<$pubeimage>>''">pussy</a>','<a href="exec:view''images/pc/body/pussy/3.jpg''">pussy</a>')+'. <<$pirspiz>><br><<$clitsize>>'
 		rand_pubes = rand(0,2)
-		if rand_pubes = 0:$pcdesc_pubesrandom = 'trimmed-back'
-		if rand_pubes = 1:$pcdesc_pubesrandom = 'lightly-furred'
-		if rand_pubes = 3:$pcdesc_pubesrandom = 'mostly well-kept'
+		if rand_pubes = 0:$pcdesc_pubesrandom = 'almost bare'
+		if rand_pubes = 1:$pcdesc_pubesrandom = 'barely-haired'
+		if rand_pubes = 3:$pcdesc_pubesrandom = 'well-kept'
 		$pcdesc_pubes = 'stubbly'
 		$pcdesc_pubeswordy = 'scratchy, roughly-stubbled'
-	elseif pcs_pubes <= 20 and pcs_bush = 1:
-		lobkoef = 3 
-		$pcs_pubes = 'You have a small neat bush of hair at the top of your <a href="exec:view''images/pc/body/pussy/3.jpg''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
-		rand_pubes = rand(0,2)
-		if rand_pubes = 0:$pcdesc_pubesrandom = 'neatly-trimmed'
-		if rand_pubes = 1:$pcdesc_pubesrandom = 'lightly-furred'
-		if rand_pubes = 3:$pcdesc_pubesrandom = 'well-kept'
-		$pcdesc_pubes = 'neatly-trimmed'
-		$pcdesc_pubeswordy = 'trimmed, well-kept'
 	elseif pcs_pubes <= 20:
 		lobkoef = 0
-		$pcs_pubes = 'You have neatly trimmed triangle of hair around your <a href="exec:view''images/pc/body/pussy/spussy.jpg''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+		$pcs_pubes = 'You have neatly trimmed section of hair around your '+iif(pubestyle = 8,'<a href="exec:view''<<$pubeimage>>''">pussy</a>','<a href="exec:view''images/pc/body/pussy/spussy.jpg''">pussy</a>')+'. <<$pirspiz>><br><<$clitsize>>'
 		rand_pubes = rand(0,3)
 		if rand_pubes = 0:$pcdesc_pubesrandom = 'wispy-haired'
 		if rand_pubes = 1:$pcdesc_pubesrandom = 'lightly-furred'
 		if rand_pubes = 2:$pcdesc_pubesrandom = 'trimmed'
-		if rand_pubes = 3:$pcdesc_pubesrandom = 'well-kept'
+		if rand_pubes = 3:$pcdesc_pubesrandom = 'mostly well-kept'
 		$pcdesc_pubes = 'neatly-trimmed'
 		$pcdesc_pubeswordy = 'trimmed, well-kept'
-	elseif pcs_pubes <= 30:
-		pcs_bush = 0
+	elseif pcs_pubes <= 25:
 		lobkoef = 0
 		$pcs_pubes = 'You have a bushy but well-maintained mat of <a href="exec:view''images/pc/body/pussy/hpussy.jpg''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
 		rand_pubes = rand(0,2)
+		if rand_pubes = 0:$pcdesc_pubesrandom = 'mildly-furred'
+		if rand_pubes = 1:$pcdesc_pubesrandom = 'slightly-bushy'
+		if rand_pubes = 2:$pcdesc_pubesrandom = 'well-maintained'
+		$pcdesc_pubes = 'bushy'
+		$pcdesc_pubeswordy = 'bushy, thick'
+	elseif pcs_pubes <= 30:
+		lobkoef = 0
+		$pcs_pubes = 'You have a bushy but well-maintained mat of <a href="exec:view''images/pc/body/pussy/shave/h_bush1.jpg''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
+		rand_pubes = rand(0,2)
 		if rand_pubes = 0:$pcdesc_pubesrandom = 'furred'
 		if rand_pubes = 1:$pcdesc_pubesrandom = 'bushy'
-		if rand_pubes = 2:$pcdesc_pubesrandom = 'well-maintained'
+		if rand_pubes = 2:$pcdesc_pubesrandom = 'partially-maintained'
 		$pcdesc_pubes = 'bushy'
 		$pcdesc_pubeswordy = 'bushy, thick'
-	else
-		pcs_bush = 0
+	elseif pcs_pubes >= 31:
 		lobkoef = 0
 		$pcs_pubes = 'You have a wild and unkempt jungle of <a href="exec:view''images/pc/body/pussy/hrypussy.jpg''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
 		rand_pubes = rand(0,2)
 		if rand_pubes = 0:$pcdesc_pubesrandom = 'thickly-furred'
-		if rand_pubes = 1:$pcdesc_pubesrandom = 'hairy'
+		if rand_pubes = 1:$pcdesc_pubesrandom = 'very hairy'
 		if rand_pubes = 2:$pcdesc_pubesrandom = 'ill-maintained'
 		$pcdesc_pubes = 'hairy'
 		$pcdesc_pubeswordy = 'hairy, wild-maned'

+ 3 - 84
locations/brothel.qsrc

@@ -504,93 +504,12 @@ if $ARGS[0] = 'brothel:section1:girlroom':
 		dynamic $brit
 	end
 	gs 'din_van', 'prvt_pee'
-	if klismaday < daystart:
-		act 'Give yourself an enema (0:05)':
-			'<h3>Girl room</h3>'
-			'<h5>Enema</h5>'
-			cla
-			*clr
-			cumspclnt = 7
-			gs 'cum_cleanup'
-			minut += 5
-			klismaday = daystart
-			klismaday1 = 1
-
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/klisma.jpg"></center>'
-			*nl
-			'You give yourself an enema, feeling clean down there. Your ass is now ready for anal sex without any awkward surprises.'
-
-			act 'Finish':gt 'brothel', $metka
-		end
-	end
-	if analplug = 1 and analplugin = 1:
-		act 'Remove your butt plug (0:05)':
-			cla
-			*clr
-			minut += 5
-			analplugIN = 0
-
-			if pcs_ass < 30:pcs_ass += 1
-
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			*nl
-			'You squat and tug gently at the butt plug, gasping as you push it out of you. You can''t help but feel a bit empty, now that it''s out.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
-		act 'Insert your butt plug (0:05)':
-			cla
-			*clr
-			minut += 5
-			analplugIN = 1
-
-			if pcs_ass < 10:pcs_ass += 5
-			if pcs_ass >= 10 and pcs_ass < 20:pcs_ass += rand(1, 2)
-			if pcs_ass >= 20 and pcs_ass < 30:pcs_ass += rand(0, 1)
-
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			*nl
-			if butpluguse > 0:'You squat and gently rub the butt plug against your anus, after lubricating it with a bit of saliva. After a short while, you''ve relaxed enough to be able to push it in. This should help with some anal stretching before today''s activities.'
-			if butpluguse = 0:butpluguse = 1 & '"If I''m not going to use it, then why did I buy it?" you ask yourself. You look at the butt plug for a while, thinking "It is necessary to start developing my ass, especially in a place like this. You''re slightly embarrassed at the thought for a second, but are then overcome by your horny fantasies. Determined to get the plug all the way in, you slowly press it against your asshole after lubricating it with a bit of saliva. It hurts a bit at first, but once the thickest part is in the rest follows rather easily. Patting yourself on your ass once it''s in.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	end
-	if vibrator = 1 and vibratorIN = 1:
-		act 'Remove the vibrator (0:05)':
-			cla
-			*clr
-			minut += 5
-			vibratorIN = 0
-
-			if pcs_vag < 30:pcs_vag += 1
-
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			*nl
-			'You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	elseif vibrator = 1 and vibratorIN = 0 and pcs_vag ! 0:
-		act 'Insert the vibrator in your vagina (0:05)':
-			cla
-			*clr
-			minut += 5
-			vibratorIN = 1
-
-			if pcs_vag < 30:pcs_vag += 2
-
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			*nl
-			'You spread your legs and slowly insert the vibrator in your pussy, hoping the added arrousal will aid with today''s activities.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	end
+	dynamic $toymanage
+	dynamic $enema
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 	dynamic $brit
 	if painkiller > 0 and pain['total'] >0 and pain['killer'] = 0:
 		act 'Take a painkiller':

+ 1 - 1
locations/brother2.qsrc

@@ -390,7 +390,7 @@ if $ARGS[0] = 'wakeup':
 			cla
 			brotherMorningSex = daystart
 			'"I''ll tell you what Kolka, if you get up now, I''ll show you my pussy."'
-			if $clothingworntype = 'nude' and $panyworntype = 'none':
+			if $clothingworntype = 'nude':
 				'He cracks open an eye. "I don''t need to get up to do that."'
 				'You look down at yourself and remember that you''re naked. Right. That wasn''t a very good plan...'
 				act'Back to the drawing board':gt'brother2','wakeup'

+ 2 - 6
locations/brother_voyeur.qsrc

@@ -748,18 +748,14 @@ if $ARGS[0] = 'brother_wash':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	if pcs_leghair > 3 or pcs_pubes > 3 or pcs_bush > 0:
+	if pcs_leghair > 3 or pcs_pubes > 3:
 		*nl
 		if pcs_leghair > 3 and pcs_pubes > 3:
 			'	As you rinse off, your brother gives a meaningful look at your lower body and you follow his gaze to your <<$pcdesc_legs>> legs and <<$pcdesc_pubes>> pussy.'
-		elseif pcs_leghair > 3 and pcs_bush > 0:
-			'	As you rinse off, your brother gives a meaningful look at your lower body and you follow his gaze to your <<$pcdesc_legs>> legs and the stubble growing around the patch of hair above your pussy.'
 		elseif pcs_leghair > 3 and pcs_pubes < 3:
 			'	As you rinse off, your brother gives a meaningful look at your lower body and you follow his gaze to your <<$pcdesc_legs>> legs.'
 		elseif pcs_leghair < 3 and pcs_pubes > 3:
 			'	As you rinse off, your brother gives a meaningful look at your lower body and you follow his gaze to your <<$pcdesc_pubes>> pussy.'
-		elseif pcs_leghair < 3 and pcs_bush > 0:
-			'	As you rinse off, your brother gives a meaningful look at your lower body and you follow his gaze to your <<$pcdesc_pubes>> pussy.'
 		end
 		'	"Aren''t you going to shave?"'
 		if stanok = 0:
@@ -986,7 +982,7 @@ if $ARGS[0] = 'brother_shower_shave':
 			*nl
 			if pcs_pubes > 3:
 				if pcs_pubes <= 20:'	Kolka frowns. "You''re not going to shave your pussy?"'
-				if pcs_pubes >= 21 or pcs_bush > 0:'	Kolka frowns. "You''re not going to shave that bush?"'
+				if pcs_pubes >= 21:'	Kolka frowns. "You''re not going to shave that bush?"'
 				if stanok = 0:
 					act'"I can''t. Razor''s gone dull"':
 						cla

+ 1 - 0
locations/butoilet.qsrc

@@ -30,6 +30,7 @@ if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 dynamic $tampon
 dynamic $quickwash
 dynamic $basin
+dynamic $removepan
 
 --- butoilet ---------------------------------
 

+ 1 - 0
locations/club.qsrc

@@ -253,6 +253,7 @@ if $ARGS[0] = 'tou':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 if $ARGS[0] = 'dance':

+ 3 - 9
locations/cum_arrcheat.qsrc

@@ -1,5 +1,7 @@
 # cum_arrcheat
 
+*clr & cla
+'<center><h2>Cheat Menu - OOX Debug</h2></center>'
 if cycle = 0:
 	$cycletemp[1] = 'menstruating with <<mesec>> hours remaining'
 elseif cycle = 1:
@@ -51,7 +53,6 @@ else
 	$cycletemp[8] = ''
 end
 
-*clr
 'You are currently <<$cycletemp[1]>><<$cycletemp[2]>><<$cycletemp[4]>><<$cycletemp[8]>>. Your womb damage is at <<sterilewb>> and your Ovary damage is at <<sterileov>><<$cycletemp[2]>>. You have been cummed on or inside yourself <<stat[''cum_count'']>> times.'
 
 cycletemp[4] = arrsize('$wombpotfath')
@@ -258,13 +259,6 @@ else
 	'No Pregnancies registered.'
 end
 killvar '$cycletemp'
-if $loc ! '' and $metka ! '':
-	act 'Leave':gt $loc, $metka
-elseif $loc ! '':
-	act 'Leave':gt $loc
-elseif $curloc ! '':
-	act 'Leave':gt $curloc
-end
-
+act 'Return to cheat index': dynamic $cheatmenu
 --- cum_arrcheat ---------------------------------
 

+ 1 - 0
locations/dimaHome.qsrc

@@ -213,6 +213,7 @@ if $ARGS[0] = 'bathroom2':
 	dynamic $bteeth
 	dynamic $tampon
 	dynamic $basin
+	dynamic $removepan
 	act 'Leave the bathroom': gt 'dimaHome','hallway2'
 end
 

+ 198 - 129
locations/din_bad.qsrc

@@ -9,19 +9,19 @@ $mobile_check = {
 			$caller = 'Vladimir'
 			$callerid = 'images/characters/city/vladimir/001.jpg'
 			gs 'telefon','phone_ring'
-			pl'<center><a href="exec:gt ''qwloc'',''2''"><img src="images/system/phone/call_accept.png"></a>		 <a href="exec:vladimirday = daystart & gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
+			pl'<center><a href="exec:gt ''qwloc'',''2''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
 		elseif vladimirQW = 25 and week = 6:
 			'<b><font color="red">Your phone is ringing</font></b>'
 			$caller = 'Vladimir'
 			$callerid = 'images/characters/city/vladimir/001.jpg'
 			gs 'telefon','phone_ring'
-			pl'<center><a href="exec:gt ''qwloc'',''3''"><img src="images/system/phone/call_accept.png"></a>		 <a href="exec:vladimirday = daystart & gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
+			pl'<center><a href="exec:gt ''qwloc'',''3''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
 		elseif vladimirQW = 35 and week = 6:
 			'<b><font color="red">Your phone is ringing</font></b>'
 			$caller = 'Vladimir'
 			$callerid = 'images/characters/city/vladimir/001.jpg'
 			gs 'telefon','phone_ring'
-			pl'<center><a href="exec:gt ''qwloc'',''4''"><img src="images/system/phone/call_accept.png"></a>		 <a href="exec:vladimirday = daystart & gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
+			pl'<center><a href="exec:gt ''qwloc'',''4''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
 		end
 	end
 
@@ -30,7 +30,7 @@ $mobile_check = {
 		$caller = 'Leonid Vostov'
 		$callerid = 'images/characters/pavlovsk/resident/leonid/leonidphone.jpg'
 		gs 'telefon','phone_ring'
-		pl'<center><a href="exec:gt ''leonid'', ''call''"><img src="images/system/phone/call_accept.png"></a>		 <a href="exec:leonidSlaveDay = daystart & gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
+		pl'<center><a href="exec:gt ''leonid'', ''call''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:leonidSlaveDay = daystart & gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
 	end
 
 	if QWdogreiqTimer = 0 and QWdogReiq = 2 and week = 7 and qwdogiventday ! daystart and hour >= 12:
@@ -48,7 +48,7 @@ $mobile_check = {
 		pl''
 		pl''
 		pl''
-		pl'<center><a href="exec:gt ''qwlocdog''"><img src="images/system/phone/call_accept.png"></a>			  <a href="exec:qwdogiventday = daystart & gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
+		'<center><a href="exec:gt ''qwlocdog''"><img src="images/system/phone/call_accept.png"></a>			 <a href="exec:qwdogiventday = daystart & gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
 	end
 
 	!! iterating all lovers
@@ -70,113 +70,126 @@ $mobile_check = {
 			$caller = '<<$loverdesc[lover_number]>>'
 			$callerid = 'images/characters/shared/'+lover_picture[lover_number]+'.jpg'
 			gs 'telefon','phone_ring'
-			pl'<center><a href="exec:gt ''telefon'', ''lover'', <<lover_number>>"><img src="images/system/phone/call_accept.png"></a>			  <a href="exec:gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
+			pl'<center><a href="exec:gt ''telefon'', ''lover'', <<lover_number>>"><img src="images/system/phone/call_accept.png"></a>			 <a href="exec:gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
 		end
 	end
 	lover_number += 1
 	if lover_number < arrsize('pcs_lovers'): jump 'loverloop'
-	
+
 	killvar 'lover_number'
 }
 
 
 $d_salf = {
-	clr
-	if cumloc[13] > 0 or cumloc[11] > 0 or cumloc[16] > 0:pl '<a href="exec:salfetka -= 1 & cumspclnt = 12 & gs ''cum_cleanup'' & cumspclnt = 9 & gs ''cum_cleanup'' & gs ''stat''"><b>Wipe your face and hands</b></a>'
-	if cumloc[14] > 0:pl '<a href="exec:salfetka -= 1 & cumspclnt = 14  & gs ''cum_cleanup'' & gs ''stat''"><b>Wipe clean your belly</b></a>'
-	if cumloc[15] > 0:pl '<a href="exec:salfetka -= 1 & cumspclnt = 16 & gs ''cum_cleanup'' & gs ''stat''"><b>Wipe clean your breasts</b></a>'
-	if cumloc[1] > 0 or cumloc[4] > 0:pl '<a href="exec:salfetka -= 1 & cumspclnt = 15 & gs ''cum_cleanup'' & gs ''stat''"><b>Wipe clean your ass and pussy</b></a>'
-	if cumloc[10] > 0 or cumloc[9] > 0:pl '<a href="exec:salfetka -= 1 & cumspclnt = 17 & gs ''cum_cleanup'' & gs ''stat''"><b>Wipe clean your arms and legs</b></a>'
-	if cumloc[2] > 0 or cumloc[5] > 0 or cumloc[6] > 0 or cumloc[7] > 0:pl '<a href="exec:salfetka -= 1 & cumspclnt = 6 & gs ''cum_cleanup'' & gs ''stat''"><b>Clean up clothing</b></a>'
-	if pcs_makeup ! 1:pl '<a href="exec:salfetka -= 1 & pcs_makeup = 1 & gs ''stat''"><b>Wipe cosmetics</b></a>'
-	pl '<a href="exec:gs ''stat''"><br><b>Not using tissue</b></a>'
+	*clr & cla
+	'<center><h1>Tissues</h1></center>'
+	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
+	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td cellspacing="0" cellpadding="0" valign="top">'
+	if cumloc[13] > 0 or cumloc[11] > 0 or cumloc[16] > 0: '<a href="exec:salfetka -= 1 & cumspclnt = 12 & gs ''cum_cleanup'' & cumspclnt = 9 & gs ''cum_cleanup'' & gs ''stat'' & dynamic $d_bag"><b>Wipe your face and hands</b></a>'
+	if cumloc[14] > 0: '<a href="exec:salfetka -= 1 & cumspclnt = 14	& gs ''cum_cleanup'' & gs ''stat'' & dynamic $d_bag"><b>Wipe clean your belly</b></a>'
+	if cumloc[15] > 0: '<a href="exec:salfetka -= 1 & cumspclnt = 16 & gs ''cum_cleanup'' & gs ''stat'' & dynamic $d_bag"><b>Wipe clean your breasts</b></a>'
+	if cumloc[1] > 0 or cumloc[4] > 0: '<a href="exec:salfetka -= 1 & cumspclnt = 15 & gs ''cum_cleanup'' & gs ''stat'' & dynamic $d_bag"><b>Wipe clean your ass and pussy</b></a>'
+	if cumloc[10] > 0 or cumloc[9] > 0: '<a href="exec:salfetka -= 1 & cumspclnt = 17 & gs ''cum_cleanup'' & gs ''stat'' & dynamic $d_bag"><b>Wipe clean your arms and legs</b></a>'
+	if cumloc[2] > 0 or cumloc[5] > 0 or cumloc[6] > 0 or cumloc[7] > 0: '<a href="exec:salfetka -= 1 & cumspclnt = 6 & gs ''cum_cleanup'' & gs ''stat'' & dynamic $d_bag"><b>Clean up clothing</b></a>'
+	if pcs_makeup ! 1: '<a href="exec:salfetka -= 1 & pcs_makeup = 1 & dynamic $d_bag"><b>Wipe cosmetics</b></a>'
+	'<a href="exec:gs ''stat'' & dynamic $d_bag"><br><b>Put tissues away</b></a>'
+	'</td></tr></table></center>'
 }
 
 $d_kosmetitka = {
-	clr
-	pl '<a href="exec:gs ''stat''"><b>Close makeup bag</b></a>'
+	*clr & cla
+	'<center><h1>Cosmetics</h1></center>'
+	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
+	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td cellspacing="0" cellpadding="0" valign="top">'
+	gs 'stat'
 
-	if kosmetitka >= 1:pl '<a href="exec:makupskl_exp += rand(1,3) & pcs_makeup = 2 & kosmetitka -= 1 & gs ''stat''"><b>Light make-up</b></a>'
-	if kosmetitka >= 2:pl '<a href="exec:makupskl_exp += rand(1,3) & pcs_makeup = 3 & kosmetitka -= 2 & gs ''stat''"><b>Natural make-up</b></a>'
-	if kosmetitka >= 3:pl '<a href="exec:makupskl_exp += rand(1,3) & pcs_makeup = 4 & kosmetitka -= 3 & gs ''stat''"><b>Heavy make-up</b></a>'
+	if kosmetitka >= 1: '<a href="exec:makupskl_exp += rand(1,3) & pcs_makeup = 2 & kosmetitka -= 1 & gs ''stat'' & dynamic $d_bag"><b>Light make-up</b></a>'
+	if kosmetitka >= 2: '<a href="exec:makupskl_exp += rand(1,3) & pcs_makeup = 3 & kosmetitka -= 2 & gs ''stat'' & dynamic $d_bag"><b>Natural make-up</b></a>'
+	if kosmetitka >= 3: '<a href="exec:makupskl_exp += rand(1,3) & pcs_makeup = 4 & kosmetitka -= 3 & gs ''stat'' & dynamic $d_bag"><b>Heavy make-up</b></a>'
+	act 'Close makeup bag':gs 'stat' & dynamic $d_bag
+	'</td></tr></table></center>'
 }
 
 $d_mouthwash = {
-	clr
+	*clr & cla
+	'<center><h1>Mouth Wash</h1></center>'
+	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
+	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td cellspacing="0" cellpadding="0" valign="top">'
 	pcs_breath = 1
 	cumspclnt = 2
 	gs 'cum_cleanup'
 	mouthwash -= 1
-	pl 'Your breath smells minty fresh.'
-	pl ''
-	pl '<a href="exec:gs ''stat''"><b>Done</b></a>'
-}	
+	gs 'stat'
+	'Your breath smells minty fresh.'
+	''
+	act 'Done':gs 'stat' & dynamic $d_bag
+	'</td></tr></table></center>'
+}
 
 $d_bag = {
-	clr
-	pl '<center><img src="<<FUNC(''$purse_image'',  $currentpursetype, currentpursenumber)>>"	height="300"></center>'
-	if salfetka > 0:pl 'You have <<salfetka>> wet wipes left in your purse. <a href="exec:dynamic $d_salf"><b>Use a tissue</b></a>'
-	if pain_timer > totminut - 242 and painkiller > 0:pl 'Take a <a href="exec:pain[''killer''] = 1 & painkiller -= 1 & pain_timer = totminut & dynamic $d_bag">painkiller</a>. <<painkiller>> painkillers left in your purse.'
-	if kosmetitka > 0 and pcs_makeup = 1:pl 'There''s a portable makeup in your purse. <<kosmetitka>> cosmetic applications left. <a href="exec:dynamic $d_kosmetitka"><b>Put on makeup</b></a>'
-	if kosmetitka > 0 and pcs_makeup ! 1:pl 'There''s a portable makeup in your purse. <<kosmetitka>> cosmetic applications left.'
-	if mouthwash > 0 and pcs_breath = 0:pl 'There''s a mouthwash in your purse. <<mouthwash>> uses remaining. <a href="exec:dynamic $d_mouthwash"><b>Use mouthwash</b></a>'
-	if mouthwash > 0 and pcs_breath = 1:pl 'There''s a mouthwash in your purse. <<mouthwash>> uses remaining.'
-	if greben > 0 and pcs_hairbsh = 0:pl 'There''s a hairbrush in your purse. <a href="exec:pcs_hairbsh = 1 & gs ''stat''"><b>Brush your hair</b></a>'
-	if greben > 0 and pcs_hairbsh = 1:pl 'There''s a hairbrush in your purse.'
+	*clr & cla
+	'<center><h1>Purse</h1></center>'
+	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
+	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td cellspacing="0" cellpadding="0" valign="top">'
+	if salfetka > 0: 'You have <<salfetka>> wet wipes left in your purse. <a href="exec:dynamic $d_salf"><b>Use a tissue</b></a>'
+	if pain_timer > totminut - 242 and painkiller > 0: 'Take a <a href="exec:pain[''killer''] = 1 & painkiller -= 1 & pain_timer = totminut & dynamic $d_bag">painkiller</a>. <<painkiller>> painkillers left in your purse.'
+	if kosmetitka > 0 and pcs_makeup = 1: 'There''s a portable makeup in your purse. <<kosmetitka>> cosmetic applications left. <a href="exec:dynamic $d_kosmetitka"><b>Put on makeup</b></a>'
+	if kosmetitka > 0 and pcs_makeup ! 1: 'There''s a portable makeup in your purse. <<kosmetitka>> cosmetic applications left.'
+	if mouthwash > 0 and (pcs_breath = 0 or cumloc[12] = 1): 'There''s a mouthwash in your purse. <<mouthwash>> uses remaining. <a href="exec:dynamic $d_mouthwash"><b>Use mouthwash</b></a>'
+	if mouthwash > 0 and pcs_breath = 1 and cumloc[12] = 0: 'There''s a mouthwash in your purse. <<mouthwash>> uses remaining.'
+	if greben > 0 and pcs_hairbsh = 0: 'There''s a hairbrush in your purse. <a href="exec:pcs_hairbsh = 1 & gs ''stat'' & dynamic $d_bag"><b>Brush your hair</b></a>'
+	if greben > 0 and pcs_hairbsh = 1: 'There''s a hairbrush in your purse. Your hair doesn''t need brushing right now.'
 	if prezik + prezikcount + preziksabo > 0:
 		if preziktype = 2 or preziksabo > 0:
-			pl 'You have <<iif(preziktype = 2, prezikcount, prezikcount+prezik)>> normal condoms left, and <<iif(preziktype = 2, prezik+preziksabo, preziksabo)>> sabotaged <a href="exec:dynamic $din_Switch_Condom_Menu"><b>condoms left in the purse.</b></a>'
+			'You have <<iif(preziktype = 2, prezikcount, prezikcount+prezik)>> normal condoms left, and <<iif(preziktype = 2, prezik+preziksabo, preziksabo)>> sabotaged <a href="exec:dynamic $din_Switch_Condom_Menu"><b>condoms left in the purse.</b></a>'
 		elseif preziktype < 2 and preziksabo = 0:
-			pl 'You have <<prezik+prezikcount>> <a href="exec:dynamic $din_Switch_Condom_Menu"><b>condoms left in the purse.</b></a>'
+			'You have <<prezik+prezikcount>> <a href="exec:dynamic $din_Switch_Condom_Menu"><b>condoms left in the purse.</b></a>'
 		end
 		*nl
 	else
-		pl 'You are out of condoms.'
-	end
-	if amphetamine > 0 :
-		pl 'You have <<amphetamine>> tablets of amphetamine left in your purse. <b><a href="exec:dynamic $use_amphetamines & dynamic $d_bag">Take One</a></b>'
+		'You are out of condoms.'
 	end
+	if amphetamine > 0:	'You have <<amphetamine>> tablets of amphetamine left in your purse. <b><a href="exec:dynamic $use_amphetamines & dynamic $d_bag">Take One</a></b>'
 	if tabletki > 0 and pillsleft[ptype] > 0:
-		pl 'You have <<tabletki>> unopened packages of <a href="exec:dynamic $d_tabletkied">birth control pills</a> and <<pillsleft[ptype]>> pills left in your opened package.</b>'
+		'You have <<tabletki>> unopened packages of <a href="exec:dynamic $d_tabletkied">birth control pills</a> and <<pillsleft[ptype]>> pills left in your opened package.</b>'
 	elseif tabletki	= 0 and pillsleft[ptype] > 0:
-		pl 'You have <<pillsleft[ptype]>> <a href="exec:dynamic $d_tabletkied">birth control pills</a> left in your purse.</b>'
+		'You have <<pillsleft[ptype]>> <a href="exec:dynamic $d_tabletkied">birth control pills</a> left in your purse.</b>'
 	elseif tabletki > 0 and pillsleft[ptype] = 0:
-		pl 'You have <<tabletki>> unopened packages of <a href="exec:dynamic $d_tabletkied">birth control pills</a> in your purse.'
+		'You have <<tabletki>> unopened packages of <a href="exec:dynamic $d_tabletkied">birth control pills</a> in your purse.'
 	else
-		pl 'You are out of birth control pills.'
-	end
-	if mentats_have > 0:
-		pl'<a href="exec:dynamic $use_mentats & dynamic $d_bag"><b>Use a neurobooster pill in your purse.</b></a> There are <<mentats_have>> pills left. The warning label says not to take more than one per day.'
-	end
-	if steroid_have > 0:
-		pl'<a href="exec:dynamic $use_steroids & dynamic $d_bag"><b>Use steroids.</b></a> You have <<steroid_have>> steroids left in your purse.'
-	end
-	if bcream_have > 0:
-		pl'<a href="exec:dynamic $use_bcream & dynamic $d_bag"><b>Apply breast cream.</b></a> You have <<bcream_have>> cream left in your purse.'
-	end
-	if aphrodisiac_have > 0:
-		pl'<a href="exec:dynamic $use_aphrodisiac & dynamic $d_bag"><b>Chew aphrodisiac gum.</b></a> You have <<aphrodisiac_have>> gum left in your purse.'
-	end
-	
-	if lubri > 0:pl'There''s a tube of lubricant in your purse, enough for <<lubri>> applications.'
-	if bottle > 0:pl 'There''s a bottle of water in your purse. <a href="exec:bottle = 0 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat''"><b>Drink</b></a>'
-	if buterbrod > 0:pl 'There''s a sandwich in your purse. <a href="exec:buterbrod = 0 & pcs_energy += 40 & cumspclnt = 2 & gs ''cum_cleanup'' & fat += 1 & gs ''stat''"><b>Eat</b></a>'
-	if wine = 1 and alkowine = 0:pl'There''s a bottle of <a href="exec:dynamic $dinalkowin1">wine</a> in your purse.'
-	if wine = 1 and alkowine = 1:pl'There''s a half-bottle of <a href="exec:dynamic $dinalkowin2">wine</a> in your purse.'
-	if foto = 1:pl'Your purse contains a strange photo'
+		'You are out of birth control pills.'
+	end
+	if mentats_have > 0:'<a href="exec:dynamic $use_mentats & dynamic $d_bag"><b>Use a neurobooster pill in your purse.</b></a> There are <<mentats_have>> pills left. The warning label says not to take more than one per day.'
+	if steroid_have > 0:'<a href="exec:dynamic $use_steroids & dynamic $d_bag"><b>Use steroids.</b></a> You have <<steroid_have>> steroids left in your purse.'
+	if bcream_have > 0:'<a href="exec:dynamic $use_bcream & dynamic $d_bag"><b>Apply breast cream.</b></a> You have <<bcream_have>> cream left in your purse.'
+	if aphrodisiac_have > 0:'<a href="exec:dynamic $use_aphrodisiac & dynamic $d_bag"><b>Chew aphrodisiac gum.</b></a> You have <<aphrodisiac_have>> gum left in your purse.'
+
+	if lubri > 0:'There''s a tube of lubricant in your purse, enough for <<lubri>> applications.'
+	if bottle > 0: 'There''s a bottle of water in your purse. <a href="exec:bottle = 0 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & dynamic $d_bag"><b>Drink</b></a>'
+	if buterbrod > 0: 'There''s a sandwich in your purse. <a href="exec:buterbrod = 0 & pcs_energy += 40 & cumspclnt = 2 & gs ''cum_cleanup'' & fat += 1 & gs ''stat'' & dynamic $d_bag"><b>Eat</b></a>'
+	if wine = 1 and alkowine = 0:'There''s a bottle of <a href="exec:dynamic $dinalkowin1">wine</a> in your purse.'
+	if wine = 1 and alkowine = 1:'There''s a half-bottle of <a href="exec:dynamic $dinalkowin2">wine</a> in your purse.'
+	if foto = 1:'Your purse contains a strange photo'
 	if pattest > 0:
-		if pattest > 1:$tt = 's' else $tt = ''
-		pl'You have <<pattest>> unused paternity test<<$tt>> in your purse.'
+		iif(used_pattest > 1,$tt = 's',$tt = '')
+		'You have <<pattest>> unused paternity test<<$tt>> in your purse.'
 	end
 	if used_pattest > 0:
-		if used_pattest > 1:$tt = 's' else $tt = ''
-		pl'You have <<used_pattest>> <a href="exec:dynamic $test_purse">used</a> paternity test<<$tt>> in your purse.'
+		iif(used_pattest > 1,$tt = 's',$tt = '')
+		'You have <<used_pattest>> <a href="exec:dynamic $test_purse">used</a> paternity test<<$tt>> in your purse.'
 	end
-	pl'<br><center><a href="exec:gs''stat''"><img src="images/system/icon/back.png"></a></center>'
 	killvar 'tt'
+
+	act 'Return':gt $loc, $metka
+	'</td></tr></table></center>'
 }
 
 $dinalkowin1 = {
+	*clr & cla
 	alkowine = 1
 	if pcs_hydra >= 100:
 		pcs_hydra -= 5
@@ -186,14 +199,17 @@ $dinalkowin1 = {
 	if pcs_intel  > 5 : intel_deg -= 1
 	alko += 5
 	cumspclnt = 2
-	gs 'cum_cleanup' 
+	gs 'cum_cleanup'
 	pcs_breath = 0
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/shared/food/alkowin.jpg"></center>'
+	*nl
 	'You take the wine bottle out of your purse and slowly drink half of it. You struggle quite a lot to put the cork back before being able to make it.'
+	act 'Continue':dynamic $d_bag
 }
 
 $dinalkowin2 = {
+	*clr & cla
 	alkowine = 0
 	if pcs_hydra >= 100:
 		pcs_hydra -= 5
@@ -208,36 +224,46 @@ $dinalkowin2 = {
 	pcs_breath = 0
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/shared/food/alkowin.jpg"></center>'
+	*nl
 	'You take out the remaining half wine bottle out of your purse, slowly drinking the rest of it. As you finish you throw the empty bottle away.'
+	act 'Continue':dynamic $d_bag
 }
 
 $din_Switch_Condom_Menu = {
 	dynamic $din_Update_Condom_Counts
-	clr
+	*clr & cla
+	'<center><h1>Condoms</h1></center>'
+	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
+	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td cellspacing="0" cellpadding="0" valign="top">'
 	i = 0
-	pl 'You have <<iif(preziktype < 2, prezik+prezikcount, prezikcount)>> normal condoms left and <<iif(preziktype = 2, prezik+preziksabo, preziksabo)>> sabotaged condoms left.'
+	'You have <<iif(preziktype < 2, prezik+prezikcount, prezikcount)>> normal condoms left and <<iif(preziktype = 2, prezik+preziksabo, preziksabo)>> sabotaged condoms left.'
 	*nl
 	if preziktype > 0:
-		pl '<a href="exec:dynamic $din_Do_Condom_Counts, 1">Switch to using normal condoms</a>.'
+		'<a href="exec:dynamic $din_Do_Condom_Counts, 1">Switch to using normal condoms</a>.'
 	end
 	if preziktype ! 1:
-		pl '<a href="exec:dynamic $din_Do_Condom_Counts, 2">Stop using condoms</a>.'
+		'<a href="exec:dynamic $din_Do_Condom_Counts, 2">Stop using condoms</a>.'
 	end
 	if preziktype ! 2:
-		pl '<a href="exec:dynamic $din_Do_Condom_Counts, 3">Switch to using sabotaged condoms</a>.'
+		'<a href="exec:dynamic $din_Do_Condom_Counts, 3">Switch to using sabotaged condoms</a>.'
 	end
 	if prezikcount > 0 or preziktype = 0:
-		pl '<a href="exec:dynamic $din_Do_Condom_Counts, 4">Sabotage a condom</a>.'
+		'<a href="exec:dynamic $din_Do_Condom_Counts, 4">Sabotage a condom</a>.'
 	end
 	*nl
-	pl '<a href="exec:gs ''stat''">Return</a>'
+	act 'Return':dynamic $d_bag
+	'</td></tr></table></center>'
 }
 
 $din_Table_Condom_Menu = {
 	dynamic $din_Update_Condom_Counts
-	*clr
+	*clr & cla
+	'<center><h1>Condoms</h1></center>'
+	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	*nl
 	i = 1
-	'You have <<iif(preziktype < 2, prezik+prezikcount, prezikcount)>> normal condoms left and  <<iif(preziktype = 2, prezik+preziksabo, preziksabo)>> sabotaged condoms left.'
+	'You have <<iif(preziktype < 2, prezik+prezikcount, prezikcount)>> normal condoms left and	<<iif(preziktype = 2, prezik+preziksabo, preziksabo)>> sabotaged condoms left.'
 	*nl
 	if preziktype > 0:
 		'<a href="exec:dynamic $din_Do_Condom_Counts, 1">Switch to using normal condoms</a>.'
@@ -252,13 +278,17 @@ $din_Table_Condom_Menu = {
 		'<a href="exec:dynamic $din_Do_Condom_Counts, 4">Sabotage a condom</a>.'
 	end
 	*nl
-	'<a href="exec:gt ''stol'', ''bc''">Return</a>'
+	act 'Return':gt 'stol', 'bc'
 }
 
 $din_Do_Condom_Counts = {
 	!{set condom count and type}
+	*clr & cla
+	'<center><h1>Condoms</h1></center>'
+	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
+	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td cellspacing="0" cellpadding="0" valign="top">'
 	if ARGS[0] = 1:
-		clr
 		'Offer a condom the next time you have sex.'
 		if preziktype = 2: preziksabo = prezik
 		prezik = prezikcount
@@ -294,8 +324,9 @@ $din_Do_Condom_Counts = {
 	else
 		dynamic $din_Table_Condom_Menu
 	end
+	'</td></tr></table></center>'
 }
-   
+
 $din_Update_Condom_Counts = {
 	if prezik + prezikcount + preziksabo > 0: prezikmsg = 1
 	if preziktype = 0:
@@ -335,20 +366,29 @@ $din_Update_Condom_Counts = {
 }
 
 $d_tabletkied = {
-	clr
+	*clr & cla
+	'<center><h1>Birth Control</h1></center>'
+	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
+	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td cellspacing="0" cellpadding="0" valign="top">'
 	tabloc = 0
-	if tabletkiday < daystart: pl '<a href="exec:dynamic $d_tabletkieda, 1">Take the birth control pill now.</b></a>'
+	if tabletkiday < daystart:  '<a href="exec:dynamic $d_tabletkieda, 1">Take the birth control pill now.</b></a>'
 	if tabletkicheck = 0:
-		pl '<a href="exec:dynamic $d_tabletkieda, 2">Automatically take your birth control pills.</b></a>'
+		'<a href="exec:dynamic $d_tabletkieda, 2">Automatically take your birth control pills.</b></a>'
 	elseif tabletkicheck = 1:
-		pl '<a href="exec:dynamic $d_tabletkieda, 3">Stop automatically taking your birth control pills.</b></a>'
+		'<a href="exec:dynamic $d_tabletkieda, 3">Stop automatically taking your birth control pills.</b></a>'
 	end
-	pl '<a href="exec:dynamic $d_tabletkieda, 4">Examine the birth control pills.</b></a>'
-	if tabletkioddk = 1: pl '<a href="exec:dynamic $d_tabletkieda, 5">Dump the strange pills.</b></a>'
-	pl '<a href="exec:gs ''stat''">Return</a>'
+	'<a href="exec:dynamic $d_tabletkieda, 4">Examine the birth control pills.</b></a>'
+	if tabletkioddk = 1:  '<a href="exec:dynamic $d_tabletkieda, 5">Dump the strange pills.</b></a>'
+	act 'Return':dynamic $d_bag
+	'</td></tr></table></center>'
 }
 
 $d_tabletkiedt = {
+	*clr & cla
+	'<center><h1>Birth Control</h1></center>'
+	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	*nl
 	tabloc = 1
 	if tabletkiday < daystart: '<a href="exec:*clr & dynamic $d_tabletkieda, 1">Take the birth control pill now.</b></a>'
 	if tabletkicheck = 0:
@@ -357,11 +397,11 @@ $d_tabletkiedt = {
 		'<a href="exec:*clr & dynamic $d_tabletkieda, 3">Stop automatically taking your birth control pills.</b></a>'
 	end
 	'<a href="exec:*clr & dynamic $d_tabletkieda, 4">Examine the birth control pills.</b></a>'
-	if tabletkioddk = 1: pl '<a href="exec:*clr & dynamic $d_tabletkieda, 5">Dump the strange pills.</b></a>'
-	'<a href="exec:gt ''stol'', ''bc''">Return</a>'
+	if tabletkioddk = 1:  '<a href="exec:*clr & dynamic $d_tabletkieda, 5">Dump the strange pills.</b></a>'
+	act 'Return':gt 'stol', 'bc'
 }
 
-$d_tabletkiedA = {
+$d_tabletkieda = {
 	if ARGS[0] = 1:
 		tabletkipd += tabletkipt
 		if tabletkiday ! daystart:
@@ -395,11 +435,11 @@ $d_tabletkiedA = {
 			if ptype = 3: $pillprob = 'that the pills are discolored and there is no expiry date.'
 			if ptype = 4: $pillprob = 'that the pills are all the same color.'
 			if ptype = 5: $pillprob = 'that the pills seem to be smaller than normal.'
-		
+
 			'Upon taking a closer look at your birth control pills, you notice <<$pillprob>>'
-			
+
 			if ptype > 0: tabletkioddk = 1
-			gs 'stat'	
+			gs 'stat'
 			if tabloc = 0:
 				dynamic $d_tabletkied
 			else
@@ -413,7 +453,7 @@ $d_tabletkiedA = {
 		tabletkioddp = 0
 		gs 'stat'
 	end
-	
+
 	if tabloc = 0:
 		dynamic $d_tabletkied
 	else
@@ -422,37 +462,42 @@ $d_tabletkiedA = {
 }
 
 $d_cycreport_choice = {
-	clr
+	*clr & cla
+	'<center><h1>Fertility Cycle</h1></center>'
+	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td width="800" cellspacing="0" cellpadding="0" valign="top">'
 	dynamic $d_cycreport_update
-	pl 'Current Status: <<$cycreport_txt>>.'
+	'<center><b>Current Status:</b></center>'
+	'<center><<$cycreport_txt>></center>'
+	'</td></tr></table></center><center><table cellspacing="0" cellpadding="20" valign="top"><tr><td width="250" valign="top">'
 	if $cycreport_txt ! 'In labour':
-		*nl
-		pl 'Change Status because:'
+		'<center><b>Change Status because:</b></center>'
 		if thinkpreg = 0:
 			if knowpreg = 1:
-				pl '<a href="exec: dynamic $d_cycreport_actor, 2">I''m pregnant.</a>'
-			else 
-				pl '<a href="exec: dynamic $d_cycreport_actor, 2">I think I''m pregnant.</a>'
+				'<a href="exec: dynamic $d_cycreport_actor, 2 & gs ''stat''">I''m pregnant.</a>'
+			else
+				'<a href="exec: dynamic $d_cycreport_actor, 2 & gs ''stat''">I think I''m pregnant.</a>'
 			end
 		elseif thinkpreg = 1:
-			pl '<a href="exec: dynamic $d_cycreport_actor, 1">I''m not pregnant.</a>'
+			'<a href="exec: dynamic $d_cycreport_actor, 1 & gs ''stat''">I''m not pregnant.</a>'
 		end
 		if mesec > 0 and thinkpreg ! 1 and knowpreg ! 1:
-			pl '<a href="exec: dynamic $d_cycreport_actor, 3">I''m menstruating.</a>'
+			'<a href="exec: dynamic $d_cycreport_actor, 3">I''m menstruating.</a>'
 		elseif thinkpreg ! 1:
-			pl '<a href="exec: dynamic $d_cycreport_actor, 4">I just recently menstruated.</a>'
-			pl '<a href="exec: dynamic $d_cycreport_actor, 5">I think my menstrual cycle has stopped.</a>'
+			'<a href="exec: dynamic $d_cycreport_actor, 4">I just recently menstruated.</a>'
+			'<a href="exec: dynamic $d_cycreport_actor, 5">I think my menstrual cycle has stopped.</a>'
 		end
 		if thinkpreg = 1 or knowpreg = 1:
-			pl '<a href="exec: dynamic $d_cycreport_actor, 6">I think my due date is...</a>'
-			pl '<a href="exec: dynamic $d_cycreport_actor, 7">I think the father is...</a>'
+			'<a href="exec: dynamic $d_cycreport_actor, 6">I think my due date is...</a>'
+			'<a href="exec: dynamic $d_cycreport_actor, 7">I think the father is...</a>'
 		end
 	elseif cycle = 5:
-		pl 'Broken water and contractions, it''s pretty clear what is going on. You need to get to a hospital ASAP.'
+		'Broken water and contractions, it''s pretty clear what is going on. You need to get to a hospital ASAP.'
 	else
 		dynamic $d_cycreport_actor, 10
 	end
-	pl '<a href="exec:gs ''stat''">Return</a>'
+	act 'Exit':gs 'stat' & gt $loc, $metka
+	'</td></tr></table></center>'
 }
 
 $d_cycreport_actor = {
@@ -467,55 +512,74 @@ $d_cycreport_actor = {
 		end
 		dynamic $d_cycreport_update
 		gs 'stat'
+		dynamic $d_cycreport_choice
 	elseif ARGS[0] = 2:
 		thinkpreg = 1
 		denypreg = 0
 		dynamic $d_cycreport_update
 		gs 'stat'
+		dynamic $d_cycreport_choice
 	elseif ARGS[0] = 3:
 		thinkpreg = 0
 		denypreg = 0
 		daylastperiod = daystart
 		dynamic $d_cycreport_update
 		gs 'stat'
+		dynamic $d_cycreport_choice
 	elseif ARGS[0] = 4:
 		thinkpreg = 0
 		denypreg = 0
-		clr
-		pl 'How many days ago was it you had your last period?'
-		pl 'Currently: <<pertemp>>'
-		pl '<a href="exec: pertemp += 1 & clr & dynamic $d_cycreport_actor, 4">+1</a> <a href="exec: pertemp += 5 & clr & dynamic $d_cycreport_actor, 4">+5</a> <a href="exec: pertemp += 10 & clr & dynamic $d_cycreport_actor, 4">+10</a> <a href="exec: pertemp = 0 & clr & dynamic $d_cycreport_actor, 4">Reset</a> <a href="exec: daylastperiod = daystart - pertemp & dynamic $d_cycreport_update & gs ''stat''">Accept</a>'
+		*clr & cla
+		'<center><h1>Fertility Cycle</h1></center>'
+		'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+		'<td width="250" cellspacing="0" cellpadding="0" valign="top">'
+		'How many days ago was it you had your last period?'
+		'Currently: <<pertemp>>'
+		'<a href="exec: pertemp += 1 & dynamic $d_cycreport_actor, 4">+1</a> <a href="exec: pertemp += 5 & dynamic $d_cycreport_actor, 4">+5</a> <a href="exec: pertemp += 10 & dynamic $d_cycreport_actor, 4">+10</a> <a href="exec: pertemp = 0 & dynamic $d_cycreport_actor, 4">Reset</a> <a href="exec: daylastperiod = daystart - pertemp & dynamic $d_cycreport_update & gs ''stat'' & dynamic $d_cycreport_choice">Accept</a>'
+		act 'Return':dynamic $d_cycreport_choice
+		act 'Exit':gs 'stat' & gt $loc, $metka
+		'</td></tr></table></center>'
 	elseif ARGS[0] = 5:
 		thinkpreg = 0
 		denypreg = 0
 		$cycreport_txt = 'You do not believe you have periods any more.'
 		gs 'stat'
+		dynamic $d_cycreport_choice
 	elseif ARGS[0] = 6:
-		clr
-		pl 'How many days ago was it you had your last period?'
-		pl 'Currently: <<pertemp>>'
-		pl '<a href="exec: pertemp += 1 & clr & dynamic $d_cycreport_actor, 6">+1</a> <a href="exec: pertemp += 5 & clr & dynamic $d_cycreport_actor, 6">+5</a> <a href="exec: pertemp += 10 & clr & dynamic $d_cycreport_actor, 6">+10</a> <a href="exec: pertemp = 0 & clr & dynamic $d_cycreport_actor, 6">Reset</a> <a href="exec: daylastperiod = daystart - pertemp & dynamic $d_cycreport_update & gs ''stat''">Accept</a>'
+		*clr & cla
+		'<center><h1>Fertility Cycle</h1></center>'
+		'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+		'<td width="250" cellspacing="0" cellpadding="0" valign="top">'
+		'How many days ago was it you had your last period?'
+		'Currently: <<pertemp>>'
+		'<a href="exec: pertemp += 1 & dynamic $d_cycreport_actor, 6">+1</a> <a href="exec: pertemp += 5 & dynamic $d_cycreport_actor, 6">+5</a> <a href="exec: pertemp += 10 & dynamic $d_cycreport_actor, 6">+10</a> <a href="exec: pertemp = 0 & dynamic $d_cycreport_actor, 6">Reset</a> <a href="exec: daylastperiod = daystart - pertemp & dynamic $d_cycreport_update & gs ''stat'' & dynamic $d_cycreport_choice">Accept</a>'
+		act 'Return':dynamic $d_cycreport_choice
+		act 'Exit':gs 'stat' & gt $loc, $metka
+		'</td></tr></table></center>'
 	elseif ARGS[0] = 7:
-		clr
+		*clr & cla
+		'<center><h1>Fertility Cycle</h1></center>'
+		'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+		'<td width="250" cellspacing="0" cellpadding="0" valign="top">'
 		tempmax = arrsize('$cumfthname')-1
 		tempcurr = 0
 		sumcum = 0
 		*nl
 		:potfathloop
 			if cumtime[tempcurr] > 1:$cum = 'cumshots' else $cum = 'cumshot'
-			if cumtime[tempcurr] > 0:pl '<<$npc_usedname[$cumfthname[tempcurr]]>> (<<$cumfthname[tempcurr]>>) - <<cumtime[tempcurr]>> <<$cum>>' & sumcum += cumtime[tempcurr]
+			if cumtime[tempcurr] > 0: '<<$npc_usedname[$cumfthname[tempcurr]]>> (<<$cumfthname[tempcurr]>>) - <<cumtime[tempcurr]>> <<$cum>>' & sumcum += cumtime[tempcurr]
 		if tempcurr < tempmax:tempcurr += 1 & jump 'potfathloop'
 		if sumcum > 1:$cum = 's' else $cum = ''
-		pl '<br>You think you have had <<sumcum>> load<<$cum>> of cum shot<<$cum>> in your womb altogether that could have gotten you pregnant.'
-		pl 'You suspect the father being: <<$wombthfath>><br>'
+		'<br>You think you have had <<sumcum>> load<<$cum>> of cum shot<<$cum>> in your womb altogether that could have gotten you pregnant.'
+		'You suspect the father being: <<$wombthfath>><br>'
 		*nl
 		tempcurr = 0
 		:pickfathloop
 			if cumtime[tempcurr] > 0:
 				if $npc_usedname[$cumfthname[tempcurr]] <> '':
-					pl ' <a href="exec: $wombthfath = ''<<$npc_usedname[$cumfthname[tempcurr]]>>'' & $wombthfathID = ''<<$cumfthname[tempcurr]>>'' & dynamic $d_cycreport_actor, 7"><<$npc_usedname[$cumfthname[tempcurr]]>> (<<$cumfthname[tempcurr]>>)</a>'
+					' <a href="exec: $wombthfath = ''<<$npc_usedname[$cumfthname[tempcurr]]>>'' & $wombthfathID = ''<<$cumfthname[tempcurr]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''"><<$npc_usedname[$cumfthname[tempcurr]]>> (<<$cumfthname[tempcurr]>>)</a>'
 				else
-					pl ' <a href="exec: $wombthfath = ''<<$npc_usedname[$cumfthname[tempcurr]]>>'' & $wombthfathID = ''<<$cumfthname[tempcurr]>>'' & dynamic $d_cycreport_actor, 7">Unknown (-)</a>'
+					' <a href="exec: $wombthfath = ''<<$npc_usedname[$cumfthname[tempcurr]]>>'' & $wombthfathID = ''<<$cumfthname[tempcurr]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''">Unknown (-)</a>'
 				end
 			end
 		if tempcurr < tempmax:tempcurr += 1 & jump 'pickfathloop'
@@ -523,7 +587,10 @@ $d_cycreport_actor = {
 		killvar 'cum'
 		killvar 'tempmax'
 		killvar 'tempcurr'
-		pl '<br>  <a href="exec:dynamic $d_cycreport_choice">Accept</a>'
+		'<br>  <a href="exec:dynamic $d_cycreport_choice">Accept</a>'
+		act 'Return':dynamic $d_cycreport_choice
+		act 'Exit':gs 'stat' & gt $loc, $metka
+		'</td></tr></table></center>'
 	elseif ARGS[0] = 10:
 		temp = arrsize('Babyptype')
 		temp -= 1
@@ -541,7 +608,9 @@ $d_cycreport_update = {
 		if cyccustom = 1:
 			if preg = 1 and knowpreg = 1:
 				$cycreport_txt = 'You are pregnant. Your due date is around <<$pregduedate>>.'
-				if $wombthfath ! 'unknown': $cycreport_txt = '<<$cycreport_txt>> You suspect the father being <<$wombthfath>>'
+				if $wombthfath ! 'unknown': 
+					$cycreport_txt = '<<$cycreport_txt>> You suspect the father being <<$wombthfath>>.'
+				end
 			elseif knowpregloss = 1:
 				$cycreport_txt = 'Your body is recovering from the trauma of pregnancy.'
 			elseif knowpregrecover = 1:

+ 322 - 434
locations/din_van.qsrc

@@ -206,34 +206,32 @@ $bath = {
 }
 
 $brit = {
-	if pcs_leghair > 3 and stanok > 1:
-		if pcs_pubes > 3 or pcs_bush > 0:
-			if pubestyle > 1 or pubestyle = 0:
-				act 'Shave your legs and pussy (0:15)':
-					cla
-					*clr
+	if shave_menu = 1  and stanok > 1:
+		if pcs_leghair > 3 or (pubestyle = 1 and pcs_pubes > 3) or (pubestyle >= 2 and pubestyle <=7 and pcs_pubes > 11) or (pubestyle = 8 and pcs_pubes > 11) or (pubestyle = 9 and pcs_pubes > 20) or (pubestyle = 10 and pcs_pubes > 26):
+			if pubestyle > 0:
+				act 'Shave yourself (0:15)':
+					*clr & cla
 					minut += 15
 					pcs_leghair = 0
-					if pubestyle = 4 or pubestyle = 2:
+					if pubestyle = 1 and pcs_pubes > 3:
 						pcs_pubes = 0
-						pcs_bush = 0
-					elseif pubestyle = 3:
-						pcs_pubes = 11
-						pcs_bush = 1
-					elseif pubestyle = 4 and pcs_pubes > 11:
+					elseif (pubestyle >= 2 and pubestyle <=7) and pcs_pubes > 11:
 						pcs_pubes = 11
+					elseif pubestyle = 8 and pcs_pubes > 11:
+						pcs_pubes = 16
+					elseif pubestyle = 9 and pcs_pubes > 20:
+						pcs_pubes = 20
+					elseif pubestyle = 10 and pcs_pubes > 26:
+						pcs_pubes = 26
 					end
 					pcs_horny += 5
 					stanok -= 2
-
 					if obdysh = 1 and rand(0, 5) = 0:gt 'vann', 'brit1'
-
 					if $loc ='Gadbana':
 						'<center><video src="images/shared/home/bathroom/shave.mp4"></center>'
 					else
 						'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
 					end
-
 					*nl
 					if daystart < 10 and StoryLine = 0 and ntstart = 0:
 						'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
@@ -241,191 +239,58 @@ $brit = {
 					elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
 						pcs_mood += 10
 						'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
-					elseif pubestyle = 2:
-						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time shaving off the stubble around your small bush tidy as well.'
-					elseif pubestyle = 3:
-						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time cleaning up the area around your neat patch of pussy hair as well.'
-					elseif pubestyle >= 4:
-						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time trimming back your bush as well.'
-					else
+					elseif pubestyle = 1:
 						'You lather up your legs and crotch and carefully shave them. Once you''re finished you gently glide your hands over your smooth pussy and legs, enjoying the smooth feeling and getting slightly more aroused by the touch.'
+					elseif pubestyle >= 2 and pubestyle <=7:
+						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time cleaning up the area around your neatly trimed and styled patch of pussy hair as well.'
+					elseif pubestyle = 8:
+						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time shaving off the stubble around your small patch of hair tidy as well.'
+					elseif pubestyle >= 9:
+						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time trimming back your small neat bush as well.'
+					elseif pubestyle >= 10:
+						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time trimming back your  bush as well.'
 					end
-
 					dynamic $dryOff
 				end
 			end
 		end
-	end
-	
-	if pcs_leghair > 3 and stanok > 0:
-		act 'Shave your legs (0:10)':
-			cla
-			*clr
-			minut += 10
-			pcs_leghair = 0
-			pcs_horny += 5
-			stanok -= 1
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave.jpg"></center>'
-			*nl
-			if daystart < 10 and StoryLine = 0 and ntstart = 0:
-				'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
-				'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. So in the end you get a pretty decent job done.'
-			elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
-				pcs_mood += 10
-				'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
-			else
-				'You lather up your legs and then start carefully shaving them. Once you''re finished you gently glide your hands over your smooth legs, making sure you didn''t miss a spot.'
-			end
-
-			dynamic $dryOff
-		end
-	end
-
-	if pcs_pubes > 3 and stanok > 0:
-		if pubestyle = 2 or pubestyle = 0:
-			act 'Shave your pussy (0:10)':
-				cla
-				*clr
-				minut += 10
-				pcs_pubes = 0
-				pcs_bush = 0
-				pcs_horny += 5
-				stanok -= 1
-				if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-
-				if $loc ='Gadbana':
-					'<center><video src="images/shared/home/bathroom/shave.mp4"></center>'
-				else
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
-				end
-
-				*nl
-				'You lather your crotch with some soapy water and carefully shave your pubic region. After shaving you can''t help but run your fingers over your pussy, enjoying the smooth feeling and getting slightly more aroused by the touch.'
-
-				dynamic $dryOff
-			end
-			
-		elseif pubestyle = 2 and pcs_pubes > 15:
-			act 'Trim your pussy (0:10)':
-				cla
-				*clr
-				minut += 10
-				pcs_pubes = 11
-				pcs_horny += 5
-				stanok -= 1
-				if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave4.jpg"></center>'
-				*nl
-				'You spend some time trimming back your bush, not shaving it away completely but careful to make it neat and tidy.'
-				dynamic $dryOff
-			end
-		end
-	end
-	
-	if pcs_leghair > 3 and stanok > 1:
-		if pubestyle > 1 or pubestyle = 0:
-			if pcs_pubes > 3 or pcs_bush > 0:
-				act 'Shave your legs and pussy (0:15)':
-					cla
-					*clr
-					minut += 15
-					pcs_leghair = 0
-					if pubestyle = 4 or pubestyle = 2:
-						pcs_pubes = 0
-						pcs_bush = 0
-					elseif pubestyle = 3:
-						pcs_pubes = 11
-						pcs_bush = 1
-					elseif pubestyle = 4 and pcs_pubes > 11:
-						pcs_pubes = 11
-					elseif pubestyle = 5 and pcs_pubes > 24:
-						pcs_pubes = 21
-					end
-					pcs_horny += 5
-					stanok -= 2
-					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
-					*nl
-					if daystart < 10 and StoryLine = 0 and ntstart = 0:
-						'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
-						'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. So in the end you get a pretty decent job done.'
-					elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
-						pcs_mood += 10
-						'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
-					
-					elseif pubestyle >= 3:
-						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time trimming back your pubes as well.'
-					else
-						'You lather up your legs and crotch and carefully shave them. Once you''re finished you gently glide your hands over your smooth pussy and legs, enjoying the smooth feeling and getting slightly more aroused by the touch.'
-					end
-
-					dynamic $dryOff
-				end
-			end
-		end
-	end
-
-	if pcs_leghair > 3 and stanok > 0:
-		act 'Shave your legs (0:10)':
-			cla
-			*clr
-			minut += 10
-			pcs_leghair = 0
-			pcs_horny += 5
-			stanok -= 1
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave.jpg"></center>'
-			*nl
-			'You lather your legs up with some soapy water and shave your legs. After a few swift movements, your legs are smooth as silk. The feeling of your smooth legs turns you on a little.'
-
-			dynamic $dryOff
-		end
-	end
-
-	if stanok > 0:
-		if pcs_pubes > 3 or pcs_bush > 0:
-			if pubestyle = 2 or pubestyle = 0:
+	elseif shave_menu = 2 and stanok > 0:
+		if pcs_pubes > 3:
+			if pubestyle = 1:
 				act 'Shave your pussy (0:10)':
-					cla
-					*clr
+					*clr & cla
 					minut += 10
 					pcs_pubes = 0
-					pcs_bush = 0
 					pcs_horny += 5
 					stanok -= 1
 					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-
 					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
 					*nl
 					'You lather your crotch with some soapy water and carefully shave your pubic hair. After shaving you can''t help but run your fingers over your pussy, enjoying the smooth feeling and getting slightly more aroused by the touch.'
-
 					dynamic $dryOff
 				end
-			elseif pubestyle = 3 and pcs_pubes > 15:
+			elseif (pubestyle >= 2 and pubestyle <= 7) and pcs_pubes > 15:
 				act 'Trim your pussy (0:10)':
-					cla
-					*clr
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave4.jpg"></center>'
 					*nl
 					if pcs_pubes >= 20:
-						'You carefully shave away the hair at the edges of your pussy, trimming it all away until there is only a neat bush left at the top.'
+						'You carefully shave away the hair at the edges of your pussy, trimming it all away until there is only a neatly styled bush left at the top.'
 					else
-						'You carefully shave away the stubble at the edges of your pussy, careful to only trim and maintain the neat bush you have at the top.'
+						'You carefully shave away the stubble at the edges of your pussy, careful to only trim and maintain the neatly styled bush you have at the top.'
 					end
 					minut += 10
 					pcs_pubes = 11
-					pcs_bush = 1
 					pcs_horny += 5
 					stanok -= 1
 					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
 					dynamic $dryOff
 				end
-			elseif pubestyle = 4 and pcs_pubes > 15:
-				act 'Trim your bush (0:10)':
-					cla
-					*clr
+			elseif pubestyle = 8 and pcs_pubes > 19:
+				act 'Trim your pubic hair (0:10)':
+					*clr & cla
 					minut += 10
-					pcs_pubes = 11
+					pcs_pubes = 19
 					pcs_horny += 5
 					stanok -= 1
 					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
@@ -434,10 +299,9 @@ $brit = {
 					'You spend some time trimming back your pubic hair, not shaving it away completely but careful to make it neat and tidy.'
 					dynamic $dryOff
 				end
-			elseif pubestyle = 5 and pcs_pubes >= 25:
-				act 'Trim back your bush (0:10)':
-					cla
-					*clr
+			elseif pubestyle = 9 and pcs_pubes >= 25:
+				act 'Trim your bush (0:10)':
+					*clr & cla
 					minut += 10
 					pcs_pubes = 21
 					pcs_horny += 5
@@ -445,12 +309,47 @@ $brit = {
 					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
 					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave4.jpg"></center>'
 					*nl
+					'You spend some time trimming back your light bush of pubic hair, tidying it up and keeping your bikini line nice and clean.'
+					dynamic $dryOff
+				end
+			elseif pubestyle = 10 and pcs_pubes >= 30:
+				act 'Trim back your bush (0:10)':
+					*clr & cla
+					minut += 10
+					pcs_pubes = 26
+					pcs_horny += 5
+					stanok -= 1
+					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
+					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave4.jpg"></center>'
+					*nl
 					'You spend some time trimming back your thick bush of pubic hair, tidying it up and keeping your bikini line nice and clean.'
 					dynamic $dryOff
 				end
 			end
 		end
-		act 'Shave options': gt 'din_van', 'shave_options'
+	elseif shave_menu = 3 and stanok > 0:
+		if pcs_leghair > 3:
+			act 'Shave your legs (0:05)':
+				*clr & cla
+				minut += 5
+				pcs_leghair = 0
+				pcs_horny += 5
+				stanok -= 1
+				if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
+				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave.jpg"></center>'
+				*nl
+				if daystart < 10 and StoryLine = 0 and ntstart = 0:
+					'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
+					'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. So in the end you get a pretty decent job done.'
+				elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
+					pcs_mood += 10
+					'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
+				else
+					'You lather your legs up with some soapy water and shave your legs. After a few swift movements, your legs are smooth as silk. The feeling of your smooth legs turns you on a little.'
+				end
+				dynamic $dryOff
+			end
+		end
 	end
 }
 
@@ -512,31 +411,45 @@ $quickwash = {
 
 $wearpan = {
 	if $pantyworntype = 'none':
-		act 'Wear panties': gt 'panties', 'view_panty_list', 'bathroom'
+		act 'Wear panties (0:02)': 
+			minut += 2
+			gs 'stat'
+			gt 'panties', 'view_panty_list', 'bathroom'
+		end
 	end
 
 	if $braworntype = 'none':
-		act 'Wear a bra': gt 'bras', 'view_bra_list', 'bathroom'
+		act 'Wear a bra (0:02)': 
+			minut += 2
+			gs 'stat'
+			gt 'bras', 'view_bra_list', 'bathroom'
+		end
 	end
 }
 
 $removepan = {
 	if $pantyworntype ! 'none' and $braworntype ! 'none':
-		act 'Remove underwear':
+		act 'Remove underwear (0:02)':
+			minut += 2
+			gs 'stat'
 			gs 'underwear', 'remove'
 			gt $loc, $metka
 		end
 	end
 
 	if $pantyworntype ! 'none':
-		act 'Remove panties':
+		act 'Remove panties (0:02)':
+			minut += 2
+			gs 'stat'
 			gs 'panties', 'remove'
 			gt $loc, $metka
 		end
 	end
 
 	if $braworntype ! 'none':
-		act 'Remove bra':
+		act 'Remove bra (0:02)':
+			minut += 2
+			gs 'stat'
 			gs 'bras', 'remove'
 			gt $loc, $metka
 		end
@@ -563,7 +476,7 @@ $basin = {
 			act 'Finish':gt $loc, $metka
 		end
 	end
-	
+
 	if body_write > 0 or face_write > 0:
 		act 'Wash the writings off your body (0:10)':
 			cla
@@ -595,7 +508,7 @@ $basin = {
 			act 'Finish':gt $loc, $metka
 		end
 	end
-	
+
 	if pcs_makeup ! 1:
 		act 'Wash off cosmetics (0:10)':
 			cla
@@ -629,15 +542,13 @@ $basin = {
 			act 'Finish':gt $loc, $metka
 		end
 	end
-	
-	dynamic $removepan
 }
 
 $pir_title = {
 	cla
 	*clr
 	'<center><b>Available piercings - select one by clicking the image</b></center>'
-	*nl	
+	*nl
 }
 $pirTongue = {
 	dynamic $pir_title
@@ -790,17 +701,98 @@ $pirManage = {
 	act'<b>Back</b>':gt $loc, $metka
 }
 
+$enema = {
+	if klisma = 1 and (klismaday ! daystart or arrpos('sparrloc', 3) ! -1):
+		act 'Give yourself an enema (0:05)':
+			cla
+			*clr
+			cumspclnt = 7
+			gs 'cum_cleanup'
+			minut += 5
+			klismaday = daystart
+			klismaday1 = 1
+
+			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/klisma.jpg"></center>'
+			*nl
+			'You give yourself an enema, feeling clean down there. Your ass is now ready for anal sex without any awkward surprises.'
+
+			act 'Finish':gt $loc, $metka
+		end
+	end
+}
+
+$toymanage = {
+	if analplug = 1 and analplugin = 1:
+		act 'Remove your butt plug (0:05)':
+			cla
+			*clr
+			minut += 5
+			analplugIN = 0
+
+			if pcs_ass < 30:pcs_ass += 1
+
+			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
+			*nl
+			'You squat and tug gently at the butt plug, gasping as you push it out of you. You can''t help but feel a bit empty, now that it''s out.' & !!0.2.6: Removed unneccessary var check
+
+			act 'Finish':gt $loc, $metka
+		end
+	elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
+		act 'Insert your butt plug (0:05)':
+			cla
+			*clr
+			minut += 5
+			analplugIN = 1
+
+			if pcs_ass < 10:pcs_ass += 5
+			if pcs_ass >= 10 and pcs_ass < 20:pcs_ass += rand(1, 2)
+			if pcs_ass >= 20 and pcs_ass < 30:pcs_ass += rand(0, 1)
+
+			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
+			*nl
+			if butpluguse > 0:'You squat and gently rub the butt plug against your anus, after lubricating it with a bit of saliva. After a short while, you''ve relaxed enough to be able to push it in. Once it''s in you give it a few gentle tugs, wondering if anyone will catch you wearing it today.'
+			if butpluguse = 0:butpluguse = 1 & '"If I''m not going to use it, then why did I buy it?" you ask yourself. You look at the butt plug for a while, thinking "It is necessary to start developing my ass, so I could have great adventures someday... you could even say huge and thick adventures with crimson heads, uh, now I got carried away..." You''re slightly embarrassed at the thought for a second, but are then overcome by your horny fantasies. Determined to get the plug all the way in, you slowly press it against your asshole after lubricating it with a bit of saliva. It hurts a bit at first, but once the thickest part is in the rest follows rather easily. Patting yourself on your ass once it''s in, you wonder if anyone will notice you''re wearing it today and then immediately feel naughty for even having thought that.'
+
+			act 'Finish':gt $loc, $metka
+		end
+	end
+
+	if vibrator = 1 and vibratorIN = 1:
+		act 'Remove the vibrator (0:05)':
+			cla
+			*clr
+			minut += 5
+			vibratorIN = 0
+
+			if pcs_vag < 30:pcs_vag += 1
+
+			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
+			*nl
+			'You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.'
+
+			act 'Finish':gt $loc, $metka
+		end
+	elseif vibrator = 1 and vibratorIN = 0 and pcs_vag ! 0:
+		act 'Insert the vibrator in your vagina (0:05)':
+			cla
+			*clr
+			minut += 5
+			vibratorIN = 1
+
+			if pcs_vag < 30:pcs_vag += 2
+
+			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
+			*nl
+			'You spread your legs and slowly insert the vibrator in your pussy, wondering if anyone will notice you wearing it today.'
+
+			act 'Finish':gt $loc, $metka
+		end
+	end
+}
+
 if $ARGS[0] = 'private':
-	if stanok > 0:'Your razor will last for <b><<stanok>></b> more shavings.'
-	
-	'Pubic Shaving Style:'
-	if pubestyle = 0:'<a href="exec:pubestyle = 2 & gt $loc, $metka">Clean Shave</a> | <a href="exec:pubestyle = 3 & gt $loc, $metka">Small Bush</a> | <a href="exec:pubestyle = 4 & gt $loc, $metka">Trimmed</a> | <a href="exec:pubestyle = 5 & gt $loc, $metka">Full Bush</a> | <a href="exec:pubestyle = 1 & gt $loc, $metka">Never Shave</a> | <u>None</u>'
-	if pubestyle = 1:'<a href="exec:pubestyle = 2 & gt $loc, $metka">Clean Shave</a> | <a href="exec:pubestyle = 3 & gt $loc, $metka">Small Bush</a> | <a href="exec:pubestyle = 4 & gt $loc, $metka">Trimmed</a> | <a href="exec:pubestyle = 5 & gt $loc, $metka">Full Bush</a> | <u>Never Shave</u> | <a href="exec:pubestyle = 0 & gt $loc, $metka">None</a>'
-	if pubestyle = 2:'<u>Clean Shave</u> | <a href="exec:pubestyle = 3 & gt $loc, $metka">Small Bush</a> | <a href="exec:pubestyle = 4 & gt $loc, $metka">Trimmed</a> | <a href="exec:pubestyle = 5 & gt $loc, $metka">Full Bush</a> | <a href="exec:pubestyle = 1 & gt $loc, $metka">Never Shave</a> | <a href="exec:pubestyle = 0 & gt $loc, $metka">None</a>'
-	if pubestyle = 3:'<a href="exec:pubestyle = 2 & gt $loc, $metka">Clean Shave</a> | <u>Small Bush</u> | <a href="exec:pubestyle = 4 & gt $loc, $metka">Trimmed</a> | <a href="exec:pubestyle = 5 & gt $loc, $metka">Full Bush</a> | <a href="exec:pubestyle = 1 & gt $loc, $metka">Never Shave</a> | <a href="exec:pubestyle = 0 & gt $loc, $metka">None</a>'
-	if pubestyle = 4:'<a href="exec:pubestyle = 2 & gt $loc, $metka">Clean Shave</a> | <a href="exec:pubestyle = 3 & gt $loc, $metka">Small Bush</a> | <u>Trimmed</u> | <a href="exec:pubestyle = 5 & gt $loc, $metka">Full Bush</a> | <a href="exec:pubestyle = 1 & gt $loc, $metka">Never Shave</a> | <a href="exec:pubestyle = 0 & gt $loc, $metka">None</a>'
-	if pubestyle = 5:'<a href="exec:pubestyle = 2 & gt $loc, $metka">Clean Shave</a> | <a href="exec:pubestyle = 3 & gt $loc, $metka">Small Bush</a> | <a href="exec:pubestyle = 4 & gt $loc, $metka">Trimmed</a> | <u>Full Bush</u> | <a href="exec:pubestyle = 1 & gt $loc, $metka">Never Shave</a> | <a href="exec:pubestyle = 0 & gt $loc, $metka">None</a>'
-	
+	if stanok > 0:'Your razor will last for <b><<stanok>></b> more shavings. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
+
 	!WD: heal chafe
 	if mosolmaz>0:'On a shelf is a tube of ointment for chafing, which will be enough for <b><<mosolmaz>></b> applications.'
 
@@ -870,231 +862,48 @@ if $ARGS[0] = 'private':
 
 	dynamic $tampon
 
-	dynamic $wearpan
-	act 'Check weight on the scales':
+	act 'Change clothes and toys':
 		cla
-		*clr
-		msg 'Your body fat is = (<<salo>>)'
-		gt $loc, $metka
-	end
-	gs 'din_van', 'prvt_pee'
-
-	dynamic $basin
-
-	if pcs_leghair > 3 and stanok > 1:
-		if pubestyle > 1 or pubestyle = 0:
-			if pcs_pubes > 3 or pcs_bush > 0:
-				act 'Shave your legs and pussy (0:15)':
-					cla
-					*clr
-					minut += 15
-					pcs_leghair = 0
-					if pubestyle = 4 or pubestyle = 2:
-						pcs_pubes = 0
-						pcs_bush = 0
-					elseif pubestyle = 3:
-						pcs_pubes = 11
-						pcs_bush = 1
-					elseif pubestyle = 4 and pcs_pubes > 11:
-						pcs_pubes = 11
-					elseif pubestyle = 5 and pcs_pubes > 24:
-						pcs_pubes = 21
-					end
-					pcs_horny += 5
-					stanok -= 2
-					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
-					*nl
-					if daystart < 10 and StoryLine = 0 and ntstart = 0:
-						'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
-						'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. So in the end you get a pretty decent job done.'
-					elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
-						pcs_mood += 10
-						'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
-					
-					elseif pubestyle = 2:
-						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time trimming back your pubes as well.'
-					else
-						'You lather up your legs and crotch and carefully shave them. Once you''re finished you gently glide your hands over your smooth pussy and legs, enjoying the smooth feeling and getting slightly more aroused by the touch.'
-					end
-
-					act 'Finish':gt $loc, $metka
-				end
+		
+		act 'Return':gt $loc, $metka
+		
+		dynamic $wearpan
+		dynamic $removepan
+
+		if $curloc = 'vanrPar' and $clothingworntype = 'nude':
+			act 'Wear clothes (0:05)':
+				*clr & cla
+				minut = 5
+				'<center><video autoplay loop src="images/locations/city/citycenter/photo/dress.mp4"></video></center>'
+				'You get dressed'
+				gs 'clothing', 'wear_last_worn'
+				gs 'stat'
+				act 'Return': gt $loc, $metka
 			end
-		end
-	end
-
-	if pcs_leghair > 3 and stanok > 0:
-		act 'Shave your legs (0:10)':
-			cla
-			*clr
-			minut += 10
-			pcs_leghair = 0
-			pcs_horny += 5
-			stanok -= 1
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave.jpg"></center>'
-			*nl
-			'You lather your legs up with some soapy water and shave your legs. After a few swift movements, your legs are smooth as silk. The feeling of your smooth legs turns you on a little.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	end
-
-	if stanok > 0:
-		if pcs_pubes > 3 or pcs_bush > 0:
-			if pubestyle = 2 or pubestyle = 0:
-				act 'Shave your pussy (0:10)':
-					cla
-					*clr
-					minut += 10
-					pcs_pubes = 0
-					pcs_bush = 0
-					pcs_horny += 5
-					stanok -= 1
-					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
-					*nl
-					'You lather your crotch with some soapy water and carefully shave your pubic hair. After shaving you can''t help but run your fingers over your pussy, enjoying the smooth feeling and getting slightly more aroused by the touch.'
-
-					act 'Finish':gt $loc, $metka
-				end
-			elseif pubestyle = 3 and pcs_pubes > 15:
-				act 'Trim your pussy (0:10)':
-					cla & *clr
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave4.jpg"></center>'
-					*nl
-					if pcs_pubes > 20:
-						'You carefully shave away the hair at the edges of your pussy, trimming it all away until there is only a neat bush left at the top.'
-					else
-						'You carefully shave away the stubble at the edges of your pussy, careful to only trim and maintain the neat bush you have at the top.'
-					end
-					minut += 10
-					pcs_pubes = 11
-					pcs_bush = 1
-					pcs_horny += 5
-					stanok -= 1
-					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-					act 'Finish':gt $loc, $metka
-				end
-			elseif pubestyle = 4 and pcs_pubes > 15:
-				act 'Trim your bush (0:10)':
-					cla
-					*clr
-					minut += 10
-					pcs_pubes = 11
-					pcs_horny += 5
-					stanok -= 1
-					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave4.jpg"></center>'
-					*nl
-					'You spend some time trimming back your pubic hair, not shaving it away completely but careful to make it neat and tidy.'
-					act 'Finish':gt $loc, $metka
-				end
-			elseif pubestyle = 5 and pcs_pubes >= 25:
-				act 'Trim back your bush (0:10)':
-					cla
-					*clr
-					minut += 10
-					pcs_pubes = 21
-					pcs_horny += 5
-					stanok -= 1
-					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
-					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave4.jpg"></center>'
-					*nl
-					'You spend some time trimming back your thick bush of pubic hair, tidying it up and keeping your bikini line nice and clean.'
-					act 'Finish':gt $loc, $metka
-				end
+		elseif $curloc = 'vanrPar' and $clothingworntype ! 'nude':
+			act 'Remove clothes (0:05)':
+				*clr & cla
+				minut = 5
+				'<center><video autoplay loop src="images/shared/Accessories/computer/webcam/undress1.mp4"></video></center>'
+				'You remove your clothing'
+				gs 'clothing', 'strip'
+				gs 'stat'
+				act 'Return': gt $loc, $metka
 			end
 		end
-		act 'Shave options': gt 'din_van', 'shave_options'
+		dynamic $toymanage
 	end
 
-	if analplug = 1 and analplugin = 1:
-		act 'Remove your butt plug (0:05)':
-			cla
-			*clr
-			minut += 5
-			analplugIN = 0
-
-			if pcs_ass < 30:pcs_ass += 1
-
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			*nl
-			'You squat and tug gently at the butt plug, gasping as you push it out of you. You can''t help but feel a bit empty, now that it''s out.' & !!0.2.6: Removed unneccessary var check
+	'<a href="exec:msg ''Your body fat is = (<<salo>>)''">Check weight on the scales</a>'
 
-			act 'Finish':gt $loc, $metka
-		end
-	elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
-		act 'Insert your butt plug (0:05)':
-			cla
-			*clr
-			minut += 5
-			analplugIN = 1
-
-			if pcs_ass < 10:pcs_ass += 5
-			if pcs_ass >= 10 and pcs_ass < 20:pcs_ass += rand(1, 2)
-			if pcs_ass >= 20 and pcs_ass < 30:pcs_ass += rand(0, 1)
-
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			*nl
-			if butpluguse > 0:'You squat and gently rub the butt plug against your anus, after lubricating it with a bit of saliva. After a short while, you''ve relaxed enough to be able to push it in. Once it''s in you give it a few gentle tugs, wondering if anyone will catch you wearing it today.'
-			if butpluguse = 0:butpluguse = 1 & '"If I''m not going to use it, then why did I buy it?" you ask yourself. You look at the butt plug for a while, thinking "It is necessary to start developing my ass, so I could have great adventures someday... you could even say huge and thick adventures with crimson heads, uh, now I got carried away..." You''re slightly embarrassed at the thought for a second, but are then overcome by your horny fantasies. Determined to get the plug all the way in, you slowly press it against your asshole after lubricating it with a bit of saliva. It hurts a bit at first, but once the thickest part is in the rest follows rather easily. Patting yourself on your ass once it''s in, you wonder if anyone will notice you''re wearing it today and then immediately feel naughty for even having thought that.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	end
-
-	if klisma = 1 and (klismaday ! daystart or arrpos('sparrloc', 3) ! -1):
-		act 'Give yourself an enema (0:05)':
-			cla
-			*clr
-			cumspclnt = 7
-			gs 'cum_cleanup'
-			minut += 5
-			klismaday = daystart
-			klismaday1 = 1
-
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/klisma.jpg"></center>'
-			*nl
-			'You give yourself an enema, feeling clean down there. Your ass is now ready for anal sex without any awkward surprises.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	end
-
-	if vibrator = 1 and vibratorIN = 1:
-		act 'Remove the vibrator (0:05)':
-			cla
-			*clr
-			minut += 5
-			vibratorIN = 0
-
-			if pcs_vag < 30:pcs_vag += 1
-
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			*nl
-			'You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.'
+	gs 'din_van', 'prvt_pee'
 
-			act 'Finish':gt $loc, $metka
-		end
-	elseif vibrator = 1 and vibratorIN = 0 and pcs_vag ! 0:
-		act 'Insert the vibrator in your vagina (0:05)':
-			cla
-			*clr
-			minut += 5
-			vibratorIN = 1
+	dynamic $basin
 
-			if pcs_vag < 30:pcs_vag += 2
+	dynamic $brit
 
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			*nl
-			'You spread your legs and slowly insert the vibrator in your pussy, wondering if anyone will notice you wearing it today.'
+	dynamic $enema
 
-			act 'Finish':gt $loc, $metka
-		end
-	end
 
 	if mosolmaz > 0 and mosol > 0 and mosal_time ! (daystart * 100) + hour:
 		act 'Rub ointment onto your pussy (0:05)':
@@ -1147,12 +956,21 @@ if $ARGS[0] = 'private':
 			act 'Finish':gt $loc, $metka
 		end
 	end
-	
-	!!breast pump is now in the menue, not on the screen
-	if breastpump > 0:
+
+	!!breast pump is now in the menu, not on the screen
+	if breastcounter <= 0:
+		temp_var = 50
+	else
+		temp_var = (50/breastcounter)
+	end
+	if breastpump > 0 and bp_unbox >= 1:
 		act 'Use breast pump':
 			gt 'lact_lib', 'bp_milking'
 		end
+	elseif breastpump > 0 and bp_unbox <= 0:
+		'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Unbox</a> your breast pump'
+	elseif breastpump <= 0 and pcs_horny >= temp_var:
+		act 'Massage your breasts': gt 'lact_lib','man_milking'
 	end
 end
 
@@ -1523,54 +1341,124 @@ if $ARGS[0] = 'pblc_pee_end':
 end
 
 if $ARGS[0] = 'shave_options':
-	*clr
-	if shave_img_hgt = 0:shave_img_hgt = 250
-
+	*clr & cla
+	if shave_img_hgt = 0:shave_img_hgt = 100
+	!if pubestyle = 0 = never shave (uses $pcs_pubes)
+	!if pubestyle = 1: $pubeimage = 'images/pc/body/pussy/pussy.jpg' (uses $pcs_pubes)
+	if pubestyle = 2: $pubeimage = 'images/pc/body/pussy/shave/v1.jpg'
+	if pubestyle = 3: $pubeimage = 'images/pc/body/pussy/shave/triangle1.jpg'
+	if pubestyle = 4: $pubeimage = 'images/pc/body/pussy/shave/landing1.jpg'
+	if pubestyle = 5: $pubeimage = 'images/pc/body/pussy/shave/heart1.jpg'
+	if pubestyle = 6: $pubeimage = 'images/pc/body/pussy/shave/flame1.jpg'
+	if pubestyle = 7: $pubeimage = 'images/pc/body/pussy/shave/cross1.jpg'
+	if pubestyle = 8: $pubeimage = 'images/pc/body/pussy/shave/s_bush1.jpg'
+	!if pubestyle = 9: $pubeimage = 'images/pc/body/pussy/spussy.jpg'  (uses $pcs_pubes)
+	!if pubestyle = 10: $pubeimage = 'images/pc/body/pussy/hpussy.jpg' (uses $pcs_pubes)
 	'<h3><center><b><font color="maroon">Shaving optons</b></h3><br><center><font color="maroon">Here you can choose your style for pubic hair and which body parts you wish to shave.</font></center>'
 	'<br><center><table border=0 cellspacing=<<shave_img_hgt/25>> cellpadding=5>'
-	*P '<TR><TD><center><a href="exec:pubestyle = 2 & gt ''din_van'', ''shave_options''"><img Height = <<shave_img_hgt>> src="images/shared/home/bathroom/shave3.jpg"></a></center></TD><TD><center><a href="exec:pubestyle = 3 & gt ''din_van'', ''shave_options''"><img Height = <<shave_img_hgt>> src="images/shared/home/bathroom/shave3.jpg"></a></center></TD>'
+	*P '<TR><TD><center><a href="exec:view''images/pc/body/pussy/pussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/pussy.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/v1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/v1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/triangle1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/triangle1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/landing1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/landing1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/heart1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/heart1.jpg"></a></center></TD>'
 	'<TR><TD><center>'
-	if pubestyle ! 2:
-		'<a href="exec:pubestyle = 2 & gt ''din_van'', ''shave_options''">Clean Shave</a>'
+	if pubestyle ! 1:
+		'<a href="exec:pubestyle = 1 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Clean Shave</a>'
 	else
 		'Clean Shave'
 	end
 	'</center></TD><TD><center>'
-	if pubestyle ! 3:
-		'<a href="exec:pubestyle = 3 & gt ''din_van'', ''shave_options''">Small Bush</a>'
+	if pubestyle ! 2 and pcs_pubes > 15:
+		'<a href="exec:pubestyle = 2 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">V-shaped</a>'
 	else
-		'Small Bush'
+		'V-shaped'
+	end
+	'</center></TD><TD><center>'
+	if pubestyle ! 3 and pcs_pubes > 15:
+		'<a href="exec:pubestyle = 3 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Triangle-shaped</a>'
+	else
+		'Triangle-shaped'
+	end
+	'</center></TD><TD><center>'
+	if pubestyle ! 4 and pcs_pubes > 15:
+		'<a href="exec:pubestyle = 4 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Landing-strip</a>'
+	else
+		'Landing-strip'
+	end
+	'</center></TD><TD><center>'
+	if pubestyle ! 5 and pcs_pubes > 15:
+		'<a href="exec:pubestyle = 5 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Heart-shaped</a>'
+	else
+		'Heart-shaped'
 	end
 	'</center></TD>'
-	*P '<TR><TD><center><a href="exec:pubestyle = 1 & gt ''din_van'', ''shave_options''"><img Height = <<shave_img_hgt>> src="images/shared/home/bathroom/shave3.jpg"></a></center></TD><TD><center><a href="exec:pubestyle = 4 & gt ''din_van'', ''shave_options''"><img Height = <<shave_img_hgt>> src="images/shared/home/bathroom/shave3.jpg"></a></center></TD>'
+	*P '<TR><TD><center><a href="exec:view''images/pc/body/pussy/shave/flame1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/flame1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/cross1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/cross1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/s_bush1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/s_bush1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/spussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/spussy.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/hpussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/hpussy.jpg"></a></center></TD>'
 	'<TR><TD><center>'
-	if pubestyle ! 1:
-		'<a href="exec:pubestyle = 1 & gt ''din_van'', ''shave_options''">Full Bush</a>'
+	if pubestyle ! 6 and pcs_pubes > 15:
+		'<a href="exec:pubestyle = 6 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Flame-shaped</a>'
 	else
-		'Full Bush'
+		'Flame-shaped'
+	end
+	'</center></TD><TD><center>'
+	if pubestyle ! 7 and pcs_pubes > 15:
+		'<a href="exec:pubestyle = 7 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Cross-Shaped</a>'
+	else
+		'Cross-Shaped'
 	end
 	'</center></TD><TD><center>'
-	if pubestyle ! 4:
-		'<a href="exec:pubestyle = 4 & gt ''din_van'', ''shave_options''">Trimmed</a>'
+	if pubestyle ! 8 and pcs_pubes > 20:
+		'<a href="exec:pubestyle = 8 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Trimmed</a>'
 	else
 		'Trimmed'
 	end
-	'</center></TD>
-	<TR><center>'
+	'</center></TD><TD><center>'
+	if pubestyle ! 9 and pcs_pubes > 25:
+		'<a href="exec:pubestyle = 9 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Small Bush</a>'
+	else
+		'Small Bush'
+	end
+	'</center></TD><TD><center>'
+	if pubestyle ! 10 and pcs_pubes > 30:
+		'<a href="exec:pubestyle = 10 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Full Bush</a>'
+	else
+		'Full Bush'
+	end
+	'</center></TD><TR><center>'
 	'Your razor will last for <b><<stanok>></b> more shaves.'
-	'</center>'
+	*nl
+	'<center><b>Change your shaving routine:</b></center>'
+	'<center><font color="grey">Note: Choosing to never shave, or to shave legs only, will remove your chosen shave style.<br> You can only choose a style if you currently have enough hair to support it.</font></center>'
+	*nl
+	!if shave_menu = 0:nothing
+	!if shave_menu = 1:legs and pussy
+	!if shave_menu = 2:pussy only
+	!if shave_menu = 3:legs only
+	if shave_menu = 0:
+		$shave_chosen = 'doesn''t include any shaving options.'
+		$shave_time = ''
+		'Never shave | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave everything.''">Everything</a>','<a href="exec:shave_menu = 1 & gs ''din_van'', ''shave_options''">Everything</a>')+' | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave your pussy.''">Pussy only</a>','<a href="exec:shave_menu = 2 & gs ''din_van'', ''shave_options''">Pussy only</a>')+' | <a href="exec:shave_menu = 3 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Legs only</a>'
+	elseif shave_menu = 1:
+		$shave_chosen = 'involves shaving your legs and maintaining your current pubic style.'
+		$shave_time = 'It takes 15 minutes to complete this routine.'
+		'<a href="exec:shave_menu = 0 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Never shave</a> | Everything | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave your pussy.''">Pussy only</a>','<a href="exec:shave_menu = 2 & gs ''din_van'', ''shave_options''">Pussy only</a>')+' | <a href="exec:shave_menu = 3 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Legs only</a>'
+	elseif shave_menu = 2:
+		$shave_chosen = 'involves not shaving your legs and maintaining your current pubic style.'
+		$shave_time = 'It takes 10 minutes to complete this routine.'
+		'<a href="exec:shave_menu = 0 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Never shave</a> | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave everything.''">Everything</a>','<a href="exec:shave_menu = 1 & gs ''din_van'', ''shave_options''">Everything</a>')+' | Pussy only | <a href="exec:shave_menu = 3 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Legs only</a>'
+	elseif shave_menu = 3:
+		$shave_chosen = 'involves shaving your legs and not maintaining any chosen pubic style.'
+		$shave_time = 'It takes 5 minutes to complete this routine.'
+		'<a href="exec:shave_menu = 0 & pubestyle = 0 & gs ''din_van'', ''shave_options''">Never shave</a> | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave everything.''">Everything</a>','<a href="exec:shave_menu = 1 & gs ''din_van'', ''shave_options''">Everything</a>')+' | '+iif(pubestyle = 0,'<a href="exec: msg ''You must choose a shave style before you can choose to shave your pussy.''">Pussy only</a>','<a href="exec:shave_menu = 2 & gs ''din_van'', ''shave_options''">Pussy only</a>')+' | Legs only'
+	end
+	*nl
+	'<center>Your current routine <<$shave_chosen>> <br><<$shave_time>></center>'
 	'</table></center>'
-	
+
 	act 'Set image height for this view':
-		shave_img_hgt = input("Enter height in pixels you want for images on this page<br>(default 250, min 100, max 500)")
-		if shave_img_hgt < 100:
-			shave_img_hgt = 250
+		shave_img_hgt = input("Enter height in pixels you want for images on this page<br>(default 100, min 50, max 500)")
+		if shave_img_hgt < 50:
+			shave_img_hgt = 50
 		elseif shave_img_hgt > 500:
 			shave_img_hgt = 500
 		end
 		gt 'din_van', 'shave_options'
 	end
-	if pubestyle > 0: act 'Disable shave styles': pubestyle = 0 & gt 'din_van', 'shave_options'
 	act 'Return':gt $loc, $metka
 end
 

+ 1 - 1
locations/events.qsrc

@@ -266,6 +266,7 @@ end
 if $ARGS[0] = 'snarkozaka':
 	cls
 	minut += 20
+	gs 'stat'
 	'<center><B>Pavlovsk train station</B></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg"></center>'
 	'You walk to the end of the platform and see a man hiding undercover smoking a cigarette'
@@ -288,7 +289,6 @@ if $ARGS[0] = 'snarkozaka':
 	act 'Leave': gt $loc, $metka
 end
 
-
 if $ARGS[0] = 'snkayf1':
 	snkz = RAND(1,6)
 	gs 'underwear', 'remove'

+ 15 - 9
locations/femcyc.qsrc

@@ -211,11 +211,16 @@ if $ARGS[0] = '':
 	if lactate = 0 and milkoverdemand >= 0 and prolactinlvl >= 0:
 		if milkgrowday < daystart:
 			temp_var = milkoverdemand/200
+			if temp_var >= 10 and pregtimes <= 0: temp_var = 10
+			if temp_var >= 50 and pregtimes > 0: temp_var = 50
 			if temp_var <= 0 and milkoverdemand >0:
 				prolactinlvl += 1
 			else
-				prolactinlvl += milkoverdemand/200
+				prolactinlvl += temp_var
 			end
+			!!	if sveta had no kid, milk induction will take a while as her breasts need to change alot.
+			if prolactinlvl >= 150 and kid <= 0 and pregtimes <= 0:milkinduceday += 1
+			if prolactinlvl >= 100 and kid <= 0 and pregtimes <= 0 and pain['breasts'] <= 20: pain['breasts'] = 20
 			!! as long as your tits are not over 11 growth will happen to them. If you do not pump or no pregnancy happens, no growth will happen.
 			if milkoverdemand = 0 and pregchem = 0 and tits < 11:
 				temp_var = prolactinlvl - 10
@@ -223,7 +228,7 @@ if $ARGS[0] = '':
 					prolactinlvl = 0
 				end
 				!! if prolactinlvl is sinking too much, the aveoli will deflate and thus the breasts growth is reverted. This only counts for induced lactation. If natural lactation occurs breasts will shrink a bit too, but stay bigger in total.
-				if prolactinlvl < 75 and total_milkinduce_growth > 0:
+				if prolactinlvl < 100 and total_milkinduce_growth > 0:
 					nbsize -= total_milkinduce_growth
 					total_milkinduce_growth = 0
 					if prolactinlvl > 10:
@@ -242,7 +247,7 @@ if $ARGS[0] = '':
 				milkgrowday = daystart
 			elseif milkoverdemand > 0 and pregchem = 0 and tits < 11:
 				!! inducing without ever being pregnant
-				if prolactinlvl > 75 and kid <= 0:
+				if prolactinlvl > 100 and kid <= 0:
 					if total_milkinduce_growth < 8:
 						total_milkinduce_growth += 1 + pumpinggrowth
 						nbsize += 1 + pumpinggrowth
@@ -251,7 +256,7 @@ if $ARGS[0] = '':
 						pumpinggrowth = 0
 					end
 				!! inducing after being pregnant
-				elseif prolactinlvl > 75 and kid > 0:
+				elseif prolactinlvl > 100 and kid > 0:
 					if total_milkinduce_growth < (total_preg_growth/2):
 						total_milkinduce_growth += 1 + pumpinggrowth
 						nbsize += 1 + pumpinggrowth
@@ -260,7 +265,7 @@ if $ARGS[0] = '':
 				end
 				milkoverdemand = 0
 			elseif milkoverdemand >= 0 and pregchem > 0 and tits < 11:
-				if prolactinlvl > 75 and pregchem < 3000 and kid <= 0:
+				if prolactinlvl > 100 and pregchem < 3000 and kid <= 0:
 					if total_milkinduce_growth < 8:
 						total_milkinduce_growth += 1 + pumpinggrowth
 						nbsize += 1 + pumpinggrowth
@@ -269,14 +274,14 @@ if $ARGS[0] = '':
 						pumpinggrowth = 0
 					end
 				!! first breast growth with first pregnancy
-				elseif prolactinlvl >= 75 and pregchem >= 2000 and pregchem < 3000 and kid <= 0:
+				elseif prolactinlvl >= 100 and pregchem >= 2000 and pregchem < 3000 and kid <= 0:
 					if rand(0,100) > 55:
 						first_preg_growth += 1
 						total_preg_growth += 1
 						if total_preg_growth > total_milkinduce_growth: nbsize += 1
 					end
 				!! there is little chance your breast grow additional sizes if you have more kids.
-				elseif prolactinlvl >= 75 and pregchem >= 2000 and pregchem < 3000 and kid > 0:
+				elseif prolactinlvl >= 100 and pregchem >= 2000 and pregchem < 3000 and kid > 0:
 					if first_preg_growth > total_preg_growth:
 						total_preg_growth += 1
 						if total_preg_growth > total_milkinduce_growth: nbsize += 1
@@ -287,7 +292,7 @@ if $ARGS[0] = '':
 						end
 					end
 				!! inducing after being pregnant
-				elseif prolactinlvl > 75 and pregchem =< 3000 and kid > 0:
+				elseif prolactinlvl > 100 and pregchem =< 3000 and kid > 0:
 					if total_milkinduce_growth < (total_preg_growth/2):
 						total_milkinduce_growth += 1 + pumpinggrowth
 						nbsize += 1 + pumpinggrowth
@@ -307,7 +312,7 @@ if $ARGS[0] = '':
 		if lactateinduced > 0 and kid <= 0:
 			if milkgrowday < daystart:
 				!! first breast growth with first pregnancy
-				if prolactinlvl >= 75 and pregchem >= 2000 and pregchem < 3000 and kid <= 0:
+				if prolactinlvl >= 100 and pregchem >= 2000 and pregchem < 3000 and kid <= 0:
 					if rand(0,100) > 55:
 						first_preg_growth += 1
 						total_preg_growth += 1
@@ -351,6 +356,7 @@ if $ARGS[0] = '':
 						lactate = 0
 						lactateinduced = 0
 						nbsize -= total_milkinduce_growth
+						milkinduceday = 0
 						'You notice that you stopped lactating.'
 					elseif lactaterate = 0 and pregchem >= 1000:
 						lactaterate = 1

+ 1 - 1
locations/gadforest.qsrc

@@ -68,7 +68,7 @@ if $ARGS[0] = '1':
 		if foresteventrand = 9 and hour >= 8 and hour <= 15 and month >= 4 and month <= 10 and gadboyday ! daystart and week > 5: gt 'gadforest_event', 'gopforest_3boys'
 	end
 
-	if $clothingworntype ! 'nude' and clothesAtLocation = 0 and temper >= 15 and sunWeather = 1 and hour>=6 and hour<=20 and miratalkforest > 1 and MiraLoc ! 3:
+	if $clothingworntype ! 'nude' and clothesAtLocation = 0 and temper >= 15 and sunWeather = 1 and hour>=6 and hour<=20 and miratalkforest > 1 and MiraLoc ! 3 and inhib > 50:
 		act'Strip naked':
 			if forestpicnic = 0:
 				inhib_exp += rand(1,3)

+ 19 - 17
locations/gadforest_event.qsrc

@@ -2014,23 +2014,25 @@ if $ARGS[0] = 'nude_event':
 		'Finally after the hundredth time, of looking around to make sure no one is around, you decide...'
 	end
 
-	act'Give in to the temptation':
-		cla
-		*clr
-		minut+=5
-		gs 'underwear', 'remove'
-		pcs_horny += 10
-		inhib_exp += rand(1,3)
-		if MiraLoc = 3:npc_rel['A60'] += 5
-		gs 'stat'
-		if CloSkirtShortness = 0 and MiraLoc ! 3:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
-		if CloSkirtShortness > 0 and MiraLoc ! 3:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
-		if MiraLoc = 3:'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforest5.jpg"></center>'
-		gs 'clothing', 'strip', 'gadforest'
-		if MiraLoc ! 3:'You do not hesitate and quickly get undressed, leaving your clothes in a pile on the forest floor.'
-		if MiraLoc = 3:'Seeing that the resistance stopped, Mira quickly began to undress you, leaving your clothes in a pile on the forest floor.'
-
-		act'Further':gt 'gadforest','1'
+	if inhib > 50:
+		act'Give in to the temptation':
+			cla
+			*clr
+			minut+=5
+			gs 'underwear', 'remove'
+			pcs_horny += 10
+			inhib_exp += rand(1,3)
+			if MiraLoc = 3:npc_rel['A60'] += 5
+			gs 'stat'
+			if CloSkirtShortness = 0 and MiraLoc ! 3:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
+			if CloSkirtShortness > 0 and MiraLoc ! 3:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
+			if MiraLoc = 3:'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforest5.jpg"></center>'
+			gs 'clothing', 'strip', 'gadforest'
+			if MiraLoc ! 3:'You do not hesitate and quickly get undressed, leaving your clothes in a pile on the forest floor.'
+			if MiraLoc = 3:'Seeing that the resistance stopped, Mira quickly began to undress you, leaving your clothes in a pile on the forest floor.'
+
+			act'Further':gt 'gadforest','1'
+		end
 	end
 
 	act 'Resist the temptation':

+ 1 - 1
locations/gadriver.qsrc

@@ -184,7 +184,7 @@ if $ARGS[0] = 'Gadbitch':
 
 	if temper >= 15 and month >= 5 and month <= 9:
 		temp_gr = RAND(0,9)
-		if $clothingworntype ! 'nude':
+		if $clothingworntype ! 'nude' and pcs_inhib > 50:
 			act 'Strip naked':
 				cla
 				minut += 5

+ 70 - 70
locations/gadukino.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = '':
 		gs 'stat'
 		'<center><b><font color = maroon>Mitka Kingpin</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mitka.jpg"></center>'
-		'In the village you are approached by your old friend Mitka.'
+		'While walking through the village, you meet your old friend Mitka who approaches you.'
 
 		act 'Further':gt 'mitka'
 	elseif mitkaday ! daystart and mitka = 1 and hour >= 17 and hour < 20 and mitkarand = 1 and mitkaday ! daystart and npc_QW['A63'] < 13:
@@ -25,7 +25,7 @@ if $ARGS[0] = '':
 		gs 'stat'
 		'<center><b><font color = maroon>Mitka Kingpin</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mitka.jpg"></center>'
-		'In the village you are approached by your old friend Mitka.'
+		'While walking through the village, you meet your old friend Mitka who approaches you.'
 
 		act 'Further':gt 'mitka'
 	else
@@ -59,13 +59,13 @@ if $ARGS[0] = '':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/street_winter_night.jpg"></center>'
 			end
 		end
-		'A small village with many rickety wooden houses and even more ruins of houses. This village has seen better times.'
+		'A small village with many rickety wooden houses and even more ruins of houses. This village has certainly seen better times.'
 		if car > 0 and cardrive = 23: '<a href="exec:GS ''carF'',''start''">Your <<$car>></a> is close by.'
 		if StoryLine = 1 :
-			'Nearby are a series of small farms, on one of which <a href="exec:minut += 5 & gt ''Gaddvor''">your grandparents</a> live.'
+			'Nearby there are several small farms, in one of which <a href="exec:minut += 5 & gt ''Gaddvor''">your grandparents</a> live.'
 			act 'Grandparent''s house': minut += 5 & gt 'Gaddvor'
 		else
-			'Nearby are a series of small farms, on one of which <a href="exec:minut += 5 & gt ''Gaddvor''">old couple</a> live.'
+			'Nearby there are several small farms, in one of which <a href="exec:minut += 5 & gt ''Gaddvor''">old couple</a> live.'
 			act 'Old couple''s house': gt 'Gaddvor'
 		end
 		if npc_rel['A60'] > 0: 'Just down the road from your grandparents house is <a href="exec:minut += 5 & gt ''MiroslavaHome'', ''start''">Mira''s</a> house.'
@@ -75,10 +75,10 @@ if $ARGS[0] = '':
 			if hour >= 9 and hour <= 11:
 				'A truck from the city has come to <a href="exec: gt ''gadukino'',''collection_point''">collect</a> mushrooms and berries. Will stay around until noon.'
 			else
-				'Between 9.00 and 12.00, a truck will come to collect mushrooms and berries.'
+				'Between 09:00 and 12:00, there''s a truck waiting to collect mushrooms and berries.'
 			end
 		else
-			'It''s not the right season for mushrooms or berries. The truck which takes them in town won''t come.'
+			'It''s not the right season for mushrooms or berries. The truck which takes them to town won''t come during this season.'
 		end
 
 !MiaLoc tells us where Mira is Located
@@ -161,14 +161,14 @@ if $ARGS[0] = '':
 			end
 		end
 
-		act 'Go to the river':minut += 20 & gt 'gadriver', 'start'
-		act 'Go to forest road':minut += 20 & gt'gadroad'
+		act 'Head to the river':minut += 20 & gt 'gadriver', 'start'
+		act 'Head to forest road':minut += 20 & gt'gadroad'
 !!Succubus active hunting, can only hunt successfully once a day, but can try until success
 		if (hour <= 7 or hour >= 21) and succubusQW = 5 and suchuntday ! daystart:
-			act 'Go Hunting (this can take a lot of time)': suchunt = 1 & gt 'gadukino', 'succubus_hunt'
+			act 'Go on the prowl (this can take a lot of time)': suchunt = 1 & gt 'gadukino', 'succubus_hunt'
 		end
 
-		act 'Go to the highway':minut += 30 & nroad = 10 & dirtyclothes = 0 & gt 'road'
+		act 'Head to the highway':minut += 30 & nroad = 10 & dirtyclothes = 0 & gt 'road'
 	end
 end
 
@@ -176,15 +176,15 @@ if $ARGS[0] = 'succubus_hunt':
 	cla
 	minut += 30
 	*nl
-	'At this hour of the night, the village is only illuminated by the light of the moon. You know this will be to your advantage. No one will be able to see you coming... That is, if there were anyone out at night. You prowl the village looking for prey, but as the minutes pass, your frustration grows.'
+	'At this time of the night, the village is only illuminated by the light of the moon. You know this will be to your advantage. No one will be able to see you coming... That is, if there was anyone out at night. You prowl the village looking for prey, but as the minutes pass, your frustration grows.'
 	if rand(1,100) < 70:
 		minut += 30
 		mood -= 5
 		*nl
-		'God, this place is dull! After searching for an hour, you find no one; not even a stray cat seems to be out and about tonight. You give up reluctantly, pondering how else you are going to feed tonight.'
+		'God, this place is dull! After spending an hour searching, you find no one; not even a stray cat seems to be out and about tonight. You give up reluctantly, pondering how else you are going to feed tonight.'
 		act 'Continue': gt 'gadukino'
 	else
-		'You are getting really antsy to feed, and after finding absolutely no one outside, you decide that breaking into someone''s house, risky as it is, is still better than going hungry.' 
+		'You are getting really anxious to feed, and after finding absolutely nobody outside, you decide that breaking into someone''s house, risky as it is, is still better than starving.' 
 		*nl
 		!Another rand_check here to choose the scene?
 		'You break the lock of the first house you see and go inside. You sneak around the house, looking for a meal, but there''s nobody there. This entire night is a bust... Well, since you''re here, you might as well try and see if there''s any regular food that helps with your hunger, even though you doubt it.' 
@@ -199,14 +199,14 @@ if $ARGS[0] = 'succubus_hunt':
 			gs 'underwear', 'remove'
 			!Just took a guess at where this image might go - Adjust src accordingly
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/succubus/kitchennude.jpg"></center>'
-			'Heavy footsteps echo through the corridor, approaching the kitchen, and with nowhere to hide, you decide to strip instead. You are here to feed, after all, and if he sees you nude, surely he will forget what he is angry about.'
+			'Heavy footsteps echo through the corridor, approaching the kitchen, and with nowhere to hide, you decide to strip instead. You are here to feed, after all, and if he sees you naked, surely he will forget what he is angry about.'
 			'When the man enters the dark kitchen, his first reaction is about what you''d expect: "Who the hell are you!?"'
-			'You give him a good look at your body; according to your plan, that should be enough to calm him down. Unfortunately, he doesn''t seem to be aware of the plan, cause he is having none of it.'
+			'You let him have a good look at your body; according to your plan, that should be enough to calm him down. Unfortunately, he doesn''t seem to care about your plan, because he isn''t behaving like you expected.'
 			'"Have you been eating my food?! Get the hell out of my house!"'
 			*nl
-			'He grabs you and starts dragging you towards the door. You protest and try in vain to seduce him, wondering how anyone could resist your charms like this. Then you remember that you are stronger than him - weird how easily superhuman strength can slip your mind.' 
-			'As soon as you resist his pull, he grinds to a halt, confused by the fact that he can''t move you further. With the tables turned, you grab him and half-drag, half-throw him into his own living room where he lands on his back, stunned by the fact that this woman so easily overpowered him.'
-			'You pull his pants off and, already nude yourself, lower your pussy to his cock. He may have played the angry man, but the fact that it stands at attention soothes your bruised ego - your seduction efforts didn''t go completely unnoticed - and you plunge yourself down on top of him.'
+			'He grabs you and starts dragging you towards the door. You protest and try in vain to seduce him, wondering how anyone could resist your charms like this. Then you remember that you are stronger than him - weird how easily superhuman strength can slip off your mind.' 
+			'As soon as you resist his pull, he grinds to a halt, confused by the fact that he can''t move you further. With the tables turned, you grab him and half-drag, half-throw him into his own living room where he heavily lands on his back, surprised by the fact that this woman so easily overpowered him.'
+			'You pull his pants off and, being already nude yourself, lower your pussy to meet his cock. He may have played the angry man, but the fact that it stands at attention soothes your bruised ego - your seduction efforts didn''t go completely unnoticed - and you plunge yourself down on top of him.'
 			
 			act 'Feed on him':
 				*clr
@@ -233,17 +233,17 @@ if $ARGS[0] = 'succubus_hunt':
 				
 				'You ride him hard, desperate to get your hungry pussy the nourishment it requires.' 
 				if scrand < succublvl:
-					'Your seduction and succubus powers were strong enough to get your victim hard, but they weren''t enough to make him forget about his situation: He is giving you hateful looks, clearly pissed about his door and food and, oh yeah, the fact you are raping him, but you simply ignore that.' 
-					'All you need is his sperm. You could care less about his happiness, and if he wants to complain about a woman like you fucking his brains out, that''s his problem. Just as you''re thinking that, your powers surge and force him to come, unloading his jizz deep into your waiting cunt.' 
+					'Your seduction and succubus powers were strong enough to get your victim hard, but they weren''t enough to make him forget about his situation: He is giving you hateful looks, clearly pissed about his door and food and, what else? oh yeah, the fact you are raping him, but you simply ignore that.' 
+					'All you need is his sperm. You couldn''t care less about his happiness, and if he wants to complain about a woman like you fucking his brains out, that''s his problem. Just as you''re thinking that, your powers surge and force him to come, unloading his jizz deep into your waiting cunt.' 
 					*nl
-					'You don''t know how long you go at it with him exactly, but after coming inside you <<$scxcum>>, and thus making you come too, he runs out of energy and falls unconscious. You lift yourself off of your passed-out plaything and head for the kitchen to collect your clothes as well as one last snack, feeling wonderfully relaxed after getting your fix.' 
+					'You don''t know how long you go at it with him exactly, but after coming inside you <<$scxcum>>, and thus making you come too, he runs out of energy and falls unconscious. You lift yourself off your passed-out plaything and head for the kitchen to collect your clothes as well as one last snack, feeling wonderfully relaxed after getting your "meal".' 
 					'Then you head out the back door, making sure to break the handle on the way out - you''re nothing if not consistent.'
 				else
 					'He was resisting you initially, but after a while, your powers break any resistance he had in him. By the time his first orgasm hits and he shoots his sperm into your needy cunt, he would have betrayed his own mother, much less broken his front door and laid his fridge at your feet, just to be inside you a little longer.'
-					'However unsavory the first few minutes of your meeting, this state of bliss you share with him pushes that memory in the far back of your minds and lets both of you enjoy the hard ride you''re giving him.'
+					'However unsavory the first few minutes of your meeting, this state of bliss you share with him pushes that memory in the far back of your mind and lets both of you enjoy the hard ride you''re giving him.'
 					*nl
-					'You don''t know how long you go at it with him exactly, but after coming inside you <<$scxcum>>, and thus making you come too, he runs out of energy and falls unconscious. You lift yourself off of your passed-out plaything, patting his head affectionately, and head for the kitchen to collect your clothes as well as one last snack, feeling wonderfully relaxed after getting your fix. There''s nothing better than sex with a willing subject.'
-					'Then you head out the back door. For a split second, you consider breaking that door too... but why add insult to injury when he has pleased you so?'
+					'You don''t know how long you go at it with him exactly, but after coming inside you <<$scxcum>>, and thus making you come too, he runs out of energy and falls unconscious. You lift yourself off your passed-out plaything, patting his head affectionately, and head for the kitchen to collect your clothes as well as one last snack, feeling wonderfully relaxed after getting your "meal". There''s nothing better than sex with a willing subject.'
+					'Then you head out the back door. For a split second, you consider breaking that door too... but why add insult to injury when he has pleased you so much?'
 				end
 				killvar 'scfeed' & killvar 'scrand'
 				gs 'stat'
@@ -261,13 +261,13 @@ if $ARGS[0] = '1':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/trail_meadow.jpg"></center>'
 	'Walking around the village you see a small path that leads between neighbor''s houses, the path leads away from the village into a dense thicket...'
 
-	act 'Follow the path to see where it goes':
+	act 'Follow the path to see where it leads':
 		*clr & cla
 		meadow = 1
 		minut += 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_thicket.jpg"></center>'
-		'You follow the path to see where it goes, but about ten minutes later the path disappears into a very dense thicket if bushes and trees.'
+		'You follow the path to see where it leads, but about ten minutes later the path disappears into a very dense thicket of bushes and trees.'
 
 		act 'Look for a way around':
 			*clr & cla
@@ -310,15 +310,15 @@ if $ARGS[0] = '2':
 	if npc_rel['A60'] = 0:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/miroslava.jpg"></center>'
-		'Walking around the village you notice unfamiliar young girl around your own age, she is pulling on a rope attached to the collar on a small calf. The calf grunts with displeasure, shakes her head and refuses to move any further.'
+		'Walking around the village you notice an unfamiliar young girl around your own age, she is pulling on a rope attached to the collar on a small calf. The calf grunts with displeasure, shakes its head and refuses to move any further.'
 		act 'Help':
 			*clr & cla
 			npc_rel['A60'] = 1
 			minut += 15
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mira.jpg"></center>'
-			'You decide to lend a hand to help the girl with the calf. Your lonely in the village, maybe this girl, if you get to know her, could make it seem to the other villagers that you are not a complete stranger in Gadukino. You walk over to the girl and introduce yourself and ask if she wants help. She nods and resumes pulling on the rope, while you walk over behind the calf and give it a load slap on the rump. The calf is surprised and immediately to moves forward away from you. The girl smiles in thanks and tells you her name is Miroslava.'
-			'Together you are able to guide the calf back into its pen. Miroslava turns out to be quite a sociable girl and conversationalist. You learn that her family was recently forced to move to the village from the city. Her father''s huge gambling debts to some questionable men forced him to eventually sell the family''s property in the city to pay them back. Mira is having a rough time adjusting to the life in a small village. She misses the apartment in the center of the city and the money to buy nice dresses and makeup with. After selling everything and paying off the debt, her father was told to leave the city "or else...", so they were destitute and could only afford to buy a house in this seedy dust covered village. You walk with her and chat until you reach her house, which is only a few away from your grandparent''s place. Mira invites you to come and visit her at any time. She is just as bored in the village as you are.'
+			'You decide to lend a hand to the girl with the calf. Your lonely in the village, maybe this girl, if you get to know her, could make it seem to the other villagers that you are not a complete stranger in Gadukino. You walk over to the girl and introduce yourself asking if she needs help. She nods and resumes pulling on the rope, while you walk over behind the calf and give it a loud slap on the rump. The calf is surprised and immediately moves forward, away from you. The girl gives you a thankful smile and tells you her name is Miroslava.'
+			'Together you are able to guide the calf back to its pen. Mira turns out to be quite a sociable girl and a chatterbox. You learn that her family was recently forced to move to the village from the city. Her father''s huge gambling debts to some questionable individuals forced him to eventually sell the family''s property in the city to pay them back. Mira is having a rough time getting used to the life in a small village. She misses the apartment in the center of the city and the money to buy nice dresses and makeup with. After selling everything and paying off the debt, her father was told to leave the city "or else...", so they were broke and could only afford to buy a house in this battered dust covered village. You walk with her and chat until you reach her house, which is only a little away from your grandparent''s place. Mira invites you to come and visit her at any time. She is just as bored in the village as you are.'
 
 			act 'Finish': gt 'gadukino'
 		end
@@ -334,7 +334,7 @@ if $ARGS[0] = '2':
 		else
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mira4.jpg"></center>'
 		end
-		'You meet Miroslava, who is heading to the river to get some water, seeing you she decides to stop and chat with you for a few minutes.'
+		'You meet Mira, who is heading to the river to get some water, seeing you she decides to stop and chat with you for a few minutes.'
 		if npc_QW['A60'] >= 20:
 			act 'You''re feeling naughty':
 				*clr & cla
@@ -348,10 +348,10 @@ if $ARGS[0] = '2':
 						'You ask Mira to show you her pussy. She smiles casually and rests her hands on the bench, giving you a view of her bare pussy. She isn''t wearing any panties.'
 					elseif temp < 25:
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp1.jpg"></center>'
-						'You ask Mira to show you her pussy. She smiles casually and sits down on the fence and slightly spreading his legs, showing you her bare naked pussy. She isn''t waering any panties.'
+						'You ask Mira to show you her pussy. She smiles casually and sits down on the fence and slightly spreading his legs, showing you her bare naked pussy. She isn''t wearing any panties.'
 					else
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp5.jpg"></center>'
-						'You ask Mira to show you her pussy. She smiles casually and getting on her hand and knees on the bench. She quickly glancing around and quickly pulls up her skirt and arched her back, showing you her naked pussy. Hold on a sec, she isn''t wearing any panties'
+						'You ask Mira to show you her pussy. She smiles casually and getting on her hand and knees on the bench. She quickly glances around, quickly pulls up her skirt and arched her back, showing you her naked pussy. Hold on a sec, she isn''t wearing any panties'
 					end
 					gs 'arousal', 'voyeur', 5, 'lesbian'
 					gs 'stat'
@@ -365,7 +365,7 @@ if $ARGS[0] = '2':
 					temp = RAND(0,30)
 					if temp < 5:
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp3.jpg"></center>'
-						'You ask Mira to show you her pussy. She smiles casually and sits down on a nearby fence. Mira glances around and spreads her legs... You are surprised to see, she isn''t wearing panties and gaping pussy is oozing cum. She must have just been fucked.'
+						'You ask Mira to show you her pussy. She smiles casually and sits down on a nearby fence. Mira glances around and spreads her legs... You are surprised to see, she isn''t wearing panties and her gaping pussy is oozing cum. She must have just been fucked.'
 						'"Who did that to you?" you ask her. Mira just smiles devilishly and tells you that it''s a secret.'
 					else
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp4.jpg"></center>'
@@ -389,7 +389,7 @@ if $ARGS[0] = '2':
 		minut += 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/mira2.jpg"></center>'
-		'You meet Miroslava and her little calf. You both pause and start laughing, remembering how you first met.'
+		'You meet Mira and her little calf. You both pause and start laughing, remembering how you first met.'
 
 		act 'Finish': gt 'gadukino'
 	elseif npc_rel['A60'] > 0 and npc_QW['A60'] >= 4 and mirasextimes >= 10 and temper >= 12 and sunWeather = 1 and temp < 7:
@@ -402,10 +402,10 @@ if $ARGS[0] = '2':
 			act 'Watch':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad1.jpg"></center>'
-				'A couple of times you think, she''s about to notice you watching, but she never does, continuing to suck Mitka''s cock. Finally, he tilts his head back and Mira, quickly seeing this takes his dick in hand and directs it into in her mouth, taking a mouth full of sperm. She greedily swallowing it all, and she licks Mitka''s cock clean before tucking it back into his pants. You see she is about to rise from her knees, so you hastily depart.'
+				'A couple of times you think, she''s about to notice you watching, but she never does, continuing to suck Mitka''s cock. Finally, he tilts his head back and Mira, seeing this, quickly takes his dick in her hand directing it towards her mouth, taking a mouth full of sperm. She greedily swallowing it all, and she licks Mitka''s cock clean before tucking it back into his pants. You see she is about to rise from her knees, so you hastily depart.'
 			end
 		else
-			'Until she finally spots you watching her. You see she blushes crimson, but she does not stop sucking, only occasionally shifts her eyes in your direction. You continue to watch as if not seeing anything unusual, as Mira''s head bobs up and down continuing to suck Mitka''s cock. Finally, he tilts his head back and Mira, quickly seeing this takes his dick in hand and directs it into in her mouth, taking a mouth full of sperm. She greedily swallowing it all, and she licks Mitka''s cock clean before tucking it back into his pants. You smile at Mira with the most peaceful of expressions and walk away...'
+			'Until she finally spots you watching her. You see she blushes crimson, but she does not stop sucking, only occasionally shifts her eyes in your direction. You continue to watch as if not seeing anything unusual, while Mira''s head bobs up and down keeping to suck Mitka''s cock. Finally, he tilts his head back and Mira, seeing this, quickly takes his dick in hand directing it towards her mouth, taking a mouth full of sperm. She greedily swallowing it all, and she licks Mitka''s cock clean before tucking it back into his pants. You smile at Mira with the most peaceful of expressions and walk away...'
 		end
 		gs 'arousal', 'voyeur', 5, 'exhibitionism'
 		gs 'stat'
@@ -418,7 +418,7 @@ if $ARGS[0] = '2':
 	elseif npc_rel['A60'] > 0 and npc_QW['A60'] >= 6 and mirasextimes >= 10 and temper < 18 and sunWeather = 1 and temp >= 7:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad2.jpg"></center>'
-		'Walking through the village, you happen to notice Mira fucking Mitka. Mitka slowly grinded his cock deep into Mira''s pussy. You see Mira shudder under him as she climaxed. She moaned and raked his back with her fingernails as she squirted and continued to cum. Mitka increased his pace and started to roughly hammer his cock into her dripping pussy. With his left hand he reached for Mira''s right tit and started to squeeze it without mercy. Mira just grunts and laughs.'
+		'Walking through the village, you happen to notice Mira fucking Mitka. Mitka slowly grinded his cock deep into Mira''s pussy. You see Mira shudder under him as she climaxes. She moans and scratches his back with her fingernails as she squirts and continues to cum. Mitka increases his pace and starts to roughly hammer his cock into her dripping pussy. With his left hand he reached for Mira''s right tit and starts to squeeze it without mercy. Mira just grunts and laughs.'
 		gs 'arousal', 'voyeur', 10, 'exhibitionism'
 		gs 'stat'
 		act 'Watch':
@@ -426,14 +426,14 @@ if $ARGS[0] = '2':
 				*clr & delact 'Watch'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad3.jpg"></center>'
-				'They are so absorbed in fucking each other senseless that they ignoring everything else, so decide to quietly continue to watch. Within a few minutes you see Mitka begin to pick up the pace and he started to drive his cock faster and faster into Mira''s pussy until he grunts like a pig and dumps a huge load of cum into Mira''s pussy which is again squirting. After a few minutes of them just laying together holding each other and gasping for breath, they slowly begin to kiss and laugh as they freshen up. You smile and rub your own dripping snatch before moving away.'
+				'They are so absorbed in fucking each other senseless that they are ignoring everything else, so you decide to quietly continue to watch. Within a few minutes you see Mitka begin to pick up the pace and he starts to drive his cock faster and faster into Mira''s pussy until he grunts like a pig and dumps a huge load of cum into Mira''s pussy which is again squirting. After a few minutes of just laying together holding each other and gasping for breath, they slowly begin to kiss and laugh as they freshen up. You smile and rub your own dripping snatch before moving away.'
 				gs 'arousal', 'voyeur', 10, 'exhibitionism'
 				gs 'stat'
 			else
 				*clr & delact 'Watch'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad3.jpg"></center>'
-				'They are so absorbed in fucking each other senseless that they ignoring everything else, so you decide to quietly continue to watch. You see Mitka pull his cock out of Mira''s dripping pussy and he drives it deep into her ass, barebacked. Mira let''s out a short scream of protest as Mitka continues to drive his cock into her asshole until his pubs rub up against her ass. Mira writhes under his brutal onslaught. After only a few minutes, Mitka starts to slap her ass leaving a bright red mark. Mitka begins to stutter in his thrusts into her ass. Finally, Mitka leans back with his dick still embedded balls deep in Mira''s asshole and lets out a bestial growl as he begins to cum...'
+				'They are so absorbed in fucking each other senseless that they are ignoring everything else, so you decide to quietly continue to watch. You see Mitka pull his cock out of Mira''s dripping pussy and driving it deep into her ass, without any preparation. Mira lets out a short scream of protest as Mitka continues to drive his cock into her asshole until his pubes rub up against her ass. Mira writhes under his brutal onslaught. After only a few minutes, Mitka starts to slap her ass leaving bright red marks on it. Mitka begins to falter in his thrusts into her ass. Finally, Mitka leans back with his dick still embedded balls deep in Mira''s asshole and lets out a bestial growl as he begins to cum...'
 				gs 'arousal', 'voyeur', 5, 'exhibitionism'
 				gs 'stat'
 			end
@@ -446,14 +446,14 @@ if $ARGS[0] = '2':
 	else
 		'<center><h2>Village Gadukino</h2></center>'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/walk.jpg"></center>'
-		'You kill time, walking through the village.'
+		'To kill time, you take a walk through the village.'
 		act 'Leave':gt 'gadukino'
 	end
 end
 
 if $ARGS[0] = '3':
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/miraqw7.jpg"></center>'
-	'Walking through the village, you notice Miroslava, digging in her vegetable garden. She stands with her ass high in the air, and to your amazement, she isn''t wearing panties. You get a good look at her pussy lips...'
+	'Walking through the village, you notice Mira, digging in her vegetable garden. She stands with her ass high in the air, and to your amazement, she isn''t wearing panties. You get a good look at her pussy lips...'
 
 	act 'You approach slowly':
 		*clr & cla
@@ -472,11 +472,12 @@ if $ARGS[0] = '3':
 		elseif npc_QW['A60'] >= 20:
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mira3,<<rand(0,3)>>.jpg"></center>'
 		end
-		'You quietly sneak up to her, but she notices your approach and turns around, her hands pull her skirt back into place, blushing. You stare at her for a few seconds silently, and then ask, "Why don''t you have any panties on?" Miroslava, her eyes darting about, shifting her weight from foot to foot, explaining hesitantly, "Well what happened is, well it''s very hot and I thought it would feel better without panties." You interrupt her with an upraised hand as you get an idea for your second wish... You remind her she still owes you wishes and you''re ready to collect your second wish. You tell Mira to sit down. Miroslava reluctantly agrees, and when is finally sitting on the ground, you order her to show you her pussy, you are thinking fast of other punishments for her. Mira grumbles incoherently and glares at you, but eventually sighs and slowly lifts up her skirt, giving you a good look at my crotch.'
+		'You quietly sneak up to her, but she notices your approach and turns around, her hands pull her skirt back into place, blushing. You stare at her for a few seconds silently, and then ask, "Why don''t you have any panties on?" Mira, her eyes darting around, shifting her weight from foot to foot, explains hesitantly, "Well what happened is, well it''s very hot and I thought it would feel better without panties." You interrupt her with an upraised hand as you get an idea for your second wish... You remind her she still owes you wishes and tell you''re ready to collect your second wish.'
+		'You tell Mira to sit down. Mira reluctantly agrees, and when is finally sitting on the ground, you order her to show you her pussy, you are thinking fast of other punishments for her. Mira grumbles incoherently and glares at you, but eventually sighs and slowly lifts up her skirt, giving you a good look at her crotch.'
 		act 'Watch':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mirawish2.jpg"></center>'
-			'You enjoy the view, then snap your fingers as a wicked idea comes to mind for your second wish. Mira says sadly, that she thought you had come up with your second wish. You ask if she is thinking about backing out of granting your wishes, but Mira says no, she will go through with them. You smile wickedly and tell her to follow you.'
+			'You enjoy the view, then snap your fingers as a wicked idea comes to mind for your second wish. Mira says sadly, that she thinks you just came up with your second wish. You ask if she is thinking about backing out of granting your wishes, but Mira says no, she will go through with them. You smile wickedly and tell her to follow you.'
 			gs 'arousal', 'voyeur', 2, 'exhibitionism', 'lesbian', 'dom'
 			gs 'stat'
 
@@ -485,7 +486,7 @@ if $ARGS[0] = '3':
 				minut += 45
 				pcs_dom += RAND(0,2)
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/mirawish2_1.jpg"></center>'
-				'You lead her out to the main road. You tell Miroslava, that she is to pose as a prostitute and attempt to get a customer or two. This is your second wish. You want Mira to become a prostitute and fulfil the desires of anyone who asks for her services. Mira looks shocked but nods that she will do it, Mira looks around the area and seeing the street was quiet, fulfills your desire...'
+				'You lead her out to the main road. You tell Mira, that she is to pose as a prostitute and attempt to get a customer or two. This is your second wish. You want Mira to become a prostitute and fulfill the desires of anyone who asks for her services. Mira looks shocked but nods that she will do it, Mira looks around the area and seeing the street was quiet, fulfills your desire...'
 				gs 'stat'
 
 				act 'Watch her perform a trick...':
@@ -502,7 +503,7 @@ if $ARGS[0] = '3':
 						*clr & cla
 						minut += 10
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/miraprost.jpg"></center>'
-						'You can''t hear what she is saying but after only a few minutes the door opens and Mira steps into the vehicle. It pulls away, but doesn''t go far. You see it pull off the main road and head down a dirt road. Smiling and wanting to see the action, you run into the woods trying to head off the vehicle.'
+						'You can''t hear what she is saying but after only a few minutes the door opens and Mira steps into the vehicle. It pulls away, but doesn''t go far. You see it pull off the main road and head down a dirt road. Smiling and wanting to see the action, you run into the woods trying to head off to the vehicle.'
 						gs 'stat'
 
 						act 'Continue':
@@ -532,7 +533,7 @@ if $ARGS[0] = '3':
 											*clr & cla
 											minut += 10
 											'<center><img <<$set_imgh>> src="images/characters/village/mira/miramoney.jpg"></center>'
-											'Mira walks back towards town counting the money he gave her as she absentmindedly licks the cum as it drips down her face. She smiles at you and shows you the money as you join her.'
+											'Mira walks back towards town counting the money he gave her as she absentmindedly licking the cum as it drips down her face. She smiles at you and shows you the money as you join her.'
 											gs 'arousal', 'end'
 											gs 'stat'
 
@@ -551,7 +552,7 @@ if $ARGS[0] = '3':
 								act 'Continue':
 									*clr & cla
 									'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost2_1.mp4"></video></center>'
-									'Mira and her John jump into the back of the van and you watch as he starts fucking her wet pussy. His hand covers her mouth as she screams in ecstasy. The guy pounds his 20cm cock deep into her pussy. From Mira''s grunts of partial ecstasy, partial pain, you know the John is hitting or entering her cervix.'
+									'Mira and her John jump into the back of the van and you watch as he starts fucking her wet pussy. His hand covers her mouth as she screams in ecstasy. The guy heavily pounds her pussy with his 20cm cock. From Mira''s grunts of a mix of ecstasy and pain, you know the John is reaching or entering her cervix.'
 									gs 'arousal', 'voyeur', 10, 'exhibitionism', 'prostitution'
 									gs 'stat'
 
@@ -566,7 +567,7 @@ if $ARGS[0] = '3':
 											*clr & cla
 											minut += 10
 											'<left><video autoplay loop src="images/locations/gadukino/sex/mira/miracumpump.mp4"></video></left>''<right><video autoplay loop src="images/locations/gadukino/sex/mira/miracumdump.mp4"></video></right>'
-											'After the wild sex, Mira and the John sit in the van and talk for a bit. He gives her a nice wad of cash and she starts walking to the village. Seeing you, she smiles and says thanks.'
+											'After the wild sex, Mira and the John sit in the van and talk for a bit. He gives her a nice wad of cash and she starts walking to the village. Seeing you, she smiles and thanks you.'
 											gs 'arousal', 'end'
 											gs 'stat'
 
@@ -586,7 +587,7 @@ end
 if $ARGS[0] = '4':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad5.jpg"></center>'
-	'Walking through the village, you notice that behind a shed Vasya and Mira are having sex. Mira moans as she rides his cock and it seems as if she''s oblivious to Mira around her. But you''re not sure you can say the same about Vasya... So, you decide not to risk being caught peeking and leave the couple alone.'
+	'Walking through the village, you notice that behind a shed Vasya and Mira are having sex. Mira moans as she rides his cock and it seems as if she''s oblivious to everything around her. But you''re not sure you can say the same about Vasya... So, you decide not to risk being caught peeking and leave the couple alone.'
 	gs 'arousal', 'voyeur', 5, 'exhibitionism'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -597,7 +598,7 @@ end
 if $ARGS[0] = '5':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad6.jpg"></center>'
-	'Walking through the village, you notice that behind a shed Vasya and Mira are having sex. Mira moans as she rides his cock and it seems as if she''s oblivious to Mira around her. But you''re not sure you can say the same about Vasya... So, you decide not to risk being caught peeking and leave the couple alone.'
+	'Walking through the village, you notice that behind a shed Vasya and Mira are having sex. Mira moans as she rides his cock and it seems as if she''s oblivious to everything around her. But you''re not sure you can say the same about Vasya... So, you decide not to risk being caught peeking and leave the couple alone.'
 	gs 'arousal', 'voyeur', 5, 'exhibitionism'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -608,7 +609,7 @@ end
 if $ARGS[0] = '6':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad7.jpg"></center>'
-	'Walking through the village, you notice Kolambu and Mira hiding behind some bushes. She''s squatting before him, passionately smacking her lips on his cock...'
+	'Walking through the village, you notice Kolyamba and Mira hiding behind some bushes. She''s squatting before him, passionately smacking her lips on his cock...'
 	gs 'arousal', 'voyeur', 5, 'exhibitionism'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -619,7 +620,7 @@ end
 if $ARGS[0] = '7':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad8.jpg"></center>'
-	'Walking through the village, you notice behind the bushes Kolambu with Vasya and Mira. That is to see you butt naked on all fours and take turns sucking boys members...'
+	'Walking through the village, you notice Kolyamba with Vasya and Mira behind the bushes. She''s butt naked on all fours and is eagerly sucking off the guys in turn...'
 	gs 'arousal', 'voyeur', 5, 'exhibitionism'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -630,7 +631,7 @@ end
 if $ARGS[0] = '8':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/mirahorny.jpg"></center>'
-	'Walking through the village, you see Mira. She sits on the fence and constantly looking intensely RUB yourself pussy, when no one is watching...'
+	'Walking through the village, you see Mira. She sits on the fence and constantly looking nervously around while intensely playing with her pussy, when no one is watching...'
 	gs 'arousal', 'voyeur', 5, 'exhibitionism'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -641,7 +642,7 @@ end
 if $ARGS[0] = '9':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad9.jpg"></center>'
-	'Walking through the village, you notice Mira behind fences with Kolyamba. She squirms and moans, but dutifully peddles her bare butt Kolyamba, trying to shove in her bottle...'
+	'Walking through the village, you notice Mira trying to hide behind a fence with Kolyamba. She squirms and moans, but dutifully opens her bare ass for Kolyamba as he''s trying to shove a bottle into it...'
 	gs 'arousal', 'voyeur', 5, 'exhibitionism'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -652,7 +653,7 @@ end
 if $ARGS[0] = '10':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasexgad10.jpg"></center>'
-	'Walking through the village, you see Mira, facing Mitka with his pants down and sticking his fingers Cebu anus, shows him prolapsed ass...'
+	'Walking through the village, you spot Mira and Mitka hidden between two buildings. Mira is bent over slightly, baring her ass to him as he probes her hole with his fingers, revealing her prolapsed anus to him.'
 	gs 'arousal', 'voyeur', 5, 'exhibitionism'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -663,7 +664,7 @@ end
 if $ARGS[0] = '11':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasexgad11.jpg"></center>'
-	'Walking through the village, you meet Mira, which corrects the shoes. However, she without panties and with her pussy white thread sticking out of a tampon...'
+	'Walking through the village, you meet Mira, after a while you''ve been chatting she bends over to fix her shoes. You can clearly notice that she''s not wearing any panties, you get a full view of her bare pussy...'
 	gs 'arousal', 'voyeur', 5, 'exhibitionism'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -675,7 +676,7 @@ if $ARGS[0] = '12':
 	*clr & cla
 	minut += 5
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadlol.jpg"></center>'
-	'Walking through the village, you see two grandmas, sawing boards...'
+	'Walking through the village, you see two grandmas, sawing wood, preparing for the winter...'
 	gs 'stat'
 
 	act 'Leave': gt 'gadukino'
@@ -685,7 +686,7 @@ if $ARGS[0] = '13':
 	*clr & cla
 	minut += 5
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadlol1.jpg"></center>'
-	'Walking through the village, you see two thieving grannies, load-bearing boards with dilapidated farm...'
+	'Walking through the village, you see two thieving grannies hastily making their way down the street, having stole bundles of wooden boards from an old run down building.'
 	gs 'stat'
 
 	act 'Leave': gt 'gadukino'
@@ -696,21 +697,21 @@ if $ARGS[0] = '14':
 	minut += 5
 	if temper >= 15:
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadlol3.jpg"></center>'
-		'Walking through the village, you see local elite. They kindly smile in your face, and as soon as you pass by, immediately start whispering among themselves...'
+		'Walking through the village, you come across the elderly gang. As you pass them, they kindly smile at you, but you know as soon as you pass by, they''ll immediately start gossiping among themselves...'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadlol2.jpg"></center>'
-		'Walking through the village, you see local elite. They, as if on command, all together subside and hard where to start looking-to the side, as soon as you approach him...'
+		'Walking through the village, you come across the elderly gang. As soon as you approach them, they all turn their back to you as they all pretentiously look away, not wanting to interact with you...'
 	end
 	gs 'stat'
 
-	act 'Pass by': gt 'gadukino'
+	act 'Continue on': gt 'gadukino'
 end
 
 if $ARGS[0] = '15':
 	*clr & cla
 	minut += 5
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadlol4.jpg"></center>'
-	'Walking through the village, you see the younger generation. They happily smile at you...'
+	'Walking through the village, a group of young boys, looking no older than 13 or 14, are playing in the road. Two of the older boys sit on an old, beat up dirt bike. You''re not even sure it even works, but the kids are having fun playing on it nonetheless.'
 	gs 'stat'
 
 	act 'Leave': gt 'gadukino'
@@ -720,7 +721,7 @@ if $ARGS[0] = '16':
 	*clr & cla
 	'<center><h2>Village Gadukino</h2></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/walk.jpg"></center>'
-	'You kill time, walking through the village.'
+	'Wanting to kill time, you decide on taking a stroll throughout the village.'
 
 	act 'Leave': gt 'gadukino'
 end
@@ -729,29 +730,28 @@ if $ARGS[0] = 'collection_point':
 	*clr & cla
 	minut += 5
 	gs 'stat'
-
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
-	'Mobile procurement vehicle for local mushrooms and berries.'
+	'Parked half way off the road is an old, unmarked truck. The back doors are held open and found inside is usually a farmer looking to buy any mushrooms locals find while out in the nearby woods. Some find it odd that they''re operating out of a truck, but you imagine it''s cheaper to maintain than a shop and it lets them get around to other villages like yours to buy their mushrooms, too.'
 
 	if boletus > 0:
-		act'sell mushrooms':
+		act'Sell your mushrooms':
 			*clr & cla
 			minut += 30
 			money += boletus*150
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
-			'You sale your mushrooms for <b><<boletus*150>></b> rubles.'
+			'You decide to sell your mushrooms for <<boletus*150>> <b>₽</b>.'
 			gs 'stat'
 
 			act'Further':boletus = 0 & gt 'gadukino','collection_point'
 		end
 	end
 	if bilberry > 0:
-		act'sell berries':
+		act'Sell your berries':
 			*clr & cla
 			minut += 30
 			money += bilberry*75
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
-			'You sale your berries for <b><<bilberry*75>></b> rubles.'
+			'You decide to your berries for <<bilberry*75>> <b>₽</b>.'
 			gs 'stat'
 
 			act'Further':bilberry = 0 & gt 'gadukino','collection_point'

+ 1 - 0
locations/gdktoilet.qsrc

@@ -338,6 +338,7 @@ if $ARGS[0] = 'mens':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 if $ARGS[0] = 'mensmast':

+ 145 - 128
locations/gpoli.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = '':
 	if prcptn_lvl > 40 and pcs_know_mward <= 0:
 		'<br><br>You see a sign that reads <a href="exec: minut += 5 & gt ''gpoli'', ''maternity_ward''">"Maternity ward"</a>.'
 	end
-	
+
 	if pcs_ask_mward_help >= 1 and pcs_know_mward <= 0:
 		'<br><br><a href="exec: minut += 5 & gt ''gpoli'', ''reception''">Ask</a> at the reception for help with your breasts.'
 	end
@@ -72,7 +72,7 @@ if $ARGS[0] = '':
 				ginrand = rand(0, 1)
 
 				if Gspravka < 10 and ginrand = 0:
-					'When you clean the floor of the gynecologist''s examination room, he leaves the room to let you do your work in peace. You''re alone now.'
+					'When you clean the floor of the gynaecologist''s examination room, he leaves the room to let you do your work in peace. You''re alone now.'
 
 					if pcs_vag > 0:
 						act 'Forge a referral to give to your mother':
@@ -82,7 +82,7 @@ if $ARGS[0] = '':
 							gs 'stat'
 							'You see a pile of unused referral forms and think to yourself: "I may not be a virgin any more, but Mom doesn''t need to know that!"'
 							'After you make sure no one is in the corridor, you quickly walk to the desk, take one of the empty referral forms and press his stamp onto it. You can do the rest later. You quickly hide it under your clothes and get back to cleaning, after carefully putting everything back the way you found it.'
-							'Later, when you''re cleaning the office of a doctor who you know is not in today, you lock the door for a moment and carefully fill out the form. You take your time, doing your best to mimic your gynecologist''s handwriting. You nod happily and mutter to yourself: "This looks good, Mom will have no clue it''s forged! That''ll get me off the hook for at least one more month..."'
+							'Later, when you''re cleaning the office of a doctor who you know is not in today, you lock the door for a moment and carefully fill out the form. You take your time, doing your best to mimic your gynaecologist''s handwriting. You nod happily and mutter to yourself: "This looks good, Mom will have no clue it''s forged! That''ll get me off the hook for at least one more month..."'
 
 							act 'Finish cleaning':gt 'gpoli'
 						end
@@ -161,7 +161,7 @@ if $ARGS[0] = '':
 		if therapistday ! daystart:
 			act 'Visit the therapist (1:00)': gt 'therapist'
 		end
-		
+
 		if pcs_know_mward > 0:
 			act 'Visit the maternity ward (0:05)': gt 'gpoli', 'maternity_ward'
 		end
@@ -350,14 +350,14 @@ if $ARGS[0] = '':
 		end
 
 		if (pav_slut >= 150 or guy > 10 or unprotfilm or whoreQW > 1 or bordelslutty > 0 or cumcondslip_aware > 0) or lastmens >= 35 and gynodaystart ! daystart:
-			act 'Visit your gynecologist (1,000 <b>₽</b>)':
+			act 'Visit your gynaecologist (1,000 <b>₽</b>)':
 				cls
 				gynodaystart = daystart
 				minut += 5
 				gs 'stat'
 
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_1.jpg"></center>'
-				'You decide to have a check-up with your gynecologist. Given your sexual history, you can''t be too careful.'
+				'You decide to have a check-up with your gynaecologist. Given your sexual history, you can''t be too careful.'
 				if docKnow = 0:
 					if pav_slut >= 150:
 						$gyn1 = 'He looks at you with some concern, but still has to ask: "Rumor in town says that you''re a prostitute?"'
@@ -379,7 +379,7 @@ if $ARGS[0] = '':
 					'You smile at him: "It''s true, dr. Petrovich. I am."'
 					'He rubs his hand over his chin, and continues: "Does your mother know?"'
 					$gyn2
-					'The gynecologist nods, and motions for you to stand up: "Very well, let''s see how you''re doing then. Undress for me, please."'
+					'The gynaecologist nods, and motions for you to stand up: "Very well, let''s see how you''re doing then. Undress for me, please."'
 				elseif docKnow = 1:
 					if pav_slut >= 150 or unprotfilm or whoreQW > 1 or bordelslutty > 0:
 						$gyn1 = 'He looks at you with some concern, asking: "Are you still in the business?"'
@@ -394,21 +394,21 @@ if $ARGS[0] = '':
 					'"Yes, doctor. I am," you tell him.'
 					'He rubs his hand over his chin, and continues: "If I may be so bold... why?"'
 					$gyn2
-					'The gynecologist smirks, but nods: "I understand. It''s not my place to judge, anyway. Let''s see how you''re doing. Undress for me, please."'
+					'The gynaecologist smirks, but nods: "I understand. It''s not my place to judge, anyway. Let''s see how you''re doing. Undress for me, please."'
 				end
 				act 'Take off your clothes':
 					cls
 					minut += 5
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_3.jpg"></center>'
-					'You quickly take off your clothes so your gynecologist can examine you, and neatly fold them before putting them aside.'
+					'You quickly take off your clothes so your gynaecologist can examine you, and neatly fold them before putting them aside.'
 					act 'Sit in the chair':
 						cls
 						minut += 5
 						docKnow = 1
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_4.jpg"></center>'
-						'Once you''re nude, you have a seat in the gynecologist''s chair and spread your legs in the stirrups.'
+						'Once you''re nude, you have a seat in the gynaecologist''s chair and spread your legs in the stirrups.'
 						'For the next few minutes, the doctor gives you a thorough check-up. He spends a bit more time on your asshole than he probably should, but then again - maybe he''s just being thorough.'
 						$gpoli_sick = ''
 						if cumcondslip > 0:
@@ -678,118 +678,120 @@ if $ARGS[0] = '':
 				end
 			end
 		end
+		if StoryLine > 0 and SchoolAtestat = 0 and Gspravka < 3 and motherKnowSpravka = 0:
+			act 'Go to the gynaecologist for a referral': gt 'gpoli', 'referral'
+		end
+	else
+		'The clinic is closed. It''s open every day between 06:00 and 21:00.'
+	end
+end
 
+if $ARGS[0] = 'referral':
 
-		if StoryLine > 0 and SchoolAtestat = 0 and Gspravka < 3 and motherKnowSpravka = 0:
-			act 'Go to the gynecologist for a referral':
-				if pcs_vag = 0:
-					cls
-					minut = minut + 15
-					gs 'stat'
+	if pcs_vag = 0:
+		cls
+		minut = minut + 15
+		gs 'stat'
 
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gin.jpg"></center>'
-					'You quickly undress and climb into the chair, spreading your legs and resting them in the stirrups. The leather-like surface feels strangely warm on your bottom, and it takes you a moment to realize that it is heated. The gynecologist examines your vagina carefully with a speculum, and silently mumbles something to himself.'
-					Gspravka = 30
-					GspravkaT = 1
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gin.jpg"></center>'
+		'You quickly undress and climb into the chair, spreading your legs and resting them in the stirrups. The leather-like surface feels strangely warm on your bottom, and it takes you a moment to realize that it is heated. The gynaecologist examines your vagina carefully with a speculum, and silently mumbles something to himself.'
+		Gspravka = 30
+		GspravkaT = 1
+		Gspassed = 1
 
-					'He confirms that you are still a virgin, and tells you to get dressed again while he prepares your referral. While you put your clothes back on, he fills out the form at his desk and stamps it before handing it to you. This should keep your mother happy for another month...'
-					act 'Leave':gt $curloc
-				end
-				if pcs_vag > 0:
+		'He confirms that you are still a virgin, and tells you to get dressed again while he prepares your referral. While you put your clothes back on, he fills out the form at his desk and stamps it before handing it to you. This should keep your mother happy for another month...'
+		act 'Leave':gt $curloc
+	end
+	if pcs_vag > 0:
+		cls
+		minut += 5
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_1.jpg"></center>'
+		'You''re a bit nervous as you enter the gynaecologist''s office. Your mother expects you to her a referral from him that states you''re still a virgin, except there''s one small problem... you''re not a virgin any more! Maybe you can work something out with him?'
+		if gpoliuborka = 2:
+			'"Hi <<$pcs_nickname>>. What brings you in today?" dr. Petrovich says with a smile.'
+			'"Hello, doctor. It''s time for my monthly check-up again. My mother needs a referral from you to make sure I''m still a virgin," you reply.'
+			'"Ah, yes. For... school, right? Let''s take a look," the doctor replies with a chuckle as you are already on your way to stand by the examination table, like last time.'
+		else
+			'"Hello, young lady. I''m dr. Petrovich. Do you have specific complaints, or are you simply here for a check-up?" the doctor asks as he comes into the examination room.'
+			'"Hello sir. I''m here for my monthly referral. My mother needs one from you to establish I''m still a virgin. It''s for school," you explain.'
+			'"For... school?" he asks, a tad confused. Then he snaps out of it and replies: "Anyway... let''s take a look, shall we?" as he gestures for you to stand next to the examination table.'
+		end
+
+		act 'Have the check-up':
+			cls
+			minut += 5
+			gs 'stat'
+			'The doctor breathes on his stethoscope to warm it up and says: "Lift your shirt, please."'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_2.jpg"></center>'
+			'Lift your shirt? What does that have to do with your virginity?'
+			'He sees your hesitation, and reassures you: "I''m just doing some basic check-ups while you''re here anyway. Now... your shirt, please?"'
+			'That makes sense. You expose your <<$titsize>> breasts to him when you lift your shirt up, and he examines you. You''re no medical professional, but you''re fairly sure he''s not supposed to put the stethoscope on your boob like that! Nevertheless... you need him to give you that referral, and calling him out on it will definitely not help your cause.'
+			'You decide to humour him and just let him play with your boobs for several minutes, after which he nods happily and says: "Everything seems to be in order."'
+			'There is an eager sparkle in his eyes when he looks at your bare breasts. The pervert!'
+			'He continues: "Now get undressed and have a seat in the chair, please. You can put your feet in the stirrups."'
+			act 'Undress':
+				cls
+				minut += 5
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_3.jpg"></center>'
+				'You reluctantly take your clothes off, trying to put off the moment as long as you can. You know he will find out about your secret in a moment. Nevertheless, you don''t have any other option. Maybe you''ll get lucky and he won''t notice?'
+				act 'Sit in the chair':
 					cls
 					minut += 5
 					gs 'stat'
-
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_1.jpg"></center>'
-					'You''re a bit nervous as you enter the gynecologist''s office. Your mother expects you to bring a referral home from him that states you''re still a virgin, except there''s one small problem... you''re not a virgin any more! Maybe you can work something out with him?'
-					if gpoliuborka = 2:
-						'"Hi <<$pcs_nickname>>. What brings you in today?" dr. Petrovich says with a smile.'
-						'"Hello, doctor. It''s time for my monthly check-up again. My mother needs a referral from you to make sure I''m still a virgin," you reply.'
-						'"Ah, yes. For... school, right? Let''s take a look," the doctor replies with a chuckle as you are already on your way to stand by the examination table, like last time.'
-					else
-						'"Hello, young lady. I''m dr. Petrovich. Do you have specific complaints, or are you simply here for a check-up?" the doctor asks as he comes into the examination room.'
-						'"Hello sir. I''m here for my monthly referral. My mother needs one from you to establish I''m still a virgin. It''s for school," you explain.'
-						'"For... school?" he asks, a tad confused. Then he snaps out of it and replies: "Anyway... let''s take a look, shall we?" as he gestures for you to stand next to the examination table.'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_4.jpg"></center>'
+					'Once you''re nude, you have a seat in the gynaecologist''s chair and spread your legs in the stirrups.'
+					'For the next few minutes, the doctor gives you a thorough check-up. He spends a bit more time on your asshole than he probably should, but then again - maybe he''s just being thorough.'
+					$gpoli_sick = ''
+					if preg > 0:
+						knowpreg = 1
+						$gpoli_sick = 'are pregnant'
 					end
-
-					act 'Have the check-up':
-						cls
-						minut += 5
-						gs 'stat'
-						'The doctor breathes on his stethoscope to warm it up and says: "Lift your shirt, please."'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_2.jpg"></center>'
-						'Lift your shirt? What does that have to do with your virginity?'
-						'He sees your hesitation, and reassures you: "I''m just doing some basic check-ups while you''re here anyway. Now... your shirt, please?"'
-						'That makes sense. You expose your <<$titsize>> breasts to him when you lift your shirt up, and he examines you. You''re no medical professional, but you''re fairly sure he''s not supposed to put the stethoscope on your boob like that! Nevertheless... you need him to give you that referral, and calling him out on it will definitely not help your cause.'
-						'You decide to humour him and just let him play with your boobs for several minutes, after which he nods happily and says: "Everything seems to be in order."'
-						'There is an eager sparkle in his eyes when he looks at your bare breasts. The pervert!'
-						'He continues: "Now get undressed and have a seat in the chair, please. You can put your feet in the stirrups."'
-						act 'Undress':
-							cls
-							minut += 5
-							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_3.jpg"></center>'
-							'You reluctantly take your clothes off, trying to put off the moment as long as you can. You know he will find out about your secret in a moment. Nevertheless, you don''t have any other option. Maybe you''ll get lucky and he won''t notice?'
-							act 'Sit in the chair':
-								cls
-								minut += 5
-								gs 'stat'
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_4.jpg"></center>'
-								'Once you''re nude, you have a seat in the gynecologist''s chair and spread your legs in the stirrups.'
-								'For the next few minutes, the doctor gives you a thorough check-up. He spends a bit more time on your asshole than he probably should, but then again - maybe he''s just being thorough.'
-								$gpoli_sick = ''
-								if preg > 0:
-									knowpreg = 1
-									$gpoli_sick = 'are pregnant'
-								end
-								if venera > 0:
-									if $gpoli_sick ! '':$gpoli_sick = $gpoli_sick + ', and you have a sexually transmitted disease'
-									if $gpoli_sick = '':$gpoli_sick = 'have a sexually transmitted disease'
-								end
-								if $gpoli_sick = '':
-									'"Well, you are completely healthy. However, you are also no longer a virgin." At these words you see the corners of his mouth twitch, and you think his trousers look a little tighter in his crotch area. "Please get dressed again while I write out the referral for your mother."'
-									'Your heart begins to race when you hear that, your mother can''t find out! She would kill you if she finds out what you have been up to!'
-									'You quickly blurt: "Wait! Could you please just write down that I''m still a virgin, so I don''t get in trouble? Please?"'
-									'He looks at you sternly and shakes his head: "I''m sorry <<$pcs_nickname>>, I can''t do that, that''s fraud! Do you have any idea how much trouble I could get into?"'
-								else
-									'The doctor frowns when he gives you the results: "I''m afraid I have some bad news, <<$pcs_nickname>>. You <<$gpoli_sick>>. You''re also not a virgin any more, obviously."'
-									'Your heart begins to race when you hear that, that''s terrible! Your mother would kill you if she finds out what you have been up to!'
-									'You quickly blurt: "Wait! Could you please just write down that I''m still a virgin, so I don''t get in trouble? Please?"'
-									'He looks at you sternly and shakes his head: "I''m sorry <<$pcs_nickname>>, but you are not an adult. I need her permission to treat you. And I can''t lie on a referral... that''s fraud! Do you have any idea how much trouble I could get into?"'
-								end
-								act 'Offer him money':gt 'gpoli', 'spravka_money'
-								act 'Try to negotiate':gt 'gpoli', 'spravka_arrange'
-								act 'Just accept the referral as is':gt 'gpoli', 'badend'
-							end
-						end
+					if venera > 0:
+						if $gpoli_sick ! '':$gpoli_sick = $gpoli_sick + ', and you have a sexually transmitted disease'
+						if $gpoli_sick = '':$gpoli_sick = 'have a sexually transmitted disease'
 					end
-					act 'Admit you''re no virgin':
-						cls
-						minut += 5
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_1.jpg"></center>'
-						if gpoliuborka = 2:
-							'You pause for a second, and then decide to just confess. He was going to find out anyway during the examination.'
-							'Hesitantly you say: "Mister Petrovich, I have something to ask of you. You see, I... I''m no longer a virgin."'
-							'He nods understandingly: "I see." That''s probably not the first time one of his patients told him that.'
-							'You continue: "But... my mom thinks I''m still a virgin, and I would really like to keep it that way. Could you please help me?"'
-							'He looks puzzled for a second, and his eyes widen when he realizes what you''re asking of him: "You mean... fake your referral? That''s fraud! Do you have any idea how much trouble I could end up in if I do that?"'
-						else
-							'You pause for a second, and then decide to just confess. He was going to find out anyway during the examination.'
-							'Hesitantly you say: "Mister Petrovich, I have something to ask of you. You see, I... I''m no longer a virgin."'
-							'He nods understandingly: "I see." That''s probably not the first time one of his patients told him that.'
-							'You continue: "But... my mom thinks I''m still a virgin, and I would really like to keep it that way. Could you please help me?"'
-							'He nods again and says: "I see what you''re getting at. I might be able to help you, but I''m running a big risk by doing that. What''s in it for me?"'
-						end
-						act 'Offer him money':gt 'gpoli', 'spravka_money'
-						act 'Try to negotiate':gt 'gpoli', 'spravka_arrange'
-						act 'Just accept the referral as is':gt 'gpoli', 'badend'
+					if $gpoli_sick = '':
+						'"Well, you are completely healthy. However, you are also no longer a virgin." At these words you see the corners of his mouth twitch, and you think his trousers look a little tighter in his crotch area. "Please get dressed again while I write out the referral for your mother."'
+						'Your heart begins to race when you hear that, your mother can''t find out! She would kill you if she finds out what you have been up to!'
+						'You quickly blurt: "Wait! Could you please just write down that I''m still a virgin, so I don''t get in trouble? Please?"'
+						'He looks at you sternly and shakes his head: "I''m sorry <<$pcs_nickname>>, I can''t do that, that''s fraud! Do you have any idea how much trouble I could get into?"'
+					else
+						'The doctor frowns when he gives you the results: "I''m afraid I have some bad news, <<$pcs_nickname>>. You <<$gpoli_sick>>. You''re also not a virgin any more, obviously."'
+						'Your heart begins to race when you hear that, that''s terrible! Your mother would kill you if she finds out what you have been up to!'
+						'You quickly blurt: "Wait! Could you please just write down that I''m still a virgin, so I don''t get in trouble? Please?"'
+						'He looks at you sternly and shakes his head: "I''m sorry <<$pcs_nickname>>, but you are not an adult. I need her permission to treat you. And I can''t lie on a referral... that''s fraud! Do you have any idea how much trouble I could get into?"'
 					end
+					act 'Offer him money':gt 'gpoli', 'spravka_money'
+					act 'Try to negotiate':gt 'gpoli', 'spravka_arrange'
+					act 'Just accept the referral as is':gt 'gpoli', 'badend'
 				end
 			end
 		end
-	else
-		'The clinic is closed. It''s open every day between 06:00 and 21:00.'
+		act 'Admit you''re no virgin':
+			cls
+			minut += 5
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_1.jpg"></center>'
+			if gpoliuborka = 2:
+				'You pause for a second, and then decide to just confess. He was going to find out anyway during the examination.'
+				'Hesitantly you say: "Mister Petrovich, I have something to ask of you. You see, I... I''m no longer a virgin."'
+				'He nods understandingly: "I see." That''s probably not the first time one of his patients told him that.'
+				'You continue: "But... my mom thinks I''m still a virgin, and I would really like to keep it that way. Could you please help me?"'
+				'He looks puzzled for a second, and his eyes widen when he realizes what you''re asking of him: "You mean... fake your referral? That''s fraud! Do you have any idea how much trouble I could end up in if I do that?"'
+			else
+				'You pause for a second, and then decide to just confess. He was going to find out anyway during the examination.'
+				'Hesitantly you say: "Mister Petrovich, I have something to ask of you. You see, I... I''m no longer a virgin."'
+				'He nods understandingly: "I see." That''s probably not the first time one of his patients told him that.'
+				'You continue: "But... my mom thinks I''m still a virgin, and I would really like to keep it that way. Could you please help me?"'
+				'He nods again and says: "I see what you''re getting at. I might be able to help you, but I''m running a big risk by doing that. What''s in it for me?"'
+			end
+			act 'Offer him money':gt 'gpoli', 'spravka_money'
+			act 'Try to negotiate':gt 'gpoli', 'spravka_arrange'
+			act 'Just accept the referral as is':gt 'gpoli', 'badend'
+		end
 	end
 end
 
@@ -843,9 +845,15 @@ if $ARGS[0] = 'badend':
 	gs 'stat'
 	Gspravka = 30
 	GspravkaT = 2
-	'You sigh, understanding that there''s nothing you can (or would be willing to) do to change his mind. Your gynecologist takes an empty form from the pile and fills it out, stating that you are not a virgin. He presses his stamp onto it and offers it to you with a disappointed look in his eyes.'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gin.jpg"></center>'
+	*nl
+	'You sigh, understanding that there''s nothing you can (or would be willing to) do to change his mind. Your gynaecologist takes an empty form from the pile and fills it out, stating that you are not a virgin. He presses his stamp onto it and offers it to you with a disappointed look in his eyes.'
 	'Dejectedly, you take it from him and get ready to leave. How are you going to tell your mother?'
-	act 'Leave':gt 'gpoli'
+	if $loc = 'kuhrPar':
+		act 'leave': gt 'mother', 'referral'
+	else
+		act 'Leave':gt 'gpoli'
+	end
 end
 
 if $ARGS[0] = 'spravka_arrange':
@@ -871,6 +879,7 @@ if $ARGS[0] = 'spravka_arrange':
 			cls
 			Gspravka = 30
 			GspravkaT = 1
+			Gspassed = 1
 			gs 'stat'
 			'This is your chance! You quickly grab a nearly filled out form from his desk and run out of his examination room. Dr. Petrovich pulls up his pants again but doesn''t even follow you, knowing this would be way too awkward to explain to anyone else in the clinic. Looks like you win this one!'
 			'A while later, you fill out the rest of the form and nod to yourself as you think: "This should get Mom off my back for another month..."'
@@ -1004,11 +1013,14 @@ if $ARGS[0] = 'spravka_arrange':
 											'You feel cheap for a moment, when you accept the referral. Nevertheless, you''re off the hook for another month... that''s worth something, right?'
 											Gspravka = 30
 											GspravkaT = 1
-
+											Gspassed = 1
 											gs 'arousal', 'end'
 											gs 'stat'
-
-											act 'Leave':gt 'gpoli'
+											if $loc = 'kuhrPar':
+												act 'leave': gt 'mother', 'referral'
+											else
+												act 'Leave':gt 'gpoli'
+											end
 										end
 									end
 								end
@@ -1020,8 +1032,10 @@ if $ARGS[0] = 'spravka_arrange':
 		end
 	end
 	act 'You can''t do that':
+		cla
 		'You frown. You really don''t want to have sex with him, sex is what got you into this whole mess in the first place! You try one more time: "I can''t do that doctor. Please, show some compassion... could you give me a break, just this once? I just need some time to figure out how to tell my mom about all this!"'
 		'His gaze is stone cold, without any sign of compassion. He says in an even tone: "So be it. Sorry <<$pcs_nickname>>, but that''s not how it works. I''m running a big enough risk as it is. If you''re not helping me, I''m not helping you."'
+		act 'Try to negotiate': gt 'gpoli', 'spravka_arrange'
 		act 'Just accept the referral as is':gt 'gpoli', 'badend'
 	end
 end
@@ -1044,6 +1058,7 @@ if $ARGS[0] = 'spravka_money':
 				gs 'stat'
 				Gspravka = 30
 				GspravkaT = 1
+				Gspassed = 1
 				'Without giving it much thought, you say: "Deal!"'
 				'It''s not cheap, but this way you get another month to think of a solution before your mother finds out you are not a virgin. Dr. Petrovich takes your money and fills out a form, stating you are a virgin. He stamps it and hands it to you, and you carefully put it in your pocket while thanking him.'
 				act 'Leave':gt 'gpoli'
@@ -1121,7 +1136,11 @@ if $ARGS[0] = 'spravka_arrange_pale':
 			cls
 			gs 'stat'
 			'In a panic, you grab your clothes and run out of the office. You know you can''t talk about this with anyone... if you say anything, dr. Petrovich would tell your mom about your addiction. You quickly get dressed again in an empty examination room, wondering how you''re going to get out of this mess now.'
-			act 'Leave':gt 'gpoli'
+			if $loc = 'kuhrPar':
+				act 'leave': gt 'mother', 'referral'
+			else
+				act 'Leave':gt 'gpoli'
+			end
 		end
 	end
 	act 'Do what you have to do':
@@ -1255,7 +1274,6 @@ if $ARGS[0] = 'spravka_arrange_pale':
 
 											gs 'arousal', 'end'
 											gs 'stat'
-
 											act 'Leave':gt 'gpoli'
 										end
 									end
@@ -1307,7 +1325,7 @@ if $ARGS[0] = 'maternity_ward':
 						if lactatemv > lactatemm*8/10:
 							'The nurse looks surprised at your engorged breasts'
 							'Nurse: Oh dear! These look painfully full. I hope the pumping will make you feel better.'
-						end					
+						end
 						if pain['nipples'] >= 60:
 							'<center><img <<$set_imgh>> src="images/pc/body/nipples/sore_nipples.jpg"></center>'
 							'The nurse looks at your sore nipples and frowns a bit. She then grabs a small tin, and takes a bit more of the yellowish cream from the tin.'
@@ -1346,9 +1364,9 @@ if $ARGS[0] = 'maternity_ward':
 					act 'Leave': gt 'gpoli', 'maternity_ward'
 				end
 				!!act 'Mammography (1:00)':
-				!!	
+				!!
 				!!end
-				act 'Leave': gt 'gpoli', 'maternity_ward'			
+				act 'Leave': gt 'gpoli', 'maternity_ward'
 			end
 		end
 		if lactate > 0 and lactatemv > lactatemm/8 and pcs_gpolimilkdonation <= 2:
@@ -1484,13 +1502,13 @@ if $ARGS[0] = 'maternity_ward':
 								else
 									mward_donatess = rand(45, 69)
 								end
-								act 'Leave':gt 'gpoli'								
+								act 'Leave':gt 'gpoli'
 							end
 							act 'deny to donate':
 								*clr
 								cla
 								'You deny to donate your breast milk. The nurse looks sad at you and let you leave.'
-								act 'Leave':gt 'gpoli'							
+								act 'Leave':gt 'gpoli'
 							end
 						else
 							pcs_gpolimilkdonation = 2
@@ -1570,15 +1588,15 @@ if $ARGS[0] = 'maternity_ward':
 								else
 									mward_donatess = rand(45, 69)
 								end
-								act 'Leave':gt 'gpoli'								
+								act 'Leave':gt 'gpoli'
 							end
 							act 'deny to donate':
 								*clr
 								cla
 								'You deny to donate your breast milk. The nurse looks sad at you and let you leave.'
-								act 'Leave':gt 'gpoli'							
+								act 'Leave':gt 'gpoli'
 							end
-						end						
+						end
 					end
 				elseif pcs_gpolimilkdonation = 2:
 					act 'Offer to donate your breast milk (0:15)':
@@ -1657,8 +1675,8 @@ if $ARGS[0] = 'maternity_ward':
 							mward_donatess = rand(0,45)
 						else
 							mward_donatess = rand(45, 69)
-						end							
-						act 'Leave':gt 'gpoli'				
+						end
+						act 'Leave':gt 'gpoli'
 					end
 				end
 				act 'Leave':gt 'gpoli'
@@ -1683,7 +1701,7 @@ if $ARGS[0] = 'reception':
 	act 'Leave': gt 'gpoli'
 end
 
-if $ARGS[0] = 'maternity_ward_donation':	
+if $ARGS[0] = 'maternity_ward_donation':
 	*clr
 	cla
 	gs 'stat'
@@ -1703,7 +1721,6 @@ if $ARGS[0] = 'maternity_ward_donation':
 			breastpumped += 4
 			'After 15 minutes, the nurse detaches the pumps from your breasts.'
 			if milkedvolume > 500:
-				'milked volume = <<milkedvolume/10>>ml'
 				temp_var = milkedvolume/500
 				pcs_gpoli_donationsessioncount += temp_var
 				pcs_gpoli_totalmilkdonation_count += 1

+ 1 - 0
locations/gschool_grounds.qsrc

@@ -628,6 +628,7 @@ if $ARGS[0] = 'change_room':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 
 	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
 

+ 1 - 1
locations/gschool_lunch.qsrc

@@ -428,7 +428,7 @@ if $ARGS[0] = 'events':
 	elseif (Anush_lunch > 0 or grupTipe = 4) and rand(0, 5) = 0:
 		pcs_horny += 20
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/school/want.jpg"></center>'
-		'As you are leaving the canteen, Anushka grabs you and pushes you up against the wall. She starts kissing you passionately, while one of her hands slides up your skirt and starts rubbing at your clit. You can hear several of your fellow classmates whistling, hooting and hollering, but right now you don''t really care. She breaks the kiss just long enough to moan into your ear. "I want to fuck you, come with me." , her fingers sliding up into your pussy as she says it.'
+		'As you are leaving the canteen, Anushka grabs you and pushes you up against the wall. She starts kissing you passionately, while one of her hands slides up your skirt and starts rubbing at your clit. You can hear several of your fellow classmates whistling, hooting and hollering, but right now you don''t really care. She breaks the kiss just long enough to moan into your ear. "I want to fuck you, come with me," her fingers sliding up into your pussy as she says it.'
 		act 'Not today':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nomake.jpg"></center>'

+ 13 - 6
locations/gskver.qsrc

@@ -113,17 +113,24 @@ if $ARGS[0] = 'start':
 
 	act 'Go for a walk (0:15)':
 		if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1', 1
-		cla
-		*clr
-		minut += 15
-		place = 1
-		Frend_num = 0
+		
+		if StoryLine = 1 and SchoolAtestat = 0 and mey_vika['mey_vika_qw'] = 0 and rand(1,4) = 1:
+			gs 'mey_vika_events', 'park_meet'
+			gs 'stat'
+			if mey_vika['qw_day'] = daystart: delact 'Looking for Vika'
+		else
+			cla
+			*clr
+			minut += 15
+			place = 1
+			Frend_num = 0
 			if MagikDostup ! 1:
 				if rand (1, 4) <= pcs_magik and (hour <=6 or hour >=19):
 					gt 'MagEncounterFairy'
 				end
 			end
-		gt 'placer'
+			gt 'placer'
+		end		
 	end
 
 	if hour >= 8 and hour < 22:

+ 29 - 28
locations/igorhome.qsrc

@@ -32,9 +32,9 @@ if $ARGS[0] = 'entrance':
 	elseif IgorLove <= 0:
 		IgorLoverQW = -1
 		if month > 8 or month < 4:
-			'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/school/walk_homew'+ rand(1,2) +'.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_homew'+ rand(1,2) +'.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/school/walk_home'+ rand(1,3) +'.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_home'+ rand(1,3) +'.jpg"></center>'
 		end
 		'As you walk towards Igor''s house, he starts having second thoughts "<<$pcs_firstname>>, you know I love you very much, but we don''t know each other well enough, so I''m wondering if we should let it be."'
 		act 'Leave': gt 'pavResidential'
@@ -46,7 +46,7 @@ if $ARGS[0] = 'entrance':
 !!			cls
 !!			minut += 15
 !!			gs 'stat'
-!!			'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/school/walk_homeb1.jpg"></center>'
+!!			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_homeb1.jpg"></center>'
 !!			'You follow Igor home. Once you get to his place, he unlocks the door and invites you in.'
 !!			act 'Walk around his home': gt 'igorhome','hallway'
 !!			act 'Go to his room': gt 'igorhome', 'igorroom'
@@ -61,7 +61,7 @@ if $ARGS[0] = 'hallway':
 	killvar '$locclass'
 	gs 'stat'
 	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
-	'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/resident/igorhome/kor.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/kor.jpg"></center>'
 	'This is the entrance hall to Igor''s house, it is tastefully decorated. It leads to all the other rooms in the house.'
 	act 'Igor''s Room': gt 'igorhome','igorroom'
 	act 'Bathroom': gt 'igorhome','bathroom'
@@ -83,12 +83,12 @@ if $ARGS[0] = 'bathroom':
 	gs 'stat'
 	$location_type = 'bathroom'
 	'<center><h4><font color="maroon">Bathroom</font></h4></center>'
-	'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/resident/igorhome/vann.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/vann.jpg"></center>'
 	'The bathroom has a large sink area and tile floors. The toilet sits along the far wall. There is also a walk-in shower and bath tub. It all looks very nice.'
 	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink.'
 	*nl
 
-    if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
+	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
 
 	act 'Take a shower':
 		cls
@@ -103,8 +103,9 @@ if $ARGS[0] = 'bathroom':
 	dynamic $bath
 	gs 'din_van', 'prvt_pee'
 	dynamic $bteeth
-    dynamic $tampon
-    dynamic $basin
+	dynamic $tampon
+	dynamic $basin
+	dynamic $removepan
 
 	act 'Leave the bathroom': gt 'igorhome','hallway'
 end
@@ -115,7 +116,7 @@ if $ARGS[0] = 'igorroom':
 	$locclass = 'bedr'
 	gs 'stat'
 	'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
-	'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/resident/igorhome/kom.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/kom.jpg"></center>'
 	'The room is surprisingly clean and organized for a boys room. It is fairly tastefully decorated. In the center of the room against one wall is a single narrow bed. Against the opposite wall is a desk and a chair, with a computer sitting on the desk. Next to the desk is a book shelf with a fairly large collection of books, just below the shelves leaning against the wall rests a guitar.'
 !!This one I think is if he is dating Dima, not sure.
 	if DimaLoveIgor > 1:'Sitting on the bed is a Teddy Bear with a red heart in its little hands.'
@@ -128,7 +129,7 @@ if $ARGS[0] = 'igorroom':
 		if IgorloverQW = 1:
 			*clr & cla
 			'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
 			'Igor looks at his watch. "If you stay any later, my mom will come in and make a fuss and talk about how unseemly it is for a boy to have a girl in his room this late."'
 			'You nod to him. "I understand, then I guess I will see you later."'
 			act 'Say goodbye and go home': gt 'pavResidential'
@@ -140,7 +141,7 @@ if $ARGS[0] = 'igorroom':
 		else
 			cls
 			'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
 			'You look at the clock saying that it''s really late and that you need to go home.'
 			act 'Say goodbye and go home': gt 'pavResidential'
 		end
@@ -148,9 +149,9 @@ if $ARGS[0] = 'igorroom':
 		cls
 		'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
 		if IgorloverQW = 1:
-			'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
 		end
 		if week = 5 or week = 6:
 			'Igor looks at his watch and asks you "I want to have fun tonight. Let''s go to the disco!"'
@@ -161,7 +162,7 @@ if $ARGS[0] = 'igorroom':
 			'Igor tells you its getting late, you could take the hint and leave or maybe chat just a little longer.'
 			act 'Take the hint and go home': gt 'pavResidential'
 			act 'Chat just a little longer':gt 'igorhome','Chat'
-		end			
+		end
 	end
 	act 'Leave Igor''s room': gt 'igorhome','hallway'
 end
@@ -172,9 +173,9 @@ if $ARGS[0] = 'Chat':
 	gs 'stat'
 	'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
 	if IgorloverQW = 1:
-		'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
 	end
 	if npcrel['A4'] > 50:
 		i = rand(0,10)
@@ -228,9 +229,9 @@ if $ARGS[0] = 'Chat':
 			cla
 			'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
 			if IgorloverQW = 1:
-				'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
 			else
-				'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
 			end
 			'Igor asks you, "<<$pcs_nickname>> lets go see a movie, my treat."'
 			act 'Agree': gt 'IgorEv', 'Movies'
@@ -239,9 +240,9 @@ if $ARGS[0] = 'Chat':
 				cla
 				'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
 				if IgorloverQW = 1:
-					'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
 				else
-					'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
 				end
 				'You shake your head no. "I would rather just stay here." He nods and smiles.'
 				act 'Continue': gt 'IgorHome', 'Chat'
@@ -269,7 +270,7 @@ if $ARGS[0] = 'study':
 	cls
 	gs 'stat'
 	'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
-	'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/study.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/study.jpg"></center>'
 	'You sit down next to Igor and he pulls out his history book and notes. He starts tutoring you in history, he is very good tutor and your learn a lot.'
 	act 'Study More':gt 'igorhome','study'
 	act 'Chat':gt 'igorhome','Chat'
@@ -727,13 +728,13 @@ if $ARGS[0] = 'livingroom4':
 end
 
 if $ARGS[0] = 'kitchen':
-    *clr & cla
-    minut += 1
+	*clr & cla
+	minut += 1
 	$locclass = 'kitr'
-    gs 'stat'
-    '<center><b><font color = maroon>Kitchen</font></b></center>'
-    '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/kitchen.jpg"></center>'
-    'The room is very clean and neat. Everything is perfectly in place, the counters are polished to a near mirror like quality. The wood floor is also highly polished.'
+	gs 'stat'
+	'<center><b><font color = maroon>Kitchen</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/kitchen.jpg"></center>'
+	'The room is very clean and neat. Everything is perfectly in place, the counters are polished to a near mirror like quality. The wood floor is also highly polished.'
 !!this is a elseif, if it is 06:00 to 07:00 igors mother is here, or if it is 18:00 to 23:00 she is here during the week. On weekends she is here from 08:00 to 23:00
 	if (week <=5 and (hour = 6 or (hour >= 18 and hour < 23))) or (week > 5 and hour >= 8 and hour < 23):
 		'You see Igor''s mother Inga is in the kitchen drinking tea. She is very neatly dressed, you don''t think she has noticed you yet.'
@@ -1129,7 +1130,7 @@ end
 
 !!new scene for going to Igors house with out following him from school.
 if $ARGS[0] = 'home':
-	'<center><img <<$set_imgh>>  src="images/locations/pavlovsk/resident/igorhome/house.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/house.jpg"></center>'
 	'You walk up to the front door and knock.'
 !!This will have a lot of if's and elseif's.
 	if SchoolAtestat = 1 and kanikuli > 0:

+ 1 - 0
locations/kafe2.qsrc

@@ -48,6 +48,7 @@ if $ARGS[0] = 'toilet':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 if $ARGS[0] = 'givi':

+ 1 - 0
locations/koncepod1.qsrc

@@ -118,6 +118,7 @@ if $ARGS[0] = 'vnr2x':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 if $ARGS[0]='bdr2x':

+ 291 - 22
locations/lact_lib.qsrc

@@ -105,7 +105,7 @@ end
 
 if $ARGS[0] = '$get_breastmilk_time':
 	!!	func('lact_lib','$get_breastmilk_time', sucktion_type, milk_demand)
-	!!	ARGS[1] = sucktion_type: the type of sucktion. adult_mouth [0], child_mouth [1], baby_mouth [2], manual_breastpump [3] , electric_breastpump [4], hand_expressing [5], cow milker [6]
+	!!	ARGS[1] = sucktion_type: the type of sucktion. adult_mouth [0], child_mouth [1], baby_mouth [2], manual_breastpump [3] , electric_breastpump [4], hand_expressing [5], cow milker [6], weak baby_mouth [7]
 	!!	ARGS[2] = milk_demand: how much milk is demanded. Warning: Should be ml and not in ml*10 for ease of use. :D
 	!!	RESULT = Time in Minutes
 	!!	Usage: breastmilktimetoget = func('lact_lib','$get_breastmilk_time', 2, 150)
@@ -134,6 +134,15 @@ if $ARGS[0] = '$get_breastmilk_time':
 		elseif ARGS[1] = 6:
 			!!	'cow milker sucking'
 			suck_flow_rate = 1000
+		elseif ARGS[1] = 7:
+			!!	'weak baby sucking'
+			suck_flow_rate = 50
+			temp_var = pcs_mood + ARGS[2]
+			if temp_var > 100:
+				pcs_mood = 100
+			else
+				pcs_mood += ARGS[2]
+			end
 		else
 			!!	'suck flow else branch'
 			suck_flow_rate = 100
@@ -228,7 +237,7 @@ end
 
 if $ARGS[0] = '$get_breastmilk':
 	!!	func('lact_lib','$get_breastmilk', sucktion_type, sucktion_time)
-	!!	ARGS[1] = sucktion_type: the type of sucktion. adult_mouth [0], child_mouth [1], baby_mouth [2], manual_breastpump [3] , electric_breastpump [4], hand_expressing [5], cow milker [6]
+	!!	ARGS[1] = sucktion_type: the type of sucktion. adult_mouth [0], child_mouth [1], baby_mouth [2], manual_breastpump [3] , electric_breastpump [4], hand_expressing [5], cow milker [6], weak baby_mouth [7]
 	!!	ARGS[2] = sucktion_time: how many minutes the sucking/pumping takes place
 	!!	Usage: breastmilkvolume = func('lact_lib','$get_breastmilk', 4, 20)
 	!! 	RESULT = Milk in ml*10
@@ -275,6 +284,15 @@ if $ARGS[0] = '$get_breastmilk':
 	elseif ARGS[1] = 6:
 		!!	'cow milker sucking'
 		suck_flow_rate = 1000
+	elseif ARGS[1] = 7:
+		!!	'weak baby sucking'
+		suck_flow_rate = 50
+		temp_var = pcs_mood + ARGS[2]
+		if temp_var > 100:
+			pcs_mood = 100
+		else
+			pcs_mood += ARGS[2]
+		end
 	else
 		!!	'suck flow else branch'
 		suck_flow_rate = 100
@@ -500,11 +518,18 @@ if $ARGS[0] = 'bp_milking':
 	pumptype = 0
 	if pump_bottletype < 1500: pump_bottletype = 1500
 	if bpbottles <= 0: bpbottles = 1
-	if $location_type ! 'bathroom' and pcs_exhibition < 60:
+	if $location_type ! 'bathroom' and pcs_inhib < 40:
 		'You can''t use it here.'
+			act 'Finish': gt $loc, $metka
+	elseif bp_unbox <= 0:
+		'You need to unbox your breast pump first.'
+			act 'Finish': gt $loc, $metka
+	elseif bp_unbox = 1 and ($location_type = 'bathroom' or $location_type = 'private'):
+		gt 'lact_lib', 'bp_unbox_event'
 	else
 		*clr
 		cla
+		'<center><img <<$set_imgh>> src="images/pc/body/tits/breast_pump.jpg"></center>'
 		'How long do you want to pump your breasts with the manual breast pump?'
 		if bpbottlem > 0:
 			if pump_bottletype = 1500:
@@ -513,7 +538,6 @@ if $ARGS[0] = 'bp_milking':
 				'Current bottle size in use <a href="exec:pump_bottletype = 1500 & gt ''lact_lib'', ''bp_milking''">150ml</a> | &gt;250ml'
 			end
 		end
-		'<center><img <<$set_imgh>> src="images/pc/body/tits/breast_pump.jpg"></center>'
 		if lactatemv > 0:
 			pumptime = (func('lact_lib','$get_breastmilk_time', 3, (lactatemv/10)))
 			if pumptime > 5:
@@ -574,28 +598,253 @@ if $ARGS[0] = 'bp_milking':
 				gt 'lact_lib', 'milking'
 			end
 		end
+		act 'Massage your breasts':	gt 'lact_lib','man_milking'
 		act 'Don''t pump':gt $loc, $metka
 	end
 end
 
 !!	man_milking - manual (with hands) milking
 !!	use href="exec:gt ''lact_lib'',''man_milking''"
-!!	Warning! Protoype function! Don not make changes to this function as it is not used yet!
+!!	for manual milk expression in bathrooms etc. please use this function.
 if $ARGS[0] = 'man_milking':
 	pumptime = 0
-	pumptype = 1
-	if $location_type ! 'bathroom' and pcs_inhib < 60:
+	if pcs_inhib < 40:
+		*clr
+		cla
 		'You can''t do this here.'
+			act 'Finish': gt $loc, $metka
 	else
 		*clr
 		cla
-		pumptime = input ("How long would you like to milk your breasts? (Not more than 60 minutes)")
-		if pumptime <= 0 or pumptime > 60:
-			minut += 2
-			act 'Don''t milk':gt $loc, $metka
-		elseif pumptime > 0 and pumptime <= 60:
-			gt 'lact_lib', 'milking'
+		'How long do you want to massage your breasts?'
+		if lactatemv > 0:
+			pumptime = (func('lact_lib','$get_breastmilk_time', 5, (lactatemv/10)))
+			if pumptime > 60:
+				act 'Express until breasts are empty':
+					*clr
+					cla
+					minut += 2
+					'You prepare yourself and weight your breasts in your hands. You feel that your breasts carry a large amount of milk and manually expressing it will probably take a long time.'
+					'Getting relieve for your breasts with manual expression will probably take at least <<pumptime>> minutes.'
+					if breastpump <= 0 and bp_unbox <= 1:
+						'You should concider buying a breastpump'
+					elseif breastpump = 1 and bp_unbox <= 1 and pain['nipples'] <= 60:
+						'You should concider using your breastpump.'
+					else
+						'You should concider the use of a breastpump.'
+					end
+					'Do you want to continue?'
+					act 'Don''t express':gt $loc, $metka
+					act 'Express your milk':
+						gt 'lact_lib', 'hand_milking'
+					end
+				end
+			elseif pumptime <= 0:
+				act 'Express milk until breasts are empty':
+					*clr
+					cla
+					minute += 2
+					'As you prepare yourself you feel your breasts in your hands. Your breasts feel really empty. There is no need to express now.'
+					act 'Don''t express milk':gt $loc, $metka
+					act 'back':gt 'lact_lib', 'man_milking'
+				end
+			else
+				act 'Express until breasts are empty':
+					pumptime = func('lact_lib','$get_breastmilk_time', 5, (lactatemv/10))
+					gt 'lact_lib', 'hand_milking'
+				end
+			end
+		end
+		act '5 Minutes':
+			pumptime = 5
+			gt 'lact_lib', 'hand_milking'
+		end
+		act '10 Minutes':
+			pumptime = 10
+			gt 'lact_lib', 'hand_milking'
+		end
+		act 'Custom':
+			pumptime = input ("How long do you plan to massage your breasts? (Not more than 60 minutes)")
+			if pumptime <= 0 or pumptime > 60:
+				minut += 2
+				act 'Don''t express':gt $loc, $metka
+				act 'back':gt 'lact_lib', 'man_milking'
+			elseif pumptime > 0 and pumptime <= 60:
+				gt 'lact_lib', 'hand_milking'
+			end
 		end
+		act 'Don''t express':gt $loc, $metka
+	end
+end
+
+if $ARGS[0] = 'bp_unbox_event':
+	if bp_unbox <= 0:
+		*clr
+		cla
+		minut += 5
+		if $location_type = 'bathroom':
+			'You push down the toilet seat to sit down and slowly start to unbox your newly aquirred breast pump.'
+		elseif $location_type = 'private' and $locclass = 'bedr':
+			'You sit down on your bed and slowly start to unbox your newly aquirred breast pump.'
+		elseif $location_type = 'private':
+			'You sit down and slowly start to unbox your newly aquirred breast pump.'
+		end
+		if kid <= 0 and preg <= 0 and pregtimes <= 0 and pregchem <= 0 and bp_unbox <= 0:
+			'While examining it, you think about why you bought it in the first place. You are not pregnant nor do you have a kid that needs breast milk.'
+			if lactate <= 0:
+				'Your breasts haven''t got any milk in them too, so it seems this pump is a bit useless.'
+			else
+				'At least it can help to get the milk out of your breasts.'
+			end
+		end
+		if $location_type = 'private':
+			'<center><img <<$set_imgh>> src="images/pc/body/tits/pump_unboxing.jpg"></center>'
+		elseif $location_type = 'bathroom':
+			'<center><img <<$set_imgh>> src="images/pc/body/tits/pump_unboxing_bath.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/pc/body/tits/pump_unboxing_bath.jpg"></center>'
+		end
+		if (pcs_inhib > 40 and $location_type = 'private') or $location_type = 'bathroom':
+			act 'Try out how it works':
+				*clr
+				cla
+				'You pull up your top to release your breasts'
+				'<br><center><img <<$set_imgh>> src="images/pc/body/tits/t<<tits>>.jpg"></center><br>'
+				'Your fingers glide around the sucktion cup of the breast pump, while your other hand holds the pump.'
+				'Making sure that no one is around, you lift the breast pump to your left breast. The cold cone feels uncomfortable on your nipple.'
+				milkedvolume = func('lact_lib','$get_breastmilk', 3, 1)
+				minut += 1
+				bp_unbox = 2
+				if lactate > 0 and milkedvolume > 0:
+					if milkedvolume <= 50:
+						'You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the sucktion on your nipple goes away and the nipple retracts.'
+						'With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rythmically squeeze it. The pump starts to draw milk from your breast.'
+						'You go on for a minute and then detach the pump. You collected some milk, but it is just a small puddle in the bottle.'
+						'<br><center><img <<$set_imgh>> src="images/pc/body/tits/pump_milkdrops.jpg"></center>'
+					elseif milkedvolume > 50 and milkedvolume <= 1500:
+						'You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the sucktion on your nipple goes away and the nipple retracts.'
+						'With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rythmically squeeze it. The pump starts to draw milk from your breast.'
+						'You go on for a minute and then detach the pump. You collected <<milkedvolume/10>>ml of your breastmilk.'
+						'<br><center><img <<$set_imgh>> src="images/pc/body/tits/pump_half.jpg"></center>'
+					else
+						'You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the sucktion on your nipple goes away and the nipple retracts.'
+						'With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rythmically squeeze it. The pump starts to draw milk from your breast.'
+						'You go on for a minute and then detach the pump. You easily filed the breast pump bottle with your breast milk just with this little pumping.'
+						'<br><center><img <<$set_imgh>> src="images/pc/body/tits/pump_full.jpg"></center>'
+					end
+					'You nod at the breast pump, thinking it will come in handy.'
+				elseif lactate > 0 and milkedvolume <= 0:
+					'You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the sucktion on your nipple goes away and the nipple retracts.'
+					'With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rythmically squeeze it.'
+					'You go on for a minute and then detach the pump. You collected some milk, but it is just a small puddle in the bottle.'
+					'<br><center><img <<$set_imgh>> src="images/pc/body/tits/pump_milkdrops.jpg"></center>'
+				else
+					'You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the sucktion on your nipple goes away and the nipple retracts.'
+					'With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rythmically squeeze it.'
+					'You go on for a minute and then detach the pump. As expected no milk was collected in the bottle.'
+					'<br><center><img <<$set_imgh>> src="images/pc/body/tits/breast_pump.jpg"></center>'
+				end
+				act 'continue':
+					*clr
+					cla
+					if milkedvolume > 50 and $location_type = 'private':
+						'You look at the milk in the bottle and then around the room. Having no idea what to do with the excess milk, you look at it and suddenly sip it down.'
+						'It is your milk, so it should be okay to drink it.'
+						'<center><img <<$set_imgh>> src="images/pc/body/tits/milk_drink.jpg"></center>'
+						'<center>The milk is still warm from your breasts.</center>'			
+						pcs_health += milkedvolume/400
+						pcs_energy += milkedvolume/500
+						if pcs_hydra >= 100:
+							pcs_hydra += milkedvolume/200
+						else
+							pcs_hydra += milkedvolume/100
+						end
+						minut += ((milkedvolume/1000) + 3)
+						act 'Finish': gt $loc, $metka
+					else
+						'You clean up your pump and cover your breasts again.'
+						act 'Finish': gt $loc, $metka
+					end
+				end
+				bp_unbox = 2
+			end
+		end
+		act 'Don''t try it here':
+			*clr
+			cla
+			'You look around you, not feeling to comfortable to use the breast pump here.'
+			bp_unbox = 1
+			act 'Finish': gt $loc, $metka
+		end
+	elseif bp_unbox = 1:
+		if $location_type = 'private' and pcs_inhib < 40:
+			'You can''t do this here'
+			act 'Finish': gt $loc, $metka
+		else
+			'You pull up your top to release your breasts'
+			'<br><center><img <<$set_imgh>> src="images/pc/body/tits/t<<tits>>.jpg"></center><br>'
+			'Your fingers glide around the sucktion cup of the breast pump, while your other hand holds the pump.'
+			'Making sure that no one is around, you lift the breast pump to your left breast. The cold cone feels uncomfortable on your nipple.'
+			milkedvolume = func('lact_lib','$get_breastmilk', 3, 1)
+			minut += 1
+			bp_unbox = 2
+			if lactate > 0 and milkedvolume > 0:
+				if milkedvolume <= 50:
+					'You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the sucktion on your nipple goes away and the nipple retracts.'
+					'With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rythmically squeeze it. The pump starts to draw milk from your breast.'
+					'You go on for a minute and then detach the pump. You collected some milk, but it is just a small puddle in the bottle.'
+					'<br><center><img <<$set_imgh>> src="images/pc/body/tits/pump_milkdrops.jpg"></center>'
+				elseif milkedvolume > 50 and milkedvolume <= 1500:
+					'You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the sucktion on your nipple goes away and the nipple retracts.'
+					'With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rythmically squeeze it. The pump starts to draw milk from your breast.'
+					'You go on for a minute and then detach the pump. You collected <<milkedvolume/10>>ml of your breastmilk.'
+					'<br><center><img <<$set_imgh>> src="images/pc/body/tits/pump_half.jpg"></center>'
+				else
+					'You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the sucktion on your nipple goes away and the nipple retracts.'
+					'With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rythmically squeeze it. The pump starts to draw milk from your breast.'
+					'You go on for a minute and then detach the pump. You easily filed the breast pump bottle with your breast milk just with this little pumping.'
+					'<br><center><img <<$set_imgh>> src="images/pc/body/tits/pump_full.jpg"></center>'						
+				end
+				'You nod at the breast pump, thinking it will come in handy.'
+			elseif lactate > 0 and milkedvolume <= 0:
+				'You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the sucktion on your nipple goes away and the nipple retracts.'
+				'With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rythmically squeeze it.'
+				'You go on for a minute and then detach the pump. You collected some milk, but it is just a small puddle in the bottle.'
+				'<br><center><img <<$set_imgh>> src="images/pc/body/tits/pump_milkdrops.jpg"></center>'
+			else
+				'You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the sucktion on your nipple goes away and the nipple retracts.'
+				'With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rythmically squeeze it.'
+				'You go on for a minute and then detach the pump. As expected no milk was collected in the bottle.'
+				'<br><center><img <<$set_imgh>> src="images/pc/body/tits/breast_pump.jpg"></center>'					
+			end
+			act 'continue':
+				*clr
+				cla
+				if milkedvolume > 50 and $location_type = 'private':
+					'You look at the milk in the bottle and then around the room. Having no idea what to do with the excess milk, you look at it and suddenly sip it down.'
+					'It is your milk, so it should be okay to drink it.'
+					'<center><img <<$set_imgh>> src="images/pc/body/tits/milk_drink.jpg"></center>'
+					'<center>The milk is still warm from your breasts.</center>'			
+					pcs_health += milkedvolume/400
+					pcs_energy += milkedvolume/500
+					if pcs_hydra >= 100:
+						pcs_hydra += milkedvolume/200
+					else
+						pcs_hydra += milkedvolume/100
+					end
+					minut += ((milkedvolume/1000) + 3)
+					act 'Finish': gt $loc, $metka
+				else
+					'You clean up your pump and cover your breasts again.'
+					act 'Finish': gt $loc, $metka
+				end
+			end
+		end
+	elseif bp_unbox >= 2:
+		*clr
+		cla
+		'You unboxed your breast pump already.'
+		act 'Finish': gt $loc, $metka
 	end
 end
 
@@ -740,7 +989,7 @@ if $ARGS[0] = 'milking':
 		end
 		minut += pumptime
 	elseif lactate = 0 and pain['nipples'] < 60:
-		if rand(1,50) + prolactinlvl >= rand(200,250):
+		if rand(1,50) + prolactinlvl >= rand(200,250) and milkinduceday >= 5:
 			'<center><img <<$set_imgh>> src="images/pc/body/tits/lactate_start.jpg"></center>'
 			'As usual, you attach the pump but after a few pumps white liquid suddenly starts flowing from your nipples.<br>You started lactating!'
 			lactateinduced = 1
@@ -760,12 +1009,12 @@ if $ARGS[0] = 'milking':
 			else
 				'You attach the pump to your nipples and start squeezing the bulb. The vacuum feels good on your nipples.'
 			end
-			if prolactinlvl > 70: 'A few droplets of liquid come out of your nipples but it is not milk.'
+			if prolactinlvl > 100: 'A few droplets of liquid come out of your nipples but it is not milk.'
 			breastcounter += 1
 			if pump_stop_brake = 1:
 				'During pumping your nipples start to hurt extremely. You have to stop after <<pumptime>> minutes, because you couldn''t go on.'
 			end
-			if prolactinlvl > 75:
+			if prolactinlvl > 100:
 				if rand(0,10) > 9:
 					pumpinggrowth += 1
 				end
@@ -793,7 +1042,7 @@ if $ARGS[0] = 'milking':
 				'<center><img <<$set_imgh>> src="images/pc/body/tits/milk_sink.jpg"></center>'
 				'<center>You pour <<milkedvolume/10>>ml of your breast milk into the sink and clean up your breastpump.</center>'
 			end
-			minute += 5
+			minute += ((milkedvolume/1500) + 3)
 			act 'Finish':
 				milkedvolume = 0
 				gt $loc, $metka
@@ -805,13 +1054,15 @@ if $ARGS[0] = 'milking':
 				cla
 				'<center><img <<$set_imgh>> src="images/pc/body/tits/milk_drink.jpg"></center>'
 				'<center>You drink your own breast milk and clean up your breastpump.</center>'
-				'<center>The milk is still warm from your breasts.</center>'
-				if pcs_hydra < 90:
-					pcs_hydra += 10
+				'<center>The milk is still warm from your breasts.</center>'				
+				pcs_health += milkedvolume/400
+				pcs_energy += milkedvolume/500
+				if pcs_hydra >= 100:
+					pcs_hydra += milkedvolume/200
 				else
-					pcs_hydra = 100
+					pcs_hydra += milkedvolume/100
 				end
-				minut += 7
+				minute += ((milkedvolume/1000) + 3)
 				act 'Finish':
 					milkedvolume = 0
 					gt $loc, $metka
@@ -833,5 +1084,23 @@ if $ARGS[0] = 'engorged_morning':
 	act 'Finish':gt $loc, $metka
 end
 
+if $ARGS[0] = 'hand_milking':
+	*clr
+	cla
+	if lactate > 0:
+		'You start to massage your breasts, your fingers gliding down your breasts skin, over the areolas. Your fingers pressing down into the areola, stretching it forwards to your nipple.'
+		'Several small streams of your milk start to jet out of your nipples.'
+		'You go on for <<pumptime>> minutes until you stop. You clean yourself up and everything else that got wet from your milk.<br>'
+		'<center><video autoplay loop src="images/pc/body/tits/bathroom_milking.mp4"></video></center>'
+		milkedvolume = func('lact_lib','$get_breastmilk', 5, pumptime)
+		minut += pumptime
+	else
+		'You start to massage your breasts, your fingers gliding down your breasts skin, over the areolas. Your fingers pressing down into the areola, stretching it forwards to your nipple.'
+		milkedvolume = func('lact_lib','$get_breastmilk', 5, pumptime)
+		minut += pumptime
+	end
+	act 'Finish':gt $loc, $metka
+end
+
 --- lact_lib ---------------------------------
 

+ 1 - 0
locations/laketoilet.qsrc

@@ -36,6 +36,7 @@ if $ARGS[0] = 'main':
 		dynamic $tampon
 		dynamic $quickwash
 		dynamic $basin
+		dynamic $removepan
 	end
 end
 

+ 1 - 0
locations/leonid.qsrc

@@ -862,6 +862,7 @@ if $ARGS[0] = 'toilet':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 --- leonid ---------------------------------

+ 0 - 6
locations/mainQW.qsrc

@@ -49,12 +49,6 @@ act 'Investigate':
 				minut += 30
 				killobj
 
-				if oldobjmenu = 0:
-					gs 'obj_din', 'new'
-				else
-					gs 'obj_din', 'old'
-				end
-
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/lab/event/main1.jpg"></center>'
 				'You undress and lie down on the couch, Tatiana begins to examine you. She dabs you with charms and uses a variety strange looking devices, after half an hour of examination she sighs and tells you to get dressed.'
 				'You get up from the couch and dress and ask Tatiana, "So? Did you learn anything else about me?"'

+ 7 - 7
locations/metro.qsrc

@@ -188,29 +188,29 @@ if $ARGS[0] = 'shop':
 	'<b>What''s it gonna be?</b>'
 	'He shows you a small box filled with red and blue pills. There is about two dozen of each pill inside.'
 	if money >= 1000:
-		'<a href="exec:money - 1000 & mentats_have += 20 & gt ''metro'', ''shop''">Buy neuroboosters</a> 1000 <b>₽</b>'
+		'<a href="exec:money -= 1000 & mentats_have += 20 & gt ''metro'', ''shop''">Buy neuroboosters</a> 1000 <b>₽</b>'
 	else
 		'Buy neuroboosters 1000 <b>₽</b> (You do not have enough money)'
 	end
 	'Uses left: <<mentats_have>>'
 	'A pillbox with 10 orange pills inside, the description is removed from the box.'
-	if money >= 1000:
-		'<a href="exec:money - 500 & steroid_have += 10 & gt ''metro'', ''shop''">Buy steroids</a> 500 <b>₽</b>'
+	if money >= 500:
+		'<a href="exec:money -= 500 & steroid_have += 10 & gt ''metro'', ''shop''">Buy steroids</a> 500 <b>₽</b>'
 	else
 		'Buy steroids 500 <b>₽</b> (You do not have enough money)'
 	end
 	'Uses left: <<steroid_have>>'
 	'Paste tube with two pictures of a woman. In latter one she sports an enormous bust.'
-	if money >= 1000:
-		'<a href="exec:money - 500 & bcream_have += 5 & gt ''metro'', ''shop''">Buy breast cream</a> 500 <b>₽</b>'
+	if money >= 500:
+		'<a href="exec:money -= 500 & bcream_have += 5 & gt ''metro'', ''shop''">Buy breast cream</a> 500 <b>₽</b>'
 	else
 		'Buy breast cream 500 <b>₽</b> (You do not have enough money)'
 	end
 	'Uses left: <<bcream_have>>'
 	if MagikDostup = 0:
 		'Packet of pink chewing gums. There are 10 in one package.'
-		if money >= 1000:
-			'<a href="exec:money - 200 & aphrodisiac_have += 10 & gt ''metro'', ''shop''">Buy aphrodisiacs</a> 200 <b>₽</b>'
+		if money >= 200:
+			'<a href="exec:money -= 200 & aphrodisiac_have += 10 & gt ''metro'', ''shop''">Buy aphrodisiacs</a> 200 <b>₽</b>'
 		else
 			'Buy aphrodisiacs 200 <b>₽</b> (You do not have enough money)'
 		end

+ 2 - 3
locations/mod_setting.qsrc

@@ -33,7 +33,6 @@ if mod_list > 0:
 else
 	'<br>No Mod actived.'
 end
-'<img src="images/system/icon/mod_sample.jpg">'
 '</center>'
 act 'Install new mod':
 	killvar 'mod_info'
@@ -65,8 +64,8 @@ act 'Disable all mods':
 		act 'Continue':goto curloc
 	end
 end
-act 'Return':
-	gt $loc,$metka
+act 'Return to settings index':
+	gs '$menu_setting'
 end
 
 --- mod_setting ---------------------------------

+ 339 - 315
locations/mother.qsrc

@@ -46,12 +46,12 @@ if $ARGS[0] = '':
 
 	!check hair color
 	if hcolfronce=0:
-		hcolmotherremember=pcs_haircol 
+		hcolmotherremember=pcs_haircol
 		hcolfronce=1
 	end
 
 	if hcolmotherremember!pcs_haircol:
-		if pcs_haircol = nathcol: 
+		if pcs_haircol = nathcol:
 			$texthcol = 'Or, rather, un-dyed your hair. Good, you decided to go back to your natural color!'
 		elseif pcs_haircol=0:
 			$texthcol='I see you decided to go back to go with black hair?'
@@ -65,7 +65,7 @@ if $ARGS[0] = '':
 			npc_rel['A29'] -= 25
 			$texthcol='What were you thinking? Do you think you''ll get into university with hair like that!'
 		end
-		if pcs_haircol ! nathcol and pcs_haircol <= 3 and npc_rel['A29'] < 60: 
+		if pcs_haircol ! nathcol and pcs_haircol <= 3 and npc_rel['A29'] < 60:
 			$texthcol2 = 'says with a frown, "You should concentrate on your studies, not on how you look."'
 		elseif pcs_haircol ! nathcol and pcs_haircol > 3 and npc_rel['A29'] < 60:
 			delin_beh += 1 &!counter for getting sent to Gadukino for the summer
@@ -147,9 +147,9 @@ if $ARGS[0] = '':
 
 				act 'Move away':gt $loc, $metka
 			end
-		
+
 			act'Show her your pierced tongue':
-				cls
+				cla
 				pirsAmother=1
 				delin_beh += 1 &!counter for getting sent to Gadukino for the summer
 				gs'stat'
@@ -167,7 +167,7 @@ if $ARGS[0] = '':
 		motherpirsadbytalk=daystart
 		'Your mother looks at your lips, noticing your new lip piercing. She doesn''t seem very happy about it. "And this is why?"'
 		act'I just think it looks pretty':
-			cls
+			cla
 			pirsBmother=1
 			delin_beh += 1 &!counter for getting sent to Gadukino for the summer
 			gs'stat'
@@ -208,36 +208,11 @@ if $ARGS[0] = '':
 			minut += 3
 			'You tell your mother you''re menstruating and ran out of tampons, but really need one right now. She looks at you knowingly, gives you three sanitary pads from her own supply and sternly tells you to next time take care of this in advance.'
 
-			act 'Thank her and move away':gt $loc, $metka
+			act 'Thank her':gt 'mother'
 			exit
 		end
 	end
 
-	act 'Chat':
-		cls
-		minut+=rand(10,15)
-		npc_rel['A29']+=1
-		gs'stat'
-		'<center><b><font color = maroon>Your mother, Natasha <<$pcs_lastname>></font></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-		'Your mother Natasha is still quite young and attractive. She''s only <<motherAge>> years. She works at the station cafe.'
-		if npc_rel['A29']<20:'Your mother can''t stand you, and she avoids you as much as she can.'
-		if npc_rel['A29']>=20 and npc_rel['A29']<40:'You and mom have a tense relationship.'
-		if npc_rel['A29']>=40 and npc_rel['A29']<60:'You have a normal relationship with your mother.'
-		if npc_rel['A29']>=60 and npc_rel['A29']<80:'You have a good relationship with your mother.'
-		if npc_rel['A29']>=80:'You have a great relationship with your mother.'
-		act 'Move away':gt $loc, $metka
-		if npc_rel['A29']<20:
-			dynamic $d_mother[1]
-		exit
-		elseif npc_rel['A29']>=20 and npc_rel['A29']<40:
-			dynamic $d_mother[2]
-		exit
-		elseif npc_rel['A29'] >=40:
-			dynamic $d_mother[3]
-		end
-	end
-
 	if SchoolAtestat = 1 and SAtestatGift = 0:
 		SAtestatGift = 1
 		money += 5000
@@ -263,7 +238,7 @@ if $ARGS[0] = '':
 
 		if momslut = 1:
 			act 'Tell her you saw her fucking her boss':
-				cls
+				*clr & cla
 				minut += 5
 				momslut = 2
 				gs 'stat'
@@ -277,321 +252,289 @@ if $ARGS[0] = '':
 			end
 		end
 
-		act 'Ask for some money':
-			cls
-			minut += 5
-			gs 'stat'
-			'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-			'You ask your mother for some money.'
+		if mother_go = 0 or (week < 6 and hour >= 16 and hour < 21) or (week >= 6 and hour >= 7 and hour < 21):
+			if (week < 6 and hour >= 17 and hour < 21) or (week >= 6 and hour >= 7 and hour < 21 and hour ! 16):
+				! schedule copied from #family - should be identical.
+				act 'Chat':
+					*clr & cla
+					minut+=rand(10,15)
+					npc_rel['A29']+=1
+					gs'stat'
+					'<center><b><font color = maroon>Your mother, Natasha <<$pcs_lastname>></font></b></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
+					'Your mother Natasha is still quite young and attractive. She''s only <<motherAge>> years. She works at the station cafe.'
+					if npc_rel['A29']<20:'Your mother can''t stand you, and she avoids you as much as she can.'
+					if npc_rel['A29']>=20 and npc_rel['A29']<40:'You and mom have a tense relationship.'
+					if npc_rel['A29']>=40 and npc_rel['A29']<60:'You have a normal relationship with your mother.'
+					if npc_rel['A29']>=60 and npc_rel['A29']<80:'You have a good relationship with your mother.'
+					if npc_rel['A29']>=80:'You have a great relationship with your mother.'
+					act 'Continue':gt 'mother'
+					if npc_rel['A29']<20:
+						dynamic $d_mother[1]
+					exit
+					elseif npc_rel['A29']>=20 and npc_rel['A29']<40:
+						dynamic $d_mother[2]
+					exit
+					elseif npc_rel['A29'] >=40:
+						dynamic $d_mother[3]
+					end
+				end
 
-			if SchoolAtestat = 0:
-				if npc_rel['A29'] >= 80:
-					if motherPayDay = daystart:
-						'Your mother frowns: "Again, <<$pcs_nickname>>? Did you forget I already gave you money today? Don''t be greedy!"'
+				act 'Ask for some money':
+					*clr & cla
+					minut += 5
+					gs 'stat'
+					'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
+					'You ask your mother for some money.'
 
-					else
-						npc_rel['A29'] -= 1
-						motherPayDay = daystart
+					if SchoolAtestat = 0:
+						if npc_rel['A29'] >= 80:
+							if motherPayDay = daystart:
+								'Your mother frowns: "Again, <<$pcs_nickname>>? Did you forget I already gave you money today? Don''t be greedy!"'
 
-						if pcs_grades >= 70:
-							if pcs_grades < 90:
-								money += 150
-								'Your mother reluctantly gives you 150 <b>₽</b>: "When you do better in school, I will give you more. In the meantime, this is all you deserve!"'
+							else
+								npc_rel['A29'] -= 1
+								motherPayDay = daystart
 
-								act 'Thank her and move away':gt $loc, $metka
+								if pcs_grades >= 70:
+									if pcs_grades < 90:
+										money += 150
+										'Your mother reluctantly gives you 150 <b>₽</b>: "When you do better in school, I will give you more. In the meantime, this is all you deserve!"'
 
-							exit
-							else
-								money += 300
-								'Your mother smiles and gives you 300 <b>₽</b>: "Okay <<$pcs_nickname>>, you''ve earned it. I''m glad you''re doing such a good job in school."'
+										act 'Thank her':gt 'mother'
+
+									exit
+									else
+										money += 300
+										'Your mother smiles and gives you 300 <b>₽</b>: "Okay <<$pcs_nickname>>, you''ve earned it. I''m glad you''re doing such a good job in school."'
 
-								act 'Thank her and move away':gt $loc, $metka
+										act 'Thank her':gt 'mother'
 
-							exit
+									exit
+									end
+								else
+									'Your mother scoffs, and shakes her head: "Money? No way, <<$pcs_nickname>>. With how poorly you are doing in school, the only thing you deserve is the belt. You can have some money when you improve your grades, until then you get nothing."'
+								end
 							end
-						else
-							'Your mother scoffs, and shakes her head: "Money? No way, <<$pcs_nickname>>. With how poorly you are doing in school, the only thing you deserve is the belt. You can have some money when you improve your grades, until then you get nothing."'
-						end
-					end
-				elseif npc_rel['A29'] >= 60 and npc_rel['A29'] < 80:
-					if motherPayDay = daystart:
-						'Your mother frowns: "Again, <<$pcs_nickname>>? Did you forget I already gave you money today? Don''t be greedy!"'
-					else
-						npc_rel['A29'] -= 1
-						motherPayDay = daystart
+						elseif npc_rel['A29'] >= 60 and npc_rel['A29'] < 80:
+							if motherPayDay = daystart:
+								'Your mother frowns: "Again, <<$pcs_nickname>>? Did you forget I already gave you money today? Don''t be greedy!"'
+							else
+								npc_rel['A29'] -= 1
+								motherPayDay = daystart
 
-						if pcs_grades >= 70:
-							if pcs_grades < 90:
-								money += 100
-								'Your mother reluctantly gives you 100 <b>₽</b>: "When you do better in school, I will give you more. In the meantime, this is all you deserve!"'
+								if pcs_grades >= 70:
+									if pcs_grades < 90:
+										money += 100
+										'Your mother reluctantly gives you 100 <b>₽</b>: "When you do better in school, I will give you more. In the meantime, this is all you deserve!"'
 
-								act 'Thank her and move away':gt $loc, $metka
+										act 'Thank her':gt 'mother'
 
-							exit
-							else
-								money += 250
-								'Your mother smiles and gives you 250 <b>₽</b>: "Okay <<$pcs_nickname>>, you''ve earned it. I''m glad you''re doing such a good job in school."'
+									exit
+									else
+										money += 250
+										'Your mother smiles and gives you 250 <b>₽</b>: "Okay <<$pcs_nickname>>, you''ve earned it. I''m glad you''re doing such a good job in school."'
 
-								act 'Thank her and move away':gt $loc, $metka
+										act 'Thank her':gt 'mother'
 
-							exit
+									exit
+									end
+								else
+									'Your mother scoffs, and shakes her head: "Money? No way, <<$pcs_nickname>>. With how poorly you are doing in school, the only thing you deserve is the belt. You can have some money when you improve your grades, until then you get nothing."'
+								end
 							end
-						else
-							'Your mother scoffs, and shakes her head: "Money? No way, <<$pcs_nickname>>. With how poorly you are doing in school, the only thing you deserve is the belt. You can have some money when you improve your grades, until then you get nothing."'
-						end
-					end
-				elseif npc_rel['A29'] >= 40 and npc_rel['A29'] < 60:
-					if motherPayDay = daystart:
-						'Your mother frowns: "Again, <<$pcs_nickname>>? Did you forget I already gave you money today? Don''t be greedy!"'
-					elseif motherPayDay ! daystart:
-						npc_rel['A29'] -= 1
-						motherPayDay = daystart
+						elseif npc_rel['A29'] >= 40 and npc_rel['A29'] < 60:
+							if motherPayDay = daystart:
+								'Your mother frowns: "Again, <<$pcs_nickname>>? Did you forget I already gave you money today? Don''t be greedy!"'
+							elseif motherPayDay ! daystart:
+								npc_rel['A29'] -= 1
+								motherPayDay = daystart
 
-						if pcs_grades >= 70:
-							if pcs_grades < 90:
-								money += 50
-								'Your mother reluctantly gives you 50 <b>₽</b>: "When you do better in school, I will give you more. In the meantime, this is all you deserve!"'
+								if pcs_grades >= 70:
+									if pcs_grades < 90:
+										money += 50
+										'Your mother reluctantly gives you 50 <b>₽</b>: "When you do better in school, I will give you more. In the meantime, this is all you deserve!"'
 
-								act 'Thank her and move away':gt $loc, $metka
+										act 'Thank her':gt 'mother'
 
-							else
-								money += 200
-								'Your mother smiles and gives you 200 <b>₽</b>: "Okay <<$pcs_nickname>>, you''ve earned it. I''m glad you''re doing such a good job in school."'
+									else
+										money += 200
+										'Your mother smiles and gives you 200 <b>₽</b>: "Okay <<$pcs_nickname>>, you''ve earned it. I''m glad you''re doing such a good job in school."'
 
-								act 'Thank her and move away':gt $loc, $metka
+										act 'Thank her':gt 'mother'
 
+									end
+								else
+									'Your mother scoffs, and shakes her head: "Money? No way, <<$pcs_nickname>>. With how poorly you are doing in school, the only thing you deserve is the belt. You can have some money when you improve your grades, until then you get nothing."'
+								end
 							end
-						else
-							'Your mother scoffs, and shakes her head: "Money? No way, <<$pcs_nickname>>. With how poorly you are doing in school, the only thing you deserve is the belt. You can have some money when you improve your grades, until then you get nothing."'
+						elseif npc_rel['A29'] < 40 and motherKnowWhore = 0 and motherKnowSpravka = 0:
+							'Your mother scowls, shaking her head: "Why should I give you anything? Go get a job, you''ll get nothing from me." She really doesn''t like you very much.'
+						elseif (motherKnowWhore >= 1 or motherKnowSpravka >= 1) and npc_rel['A29'] < 40:
+							'Your mother can''t believe you would even ask, and shouts angrily: "Whores don''t get money from me! Get out of here, run to your stud and go ask him!"'
 						end
+					elseif SchoolAtestat > 0:
+						'Your mother shakes her head: "You are old enough to earn your own money <<$pcs_nickname>>, you can''t keep depending on me forever. Get a job."'
 					end
-				elseif npc_rel['A29'] < 40 and motherKnowWhore = 0 and motherKnowSpravka = 0:
-					'Your mother scowls, shaking her head: "Why should I give you anything? Go get a job, you''ll get nothing from me." She really doesn''t like you very much.'
-				elseif (motherKnowWhore >= 1 or motherKnowSpravka >= 1) and npc_rel['A29'] < 40:
-					'Your mother can''t believe you would even ask, and shouts angrily: "Whores don''t get money from me! Get out of here, run to your stud and go ask him!"'
-				end
-			elseif SchoolAtestat > 0:
-				'Your mother shakes her head: "You are old enough to earn your own money <<$pcs_nickname>>, you can''t keep depending on me forever. Get a job."'
-			end
-
-			act 'Move away from her':gt $loc, $metka
-		end
 
-		act 'Ask about your biological father':
-			cls
-			minut += 5
-			gs 'stat'
-			'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-
-			if npc_rel['A29'] < 80:
-				'You barely have any memories of your real father, and are curious about him. When you see your mother in the kitchen you decide to ask: "Mom... about my real father... what was he like? What happened between you two?"'
-				'You seem to have struck a sore spot. Your mother''s face saddens, and after a few seconds she replies: "<<$pcs_nickname>>, I don''t want to talk about him, it brings back too many bad memories. Just know that Vladimir, your stepfather, raised you and Anya as if they were his own daughters."'
-			elseif npc_rel['A29'] >= 80:
-				'You barely have any memories of your real father, and are curious about him. When you see your mother in the kitchen you decide to ask: "Mom... about my real father... what was he like? What happened between you two?"'
-				'You seem to have struck a sore spot. Your mother''s face saddens, and after a few seconds she replies: "I have no idea where Mikhail is and what he does now, I haven''t seen him in many years. We went to the same school when we were young, and were dating back then... nothing serious. Things weren''t great between us, but then I got pregnant with your sister Anya. Our parents forced us to get married. We tried to make the most of it, and for a while things didn''t seem so bad. A few months after I had you, we got into a huge argument though. We decided we couldn''t live together any more, and got divorced." You can''t help but notice she won''t tell you what the argument was about, but you don''t interrupt her. It''s rare enough to get her to talk about your real father as it is.'
-				'"A year later I married Vladimir, your stepfather. We had Kolka together, but Vladimir always treated you and Anya as if they were his own daughters too. He looked after you, bathed you, told you stories at night and took you for walks whenever he could." Those memories seem to have cheered her up, and she has a serene smile on her face. "Vladimir really is a wonderful man..." she adds, while you thank her for the story and let her get back to what she was doing.'
-			end
-
-			act 'Move away from her':gt $loc, $metka
-		end
+					act 'Continue':gt 'mother'
+				end
 
-		act 'Ask for some new clothes':
-			cls
-			minut += 5
-			gs 'stat'
-			'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-			'You wait until your mother is in a good mood, and then quickly swoop in: "Mom, I have nothing nice to wear. Can I please have some new clothes?"'
-			if pav_prostitute >= 100 and motherKnowWhore >= 1:
-				'Your mother is outraged by the suggestion. "Really <<$pcs_nickname>>? You have lots of customers, and you''re still asking me for clothes? You should have plenty of whore money, you can afford them yourself. Besides, I don''t know where to buy clothes for a whore."'
+				act 'Ask about your biological father':
+					*clr & cla
+					minut += 5
+					gs 'stat'
+					'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
+
+					if npc_rel['A29'] < 80:
+						'You barely have any memories of your real father, and are curious about him. When you see your mother in the kitchen you decide to ask: "Mom... about my real father... what was he like? What happened between you two?"'
+						'You seem to have struck a sore spot. Your mother''s face saddens, and after a few seconds she replies: "<<$pcs_nickname>>, I don''t want to talk about him, it brings back too many bad memories. Just know that Vladimir, your stepfather, raised you and Anya as if they were his own daughters."'
+					elseif npc_rel['A29'] >= 80:
+						'You barely have any memories of your real father, and are curious about him. When you see your mother in the kitchen you decide to ask: "Mom... about my real father... what was he like? What happened between you two?"'
+						'You seem to have struck a sore spot. Your mother''s face saddens, and after a few seconds she replies: "I have no idea where Mikhail is and what he does now, I haven''t seen him in many years. We went to the same school when we were young, and were dating back then... nothing serious. Things weren''t great between us, but then I got pregnant with your sister Anya. Our parents forced us to get married. We tried to make the most of it, and for a while things didn''t seem so bad. A few months after I had you, we got into a huge argument though. We decided we couldn''t live together any more, and got divorced." You can''t help but notice she won''t tell you what the argument was about, but you don''t interrupt her. It''s rare enough to get her to talk about your real father as it is.'
+						'"A year later I married Vladimir, your stepfather. We had Kolka together, but Vladimir always treated you and Anya as if they were his own daughters too. He looked after you, bathed you, told you stories at night and took you for walks whenever he could." Those memories seem to have cheered her up, and she has a serene smile on her face. "Vladimir really is a wonderful man..." she adds, while you thank her for the story.'
+					end
+					act 'Continue':gt 'mother'
+				end
 
-				act 'Move away from her':gt $loc, $metka
-			else
-				if SchoolAtestat = 0:
-					if npc_rel['A29'] >= 80:
-						if motherClotheMonth ! month:
-							'Your mother lets out an exasperated sigh, and throws her hands in the air. "Here we go again... "Mommy, I have nothing to wear!"" he says, mocking your voice in a high pitch. You both laugh. "Alright then <<$pcs_nickname>>, let''s go see if we can find something."'
-	
-							act 'Go to the store':
-								cls
-								npc_rel['A29'] = 70
-								motherClotheMonth = month
-								minut += 30
-								gs 'stat'
-								'Going clothes shopping with your mother is always an interesting experience. You never get to pick your own clothes, but she brings you clothes that she thinks would suit you and lets you try them on. You would argue but her taste in clothing is actually very good, always picking out cute outfits for you to wear that are quite trendy too. You directly go towards the changing booths, wondering what she''ll bring you this time.'
-
-								act 'Try on the clothes she brings you':
-									cls
-									gs 'stat'
-									loop_counter = 0
-									:markbuyclomother
-									loop_counter += 1
-									if loop_counter = 300:
-										'After 30 minutes of trying on various outfits you are unable to find any that you either don''t already own or that you are willing to wear.'
-									else
-										numrand = rand(1, 413)
-
-										gs 'clothing_attributes', 'cheap', numrand
-										!!not prostitute
-										if CloStyle = 4:jump 'markbuyclomother'
-										!!Sveta can wear it and not too revealing
-										if CloInhibit > pcs_inhib or CloInhibit > 30:jump 'markbuyclomother'
-
-										if cheap[numrand] = 0:
-											cheap[numrand] = 1
-											cheapH[numrand] = 50
-											cheapB[numrand] = pcs_hips
-											'<center><img <<$set_imgh>> src="images/pc/clothing/1cheap/<<numrand>>.jpg"></center>'
-										else
-											jump 'markbuyclomother'
+				act 'Ask for some new clothes':
+					*clr & cla
+					minut += 5
+					gs 'stat'
+					'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
+					'You wait until your mother is in a good mood, and then quickly swoop in: "Mom, I have nothing nice to wear. Can I please have some new clothes?"'
+					if pav_prostitute >= 100 and motherKnowWhore >= 1:
+						'Your mother is outraged by the suggestion. "Really <<$pcs_nickname>>? You have lots of customers, and you''re still asking me for clothes? You should have plenty of whore money, you can afford them yourself. Besides, I don''t know where to buy clothes for a whore."'
+
+						act 'Move away from her':gt $loc, $metka
+					else
+						if SchoolAtestat = 0:
+							if npc_rel['A29'] >= 80:
+								if motherClotheMonth ! month:
+									'Your mother lets out an exasperated sigh, and throws her hands in the air. "Here we go again... "Mommy, I have nothing to wear!"" he says, mocking your voice in a high pitch. You both laugh. "Alright then <<$pcs_nickname>>, let''s go see if we can find something."'
+
+									act 'Go to the store':
+										cla
+										npc_rel['A29'] = 70
+										motherClotheMonth = month
+										minut += 30
+										gs 'stat'
+										'Going clothes shopping with your mother is always an interesting experience. You never get to pick your own clothes, but she brings you clothes that she thinks would suit you and lets you try them on. You would argue but her taste in clothing is actually very good, always picking out cute outfits for you to wear that are quite trendy too. You directly go towards the changing booths, wondering what she''ll bring you this time.'
+
+										act 'Try on the clothes she brings you':
+											*clr & cla
+											gs 'stat'
+											loop_counter = 0
+											:markbuyclomother
+											loop_counter += 1
+											if loop_counter = 300:
+												'After 30 minutes of trying on various outfits you are unable to find any that you either don''t already own or that you are willing to wear.'
+											else
+												numrand = rand(1, 413)
+
+												gs 'clothing_attributes', 'cheap', numrand
+												!!not prostitute
+												if CloStyle = 4:jump 'markbuyclomother'
+												!!Sveta can wear it and not too revealing
+												if CloInhibit > pcs_inhib or CloInhibit > 30:jump 'markbuyclomother'
+
+												if cheap[numrand] = 0:
+													cheap[numrand] = 1
+													cheapH[numrand] = 50
+													cheapB[numrand] = pcs_hips
+													'<center><img <<$set_imgh>> src="images/pc/clothing/1cheap/<<numrand>>.jpg"></center>'
+												else
+													jump 'markbuyclomother'
+												end
+											end
+
+											'You enter a changing booth and spend 30 minutes trying on various outfits: short ones, long ones, light ones, dark ones... Then finally her eyes light up, and she beams: "This one! This one is perfect!" She buys the outfit for you, and you go back home together. You thank your mother and give her a hug.'
+
+											act 'Continue':gt 'mother'
 										end
 									end
-
-									'You enter a changing booth and spend 30 minutes trying on various outfits: short ones, long ones, light ones, dark ones... Then finally her eyes light up, and she beams: "This one! This one is perfect!" She buys the outfit for you, and you go back home together. You thank your mother and give her a hug.'
-	
-									act 'Move away':gt $loc, $metka
+								else
+									'Your mother sadly shakes her head: I''m sorry <<$pcs_nickname>>, our budget is limited and we already went clothes shopping this month. You''ll have to manage with what you have in your closet for a little while, maybe we can go again next month."'
+									act 'Continue':gt 'mother'
 								end
+							else
+								'Your mother shakes her head: "I''m sorry <<$pcs_nickname>>, money is tight. We just can''t afford it right now."'
+								act 'Continue':gt 'mother'
 							end
 						else
-							'Your mother sadly shakes her head: I''m sorry <<$pcs_nickname>>, our budget is limited and we already went clothes shopping this month. You''ll have to manage with what you have in your closet for a little while, maybe we can go again next month."'
-							act 'Move away':gt $loc, $metka
+							'Your mother shakes her head: "No <<$pcs_nickname>>, you''re old enough to earn your own money and buy your own clothes. Get a job if you want new clothes."'
+							act 'Continue':gt 'mother'
 						end
-					else
-						'Your mother shakes her head: "I''m sorry <<$pcs_nickname>>, money is tight. We just can''t afford it right now."'
-						act 'Move away':gt $loc, $metka
 					end
-				else
-					'Your mother shakes her head: "No <<$pcs_nickname>>, you''re old enough to earn your own money and buy your own clothes. Get a job if you want new clothes."'
-					act 'Move away':gt $loc, $metka
 				end
-			end
-		end
-	end
-
-	if $loc = 'kuhrPar':
-
-		gs 'mother', 'pregreact'
-
-		act 'Offer to help around the house':
-			cls
-			minut += 60
-			npc_rel['A29'] += rand(1, 5)
-			pcs_mood -= 10
-			delin_beh -= 1 &!counter for getting sent to Gadukino for the summer
-			TotalMomPom += 1
-			MomPom += 1
-			gs 'stat'
-			'You offer to help your mother out around the house.'
-
-			if MomPom = 1:
-				'Your mother asks you to do the dishes. You spend an hour washing the dishes in the kitchen.'
-			elseif MomPom = 2:
-				'Your mother asks you to peel potatoes for tonight''s meals. You spend an hour in the kitchen peeling potatoes.'
-			elseif MomPom = 3:
-				'Your mother asks you to clean the floor. You spend an hour scubbing the floors of the apartment.'
-			elseif MomPom = 4:
-				'Your mother asks you to do a load of laundry. You spend an hour washing clothes in the bathroom.'
-			elseif MomPom = 5:
-				'Your mother asks you to iron some clothes. You spend an hour in the hallway ironing clothes.'
-			elseif MomPom = 6:
-				sdacharand = rand(10, 50)
-				money += sdacharand
-				gs 'stat'
-				'Your mother asks you to run to the store, and buy some groceries. You head to the store and purchase the food, hauling the heavy bags home. The groceries cost you <<sdacharand>> <b>₽</b>, and she gives you the money back when you return home.'
-			elseif MomPom = 7:
-				'Your mother asks you to go to the pharmacy, to get some medicine. Your mother''s sister, Lyudmila, works there and always gives your family the medicine you need for free. Your mother gave you a list of the items you need, and when you enter the pharmacy you see your aunt Luda behind the counter as always. She smiles when she recognizes you. "Hi <<$pcs_nickname>>! How are you? I hope everything is okay?"'
-				'"Hello aunt!" You greet her back, and have a chat with her before you give her list your mother made. Aunt Luda quickly gathers the items your mother wrote down, gathers them in a paper bag and hands the bag over to you. "Here you go, <<$pcs_nickname>>! Have a nice day, tell your mother I said hi!"'
-				'You say you will and wave her goodbye. When you come home, you give your mother the bag. After a few minutes you realize you forgot to pass on aunt Luda''s regards to your mom, but decide to not bother now.'
-			elseif MomPom = 8:
-				MomPom = 1
-			end
 
-			act 'Move away':gt $loc, $metka
-		end
-	end
-
-	if SchoolAtestat = 0 and motherKnowSpravka = 0:
-		if GspravkaT = 0 and GspravkaTimes >= 3 and hour >= 6 and hour <= 21:
-			cla
-			npc_rel['A29'] -= 1
-			'Your mother frowns and gets her handbag: "<<$pcs_nickname>>, why haven''t you been to the gynaecologist like I asked you to? You don''t have anything to hide, do you? Come on, we''re going there right now." Your mother takes you by the hand and leads you to the clinic, ushering you into the gynaecologist''s office.'
-
-			act 'Get a referral from the gynaecologist':
-				cla
-				minut += 15
-				'You lie on the examination table and spread your legs. The gynaecologist examines your vagina.'
-
-				if pcs_vag > 0:
-					Gspravka = 7
-					GspravkaT = 2
-					'The gynaecologist notices you are not a virgin any more, and gives you a written referral to give to your mother.'
-				else
-					Gspravka = 7
-					GspravkaT = 1
-					'The gynaecologist verifies you are a virgin and gives you a written referral to give to your mother.'
+				gs 'mother', 'pregreact'
+				act 'Offer to help around the house':
+					cla
+					minut += 60
+					npc_rel['A29'] += rand(1, 5)
+					pcs_mood -= 10
+					delin_beh -= 1 &!counter for getting sent to Gadukino for the summer
+					TotalMomPom += 1
+					MomPom += 1
+					gs 'stat'
+					'You offer to help your mother out around the house.'
+
+					if MomPom = 1:
+						'Your mother asks you to do the dishes. You spend an hour washing the dishes in the kitchen.'
+					elseif MomPom = 2:
+						'Your mother asks you to peel potatoes for tonight''s meals. You spend an hour in the kitchen peeling potatoes.'
+					elseif MomPom = 3:
+						'Your mother asks you to clean the floor. You spend an hour scubbing the floors of the apartment.'
+					elseif MomPom = 4:
+						'Your mother asks you to do a load of laundry. You spend an hour washing clothes in the bathroom.'
+					elseif MomPom = 5:
+						'Your mother asks you to iron some clothes. You spend an hour in the hallway ironing clothes.'
+					elseif MomPom = 6:
+						sdacharand = rand(10, 50)
+						money += sdacharand
+						gs 'stat'
+						'Your mother asks you to run to the store, and buy some groceries. You head to the store and purchase the food, hauling the heavy bags home. The groceries cost you <<sdacharand>> <b>₽</b>, and she gives you the money back when you return home.'
+					elseif MomPom = 7:
+						'Your mother asks you to go to the pharmacy, to get some medicine. Your mother''s sister, Lyudmila, works there and always gives your family the medicine you need for free. Your mother gave you a list of the items you need, and when you enter the pharmacy you see your aunt Luda behind the counter as always. She smiles when she recognizes you. "Hi <<$pcs_nickname>>! How are you? I hope everything is okay?"'
+						'"Hello aunt!" You greet her back, and have a chat with her before you give her list your mother made. Aunt Luda quickly gathers the items your mother wrote down, gathers them in a paper bag and hands the bag over to you. "Here you go, <<$pcs_nickname>>! Have a nice day, tell your mother I said hi!"'
+						'You say you will and wave her goodbye. When you come home, you give your mother the bag. After a few minutes you realize you forgot to pass on aunt Luda''s regards to your mom, but decide to not bother now.'
+					elseif MomPom = 8:
+						MomPom = 1
+					end
+					act 'Continue':gt 'mother'
 				end
 
-				act 'Leave the office':gt $loc, $metka
-			end
+				if npc_QW['A29'] = 1 and npc_rel['A29'] >= 20 and $loc = 'kuhrPar':
+					act 'Try to reconcile':
+						*clr & cla
+						'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 
-		elseif GspravkaT = 0 and GspravkaTimes < 3:
-			GspravkaTimes += 1
-			'"<<$pcs_nickname>>, you need to go to the clinic. We need a written referral from the gynaecologist for school."'
-		elseif GspravkaT = 2 and motherKnowSpravka = 0:
-			cla
+						mqwtRand = rand(1, 10)
 
-			if motherKnowWhore = 0:
-				npc_rel['A29'] = 0
-				motherKnowSpravka = 1
+						if mqwtRand <= 2:
+							npc_rel['A29'] -= rand(1, 5)
+							minut += 30
+							'You try to have a talk with your mother, to hopefully patch up your horrible relationship. You''re not sure whether you said something wrong, or whether she''s just in a bad mood, but your attempt to reconcile backfired horribly; within moments the conversation turns into a screaming contest, and your mother ends up disliking you even more.'
 
-				if npc_QW['A29'] = 0:npc_QW['A29'] = 1
+							act 'Leave her be for now':gt $loc, $metka
+						elseif mqwtRand > 2 and mqwtRand <= 8:
+							npc_rel['A29'] += rand(0, 1)
+							minut += 30
+							'You try to have a talk with your mother, to try and patch up your horrible relationship. Despite your best efforts, the whole half-hour conversation consists mainly of a fairly aggressive monologue from your mother about morality, diseases and what awaits you in the future, if you do not change your ways. Still, there is some improvement in your relationship.'
 
-				if momslut < 2:
-					delin_beh += 1 &!counter for getting sent to Gadukino for the summer
-					'Your mother is furious and grabs you by the ear, pulling you out of the clinic and onto the street. "Oh, you slut! Your father and I worked so hard to raise you as a decent person, hoping you would find a good husband some day... and now it turns out you''re a whore who has already put her pussy to work. Get out of my sight!" She storms off, leaving you to find your own way home. When you return home, you make sure you do it quietly so she can''t give you another earful.'
-				else
-					'Your mother shakes her head sadly when she reads the referral. "Well... I guess I shouldn''t be surprised."'
+							act 'Leave her be for now':gt $loc, $metka
+						elseif mqwtRand > 8:
+							gt'motherQW','motherQW_2'
+						end
+					end
 				end
-			elseif motherKnowWhore > 0 and npc_QW['A29'] < 2:
-				npc_rel['A29'] -= 10
-				motherKnowSpravka = 1
-				delin_beh += 1 &!counter for getting sent to Gadukino for the summer
-				if npc_QW['A29'] = 0:npc_QW['A29'] = 1
-				'Your mother reads the referral and closes her eyes for a second, trying to suppress her anger. "To be honest, it''s not even a surprise to me. Don''t think that I haven''t seen you sneaking around the house at weird times, and all the guys loitering near our apartment."'
-			elseif npc_QW['A29'] >= 2:
-				motherKnowSpravka = 2
-				'"Why are you showing me this, <<$pcs_nickname>>, do you think this is funny? Are you trying to rub it in my face? Even if you made photocopies of it and handed them out at school, I doubt it would change your reputation at all... everyone already knows." your mother says coldly.'
-			end
-
-			act 'Move away':gt $loc, $metka
-
-		end
-	end
-		
-	if npc_QW['A29'] = 1 and npc_rel['A29'] >= 20 and $loc = 'kuhrPar':
-		act 'Try to reconcile':
-			cls
-			'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-
-			mqwtRand = rand(1, 10)
-
-			if mqwtRand <= 2:
-				npc_rel['A29'] -= rand(1, 5)
-				minut += 30
-				'You try to have a talk with your mother, to hopefully patch up your horrible relationship. You''re not sure whether you said something wrong, or whether she''s just in a bad mood, but your attempt to reconcile backfired horribly; within moments the conversation turns into a screaming contest, and your mother ends up disliking you even more.'
-
-				act 'Leave her be for now':gt $loc, $metka
-			elseif mqwtRand > 2 and mqwtRand <= 8:
-				npc_rel['A29'] += rand(0, 1)
-				minut += 30
-				'You try to have a talk with your mother, to try and patch up your horrible relationship. Despite your best efforts, the whole half-hour conversation consists mainly of a fairly aggressive monologue from your mother about morality, diseases and what awaits you in the future, if you do not change your ways. Still, there is some improvement in your relationship.'
-
-				act 'Leave her be for now':gt $loc, $metka
-			elseif mqwtRand > 8:
-				gt'motherQW','motherQW_2'
+			else
+				gt $loc, $metka
 			end
 		end
 	end
@@ -667,7 +610,88 @@ if $ARGS[0] = '':
 			act 'Go to Gadukino':hour = 12 & minut = 0 & indorf = 1 & gt 'famdorfride'
 		end
 	end
-end	
+
+	if SchoolAtestat = 0 and motherKnowSpravka = 0 and GspravkaT ! 1:
+		gt 'mother', 'referral'
+	elseif Gspassed = 1:
+		gt 'mother', 'referral_pass'
+	end
+end
+
+if $ARGS[0] = 'referral':
+	*clr & cla
+	'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
+	*nl
+	if GspravkaT = 0 and GspravkaTimes >= 3 and hour >= 6 and hour <= 21:
+		npc_rel['A29'] -= 1
+		'Your mother frowns and gets her handbag: "<<$pcs_nickname>>, why haven''t you been to the gynaecologist like I asked you to? You don''t have anything to hide, do you? Come on, we''re going there right now." Your mother takes you by the hand and leads you to the clinic, ushering you into the gynaecologist''s office.'
+
+		act 'Get a referral from the gynaecologist':
+			gt 'gpoli', 'referral'
+		end
+
+	elseif GspravkaT = 0 and GspravkaTimes < 3:
+		GspravkaTimes += 1
+		'"<<$pcs_nickname>>, you need to go to the clinic. We need a written referral from the gynaecologist for school."'
+		act 'Continue': gt 'mother'
+
+	elseif GspravkaT = 2 and motherKnowSpravka = 0:
+		gt 'mother', 'referral_fail'
+	elseif Gspassed = 1:
+		gt 'mother', 'referral_pass'
+	end
+end
+
+if $ARGS[0] = 'referral_fail':
+	*clr & cla
+	'<center><h2>Pavlovsk</h2></center>'
+	if month >= 11 or month <= 3:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodokw.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodok.jpg"></center>'
+	end
+	*nl
+	if motherKnowWhore = 0:
+		npc_rel['A29'] = 0
+		motherKnowSpravka = 1
+
+		if npc_QW['A29'] = 0:npc_QW['A29'] = 1
+
+		if momslut < 2:
+			!counter for getting sent to Gadukino for the summer
+			delin_beh += 1
+			'Your mother is furious and grabs you by the ear, pulling you out of the clinic and onto the street. "Oh, you slut! Your father and I worked so hard to raise you as a decent person, hoping you would find a good husband some day... and now it turns out you''re a whore who has already put her pussy to work. Get out of my sight!" She storms off, leaving you to find your own way home. When you return home, you make sure you do it quietly so she can''t give you another earful.'
+			act 'Walk home': gt 'korrPar'
+		else
+			'Your mother shakes her head sadly when she reads the referral. "Well... I guess I shouldn''t be surprised." You head home in silence.'
+			act 'Walk home': gt 'korrPar'
+		end
+
+	elseif motherKnowWhore > 0 and npc_QW['A29'] < 2:
+		npc_rel['A29'] -= 10
+		motherKnowSpravka = 1
+		!counter for getting sent to Gadukino for the summer
+		delin_beh += 1
+		if npc_QW['A29'] = 0:npc_QW['A29'] = 1
+		'Your mother reads the referral and closes her eyes for a second, trying to suppress her anger. "To be honest, it''s not even a surprise to me. Don''t think that I haven''t seen you sneaking around the house at weird times, and all the guys loitering near our apartment." You head home in silence.'
+		act 'Walk home': gt 'korrPar'
+	elseif npc_QW['A29'] >= 2:
+		motherKnowSpravka = 2
+		'"Why are you showing me this, <<$pcs_nickname>>, do you think this is funny? Are you trying to rub it in my face? Even if you made photocopies of it and handed them out at school, I doubt it would change your reputation at all... everyone already knows." your mother says coldly. You head home in silence.'
+		act 'Walk home': gt 'korrPar'
+	end
+end
+
+if $ARGS[0] = 'referral_pass':
+	*clr & cla
+	'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
+	*nl
+	Gspassed = 0
+	'You hand your mother the referral. She opens it, closes her eyes for a second, and breates a sigh of relief. "I''m not even surprised, you''re a good girl <<$pcs_nickname>>, just as I raised you to be."'
+	act 'Continue': gt 'mother'
+end
 
 if $ARGS[0] = 'pregreact':
 	*nl
@@ -739,11 +763,11 @@ if $ARGS[0] = 'pregreactnude':
 	act 'Return to mother':gt 'mother', 'pregreact1'
 end
 
-!!Mom should have more pregnancy reactions than other characters. 
+!!Mom should have more pregnancy reactions than other characters.
 !!Add shorter reactions inside this array. If longer, link to another array in the format of 'pregreactbrother'
 if $ARGS[0] = 'pregreact1':
 	*nl
-	if $wombthfath = 'Kolka' and npc_rel['A34'] > 50 and brotherSecret = 1 and momKnowsKolka = 0:	
+	if $wombthfath = 'Kolka' and npc_rel['A34'] > 50 and brotherSecret = 1 and momKnowsKolka = 0:
 		'"I... I don''t actually know. I was," you stammer as you struggle to get the next word out. "I was raped."'
 		'"What? Are you okay? Why did''t you tell me sooner?"'
 		'"I was scared and ashamed and I didn''t know how you would react." Your lip quivers as tears begin to flow down your face. "I''m sorry. I should have said something."'
@@ -758,7 +782,7 @@ if $ARGS[0] = 'pregreact1':
 			act 'Continue':gt 'kuhrPar'
 		elseif brotherSecret = 1 and pcs_intel < 60:
 			cla
-			'"Wow, thank God that worked. I thought for sure you would figure out I was lying and I would have to tell you that Kolka is really the father."' 
+			'"Wow, thank God that worked. I thought for sure you would figure out I was lying and I would have to tell you that Kolka is really the father."'
 			'You see the stunned look on her face and realize your mistake. "I mean... that was a joke. Shit."'
 
 			act 'Continue':gt 'mother', 'pregreactbrother'
@@ -777,7 +801,7 @@ if $ARGS[0] = 'pregreact1':
 			cla
 			'You continue on with your successful act, "Thank you. I''m so glad you didn''t get mad at me." The two of you then share a warm embrace as you''re doing a victory dance inside your head over your successful ruse.'
 
-			act 'Continue':gt 'kuhrPar'
+			act 'Continue':gt 'mother'
 		elseif stepdadSecret = 1 and pcs_intel < 60:
 			cla
 			'"Wow, I can''t believe that worked. I was for certain that you would figure out I was lying and I would have to tell you that Vladimir''s the true father."'
@@ -809,10 +833,10 @@ if $ARGS[0] = 'pregreact1':
 			'"All right, I had to ask," she says, hugging you again. A bit later she whispers in your ear. "You know, it will not be that bad. You will be still young when your child grows up. You can even go to parties with her. Or him. Whatever. And I will be the awesome hot grandma."'
 			'The image conjured by that thought makes you giggle a bit. Maybe it will not be that bad.'
 		end
-		act 'Continue':gt 'kuhrPar'
+		act 'Continue':gt 'mother'
 	else
 		'You tell her that the father is <<$wombthfath>> and give her some brief details about how you met and the events that led up to your pregnancy. She reassuers you that she will help you get through this.'
-		act 'Continue':gt 'kuhrPar'
+		act 'Continue':gt 'mother'
 	end
 end
 
@@ -822,7 +846,7 @@ if $ARGS[0] = 'pregreactbrother':
 		'As soon as your brother''s name crosses your lips, your mother''s face visibly reddens. Her mouth curls into a snarl and she reaches up and grips you by your hair. '
 		'"What the fuck is wrong with you?" she screams in your face. "I knew you were a worthless whore, but this? Even I didn''t think you’d go so far as to try corrupting your brother, too."'
 		'Kolka tries to speak up. "Mom, <<$pcs_nickname>>-"'
-		'Your mother quickly cuts him off. "Kolka, shut the fuck up and go to the living room. I''ll deal with you later."' 
+		'Your mother quickly cuts him off. "Kolka, shut the fuck up and go to the living room. I''ll deal with you later."'
 		'He shuffles out of the room, stopping in the doorway for a moment to look at you sympathetically.'
 		'Your mother releases your hair as tears begin to stream down your face.'
 		'"Mom, I''m s-"'

File diff suppressed because it is too large
+ 733 - 241
locations/obj_din.qsrc


+ 29 - 81
locations/onobjsel.qsrc

@@ -1,82 +1,38 @@
 # onobjsel
 !the dynamics can all be found in obj_din and Cheatmenu_din
 
-killvar 'menu_character'
-$menu_character[0] = 'Description:$menu_descrip'
-$menu_character[1] = 'Skills:$menu_skills'
-$menu_character[2] = 'Statistics:$menu_statistika'
-$menu_character[3] = 'Traits:$menu_traits'
-$menu_character[4] = 'Fame:$menu_reputation'
-$menu_character[5] = 'Pain:$menu_pain'
-$menu_character[6] = 'Calendar:$menu_calendar'
-
-if pcs_magik > 0:$menu_character[7] = 'Magic:$menu_magic'
-
-killvar 'menu_lookon'
-$menu_lookon[0] = 'Face:$menu_face'
-$menu_lookon[1] = 'Body:$menu_body'
-$menu_lookon[2] = 'Clothing:$menu_clothes'
-$menu_lookon[3] = 'Bra:$menu_bra'
-$menu_lookon[4] = 'Panties:$menu_panties'
-$menu_lookon[5] = 'Shoes:$menu_shoes'
-$menu_lookon[6] = 'Tattoos:$menu_tattoos'
-$menu_lookon[7] = 'Piercing:$menu_pirs'
-
-killvar 'menu_view'
-$menu_view[0] = 'The old menu:$menu_addoldmenu'
-$menu_view[1] = 'Game Setting:$menu_setting'
-$menu_view[2] = 'Cheat menu:$menu_cheat'
-$menu_view[3] = 'Refresh:$menu_obnovit'
-
-killvar 'menu_other'
-$menu_other[0] = 'Notebook:$menu_bloknot'
-$menu_other[1] = 'Emergency exit:$menu_avariya'
-if disable_autosave = 1:
-	$menu_other[2] = 'Enable autosave:$menu_autosave'
-else
-	$menu_other[2] = 'Disable autosave:$menu_autosave'
-end
-if mobila > 0:$menu_other[3] = 'Phone:$menu_mobila'
-
 !The old menu: beginning
-if $selobj = '<font color = green>Character</font>':gs 'obj_din', 'descrip'
-if $selobj = 'Skills':gs 'obj_din', 'skills'
-if $selobj = 'Statistics':gs 'obj_din', 'stats'
-if $selobj = 'Pain':gs 'obj_din', 'pain'
-if $selobj = 'Traits':gs 'traits', 'menu'
-if $selobj = 'Fame':gs 'obj_din', 'reputation'
-if pcs_magik > 0:if $selobj = 'Magic':gs 'obj_din', 'magic'
-if $selobj = 'Face':gs 'obj_din', 'menuface'
-if $selobj = 'Body':gs 'obj_din', 'menubody'
-if $selobj = 'Clothing':gs 'obj_din', 'clothes'
-if $selobj = 'Bra':gs 'obj_din', 'bra'
-if $selobj = 'Panties':gs 'obj_din', 'panties'
-if $selobj = 'Shoes':gs 'obj_din', 'shoes'
-if $selobj = 'Tattoos':gs 'obj_din', 'tattoos'
-if $selobj = 'Piercing':gs 'obj_din', 'piercing'
-if $selobj = 'Purse':dynamic $d_bag
-if $selobj = 'Phone':gs 'telefon','Phone_menu'
-if $selobj = 'Notebook':gs 'obj_din', 'records'
-if $selobj = 'Refresh':gs '$menu_obnovit'
-if $selobj = 'Cheats':gs '$menu_cheat'
-if $selobj = 'Settings':gs '$menu_setting'
-if $selobj = '<font color = red>Emergency</font>':gs 'obj_din', 'exit'
-if disable_autosave = 1:
-	if $selobj = '<font color = red><b>[</b></font>Autosave<font color = red><b>]</b></font>':gs 'obj_din', 'autosave'
-else
-	if $selobj = '<font color = green><b>[</b></font>Autosave<font color = green><b>]</b></font>':gs 'obj_din', 'autosave'
-end
+! if $selobj = '<center><font color = green>Character</font></center>':menu_page = 0 & gs 'obj_din', 'description'
+! if $selobj = '<center>Skills</center>':menu_page = 1 & gs 'obj_din', 'skills'
+! if $selobj = '<center>Statistics</center>':menu_page = 2 & gs 'obj_din', 'stats'
+! if $selobj = '<center>Pain</center>':menu_page = 3 & gs 'obj_din', 'pain'
+! if $selobj = '<center>Traits</center>':menu_page = 4 & gs 'traits', 'menu'
+! if $selobj = '<center>Renown</center>':menu_page = 5 & gs 'obj_din', 'reputation'
+! if pcs_magik > 0:if $selobj = '<center>Magic</center>':menu_page = 6 & gs 'obj_din', 'magic'
+! if $selobj = '<center>Face</center>':menu_page = 0 & gs 'obj_din', 'face'
+! if $selobj = '<center>Body</center>':menu_page = 1 & gs 'obj_din', 'body'
+! if $selobj = '<center>Clothing</center>':menu_page = 2 & gs 'obj_din', 'clothes'
+! if $selobj = '<center>Bra</center>':menu_page = 3 & gs 'obj_din', 'bra'
+! if $selobj = '<center>Panties</center>':menu_page = 4 & gs 'obj_din', 'panties'
+! if $selobj = '<center>Shoes</center>':menu_page = 5 & gs 'obj_din', 'shoes'
+! if $selobj = '<center>Tattoos</center>':menu_page = 6 & gs 'obj_din', 'tattoos'
+! if $selobj = '<center>Piercing</center>':menu_page = 7 & gs 'obj_din', 'piercing'
+! if $selobj = '<center>Purse</center>':dynamic $d_bag
+! if $selobj = '<center>Phone</center>':gs 'telefon','Phone_menu'
+! if $selobj = '<center>Notebook</center>':gs 'obj_din', 'records'
+!The old menu: beginning - still using these options for testing, but really aren''t needed for gameplay.
+if $selobj = '<center>Refresh</center>':gs '$menu_obnovit'
+!if $selobj = '<center>Cheats</center>':menu_page = 0 & gs '$menu_cheat'
+!if $selobj = '<center>Settings</center>':menu_page = 0 & gs '$menu_setting'
+! if disable_autosave = 1:
+	! if $selobj = '<center><font color = red><b>[</b></font>Autosave<font color = red><b>]</b></font></center>':gs 'obj_din', 'autosave'
+! else
+	! if $selobj = '<center><font color = green><b>[</b></font>Autosave<font color = green><b>]</b></font></center>':gs 'obj_din', 'autosave'
+! end
+if $selobj = '<center>Console</center>':dynamic $cheatmenu['dynamic']
+if $selobj = '<center><font color = red>Emergency</font></center>':gs 'obj_din', 'emergency'
 !The old menu: end
 
-!The new menu: beginning
-if $selobj = '<img src="images/system/icon/pers.png">':menu '$menu_character'
-if $selobj = '<img src="images/system/icon/look.png">':menu '$menu_lookon'
-if $selobj = '<img src="images/system/icon/proch.png">':menu '$menu_other'
-if $selobj = '<img src="images/system/icon/phone.png">':gs 'din_bad' & gs 'telefon','Phone_menu'
-if $selobj = '<img src="images/system/icon/purse.png">':dynamic $d_bag
-if $selobj = '<img src="images/system/icon/menu.png">':menu '$menu_view'
-!The new menu: end
-
 if $selobj = 'Player':
 	clr
 	pl'Your name is Mikhail Kuznetsov. You <<age>> years. <<$vneshPRE>>'
@@ -84,14 +40,6 @@ if $selobj = 'Player':
 	pl'Growth <<pcs_hgt>> see, weight 100 kg.'
 end
 
-
-
-!!	gs'Menu.Create','mainMenu'
-!!	gs'Menu.Add','mainMenu','Status Bar','','MenuMainLoc','0'
-!!	gs'Menu.Add','mainMenu','Text Symbols','','MenuMainLoc','1'
-!!	gs'Menu.Call','mainMenu'
-
-
 unselect
 
 --- onobjsel ---------------------------------

+ 2 - 0
locations/parkdin.qsrc

@@ -23,6 +23,8 @@ if hour > 7 and hour < 21:
 		if parkrand = 7:gt 'parkivent', '7'
 		if parkrand = 8:gt 'parkivent', '8'
 		if parkrand = 9:gt 'parkivent', '9'
+	elseif parkrand = 19 and prcptn_lvl >= 50 and lactate > 0:
+        gt 'parkivent', 'find_baby'
 	else
 		gt 'parkivent', 'empty'
 	end

+ 200 - 0
locations/parkivent.qsrc

@@ -859,5 +859,205 @@ if $ARGS[0] = 'run_reactions':
 	act 'Finish your run': gt $loc, $metka
 end
 
+if $ARGS[0] = 'find_baby':
+    if hour >= 8 and hour <= 20 and park_baby_found < 1:
+        pcs_mood += 10
+        pcs_willpwr += 10
+        gs 'stat'
+        '<center><img <<$set_imgh>> src="images/locations/city/centralpark/park_baby/park_woods.jpg"></center>'
+        'You take a relaxing and refreshing walk through the park, trying to figure out the meaning of life.'
+        'Your thoughts are interrupted by a weak noise coming from a small forest in the park.'
+        act 'Investigate':    
+            *clr
+            cla
+            '<center><img <<$set_imgh>> src="images/locations/city/centralpark/park_baby/park_baby_a.jpg"></center>'
+            'After searching and following the noises you end up finding an abandoned baby in the park. You approach it and can hear weak cries coming from it.'
+            'You pull it from the crib an see that it is a boy. The baby boy isn''t moving much as he seems really weak.'
+            park_baby_found = 1
+            if lactate > 0:
+                'His small almost dry mouth makes little smacking movements.'
+            end
+            'What do you want to do?'
+            if lactate > 0:
+                act 'Breastfeed him':
+                    gs 'stat'
+                    *clr
+                    cla
+                    '<center><img <<$set_imgh>> src="images/locations/city/centralpark/park_baby/park_baby_bf.jpg"></center>'
+					'You sit down on a nearby bench and get a breast out.'
+					if kid <= 0:
+						'Something feels weird in your breast, a pulling tension goes through it from the base to the nipple.'
+					end
+					'The boy is in your arms and you lead your nipple into his small dry mouth. You can feel the small lips clamping weakly onto your nipple, only light sucktion coming from the mouth.'
+					'<center><img <<$set_imgh>> src="images/locations/city/centralpark/park_baby/feeding_01.jpg"></center>'
+					temp_var = func('lact_lib','$get_breastmilk_time', 7, 30)
+					if temp_var > 10:
+						'<br>The baby boys weak suckling isn''t getting better with time. He is suckling on your nipple for almost 10 minutes and his condition isn'' getting better.'
+						milkedvolume = func('lact_lib','$get_breastmilk', 7, 10)
+						milkedvolume = 0
+						minut += temp_var
+						if pcs_mood < 20:
+							act 'Leave him here':
+								*clr
+								cla
+								'You look around, someone probably left him here for good. You put him back into the crib and leave the baby behind, finishing your walk.'
+								act 'Finish your walk': gt $loc, $metka
+							end
+						end
+						act 'Bring him to the hospital':
+							*clr
+							cla
+							'<center><b><font color="maroon">Clinic</font></b></center>'
+							'<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
+							'You take the baby and walk to the hospital in the residential area of St. Petersburg.'
+							'They take him at the reception and you explain what happened. A nurse takes the baby away and the receptionist assures you that they are taking care of him.'
+							minut += 30
+							act 'Finish': gt 'poli', 'start'
+						end
+						!!if pcs_mood > 80:
+						!!    act 'Take him with you':
+						!!end
+					else
+						'<br>The baby boys weak suckling is getting better with time. After around <<temp_var>> minutes his sucking is getting more intense.'
+						milkedvolume = func('lact_lib','$get_breastmilk', 7, 10)
+						milkedvolume = 0
+						minut += temp_var
+						act 'Continue to breastfeed him':
+							*clr
+							cla
+							gs 'stat'
+							'You adjust yourself a bit as you continue to breastfeed the baby. He opens his mouth more to suck in your areola, starting to chew on it. You can feel how it causes your breast to leak more milk. His small hands grabbing up, holding onto your nutrious breast.'
+							'<center><img <<$set_imgh>> src="images/locations/city/centralpark/park_baby/feeding_02.jpg"></center><br>'
+							temp_var = func('lact_lib','$get_breastmilk_time', 2, 120)
+							if temp_var > 30:
+								'You try to breastfeed him for 30 minutes but you can''t satisfy his needs even after switching breasts. Your breasts don''t make enough milk.'
+								milkedvolume = func('lact_lib','$get_breastmilk', 2, 30)
+								milkedvolume = 0
+								minut += 30
+								if pcs_mood < 20:
+									act 'Leave him here':
+										*clr
+										cla
+										'You look around, someone probably left him here for good. You put him back into the crib and leave the baby behind, finishing your walk.'
+										act 'Finish your walk': gt $loc, $metka
+									end
+								end
+								act 'Bring him to the hospital':
+									*clr
+									cla
+									'<center><b><font color="maroon">Clinic</font></b></center>'
+									'<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
+									'You take the baby and walk to the hospital in the residential area of St. Petersburg.'
+									'They take him at the reception and you explain what happened. A nurse takes the baby away and the receptionist assures you that they are taking care of him.'
+									minut += 35
+									act 'Finish': gt 'poli', 'start'
+								end
+								!!if pcs_mood > 80:
+								!!    act 'Take him with you':
+								!!end
+							else
+								if temp_var = 1:
+									if (lactatemv/1200) < 2:
+										'You breastfeed him for one minute. During feeding you have to switch breasts as he is drinking alot, but your breasts make enough milk to satisfy his needs.'
+									else
+										'You breastfeed him for one minute. Your breasts make so much milk you don''t even have to switch breasts during feeding. He is satisfied to his full content.'
+									end
+								else
+									if (lactatemv/1200) < 2:
+										'You breastfeed him for <<temp_var>> minutes. During feeding you have to switch breasts as he is drinking alot, but your breasts make enough milk to satisfy his needs.'
+									else
+										'You breastfeed him for <<temp_var>> minutes. Your breasts make so much milk you don''t even have to switch breasts during feeding. He is satisfied to his full content.'
+									end
+								end
+								if age < 18 and kid <= 0:
+									'As you notice how you where able to fully breastfeed a baby, even if you never had kids yourself, you start to feel proud and confident of yourself, smiling and nodding. This rises your mood as you feel more like a grown up woman now.'
+									pcs_mood += 20
+								elseif age >= 18 and kid <= 0:
+									'As you notice how you where able to fully breastfeed a baby, even if you never had kids yourself, you start to feel proud and confident of yourself, smiling and nodding. This rises your mood a bit.'
+									pcs_mood += 10
+								else
+									'You feel satisfied after the breastfeeding and smile at the baby. Your mood rises a bit.'
+									pcs_mood += 10
+								end
+								milkedvolume = func('lact_lib','$get_breastmilk', 2, temp_var)
+								milkedvolume = 0
+								minut += temp_var
+								if pcs_mood < 20:
+									act 'Leave him here':
+										*clr
+										cla
+										'You look around, someone probably left him here for good. You put him back into the crib and leave the baby behind, finishing your walk.'
+										act 'Finish your walk': gt $loc, $metka
+									end
+								end
+								act 'Bring him to the hospital':
+									*clr
+									cla
+									'<center><b><font color="maroon">Clinic</font></b></center>'
+									'<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
+									'You take the baby and walk to the hospital in the residential area of St. Petersburg.'
+									'They take him at the reception and you explain what happened. A nurse takes the baby away and the receptionist assures you that they are taking care of him.'
+									minut += 35
+									act 'Finish': gt 'poli', 'start'
+								end
+								!!if pcs_mood > 80:
+								!!    act 'Take him with you':
+								!!end
+							end
+						end
+						if pcs_mood < 20:
+							act 'Leave him here':
+								*clr
+								cla
+								'You look around, someone probably left him here for good. You put him back into the crib and leave the baby behind, finishing your walk.'
+								act 'Finish your walk': gt $loc, $metka
+							end
+						end
+						act 'Bring him to the hospital':
+							*clr
+							cla
+							'<center><b><font color="maroon">Clinic</font></b></center>'
+							'<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
+							'You take the baby and walk to the hospital in the residential area of St. Petersburg.'
+							'They take him at the reception and you explain what happened. A nurse takes the baby away and the receptionist assures you that they are taking care of him.'
+							minut += 35
+							act 'Finish': gt 'poli', 'start'
+						end
+						!!if pcs_mood > 80:
+						!!    act 'Take him with you':
+						!!end
+					end
+                end
+            end
+            act 'Bring him to the hospital':
+                *clr
+                cla
+                '<center><b><font color="maroon">Clinic</font></b></center>'
+                '<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
+                'You take the baby and walk to the hospital in the residential area of St. Petersburg.'
+                'They take him at the reception and you explain what happened. A nurse takes the baby away and the receptionist assures you that they are taking care of him.'
+                minut += 30
+                act 'Finish': gt 'poli', 'start'
+            end
+            if pcs_mood < 20:
+                act 'Leave him here':
+                    *clr
+                    cla
+                    'You look around, someone probably left him here for good. You leave the baby behind and finish your walk.'
+                    act 'Finish your walk': gt $loc, $metka
+                end
+            end
+            !!if pcs_mood > 80:
+            !!    act 'Take him with you':
+            !!end
+        end
+        act 'Complete walk':gt 'park', 'start'
+    else
+        gt 'parkivent', 'empty'
+    end
+end
+
+
 --- parkivent ---------------------------------
 
+

+ 2 - 0
locations/pavComplex.qsrc

@@ -109,6 +109,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 	act 'Go to the Western apartment building':minut += 3 & gt 'pavComplexb3', 'etaj_1'
+	act 'Go to the old apartment building':minut += 3 & gt 'pavComplexOld', 'etaj_1'
 	act 'Go to the apartment courtyard':minut += 3 & gt 'pavComplex', 'courtyard'
 	act 'Go to the apartment garages':minut += 3 & gt 'pavComplex', 'garages'
 end
@@ -160,6 +161,7 @@ if $ARGS[0] = 'courtyard':
 		end
 	end
 	act 'Go to the Western apartment building':minut += 3 & gt 'pavComplexb3', 'etaj_1'
+	act 'Go to the old apartment building':minut += 3 & gt 'pavComplexOld', 'etaj_1'
 	act 'Go to the garages':minut += 1 & gt 'pavComplex', 'garages'
 end
 

+ 1 - 1
locations/pavComplexOld.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = 'etaj_1':
 		act 'Turn back': gt 'pavComplexOld', 'etaj_1'
 	end
 
-	act 'Leave the building':gt 'pavResidential'
+	act 'Leave the building':gt 'pavcomplex', 'start'
 end
 
 if $ARGS[0] = 'advert':

+ 5 - 17
locations/pavResidential.qsrc

@@ -114,14 +114,14 @@ end
 
 
 if home_owned[2] = 1:
-	'You live in one of the apartment blocks in the old part of Pavlovsk, and the door to the <a href="exec:minut += 2 & GT ''pavcomplex'',''start''">apartment building</a> is right there. Your <a href="exec:minut += 5 & GT ''korrPar''">parents'' home</a> is on the second floor there. <<$gcartext>>'
+	'You live in one of the apartment blocks in the old part of Pavlovsk, and the door to the <a href="exec:minut += 3 & GT ''pavcomplex'',''start''">apartment building</a> is right there. Your <a href="exec:minut += 5 & GT ''korrPar''">parents'' home</a> is on the second floor there. <<$gcartext>>'
 elseif StoryLine = 1:
-	'You are standing near one of the apartment blocks in the old part of Pavlovsk, and the door to the <a href="exec:minut += 2 & GT ''pavcomplex'',''start''">apartment building</a> is right there. Your parents live here, but you are no longer welcome in their home. <<$gcartext>>'
+	'You are standing near one of the apartment blocks in the old part of Pavlovsk, and the door to the <a href="exec:minut += 3 & GT ''pavcomplex'',''start''">apartment building</a> is right there. Your parents live here, but you are no longer welcome in their home. <<$gcartext>>'
 else
 	'<<$gcartext>>'
 end
 
-if StoryLine = 1: 'There is an <a href="exec:minut += 2 & GT ''pavComplexOld'',''etaj_1''">old apartment building</a> near to where your parents live.'
+if StoryLine = 1: 'There is an <a href="exec:minut += 3 & GT ''pavComplexOld'',''etaj_1''">old apartment building</a> near to where your parents live.'
 
 if rexCar = 1 and rexCarDay = daystart and hour >= 21 and hour < 23 and rexSisTalk = 3:
 	'Rex is in his car, waiting for you at the parking lot near the apartment building where your parents live.'
@@ -187,6 +187,8 @@ act 'Go to the high street':minut += 5 & gt 'pavCommercial'
 if home_owned[2] = 1: act '<b>GO HOME</b> (Parents'' Apartment)': minut += 4 & GT 'korrPar'
 if pavSharedAptEnabled = 1:act '<b>GO HOME</b> (Shared Apartment)': minut += 5 & GT 'pavSharedApt', 'start'
 
+act 'Go to the apartment complex':minut += 3 & gt 'pavcomplex', 'start'
+
 act 'Wait':gs 'obj_din', 'wait'
 
 if (hour > 20 or hour < 4) and succubusQW = 5 and suchuntday ! daystart:
@@ -221,20 +223,6 @@ if (hour > 20 or hour < 4) and succubusQW = 5 and suchuntday ! daystart:
 	end
 end
 
-act 'Go to the Southern apartment building':minut += 3 & gt 'pod_ezd', 'etaj_1'
-act 'Go to the Eastern apartment building':
-	minut += 3
-	if anushkaFirstvisit = 0 and npc_rel['A144'] > 50:
-		gt 'pavComplexb2', 'anushkaFirst'
-	else
-		gt 'pavComplexb2', 'etaj_1'
-	end
-end
-act 'Go to the Western apartment building':minut += 3 & gt 'pavComplexb3', 'etaj_1'
-act 'Go to the apartment courtyard':minut += 3 & gt 'pavComplex', 'courtyard'
-act 'Go to the apartment garages':minut += 3 & gt 'pavComplex', 'garages'
-
-
 if StoryLine ! 0 and (hour >= 8 or hour < 23) and cumloc[11] = 1 and rand(0, 3) = 0 and sosedday ! daystart:
 	cls
 	sosedday = daystart

+ 34 - 30
locations/pornhist.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'short':
 		end
 
 		if $porntitle[i] = '':
-			$pfilmhistory += '● <b><<i>>. Movie</b><br><font size=2>'+$pfilmtext+'</font><br>'
+			$pfilmhistory += '● <b><<i>>. Movie</b><br><font size=2></font><br>'
 		else
 			if i = 1:
 				$pfilmhistory += '● <b>'+$porntitle[i]+'<<$pfname>></b><br><font size=2>'+$pfilmtext+'</font><br>'
@@ -29,7 +29,10 @@ end
 
 !! Detailed description of movies, only available after selecting the "Filmography" link
 if $ARGS[0] = 'pdetail':
-	clr
+	*clr & cla
+	'<center><h1>Filmography of <font color="magenta"><<$pfname>></font></h1></center>'
+	'<center><table width="90%" cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td cellspacing="0" cellpadding="0" valign="top">'
 	i = 1
 	killvar 'firstvariable'
 	killvar 'firstvariable2'
@@ -37,68 +40,69 @@ if $ARGS[0] = 'pdetail':
 		dynamic $pornfilmdesc, pornfilmType[i]
 		if $porntitle[i] = '':
 			if firstvariable = 0:firstvariable = 1 & fvvalue = i
-			pl '<b><a href="exec:$porntitle[fvvalue] = input(''<font color=#FF0000>WARNING!</font> No matter where you clicked, it will name the <b>first</b> unnamed movie! This action can be done only once!'') & gs ''pornhist'', ''pdetail''"><<i>>. Movie</a></b>'
+			'<b><a href="exec:$porntitle[fvvalue] = input(''<font color=#FF0000>WARNING!</font> No matter where you clicked, it will name the <b>first</b> unnamed movie! This action can be done only once!'') & gs ''pornhist'', ''pdetail''"><<i>>. Movie</a></b>'
 		else
 			if i = 1:
-				pl '<b><font color="brown"><<$porntitle[i]>><<$pfname>></font></b>'
+				'<b><font color="brown"><<$porntitle[i]>><<$pfname>></font></b>'
 			else
-				pl '<b><font color="brown"><<$porntitle[i]>></font></b>'
+				'<b><font color="brown"><<$porntitle[i]>></font></b>'
 			end
 		end
 		if daystart - porndaystart[i] = 0:
-			pl ' <b>Production date:</b> <font size=2><<$pornfilmDate[i]>> (Today)</font>'
+			' <b>Production date:</b> <font size=2><<$pornfilmDate[i]>> (Today)</font>'
 		elseif daystart - porndaystart[i] = 1:
-			pl ' <b>Production date:</b> <font size=2><<$pornfilmDate[i]>> (Yesterday)</font>'
+			' <b>Production date:</b> <font size=2><<$pornfilmDate[i]>> (Yesterday)</font>'
 		else
-			pl ' <b>Production date:</b> <font size=2><<$pornfilmDate[i]>> (<<daystart - porndaystart[i]>> days ago)</font>'
+			' <b>Production date:</b> <font size=2><<$pornfilmDate[i]>> (<<daystart - porndaystart[i]>> days ago)</font>'
 		end
-		pl ' <b>Actress age:</b> <font size=2><<pornfilmActAge[i]>></font>  <font size=2>(Appears: <<pornfilmAppAge[i]>>)</font>'
+		' <b>Actress age:</b> <font size=2><<pornfilmActAge[i]>></font>  <font size=2>(Appears: <<pornfilmAppAge[i]>>)</font>'
 		if $pornfilmActor[i] = 'Fifty fans of':
-			pl ' <b>Actors:</b> <font size=2><<$pornfilmActor[i]>> <<$pfname>> and <<$pfname>> herself</font>'
+			' <b>Actors:</b> <font size=2><<$pornfilmActor[i]>> <<$pfname>> and <<$pfname>> herself</font>'
 		else
-			pl ' <b>Actors:</b> <font size=2><<$pornfilmActor[i]>> and <<$pfname>></font>'
+			' <b>Actors:</b> <font size=2><<$pornfilmActor[i]>> and <<$pfname>></font>'
 		end
-		pl ' <b>Income:</b> <font size=2><<pornfilmCash[i]>>₽</font>'
+		' <b>Income:</b> <font size=2><<pornfilmCash[i]>>₽</font>'
 		if pornfilmacting[i] < 15:
-			pl ' <b>Acting:</b> <font size=2>You were so obviously fake as a bad boobjob. Have you got paid for this?</font>'
+			' <b>Acting:</b> <font size=2>You were so obviously fake as a bad boobjob. Have you got paid for this?</font>'
 		elseif pornfilmacting[i] < 30:
-			pl ' <b>Acting:</b> <font size=2>You were acting quite fake, but it were passable.</font>'
+			' <b>Acting:</b> <font size=2>You were acting quite fake, but it were passable.</font>'
 		elseif pornfilmacting[i] < 45:
-			pl ' <b>Acting:</b> <font size=2>You probably could have done better, but at least you were not totally unconvincing.</font>'
+			' <b>Acting:</b> <font size=2>You probably could have done better, but at least you were not totally unconvincing.</font>'
 		elseif pornfilmacting[i] < 60:
-			pl ' <b>Acting:</b> <font size=2>You were actually acting, even if not totally convincingly.</font>'
+			' <b>Acting:</b> <font size=2>You were actually acting, even if not totally convincingly.</font>'
 		elseif pornfilmacting[i] < 75:
-			pl ' <b>Acting:</b> <font size=2>You were acting really well.</font>'
+			' <b>Acting:</b> <font size=2>You were acting really well.</font>'
 		elseif pornfilmacting[i] < 90:
-			pl ' <b>Acting:</b> <font size=2>As a professional actress, everybody believed your every gesture and sentence.</font>'
+			' <b>Acting:</b> <font size=2>As a professional actress, everybody believed your every gesture and sentence.</font>'
 		else
-			pl ' <b>Acting:</b> <font size=2>Your performance was phenomenal. You may actually win some award with this one.</font>'
+			' <b>Acting:</b> <font size=2>Your performance was phenomenal. You may actually win some award with this one.</font>'
 		end
 		if pornfilmvnesh[film] >= 200:
-			pl ' <b>Look:</b> <font size=2>Amazingly beautiful.</font>'
+			' <b>Look:</b> <font size=2>Amazingly beautiful.</font>'
 		elseif pornfilmvnesh[film] >= 120:
-			pl ' <b>Look:</b> <font size=2>Beautiful.</font>'
+			' <b>Look:</b> <font size=2>Beautiful.</font>'
 		elseif pornfilmvnesh[film] >= 60:
-			pl ' <b>Look:</b> <font size=2>Attractive.</font>'
+			' <b>Look:</b> <font size=2>Attractive.</font>'
 		else
-			pl ' <b>Look:</b> <font size=2>Unnoticeable.</font>'
+			' <b>Look:</b> <font size=2>Unnoticeable.</font>'
 		end
-		pl ' <b>Description:</b> <font size=2><<$pfilmtext>></font>'
+		' <b>Description:</b> <font size=2><<$pfilmtext>></font>'
 		if $pornfilmstory[i] = '':
 			if firstvariable2 = 0:firstvariable2 = 1 & fvvalue2 = i
-			pl ' <b>Story:</b> <font size=2><a href="exec:$pornfilmstory[fvvalue2] = input(''<font color=#FF0000>WARNING!</font> No matter where you clicked, you will enter the story of the <b>first</b> movie which missing it! This action can be done only once!'') & gs ''pornhist'', ''pdetail''">Missing story</a></font>'
+			' <b>Story:</b> <font size=2><a href="exec:$pornfilmstory[fvvalue2] = input(''<font color=#FF0000>WARNING!</font> No matter where you clicked, you will enter the story of the <b>first</b> movie which missing it! This action can be done only once!'') & gs ''pornhist'', ''pdetail''">Missing story</a></font>'
 		else
-			pl ' <b>Story:</b> <font color=#1B4532 size=2><<$pornfilmstory[i]>></font>'
+			' <b>Story:</b> <font color=#1B4532 size=2><<$pornfilmstory[i]>></font>'
 		end
-		pl ' <b>Tags: <font color=#541717 size=2><<$pfilmtags>></font></b>'
-		if pornDanger[i] = 1 and pfType = 1:pl ' <font color="red" size=2><b>You were unprotected and fertile during the shoot.</b></font>'
+		' <b>Tags: <font color=#541717 size=2><<$pfilmtags>></font></b>'
+		if pornDanger[i] = 1 and pfType = 1:' <font color="red" size=2><b>You were unprotected and fertile during the shoot.</b></font>'
 		killvar '$pfilmtags'
 	if i < film:
-		p '<font color="sienna"><hr></font>'
+		*p '<font color="sienna"><hr></font>'
 		i += 1
 		jump 'pornhistloop2'
 	end
-	pl '<a href="exec:gs ''obj_din'', ''stats'' & killvar ''pornfilmdesc'' & killvar ''porntag''"><br>Return</a>'
+	act 'Return to Reputation': killvar 'pornfilmdesc' & killvar 'porntag' & gt 'obj_din', 'reputation'
+	'</td></tr></table></center>'
 end
 
 !! Dynamic of selectable porn movies, called from:

+ 3 - 15
locations/preALT.qsrc

@@ -45,11 +45,7 @@ if $ARGS[0] = 'Three':
 	if MagikDostup = 1:
 		showstat 1
 		showobjs 1
-		if oldobjmenu = 0:
-			gs 'obj_din', 'new'
-		else
-			gs 'obj_din', 'old'
-		end
+		gs 'obj_din', 'old'
 		act 'Begin':
 			*clr
 			cla
@@ -135,11 +131,7 @@ if $ARGS[0] = 'Cursed Schoolgirl Start':
 		hour = 18
 		showstat 1
 		showobjs 1
-		if oldobjmenu = 0:
-			gs 'obj_din', 'new'
-		else
-			gs 'obj_din', 'old'
-		end
+		gs 'obj_din', 'old'
 		'<center><img <<$set_imgh>> src="images/system/magicschoolgirl.jpg"></center>'
 		'Welcome to the Cursed Schoolgirl version! Guide <<$pcs_nickname>> through her school life, relationships and myriad other issues that might pop up and all with the added spice of magic to keep things interesting!'
 		act 'Begin':
@@ -231,11 +223,7 @@ if $ARGS[0] = 'Cursed Schoolgirl Start 2':
 								act 'Continue':
 									showstat 1
 									showobjs 1
-									if oldobjmenu = 0:
-										gs 'obj_din', 'new'
-									else
-										gs 'obj_din', 'old'
-									end
+									gs 'obj_din', 'old'
 									cla
 									*clr
 									'<center><img <<$set_imgh>> src="images/system/magicschoolgirl.jpg"></center>'

+ 2 - 12
locations/preNT.qsrc

@@ -419,12 +419,7 @@ if $ARGS[0] =  'Listings':
 			cla
 			showstat 1
 			showobjs 1
-
-			if oldobjmenu = 0:
-				gs 'obj_din', 'new'
-			else
-				gs 'obj_din', 'old'
-			end
+			gs 'obj_din', 'old'
 			gt 'korr'
 		end
 	end
@@ -512,12 +507,7 @@ if $ARGS[0] =  'Train':
 						cla
 						showstat 1
 						showobjs 1
-
-						if oldobjmenu = 0:
-							gs 'obj_din', 'new'
-						else
-							gs 'obj_din', 'old'
-						end
+						gs 'obj_din', 'old'
 						cla
 						*clr
 						'<center><img <<$set_imgh>> src="images/system/newintown.jpg"></center>'

+ 2 - 4
locations/preSYS.qsrc

@@ -512,8 +512,7 @@ if $ARGS[0] = 'charselect':
 				currentpursenumber = 9
 				dynamic $currentpursetype + '_purses[' + currentpursenumber + '] = 1'
 				bag = 1
-				if menu_option = 1:gs 'obj_din', 'old'
-				if menu_option = 0:gs 'obj_din', 'new'
+				gs 'obj_din', 'old'
 				greben = 1
 				kosmetitka = 10
 				krem = 10
@@ -818,8 +817,7 @@ if $ARGS[0] = 'charselect':
 				$currentpursetype = 'kats'
 				currentpursenumber = 10
 				bag = 1
-				if menu_option = 1:dynamic $menu_addoldmenu
-				if menu_option = 0:gs 'obj_din', 'new'
+				gs 'obj_din', 'old'
 				greben = 1
 				kosmetitka = 10
 				salfetka = 10

+ 2 - 3
locations/preSYS2.qsrc

@@ -19,8 +19,7 @@ if $ARGS[0] = 'start':
 		if bag = 1:
 			!!using current combination should prevent having more than 1 bag at the start of game.
 			dynamic $currentpursetype + '_purses[<<currentpursenumber>>] = 1'
-			if menu_option = 1:gs 'obj_din', 'old'
-			if menu_option = 0:gs 'obj_din', 'new'
+			gs 'obj_din', 'old'
 		end
 		gt 'preCUST', 'SGStart'
 	end
@@ -384,7 +383,7 @@ if $ARGS[0] = 'modatt':
 	gs 'preSYS2', 'modrel_setup2', 'pcs_vital', 'Endurance'
 	gs 'preSYS2', 'modrel_setup2', 'pcs_intel', 'Intelligence'
 	gs 'preSYS2', 'modrel_setup2', 'pcs_sprt', 'Spirit'
-	gs 'preSYS2', 'modrel_setup2', 'pcs_react', 'Mental Agility'
+	gs 'preSYS2', 'modrel_setup2', 'pcs_react', 'Reaction'
 	gs 'preSYS2', 'modrel_setup2', 'pcs_chrsm', 'Charisma'
 	gs 'preSYS2', 'modrel_setup2', 'pcs_prcptn', 'Perception'
 	if MagikDostup = 0: gs 'preSYS2', 'modrel_setup2', 'pcs_magik', 'Magic'

+ 1 - 6
locations/preTG.qsrc

@@ -483,12 +483,7 @@ if $ARGS[0] = 'sleepPRE':
 					cla
 					showstat 1
 					showobjs 1
-
-					if oldobjmenu = 0:
-						gs 'obj_din', 'new'
-					else
-						gs 'obj_din', 'old'
-					end
+					gs 'obj_din', 'old'
 					cla
 					*clr
 					'<center><img <<$set_imgh>> src="images/system/transgender.jpg"></center>'

+ 0 - 4
locations/purses.qsrc

@@ -86,8 +86,6 @@ if $ARGS[0] = 'view_purse_item':
 						bag = 1
 						$currentpursetype = $ARGS[2]
 						currentpursenumber = ARGS[3]
-						if menu_option = 1:gs 'obj_din', 'old'
-						if menu_option = 0:gs 'obj_din', 'new'
 					end
 					gt $loc, $metka
 				end
@@ -109,8 +107,6 @@ if $ARGS[0] = 'view_purse_item':
 					$currentpursetype = $ARGS[2]
 					currentpursenumber = ARGS[3]
 					bag = 1
-					if menu_option = 1:gs 'obj_din', 'old'
-					if menu_option = 0:gs 'obj_din', 'new'
 
 					gt 'wardrobe', 'start'
 				end

+ 1 - 0
locations/qwBarPoletToilet.qsrc

@@ -23,6 +23,7 @@ if temp <= 6:
 	'The <a href="exec:gt ''mirror'', ''start''">mirror</a> you see above the sinks has some cracks radiating from one of the corners, but other than that, it''s perfectly usable.'
 	act 'Return to the main room': minut += 1 & gt 'qwBarPolet'
 	dynamic $basin
+	dynamic $removepan
 	dynamic $quickwash
 elseif temp = 7:
 	if pcs_horny < 90: pcs_horny += 10

+ 3 - 58
locations/rolanbath.qsrc

@@ -392,6 +392,7 @@ if $ARGS[0] = 'start':
 	dynamic $bteeth
 	dynamic $tampon
 	dynamic $basin
+	dynamic $removepan
 	if (cumloc[6] = 1 or cumloc[7] = 1):
 		act 'Clean semen stains from your clothing (0:15)':
 			*clr & cla
@@ -404,43 +405,6 @@ if $ARGS[0] = 'start':
 			act 'Finish': gt 'rolanbath', 'start'
 		end
 	end
-	if klisma = 1 and (klismaday ! daystart or arrpos('sparrloc', 3) ! -1):
-		act 'Give yourself an enema (0:05)':
-			*clr & cla
-			cumspclnt = 7
-			gs 'cum_cleanup'
-			minut += 5
-			klismaday = daystart
-			klismaday1= 1
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/klisma.jpg"></center>'
-			'You give yourself an enema, feeling clean down there. Your ass is now ready for anal sex without any awkward surprises.'
-			act 'Finish':gt 'rolanbath', 'start'
-		end
-	end
-	if analplug = 1 and analplugin = 1:
-		act 'Take out your butt plug (0:05)':
-			*clr & cla
-			minut += 5
-			analplugIN = 0
-			if pcs_ass < 30:pcs_ass += 1
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			'You squat and tug gently at the butt plug, gasping as you push it out of you. You can''t help but feel a bit empty, now that it''s out.'
-			act 'Finish':gt 'rolanbath', 'start'
-		end
-	elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
-		act 'Wear your butt plug (0:05)':
-			*clr & cla
-			minut += 5
-			analplugIN = 1
-			if pcs_ass < 10:pcs_ass = pcs_ass + 5
-			if pcs_ass >= 10 and pcs_ass < 20:pcs_ass += rand(1, 2)
-			if pcs_ass >= 20 and pcs_ass < 30:pcs_ass += rand(0, 1)
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			if butpluguse > 0:'You squat and gently rub the butt plug against your anus, after lubricating it with a bit of saliva. After a short while, you''ve relaxed enough to be able to push it in. Once it''s in you give it a few gentle tugs, wondering if anyone will catch you wearing it today.'
-			if butpluguse = 0:butpluguse = 1 & '"If I''m not going to use it, then why did I buy it?" you ask yourself. You look at the butt plug for a while, thinking "It is necessary to start developing my ass, so I could have great adventures someday... you could even say huge and thick adventures with crimson heads, uh, now I got carried away..." You''re slightly embarrassed at the thought for a second, but are then overcome by your horny fantasies. Determined to get the plug all the way in, you slowly press it against your asshole after lubricating it with a bit of saliva. It hurts a bit at first, but once the thickest part is in the rest follows rather easily. Patting yourself on your ass once it''s in, you wonder if anyone will notice you''re wearing it today and then immediately feel naughty for even having thought that.'
-			act 'Finish':gt 'rolanbath', 'start'
-		end
-	end
 	if pregtest > 0 and (abortionbirthdate = 0 or daystart - abortionbirthdate > 100):
 		act 'Do a pregnancy test':
 			cla
@@ -457,27 +421,8 @@ if $ARGS[0] = 'start':
 			act 'Finish':gt 'rolanbath', 'start'
 		end
 	end
-	if vibrator = 1 and vibratorIN = 1:
-		act 'Remove the vibrator (0:05)':
-			*clr & cla
-			minut += 5
-			vibratorIN = 0
-			if pcs_vag < 30:pcs_vag += 1
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			'You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.'
-			act 'Finish':gt 'rolanbath', 'start'
-		end
-	elseif vibrator = 1 and vibratorIN = 0 and pcs_vag > 0:
-		act 'Insert the vibrator in your vagina (0:05)':
-			*clr & cla
-			minut += 5
-			vibratorIN = 1
-			if pcs_vag < 30:pcs_vag += 2
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			'You spread your legs and slowly insert the vibrator in your pussy, wondering if anyone will notice you wearing it today.'
-			act 'Finish':gt 'rolanbath', 'start'
-		end
-	end
+	dynamic $toymanage
+	dynamic $enema
 end
 
 !Bathroom, Rolan caught:

+ 5 - 18
locations/saunawhore.qsrc

@@ -1054,23 +1054,9 @@ if $ARGS[0] = 'bathroom':
 		'Your razor blade looks in good enough shape for <b><<stanok>></b> more shaves.'	
 	end
 	gs 'din_van', 'prvt_pee'
-	if klismaday < daystart:
-		act 'Give yourself an enema (0:05)':
-			cla
-			*clr
-			cumspclnt = 7
-			gs 'cum_cleanup'
-			minut += 5
-			klismaday = daystart
-			klismaday1 = 1
-
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/klisma.jpg"></center>'
-			*nl
-			'You give yourself an enema, feeling clean down there, hopefully avoiding any awkward surprises for clients.'
 
-			act 'Continue':gt $locM, $metkaM
-		end
-	end
+	dynamic $toymanage
+	dynamic $enema
 
 	if workdolg > 0:
 		if (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprok = 0 and isprokp = 0:
@@ -1095,8 +1081,9 @@ if $ARGS[0] = 'bathroom':
 	dynamic $quickwash
 	dynamic $bteeth
 	dynamic $basin
-	if breastpump > 0:
-		act 'Use breast pump':gt 'lact_lib', 'bp_milking'
+	dynamic $removepan
+	if breastpump > 0 and bp_unbox >= 1:
+		act 'Use breast pump' :gt 'lact_lib', 'bp_milking'
 	end
 end
 

+ 43 - 0
locations/saveupdater.qsrc

@@ -1,5 +1,48 @@
 # saveupdater
 
+!0.73 new menu.
+!delete old menus and rebuild.
+!killobj
+killvar 'Enable_settingmode'
+killvar 'menu_character'
+killvar 'menu_lookon'
+killvar 'menu_view'
+killvar 'menu_other'
+delobj '[Autosave]'
+delobj '<font color = green>Character</font>'
+delobj 'Skills'
+delobj 'Statistics'
+delobj 'Pain'
+delobj 'Traits'
+delobj 'Fame'
+delobj 'Renown'
+delobj 'Magic'
+delobj 'Face'
+delobj 'Body'
+delobj 'Clothing'
+delobj 'Panties'
+delobj 'Shoes'
+delobj 'Tattoos'
+delobj 'Piercing'
+delobj 'Phone'
+delobj 'Purse'
+delobj 'Notebook'
+delobj 'Refresh'
+delobj 'Settings'
+delobj 'Cheats'
+delobj '<font color = red><b>[</b></font>Autosave<font color = red><b>]</b></font>'
+delobj '<font color = green><b>[</b></font>Autosave<font color = green><b>]</b></font>'
+delobj ''
+delobj '<font color = red>Emergency</font>'
+delobj '<img src="images/system/icon/pers.png">'
+delobj '<img src="images/system/icon/look.png">'
+delobj '<img src="images/system/icon/proch.png">'
+delobj '<img src="images/system/icon/menu.png">'
+delobj '<img src="images/system/icon/phone.png">'
+delobj '<img src="images/system/icon/purse.png">'
+!add menus back to utility menu.
+gs 'obj_din', 'old'
+
 ! 0.72 water to pcs_hydra
 if water > 0: pcs_hydra = water & killvar 'water'
 ! 0.72 pavSharedApt changes.

+ 1 - 0
locations/sexshop.qsrc

@@ -673,6 +673,7 @@ if $ARGS[0] = 'toi':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 if $ARGS[0] = 'pip':

+ 0 - 2
locations/shop.qsrc

@@ -309,8 +309,6 @@ if $shoplocation= 'cosmetics':
 	end
 
 	act 'Leave the cosmetics department':
-		if menu_option = 1:gs 'obj_din', 'old'
-		if menu_option = 0:gs 'obj_din', 'new'
 		gt 'shop', 'start'
 	end
 	if $loc = 'torgcentr': gs 'shoplifting', 'city'

+ 3 - 63
locations/shulgabath.qsrc

@@ -43,6 +43,7 @@ if $ARGS[0] = 'start':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $wearpan
+	dynamic $removepan
 	dynamic $basin
 
 	if (cumloc[6] = 1 or cumloc[7] = 1):
@@ -59,47 +60,8 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if klisma = 1 and (klismaday ! daystart or arrpos('sparrloc', 3) ! -1):
-		act 'Give yourself an enema (0:05)':
-			*clr & cla
-			cumspclnt = 7
-			gs 'cum_cleanup'
-			minut += 5
-			klismaday = daystart
-			klismaday1= 1
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/klisma.jpg"></center>'
-			'You give yourself an enema, feeling clean down there. Your ass is now ready for anal sex without any awkward surprises.'
-			act 'Finish':gt 'shulgabath', 'start'
-		end
-	end
-
-	if analplug = 1 and analplugin = 1:
-		act 'Take out your butt plug (0:05)':
-			*clr & cla
-			minut += 5
-			analplugIN = 0
-			if pcs_ass < 30:pcs_ass += 1
-
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			'You squat and tug gently at the butt plug, gasping as you push it out of you. You can''t help but feel a bit empty, now that it''s out.'
-			act 'Finish':gt 'shulgabath', 'start'
-		end
-	elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
-		act 'Wear your butt plug (0:05)':
-			*clr & cla
-			minut += 5
-			analplugIN = 1
-			if pcs_ass < 10:pcs_ass = pcs_ass + 5
-			if pcs_ass >= 10 and pcs_ass < 20:pcs_ass += rand(1, 2)
-			if pcs_ass >= 20 and pcs_ass < 30:pcs_ass += rand(0, 1)
-
-			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
-			if butpluguse > 0:'You squat and gently rub the butt plug against your anus, after lubricating it with a bit of saliva. After a short while, you''ve relaxed enough to be able to push it in. Once it''s in you give it a few gentle tugs, wondering if anyone will catch you wearing it today.'
-			if butpluguse = 0:butpluguse = 1 & '"If I''m not going to use it, then why did I buy it?" you ask yourself. You look at the butt plug for a while, thinking "It is necessary to start developing my ass, so I could have great adventures someday... you could even say huge and thick adventures with crimson heads, uh, now I got carried away..." You''re slightly embarrassed at the thought for a second, but are then overcome by your horny fantasies. Determined to get the plug all the way in, you slowly press it against your asshole after lubricating it with a bit of saliva. It hurts a bit at first, but once the thickest part is in the rest follows rather easily. Patting yourself on your ass once it''s in, you wonder if anyone will notice you''re wearing it today and then immediately feel naughty for even having thought that.'
-
-			act 'Finish':gt 'shulgabath', 'start'
-		end
-	end
+	dynamic $toymanage
+	dynamic $enema
 
 	if pregtest > 0 and (abortionbirthdate = 0 or daystart - abortionbirthdate > 100):
 		act 'Do a pregnancy test':
@@ -118,28 +80,6 @@ if $ARGS[0] = 'start':
 			act 'Finish':gt 'shulgabath', 'start'
 		end
 	end
-
-	if vibrator = 1 and vibratorIN = 1:
-		act 'Remove the vibrator (0:05)':
-			*clr & cla
-			minut += 5
-			vibratorIN = 0
-			if pcs_vag < 30:pcs_vag += 1
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			'You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.'
-			act 'Finish':gt 'shulgabath', 'start'
-		end
-	elseif vibrator = 1 and vibratorIN = 0 and pcs_vag > 0:
-		act 'Insert the vibrator in your vagina (0:05)':
-			*clr & cla
-			minut += 5
-			vibratorIN = 1
-			if pcs_vag < 30:pcs_vag += 2
-			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-			'You spread your legs and slowly insert the vibrator in your pussy, wondering if anyone will notice you wearing it today.'
-			act 'Finish':gt 'shulgabath', 'start'
-		end
-	end
 end
 
 !Bathroom, Sonia choice opening event:

+ 10 - 0
locations/sitrPar.qsrc

@@ -71,5 +71,15 @@ elseif month = 1 and day = 1:
 	end
 end
 
+if ocpd_room = 0 and breastpump = 1 and bp_unbox <= 0:
+	'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Unbox</a> your breast pump'
+elseif kid >= 1 and breastpump = 1 and bp_unbox <= 0:
+	'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Unbox</a> your breast pump'
+elseif ocpd_room = 0 and breastpump = 1 and bp_unbox = 1 and pcs_inbition > 40:
+	'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Try out</a> your breast pump'
+elseif kid >= 1 and breastpump = 1 and bp_unbox = 1 and pcs_inbition > 30:
+	'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Try out</a> your breast pump'
+end
+
 --- sitrPar ---------------------------------
 

+ 1 - 5
locations/stat.qsrc

@@ -6,11 +6,7 @@ if opPRE > 0: exit
 if Enable_Android = 0:
 	clr
 	!only clear status and renew object in non-Android mode
-	if oldobjmenu = 0:
-		gs 'obj_din', 'new'
-	else
-		gs 'obj_din', 'old'
-	end
+	gs 'obj_din', 'old'
 end
 
 if daystart_start < 100:

+ 18 - 15
locations/stat_display.qsrc

@@ -142,7 +142,7 @@ if Enable_showstatimg = 1 or Enable_statimg_loc > 0:
 		$img_temp = FUNC('$body_image','shoes')
 		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img <<$set_statimgh>> src="<<$img_temp>>"></a> '
 	end
-	$stat_imgtool_msg += ' <a href="exec:gs ''Cheatmenu_din'' & Enable_settingmode = 1 & dynamic $cheatmenu[''display'']">◎Setting</a>'
+	$stat_imgtool_msg += ' <a href="exec:gs ''Cheatmenu_din'' & dynamic $cheatmenu[''setting'']">◎Settings</a>'
 
 end
 !!----------------image Extra messages, end --------------------------
@@ -164,6 +164,10 @@ $stat_android += '<<$week[week]>> <<day>>/<<month>>, <<money>> ₽, <a href="exe
 ! $stat_android for short desc in android mode, $stat_msg for status bar.
 if StoryLine > 0 and SchoolAtestat = 0 and $holyday ! '': $stat_msg += '<BR><<$holyday>>' & $stat_msg += '<BR>'
 if birthday = day and birthmonth = month: $stat_msg += '<BR><b>Today is your birthday.</b>' & $stat_msg += '<BR>'
+
+!New icon based menu.
+$stat_msg += '<table><tr><td><a href="exec:killvar ''menu_page'' & gt ''obj_din'', ''description''"><img src="images/system/menu icons/icon_character.png"></a></td><td><a href="exec:killvar ''menu_page'' & gt ''obj_din'', ''face''"><img src="images/system/menu icons/icon_lookself.png"></a></td>'+iif(bag > 0,'<td><a href="exec:dynamic $d_bag"><img src="images/system/menu icons/icon_purse.png"></a></td>','')+'<td><a href="exec:gs ''telefon'',''Phone_menu''"><img src="images/system/menu icons/icon_phone.png"></a></td><td><a href="exec:gt ''obj_din'', ''records''"><img src="images/system/menu icons/icon_additional.png"></a></td><td><a href="exec:killvar ''menu_page'' & gs''$menu_setting''"><img src="images/system/menu icons/icon_menu.png"></a></td></tr></table>'
+
 $pockets = 'Pockets'
 if bag > 0: $pockets = 'Purse'
 if bankAccount = 0 and stolmoney = 0:
@@ -269,13 +273,11 @@ else
 			$dom_stat_msg = 'neutral'
 		end
 
-		$stat_extra_msg += '<font color="<<$st_temp>>"><TABLE cellpadding="1" cellspacing="0" width="300"><TR><TD width="85%">'+FUNC('indiktab', '3', 100+pcs_dom-sub, 100+pcs_dom-sub,$dom_stat_msg)+'</TD><TD> Dominance</TD></TR>  <TR><TD width="85%">'+FUNC('indiktab', '1', pcs_stren, pcs_stren)+'</TD><TD> Strength</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_agil, pcs_agil)+'</TD><TD> Agility</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_vital, pcs_vital)+'</TD><TD> Endurance</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_intel, pcs_intel)+'</TD><TD> Intelligence</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_sprt, pcs_sprt)+'</TD><TD> Spirit</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_react, pcs_react)+'</TD><TD nowrap> Mental Agility</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_chrsm, pcs_chrsm)+'</TD><TD> Charisma</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_prcptn, pcs_prcptn)+'</TD><TD> Perception</TD></TR>'
+		$stat_extra_msg += '<font color="<<$st_temp>>"><TABLE cellpadding="1" cellspacing="0" width="300"><TR><TD width="85%">'+FUNC('indiktab', '3', 100+pcs_dom-sub, 100+pcs_dom-sub,$dom_stat_msg)+'</TD><TD> Dominance</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', 100 - pcs_inhib, 100 - pcs_inhib)+'</TD><TD> Inhibition</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_stren, pcs_stren)+'</TD><TD> Strength</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_agil, pcs_agil)+'</TD><TD> Agility</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_vital, pcs_vital)+'</TD><TD> Endurance</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_intel, pcs_intel)+'</TD><TD> Intelligence</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_sprt, pcs_sprt)+'</TD><TD> Spirit</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_react, pcs_react)+'</TD><TD nowrap> Reaction</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_chrsm, pcs_chrsm)+'</TD><TD> Charisma</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_prcptn, pcs_prcptn)+'</TD><TD> Perception</TD></TR>'
 		if MagikDostup = 0: $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_magik, pcs_magik)+'</TD><TD> Magic</TD></TR>'
 		if succubusflag = 1: $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', sucexcess, sucexcess)+'</TD><TD> Succubus Energy</TD></TR>'
 		$stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_apprnc / 2, pcs_apprnc)+'</TD><TD> Attractiveness</TD></TR>'
 		if SchoolAtestat = 0 and StoryLine > 0:$stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_grades, pcs_grades)+'</TD><TD nowrap> School Grades</TD></TR>'
-		$stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', 100 - pcs_inhib, 100 - pcs_inhib)+'</TD><TD> Inhibition</TD></TR>'
-		if pcs_heels > 0:$stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_heels, pcs_heels)+'</TD><TD> Heels skill</TD></TR>'
 		$stat_extra_msg += '</TABLE></font>'
 		killvar '$dom_stat_msg'
 	else
@@ -288,7 +290,8 @@ else
 		else
 			$stat_extra_msg += ' (natural)'
 		end
-!		$stat_extra_msg += '<BR>'
+		gs 'indik', '1', 100 - pcs_inhib, 100 - pcs_inhib
+		$stat_extra_msg += '<BR><<$ind>> inhibition'
 		gs 'indik', '1', pcs_stren, pcs_stren
 		$stat_extra_msg += '<BR><<$ind>> Strength'
 		gs 'indik', '1', pcs_agil, pcs_agil
@@ -300,7 +303,7 @@ else
 		gs 'indik', '1', pcs_sprt, pcs_sprt
 		$stat_extra_msg += '<BR><<$ind>> Spirit'
 		gs 'indik', '1', pcs_react, pcs_react
-		$stat_extra_msg += '<BR><<$ind>> Mental Agility'
+		$stat_extra_msg += '<BR><<$ind>> Reaction'
 		gs 'indik', '1', pcs_chrsm, pcs_chrsm
 		$stat_extra_msg += '<BR><<$ind>> Charisma'
 		gs 'indik', '1', pcs_prcptn, pcs_prcptn
@@ -321,13 +324,6 @@ else
 			$stat_extra_msg += '<BR><<$ind>> School Grades'
 		end
 
-		gs 'indik', '1', 100 - pcs_inhib, 100 - pcs_inhib
-		$stat_extra_msg += '<BR><<$ind>> inhibition'
-
-		if pcs_heels > 0:
-			gs 'indik', '1', pcs_heels, pcs_heels
-			$stat_extra_msg += '<BR><<$ind>> Heels skill'
-		end
 		$stat_extra_msg += '<BR>'
 	end
 end
@@ -370,7 +366,8 @@ else
 		if pcs_shoot > 0: gs 'show_table', '<<pcs_shoot>> Marksmanship', '2'
 		if pcs_chess > 0: gs 'show_table', '<<pcs_chess>> Chess', '2'
 		if pcs_icesktng > 0: gs 'show_table', '<<pcs_icesktng>> Ice Skating', '2'
-		if pcs_ttgmng > 0: gs 'show_table', '<<pcs_ttgmng>> Gaming', '2'
+		if pcs_ttgmng > 0: gs 'show_table', '<<pcs_ttgmng>> Tabletop Gaming', '2'
+		if pcs_gaming > 0: gs 'show_table', '<<pcs_gaming>> Video Gaming', '2'
 		if pcs_pool > 0: gs 'show_table', '<<pcs_pool>> Pool', '2'
 	end
 
@@ -384,6 +381,7 @@ else
 		if pcs_dancero > 0: gs 'show_table', '<<pcs_dancero>> Erotic Dancing', '2'
 		if pcs_dancpol > 0: gs 'show_table', '<<pcs_dancpol>> Pole Dancing', '2'
 		if pcs_mdlng > 0: gs 'show_table', '<<pcs_mdlng>> Modelling', '2'
+		if pcs_heels > 0: gs 'show_table', '<<pcs_heels>> Heels', '2'
 	end
 
 	!!---------------------Artistic skills-------------------
@@ -666,7 +664,11 @@ if dirtyclothes = 1 and swamp_clothes = 0:
 	end
 end
 
-if lactate = 1:
+if lactate <= 0 and prolactinlvl >= 100:
+	$stat_msg += '<BR>'+iif(night_mode = 1,'<font color = white>','<font color = black>')+'Your breasts feel weirdly engorged and sore.</font><BR>'
+end
+
+if lactate >= 1:
 	if lactatemv >= lactatemm-1:
 		if lact_engorgement > 0 and lact_engorgement < 3:
 			$stat_msg += '<BR><font color = orange>Your breasts are so full they hurt.</font><BR>'
@@ -1240,6 +1242,7 @@ if StoryLine = 1:
 	if week = 6 and hour < 9 and detention_set = 1:$stat_msg += '<BR><b>You have a detention this morning and must be at school between 8 and 9.</b>'
 	if gopnik_initiation = 1 and gopnik_initiation_day = daystart and hour > 15 and hour < 21: $stat_msg += '<BR><b>Meet Lena and Lera at the apartment garages at eight</b>'
 	if nerd_night_game = 1 and nerd_night_game_day = daystart and hour > 15 and hour < 21: $stat_msg += '<BR><b>Join nerds at the community center at eight</b>'
+	if InvitationToDimkaNYparty = 1 and month = 12 and day = 31: $stat_msg += '<BR><b>Go to the residential area between 15:00 and 18:00 to go to Dimka''s New Year party.</b>'
 end
 
 if model > 0 and model_week = (daystart - week) / 7 and model_job_week >= 2:

+ 22 - 16
locations/stol.qsrc

@@ -5,7 +5,10 @@ Added birth control control options to desk in Pavlovsk and "Bric-a-Brac drawer"
 }
 if $ARGS[0] = 'start':
 	cla
-	clr
+	*clr
+	'<center><h1>Desk</h1></center>'
+	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	*nl
 	gs 'stat'
 	'Bric-a-brac drawer.'
 
@@ -16,13 +19,13 @@ if $ARGS[0] = 'start':
 	if dildo > 0:'Realistic Dildo.'
 
 	if mentats_have > 0:
-		pl'<a href="exec:dynamic $use_mentats & gt ''stol'', ''start''"><b>Take neurobooster pill.</b></a> Uses left: <<mentats_have>>. Warning on the box says not to take more than one per day.'
+		'<a href="exec:dynamic $use_mentats & gt ''stol'', ''start''"><b>Take neurobooster pill.</b></a> Uses left: <<mentats_have>>. Warning on the box says not to take more than one per day.'
 	end
 	if steroid_have > 0:
-		pl'<a href="exec:dynamic $use_steroids & gt ''stol'', ''start''"><b>Take steroids.</b></a> Uses left: <<steroid_have>>.'
+		'<a href="exec:dynamic $use_steroids & gt ''stol'', ''start''"><b>Take steroids.</b></a> Uses left: <<steroid_have>>.'
 	end
 	if aphrodisiac_have > 0:
-		pl'<a href="exec:dynamic $use_aphrodisiac & gt ''stol'', ''start''"><b>Chew aphrodisiac gum.</b></a> Uses left: <<aphrodisiac_have>>.'
+		'<a href="exec:dynamic $use_aphrodisiac & gt ''stol'', ''start''"><b>Chew aphrodisiac gum.</b></a> Uses left: <<aphrodisiac_have>>.'
 	end
 
 	act 'Close the drawer':
@@ -67,25 +70,26 @@ end
 if $ARGS[0] = 'fin':
 	cla
 	gt $loc, $metka
-
 end
 
 if $ARGS[0] = 'stolPar':
+	*clr & cla
 	gs'stat'
-
+	'<center><h1>Desk</h1></center>'
 	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	*nl
 	'You sat down at his desk.'
 	act 'Check birth control': gt 'stol', 'bc'
 	act 'Get up from the table':gt $loc, $metka
 
 	if mentats_have > 0:
-		pl'<a href="exec:dynamic $use_mentats & gt ''stol'', ''stolPar''"><b>Take neurobooster pill.</b></a> Uses left: <<mentats_have>>. Warning on the box says not to take more than one per day.'
+		'<a href="exec:dynamic $use_mentats & gt ''stol'', ''stolPar''"><b>Take neurobooster pill.</b></a> Uses left: <<mentats_have>>. Warning on the box says not to take more than one per day.'
 	end
 	if steroid_have > 0:
-		pl'<a href="exec:dynamic $use_steroids & gt ''stol'', ''stolPar''"><b>Take steroids.</b></a> Uses left: <<steroid_have>>.'
+		'<a href="exec:dynamic $use_steroids & gt ''stol'', ''stolPar''"><b>Take steroids.</b></a> Uses left: <<steroid_have>>.'
 	end
 	if aphrodisiac_have > 0:
-		pl'<a href="exec:dynamic $use_aphrodisiac & gt ''stol'', ''stolPar''"><b>Chew aphrodisiac gum.</b></a> Uses left: <<aphrodisiac_have>>.'
+		'<a href="exec:dynamic $use_aphrodisiac & gt ''stol'', ''stolPar''"><b>Chew aphrodisiac gum.</b></a> Uses left: <<aphrodisiac_have>>.'
 	end
 
 	if lernHome > 0:
@@ -111,8 +115,10 @@ if $ARGS[0] = 'stolPar':
 end
 
 if $ARGS[0] = 'bc':
-	cls 
-	cla
+	*clr & cla
+	'<center><h1>Desk</h1></center>'
+	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	*nl
 	gs 'stat'
 	gs 'din_bad'
 	'In the drawer of your desk, you store your birth control.'
@@ -122,16 +128,16 @@ if $ARGS[0] = 'bc':
 		elseif preziktype < 2 and preziksabo = 0:
 			'You have <<prezik+prezikcount>> <a href="exec:dynamic $din_Table_Condom_Menu"><b>condoms.</b></a>'
 		END
-		NL
+		*nl
 	else
-		pl 'You are out of condoms.'
+		'You are out of condoms.'
 	end
 	if tabletki > 0 and pillsleft[ptype] > 0:
-		'You have <<tabletki>> unopened packages of <a href="exec:dynamic $d_tabletkied">birth control pills</a> and <<pillsleft[ptype]>> pills left in your opened package.</b>'
+		'You have <<tabletki>> unopened packages of <a href="exec:dynamic $d_tabletkiedt">birth control pills</a> and <<pillsleft[ptype]>> pills left in your opened package.</b>'
 	elseif tabletki	= 0 and pillsleft[ptype] > 0:
-		'You have <<pillsleft[ptype]>> <a href="exec:dynamic $d_tabletkied">birth control pills</a> left.</b>'
+		'You have <<pillsleft[ptype]>> <a href="exec:dynamic $d_tabletkiedt">birth control pills</a> left.</b>'
 	elseif tabletki > 0 and pillsleft[ptype] = 0:
-		'You have <<tabletki>> unopened packages of <a href="exec:dynamic $d_tabletkied">birth control pills</a>.'
+		'You have <<tabletki>> unopened packages of <a href="exec:dynamic $d_tabletkiedt">birth control pills</a>.'
 	else
 		'You are out of birth control pills.'
 	end

+ 3 - 19
locations/stwork.qsrc

@@ -151,28 +151,12 @@ if $ARGS[0] = 'toilet':
 		dynamic $brit
 	end
 	gs 'din_van', 'prvt_pee'
-	if klismaday < daystart:
-		act 'Give yourself an enema (0:05)':
-			'<h3>Toilet</h3>'
-			'<h5>Enema</h5>'
-			cla
-			*clr
-			cumspclnt = 7
-			gs 'cum_cleanup'
-			minut += 5
-			klismaday = daystart
-			klismaday1 = 1
-
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/klisma.jpg"></center>'
-			*nl
-			'You give yourself an enema, feeling clean down there, hopefully avoiding any awkward surprises.'
-
-			act 'Continue':gt $locM, $metkaM
-		end
-	end
+	dynamic $toymanage
+	dynamic $enema
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 --- stwork ---------------------------------

+ 1 - 1
locations/swamphouse.qsrc

@@ -176,7 +176,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			end
 		end
 	end
-	if breastpump > 0:
+	if breastpump > 0 and bp_unbox >= 1:
 		act 'Use breast pump':
 			gt 'lact_lib', 'bp_milking'
 		end

+ 2 - 2
locations/telefon.qsrc

@@ -997,8 +997,8 @@ if $ARGS[0] = 'Phone_menu':
 	pl'<center><a href="exec:gs ''telefon'', ''Phone_camera'' "><img src="<<FUNC(''$phone_theme'')>>icon_camera.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_calendar'' "><img src="<<FUNC(''$phone_theme'')>>icon_calendar.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_pictures'' "><img src="<<FUNC(''$phone_theme'')>>icon_pictures.png" height="80" width="80"></a></center>'
 	pl'<center><a href="exec:gs ''telefon'', ''Phone_media'' "><img src="<<FUNC(''$phone_theme'')>>icon_music.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_notebook'' "><img src="<<FUNC(''$phone_theme'')>>icon_notebook.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_wheather'' "><img src="<<FUNC(''$phone_theme'')>>icon_weather.png" height="80" width="80"></a></center>'
 	pl'<center><a href="exec:gs ''telefon'', ''Phone_contactlist'' "><img src="<<FUNC(''$phone_theme'')>>icon_call.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_sms'' "><img src="<<FUNC(''$phone_theme'')>>icon_sms.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_megafon'' "><img src="<<FUNC(''$phone_theme'')>>icon_megafon.png" height="80" width="80"></a></center>'
-	pl'<center><a href="exec:gs ''Cheatmenu_din'' & Enable_settingmode = 1 & dynamic $cheatmenu[''display'']"><img src="<<FUNC(''$phone_theme'')>>icon_settings.png" height="80" width="80"></a></center>'
-	pl'<center><a href="exec:gs''stat''"><img src="images/system/icon/back.png"></a></center>'
+	pl'<center><a href="exec:gs ''Cheatmenu_din'' & dynamic $cheatmenu[''setting'']"><img src="<<FUNC(''$phone_theme'')>>icon_settings.png" height="80" width="80"></a></center>'
+	pl'<center><a href="exec:clr & gs''stat''"><img src="images/system/icon/back.png"></a></center>'
 end &! --- Phone_menu ---
 
 if $ARGS[0] = 'Add_contact':

+ 60 - 57
locations/traits.qsrc

@@ -1,93 +1,96 @@
 # traits
 
 if $ARGS[0] = 'menu':
-	clr
-	pl '<center>Traits Menu</center>'
-	pl'<a href="exec:gs ''stat''">Leave</a>'
-	nl
-	pl '<b>Bimbo</b>'
+	*clr & cla
+	gs 'obj_din', 'chartabs'
+	'<center><h2>Traits</h2></center>'
+	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td>'
+	'<center><b>Bimbo</b></center>'
 	if bimbolevel = 0:
-		pl 'You do not have this trait.'
-		pl 'To gain this trait you must wear bimbo clothing / shoes for a few days.'
-		pl 'You have <<bimbo>> out of 10 points towards level 1.'
+		'You do not have this trait.'
+		'To gain this trait you must wear bimbo clothing / shoes for a few days.'
+		'You have <<bimbo>> out of 10 points towards level 1.'
 	elseif bimbolevel = 1:
-		pl 'You have this trait at level 1.'
-		pl 'To maintain this trait you must wear bimbo clothing / shoes and/or have regular sex.'
-		pl 'Due to this trait you gain a very small bonus to appearance and a very small penalty to intelligence.'
-		pl 'You have <<bimbo>> out of 20 points towards level 2.'
+		'You have this trait at level 1.'
+		'To maintain this trait you must wear bimbo clothing / shoes and/or have regular sex.'
+		'Due to this trait you gain a very small bonus to appearance and a very small penalty to intelligence.'
+		'You have <<bimbo>> out of 20 points towards level 2.'
 		if bimbowithdrawal = 0:
-			pl 'You are not in withdrawal.'
+			'You are not in withdrawal.'
 		else
-			pl 'You have <<bimbowithdrawal>> out of 30 points towards losing this trait.'
+			'You have <<bimbowithdrawal>> out of 30 points towards losing this trait.'
 		end
 	elseif bimbolevel = 2:
-		pl 'You have this trait at level 2.'
-		pl 'To maintain this trait you must wear bimbo clothing / shoes and/or have regular sex.'
-		pl 'Due to this trait you gain a small bonus to appearance and a small penalty to intelligence.'
-		pl 'You have <<bimbo>> out of 30 points towards level 3.'
+		'You have this trait at level 2.'
+		'To maintain this trait you must wear bimbo clothing / shoes and/or have regular sex.'
+		'Due to this trait you gain a small bonus to appearance and a small penalty to intelligence.'
+		'You have <<bimbo>> out of 30 points towards level 3.'
 		if bimbowithdrawal = 0:
-			pl 'You are not in withdrawal.'
+			'You are not in withdrawal.'
 		else
-			pl 'You have <<bimbowithdrawal>> out of 30 points towards losing this trait.'
+			'You have <<bimbowithdrawal>> out of 30 points towards losing this trait.'
 		end
 	else
-		pl 'You have this trait at level 3.'
-		pl 'To maintain this trait you must wear bimbo clothing / shoes and/or have regular sex.'
-		pl 'Due to this trait you gain a moderate bonus to appearance and a moderate penalty to intelligence.'
+		'You have this trait at level 3.'
+		'To maintain this trait you must wear bimbo clothing / shoes and/or have regular sex.'
+		'Due to this trait you gain a moderate bonus to appearance and a moderate penalty to intelligence.'
 		if bimbowithdrawal = 0:
-			pl 'You are not in withdrawal.'
+			'You are not in withdrawal.'
 		else
-			pl 'You have <<bimbowithdrawal>> out of 30 points towards losing this trait.'
+			'You have <<bimbowithdrawal>> out of 30 points towards losing this trait.'
 		end
 	end
-	nl
-	pl '<b>Exhibitionist</b>'
+	*nl
+	'<center><b>Exhibitionist</b></center>'
 	if Exhibitionist_lvl = 0:
-		pl 'You do not have this trait.'
-		pl 'To gain this trait you must have low enough inhibition and choose to expose your breasts in public.'
-		pl 'You have <<pcs_exhib>> out of 10 points towards level 1. This will slowly decrease each day unless you expose yourself.'
-    elseif Exhibitionist_lvl = 1:
-		pl 'You have this trait at level 1.'
-		pl 'To increase this trait you must choose to expose your breasts and/or bare bottom in public.'
-		pl 'This trait grants you a small amount or excitement from exposing yourself.'
-		pl 'You have <<pcs_exhib>> out of 50 points towards level 2.'
-    elseif Exhibitionist_lvl = 2:
-		pl 'You have this trait at level 2.'
-		pl 'To increase this trait you must choose to expose your breasts, bare bottom and/or pussy in public.'
-		pl 'This trait grants you a moderate amount or excitement from exposing yourself.'
+		'You do not have this trait.'
+		'To gain this trait you must have low enough inhibition and choose to expose your breasts in public.'
+		'You have <<pcs_exhib>> out of 10 points towards level 1. This will slowly decrease each day u*nless you expose yourself.'
+	elseif Exhibitionist_lvl = 1:
+		'You have this trait at level 1.'
+		'To increase this trait you must choose to expose your breasts and/or bare bottom in public.'
+		'This trait grants you a small amount or excitement from exposing yourself.'
+		'You have <<pcs_exhib>> out of 50 points towards level 2.'
+	elseif Exhibitionist_lvl = 2:
+		'You have this trait at level 2.'
+		'To increase this trait you must choose to expose your breasts, bare bottom and/or pussy in public.'
+		'This trait grants you a moderate amount or excitement from exposing yourself.'
 		if pcs_exhib < 100:
-			pl 'You have <<pcs_exhib>> out of 100 points towards level 3.'
+			'You have <<pcs_exhib>> out of 100 points towards level 3.'
 		else
-			pl 'You must trigger an event in the park to gain level 3.'
+			'You must trigger an event in the park to gain level 3.'
 		end
-    else
-		pl 'You have this trait at level 3.'
-		pl 'This is the highest level of this trait.'
-		pl 'This trait grants you a large amount or excitement from exposing yourself.'
-    end
-	nl
-	pl '<b>Cumeater</b>'
+	else
+		'You have this trait at level 3.'
+		'This is the highest level of this trait.'
+		'This trait grants you a large amount or excitement from exposing yourself.'
+	end
+	*nl
+	'<center><b>Cumeater</b></center>'
 	if trt_cumeater = 0:
-		pl 'You do not have this trait.'
-		pl 'To gain this trait you must swallow cum 10 times.'
-		pl 'You have swallowed cum <<swallow>> times.'
+		'You do not have this trait.'
+		'To gain this trait you must swallow cum 10 times.'
+		'You have swallowed cum <<swallow>> times.'
 	else
-		pl 'You have this trait.'
-		pl 'It allows you to remove cum from certain locations and eat it'
-		pl 'This trait cannot be lost.'
+		'You have this trait.'
+		'It allows you to remove cum from certain locations and eat it'
+		'This trait cannot be lost.'
 	end
+
+	act 'Exit the menu': gt $loc, $metka
+	'</td></tr></table></center>'
 end
 
 if $ARGS[0] = 'hourly':
 	if swallow >= 10 and trt_cumeater = 0:
 		trt_cumeater = 1
 		msg 'You have gained the trait "Cumeater"'
-	end	
+	end
 end
 
 if $ARGS[0] = 'overnight':
-	
-	
+
 end
 
 --- traits ---------------------------------

+ 1 - 0
locations/vokmantoiev.qsrc

@@ -32,6 +32,7 @@ if $ARGS[0] = 'female':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 if $ARGS[0] = 'male':

+ 6 - 0
locations/vokzalGin.qsrc

@@ -51,6 +51,12 @@ if $ARGS[0] = '':
 		act 'Go to the ticket office': gt 'vokzalGin', 'ticket'
 	end
 
+	if snarkozak = 1 and narkossista = 0 and narkozakday!day:
+		if money >= 1500:
+			act 'Find the drug dealer':gs 'events', 'snarkozaka'
+		end
+	end
+	
 	if vokzalVork >= 1:
 		if cleZalDay ! daystart or cleMTDay ! daystart or cleWTDay ! daystart:
 			act 'Work': gt 'vokzalGin', 'work'

+ 0 - 7
locations/vokzalperG.qsrc

@@ -20,13 +20,6 @@ gs'stat'
 '<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg"></center>'
 'Because Pavlovsk is a place that attracts a fair amount of tourists, the station can be quite busy at times. The busiest times on the platforms are between 11:00 and 11:30, and between 18:00 and 18:30 when the long-distance trains are ready for boarding.'
 
-if snarkozak = 1 and narkossista = 0 and narkozakday!day:
-    if money >= 2000:
-        act 'Find the drug dealer':gs 'events', 'snarkozaka'
-    end
-end
-
-
 if Trainpass_day > daystart:
 	act 'Take a train to the old town': gt 'vokzalGin', 'oldtown'
 

+ 2 - 1
locations/vokzaltoilet.qsrc

@@ -31,6 +31,7 @@ if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 dynamic $tampon
 dynamic $quickwash
 dynamic $basin
-	
+dynamic $removepan
+
 --- vokzaltoilet ---------------------------------
 

+ 0 - 2
locations/wardrobe.qsrc

@@ -145,8 +145,6 @@ if $ARGS[0] = 'default_entry_wear':
 	else
 		bag = 1
 	end
-	if menu_option = 1:dynamic $menu_addoldmenu
-	if menu_option = 0:gs 'obj_din', 'new'
 
 	if dyneval('RESULT = coat[<<defcoat[default_entry]>>]') = 0: defcoat[default_entry] = 0
 	defaultcoat = defcoat[default_entry]

+ 1 - 0
locations/zaprF.qsrc

@@ -121,6 +121,7 @@ if $ARGS[0] = 'toilet':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 --- zaprF ---------------------------------

+ 13 - 4
locations/zaprFWash.qsrc

@@ -103,7 +103,7 @@ if $ARGS[0] = 'titsQ':
 	'Want to earn some more cash, girl? Show me your tits. I''ll give you 100 <b>₽</b>. It''s easy money.'
 	
 	! inhibition or exhibitionism requirements needed to accept the offer or just have fun with him
-	if pcs_inhib >= 30 or pcs_horny >= 40: act 'Agree and show him your tits':gt 'zaprFWash', 'titsFlash', 'Paid', 'Question'
+	if exhibitionist_lvl > 0 or pcs_inhib >= 35 or pcs_horny >= 40: act 'Agree and show him your tits':gt 'zaprFWash', 'titsFlash', 'Paid', 'Question'
 	act 'Refuse':gt 'zaprFWash', 'refuse'
 end
 
@@ -265,7 +265,10 @@ if $ARGS[0] = 'titsFlash':
 		end
 	! flashing for cars just allows you to return to the gas station
 	else
-		act 'Go back to the gas station':gt 'zaprF', 'start'
+		act 'Go back to the gas station': 
+			if $ARGS[1] = 'Paid': slutty += 1
+			gt 'zaprF', 'start'
+		end
 	end
 end
 
@@ -349,7 +352,10 @@ if $ARGS[0] = 'assFlash':
 			act 'Continue':gt 'zaprFWash', 'pussyQ'
 		end
 	else
-		act 'Go back to the gas station':gt 'zaprF', 'start'
+		act 'Go back to the gas station': 
+			if $ARGS[1] = 'Paid': slutty += 1
+			gt 'zaprF', 'start'
+		end
 	end
 end
 
@@ -401,7 +407,10 @@ if $ARGS[0] = 'pussyFlash':
 			act 'Continue':gt 'zaprFWash', 'handQ'
 		end
 	else
-		act 'Go back to the gas station':gt 'zaprF', 'start'
+		act 'Go back to the gas station': 
+			if $ARGS[1] = 'Paid': slutty += 1
+			gt 'zaprF', 'start'
+		end
 	end
 end
 

Some files were not shown because too many files changed in this diff