Bladeren bron

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

KevinSmarts 5 jaren geleden
bovenliggende
commit
35b7448555
59 gewijzigde bestanden met toevoegingen van 2094 en 2080 verwijderingen
  1. 0 1
      glife.qproj
  2. 645 634
      locations/Cheatmenu_din.qsrc
  3. 2 78
      locations/Gadbana.qsrc
  4. 0 2
      locations/Gadsarai.qsrc
  5. 1 1
      locations/LOCA.qsrc
  6. 6 4
      locations/NPCChanger.qsrc
  7. 1 2
      locations/_body_image.qsrc
  8. 0 7
      locations/_menu_addoldmenu.qsrc
  9. 1 1
      locations/_menu_avariya.qsrc
  10. 1 1
      locations/_menu_body.qsrc
  11. 1 1
      locations/_menu_descrip.qsrc
  12. 1 1
      locations/_menu_face.qsrc
  13. 1 2
      locations/_menu_setting.qsrc
  14. 2 0
      locations/abduction.qsrc
  15. 0 2
      locations/arturend.qsrc
  16. 5 7
      locations/begin.qsrc
  17. 24 26
      locations/body.qsrc
  18. 2 84
      locations/brothel.qsrc
  19. 2 6
      locations/brother_voyeur.qsrc
  20. 1 0
      locations/butoilet.qsrc
  21. 1 0
      locations/club.qsrc
  22. 3 9
      locations/cum_arrcheat.qsrc
  23. 1 0
      locations/dimaHome.qsrc
  24. 125 109
      locations/din_bad.qsrc
  25. 303 430
      locations/din_van.qsrc
  26. 1 0
      locations/gdktoilet.qsrc
  27. 1 0
      locations/gschool_grounds.qsrc
  28. 29 28
      locations/igorhome.qsrc
  29. 1 0
      locations/kafe2.qsrc
  30. 1 0
      locations/koncepod1.qsrc
  31. 1 0
      locations/laketoilet.qsrc
  32. 1 0
      locations/leonid.qsrc
  33. 0 6
      locations/mainQW.qsrc
  34. 2 3
      locations/mod_setting.qsrc
  35. 733 241
      locations/obj_din.qsrc
  36. 29 81
      locations/onobjsel.qsrc
  37. 34 30
      locations/pornhist.qsrc
  38. 0 15
      locations/preALT.qsrc
  39. 0 12
      locations/preNT.qsrc
  40. 0 4
      locations/preSYS.qsrc
  41. 1 3
      locations/preSYS2.qsrc
  42. 0 6
      locations/preTG.qsrc
  43. 0 4
      locations/purses.qsrc
  44. 1 0
      locations/qwBarPoletToilet.qsrc
  45. 2 58
      locations/rolanbath.qsrc
  46. 2 16
      locations/saunawhore.qsrc
  47. 43 0
      locations/saveupdater.qsrc
  48. 1 0
      locations/sexshop.qsrc
  49. 0 2
      locations/shop.qsrc
  50. 2 63
      locations/shulgabath.qsrc
  51. 0 5
      locations/stat.qsrc
  52. 12 14
      locations/stat_display.qsrc
  53. 2 19
      locations/stwork.qsrc
  54. 2 2
      locations/telefon.qsrc
  55. 60 57
      locations/traits.qsrc
  56. 1 0
      locations/vokmantoiev.qsrc
  57. 2 1
      locations/vokzaltoilet.qsrc
  58. 0 2
      locations/wardrobe.qsrc
  59. 1 0
      locations/zaprF.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>

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


+ 2 - 78
locations/Gadbana.qsrc

@@ -98,6 +98,7 @@ if mira = 0:
 	gs 'din_van', 'prvt_pee'
 	dynamic $tampon
 	dynamic $wearpan
+	dynamic $removepan
 	dynamic $basin
 
 	if painkiller > 0:
@@ -161,71 +162,8 @@ if mira = 0:
 			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
 
 	if mosolmaz > 0 and mosol > 0 and mosal_time ! (daystart * 100) + hour:
 		act 'Rub ointment onto your pussy (0:05)':
@@ -239,20 +177,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':

+ 0 - 2
locations/Gadsarai.qsrc

@@ -361,8 +361,6 @@ if $ARGS[0] = '':
 					$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>'

+ 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

+ 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 ---------------------------------
 

+ 2 - 0
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>'

+ 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
 

+ 5 - 7
locations/begin.qsrc

@@ -3,10 +3,7 @@
 if $ARGS[0] = 'start':
 	$metka = '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>'
@@ -22,7 +19,7 @@ if $ARGS[0] = 'start':
 	'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
+		settingmode = 0
 		showstat 0
 		cla
 		act '<center>Show intro (recommended)</center>':
@@ -36,7 +33,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 +42,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 +50,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'

+ 2 - 84
locations/brothel.qsrc

@@ -504,93 +504,11 @@ 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 $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 	dynamic $brit
 	if painkiller > 0 and pain['total'] >0 and pain['killer'] = 0:
 		act 'Take a painkiller':

+ 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
 

+ 125 - 109
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,122 @@ $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><img src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"	height="300"></center>'
+	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>'
 }
 
 $d_kosmetitka = {
-	clr
-	pl '<a href="exec:gs ''stat''"><b>Close makeup bag</b></a>'
+	*clr & cla
+	gs 'stat'
+	'<center><img src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"	height="300"></center>'
 
-	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>'
+	'<a href="exec:gs ''stat'' & dynamic $d_bag"><b>Close makeup bag</b></a>'
 }
 
 $d_mouthwash = {
-	clr
+	*clr & cla
+	'<center><img src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"	height="300"></center>'
 	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.'
+	''
+	'<a href="exec:gs ''stat'' & dynamic $d_bag"><b>Done</b></a>'
+}
 
 $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><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
+	*nl
+	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: '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: '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''"><b>Brush your hair</b></a>'
+	if greben > 0 and pcs_hairbsh = 1: 'There''s a hairbrush in your purse.'
 	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.'
+		'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 have <<amphetamine>> tablets of amphetamine left in your purse. <b><a href="exec:dynamic $use_amphetamines & dynamic $d_bag">Take One</a></b>'
 	end
 	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.'
+		'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.'
+		'<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.'
+		'<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.'
+		'<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'
+		'<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:'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.'
+		'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.'
+		'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
+	end
 }
 
 $dinalkowin1 = {
+	*clr & cla
 	alkowine = 1
 	if pcs_hydra >= 100:
 		pcs_hydra -= 5
@@ -186,14 +195,16 @@ $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>'
 	'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
@@ -209,35 +220,38 @@ $dinalkowin2 = {
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/shared/food/alkowin.jpg"></center>'
 	'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><img src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"	height="300"></center>'
 	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>'
+	'<a href="exec:gs ''stat'' & dynamic $d_bag">Return</a>'
 }
 
 $din_Table_Condom_Menu = {
 	dynamic $din_Update_Condom_Counts
-	*clr
+	*clr & cla
+	'<center><img src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"	height="300"></center>'
 	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>.'
@@ -257,8 +271,9 @@ $din_Table_Condom_Menu = {
 
 $din_Do_Condom_Counts = {
 	!{set condom count and type}
+	*clr & cla
+	'<center><img src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"	height="300"></center>'
 	if ARGS[0] = 1:
-		clr
 		'Offer a condom the next time you have sex.'
 		if preziktype = 2: preziksabo = prezik
 		prezik = prezikcount
@@ -295,7 +310,7 @@ $din_Do_Condom_Counts = {
 		dynamic $din_Table_Condom_Menu
 	end
 }
-   
+
 $din_Update_Condom_Counts = {
 	if prezik + prezikcount + preziksabo > 0: prezikmsg = 1
 	if preziktype = 0:
@@ -335,17 +350,18 @@ $din_Update_Condom_Counts = {
 }
 
 $d_tabletkied = {
-	clr
+	*clr & cla
+	'<center><img src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"	height="300"></center>'
 	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>'
+	'<a href="exec:gs ''stat'' & dynamic $d_bag">Return</a>'
 }
 
 $d_tabletkiedt = {
@@ -357,7 +373,7 @@ $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>'
+	if tabletkioddk = 1:  '<a href="exec:*clr & dynamic $d_tabletkieda, 5">Dump the strange pills.</b></a>'
 	'<a href="exec:gt ''stol'', ''bc''">Return</a>'
 }
 
@@ -395,11 +411,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 +429,7 @@ $d_tabletkiedA = {
 		tabletkioddp = 0
 		gs 'stat'
 	end
-	
+
 	if tabloc = 0:
 		dynamic $d_tabletkied
 	else
@@ -422,37 +438,37 @@ $d_tabletkiedA = {
 }
 
 $d_cycreport_choice = {
-	clr
+	*clr & cla
 	dynamic $d_cycreport_update
-	pl 'Current Status: <<$cycreport_txt>>.'
+	'Current Status: <<$cycreport_txt>>.'
 	if $cycreport_txt ! 'In labour':
 		*nl
-		pl 'Change Status because:'
+		'Change Status because:'
 		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">I''m pregnant.</a>'
+			else
+				'<a href="exec: dynamic $d_cycreport_actor, 2">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">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>'
+	'<a href="exec:gs ''stat'' & gt $loc, $metka">Return</a>'
 }
 
 $d_cycreport_actor = {
@@ -482,9 +498,9 @@ $d_cycreport_actor = {
 		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>'
+		'How many days ago was it you had your last period?'
+		'Currently: <<pertemp>>'
+		'<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>'
 	elseif ARGS[0] = 5:
 		thinkpreg = 0
 		denypreg = 0
@@ -492,9 +508,9 @@ $d_cycreport_actor = {
 		gs 'stat'
 	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>'
+		'How many days ago was it you had your last period?'
+		'Currently: <<pertemp>>'
+		'<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>'
 	elseif ARGS[0] = 7:
 		clr
 		tempmax = arrsize('$cumfthname')-1
@@ -503,19 +519,19 @@ $d_cycreport_actor = {
 		*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"><<$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">Unknown (-)</a>'
 				end
 			end
 		if tempcurr < tempmax:tempcurr += 1 & jump 'pickfathloop'
@@ -523,7 +539,7 @@ $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>'
 	elseif ARGS[0] = 10:
 		temp = arrsize('Babyptype')
 		temp -= 1

+ 303 - 430
locations/din_van.qsrc

@@ -206,146 +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.'
-						'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 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
-						'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
-			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.'
@@ -353,79 +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 >= 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
+					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
-			'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,227 +701,7 @@ $pirManage = {
 	act'<b>Back</b>':gt $loc, $metka
 }
 
-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>'
-	
-	!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 shampoo > 0 or $loc = 'vanrPar':
-		if $loc = 'vanrPar':
-			if shampoo < 1:shampoo = 1
-			'You are using your parents'' shampoo.'
-		else
-			'You have enough shampoo for <b><<shampoo>></b> uses.'
-		end
-		dynamic $shower
-		dynamic $bath
-	elseif shampoo = 0 and $loc = 'tanvanr':
-		shampoo = 1
-		'You can use Tanyas shampoo.'
-		gs 'din_van', 'prvt_pee'
-	else
-		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
-		gs 'din_van', 'prvt_pee'
-	end
-
-	if painkiller > 0:
-		$pluralS = 's'
-		if painkiller = 1:$pluralS = ''
-		'You have <b><<painkiller>></b> painkiller<<$pluralS>>.'
-		if pain['total'] > 0 and pain['killer'] = 0:
-			act 'Take a painkiller':
-				cla
-				pain['killer'] += 1
-				painkiller -= 1
-				pcs_hydra += 20
-				gs 'stat'
-
-				*nl
-				'You take a painkiller and gulp it down with a glass of water.'
-
-				act 'Finish':gt $loc, $metka
-			end
-		end
-	end
-
-	if bcream_have > 0:
-		'<a href="exec:dynamic $use_bcream & gt $loc, $metka">Apply breast cream.</a> Uses left: <<bcream_have>>.'
-	end
-
-	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings.</a>'
-
-	if fillimplant = 1 and siliconeBag >= 1:'<a href="exec:cls & siliconeBag -= 1 & silicone += 10 & gt $loc, $metka">Inject silicone into breast implants.</a>'
-	if fillimplant = 1 and silicone >= 20:'<a href="exec:cls & silicone -= 10 & gt $loc, $metka">Drain silicone from breast implants.</a>'
-
-	dynamic $bteeth
-
-	dynamic $tampon
-
-	dynamic $wearpan
-	act 'Check weight on the scales':
-		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
-			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
-			end
-		end
-		act 'Shave options': gt 'din_van', 'shave_options'
-	end
-
+$toymanage = {
 	if analplug = 1 and analplugin = 1:
 		act 'Remove your butt plug (0:05)':
 			cla
@@ -1095,6 +786,118 @@ if $ARGS[0] = 'private':
 			act 'Finish':gt $loc, $metka
 		end
 	end
+}
+
+if $ARGS[0] = 'private':
+	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 shampoo > 0 or $loc = 'vanrPar':
+		if $loc = 'vanrPar':
+			if shampoo < 1:shampoo = 1
+			'You are using your parents'' shampoo.'
+		else
+			'You have enough shampoo for <b><<shampoo>></b> uses.'
+		end
+		dynamic $shower
+		dynamic $bath
+	elseif shampoo = 0 and $loc = 'tanvanr':
+		shampoo = 1
+		'You can use Tanyas shampoo.'
+		gs 'din_van', 'prvt_pee'
+	else
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+		gs 'din_van', 'prvt_pee'
+	end
+
+	if painkiller > 0:
+		$pluralS = 's'
+		if painkiller = 1:$pluralS = ''
+		'You have <b><<painkiller>></b> painkiller<<$pluralS>>.'
+		if pain['total'] > 0 and pain['killer'] = 0:
+			act 'Take a painkiller':
+				cla
+				pain['killer'] += 1
+				painkiller -= 1
+				pcs_hydra += 20
+				gs 'stat'
+
+				*nl
+				'You take a painkiller and gulp it down with a glass of water.'
+
+				act 'Finish':gt $loc, $metka
+			end
+		end
+	end
+
+	if bcream_have > 0:
+		'<a href="exec:dynamic $use_bcream & gt $loc, $metka">Apply breast cream.</a> Uses left: <<bcream_have>>.'
+	end
+
+	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings.</a>'
+
+	if fillimplant = 1 and siliconeBag >= 1:'<a href="exec:cls & siliconeBag -= 1 & silicone += 10 & gt $loc, $metka">Inject silicone into breast implants.</a>'
+	if fillimplant = 1 and silicone >= 20:'<a href="exec:cls & silicone -= 10 & gt $loc, $metka">Drain silicone from breast implants.</a>'
+
+	dynamic $bteeth
+
+	dynamic $tampon
+
+	act 'Change clothes and toys':
+		cla
+		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
+		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
+		dynamic $toymanage
+
+		act 'Return':gt $loc, $metka
+	end
+
+	'<a href="exec:msg ''Your body fat is = (<<salo>>)''">Check weight on the scales</a>'
+
+	gs 'din_van', 'prvt_pee'
+
+	dynamic $basin
+
+	dynamic $brit
 
 	if mosolmaz > 0 and mosol > 0 and mosal_time ! (daystart * 100) + hour:
 		act 'Rub ointment onto your pussy (0:05)':
@@ -1147,8 +950,8 @@ if $ARGS[0] = 'private':
 			act 'Finish':gt $loc, $metka
 		end
 	end
-	
-	!!breast pump is now in the menue, not on the screen
+
+	!!breast pump is now in the menu, not on the screen
 	if breastpump > 0:
 		act 'Use breast pump':
 			gt 'lact_lib', 'bp_milking'
@@ -1523,54 +1326,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 - 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':

+ 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>'
 

+ 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':

+ 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?"'

+ 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 ---------------------------------

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 ---------------------------------

+ 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:

+ 0 - 15
locations/preALT.qsrc

@@ -45,11 +45,6 @@ if $ARGS[0] = 'Three':
 	if MagikDostup = 1:
 		showstat 1
 		showobjs 1
-		if oldobjmenu = 0:
-			gs 'obj_din', 'new'
-		else
-			gs 'obj_din', 'old'
-		end
 		act 'Begin':
 			*clr
 			cla
@@ -135,11 +130,6 @@ 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
 		'<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 +221,6 @@ 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
 									cla
 									*clr
 									'<center><img <<$set_imgh>> src="images/system/magicschoolgirl.jpg"></center>'

+ 0 - 12
locations/preNT.qsrc

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

+ 0 - 4
locations/preSYS.qsrc

@@ -512,8 +512,6 @@ 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'
 				greben = 1
 				kosmetitka = 10
 				krem = 10
@@ -818,8 +816,6 @@ 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'
 				greben = 1
 				kosmetitka = 10
 				salfetka = 10

+ 1 - 3
locations/preSYS2.qsrc

@@ -19,8 +19,6 @@ 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'
 		end
 		gt 'preCUST', 'SGStart'
 	end
@@ -384,7 +382,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'

+ 0 - 6
locations/preTG.qsrc

@@ -483,12 +483,6 @@ if $ARGS[0] = 'sleepPRE':
 					cla
 					showstat 1
 					showobjs 1
-
-					if oldobjmenu = 0:
-						gs 'obj_din', 'new'
-					else
-						gs 'obj_din', 'old'
-					end
 					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

+ 2 - 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,7 @@ 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
 end
 
 !Bathroom, Rolan caught:

+ 2 - 16
locations/saunawhore.qsrc

@@ -1054,23 +1054,8 @@ 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
 
 	if workdolg > 0:
 		if (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprok = 0 and isprokp = 0:
@@ -1095,6 +1080,7 @@ if $ARGS[0] = 'bathroom':
 	dynamic $quickwash
 	dynamic $bteeth
 	dynamic $basin
+	dynamic $removepan
 	if breastpump > 0:
 		act 'Use breast pump':gt 'lact_lib', 'bp_milking'
 	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'

+ 2 - 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,7 @@ 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
 
 	if pregtest > 0 and (abortionbirthdate = 0 or daystart - abortionbirthdate > 100):
 		act 'Do a pregnancy test':
@@ -118,28 +79,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:

+ 0 - 5
locations/stat.qsrc

@@ -6,11 +6,6 @@ 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
 end
 
 if daystart_start < 100:

+ 12 - 14
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-------------------

+ 2 - 19
locations/stwork.qsrc

@@ -151,28 +151,11 @@ 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 $tampon
 	dynamic $quickwash
 	dynamic $basin
+	dynamic $removepan
 end
 
 --- stwork ---------------------------------

+ 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':

+ 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 ---------------------------------

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