Browse Source

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

# Conflicts:
#	locations/gkafe
KevinSmarts 6 years ago
parent
commit
1f9d55f19a
99 changed files with 3296 additions and 2637 deletions
  1. 1 4
      glife.qproj
  2. 1 1
      locations/Cheatmenu_din
  3. 58 3
      locations/EvOtelMan
  4. 1 1
      locations/FedorEv2
  5. 10 3
      locations/FedorEv4
  6. 1 1
      locations/FedorMisc
  7. 87 9
      locations/Gadbana
  8. 28 28
      locations/Gadhouse
  9. 74 68
      locations/Gadsarai
  10. 5 15
      locations/IbizaToilet
  11. 1 1
      locations/KatjaHomeTalk
  12. 97 162
      locations/Komp
  13. 58 60
      locations/Miroslava
  14. 22 6
      locations/ParChurch
  15. 10 15
      locations/TV
  16. 2 1
      locations/_stock_item_info
  17. 26 7
      locations/abduction
  18. 199 46
      locations/agentned
  19. 1 1
      locations/albinahome
  20. 17 14
      locations/andrey
  21. 2 1
      locations/anushapt
  22. 5 4
      locations/bandit
  23. 1 1
      locations/bedr2x
  24. 1 1
      locations/bedrPar2
  25. 1 1
      locations/belgang
  26. 1 1
      locations/beverage
  27. 11 26
      locations/brothel
  28. 162 162
      locations/brother_voyeur
  29. 1 15
      locations/butoilet
  30. 140 44
      locations/cikl
  31. 3 3
      locations/cityTrain
  32. 2 16
      locations/club
  33. 6 3
      locations/crossfit_north_box
  34. 2 2
      locations/crossfit_north_record
  35. 275 281
      locations/din_van
  36. 53 10
      locations/family
  37. 150 136
      locations/foto
  38. 241 79
      locations/foto_events
  39. 110 110
      locations/foto_models
  40. 123 123
      locations/gadforest_event
  41. 15 15
      locations/gadforestswamp
  42. 1 1
      locations/gadmarket
  43. 13 12
      locations/gaptek
  44. 21 8
      locations/gdk
  45. 1 1
      locations/gdksport
  46. 6 5
      locations/gdktoilet
  47. 1 0
      locations/gevent
  48. 9 3
      locations/gopskver
  49. 5 0
      locations/gschool_events
  50. 1 15
      locations/gschool_grounds
  51. 25 25
      locations/gschool_lessons
  52. 67 0
      locations/housing
  53. 1 1
      locations/husbSex
  54. 10 4
      locations/igorhome
  55. 1 1
      locations/kafe
  56. 6 19
      locations/kafe2
  57. 11 7
      locations/kiosk
  58. 2 19
      locations/koncepod1
  59. 2 2
      locations/korrPar
  60. 2 2
      locations/lakecafe
  61. 2 16
      locations/laketoilet
  62. 9 22
      locations/leonid
  63. 1 0
      locations/loadg
  64. 31 31
      locations/motherkafeboss
  65. 127 58
      locations/obj_din
  66. 3 3
      locations/pavResidential
  67. 0 4
      locations/pavSharedApt
  68. 2 2
      locations/pharmacy
  69. 24 28
      locations/poli
  70. 2 0
      locations/preSYS
  71. 3 3
      locations/restoranM
  72. 186 25
      locations/sauna
  73. 0 38
      locations/sauna2
  74. 0 96
      locations/saunabed
  75. 0 61
      locations/saunaroom
  76. 355 23
      locations/saunawhore
  77. 0 319
      locations/saunawork
  78. 1 1
      locations/sewing
  79. 2 16
      locations/sexshop
  80. 63 62
      locations/shop
  81. 74 26
      locations/shopdacha
  82. 1 1
      locations/shulgahall
  83. 2 36
      locations/sitrPar
  84. 13 13
      locations/soba
  85. 2 2
      locations/stat
  86. 27 27
      locations/stat_display
  87. 3 2
      locations/stat_sklattrib
  88. 4 0
      locations/stat_sklattrib_lvlset
  89. 1 1
      locations/street_event
  90. 1 1
      locations/succubus
  91. 4 4
      locations/talent_agency
  92. 67 44
      locations/telefon
  93. 1 0
      locations/version
  94. 1 1
      locations/vokdin
  95. 3 16
      locations/vokmantoiev
  96. 3 17
      locations/vokzaltoilet
  97. 80 16
      locations/wardrobe
  98. 7 1
      locations/young_shop
  99. 2 16
      locations/zaprF

+ 1 - 4
glife.qproj

@@ -224,11 +224,7 @@
       <Location name="rinok"/>
       <Location name="rinwork"/>
       <Location name="sauna"/>
-      <Location name="sauna2"/>
-      <Location name="saunabed"/>
-      <Location name="saunaroom"/>
       <Location name="saunawhore"/>
-      <Location name="saunawork"/>
       <Location name="trashplace"/>
       <Location name="musorkaexh"/>
       <Location name="RynokHoz"/>
@@ -982,6 +978,7 @@
     <Folder name="Misc">
       <Location name="beg"/>
       <Location name="beg1"/>
+      <Location name="housing"/>
       <Location name="husb"/>
       <Location name="husbSex"/>
       <Location name="indik"/>

+ 1 - 1
locations/Cheatmenu_din

@@ -334,7 +334,7 @@ $cheatmenu['permanent'] = {
 	end
 	nl
 	if Enable_nodream > 0:
-		pl'No dream chance: <a href="exec:Enable_nodream=input(''Enter no dream chance (%)'') & dynamic $cheatmenu[''permanent'']"><<din_cheat_nodream>>%</a>, <a href="exec:din_cheat_nodream=0 & dynamic $cheatmenu[''permanent'']">ON</a>'
+		pl'No dream chance: <a href="exec:Enable_nodream=input(''Enter no dream chance (%)'') & dynamic $cheatmenu[''permanent'']"><<Enable_nodream>>%</a>, <a href="exec:Enable_nodream=0 & dynamic $cheatmenu[''permanent'']">ON</a>'
 	else
 		pl'No dream chance: <a href="exec:Enable_nodream=input(''Enter no dream chance (%)'') & dynamic $cheatmenu[''permanent'']">OFF</a>'
 	end & !1.2.3 new function

+ 58 - 3
locations/EvOtelMan

@@ -10,7 +10,7 @@ if $ARGS[0] = '':
 	gs 'boymass', 'B'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/hotel/coupletaxi.jpg"></center>'
-	'When you get outside, <<$boydesc>> hails a quickly hails a taxi and has a short chat with its driver.'
+	'When you get outside, <<$boydesc>> quickly hails a taxi and has a short chat with its driver.'
 	'Then he beckons you: "<<$pcs_nickname>>, come on. Let''s go!"'
 	'You get into the back seat of the taxi with him, and spend the next five minutes driving mostly in silence. You notice <<$boydesc>> giving the taxi driver an impressive tip when you arrive at the hotel... is he trying to impress you, or he just very generous?'
 	act 'Go to <<$boydesc>>''s room':
@@ -193,6 +193,7 @@ if $ARGS[0] = 'heating_up':
 		act 'Agree to have sex for money':
 			*clr
 			cla
+			hotel_sex = 1
 			guy += 1
 			bmSEX[Tboynum] += 1
 			money += 3000
@@ -236,6 +237,7 @@ if $ARGS[0] = 'heating_up':
 		cla
 		if boynumBlock = 0:guy += 1
 		if boynumBlock > 0 and bmTOTSEX[Tboynum] = 0:guy += 1
+		hotel_sex = 1
 		bmSEX[Tboynum] += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/hotel/foreplay.jpg"></center>'
@@ -266,7 +268,7 @@ if $ARGS[0] = 'sex':
 		gs 'arousal', 'bj', 5, 'prostitution'
 		dynamic $venerasiakOral
 		gs 'stat'
-		if lose_virginity_event = 0:
+		if lose_virginity_event = 0 and hotel_sex = 0:
 			act 'Keep sucking':
 				*clr
 				cla
@@ -312,9 +314,10 @@ if $ARGS[0] = 'sex':
 			act 'Suggest he fucks your ass':
 				*clr
 				cla
+				hotel_sex = 0
 				bmANAL[Tboynum] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/hotel/anal1.jpg"></center>'
-				'You pull yourself away from his cock, your lips making a lewd pop as it leaves your mouth. You quickly jump up on the bed, lay yourself down on your back and lift your knees al the way up to your breasts, reaching down with one hand to pull one of your butt cheeks aside. Not one to pass up such a great opportunity, <<$boydesc>> takes the hint and starts pushing the head of his dick against your asshole. Pushing slowly but insistently, the head of his dick pops into your ass - he pauses just a moment to let you adjust - before he slowly starts moving in and out, fucking you carefully and stretching your hole. He slowly but steadily works his dick deeper into your ass, all the while picking up more and more speed.'
+				'You pull yourself away from his cock, your lips making a lewd pop as it leaves your mouth. You quickly jump up on the bed, lay yourself down on your back and lift your knees all the way up to your breasts, reaching down with one hand to pull one of your butt cheeks aside. Not one to pass up such a great opportunity, <<$boydesc>> takes the hint and starts pushing the head of his dick against your asshole. Pushing slowly but insistently, the head of his dick pops into your ass - he pauses just a moment to let you adjust - before he slowly starts moving in and out, fucking you carefully and stretching your hole. He slowly but steadily works his dick deeper into your ass, all the while picking up more and more speed.'
 				gs 'arousal', 'anal', 10, 'prostitution'
 				dynamic $venerasiak
 				gs 'stat'
@@ -352,6 +355,56 @@ if $ARGS[0] = 'sex':
 						gs 'stat'
 						act 'Get cleaned up':gt 'EvOtelMan', 'End'
 					end
+					act 'Let him fuck your pussy too':
+						*clr
+						cla
+						bmSEX[Tboynum] += 1
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/hotel/fuck2.jpg"></center>'
+						'After some time he pulls out of you, before you can even ask why he turns you on your side and slides his dick into your sopping wet pussy. He slides himself balls deep in you again and starts fucking you, his thighs pounding against your butt cheeks.'
+						'He seems to be really getting into it, his movements are almost frenzied in their pace.'
+						gs 'arousal', 'vaginal', 10, 'prostitution'
+						dynamic $venerasiak
+						gs 'stat'
+						act 'Suck him off':
+							*clr
+							cla
+							lose_virginity_event = 0
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/hotel/bj2.jpg"></center>'
+							'Not wanting him to cum inside of you you say, "Let me suck you off, I want to taste myself on you." He grins and pulls out of you letting you slide off the bed back onto your knees. You slide his dick as deeply down your throat as you can without gagging, sucking up every drop of pussy juice clinging to his cock and licking the occasional stray from his balls. You slip your free hand down between your legs, your fingers sliding up into your well fucked pussy, sucking harder and harder as your own arousal builds, flicking your clit every time he trusts his cock down your throat.'
+							gs 'arousal', 'bj', 10, 'prostitution'
+							dynamic $venerasiakOral
+							gs 'arousal', 'mast', 10, 'prostitution'
+							minut -= 10
+							gs 'stat'
+							act 'Swallow his load':
+								*clr
+								cla
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/hotel/bj2.jpg"></center>'
+								'You keep sucking his dick for a while longer, before his breathing starts to quicken and you hear him making soft grunts. Looking up at him with your lips clasped around his member, you can see his eyes are closed in pleasure. You keep watching him, sucking harder and speeding up, making him twitch and moan before you suddenly feel a hot jet of liquid coat your tongue before sliding down your throat. Spray after spray keeps filling your mouth and you barely have time to think: Wow, fucking your pussy must have really turned him on!'
+								'He cums so much that you feel like your mouth is about to overflow with it all, but swallowing as fast as you can, you manage to get it all down. As he pulls his dick from your mouth a strand of excess cum stretches from the tip of his cock back down to your lips. Smirking, he wipes his cock head off against your lips before tucking his dick back in his pants.'
+								gs 'arousal', 'bj', 10, 'prostitution'
+								gs 'arousal', 'mast', 10, 'prostitution'
+								minut -= 10
+								gs 'stat'
+								act 'Get cleaned up':gt 'EvOtelMan', 'End'
+							end
+							act 'Let him spray his load onto your face':
+								*clr
+								cla
+								spafinloc = 11
+								gs 'cum_manage'
+								facial += 1
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/hotel/messyfacial.jpg"></center>'
+								'You keep sucking his dick for a while longer, before his breathing starts to quicken and you hear him making soft grunts. Looking up at him with your lips clasped around his member, you can see his eyes are closed in pleasure. You watch him closely, sucking harder and speeding up, making him twitch and moan before you suddenly feel a hot jet of liquid coat your tongue.'
+								'You quickly pull back, letting his member pop out of your mouth and smile up at him happily when you feel another jet of sperm immediately land on your forehead. You close your eyes in pleasure and let him cover the rest of your face with his load, which <<$boydesc>> does with great enthusiasm.'
+								gs 'arousal', 'bj', 10, 'prostitution'
+								gs 'arousal', 'mast', 10, 'prostitution'
+								minut -= 10
+								gs 'stat'
+								act 'Get cleaned up':gt 'EvOtelMan', 'End'
+							end
+						end
+					end
 				end
 			end
 		end
@@ -359,6 +412,7 @@ if $ARGS[0] = 'sex':
 			*clr
 			cla
 			bmSEX[Tboynum] += 1
+			hotel_sex = 0
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/hotel/fuck1.jpg"></center>'
 			'After sucking his dick for a bit, you stop and stand up, just long enough to lay down on the bed on your back and spread you legs. <<$boydesc>> watches you like a hawk the whole time, taking off his clothes while he doing so. You barely have your legs spread before he''s between them, already rubbing his slick cock along your pussylips. He pushes forward gently, slipping his dick inside of your soaking pussy - he goes slowly at first, but he picks up the pace quickly, speeding up and pounding his meat balls deep inside you, leaving you with a very full feeling.'
 			gs 'arousal', 'vaginal', 10, 'prostitution'
@@ -407,6 +461,7 @@ if $ARGS[0] = 'sex':
 			act 'Continue':
 				*clr
 				cla
+				bmSEX[Tboynum] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/hotel/fuck2.jpg"></center>'
 				'After some time he pulls out of you, before you can even ask why he turns you on your side and slides his dick back into your sopping wet pussy. He slides himself balls deep in you again and starts fucking you, his thighs pounding against your butt cheeks.'
 				'He seems to be really getting into it, his movements are almost frenzied in their pace, as he leans forward towards you and says. "I want to fuck your ass."'

+ 1 - 1
locations/FedorEv2

@@ -804,7 +804,7 @@ if $ARGS[0] =  'Park 2':
 	if VKwip = 100:
 		act 'Go jogging':	
 			cls
-			speed_exp += rand(1, 2)	
+			react_exp += rand(1, 2)	
 			fat -= 1
 			pcs_mood -= 5
 			pcs_sweat += 30			

+ 10 - 3
locations/FedorEv4

@@ -2498,12 +2498,18 @@ if $ARGS[0] =  'Toilet 3':
 end
 
 if $ARGS[0] =  'Kitchen':
+	$loc = 'FedorEv4'
+	$metka = 'Kitchen'
 	cls
 	if hour >= 20 and hour <= 22 and ReginaIntro = 0:gt 'FedorEv4', 'Regina Intro'
 	minut += 5
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/kitchen.jpg"></center>'
-	'This kitchen is very clean. Fedor''s parents must be very neat people. There is a sink, a microwave, a stove and a <a href="exec:gt ''FedorEv4'', ''Fridge''">refrigerator</a> stocked with food.'
+	''
+	'This kitchen is very clean. Fedor''s parents must be very neat people.' 
+	''
+	'There is a sink, a microwave, a stove and a <a href="exec:gt ''FedorEv4'', ''Fridge''">refrigerator</a> stocked with food.'
+	'If you''re thirsty, you can pour yourself a glass of <a href="exec:gt ''beverage'', ''bev_wat''">water</a> from the tap.'
 	if week <= 5 and hour >= 19 and hour < 20 or week > 5 and hour >= 12 and hour < 14:
 		'<a href="exec:gt ''FedorEv4'', ''Fedor Kitchen''">Fedor</a> is sitting down, eating dinner.'
 	end
@@ -2708,8 +2714,6 @@ if $ARGS[0] =  'Fedor Sleeping':
 		'Fedor then looks back at you and frowns. "<<$pcs_firstname>> you''re hurt. My mother works as a nurse. You should have her take a look at you."'
 	end
 
-	act 'Spend the night':gt 'bed2'
-
 	act 'Walk away':gt 'FedorEv4', 'Bedroom'
 end
 
@@ -3153,6 +3157,9 @@ if $ARGS[0] =  'Fedor Bedroom':
 	if FedorLove = 1:
 		act 'Discuss taking relationhip to next level':gt 'FedorEv4', 'Future'
 	end
+	if hour >= 21:
+		act 'Spend the night':gt 'bed2'
+	end
 
 	act 'Walk away':gt 'FedorEv4', 'Bedroom'
 end

+ 1 - 1
locations/FedorMisc

@@ -693,7 +693,7 @@ if $ARGS[0] =  'Agility':
 	cla
 	*clr
 	minut += 30
-	speed_exp += rand(1, 3)
+	react_exp += rand(1, 3)
 	agil_exp += rand(1, 3)
 	fat -= 1
 	pcs_mood += 5

+ 87 - 9
locations/Gadbana

@@ -28,10 +28,10 @@ if mira = 0:
 			minut += 1 & gt'Gaddvor'
 		else
 			cls
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/noundress.jpg"></center>'	
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/noundress.jpg"></center>'
 			'You can''t go out without any clothes on.'
 			act 'Back':gt'Gadbana'
-		end	
+		end
 	end
 
 	if week >= 6:
@@ -50,7 +50,7 @@ if mira = 0:
 					pcs_makeup = 1
 					gs 'underwear', 'remove'
 					gs 'clothing', 'strip'
-					
+
 					banaday = daystart
 
 					if frost > 0:frost = 0
@@ -87,7 +87,7 @@ if mira = 0:
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mit.jpg"></center>'
 		'You lather your body washcloth and start scrubbing your body. You rinse off the soap and start to lather the hair with the shampoo. After rising off the shampoo you are completely clean.'
-		
+
 		act 'Leave':gt $loc, $metka
 	end
 
@@ -127,12 +127,90 @@ if mira = 0:
 			else
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
 				 'You undress and wash your dirty clothes.'
-			end	
+			end
 			*nl
 			'You soak your muddy clothes and underwear in the basin and pour in washing powder, then you scrub them until they are finally clean.'
 			act 'Finish':gt $loc, $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.' & !!0.2.6: Removed unneccessary var check
+
+			act 'Finish':gt $loc, $metka
+		end
+	elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
+		act 'Insert your butt plug (0:05)':
+			cla
+			*clr
+			minut += 5
+			analplugIN = 1
+
+			if pcs_ass < 10:pcs_ass += 5
+			if pcs_ass >= 10 and pcs_ass < 20:pcs_ass += rand(1, 2)
+			if pcs_ass >= 20 and pcs_ass < 30:pcs_ass += rand(0, 1)
+
+			'<center><img <<$set_imgh>> src="images/pc/body/analplug.jpg"></center>'
+			*nl
+			if butpluguse > 0:'You squat and gently rub the butt plug against your anus, after lubricating it with a bit of saliva. After a short while, you''ve relaxed enough to be able to push it in. Once it''s in you give it a few gentle tugs, wondering if anyone will catch you wearing it today.'
+			if butpluguse = 0:butpluguse = 1 & '"If I''m not going to use it, then why did I buy it?" you ask yourself. You look at the butt plug for a while, thinking "It is necessary to start developing my ass, so I could have great adventures someday... you could even say huge and thick adventures with crimson heads, uh, now I got carried away..." You''re slightly embarrassed at the thought for a second, but are then overcome by your horny fantasies. Determined to get the plug all the way in, you slowly press it against your asshole after lubricating it with a bit of saliva. It hurts a bit at first, but once the thickest part is in the rest follows rather easily. Patting yourself on your ass once it''s in, you wonder if anyone will notice you''re wearing it today and then immediately feel naughty for even having thought that.'
+
+			act 'Finish':gt $loc, $metka
+		end
+	end
+	if vibrator = 1 and vibratorIN = 1:
+		act 'Remove the vibrator (0:05)':
+			cla
+			*clr
+			minut += 5
+			vibratorIN = 0
+
+			if pcs_vag < 30:pcs_vag += 1
+
+			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
+			*nl
+			'You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.'
+
+			act 'Finish':gt $loc, $metka
+		end
+	elseif vibrator = 1 and vibratorIN = 0 and pcs_vag ! 0:
+		act 'Insert the vibrator in your vagina (0:05)':
+			cla
+			*clr
+			minut += 5
+			vibratorIN = 1
+
+			if pcs_vag < 30:pcs_vag += 2
+
+			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
+			*nl
+			'You spread your legs and slowly insert the vibrator in your pussy, wondering if anyone will notice you wearing it today.'
+
+			act 'Finish':gt $loc, $metka
+		end
+	end
+
+	if mosolmaz > 0 and mosol > 0 and mosal_time ! (daystart * 100) + hour:
+		act 'Rub ointment onto your pussy (0:05)':
+			cla
+			mosal_time = (daystart * 100) + hour
+			minut += 5
+			mosolmaz -= 1
+			mosol -= 5
+			'You take a tube of cream and rub it onto your itchy vulva.'
+
+			act 'Finish':gt $loc, $metka
+		end
+	end
 	if (klismaday ! daystart or arrpos('sparrloc', 3) ! -1):
 		act 'Give yourself an enema (0:05)':
 			cla
@@ -156,10 +234,10 @@ else
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/miraban.jpg"></center>'
 			'While you undress, through the corner of your eye you notice Mira removing her panties.'
-			
+
 			gs 'arousal', 'voyeur', 10, 'lesbian'
 			gs 'stat'
-			
+
 			act 'Watch Mira clean herself':
 			cls
 			gs 'stat'
@@ -181,12 +259,12 @@ else
 				dynamic $showerdin
 				pcs_hairbsh = 0
 				pcs_makeup = 1
-				
+
 				! WD: Missing Var ~ 'banaday'
 				banaday = daystart
 				if frost > 0:frost = 0
 				pcs_skin += 5
-				
+
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/miraban2.jpg"></center>'
 				'Mira finally finishes lathering herself, you take the loofah and lather yourself from head to toe. You enjoy yourselves in the warm bath, relaxing in each other''s company, occasionally exchanging meaningless anecdotes...'

+ 28 - 28
locations/Gadhouse

@@ -16,7 +16,7 @@ if $ARGS[0]='' or $ARGS[0] = 'Start':
 	if monthbabkapay ! month and monthgrandmahelp ! month and hour >= 6 and hour < 22:
 		monthbabkapay = month
 		monthgrandmahelp = month
-		if grandmahelp > 0: money += grandmahelp*50	
+		if grandmahelp > 0: money += grandmahelp*50
 		money += 2000
 		minut += 10
 
@@ -80,7 +80,7 @@ if $ARGS[0]='' or $ARGS[0] = 'Start':
 		'You give your grandpa a smooch on the cheek and go on with your day.'
 
 		act 'Further': grandpa_boletus = 0 & grandpa_bilberry = 0 & gt 'Gadhouse', 'Start'
-	
+
 	elseif go_in_bilberry = 1 and bilberry >= grandpa_bilberry and hour >= 6 and hour < 22:
 		cla
 		*clr
@@ -107,7 +107,7 @@ if $ARGS[0]='' or $ARGS[0] = 'Start':
 		minut += 5
 		mira_guest = 1
 		gs 'stat'
-		
+
 		gs 'Miroslava', 'miraclothes'
 		'You notice Mira coming towards your grandparents home.'
 		'You step out on the porch and greet Mira. She replies "Hi <<$pcs_nickname>>, I was really bored being all alone at home. Do you want to do something?"'
@@ -118,7 +118,6 @@ if $ARGS[0]='' or $ARGS[0] = 'Start':
 		gt 'Gadhouse', 'Main'
 	end
 end
-
 	!125e
 if $ARGS[0] = 'Main':
 	$metkaM = 'Main'
@@ -131,7 +130,8 @@ if $ARGS[0] = 'Main':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/izba.jpg"></center>'
 	'A fairly simple cottage in the village of Gadyukino which your grandparents call home. In the main room there is a huge <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a>) and a <a href="exec:gad = 1 & gt ''bed2''">bed</a> where you can rest. The bed is more comfortable than it looks.'
 	'There is an old <a href="exec:gt ''TV'',''gad''">television</a> in the living room. It''s positioned next to a body length <a href="exec:gt ''mirror'', ''start''">mirror</a>.'
-	
+	'You can check your weight on your grandma''s old mechanical <a href="exec:msg ''Your body fat is = (<<salo>>)''">scales</a>.'
+
 	if hour < 8:
 		temp = RAND(0,9)
 		if temp = 0:'In a box filled with scraps of cloth, <a href="exec: gt ''Gadhouse'',''villagecat''">Boniface</a> is curled up sleeping peacefully.'
@@ -155,7 +155,7 @@ if $ARGS[0] = 'Main':
 	elseif hour >= 22:
 		temp = RAND(0,2)
 		if temp = 1:'In a box filled with scraps of cloth, <a href="exec: gt ''Gadhouse'',''villagecat''">Boniface</a> is curled up sleeping peacefully.'
-	end	
+	end
 
 
 	if hour >= 6 and hour < 22:
@@ -165,7 +165,7 @@ if $ARGS[0] = 'Main':
 		'Your grandparents sleep in separate beds. It''s quite strange since they''re still madly in love with eachother.'
 	end
 
-	if mira_guest = 1: MiraLoc = 6 & '<a href="exec: gt ''Miroslava'', ''Start''">Mira</a> is sitting next to you.' 
+	if mira_guest = 1: MiraLoc = 6 & '<a href="exec: gt ''Miroslava'', ''Start''">Mira</a> is sitting next to you.'
 
 	clr
 	gs 'stat'
@@ -189,13 +189,13 @@ if $ARGS[0] = 'Main':
 	end
 	}
 	if week = 6 and hour > 12 and family_trip_month ! month: indorf = 1
-	
+
 	if indorf = 1:
 		'Your parents are relaxing inside.'
 
 		if staygad ! daystart: gs 'gadukino_event', 'go_home'
 	end
-	
+
 	if gobelen>0:'You have <<gobelen>> completed tapestries.'
 	if pcs_sewng >= 40 and tkan > 0:'You have enough fabric for <<tkan>> lessons.'
 	if pcs_sewng >= 40 and tkan <= 0:'You do not have any fabric.'
@@ -246,7 +246,7 @@ if $ARGS[0] = 'Main':
 	act 'Prepare a light meal (0:25)':gs 'food', 's_meal'
 
 	act 'Have a snack (0:15)':gs 'food', 'snack'
-	
+
 	act 'Drink some water (0:05)':gs 'beverage', 'bev_wat'
 
 	act 'Have a cup of tea (0:05)':
@@ -397,7 +397,7 @@ if $ARGS[0]='grandma':
 	minut += 2
 	if grandmatalkday ! daystart: grandmatalk = 0
 	gs 'stat'
-	
+
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
 	'Your grandma is extremely old, and almost never leaves the house. Most of the time she just sits on her bed watching TV, or is slowly cleaning.'
 	if $clothingworntype = 'nude':
@@ -418,7 +418,7 @@ if $ARGS[0]='grandma':
 				minut += 10
 				pcs_mood += 5
 				gs 'stat'
-		
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
 				'You sit next to grandma, eager to have her tell you more about the village.'
 				'"Don''t you remember <<$pcs_nickname>>? You''ve visited us many times," said grandma.'
@@ -430,11 +430,11 @@ if $ARGS[0]='grandma':
 				'"In the outskirts of the village is the field where the cattle graze and beyond the field is the forest. You''ll usually find our local hunter Andrew in the forest. He often brings along his friends to hunt, they often stay there for days. They say he built a hut somewhere in the forest. So, if you meet Andrew and his friends out there, don''t be afraid. If you want to go to the forest make sure to ask grandfather first."'
 				'"If you like running, you can take a run on the road leading into the forest. Or you can take a ride on our old bike. I''m pretty sure the bike is in the shed. Make sure to look for it if you''re interested. And if you want to watch your figure, then go to the garden, have some fruit, it''s as healthy as the diet meals you''re eating, if not more healthier."'
 				'"That''s about it my dear granddaughter. Now run along, don''t bother me anymore. My soap opera "Santa Barbara" is about to begin, I don''t want to miss a second of it."'
-		
+
 				act 'Finish':gt 'Gadhouse', 'Start'
 			end
 		end
-		!125e	
+		!125e
 		if hour >= grandmatalk + 3:
 			act 'Chat with your grandmother (0:10)':
 				cla
@@ -444,10 +444,10 @@ if $ARGS[0]='grandma':
 				minut += 10
 				pcs_mood += RAND(5,10)
 				gs 'stat'
-		
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
 				'You spend some time talking with your grandmother. She''s sometimes difficult to understand. Her nearly toothless mouth makes the pronunciation of words difficult for her. Most of what she says boils down to the same thing, life is much more fun when you''re young!'
-		
+
 				act 'Continue':gt 'Gadhouse', 'Start'
 			end
 		end
@@ -460,7 +460,7 @@ if $ARGS[0]='grandma':
 				minut += 20
 				pcs_mood += RAND(10,15)
 				gs 'stat'
-		
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/babushka.jpg"></center>'
 				'When you ask your grandmother to tell you a story, she mumbles something. Nevertheless, after a brief second or two, she decides on a story to share with you today, she begins to talk slowly.'
 
@@ -497,7 +497,7 @@ if $ARGS[0]='grandma':
 				elseif temp = 5:
 					'"One evening during the Christmas holidays in my younger days I was hanging out with my girlfriends in the kitchen. It was my school friends, so we were always up to some mischief all the time."'
 					'"We were home alone, and one of my friends persuades us to do a séance. She tells us that a fortune-teller had explained to her how one could summon a spirit. So we light some candles and began chanting for the spirits to show themself."'
-					'"I managed to summon the profile of a male figure. He was holding something resembling a bouquet of flowers. My second friend summoned a kettle looking object while my last friend managed to summon an infant which frightened us."' 
+					'"I managed to summon the profile of a male figure. He was holding something resembling a bouquet of flowers. My second friend summoned a kettle looking object while my last friend managed to summon an infant which frightened us."'
 					'"Not being discouraged we decided to try again excited by what we would manage to summon this time. This time I summoned a large steamer. My second friend didn''t summon anything special, but my third friend summoned the same infant again, the difference this time was that the infant was in a stroller."'
 					'"We ended the séance and went back doing ordinary stuff. All of a sudden we heard a knock on the door, it was the young man from the séance. He pulled out a beautiful bouquet of roses for me and gave them to me. I asked him what the reason was but he just answered that he got a feeling that he should deliver flowers to a girl in this specific village. I got the chills, because I remembered the man with a bouquet of flowers from the séance."'
 					'"The most interesting thing that happened was a few months after our séance, my friend that summoned the baby got pregnant. And by the end of the year she had a baby by the young age of 15. So beware when you meet a fortune-teller you never know what might happen..."'
@@ -505,7 +505,7 @@ if $ARGS[0]='grandma':
 					'"I remember sitting down as we are right now," your grandma starts, but suddenly as if she remembered something, she sadly sighs "There are no more matches..."'
 					'You look at her perplexed, questioning what she''s talking about. "We do have matches in the kitchen or if you want I can run over to the store to buy some."'
 					'"You don''t get it, <<$pcs_nickname>>. The matches today are not as good as those made long time ago. I miss those matches we had during the Great Patriotic War, before they had to move the factory to the far east... Those matches were magical, not like this crap we have now... Ugh..."'
-		
+
 				!Keep the word brigade if you want to change the text. It''s what the people working on the kolkhoz were called.
 				elseif temp = 7:
 					'"One day my mother, rest her soul, sent us four siblings out to the forest for berry gathering", your grandma begins. "We took our berry collectors and headed out. We reached the entrance of the forest pretty quickly and decided that it would be best to split up to complete the task faster. Since we were familiar with the area we all dispersed to our cherished spots and began gathering berries."'
@@ -529,7 +529,7 @@ if $ARGS[0]='grandpa':
 	minut += 2
 	if grandpatalkday ! daystart:grandpatalk = 0
 	gs 'stat'
-	
+
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa.jpg"></center>'
 	'Your grandfather is a grumpy old man, who is always complaining about the village elders and how they have neglected the village to barely being fit to live in. He can walk, but requires a cane. He doesn''t really leave the house any more, unless he really has to.'
 	if $clothingworntype = 'nude':
@@ -543,7 +543,7 @@ if $ARGS[0]='grandpa':
 		if go_in_bilberry = 1:'You promise to bring grandpa <<grandpa_bilberry>> kg of berries.'
 		if go_in_boletus_bilberry = 1:'You promise to bring grandpa <<grandpa_boletus>> kg mushrooms and <<grandpa_bilberry>> kg of berries.'
 		!125s
-		if grandpahelpday ! daystart:act 'Offer to help':grandpahelpday = daystart & gt'grandpahelp'	
+		if grandpahelpday ! daystart:act 'Offer to help':grandpahelpday = daystart & gt'grandpahelp'
 		if grandpatalkforest = 0:
 			act 'Ask about the forest (0:10)':
 				cla
@@ -553,16 +553,16 @@ if $ARGS[0]='grandpa':
 				pcs_mood += 5
 				goforest += 1
 				gs 'stat'
-		
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'"Listen carefully <<$pcs_nickname>>. You want to explore the forest and that''s great. But be sure of your surroundings, without having any knowledge of the forest you may easily get lost. Don''t go exploring too deep in the forest, because the mushrooms and berries can be found at the edge of the forest. If you chose to explore the forrest you''ll find a swamp in the middle of the forrest. You can find mushrooms and berries there too... Going into the forest at night is not recommended, wild boars may attack, and you might end up really hurt."'
 				'"If you manage to get lost and can''t find your way out of the forest before it gets dark, then light a fire and sit still there until morning. The beasts in the forest are afraid of the fire, so they won''t approach you."'
 				'"There''s one more thing... While you''re in the woods, avoid dressing yourself up in fancy clothes. You might damage them. It''s better to dress in more comfortable clothes instead..."'
 				'"Well, I think that''s everything <<$pcs_nickname>>, run along now, and remember what I''ve told you."'
-		
+
 				act 'Finish':gt 'Gadhouse', 'Start'
 			end
-		end	
+		end
 		!125e
 		if hour >= grandpatalk + 3:
 			act 'Chat with your grandfather (0:10)':
@@ -573,10 +573,10 @@ if $ARGS[0]='grandpa':
 				minut += 10
 				pcs_mood += RAND(5,10)
 				gs 'stat'
-		
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'Your grandfather stops complaining and smiles at you, he loves telling stories. He has lived a rich and eventful life, and you enjoy listening to his stories and talking to him. He mostly reminisces about his past, and reflects on his earlier life.'
-		
+
 				act 'Continue':gt 'Gadhouse', 'Start'
 			end
 		end
@@ -592,7 +592,7 @@ if $ARGS[0]='villagecat':
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/villcat.jpg"></center>'
 	'Your grandparents'' fat tomcat, Boniface, is aware of you approaching him, even though his eyes are closed. He tracks you with his ears and simply ignores you.'
-	
+
 	act 'Pet Boniface':
 		cla
 		*clr
@@ -621,7 +621,7 @@ if $ARGS[0]='villagecat':
 
 	if catout = 1:
 		act 'Let Boniface Out':
-			if sunWeather = 0: 
+			if sunWeather = 0:
 				cla
 				*clr
 				minute += 10

+ 74 - 68
locations/Gadsarai

@@ -10,6 +10,7 @@ if $ARGS[0] = '':
 	if npc_QW['A66'] >= 35 and temp <= 3:
 		gs 'boyStat', 'A66'
 		sexpartkno = 1
+		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/leghump.jpg"></center>'
 		'Bandit pounces on you and pins your thigh between his front legs. He begins to persistently and significantly put pressure on you, growling menacingly...'
 		if pcs_dom > 0:
@@ -19,10 +20,10 @@ if $ARGS[0] = '':
 				cls
 				banditknow = RAND(0,1)
 				npc_horny['A66'] = 0
-				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/predoggy.jpg"></center>'
 				'You remove your panties and get up on all fours in front of Bandit, presenting him with your bare ass. The dog instinctively knowing what to do, throws his forepaws on your back and starts to poke you in the crotch with his hot member.'
-				gs 'arousal', 'vaginal', 2, 'sub', 'beast'
+				gs 'arousal', 'foreplay', 2, 'sub', 'beast'
+				gs 'arousal', 'end'
 				gs 'stat'
 				if banditknow = 1:
 					if pcs_vag = 0:
@@ -35,12 +36,12 @@ if $ARGS[0] = '':
 							gs 'boyStat', 'A66'
 							sexvolume = rand(20,590)
 							gs 'cum_manage'
-							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/beast/bandit/doggyvirgin.jpg"></center>'
-							'You obediently wait until your dog finds his way to your hole. His tongue is hanging out, panting and snorting loudly over your ear. He begins making fast sharp movements with his hips, and you immediately feel the tip of his cock break through your hymen and begin furiously jabbing at your insides. The acute pain makes you moan loudly, and you have to stretch both hands on the floor to keep from falling onto the ground because of the dogs pounding. Biting your lip, you endure the pain as the animal takes your virginity.' 
+							'You obediently wait until your dog finds his way to your hole. His tongue is hanging out, panting and snorting loudly over your ear. He begins making fast sharp movements with his hips, and you immediately feel the tip of his cock break through your hymen and begin furiously jabbing at your insides. The acute pain makes you moan loudly, and you have to stretch both hands on the floor to keep from falling onto the ground because of the dogs pounding. Biting your lip, you endure the pain as the animal takes your virginity.'
 							'His penis gets bigger and bigger with each passing second it''s painfully stretching your pussy. He tries to pull out from you, but his cock knot has swollen inside your tight pussy. You scream in pain as he tries to free himself from your sore bleeding vagina. Eventually, he settles down and you can feel a mix of blood and dog semen drip down your legs. After waiting for nearly half and hour, he finally shrinks enough to pop out of your well and truely fucked hole. You cry a little from your still bleeding and abused pussy, but somehow you manage to gather yourself after this intense ordeal...'
 							gs 'arousal', 'vaginal', 30, 'sub', 'beast', 'rough'
 							gs 'arousal', 'end'
+							gs 'pain', 4, 'vaginal', 'stretch'
 							gs 'stat'
 							act 'So I more or girl':gt 'Gadsarai'
 						end
@@ -56,11 +57,13 @@ if $ARGS[0] = '':
 								gs 'boyStat', 'A66'
 								sexvolume = rand(20,590)
 								gs 'cum_manage'
-								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/beast/bandit/piratvagknot.jpg"></center>'
-								'After a few moments you feel his hot cock sharply penetrate your tight vagina and start flailing wildly and deeply, reaching almost to the back of your uterus. Your eyes instantly well with involuntarily tears, and painful groans fall from your mouth. You shake your hips, trying to somehow reduce the pain, but Bandit snarls and gets angry. His teeth quite noticeably grip your neck and you are left with no choice but to obediently endure. He''s so strong, fast, and deep.' 
+								'After a few moments you feel his hot cock sharply penetrate your tight vagina and start flailing wildly and deeply, reaching almost to the back of your uterus. Your eyes instantly well with involuntarily tears, and painful groans fall from your mouth. You shake your hips, trying to somehow reduce the pain, but Bandit snarls and gets angry. His teeth quite noticeably grip your neck and you are left with no choice but to obediently endure. He''s so strong, fast, and deep.'
 								'He hammers your pussy with his cock, and in a minute you feel like it gets hotter and starts to swell. The walls of your vagina painfully stretch, causing you more suffering, but you dare not move for fear that Bandit will take you by the neck again ... But after a couple of minutes, he gets off inside you and turns his back to your ass. All the rest of the time you wait to uncork your dog cum oozing pussy...'
 								gs 'arousal', 'vaginal', 25, 'sub', 'beast', 'rough'
+								gs 'arousal', 'end'
+								gs 'pain', 2, 'vaginal', 'stretch'
+								gs 'pain', 2, 'neck', 'pierce'
 								gs 'stat'
 								act 'Close':gt 'Gadsarai'
 							elseif pcs_vag >= 10 and pcs_vag < 25:
@@ -74,24 +77,27 @@ if $ARGS[0] = '':
 								if pcs_horny >= 100:
 									cls
 									pcs_mood = 100
-									gs 'stat'
 									if pirsG = 1:
 										'<center><img <<$set_imgh>> src="images/beast/bandit/piratvagcumpirs.jpg"></center>'
 									else
 										'<center><img <<$set_imgh>> src="images/beast/bandit/piratvagcum.jpg"></center>'
 									end
-									'After a few moments you feel his hot cock sharply penetrate your moist vagina and start flailing wildly and deeply, reaching almost to the back of your uterus. From your lips come frustrated groans of both pain and pleasure. You gyrate your hips, trying to somehow reduce the pain and ironically almost prevent your approaching orgasm, but Bandit snarls and gets angry. His teeth quite noticeably grip your neck and you are left with no choice but to obediently endure. He''s so strong, fast, and deep.' 
+									'After a few moments you feel his hot cock sharply penetrate your moist vagina and start flailing wildly and deeply, reaching almost to the back of your uterus. From your lips come frustrated groans of both pain and pleasure. You gyrate your hips, trying to somehow reduce the pain and ironically almost prevent your approaching orgasm, but Bandit snarls and gets angry. His teeth quite noticeably grip your neck and you are left with no choice but to obediently endure. He''s so strong, fast, and deep.'
 									'He hammers your pussy with his cock, and in a minute you feel like it gets hotter and starts to swell. The walls of your vagina stretch, giving you a surprisingly painful yet pleasant feeling. A few minutes later you have to let go and Bandit gets off you and turns his back to your ass. You''re exhausted, and have to wait the rest of the time before you can uncork your dog cum oozing pussy...'
 									$orgasm_or = 'yes'
 									gs 'arousal', 'vaginal', 20, 'sub', 'beast', 'rough'
 									gs 'arousal', 'end'
+									gs 'pain', 2, 'vaginal', 'stretch'
+									gs 'pain', 2, 'neck', 'pierce'
 									gs 'stat'
 								else
 									'<center><img <<$set_imgh>> src="images/beast/bandit/piratvagknot.jpg"></center>'
-									'After a few moments you feel his hot cock sharply penetrate your moist vagina and start flailing wildly and deeply, reaching almost to the back of your uterus. Your eyes instantly well with involuntarily tears, and painful groans fall from your mouth. You shake your hips, trying to somehow reduce the pain, but Bandit snarls and gets angry. His teeth quite noticeably grip your neck and you are left with no choice but to obediently endure. He''s so strong, fast, and deep.' 
+									'After a few moments you feel his hot cock sharply penetrate your moist vagina and start flailing wildly and deeply, reaching almost to the back of your uterus. Your eyes instantly well with involuntarily tears, and painful groans fall from your mouth. You shake your hips, trying to somehow reduce the pain, but Bandit snarls and gets angry. His teeth quite noticeably grip your neck and you are left with no choice but to obediently endure. He''s so strong, fast, and deep.'
 									'He hammers your pussy with his cock, and in a minute you feel like it gets hotter and starts to swell. The walls of your vagina painfully stretch, causing more suffering, but you dare not move for fear that Bandit will take you by the neck again ... But after a couple of minutes, he gets off inside you and turns his back to your ass. All the rest of the time you wait to uncork your dog cum oozing pussy...'
 									gs 'arousal', 'vaginal', 20, 'sub', 'beast', 'rough'
 									gs 'arousal', 'end'
+									gs 'pain', 2, 'vaginal', 'stretch'
+									gs 'pain', 2, 'neck', 'pierce'
 									gs 'stat'
 								end
 								act 'Close':gt 'Gadsarai'
@@ -105,21 +111,22 @@ if $ARGS[0] = '':
 								if pcs_horny >= 100:
 									cls
 									pcs_mood = 100
-									gs 'stat'
 									if pirsG = 1:
 										'<center><img <<$set_imgh>> src="images/beast/bandit/piratvagcumpirs.jpg"></center>'
 									else
 										'<center><img <<$set_imgh>> src="images/beast/bandit/piratvagcum.jpg"></center>'
 									end
-									'After a few moments you feel his hot cock sharply penetrate your wet vagina and start flailing wildly and deeply, every thrust pushing at your womb. From your lips comes lustful groans, expressing both animal and human lust. You gyrate your hips, trying to somehow reduce the pain and ironically almost prevent your approaching orgasm, but Bandit snarls and gets angry. His teeth quite noticeable as he grips your neck and you are left with no choice but to obediently endure. He''s so strong, fast, and deep.' 
+									'After a few moments you feel his hot cock sharply penetrate your wet vagina and start flailing wildly and deeply, every thrust pushing at your womb. From your lips comes lustful groans, expressing both animal and human lust. You gyrate your hips, trying to somehow reduce the pain and ironically almost prevent your approaching orgasm, but Bandit snarls and gets angry. His teeth quite noticeable as he grips your neck and you are left with no choice but to obediently endure. He''s so strong, fast, and deep.'
 									'He hammers your pussy with his cock, and in a minute you scream and cry as your orgasm overwhelms you. You yell loudly as you cum, forgetting that someone might hear you. As you come down from your orgasm, it''s only a few minutes before Bandit has turned away from you waiting patiently for his knot to deflate...'
 									$orgasm_or = 'yes'
 									gs 'arousal', 'vaginal', 20, 'sub', 'beast', 'rough'
 									gs 'arousal', 'end'
+									gs 'pain', 2, 'vaginal', 'stretch'
+									gs 'pain', 2, 'neck', 'pierce'
 									gs 'stat'
 								else
 									'<center><img <<$set_imgh>> src="images/beast/bandit/piratvagcum.jpg"></center>'
-									'After a few moments you feel his hot cock sharply penetrate your wet vagina and start flailing wildly and deeply, every thrust pushing at your womb. From your lips come lustful groans, expressing both animal and human lust. You gyrate your hips, trying to build towards orgasm, but Bandit snarls and gets angry. His teeth are quite noticeable as he grips your neck and you are left with no choice but to obediently endure. He''s so strong, fast, and deep.' 
+									'After a few moments you feel his hot cock sharply penetrate your wet vagina and start flailing wildly and deeply, every thrust pushing at your womb. From your lips come lustful groans, expressing both animal and human lust. You gyrate your hips, trying to build towards orgasm, but Bandit snarls and gets angry. His teeth are quite noticeable as he grips your neck and you are left with no choice but to obediently endure. He''s so strong, fast, and deep.'
 									'The walls of your vagina stretch, sending a new wave of pleasure through your body, but you dare not move for fear that Bandit will take you by the neck again... But after a couple of minutes, he gets off inside you and turns his back to your ass. All the rest of the time you wait to uncork your dog cum oozing pussy...'
 									gs 'arousal', 'vaginal', 20, 'sub', 'beast', 'rough'
 									gs 'arousal', 'end'
@@ -136,7 +143,6 @@ if $ARGS[0] = '':
 								if pcs_horny >= 100:
 									cls
 									pcs_mood = 100
-									gs 'stat'
 									if pirsG = 1:
 										'<center><img <<$set_imgh>> src="images/beast/bandit/piratvagcumpirs.jpg"></center>'
 									else
@@ -165,21 +171,20 @@ if $ARGS[0] = '':
 						pcs_mood = 50
 						sub += RAND(0,1)
 						gs 'stat'
-
 						'<center><img <<$set_imgh>> src="images/beast/bandit/analknot1.jpg"></center>'
 						if pcs_ass < 10:
 							pcs_ass += 5
 							agape = 3
-							pcs_horny = 0
 							spafinloc = 3
 							gs 'boyStat', 'A66'
 							sexvolume = rand(20,590)
 							gs 'cum_manage'
-							gs 'stat'
-							'You obediently wait until your dog finds his way to your hole. His tongue is hanging out, panting and snorting loudly over your ear. He begins making fast sharp movements with his hips, and you immediately feel the tip of his cock, with plenty of cock grease, slam through your puckered anus. Each time he thrusts he makes his way deeper and deeper into your tight ass. The acute pain makes you moan loudly, and you have to stretch both hands on the floor to keep from falling onto the ground because of the dogs pounding.' 
+							'You obediently wait until your dog finds his way to your hole. His tongue is hanging out, panting and snorting loudly over your ear. He begins making fast sharp movements with his hips, and you immediately feel the tip of his cock, with plenty of cock grease, slam through your puckered anus. Each time he thrusts he makes his way deeper and deeper into your tight ass. The acute pain makes you moan loudly, and you have to stretch both hands on the floor to keep from falling onto the ground because of the dogs pounding.'
 							'You groan from the pain and cramps in your anus, but Bandit''s angry snarling teeth powerfully grabs you by the neck. You have no choice but to try to relax as Bandit takes your ass with a fury. The pain subsided a bit, but not for long - as the long hot pulsating lump of flesh starts to increase rapidly in size, clogging your ass. The pain grows even greater as it increased to its maximum size, and you begin to squirm involuntarily, while not ceasing to moan and hum. But Bandit no longer pays any attention to you. He climbs down imperiously from your back and waits for his knot to deflate...'
 							gs 'arousal', 'anal', 20, 'sub', 'beast', 'rough'
 							gs 'arousal', 'end'
+							gs 'pain', 2, 'asshole', 'stretch'
+							gs 'pain', 2, 'neck', 'pierce'
 							gs 'stat'
 							act 'Close':gt 'Gadsarai'
 						elseif pcs_ass >= 10 and pcs_ass < 25:
@@ -189,11 +194,12 @@ if $ARGS[0] = '':
 							gs 'boyStat', 'A66'
 							sexvolume = rand(20,590)
 							gs 'cum_manage'
-							gs 'stat'
-							'You obediently wait until your dog finds his way to your hole. His tongue is hanging out, panting and snorting loudly over your ear. He begins making fast sharp movements with his hips, and you immediately feel the tip of his cock, with plenty of cock grease, slam through your puckered anus. Each time he thrusts he makes his way deeper and deeper into your ass. The dull aching pain makes you moan loudly, and you have to stretch both hands on the floor to keep from falling onto the ground because of the dogs pounding.' 
+							'You obediently wait until your dog finds his way to your hole. His tongue is hanging out, panting and snorting loudly over your ear. He begins making fast sharp movements with his hips, and you immediately feel the tip of his cock, with plenty of cock grease, slam through your puckered anus. Each time he thrusts he makes his way deeper and deeper into your ass. The dull aching pain makes you moan loudly, and you have to stretch both hands on the floor to keep from falling onto the ground because of the dogs pounding.'
 							'Biting your lip, you endure the pain as the animal gets further into your rectum. His penis gets bigger and bigger with each passing second, and the thrusts become stronger as your ass stretches with every penetrating movement. You groan and whine from the pain in your anus, but Bandit''s angry snarling teeth powerfully grabs you by the neck, and you will inevitably have to submit. To reduce the pain, you try to relax your anus, but it starts to get worse - after his cock gets fully in your ass, then the knot itself finds its way in and quickly starts to grow in size. Bandit fights against you, trying to push the knot in further. Eventually it is firmly corked in your rectum, and you even feel it erupt with hot cum deep inside you. Bandit finally calms down and quietly dismounts his bitch – all you can do is wait for the knot to deflate...'
 							gs 'arousal', 'anal', 20, 'sub', 'beast', 'rough'
 							gs 'arousal', 'end'
+							gs 'pain', 2, 'asshole', 'stretch'
+							gs 'pain', 2, 'neck', 'pierce'
 							gs 'stat'
 							act 'Close':gt 'Gadsarai'
 						elseif pcs_ass >= 25 and pcs_ass < 35:
@@ -207,17 +213,18 @@ if $ARGS[0] = '':
 							if pcs_horny >= 100:
 								cls
 								pcs_mood = 100
-								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/beast/bandit/analknotcum.jpg"></center>'
-								'You obediently wait until your dog finds his way to your hole. His tongue is hanging out, panting and snorting loudly over your ear. He begins making fast sharp movements with his hips, and you immediately feel the tip of his cock, with plenty of cock grease, slam through your puckered anus. Each time he thrusts he makes his way deeper and deeper into your ass. There is a little pain, but your starting to moan louder with pleasure as Bandit forces his hard cock into you.' 
-								'You have to stretch both hands on the floor to keep from falling onto the ground, and even begin to grind back against the dog to please him. However, Bandit does not like this and viciously growls as he possessively grabs you by the neck with his teeth, forcing you to submit and stay still. The knot easily penetrates into your wet ass, and when it begins to grow, you feel a slight discomfort that almost spoils your growing arousal. In an attempt to reach orgasm, you accidentally run a hand against his crotch, but Bandit immediately jumps away from you. Back on the ground, he turned his ass to yours and began to pull away, trying to free himself.' 
+								'You obediently wait until your dog finds his way to your hole. His tongue is hanging out, panting and snorting loudly over your ear. He begins making fast sharp movements with his hips, and you immediately feel the tip of his cock, with plenty of cock grease, slam through your puckered anus. Each time he thrusts he makes his way deeper and deeper into your ass. There is a little pain, but your starting to moan louder with pleasure as Bandit forces his hard cock into you.'
+								'You have to stretch both hands on the floor to keep from falling onto the ground, and even begin to grind back against the dog to please him. However, Bandit does not like this and viciously growls as he possessively grabs you by the neck with his teeth, forcing you to submit and stay still. The knot easily penetrates into your wet ass, and when it begins to grow, you feel a slight discomfort that almost spoils your growing arousal. In an attempt to reach orgasm, you accidentally run a hand against his crotch, but Bandit immediately jumps away from you. Back on the ground, he turned his ass to yours and began to pull away, trying to free himself.'
 								'From such an unexpected turn of events you begin to rapidly and continuously try to finish, cumming hard, and not noticing the sound of Bandits nails scrapping the floor in an attempt to get away. His knot pulls at your asshole, stretching it outward. After half a minute Bandit is unable to get free, and you can feel his knot spewing out warm, sticky dog cum deep into your ass...'
 								$orgasm_or = 'yes'
 								gs 'arousal', 'anal', 20, 'sub', 'beast', 'rough'
 								gs 'arousal', 'end'
+								gs 'pain', 1, 'asshole', 'stretch'
+								gs 'pain', 1, 'neck', 'pierce'
 								gs 'stat'
 							else
-								'You obediently wait until your dog finds his way to your hole. His tongue is hanging out, panting and snorting loudly over your ear. He begins making fast sharp movements with his hips, and you immediately feel the tip of his cock, with plenty of cock grease, slam through your puckered anus. Each time he thrusts he makes his way deeper and deeper into your ass. There is a little pain, but your starting to moan louder with pleasure as Bandit forces his hard cock into you. You have to stretch both hands on the floor to keep from falling onto the ground, and even begin to grind back against the dog to please him.' 
+								'You obediently wait until your dog finds his way to your hole. His tongue is hanging out, panting and snorting loudly over your ear. He begins making fast sharp movements with his hips, and you immediately feel the tip of his cock, with plenty of cock grease, slam through your puckered anus. Each time he thrusts he makes his way deeper and deeper into your ass. There is a little pain, but your starting to moan louder with pleasure as Bandit forces his hard cock into you. You have to stretch both hands on the floor to keep from falling onto the ground, and even begin to grind back against the dog to please him.'
 								'However, Bandit does not like this and viciously growls as he possessively grabs you by the neck with his teeth, forcing you to submit and stay still. The knot easily penetrates into your wet ass, and when it begins to grow, you feel a slight discomfort that almost spoils your growing arousal. In an attempt to reach orgasm, you accidentally run a hand against his crotch, but Bandit immediately jumps away from you. Back on the ground, he turned and began to growl menacingly with displeasure. You decide it is not worth the risk to try and climax. You spent the rest of the waiting for Bandits knot to fade...'
 								gs 'arousal', 'anal', 20, 'sub', 'beast', 'rough'
 								gs 'arousal', 'end'
@@ -234,9 +241,8 @@ if $ARGS[0] = '':
 							if pcs_horny >= 100:
 								cls
 								pcs_mood = 100
-								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/beast/bandit/analcum.jpg"></center>'
-								'You obediently wait until your dog finds his way to your hole. His tongue is hanging out, panting and snorting loudly over your ear. He begins making fast sharp movements with his hips, and you immediately feel the tip of his cock, with plenty of cock grease, slam through your puckered anus. Each time he thrusts he makes his way deeper and deeper into your ass. There is almost no pain, and your starting to moan louder with animal lust and pleasure as Bandit forces his hard cock into you. You have to stretch both hands on the floor to keep from falling onto the ground, and even begin to grind back against the dog to please him.' 
+								'You obediently wait until your dog finds his way to your hole. His tongue is hanging out, panting and snorting loudly over your ear. He begins making fast sharp movements with his hips, and you immediately feel the tip of his cock, with plenty of cock grease, slam through your puckered anus. Each time he thrusts he makes his way deeper and deeper into your ass. There is almost no pain, and your starting to moan louder with animal lust and pleasure as Bandit forces his hard cock into you. You have to stretch both hands on the floor to keep from falling onto the ground, and even begin to grind back against the dog to please him.'
 								'However, Bandit does not like this and viciously growls as he possessively grabs you by the neck with his teeth, forcing you to submit and stay still. The knot easily penetrates into your wet ass, and when it begins to grow, you feel a slight discomfort that almost spoils your growing arousal. In an attempt to reach orgasm, you accidentally run a hand against his crotch, but Bandit immediately jumps away from you. Back on the ground, he turned his ass to yours and began to pull away, trying to free himself. From such an unexpected turn of events you begin to rapidly and continuously try to finish, without noticing that the knot has long since popped out of your gaping asshole and Bandit is now sitting opposite you, indifferently watching your post-orgasmic convulsions and yelps...'
 								$orgasm_or = 'yes'
 								gs 'arousal', 'anal', 20, 'sub', 'beast', 'rough'
@@ -300,24 +306,24 @@ if $ARGS[0] = '':
 			else
 				'On your left is a <a href="exec: gt ''Gadsarai'',''horse'' ">horse</a> stable.'
 			end
-		else 
+		else
 			'On your right is a <a href="exec: gt ''Gadsarai'',''cow'' ">cattle</a> barn.'
 			'On your left is a <a href="exec: gt ''Gadsarai'',''horse'' ">horse</a> stable.'
 		end
-		'There''s a <a href="exec: gt ''Gadsarai'',''boar'' ">boar</a> living in a separate stable.'	
+		'There''s a <a href="exec: gt ''Gadsarai'',''boar'' ">boar</a> living in a separate stable.'
 		if findvel = 1:'You see an old <a href="exec:gt ''bicycle'',''sarai''">bike</a> in the corner.'
-		
+
 		clr
 		gs 'stat'
-		
+
 		act 'Go outside':minut += 1 & gt 'Gaddvor'
-		
+
 		act 'Poke around in the barn':
 			if grigoryEV > 0 and grigory_barn ! daystart and hour > 8 and hour < 12: gt 'grigory', 'barn'
 			cls
 			minut += 15
 			gs 'stat'
-			if vcard = 0: 
+			if vcard = 0:
 				cls
 				if RAND(0,5) >= 4:
 					gs 'stat'
@@ -328,12 +334,12 @@ if $ARGS[0] = '':
 				else
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
 					'In the barn you find many muldy magazines and rusty tools and equipment, toys and many dusty yellowed books. The entire barn reeks of mold and decay.'
-				end 
+				end
 				act 'Leave and get some fresh air':gt 'Gadsarai'
 			elseif findvel = 0:
 				cls
 				if RAND(0,8) >= 7:
-					gs 'stat'				
+					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findbike.jpg"></center>'
 					'In the far corner of the barn you manage to find an old bicycle. It''s in surprisingly good condition. You pull it out of the barn and clean it up.'
 					findvel = 1
@@ -348,7 +354,7 @@ if $ARGS[0] = '':
 				if RAND(0,10) > 9:
 					findbag = 1
 					observ_exp += 3
-					gs 'stat'					
+					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/pc/purses/cheap/5.jpg"></center>'
 					'In a far corner of the barn you find a burlap sack filled with mostly junk, but at the bottom you find a good quality messenger bag.'
 					cheap_purses[5] = 1
@@ -361,15 +367,15 @@ if $ARGS[0] = '':
 				else
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
 					'In the barn you find old many muldy magazines and rusty tools and equipment, toys and many dusty yellowed books. The entire barn reeks of mold and decay'
-				end	
+				end
 				act 'Leave and get some fresh air':gt 'Gadsarai'
 			elseif findbraclet = 0:
 				cls
 				if RAND(0,15) >= 14:
-					gs 'stat'					
+					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bracelet.jpg"></center>'
 					'While looking through the barn you spot a glint of metal under a pile of wood. Upon closer inspection you see a bracelet made of silver and crafted into the likeness of a snake. Strange, but cool that you would find something this valuable in the barn.'
-					findbraclet = 1	
+					findbraclet = 1
 					observ_exp += 3
 				else
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
@@ -380,7 +386,7 @@ if $ARGS[0] = '':
 				if findneck = 0:
 					cls
 					if RAND(0,20) >= 19:
-						gs 'stat'					
+						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/necklace.jpg"></center>'
 						if altQS = 1:
 							'While looking through the barn your foot goes through a rotten floorboard. You suddenly feel the presence of something magical under the floor. You get on your belly and look through the hole in the floor. You find a small box made of a black wood. You pick up the box and see the box is covered in a strange writing and glyphs that look like serpents. The feeling of power is coming from within the box. You lift the lid of the box and see a black metal necklace that looks like a coiled snake with ruby eyes. You feel the power coming from the necklace, but it doesn''t feel like any power you have ever felt.'
@@ -391,7 +397,7 @@ if $ARGS[0] = '':
 						observ_exp += 3
 					else
 						cls
-						gs 'stat'				
+						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
 						'In the barn you find old many muldy magazines and rusty tools and equipment, toys and many dusty yellowed books. The entire barn reeks of mold and decay.'
 					end
@@ -409,7 +415,7 @@ if $ARGS[0] = '':
 			act 'Masturbate':gt 'selfplay', 'start'
 		end
 
-	!! Serpent is not ready yet, so remarking out til then.	
+	!! Serpent is not ready yet, so remarking out til then.
 	!!	if findneck = 1:
 	!!		act 'You hear a scrapping noice above you.':gt 'serpent'
 	!!	end
@@ -419,7 +425,7 @@ if $ARGS[0] = '':
 	!!			'You decide to spend awhile riding the <a href="exec: gt ''events'', ''cycling''">bicycle</a> around.'
 	!!		end
 	!!	end
-	
+
 		if npc_horny['A66'] >= 20 and banditfrend >= 10:gt 'bandit'
 	end
 end
@@ -429,7 +435,7 @@ if $ARGS[0] = 'boar':
 	cls
 	minut += 1
 	gs 'stat'
-	
+
 	'<center><H4>The barn</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/boar.jpg"></center>'
 	'One of your grandparents dearest possessions, the boar Nickle.'
@@ -441,27 +447,27 @@ if $ARGS[0] = 'boar':
 			minut += 30
 			grandmahelp += 1
 			feed_boar = 0
-			hndiwrk_exp += rand(0,3) 
+			hndiwrk_exp += rand(0,3)
 			gs 'stat'
-			
+
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_boar.jpg"></center>'
 			'You fed Nickle and went on about your business.'
 
 			act 'Finish':gt 'Gadsarai','boar'
 		end
 	end
-	act 'Go':minut += 5 & gt'Gadsarai'	
+	act 'Go':minut += 5 & gt'Gadsarai'
 end
 
 if $ARGS[0] = 'cow':
 	cls
 	minut += 1
 	gs 'stat'
-	
+
 	'<center><H4>The barn</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow.jpg"></center>'
 	'Grandma''s favorite animal, the cow Dawn.'
-	
+
 	if milk_cow = 1:
 		act 'Milk the cow':
 			cla
@@ -469,9 +475,9 @@ if $ARGS[0] = 'cow':
 			minut += 30
 			milk_cow = 0
 			grandmahelp += 1
-			hndiwrk_exp += rand(0,3) 
+			hndiwrk_exp += rand(0,3)
 			gs 'stat'
-			
+
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/milk_cow.jpg"></center>'
 			'You start milking Dawn, improving for each time you do it.'
 
@@ -485,9 +491,9 @@ if $ARGS[0] = 'cow':
 			minut += 30
 			feed_cow = 0
 			grandmahelp += 1
-			hndiwrk_exp += rand(0,3) 
+			hndiwrk_exp += rand(0,3)
 			gs 'stat'
-			
+
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_cow.jpg"></center>'
 			'You fed Dawn and continued on with your day.'
 
@@ -501,30 +507,30 @@ if $ARGS[0] = 'cow':
 			minut += 60
 			cow_field = 0
 			grandmahelp += 1
-			hndiwrk_exp += rand(0,3) 
+			hndiwrk_exp += rand(0,3)
 			gs 'stat'
-			
+
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_field.jpg"></center>'
 			if cow_field = 1:'You lead Dawn to the field, where you let the shepherds take over.'
 			if graze_cow = 1:'You lead Dawn to the field, where you grandfather awaits you. It''s his turn to keep an eye on the cows.'
 
 			act 'Further':gt'gadfield','cow'
 		end
-	end		
+	end
 
-	act 'Go':minut += 5 & gt'Gadsarai'	
+	act 'Go':minut += 5 & gt'Gadsarai'
 end
 
 if $ARGS[0] = 'horse':
 	cls
 	minut += 1
 	gs 'stat'
-	
+
 	'<center><H4>The barn</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse.jpg"></center>'
 	'Grandfather trusted assistant, the horse Desperado.'
 
-	
+
 	if feed_horse = 1:
 		act 'Feed the horse':
 			cla
@@ -532,9 +538,9 @@ if $ARGS[0] = 'horse':
 			minut += 30
 			feed_horse = 0
 			grandmahelp += 1
-			hndiwrk_exp += rand(0,3) 
+			hndiwrk_exp += rand(0,3)
 			gs 'stat'
-			
+
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_horse.jpg"></center>'
 			'You fed Desperado and went on about your business.'
 
@@ -548,9 +554,9 @@ if $ARGS[0] = 'horse':
 			minut += 60
 			horse_field = 0
 			grandmahelp += 1
-			hndiwrk_exp += rand(0,3) 
+			hndiwrk_exp += rand(0,3)
 			gs 'stat'
-			
+
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse_field.jpg"></center>'
 			'You took Desperado by the bridle and led it to the field. There, you let it run free in the paddock area, and went on with your business.'
 
@@ -563,9 +569,9 @@ if $ARGS[0] = 'horse':
 			*clr
 			minut += 30
 			horse_river = 2
-			hndiwrk_exp += rand(0,3) 
+			hndiwrk_exp += rand(0,3)
 			gs 'stat'
-			
+
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse_field.jpg"></center>'
 			'You took Desperado by the bridle and led it to the river.'
 
@@ -579,15 +585,15 @@ if $ARGS[0] = 'horse':
 			minut += 60
 			comb_horse = 0
 			grandmahelp += 1
-			hndiwrk_exp += rand(0,3) 
+			hndiwrk_exp += rand(0,3)
 			gs 'stat'
-			
+
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/comb_horse.jpg"></center>'
 			'You groom Desperado for an hour. When finished, you''re satisfied with the result. Desperado is looking as healthy as ever.'
 
 			act 'Further':gt 'Gadsarai','horse'
 		end
-	end		
+	end
 
 	act 'Go':minut += 5 & gt'Gadsarai'
 end
@@ -596,7 +602,7 @@ if $ARGS[0] = 'mira_dog':
 	cls
 	minut += 5
 	gs 'stat'
-	
+
 	'<center><H4>The barn</H4></center>'
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_kennel2.jpg"></center>'
 	'You see Mira in chains, naked, in Bandit''s dog house depicting a dog.'
@@ -611,7 +617,7 @@ if $ARGS[0] = 'mira_dog':
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_kennel3.jpg"></center>'
 		'Taking pity, you decide to let go the Mira ahead of time.'
 		'"Okay Mira, I''m feeling mercyfull today. You can consider yourself forgiven." you say, removing Mira''s collar.'
-		'The girl looks nervously at you for a few moments, then quickly gets dressed and runs home.'		
+		'The girl looks nervously at you for a few moments, then quickly gets dressed and runs home.'
 
 		act 'Further':gt'Gadsarai'
 	end

+ 5 - 15
locations/IbizaToilet

@@ -27,27 +27,17 @@ if $ARGS[0] = 'tou':
 
 	minut += 5
 	gs 'stat'
+
 	act 'Leave the toilet': gt 'restoreposition'
+	
 	act 'Look into the mirror': gt 'mirror', 'start'
-	act 'Go into booth': gt 'IbizaToilet', 'booth'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
-	if (cumloc[6] = 1 or cumloc[7] = 1):
-		act 'Wipe the cum off your clothes (0:10)':
-			cla
-			*clr
-			cumspclnt = 6
-			gs 'cum_cleanup'
-			minut += 10
-			'<center><img <<$set_imgh>> src="images/shared/sex/cum/frotsp.jpg"></center><br>'
-			'You use a tissue and a bit of water to remove cum stains in your clothes. '
-
-			act 'Finish': gt 'restoreposition'
-		end
-	end
+	act 'Go into booth': gt 'IbizaToilet', 'booth'
+	
 	dynamic $tampon
+	dynamic $basin
 	dynamic $quickwash
-!!	dynamic $basin
 end
 
 

+ 1 - 1
locations/KatjaHomeTalk

@@ -215,7 +215,7 @@ if $ARGS[0] = '':
 				act 'Lick Katja': gt 'KatjaEvDin', 'kuni_dom'
 			end
 
-		elseif hour >= 20:
+		elseif hour >= 20 and week >= 5 and week < 7:
 			'Katja says, "Let''s go to the disco."'
 
 			if money >= 25:act 'Go to the disco':money -= 25 & minut += 15 & gt 'gdkin'

+ 97 - 162
locations/Komp

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start':
 	!!act 'SunReview of the Dead':gt 'KGZstart'
 
 	if student > 0 and kursovik < 100:'You should probably do some of your <a href="exec:GT ''Komp'',''kursak''">coursework</a>.'
-	
+
 	if $LOC = 'shulga_room':
 		internet = 100000
 		act 'Browse the internet':gt 'Komp', 'brows'
@@ -49,9 +49,7 @@ if $ARGS[0] = 'brows':
 
 		'A blinking banner for a <a href="exec:GT ''Komp'',''agent''">real estate agency</a> keeps popping up in the corner.'
 
-		act 'Check out an interior design website (1:00)':gt 'Komp', 'remont'
-
-		if home_owned[1] = 1 and husband = 0:act 'Rent your apartment out':gt 'Komp', 'sale'
+		if home_owned[1] = 2 and husband = 0:act 'Rent your apartment out':gt 'Komp', 'sale'
 
 		act 'Search for porn (1:00)':gt 'Komp', 'porno'
 		act 'Browse a dating website (1:00)':gt 'Komp', 'znak'
@@ -99,10 +97,10 @@ if $ARGS[0] = 'sale':
 			if obkvsdam = 1:
 				'No one has responded to your offer to rent out your apartment just yet.'
 			elseif obkvsdam > 1:
-				if obkvsdam = 2:predsumm = 7000
-				if obkvsdam = 3:predsumm = 8000
-				if obkvsdam = 4:predsumm = 9000
-				if obkvsdam = 5:predsumm = 10000
+				if obkvsdam = 2:predsumm = 16000
+				if obkvsdam = 3:predsumm = 17000
+				if obkvsdam = 4:predsumm = 18000
+				if obkvsdam = 5:predsumm = 19000
 				'Someone wants to stay in your apartment for a month! They''re offering you <<predsumm>> <b>₽</b> in cash.'
 
 				act 'Accept the offer':
@@ -123,101 +121,10 @@ if $ARGS[0] = 'sale':
 	act 'Leave this website':gt 'Komp', 'brows'
 end
 
-if $ARGS[0] = 'remont':
-	cla
-	clr
-	*clr
-	minut += 60
-	elektro += 3
-	internet -= 1
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/computer/komp.jpg"></center>'
-	'You''re currently browsing the website of a local interior designer. They claim they can remodel houses so fast, it''s done by the time you leave the computer! Surely a joke...'
-
-	if home_owned[1] > 0:
-		if rembedr = 0:
-			act 'Have them redesign your bedroom (50,000 <b>₽</b>)':
-				cla
-				if karta + bankDebtLimit >= 50000:
-					rembedr = 1
-					karta -= 50000
-					'When you transfer the money, you wait for a second to fill out your contact information somewhere. When you look into the hallway, you notice your new bedroom is finished already! It looks fabulous, but wait... how did they do that!?'
-				else
-					'Unfortunately, you do not have enough money in your bank account.'
-				end
-
-				act 'Go back one step':gt 'Komp', 'remont'
-			end
-		end
-
-		if remsitr = 0:
-			act 'Renovate the living room (50,000 <b>₽</b>)':
-				cla
-				if karta + bankDebtLimit >= 50000:
-					remsitr = 1
-					karta -= 50000
-					'When you transfer the money, you wait for a second to fill out your contact information somewhere. When you look into the hallway, you notice the living room is finished already! It looks fabulous, but wait... how did they do that!?'
-				else
-					'Unfortunately, you do not have enough money in your bank account.'
-				end
-
-				act 'Go back one step':gt 'Komp', 'remont'
-			end
-		end
-
-		if remkorr = 0:
-			act 'Repair hallway (50,000 <b>₽</b>)':
-				cla
-				if karta + bankDebtLimit >= 50000:
-					remkorr = 1
-					karta -= 50000
-					'When you transfer the money, you wait for a second to fill out your contact information somewhere. When you look into the hallway, you notice it is finished already! It looks fabulous, but wait... how did they do that!?'
-				else
-					'Unfortunately, you do not have enough money in your bank account.'
-				end
-
-				act 'Go back one step':gt 'Komp', 'remont'
-			end
-		end
-
-		if remvanr = 0:
-			act 'Renovate the bathroom (50,000 <b>₽</b>)':
-				cla
-				if karta + bankDebtLimit >= 50000:
-					remvanr = 1
-					karta -= 50000
-					'When you transfer the money, you wait for a second to fill out your contact information somewhere. When you look into the hallway, you notice your new bathroom is installed already! It looks fabulous, but wait... how did they do that!?'
-				else
-					'Unfortunately, you do not have enough money in your bank account.'
-				end
-
-				act 'Go back one step':gt 'Komp', 'remont'
-			end
-		end
-
-		if remkuhr = 0:
-			act 'Renovate the kitchen (50,000 <b>₽</b>)':
-				cla
-				if karta + bankDebtLimit >= 50000:
-					remkuhr = 1
-					karta -= 50000
-					'When you transfer the money, you wait for a second to fill out your contact information somewhere. When you look into the hallway, you notice the kitchen you just ordered is already installed and ready to use. It looks fabulous, but wait... how did they do that!?'
-				else
-					'Unfortunately, you do not have enough money in your bank account.'
-				end
-
-				act 'Go back one step':gt 'Komp', 'remont'
-			end
-		end
-	end
-
-	act 'Leave this website':gt 'Komp', 'brows'
-end
-
 if $ARGS[0] = 'porno':
 	cls
 	gs 'stat'
-	
+
 	if internet <= 0:
 		'<center><b>Browser</b></center>'
 		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/eror.jpg"></center>'
@@ -242,10 +149,10 @@ if $ARGS[0] = 'porno':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/accessories/computer/porno.jpg"></center>'
 			'You find a video you think you''d enjoy, and spend some time watching it. Wow, that girl is so lucky...'
-			
+
 			gs 'arousal', 'voyeur', 60
 			gs 'stat'
-			
+
 			act 'The video ends...':gt 'Komp', 'porno'
 		end
 
@@ -271,7 +178,7 @@ if $ARGS[0] = 'masturbate':
 	'<center><img <<$set_imgh>> src="images/shared/accessories/computer/kompmas.jpg"></center>'
 	'You get comfortable in front of your computer and with one hand begin to fondle your breasts, while you click on a link to something really dirty.'
 	'You let go of the mouse and start rubbing your pussy, imagining you''re the woman in the video. The fantasy and your touching are getting you all hot and bothered.'
-	
+
 	gs 'arousal', 'masturbate', 15
 	gs 'stat'
 
@@ -281,10 +188,10 @@ if $ARGS[0] = 'masturbate':
 	end
 
 	act 'Stop masturbating':divanmastr = 0 & gt 'Komp', 'porno'
-	
+
 	gs 'arousal', 'end'
 	gs 'stat'
-	
+
 	if pcs_horny >= 50:act 'Masturbate some more (0:15)':gt 'Komp', 'masturbate'
 end
 
@@ -567,7 +474,7 @@ if $ARGS[0] = 'rabota':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore2.jpg"></center>'
 					'You fill out the questionnaire and register yourself as a webcam model. Ten minutes later, you have already been approved and you can now earn money as a webcam girl.'
-					'Of course, you will need a functioning webcam to do this! If you don''t have one yet, they are fairly cheap to buy at most local supermarket chains.' 
+					'Of course, you will need a functioning webcam to do this! If you don''t have one yet, they are fairly cheap to buy at most local supermarket chains.'
 					act 'Leave this website':gt 'Komp','brows'
 				end
 				act 'Leave this website':gt 'Komp','brows'
@@ -591,11 +498,11 @@ if $ARGS[0] = 'study':
 	elektro = elektro + 3
 	internet -= 1
 	intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
-	compskl_exp += 1 
+	compskl_exp += 1
 	'<center><b>The Institute for Education Measurement</b></center>'
 	'<center><img <<$set_imgh>> src="images/shared/accessories/computer/study.jpg"></center>'
 	'You spend an hour on the IEM website, reading news articles and educational blogs. You feel a bit smarter afterwards.'
-	
+
 	act 'Leave this website':gt'Komp','brows'
 end
 
@@ -606,7 +513,7 @@ if $ARGS[0] = 'kursak':
 	elektro += 3
 	internet -= 1
 	pcs_mood -= 10
-	compskl_exp += 1 
+	compskl_exp += 1
 	kursovik = kursovik + RAND(pcs_intel/20,pcs_intel/10)
 	if kursovik > 100:kursovik = 100
 	'<center><b>Coursework</b></center>'
@@ -624,23 +531,51 @@ if $ARGS[0] = 'agent':
 	elektro += 3
 	internet -= 1
 	gs 'stat'
+	gs 'housing', 'rent'
 	'<center><b>Real estate agency</b></center>'
 	'<center><img <<$set_imgh>> src="images/shared/accessories/computer/agent.jpg"></center>'
 	'You''re currently at the website of the largest real estate agency in the area.'
-	'They have apartments available in the residential district. Renting one would cost you 6000 <b>₽</b> for 30 days.'
+	'They have apartments available in the city residential district and Pushkin. Renting one would cost you as low as 10000 <b>₽</b> for 30 days.'
 	''
-	if ArendHouseSL > 0:'You have <B><<ArendHouseSL>> days</B> remaining on the rental of your apartment.'
-	if karta + bankDebtLimit >= 6000 and home_owned[1] ! 1:
-		act 'Rent an apartment online':
+	if ArendHouseSL > 0:'You have <B><<ArendHouseSL>> days</B> remaining on the rental of your St. Petersburg apartment.'
+	if ArendHouseSL4 > 0:'You have <B><<ArendHouseSL4>> days</B> remaining on the rental of your Pushkin apartment.'
+	if karta + bankDebtLimit >= home_rent[1] and home_owned[1] = 1:
+		act 'Pay rent on St. Petersburg':
+			cla
+			karta -= home_rent[1]
+			ArendHouseSL += ArendHouseSL_due
+			'After a very simple procedure, you can now call an apartment in the city residential district home for another 30 days. You have <B><<ArendHouseSL>> days</B> remaining on the rental of your apartment.'
+			act 'Leave this website':gt 'Komp','brows'
+		end
+	elseif karta + bankDebtLimit >= home_rent[1] and home_owned[1] = 0:
+		act 'Rent a city apartment':
 			cla
-			karta -= 6000
+			karta -= home_rent[1]
+			ArendHouseSL += ArendHouseSL_due
 			home_owned[1] = 1
-			BuyHous = 2
-			ArendHouseSL += 30
-			'After a very simple procedure, you can now call an apartment in the residential district home for another 30 days. You have <B><<ArendHouseSL>> days</B> remaining on the rental of your apartment.'
+			'After a very simple procedure, you can now call an apartment in the city residential district home for 30 days.'
+			act 'Leave this website':gt 'Komp','brows'
+		end
+	end
+	if karta + bankDebtLimit >= home_rent[4] and home_owned[4] > 0:
+		act 'Pay rent on Pushkin':
+			cla
+			karta -= home_rent[4]
+			ArendHouseSL4 += ArendHouseSL_due
+			'After a very simple procedure, you can now call an apartment in Pushkin home for another 30 days. You have <B><<ArendHouseSL4>> days</B> remaining on the rental of your apartment.'
+			act 'Leave this website':gt 'Komp','brows'
+		end
+	elseif karta + bankDebtLimit >= home_rent[4] and home_owned[4] = 0:
+		act 'Rent a Pushkin apartment':
+			cla
+			karta -= home_rent[4]
+			ArendHouseSL4 += ArendHouseSL_due
+			home_owned[4] = 1
+			'After a very simple procedure, you can now call an apartment in Pushkin home for 30 days.'
 			act 'Leave this website':gt 'Komp','brows'
 		end
 	end
+
 	act 'Leave this website':gt 'Komp','brows'
 end
 
@@ -745,9 +680,9 @@ if $ARGS[0] = 'waitclients':
 				end
 			elseif webpopular >= 75:
 				if mfcclients > 3:
-					camclients -= RAND(5,15)   
+					camclients -= RAND(5,15)
 				else
-					camclients += RAND(5,15)   
+					camclients += RAND(5,15)
 				end
 			end
 			chancetips = RAND(0,100)
@@ -765,7 +700,7 @@ if $ARGS[0] = 'waitclients':
 					camclients -= RAND(3,5)
 				else
 					camclients += RAND(3,5)
-				end	
+				end
 			elseif webpopular >= 15 and webpopular < 35:
 				if mfcclients > 3:
 					camclients -= RAND(5,8)
@@ -783,7 +718,7 @@ if $ARGS[0] = 'waitclients':
 					camclients -= RAND(8,15)
 				else
 					camclients += RAND(8,15)
-				end  
+				end
 			end
 			chancetips = RAND(5,100)
 			clientask = RAND(5,100)
@@ -820,7 +755,7 @@ if $ARGS[0] = 'waitclients':
 					camclients -= RAND(6,15)
 				else
 					camclients += RAND(6,15)
-				end   
+				end
 			end
 			chancetips = RAND(5,90)
 			clientask = RAND(5,100)
@@ -852,9 +787,9 @@ if $ARGS[0] = 'waitclients':
 				end
 			elseif webpopular >= 75:
 				if mfcclients > 3:
-					camclients -= RAND(10,15) 
+					camclients -= RAND(10,15)
 				else
-					camclients += RAND(10,15) 
+					camclients += RAND(10,15)
 				end
 			end
 			chancetips = RAND(10,90)
@@ -921,7 +856,7 @@ if $ARGS[0] = 'waitclients':
 					camclients -= RAND(9,15)
 				else
 					camclients += RAND(9,15)
-				end	
+				end
 			elseif webpopular >= 75:
 				if mfcclients > 3:
 					camclients -= RAND(15,20)
@@ -964,7 +899,7 @@ if $ARGS[0] = 'waitclients':
 					camclients -= RAND(10,30)
 				else
 					camclients += RAND(10,30)
-				end	
+				end
 			end
 			chancetips = RAND(15,50)
 			clientask = RAND(15,100)
@@ -999,7 +934,7 @@ if $ARGS[0] = 'waitclients':
 					camclients -= RAND(10,30)
 				else
 					camclients += RAND(10,30)
-				end	
+				end
 			end
 			chancetips = RAND(20,50)
 			clientask = RAND(20,100)
@@ -1024,7 +959,7 @@ if $ARGS[0] = 'waitclients':
 	else
 		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore6.jpg"></center>'
 	end
-	
+
 	tokenpay = tokens / 2
 	'You take a moment of rest, and just chat casually with your <<camclients>> visitors.'
 	'You have earned <<tokens>> tokens so far this session, which amounts to <<tokenpay>> <b>₽</b>.'
@@ -1053,7 +988,7 @@ if $ARGS[0] = 'waitclients':
 			'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore7.jpg"></center>'
 			'You stand up and lean forward, so your boobs are in full view of the camera. You slowly take off your bra and give the camera a sweet smile.'
 			'While you sit back down and toss your bra to the ground, you hear the donation sound several times. Your visitors enjoyed that!'
-			
+
 			gs 'arousal', 'porn', 2, 'exhibitionism'
 			gs 'stat'
 
@@ -1087,10 +1022,10 @@ if $ARGS[0] = 'waitclients':
 			'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore8.jpg"></center>'
 			'You make a show of pointing the camera at your groin, and slowly push your panties down your legs. The chat explodes for a moment, with several visitors complimenting your body, and a few more making lewd comments on what they would do to you if they were with you right now.'
 			'As promised, you receive some tokens.'
-			
+
 			gs 'arousal', 'porn', 2, 'exhibitionism'
 			gs 'stat'
-			
+
 			act 'Continue':gt 'Komp','waitclients'
 		end
 		act 'Refuse to take off your panties':
@@ -1123,7 +1058,7 @@ if $ARGS[0] = 'waitclients':
 
 			gs 'arousal', 'porn', 2, 'exhibitionism'
 			gs 'stat'
-			
+
 			act 'Continue':gt 'Komp','waitclients'
 		end
 		act 'Refuse to play with your boobs':
@@ -1153,10 +1088,10 @@ if $ARGS[0] = 'waitclients':
 
 			'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore12.jpg"></center>'
 			'You lie down comfortably and put your hand between your legs, gently rubbing your labia with your fingers. You put some effort into showing how wet you are already, which is met with some enthusiastic chatter.'
-			
+
 			gs 'arousal', 'porn', 2, 'exhibitionism'
 			gs 'stat'
-			
+
 			if pcs_horny >= 100:
 				mfccum += 1
 				pcs_mood = 100
@@ -1211,10 +1146,10 @@ if $ARGS[0] = 'waitclients':
 				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore17.jpg"></center>'
 			end
 			'Aww, what a sweetheart! You smile at the camera and do what your client wants. He delivers on his promise as well, sending some tokens your way. The rest of the chat is thanking him too, everyone wanted to see that!'
-			
+
 			gs 'arousal', 'porn', 2, 'exhibitionism'
 			gs 'stat'
-			
+
 			act 'Continue':gt 'Komp','waitclients'
 		end
 		act 'Ignore him':
@@ -1255,29 +1190,29 @@ if $ARGS[0] = 'waitclients':
 					'"I''d love to add my load to that!" a third one laughs.'
 					'Oh no! Your face turns a deep red... you''re so ashamed right now! You try to calm the chat down, but the vulgar comments just keep coming and coming.'
 					'At least the visitor who promised to donate did, so you''re a few tokens richer.'
-					
+
 					gs 'arousal', 'porn', 2, 'exhibitionism'
 					gs 'stat'
-					
+
 				else
 					'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore20,<<rand(0,7)>>.jpg"></center>'
 					'You bite your lip for a second, trying to think of a way to get out of his request. Then, you sigh and show them your rectum. It''s obviously quite used to having objects shoved in, something your audience notices immediately.'
 					'Then your greed overcomes you. They already know... you might as well earn some money by showing them properly, right?'
 					'You pull your ass cheeks aside, giving them a good view of your worn out anus.'
-					
+
 					gs 'arousal', 'porn', 2, 'exhibitionism'
 					gs 'stat'
-					
+
 				end
 			else
 				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore21.jpg"></center>'
 				'You smile to yourself, he''s going to love what you have in store for him!'
 				'"I''m sorry", you tell him, explicitly mentioning his username as well. "I can''t right now..."'
 				'Then you turn around, and show him the large plug you currently have shoved inside you. You wiggle your ass seductively at the camera, and hear the donation sound mere seconds later.'
-				
+
 				gs 'arousal', 'porn', 2, 'exhibitionism'
 				gs 'stat'
-			
+
 			end
 			act 'Continue':gt 'Komp','waitclients'
 		end
@@ -1357,10 +1292,10 @@ if $ARGS[0] = 'waitclients':
 				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore5.jpg"></center>'
 			end
 			'Even though no one requested you to do so, you figure showing off your nice boobs might get some more viewers into the channel. You slowly take off your bra and wiggle your breasts seductively at the camera.'
-			
+
 			gs 'arousal', 'porn', 2, 'exhibitionism'
 			gs 'stat'
-			
+
 			act 'Continue':gt 'Komp','waitclients'
 		end
 	end
@@ -1391,10 +1326,10 @@ if $ARGS[0] = 'waitclients':
 				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore9.jpg"></center>'
 			end
 			'You chat with your visitors for a little while, but begin to play with your boobs absent-mindedly in a slow moment. It feels quite nice! You knead your boobs and play with them more and more intently, almost completely forgetting about the camera.'
-			
+
 			gs 'arousal', 'porn', 2, 'exhibitionism'
 			gs 'stat'
-			
+
 			act 'Continue':gt 'Komp','waitclients'
 		end
 	end
@@ -1412,10 +1347,10 @@ if $ARGS[0] = 'waitclients':
 				'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore6.jpg"></center>'
 			end
 			'You know that the fewer clothes you have on, the more visitors will be inclined to check out your channel. You slowly take off your panties in front of the camera, rewarding the viewers already in your channel to a free show when you expose your naked pussy to them.'
-			
+
 			gs 'arousal', 'porn', 2, 'exhibitionism'
 			gs 'stat'
-			
+
 			act 'Continue':gt 'Komp','waitclients'
 		end
 	end
@@ -1441,12 +1376,12 @@ if $ARGS[0] = 'waitclients':
 			'You get bored during a slow moment in the chat, and begin to play with your pussy without giving it another thought.'
 			'"How does that feel, girl?" one of your visitors asks. "I bet you love fingering yourself, with a bunch of strangers watching you!" another adds.'
 			'Giving them a defensive smile, you shrug and reply with one hand, while you keep rubbing your clit slowly with the other.'
-			
+
 			gs 'arousal', 'porn', 2, 'exhibitionism'
 			gs 'arousal', 'vaginal_finger', 2, 'exhibitionism'
 			minut -= 2
 			gs 'stat'
-			
+
 			if pcs_horny >= 100:
 				webpopular -= 1
 				mfccum += 1
@@ -1454,7 +1389,7 @@ if $ARGS[0] = 'waitclients':
 				gs 'stat'
 				'Oh crap! You misjudged your endurance, and suddenly squirm and gasp in front of the camera. You''re having an orgasm!'
 				'When it subsides, you look at your current viewer count. Damn... you just came in front of <<camclients>> users, completely free of charge!'
-				
+
 				$orgasm_or = 'yes'
 				gs 'stat'
 			end
@@ -1480,17 +1415,17 @@ if $ARGS[0] = 'waitclients':
 			chancetips = RAND(0,100)
 			if chancetips >= 60:
 				tokens += RAND(10,20)
-			end  
+			end
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore45.jpg"></center>'
 			'You put two fingers in your mouth and generously cover them in saliva, and then turn your back to the camera. Much to the appreciation of your viewers, you give them a short preview of what an anal show would look like from you. You finger your anus for the camera for a little while, giving your viewers a happy smile the whole time.'
-			
+
 			gs 'arousal', 'porn', 2, 'exhibitionism'
 			gs 'arousal', 'anal_finger', 2, 'exhibitionism'
 			minut -= 2
 			gs 'stat'
-			
+
 			if pcs_horny >= 100:
 				webpopular -= 1
 				mfccum += 1
@@ -1520,16 +1455,16 @@ if $ARGS[0] = 'waitclients':
 			chancetips = RAND(0,100)
 			if chancetips >= 75:
 				tokens += RAND(20,40)
-			end  
+			end
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore80.jpg"></center>'
 			'You''re getting too turned on, and need to slow yourself down a little!'
 			'You tightly pinch your nipples and pull hard on them. It hurts a lot, and the sharp pain lowers your excitement by quite a lot. Nevertheless, your viewers enjoy the free show and have no idea you actually did that for your own good.'
-			
+
 			gs 'arousal', 'porn', 2, 'exhibitionism'
 			gs 'stat'
-			
+
 			act'Continue':gt'Komp','waitclients'
 		end
 	end
@@ -1553,11 +1488,11 @@ if $ARGS[0] = 'bank':
 	'<center><img <<$set_imgh>> src="images/shared/accessories/computer/online_bank.jpg"></center>'
 	if karta + bankDebtLimit >= 10:
 		*pl
-		
+
 		'You can buy prepaid internet access online through your bank account. 1 hour of internet only costs 10 <b>₽</b>! *'
-		
+
 		*pl
-		
+
 		if karta >= 0:
 			'You have <<karta>> <b>₽</b> in your account.'
 			'You have an overdraft limit of <font color="blue"><<bankDebtLimit>></font>!'
@@ -1565,9 +1500,9 @@ if $ARGS[0] = 'bank':
 			'You are overdrawn by <font color="red"><<-1 * karta>> <b>₽</b></font>.'
 			'You have a remaining credit limit of <font color="blue"><<bankDebtLimit + karta>></font>!'
 		end
-		
+
 		*pl
-		
+
 		act 'Buy internet time':
 			cla
 			intinp = input ("How many hours of internet access do you wish to purchase? (1hr = 10 <b>₽</b>)")

+ 58 - 60
locations/Miroslava

@@ -56,63 +56,6 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 		'You and Mira are best friends.'
 	end
 
-	if mira_temp = 0 and mira_go_blok = 0 and meadow > 2 and MiraLoc = 0:
-		*clr & cla
-		minut += 5
-		mira_no_home = 0
-		gs 'stat'
-		if MiraLoc = 1:
-			if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_go_home.jpg"></center>'
-			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_go_home_nude.jpg"></center>'
-		end
-		if MiraLoc ! 1:gs 'Miroslava', 'miraclothes'
-		'"<<$pcs_nickname>>, you''re fun to be with, but Dad has chores for me to work on." Mira tells you.'
-
-		act 'Further':mira_guest = 0 & MiraLoc = 0 & gt 'Gadukino'
-	end
-
-	if mira_temp = 0 and mira_go_blok = 0 and meadow > 2 and MiraLoc ! 0:
-		*clr & cla
-		minut += 5
-		mira_no_home = 0
-		gs 'stat'
-		if MiraLoc = 1:
-			if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_go_home.jpg"></center>'
-			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_go_home_nude.jpg"></center>'
-		end
-		if MiraLoc ! 1:gs 'Miroslava', 'miraclothes'
-		'"<<$pcs_nickname>>, you''re fun to be with, but I gotta get home. Dad has chores for me to work on.," Mira tells you.'
-
-		act 'Further':mira_guest = 0 & MiraLoc = 0 & gt 'Gadukino'
-	end
-
-	if hour = 23 and MiraLoc = 0:
-		*clr & cla
-		minut += 5
-		mira_no_home = 0
-		gs 'stat'
-		gs 'Miroslava', 'miraclothes'
-		'"<<$pcs_nickname>>, you''re fun to be with, but it''s late. I gotta get to bed. Dad has chores for me to work on tomorrow." Mira tells you.'
-
-		act 'Further':gt 'Gadukino'
-	end
-
-	if hour = 23 and MiraLoc ! 0:
-		*clr & cla
-		minut += 5
-		mira_no_home = 0
-		gs 'stat'
-		if MiraLoc = 1:
-			if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_go_home.jpg"></center>'
-			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_go_home_nude.jpg"></center>'
-		end
-		if MiraLoc ! 1:gs 'Miroslava', 'miraclothes'
-		'"<<$pcs_nickname>>, you''re fun to be with, but I gotta get home and get to bed. Dad has chores for me to work on tomorrow." Mira tells you.'
-
-		act 'Further':mira_guest = 0 & MiraLoc = 0 & gt 'Gadukino'
-	end
-
-
 	if graze_cow = 1:
 
 		act 'Talking to Mira':
@@ -572,7 +515,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 			end
 		end
 		!125e
-		if npc_QW['A60'] = 30 and hour < 19 and month >= 5 and month <= 9 and MiraLoc ! 3:
+		if npc_QW['A60'] >= 30 and hour < 19 and month >= 5 and month <= 9 and MiraLoc ! 3:
 
 			act '<b>Make your third wish</b>':
 				*clr & cla
@@ -584,7 +527,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				end
 				gs 'stat'
 				gs 'Miroslava', 'miraclothes'
-			   'You remind Mira about the third wish, and she reluctantly nods her head and says that she remembers it. You, act mysterious and with a sinister smile, command her to follow you...'
+				'You remind Mira about the third wish, and she reluctantly nods her head and says that she remembers it. You, act mysterious and with a sinister smile, command her to follow you...'
 				act 'Go to the street (Walk through village naked)':
 					*clr & cla
 					minut += 15
@@ -958,7 +901,6 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 			end
 		end
 
-
 		if hour >= 20 and mira_temp > 10 and sunWeather = 1 and mira_go_blok = 0 and npc_QW['A60'] > 0 and MiraLoc ! 3:
 			*clr & cla
 			minut += 1
@@ -1051,6 +993,62 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 			end
 		end
 	end
+	
+	if mira_temp = 0 and mira_go_blok = 0 and meadow > 2 and MiraLoc = 0:
+		*clr & cla
+		minut += 5
+		mira_no_home = 0
+		gs 'stat'
+		if MiraLoc = 1:
+			if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_go_home.jpg"></center>'
+			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_go_home_nude.jpg"></center>'
+		end
+		if MiraLoc ! 1:gs 'Miroslava', 'miraclothes'
+		'"<<$pcs_nickname>>, you''re fun to be with, but Dad has chores for me to work on." Mira tells you.'
+
+		act 'Further':mira_guest = 0 & MiraLoc = 0 & gt 'Gadukino'
+	end
+
+	if mira_temp = 0 and mira_go_blok = 0 and meadow > 2 and MiraLoc ! 0:
+		*clr & cla
+		minut += 5
+		mira_no_home = 0
+		gs 'stat'
+		if MiraLoc = 1:
+			if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_go_home.jpg"></center>'
+			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_go_home_nude.jpg"></center>'
+		end
+		if MiraLoc ! 1:gs 'Miroslava', 'miraclothes'
+		'"<<$pcs_nickname>>, you''re fun to be with, but I gotta get home. Dad has chores for me to work on.," Mira tells you.'
+
+		act 'Further':mira_guest = 0 & MiraLoc = 0 & gt 'Gadukino'
+	end
+
+	if hour = 23 and MiraLoc = 0:
+		*clr & cla
+		minut += 5
+		mira_no_home = 0
+		gs 'stat'
+		gs 'Miroslava', 'miraclothes'
+		'"<<$pcs_nickname>>, you''re fun to be with, but it''s late. I gotta get to bed. Dad has chores for me to work on tomorrow." Mira tells you.'
+
+		act 'Further':gt 'Gadukino'
+	end
+
+	if hour = 23 and MiraLoc ! 0:
+		*clr & cla
+		minut += 5
+		mira_no_home = 0
+		gs 'stat'
+		if MiraLoc = 1:
+			if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_go_home.jpg"></center>'
+			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_go_home_nude.jpg"></center>'
+		end
+		if MiraLoc ! 1:gs 'Miroslava', 'miraclothes'
+		'"<<$pcs_nickname>>, you''re fun to be with, but I gotta get home and get to bed. Dad has chores for me to work on tomorrow." Mira tells you.'
+
+		act 'Further':mira_guest = 0 & MiraLoc = 0 & gt 'Gadukino'
+	end
 end
 
 if $ARGS[0] = 'miraclothes':

+ 22 - 6
locations/ParChurch

@@ -84,8 +84,16 @@ if $ARGS[0] = 'vigil':
 		gs 'stat'
 		temprand = rand(1,100)
 		if temprand <= 80:
-			if pav_sex > 10: pav_sex -= 10
-			if pav_prostitute > 10: pav_prostitute -= 10
+			if pav_sex > 10: 
+				pav_sex -= 10
+			else
+				pav_sex = 0
+			end
+			if pav_prostitute > 10:
+				pav_prostitute -= 10
+			else
+				pav_prostitute = 0
+			end
 		end
 		hour = 23
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/church'+ rand(9,10) +'.jpg"></center>'
@@ -115,8 +123,16 @@ if $ARGS[0] = 'liturgy':
 		'You participate fully in the Divine Liturgy. You listen to the preaching and sing along. When going to communion and receiving the ceremonial bread, you lock eyes with Father Kirill. He seems happy to see you participating in the service.'
 	elseif pav_slut >= 50:
 		if rand(1,100) > 20:
-			if pav_sex > 10: pav_sex -= 25
-			if pav_prostitute > 10: pav_prostitute -= 10
+			if pav_sex > 25:
+				pav_sex -= 25
+			else
+				pav_sex = 0
+			end
+			if pav_prostitute > 10:
+				pav_prostitute -= 10
+			else
+				pav_prostitute = 0
+			end
 		end
 		Kirill += 1
 		pcs_mood +=20
@@ -184,8 +200,8 @@ if $ARGS[0] = 'pray':
 	cls
 	randtime = rand(15,60)
 	minut += randtime
-	pav_sex -= 1
-	pav_prostitute -= rand(0,1)
+	if pav_sex > 1: pav_sex -= 1
+	if pav_prostitute > 1: pav_prostitute -= rand(0,1)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/ch_praying.jpg"></center>'
 	if hour >6 and hour < 20 and moral < 30:

+ 10 - 15
locations/TV

@@ -13,11 +13,11 @@ if $ARGS[0] = 'start':
 	if kabel = 0:
 		'You do not have cable, so it shows only one channel that''s just constant advertising and news.'
 
-		act 'Watch TV (1:00)':gt 'TV', 'nokable'
+		act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'nokable'
 	elseif kabel = 1:
 		'You have cable TV.'
 
-		act 'Watch TV (1:00)':gt 'TV', 'kable'
+		act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'kable'
 	end
 
 	if daystart < 10 and StoryLine = 0 and ntstart = 0:'Sometimes while watching TV you catch a glimpse of your legs or chest, and every time it''s a bit shocking for you to see that your body is now that of a woman.'
@@ -31,7 +31,6 @@ if $ARGS[0] = 'nokable':
 	cla
 	clr
 	*clr
-	minut += 60
 	pcs_mood += 6
 	pcs_willpwr += rand(5, 10)
 	elektro += 3
@@ -41,7 +40,7 @@ if $ARGS[0] = 'nokable':
 
 	if daystart < 10 and StoryLine = 0 and ntstart = 0:'Sometimes while watching TV you catch a glimpse of your legs or chest, and every time it''s a bit shocking for you to see that your body is now that of a woman.'
 
-	act 'Watch TV (1:00)':gt 'TV', 'nokable'
+	act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'nokable'
 	act 'Turn off the TV and get off the couch':gt 'TV', 'fin'
 end
 
@@ -49,7 +48,6 @@ if $ARGS[0] = 'kable':
 	cla
 	clr
 	*clr
-	minut += 60
 	pcs_mood += 12
 	pcs_willpwr += rand(10, 20)
 	elektro += 3
@@ -59,7 +57,7 @@ if $ARGS[0] = 'kable':
 
 	if daystart < 10 and StoryLine = 0 and ntstart = 0:'Sometimes while watching TV you catch a glimpse of your legs or chest, and every time it''s a bit shocking for you to see that your body is now that of a woman.'
 
-	act 'Watch TV (1:00)':gt 'TV', 'kable'
+	act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'kable'
 	act 'Turn off the TV and get off the couch':gt 'TV', 'fin'
 end
 
@@ -75,24 +73,23 @@ if $ARGS[0] = 'pav':
 		minut += 5
 		tvtime = 1
 		gs 'stat'
-		'<center><video autoplay loop src="images/locations/gadukino/grandparents/tv/oldtvon.mp4"></video></center>'
+		'<center><video autoplay src="images/locations/gadukino/grandparents/tv/oldtvon.mp4"></video></center>'
 		'You turn on the TV and settled comfortably on the couch as you wait for the ancient TV to warm up. After 5 minutes or so, the tiny white dot at the center of the screen expands into a grainy black and white image that scrolls up and down for a few moments before settling.'
 		act 'Continue': gt 'TV', 'pav'
 	elseif tvtime = 1:
 		cla
 		cls
-		minut += 55
 		pcs_willpwr += rand(5, 10)
 		pcs_mood += rand(5, 10)
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/home/telek.jpg"></center>'
 		'You are watching one of the half dozen or so television channels that you can get without cable. None of their programs are really worth watching, but the distraction is welcome anyway.'
-		act 'Watch TV (1:00)': gt 'TV', 'pav'
+		act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'pav'
 		act 'Turn off the TV': 
 			cls
 			cla
 			tvtime = 0 
-			'<center><video autoplay loop src="images/locations/gadukino/grandparents/tv/tv_turn_off_effect.mp4"></video></center>'
+			'<center><video autoplay src="images/locations/gadukino/grandparents/tv/tv_turn_off_effect.mp4"></video></center>'
 			'You turn off the TV and the image folds in on itself to form a bright line across the screen which then shrinks into a tiny white dot that slowly fades. The speakers emit a high pitched squalk in protest.'
 			act 'Continue': gt $loc, $metka
 		end
@@ -106,30 +103,28 @@ if $ARGS[0] = 'gad':
 		minut += 5
 		tvtime = 1
 		gs 'stat'
-		'<center><video autoplay loop src="images/locations/gadukino/grandparents/tv/oldtvon.mp4"></video></center>'
+		'<center><video autoplay src="images/locations/gadukino/grandparents/tv/oldtvon.mp4"></video></center>'
 		'You turn on the TV and settled comfortably on the couch as you wait for the ancient TV to warm up. After 5 minutes or so, the tiny white dot at the center of the screen expands into a grainy black and white image that scrolls up and down for a few moments before settling.'
 		act 'Continue': gt 'TV', 'gad'
 	elseif tvtime = 1:
 		cla
 		cls
-		minut += 60
 		pcs_willpwr += rand(5, 10)
 		pcs_mood += rand(5, 10)
 		gs 'stat'
 		'<center><video autoplay loop src="images/locations/gadukino/grandparents/tv/tv'+rand(1,5)+'.mp4"></video></center>'
 		'You are watching one of the three television channels that you can get here in the country. None of their programs are really worth watching, but the distraction is welcome anyway.'
-		act 'Watch TV (1:00)': gt 'TV', 'gad'
+		act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'gad'
 		act 'Turn off the TV': 
 			cls
 			cla
 			tvtime = 0 
-			'<center><video autoplay loop src="images/locations/gadukino/grandparents/tv/tv_turn_off_effect.mp4"></video></center>'
+			'<center><video autoplay src="images/locations/gadukino/grandparents/tv/tv_turn_off_effect.mp4"></video></center>'
 			'You turn off the TV and the image folds in on itself to form a bright line across the screen which then shrinks into a tiny white dot that slowly fades. The speakers emit a high pitched squalk in protest.'
 			act 'Continue': gt $loc, $metka
 		end
 	end
 end
 
-
 --- TV ---------------------------------
 

+ 2 - 1
locations/_stock_item_info

@@ -5,7 +5,7 @@
 
 
 !medical item
-$item_info['prezik'] = '<center><b>Condoms</b></center><br>Condoms prevent the exchange of body fluids during sexual activity, thereby preventing infection and conception. Condoms cannot be used again.'
+$item_info['prezikcount'] = '<center><b>Condoms</b></center><br>Condoms prevent the exchange of body fluids during sexual activity, thereby preventing infection and conception. Condoms cannot be used again.'
 $item_info['pregtest'] = '<center><b>Pregnancy test</b></center><br>Pregnancy test is strip that you hold in the urine stream or dip into a sample of urine. An area on the end of the test strip changes color if hCG is present, meaning you are pregnant. The test strip can only be used once.'
 $item_info['tabletki'] = '<center><b>Birth control pills</b></center><br>Combination pills contain synthetic forms of the hormones estrogen and progestin. Most pills in each cycle are active, which means they contain hormones. The remaining pills are inactive, which means they don’t contain hormones<br>Application: one pill a day.'
 $item_info['vitamin'] = '<center><b>Vitamin drinks</b></center><br>A complete multivitamin in a fun-to-chew gummy, specially formulated to provide nutritional support for growing teenage girls.<br>Application: one pill a day.'
@@ -18,6 +18,7 @@ $item_info['lubri'] = '<center><b>Lubricant</b></center><br>A specialized gel us
 $item_info['painkiller'] = '<center><b>Painkillers</b></center><br>A pack of pills containing drugs used to relieve pain. Some are taken recreationally for their mind-altering effects. Can be addictive.'
 $item_info['tampon'] = '<center><b>Tampons</b></center><br>A pack of cyliner-shape cotton swabs with a string that is capable absorb menstrual fluids during your period.'
 $item_info['sanpad'] = '<center><b>Sanitary napkins</b></center><br>A pack of absorbent towels that provide protection during your period. They attach to the inside of panties to avoid any leakage onto your clothes'
+$item_info['breastpump'] = '<center><b>Breast Pump</b></center><br>A breast pump is a mechanical device that lactating women use to extract milk from their breasts.'
 
 if $item_info[$ARGS[0]]!'':
 	$RESULT = '<a href="exec: MSG ''<<$item_info[$ARGS[0]]>>''"><img src="images/system/icon/anptekainfo.jpg"></a>'

+ 26 - 7
locations/abduction

@@ -518,6 +518,7 @@ if $ARGS[0] = 'abdFood':
 	'There are some water bottles and dried food beneath your bed.'
 	'A half broken, dirty mirror provides some means to inspect your appearance.'
 	'In the corner there is something remotely similar to a shower, with cold water only, though.'
+	'There''s enough space to do some basic <a href="exec:gt ''abduction'', ''abdpushup''">exercise</a>.'
 	chainChance = rand(1, 100)
 	if chainChance <= 20 and (rapeCount > 5 or tortureCount > 5):
 		'Suddenly you spot a loose chainlink on your leash. You try to manipulate it and you manage to free yourself from the wall.'
@@ -526,8 +527,7 @@ if $ARGS[0] = 'abdFood':
 	act 'Eat dried food (0:10)':
 		cla
 		*clr
-		minut += 20
-		pranik -= 1
+		minut += 15
 		pcs_health += 30
 		pcs_mood += 10
 		pcs_energy += 25
@@ -536,11 +536,8 @@ if $ARGS[0] = 'abdFood':
 		else
 			pcs_hydra -= 20
 		end
-		cumspclnt = 2
-		gs 'cum_cleanup'
 		pcs_breath = 0
 		fat += 4
-		frost = 0
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/abduction/driedbread1.jpg"></center>'
 		'You ate the dried meat and bread. Your throat is dry and some water could come in handy.'
@@ -552,7 +549,6 @@ if $ARGS[0] = 'abdFood':
 		cla
 		*clr
 		minut += 5
-		pranik -= 1
 		pcs_health += 30
 		pcs_mood += 10
 		if pcs_hydra >= 100:
@@ -623,6 +619,29 @@ if $ARGS[0] = 'abdFood':
 	act 'Get back to your bed':gt 'abduction', 'abdRoom'
 end
 
+if $ARGS[0] = 'abdpushup':
+	$loc = 'abduction'
+	$metka = 'abdFood'
+	cla
+	*clr
+	'<center><video autoplay loop src="images/pc/activities/push_naked.mp4"></video></center>'
+	gs 'exercise', 'tier2', 30, 'stren_exp', 'exhibition_exp'
+	'You do push-ups for <<$timestring>> minutes, improving your strength.'
+
+	randpushfact = rand(-5,5)
+	if pcs_energy < 40: randpushfact -= RAND(1,10)
+
+	pushnum = (pcs_stren * pcs_sleep * pcs_health)  / ( 1 * 67 *  healthmax) + randpushfact
+
+	if pushnum < 1: pushnum = rand(1,5)
+	KILLVAR 'randpushfact'
+	'<br>You managed to do <<pushnum>> push-ups. Your previous record is <<pushrecord>>.'
+
+	if pushrecord < pushnum:pushrecord = pushnum & 'This is a new record!'
+	gs 'stat'
+	act 'Finish': gt $loc, $metka
+end
+
 if $ARGS[0] = 'abdRape':
 	cls
 	rapeCount += 1
@@ -983,7 +1002,7 @@ if $ARGS[0] = 'abdSoldSauna':
 	kosmetica = kosmetica_bak
 	lipbalm = lipbalm_bak
 
-	act 'Continue':gt 'saunaroom'
+	act 'Continue':gt 'sauna', 'saunaroom'
 end
 
 if $ARGS[0] = 'abdFailedCustomer':

+ 199 - 46
locations/agentned

@@ -7,70 +7,207 @@ if $ARGS[0] = 'start':
 	frost = 0
 	gs'stat'
 	gs'dina'
+	gs 'housing', 'rent'
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo.jpg"></center>'
+	*nl
 	'The head office of the largest real estate agency in the area.'
 	*nl
 	'At the reception you notice a banner, which is written in large print:'
-	'"Please note, that all transactions of purchases and sales are made exclusively through your bank account."'
-	''
-	if ArendHouseSL > 0:'You have <B><<ArendHouseSL>> days</B> rental.' 
-	if home_owned[1] = 2:'<a href="exec:GT ''agentned'',''sell''">Sell apartment</a> for 1 million. <b>₽</b>.'
+	'"Please note, that all transactions of purchases and sales are made exclusively through your bank account. Rent payments excluded."'
+
+	if home_owned[1] > 1 and ArendHouseSL > 0:
+		*nl
+		'You have <B><<ArendHouseSL>> days</B> rental on your St. Petersburg apartment remaining. '+iif(money >= home_rent[1],'You can make a rent <a href="exec:money -= home_rent[1] & home_owned[1] = 1 & ArendHouseSL += ArendHouseSL_due & gs ''$menu_obnovit''">payment</a> in cash.','You can''t afford to pay rent at the moment')+''
+	end
+	if home_owned[4] > 0 and ArendHouseSL4 > 0:
+		*nl
+		'You have <B><<ArendHouseSL4>> days</B> rental on your Pushkin apartment. '+iif(money >= home_rent[4],'You can make a rent <a href="exec:money -= home_rent[4] & home_owned[1] = 1 & ArendHouseSL4 += ArendHouseSL_due & gs ''$menu_obnovit''">payment</a> in cash.','You can''t afford to pay rent at the moment')+''
+	end
+
+	if home_owned[1] = 2 or home_owned[3] > 0 or home_owned[5] = 1:
+		*nl
+		'You own the follwing property:'
+		*nl
+		if home_owned[1] = 2: 'An apartment in St. Petersburg residential area'
+		if home_owned[3] > 0: 'An cottage located in the cooperative village'
+		if home_owned[5] = 1: 'A plot of land in the St. Petersburg suburbs'
+		*nl
+		'We are at your service if you decide to <a href="exec:GT ''agentned'',''sell''">sell</a>.'
+	end
 
 	act 'View rentals': gt 'agentned', 'rent'
 	act 'View properties for sale': gt 'agentned', 'buy'
-	
+
 	act '<B>Leave</B>': minut += 5 & gt'down'
 end
 
 if $ARGS[0] = 'buy':
+	cla
+	*clr
+	gs 'housing', 'sale'
+	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo_paperwork.jpg"></center>'
+	*nl
 	minut += 5
-	if home_owned[1] = 0:
-		'There is an apartment in the city residential area available for 2 million <b>₽</b>.'
-		if karta + bankDebtLimit >= 2000000:act 'Buy the city residential apartment': gt 'agentned', 'buy_cityres'
-	elseif home_owned[1] = 1:
-		'You could buy your current rental apartment for 2 million <b>₽</b>.'
-		if karta + bankDebtLimit >= 2000000:act 'Buy the city residential apartment': gt 'agentned', 'buy_cityres'
-	end
+	gs 'stat'
+	if home_owned[1] = 0 or home_owned[3] = 0 or home_owned[4] = 0 or home_owned[5] = 0:
+		if home_owned[1] = 0:
+			'There is an apartment in the city residential area available for 2 million <b>₽</b>.'
+			if karta + bankDebtLimit >= home_value[1]:act 'Buy the city residential apartment': gt 'agentned', 'buy_cityres'
+		elseif home_owned[1] = 1:
+			'You could buy your current rental apartment for 2 million <b>₽</b>.'
+			if karta + bankDebtLimit >= home_value[1]:act 'Buy the city residential apartment': gt 'agentned', 'buy_cityres'
+		end
 
-	if home_owned[3] = 0:
-		'There is a holiday cottage with an adjacent allotment in the village, for 150,000 <b>₽</b>.'
-		if karta + bankDebtLimit >= 150000:act 'Buy the cottage in the village': gt 'agentned','buy_dacha'
-	end
+		if home_owned[3] = 0:
+			'There is a holiday cottage with an adjacent allotment in the village, for 150,000 <b>₽</b>.'
+			if karta + bankDebtLimit >= home_value[3]:act 'Buy the cottage in the village': gt 'agentned','buy_dacha'
+		end
 
-	if home_owned[5] = 0:
-		'There is a plot in the suburbs with planning permission for a mansion for 1.5 million <b>₽</b>.'
-		if karta + bankDebtLimit >= 1500000:act 'Buy the plot in the suburbs': gt 'agentned','buy_Mansion'
+		if home_owned[5] = 0:
+			'There is a plot in the suburbs with planning permission for a mansion for 1.5 million <b>₽</b>.'
+			if karta + bankDebtLimit >= home_value[5]:act 'Buy the plot in the suburbs': gt 'agentned','buy_Mansion'
+		end
+	else
+		'We currently have no properties listed for sale.'
 	end
-
 	act 'Return':gt'agentned', 'start'
 end
 
 if $ARGS[0] = 'sell':
 	cla
 	*clr
-	minut += 30
-	karta += 1000000
-	home_owned[1] = 0
-	BuyHous = 0
-	gs'stat'
+	gs 'housing', 'sale'
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo_paperwork.jpg"></center>'
-	'You spend half an hour filling in the paperwork for the sale of your apartment in the residential area. 1,000,0000 <b>₽</b> have been paid into your bank account.'
-
+	*nl
+	if home_owned[1] = 2 and rembedr = 1 and remsitr = 1 and remkorr = 1 and remvanr = 1 and remkuhr = 1:
+		!Renovated city residential apartment
+		home_value1 = ((home_value[1] + 250000) + rand(-100000, 100000)) 
+		'We have found a buyer for your renovated apartment in the city residential area. They will offer <<home_value1>> <b>₽</b>, minus 5% for fees and taxes, bringing the total to <<home_value1/100*95>>'
+		act 'Sell the renovated apartment':
+			minut += 30
+			'You spend half an hour filling in the paperwork for the sale of your renovated apartment, with a loss of around 5% for fees and taxes. <<home_value1>> <b>₽</b> have been paid into your bank account.'
+			home_owned[1] = 0
+			ArendHouseSL = 0
+			if bankaccount = 1:
+				karta += home_value1/100*95
+			else
+				money += home_value1/100*95
+			end
+			delact 'Sell the renovated apartment'
+			gs 'stat'
+		end
+	end
+	if home_owned[1] = 2:
+		!City residential apartment
+		home_value1 = (home_value[1] + rand(-100000, 100000))
+		'We have found a buyer for your apartment in the city residential area. They will offer <<home_value1>> <b>₽</b>, minus 5% for fees and taxes, bringing the total to <<home_value1/100*95>>'
+		act 'Sell the city apartment':
+			minut += 30
+			'You spend half an hour filling in the paperwork for the sale of your apartment, with a loss of around 5% for fees and taxes. <<home_value1>> <b>₽</b> have been paid into your bank account.'
+			home_owned[1] = 0
+			ArendHouseSL = 0
+			if bankaccount = 1:
+				karta += home_value1/100*95
+			else
+				money += home_value1/100*95
+			end
+			delact 'Sell the city apartment'
+			gs 'stat'
+		end
+	end
+	if home_owned[3] = 1:
+		!Communal cottage
+		home_value3 = (home_value[3] + rand(-5000, 5000))
+		'We have found a buyer for your small communal cottage. They will offer <<home_value3>> <b>₽</b>, minus 5% for fees and taxes, bringing the total to <<home_value3/100*95>>'
+		act 'Sell the holiday cottage':
+			minut += 30
+			'You spend half an hour filling in the paperwork for the sale of your small cottage, with a loss of around 5% for fees and taxes. <<home_value3>> <b>₽</b> have been paid into your bank account.'
+			home_owned[3] = 0
+			if bankaccount = 1:
+				karta += home_value3/100*95
+			else
+				money += home_value3/100*95
+			end
+			delact 'Sell the holiday cottage'
+			gs 'stat'
+		end
+	end
+	if home_owned[3] = 2:
+		!Renovated communal cottage
+		home_value3 = ((home_value[3] + 200000) + rand(-10000, 10000))
+		'We have found a buyer for your small renovated communal cottage. They will offer <<home_value3>> <b>₽</b>, minus 5% for fees and taxes, bringing the total to <<home_value3/100*95>>'
+		act 'Sell the renovated cottage':
+			minut += 30
+			'You spend half an hour filling in the paperwork for the sale of the renovated cottage, with a loss of 1around 5% for fees and taxes. <<home_value3>> <b>₽</b> have been paid into your bank account.'
+			home_owned[3] = 0
+			if bankaccount = 1:
+				karta += home_value3/100*95
+			else
+				money += home_value3/100*95
+			end
+			delact 'Sell the renovated cottage'
+			gs 'stat'
+		end
+	end
+	if home_owned[5] = 1:
+		!Suburban land only - currently too many variables for selling upgraded mansion - might do later - 3xpurt.
+		home_value5 = (home_value[5] + rand(-50000, 50000))
+		'We have found a buyer for your vacant plot of land in the suburbs. They will offer <<home_value5>> <b>₽</b>, minus 5% for fees and taxes, bringing the total to <<home_value5/100*95>>'
+		act 'Sell the vacant plot':
+			minut += 30
+			'You spend half an hour filling in the paperwork for the vacant plot, with a loss of around 5% for fees and taxes. <<home_value5>> <b>₽</b> have been paid into your bank account.'
+			home_owned[5] = 0
+			if bankaccount = 1:
+				karta += home_value5/100*95
+			else
+				money += home_value5/100*95
+			end
+			delact 'Sell the vacant plot'
+			gs 'stat'
+		end
+	end
+	if home_owned[5] = 2:
+		!Suburban land only - currently too many variables for selling upgraded mansion - might do later - 3xpurt.
+		'Sorry, we are unable to find a buyer for your property at this time.'
+	end
+	if home_owned[5] = 3:
+		!Suburban land only - currently too many variables for selling upgraded mansion - might do later - 3xpurt.
+		'Sorry, we are unable to find a buyer for your property at this time.'
+	end
+	if home_owned[1] = 0 and home_owned[3] = 0 and home_owned[4] = 0 and home_owned[5] = 0:
+		'You don''t currently own any property.'
+	end
 	act 'Return':gt'agentned', 'start'
 end
 
 if $ARGS[0] = 'rent':
+	cla
+	*clr
+	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo_paperwork.jpg"></center>'
+	*nl
 	minut += 5
-	if ArendHouseSL ! 0:
-		'You already have a rental home with us'
-	else
-		if home_owned[1] = 0: 'There is an apartment in the residential area available'
-		'There is an apartment in the old town available'
+	gs 'stat'
+	if home_owned[1] > 0 and home_owned[4] > 0:
+		'We currently have no properties for rent.'
 
-		if home_owned[1] = 0 and money >= 15000: act 'View the city residential apartment details': gt 'agentned', 'rent_cityres'
-		if money >= 15000: act 'View the apartment in the Old Town details': gt 'agentned', 'rent_pushkin'
+	elseif home_owned[1] = 0 and home_owned[4] = 0:
+		''
+		'There are two properties available for rent.'
+		'There is an apartment in the city residential area, and an apartment in Pushkin available'
+		act 'View the city apartment details': gt 'agentned', 'rent_cityres'
+		act 'View the Pushkin apartment details': gt 'agentned', 'rent_pushkin'
+
+	elseif home_owned[1] = 0:
+		'There is a property for rent in the city residential area'
+		act 'View the city apartment details': gt 'agentned', 'rent_cityres'
+
+	elseif home_owned[4] = 0:
+		'There is a property for rent in the old town of Pushkin'
+		act 'View the Pushkin apartment details': gt 'agentned', 'rent_pushkin'
 	end
 
 	act 'Return':gt'agentned', 'start'
@@ -79,22 +216,24 @@ end
 if $ARGS[0] = 'rent_cityres':
 	cla
 	*clr
+	gs 'housing', 'rent'
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo.jpg"></center>'
+	*nl
 	'“We have a flat available right now in the residential area of St. Petersburg.” The receptionist says as he starts pulling out the paperwork. “Rent is 15,000₽ and leases have to be renewed every 30 days, which can be taken automatically from your account or you can come in and pay directly. Last but not least, you have to make your first payment up front at signing.”'
 	'He pulls out a pen and slides the paperwork onto the counter. “Interested? We can get you moved in right away.”'
 
-	if money >= 10000:
+	if money >= home_rent[1]:
 		act 'Agree and pay':
 			cls
 			minut += 30
-			money -= 10000
+			money -= home_rent[1]
 			home_owned[1] = 1
-			BuyHous = 2
-			ArendHouseSL += 30
+			ArendHouseSL += ArendHouseSL_due
 			gs'stat'
 			'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo_paperwork.jpg"></center>'
+			*nl
 			'You take the pen and start filling out the paperwork. Half an hour later, you’re handing over the money and getting the keys to your new apartment.'
 
 			act 'Return':gt'agentned', 'start'
@@ -110,6 +249,7 @@ if $ARGS[0] = 'rent_cityres':
 		minut += 5
 		'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo.jpg"></center>'
+		*nl
 		'You shake your head, “Actually, I need more time to think about this.”'
 		'The receptionist seems a bit miffed, but says nothing as he grabs the paperwork and stuffs it back in a drawer.'
 
@@ -120,35 +260,42 @@ end
 if $ARGS[0] = 'rent_pushkin':
 	cla
 	*clr
+	gs 'housing', 'rent'
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo.jpg"></center>'
-	'“We have a small apartment available right now in Pushkin’s city center. It’s a little bit pricey, but it’s been recently renovated to be more modern, and it looks quite nice. You won’t find a place like that outside of Pushkin.” The receptionist says as he starts pulling out the paperwork. “Rent is 15,000₽ and leases have to be renewed every 30 days, which can be taken automatically from your account or you can come in and pay directly. Last but not least, you have to make your first payment up front at signing.”'
+	*nl
+	'“We have a small apartment available right now in Pushkin’s city center. It’s a little bit pricey, but it’s been recently renovated to be more modern, and it looks quite nice. You won’t find a place like that outside of Pushkin.” The receptionist says as he starts pulling out the paperwork. “Rent is 10,000₽ and leases have to be renewed every 30 days, which can be taken automatically from your account or you can come in and pay directly. Last but not least, you have to make your first payment up front at signing.”'
 	'He pulls out a pen and slides the paperwork onto the counter. “Interested? We can get you moved in right away.”'
 
-	if money >= 6000:
+	if money >= home_rent[4]:
 		act 'Agree and pay':
 			cla
 			*clr
 			minut += 30
-			money -= 6000
+			money -= home_rent[4]
 			home_owned[4] = 1
-			BuyHous = 2
-			ArendHouseSL += 30
+			ArendHouseSL4 += ArendHouseSL_due
 			gs'stat'
 			'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo_paperwork.jpg"></center>'
+			*nl
 			'You take the pen and start filling out the paperwork. An hour later, you’re handing over the money and getting the keys to your new apartment.'
 
 			act 'Return':gt'agentned', 'start'
 		end
+	else
+		*nl
+		'You do not have enough money with you to rent this now.'
 	end
 
 	act 'Decline':
 		cla
 		*clr
 		minut += 5
+		gs 'stat'
 		'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo.jpg"></center>'
+		*nl
 		'You shake your head, “Actually, I need more time to think about this.”'
 		'The receptionist seems a bit miffed, but says nothing as he grabs the paperwork and stuffs it back in a drawer.'
 
@@ -159,12 +306,14 @@ end
 if $ARGS[0] = 'buy_cityres':
 	cla
 	*clr
+	gs 'housing', 'sale'
 	minut += 30
-	karta -= 2000000
+	karta -= home_value[1]
 	home_owned[1] = 2
 	gs'stat'
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo_paperwork.jpg"></center>'
+	*nl
 	'You spend half an hour filling in the paperwork to buy an apartment in the residential area. 2,000,0000 <b>₽</b> are removed from your bank account.'
 
 	act 'Return':gt'agentned', 'start'
@@ -173,13 +322,15 @@ end
 if $ARGS[0] = 'buy_dacha':
 	cla
 	*clr
+	gs 'housing', 'sale'
 	minut += 30
-	karta -= 150000
+	karta -= home_value[3]
 	home_owned[3] = 1
 	etoexhib = 0
 	gs'stat'
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo_paperwork.jpg"></center>'
+	*nl
 	'You spend half an hour filling in the paperwork for the purchase of a cottage with a garden on the co-op 5km up the north road. 150,000 <b>₽</b> have been removed from your bank account.'
 
 	act 'Return':gt'agentned', 'start'
@@ -188,12 +339,14 @@ end
 if $ARGS[0] = 'buy_Mansion':
 	cla
 	*clr
+	gs 'housing', 'sale'
 	minut += 30
-	karta -= 1500000
+	karta -= home_value[5]
 	home_owned[5] = 1
 	gs'stat'
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo_paperwork.jpg"></center>'
+	*nl
 	'You spend half an hour filling in the paperwork for the purchase of a lot for building a mansion 1km up the north road. 1,500,0000 <b>₽</b> have been removed from your bank account.'
 
 	act 'Return':gt'agentned', 'start'

+ 1 - 1
locations/albinahome

@@ -351,7 +351,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		end
 	end
 
-	if hour >= 20:
+	if hour >= 20 and week >= 5 and week < 7:
 		'Albina says that she wants to go to the disco.'
 
 		if money >= 25:act 'Go to the disco':money -= 25 & minut += 15 & gt 'gdkin'

+ 17 - 14
locations/andrey

@@ -53,21 +53,24 @@ if $ARGS[0] = 'apply':
 				work = 1
 				young_shop_work = 100
 				minut += 5
+				*nl
 				'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Monday at 15:00.'
-				gt 'young_shop', 'start'
+				act 'Continue': gt 'young_shop', 'start'
 			end
 			act 'Take the weekend job':
-				young_shop_work2 = 100
+				young_shop_work1 = 100
 				minut += 5
+				*nl
 				'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Saturday at 09:00.'
-				gt 'young_shop', 'start'
+				act 'Continue': gt 'young_shop', 'start'
 			end
 !!			act 'Take the full time job':
 !!				work = 1
-!!				young_shop_work3 = 100
+!!				young_shop_work2 = 100
 !!				minut += 5
+!!				*nl
 !!				'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Monday at 09:00.'
-!!				gt 'young_shop', 'start'
+!!				act 'Continue': gt 'young_shop', 'start'
 !!			end
 		end
 	end
@@ -159,8 +162,8 @@ if $ARGS[0] = 'punish':
 			cla
 			*clr
 			if young_shop_work = 1:young_shop_work = 2
-			if young_shop_work1 = 1:young_shop_work2 = 2
-			if young_shop_work1 = 1:young_shop_work2 = 2
+			if young_shop_work1 = 1:young_shop_work1 = 2
+			if young_shop_work2 = 1:young_shop_work2 = 2
 			young_shop_miss = 0
 			char_honest += 5
 			work = 0
@@ -395,7 +398,7 @@ if $ARGS[0] = 'fired1':
 					act 'Finish':
 						cla
 						*clr
-						gs 'cum_call', 'mouth', 'Mr. Sobulyagin', 1
+						gs 'cum_call', 'mouth', 'A101', 1
 						'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\sex\bj5.jpg"></center>'
 						'He starts grunting louder. "Open your mouth and stick out your tongue." You do as he commands and he takes over jerking his cock. Suddenly he is shooting ropes of his hot cum in your mouth and all over your tongue. After a few moments, his cock stops twitching and spurting cum in your mouth. He lets go of his cock as it starts to go limp. "Now swallow." You do as you''re told and swallow his whole load.'
 						*nl
@@ -474,9 +477,9 @@ if $ARGS[0] = 'fired2':
 						act 'Finish':
 							cla
 							*clr
-							gs 'cum_call', 'mouth', 'Mr. Sobulyagin', 1
-							gs 'cum_call', 'breasts', 'Mr. Sobulyagin', 1
-							gs 'cum_call', 'face', 'Mr. Sobulyagin', 1
+							gs 'cum_call', 'mouth', 'A101', 1
+							gs 'cum_call', 'breasts', 'A101', 1
+							gs 'cum_call', 'face', 'A101', 1
 							'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\sex\fired6.jpg"></center>'
 							'He starts grunting louder, finally he pulls his cock out of your ass and you sigh in relief. He takes a step back from you. "Get on your knees and finish me off." You do as he says and turn around, dropping to your knees. You take his dick in your mouth and start sucking it. You try not to think about where it just was, but at least the pain has stopped. Suddenly he pulls his cock out of your mouth and starts shooting ropes of his hot cum all over your face and tits. After a few moments, his cock stops twitching and spurting cum on you. He lets go of his cock as it starts to go limp.'
 							*nl
@@ -559,9 +562,9 @@ if $ARGS[0] = 'rehired':
 						act 'Finish':
 							cla
 							*clr
-							gs 'cum_call', 'mouth', 'Mr. Sobulyagin', 1
-							gs 'cum_call', 'breasts', 'Mr. Sobulyagin', 1
-							gs 'cum_call', 'face', 'Mr. Sobulyagin', 1
+							gs 'cum_call', 'mouth', 'A101', 1
+							gs 'cum_call', 'breasts', 'A101', 1
+							gs 'cum_call', 'face', 'A101', 1
 							'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\sex\fired6.jpg"></center>'
 							'He starts grunting louder, finally he pulls his cock out of your ass and you sigh in relief. He takes a step back from you. "Get on your knees and finish me off." You do as he says and turn around, dropping to your knees. You take his dick in your mouth and start sucking it. You try not to think about where it just was, but at least the pain has stopped. Suddenly he pulls his cock out of your mouth and starts shooting ropes of his hot cum all over your face and tits. After a few moments, his cock stops twitching and spurting cum on you. He lets go of his cock as it starts to go limp.'
 							*nl

+ 2 - 1
locations/anushapt

@@ -22,7 +22,7 @@
 
 !!this is the text and chances anyone is at Anushka''s apartment.
 if $ARGS[0] = 'home':
-	music_loop = 0
+	$track_loop = ''
 	CLOSE ALL
 	if sound = 0:PLAY 'sound/korr.mp3',30
 	$metkaM = $ARGS[0]
@@ -255,6 +255,7 @@ end
 
 if $ARGS[0] = 'anushroom':
 	CLOSE ALL
+	$track_loop = ''
 	music_loop = 1
 	cla
 	*clr

File diff suppressed because it is too large
+ 5 - 4
locations/bandit


+ 1 - 1
locations/bedr2x

@@ -28,7 +28,7 @@ end
 if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt'tobiQW','start'
 'Bright and beautiful bedroom, with modern and stylish furniture. The room is dominated by <a href="exec:GT ''bed'',''start''">full sized bed</a> with an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a>.' 
 'Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a>). Against the wall is a table with a <a href="exec:GT ''mirror'',''start''">mirror</a> above it.'
-if komp = 1:'On the bedside table is your <a href="exec:GT ''Komp'',''start''">notebook</a>.'
+if komp = 1:'On the bedside table is your <a href="exec:GT ''Komp'',''start''">laptop</a>.'
 if husbandrinkday = daystart:
 	if husbanstrapon = 1:'Your husband is still passed out drunk, after you used a anal plug on him.'
 	if husbanstrapon = 2:'Your husband is still passed out drunk, after you stuck a dildo in his ass.'

+ 1 - 1
locations/bedrPar2

@@ -25,7 +25,7 @@ if $ARGS[0] = '':
 	'The room in which your parents live. Their large bed, <a href="exec: gt ''bedrPar2'',''parents_wardrobe''">wardrobe</a> and other closets take up most of the space.'
 	gs 'family'
 
-	if hour > 6 and hour < 21:
+	if indorf = 1 or (indorf = 0 and hour > 6 and hour < 21):
         if kamasutra_day ! daystart:
             'You notice a <a href="exec: gt ''bedrPar2'',''kamasutra''">book laying on the bed</a>.'
         end

+ 1 - 1
locations/belgang

@@ -263,7 +263,7 @@ elseif $ARGS[0] = 'payday':
 					'Silence fills the room as he waits for you to acknowledge what he just said. Mortified about what might happen if you don''t, you nod. He decides to paint the picture anyway: "If you try to escape or refuse to work, we''ll put a bullet in your head, chop you up and bury you in the woods in pieces. And that would be a waste, with such a pretty face as yours." He pinches your cheeks and then slaps your face; not hard enough to be painful, but it certainly drives the message home. You can tell he''s dead serious.'
 					'After looking you in the eyes for a few more seconds to make sure you get the message, he turns around and leaves. You are all alone now.'
 					
-					act 'Look around': gt 'saunaroom'
+					act 'Look around': gt 'sauna', 'saunaroom'
 				end	
 			end
 		end

+ 1 - 1
locations/beverage

@@ -83,7 +83,7 @@ if $ARGS[0] = 'bev_wat':
 	*clr & cla
 	frost = 1
 	alko -= 1
-	minut += 10
+	minut += 5
 	money -= val($_drink['<<args[1]>>,price'])
 	pcs_health += 10
 	pcs_energy += 4

+ 11 - 26
locations/brothel

@@ -80,35 +80,14 @@ if $ARGS[0] = 'lobby:toilet':
 	'<center><img <<$set_imgh>> src="images/locations/shared/brothel/hoteltoilet.jpg"></center>'
 	*nl
 
-	act 'Look in the mirror':
-		cla
-		gt 'mirror', 'start'
-	end
-
-	if pcs_hairbsh = 0:
-		act 'Brush your hair': gt 'mirror', 'brush'
-	end
-
-	if (cumloc[6] = 1 or cumloc[7] = 1):
-		act 'Wipe the cum off your clothes (0:10)':
-			cla
-			*clr
-			cumspclnt = 6
-			gs 'cum_cleanup'
-			minut += 10
-			'<center><img <<$set_imgh>> src="images/shared/sex/cum/frotsp.jpg"></center>'
-			'You spend ten minutes wiping and rinsing the cum stains out of your clothes. In the end, all that remains of the stains are some damp spots that should dry up in a few minutes.'
-
-			act 'Continue':gt 'zaprF', 'toilet'
-		end
-	end
+	act 'Leave':gt 'brothel', 'lobby'
+	
+	act 'Look into the mirror': gt 'mirror', 'start'
+	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	gs 'din_van', 'pblc_pee'
-	
-	act 'Leave':gt 'brothel', 'lobby'
 end
 
 if $ARGS[0] = 'bar':
@@ -157,7 +136,13 @@ if $ARGS[0] = 'bar:order':
 	'<h3>Hotel Bar</h3>'
 	'<h5>Ordering a drink</h5>'
 	*nl
-	'<center><img <<$set_imgh>> src="images/locations/shared/brothel/barorder.jpg"></center>'
+	if alko <= 3:
+		'<center><img <<$set_imgh>> src="images/locations/shared/brothel/barorder.jpg"></center>'
+	elseif alko > 3 and alko < 6:
+		'<center><img <<$set_imgh>> src="images/locations/shared/brothel/bardrunk.jpg"></center>'
+	elseif alko >= 6:
+		'<center><img <<$set_imgh>> src="images/locations/shared/brothel/barwasted.jpg"></center>'
+	end
 	*nl
 	'You signal to the barman that you want something.'
 	'"What would you like miss?"'

File diff suppressed because it is too large
+ 162 - 162
locations/brother_voyeur


+ 1 - 15
locations/butoilet

@@ -25,21 +25,7 @@ gs 'stat'
 act 'Leave the toilet':gt 'burger', 'start'
 
 act 'Look in the mirror': gt 'mirror', 'start'
-
-if (cumloc[6] = 1 or cumloc[7] = 1):
-	act 'Wipe the cum off your clothes (0:10)':
-		cla
-		*clr
-		cumspclnt = 6
-		gs 'cum_cleanup'
-		minut += 10
-		!!'<center><img <<$set_imgh>> src="images/shared/sex/cum/frotsp.jpg"></center>'
-		'You remove traces of semen from the clothes.'
-
-		act 'Finish':gt $curloc
-	end
-end
-!!
+if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
 dynamic $tampon
 dynamic $quickwash

+ 140 - 44
locations/cikl

@@ -27,7 +27,7 @@ if day > monthsEnd[month]:
 	else
 		nyp_day = 29
 	end
-	
+
 end
 
 !!MJ: Dont think that one is needed. But it was here already.
@@ -72,7 +72,10 @@ ringB = 0
 ringC = 0
 
 if home_owned[1] = 1 and ArendHouseSL <= 0: ArendHouseSL = 0 & home_owned[1] = 0
+if home_owned[4] > 0 and ArendHouseSL4 <= 0: ArendHouseSL4 = 0 & home_owned[4] = 0
+
 if home_owned[1] = 1: ArendHouseSL -= 1
+if home_owned[4] > 0: ArendHouseSL4 -= 1
 
 !!Appearance Age
 vidageday -= 1
@@ -177,7 +180,7 @@ if bimbolevel = 1: supnatvnesh = 2 & bimbostupidity = (pcs_intel / 6)
 if bimbolevel = 2: supnatvnesh = 4 & bimbostupidity = (pcs_intel / 4)
 if bimbolevel = 3: supnatvnesh = 8 & bimbostupidity = (pcs_intel / 3)
 
-!!Succubus Level & hunger calcs 
+!!Succubus Level & hunger calcs
 if succubusflag = 1:
 
 	cheatHealth = 1
@@ -255,7 +258,7 @@ if succubusflag = 1:
 	end
 	if sucexcess < 0: sucpowzeroed += 1
 	if sucexcess >= 0 and sucpowzeroed > 0: sucpowzeroed -= 1
-	
+
 !!	This is so a Succubus always moves toward a default vaginal and anal size when she has the accomadation ability
 	if sucskill >= 4:
 		if pcs_vag - 2 >= 13:
@@ -355,7 +358,7 @@ if tabletkicheck = 2:
 		shotdue = 0
 		'Your birth control shot is no longer protecting you.'
 	elseif shotdays <= 0:
-		if shotdays = 0: 
+		if shotdays = 0:
 			shotdue = 7
 		else
 			shotdue -= 1
@@ -381,7 +384,7 @@ if tabletkicheck = 1:
 		tabletkipi = -5
 	elseif tabletki = 0 and pillsleft[ptype] = 28:
 		'You have just opened your last package of birth control pills. You need to buy more.'
-	elseif tabletki = 0 and pillsleft[ptype] <= 5:	
+	elseif tabletki = 0 and pillsleft[ptype] <= 5:
 		'You are running out of birth control pills, you only have a few left.'
 	end
 end
@@ -469,7 +472,7 @@ if tabletkicheck = 1 and tabletkichday < daystart:
 			tabletkipt = 0
 			tabletkipi = 0
 		end
-	end		
+	end
 elseif tabletkicheck = 0:
 	if tabletkiday >= (daystart - 1) and tabletkipt = 0 and rand(0,7) = 0: tabletkipt = 1
 	if pillcon > 0 and tabletkipi = 0 and rand(0,3) = 0 and (tabletkiday + 15) > daystart = 0: tabletkipi = -1
@@ -506,7 +509,7 @@ if cheatNoEat = 1 and dounspell = 1:fat += 15
 if SifacOnce = 1:Sifilis += 1
 if GerpesOnce = 1:Gerpes += 1
 if TriperOnce = 1:
-	if Triper > 0: 
+	if Triper > 0:
 		Triper += 1
 	end
 	if TriperOral > 0:
@@ -576,7 +579,7 @@ elseif preg = 0:
 	KILLVAR 'pregTalkNat'
 	KILLVAR 'pregTalkKatja'
 	KILLVAR 'pregTalkAlbina'
-	KILLVAR 'pregTalkPC'          
+	KILLVAR 'pregTalkPC'
 	KILLVAR 'pregTalkStarlets'
 	KILLVAR 'pregTalkvball'
 	KILLVAR 'pregTalkTrack'
@@ -699,7 +702,7 @@ else
 !!Intentional double to add up to 2 points
 	if exhibition_exp >= 5 * pcs_exhibition / 2: exhibition_exp -= 5 * pcs_exhibition / 2 & pcs_exhibition += 1
 	if exhibition_exp >= 5 * pcs_exhibition / 2: exhibition_exp -= 5 * pcs_exhibition / 2 & pcs_exhibition += 1
-end	
+end
 if pcs_exhibition > 50 and exhibitionQW < 3: pcs_exhibition = 50
 
 !counter for Dimka avoidance
@@ -724,13 +727,13 @@ gs 'traits', 'overnight'
 !! Hair grows 1mm each day, it takes 20 months (1 month = 30 days) to regrow the hair from 0.
 if pcs_hairlng < 1001 and hairgrowcht = 0:pcs_hairlng += 1
 
-if pcs_haircol ! nathcol: 
+if pcs_haircol ! nathcol:
 	dyefade -=1
 	if dyefade < 0: dyefade = 0
 	if dyefade > 0 and dyefade < 7: dyevmod = 5
 	if dyefade = 0: dyevmod = 15
 end
-	
+
 if hscrunch > 0:
 	hscrunchrand = rand(1, 100)
 
@@ -824,7 +827,7 @@ if pcs_lashes > 2:
 			pcs_lashes = pcs_naturallashes
 			killvar 'lashextensionstyle'
 			killvar 'lashextensionduration'
-			killvar 'lashextensionnew'	
+			killvar 'lashextensionnew'
 		end
 	end
 	if false_lashes > 0:
@@ -837,7 +840,7 @@ if pcs_lashes > 2:
 		end
 	end
 end
-	
+
 
 prezikProver += 1
 if pirs_pain_ton > 0:pirs_pain_ton -= 1
@@ -967,17 +970,17 @@ if bankAccount = 1:
 		largekarta[kartacount] = 20000000
 		kartatotal -= 20000000
 		jump 'kartaloop'
-	else 
+	else
 		largekarta[0] = kartatotal
 	end
 	if karta >= 2000000:
 		!! yearly interest of 2.3% recalculated into daily interest = 0.006% daily
 		intrate = 60
 	elseif karta >= 0:
-		!! yearly interest of 1.15% recalculated into daily interest = 0.003% daily	
+		!! yearly interest of 1.15% recalculated into daily interest = 0.003% daily
 		intrate = 30
 	else
-		!! yearly overdraft interest of 20% recalculated into daily interest = 0.055% daily		
+		!! yearly overdraft interest of 20% recalculated into daily interest = 0.055% daily
 		intrate = 550
 	end
 	:intloop
@@ -1083,26 +1086,120 @@ if day = 25:
 	end
 
 	if stipuha = 1 and stipuhaday = 0:stipuhaday = 1 & karta += 1200 & '<b><font color="green">You have received 1,200 <b>₽</b> scholarship.</font></b>'
-	if home_owned[1] = 1 and haday = 0 and BuyHous = 0:haday = 1 & money -= 15000 & '<b><font color="red">You paid 15,000 <b>₽</b> for your apartment.</font></b>'
 
-	if home_owned[1] > 0 and electroday = 0:
-		electroday = 1
-		if elektro >= 2000:elektro = 2000 + rand(0, 100)
+	if haday = 0:
+		gs 'housing', 'rent'
+		! Rent for the city apartment
+		if home_owned[1] = 1:
+			if ArendHouseSL < 31:
+				!From bank
+				if bankAccount = 1 and karta >= home_rent[1]:
+					'<b><font color="yellow">Your rent payment of <<home_rent[1]>> <b>₽</b> for your city apartment, has automatically been deducted from your bank account.</font></b>'
+					haday = 1
+					karta -= home_rent[1]
+					ArendHouseSL += ArendHouseSL_due
+				elseif bankAccount = 1 and karta + bankDebtLimit >= home_rent[1]:
+					'<b><font color="yellow">Your rent payment of <<home_rent[1]>> <b>₽</b> for your city apartment, has automatically been deducted from your bank account and overdraw facility. Please contact your bank regarding your overdraw repayment.</font></b>'
+					haday = 1
+					karta -= home_rent[1]
+					ArendHouseSL += ArendHouseSL_due
+				elseif bankAccount = 0:
+					'<b><font color="red">You currently do not have a bank account setup for automatic rent deduction of <<home_rent[1]>> <b>₽</b> for your city apartment.To avoid eviction, please make manual payment as soon as possible.</font></b>'
+				else
+					nl
+					'<b><b><font color="red">You''re card was declined during automatic rent deduction of <<home_rent[1]>> <b>₽</b> for your city apartment. To avoid eviction, please rectify as soon as possible.</font></b>'
+				end
+			elseif home_owned[1] = 1 and ArendHouseSL >= 31:
+				'<b><font color="yellow">Your rent for your city apartment is already paid in full for this month.</font></b>'
+				haday = 1
+			end
+		end
+
+		! Rent for the Pushkin apartment
+		if home_owned[4] > 0:
+			if ArendHouseSL4 < 31:
+				!From bank
+				if bankAccount = 1 and karta >= home_rent[4] and ArendHouseSL4 <= 30:
+					'<b><font color="yellow">Your rent payment of <<home_rent[4]>> <b>₽</b> for your Pushkin apartment, has automatically been deducted from your bank account.</font></b>'
+					haday = 1
+					karta -= home_rent[4]
+					ArendHouseSL4 += ArendHouseSL4_due
+				elseif bankAccount = 1 and karta + bankDebtLimit >= home_rent[4] and ArendHouseSL4 <= 30:
+					'<b><font color="yellow">Your rent payment of <<home_rent[4]>> <b>₽</b> for your Pushkin apartment, has automatically been deducted from your bank account and overdraw facility. Please contact your bank regarding your overdraw repayment.</font></b>'
+					haday = 1
+					karta -= home_rent[4]
+					ArendHouseSL4 += ArendHouseSL4_due
+				elseif bankAccount = 0 and ArendHouseSL4 <= 30:
+					'<b><font color="red">You currently do not have a bank account setup for automatic rent deduction of <<home_rent[4]>> <b>₽</b> for your Pushkin apartment.To avoid eviction, please make manual payment as soon as possible.</font></b>'
+				else
+					nl
+					'<b><b><font color="red">You''re card was declined during automatic rent deduction of <<home_rent[4]>> <b>₽</b> for your Pushkin apartment. To avoid eviction, please rectify as soon as possible.</font></b>'
+				end
+			elseif home_owned[4] > 0 and ArendHouseSL4 >= 31:
+				'<b><font color="yellow">Your rent for your Pushkin apartment is already paid in full this month.</font></b>'
+				haday = 1
+			end
+		end
+	end
 
-		money -= elektro
-		'<b><font color="red">You paid <<elektro>> for utilities.</font></b>'
+	! Utilities for all apartments.
+	if electroday = 0:
+		gs 'housing', 'util'
+		if bankAccount = 1 and karta >= elektro:
+			'<b><font color="yellow"> <<elektro>> <b>₽</b> for utilities, has been automatically deducted from your bank account.</font></b>'
+			electroday = 1
+			if elektro >= 2000:
+				elektro = 2000 + rand(0, 100)
+				karta -= elektro * hcount_util
+			end
+		elseif bankAccount = 1 and karta + bankDebtLimit >= elektro:
+			'<b><font color="yellow"> <<elektro>> <b>₽</b> for utilities, has been automatically deducted from your bank account and overdraw facility. Please contact your bank.</font></b>'
+			electroday = 1
+			if elektro >= 2000:
+				elektro = 2000 + rand(0, 100)
+				karta -= elektro * hcount_util
+			end
+		elseif bankAccount = 0 and money >= elektro:
+			'<b><font color="red">You currently do not have a bank account setup for automatic utilities payments. <<elektro>> <b>₽</b> has been deducted from your cash holdings.</font></b>'
+			electroday = 1
+			if elektro >= 2000:
+				elektro = 2000 + rand(0, 100)
+				money -= elektro * hcount_util
+			end
+		else
+			'<b><font color="red">You''re card was declined during automatic debit of <<elektro>> <b>₽</b>, for automatic utilities payment.</font></b>'
+		end
 	end
 
-	if home_owned[1] > 0 and kabel > 0 and kabelday = 0:kabelday = 1 & money -= 300 & '<b><font color="red">You have paid 300 <b>₽</b> for cable TV.</font></b>'
+	! Cable for all apartments
+	if kabel > 0 and kabelday = 0:
+		gs 'housing', 'cable'
+		if bankAccount = 1 and karta >= (300 * hcount_cable):
+			'<b><font color="yellow">300 <b>₽</b> has been deducted from your bank account, for you cable TV subscription.</font></b>'
+			kabelday = 1
+			karta -= 300 * hcount_cable
+			'<b><font color="red">You''re card was declined during automatic debit of 300 <b>₽</b> for cable TV subscription.</font></b>'
+		elseif bankAccount = 1 and karta + bankDebtLimit >= (300 * hcount_cable):
+			'<b><font color="yellow">300 <b>₽</b> has been deducted from your bank account and overdraw facility, for you cable TV subscription.</font></b>'
+			kabelday = 1
+			karta -= 300 * hcount_cable
+		elseif bankAccount = 0 and money >= (300 * hcount_cable):
+			'<b><font color="red">You currently do not have a bank account setup for automatic payment of your cable TV subscription. 300 <b>₽</b> has been deducted from your cash holdings.</font></b>'
+			kabelday = 1
+			money -= 300 * hcount_cable
+		else
+			'<b><font color="red">You''re card was declined during automatic debit of 300 <b>₽</b> for cable TV subscription.</font></b>'
+		end
+	end
 end
 
 if day ! 25:
 	if paydayHusb = 1:paydayHusb = 0
 	if workKafe = 1 and paydayKafe = 1:paydayKafe = 0
 	if workSec = 1 and paydaySec = 1:paydaySec = 0
-	if home_owned[1] = 1 and haday = 1:haday = 0
-	if home_owned[1] > 0 and electroday = 1:electroday = 0
-	if home_owned[1] > 0 and kabel > 0 and kabelday = 1:kabelday = 0
+	if (home_owned[1] = 1 or home_owned[4] > 0) and haday = 1:haday = 0
+	if (home_owned[1] > 0 or home_owned[4] > 0 or home_owned[5] = 2) and electroday = 1:electroday = 0
+	if (home_owned[1] > 0 or home_owned[4] > 0 or home_owned[5] = 3) and kabel > 0 and kabelday = 1:kabelday = 0
 	if stipuhaday = 1:stipuhaday = 0
 	if nopaytanwork = 1:nopaytanwork = 0
 	if nopaypoly = 1:nopaypoly = 0
@@ -1118,7 +1215,6 @@ end
 
 !!------------------------------------------------------------------------------------------------------------
 
-
 killvar 'holyday'
 killvar 'kanikuli'
 
@@ -1138,7 +1234,7 @@ if storyline = 1:
 			sisboyparty_day = daystart + rand(3,5)
 		end
 	end
-	
+
 	if sisboyparty = 2 and sisboyparty_day + 1 < daystart: sisboyparty = 3
 
 !!missed graduation
@@ -1150,40 +1246,40 @@ if storyline = 1:
 		end
 	end
 
-	if SchoolAtestat = 0:	
+	if SchoolAtestat = 0:
 		if month = 12 and day > 25:
-			if day < 31: 
+			if day < 31:
 				$holyday = '<b>Winter Break in <<32-day>> days.</b>'
 			else
 				$holyday = '<b>Winter Break starts tomorrow.</b>'
 			end
 		elseif month = 1 and day <= 15:
 			kanikuli = 2
-			if day < 13: 
+			if day < 13:
 				$holyday = '<b>Winter Break.</b>'
-			elseif day < 15: 
+			elseif day < 15:
 				$holyday = '<b>Winter Break ends in <<16-day>> days.</b>'
 			else
 				$holyday = '<b>Last day of Winter Break.</b>'
 			end
 		elseif month = 3 and day > 13:
-			if day < 19: 
+			if day < 19:
 				$holyday = '<b>Spring Break starts in <<20-day>> days.</b>'
-			elseif day = 19: 
+			elseif day = 19:
 				$holyday = '<b>Spring Break starts tomorrow.</b>'
-			elseif day >= 20 and day <= 26: 
+			elseif day >= 20 and day <= 26:
 				kanikuli = 3
-				if day < 24: 
+				if day < 24:
 					$holyday = '<b>Spring Break.</b>'
-				elseif day < 26: 
+				elseif day < 26:
 					$holyday = '<b>Spring Break ends in <<27-day>> days.</b>'
-				else 
+				else
 					$holyday = '<b>Last day of Spring Break.</b>'
 				end
 			end
 		elseif month = 5:
 			if ( (school_year = 2000 and year = 2017) or (school_year = 2001 and year = 2018) ) and day >= 19 and day <= 25:
-				if day = 25: 
+				if day = 25:
 					kanikuli = 6
 					$holyday = '<b>Your graduation is today. Be there by 8:00.</b>'
 				elseif day = 24:
@@ -1192,7 +1288,7 @@ if storyline = 1:
 					$holyday = '<b>Your graduation is in <<26-day>> days.</b>'
 				end
 			elseif day >= 25:
-				if day = 31: 
+				if day = 31:
 					$holyday = '<b>Summer Break starts tomorrow.</b>'
 				else
 					$holyday = '<b>Summer Break starts in <<32-day>> days.</b>'
@@ -1212,7 +1308,7 @@ if storyline = 1:
 		elseif month = 10 and day >= 29:
 			$holyday = '<b>Autumn Break starts in <<35-day>> days.</b>'
 		elseif month = 11:
-			if day < 3: 
+			if day < 3:
 				$holyday = '<b>Autumn Break starts in <<4-day>> days.</b>'
 			elseif day = 3:
 				$holyday = '<b>Autumn Break starts tomorrow.</b>'
@@ -1300,11 +1396,11 @@ if feedcat ! 0: feedcat = 0
 
 loc_count = ARRSIZE('$CloLosLoc')
 i = loc_count - 1
-:loopCloLoc	
+:loopCloLoc
 	$CloLoc = $CloLosLoc[i]
 	CloLostOn = CloLosDay[$CloLoc]
-	if CloLostOn + RAND(7,14) < daystart :		
-		gs 'clothing', 'recover_lost_clothes', $CloLoc, 2			
+	if CloLostOn + RAND(7,14) < daystart :
+		gs 'clothing', 'recover_lost_clothes', $CloLoc, 2
 	end
 	i -=1
 if i > -1 :jump 'loopCloLoc'

+ 3 - 3
locations/cityTrain

@@ -18,8 +18,8 @@ if $ARGS[0] = 'start':
 		'In the parking lot is <a href="exec:GS ''carF'',''start''">your <<$car>></a>.'
 	end
 
-	act 'Enter the station building': minut += 1 & gt 'cityTrain', 'inside'
 	act 'Go to the city center':minut += 5 & gt 'down'
+	act 'Enter the station building': minut += 1 & gt 'cityTrain', 'inside'
 end
 
 if $ARGS[0] = 'inside':
@@ -32,13 +32,13 @@ if $ARGS[0] = 'inside':
 	'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/central_station_inside.jpg"></center>'
 	'The grand old station is even more impressive on the inside and has a number of shops and bars as well as all the platforms and trains. '
 	*nl
+	act 'Leave the station': minut += 1 & gt 'cityTrain', 'start'
 	if Trainpass_day > daystart:
 		'You have <<Trainpass_day - daystart>> days left on your train pass.'
 		act 'Go to platforms': gt 'cityTrain', 'platform'
 	else
-		act 'Buy a ticket': gt 'cityTrain', 'tickets'
+		act 'Go to the ticket office': gt 'cityTrain', 'tickets'
 	end
-	act 'Leave the station': minut += 1 & gt 'cityTrain', 'start'
 end
 
 if $ARGS[0] = 'tickets':

+ 2 - 16
locations/club

@@ -246,24 +246,10 @@ if $ARGS[0] = 'tou':
 	''
 
 	act 'Leave the toilet':gt 'club', 'inside'
-
-	act 'Look into the mirror': gt 'mirror', 'start'
+	
+	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
-	if (cumloc[6] = 1 or cumloc[7] = 1):
-		act 'Wipe the cum off your clothes (0:10)':
-			cla
-			*clr
-			cumspclnt = 6
-			gs 'cum_cleanup'
-			minut += 10
-			'<center><img <<$set_imgh>> src="images/shared/sex/cum/frotsp.jpg"></center>'
-			'You use a tissue and a bit of water to remove cum stains in your clothes. '
-
-			act 'Finish':gt 'club', 'tou'
-		end
-	end
-
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin

+ 6 - 3
locations/crossfit_north_box

@@ -26,9 +26,11 @@ if $ARGS[0] = 'box':
 	'It consists of:'
 	gs 'crossfit_north_wod', $todays_crossfit_wod
 
-	act 'Check personal records':
-		cla
-		gt 'crossfit_north_record', 'view_records'
+	if crossfit_first = 1:
+		act 'Check personal records':
+			cla
+			gt 'crossfit_north_record', 'view_records'
+		end
 	end
 
 	act 'Start the exercise':
@@ -39,6 +41,7 @@ if $ARGS[0] = 'box':
 			cla
 			*clr
 			last_crossfit_workout = daystart
+			crossfit_first = 1
 			abonement -= 1
 			'You start with the workout.'
 			gs 'crossfit_north_wod', $todays_crossfit_wod

+ 2 - 2
locations/crossfit_north_record

@@ -60,7 +60,7 @@ end
 
 if $ARGS[0] = 'box_records':
 	crossfit_record_it = 0
-	:recordloop
+	:recordgeneratorloop
 	if crossfit_record_it < ARRSIZE('$crossfit_wods'):
 
 		$crossfit_wod = $crossfit_wods[crossfit_record_it]
@@ -75,7 +75,7 @@ if $ARGS[0] = 'box_records':
 			end
 		end
 		crossfit_record_it += 1
-		jump 'recordloop'
+		jump 'recordgeneratorloop'
 	end
 	killvar 'crossfit_record_it'
 	killvar 'new_record_wod_time'

+ 275 - 281
locations/din_van

@@ -134,12 +134,11 @@ $shower = {
 
 				dynamic $dryOff
 			end
-		end	
+		end
 
 		dynamic $brit
 		dynamic $dryOff
 	end
-
 }
 
 $bath = {
@@ -231,7 +230,6 @@ $bath = {
 $brit = {
 	'Your razor blade looks in good enough shape for <b><<stanok>></b> more shaves.'
 
-
 	if pcs_leghair > 3 and pcs_pubes > 3 and stanok > 1:
 		act 'Shave your legs and pussy (0:15)':
 			cla
@@ -261,11 +259,10 @@ $brit = {
 				'You lather up your legs and crotch and then start carefully shaving 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 'Put the razor away':cla & dynamic $dryOff
+			dynamic $dryOff
 		end
 	end
-	
-	
+
 	if pcs_leghair > 3 and stanok > 0:
 		act 'Shave your legs (0:10)':
 			cla
@@ -286,7 +283,7 @@ $brit = {
 				'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
 
-			act 'Put the razor away':cla & dynamic $dryOff
+			dynamic $dryOff
 		end
 	end
 
@@ -310,10 +307,9 @@ $brit = {
 			*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 'Put the razor away':cla & dynamic $dryOff
+			dynamic $dryOff
 		end
 	end
-
 }
 
 $tampon = {
@@ -347,13 +343,12 @@ $tampon = {
 	end
 }
 
-
 $quickwash = {
 	if spdirty > 0:
 		act 'Quick wash (0:15)':
 			cla
 			*clr
-			
+
 			cumspclnt = 4
 			gs 'cum_cleanup'
 			if pcs_sweat < 30:
@@ -408,8 +403,6 @@ $removepan = {
 
 $basin = {
 
-	dynamic $removepan
-
 	if cumloc[11] = 1 or cumloc[12] = 1:
 		act 'Clean the sperm from your face (0:10)':
 			cla
@@ -428,7 +421,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
@@ -446,6 +439,21 @@ $basin = {
 		end
 	end
 
+	if (cumloc[6] = 1 or cumloc[7] = 1):
+		act 'Wipe the cum off your clothes (0:10)':
+			cla
+			*clr
+			cumspclnt = 6
+			gs 'cum_cleanup'
+			minut += 10
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/shared/sex/cum/frotsp.jpg"></center>'
+			'You spend ten minutes wiping and rinsing the cum stains out of your clothes. In the end, all that remains of the stains are some damp spots that should dry up in a few minutes.'
+
+			act 'Finish':gt $loc, $metka
+		end
+	end
+	
 	if pcs_makeup ! 1:
 		act 'Wash off cosmetics (0:10)':
 			cla
@@ -461,7 +469,7 @@ $basin = {
 			act 'Finish':gt $loc, $metka
 		end
 	end
-	
+
 	if false_lashes >= 1:
 		act 'Remove false lashes (0:05)':
 			cla
@@ -479,6 +487,8 @@ $basin = {
 			act 'Finish':gt $loc, $metka
 		end
 	end
+	
+	dynamic $removepan
 }
 
 $pirTongue = {
@@ -571,73 +581,73 @@ $pirPubic = {
 
 $pirManage = {
 	cls
-    *nl
-    if pirsA > 0:
-        if pirsA < 10000:
-            '<a href="exec:pirsA = 10000 & pierWearCount -= 1 & dynamic $pirManage">Remove tongue piercing</a>.'
+	*nl
+	if pirsA > 0:
+		if pirsA < 10000:
+			'<a href="exec:pirsA = 10000 & pierWearCount -= 1 & dynamic $pirManage">Remove tongue piercing</a>.'
 		else
-            '<a href="exec:dynamic $pirTongue">Insert tongue piercing</a>.'
-        end
-    end
-    if pirsB > 0:
-        if pirsB < 10000:
-            '<a href="exec:pirsB = 10000 & pierWearCount -= 1 & dynamic $pirManage">Remove lip piercing</a>.'
+			'<a href="exec:dynamic $pirTongue">Insert tongue piercing</a>.'
+		end
+	end
+	if pirsB > 0:
+		if pirsB < 10000:
+			'<a href="exec:pirsB = 10000 & pierWearCount -= 1 & dynamic $pirManage">Remove lip piercing</a>.'
 		else
-            '<a href="exec:dynamic $pirLip">Insert lip piercing</a>.'
-        end
-    end
-    if pirsC > 0:
-        if pirsC < 10000:
-            '<a href="exec:pirsC = 10000 & pierWearCount -= 1 & dynamic $pirManage">Remove ear piercings</a>.'
+			'<a href="exec:dynamic $pirLip">Insert lip piercing</a>.'
+		end
+	end
+	if pirsC > 0:
+		if pirsC < 10000:
+			'<a href="exec:pirsC = 10000 & pierWearCount -= 1 & dynamic $pirManage">Remove ear piercings</a>.'
 		else
-            '<a href="exec:dynamic $pirEars">Insert ear piercings</a>.'
-        end
-    end
-    if pirsD > 0:
-        if pirsD < 10000:
-            '<a href="exec:pirsD = 10000 & pierWearCount -= 1 & dynamic $pirManage">Remove nose piercing</a>.'
+			'<a href="exec:dynamic $pirEars">Insert ear piercings</a>.'
+		end
+	end
+	if pirsD > 0:
+		if pirsD < 10000:
+			'<a href="exec:pirsD = 10000 & pierWearCount -= 1 & dynamic $pirManage">Remove nose piercing</a>.'
 		else
-            '<a href="exec:dynamic $pirNose">Insert nose piercing</a>.'
-        end
-    end
-    if pirsE > 0:
-        if pirsE < 10000:
-            '<a href="exec:pirsE = 10000 & pierWearCount -= 1 & dynamic $pirManage">Remove eyebrow piercing</a>.'
+			'<a href="exec:dynamic $pirNose">Insert nose piercing</a>.'
+		end
+	end
+	if pirsE > 0:
+		if pirsE < 10000:
+			'<a href="exec:pirsE = 10000 & pierWearCount -= 1 & dynamic $pirManage">Remove eyebrow piercing</a>.'
 		else
-            '<a href="exec:dynamic $pirBrow">Insert eyebrow piercing</a>.'
-        end
-    end
-    if pirsF > 0:
-        if pirsF < 10000:
-            '<a href="exec:pirsF = 10000 & pierWearCount -= 1 & dynamic $pirManage">Remove nipple piercings</a>.'
+			'<a href="exec:dynamic $pirBrow">Insert eyebrow piercing</a>.'
+		end
+	end
+	if pirsF > 0:
+		if pirsF < 10000:
+			'<a href="exec:pirsF = 10000 & pierWearCount -= 1 & dynamic $pirManage">Remove nipple piercings</a>.'
 		else
-            '<a href="exec:dynamic $pirNips">Insert nipple piercings</a>.'
-        end
-    end
-    if pirsN > 0:
-        if pirsN < 10000:
-            '<a href="exec:pirsN = 10000 & pierWearCount -= 1 & dynamic $pirManage">Remove navel piercing</a>.'
+			'<a href="exec:dynamic $pirNips">Insert nipple piercings</a>.'
+		end
+	end
+	if pirsN > 0:
+		if pirsN < 10000:
+			'<a href="exec:pirsN = 10000 & pierWearCount -= 1 & dynamic $pirManage">Remove navel piercing</a>.'
 		else
-            '<a href="exec:dynamic $pirNavel">Insert navel piercing</a>.'
-        end
-    end
-    if pirsG > 0:
-        if pirsG < 10000:
-            '<a href="exec:pirsG = 10000 & pierWearCount -= 1 & dynamic $pirManage">Remove pussy piercings</a>.'
+			'<a href="exec:dynamic $pirNavel">Insert navel piercing</a>.'
+		end
+	end
+	if pirsG > 0:
+		if pirsG < 10000:
+			'<a href="exec:pirsG = 10000 & pierWearCount -= 1 & dynamic $pirManage">Remove pussy piercings</a>.'
 		else
-            '<a href="exec:dynamic $pirPubic">Insert pussy piercings</a>.'
-        end
-    end
-    
-    act'<b>Back</b>':gt $loc, $metka
+			'<a href="exec:dynamic $pirPubic">Insert pussy piercings</a>.'
+		end
+	end
+
+	act'<b>Back</b>':gt $loc, $metka
 }
 
 if $ARGS[0] = 'private':
-    if stanok > 0:'Your razor will last for <b><<stanok>></b> more shavings.'
-	
-    !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 stanok > 0:'Your razor will last for <b><<stanok>></b> more shavings.'
+
+	!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:
@@ -653,7 +663,7 @@ if $ARGS[0] = 'private':
 		'You have <b><<sanpad>></b> pads.'
 	end
 
-    if shampoo > 0 or $loc = 'vanrPar':
+	if shampoo > 0 or $loc = 'vanrPar':
 		if $loc = 'vanrPar':
 			if shampoo < 1:shampoo = 1
 			'You are using your parents'' shampoo.'
@@ -662,14 +672,14 @@ if $ARGS[0] = 'private':
 		end
 		dynamic $shower
 		dynamic $bath
-    elseif shampoo = 0 and $loc = 'tanvanr':
-    	shampoo = 1
+	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>'
+	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
+	end
 
 	if painkiller > 0:
 		$pluralS = 's'
@@ -691,18 +701,18 @@ if $ARGS[0] = 'private':
 		end
 	end
 
-    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>'
 
-    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>'
+	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>'
 
-    if breastpump > 0:'<a href="exec:gt ''shortgs'', ''milk_me''">Use breast pump</a></center>'
+	if breastpump > 0:'<a href="exec:gt ''shortgs'', ''milk_me''">Use breast pump</a></center>'
 
-    dynamic $bteeth
+	dynamic $bteeth
 
-    dynamic $tampon
+	dynamic $tampon
 
-    dynamic $wearpan
+	dynamic $wearpan
 	act 'Check weight on the scales':
 		cla
 		*clr
@@ -711,28 +721,12 @@ if $ARGS[0] = 'private':
 	end
 	gs 'din_van', 'prvt_pee'
 
-    dynamic $basin
+	dynamic $basin
 
 	if bcream_have > 0:
 		pl'<a href="exec:dynamic $use_bcream & gt $loc, $metka"><b>Apply breast cream.</b></a> Uses left: <<bcream_have>>.'
 	end
 
-    if (cumloc[6] = 1 or cumloc[7] = 1):
-        act 'Wipe the cum off your clothes (0:10)':
-            cla
-            *clr
-            cumspclnt = 6
-            gs 'cum_cleanup'
-            minut += 10
-            gs 'stat'
-            '<center><img <<$set_imgh>> src="images/shared/sex/cum/frotsp.jpg"></center>'
-            *nl
-            'You remove the traces of cum from your clothes.'
-
-            act 'Finish':gt $loc, $metka
-        end
-    end
-
 	if pcs_leghair > 3 and pcs_pubes > 3 and stanok > 1:
 		act 'Shave your legs and pussy (0:15)':
 			cla
@@ -760,145 +754,145 @@ if $ARGS[0] = 'private':
 		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.'
+	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 'Return to showering':gt $loc, $metka
-        end
-    end
-
-    if pcs_pubes > 3 and stanok > 0:
-        act 'Shave your pussy (0:10)':
-            cla
-            *clr
-            minut += 10
-            pcs_pubes = 0
-            pcs_horny += 5
-            stanok -= 1
+		end
+	end
+
+	if pcs_pubes > 3 and stanok > 0:
+		act 'Shave your pussy (0:10)':
+			cla
+			*clr
+			minut += 10
+			pcs_pubes = 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.'
+			'<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 'Return to showering':gt $loc, $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
 
-            act 'Return to showering':gt $loc, $metka
-        end
-    end
+			'<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
 
-    if analplug = 1 and analplugin = 1:
-        act 'Remove your butt plug (0:05)':
-            cla
-            *clr
-            minut += 5
-            analplugIN = 0
+			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 < 30:pcs_ass += 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>'
+			'<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>'
+			if butpluguse > 0:'You squat and gently rub the butt plug against your anus, after lubricating it with a bit of saliva. After a short while, you''ve relaxed enough to be able to push it in. Once it''s in you give it a few gentle tugs, wondering if anyone will catch you wearing it today.'
+			if butpluguse = 0:butpluguse = 1 & '"If I''m not going to use it, then why did I buy it?" you ask yourself. You look at the butt plug for a while, thinking "It is necessary to start developing my ass, so I could have great adventures someday... you could even say huge and thick adventures with crimson heads, uh, now I got carried away..." You''re slightly embarrassed at the thought for a second, but are then overcome by your horny fantasies. Determined to get the plug all the way in, you slowly press it against your asshole after lubricating it with a bit of saliva. It hurts a bit at first, but once the thickest part is in the rest follows rather easily. Patting yourself on your ass once it''s in, you wonder if anyone will notice you''re wearing it today and then immediately feel naughty for even having thought that.'
+
+			act 'Finish':gt $loc, $metka
+		end
+	end
+
+	if klisma = 1 and (klismaday ! daystart or arrpos('sparrloc', 3) ! -1):
+		act 'Give yourself an enema (0:05)':
+			cla
+			*clr
+			cumspclnt = 7
+			gs 'cum_cleanup'
+			minut += 5
+			klismaday = daystart
+			klismaday1 = 1
+
+			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/klisma.jpg"></center>'
 			*nl
-            if butpluguse > 0:'You squat and gently rub the butt plug against your anus, after lubricating it with a bit of saliva. After a short while, you''ve relaxed enough to be able to push it in. Once it''s in you give it a few gentle tugs, wondering if anyone will catch you wearing it today.'
-            if butpluguse = 0:butpluguse = 1 & '"If I''m not going to use it, then why did I buy it?" you ask yourself. You look at the butt plug for a while, thinking "It is necessary to start developing my ass, so I could have great adventures someday... you could even say huge and thick adventures with crimson heads, uh, now I got carried away..." You''re slightly embarrassed at the thought for a second, but are then overcome by your horny fantasies. Determined to get the plug all the way in, you slowly press it against your asshole after lubricating it with a bit of saliva. It hurts a bit at first, but once the thickest part is in the rest follows rather easily. Patting yourself on your ass once it''s in, you wonder if anyone will notice you''re wearing it today and then immediately feel naughty for even having thought that.'
-
-            act 'Finish':gt $loc, $metka
-        end
-    end
-
-    if klisma = 1 and (klismaday ! daystart or arrpos('sparrloc', 3) ! -1):
-        act 'Give yourself an enema (0:05)':
-            cla
-            *clr
-            cumspclnt = 7
-            gs 'cum_cleanup'
-            minut += 5
-            klismaday = daystart
-            klismaday1 = 1
-
-            '<center><img <<$set_imgh>> src="images/shared/home/bathroom/klisma.jpg"></center>'
-            *nl
-            'You give yourself an enema, feeling clean down there. Your ass is now ready for anal sex without any awkward surprises.'
-
-            act 'Finish':gt $loc, $metka
-        end
-    end
-
-    if vibrator = 1 and vibratorIN = 1:
-        act 'Remove the vibrator (0:05)':
-            cla
-            *clr
-            minut += 5
-            vibratorIN = 0
-
-            if pcs_vag < 30:pcs_vag += 1
-
-            '<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-            *nl
-            'You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.'
-
-            act 'Finish':gt $loc, $metka
-        end
-    elseif vibrator = 1 and vibratorIN = 0 and pcs_vag ! 0:
-        act 'Insert the vibrator in your vagina (0:05)':
-            cla
-            *clr
-            minut += 5
-            vibratorIN = 1
-
-            if pcs_vag < 30:pcs_vag += 2
-
-            '<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
-            *nl
-            'You spread your legs and slowly insert the vibrator in your pussy, wondering if anyone will notice you wearing it today.'
-
-            act 'Finish':gt $loc, $metka
-        end
-    end
-
-    if mosolmaz > 0 and mosol > 0 and mosal_time ! (daystart * 100) + hour:
-        act 'Rub ointment onto your pussy (0:05)':
-            cla
+			'You give yourself an enema, feeling clean down there. Your ass is now ready for anal sex without any awkward surprises.'
+
+			act 'Finish':gt $loc, $metka
+		end
+	end
+
+	if vibrator = 1 and vibratorIN = 1:
+		act 'Remove the vibrator (0:05)':
+			cla
+			*clr
+			minut += 5
+			vibratorIN = 0
+
+			if pcs_vag < 30:pcs_vag += 1
+
+			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
+			*nl
+			'You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.'
+
+			act 'Finish':gt $loc, $metka
+		end
+	elseif vibrator = 1 and vibratorIN = 0 and pcs_vag ! 0:
+		act 'Insert the vibrator in your vagina (0:05)':
+			cla
+			*clr
+			minut += 5
+			vibratorIN = 1
+
+			if pcs_vag < 30:pcs_vag += 2
+
+			'<center><img <<$set_imgh>> src="images/shared/accessories/toys/vibrator.jpg"></center>'
+			*nl
+			'You spread your legs and slowly insert the vibrator in your pussy, wondering if anyone will notice you wearing it today.'
+
+			act 'Finish':gt $loc, $metka
+		end
+	end
+
+	if mosolmaz > 0 and mosol > 0 and mosal_time ! (daystart * 100) + hour:
+		act 'Rub ointment onto your pussy (0:05)':
+			cla
 			mosal_time = (daystart * 100) + hour
-            minut += 5
-            mosolmaz -= 1
-            mosol -= 5
-            'You take a tube of cream and rub it onto your itchy vulva.'
+			minut += 5
+			mosolmaz -= 1
+			mosol -= 5
+			'You take a tube of cream and rub it onto your itchy vulva.'
 
-            act 'Finish':gt $loc, $metka
-        end
-    end
+			act 'Finish':gt $loc, $metka
+		end
+	end
 
-   !For now, the pregnancy reactions use bimbolevel as a chack. Once the pregnancy fetish is added to the game, the check will likely change to that.
+	!For now, the pregnancy reactions use bimbolevel as a chack. Once the pregnancy fetish is added to the game, the check will likely change to that.
 	if pregtest > 0 and (abortionbirthdate = 0 or daystart - abortionbirthdate > 100):
-        act 'Do a pregnancy test (0:05)':
-            cla
-            minut += 5
-            pregtest -= 1
-            gs 'stat'
+		act 'Do a pregnancy test (0:05)':
+			cla
+			minut += 5
+			pregtest -= 1
+			gs 'stat'
 			 if pregchem > 120 and bimbolevel < 3 and knowpreg = 0 and huband = 0 and pregTalkPC = 0:
 				knowpreg = 1
 				thinkpreg = 1
@@ -906,7 +900,7 @@ if $ARGS[0] = 'private':
 				act 'Horrified':gt 'din_van', 'HorrifiedReact1'
 				act 'Concerned':gt 'din_van', 'ConcernedReact1'
 				act 'Excited':gt 'din_van', 'ExcitedReact1'
-            elseif pregchem > 120 and bimbolevel = 3 and knowpreg = 0 and huband = 0 and pregTalkPC = 0:
+			elseif pregchem > 120 and bimbolevel = 3 and knowpreg = 0 and huband = 0 and pregTalkPC = 0:
 				knowpreg = 1
 				thinkpreg = 1
 				'As you look at the test in your hand, you are'
@@ -921,62 +915,62 @@ if $ARGS[0] = 'private':
 				thinkpreg = 1
 				gt 'din_van', 'WifeReact2'
 			elseif pregTalkPC = 1:
-                'The test showed two strips. You are pregnant.'
-            else
+				'The test showed two strips. You are pregnant.'
+			else
 				knowpreg = 0
-                'The test showed one band. Not pregnant.'
-            end
+				'The test showed one band. Not pregnant.'
+			end
 
-            act 'Finish':gt $loc, $metka
-        end
-    end
+			act 'Finish':gt $loc, $metka
+		end
+	end
 end
 
 if $ARGS[0] = 'misery':
 
-    if stiralka > 0:
-        if husband > 0 and husbanday > 0 and husporday ! daystart and poroshok >= 1:
-            husband += 5
-            poroshok -= 1
-            husporday = daystart
-            'The washing machine washed your husband''s dirty laundry.'
-        elseif poroshok < 1:
-            'You ran out of washing powder for the washing machine.'
-        end
-    end
-
-    if husband > 0 and husbanday > 0 and husporday ! daystart and poroshok >= 2:
-        act 'Wash your husbands clothes (2 units of washing powder) (1:00)':
-            cla
-            *clr
-            husband += 5
-            poroshok -= 2
-            minut += 60
-            husporday = daystart
-            pcs_mood -= 25
-            '<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stir.jpg"></center>'
-            *nl
-            'You spend an hour washing your husband''s dirty laundry.'
-
-            act 'Leave the bathroom':gt $loc, $metka
-        end
-    end
-
-    if husband > 0 and husbanday > 0 and huspolday ! daystart:
-        act 'Clean the apartment (1:00)':
-            cla
-            *clr
-            husband += 5
-            minut += 60
-            huspolday = daystart
-            pcs_mood -= 25
-            !!'<center><img <<$set_imgh>> src="images/shared/home/kitchen/cook.jpg"></center>'
-            *nl
-            'You take a rag and start cleaning the apartment.'
-
-            act 'Finish':gt $loc, $metka
-        end
-    end
+	if stiralka > 0:
+		if husband > 0 and husbanday > 0 and husporday ! daystart and poroshok >= 1:
+			husband += 5
+			poroshok -= 1
+			husporday = daystart
+			'The washing machine washed your husband''s dirty laundry.'
+		elseif poroshok < 1:
+			'You ran out of washing powder for the washing machine.'
+		end
+	end
+
+	if husband > 0 and husbanday > 0 and husporday ! daystart and poroshok >= 2:
+		act 'Wash your husbands clothes (2 units of washing powder) (1:00)':
+			cla
+			*clr
+			husband += 5
+			poroshok -= 2
+			minut += 60
+			husporday = daystart
+			pcs_mood -= 25
+			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stir.jpg"></center>'
+			*nl
+			'You spend an hour washing your husband''s dirty laundry.'
+
+			act 'Leave the bathroom':gt $loc, $metka
+		end
+	end
+
+	if husband > 0 and husbanday > 0 and huspolday ! daystart:
+		act 'Clean the apartment (1:00)':
+			cla
+			*clr
+			husband += 5
+			minut += 60
+			huspolday = daystart
+			pcs_mood -= 25
+			!!'<center><img <<$set_imgh>> src="images/shared/home/kitchen/cook.jpg"></center>'
+			*nl
+			'You take a rag and start cleaning the apartment.'
+
+			act 'Finish':gt $loc, $metka
+		end
+	end
 end
 
 if $ARGS[0] = 'buffpick':
@@ -1070,7 +1064,7 @@ end
 
 if $ARGS[0] = 'WifeReact1':
 	cla
-	pregTalkPC = 1 
+	pregTalkPC = 1
 	minut += 10
 	*nl
 		'A wide smile spreads across your face as you look down at the pregnancy test. The two strips displayed exclaim that you’re finally starting a family. You begin to shake with excitement as you think about how you are going to tell your husband. Should you just tell him as soon as you see him, or do you want to make it an even more special occasion and tell him over a fancy dinner? Maybe you should just nonchalantly drop the test in front of him to see his reaction. Regardless of how you decide to do it, you can''t keep the excitement to yourself any longer. You take a brief moment to freshen up before leaving the room. '
@@ -1091,7 +1085,7 @@ end
 
 !!Peeing text
 
-!!I''m separating the following text into two versions, some for private bathrooms like those found in homes, and one set for public bathrooms, like those at the school. 
+!!I''m separating the following text into two versions, some for private bathrooms like those found in homes, and one set for public bathrooms, like those at the school.
 
 !!Private bathrooms: One of these text should be randomly selected if using a private restroom, such as one in a home.
 if $ARGS[0] = 'prvt_pee':
@@ -1205,7 +1199,7 @@ if $ARGS[0] = 'pblc_pee':
 			elseif rand_pee = 4:
 				'If you smell fish, it''s probably your dirty twat! Hahaha!'
 			elseif rand_pee = 5:
-				'Shave your punani, bitches! No one likes digging through a forest, LOL.' 
+				'Shave your punani, bitches! No one likes digging through a forest, LOL.'
 			elseif rand_pee = 6:
 				'Shaved pussies stink and are prone to infection! Don''t believe the lies!'
 			elseif rand_pee = 7:
@@ -1267,7 +1261,7 @@ if $ARGS[0] = 'pblc_pee':
 			end
 		end
 
-		gs 'din_van', 'pblc_pee_end'		
+		gs 'din_van', 'pblc_pee_end'
 	end
 end
 

+ 53 - 10
locations/family

@@ -119,24 +119,24 @@ if StoryLine = 1:
 			end
 		end
 
-		if $loc = 'sitrPar':
+		 if $loc = 'sitrPar' or ($loc = 'family' and $metka = 'sofa'):
 			if hour < 7 or hour >= 21:
 				ocpd_room = 1
-				'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sleeping on the couch.'
+				'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sleeping on the sofa.'
 			end
 
 			if week < 6:
 				if father_go = 0:
 					if hour >= 16 and hour < 21:
 						ocpd_room = 1
-						'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the couch, watching TV.'
+						'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the sofa, watching TV.'
 					end
 				end
 
 				if hour >= 18 and hour < 20:
 					if kanikuli > 0:
 						ocpd_room = 1
-						'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the couch, watching TV.'
+						'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the sofa, watching TV.'
 					else
 						ocpd_room = 1
 						'Your little brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting by the table and doing his homework.'
@@ -144,7 +144,7 @@ if StoryLine = 1:
 				end
 				if hour = 20:
 					ocpd_room = 1
-					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the couch, watching TV.'
+					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the sofa, watching TV.'
 				end
 			end
 
@@ -152,18 +152,18 @@ if StoryLine = 1:
 				if father_go = 0:
 					if hour >= 7 and hour < 21:
 						ocpd_room = 1
-						'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the couch, watching TV.'
+						'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the sofa, watching TV.'
 					end
 				else
 					if hour >= 7 and hour < 16:
 						ocpd_room = 1
-						'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the couch, watching TV.'
+						'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the sofa, watching TV.'
 					end
 				end
 
 				if hour >= 18 and hour <= 20:
 					ocpd_room = 1
-					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the couch, watching TV.'
+					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the sofa, watching TV.'
 				end
 			end
 		end
@@ -198,11 +198,54 @@ if StoryLine = 1:
 	end
 end
 
-if $loc = 'sitrPar' and ocpd_room = 0:
+if $loc = 'sitrPar':
+	act 'Sit on the sofa':gt 'family', 'sofa'
+end
+
+ if $loc = 'sitrPar' and ocpd_room = 0:
 	'No one else is here right now, so I''m free to use the room how I like.'
-	act 'Sit on the sofa bed':gt 'sitrPar', 'sofa'
 	gs 'exercise','start'
 end
 
+if $ARGS[0]='sofa':
+	$metka = 'sofa'
+	$loc = 'family'
+	*clr & cla
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/sofa.jpg"></center>'
+	''
+	'<center>A small sofa bed, when not folded out into a bed, is just big enough for you to curl up on and take a nap.</center>'
+	''
+	act 'Watch TV':gt 'TV','pav'
+
+	if ocpd_room = 0 and pornMagazine > 0:
+		'<br>There is a porn magazine under the sofa cushions'
+		gs 'events', 'read_porn'
+		if pcs_horny >= 50:
+			act 'Masturbate':gt 'selfplay', 'start'
+		end
+	end
+
+	gs 'events', 'read'
+	gs 'family'
+
+	if ocpd_room = 0:
+		act 'Take a nap (1:00)':
+			if pcs_sleep < 90:
+				pcs_sleep += 10
+				pcs_health += 5
+				minut += 60
+				gs 'stat'
+				'You sleep about an hour.'
+			else
+				minut += 5
+				gs 'stat'
+				'You are not tired enough to sleep, even for a short nap.'
+			end
+		end
+	end
+	act 'Get up':gt 'sitrPar'
+end
+
 --- family ---------------------------------
 

File diff suppressed because it is too large
+ 150 - 136
locations/foto


+ 241 - 79
locations/foto_events

@@ -27,7 +27,7 @@ if $ARGS[0] = 'skill':
 	if mdlng_skill_event = 3:gt'foto_events','pool2'
 	if mdlng_skill_event = 4:gt'foto_events','runway2'
 	if mdlng_skill_event = 5:gt'foto_events','wet'
-	
+
 
 end
 
@@ -108,6 +108,8 @@ if $ARGS[0] = 'high_fasion':
 			city_modelling += rand(5,25)
 			pav_modelling += rand(0,city_modelling)/6
 			exhibition_exp += rand(0,1)
+			money += modelpayfin
+			modelfotomoney += modelpayfin
 			'	You spend the duration of the shoot changing in and out of designer bodices, corsets, and other tops, all of which conspicuously lack any kind of bottom, leaving your pussy exposed.'
 			*nl
 			'	Your manager was right. <i>Definitely</i> not suited for every day use.'
@@ -187,7 +189,7 @@ if $ARGS[0] = 'fine_art':
 										'	"No," you say, standing firm. "I''m not about to lose my virginity just for a modelling job. You''ll have to make do with that, or get another model who''s willing to <b>whore herself</b> out for your art."'
 										'	"Ugh," she rolls her eyes and waves her hand dismissively. "Vine, vine. I vill not take your virginity. Ve are vasting too much time. But Alexhandar, maintain your erection. I cannot have a flaccid penis in a piece that iz zat iz zupposed to exude <i>lust</i> and <i>eroticism!</i>"'
 										'	You breathe out a sigh of relief and resume the pose she wants, waiting for further instruction.'
-										act'. . .':gt'foto_events','fine_art2'
+										act'Continue':gt'foto_events','fine_art2'
 									end
 									act'Take the deal':
 										cla & *clr
@@ -202,7 +204,7 @@ if $ARGS[0] = 'fine_art':
 										act'"AHH!!"':gt'foto_events','fine_art2'
 									end
 								end
-										
+
 								act'Resign yourself to your fate':
 									fine_art_deal = 2
 									cla & *clr
@@ -224,7 +226,7 @@ if $ARGS[0] = 'fine_art':
 							'	"I don''t care who he is, he''s not putting his dick inside me! Either deal with that or get yourself a new model."'
 							'	"Ugh," she rolls her eyes and waves her hand dismissively. "Vine, vine. Ve are vasting too much time. But Alexhandar, maintain your erection. I cannot have a flaccid penis in a piece that iz zat iz zupposed to exude <i>lust</i> and <i><eroticism!</i>"'
 							'	You huff in annoyance, but the matter resolved, you resume the pose she wants and wait for further instruction.'
-							act'. . .':gt'foto_events','fine_art2'
+							act'Continue':gt'foto_events','fine_art2'
 						end
 					end
 				end
@@ -260,7 +262,7 @@ if $ARGS[0] = 'fine_art2':
 		'	"No, no, Alexhandar. It iz no good like zat. All ze way inside." He immediately does as instructed, gripping your shoulder and he pulling you back while simultaneously pushing his hips forward. You gasp for breath, eyes watering, as he slowly drives the entire length of his cock inside your pussy centimeter by centimeter, stretching you to a breaking point. When his cock is fully enveloped and balls are brushing up against your clit, you hear the woman again.'
 		'	"Yez! Yez! Just like zat! Now hold zat pozition just like zat!" In the corner of your tear-blurred vision, you see her click the remote and a ring of cameras flash around you, snapping simultaneously. Then, a red laser begin to scan you from bottom to top. The scanner works at an excruciatingly slow pace. It takes all of your willpower not to cry out, quiver, or scream in pain. You bite down hard on your lip, tears streaming down your face as it the only facial expression you can bear to maintain without moving.'
 		'	The scan continues but at the edge of your hearing you can perceive a faint scratching sound. After a few minutes, you sink into despair when you realize that it''s the sound of drawing. She expects you to hold this position, hold this monstrously huge cock in your pussy without flinching. You want to whimper but fearing retribution you just bite down on your lip harder.'
-		act'. . .':
+		act'Continue':
 			modelfoto += 1
 			if fine_art_deal = 1:money += modelpayfin + 30000
 			if art_resign = 1:money += modelpayfin
@@ -277,7 +279,7 @@ if $ARGS[0] = 'fine_art2':
 			'	"I think I shall make zis into a sculpture. This piece must be chiseled from marble to truly encapsulate ze glory of zis zubject!" She snaps her fingers twice and staff come out to begin collecting the equipment and putting it away. The woman herself walks over and reaches into her purse.'
 			if fine_art_deal = 1:'	"Zis is for ze job," she says, placing wad of <<modelpayfin>> <b>₽</b> into your hand. "And zis, is for your contribution to art!" she says, placing in your other hand a large stack of bills equaling to 30,000 <b>₽</b>. "Zis vill be a famous piece to go down in the history of ze world! Do not forget and take pride in your part of what began here today!"'
 			if fine_art_deal = 2:'	"Zis is for ze job," she says, placing wad of <<modelpayfin>> <b>₽</b> into your hand. "And be proud," she says, placing her other hand on your shoulder. "Zis vill be a famous piece to go down in the history of ze world! One day, vhen you see ze statue, remember and be proud of ze young woman whose loss of virtue vas immortalized in stone. Remember and <i>be proud.</i>"'
-			act'. . .':
+			act'Continue':
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 				'	As the people around you pack up the equipment and depart, the artist and Alexander disappearing with them, you stand there, feeling the throbbing ache between your legs and the blood still dripping down your thighs. While you stand, all you can do is stare at the stacks of cash you have been given; the money that bought your virginity. And while you stand and stare, you think to yourself...'
 				*nl
@@ -341,7 +343,7 @@ if $ARGS[0] = 'fine_art2':
 		end
 	end
 end
-		
+
 if $ARGS[0] = 'modern_art':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
@@ -389,7 +391,7 @@ if $ARGS[0] = 'modern_art':
 		end
 	end
 end
-	
+
 if $ARGS[0] = 'aphrodite_advert':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
@@ -425,7 +427,7 @@ if $ARGS[0] = 'aphrodite_advert':
 		end
 	end
 end
-	
+
 if $ARGS[0] = 'independent_art':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
@@ -461,32 +463,192 @@ if $ARGS[0] = 'independent_art':
 	end
 end
 
-!!if $ARGS[0] = 'documentary':
-!!	cla & *clr
-!!	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-!!	'	"Documentary?" you ask. "What do you mean documentary? What''s this about?"'
-!!	'	"It''s not a modelling job, but someone''s going around asking about life as a model and in the industry. They want to interview some of the models here. Point a camera at them, ask them a few questions, put it on the internet and stuff. The pay is about that of a standard nude shoot but it''s also likely to increase your profile more than the average nude shoot, how many people who''ve seen your face, know your name. Could be good for increasing your reputation or popularity."'
-!!	'	"Hmmm..."'
-!!	act'Back to the list':gt'foto_events','list'
-!!	act'I''d like to do this one':
-!!		cla
-!!		*nl
-!!		specialjob6 = 0
-!!		
-!!end
+if $ARGS[0] = 'documentary':
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+	'	"Documentary?" you ask. "What do you mean documentary? What''s this about?"'
+	'	"It''s not a modelling job, but someone''s going around asking about life as a model and in the industry. They want to interview some of the models here. Point a camera at them, ask them a few questions, put it on the internet and stuff. The pay is about half that of a standard nude shoot. They want you in your ''natural habitat'' so you can''t put on clothes, But it''s also likely to increase your profile more than the average nude shoot, increase how many people who''ve seen your face, know your name. Could be good for your reputation or popularity."'
+	'	"Hmmm..."'
+	act'Back to the list':gt'foto_events','list'
+	act'I''d like to do this one':
+		cla
+		*nl
+		specialjob6 = 0
+		'	"I''d like to do this one. Sounds kind of fun."'
+		'	"Great! Go to set 26. The client will be waiting for you there."'
+		act'Go to set 26':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
+			'	You go to the designated set and find a simple setup with a woman sitting in a folding chair, a couple cameras with crew working them, and an overhead microphone. As far as you can tell, the woman is the one who seems to be in charge and so you walk up to her.'
+			'	"Hi, I was told to come here for the documentary shoot?"'
+			'	"Hello!" she says with a genuine smile. "I''m Anfisa, the director running this project. I''ll be the one asking you questions today. If you could just stand over here, we''ll take a minute get the exposure and sound levels right. Are you comfortable on camera?"'
+			'	You shrug. "I hope so. It''s kind of my job here to be comfortable on camera."'
+			'	Anfisa laughs. "I suppose you''re right. Kind of asked out of habit, comes with the job that you get some people who aren''t comfortable but need to be filmed regardless. Anyways, I think we''re all set up on our end. Are you ready to get started?"'
+			'	You nod. "I''m ready."'
+			'	"Okay, and here... we... go!" Anfisa signals and one of the crew members walks up and snaps a clapperboard in front of you before hurrying away.'
+			act'Continue':
+				cla & *clr
+				'<center><video autoplay loop src="images/locations/city/citycenter/photo/interview3.mp4">'
+				'	"Alright, well, first thing''s first. Who are you, how old are you, and where do you work?"'
+				if age < 18:'	"My name is <<$pcs_firstname>>, I am 18 years old, and I work as a model at Aphrodite Photography."'
+				elseif age >= 18:'	"My name is <<$pcs_firstname>>, I am <<age>> years old, and I work as a model at Aphrodite Photography."'
+				*nl
+				'	"And how long have you been working as a model?"'
+				act'Continue':
+					cla & *clr
+					'<center><video autoplay loop src="images/locations/city/citycenter/photo/interview1.mp4">'
+					if modelyear = year:'	"I started working at Aphrodite earlier this year."'
+					if modelyear = year - 1:'	"I started working at Aphrodite last year."'
+					if modelyear < year - 1:'	"I started working at Aphrodite a couple years ago."'
+					*nl
+					'	"And why did you decide to become a model?"'
+					act'I needed a job':
+						questionanswer = 1
+						gt'foto_events','documentary2'
+					end
+						
+					act'I needed fast cash':
+						questionanswer = 2
+						gt'foto_events','documentary2'
+					end
+						
+					act'I wanted to buy nice things':
+						questionanswer = 3
+						gt'foto_events','documentary2'
+					end
+					
+					act'I wanted to be famous':
+						if rank >= 1:
+							*nl
+							if rank < 10:'	"I see. And now you''ve become one of the top ten models in the city! I think that qualifies as famous. Now that you''ve achieved your dream, how does this make you feel?"'
+							if rank = 10:'	"And now you''ve become the number one model in the city! I think that definitely qualifies as famous. Now that you''ve achieved your dream, how does this make you feel?"'
+							act'It was everything I dreamed it would be':
+								questionanswer = 7
+								gt'foto_events','documentary2'
+							end
+							
+							act'It feels kind of hollow':
+								questionanswer = 8
+								gt'foto_events','documentary2'
+							end
+							if rank < 10:
+								act'It''s not enough, I need to be number one':
+									questionanswer = 9
+									gt'foto_events','documentary2'
+								end
+							end
+						else
+							questionanswer = 4
+							gt'foto_events','documentary2'
+						end
+					end
+					
+					act'I wanted to get into acting':
+						questionanswer = 5
+						gt'foto_events','documentary2'
+					end
+					
+					if pcs_exhibition > 50:
+						act'It really turns me on':
+							questionanswer = 6
+							pcs_horny += 5
+							city_modelling += 5
+							city_slut += 30
+							pav_slut += 1
+							pav_modelling += 1
+							cla & *clr
+							gt'foto_events','documentary2'
+						end
+					end
+				end
+			end
+		end
+	end
+end
+	
+
+if $ARGS[0] = 'documentary2':
+	cla & *clr
+	if questionanswer = 1 or questionanswer = 3:'<center><video autoplay loop src="images/locations/city/citycenter/photo/interview3.mp4">'
+	if questionanswer = 4 or questionanswer = 6 or questionanswer = 7:'<center><video autoplay loop src="images/locations/city/citycenter/photo/interview2.mp4">'
+	if questionanswer = 2 or questionanswer = 8:'<center><video autoplay loop src="images/locations/city/citycenter/photo/interview1.mp4">'
+	if questionanswer = 5 or questionanswer = 9:'<center><video autoplay loop src="images/locations/city/citycenter/photo/interview5.mp4">'
+	
+	if questionanswer = 1:
+		'	"I just needed a job to be honest," you laugh. "No bigger reason than that to be honest. Everyone needs money to live and the rates here are pretty good. So I became a model."'
+		*nl
+		'	"I see! I see! Well that''s a fair enough reason as any to get into modelling. For the next question: when you first started working here how comfortable were you with doing nude modelling?"'
+	elseif questionanswer = 2:
+		'	"Because..." you trail off, thinking back on it. "I needed some fast cash at the time. Had some things I wanted to buy or needed to pay off. Modelling paid well, nude modelling paid even better, so I got a job here."'
+		*nl
+		'	'
+	
+	elseif questionanswer = 3:
+		'	"I just wanted to buy nice things!" you laugh. "Clothes, jewelry, shoes, whatever. Modelling here pays pretty good. Nude modelling pays even better. I''m fine with doing some posing in my birthday suit if it means I don''t have to worry about money and I can buy whatever I want."'
+	
+	elseif questionanswer = 4:
+		'	"I wanted to be famous. I mean, growing up, what teenage girl <i>doesn''t</i> want to be famous? You look in magazines and at billboards and watch TV and you see these beautiful women who have everyone''s attention and everyone knows their name. That''s what I wanted. That''s why I became a model."'
+		
+			*nl
+			'	dialogue'
+			gt'foto_events','documentary3'
+		end
+	
+	elseif questionanswer = 5:
+		'	"I actually wanted to use this as a platform for getting into acting. It''s so hard to get into the showbiz so I wondered what the best way to get hired would be. There''s just so many other girls who audition for movies and TV roles and stuff, it''s hard to set yourself apart. But I figured that if I showed my work as a model, got some fame and publicity that way, I''d be more likely to land a role. People would already know my name, I could use that as a selling point for why I should be hired. The next girl in line doesn''t have that on her résumé!"'
+		*nl
+		
+	
+	elseif questionanswer = 6:
+		'	Smiling quietly to yourself, you almost can''t believe you''re going to say this. But that''s what makes it so good.'
+		'	"Truth be told... I actually took this job because it really turns me on. I mean, think about it: An untold number of people out there, most of which I''ll never meet, all looking at my naked body and seeing my most private parts? Ohhh! It just makes me want to- nnngh!"'
+		'	As much as you''d like to, you have to force yourself to not start masturbating in the moment. You can''t do that right now. What if it makes them cut your interview? Gotta play the long game here.'
+		'	"But, yeah. I became a model because it makes me real fuckin'' horny."'
+	
+	elseif questionanswer = 7:
+		'	"It''s everything I dreamed it would be," you smile, practically giggling. "I mean, the recognition, the money, my personal sense of achievement, it all feels fantastic! It makes me happy, it really does."'
+	
+	elseif questionanswer = 8:
+		if rank < 10:'	"It feels... kind of hollow to be honest. I always thought that once I made it big, get my face on a billboard or two that it would make me happy but... it just doesn''t. I''m famous now. I mean, I''m one of the top 10 models in the city. That means I made it, right? But... I just feel empty inside... Sure, people know who I am, I have lots of money, everyone wants to be me but... I dunno. I guess dreams aren''t all they''re cracked up to be."'
+		if rank = 10:'	"It feels... kind of hollow to be honest. I always thought that once I made it big, get my face on a billboard or two that it would make me happy but... it just doesn''t. I''m famous now. I mean, I''m the number one model in the city, one of the most famous models in the country. That means I made it, right? But... I just feel empty inside... Sure, people know who I am, I have lots of money, everyone wants to be me but... I dunno. I guess dreams aren''t all they''re cracked up to be."'
+	
+	elseif questionanswer = 9:
+		'	"No, you''re wrong. I haven''t achieved my dream yet. I need to be the most famous model in the city. Unless I''m number one, I won''t be satisfied."'
+	
+	end
+	
+	
+end
+
+if $ARGS[0] = 'documentary3':
 
-!!if $ARGS[0] = 'designer_wedding':
-!!	cla & *clr
-!!	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-!!	'	"Designer wedding dress?" you ask. "We do this kind of work?"'
-!!	'	"When it''s this kind of designer we do. It''s another one of those high fashion type things, taking a look at the bridal fashion, looking to make it more dramatic, more exciting, more sexual. Anyways, bottom line, I wouldn''t call this a ''dress.'' I''d barely call it clothing actually. It''s pretty much just a veil, stockings, and lingerie. I guess it''s a little bit like a wedding dress in that it has lacy gloves. Anyways, that''s the request. Wear the stuff, show some skin, we take the pictures to send to her so she can share them with her designer friends. So, what do you say?"'
-!!	act'Back to the list':gt'foto_events','list'
-!!	act'I''d like to do this one':
-!!		cla
-!!		*nl
-!!		specialjob7 = 0
-!!		
-!!end
+
+if $ARGS[0] = 'documentary4':
+
+
+if $ARGS[0] = 'documentary5':
+
+
+if $ARGS[0] = 'documentary6':
+
+
+if $ARGS[0] = 'documentary7':
+
+
+if $ARGS[0] = 'documentary8':
+
+if $ARGS[0] = 'designer_wedding':
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+	'	"Designer wedding dress?" you ask. "We do this kind of work?"'
+	'	"When it''s this kind of designer we do. It''s another one of those high fashion type things, taking a look at the bridal fashion, looking to make it more dramatic, more exciting, more sexual. Anyways, bottom line, I wouldn''t call this a ''dress.'' I''d barely call it clothing actually. It''s pretty much just a veil, stockings, and lingerie. I guess it''s a little bit like a wedding dress in that it has lacy gloves. Anyways, that''s the request. Wear the stuff, show some skin, we take the pictures to send to her so she can share them with her designer friends. So, what do you say?"'
+	act'Back to the list':gt'foto_events','list'
+	act'I''d like to do this one':
+		cla
+		*nl
+		specialjob7 = 0
+		
+end
 
 !!------------------------------------------------------------------------ Fame events ------------------------------------------------------------------------
 if $ARGS[0] = 'topless1':
@@ -514,14 +676,14 @@ if $ARGS[0] = 'topless1':
 					'	"That''s a shame. Well, maybe some other time then. I''ll tell the producer you said no."'
 					act'Back to the studio':gt'foto','studio'
 				end
-				
+
 				act'"Yeah! Let''s do it!"':
 					first_fame_event = 2
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 					'	"Yeah! Let''s do it!" you say excitedly.'
 					'	"Great! Do your makeup and put your clothes back on, we''ll leave as soon as you''re ready.'
-					act'. . .':gt'foto_events','topless1.1'
+					act'Continue':gt'foto_events','topless1.1'
 				end		
 			else
 				'	"What kind of offer?"'
@@ -533,14 +695,14 @@ if $ARGS[0] = 'topless1':
 					'	"That''s a shame. Well, maybe some other time then. I''ll tell the producer you said no."'
 					act'Back to the studio':gt'foto','studio'
 				end
-				
+
 				act'"Yeah! Let''s do it!"':
 					*clr & cla
 					first_fame_event = 2
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 					'	"Yeah! Let''s do it!" you say excitedly.'
 					'	"Great! Do your makeup and put your clothes back on, we''ll leave as soon as you''re ready.'
-					act'. . .':gt'foto_events','topless1.1'
+					act'Continue':gt'foto_events','topless1.1'
 				end
 			end
 		end
@@ -557,31 +719,31 @@ if $ARGS[0] = 'topless1.1':
 	gs 'clothing', 'wear_last_worn'
 	'<center><video autoplay loop src="images/locations/city/citycenter/photo/dress.mp4"></video></center>'
 	'	You run to your makeup station and get your makeup straighted out before running back to the dressing room and throwing your clothes on.'
-	act'. . .':
+	act'Continue':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/down.jpg"></center>'
 		minut += 60
 		'	You hop in the van they have prepared and drive to a house with large windows. You get in the clothes they want you to and begin the photo shoot.'
-		act'. . .':
+		act'Continue':
 			*clr & cla
 			gs 'clothing', 'strip'
 			gs 'underwear', 'remove'
 			gs 'stat'
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/fametopless1.mp4"></video></center>'
 			'	They have you start in an oversized hoodie, teasing the camera with your breasts until you finally pull it all the way off and bare your shoulders.'
-			act'. . .':
+			act'Continue':
 				*clr & cla
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/fametopless2.mp4"></video></center>'
 				'	The photographer has you play with some of the pillows on the furniture and then in a moment of spontaneous glee you drop kick it across the room.'
-				act'. . .':
+				act'Continue':
 					*clr & cla
 					'<center><video autoplay loop src="images/locations/city/citycenter/photo/fametopless3.mp4"></video></center>'
 					'	Afterwards, you drop back down on the sofa, basking in the warmth of the sun.'
-					act'. . .':
+					act'Continue':
 						*clr & cla
 						'<center><video autoplay loop src="images/locations/city/citycenter/photo/fametopless4.mp4"></video></center>'
 						'	To end the shoot, you wiggle around on your back, letting gravity do the work as your breasts jiggle enticingly.'
-						act'. . .':
+						act'Continue':
 							*clr & cla
 							'<center><video autoplay loop src="images/locations/city/citycenter/photo/fametopless5.mp4"></video></center>'
 							minut += 120
@@ -646,7 +808,7 @@ if $ARGS[0] = 'pool1':
 					act'Back to the studio':gt'foto','studio'
 				end
 			end
-			
+
 			act'"Sorry, I had other plans"':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
@@ -654,13 +816,13 @@ if $ARGS[0] = 'pool1':
 				'	"Okay, I understand. Maybe next time."'
 				act'Back to the studio':gt'foto','studio'
 			end
-				
+
 			act'"I''d be happy to help"':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 				'	"I''d be happy to feature in the special issue."'
 				'	"Okay, great! I''ll be going ahead to set up but when you''re ready you can get in the shuttle that''s taking the other girls. I suspect when you get there we''ll start shooting immediately so put your makeup on now."'
-				act'. . .':
+				act'Continue':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/mirrors.jpg"></center>'
 					pcs_hairbsh = 1
@@ -668,7 +830,7 @@ if $ARGS[0] = 'pool1':
 					pcs_lipbalm += 8
 					'	You go over to your station and touch up your makeup, make sure it''s perfect. You see a few of the other girls who are participating in the shoot doing the same. Soon, everyone is ready and you all pile into a shuttle and drive to the shooting location.'
 					'	As promised, as soon as you all arrive, they''re ready to start.'
-					act'. . .':
+					act'Continue':
 						*clr & cla
 						minut += 180
 						modelpayfin = 3000 + (modelpay * 2) + (50*rand(0,7))
@@ -681,7 +843,7 @@ if $ARGS[0] = 'pool1':
 						pcs_mood += 5
 						'<center><video autoplay loop src="images/locations/city/citycenter/photo/fame_pool.mp4"></video></center>'
 						'	You spend various portions of the next few hours in and around the pool. Sometimes by yourself, sometimes with the other girls in the background. Eventually your portion of the shoot is over and you spend the rest of the time lazing on a chaise lounge while the other girls finish up. It''s so comfortable, you couldn''t care less when the photographers decide to snap a few more pictures of you and your invitingly exposed ass.'
-						act'. . .':
+						act'Continue':
 							*clr & cla
 							money += modelpayfin
 							modelfotomoney += modelpayfin
@@ -717,7 +879,7 @@ if $ARGS[0] = 'tennis':
 			if city_modelling < 100:'	"What would I be doing? What sport?"'
 			if city_modelling < 100:'	"Tennis. We''re doing a bit of video for this shoot and you''d be doing tennis swings in slow motion. The thing is, we really do want someone who looks like they know what they''re doing, so that''s why we''d like to have you over someone else. Think you''re up for it? I think it would really increase your exposure and your profile."'
 			if city_modelling >= 100:'	"You like tennis right? Some other magazines were talking about how much you liked the sport so we thought it''d be good put out some special material featuring you doing some tennis swings. We''re talking photography and video here. We think it''d be good publicity for you. What do you think? Want to do it?"'
-			
+
 			act'"I''m not actually that into tennis..."':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
@@ -726,7 +888,7 @@ if $ARGS[0] = 'tennis':
 				'	"Yeah. Maybe something else," you say as you walk into the main part of the studio with him.'
 				act'Back to the studio':gt'foto','studio'
 			end
-			
+
 			act'"Not today"':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
@@ -735,14 +897,14 @@ if $ARGS[0] = 'tennis':
 				'	He seems really disappointed. You honestly feel kind of bad about it.'
 				act'Back to the studio':gt'foto','studio'
 			end
-				
+
 			act'"Sure, that sounds like fun"':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 				'	"Sure, that sounds like fun!"'
 				'	"Great!" he says. "If you go to your makeup station, we left you the stuff you need for the shoot. Meet at the white screen?"'
 				'	"Okay! See you there!"'
-				act'. . .':
+				act'Continue':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/mirrors.jpg"></center>'
 					pcs_hairbsh = 1
@@ -751,13 +913,13 @@ if $ARGS[0] = 'tennis':
 					'	You go over to your station and see what they left for you. You see sneakers and a skirt, a visor and a sweat band, and a racket. There is a noticable lack of top or underwear. They didn''t tell you this was going to be a topless shoot, but you guess you shouldn''t be that surprised.'
 					'	You pull up the skirt and put on your makeup before heading over to the set.'
 					'	You do some practice swings while they''re setting up a high speed camera to capture you in slow motion. Soon enough, they''re ready to begin.'
-					act'. . .':
+					act'Continue':
 						*clr & cla
 						'<center><video autoplay loop src="images/locations/city/citycenter/photo/fame_tennis.mp4"></video></center>'
 						'	You give it your all and put in some vicious swings while one camera records and the other rapidly clicks.'
 						'	As you make your strokes, you feel your fluid and free-moving breasts follow through with them, reminding you why you usually wear a sports bra for this kind of thing.'
 						'	<i>And why they didn''t give me one for this shoot...</i> you think to yourself.'
-						act'. . .':
+						act'Continue':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 							minut += 120
@@ -778,7 +940,7 @@ if $ARGS[0] = 'tennis':
 		end
 	end
 end
-			
+
 !!------------------------------------------------------------------------ Skill Events ------------------------------------------------------------------------
 if $ARGS[0] = 'topless2':
 	*clr & cla
@@ -802,7 +964,7 @@ if $ARGS[0] = 'topless2':
 				'	You wave goodbye as he goes off to find another girl.'
 				act'Back to the studio':gt'foto','studio'
 			end
-				
+
 			act'"Sure, why not?"':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
@@ -822,7 +984,7 @@ if $ARGS[0] = 'topless2':
 						 minut += 120
 						'<center><video autoplay loop src="images/locations/city/citycenter/photo/skill_topless.mp4"></video></center>'
 						'	You spend two hours walking around, posing, and generally looking sexy for the camera on the sunny penthouse pool balcony.'
-						act'. . .':
+						act'Continue':
 							*clr & cla
 							minut += 30
 							modelpayfin = 2000 + (modelpay * 2) + (35*rand(0,5))
@@ -844,7 +1006,7 @@ if $ARGS[0] = 'topless2':
 				end
 			end
 		end
-	end	
+	end
 end
 
 if $ARGS[0] = 'beach2':
@@ -868,7 +1030,7 @@ if $ARGS[0] = 'beach2':
 				'	You wave goodbye as he goes off to find another girl.'
 				act'Back to the studio':gt'foto','studio'
 			end
-				
+
 			act'"Sure, sounds fun!"':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
@@ -885,7 +1047,7 @@ if $ARGS[0] = 'beach2':
 					gs 'clothing', 'wear_last_worn'
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/lake2.jpg"></center>'
 					'	You do the works at your makeup station throw your clothes on and jump in the car which immediately speeds off to the lake.'
-					act'. . .':
+					act'Continue':
 						cla
 						minut += 30
 						gs 'clothing', 'strip'
@@ -897,7 +1059,7 @@ if $ARGS[0] = 'beach2':
 							'<center><video autoplay loop src="images/locations/city/citycenter/photo/skill_beach.mp4"></video></center>'
 							'	You have a great time spending the next three hours posing and playing in the water with your breasts exposed. There''s one moment when a particularly big wave almost knocks your bottoms off and you end up mooning the crew for a couple seconds.'
 							'	As the sun is setting, the shoot is finally finished and you all get ready to pack up and leave.'
-							act'. . .':
+							act'Continue':
 								*clr & cla
 								minut += 60
 								modelpayfin = 2500 + (modelpay * 2) + (50*rand(0,7))
@@ -944,7 +1106,7 @@ if $ARGS[0] = 'pool2':
 				'	You point him in the direction of the last place you saw her.'
 				act'Back to the studio':gt'foto','studio'
 			end
-				
+
 			act'"Sure"':
 				*clr & cla
 				pcs_hairbsh = 1
@@ -959,12 +1121,12 @@ if $ARGS[0] = 'pool2':
 					*clr & cla
 					'<center><video autoplay loop src="images/locations/city/citycenter/photo/skill_pool.mp4"></video></center>'
 					'	You spend two hours in and around the pool, dealing with and laughing about the struggles of water physics.'
-					act'. . .':
+					act'Continue':
 						*clr & cla
 						minut += 30
 						modelpayfin = 2500 + (modelpay * 2) + (50*rand(0,7))
 						money += modelpayfin
-						modelfotomoney += modelpayfin						
+						modelfotomoney += modelpayfin
 						city_modelling += 15
 						mdlng_exp += rand(8,10)
 						modelfoto_topless += 1
@@ -979,7 +1141,7 @@ if $ARGS[0] = 'pool2':
 					end
 				end
 			end
-		end	
+		end
 	end
 end
 
@@ -1007,7 +1169,7 @@ if $ARGS[0] = 'runway2':
 				'	"Of course darling! What do you need?" As they frantically chatter away, you leave them be and go back to the main studio.'
 				act'Back to the studio':gt'foto','studio'
 			end
-				
+
 			act'"I''m sorry, I can''t be out that late"':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
@@ -1016,18 +1178,18 @@ if $ARGS[0] = 'runway2':
 				'	"Of course darling! What do you need?" As they frantically chatter away, you leave them be and go back to the main studio.'
 				act'Back to the studio':gt'foto','studio'
 			end
-				
+
 			act'"Yes! Of course!"':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 				'	"Yes of course I can be there! If the studio need me to be there, I''m there."'
 				'	<i>The money doesn''t hurt either...</i> you think to yourself.'
 				'	The photographer heaves a sigh of relief and says, "Great! Okay, stick around, I''m going to see who else is around for me to round up, okay?" With that, he rushes off and you find a place to hang out until it all starts.'
-				act'. . .':
+				act'Continue':
 					*clr & cla
 					'<center><video autoplay loop src="images/locations/city/citycenter/photo/runway_waiting.mp4"></video></center>'
 					'Eventually the photographer succeeds in rounding up as many models including one really new girl who looks like it might have been her first day here when the photographer found her. You''re all sat down on a line of chairs and told to wait for the company to do your makeup and wardrobe.'
-					act'. . .':
+					act'Continue':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/mirrors.jpg"></center>'
 						pcs_hairbsh = 1
@@ -1036,7 +1198,7 @@ if $ARGS[0] = 'runway2':
 						hour = 19
 						'	The runway crew shows up and immediately moves you to the makeup station to get your hair and everything done. They really shovel it on for this. A bit different to the subtle makeup you normally put on for modelling.'
 						'	They put you into the clothes that they''ve decided you''re going to be modelling and you wait for the show to begin.'
-						act'. . .':
+						act'Continue':
 							hour = 20
 							modelpayfin = 6000 + (modelpay * 3) + (50*rand(0,7))
 							city_modelling += 30
@@ -1047,7 +1209,7 @@ if $ARGS[0] = 'runway2':
 							'<center><video autoplay loop src="images/locations/city/citycenter/photo/skill_runway.mp4"></video></center>'
 							'	As soon as they send you down the runway you realize something''s gone wrong. The loose cleavage of the dress you''re wearing is too loose. With the kind of purposeful steps you''re taking and your breasts jiggling underneath, the fabric falls to the sides and your breasts are left completely exposed. You try your best to recover but the dress is just too loose and skimpy and no matter what you do your breasts end up coming loose.'
 							'	With nothing left to it and not wanting to make a big deal out of it and ruin the show, you put on your best model smile and just get through the rest of your walk.'
-							act'. . .':
+							act'Continue':
 								*clr & cla
 								hour = 22
 								money += modelpayfin
@@ -1065,7 +1227,7 @@ if $ARGS[0] = 'runway2':
 					end
 				end
 			end
-		end	
+		end
 	end
 end
 
@@ -1095,13 +1257,13 @@ if $ARGS[0] = 'wet':
 					'	"Yeah..." he sighs. "That''s what I thought you''d say. Dammit! Why won''t any of the girls agree to this anymore?!"'
 					act'Back to the studio':gt'foto','studio'
 				end
-					
+
 				act'"Sure! Why not?"':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 					'	"Sure! Why not? I don''t mind getting a little wet."'
 					'	"Really?" he pipes up. "Wow! I didn''t think you''d actually say yes. Alright! Let''s do it then!"'
-					act'. . .':
+					act'Continue':
 						*clr & cla
 						minut += 120
 						pcs_hairbsh = 1
@@ -1110,7 +1272,7 @@ if $ARGS[0] = 'wet':
 						'<center><video autoplay loop src="images/locations/city/citycenter/photo/wet.mp4"></video></center>'
 						'	You put on your makeup and follow him over to the water proof set in the studio and spend the next two hours shrieking and giggling as you get blasted with water while photographed nude.'
 						'	He wasn''t kidding! That water is cold!'
-						act'. . .':
+						act'Continue':
 							cla
 							modelpayfin = 3000 + (modelpay * 2) + (50*rand(0,7))
 							modelfoto_nip += 1
@@ -1126,9 +1288,9 @@ if $ARGS[0] = 'wet':
 							act'Back to the studio':gt'foto','studio'
 						end
 					end
-				end	
-			end		
-		end			
+				end
+			end
+		end
 	end
 end
 

+ 110 - 110
locations/foto_models

@@ -110,7 +110,7 @@ if $ARGS[0] = 'model_chatter':
 		'	"But-!"'
 		'	"Listen, I get it. The first time I came home to my boyfriend after I fucked someone for a role I felt bad too. But I learned pretty quickly that fucking guys for roles is like getting naked here. It''s not cheating if another guy sees your tits in a magazine right? Just like it''s not cheating to blow a casting director to land a role. It''s just part of the job. Other than this, the only audition advice I have is not to wear panties and make sure you''re on birth control."'
 	end
-	act'. . .':gt'foto','bathroom'
+	act'Continue':gt'foto','bathroom'
 end
 
 if $ARGS[0] = 'mari_1':
@@ -138,7 +138,7 @@ if $ARGS[0] = 'mari_1':
 			'	"I''ve been working for this agency for about a year. Ever since I moved to the city really."'
 			'	Something piques an interest in you as Mari mentions she''s from out of town, "If you don''t mind me asking where do you come from?"'
 			'	"Oh, just some place called Gadyukino. You''ve probably never heard of it. It''s a small village outside the city. Too small too be honest, same boring ins and outs every day. I wanted more excitement in my life! More than a simple farm girl would ever have. So I moved here."'
-			
+
 			if storyline = 1:
 				act '"You''re from Gadyukino?"':
 					cla
@@ -170,7 +170,7 @@ if $ARGS[0] = 'mari_1':
 									cla
 									*clr
 									'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/meeting/7.jpg"></center>'
-									'	You watch her pull off her top next with a smile and a laugh and you realize that she''s genuinely happy right now.' 
+									'	You watch her pull off her top next with a smile and a laugh and you realize that she''s genuinely happy right now.'
 									act'...':
 										cla
 										*clr
@@ -186,7 +186,7 @@ if $ARGS[0] = 'mari_1':
 					end
 				end
 			end
-			
+
 			act 'Ask for modelling advice':
 				cla
 				*clr
@@ -215,7 +215,7 @@ if $ARGS[0] = 'mari_1':
 								cla
 								*clr
 								'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/meeting/7.jpg"></center>'
-								'	You watch her pull off her top next with a smile and a laugh and you realize that she''s genuinely happy right now.' 
+								'	You watch her pull off her top next with a smile and a laugh and you realize that she''s genuinely happy right now.'
 								act'...':
 									cla
 									*clr
@@ -373,7 +373,7 @@ if $ARGS[0] = 'mari_4':
 			'	<i>Stuck playing the farm girl again, huh Mari? They really are slave drivers for this kind of thing aren''t they? I guess I''ll find you some other time.</i>'
 			act 'Leave':gt'foto','studio'
 		end
-		
+
 	elseif mari_busy = 3:
 		'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/busy3.jpg"></center>'
 		'	You''re looking for Mari when you find her in the middle of a shoot.'
@@ -521,16 +521,16 @@ if $ARGS[0] = 'mari_chat':
 		!		cla & *clr
 		!		'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading3.jpg"></center>'
 		!		'	"I just really wanted the extra cash so I could buy more stuff. Clothes, makeup, whatever. It''s not like I really <i>need</i> to be doing this. I''m just in it for the money."'
-		!		
+		!
 		!	act'To make money because I needed it':
 		!		cla & *clr
 		!		'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading3.jpg"></center>'
 		!		'	"Oh, I just needed the money. Things to buy, bills to pay, you know."'
-		!	
+		!
 		!	act'To build confidence':
 		!		cla & *clr
 		!		'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading3.jpg"></center>'
-		!		
+		!
 		!	act'Because it turns me on':
 		!		cla & *clr
 		!		'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading3.jpg"></center>'
@@ -551,14 +551,14 @@ if $ARGS[0] = 'mari_chat':
 		'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading16.jpg"></center>'
 		'	"How come you''re always reading the same book Mari?"'
 		'	"Oh this old thing? I don''t know, it''s just one of my favorite stories. I fell in love with it back when I still lived in Gadyukino. It''s about a girl who moves away from her home and experiences all kinds of stuff. Love, and adventure, and new things she never even dreamed existed... I guess it''s comforting to me because I feel like the girl in this story. And I suppose it also reminds me a bit of home and how it''s never far away..."'
-		act'. . .':
+		act'Continue':
 			*clr & cla
 			'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading7.jpg"></center>'
 			'	She says her last sentence with a smile. No sadness. No regret. Just happy to be living her life the way she is and happy she had parents who let her strike out on her own at such a young age.'
 			act 'Keep chatting':gt 'foto_models','mari_chat'
 		end
 	end
-	
+
 	act 'Ask about food':
 		*clr & cla
 		'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading3.jpg"></center>'
@@ -567,7 +567,7 @@ if $ARGS[0] = 'mari_chat':
 		'	You laugh about it together.'
 		act'Keep chatting':gt 'foto_models','mari_chat'
 	end
-	
+
 	act 'Ask how she stays in shape':
 		*clr & cla
 		'	<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading6.jpg"></center>'
@@ -575,15 +575,15 @@ if $ARGS[0] = 'mari_chat':
 		'	"I know right? It''s so hard!" The nice thing though is that there''s a fitness center nearby so I can always work out there on my way home from work. Good prices <i>and</i> conveniently placed! There''s a few perverts there though, so watch out!"'
 		'	"Haha, okay Mari!"'
 		act'Keep chatting':gt 'foto_models','mari_chat'
-	end	
+	end
 
 	act 'Talk about modelling':gt'foto_models','mari_modelling_chat'
-	
-	!!if week = 6: 
+
+	!!if week = 6:
 	!!	act 'Ask about her weekend plans':
-			
-		
-			
+
+
+
 	if mari_sex = 0:
 		act 'Ask for sex advice':
 			*clr & cla
@@ -591,7 +591,7 @@ if $ARGS[0] = 'mari_chat':
 			'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading3.jpg"></center>'
 			'	"Sex?? You want to ask me for advice on sex???" she says, seemingly surprised.'
 			'	"Yeah, I just wanted to ask you about it since you always have such good advice about everything."'
-			act '. . .':
+			act 'Continue':
 				*clr & cla
 				'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading5.jpg"></center>'
 				'	"Well... That''s... I..." Mari is blushing heavily, her face turning dramatically red. You think this is the first time you''ve ever seen her embarrassed about something. "I might not be the best person to ask <<$pcs_nickname>>..."'
@@ -600,7 +600,7 @@ if $ARGS[0] = 'mari_chat':
 					'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading4.jpg"></center>'
 					'	The realization dawns on you slowly as her face grows more and more red. "Wait... don''t tell me you''ve..."'
 					'	"Never had sex?" she says shyly. "No... I haven''t..."'
-					act '. . .':
+					act 'Continue':
 						*clr & cla
 						'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading5.jpg"></center>'
 						'	Your mouth is agape as she wriggles in embarrassment. She doesn''t seem upset by any means, she''s still clearly smiling. It kind of reminds you of when you were younger and when girls asked each other if they had ever kissed a boy.'
@@ -624,12 +624,12 @@ if $ARGS[0] = 'mari_chat':
 									'	"Are you bi Mari?" you say, breaking her from her stupor.'
 									'	She looks at you a little shocked. "What? No! I-... I like boys! Why would you ask... that...?" she says trailing off at the end.'
 									'	"Oh, sorry. I didn''t mean to offend you. It''s just that I wasn''t sure and all, you never said ''he'' once while you were talking. I wasn''t sure if you went both ways."'
-									act '. . .':
+									act 'Continue':
 										*clr & cla
 										'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading19.jpg"></center>'
 										'	She looks a little confused and picks up her book again.'
 										'	Mari blushes intensely and says,"N-no... I like boys..." You see her whisper the words again quietly to herself, "I like boys..."'
-										act'. . .':
+										act'Continue':
 											*clr & cla
 											'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading10.jpg"></center>'
 											'	She shakes her head and snaps out of it, sitting back down and picking up her book again.'
@@ -670,7 +670,7 @@ if $ARGS[0] = 'mari_modelling_chat':
 	'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading2.jpg"></center>'
 	'	"You want to talk about modelling? What about it?"'
 	act'Talk about something else':gt'foto_models','mari_chat'
-	
+
 	act 'Ask for modelling advice':
 		*clr & cla
 		mdlng_exp += 1
@@ -684,7 +684,7 @@ if $ARGS[0] = 'mari_modelling_chat':
 			'	She stands up and gives you a tight hug. Once again you feel her soft breasts molding into yours and her hot skin rubbing against you. Her hug is so tight that your hips are being pressed together and you can feel her bush between your legs.'
 			'	Pulling back with a smile she says, "Always make friends with your co-workers. Especially girls. We have to stick together you know!"'
 			'	You can''t help but smile back, saying, "We sure do Mari!"'
-			act'. . .':gt 'foto_models','mari_modelling_chat'
+			act'Continue':gt 'foto_models','mari_modelling_chat'
 		end
 	end
 
@@ -706,10 +706,10 @@ if $ARGS[0] = 'mari_modelling_chat':
 				'	"Mari!" you cry out with a laugh. "We''re nude models!"'
 				'	Laughing with you she looks down and says, "I know! I know! But at the diner the all the employees and the customers were constantly trying to get into my pants and I once walked in on the manager jerking off into a condom! At least as a model I can assume people are getting off by jerking it to pictures of me instead of trying to reach up my skirt. Then they''re happy and I don''t have to see it!"'
 				'	After thinking about it a bit, you can''t help but be inclined to agree.'
-				act'. . .':
+				act'Continue':
 					*clr & cla
 					'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading7.jpg"></center>'
-					'	"So then how <i>did</i> you get hired here?"' 
+					'	"So then how <i>did</i> you get hired here?"'
 					'	Mari looks down at her book smiling in a way that looks like she''s slightly embarrassed. "I just... kind of... walked in... I saw some of the albums they have by the entrance, thought, ''Hey, maybe I can do this?'' and asked if I could get hired here."'
 					'	"And they hired you just like that?" you ask.'
 					'	"Well... There were a couple hoops I had to jump through. I wasn''t exactly legal yet, so I had to buy a fake passport that said I was just to get started. But as you can see, it was well worth it!"'
@@ -719,7 +719,7 @@ if $ARGS[0] = 'mari_modelling_chat':
 			end
 		end
 	end
-	
+
 	if mari_fakepassport = 1:
 		act 'Ask about her fake passport':
 			*clr & cla
@@ -753,7 +753,7 @@ if $ARGS[0] = 'mari_modelling_chat':
 					end
 				end
 			end
-						
+
 			if age >=18 and fakepassport = 1:
 				act '"Did you buy it from that suspicious guy at the train station?"':
 					*clr & cla
@@ -772,7 +772,7 @@ if $ARGS[0] = 'mari_modelling_chat':
 					end
 				end
 			end
-			
+
 			if fakepassport = 2:
 				act '"Did you buy it from that suspicious guy at the train station?"':
 					cla
@@ -784,7 +784,7 @@ if $ARGS[0] = 'mari_modelling_chat':
 						'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading3.jpg"></center>'
 						'	"Oh no, I''ve never bought a fake passport. I''m <<age>> and I''ve always been legal to work here, I just know about the guy. It was where the Gopniks in my school would go to get their fakes so they could buy booze," you say with a laugh.'
 						'	"Oh! I didn''t realize he was that well known."'
-						act'. . .':
+						act'Continue':
 							*clr & cla
 							'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading8.jpg"></center>'
 							'	You decide to tease her a bit. "You know Mari, for a girl who went out of her way to start nude modelling before she was legal, you''re kind of innocent."'
@@ -795,7 +795,7 @@ if $ARGS[0] = 'mari_modelling_chat':
 					end
 				end
 			end
-			
+
 			if fakepassport = 0:
 				act '"Where did you even get it?"':
 					cla
@@ -807,7 +807,7 @@ if $ARGS[0] = 'mari_modelling_chat':
 						'	"I can''t believe you went through so much to start nude modelling while you were underage!" you say in astonishment. "Couldn''t you have just waited a year?"'
 						'	She looks down in embarrassment. "Well... I guess... But I <i>really</i> love this job <<$pcs_nickname>>. Wasn''t it all worth it?"'
 						'	As you look at her, you relent a bit. You can''t really fault her for chasing so hard after something she loves doing.'
-						act'. . .':
+						act'Continue':
 							*clr & cla
 							'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading8.jpg"></center>'
 							'	Still, you decide the opportunity to tease her is too good to pass up. "You know Mari, for a girl who went out of her way to start nude modelling before she was legal, you''re kind of innocent."'
@@ -843,9 +843,9 @@ if $ARGS[0] = 'anastasia1':
 		'	You thank her for the welcome and watch on as she goes onto one of the sets...'
 		anastasia = 2
 		act 'Leave':gt 'foto','studio'
-	end 
+	end
 end
-	
+
 if $ARGS[0] = 'anastasia2':
 	*clr & cla
 	'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/11.jpg"></center>'
@@ -935,7 +935,7 @@ if $ARGS[0] = 'anastasia6':
 	'	One of the men grins and pulls hard on her nipples, eliciting a sound from Anastasia that leaves you undecided on whether it was pain or pleasure.'
 	'	"You''re such a fucking slut Anastasia. I bet you''ll do anything for money. What would happen to you if all your fans saw you like this right now?"'
 	'	Unfazed by his insults she retorts without hesitation, "Then I''d stand to make a lot more money off of dirty old men like you!"'
-	act '. . .':
+	act 'Continue':
 		*clr & cla
 		'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/sex/1.jpg"></center>'
 		'	You''re admittedly impressed by Anastasia''s ability to remain in control of the situation despite the fact that she is literally being fucked in the ass.'
@@ -967,8 +967,8 @@ if $ARGS[0] = 'anastasia_chat':
 		'	"Okay, have a nice day <<$pcs_nickname>>. Don''t be a stranger!"'
 		act 'Leave':gt 'foto','studio'
 	end
-	
-		
+
+
 	act 'Ask her how she became a model':
 		*clr & cla
 		'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/9.jpg"></center>'
@@ -976,7 +976,7 @@ if $ARGS[0] = 'anastasia_chat':
 		'	"Oh, this story could take a little while for an old gal like me," she says, sitting down. "It all began when I graduated high school. I grew up in this city you know, surrounded by the business and the glamour, and the rush. Naturally, I needed a job. I was 18, I was inexperienced, and I had no qualifications other than my diploma and that I was pretty. I found that I could get a job as a secretary for quite a bit of money, but I needed a secretarial diploma to get hired. They have courses at the community center in the industrial area, but it cost more money than I had. So to get that, I did nude modelling here."'
 		'	"But-" she interrupts you by holding up her hand, telling you to wait for her to finish.'
 		'	"It was a real spur of the moment thing. One second I was thinking how much money I needed for the course, the next thing I realized I was handed a flyer that said, <b>"Big money for nude models! Audition inquiry here!"</b> So I came."'
-		act'. . .':
+		act'Continue':
 			*clr & cla
 			'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/4.jpg"></center>'
 			'	She gushes a bit as she remembers her origins. "Oh, I was such a silly girl back then. Didn''t know what I was doing, photographers had to come up and re-arrange me all the time because I couldn''t get into the right poses. Oh, to be young... Anyways, after a few weeks I had enough money to take the secretarial course. I continued shooting here at the studio between classes to support myself and 10 short classes later, I was issued my diploma!"'
@@ -990,7 +990,7 @@ if $ARGS[0] = 'anastasia_chat':
 			end
 		end
 	end
-		
+
 	act 'Ask for modelling advice':
 		*clr & cla
 		mdlng_exp += 3
@@ -1000,7 +1000,7 @@ if $ARGS[0] = 'anastasia_chat':
 		mdlng_exp += 1
 		act 'Keep chatting':gt 'foto_models','anastasia_chat'
 	end
-	
+
 	act 'Ask about food':
 		*clr & cla
 		'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/1.jpg"></center>'
@@ -1010,7 +1010,7 @@ if $ARGS[0] = 'anastasia_chat':
 		'	"Young Mari hasn''t been telling you to go to that burger joint has she?" she says in an admonishing tone.'
 		act'Keep chatting':gt 'foto_models','anastasia_chat'
 	end
-	
+
 	if anastasiasex = 0:
 		act 'Ask how she stays in shape':
 			*clr & cla
@@ -1024,7 +1024,7 @@ if $ARGS[0] = 'anastasia_chat':
 				act'Keep chatting':gt 'foto_models','anastasia_chat'
 			end
 		end
-	end	
+	end
 	if anastasiasex = 1:
 		act 'Ask how she stays in shape':
 			*clr & cla
@@ -1042,15 +1042,15 @@ if $ARGS[0] = 'anastasia_chat':
 			end
 		end
 	end
-	
+
 	if anastasiasex = 0:
 		act 'Tell her you saw her having sex in the empty set':
 			cla
 			'	"Oh you saw that?" She barely even reacts to what you said. She doesn''t appear to be surprised or embarrassed at all.'
-			act '. . .':
+			act 'Continue':
 				*clr & cla
 				'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/2.jpg"></center>'
-				'	"Just one of the perks of being the top model in Russia." She pauses for a moment to run her hands through her hair, almost like she''s stretching...' 
+				'	"Just one of the perks of being the top model in Russia." She pauses for a moment to run her hands through her hair, almost like she''s stretching...'
 				'	"All the men end up wanting to fuck you."'
 				act 'Uh...':
 					*clr & cla
@@ -1064,7 +1064,7 @@ if $ARGS[0] = 'anastasia_chat':
 						'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/5.jpg"></center>'
 						'	Anastasia sits up a bit. "Yes, financially. I need money to live don''t I?"'
 						'	"No, wait! That''s not what I meant! Who were those men?"'
-						act'. . .':
+						act'Continue':
 							*clr & cla
 							'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/4.jpg"></center>'
 							'	She leans back again and closes her eyes as if she were tired. "My clients of course. I''m the number one model in the city, it makes it easy to do some escorting on the side. It''s a good deal for everyone. They get to live their dream, the studio makes more money on set rental, and in the end I get to supplement my sexual and financial needs. Men will pay a lot of money to have sex with a model like me."'
@@ -1078,7 +1078,7 @@ if $ARGS[0] = 'anastasia_chat':
 									'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/9.jpg"></center>'
 									'	"<<$pcs_nickname>>," she says, "if you''re going to have a career in this industry you can''t be naive about how it works. This is just another way to use your fame."'
 									'	She sounds vaguely disappointed in you, like a mother trying to teach her child manners.'
-									act'. . .':
+									act'Continue':
 										*clr & cla
 										'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/1.jpg"></center>'
 										'	She picks up her panties and gets up again. "Listen <<$pcs_nickname>>, you''re great at this job, and one day you might be as famous or even more famous a model than I am. And I want you to be ready when it happens. So just in case, my advice to you is to make sure you''re on birth control, make sure you enjoy yourself, and <i>always</i> charge extra for creampies and swallowing."'
@@ -1101,13 +1101,13 @@ if $ARGS[0] = 'anastasia_chat':
 !		act'Ask Anastasia how to start selling yourself like she does':gt'foto_models','anastasia_ask'
 !	end
 end
-		
+
 if $ARGS[0] = 'anastasiasex':
 	cla
 	'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/face.jpg"></center>'
 	'	"Sure <<$pcs_nickname>>, what would you like help with?"'
 	'	If you''re being honest, her reaction is still a little strange to you. She''s as nonchalant about this as if you asked her for advice about knitting.'
-	
+
 	act 'Thank her and leave':
 		*clr & cla
 		'<center><video autoplay loop src="images/locations/city/citycenter/studio/sex/pornwalk1.mp4"></video></center>'
@@ -1116,7 +1116,7 @@ if $ARGS[0] = 'anastasiasex':
 
 		act 'Leave':gt 'foto','studio'
 	end
-	
+
 	act 'Ask about blowjobs':
 		*clr
 		pcs_horny += 5
@@ -1128,7 +1128,7 @@ if $ARGS[0] = 'anastasiasex':
 		*nl
 		'	"Is there anything else you wanted to ask about?"'
 	end
-		
+
 	act 'Ask about sex':
 		*clr
 		pcs_horny += 5
@@ -1141,7 +1141,7 @@ if $ARGS[0] = 'anastasiasex':
 		'	"Is there anything else you wanted to ask about?"'
 
 	end
-		
+
 	act 'Ask about anal':
 		*clr
 		pcs_horny += 5
@@ -1151,7 +1151,7 @@ if $ARGS[0] = 'anastasiasex':
 		*nl
 		'	"Is there anything else you wanted to ask about?"'
 	end
-		
+
 	act 'Ask about cunnilingus':
 		*clr
 		pcs_horny += 5
@@ -1161,7 +1161,7 @@ if $ARGS[0] = 'anastasiasex':
 		*nl
 		'	"Is there anything else you wanted to ask about?"'
 	end
-		
+
 	act 'Having sex with multiple men at once':
 		*clr & cla
 		pcs_horny += 10
@@ -1169,7 +1169,7 @@ if $ARGS[0] = 'anastasiasex':
 		'	Embarrassed that you even considered asking her, you blush fiercely and mumble, "I wanted to know if you had any suggestions for having sex with more than one boy..."'
 		'	"Do you mean only two? Or did you mean three to five?" she says glibly. "I guess it doesn''t matter very much. Like I told you before, this position is exceptionally versatile," she says as she gets on a nearby sofa and points her ass towards you.'
 		'	"The beauty of this position is that it can be used for all situations! Whether you''re sucking and fucking or doing some double penetration or sucking while being doubly penetrated or even taking on five boys at once!" she says while moving her hands to jerk off two imaginary cocks, "this position will cover it all."'
-		act '. . .':
+		act 'Continue':
 			*clr & cla
 			'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/14.jpg"></center>'
 			'	"It''s also the most comfortable one," she says while turning over and spreading her legs. You''re starting to get even more embarrassed. This explanation is taking longer than you thought and several people have passed by while Anastasia continues to talk about the intricacies of being gangbanged at an educational volume. You''re once again reminded of a mother, loudly talking about her daughter''s embarrassing hobbies so everyone can hear. You''re legitimately worried that people around the studio will think you''re a slut.'
@@ -1198,9 +1198,9 @@ end
 !	act'Change your mind':
 !		'	"Uhmm... You know what? It''s not actually that important right now. I''ll ask you about it later." You can tell that Anastasia still wants to know, especially after your initial prompting but doesn''t pressure you at all.'
 !		'	"That''s alright <<$pcs_firstname>>. Whenever you''re ready okay?"'
-!		act'. . .':gt'foto_models','anastasia_chat'
+!		act'Continue':gt'foto_models','anastasia_chat'
 !	end
-!	
+!
 !	act'Ask her confidently':
 !		anastasia_ask = 1
 !		*clr & cla
@@ -1208,9 +1208,9 @@ end
 !		'	"I want to know more about using my fame to make more money like you do. About using my fame to sell myself."'
 !		'	Her face lights up with a smile that looks like she''s delighted that you asked. "Yes! Of course <<$pcs_firstname>>! Ever since you broke the barrier into the studio''s top ten I''ve been waiting for you to take this next step! I''m <i>very</i> proud of you for doing it and so happy that you came to me to find out more!"'
 !		'	She leads you over to a nearby set and gestures for you to sit down across from her.'
-!		act'. . .':gt'anastasia_escort','ana_pro_talk':
+!		act'Continue':gt'anastasia_escort','ana_pro_talk':
 !	end
-!	
+!
 !	act'Ask embarrassedly':
 !		anastasia_ask = 1
 !
@@ -1225,11 +1225,11 @@ if $ARGS[0] = 'krystal1':
 	'<center><img src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	'	Walking by one of the sets you hear the photographer exclaim, "Yeah, that''s exactly what I was looking for. It''s always a pleasure working with you Katherine. You always seem to outdo yourself with every shoot."'
 	'	By hearing that you''re too excited and can''t miss the opportunity to find out what the fuss is about.'
-	act '. . .':
+	act 'Continue':
 		*clr & cla
 		'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/meeting/1.jpg"></center>'
 		'	As you peek in you see a girl posing in several exposing poses. You are spellbound by how flexible she is and you don''t even realize that you''re now standing in the open with your mouth open.'
-		act '. . .':
+		act 'Continue':
 			*clr & cla
 			'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/meeting/2.jpg"></center>'
 			'	Katherine looking teasingly your way says, "Looks like we have a little voyeur here."'
@@ -1253,7 +1253,7 @@ if $ARGS[0] = 'krystal1':
 						'	"Hmm? Oh yeah. I work a lot of places, use a lot of aliases, but you can call me Krystal. That''s my real name."'
 						'	You hear the photographer yell out that the break is over and he wants Katherine, er- Krystal back on the set.'
 						'	"Alright, gotta go babe. Hope to see you later!" she says going back to set.'
-						act '. . .':
+						act 'Continue':
 							*clr & cla
 							'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/meeting/6.jpg"></center>'
 							'	You say your farewells and watch her work for a few more mintues. If nothing else, she certainly has no shame.'
@@ -1299,7 +1299,7 @@ if $ARGS[0] = 'krystal2':
 					'	"Oh yeah. That good fucking I was talking about? I just came from the porn studio. It was gangbang! My favorite kind of scene because I don''t have to choose one way to get fucked. Gangbangs are <i>soooooo good...</i>" she closes her eyes and starts to zone out a bit.'
 					'	You stand there awkwardly, unsure of what to say.'
 					'	"That''s... good for you...? I guess...?" you finally manage.'
-					act '. . .':
+					act 'Continue':
 						*clr & cla
 						'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/meeting2/5.jpg"></center>'
 						'	"It really is! My boyfriend does a lot of scenes with me. He''s a porn star too. I love the idea that all over the world, people are watching us make love. Cumming on and in each other, fucking each other like animals, swallowing him whole... oh shit- I''m getting wet..."'
@@ -1313,7 +1313,7 @@ if $ARGS[0] = 'krystal2':
 				end
 			end
 		end
-	end 
+	end
 end
 
 
@@ -1327,7 +1327,7 @@ if $ARGS[0] = 'krystal3':
 		'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/meeting3/2.jpg"></center>'
 		'	"Hey Krys-"'
 		'	You stop suddenly as the guy starts to reachs up her skirt and down her dress.'
-		act '. . .':
+		act 'Continue':
 			*clr & cla
 			'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/meeting3/3.jpg"></center>'
 			'	As he pulls down her strap and bares one of her breasts, Krystal looks up and notices you.'
@@ -1348,7 +1348,7 @@ if $ARGS[0] = 'krystal3':
 				act 'Leave':gt 'foto','studio'
 			end
 		end
-	end 
+	end
 end
 
 if $ARGS[0] = 'krystal4':
@@ -1366,7 +1366,7 @@ if $ARGS[0] = 'krystal4':
 		'	"Don''t worry about it. Catch you later beautiful!"'
 		act'Leave':gt'foto','studio'
 	end
-	
+
 	act'"Sure"':gt'foto_models','krystal_chat'
 end
 
@@ -1385,7 +1385,7 @@ end
 if $ARGS[0] = 'krystal_chat':
 	*clr & cla
 	'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/1.jpg"></center>'
-	
+
 	act 'Leave':
 		*clr & cla
 		'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/1.jpg"></center>'
@@ -1393,11 +1393,11 @@ if $ARGS[0] = 'krystal_chat':
 		'	"Okay. See you later babe!"'
 		act 'Leave':gt 'foto','studio'
 	end
-	
+
 	act'Discuss random topics':
-		
+
 		krystal_convo = rand(1,4)
-		
+
 		if krystal_convo = 1:
 			*clr & cla
 			'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/' + rand(4,5) + '.jpg"></center>'
@@ -1407,7 +1407,7 @@ if $ARGS[0] = 'krystal_chat':
 			'	"Oh yeah, they love it. As far as they''re concerned, it''s free publicity to sell more magazines of me. How else do you think I got so popular?"'
 			act'Keep chatting':gt'foto_models','krystal_chat'
 		end
-		
+
 		if krystal_convo = 2:
 			*clr & cla
 			'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/2.jpg"></center>'
@@ -1417,8 +1417,8 @@ if $ARGS[0] = 'krystal_chat':
 			'	"Well, it was his idea to start making home videos. I was already a model at the time so he thought videos would be a step up. At first it was just being around the house together, but then we''d start to get frisky with each other and the camera would keep rolling. Soon, we''d start fucking while watching videos of ourselves fucking. It was so hot taking a creampie watching him give me a cumshot at the same time... I couldn''t get enough so I signed us up for our first porn audition! A few dozen films later, here we are!"'
 			act'Keep chatting':gt'foto_models','krystal_chat'
 		end
-		
-		
+
+
 		if krystal_convo = 3:
 			*clr & cla
 			'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/2.jpg"></center>'
@@ -1426,8 +1426,8 @@ if $ARGS[0] = 'krystal_chat':
 			'	"You could try the diner I used to work at before I became a porn star and modelling was only part time. It''s American themed in the residential area. If you need another job, you could probably be a waitress there. And if you ever want better tips as a waitress, you need to use your head. No, seriously, give the customers blowjobs. There''s always at least an extra 50<b>₽</b> in it. And you get to swallow some cum!"'
 			act'Keep chatting':gt'foto_models','krystal_chat'
 		end
-		
-		
+
+
 		if krystal_convo = 4:
 			*clr & cla
 			'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/6.jpg"></center>'
@@ -1437,10 +1437,10 @@ if $ARGS[0] = 'krystal_chat':
 			'	"Uhm... yeah... great story..."'
 			act'Keep chatting':gt'foto_models','krystal_chat'
 		end
-		
+
 	end
-	
-	
+
+
 	act 'Ask for modelling advice':
 		*clr & cla
 		mdlng_exp += 2
@@ -1450,7 +1450,7 @@ if $ARGS[0] = 'krystal_chat':
 		'	She smirks and says, "Exactly. No point in being a nude model if you''re not gonna show off the goods right? No matter what position, it''s all about your breasts, your pussy, or your ass. That''s what you want to be showing off!"'
 		act'Keep chatting':gt'foto_models','krystal_chat'
 	end
-	
+
 	act 'Ask how she stays in shape':
 		*clr & cla
 		'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/11.jpg"></center>'
@@ -1464,14 +1464,14 @@ if $ARGS[0] = 'krystal_chat':
 				'	"Oh." When you say this, you let a bit too much surprise slip into your voice.'
 				'	Krystal raises and eyebrow, saying, "Expecting something different?"'
 				'	"No! No! I-!" You stop yourself mid sentence as you realize you''re too deep to back out now. "Well... It''s just that Anastasia told me that she uses- er, that sex is a good way of staying in shape. I just thought you know... with your other job at the porn studio and your boyfriend and all that..."'
-				act'. . .':
+				act'Continue':
 					*clr & cla
 					'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/7.jpg"></center>'
 					'	"Ohhh, I get it now. Because of what Anastasia said, you thought that I stayed this thin just because I''m fucking constantly. Well, she''s is half right. Sex <i>is</i> good for burning calories and I definitely prefer to get my aerobic exercise in the bedroom with Ben instead of on a treadmill, but a body like this takes more maintenance than that just fucking."'
 					'	"How so?" you ask.'
 					'	"Well, if you look at me," she says, getting up on her knees and straightening her posture. "You''ll see my tummy isn''t just flat, it''s tight. And the same goes for the rest of my body. You can only get muscle tone like this by lifting weights and stuff." You nod understandingly.'
 					'	"Oh, okay. I think I get it now. Thanks Krystal!" You''re pretty surprised. A conversation you thought was going to be all about Krystal having sex with her boyfriend actually turned out to have some pretty decent advice for health and fitness.'
-					act'. . .':
+					act'Continue':
 						*clr & cla
 						'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/10.jpg"></center>'
 						'	Suddenly you realize Krystal is giving you a weird look.'
@@ -1491,12 +1491,12 @@ if $ARGS[0] = 'krystal_chat':
 			end
 		end
 	end
-	
+
 	act 'Ask about movies':
 			*clr & cla
 			*nl
 			krys_movie = rand(1,4)
-			
+
 			if krys_movie = 1:
 				'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/6.jpg"></center>'
 				'	"See any good movies lately Krystal?"'
@@ -1505,7 +1505,7 @@ if $ARGS[0] = 'krystal_chat':
 				'	"Yeah! Er... Not really...? Uhmm... Honestly, I don''t remember. I got distracted sucking Ben''s cock..."'
 				act'Keep chatting':gt'foto_models','krystal_chat'
 			end
-			
+
 			if krys_movie = 2:
 				'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/6.jpg"></center>'
 				'	"See any good movies lately Krystal?"'
@@ -1514,7 +1514,7 @@ if $ARGS[0] = 'krystal_chat':
 				'	"I love going to see horror movies! With all the screaming going on, Ben can get rough and I can cum as loud as I like and people just think it''s part of the movie!"'
 				act'Keep chatting':gt'foto_models','krystal_chat'
 			end
-			
+
 			if krys_movie = 3:
 				'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/11.jpg"></center>'
 				'	"See any good movies lately Krystal?"'
@@ -1523,7 +1523,7 @@ if $ARGS[0] = 'krystal_chat':
 				'	"Not really. But it was hard to concentrate on any of the jokes with Ben''s cock up my ass and my nipples being pulled through my shirt."'
 				act'Keep chatting':gt'foto_models','krystal_chat'
 			end
-			
+
 			if krys_movie = 4:
 				'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/8.jpg"></center>'
 				'	"See any good movies lately Krystal?"'
@@ -1533,7 +1533,7 @@ if $ARGS[0] = 'krystal_chat':
 				act'Keep chatting':gt'foto_models','krystal_chat'
 			end
 		end
-	
+
 end
 
 
@@ -1565,7 +1565,7 @@ if jeff = 4:gt 'foto_models','jeff_model'
 				'	"I''m <<$pcs_firstname>>."'
 				'	"What a cute name!"'
 				'	<i>She''s got quite a bubbly personality doesn''t she?</i> you think to yourself before you realize she''s still standing in silence, continuing to smile at you.'
-				'	"And your name is...?" you say awkwardly.' 
+				'	"And your name is...?" you say awkwardly.'
 				'	"Oh! You can call me Jeff!" she says.'
 				act '"Jeff...?"':
 					*clr & cla
@@ -1583,7 +1583,7 @@ if jeff = 4:gt 'foto_models','jeff_model'
 			end
 		end
 	end
-end 
+end
 !!
 if $ARGS[0] = 'jeff_2':
 '<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/4.jpg"></center>'
@@ -1613,7 +1613,7 @@ if $ARGS[0] = 'jeff_2':
 					'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/8.jpg"></center>'
 					'	"Yup! Being a model is a lot more fun."'
 					'	"What is it you said you were studying in university?"'
-					'	"Economy and management!" she says proudly.' 
+					'	"Economy and management!" she says proudly.'
 					'	<i>This airhead? Economy and management?!</i>'
 					'	"Well, I guess I should go now. Gotta get paid! Bye <<$pcs_nickname>>!" she says and then runs off.'
 					jeff = 3
@@ -1622,7 +1622,7 @@ if $ARGS[0] = 'jeff_2':
 			end
 		end
 	end
-end 
+end
 
 !!
 
@@ -1634,7 +1634,7 @@ if $ARGS[0] = 'jeff_3':
 	'	While walking through the studio, you suddenly feel someone''s arms wrap around your waist and two soft breasts press into your back.'
 	'	Before you can say anything you jump in surprise as you feel the person''s hands fly up your body and slap against your breasts to give them a firm squeeze.'
 	'	"Hiiiii cutie!" you hear a voice squeak out.'
-	
+
 	act '"Oh-! Hi!!"':
 		*clr & cla
 		'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/face.jpg"></center>'
@@ -1647,7 +1647,7 @@ if $ARGS[0] = 'jeff_3':
 			'	"Sure! Sure! Catch you later cutie!" she says, changing her tune immediately. "Gotta work to earn! Gotta earn to eat! Gotta eat to live! Have fun!" she says before startling you again with a firm squeeze of your ass and skipping off.'
 			act 'Leave':gt 'foto','studio'
 		end
-		
+
 		act '"Sure"':
 			cla
 			*nl
@@ -1658,7 +1658,7 @@ if $ARGS[0] = 'jeff_3':
 		end
 	end
 end
-		
+
 if $ARGS[0] = 'jeff_chat':
 	*clr & cla
 	'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/face.jpg"></center>'
@@ -1668,11 +1668,11 @@ if $ARGS[0] = 'jeff_chat':
 		'	"Okay! Okay! See you later hot stuff!" she says, giving you a big hug so your breasts mush together before skipping off on her own.'
 		act 'Leave':gt 'foto','studio'
 	end
-	
+
 	act 'Chat':
 		*clr
 		jeff_convo = rand(1,5)
-		
+
 		if jeff_convo = 1:
 			*clr
 			'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/15.jpg"></center>'
@@ -1680,7 +1680,7 @@ if $ARGS[0] = 'jeff_chat':
 			'	"Oh no! I don''t go to the movies. I hate them! They''re so loud and unpleasant! My poor ears can''t handle them!" she whines while putting her hands over her ears even though it is perfectly quiet right now.'
 			jeff_movies = 1
 		end
-		
+
 		if jeff_convo = 2:
 			*clr
 			'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/16.jpg"></center>'
@@ -1688,7 +1688,7 @@ if $ARGS[0] = 'jeff_chat':
 			'	"Hmmmm nooooo, not reaaaally. I mostly eat at the university''s cafeteria. They won''t let you in unless you''re a student though."'
 			'<i>Well, enrolling in a university just for food doesn''t seem like a viable option...</i>'
 		end
-		
+
 		if jeff_convo = 3:
 			*clr & cla
 			'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/9.jpg"></center>'
@@ -1703,10 +1703,10 @@ if $ARGS[0] = 'jeff_chat':
 				'	". . ."'
 				act 'Keep chatting':gt 'foto_models','jeff_chat'
 			end
-				
-				
+
+
 		end
-		
+
 		if jeff_convo = 4:
 			*clr
 			'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/14.jpg"></center>'
@@ -1717,7 +1717,7 @@ if $ARGS[0] = 'jeff_chat':
 			'	". . ."'
 			if jeff_movies = 1:'	Wait, didn''t she say that she hates going to the movies because they''re loud? How can she go to a nightclub with pounding music then???'
 		end
-		
+
 		if jeff_convo = 5:
 			*clr & cla
 			'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/18.jpg"></center>'
@@ -1727,15 +1727,15 @@ if $ARGS[0] = 'jeff_chat':
 			'	"Oh! So these <i>are</i> your reset buttons!"'
 			act 'Keep chatting':gt 'foto_models','jeff_chat'
 		end
-	end		
-	
+	end
+
 	act 'Ask for modelling advice':
 		mdlng_exp += 1
 		*clr & cla
 		'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/9.jpg"></center>'
 		'	"How to be a better model? Oh that''s easy! Just have fun!" she says.'
 		'	<i>Typical answer from her... Couldn''t have expected more I guess...</i>'
-		act'. . .':
+		act'Continue':
 			*clr & cla
 			'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/10.jpg"></center>'
 			'	"Oh, and also, don''t forget to get sexy with it! They love it when cute girls like us... <i>mmm-mmm-!</i> act like... <i>pfft-!</i> dirty sluts!" It seems like she''s legitimately holding back laughter.'
@@ -1743,8 +1743,8 @@ if $ARGS[0] = 'jeff_chat':
 			act 'Keep chatting':gt 'foto_models','jeff_chat'
 		end
 	end
-	
-	
+
+
 	if jeff_grope > 3:
 		act 'Ask her to stop groping you':
 			*clr & cla
@@ -1752,7 +1752,7 @@ if $ARGS[0] = 'jeff_chat':
 			'	"Hey Jeff... You know how whenever you see me you come up behind me and grab my breasts?"'
 			'	"Yeah?" she says, smiling and completely oblivious to your awkward tone.'
 			'	"Yeah... Could you <i>not</i> do that? It makes me kind of uncomfortable..."'
-			act'. . .':
+			act'Continue':
 				*clr & cla
 				'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/13.jpg"></center>'
 				'	She laughs and says, "Of course not silly! Boobies are meant to be grabbed!" she says kneading her own to make her point.'
@@ -1768,7 +1768,7 @@ if $ARGS[0] = 'jeff_model':
 	'<center><img src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	'You''re looking for Jeff when you hear her voice coming from one of the sets.'
 	jeff = rand(3,4)
-	act'. . .':
+	act'Continue':
 		*clr & cla
 		'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/19.jpg"></center>'
 		'	"Whooo! Yipee!"'

+ 123 - 123
locations/gadforest_event

@@ -94,9 +94,9 @@ if $ARGS[0] = 'gopforest_mitka':
 						else
 							cla
 							*clr
-							temp = RAND(0,1)
+							temp_gadf = RAND(0,1)
 							gs 'stat'
-							if temp = 0:
+							if temp_gadf = 0:
 								'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowanal.jpg"></center>'
 								'Mira is working her ass up and down on Mitka''s hard member, every time she goes down her buttocks slap loudly on his thighs.'
 								gs 'arousal', 'voyeur', 2
@@ -137,9 +137,9 @@ if $ARGS[0] = 'gopforest_mitka':
 					act 'Spy':
 						cla
 						*clr
-						temp = RAND(0,1)
+						temp_gadf = RAND(0,1)
 						gs 'stat'
-						if temp = 0:
+						if temp_gadf = 0:
 							'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowanal.jpg"></center>'
 							'Mira is working her ass up and down on Mitka''s hard member, every time she goes down her buttocks slap loudly on his thighs.'
 							gs 'arousal', 'voyeur', 2
@@ -225,17 +225,17 @@ if $ARGS[0] = 'gopforest_mitka':
 				cla
 				*clr
 				minut += 5
-				temp = rand (1,2)
-				if temp = 1:gadboyday = daystart
+				temp_gadf = rand (1,2)
+				if temp_gadf = 1:gadboyday = daystart
 				gs 'stat'
 				!gs 'time'
 
 				'<center><b><font color = maroon>Mitka Pin</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mitka.jpg"></center>'
-				if temp = 1:'Walking through the forest you come face-to-face with Mitka. He stared longingly at your naked body, and you decide...'
-				if temp = 2:'Walking through the forest you saw Mitka. Realizing that he hasn''t noticed you yet, you decide...'
+				if temp_gadf = 1:'Walking through the forest you come face-to-face with Mitka. He stared longingly at your naked body, and you decide...'
+				if temp_gadf = 2:'Walking through the forest you saw Mitka. Realizing that he hasn''t noticed you yet, you decide...'
 				*pl
-				if temp = 1:
+				if temp_gadf = 1:
 					act 'To run away and dress':
 						cla
 						*clr
@@ -305,15 +305,15 @@ if $ARGS[0] = 'gopforest_mitka':
 					*clr
 					minut += 15
 					gadboyday = daystart
-					temp = rand (1,2)
+					temp_gadf = rand (1,2)
 					gs 'stat'
 					!gs 'time'
 
 					'<center><b><font color = maroon>Mitka Pin</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mitka.jpg"></center>'
-					if temp = 1:'Walking through the forest with Mira, you come face-to-face with Mitka. He stared longingly at your naked body...'
-					if temp = 2:'Walking through the forest you saw Mitka. Realizing that he hasn''t noticed you yet, you decide...'
-					if temp = 1:
+					if temp_gadf = 1:'Walking through the forest with Mira, you come face-to-face with Mitka. He stared longingly at your naked body...'
+					if temp_gadf = 2:'Walking through the forest you saw Mitka. Realizing that he hasn''t noticed you yet, you decide...'
+					if temp_gadf = 1:
 						act 'To run away and dress':
 							cla
 							*clr
@@ -351,16 +351,16 @@ if $ARGS[0] = 'gopforest_mitka':
 					*clr
 					minut += 5
 					gadboyday = daystart
-					temp = rand (1,2)
+					temp_gadf = rand (1,2)
 					gs 'stat'
 					!gs 'time'
 
 					'<center><b><font color = maroon>Mitka Pin</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mitka.jpg"></center>'
-					if temp = 1:'Walking through the forest with Mira, you come face-to-face with Mitka. He stared longingly your naked body...'
-					if temp = 2:'Walking through the forest you saw Mitka. Realizing that he hasn''t noticed you yet, you decide...'
+					if temp_gadf = 1:'Walking through the forest with Mira, you come face-to-face with Mitka. He stared longingly your naked body...'
+					if temp_gadf = 2:'Walking through the forest you saw Mitka. Realizing that he hasn''t noticed you yet, you decide...'
 
-					if temp = 1:
+					if temp_gadf = 1:
 						act 'To run away and dress':
 							cla
 							*clr
@@ -383,9 +383,9 @@ if $ARGS[0] = 'gopforest_mitka':
 							act 'Spy':
 								cla
 								*clr
-								temp = RAND(0,1)
+								temp_gadf = RAND(0,1)
 								gs 'stat'
-								if temp = 0:
+								if temp_gadf = 0:
 									'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowanal.jpg"></center>'
 									'Mira is working her ass up and down on Mitka''s hard member, every time she goes down her buttocks slap loudly on his thighs.'
 									gs 'arousal', 'voyeur', 2
@@ -430,17 +430,17 @@ if $ARGS[0] = 'gopforest_mitka':
 				*clr
 				minut += 5
 				gadboyday = daystart
-				temp = rand (1,2)
+				temp_gadf = rand (1,2)
 				gs 'stat'
 				!gs 'time'
 
 				'<center><b><font color = maroon>Mitka Pin</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mitka.jpg"></center>'
-				if temp = 1:'Walking through the forest with Mira, you come face-to-face with Mitka. You yelp in surprise, and rush to your clothing. You are running away with Mira, but before you get too far Mitka grabs you in his arms and drags you with him into the nearest bush.'
-				if temp = 2:'Walking through the forest you saw Mitka. Realizing that he hasn''t noticed you yet, you decide...'
+				if temp_gadf = 1:'Walking through the forest with Mira, you come face-to-face with Mitka. You yelp in surprise, and rush to your clothing. You are running away with Mira, but before you get too far Mitka grabs you in his arms and drags you with him into the nearest bush.'
+				if temp_gadf = 2:'Walking through the forest you saw Mitka. Realizing that he hasn''t noticed you yet, you decide...'
 
-				if temp = 1:act 'Further':MiraLoc = 0 & forest_gopsex = 1 & temphant = 4 & gt 'hanters', 'start'
-				if temp = 2:
+				if temp_gadf = 1:act 'Further':MiraLoc = 0 & forest_gopsex = 1 & temphant = 4 & gt 'hanters', 'start'
+				if temp_gadf = 2:
 					act 'Hide':
 						cla
 						*clr
@@ -611,16 +611,16 @@ if $ARGS[0] = 'gopforest_kolyamba':
 				cla
 				*clr
 				minut += 5
-				temp = rand (1,2)
+				temp_gadf = rand (1,2)
 				gadboyday = daystart
 				gs 'stat'
 
 				'<center><b><font color = maroon>Calamba</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/kolyamba.jpg"></center>'
-				if temp = 1:'Walking through the forest you come face-to-face with Kolambu. He stared longingly at your naked body, and you decide...'
-				if temp = 2:'Walking through the forest you saw Kolambu. Realizing that he hasn''t noticed you yet, you decide...'
+				if temp_gadf = 1:'Walking through the forest you come face-to-face with Kolambu. He stared longingly at your naked body, and you decide...'
+				if temp_gadf = 2:'Walking through the forest you saw Kolambu. Realizing that he hasn''t noticed you yet, you decide...'
 				*pl
-				if temp = 1:
+				if temp_gadf = 1:
 					act 'To run away and dress':
 						cla
 						*clr
@@ -675,15 +675,15 @@ if $ARGS[0] = 'gopforest_kolyamba':
 					*clr
 					minut += 15
 					gadboyday = daystart
-					temp = rand (1,2)
+					temp_gadf = rand (1,2)
 					gs 'stat'
 					!gs 'time'
 
 					'<center><b><font color = maroon>Calamba</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/kolyamba.jpg"></center>'
-					if temp = 1:'Walking through the forest you come face-to-face with Kolambu. He stared longingly at your naked body, and you decide...'
-					if temp = 2:'Walking through the forest you saw Kolambu. Realizing that he hasn''t noticed you yet, you decide...'
-					if temp = 1:
+					if temp_gadf = 1:'Walking through the forest you come face-to-face with Kolambu. He stared longingly at your naked body, and you decide...'
+					if temp_gadf = 2:'Walking through the forest you saw Kolambu. Realizing that he hasn''t noticed you yet, you decide...'
+					if temp_gadf = 1:
 						act 'To run away and dress':
 							cla
 							*clr
@@ -721,16 +721,16 @@ if $ARGS[0] = 'gopforest_kolyamba':
 					*clr
 					minut += 5
 					gadboyday = daystart
-					temp = rand (1,2)
+					temp_gadf = rand (1,2)
 					gs 'stat'
 					!gs 'time'
 
 					'<center><b><font color = maroon>Calamba</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/kolyamba.jpg"></center>'
-					if temp = 1:'Walking through the forest you come face-to-face with Kolambu. He stared longingly at your naked body, and you decide...'
-					if temp = 2:'Walking through the forest you saw Kolambu. Realizing that he hasn''t noticed you yet, you decide...'
+					if temp_gadf = 1:'Walking through the forest you come face-to-face with Kolambu. He stared longingly at your naked body, and you decide...'
+					if temp_gadf = 2:'Walking through the forest you saw Kolambu. Realizing that he hasn''t noticed you yet, you decide...'
 
-					if temp = 1:
+					if temp_gadf = 1:
 						act 'To run away and dress':
 							cla
 							*clr
@@ -782,17 +782,17 @@ if $ARGS[0] = 'gopforest_kolyamba':
 				*clr
 				minut += 5
 				gadboyday = daystart
-				temp = rand (1,2)
+				temp_gadf = rand (1,2)
 				gs 'stat'
 				!gs 'time'
 
 				'<center><b><font color = maroon>Calamba</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/kolyamba.jpg"></center>'
-				 if temp = 1:'Walking through the forest with Mira, you come face-to-face with Kolambu. You yelp in surprise, and rush to your clothing. You are running away with Mira, but before you get too far Kolambu grabs you in his arms and drags you with him into the nearest bush.'
-				 if temp = 2:'Walking through the forest you saw Kolambu. Realizing that he hasn''t noticed you yet, you decide...'
+				 if temp_gadf = 1:'Walking through the forest with Mira, you come face-to-face with Kolambu. You yelp in surprise, and rush to your clothing. You are running away with Mira, but before you get too far Kolambu grabs you in his arms and drags you with him into the nearest bush.'
+				 if temp_gadf = 2:'Walking through the forest you saw Kolambu. Realizing that he hasn''t noticed you yet, you decide...'
 
-				if temp = 1:act 'Further':Miraloc = 0 & forest_gopsex = 1 & temphant = 5 & gt 'hanters', 'start'
-				if temp = 2:
+				if temp_gadf = 1:act 'Further':Miraloc = 0 & forest_gopsex = 1 & temphant = 5 & gt 'hanters', 'start'
+				if temp_gadf = 2:
 					act 'Hide':
 						cla
 						*clr
@@ -965,17 +965,17 @@ if $ARGS[0] = 'gopforest_vasyan':
 				cla
 				*clr
 				minut += 5
-				temp = rand (1,2)
+				temp_gadf = rand (1,2)
 				gadboyday = daystart
 				gs 'stat'
 				!gs 'time'
 
 				'<center><b><font color = maroon>Vasan Package</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vasyan.jpg"></center>'
-				if temp = 1:'Walking through the forest you come face-to-face with Vasyan. He stared longingly at your naked body, and you decide...'
-				if temp = 2:'Walking through the forest you saw Vasyan. Realizing that he hasn''t noticed you yet, you decide...'
+				if temp_gadf = 1:'Walking through the forest you come face-to-face with Vasyan. He stared longingly at your naked body, and you decide...'
+				if temp_gadf = 2:'Walking through the forest you saw Vasyan. Realizing that he hasn''t noticed you yet, you decide...'
 				*pl
-				if temp = 1:
+				if temp_gadf = 1:
 					act 'To run away and dress':
 						cla
 						*clr
@@ -1030,15 +1030,15 @@ if $ARGS[0] = 'gopforest_vasyan':
 					*clr
 					minut += 15
 					gadboyday = daystart
-					temp = rand (1,2)
+					temp_gadf = rand (1,2)
 					gs 'stat'
 					!gs 'time'
 
 					'<center><b><font color = maroon>Vasan Package</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vasyan.jpg"></center>'
-					if temp = 1:'Walking through the forest you come face-to-face with Vasyan. He stared longingly at your naked body, and you decide...'
-					if temp = 2:'Walking through the forest you saw Vasyan. Realizing that he hasn''t noticed you yet, you decide...'
-					if temp = 1:
+					if temp_gadf = 1:'Walking through the forest you come face-to-face with Vasyan. He stared longingly at your naked body, and you decide...'
+					if temp_gadf = 2:'Walking through the forest you saw Vasyan. Realizing that he hasn''t noticed you yet, you decide...'
+					if temp_gadf = 1:
 						act 'To run away and dress':
 							cla
 							*clr
@@ -1077,16 +1077,16 @@ if $ARGS[0] = 'gopforest_vasyan':
 					*clr
 					minut += 5
 					gadboyday = daystart
-					temp = rand (1,2)
+					temp_gadf = rand (1,2)
 					gs 'stat'
 					!gs 'time'
 
 					'<center><b><font color = maroon>Vasan Package</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vasyan.jpg"></center>'
-					if temp = 1:'Walking through the forest you come face-to-face with Vasyan. He stared longingly at your naked body, and you decide...'
-					if temp = 2:'Walking through the forest you saw Vasyan. Realizing that he hasn''t noticed you yet, you decide...'
+					if temp_gadf = 1:'Walking through the forest you come face-to-face with Vasyan. He stared longingly at your naked body, and you decide...'
+					if temp_gadf = 2:'Walking through the forest you saw Vasyan. Realizing that he hasn''t noticed you yet, you decide...'
 
-					if temp = 1:
+					if temp_gadf = 1:
 						act 'To run away and dress':
 							cla
 							*clr
@@ -1138,17 +1138,17 @@ if $ARGS[0] = 'gopforest_vasyan':
 				*clr
 				minut += 5
 				gadboyday = daystart
-				temp = rand (1,2)
+				temp_gadf = rand (1,2)
 				gs 'stat'
 				!gs 'time'
 
 				'<center><b><font color = maroon>Vasan Package</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vasyan.jpg"></center>'
-				if temp = 1:'Walking through the forest with Mira, you come face-to-face with Vasyan. You yelp in surprise, and rush to your clothing. You are running away with Mira, but before you get too far Vasyan grabs you in his arms and drags you with him into the nearest bush.'
-				if temp = 2:'Walking through the forest you saw Vasyan. Realizing that he hasn''t noticed you yet, you decide...'
+				if temp_gadf = 1:'Walking through the forest with Mira, you come face-to-face with Vasyan. You yelp in surprise, and rush to your clothing. You are running away with Mira, but before you get too far Vasyan grabs you in his arms and drags you with him into the nearest bush.'
+				if temp_gadf = 2:'Walking through the forest you saw Vasyan. Realizing that he hasn''t noticed you yet, you decide...'
 
-				if temp = 1:act 'Further':Miraloc = 0 & forest_gopsex = 1 & temphant = 6 & gt 'hanters', 'start'
-				if temp = 2:
+				if temp_gadf = 1:act 'Further':Miraloc = 0 & forest_gopsex = 1 & temphant = 6 & gt 'hanters', 'start'
+				if temp_gadf = 2:
 					act 'Hide':
 						cla
 						*clr
@@ -1344,13 +1344,13 @@ if $ARGS[0] = 'gopforest_2boys':
 				cla
 				*clr
 				minut += 5
-				temp = rand (1,2)
+				temp_gadf = rand (1,2)
 				gadboyday = daystart
 				gs 'stat'
 				!gs 'time'
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/2boys.'+rand(1,2)+'.jpg"></center>'
-				if temp = 1:
+				if temp_gadf = 1:
 					if temphant = 1:'Walking through the forest you come face-to-face with Mitka and Kolambu. They stared longingly at your naked body, and you decide...'
 					if temphant = 2:'Walking through the forest you come face-to-face with Mitka and Vasyan. They stared longingly at your naked body, and you decide...'
 					if temphant = 3:'Walking through the forest you come face-to-face with Kolambu and Vasyan. They stared longingly at your naked body, and you decide...'
@@ -1360,7 +1360,7 @@ if $ARGS[0] = 'gopforest_2boys':
 					if temphant = 3:'Walking through the woods you saw Kolambu and Vasyan. Realizing that they haven''t noticed you yet, you decide...'
 				end
 				*pl
-				if temp = 1:
+				if temp_gadf = 1:
 					act 'To run away and dress':
 						cla
 						*clr
@@ -1414,12 +1414,12 @@ if $ARGS[0] = 'gopforest_2boys':
 					*clr
 					minut += 15
 					gadboyday = daystart
-					temp = rand (1,2)
+					temp_gadf = rand (1,2)
 					gs 'stat'
 					!gs 'time'
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/2boys.'+rand(1,2)+'.jpg"></center>'
-					if temp = 1:
+					if temp_gadf = 1:
 						if mitboyrand = 1:'Walking through the forest with Mira, you come face-to-face with Mitka and Kolambu. They stared longingly at your naked body, and you decide...'
 						if mitboyrand = 2:'Walking through the forest with Mira, you come face-to-face with Mitka and Vasyan. They stared longingly at your naked body, and you decide...'
 						if mitboyrand = 3:'Walking through the forest with Mira, you come face-to-face with Kolambu and Vasyan. They stared longingly at your naked body, and you decide...'
@@ -1428,7 +1428,7 @@ if $ARGS[0] = 'gopforest_2boys':
 						if mitboyrand = 2:'Walking through the forest with Mira you saw Mitka and Vasyan. Realizing that they haven''t noticed you yet, you decide...'
 						if mitboyrand = 3:'Walking through the forest with Mira you saw Kolambu and Vasyan. Realizing that they haven''t noticed you yet, you decide...'
 					end
-					if temp = 1:
+					if temp_gadf = 1:
 						act 'To run away and dress':
 							cla
 							*clr
@@ -1468,12 +1468,12 @@ if $ARGS[0] = 'gopforest_2boys':
 					*clr
 					minut += 5
 					gadboyday = daystart
-					temp = rand (1,2)
+					temp_gadf = rand (1,2)
 					gs 'stat'
 					!gs 'time'
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/2boys.'+rand(1,2)+'.jpg"></center>'
-					if temp = 1:
+					if temp_gadf = 1:
 						if mitboyrand = 1:'Walking through the forest with Mira, you come face-to-face with Mitka and Kolambu. They stared longingly at your naked body, and you decide...'
 						if mitboyrand = 2:'Walking through the forest with Mira, you come face-to-face with Mitka and Vasyan. They stared longingly at your naked body, and you decide...'
 						if mitboyrand = 3:'Walking through the forest with Mira, you come face-to-face with Kolambu and Vasyan. They stared longingly at your naked body, and you decide...'
@@ -1483,7 +1483,7 @@ if $ARGS[0] = 'gopforest_2boys':
 						if mitboyrand = 3:'Walking through the forest with Mira you saw Kolambu and Vasyan. Realizing that they haven''t noticed you yet, you decide...'
 					end
 
-					if temp = 1:
+					if temp_gadf = 1:
 						act 'To run away and dress':
 							cla
 							*clr
@@ -1547,12 +1547,12 @@ if $ARGS[0] = 'gopforest_2boys':
 				*clr
 				minut += 5
 				gadboyday = daystart
-				temp = rand (1,2)
+				temp_gadf = rand (1,2)
 				gs 'stat'
 				!gs 'time'
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/2boys.'+rand(1,2)+'.jpg"></center>'
-				if temp = 1:
+				if temp_gadf = 1:
 					if mitboyrand = 1:'Walking through the forest with Mira, you come face-to-face with Mitka and Kolambu. You yelp in surprise, and rush to your clothing. You are running away with Mira, but before you get too far the guys grab you by the arms and drag you with them into the nearest bush.'
 					if mitboyrand = 2:'Walking through the forest with Mira, you come face-to-face with Mitka and Vasyan. You yelp in surprise, and rush to your clothing. You are running away with Mira, but before you get too far the guys grab you by the arms and drag you with them into the nearest bush.'
 					if mitboyrand = 3:'Walking through the forest with Mira, you come face-to-face with Kolambu and Vasyan. You yelp in surprise, and rush to your clothing. You are running away with Mira, but before you get too far the guys grab you by the arms and drag you with them into the nearest bush.'
@@ -1562,8 +1562,8 @@ if $ARGS[0] = 'gopforest_2boys':
 					if mitboyrand = 3:'Walking through the forest with Mira you saw Kolambu and Vasyan. Realizing that they haven''t noticed you yet, you decide...'
 				end
 
-				if temp = 1:act 'Further':Miraloc = 0 & forest_gopsex = 2 & gt 'hantersex', 'doublelovesex'
-				if temp = 2:
+				if temp_gadf = 1:act 'Further':Miraloc = 0 & forest_gopsex = 2 & gt 'hantersex', 'doublelovesex'
+				if temp_gadf = 2:
 					act 'Hide':
 						cla
 						*clr
@@ -1732,19 +1732,19 @@ if $ARGS[0] = 'gopforest_3boys':
 				cla
 				*clr
 				minut += 5
-				temp = rand (1,2)
+				temp_gadf = rand (1,2)
 				gadboyday = daystart
 				gs 'stat'
 				!gs 'time'
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/3boys.'+rand(1,2)+'.jpg"></center>'
-				if temp = 1:
+				if temp_gadf = 1:
 					'Walking through the forest you come face-to-face with Mitka, Kolambu and Vasyan. They stared longingly at your naked body, and you decide...'
 				else
 					'Walking through the forest you saw Mitka, Kolambu and Vasyan. Realizing that they haven''t noticed you yet, you decide...'
 				end
 				*pl
-				if temp = 1:
+				if temp_gadf = 1:
 					act 'To run away and dress':
 						cla
 						*clr
@@ -1798,17 +1798,17 @@ if $ARGS[0] = 'gopforest_3boys':
 					*clr
 					minut += 15
 					gadboyday = daystart
-					temp = rand (1,2)
+					temp_gadf = rand (1,2)
 					gs 'stat'
 					!gs 'time'
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/3boys.'+rand(1,2)+'.jpg"></center>'
-					if temp = 1:
+					if temp_gadf = 1:
 						'Walking through the forest with Mira, you come face-to-face with Mitka, Kolambu and Vasyan. They stared longingly at your naked body, and you decide...'
 					else
 						'Walking through the forest with Mira you saw Mitka, Kolambu and Vasyan. Realizing that they haven''t noticed you yet, you decide...'
 					end
-					if temp = 1:
+					if temp_gadf = 1:
 						act 'To run away and dress':
 							cla
 							*clr
@@ -1848,18 +1848,18 @@ if $ARGS[0] = 'gopforest_3boys':
 					*clr
 					minut += 5
 					gadboyday = daystart
-					temp = rand (1,2)
+					temp_gadf = rand (1,2)
 					gs 'stat'
 					!gs 'time'
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/3boys.'+rand(1,2)+'.jpg"></center>'
-					if temp = 1:
+					if temp_gadf = 1:
 						'Walking through the forest with Mira, you come face-to-face with Mitka, Kolambu and Vasyan. They stared longingly at your naked body, and you decide...'
 					else
 						'Walking through the forest with Mira you saw Mitka, Kolambu and Vasyan. Realizing that they haven''t noticed you yet, you decide...'
 					end
 
-					if temp = 1:
+					if temp_gadf = 1:
 						act 'To run away and dress':
 							cla
 							*clr
@@ -1911,19 +1911,19 @@ if $ARGS[0] = 'gopforest_3boys':
 				*clr
 				minut += 5
 				gadboyday = daystart
-				temp = rand (1,2)
+				temp_gadf = rand (1,2)
 				gs 'stat'
 				!gs 'time'
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/3boys.'+rand(1,2)+'.jpg"></center>'
-				if temp = 1:
+				if temp_gadf = 1:
 					'Walking through the forest with Mira, you come face-to-face with Mitka, Kolambu and Vasyan. You yelp in surprise, and rush to your clothing. You are running away with Mira, but before you get too far the guys grab you by the arms and drag you with them into the nearest bush..'
 				else
 					'Walking through the forest with Mira you saw Mitka, Kolambu and Vasyan. Realizing that they haven''t noticed you yet, you decide...'
 				end
 
-				if temp = 1:act 'Further':Miraloc = 0 & forest_gopsex = 3 & gt 'hanters', 'start'
-				if temp = 2:
+				if temp_gadf = 1:act 'Further':Miraloc = 0 & forest_gopsex = 3 & gt 'hanters', 'start'
+				if temp_gadf = 2:
 					act 'Hide':
 						cla
 						*clr
@@ -2069,10 +2069,10 @@ if $ARGS[0] = 'mushroom_pickers2':
 
 	act 'Stay here':gt 'gadforest','1'
 	act 'Go for the mushroom':
-		temp = rand(1,3)
-		if temp = 1: gt 'gadforest','2'
-		if temp = 2: gt 'gadforest','3'
-		if temp = 3: gt 'gadforest','4'
+		temp_gadf = rand(1,3)
+		if temp_gadf = 1: gt 'gadforest','2'
+		if temp_gadf = 2: gt 'gadforest','3'
+		if temp_gadf = 3: gt 'gadforest','4'
 	end
 end
 if $ARGS[0] = 'mushroom_pickers3':
@@ -2172,18 +2172,18 @@ if $ARGS[0] = 'basket':
 	cla
 	*clr
 	minut += 5
-	temp = rand(1,2)
+	temp_gadf = rand(1,2)
 	foresteventday = daystart
 	gs 'stat'
 	!gs 'time'
 
-	if temp = 1:
+	if temp_gadf = 1:
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/basket_boletus.jpg"></center>'
 		'Wandering in the forest you find a basket full of mushrooms. Strange, someone must have left it here or just lost it.'
 
 		act 'Take':boletus += 10 & gt $loc, $metka
 	end
-	if temp = 2:
+	if temp_gadf = 2:
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/basket_bilberry.jpg"></center>'
 		'Wandering in the forest you find a basket full of berries. Strange, someone must have left it here or just lost it.'
 
@@ -2366,12 +2366,12 @@ if $ARGS[0] = 'forest_hanters':
 					act 'Further':hanters = 1 & wolf_know = 1 & minut += 60 & gt 'swamp_yard'
 				else
 					act 'Further':
-						temp = rand(1,3)
+						temp_gadf = rand(1,3)
 						temphant = rand(1,3)
 						hanters = 1
-						if temp = 1:
+						if temp_gadf = 1:
 							forest_hantersex = 1 & gt 'hanters', 'start'
-						elseif temp = 2:
+						elseif temp_gadf = 2:
 							forest_hantersex = 2 & gt 'hantersex', 'doublelovesex'
 						else
 							forest_hantersex = 3 & gt 'hanters', 'start'
@@ -2445,11 +2445,11 @@ if $ARGS[0] = 'forest_hanters':
 						act 'To go with the hunters':hanters = 1 & minut += 60 & gt 'swamp_yard'
 						act 'Stay here':gt $loc, $metka
 					else
-						temp = rand(1,3)
+						temp_gadf = rand(1,3)
 						temphant = rand(1,3)
-						if temp = 1:hanters = 1 & forest_hantersex = 1 & gt 'hanters', 'start'
-						if temp = 2:hanters = 1 & forest_hantersex = 2 & gt 'hantersex', 'doublelovesex'
-						if temp = 3:hanters = 1 & forest_hantersex = 3 & gt 'hanters', 'start'
+						if temp_gadf = 1:hanters = 1 & forest_hantersex = 1 & gt 'hanters', 'start'
+						if temp_gadf = 2:hanters = 1 & forest_hantersex = 2 & gt 'hantersex', 'doublelovesex'
+						if temp_gadf = 3:hanters = 1 & forest_hantersex = 3 & gt 'hanters', 'start'
 					end
 				end
 			end
@@ -2474,12 +2474,12 @@ end
 if $ARGS[0] = 'forest_road':
 	cla
 	*clr
-	temp = rand(1,10)
+	temp_gadf = rand(1,10)
 	gs 'stat'
 	!gs 'time'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/forest_road.jpg"></center>'
 	'You`re off, on the road towards the village, humming happily to yourself.'
-	if temp > 3:
+	if temp_gadf > 3:
 		act 'Further':
 			cla
 			*clr
@@ -2514,7 +2514,7 @@ if $ARGS[0] = 'forest_road':
 						cla
 						*clr
 						minut += 25
-						temp = rand(1,4)
+						temp_gadf = rand(1,4)
 						pcs_sweat += 20
 						gs 'stat'
 
@@ -2522,15 +2522,15 @@ if $ARGS[0] = 'forest_road':
 						'You`ve been running up hill and down hill, too afraid to even to look behind you. In the end the exhaustion made you stop, after a quick look around you realize that no one is behind you, chasing you, but now you have no idea where you are.'
 
 						act 'Further':
-							if temp = 1: gt 'gadforestlost','1'
-							if temp = 2: gt 'gadforestlost','2'
-							if temp = 3: gt 'gadforestlost','3'
-							if temp = 4: gt 'gadforestlost','4'
+							if temp_gadf = 1: gt 'gadforestlost','1'
+							if temp_gadf = 2: gt 'gadforestlost','2'
+							if temp_gadf = 3: gt 'gadforestlost','3'
+							if temp_gadf = 4: gt 'gadforestlost','4'
 						end
 					end
 				end
 			end
-							
+
 			act 'Freeze in terror':
 				cla
 				*clr
@@ -2550,12 +2550,12 @@ end
 if $ARGS[0] = 'swamp_road':
 	cla
 	*clr
-	temp = rand(1,10)
+	temp_gadf = rand(1,10)
 	gs 'stat'
 	!gs 'time'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/forest_road.jpg"></center>'
 	'You went on the road in the direction of the swamp, merrily humming to yourself.'
-	if temp > 3:
+	if temp_gadf > 3:
 		act 'Further':
 			cla
 			*clr
@@ -2590,7 +2590,7 @@ if $ARGS[0] = 'swamp_road':
 						cla
 						*clr
 						minut += 25
-						temp = rand(1,4)
+						temp_gadf = rand(1,4)
 						pcs_sweat += 20
 						gs 'stat'
 
@@ -2598,10 +2598,10 @@ if $ARGS[0] = 'swamp_road':
 						'You`ve been running up hill and down hill, too afraid to even to look behind you. In the end the exhaustion made you stop, after a quick look around you realize that no one is behind you, chasing you, but now you have no idea where you are.'
 
 						act 'Further':
-							if temp = 1: gt 'gadforestlost','1'
-							if temp = 2: gt 'gadforestlost','2'
-							if temp = 3: gt 'gadforestlost','3'
-							if temp = 4: gt 'gadforestlost','4'
+							if temp_gadf = 1: gt 'gadforestlost','1'
+							if temp_gadf = 2: gt 'gadforestlost','2'
+							if temp_gadf = 3: gt 'gadforestlost','3'
+							if temp_gadf = 4: gt 'gadforestlost','4'
 						end
 					end
 				end
@@ -2651,7 +2651,7 @@ if $ARGS[0] = 'lost':
 			cla
 			*clr
 			minut += 25
-			temp = rand(1,4)
+			temp_gadf = rand(1,4)
 			pcs_sweat += 20
 			gs 'stat'
 
@@ -2659,10 +2659,10 @@ if $ARGS[0] = 'lost':
 			'You`ve been running up hill and down hill, too afraid to even to look behind you. In the end the exhaustion made you stop, after a quick look around you realize that no one is behind you, chasing you, but now you have no idea where you are.'
 
 			act 'Further':
-				if temp = 1: gt 'gadforestlost','1'
-				if temp = 2: gt 'gadforestlost','2'
-				if temp = 3: gt 'gadforestlost','3'
-				if temp = 4: gt 'gadforestlost','4'
+				if temp_gadf = 1: gt 'gadforestlost','1'
+				if temp_gadf = 2: gt 'gadforestlost','2'
+				if temp_gadf = 3: gt 'gadforestlost','3'
+				if temp_gadf = 4: gt 'gadforestlost','4'
 			end
 		end
 
@@ -2718,7 +2718,7 @@ if $ARGS[0] = 'relax':
 			cla
 			*clr
 			minut += 25
-			temp = rand(1,4)
+			temp_gadf = rand(1,4)
 			pcs_sweat += 20
 			gs 'stat'
 
@@ -2726,10 +2726,10 @@ if $ARGS[0] = 'relax':
 			'You`ve been running up hill and down hill, too afraid to even to look behind you. In the end the exhaustion made you stop, after a quick look around you realize that no one is behind you, chasing you, but now you have no idea where you are.'
 
 			act 'Further':
-				if temp = 1: gt 'gadforestlost','1'
-				if temp = 2: gt 'gadforestlost','2'
-				if temp = 3: gt 'gadforestlost','3'
-				if temp = 4: gt 'gadforestlost','4'
+				if temp_gadf = 1: gt 'gadforestlost','1'
+				if temp_gadf = 2: gt 'gadforestlost','2'
+				if temp_gadf = 3: gt 'gadforestlost','3'
+				if temp_gadf = 4: gt 'gadforestlost','4'
 			end
 		end
 

+ 15 - 15
locations/gadforestswamp

@@ -36,11 +36,11 @@ if $ARGS[0] = '1':
 		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_ski.jpg"></center>'
 		if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_nude0.'+rand(4,5)+'.jpg"></center>'
 		'You entered the swamp and felt your feet starting to sink into the mud...'
-		temp = RAND(1,100)
+		temp_gads = RAND(1,100)
 		act 'Go further':
-			if swamprand > temp:gt 'swamp_yard'
-			if swamprand < temp and temp >= 90:over = 10 & gt 'gameover'
-			if swamprand < temp and temp < 90:gt 'gadforestswamp', '2'
+			if swamprand > temp_gads:gt 'swamp_yard'
+			if swamprand < temp_gads and temp_gads >= 90:over = 10 & gt 'gameover'
+			if swamprand < temp_gads and temp_gads < 90:gt 'gadforestswamp', '2'
 		end
 	end
 end
@@ -68,14 +68,14 @@ if $ARGS[0] = '2':
 		*clr & cla
 		minut += 10
 		if pcs_sweat < 10: pcs_sweat += 10	
-		if week = 6 or week = 7:temp = RAND(1,3)
-		if week < 6:temp = RAND(1,5)
+		if week = 6 or week = 7:temp_gads = RAND(1,3)
+		if week < 6:temp_gads = RAND(1,5)
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/gadforestlosthelp.jpg"></center>'
 		'You are exhausted and begin to scream for help, suddenly you see people...'
 
 		act 'Wait':
-			if temp = 1:
+			if temp_gads = 1:
 				*clr & cla
 				minut += 10
 				hanters = 1
@@ -102,16 +102,16 @@ if $ARGS[0] = '2':
 		stren_exp += rand(0,1)
 		agil_exp += rand(0,1)
 		pcs_sweat += 30
-		temp = RAND(1,100)
+		temp_gads = RAND(1,100)
 		gs 'stat'
 
 		dynamic $swampclothes
 		'You decided not to tempt fate more and turn back...'
 
 		act 'Go':
-			if swamprand > temp:gt 'gadforestswamp','1'
-			if swamprand < temp and temp <= 20:over = 10 & gt'gameover'
-			if swamprand < temp and temp > 20:gt 'gadforestswamp','2'
+			if swamprand > temp_gads:gt 'gadforestswamp','1'
+			if swamprand < temp_gads and temp_gads <= 20:over = 10 & gt'gameover'
+			if swamprand < temp_gads and temp_gads > 20:gt 'gadforestswamp','2'
 		end
 	end
 	act 'Try to go on to the house':
@@ -122,16 +122,16 @@ if $ARGS[0] = '2':
 		stren_exp += rand(0,1)
 		agil_exp += rand(0,1)
 		pcs_sweat += 30
-		temp = RAND(1,100)
+		temp_gads = RAND(1,100)
 		gs 'stat'
 
 		dynamic $swampclothes
 		'You thought more about it and decided against it. You move on from the house...'
 
 		act 'Go':
-			if swamprand > temp:gt 'swamp_yard'
-			if swamprand < temp and temp <= 30:over = 10 & gt'gameover'
-			if swamprand < temp and temp > 30:gt 'gadforestswamp','2'
+			if swamprand > temp_gads:gt 'swamp_yard'
+			if swamprand < temp_gads and temp_gads <= 30:over = 10 & gt'gameover'
+			if swamprand < temp_gads and temp_gads > 30:gt 'gadforestswamp','2'
 		end 
 	end
 end

+ 1 - 1
locations/gadmarket

@@ -21,7 +21,7 @@ $gadmarkettab += FUNC ('$single_stock_item', 1, 'Computer magazine', 450, 'compm
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Biographical magazine', 450, 'biomag', 'gadmarket')
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Cooking magazine', 450, 'cookmag', 'gadmarket')
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Knitting magazine', 450, 'knitmag', 'gadmarket')
-$gadmarkettab += FUNC ('$stock_item', 5, 'condoms', 600, 'prezik', 'gadmarket')
+$gadmarkettab += FUNC ('$stock_item', 5, 'condoms', 600, 'prezikcount', 'gadmarket')
 $gadmarkettab += FUNC ('$stock_item', 20, 'Tampons', 250, 'tampon', 'gadmarket')
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Sandwich', 200, 'buterbrod', 'gadmarket')
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Bottle of wine', 700, 'wine', 'gadmarket')

+ 13 - 12
locations/gaptek

@@ -12,7 +12,7 @@ if $ARGS[0] = 'start' or gaptek_loc = 1 or $message ! '':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_1.jpg"></center>'
 
 	act 'Leave the pharmacy':gt 'pavCommercial'
-	
+
 	if Olu_pay > 0:
 		minut += RAND(5,10)
 		money += Olu_pay * RAND(500,700)
@@ -42,8 +42,8 @@ if $ARGS[0] = 'start' or gaptek_loc = 1 or $message ! '':
 		end
 	end
 	'</center>'
-	*pl '<center><table align="center" width=80%>' 
-	*P FUNC ('$stock_item', 5, 'condoms', 500, 'prezik', $CURLOC, $ARGS[0], StoryLine, 'Aunt will tell mom!')
+	*pl '<center><table align="center" width=80%>'
+	*P FUNC ('$stock_item', 5, 'condoms', 500, 'prezikcount', $CURLOC, $ARGS[0], StoryLine, 'Aunt will tell mom!')
 	*P FUNC ('$stock_item', 1, 'pregnancy test', 530, 'pregtest', $CURLOC, $ARGS[0], StoryLine, 'Aunt will tell mom!')
 	*P FUNC ('$stock_item', 1, 'birth control pills', 1870, 'tabletki', $CURLOC, $ARGS[0], StoryLine, 'Aunt will tell mom!')
 	*P FUNC ('$stock_item', 10, 'antibiotics', 580, 'lekarstvo', $CURLOC, $ARGS[0])
@@ -134,7 +134,7 @@ if $ARGS[0] = 'start' or gaptek_loc = 1 or $message ! '':
 					'You wait for your turn and move up to the counter, discretely nodding at the counter with the contraceptives. She apologizes: "I''m sorry <<$pcs_nickname>>, those are all sold out." With some malice in her voice, she whispers: "Your stud will have to wait until tomorrow, unless you plan on entertaining him in some other way." Giving you a lewd grin, she ushers you away from the counter so she can help the next customer.'
 				end
 			end
-			
+
 			act 'Move away from the counter':gt 'gaptek', 'start'
 		end
 
@@ -150,7 +150,7 @@ if $ARGS[0] = 'start' or gaptek_loc = 1 or $message ! '':
 						'You change your mind and feel flustered,'
 						act 'Move away from the counter':gt 'gaptek', 'start'
 					exit
-						
+
 					elseif portion > 1 and npc_QW['A29'] < 3:
 						portion = 1
 						'You quietly think to yourself, while you put most of the packages back on the shelf: "Just the one should be enough. It''s probably better if I don''t buy too many at once, otherwise aunt Luda might become suspicious."'
@@ -202,12 +202,13 @@ if $ARGS[0] = 'start' or gaptek_loc = 1 or $message ! '':
 end
 
 if $ARGS[0] = 'garden':
-	'Condoms - 500 ₽'
-	'Pregnancy test - 530 ₽'
-	if npc_QW['A29'] >= 2: 'Lubricant - 145 ₽'
+	*nl
+	'<center>Condoms: 500 ₽ per pack - You currently have <b><<prezikcount>></b></center>'
+	'<center>Pregnancy test: 530 ₽ per pack - You currently have <b><<pregtest>></b></center>'
+	if money >= 145 and galubri = 1 and npc_QW['A29'] >= 2 and gaptekfirst = 1 and galubriday ! daystart:'<center>Lubricant: 145 ₽ each - You currently have <b><<lubri>></b></center>'
 	if money >= 500 and npc_QW['A29'] >= 2 and gaptekfirst = 1 and gaprezikday ! daystart:
-		act 'Buy condoms (500 <b>₽</b>) <<iif(prezik > 0, ''[left:<b>'' + prezik + ''</b>]'', '''')>>':
-!!Apostrope fix for notepad display'''' 
+		act 'Buy condoms (500 <b>₽</b>) <<iif(prezikcount > 0, ''[left:<b>'' + prezikcount + ''</b>]'', '''')>>':
+!!Apostrope fix for notepad display''''
 			cla
 			*clr
 			portion = input("How many packages you want to buy? (One package contains 5 condoms)")
@@ -242,7 +243,7 @@ if $ARGS[0] = 'garden':
 
 	if money >= 530 and npc_QW['A29'] >= 2 and gaptekfirst = 1:
 		act 'Buy  pregnancy tests (530 <b>₽</b>) <<iif(pregtest > 0, ''[left:<b>'' + pregtest + ''</b>]'', '''')>>':
-!!Apostrope fix for notepad display'''' 
+!!Apostrope fix for notepad display''''
 			cla
 			*clr
 			portion = input("How many packages do you want to buy? (One package contains two testers)")
@@ -274,7 +275,7 @@ if $ARGS[0] = 'garden':
 	!! you can only buy lube here if your aunt arranged for it and you haven''t bought any today yet
 	if money >= 145 and galubri = 1 and npc_QW['A29'] >= 2 and gaptekfirst = 1 and galubriday ! daystart:
 		act 'Buy <b>lubricant</b> (145 <b>₽</b>) <<iif(lubri > 0, ''[left:<b>'' + lubri + ''</b>]'', '''')>>':
-!!Apostrope fix for notepad display'''' 
+!!Apostrope fix for notepad display''''
 			cla
 			*clr
 			portion = input ("How many tubes do you want to buy? (One tube lasts for 5 uses)")

+ 21 - 8
locations/gdk

@@ -7,14 +7,7 @@ $location_type = 'public_outdoors'
 gs 'stat'
 '<center><b><font color="maroon">Community Centre</font></b></center>'
 
-if hour < 9:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
-if hour >= 9 and hour < 20:
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk.jpg"></center>'
-	'The Community Centre has sports facilities and offers classes in the evening.'
-	'It houses a small library. Open from 8h until 18h.'
-	'Upstairs, there are some hobby clubs available from 12h until 20h.'
-	'In the evenings, from 20h to 23h the main hall is used as a local club, with popular music and dancing. Entrance 25 <b>₽</b>.'
-elseif hour >= 20 and hour <= 23:
+if hour >= 20 and hour <= 23 and week >= 5 and week < 7:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
 	'The entrance to the Community Centre is full of young people, the guys are just hanging around smoking and joking. The girls in small groups, all dressed up and gossiping. You see the bushes moving, Pavlovsks'' famous make out garden.'
 	'You hear people in the alley beside the club. <a href="exec:minut += 5 & GT ''ugel''">Investigate</a>.'
@@ -27,6 +20,26 @@ elseif hour >= 20 and hour <= 23:
 			gt 'gdkin'
 		end
 	end
+elseif hour >= 20 and hour <= 23:
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
+	'The Community Centre has sports facilities and offers classes in the evening.'
+	'It houses a small library. Open from 8h until 18h.'
+	'Upstairs, there are some hobby clubs available from 12h until 20h.'
+	'On Friday and Saturday evenings, from 20h to 23h, the main hall is used as a local club, with popular music and dancing. Entrance 25 <b>₽</b>.'
+end
+if hour >= 9 and hour < 20:
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk.jpg"></center>'
+	'The Community Centre has sports facilities and offers classes in the evening.'
+	'It houses a small library. Open from 8h until 18h.'
+	'Upstairs, there are some hobby clubs available from 12h until 20h.'
+	'On Friday and Saturday evenings, from 20h to 23h, the main hall is used as a local club, with popular music and dancing. Entrance 25 <b>₽</b>.'
+end
+if hour < 9:
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
+	'The Community Centre has sports facilities and offers classes in the evening.'
+	'It houses a small library. Open from 8h until 18h.'
+	'Upstairs, there are some hobby clubs available from 12h until 20h.'
+	'On Friday and Saturday evenings, from 20h to 23h, the main hall is used as a local club, with popular music and dancing. Entrance 25 <b>₽</b>.'
 end
 
 if hour >= 14 and hour < 20:act 'Go to the sports section':gt 'gdksport', 'start'

+ 1 - 1
locations/gdksport

@@ -461,7 +461,7 @@ if $ARGS[0] = 'starlets':
 			end
 
 			if DanceWhoreT > 0: DanceWhoreT = 0
-			if AlbFather = 0 and DanceWhore > rand (1, 20):
+			if AlbFather = 0 and DanceWhore > rand (5, 20):
 				AlbFather = 1
 				'Albina after training beckoned you to her. "Good work, <<$pcs_nickname>>. The clients were satisfied and you were very discrete. You''re doing fine, doing excellent, in fact. Stick with me and you will have all the money, cars and apartments you could want."'
 			end

+ 6 - 5
locations/gdktoilet

@@ -25,7 +25,7 @@ if $ARGS[0] = 'start':
 		act 'Go in the Women''s toilet': gt 'gdktoilet', 'womens'
 	end
 
-	if hour >=20 and hour <=23:
+	if hour >=20 and hour <=23 and week >= 5 and week < 7:
 		if music_on = 1:
 			$track_loop = 'sound/komb.mp3'
 			volume = 50
@@ -619,11 +619,12 @@ if $ARGS[0] = 'womens':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/womens/bathroom_women.jpg"></center>'
 	'You walk in to the women''s restroom. You see some sinks and <a href="exec:gt ''mirror'', ''start''">mirrors</a>. You notice the last stall has its door wide open.'
 
-	dynamic $basin
-	dynamic $quickwash
-
-	act 'Go to the last stall': gt'gdktoilet', 'emptystall'
 	act 'Leave': gt'gdktoilet', 'start'
+	act 'Go to the last stall': gt'gdktoilet', 'emptystall'
+	
+	dynamic $tampon
+	dynamic $quickwash
+	dynamic $basin		
 end
 
 if $ARGS[0] = 'emptystall':

+ 1 - 0
locations/gevent

@@ -84,6 +84,7 @@ if $ARGS[0] = '1-1':
 	spafinloc = 14
 	gs 'cum_manage'
 	pcs_throat += 1
+	slutty += 1
 
 	if pcs_vag < dick:pcs_vag += 1
 

+ 9 - 3
locations/gopskver

@@ -169,7 +169,9 @@ if kotovLoveQW > 0:
 				'It''s evening, and the boys are getting ready to go to the disco like they do every night. You could call it a night and leave them alone, or tag along.'
 
 				act 'Leave':gt 'gkafe'
-				act 'Go to the disco with the boys':minut += 15 & gt 'gdkin'
+				if week = 5 or week = 6:
+					act 'Go to the disco with the boys':minut += 15 & gt 'gdkin'
+				end
 				exit
 			end
 			act 'Continue':
@@ -198,7 +200,9 @@ if kotovLoveQW > 0:
 		'It''s evening, and the boys are getting ready to go to the disco like they do every night. You could call it a night and leave them alone, or tag along.'
 
 		act 'Leave':gt 'gskver'
-		act 'Go to the disco with the boys':minut += 15 & gt 'gdkin'
+		if week = 5 or week = 6:
+			act 'Go to the disco with the boys':minut += 15 & gt 'gdkin'
+		end
 	end
 else
 	if hour >= 20:
@@ -206,7 +210,9 @@ else
 			'It''s evening, and the boys are getting ready to go to the disco like they do every night. You could call it a night and leave them alone, or tag along.'
 
 			act 'Leave':gt 'gskver'
-			act 'Go to the disco with boys':minut += 15 & gt 'gdkin'
+			if week = 5 or week = 6:
+				act 'Go to the disco with the boys':minut += 15 & gt 'gdkin'
+			end
 		elseif alko >= 3 and alko < 6 and DansOralSlut = 1:
 			'You''re quite drunk, and before going to the disco Dan offers to walk you home.'
 

+ 5 - 0
locations/gschool_events

@@ -3,6 +3,7 @@
 !!From here down they happen before first class
 if $ARGS[0] = 'teacher_greet':
 	!!meet teacher, from 1.2.4
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/26.jpg"></center>'
 	'You walk down the corridor, past countless classrooms. On the next corner, you meet your teacher Anatoly Evgenievich.'
 	act 'Hello':
 		*clr & cla
@@ -98,9 +99,11 @@ if $ARGS[0] = 'teacher_greet':
 			act 'Continue': gt 'gschool_lessons', 'morning'
 		else
 			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/26.jpg"></center>'
 			'"Good morning, <<$pcs_lastname>>. Why not say Hello? A teacher can''t punish or reward such actions. But still you''ve got this year''s exam. Should behave more kindly." your teacher jokes.'
 			act 'Apologize':
 				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/26.jpg"></center>'
 				'"Oh, Anatoly Evgenievich, I''m sorry, I didn''t see you. Of course, good day to you. Looking forward to our lessons." you say smiling.'
 				npc_rel['A26'] += 1
 
@@ -108,6 +111,7 @@ if $ARGS[0] = 'teacher_greet':
 			end
 			act 'Touch and apologize':
 				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/26.jpg"></center>'
 				'"Oh, Anatoly Evgenievich, I''m sorry, I didn''t see you." You say happily, coming closer and as if by accident, touch his arm.'
 				'He either doesn''t notice the touch or pretends not to notice it.'
 				if hotcat >= 5: npc_rel['A26'] += 1
@@ -116,6 +120,7 @@ if $ARGS[0] = 'teacher_greet':
 			end
 			act 'Ignore the comment':
 				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/26.jpg"></center>'
 				'You pretend not to hear the teacher''s remark and go on about your business.'
 				pcs_dom += 1
 				npc_rel['A26'] -= 1

+ 1 - 15
locations/gschool_grounds

@@ -33,7 +33,6 @@ if $ARGS[0] = 'main':
 		act 'Follow Dimka to his home at the New Year party':  minut += 30 & gt 'sny', '3'
 	end
 	
-
 	if hour <= 8 and kanikuli = 6:
 		'Today is graduation day! The school prom is tonight as well.'
 
@@ -46,7 +45,7 @@ if $ARGS[0] = 'main':
 			gs 'stat'
 			'Everyone from your year is assembled in the classroom. Your teachers have gathered in front of the class, and congratulate all of you on completing high school. As they hand everyone their well-earned diplomas, they wish you luck for the future.'
 
-			act 'Return to town':gt 'pavResidential'
+			act 'Return to town': minut += 1 & gt 'pavResidential'
 
 			act 'Go to the prom party':
 				*clr & cla
@@ -626,19 +625,6 @@ if $ARGS[0] = 'change_room':
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
-	if (cumloc[6] = 1 or cumloc[7] = 1):
-		act 'Wipe the cum off your clothes (0:10)':
-			*clr & cla
-			cumspclnt = 6
-			gs 'cum_cleanup'
-			minut += 10
-			'<center><img <<$set_imgh>> src="images/pc/body/cum/cumclothes/cumclothes12.jpg"></center>'
-			'You remove traces of cum from your clothes.'
-
-			act 'Leave':gt 'gschool_grounds', 'change_room'
-		end
-	end
-
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin

+ 25 - 25
locations/gschool_lessons

@@ -11,7 +11,7 @@ if $ARGS[0] = 'morning':
 	lernSkill += 1
 	lernHome += 1
 	if schoolSorev = 1: schoolSorev = 0
-	
+
 	gs 'gschool_socialchg', 'test'
 
 	if detention_set = 1 and week = 1:
@@ -421,7 +421,7 @@ if $ARGS[0] = 'math':
 				end
 				act 'Give him an attitude':
 					*clr & cla
-					demerits +=5
+					demerit +=5
 					grupvalue[1] +=3
 					grupvalue[4] +=3
 					grupvalue[3] -=3
@@ -431,7 +431,7 @@ if $ARGS[0] = 'math':
 					'"Of course. Please continue your super-fascinating lesson. Just keep it a bit up-beat please. If you talk any slower, I might fall asleep!" You answer boldly. The whole class bursts into laughter, and Anatoly has a rough time getting everyone to quiet down. "Miss <<$pcs_lastname>>, do you find this kind of behavior amusing? or are you just seeking attention? Try to answer this question for yourself while to head off to the principal''s office." Anatoly then points to the door.'
 					act 'Don''t leave the classroom':
 						*clr & cla
-						demerits +=5
+						demerit +=5
 						grupvalue[4] +=5
 						grupvalue[3] -=5
 						gs'stat'
@@ -604,7 +604,7 @@ if $ARGS[0] = 'russian':
 			'"Now that I''ve got you attention once again <<$pcs_nickname>>, please pay attention, you don''t want to miss today''s topic, it''s going to be on the exam for sure."'
 			act 'Be a smart ass':
 				*clr & cla
-				demerits +=5
+				demerit +=5
 				grupvalue[1] +=3
 				grupvalue[4] +=3
 				grupvalue[3] -=3
@@ -614,7 +614,7 @@ if $ARGS[0] = 'russian':
 				'"Now you''ve done it <<$pcs_lastname>>, you probably want a reaction from me, but don''t worry I already have a punishment in mind."'
 				act 'What''s the worst you could do?':
 					*clr & cla
-					demerits +=5
+					demerit +=5
 					grupvalue[4] +=5
 					grupvalue[3] -=5
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bitchflip.jpg"></center>'
@@ -798,7 +798,7 @@ if $ARGS[0] = 'literature':
 			'"I''ve called your name three times now, if you want to sleep you can do it during detention." She points to the door.'
 			act 'Be a smart ass':
 				*clr & cla
-				demerits +=5
+				demerit +=5
 				grupvalue[1] +=3
 				grupvalue[4] +=3
 				grupvalue[3] -=3
@@ -811,7 +811,7 @@ if $ARGS[0] = 'literature':
 				'Ms. Braakman''s face turns red and her expression darkens, a mixture of rage and embarrassment. "Get out and report to Headmistress Aleksandrina''s office right now!" She barks.'
 				act 'Go to the principal''s office':
 					*clr & cla
-					demerits +=5
+					demerit +=5
 					grupvalue[1] +=5
 					grupvalue[4] +=5
 					grupvalue[3] -=5
@@ -1077,7 +1077,7 @@ if $ARGS[0] = 'english':
 				'"I''ve called your name three times now, if you want to sleep you can do it during detention." She points to the door.'
 				act 'Be a smart ass':
 					*clr & cla
-					demerits +=5
+					demerit +=5
 					grupvalue[1] +=3
 					grupvalue[4] +=3
 					grupvalue[3] -=3
@@ -1090,7 +1090,7 @@ if $ARGS[0] = 'english':
 					'Ms. Braakman''s face turns red and her expression darkens, a mixture of rage and embarrassment. "Get out and report to Headmistress Aleksandrina''s office right now!" She barks.'
 					act 'Go to the principal''s office':
 						*clr & cla
-						demerits +=5
+						demerit +=5
 						grupvalue[1] +=5
 						grupvalue[4] +=5
 						grupvalue[3] -=5
@@ -1268,7 +1268,7 @@ if $ARGS[0] = 'geography':
 			'Mrs. Sokoloff tries to convince you of the importance of todays lesson, "<<$pcs_nickname>>, please pay attention, this is very important. Today''s topic is going to be on the exam for sure."'
 			act 'Be a smart ass.':
 				*clr & cla
-				demerits +=5
+				demerit +=5
 				grupvalue[1] +=3
 				grupvalue[4] +=3
 				grupvalue[3] -=3
@@ -1278,7 +1278,7 @@ if $ARGS[0] = 'geography':
 				'"Miss <<$pcs_lastname>>, get out of class! Report to the Principal now!"'
 				act 'Don''t leave the classroom':
 					*clr & cla
-					demerits +=5
+					demerit +=5
 					grupvalue[4] +=5
 					grupvalue[3] -=5
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bitchflip.jpg"></center>'
@@ -1432,7 +1432,7 @@ if $ARGS[0] = 'history':
 			'Mrs. Sokoloff tries to convince you of the importance of todays lesson, "<<$pcs_nickname>>, please pay attention, this is very important. Today''s topic is going to be on the exam for sure."'
 			act 'Be a smart ass.':
 				*clr & cla
-				demerits +=5
+				demerit +=5
 				grupvalue[1] +=3
 				grupvalue[4] +=3
 				grupvalue[3] -=3
@@ -1442,7 +1442,7 @@ if $ARGS[0] = 'history':
 				'"Miss <<$pcs_lastname>>, get out of class! Report to the Principal now!"'
 				act 'Don''t leave the classroom':
 					*clr & cla
-					demerits +=5
+					demerit +=5
 					grupvalue[4] +=5
 					grupvalue[3] -=5
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bitchflip.jpg"></center>'
@@ -1593,7 +1593,7 @@ if $ARGS[0] = 'biology':
 			'"<<pcs_nickname>>, please pay attention, this is very important. Today''s topic is going to be on the exam for sure."'
 			act 'Be a smart ass':
 				*clr & cla
-				demerits +=5
+				demerit +=5
 				grupvalue[1] +=3
 				grupvalue[4] +=3
 				grupvalue[3] -=3
@@ -1602,7 +1602,7 @@ if $ARGS[0] = 'biology':
 				'The whole class bursts into loud laughter, Miss Orlov seems a bit stunned by your comment, after a moment to regain her composure she quietly asks you "Miss <<$pcs_lastname>>, please leave class and report to the principal."'
 				act 'Don''t leave the classroom':
 					*clr & cla
-					demerits +=5
+					demerit +=5
 					grupvalue[4] +=5
 					grupvalue[3] -=5
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bitchflip.jpg"></center>'
@@ -1711,7 +1711,7 @@ if $ARGS[0] = 'computer':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/classcomputer.jpg"></center>'
 	'You go to your computer class and find a seat at one of the computer stations. Before long all of your fellow students file in and takes their seats as well. Once the bell rings Mr. Ivanov takes roll call, you say here when your name is called. With that done, he gets up and starts walking around the room explaining todays lessons. Occasionally stopping to look at the screen of varies students to make sure they are doing it right.'
 	*nl
-	'If he has to correct one of the nerds he will take his time and quietly explain it to them, giving them lots of encouragement. For everyone else he loudly proclaims what you did wrong, drawing attention to how easy this is. He makes sure the whole class knows about their mistake and he does it in such a condescending manner, like he is trying to prove to everyone how much smarter he is than you are, or maybe he just wants the others students to make fun of them. With Mr. Ivanov it is hard to tell. He doesn''t to approve of anyone but the nerds and harshly grades everyone else.'
+	'If he has to correct one of the nerds he will take his time and quietly explain it to them, giving them lots of encouragement. For everyone else he loudly proclaims what you did wrong, drawing attention to how easy this is. He makes sure the whole class knows about their mistake and he does it in such a condescending manner, like he is trying to prove to everyone how much smarter he is than you are, or maybe he just wants the others students to make fun of them. With Mr. Ivanov it is hard to tell. He doesn''t seem to approve of anyone but the nerds and harshly grades everyone else.'
 	act 'Listen attentively to Mr. Ivanov':
 		*clr & cla
 		compskl_exp += rand(1,2)
@@ -1754,7 +1754,7 @@ if $ARGS[0] = 'computer':
 			end
 			act 'Be a smart ass.':
 				*clr & cla
-				demerits +=5
+				demerit +=5
 				grupvalue[1] +=3
 				grupvalue[4] +=3
 				grupvalue[3] -=3
@@ -1764,7 +1764,7 @@ if $ARGS[0] = 'computer':
 				'"Miss <<$pcs_lastname>>, get out of class! Report to the Principal now!"'
 				act 'Don''t leave the classroom':
 					*clr & cla
-					demerits +=5
+					demerit +=5
 					grupvalue[4] +=5
 					grupvalue[3] -=5
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/eartwist.jpg"></center>'
@@ -1917,7 +1917,7 @@ if $ARGS[0] = 'science':
 			'"<<pcs_nickname>>, please pay attention, this is very important. Today''s topic is going to be on the exam for sure."'
 			act 'Be a smart ass.':
 				*clr & cla
-				demerits +=5
+				demerit +=5
 				grupvalue[1] +=3
 				grupvalue[4] +=3
 				grupvalue[3] -=3
@@ -1926,7 +1926,7 @@ if $ARGS[0] = 'science':
 				'The whole class bursts into loud laughter, Miss Orlov seems a bit stunned by your comment, after a moment to regain her composure she quietly asks you "Miss <<$pcs_lastname>>, please leave class and report to the principal."'
 				act 'Don''t leave the classroom':
 					*clr & cla
-					demerits +=5
+					demerit +=5
 					grupvalue[4] +=5
 					grupvalue[3] -=5
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bitchflip.jpg"></center>'
@@ -2068,7 +2068,7 @@ if $ARGS[0] = 'music':
 			'Mr. Vasilyev tries to convince you of the importance of todays lesson, "<<$pcs_nickname>>, please pay attention, this is very important. Today''s topic is going to be on the exam for sure."'
 			act 'Be a smart ass':
 				*clr & cla
-				demerits +=5
+				demerit +=5
 				grupvalue[1] +=3
 				grupvalue[4] +=3
 				grupvalue[3] -=3
@@ -2078,7 +2078,7 @@ if $ARGS[0] = 'music':
 				'"Miss <<$pcs_lastname>>, get out of class! Report to the Principal now!"'
 				act 'Don''t leave the classroom':
 					*clr & cla
-					demerits +=5
+					demerit +=5
 					grupvalue[4] +=5
 					grupvalue[3] -=5
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bitchflip.jpg"></center>'
@@ -2248,7 +2248,7 @@ if $ARGS[0] = 'art':
 			'Mr. Vasilyev tries to convince you of the importance of todays lesson, "<<$pcs_nickname>>, please pay attention, this is very important. Today''s topic is going to be on the exam for sure."'
 			act 'Be a smart ass.':
 				*clr & cla
-				demerits +=5
+				demerit +=5
 				grupvalue[1] +=3
 				grupvalue[4] +=3
 				grupvalue[3] -=3
@@ -2258,7 +2258,7 @@ if $ARGS[0] = 'art':
 				'"Miss <<$pcs_lastname>>, get out of class! Report to the Principal now!"'
 				act 'Don''t leave the classroom':
 					*clr & cla
-					demerits +=5
+					demerit +=5
 					grupvalue[4] +=5
 					grupvalue[3] -=5
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bitchflip.jpg"></center>'
@@ -2404,7 +2404,7 @@ if $ARGS[0] = 'shop':
 			'Mr. Kuznetsov tries to convince you of the importance of todays lesson, "<<$pcs_nickname>>, please pay attention, this is very important. Today''s topic is going to be on the exam for sure."'
 			act 'Be a smart ass':
 				*clr & cla
-				demerits +=5
+				demerit +=5
 				grupvalue[1] +=3
 				grupvalue[4] +=3
 				grupvalue[3] -=3

+ 67 - 0
locations/housing

@@ -0,0 +1,67 @@
+# housing
+
+! 'rent' checks rent days given matches days of the month, and how much each rental costs.
+! 'util' checks which properties having working utilities, then multiplies the amount owed accordingly.
+! 'cable' checks which properties can have cable TV, then multiplies the amount owed accordingly.
+
+if $ARGS[0] = 'rent':
+	if month = 1:
+		ArendHouseSL_due = 31
+	elseif month = 2:
+		if ((year mod 4 = 0) and (year mod 100 ! 0)) or (year mod 400 = 0):
+			ArendHouseSL_due = 29
+		else
+			ArendHouseSL_due = 28
+		end
+	elseif month = 3:
+		ArendHouseSL_due = 31
+	elseif month = 4:
+		ArendHouseSL_due = 30
+	elseif month = 5:
+		ArendHouseSL_due = 31
+	elseif month = 6:
+		ArendHouseSL_due = 30
+	elseif month = 7:
+		ArendHouseSL_due = 31
+	elseif month = 8:
+		ArendHouseSL_due = 31
+	elseif month = 9:
+		ArendHouseSL_due = 30
+	elseif month = 10:
+		ArendHouseSL_due = 31
+	elseif month = 11:
+		ArendHouseSL_due = 30
+	elseif month = 12:
+		ArendHouseSL_due = 31
+	end
+
+	home_rent[1] = 15000
+	!home_rent[3] = 0000
+	home_rent[4] = 10000
+	!home_rent[5] = 00000
+end
+
+if $ARGS[0] = 'sale':
+	home_value[1] = 2000000
+	home_value[3] = 150000
+	!home_value[4] = 000000
+	home_value[5] = 1500000
+end
+
+if $ARGS[0] = 'util':
+	killvar 'hcount_util'
+	if home_owned[1] = 1: hcount_util += 1
+	if home_owned[3] > 1: hcount_util += 1
+	if home_owned[4] > 0: hcount_util += 1
+	if home_owned[5] > 2: hcount_util += 1
+end
+
+if $ARGS[0] = 'cable':
+	if home_owned[1] = 1: hcount_cable += 1
+	!if home_owned[3] > 1: hcount_cable += 1
+	if home_owned[4] > 0: hcount_cable += 1
+	if home_owned[5] > 2: hcount_cable += 1
+end
+
+--- housing ---------------------------
+

+ 1 - 1
locations/husbSex

@@ -174,7 +174,7 @@ if $ARGS[0] = 'dolgend':
 			'They take you to to the sauna. The bandits drag you into a room start to explain. "You will live here and work, until the debt is paid off. Everything clear? If you try to escape we''ll put a bullet in your head and bury you in the woods, understood?"'
 			'You nod fearfully, realizing that they were not kidding.'
 
-			act 'Look around':gt'saunaroom'
+			act 'Look around':gt 'sauna', 'saunaroom'
 		end
 
 		exit

+ 10 - 4
locations/igorhome

@@ -150,10 +150,16 @@ if $ARGS[0] = 'igorroom':
 		else
 			'<center><img <<$set_imgh>>  src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
 		end
-		'Igor looks at his watch and asks you "I want to have fun tonight. Let''s go to the disco!"'
-		act 'Agree': & minut += 20 & gt 'gdkin' & !!if they are dating I will add a new version but have not written it yet.
-		act 'Decline and go home': gt 'pavResidential'
-		act 'Decline and chat instead':gt 'igorhome','Chat'
+		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!"'
+			act 'Agree': & minut += 20 & gt 'gdkin' & !!if they are dating I will add a new version but have not written it yet.
+			act 'Decline and go home': gt 'pavResidential'
+			act 'Decline and chat instead':gt 'igorhome','Chat'
+		else
+			'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
 	act 'Leave Igor''s room': gt 'igorhome','hallway'
 end

+ 1 - 1
locations/kafe

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start':
 	*nl
 	'They serve American style meals'
 	if QWdogReiq = 3 and week = 7 and hour >= 12:
-		act 'Sit down at the table and wait for a Margarita':gt 'kafe2', 'margo'
+		act 'Sit down at the table and wait for Margaret':gt 'kafe2', 'margo'
 	end
 
 	!!act 'Agree':gt 'cafe3', 'wc'

+ 6 - 19
locations/kafe2

@@ -40,29 +40,14 @@ if $ARGS[0] = 'toilet':
 		exit
 	end
 
+	act 'Leave':gt 'kafe', 'workPred'
+	
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
+	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-
-	if (cumloc[6] = 1 or cumloc[7] = 1):
-		act 'Wipe the cum off your clothes (0:10)':
-			cla
-			*clr
-			cumspclnt = 6
-			gs 'cum_cleanup'
-			minut += 10
-			'<center><img <<$set_imgh>> src="images/shared/sex/cum/frotsp.jpg"></center>'
-			'You remove the traces of cum from your clothes.'
-
-			act 'Finish':gt 'kafe2', 'toilet'
-		end
-	end
-
-	dynamic $tampon
-
-	act 'Leave':gt 'kafe', 'workPred'
 end
 
 if $ARGS[0] = 'givi':
@@ -198,10 +183,12 @@ if $ARGS[0] = 'ashot':
 	'You go into the kitchen where trainee chef Ashot is cooking. Dishwasher <a href="exec:gt ''kafe2'', ''tamdin''">Tamara</a> as always stands near the sink and washes the dishes.'
 
 	if hour < 22:
-		act 'Eat and drink in the kitchen':
+		act 'Eat some food (0:30)':
 			gs 'food', 'm_meal'
 		end
 
+		act 'Drink some water (0:05)':gs 'beverage', 'bev_wat'
+
 		act 'Chat with Ashot':
 			cla
 			minut += 30

+ 11 - 7
locations/kiosk

@@ -194,14 +194,18 @@ if $ARGS[0] =  'themes':
 	'<center><img <<$set_imgh>> src="images/locations/city/shared/kiosk/kiosk123.jpg"></center>'
 	'<center><img WIDTH = 245 HEIGHT = 56 src="images/locations/city/shared/kiosk/ruch.jpg"></center>'
 	'All themes cost 500 <b>₽</b>'
+	
+	if money >= 500:
+		i = 1
+		:phonethemeloop
+		if phonetheme[i] = 0: '<a href="exec: money -= 500 & phonetheme[<<i>>] = 1 & gt ''kiosk'', ''themes''">Buy the <<$phonetheme_name[i]>> theme.</a>'
+		i += 1
+		if i < 13: jump 'phonethemeloop'
+	else
+		'You don''t have enough money to buy a phone theme.'
+	end
 
-	i = 1
-	:phonethemeloop
-	if phonetheme[i] = 0: '<a href="exec: money -= 500 & phonetheme[<<i>>] = 1 & gt ''kiosk''">Buy the <<$phonetheme_name[i]>> theme.</a>'
-	i += 1
-	if i < 13: jump 'phonethemeloop'
-
-	act 'Return': $kioskloc = 'counter' & gt 'kiosk', 'counter'
+	act 'Return': gt 'kiosk', 'counter'
 end
 
 --- kiosk ---------------------------------

+ 2 - 19
locations/koncepod1

@@ -43,9 +43,6 @@ if $ARGS[0]='krr2x':
     if psiho = 3 and psi1day = 0:dynamic $pavser7
     if psi1day = 1:'Continue'
 
-
-
-
     act 'Go to the Hall':gt'koncepod1','str2x'
     act 'Go to the kitchen':gt'koncepod1','khr2x'
     act 'Go to the bathroom':gt'koncepod1','vnr2x'
@@ -112,25 +109,11 @@ if $ARGS[0] = 'vnr2x':
     'Above the washbasin hangs an <a href="exec:GT ''mirror'',''start''">oval mirror</a>.'
     if psiho = 2 and psihb = 1 and psihc = 0 and psi1day = 0:dynamic $pavser4
 
-	if (cumloc[6] = 1 or cumloc[7] = 1):
-		act 'Wipe the cum off your clothes (0:10)':
-			cla
-			*clr
-			cumspclnt = 6
-			gs 'cum_cleanup'
-			minut += 10
-
-			'You wipe the cum off your clothes and thoroughly rinse out the stains with water.'
-
-			act 'Finish':gt 'vokzaltoilet'
-		end
-	end
-
+	act 'Corridor':gt'koncepod1','krr2x'
+	
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-
-    act 'Corridor':gt'koncepod1','krr2x'
 end
 
 if $ARGS[0]='bdr2x':

+ 2 - 2
locations/korrPar

@@ -52,15 +52,15 @@ act '<font color = maroon>Leave the apartment and go to the stairwell</font>':
 	end
 end
 
-
 act '<font color = maroon><b>Leave the apartment and go outside</b></font>':
 	if $clothingworntype ! 'nude':
 		if hour < 4 and motherWorry = 0 and age < 18:
 			'<font color=red>Are you sure? Your mother will worry if you go out at this time.</font>'
 			cla
-			act '<font color=red>Yes, go outside</font>':gt'pavResidential'
+			act '<font color=red>Yes, go outside</font>': minut += 5 & gt'pavResidential'
 			act 'No, stay inside':gt 'korrPar'
 		else
+			minut += 5
 			gt'pavResidential'
 		end
 	else

+ 2 - 2
locations/lakecafe

@@ -62,8 +62,8 @@ if $ARGS[0] = 'main':
 
 		'The diner has a single <a href="exec:gt ''laketoilet'', ''main''">toilet</a> available, for both males and females.'
 
-		act 'Order drinks':gs 'beverage_menu', 'cafe'
 		act 'Order food':gs 'food_menu', 'cafe'
+		act 'Order drinks':gs 'beverage_menu', 'cafe'
 	end
 
 	if LCwork2 >= 1 and LCwork2day ! daystart and hour = 18:
@@ -479,7 +479,7 @@ if $ARGS[0] = 'bandits':
 					'He pinches your cheeks and then slaps your face; not hard enough to be painful, but it certainly drives the message home. You can tell he''s dead serious.'
 					'After looking you in the eyes for a few more seconds to make sure you get the message, he turns around and leaves. You are all alone now.'
 
-					act 'Look around':gt'saunaroom'
+					act 'Look around':gt 'sauna', 'saunaroom'
 				end
 			end
 		end

+ 2 - 16
locations/laketoilet

@@ -28,28 +28,14 @@ if $ARGS[0] = 'main':
 		'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/toilet.jpg"></center>'
 		'The diner has a single unisex restroom. From the dirt and smell, you don''t think this toilet has ever been cleaned before. Ugh.'
 
+		act 'Leave the restroom':gt 'lakecafe', 'main'
+		
 		act 'Look in the mirror': gt 'mirror', 'start'
 		if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
-		if (cumloc[6] = 1 or cumloc[7] = 1):
-			act 'Wipe the cum off your clothes (0:10)':
-				cla
-				*clr
-				cumspclnt = 6
-				gs 'cum_cleanup'
-				minut += 10
-				'<center><img <<$set_imgh>> src="images/shared/sex/cum/frotsp.jpg"></center>'
-				'You spend ten minutes wiping and rinsing the cum stains out of your clothes. By the end, all that remain of them are some damp spots that should dry up in a few minutes.'
-
-				act 'Continue':gt 'laketoilet', 'main'
-			end
-		end
-
 		dynamic $tampon
 		dynamic $quickwash
 		dynamic $basin
-
-		act 'Leave the restroom':gt 'lakecafe', 'main'
 	end
 end
 

+ 9 - 22
locations/leonid

@@ -80,7 +80,7 @@ if $ARGS[0] = 'hall':
 	leoStress = rand (0, 30)
 	leoCoffee = rand (80, 100)
 	leoComfort = rand (0, 30)
-	paperwork  = rand (40, 60)
+	paperwork = rand (40, 60)
 	act 'Get back':gt 'pavCommercialOffices'
 end
 
@@ -132,7 +132,7 @@ end
 
 if $ARGS[0] = 'secretaryGate':
 	if $clothingworntype ! 'office':
-		gt 'leonid',  'toilet'
+		gt 'leonid', 'toilet'
 	end
 
 	if hour	>= 19:
@@ -410,9 +410,9 @@ if $ARGS[0] = 'secretRoom':
 		'In fear you step through the secret door and look around on all the stuff that is prepared for you.'
 		'<<$bName>> closes the door behind you and grabs you by the arm.'
 		slaveEventCount += 1
-        leonidVisit = 0
-        if leonidVisitMissed > 0:leonidVisitMissed -= 1
-        leonidSlaveDay = (daystart + rand(1, 5))
+		leonidVisit = 0
+		if leonidVisitMissed > 0:leonidVisitMissed -= 1
+		leonidSlaveDay = (daystart + rand(1, 5))
 		act 'Continue':gt 'leonid', 'bdsmGate'
 	elseif slaveEventCount > 0 and leonidVisit = 1 and leonidVisitMissed <= 3:
 		leoHorny = rand (30, 100)
@@ -830,7 +830,7 @@ if $ARGS[0] = 'sold':
 	'"When whoring, I want you clean and made up. Earn me enough money and I may let you leave. Understood?"'
 	workDolg = 100000 + money
 	gs 'stat'
-	act 'Continue':gt 'saunaroom'
+	act 'Continue':gt 'sauna', 'saunaroom'
 end
 
 if $ARGS[0] = 'toilet':
@@ -849,30 +849,17 @@ if $ARGS[0] = 'toilet':
 	if $clothingworntype ! 'office':
 		'<b style="color: #FF00000">You are at work, so you need to be dressed as a secretary!</b>'
 	end
+
+	act 'Leave the restroom':gt 'leonid', 'office'
+	
 	act 'Change your clothes':gt 'wardrobe', 'start'
 
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
-	if (cumloc[6] = 1 or cumloc[7] = 1):
-		act 'Wipe the cum off your clothes (0:10)':
-			cla
-			*clr
-			cumspclnt = 6
-			gs 'cum_cleanup'
-			minut += 10
-			'<center><img <<$set_imgh>> src="images/shared/sex/cum/frotsp.jpg"></center>'
-			'You spend ten minutes wiping and rinsing the cum stains out of your clothes. By the end, all that remain of them are some damp spots that should dry up in a few minutes.'
-
-			act 'Continue':gt 'leonid', 'toilet'
-		end
-	end
-
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-
-	act 'Leave the restroom':gt 'leonid', 'office'
 end
 
 --- leonid ---------------------------------

+ 1 - 0
locations/loadg

@@ -93,6 +93,7 @@ killvar 'housr'
 killvar 'BuyHous'
 
 if alko < 0: alko = 0
+if pranik < 0: pranik = 0
 
 --- loadg ---------------------------------
 

+ 31 - 31
locations/motherkafeboss

@@ -60,7 +60,7 @@ if $ARGS[0] = 'confrontation':
 	'Ignoring his question you bluntly say, "I know you''ve been fucking mom." He pauses briefly at your words and glances around the room at the customers.'
 	'"Why don''t we talk about this in the back?" he says calmly. "We don''t want to cause trouble for your mother do we?" You give him a hard look and follow him as he escorts you into a back room of the cafe.'
 
-	act'OK. . .':
+	act'Continue':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/cafe/borislav.jpg"></center>'
 		'Once both inside, he shuts the door behind you and sits down casually in a desk chair.'
@@ -117,7 +117,7 @@ if $ARGS[0] = 'confrontation':
 					end
 				end
 
-				act'You don''t want to do this':
+				act'You don''t want to do this, ever!':
 					cla & *clr
 					pcs_mood -= 10
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe2.jpg"></center>'
@@ -128,7 +128,7 @@ if $ARGS[0] = 'confrontation':
 				end
 			end
 
-			act'Accept defeat':
+			act'Accept defeat - for now.':
 				cla & *clr
 				pcs_mood -= 10
 				slavatalk = 0
@@ -147,7 +147,7 @@ if $ARGS[0] = 'dealbreaker':
 	*nl
 	'You forcefully spit words at him and then move straightaway to the back room and wait for him at his desk.'
 
-	act'. . .':
+	act'Continue':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/cafe/backroom.jpg"></center>'
 		'He curiously follows you in and shuts the door behind him.'
@@ -181,7 +181,7 @@ if $ARGS[0] = 'dealbreaker':
 					'You feel your face go pale as you consider what he''s saying. "But-!"'
 					'"But what?" he interrupts. "Think about what you saw, really. Did it look like I was blackmailing her? Did she look reluctant or unhappy? Or did she look like a wanton whore, ready, willing, and wanting to please?"'
 
-					act'. . .':
+					act'Continue':
 						cla & *clr
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/cafe/backroom.jpg"></center>'
 						'You slump your shoulders and lean back against the desk with the realizations. How loud your mother''s moans were even through the window, how quickly she''d drop to her knees after he came inside her, the whispers you hear about your family around town. He''s right. Your mother is undeniably a slut.'
@@ -238,7 +238,7 @@ if $ARGS[0] = 'dealbreaker':
 								'"I must admit, this is not the reaction I was expecting," Slava smiles appreciatively as you back him up and push him down onto the couch.'
 								'You smile back and kneel down to unzip his trousers, "My mother has been telling me not to be a slut or have a boyfriend or do anything sexual for as long as I can remember. Let''s just say I''m sick of that."'
 
-								act'. . .':
+								act'Continue':
 									cla & *clr
 									'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/kotovbj1.jpg"></center>'
 									'You pull Slava''s already hardening cock out, gently jacking it off and licking the tip.'
@@ -303,7 +303,7 @@ if $ARGS[0] = 'work_shift':
 	pcafetip = rand(40,140)
 	money += 300 + pcafetip
 	minut += 120
-	'You worked as a waitress for 2 hours and made 300<b>₽</b> plus <<$pcafetip>><b>₽</b> in tips.'
+	'You worked as a waitress for 2 hours and made 300<b>₽</b> plus <<pcafetip>><b>₽</b> in tips.'
 	*nl
 	if slavadealfuck ! daystart:
 		'As you finish up your shift, Slava catches your eye and gestures towards the back room.'
@@ -412,7 +412,7 @@ if $ARGS[0] = 'first_sex1':
 				'"Ahh..." he sighs. "I have to say, Natasha is still better at giving head but a younger and more supple pair of breasts..." he says, emphasizing his words with hard squeezes, "is always better than an older pair."'
 				'With his comments about your mother while he''s abusing your body, you''re ready to snap. You try to to get a little deeper so when you bite you can take off as much of his dick as possible when he suddenly yanks you upward by your breasts. You feel genuinely disappointed you couldn''t have blown him for a couple more seconds or he''d have become a eunuch.'
 				'Now standing in front of Borislav, he pushes you backwards onto the desk and says, "Time for the main course."'
-				act'. . .':gt 'motherkafeboss','first_sex2'
+				act'Continue':gt 'motherkafeboss','first_sex2'
 			end
 		end
 	end
@@ -433,7 +433,7 @@ if $ARGS[0] = 'first_sex2':
 			'He wastes no time and immediately starts fucking you at a steady pace without any buildup whatsoever. The room is filled with the sound of your flesh slapping together, the squelching sounds of his thick cock pumping in and out of your pussy, and your soft cries that go up in volume at intervals that correspond with his cock bumping against your cervix. You lose track of everything but the sound of your own crying and the feeling of his cock violating you and just as your mind is about to go blank you feel him pull out and pull you off the desk.'
 			'"Get back on your knees," you hear him growl.'
 
-			act'. . .':
+			act'Continue':
 				cla & *clr
 				gs 'cum_call', 'face', $boy
 				'<center><video autoplay loop src="images/shared/sex/cum/facial/facial0,3.mp4"></video></center>'
@@ -443,7 +443,7 @@ if $ARGS[0] = 'first_sex2':
 				'You don''t even flinch, exhausted from the ordeal as more droplets hit you in the face. As Borislav''s fresh cum drips down your cheeks, you wonder to yourself, <i>Is this really worth it?</i>'
 				'"Hey, don''t just sit there. Clean me up."'
 
-				act'. . .':
+				act'Continue':
 					cla & *clr
 					gs 'cum_call', 'mouth', $boy
 					gs 'cum_call', 'hair', $boy
@@ -478,7 +478,7 @@ if $ARGS[0] = 'first_sex2':
 			'Without hesitation or any slow buildup, he begins fucking you at a steady speed. The room is filled with the sound of your flesh slapping together and the squelching sound of his cock pumping in and out of your pussy. Between his grunts you hear the sound of your own voice as you instinctively start to moan, the tip of his cock eliciting involuntary cries whenever it bumps against your cervix.'
 			'After several minutes of this, he suddenly pulls out, growling, "Get on your knees."'
 
-			act'. . .':
+			act'Continue':
 				cla & *clr
 				gs 'cum_call', 'face', $boy
 				'<center><video autoplay loop src="images/shared/sex/cum/facial/facial0,3.mp4"></video></center>'
@@ -489,7 +489,7 @@ if $ARGS[0] = 'first_sex2':
 				'<i>At least he has the decency not to cum inside me,</i> you think to yourself. <i>Or in a way, is this actually <b>more</b> degrading?</i>'
 				'"Hey, don''t just sit there. Clean me up," Slava says, interrupting your train of thought by sticking his cock in your face.'
 
-				act'. . .':
+				act'Continue':
 					cla & *clr
 					gs 'cum_call', 'mouth', $boy
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/cafe/cum_clean.jpg"></center>'
@@ -528,7 +528,7 @@ if $ARGS[0] = 'first_sex2':
 			'For a second you don''t know what he''s talking about when you realize that your anger is unconsciously making your pussy tighter. Ironically, the realization causes your rage to build even further and tensing your body even more. His grunts become even more satisfactory, creating a vicious cycle of anger and pleasure between you and Slava.'
 			'After several minutes of this, he suddenly pulls out, growling, "Get on your knees."'
 
-			act'. . .':
+			act'Continue':
 				cla & *clr
 				gs 'cum_call', 'face', $boy
 				'<center><video autoplay loop src="images/shared/sex/cum/facial/facial0,3.mp4"></video></center>'
@@ -539,7 +539,7 @@ if $ARGS[0] = 'first_sex2':
 				'<i>Ugh, could there have been anything more degrading than this?</i> you think to yourself. <i>Making a girl take a cumshot to the face as part of a deal to stop fucking her mother. This is just ridiculous.</i>'
 				'"Hey, don''t just sit there. Clean me up," Slava says, interrupting your train of thought when you feel his cock poking you in the face.'
 
-				act'. . .':
+				act'Continue':
 					cla & *clr
 					gs 'cum_call', 'mouth', $boy
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/cafe/cum_clean.jpg"></center>'
@@ -584,7 +584,7 @@ if $ARGS[0] = 'first_sex2':
 				'The room is filled with the sound of your flesh slapping together, the squelching sounds of his thick cock pumping in and out of your bloody pussy, and your soft cries that go up in volume at intervals that correspond with his cock bumping against your cervix. You lose track of everything but the sound of your own crying and the feeling of his cock violating you and just as your mind is about to go blank you feel him pull out and pull you off the desk.'
 				'"Get back on your knees," you hear him growl.'
 
-				act'. . .':
+				act'Continue':
 					cla & *clr
 					gs 'cum_call', 'face', $boy
 					'<center><video autoplay loop src="images/shared/sex/cum/facial/facial0,3.mp4"></video></center>'
@@ -594,7 +594,7 @@ if $ARGS[0] = 'first_sex2':
 					'You don''t even flinch, exhausted from the ordeal as the hot sticky liquid spatters across your face. Borislav''s fresh cum drips down your cheeks, mixing with your tears and you think dejectedly to yourself, <i>Is this what my virginity was worth?</i>'
 					'"Hey, don''t just sit there. Clean me up."'
 
-					act'. . .':
+					act'Continue':
 						cla & *clr
 						gs 'cum_call', 'mouth', $boy
 						gs 'cum_call', 'hair', $boy
@@ -628,7 +628,7 @@ if $ARGS[0] = 'first_sex2':
 				'The room is filled with the sound of your flesh slapping together and the squelching sound of his cock pumping in and out of your bloody pussy. Between his grunts you hear the sound of your own voice as you instinctively start to moan, the tip of his cock eliciting involuntary cries whenever it bumps against your cervix.'
 				'After several minutes he suddenly pulls out, growling, "Get on your knees."'
 
-				act'. . .':
+				act'Continue':
 					cla & *clr
 					gs 'cum_call', 'face', $boy
 					'<center><video autoplay loop src="images/shared/sex/cum/facial/facial0,3.mp4"></video></center>'
@@ -639,7 +639,7 @@ if $ARGS[0] = 'first_sex2':
 					'<i>Is this what mom feels every day she goes to work?</i> you think to yourself. <i>Is this how much she loves us?</i>'
 					'"Hey, don''t just sit there. Clean me up," Slava says, interrupting your train of thought by sticking his cock in your face.'
 
-					act'. . .':
+					act'Continue':
 						cla & *clr
 						gs 'cum_call', 'mouth', $boy
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/cafe/cum_clean.jpg"></center>'
@@ -681,7 +681,7 @@ if $ARGS[0] = 'first_sex2':
 				'For a second you don''t know what he''s talking about when you realize that your anger is unconsciously making you flex your muscles and it''s making your pussy tighter. Ironically, the realization only causes your rage to build even further and you feel your snatch clench harder on his invading cock. His grunts become even more satisfactory, creating a vicious cycle of anger and pleasure between you and Slava.'
 				'After several minutes he suddenly pulls out, growling, "Get on your knees."'
 
-				act'. . .':
+				act'Continue':
 					cla & *clr
 					gs 'cum_call', 'face', $boy
 					'<center><video autoplay loop src="images/shared/sex/cum/facial/facial0,3.mp4"></video></center>'
@@ -692,7 +692,7 @@ if $ARGS[0] = 'first_sex2':
 					'<i>Ugh, could there have been anything more vile than this?</i> you think to yourself. <i>Making a girl blow you, then taking her virginity, and then cumming on her face, all just to get him to stop fucking her mother. Just despicable...</i>'
 					'"Hey, don''t just sit there. Clean me up," Slava says, interrupting your train of thought when you feel his cock poking you in the face.'
 
-					act'. . .':
+					act'Continue':
 						cla & *clr
 						gs 'cum_call', 'mouth', $boy
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/cafe/cum_clean.jpg"></center>'
@@ -833,12 +833,12 @@ if $ARGS[0] = 'cloth_pre_fuck':
 		if slavafuck < 4:'"I feel like fucking you in your uniform today," he says, pulling down your panties and in one quick thrust plunges balls deep inside you. You grunt at the unexpected sensation of his entire cock filling you so suddenly and he sighs. "Ahh... Even after over a dozen years of owning a cafe, there novelty of fucking a waitress never wears off."'
 		if slavafuck >= 4 and slavafuck < 10:'"I feel like fucking you in your uniform today," he says, pulling down your panties. You hold your breath as Slava thrusts hard, plunging the full length of his cock into you. The sensation causes you to exhale with force almost like you''ve been winded. You''re getting used to his antics but it doesn''t make it any more comfortable that he insists on going balls deep on the first thrust every time. He sighs saying, "Maybe it''s just me being spoiled by your youth but it always feels like you''re tighter when you''re still in uniform," before beginning to fuck you.'
 		if slavafuck >= 10:'"I feel like fucking you in your uniform today," he says, pulling down your panties. You barely even flinch when Slava thrusts the entirety of his manhood into you in one go. Whether you like it or not, it seems your body has gotten used to having his large cock rammed balls deep into you. "Just as enjoyable as the first time," he says, pausing to appreciate the tightness of your pussy. He begins to fuck you saying, "Good coochie must run in the family."'
-		act'. . .':gt'motherkafeboss','cloth_fuck'
+		act'Continue':gt'motherkafeboss','cloth_fuck'
 	else
 		if slavafuck < 4:'"I feel like fucking you in your uniform today," he says, reaching for your panties only to find your bare pussy. "Oooh," You can feel his grin even from behind you. "I hope you got some nice tips today," he says, causing you to blush. Without warning he plunges balls deep into you with one quick thrust. You grunt at the unexpected sensation of his entire cock filling you so suddenly and he sighs. "Ahh... Even after over a dozen years of owning a cafe, there novelty of fucking a waitress never wears off."'
 		if slavafuck >= 4 and slavafuck < 10:'"I feel like fucking you in your uniform today," he says, reaching for your panties only to find your bare pussy. "Oooh," You can feel his grin even from behind you. "I hope you got some nice tips today," he says, causing you to blush. You hold your breath as Slava thrusts hard, plunging the full length of his cock into you. The sensation causes you to exhale with force almost like you''ve been winded. You''re getting used to his antics but it doesn''t make it any more comfortable that he insists on going balls deep on the first thrust every time. He sighs saying, "Maybe it''s just me being spoiled by your youth but it always feels like you''re tighter when you''re still in uniform," before beginning to fuck you.'
 		if slavafuck >= 10:'"I feel like fucking you in your uniform today," he says, reaching for your panties only to find your bare pussy. "Oooh! Good girl..." You can feel his grin even from behind you. "You keep this up, I''ll have the most popular cafe in Pavlovsky. Or are you doing it just for me?" he says, causing you to blush. You barely even flinch when Slava thrusts the entirety of his manhood into you in one go. Whether you like it or not, it seems your body has gotten used to having his large cock rammed balls deep into you. "Just as enjoyable as the first time," he says, pausing to appreciate the tightness of your pussy. He begins to fuck you saying, "Good coochie must run in the family."'
-		act'. . .':gt'motherkafeboss','cloth_fuck'
+		act'Continue':gt'motherkafeboss','cloth_fuck'
 	end
 end
 
@@ -920,7 +920,7 @@ if $ARGS[0] = 'cloth_fuck':
 					*nl
 					'"Did you just cum <<$pcs_nickname>>?" Slava asks. You can''t turn around right now but you can feel his grin from behind you all the same. "Glad to see you''re enjoying this deal as much as I am. All the same, feeling you tighten up on me like that brought me pretty close. Turn around, I''ll give you what you came here for."'
 
-					act'. . .':
+					act'Continue':
 						cla & *clr
 						orgasm += 1
 						pcs_horny = 0
@@ -957,7 +957,7 @@ if $ARGS[0] = 'cloth_fuck':
 					*nl
 					'"Did you just cum <<$pcs_nickname>>?" Slava asks. You can''t turn around right now but you can feel his grin from behind you all the same. "Glad to see you''re enjoying this deal as much as I am. All the same, feeling you tighten up on me like that brought me pretty close. Turn around, I''ll give you what you came here for."'
 
-					act'. . .':
+					act'Continue':
 						cla & *clr
 						orgasm += 1
 						pcs_horny = 20
@@ -1001,7 +1001,7 @@ if $ARGS[0] = 'cloth_fuck':
 					*nl
 					'"Glad to see you''re enjoying this deal as much as I am," Slava says, grinning. Noticing the expression on your face he continues, "Oh, don''t look like that <<$pcs_nickname>>. It''s natural for a girl your age to be enjoying sex. Here, kneel down and I''ll cheer you up with something."'
 
-					act'. . .':
+					act'Continue':
 						cla & *clr
 						orgasm += 1
 						pcs_horny = 0
@@ -1039,7 +1039,7 @@ if $ARGS[0] = 'cloth_fuck':
 					*nl
 					'"Glad to see you''re enjoying this deal as much as I am," Slava says, grinning. Noticing the expression on your face he continues, "Oh, don''t look like that <<$pcs_firstname>>. If you want more, we can keep fucking tomorrow. Here, kneel down and I''ll cheer you up with something."'
 
-					act'. . .':
+					act'Continue':
 						cla & *clr
 						orgasm += 1
 						pcs_horny = 0
@@ -1108,7 +1108,7 @@ if $ARGS[0] = 'cloth_fuck':
 					'You do as he commands as he starts jacking off. He doesn''t cum immediately but you patiently wait and as you see his face begin to contort you position yourself under his cock and close your eyes, feeling his hot sperm dribble all over your face.'
 					*nl
 					'Afterwards, you dutifully clean his cock, licking off your pussy juice and sucking out the remnants as you did before. He pulls up his trousers and leaves you.'
-					act'. . .':
+					act'Continue':
 						*nl
 						'Once you''re alone, your thoughts go back to when Slava was fucking you. Up until now, you used thoughts of your mother to keep yourself going during this time. You tried to remember that you were doing it for her so she wouldn''t have to but it didn''t help. You feel empty inside as you realize that thoughts of your mother no longer drive you.'
 
@@ -1150,7 +1150,7 @@ if $ARGS[0] = 'cloth_fuck':
 					*nl
 					'"Did you just cum <<$pcs_nickname>>?" Slava asks. You can''t turn around right now but you can feel his grin from behind you all the same. "Glad to see you''re enjoying this deal as much as I am. All the same, feeling you tighten up on me like that brought me pretty close. Turn around, I''ll give you what you came here for."'
 
-					act'. . .':
+					act'Continue':
 						cla & *clr
 						orgasm += 1
 						pcs_horny = 0
@@ -1188,7 +1188,7 @@ if $ARGS[0] = 'cloth_fuck':
 					*nl
 					'"Did you just cum <<$pcs_nickname>>?" Slava asks. You can''t turn around right now but you can feel his grin from behind you all the same. "Glad to see you''re enjoying this deal as much as I am. All the same, feeling you tighten up on me like that brought me pretty close. Turn around, I''ll give you what you came here for."'
 
-					act'. . .':
+					act'Continue':
 						cla & *clr
 						orgasm += 1
 						pcs_horny = 20
@@ -1232,7 +1232,7 @@ if $ARGS[0] = 'cloth_fuck':
 					*nl
 					'"Glad to see you''re enjoying this deal as much as I am," Slava says, grinning. Noticing the expression on your face he continues, "Oh, don''t look like that <<$pcs_nickname>>. It''s natural for a girl your age to be enjoying sex. Here, kneel down and I''ll cheer you up with something."'
 
-					act'. . .':
+					act'Continue':
 						cla & *clr
 						orgasm += 1
 						pcs_horny = 0
@@ -1270,7 +1270,7 @@ if $ARGS[0] = 'cloth_fuck':
 					*nl
 					'"Glad to see you''re enjoying this deal as much as I am," Slava says, grinning. Noticing the expression on your face he continues, "Oh, don''t look like that <<$pcs_firstname>>. If you want more, we can keep fucking tomorrow. Here, kneel down and I''ll cheer you up with something."'
 
-					act'. . .':
+					act'Continue':
 						cla & *clr
 						orgasm += 1
 						pcs_horny = 0

+ 127 - 58
locations/obj_din

@@ -18,7 +18,7 @@ if $ARGS[0] = 'descrip':
 	!!!
 
 	pl 'Your current home is <a href="exec:gs ''obj_din'', ''cur_home''"><<$home_name>></a>.'
-	
+
 	if succubusflag = 1 and sucpcinfo >= 4: pl 'You are a Succubus.'
 	if age = vidage:
 		pl 'You are <<age>> years old.'
@@ -41,7 +41,7 @@ if $ARGS[0] = 'descrip':
 	pl 'Your breasts would be considered an EU <a href="exec:gs ''obj_din'', ''show_tits''"><<$titsize>></a>.'
 	pl '<<$nipplesize>>'
 	pl '<<$pcs_apprnc>>'
-	
+
 	if preg = 1:
 		if denypreg = 1 and pregtime > 75:
 			pl 'You seem to be putting on a bit of weight, your belly is definitely bigger.'
@@ -61,8 +61,8 @@ if $ARGS[0] = 'descrip':
 			pl 'You''ve noticed that your breasts seem firmer lately and your nipples seem to be sticking out more.'
 		end
 	end
-	nl  
-	
+	nl
+
 	if avatar_hair = 1:
 		pl'Your hair: <<$av_hair>>.'
 	else
@@ -147,7 +147,7 @@ if $ARGS[0] = 'cur_home':
 	if home_owned[12] = 1:pl 'Set current home as <a href="exec:gs ''set_home'', 12 & gs ''obj_din'', ''cur_home''">Hunter''s lodge in Gadukino</a>'
 	if home_owned[13] = 1:pl 'Set current home as <a href="exec:gs ''set_home'', 13 & gs ''obj_din'', ''cur_home''">Shared apartment in Pavlovsk</a>'
 !!Apostrophe colour correction - KS ''''
-end	
+end
 
 if $ARGS[0] = 'skills':
 	clr
@@ -247,7 +247,7 @@ end
 
 if $ARGS[0] = 'husb_cheat_count':
 	if husband > 0:
-		if guy > before_h_guy : 
+		if guy > before_h_guy :
 			guy_cheat += guy - guy_cheat
 			before_h_guy = guy
 		end
@@ -285,42 +285,90 @@ if $ARGS[0] = 'stats':
 	pl'		<a href="exec:gs ''obj_din'', ''stats_beauty''">View Beauty/Modelling skills</a>'
 	pl'		<a href="exec:gs ''obj_din'', ''stats_artistic''">View Artistic skills</a>'
 	pl'		<a href="exec:gs ''obj_din'', ''stats_job''">View Job skills</a>'
-	
-end
 
+end
 
 if $ARGS[0] = 'stats_gen':
 	clr
+	gs 'housing', 'rent'
 	pl'<center><img src="images/system/icon/statistics.png"><br></center>'
 	pl'<a href="exec:gs ''obj_din'', ''stats''">Return to statistics main page</a>'
 	nl
 	if opPRE = 0:pl 'It has been <<daystart>> days since the game started.'
 	nl
-	if BuyHous = 2 and ArendHouseSL >0:
-		pl 'You have rented an apartment in the residential area for <<ArendHouseSL>> days.'
-		if money >= 6000 or stolmoney >= 6000 or money + stolmoney >= 6000 or karta + bankDebtLimit >= 6000:
-			*P ' Renew with '
-			if money >= 6000:
-				*P ' <a href="exec:money -= 6000 & home_owned[1] = 1 & BuyHous = 2 & ArendHouseSL += 30" & gs ''$menu_obnovit''>cash</a>'
-			elseif stolmoney >= 6000:
-				*P ' <a href="exec:stolmoney -= 6000 & home_owned[1] = 1 & BuyHous = 2 & ArendHouseSL += 30" & gs ''$menu_obnovit''>cash from drawer</a>'
-			elseif money + stolmoney >= 6000:
-				!both < 6000, so money = money - 6000 + stolmoney
-				*P ' <a href="exec:money -= 6000 - stolmoney & stolmoney = 0 & home_owned[1] = 1 & BuyHous = 2 & ArendHouseSL += 30" & gs ''$menu_obnovit''>cash from purse and drawer</a>'
+
+	if (home_owned[1] = 1 or home_owned[4] > 0) and ArendHouseSL > 0:
+			nl
+		if home_owned[1] = 1 and home_owned[4] > 0:
+			pl 'You have rented an apartment in the city residential area, which is paid up for <b><<ArendHouseSL>></b> days, and you also have an apartment in Pushkin, which is paid up for <b><<ArendHouseSL4>></b> days.'
+		elseif home_owned[1] = 1:
+			pl 'You have rented an apartment in the city residential area, and you are paid up for <<ArendHouseSL>> days.'
+		elseif home_owned[4] > 0:
+			pl 'You have rented an apartment in Pushkin, and you are paid up for <<ArendHouseSL>> days.'
+		end
+		if home_owned[1] = 1:
+			if karta >= home_rent[1] or money >= home_rent[1] or money + stolmoney >= home_rent[1] or karta + bankDebtLimit >= home_rent[1]:
+				nl
+				p 'The monthly rent for your city apartment is <<home_rent[1]>> <b>₽</b>. '
+				if karta >= home_rent[1]:
+					!From bank
+					p 'You can make an advance <a href="exec:karta -= home_rent[1] & home_owned[1] = 1 & ArendHouseSL += ArendHouseSL_due & gs ''$menu_obnovit''">payment</a> from your bank account.'
+				elseif money >= home_rent[1]:
+					!From cash
+					p 'You can make an advance <a href="exec:money -= home_rent[1] & home_owned[1] = 1 & ArendHouseSL += ArendHouseSL_due & gs ''$menu_obnovit''">payment</a> from your on-hand cash.'
+					nl
+				elseif stolmoney >= home_rent[1]:
+					!From drawer
+					p 'You can make an advance <a href="exec:stolmoney -= home_rent[1] & home_owned[1] = 1 & ArendHouseSL += ArendHouseSL_due & gs ''$menu_obnovit''">payment</a> from the cash you have in your stash drawer.'
+					nl
+				elseif money + stolmoney >= home_rent[1]:
+					!From cash and drawer
+					p 'You can make an advance <a href="exec:money -= (home_rent[1] - stolmoney) & stolmoney = 0 & home_owned[1] = 1 & ArendHouseSL += ArendHouseSL_due & gs ''$menu_obnovit''">payment</a> from your on-hand cash and the cash in your stash drawer.'
+					nl
+				elseif karta + bankDebtLimit >= home_rent[1]:
+					!From bank and overdraw
+					p 'You can make an advance <a href="exec:karta -= home_rent[1] & home_owned[1] = 1 & ArendHouseSL += ArendHouseSL_due & gs ''$menu_obnovit''">payment</a> from your bank account and overdraw facility.'
+					nl
+				else
+					p 'You can''t afford to make an advance payment right now, but you should try to have enough money in your account before the 25th of <<month>>, so you don''t get evicted.'
+					nl
+				end
 			end
-			!from purse, drawer or both
-			if karta >= 6000: 
-				*P ' <a href="exec:karta -= 6000 & home_owned[1] = 1 & BuyHous = 2 & ArendHouseSL += 30 & gs ''$menu_obnovit''">bank account</a>'
-			elseif karta + bankDebtLimit >= 6000: 
-				*P ' <a href="exec:karta -= 6000 & home_owned[1] = 1 & BuyHous = 2 & ArendHouseSL += 30 & gs ''$menu_obnovit''">bank account, but you will be overdrawn.</a>'
+		end
+		if home_owned[4] > 0:
+			if karta >= home_rent[4] or money >= home_rent[4] or money + stolmoney >= home_rent[4] or karta + bankDebtLimit >= home_rent[4]:
+				nl
+				p 'The monthly rent for your Pushkin apartment is <<home_rent[4]>> <b>₽</b>. '
+				if karta >= home_rent[4]:
+					!From bank
+					p 'You can make an advance <a href="exec:karta -= home_rent[4] & home_owned[1] = 1 & ArendHouseSL4 += ArendHouseSL_due & gs ''$menu_obnovit''">payment</a> from your bank account.'
+					nl
+				elseif money >= home_rent[4]:
+					!From cash
+					p 'You can make an advance <a href="exec:money -= home_rent[4] & home_owned[1] = 1 & ArendHouseSL4 += ArendHouseSL_due & gs ''$menu_obnovit''">payment</a> from your on-hand cash.'
+					nl
+				elseif stolmoney >= home_rent[4]:
+					!From drawer
+					p 'You can make an advance <a href="exec:stolmoney -= home_rent[4] & home_owned[1] = 1 & ArendHouseSL4 += ArendHouseSL_due & gs ''$menu_obnovit''">payment</a> from the cash you have in your stash drawer.'
+					nl
+				elseif money + stolmoney >= home_rent[4]:
+					!From cash and drawer
+					p 'You can make an advance <a href="exec:money -= (home_rent[4] - stolmoney) & stolmoney = 0 & home_owned[1] = 1 & ArendHouseSL4 += ArendHouseSL_due & gs ''$menu_obnovit''">payment</a> from your on-hand cash and the cash in your stash drawer.'
+					nl
+				elseif karta + bankDebtLimit >= home_rent[4]:
+					!From bank and overdraw
+					p 'You can make an advance <a href="exec:karta -= home_rent[4] & home_owned[1] = 1 & ArendHouseSL4 += ArendHouseSL_due & gs ''$menu_obnovit''">payment</a> from your bank account and overdraw facility.'
+					nl
+				else
+					p 'You can''t afford to make an advance payment right now, but you should try to have enough money in your account before 25th of <<month>>, so you don''t get evicted.'
+					nl
+				end
 			end
-		else
-			*P ' But you can''t afford to pay the rent right now.'
 		end
-		nl
 	end
-	
+
 	if kid = 1:
+		nl
 		pl 'You have 1 child:'
 	else
 		pl 'You have <<kid>> children:'
@@ -358,7 +406,7 @@ if $ARGS[0] = 'kidlist':
 	kidnumber = ARGS[1]
 	if kidage[kidnumber] < 1:
 		if (month - monthkid[kidnumber]) < 1 and (day-daykid[kidnumber]) < 7:
-			kiddaycalc[kidnumber] = day - daykid[kidnumber]	
+			kiddaycalc[kidnumber] = day - daykid[kidnumber]
 			if kiddaycalc[kidnumber] = 0:
 				$kidagetext[kidnumber] = 'was born today'
 			elseif kiddaycalc[kidnumber] = 1:
@@ -453,7 +501,7 @@ if $ARGS[0] = 'stats_achievements':
 		nl
 	end
 
-	
+
 	if chess_win > 0 or chess_loss > 0:pl'Chess Record: Win <<chess_win>>, Loss <<chess_loss>>'
 	if chess_rank > 0:
 		if chess_rank = 1:pl'You have mastered the basics of chess'
@@ -485,7 +533,7 @@ if $ARGS[0] = 'stats_achievements':
 		if modelfoto_pussy > 0: pl'<<modelfoto_pussy>> - Number of shoots your vagina has been visible'
 		nl
 	end
-	
+
 	if slavafuck > 0:pl'You have let Borislav fuck you <<slavafuck>> times'
 	if slava_bj > 0:pl'You have given Borislav <<$slava_bj>> blowjobs'
 
@@ -504,7 +552,7 @@ if $ARGS[0] = 'stats_achievements':
 	if teachlevel > 0:pl 'Your credibility as a teacher is <<teachlevel>>'
 	!WD:FORMATING
 	if (maxdamage + stripdancesum + profiDanceTime + SchoolAtestat + diplom + teachlevel) > 0:nl
-	
+
 	if film > 0:
 		gs 'pornhist', 'short'
 		$retired=''
@@ -537,20 +585,20 @@ if $ARGS[0] = 'stats_sex':
 	if stat['flashlite'] > 0 or stat['flash'] > 0:pl 'Times you have flashed: <<stat[''flashlite''] + stat[''flash'']>>'
 	if stat['voyeur'] > 0:pl 'Times you have watched other people fuck: <<stat[''voyeur'']>>'
 	if spank > 0:pl 'You have had your ass spanked <<spank>> times'
-	temp = func('shortgs','guy') 
+	temp = func('shortgs','guy')
 	if guy+temp > 0 and hidden_guy = 0:
 		pl 'You had sex with <<guy+temp>> guys.'
 	elseif guy+temp = 0 and hidden_guy > 0:
 		pl 'You had sex with <<hidden_guy>> guys, but you do not have any recollection of it. You still think of yourself as a virgin.'
-	else
+	elseif guy+temp > 0 and hidden_guy > 0:
 		pl 'You had sex with <<guy+hidden_guy+temp>> guys, but you know only about <<guy+temp>> of them.'
 	end
-	temp = func('shortgs','girl') 
+	temp = func('shortgs','girl')
 	if girl+temp > 0 and hidden_girl = 0:
 		pl 'You had sex with <<girl+temp>> girls.'
 	elseif girl+temp = 0 and hidden_girl > 0:
 		pl 'You had sex with <<hidden_girl>> girls, but you do not have any recollection of any of it.'
-	else
+	elseif girl+temp > 0 and hidden_girl > 0:
 		pl 'You had sex with <<girl+temp+hidden_girl>> girls, but you know only about <<girl+temp>> of them.'
 	end
 	if divorced > 0:pl 'You were married <<divorced>> times.'
@@ -581,13 +629,13 @@ if $ARGS[0] = 'stats_sex':
 
 	if sex > 0 or stat['vaginal'] > 0 or stat['hidden_vaginal'] > 0:pl 'Vaginal sex (known/unknown): <<stat[''vaginal'']>>/<<stat[''hidden_vaginal'']>>'
 	if sexa > 0:pl 'Vaginal sex with your boyfriend: <<sexa>>'
-	if (pcs_cp_safe_known + pcs_cp_notsafe_known + pcs_cp_risky_known) > 0: 
+	if (pcs_cp_safe_known + pcs_cp_notsafe_known + pcs_cp_risky_known) > 0:
 		pl '  Known vaginal creampies:'
 		if pcs_cp_safe_known > 0: pl '    Safe: <<pcs_cp_safe_known>>'
 		if pcs_cp_notsafe_known > 0: pl '    Likely safe: <<pcs_cp_notsafe_known>>'
 		if pcs_cp_risky_known > 0: pl '    Risky: <<pcs_cp_risky_known>>'
 	end
-	if (pcs_cp_safe_unknown + pcs_cp_notsafe_unknown + pcs_cp_risky_unknown) > 0: 
+	if (pcs_cp_safe_unknown + pcs_cp_notsafe_unknown + pcs_cp_risky_unknown) > 0:
 		pl '  Unknown vaginal creampies:'
 		if pcs_cp_safe_unknown > 0: pl '    Safe: <<pcs_cp_safe_unknown>>'
 		if pcs_cp_notsafe_unknown > 0: pl '    Likely safe: <<pcs_cp_notsafe_unknown>>'
@@ -655,7 +703,7 @@ if $ARGS[0] = 'stats_sex':
 	!!!WD:FORMATING
 	if (slutty + pfilmSTOP + film + orgasm + analorgasm + swallow + facial + frot + zoo + pee) > 0:nl
 	!!!
-	
+
 	gs 'obj_din', 'husb_cheat_count'
 
 end
@@ -917,7 +965,7 @@ if $ARGS[0] = 'rep2':
 	if rinslut > 1 and kavslut > 0:pl'In the residential area of ​​you are known as a whore that sleeps with Caucasians.'
 	if afra > 80: pl'In the student hostel, you are known for bedding blacks.'
 	if opusk > 0 or gnewQW >= 5: pl'In the residential area it is well known by all the guys that you are a whore.'
-	if StoryLine = 1:		
+	if StoryLine = 1:
 		nl
 		if motherKnowSpravka > 0 and motherKnowWhore > 0:
 			pl'Your mother knows, that you are sexually active and considers you a slut.'
@@ -941,8 +989,8 @@ if $ARGS[0] = 'rep2':
 		else
 			pl'Your brother has a good opinion of you.'
 		end
-		
-		
+
+
 		if sisterknowslut > 1 and sisboypartyQW = 2:
 			pl'Your sister thinks you are a slut'
 		elseif sisterknowslut > 0:
@@ -950,7 +998,7 @@ if $ARGS[0] = 'rep2':
 		else
 			pl'Your sister has a good opinion of you.'
 		end
-		
+
 		if brothershowertalk > 0:pl'<<brothershowertalk>> - Number of conversations you''ve had with your brother in the shower.'
 		if brothershowerlook = 1:pl'You let your brother look at you when you''re shower'
 		if brothershave > 0:pl'<<brothershave>> - Number of times you''ve let your brother watch you shave your pussy'
@@ -1049,7 +1097,7 @@ if $ARGS[0] = 'magic':
 		if spellwater5 = 1:pl'The Great Flood, It creates a huge sphere that absorbs water and drains opponents mana, passing it to strengthen protection. Cost 500 manna.'
 		nl
 	end
-	
+
 	if succubusflag = 1 and sucpcinfo >= 4 and sucskill >= 1:
 		pl'<center><b>Succubus Stats</b></center>'
 		nl
@@ -1409,24 +1457,24 @@ end
 
 if $ARGS[0] = 'clothes':
 	clr
-	pl'<center><a href="exec:gs''$menu_obnovit''"><b>Clothes</b></a></center>'	
+	pl'<center><a href="exec:gs''$menu_obnovit''"><b>Clothes</b></a></center>'
 	!move image define to $body_image
-	
+
 	!display coat
 	$img_temp = FUNC('$body_image','coat')
 	if $img_temp ! null:  pl '<a href="exec:view ''<<$img_temp>>''"><img <<$set_imgh>> src="<<$img_temp>>"></a>'
 	pl '<<$body_image_msg>>'
 
 	pl ''
-	
+
 	!display cloth
 	$img_temp = FUNC('$body_image','clothes')
-	if $img_temp ! null: pl '<a href="exec:view ''<<$img_temp>>''"><img <<$set_imgh>> src="<<$img_temp>>"></a>'	
+	if $img_temp ! null: pl '<a href="exec:view ''<<$img_temp>>''"><img <<$set_imgh>> src="<<$img_temp>>"></a>'
 	pl '<<$body_image_msg>>'
-	
+
 	killvar 'img_temp'
-	killvar 'body_image_msg'	
-	!{	
+	killvar 'body_image_msg'
+	!{
 	if defaultcoat = 0:
 		pl 'You have no default coat set.'
 
@@ -1486,7 +1534,7 @@ end
 
 if $ARGS[0] = 'panties':
 	clr
-	pl'<center><a href="exec:gs''$menu_obnovit''"><b>Panties</b></a></center>'	
+	pl'<center><a href="exec:gs''$menu_obnovit''"><b>Panties</b></a></center>'
 	$img_temp = FUNC('$body_image','panties')
 	pl '<a href="exec:view ''<<$img_temp>>''"><img <<$set_imgh>> src="<<$img_temp>>"></a>'
 	pl '<<$body_image_msg>>'
@@ -1511,7 +1559,7 @@ end
 
 if $ARGS[0] = 'bra':
 	clr
-	pl'<center><a href="exec:gs''$menu_obnovit''"><b>Bra</b></a></center>'	
+	pl'<center><a href="exec:gs''$menu_obnovit''"><b>Bra</b></a></center>'
 	$img_temp = FUNC('$body_image','bra')
 	pl '<a href="exec:view ''<<$img_temp>>''"><img <<$set_imgh>> src="<<$img_temp>>"></a>'
 	pl '<<$body_image_msg>>'
@@ -1537,8 +1585,8 @@ if $ARGS[0] = 'shoes':
 	end
 	}
 end
-		
-		
+
+
 if $ARGS[0] = 'body':
 !!	This displays the body image; $bodimgsets[x9] is the folder name
 	!some in-game script may call this to display image, so leave it be
@@ -1694,7 +1742,7 @@ if $ARGS[0] = 'tattoos':
 	if tatunder > 0:tatcounter = 1 & pl'<a href="exec: gs ''obj_din'', ''tattoounder''">Tattoo under your breasts</a>'
 	if tatwrist > 0:tatcounter = 1 & pl'<a href="exec: gs ''obj_din'', ''tattoowrist''">Tattoo on your wrist</a>'
 	if tathand > 0:tatcounter = 1 & pl'<a href="exec: gs ''obj_din'', ''tattoohand''">Tattoo on your hand</a>'
-	
+
 	if tatcounter = 0:
 		pl'You have a pristine body. Not in terms of debauchery, but in terms of tattoos.'
 	end
@@ -1721,7 +1769,24 @@ end
 
 if $ARGS[0] = 'records':
 	clr
-	if home_owned[1] > 0:pl'You live in a two-room apartment, in the city residential area. Rent for the apartment is subtracted automatically, in sum of 3000 <b>₽</b> plus electric bill on 25th of each month.'
+	gs 'housing', 'rent'
+	if pavSharedAptEnabled = 1:pl'You share an apartment with three others in Pavlovsk. Bills are paid by the other tennants in exchange for your house services'
+	nl
+	if home_owned[1] = 1:pl'You rent a two-room apartment, in the city residential area. Rent for the apartment is subtracted automatically, in sum of <<home_rent[1]>> <b>₽</b> plus electric bill on 25th of each month. You are currently paid up for <b><<ArendHouseSL>></b> days'
+	nl
+	if home_owned[1] = 2:pl'You own a two-room apartment, in the city residential area. Utility bills are on the 25th of each month.'
+	nl
+	if home_owned[2] > 0:pl'You live in a two-room apartment, in a large apartment complex, with your parents and siblings in Pavlovsk.'
+	nl
+	if home_owned[3] > 0:pl'You own small holiday cottage with an adjacent allotment in the communal village.'
+	nl
+	if home_owned[4] > 0:pl'You rent a two-room apartment, in Pushkin. Rent for the apartment is subtracted automatically, in sum of <<home_rent[4]>> <b>₽</b> plus electric bill on 25th of each month. You are currently paid up for <b><<ArendHouseSL4>></b> days'
+	nl
+	if home_owned[5] = 1:pl'You own a vacant block, in the city suburbs. Utility bills are on the 25th of each month.'
+	nl
+	if home_owned[5] = 2:pl'You own a block in the city suburbs, upon which, you are building a house. Utility bills are on the 25th of each month.'
+	nl
+	if home_owned[5] = 3:pl'You own an impressive manion in the suburbs of St. Petersburg. Utility bills are on the 25th of each month.'
 	nl
 	if workPTU > 2:pl'You work as a teacher at the Lycée. Working days Mon-Sat, with 14.00 to 16.00. Salary 300r/day. Dress code - office clothes, Strict. The road from the apartment to the Lyceum takes 2 hours 10 minutes.'
 	nl
@@ -1735,7 +1800,11 @@ if $ARGS[0] = 'records':
 	nl
 	if (work = 1 or cheatWork = 1) and tanwork > 0:pl'You work as a governess for Tanya, at Nicholas'' luxury city apartment. Salary is automatically transferred on 25th of each month.'
 	nl
-	if (work = 1 or cheatWork = 1) and young_shop_work = 1:pl'You work in the city as a store clerk at Pussy-Cats - youth clothing store. Work starts at 15, every day except Saturday and Sunday. The salary shall be issued once a week on Fridays.'
+	if (work = 1 or cheatWork = 1) and young_shop_work = 1:pl'You work in the city as a store clerk at Pussy-Cats - youth clothing store. Work starts at 15, Monday to Friday. The salary shall be issued once a week on Fridays.'
+	nl
+	if (work = 1 or cheatWork = 1) and young_shop_work1 = 1:pl'You work in the city as a store clerk at Pussy-Cats - youth clothing store. Work starts at 9, Saturday and Sunday. The salary shall be issued once a week on Fridays.'
+	nl
+	if (work = 1 or cheatWork = 1) and young_shop_work2 = 1:pl'You work in the city as a store clerk at Pussy-Cats - youth clothing store. Work starts at 9, Monday to Friday. The salary shall be issued once a week on Fridays.'
 	nl
 	if (work = 1 or cheatWork = 1) and workFabrika = 1:pl'You work as a seamstress in a factory in Pavlovsk. Work is every day except Saturday and Sunday. Salary is automatically transferred on 25th of each month.'
 	nl

+ 3 - 3
locations/pavResidential

@@ -142,14 +142,14 @@ end
 if hour >= 8 and hour <= 22:'You can see the <a href="exec:$locM = ''pavResidential'' & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
 
 if SchoolBlock = 0:
-	$schoolname = ' and the local <a href="exec:gt ''gschool_grounds'', ''main''">school</a>.'
+	$schoolname = ' and the local <a href="exec: minut += 1 & gt ''gschool_grounds'', ''main''">school</a>.'
 else
 	'.'
 end
 
 'The town surrounds the old place grounds which are now a large <a href="exec:minut += 5 & gt ''gskver'', ''park''">public park</a>, close to the residential area is the <a href="exec:gt ''glake''">lake</a>.'
 
-'The town square features a <a href="exec:gt ''gdk''">community center</a><<$schoolname>>'
+'The town square features a <a href="exec: minut += 2 & gt ''gdk''">community center</a><<$schoolname>>'
 
 
 'A <a href="exec:minut += 15 & gt ''Gshveyfab'', ''start''">garment factory</a> named Paris Commune is situated in the industrial area on the outskirts of town. Inhabitants of Pavlovsk can store their cars in the <a href="exec:minut += 5 & gt ''pavComplex'', ''garages''">garages</a>.'
@@ -182,7 +182,7 @@ end
 if kanikuli = 0 and StoryLine > 0 and SchoolAtestat = 0 and week < 6 and hour >= 4 and hour < 9: act '<font color = green><b>Go to school</b></font>': minut += 1 & gt 'gschool_grounds', 'main'
 
 act 'Go to the high street':minut += 5 & gt 'pavCommercial'
-if home_owned[2] = 1: act '<b>GO HOME</b> (Parents'' Apartment)': minut += 5 & GT 'korrPar'
+if home_owned[2] = 1: act '<b>GO HOME</b> (Parents'' Apartment)': minut += 4 & GT 'korrPar'
 if pavSharedAptEnabled = 1:act '<b>GO HOME</b> (Shared Apartment)': minut += 5 & GT 'pavSharedApt', 'start'
 
 act 'Wait':

+ 0 - 4
locations/pavSharedApt

@@ -781,8 +781,6 @@ if $ARGS[0] = 'cookForGuys':
 	minut += 90
 	eda -= 3
 	kuhdrova = 0
-	!musor += 1
-	cltarelka -= 1
 	pcs_mood -= 10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/home/kitchen/cook.jpg"></center>'
@@ -796,9 +794,7 @@ if $ARGS[0] = 'cleanForGuys':
 	cla
 	*clr
 	minut += 60
-	suhbelo += dirtbelo
 	poroshok -= 3
-	dirtbelo = 0
 	pcs_mood -= 10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stir.jpg"></center>'

+ 2 - 2
locations/pharmacy

@@ -20,7 +20,7 @@ if $ARGS[0] = 'start' :
 		end
 	else
 		gt 'pharmacy', 'shop'
-	end				
+	end
 	act 'Leave': minut += 5 & gt $loc, $metka
 end
 
@@ -48,7 +48,7 @@ if $ARGS[0] = 'shop' or $ARGS[0] = '':
 	iif($ARGS[1] = '', '', '<center><<$ARGS[1]>></center>')
 
 	*pl '<center><table align="center">'
-	*P FUNC ('$stock_item', 5, 'condoms', 500, 'prezik', $CURLOC, $ARGS[0])
+	*P FUNC ('$stock_item', 5, 'condoms', 500, 'prezikcount', $CURLOC, $ARGS[0])
 	*P FUNC ('$stock_item', 1, 'pregnancy test', 530, 'pregtest', $CURLOC, $ARGS[0])
 	*P FUNC ('$stock_item', 1, 'birth control pills', 1870, 'tabletki', $CURLOC, $ARGS[0])
 	*P FUNC ('$stock_item', 10, 'antibiotics', 580, 'lekarstvo', $CURLOC, $ARGS[0])

+ 24 - 28
locations/poli

@@ -1420,12 +1420,12 @@ if $ARGS[0] = 'cosmetic1':
 		'Get XXL breast implants - 200,000 <b>₽</b>'
 	end
 	if money >= 200000 and silicone = 0 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 20 & fillimplant = 1 & gt ''poli'', ''bImplantFill''">Get fillable implants</a> - 200,000 <b>₽</b>'
+		'<a href="exec:brSurTemp = 20 & fillimplant = 1 & gt ''poli'', ''bImplantA''">Get fillable implants</a> - 200,000 <b>₽</b>'
 		else
 		'Get fillable implants - 200,000 <b>₽</b>'
 	end
 	if money >= 250000 and silicone = 0 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 20 & stringimplant = 1 & gt ''poli'', ''bImplantString''">Get string implants</a> - 250,000 <b>₽</b>'
+		'<a href="exec:brSurTemp = 20 & stringimplant = 1 & gt ''poli'', ''bImplantA''">Get string implants</a> - 250,000 <b>₽</b>'
 		else
 		'Get string implants - 250,000 <b>₽</b>'
 	end
@@ -1530,20 +1530,28 @@ if $ARGS[0] = 'bImplantA':
 	cls
 	minut += 60
 	silicone = brSurTemp
-	money -= 90000
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/cosmeticsur.jpg"></center>'
-	'The surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you: "Just breathe in deeply... we''ll be done before you know it."'
-	'By the time you wake up again, the procedure is complete.'
-
-	act 'Continue':gt 'poli', 'cosmetic1'
-end
-
-if $ARGS[0] = 'bImplantFill':
-	cls
-	minut += 60
-	silicone = brSurTemp
-	money -= 200000
+	! Get String Implants
+	if stringimplant = 1:
+		money -= 250000
+	! Get Fillable Implants
+	elseif fillimplant = 1:
+		money -= 200000
+	! Get XXL Implants
+	elseif silicone = 40:
+		money -= 200000
+	! Get Large Implants
+	elseif silicone = 30:
+		money -= 190000
+	! Get Medium Implants
+	elseif silicone = 20:
+		money -= 180000
+	! Get Small Implants
+	elseif silicone = 10:
+		money -= 170000
+	! Remove any implants
+	elseif silicone = 0:
+		money -= 90000
+	end
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/cosmeticsur.jpg"></center>'
 	'The surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you: "Just breathe in deeply... we''ll be done before you know it."'
@@ -1552,18 +1560,6 @@ if $ARGS[0] = 'bImplantFill':
 	act 'Continue':gt 'poli', 'cosmetic1'
 end
 
-if $ARGS[0] = 'bImplantString':
-	cls
-	minut += 60
-	silicone = brSurTemp
-	money -= 250000
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/cosmeticsur.jpg"></center>'
-	'The surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you: "Just breathe in deeply... we''ll be done before you know it."'
-	'By the time you wake up again, the procedure is complete.'
-
-	act 'Continue':gt 'poli', 'cosmetic1'
-end
 
 --- poli ---------------------------------
 

+ 2 - 0
locations/preSYS

@@ -24,6 +24,7 @@ if $ARGS[0] = 'TGStart':
 
 	home_owned[1] = 1
 	gs 'set_home', 1
+	ArendHouseSL = 21
 
 	if MagikDostup = 1:
 		gt 'preCUST', 'NTStart'
@@ -510,6 +511,7 @@ if $ARGS[0] = 'charselect':
 				falselashesmink = 2
 				$currentpursetype = 'fashionista'
 				currentpursenumber = 9
+				dynamic $currentpursetype + '_purses[' + currentpursenumber + '] = 1'
 				bag = 1
 				if menu_option = 1:dynamic $menu_addoldmenu
 				if menu_option = 0:gs 'obj_din', 'new'

+ 3 - 3
locations/restoranM

@@ -35,7 +35,7 @@ end
 
 if $ARGS[0] = 'a':
 	minut += 30
-	alko += 1
+	alko += 2
 	if pcs_hydra >= 100:
 		pcs_hydra -= 5
 	else
@@ -50,8 +50,8 @@ if $ARGS[0] = 'a':
 end
 
 if $ARGS[0] = 'b':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$metka = 'b'
+	$loc = 'restoranM'
 
 
 	gs 'food', 'm_meal'

+ 186 - 25
locations/sauna

@@ -1,32 +1,193 @@
 # sauna
-clr
-sauna += 1
-gs 'stat'
-'<center><b>Sauna</b></center>'
-'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sauna.jpg"></center>'
-'Luxurious high quality public sauna founded long time ago. The sauna houses separate changing rooms and shower facilities for men and women.'
-
-act 'Leave':minut += 10 & gt 'street'
-
-!!if saunaWorkWhore > 0:act 'Go to work':gt 'saunawork'
-if SaunaWhore > 0:act 'Head to work':gt 'saunawork'
-
-if week = 5 and workDisk = 2:
-	'There''s a security guard waiting at the entrance for you to arrive.'
-
-	act 'Hand over the disk':
-		cls
-		minut += 20
-		workDisk = 3
-		konvert = 1
-		gs 'stat'
-		'You hand over the disk to him and you are handed back a thick envelope.'
-
-		act 'Leave':minut += 10 & gt 'street'
+
+if night_mode = 1:
+	fcolor = rgb(255, 255, 255)
+	bcolor = rgb(0, 0, 0)
+	lcolor = rgb(106, 90, 205)
+else
+	fcolor = rgb(0, 0, 0)
+	bcolor = rgb(255, 255, 255)
+	lcolor = rgb(106, 90, 205)
+end
+
+if $ARGS[0] = '':
+	clr
+	$loc = 'sauna'
+	$metka = ''
+	sauna += 1
+	gs 'stat'
+	'<center><b>Sauna</b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sauna.jpg"></center>'
+	'Luxurious high quality public sauna founded long time ago. The sauna houses separate changing rooms and shower facilities for men and women.'
+
+	act 'Leave':minut += 10 & gt 'street'
+
+	if SaunaWhore > 0:act 'Head to work':gt 'saunawhore', 'saunawork'
+
+	if week = 5 and workDisk = 2:
+		'There''s a security guard waiting at the entrance for you to arrive.'
+
+		act 'Hand over the disk':
+			cls
+			minut += 20
+			workDisk = 3
+			konvert = 1
+			gs 'stat'
+			'You hand over the disk to him and you are handed back a thick envelope.'
+
+			act 'Leave':minut += 10 & gt 'street'
+		end
+	end
+
+	if hour >= 8 and hour <= 23:act 'Head to the sauna':gt 'sauna', 'sauna2'
+end
+
+if $ARGS[0] = 'sauna2':
+	*clr & cla
+	$loc = 'sauna'
+	$metka = 'sauna2'
+	minut += 5
+	gs 'stat'
+	'<center><b><font color="maroon">Sauna</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sauna1.jpg"></center>'
+	'One hour visit - 2,000 <b>₽</b>'
+
+	act 'Leave':gt 'sauna'
+
+	if money >= 2000 and saunaday ! daystart:
+		act 'Stay (2,000 <b>₽</b>)':
+			cls
+			money = money - 2000
+			minut += 60
+			fat -= 10
+			pcs_sweat = rand(0,5)
+			dynamic $showerdin
+			saunaday = daystart
+			pcs_mood = 100
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/shared/sauna/sau.jpg"></center>'
+			'You spend an hour relaxing in the heat of the sauna, having a cool shower and dressing. You feel revitalised.'
+
+			act 'Leave':gt 'sauna'
+		end
+	end
+end
+
+if $ARGS[0] = 'saunaroom':
+	*clr & cla
+	$loc = 'sauna'
+	$metka = 'saunaroom'
+	$locBroom = 'sauna'
+	$metkaBroom = 'saunaroom'
+	$locM = 'sauna'
+	$metkaM = 'saunaroom'
+	$location_type = 'private'
+	saunaYouRoom = 1
+	gs 'stat'
+	'<center><b><font color="maroon">Room</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/saunaroom.jpg"></center>'
+
+	'<br>The room has a thread bare <a href="exec:sec += 30 & gt ''bed2''">bed</a> and a cheap <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a>).'
+
+	'<br>Hanging on the wall is a dirty <a href="exec:gt ''mirror'', ''start''">mirror</a>. The floor is littered with dozens of porn magazines, and a selection of adult toys are scattered throughout the room. There''s so much crap laying around, there''s barely enough space to do some basic <a href="exec:gt ''sauna'', ''saunafitness''">exercise</a>.'
+
+	if budilnikOn = 0:
+		'<br>Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 1 & GT ''<<$loc>>''">off</a>.'
+	else
+		'<br>Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 0 & GT ''<<$loc>>''">on</a>.'
+	end
+
+	if money > 0 and workDolg > 0:workDolg -= money & money = 0
+	if workDolg > 0:'Your debt is <<workDolg>> <b>₽</b>'
+
+	act '<b>Exit to the sauna</b>':gt 'saunawhore', 'saunawork'
+
+	if workDolg > 0:
+
+		act 'Have some food (0:15)':gs 'food', 'snack'
+		act 'Drink some water (0:05)':gs 'beverage', 'bev_wat'
+
+		act 'Borrow cosmetics':
+			workDolg += 1000
+			kosmetica += 25
+			gt $curloc
+		end
+	end
+	if workDolg <= 0 and SaunaWhore > 0:
+
+		if money >= 100:
+			act 'Buy some food (0:15) (100 <b>₽</b>)':
+				gs 'food', 'snack'
+				money -= 100
+			end
+		end
+		act 'Drink some water (0:05)':gs 'beverage', 'bev_wat'
+
+		dynamic $fatdel
+		dynamic $lekarstvo
+		dynamic $vitamin
+	end
+
+	gs 'events', 'read_porn'
+
+	if pcs_horny >= 50:
+		act 'Masturbate':gt 'selfplay', 'start'
+	end
+
+	if pcs_sleep <= 80:
+		if $clothingworntype = 'nude':
+			$sleep_txt = 'Go to sleep'
+		else
+			$sleep_txt = 'Undress and go to sleep'
+		end
+		if succubusQW = 2:
+			act '<<$sleep_txt>>':
+				if $clothingworntype ! 'nude': gs 'clothing', 'strip'
+				gt 'bed2', 'succhoice'
+			end
+		else
+			act '<<$sleep_txt>>':
+				if disable_autosave = 0:
+					if StoryLine = 0:
+						savegame 'autosave.sav'
+					else
+						savegame 'autosave_alt.sav'
+					end
+				end
+				if $clothingworntype ! 'nude': gs 'clothing', 'strip'
+				if magf2bdo = 2:
+					gt 'bed2', 'magbstchoice'
+				else
+					gt 'bed2', 'sleep'
+				end
+			end
+			killvar '$sleep_txt'
+		end
 	end
 end
 
-if hour >= 8 and hour <= 23:act 'Head to the sauna':gt 'sauna2'
+if $ARGS[0] = 'saunafitness':
+	$loc = 'sauna'
+	$metka = 'saunaroom'
+	cla
+	*clr
+	'<center><video autoplay loop src="images/pc/activities/push_naked.mp4"></video></center>'
+	gs 'exercise', 'tier2', 30, 'stren_exp', 'exhibition_exp'
+	'You do push-ups for <<$timestring>> minutes, improving your strength.'
+
+	randpushfact = rand(-5,5)
+	if pcs_energy < 40: randpushfact -= RAND(1,10)
+
+	pushnum = (pcs_stren * pcs_sleep * pcs_health)  / ( 1 * 67 *  healthmax) + randpushfact
+
+	if pushnum < 1: pushnum = rand(1,5)
+	KILLVAR 'randpushfact'
+	'<br>You managed to do <<pushnum>> push-ups. Your previous record is <<pushrecord>>.'
+
+	if pushrecord < pushnum:pushrecord = pushnum & 'This is a new record!'
+	gs 'stat'
+	act 'Finish': gt $loc, $metka
+end
 
 --- sauna ---------------------------------
 

+ 0 - 38
locations/sauna2

@@ -1,38 +0,0 @@
-# sauna2
-minut += 5
-gs 'stat'
-if night_mode = 1:
-	fcolor = rgb(255, 255, 255)
-	bcolor = rgb(0, 0, 0)
-	lcolor = rgb(106, 90, 205)
-else
-	fcolor = rgb(0, 0, 0)
-	bcolor = rgb(255, 255, 255)
-	lcolor = rgb(106, 90, 205)
-end
-'<center><b><font color="maroon">Sauna</font></b></center>'
-'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sauna1.jpg"></center>'
-'One hour visit - 2,000 <b>₽</b>'
-
-act 'Leave':gt 'sauna'
-
-if money >= 2000 and saunaday ! daystart:
-	act 'Stay (2,000 <b>₽</b>)':
-		cls
-		money = money - 2000
-		minut += 60
-		fat -= 10
-		pcs_sweat = rand(0,5)
-		dynamic $showerdin
-		saunaday = daystart
-		pcs_mood = 100
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/city/shared/sauna/sau.jpg"></center>'
-		'You spend an hour relaxing in the heat of the sauna, having a cool shower and dressing. You feel revitalised.'
-
-		act 'Leave':gt 'sauna'
-	end
-end
-
---- sauna2 ---------------------------------
-

+ 0 - 96
locations/saunabed

@@ -1,96 +0,0 @@
-# saunabed
-
-if $args[0] = '':
-	cls
-	$loc = 'saunabed'
-	$metka = ''
-	$location_type = 'private'
-	gs 'stat'
-	'<center><b>bed</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/son.jpg"></center>'
-	if pcs_sleep < 80:
-		act 'Sleep': gt 'saunabed', 'sleep'
-	end
-	if budon = 1:
-		'Alarm set for <<timer>> hours <<timerM>> minutes'
-
-		act 'Turn the alarm off':budon = 0 & gt 'saunabed'
-	else
-		act 'Turn the alarm on':budon = 1 & gt 'saunabed'
-	end
-
-	act 'Set the alarm':gt'budilnik', 'start'
-	act 'Get out of bed':gt $locBroom, $metkaBroom
-end
-
-if $args[0] = 'sleep':
-	if disable_autosave = 0:
-		if StoryLine = 0:
-			SAVEGAME 'autosave.sav'
-		else
-			SAVEGAME 'autosave_alt.sav'
-		end
-	end
-	cls
-	pcs_hairbsh = 0
-	InSleep = 1
-	
-	gs 'clothing', 'strip'
-	
-	
-	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/son.jpg"></center>'
-
-	if analplugIN = 1 and bedanal = 0:analplugIN = 0 & 'Before going to bed you remove your butt plug.'
-	if vibratorIN = 1:vibratorIN = 0 & 'Before going to bed you remove your vibrator'
-	if pcs_makeup > 1:pcs_makeup = 0 & vidageday = vidageday - 1 & 'Makeup smears your face, you think that it looks bad sleeping in makeup, and your skin will age faster from this.'
-	if fat > 5 and stringimplant = 1:silicone += 1 & fat -= 5
-
-
-	:loopson
-	minut += 1
-	stime += 1
-	pcs_health += 5
-
-	if stime = 60:stime = 0 & pcs_sleep += 15
-
-	gs 'stat'
-	if budilnikOn = 1 and hour = timer and minut = timerM:
-		pcs_mood -= 10
-		'Your alarm goes off.'
-
-		act 'Get out of bed and get dressed (0:15)':
-			gs 'clothing', 'wear_last_worn'
-			InSleep = 0
-			minut += 15
-			gt $locBroom, $metkaBroom
-		end
-
-		act 'Get out of bed (0:10)':
-			InSleep = 0
-			minut += 10
-			gt $locBroom, $metkaBroom
-		end
-
-	elseif pcs_sleep > 100:
-		pcs_mood -= 10
-		'You wake up, no longer tired.'
-
-		act 'Get out of bed and get dressed (0:15)':
-			gs 'clothing', 'wear_last_worn'
-			InSleep = 0
-			minut += 15
-			gt $locBroom, $metkaBroom
-		end
-
-		act 'Get out of bed (0:10)':
-			InSleep = 0
-			minut += 10
-			gt $locBroom, $metkaBroom
-		end
-	else
-		jump 'loopson'
-	end
-end
-
---- saunabed ---------------------------------
-

+ 0 - 61
locations/saunaroom

@@ -1,61 +0,0 @@
-# saunaroom
-$metka = ''
-$loc = 'saunaroom'
-$metkaBroom = ''
-$locBroom = 'saunaroom'
-$metkaM = ''
-$locM = 'saunaroom'
-$location_type = 'private'
-saunaYouRoom = 1
-'<center><b><font color="maroon">Room</font></b></center>'
-'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/saunaroom.jpg"></center>'
-'The room has a thread bare <a href="exec:sec += 30 & gt ''saunabed''">bed</a> and a cheap <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a>).'
-'Hanging on the wall is a dirty <a href="exec:gt ''mirror'', ''start''">mirror</a>'
-
-if money > 0 and workDolg > 0:workDolg -= money & money = 0
-if workDolg > 0:'Your debt is <<workDolg>> <b>₽</b>'
-
-act 'Go to the sauna':gt 'saunawork'
-
-if workDolg > 0:
-	act 'Drink tea with cookies (0:05)':
-		cla
-		*clr
-		minut += 5
-		workDolg += 50
-		pcs_health += 30
-		pcs_mood += 30
-		pcs_energy += 20
-		pcs_hydra += 60
-		fat += 3
-		frost = 0
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/shared/food/food.jpg"></center>'
-		'You drank tea with cookies, sweet and very bad for the figure, but so nice.'
-
-		act 'Get up from the table':gt 'saunaroom'
-	end
-
-	act 'Borrow cosmetics':
-		workDolg += 1000
-		kosmetica += 25
-		gt $curloc
-	end
-end
-
-if pcs_hydra < 80:
-	act 'Drink':
-		cla
-		minut += 5
-		pcs_hydra = 100
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
-		'You gladly drink a glass of water.'
-
-		act 'Get up from the table':gt 'saunaroom'
-	end
-end
-
---- saunaroom ---------------------------------
-

+ 355 - 23
locations/saunawhore

@@ -9,7 +9,7 @@ elseif moodTypeRand >= 4:
 end
 
 if $ARGS[0] = 'clientGate':
-	
+
 	if rand(0,19) = 0:gt 'saunawhore', 'bdsmclient'
 
 	moodTypeRand = rand(-3, 3)
@@ -205,13 +205,13 @@ if $ARGS[0] = 'blowjob':
 		'You start kissing the tip, licking it all around and putting it a bit inside your mouth and sucking the head.'
 		gs 'arousal', 'bj', 5, 'prostitution'
 		gs 'stat'
-		
+
 		act 'Suck it':gt 'saunawhore', 'blowjobGate'
 	elseif $moodType = 'good':
 		'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/blowjob'+rand(1, 5)+'.mp4"></video></center>'
 		'He comes close to you, fondles your hair and face and takes you gently by your arm, raising you up from the floor.'
 		'He directs you to the bed, undresses and both of you lie down.'
-		
+
 		act 'Embrace him':gt 'saunawhore', 'fuckGate'
 	elseif $moodType = 'bad':
 		'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/slapface'+rand(1, 1)+'.mp4"></video></center>'
@@ -225,7 +225,7 @@ if $ARGS[0] = 'blowjob':
 		else
 			Manna -= 10
 		end
-	
+
 		gs 'pain', 2, 'armL', 'twist'
 		gs 'pain', 2, 'armR', 'twist'
 		act 'Brace yourself':gt 'saunawhore', 'fuckRoughGate'
@@ -256,7 +256,7 @@ if $ARGS[0] = 'blowjobCaress':
 
 	if $moodType = 'good':
 		'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/blowjob'+rand(1, 5)+'.mp4"></video></center>'
-		'He seems to enjoy your efforts anyway, and signals to you that he''s ready to move on to the next stage.'	
+		'He seems to enjoy your efforts anyway, and signals to you that he''s ready to move on to the next stage.'
 		act 'Continue':gt 'saunawhore', 'fuckGate'
 	elseif $moodType = 'fairly normal':
 		'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/blowjob'+rand(1, 5)+'.mp4"></video></center>'
@@ -480,7 +480,7 @@ if $ARGS[0] = 'cumClientGate':
 				act 'Continue':gt 'saunawhore', 'cumAnal'
 			else
 				'He pulls out and brings his cock up in front of your face.'
-				act 'Continue':gt 'saunawhore', 'cumFace'	
+				act 'Continue':gt 'saunawhore', 'cumFace'
 			end
 		else
 			cumRand = rand(1, 2)
@@ -504,35 +504,35 @@ if $ARGS[0] = 'cumClientGate':
 				act 'Continue':gt 'saunawhore', 'cumAnal'
 			elseif cumRand = 2:
 				'He pulls out and brings his cock up in front of your face.'
-				act 'Continue':gt 'saunawhore', 'cumFace'	
+				act 'Continue':gt 'saunawhore', 'cumFace'
 			elseif cumRand = 3:
 				'He pulls out and brings his cock up in front of your face.'
-				act 'Continue':gt 'saunawhore', 'cumMouth'	
+				act 'Continue':gt 'saunawhore', 'cumMouth'
 			elseif cumRand = 4:
 				'He pulls out and holds his cock over your body.'
-				act 'Continue':gt 'saunawhore', 'cumBelly'	
+				act 'Continue':gt 'saunawhore', 'cumBelly'
 			elseif cumRand = 5:
 				'He pulls out and holds his cock over your body.'
-				act 'Continue':gt 'saunawhore', 'cumTits'	
+				act 'Continue':gt 'saunawhore', 'cumTits'
 			end
 		else
 			cumRand = rand(1, 9)
 			if cumRand <= 2:
 				'He nods, pulls out, and brings his cock up in front of your face.'
-				act 'Continue':gt 'saunawhore', 'cumFace'	
+				act 'Continue':gt 'saunawhore', 'cumFace'
 			elseif cumRand <= 4:
 				'He nods, pulls out, and brings his cock up in front of your face.'
-				act 'Continue':gt 'saunawhore', 'cumMouth'	
+				act 'Continue':gt 'saunawhore', 'cumMouth'
 			elseif cumRand <= 6:
 				'He nods, pulls out, and holds his cock over your body.'
-				act 'Continue':gt 'saunawhore', 'cumBelly'	
+				act 'Continue':gt 'saunawhore', 'cumBelly'
 			elseif cumRand <= 8:
 				'He nods, pulls out, and holds his cock over your body.'
 				act 'Continue':gt 'saunawhore', 'cumTits'
 			else
 				'He shakes his head and says "Sorry, I can''t stop now!" and you realize he''s going to cum in you anyway!'
 				act 'Continue':gt 'saunawhore', 'cumVaginal'
-			end	
+			end
 		end
 	end
 end
@@ -622,7 +622,7 @@ end
 
 if $ARGS[0] = 'cumBelly':
 	'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/cumBelly'+rand(1, 5)+'.mp4"></video></center>'
-	if useCondom = 1:	
+	if useCondom = 1:
 		'The client strips the condom from his dick and shoots <<$cumType>> cum all over your belly.'
 	else
 		'The client finishes himself off and shoots <<$cumType>> cum all over your belly.'
@@ -725,8 +725,8 @@ if $ARGS[0] = 'bdsmclient':
 
 							gs 'arousal', 'end'
 							gs 'stat'
-							
-							act 'Head back to the main area':gt 'saunawork'
+
+							act 'Head back to the main area':gt 'saunawhore', 'saunawork'
 						end
 					end
 				end
@@ -753,21 +753,353 @@ if $ARGS[0] = 'clientLeave':
 	if workDolg > 0:
 		workDolg -= payment
 		'Having finished with you, the client gets dressed, leaves the room, and pays the sauna <<payment>> <b>₽</b> for your services.'
-		
+
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		act 'Head back to the main area':gt 'saunawork'
+		act 'Head back to the main area':gt 'saunawhore', 'saunawork'
 	else
 		money += payment
 		'Having finished with you, the client gets dressed, takes his wallet and hands you <<payment>> <b>₽</b>.'
-		
+
 		gs 'arousal', 'end'
 		gs 'stat'
-		
-		act 'Take the money and see him out':gt 'saunawork'
+
+		act 'Take the money and see him out':gt 'saunawhore', 'saunawork'
+	end
+end
+
+!! saunawork start ---------------------------------------------------------------------------------
+
+if $ARGS[0] = 'saunawork':
+	$loc = 'saunawhore'
+	$metka = 'saunawork'
+	$locBroom = 'saunawhore'
+	$metkaBroom = 'saunawork'
+	$locM = 'saunawhore'
+	$metkaM = 'saunawork'
+	$location_type = 'public_indoors'
+	saunaYouRoom = 1
+
+	if paymamka = 0:paymamka = 300
+	if workDolg > 0:paymamka = 300
+	if workDolg <= 0:paymamka = 500
+
+	gs 'stat'
+	'<center><b><font color="maroon">Sauna</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sauna1.jpg"></center>'
+	''
+	'The sauna is open between 08:00 and 24:00. Only in that time customers can arrive.'
+	'All the walls are covered in <a href="exec:gt ''mirror'', ''start''">mirrors</a>.'
+
+	if saunaWorkNow = 1:
+		saunaWorkNow = 0
+		money -= paymamka
+		'Nurse cames to you and takes from you <<paymamka>> per customer.'
+	end
+
+	if money > 0 and workDolg > 0:workDolg -= money & money = 0
+	if workDolg > 0:'Your debt is <<workDolg>> <b>₽</b>'
+
+	gs 'stat'
+
+	if workDolg <= 0:act 'Leave':gt 'sauna'
+
+	act 'Go to your room':gt 'sauna', 'saunaroom'
+
+	act 'Use the staff bathroom':gt 'saunawhore', 'bathroom'
+
+	if workDolg > 0 and pcs_mood <= 10 or workDolg > 0 and SLomka > 0:
+		cls
+		workDolg += 1500
+		gs 'stat'
+		'You are beckoned by the nurse. "Hey, come here."'
+		'You go up to her and she demands your bared arm. You present your arm as required and she takes out a syringe filled with drugs. "Sit still, I''ll give you a shot now and it will make you feel like normal again."'
+
+		act 'Leave':StrongNarkota += 25 & SNarkTimes += 1 & minut += 10 & gt 'saunawhore', 'saunawork'
+
+		exit
+	end
+	if workDolg <= 0 and pcs_mood <= 50 and SaunaWhore > 0 and money >= 1000:
+		act 'Ask for some drugs (1000 <b>₽</b>)':
+			cls
+			gs 'stat'
+			'You are beckoned by the nurse. "OK, come here."'
+			'You go up to her and she asks for your bared arm. You present your arm and she takes out a syringe filled with drugs. "Sit still, I''ll give you a shot now and it will make you feel like normal again."'
+
+			act 'Leave':StrongNarkota += 25 & SNarkTimes += 1 & minut += 10 & gt 'saunawhore', 'saunawork'
+
+			exit
+		end
+	end
+
+	if cumcondslip > 0 and cumcondslip_aware > 0:
+		act 'Ask to see a doctor':
+			cla
+			*clr
+			minut += 25
+			'You explain how you feel nauseous and have pain in your pubic area.'
+			'The nurse checks you over and eventually comes to a conclusion.'
+			'"I think it might be toxic shock, we''ll have to get you sorted out. Wait here I''ll call the doctor."'
+			act 'Some time later':
+				cla
+				minut += 15
+				gs 'cum_cleanup', 'cleanloc', 17
+				cumcondslip = 0
+				gs 'stat'
+				'When he arrives the doctor quickly examines you, and establishes that you are suffering from toxic shock from a spent condom in your body.'
+				'"I removed it as soon as I found it. If you were feeling sick, it should slowly subside."'
+				'You reflexively thank the Doctor even though he''s visiting you in this place.'
+
+				act 'Return':gt 'saunawhore', 'saunawork'
+			end
+		end
+	end
+
+	if hour >= 8:
+		act 'Sit on the couch (1:00)':
+			if pcs_makeup > 1 and pcs_hairbsh = 1 and pcs_sweat < 26 and pcs_leghair <= 3 and pcs_pubes <= 3:
+				cls
+				minut += 60
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/saunawork.jpg"></center>'
+				'You spend an hour sitting on the couch waiting for customers.'
+
+				saunaWorkKlient = 0
+
+				if hour >= 21:
+					saunaWorkKlient = 1
+				elseif hour >= 16:
+					if rand(0, 100) >= 10:saunaWorkKlient = 1
+				elseif hour >= 12:
+					if rand(0, 100) >= 50:saunaWorkKlient = 1
+				elseif hour >= 8:
+					if rand(0, 100) >= 80:saunaWorkKlient = 1
+				end
+
+				if saunaWorkKlient = 1:
+					cls
+					gs 'stat'
+					'A client has arrived at the sauna, and the girls line up so that the customer can choose his favorite.'
+					'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/saunawhore.jpg"></center>'
+
+					if rand(0, 120) < pcs_apprnc:
+						'Client jabs a finger at you, "This one."'
+						act 'Go to the sauna with client':
+							saunaWorkKlient = 1
+							guy += 1
+							slutty += 1
+							SaunaWhore += 1
+							gt 'saunawhore', 'clientGate'
+						end
+					else
+						'The client examines you closely but turns away to chose another girl.'
+
+						act 'Continue':gt 'saunawhore', 'saunawork'
+					end
+				else
+					'The client chooses another girl and she leads him to one of the back rooms.'
+
+					act 'Continue':gt 'saunawhore', 'saunawork'
+				end
+			else
+				cla
+				'The brothel madam comes over to you and says, "Our customers expect you to be clean, shaven, made-up and with your hair looking nice. Go and sort yourself out, now!"'
+				act 'Leave':gt 'saunawhore', 'saunawork'
+			end
+		end
+	end
+
+	if clenerSauna ! daystart:
+		act 'Clean toilets (1:00)':
+			cla
+			*clr
+			minut += 60
+			clenerSauna = daystart
+			pcs_mood -= 25
+			workDolg -= 100
+			pcs_sweat += 30
+			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener2.jpg"></center>'
+			if workDolg > 0:
+				'You scrub the sauna toilets for an hour until they shine and reducing your debt by 100 <b>₽</b>.'
+				workDolg -= 100
+			else
+				'You scrub the sauna toilets for an hour until they shine. You get payed 100 <b>₽</b> for your hard work.'
+				money += 100
+			end
+
+			act 'Leave':gt 'saunawhore', 'saunawork'
+		end
+	end
+
+	if clenerSauna2 ! daystart:
+		act 'Scrub floors (1:00)':
+			cla
+			*clr
+			minut += 60
+			clenerSauna2 = daystart
+			pcs_mood -= 25
+			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener1.jpg"></center>'
+			if workDolg > 0:
+				'You spend an hour mopping and scrubbing all the floors and reducing your debt by 100 <b>₽</b>.'
+				workDolg -= 100
+			else
+				'You spend an hour mopping and scrubbing all the floors. You get payed 100 <b>₽</b> for your hard work.'
+				money += 100
+			end
+
+			pcs_sweat += 30
+
+
+			act 'Leave':gt 'saunawhore', 'saunawork'
+		end
 	end
+
+	if npc_QW['A113'] = 1 and workDolg <= 0 and belgangPay <= 0:
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
+		'As you enter the sauna you see a familiar face. It''s Vadim Bely standing there with his brother. "Good news little whore, you''ve finally paid off your debt. You''re free to do whatever you want now."'
+		'You look at him with hate-filled eyes, "Do you know what you put me through here? You''re the most despicable man I''ve ever met in my life."'
+		'Vadim starts laughing loudly, "Choose you words carefully girl. I''m still in control of your future, maybe you haven''t payed off your debt yet?"'
+		'Not wanting to escalate the situation, you look down on the floor, "I''m sorry. I should know my place."'
+		'"Good girl, now that you''re free wanna go party with us to celebrate your freedom?"'
+		act 'No, thanks':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
+			'"No, I''m sorry but I just want to go home... Maybe some other time."'
+			'Vadim looks at you with a serious look, "You''re lucky I''m in a good mood today. I''ll let it slide this time." he says laughing.'
+			'You quickly gather your stuff before he has a change of heart and step outside the sauna.'
+			npc_QW['A113'] = 2
+
+			act 'Leave':gt 'street'
+		end
+	end
+end
+
+if $ARGS[0] = 'bathroom':
+	$loc = 'saunawhore'
+	$metka = 'bathroom'
+	$locM = 'saunawhore'
+	$metkaM = 'bathroom'
+	minut += 2
+	$location_type = 'bathroom'
+	*clr & cla
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/shared/brothel/brothelShower.jpg"></center>'
+	''
+	'You enter the staff bathroom, which is usually cleaned by the girls that have only just started work here, voluntary or otherwise.'
+	'There is a <a href="exec:gt ''mirror'', ''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:GT ''mirror'',''brush''">brush</a>','brush') + ' your hair, a shower, toilet, and basin.'
+
+	act 'Return to foyer': gt 'saunawhore', 'saunawork'
+
+	act 'Take a shower (0:15)':
+		cls
+		dynamic $showerdin
+		'<center><h3>Staf Bathroom</h3></center>'
+		'<center><img <<$set_imgh>> src="images/locations/shared/brothel/brothelShower.jpg"></center>'
+		''
+		'After taking off all of your clothes, you gather up your towel, washcloth and soap, then head to the shower. You wash yourself thoroughly to be as clean as possible for potential customers.'
+		dynamic $brit
+		act 'Get out and dry off':gt $locM, $metkaM
+	end
+	$saunabrit = {
+		cls
+		if workDolg > 0:
+			'There are a handful of cheap razors you can use. At least they don''t make you pay for them, but only because they don''t know who has used which blades.'
+		else
+			'You rinse the razor blade. It will be good for another <<stanok>> uses.'
+		end
+
+		if pcs_pubes > 3 or pcs_leghair > 3:
+			act 'Shave legs and pussy (0:20)':
+				cla
+				*clr
+				minut += 20
+				pcs_leghair = 0
+				pcs_pubes = 0
+				pcs_horny += 10
+				if workDolg = 0:stanok -= 1
+				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
+				'You lathered up and shaved your legs and pussy. Afterwards, you run your hands over your lower body to make sure its nice and smooth which makes you feel a bit horny.'
+
+				act 'Get out and get dressed':gt 'saunawhore', 'saunawork'
+			end
+		end
+
+		if pcs_leghair > 3:
+			act 'Shave your legs (0:15)':
+				cla
+				*clr
+				minut += 15
+				pcs_leghair = 0
+				if workDolg = 0:stanok -= 1
+				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave.jpg"></center>'
+				'You lathered up and shaved your legs.'
+
+				act 'Rinse razor':dynamic $saunabrit
+			end
+		end
+
+		if pcs_pubes > 3:
+			act 'Shave your pussy (0:15)':
+				cla
+				*clr
+				minut += 15
+				pcs_pubes = 0
+				pcs_horny += 10
+				if workDolg = 0:stanok -= 1
+				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
+				'You lathered up and shaved your pussy. Afterwards, you run your hands over your lower body to make sure its nice and smooth which makes you feel a bit horny.'
+
+				act 'Rinse razor':dynamic $saunabrit
+			end
+		end
+
+		act 'Get out and get dressed':gt 'saunawhore', 'saunawork'
+	}
+	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
+
+	if workdolg > 0:
+		if (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprok = 0 and isprokp = 0:
+			act 'Buy and use a tampon (0:05)':
+				cla
+				*clr
+				isprok = 1
+				minut += 5
+				pcs_mood -= 5
+				workDolg += 10
+	
+				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash3.jpg"></center>'
+				'You use a tampon, it will add another 10 <b>₽</b> to your debt, but the alternative is unpleasant.'
+	
+				act 'Finish':gt $locM, $metkaM
+			end
+		end
+	elseif workdolg = 0:
+		dynamic $tampon
+	end
+	
+	dynamic $quickwash
+	dynamic $bteeth
+	dynamic $basin
 end
 
---- saunawhore ---------------------------------
+--- saunaWhore ---------------------------------
 

+ 0 - 319
locations/saunawork

@@ -1,319 +0,0 @@
-# saunawork
-
-$metka = ''
-$loc = 'saunawork'
-$metkaBroom = ''
-$locBroom = 'saunawork'
-$metkaM = ''
-$locM = 'saunawork'
-$location_type = 'public_indoors'
-saunaYouRoom = 1
-
-if paymamka = 0:paymamka = 300
-if workDolg > 0:paymamka = 300
-if workDolg <= 0:paymamka = 500
-
-gs 'stat'
-'<center><b><font color="maroon">Sauna</font></b></center>'
-'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sauna1.jpg"></center>'
-'The sauna is open between 08:00 and 24:00. Only in that time customers can arrive.'
-'All the walls are covered in <a href="exec:gt ''mirror'', ''start''">mirrors</a>.'
-
-if saunaWorkNow = 1:
-	saunaWorkNow = 0
-	money -= paymamka
-	'Nurse cames to you and takes from you <<paymamka>> per customer.'
-end
-
-if money > 0 and workDolg > 0:workDolg -= money & money = 0
-if workDolg > 0:'Your debt is <<workDolg>> <b>₽</b>'
-
-gs 'stat'
-
-if workDolg <= 0:act 'Leave':gt 'sauna'
-if workDolg > 0:act 'Go to your room':gt 'saunaroom'
-
-if workDolg > 0 and pcs_mood <= 10 or workDolg > 0 and SLomka > 0:
-	cls
-	workDolg += 1500
-	gs 'stat'
-	'You are beckoned by the nurse. "Hey, come here."'
-	'You go up to her and she demands your bared arm. You present your arm as required and she takes out a syringe filled with drugs. "Sit still, I''ll give you a shot now and it will make you feel like normal again."'
-
-	act 'Leave':StrongNarkota += 25 & SNarkTimes += 1 & minut += 10 & gt 'saunawork'
-
-	exit
-end
-
-if cumcondslip > 0 and cumcondslip_aware > 0:
-	act 'Ask to see a doctor':
-		cla
-		*clr
-		minut += 25
-		'You explain how you feel nauseous and have pain in your pubic area.'
-		'The nurse checks you over and eventually comes to a conclusion.'
-		'"I think it might be toxic shock, we''ll have to get you sorted out. Wait here I''ll call the doctor."'
-		act 'Some time later':
-			cla
-			minut += 15
-			gs 'cum_cleanup', 'cleanloc', 17
-			cumcondslip = 0
-			gs 'stat'
-			'When he arrives the doctor quickly examines you, and establishes that you are suffering from toxic shock from a spent condom in your body.'
-			'"I removed it as soon as I found it. If you were feeling sick, it should slowly subside."'
-			'You reflexively thank the Doctor even though he''s visiting you in this place.'
-
-			act 'Return':gt 'saunawork'
-		end
-	end
-end
-
-if hour >= 8:
-    act 'Sit on the couch (1:00)':
-    	if pcs_makeup > 1 and pcs_hairbsh = 1 and pcs_sweat < 26 and pcs_leghair <= 3 and pcs_pubes <= 3:
-    		cls
-    		minut += 60
-    		gs 'stat'
-    		'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/saunawork.jpg"></center>'
-    		'You spend an hour sitting on the couch waiting for customers.'
-    
-    		saunaWorkKlient = 0
-
-    		if hour >= 21:
-    			saunaWorkKlient = 1
-    		elseif hour >= 16:
-    			if rand(0, 100) >= 10:saunaWorkKlient = 1
-    		elseif hour >= 12:
-    			if rand(0, 100) >= 50:saunaWorkKlient = 1
-    		elseif hour >= 8:
-    			if rand(0, 100) >= 80:saunaWorkKlient = 1
-    		end
-    
-    		if saunaWorkKlient = 1:
-    			cls
-    			gs 'stat'
-    			'A client has arrived at the sauna, and the girls line up so that the customer can choose his favorite.'
-    			'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/saunawhore.jpg"></center>'
-    
-    			if rand(0, 120) < pcs_apprnc:
-	    			'Client jabs a finger at you, "This one."'
-	    			act 'Go to the sauna with client':
-    					saunaWorkKlient = 1
-    					guy += 1
-	    				slutty += 1
-    					SaunaWhore += 1
-    					gt 'saunawhore', 'clientGate'
-	    			end
-    			else
-    				'The client examines you closely but turns away to chose another girl.'
-    
-    				act 'Continue':gt 'saunawork'
-    			end
-    		else
-    			'The client chooses another girl and she leads him to one of the back rooms.'
-    
-    			act 'Continue':gt 'saunawork'
-    		end
-    	else
-	    	cla
-	    	'The brothel madam comes over to you and says, "Our customers expect you to be clean, shaven, made-up and with your hair looking nice. Go and sort yourself out, now!"'
-    		act 'Leave':gt 'saunawork'
-    	end
-    end
-end
-
-if clenerSauna ! daystart:
-	act 'Clean toilets (1:00)':
-		cla
-		*clr
-		minut += 60
-		clenerSauna = daystart
-		pcs_mood -= 25
-		workDolg -= 100
-		pcs_sweat += 30
-		'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener2.jpg"></center>'
-		if workDolg > 0:
-		    'You scrub the sauna toilets for an hour until they shine and reducing your debt by 100 <b>₽</b>.'
-		    workDolg -= 100
-		else
-		    'You scrub the sauna toilets for an hour until they shine. You get payed 100 <b>₽</b> for your hard work.'
-		    money += 100
-		end
-		
-		act 'Leave':gt 'saunawork'
-	end
-end
-
-if clenerSauna2 ! daystart:
-	act 'Scrub floors (1:00)':
-		cla
-		*clr
-		minut += 60
-		clenerSauna2 = daystart
-		pcs_mood -= 25
-		'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener1.jpg"></center>'
-		if workDolg > 0:
-		    'You spend an hour mopping and scrubbing all the floors and reducing your debt by 100 <b>₽</b>.'
-		    workDolg -= 100
-		else
-		    'You spend an hour mopping and scrubbing all the floors. You get payed 100 <b>₽</b> for your hard work.'
-		    money += 100
-		end
-		
-		pcs_sweat += 30
-
-
-		act 'Leave':gt 'saunawork'
-	end
-end
-
-
-act 'Take a shower (0:15)':
-	cla
-	*clr
-	minut += 15
-	pcs_horny += 1
-	pcs_hairbsh = 0
-	pcs_makeup = 1
-	dynamic $showerdin
-
-	if frost > 0:frost = 0
-
-	'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
-	'You go into the bathroom and turn on the shower. Lather your body and wash it off in the shower.'
-
-	if pcs_leghair > 3 or pcs_pubes > 3:
-		act 'Get razor':dynamic $saunabrit
-	end
-
-	if pcs_horny >= 90:
-		act 'Use the shower head on your pussy':
-			cla
-			*clr
-			if pcs_exhibition < 30:exhibition_exp += rand(1,3)
-			pcs_mood += 15
-			pcs_willpwr += 15
-			'<center><video autoplay loop src="images/shared/home/bathroom/wash2.mp4"></video></center>'
-			'You turn the shower head on your pussy and let the jet of warm water caress you. Soon you feel like a warm wave covers your entire body and you begin to shudder in orgasm.'
-
-			$orgasm_or = 'yes'
-			gs 'arousal', 'masturbate', 30
-			gs 'arousal', 'end'
-			gs 'stat'
-			
-			act 'Get out and get dressed':gt 'saunawork'
-		end
-	elseif pcs_horny >= 40 and pcs_horny < 90:
-		act 'Use the shower head on your pussy':
-			cla
-			*clr
-			pcs_mood += 10
-			pcs_willpwr += 10
-			'<center><video autoplay loop src="images/shared/home/bathroom/wash2.mp4"></video></center>'
-			'You turn the shower head on your pussy and let the jet of warm water caress you. First you find this very nice, but after a while, it gets a little painful. You realise this is pointless and stop masturbating.'
-
-			gs 'arousal', 'masturbate', 30
-			gs 'arousal', 'end'
-			gs 'stat'
-			
-			act 'Get out and get dressed':gt 'saunawork'
-		end
-	end
-
-	act 'Get out and get dressed':gt 'saunawork'
-end
-
-$saunabrit = {
-	cls
-	if workDolg > 0:
-		'There are a handful of cheap razors you can use. At least they don''t make you pay for them, but only because they don''t know who has used which blades.'
-	else
-		'You rinse the razor blade. It will be good for another <<stanok>> uses.'
-	end
-
-	if pcs_pubes > 3 or pcs_leghair > 3:
-		act 'Shave legs and pussy (0:20)':
-			cla
-			*clr
-			minut += 20
-			pcs_leghair = 0
-			pcs_pubes = 0
-			pcs_horny += 10
-			if workDolg = 0:stanok -= 1
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
-			'You lathered up and shaved your legs and pussy. Afterwards, you run your hands over your lower body to make sure its nice and smooth which makes you feel a bit horny.'
-
-			act 'Get out and get dressed':gt 'saunawork'
-		end
-	end
-
-	if pcs_leghair > 3:
-		act 'Shave your legs (0:15)':
-			cla
-			*clr
-			minut += 15
-			pcs_leghair = 0
-			if workDolg = 0:stanok -= 1
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave.jpg"></center>'
-			'You lathered up and shaved your legs.'
-
-			act 'Rinse razor':dynamic $saunabrit
-		end
-	end
-
-	if pcs_pubes > 3:
-		act 'Shave your pussy (0:15)':
-			cla
-			*clr
-			minut += 15
-			pcs_pubes = 0
-			pcs_horny += 10
-			if workDolg = 0:stanok -= 1
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
-			'You lathered up and shaved your pussy. Afterwards, you run your hands over your lower body to make sure its nice and smooth which makes you feel a bit horny.'
-
-			act 'Rinse razor':dynamic $saunabrit
-		end
-	end
-
-	act 'Get out and get dressed':gt 'saunawork'
-}
-
-if mesec > 0 and isprok = 0 and workdolg > 0:
-	act 'Use a tampon (0:05)':
-		cla
-		*clr
-		isprok = 1
-		minut += 5
-		pcs_mood -= 5
-		workDolg += 10
-
-		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash3.jpg"></center>'
-		'You use a tampon, it will add another 10 <b>₽</b> to your debt, but the alternative is unpleasant.'
-
-		act 'Finish':gt $locM, $metkaM
-	end
-end
-
-if npc_QW['A113'] = 1 and workDolg <= 0 and belgangPay <= 0:
-	cla & *clr
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
-	'As you enter the sauna you see a familiar face. It''s Vadim Bely standing there with his brother. "Good news little whore, you''ve finally paid off your debt. You''re free to do whatever you want now."'
-	'You look at him with hate-filled eyes, "Do you know what you put me through here? You''re the most despicable man I''ve ever met in my life."'
-	'Vadim starts laughing loudly, "Choose you words carefully girl. I''m still in control of your future, maybe you haven''t payed off your debt yet?"'
-	'Not wanting to escalate the situation, you look down on the floor, "I''m sorry. I should know my place."'
-	'"Good girl, now that you''re free wanna go party with us to celebrate your freedom?"'
-	act 'No, thanks':
-		cla & *clr
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
-		'"No, I''m sorry but I just want to go home... Maybe some other time."'
-		'Vadim looks at you with a serious look, "You''re lucky I''m in a good mood today. I''ll let it slide this time." he says laughing.'
-		'You quickly gather your stuff before he has a change of heart and step outside the sauna.'
-		npc_QW['A113'] = 2
-			
-		act 'Leave':gt 'street'
-	end
-end
-
---- saunawork ---------------------------------
-

+ 1 - 1
locations/sewing

@@ -29,7 +29,7 @@ if $ARGS[0] = 'start':
 		cla & *clr
 		if tkan < 1:
 			'	You do not have any material to sew anything. You should buy some from the supermarket.'
-			act'. . .':gt 'sewing','start'
+			act'Continue':gt 'sewing','start'
 		else
 			sew_trinket_success = rand(1,240)
 			tkan -= 1

+ 2 - 16
locations/sexshop

@@ -665,28 +665,14 @@ if $ARGS[0] = 'toi':
 	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/publictoilet.jpg"></center>'
 	''
 
+	act 'Leave the toilet':gt 'sexshop', 'podval'
+	
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
-	if (cumloc[6] = 1 or cumloc[7] = 1):
-		act 'Wipe the cum off your clothes (0:10)':
-			cla
-			*clr
-			cumspclnt = 6
-			gs 'cum_cleanup'
-			minut += 10
-			!!'<center><img <<$set_imgh>> src="images/shared/sex/cum/frotsp.jpg"></center>'
-			'You remove traces of cum from your clothes.'
-
-			act 'Leave':gt 'sexshop', 'toi'
-		end
-	end
-
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-
-	act 'Leave the toilet':gt 'sexshop', 'podval'
 end
 
 if $ARGS[0] = 'pip':

+ 63 - 62
locations/shop

@@ -28,7 +28,7 @@ if $shoplocation = 'main':
 	end
 
 	'In the hall stands an <a href="exec:$shoplocation = ''ATM'' & gt ''shop'', ''move''">ATM</a>, from which you can withdraw money from your bank account.'
-	'There is a branch of communication giants <a href="exec:$shoplocation = ''megafon'' & gt ''shop'', ''move''">Bullhorn</a>.'
+	'There is a branch of communication giants <a href="exec:$shoplocation = ''megafon'' & gt ''shop'', ''move''">MegaFon</a>.'
 	'On the other side is on the wall <a href="exec: gs ''noticeboard'',''start''">Public notice board</a>, where you can check various private and official advertisement.'
 	'<br>Most of the space in the supermarket is taken up by the <a href="exec:$shoplocation = ''grocery'' & gt ''shop'', ''move''">grocery department</a>, but the store has many smaller departments as well. <a href="exec:$shoplocation=''cosmetics'' & gt ''shop'', ''move''">Cosmetics</a>, <a href="exec:$shoplocation = ''hardware'' & gt ''shop'', ''move''">hardware</a>, <a href="exec:$shoplocation = ''clothing'' & gt ''shop'', ''move''">clothing</a> and the department of <a href="exec:$shoplocation = ''tech'' & gt ''shop'', ''move''">household appliances</a>. Not far from the entrance is a <a href="exec:$shoplocation = ''icecream'' & gt ''shop'', ''move''">counter selling ice cream</a>.'
 	clr
@@ -144,7 +144,7 @@ end
 if $shoplocation = 'ATM':
 	'<center><b><font color="maroon">ATM</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/store/atm.jpg"></center>'
-	
+
 	if bankAccount = 1:
 		if karta >= 0:
 			'You have <<karta>> <b>₽</b> in your account.'
@@ -153,14 +153,14 @@ if $shoplocation = 'ATM':
 			'You are overdrawn by <font color="red"><<-1 * karta>> <b>₽</b></font>.'
 			'You have a remaining credit limit of <font color="blue"><<bankDebtLimit + karta>></font>!'
 		end
-		
+
 		'<br>ATM Deposit Fee: 100 <b>₽</b>'
-		
+
 		if atmDeposit = 0:
 			act 'Deposit money':
 				cla
 				minut += 5
-				
+
 				kartaINATM = input ("How much money you want to deposit into the account? Note: A service charge of 100 <b>₽</b> will be deducted from the amount deposited.")
 				if kartaINATM < 100 or kartaINATM > money:
 					'This is not a valid input.'
@@ -171,19 +171,19 @@ if $shoplocation = 'ATM':
 					'<br>You deposited <<kartaINATM>> <b>₽</b> into your account.'
 					'It will take 2 days for funds to be available. Your new balance will be <<karta+atmDeposit>>  <b>₽</b>.'
 				end
-				
+
 				gs 'stat'
 				act 'Move away': gt 'shop'
 			end
 		else
 			'<br>★ Processing deposit of <<atmDeposit>> <b>₽</b> in <<atmDepositDate - daystart>> days.'
 		end
-		
+
 		if karta + bankDebtLimit > 0:
 			act 'Withdraw money from the ATM':
 				cla
 				minut += 5
-				
+
 				kartaOUT = input ("How much money you want to withdraw?")
 				if kartaOUT <= 0 or kartaOUT > karta + bankDebtLimit:
 					'<br>Invalid operation.'
@@ -198,7 +198,7 @@ if $shoplocation = 'ATM':
 						'<br>You withdraw <<kartaOUT>> <b>₽</b>. <font color="red">Your bank account is overdrawn by <b><<karta>> ₽</b>.</font>'
 					end
 				end
-				
+
 				gs 'stat'
 				act 'Move away': gt 'shop'
 			end
@@ -208,7 +208,7 @@ if $shoplocation = 'ATM':
 	else
 		'You don''t have a bank account yet!'
 	end
-	
+
 	act 'Move away':gt 'shop', 'start'
 end
 
@@ -233,18 +233,18 @@ if $shoplocation = 'grocery':
 		killvar '$message'
 	else
 		''
-	end	
-	*pl '<center><table align="center" width=80%>' 
-	*P FUNC ('$stock_item', 1, 'Regular food', 80, 'eda', $CURLOC) 
-	*P FUNC ('$stock_item', 10, 'Regular food', 800, 'eda', $CURLOC) 
-	*P FUNC ('$stock_item', 1, 'Diet food', 300, 'edaD', $CURLOC) 
-	*P FUNC ('$stock_item', 10, 'Diet food', 3000, 'edaD', $CURLOC) 
+	end
+	*pl '<center><table align="center" width=80%>'
+	*P FUNC ('$stock_item', 1, 'Regular food', 80, 'eda', $CURLOC)
+	*P FUNC ('$stock_item', 10, 'Regular food', 800, 'eda', $CURLOC)
+	*P FUNC ('$stock_item', 1, 'Diet food', 300, 'edaD', $CURLOC)
+	*P FUNC ('$stock_item', 10, 'Diet food', 3000, 'edaD', $CURLOC)
 	*P FUNC ('$stock_item', 10, 'Tea biscuits', 400, 'pranik', $CURLOC)
-	*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Bottle of water', 100, 'bottle', $CURLOC), '<tr><td></td><td>Bottle of water</td><td colspan=2>You need a handbag</td><td>for 50 <b>₽</b></td></tr>') 
-	*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Sandwich', 100, 'buterbrod', $CURLOC), '<tr><td></td><td>Sandwich</td><td colspan=2>You need a handbag</td><td>for 100 <b>₽</b></td></tr>') 
-	*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Cheap Bottle of wine', 200, 'wine', $CURLOC), '<tr><td></td><td>Bottle of wine</td><td colspan=2>You need a handbag</td><td>for 500 <b>₽</b></td></tr>') 
-	!!*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Average Bottle of wine', 500, 'wine', $CURLOC), '<tr><td></td><td>Bottle of wine</td><td colspan=2>You need a handbag</td><td>for 500 <b>₽</b></td></tr>') 
-	!!*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Quality Bottle of wine', 1000, 'wine', $CURLOC), '<tr><td></td><td>Bottle of wine</td><td colspan=2>You need a handbag</td><td>for 500 <b>₽</b></td></tr>') 
+	*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Bottle of water', 100, 'bottle', $CURLOC), '<tr><td></td><td>Bottle of water</td><td colspan=2>You need a handbag</td><td>for 50 <b>₽</b></td></tr>')
+	*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Sandwich', 100, 'buterbrod', $CURLOC), '<tr><td></td><td>Sandwich</td><td colspan=2>You need a handbag</td><td>for 100 <b>₽</b></td></tr>')
+	*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Cheap Bottle of wine', 200, 'wine', $CURLOC), '<tr><td></td><td>Bottle of wine</td><td colspan=2>You need a handbag</td><td>for 500 <b>₽</b></td></tr>')
+	!!*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Average Bottle of wine', 500, 'wine', $CURLOC), '<tr><td></td><td>Bottle of wine</td><td colspan=2>You need a handbag</td><td>for 500 <b>₽</b></td></tr>')
+	!!*P iif(bag > 0, FUNC ('$single_stock_item', 1, 'Quality Bottle of wine', 1000, 'wine', $CURLOC), '<tr><td></td><td>Bottle of wine</td><td colspan=2>You need a handbag</td><td>for 500 <b>₽</b></td></tr>')
 	*P '</table></center>'
 	gs 'stat'
 	if night_mode = 1:
@@ -282,17 +282,17 @@ if $shoplocation= 'cosmetics':
 		killvar '$message'
 	else
 		''
-	end	
-	*pl '<center><table align="center" width=80%>' 
-	*P FUNC ('$stock_item', 50, 'Cosmetics', 1300, 'kosmetica', $CURLOC) 
+	end
+	*pl '<center><table align="center" width=80%>'
+	*P FUNC ('$stock_item', 50, 'Cosmetics', 1300, 'kosmetica', $CURLOC)
 	*P FUNC ('$stock_item', 10, 'Plain false lashes', 1500, 'falselashesplain',$CURLOC)
 	*P FUNC ('$stock_item', 3, 'Mink false lashes', 900, 'falselashesmink',$CURLOC)
-	*P FUNC ('$stock_item', 10, 'Razors', 1000, 'stanok', $CURLOC) 
-	*P FUNC ('$stock_item', 20, 'Sunblock', 500, 'krem', $CURLOC) 
-	*P FUNC ('$stock_item', 20, 'Tampons', 200, 'tampon', $CURLOC) 
-	*P FUNC ('$stock_item', 20, 'Sanitary napkins', 100, 'sanpad', $CURLOC) 
-	*P FUNC ('$stock_item', 30, 'Shampoo', 250, 'shampoo', $CURLOC) 
-	*P FUNC ('$stock_item', 10, 'Hair scrunchies', 80, 'hscrunch', $CURLOC) 
+	*P FUNC ('$stock_item', 10, 'Razors', 1000, 'stanok', $CURLOC)
+	*P FUNC ('$stock_item', 20, 'Sunblock', 500, 'krem', $CURLOC)
+	*P FUNC ('$stock_item', 20, 'Tampons', 200, 'tampon', $CURLOC)
+	*P FUNC ('$stock_item', 20, 'Sanitary napkins', 100, 'sanpad', $CURLOC)
+	*P FUNC ('$stock_item', 30, 'Shampoo', 250, 'shampoo', $CURLOC)
+	*P FUNC ('$stock_item', 10, 'Hair scrunchies', 80, 'hscrunch', $CURLOC)
 	*P FUNC ('$stock_item', 12, 'Hair pins', 100, 'hpingrip', $CURLOC)
 	*P FUNC ('$stock_item', 10, 'Wipes', 50, 'salfetka', $CURLOC, '', iif(bag > 0, 0, 1), 'You need a handbag')
 	*P FUNC ('$stock_item', 10, 'Portable makeup', 700, 'kosmetitka', $CURLOC, '', iif(bag > 0, 0, 1), 'You need a handbag')
@@ -338,14 +338,14 @@ if $shoplocation = 'hardware':
 		killvar '$message'
 	else
 		''
-	end	
-	*pl '<center><table align="center" width=80%>' 
-	*P FUNC ('$stock_item', 20, 'Dishwashing detergent', 500, 'fairy', $CURLOC) 
-	*P FUNC ('$stock_item', 30, 'Clothing detergent', 500, 'poroshok', $CURLOC) 
-	*P FUNC ('$stock_item', 5, 'Plates', 450, 'cltarelka', $CURLOC) 
+	end
+	*pl '<center><table align="center" width=80%>'
+	*P FUNC ('$stock_item', 20, 'Dishwashing detergent', 500, 'fairy', $CURLOC)
+	*P FUNC ('$stock_item', 30, 'Clothing detergent', 500, 'poroshok', $CURLOC)
+	*P FUNC ('$stock_item', 5, 'Plates', 450, 'cltarelka', $CURLOC)
 	*P '</table></center>'
 	*nl
-	
+
 	gs 'stat'
 	if night_mode = 1:
 		fcolor = rgb(255, 255, 255)
@@ -358,8 +358,8 @@ if $shoplocation = 'hardware':
 	end
 
 	act 'Leave the hardware department':gt 'shop', 'start'
-	
-	 if sewing_kit = 0 and money >= 500:
+
+	if sewing_kit = 0 and money >= 500:
 		act'Buy sewing kit for 500 <b>₽</b>':
 		cla & *clr
 		sewing_kit = 1
@@ -368,27 +368,28 @@ if $shoplocation = 'hardware':
 			act'Move away from the counter':gt'shop'
 		end
 	end
-		
-	
- 'On the counter you can see that the fabric is suitable for sewing. It''s sold in large squares with each square costing 50 <b>₽</b>.'
- if tkan <= 0:'You have <<tkan>> squares of fabric.'
- if tkan > 0:'You have <<tkan>> squares of fabric.'
-	 if money >= 50:
-		 act'Buy fabric':
-		 cls
-		 portion = input ("How much do you want to buy?")
-		 if portion <= 0:portion = 1
-		 if portion*50 > money:'You do not have enough money.'
-			 if portion*50 <= money:
+
+
+	'On the counter you can see fabric suitable for sewing. It''s sold in large squares costing 50 <b>₽</b> each.'
+	if tkan <= 0:'You have <<tkan>> squares of fabric.'
+	if tkan > 0:'You have <<tkan>> squares of fabric.'
+
+	if money >= 50:
+		act'Buy fabric':
+		cls
+		portion = input ("How much do you want to buy?")
+		if portion <= 0:portion = 1
+		if portion*50 > money:'You do not have enough money.'
+			if portion*50 <= money:
 				tkan += portion
 				money = money - portion*50
 				'<center><img <<$set_imgh>> src="images/locations/shared/store/kassa.jpg"></center>'
 				'You paid the cashier and bought cloth.'
-			 end
+			end
 			gs'stat'
-		 act 'Move away from the counter':gt'shop'
-		 end
-	 end	
+		act 'Move away from the counter':gt'shop'
+		end
+	end
 end
 
 !! Women''s clothing
@@ -411,7 +412,7 @@ if $shoplocation = 'clothing':
 			killvar '$message'
 		else
 			''
-		end	
+		end
 		'Women''s clothing at unbeatable prices, panties and bras 300<b>₽</b> each'
 		gs 'stat'
 		if night_mode = 1:
@@ -425,9 +426,9 @@ if $shoplocation = 'clothing':
 		end
 
 		act 'Leave the women''s clothing department':gt 'shop', 'start'
-		
+
 		act 'View clothes': $shoplocation = 'clothing1' & gt 'shop'
-		
+
 		act 'View underwear': $shoplocation = 'underwear' & gt 'shop'
 
 		if konki!1:
@@ -574,15 +575,15 @@ if $shoplocation = 'tech':
 		killvar '$message'
 	else
 		''
-	end	
-	*pl '<center><table align="center" width=80%>' 
+	end
+	*pl '<center><table align="center" width=80%>'
 	*P FUNC ('$single_stock_item', 1, 'Small TV', 15000, 'TV', $CURLOC, '', iif(home_owned[1] > 0 or home_owned[3] > 0 or home_owned[4] = 1 or home_owned[5] > 2, 0, 1), 'You need your own home')
 	*P FUNC ('$single_stock_item', 2, 'Large Plasma TV', 30000, 'TV', $CURLOC, '', iif(home_owned[1] > 0 or home_owned[3] > 0 or home_owned[4] = 1 or home_owned[5] > 2, 0, 1), 'You need your own home')
 	*P FUNC ('$single_stock_item', 1, 'Computer', 40000, 'komp', $CURLOC)
 	*p FUNC ('$single_stock_item', 1, 'Computer game Dead Sunset', 800, 'GameCD2', $CURLOC, '', iif(komp > 0, 0, 1), 'You need a computer')
 	*P FUNC ('$single_stock_item', 1, 'Dishwasher', 28000, 'posudomashina', $CURLOC, '', iif(home_owned[1] > 0 or home_owned[3] > 0 or home_owned[4] = 1 or home_owned[5] > 2, 0, 1), 'You need your own home')
 	*P FUNC ('$single_stock_item', 1, 'Washing machine', 30000, 'stiralka', $CURLOC, '', iif(home_owned[1] > 0 or home_owned[3] > 0 or home_owned[4] = 1 or home_owned[5] > 2, 0, 1), 'You need your own home')
-	*P FUNC ('$single_stock_item', 1, 'Camera', 20000, 'zenit', $CURLOC) 
+	*P FUNC ('$single_stock_item', 1, 'Camera', 20000, 'zenit', $CURLOC)
 	*P FUNC ('$single_stock_item', 1, 'Mini camera disguised as a cigarette pack', 100000, 'minifoto', $CURLOC)
 	*P FUNC ('$single_stock_item', 1, 'Webcam', 2000, 'webcamera', $CURLOC, '', iif((npc_rel['A11']>=30 and webcamera = 0) or (camwhore = 1 and webcamera = 0), 0, 1), 'You have no use this')
 	*P '</table></center>'
@@ -631,7 +632,7 @@ if $shoplocation = 'megafon':
 	minut+=3
 	gs'stat'
 	i = 0
-	'<center><b><font color = maroon>Salon connection Megaphone</font></B></center>'
+	'<center><b><font color = maroon>MegaFon shop</font></B></center>'
 	'<center><img src="images/system/phone/megafon2.jpg" ></center>'
 
 	*pl '<center><table align="center">'
@@ -667,7 +668,7 @@ if $shoplocation = 'megafon':
 	'</table></center>'
 
 
-	act 'Exit Department':gt'shop','start'
+	act 'Return to the Supermarket':gt'shop','start'
 
 	if money > 0:
 		act 'Put the money on the phone':

+ 74 - 26
locations/shopdacha

@@ -12,8 +12,7 @@ else
 end
 '<center><b><font color="maroon">Ilyich and Biryukov construction</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/shared/store/shopdacha.jpg"></center>'
-'In this storefront office you can buy a cottage in a cooperative and upgrade it.'
-'You can also buy land for mansion for 1.5 million and all the many construction projects required to build and upgrade it.'
+'In this storefront office you can upgrade your existing properties, or start a new construction project upon any land you may own.'
 'All payments must be made from you bank account. Current balance - <<karta>> <b>₽</b>.'
 
 act 'Leave': minut += 3 & gt 'torgcentr'
@@ -21,20 +20,82 @@ act 'Leave': minut += 3 & gt 'torgcentr'
 if hour < 8 or hour > 20:
 	'Shop closed.'
 else
-	if karta + bankDebtLimit >= 150000 and home_owned[3] = 0:
-		act 'Buy a cottage (150,000 <b>₽</b>)':
-			cls
-			karta -= 150000
-			home_owned[3] = 1
-			minut += 15
-			etoexhib = 0
-			gs 'stat'
-			'You bought a house with a garden in the dacha cooperative 5km from the city on highway to Pavlovsk.'
+	if karta + bankDebtLimit >= 50000 and home_owned[1] = 2:
+		if rembedr = 0:
+			act 'Renovate city apartment bedroom (50,000 <b>₽</b>)':
+				cla
+				if karta + bankDebtLimit >= 50000:
+					rembedr = 1
+					karta -= 50000
+					'You have upgraded your apartment bedroom'
+				else
+					'Unfortunately, you do not have enough money in your bank account.'
+				end
+
+				act 'Return':gt 'shopdacha'
+			end
+		end
 
-			act 'Return': gt 'shopdacha'
+		if remsitr = 0:
+			act 'Renovate city apartment living room (50,000 <b>₽</b>)':
+				cla
+				if karta + bankDebtLimit >= 50000:
+					remsitr = 1
+					karta -= 50000
+					'You have upgraded your apartment living room'
+				else
+					'Unfortunately, you do not have enough money in your bank account.'
+				end
+
+				act 'Return':gt 'shopdacha'
+			end
+		end
+
+		if remkorr = 0:
+			act 'Renovate city apartment hallway (50,000 <b>₽</b>)':
+				cla
+				if karta + bankDebtLimit >= 50000:
+					remkorr = 1
+					karta -= 50000
+					'You have upgraded your apartment hallway'
+				else
+					'Unfortunately, you do not have enough money in your bank account.'
+				end
+
+				act 'Return':gt 'shopdacha'
+			end
+		end
+
+		if remvanr = 0:
+			act 'Renovate city apartment bathroom (50,000 <b>₽</b>)':
+				cla
+				if karta + bankDebtLimit >= 50000:
+					remvanr = 1
+					karta -= 50000
+					'You have upgraded your apartment bathroom'
+				else
+					'Unfortunately, you do not have enough money in your bank account.'
+				end
+
+				act 'Return':gt 'shopdacha'
+			end
 		end
-	end
 
+		if remkuhr = 0:
+			act 'Renovate city apartment kitchen (50,000 <b>₽</b>)':
+				cla
+				if karta + bankDebtLimit >= 50000:
+					remkuhr = 1
+					karta -= 50000
+					'You have upgraded your apartment kitchen'
+				else
+					'Unfortunately, you do not have enough money in your bank account.'
+				end
+
+				act 'Return':gt 'shopdacha'
+			end
+		end
+	end
 	if karta + bankDebtLimit >= 200000 and home_owned[3] = 1:
 		act 'Upgrade your cottage (200,000 <b>₽</b>)':
 			cls
@@ -47,19 +108,6 @@ else
 		end
 	end
 
-	if karta + bankDebtLimit >= 1500000 and home_owned[5] = 0:
-		act 'Buy land for Mansion (1,500,000 <b>₽</b>)':
-			cls
-			karta -= 1500000
-			home_owned[5] = 1
-			minut += 5
-			gs 'stat'
-			'You have bought land for Mansion.'
-
-			act 'Return': gt 'shopdacha'
-		end
-	end
-
 	if karta + bankDebtLimit >= 500000 and home_owned[5] = 1:
 		act 'Connect water, electricity (500,000 <b>₽</b>)':
 			cls

+ 1 - 1
locations/shulgahall

@@ -24,7 +24,7 @@ if $ARGS[0] = '':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/korr.jpg"></center>'
 
 	if momslut >= 1 and sexev_momgg_count > 0:
-		if hour < 23 and ((week < 6 and hour >= 15) or (week >= 6 and hour >= 10)):
+		if indorf = 0 and hour < 23 and ((week < 6 and hour >= 15) or (week >= 6 and hour >= 10)):
 			if RAND(1,100) <= 3:
 				'You hear some strange sounds, coming from uncle Sergey''s room. You could go <a href="exec: gt ''shulgahall'',''shulga_home_momgg1''">see</a> what''s causing them.'
 			elseif RAND(4,100) <= 6:

+ 2 - 36
locations/sitrPar

@@ -21,7 +21,8 @@ end
 '<center><b><font color="maroon">Living Room</font></b></center>'
 ! WD: Correct Image path ~ "images/qwest/alter/<<$loc>>.jpg"
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/sitrpar.jpg"></center>'
-'The living room has a <a href="exec:gt ''TV'',''pav''">TV</a>, which is near the window. In front of the TV is a sofa bed, on which your brother sleeps at night. A large tapestry covers one wall, while the other wall has several shelves on it, stocked with books and other things.'
+''
+'The living room has a <a href="exec:gt ''TV'',''pav''">TV</a>, which is near the window. In front of the TV is a <a href="exec:gt ''family'',''sofa''">sofa bed</a>, on which your brother sleeps at night. A large tapestry covers one wall, while the other wall has several shelves on it, stocked with books and other things.'
 gs 'family'
 gs 'subkid'
 
@@ -70,40 +71,5 @@ elseif month = 1 and day = 1:
 	end
 end
 
-if $ARGS[0]='sofa':
-	$metka = 'sofa'
-	$loc = 'sitrPar'
-	*clr & cla
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/sofa.jpg"></center>'
-	'<center>A small sofa bed, when not unfolded, is just big enough for you to curl up on and take a nap.</center>'
-
-	act 'Watch TV':gt 'TV','pav'
-
-	if pornMagazine > 0:'<br>There is a porn magazine under the sofa cushions'
-
-	gs 'events', 'read_porn'
-	gs 'events', 'read'
-
-	if pcs_horny >= 50:
-		act 'Masturbate':gt 'selfplay', 'start'
-	end
-
-	act 'Take a nap (1:00)':
-		if pcs_sleep < 90:
-			pcs_sleep += 10
-			pcs_health += 5
-			minut += 60
-			gs 'stat'
-			'You sleep about an hour.'
-		else
-			minut += 5
-			gs 'stat'
-			'You are not tired enough to sleep, even for a short nap.'
-		end
-	end
-	act 'Get up':gt 'sitrPar'
-end
-
 --- sitrPar ---------------------------------
 

+ 13 - 13
locations/soba

@@ -69,7 +69,7 @@ if $ARGS[0] = 'polactdog':
 
 		act '....':
 			cls
-			gs 'cum_call', '', $namesob, 1, 0, -1, 60
+			gs 'cum_call', '', 'A191', 1, 0, -1, 60
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/beast/zoo/vag2.jpg"></center>'
 			'You push your ass higher and rest his paws on the ground, becoming more comfortable for the males dick. Your pussy greedily swallows every centimeter of this member, milking him, squeezing along the entire length. Your Pussy burns and drips with love juice, some of it tricklomg down his thighs and dripping to the ground. The thrusts of the dog became more violent and stronger. Soon he began to growl and you began to push your ass into his penis, trying to swallow more of it. Your pussy walls squeeze as his cock grows inside, and he drives his cock to the balls. His unit expands in your pussy, pushing against your wall, his knot tightly binding you together. The dog begins to escape but the member is firmly stuck in your pussy. You squeeze it tight at the base, determined not to be released until it pumps his bitch full of sperm. You scream when the sperm finally hits, filling your throbbing pussy completely, his thick, hot sperm is warm inside you. His member spent and throbbing in your depths, your pussy milking him of his semen, sucking in every last drop. Cum begins to flow down your legs trickling down your thighs. You are completely filled with his sperm. The dog struggles and moves around but you stay pressed together for a few minutes with his knot in his prize. Eventually his knot loosens and you are released from him. You fall to the ground, the dogs thick spunk flowing out of your pussy and pooling around you on the ground'
@@ -96,7 +96,7 @@ if $ARGS[0] = 'polactdog':
 
 		act '....':
 			cls
-			gs 'cum_call', 'anus', $namesob, 1, 0, -1, 60
+			gs 'cum_call', 'anus', 'A191', 1, 0, -1, 60
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/beast/zoo/anal2.jpg"></center>'
 			'You feel it as he starts spewing his liquid inside your ass. Having stood in the positiong for a few minutes, but the ball on his penis doesn''t decrease and the bored dog begins to pull out of your anus growling. In pain you started yelling, feeling like his huge cock will rip your anus in two. There is a distinctive "schlpop!" sound as his cock pops out of your ass, which gushes sperm mixed with secretions from your anus down your belly.'
@@ -194,7 +194,7 @@ if $ARGS[0] = 'gamedog':
 			act 'Take it':
 				cla
 				*clr
-				gs 'cum_call', 'face', $namesob, 1, 0, -1, 60
+				gs 'cum_call', 'face', 'A191', 1, 0, -1, 60
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/beast/zoo/9.jpg"></center>'
 				'My sexy dog completes with a powerful ejaculation, which blasts all over your face, getting a few drops in your mouth.'
@@ -317,7 +317,7 @@ if $ARGS[0] = 'hardcoredog':
 										act 'Take me to Nivarna <<$namesob>>':
 											cla
 											*clr
-											gs 'cum_call', '', $namesob, 1, 0, -1, 60
+											gs 'cum_call', '', 'A191', 1, 0, -1, 60
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/beast/zoo/spa7.jpg"></center>'
 											'You clung to the dog and he starts cumming inside you.'
@@ -452,7 +452,7 @@ end
 if $ARGS[0] = 'cumshot2':
 	cla
 	*clr
-	gs 'cum_call', '', $namesob, 1, 0, -1, 60
+	gs 'cum_call', '', 'A191', 1, 0, -1, 60
 	'<center><img <<$set_imgh>> src="images/beast/zoo/zoof8.jpg"></center>'
 	'<<$namesob>> discharges into your vagina, you stick together with the dog passionately'
 
@@ -472,7 +472,7 @@ if $ARGS[0] = 'cumshot1':
 	cla
 	*clr
 	swallow += 1
-	gs 'cum_call', 'mouth', $namesob, 1, 0, -1, 60
+	gs 'cum_call', 'mouth', 'A191', 1, 0, -1, 60
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/beast/zoo/zoof11.jpg"></center>'
@@ -493,7 +493,7 @@ end
 if $ARGS[0] = 'zoof14':
 	cla
 	*clr
-	gs 'cum_call', '', $namesob, 1, 0, -1, 60
+	gs 'cum_call', '', 'A191', 1, 0, -1, 60
 	'<center><img <<$set_imgh>> src="images/beast/zoo/yl4.jpg"></center>'
 	'You take the hold of <<$namesob>>s cock and start to fuck yourself with it.'
 
@@ -512,7 +512,7 @@ end
 if $ARGS[0] = 'zoof15':
 	cla
 	*clr
-	gs 'cum_call', '', $namesob, 1, 0, -1, 60
+	gs 'cum_call', '', 'A191', 1, 0, -1, 60
 	pcs_vag += 3
 	'<center><img <<$set_imgh>> src="images/beast/zoo/yl5.jpg"></center>'
 	'You turn your back on <<$namesob>>, he jumps on you and starts to fuck you.'
@@ -581,7 +581,7 @@ if $ARGS[0] = 'zoof27':
 	act 'Undress and play lady dog':
 		cla
 		*clr
-		gs 'cum_call', '', $namesob, 1, 0, -1, 60
+		gs 'cum_call', '', 'A191', 1, 0, -1, 60
 		'<center><img <<$set_imgh>> src="images/beast/zoo/kuh.jpg"></center>'
 		'You assume the position, doggy ​​jumps on you and starts fucking.'
 		'It doesn''t take for <<$namesob>> to cum inside you.'
@@ -666,7 +666,7 @@ end
 if $ARGS[0] = 'dogcancerstyle':
 	cla
 	*clr
-	gs 'cum_call', '', $namesob, 1, 0, -1, 60
+	gs 'cum_call', '', 'A191', 1, 0, -1, 60
 	'<center><img <<$set_imgh>> src="images/beast/zoo/zal3.jpg"></center>'
 	'You get on all fours and your dog ​​jumps you and starts fucking your pussy.'
 	'It doesn''t take for <<$namesob>> to cum inside you.'
@@ -685,7 +685,7 @@ end
 if $ARGS[0] = 'dogmissionarystyle':
 	cla
 	*clr
-	gs 'cum_call', '', $namesob, 1, 0, -1, 60
+	gs 'cum_call', '', 'A191', 1, 0, -1, 60
 	'<center><img <<$set_imgh>> src="images/beast/zoo/zal2.jpg"></center>'
 	'You push yourself up on ti your feet, from this better angle <<$namesob>> easily finds his way into your pussy.'
 	'It doesn''t take for <<$namesob>> to cum inside you.'
@@ -754,7 +754,7 @@ if $ARGS[0] = 'dzoof1':
 						act 'Soothe Rex':
 							cla
 							*clr
-							gs 'cum_call', 'hands', 'Rex', 1, 0, -1, 60
+							gs 'cum_call', 'hands', 'A166', 1, 0, -1, 60
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/beast/zoo/dzoof3.jpg"></center>'
 							'You kneel down and begin to suck Rex, he quickly cums in your mouth.'
@@ -874,7 +874,7 @@ if $ARGS[0] = 'dzoof1':
 																	act 'Lick Sonia':
 																		cla
 																		*clr
-																		gs 'cum_call', '', 'Rex', 1, 0, -1, 60
+																		gs 'cum_call', '', 'A166', 1, 0, -1, 60
 																		money += RAND(30,60)
 																		gs 'stat'
 																		'<center><img <<$set_imgh>> src="images/beast/zoo/dzoof15.jpg"></center>'

+ 2 - 2
locations/stat

@@ -812,7 +812,7 @@ end
 if succubusflag = 1:
 	if pcs_energy < 0:
 		if salo >= 1:
-			salo -= 2
+			if cheatNoFat = 0: salo -= 2
 			pcs_energy += 8 + succublvl
 		else
 			pcs_energy += 8 + succublvl
@@ -853,7 +853,7 @@ if pcs_energy < 0:
 			salo = 1
 		end
 	elseif salo > 0:
-		salo -= 1
+		if cheatNoFat = 0: salo -= 1
 		pcs_energy += 8
 	end
 end

+ 27 - 27
locations/stat_display

@@ -487,30 +487,6 @@ killvar 'stat_extra_msg'
 
 
 !!----------------Extra messages, End--------------------------
-!! double with payment in cikl
-
-!! if home_owned[1] = 1 and ArendHouseSL <= 0:
-!! 	$stat_msg += '<br><font color="red"><b>The rent on your apartment is due today.</b></font>'
-!! 	if money >= 6000 or stolmoney >= 6000 or money + stolmoney >= 6000 or karta + bankDebtLimit >= 6000:
-!! 		$stat_msg += ' Renew with '
-!! 		if money >= 6000:
-!! 			$stat_msg += ' <a href="exec:money -= 6000 & home_owned[1] = 1 & ArendHouseSL += 30 & gs ''$menu_obnovit''">cash</a>'
-!! 		elseif stolmoney >= 6000:
-!! 			$stat_msg += ' <a href="exec:stolmoney -= 6000 & home_owned[1] = 1 & ArendHouseSL += 30 & gs ''$menu_obnovit''">cash from drawer</a>'
-!! 		elseif money + stolmoney >= 6000:
-!! 			!both < 6000, so money = money - 6000 + stolmoney
-!! 			$stat_msg += ' <a href="exec:money -= 6000 - stolmoney & stolmoney = 0 & home_owned[1] = 1 & ArendHouseSL += 30 & gs ''$menu_obnovit''">cash from purse and drawer</a>'
-!! 		end
-!! 		!from purse, drawer or both
-!! 		if karta >= 6000: 
-!! 			$stat_msg += ' <a href="exec:karta -= 6000 & home_owned[1] = 1 & ArendHouseSL += 30 & gs ''$menu_obnovit''">bank account</a>'
-!! 		elseif karta + bankDebtLimit >= 6000: 
-!! 			$stat_msg += ' <a href="exec:karta -= 6000 & home_owned[1] = 1 & ArendHouseSL += 30 & gs ''$menu_obnovit''">bank account, but you will be overdrawn.</a>'
-!! 		end	
-!! 	else
-!! 		$stat_msg += ' But you can''t afford to pay the rent.'
-!! 	end
-!! end
 
 if opPRE = 0: $stat_msg += '<BR><<$pcs_makeup>> and your hair is <<$pcs_hairbsh>>.' & !$stat_msg += '<BR>'
 
@@ -1141,13 +1117,37 @@ if young_shop_work = 1:
 		young_shop_miss += 1
 		$stat_msg += '<BR><b><font color="red">You missed work.</font></b>'
 	elseif (hour = 14 or hour = 13) and week < 6:
-		$stat_msg += '<BR><b><font color="red">By 15:00 you have to be at work in the shop Pussy-Cats.</font></b>'
+		$stat_msg += '<BR><b><font color="red">By 15:00 you have to be at Pussy-Cats to start work.</font></b>'
+	end
+end
+
+if young_shop_work1 = 1:
+	if hour = 9 and minut <= 5 and week >= 6 and inWorkYoungShop = 0:
+		'You are late for work at Pussy-Cats.'
+	elseif hour = 9 and week >= 6 and inWorkYoungShop = 0 and misscheck ! daystart:
+		misscheck = daystart
+		young_shop_miss += 1
+		$stat_msg += '<BR><b><font color="red">You missed work.</font></b>'
+	elseif (hour = 7 or hour = 8) and week >= 6:
+		$stat_msg += '<BR><b><font color="red">By 9:00 you have to be at Pussy-Cats to start work.</font></b>'
+	end
+end
+
+if young_shop_work2 = 1:
+	if hour = 9 and minut <= 5 and week < 6 and inWorkYoungShop = 0:
+		'You are late for work at Pussy-Cats.'
+	elseif hour = 9 and week < 6 and inWorkYoungShop = 0 and misscheck ! daystart:
+		misscheck = daystart
+		young_shop_miss += 1
+		$stat_msg += '<BR><b><font color="red">You missed work.</font></b>'
+	elseif (hour = 7 or hour = 8) and week < 6:
+		$stat_msg += '<BR><b><font color="red">By 9:00 you have to be at Pussy-Cats to start work.</font></b>'
 	end
 end
 
 if workrin = 1:
 	if week = 2 or week = 4 or week = 6:
-		if hour = 7:$stat_msg += '<BR><b><font color="red">At 8 c''clock you start work on the market.</font></b>'
+		if hour = 7:$stat_msg += '<BR><b><font color="red">At 8 o''clock you start work on the market.</font></b>'
 		if hour = 8:$stat_msg += '<BR><b><font color="red">You need to work on the market now.</font></b>'
 	end
 end
@@ -1279,7 +1279,7 @@ if pfilmday[0] > 0:
 end
 if pornmiss = 1: $stat_msg += '<br><b>You missed a scheduled porno shoot!</b>'
 if prodcosttrue > 0: $stat_msg += '<br><b>You owe to the porn studio <<prodcost>>?</b>'
-if firstkasting > 0 and pfilmNO < 1 and pornstack < 10: $stat_msg += '<br><b>You can contract to <<10-pornstack>> porno movie.</b>'
+if firstkasting > 0 and pfilmNO < 1: $stat_msg += '<br><b>You can contract '+iif(pornstack < 9,'up to <<10-pornstack>> porn shoots','<<10-pornstack>> porn shoot')+' at the Porn Studio.</b>'
 if hour < 22 and week >= 2 and week <= 4 and workKafe = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift at The Roadhouse cafe starting at 11:00.</font></b>'
 if hour < 17 and week < 5 and workSec >= 1 or hour < 17 and week < 5 and workSec = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift as a secretary at Titran-Express from 9:00 to 17:00</font></b>'
 if hour < 17 and week < 5 and PersSecWork = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift as a secretary at Diner Bystroeshka from 9:00 to 17:00</font></b>'

+ 3 - 2
locations/stat_sklattrib

@@ -82,17 +82,18 @@ $skl_name[29] = 'mdlng'
 $skl_name[30] = 'medcn'
 $skl_name[31] = 'heels'
 $skl_name[32] = 'pool'
+$skl_name[33] = 'inhib'
 
 !!Trait Section
 !!This is where Traits that will affect attribute or skill advancement or degradation have those aspects defined.
 !!Always put the trait name, variable name, and skill or attribute variable in a comment
 
-!!Natrual Dancer; Provides a 10% reduction in xp required to level dance skills
+!!Natural Dancer; Provides a 10% reduction in xp required to level dance skills
 nat_dancer[1] = 2 & nat_dancer[2] = 10 & nat_dancer[3] = -6 & nat_dancer[4] = 0
 nat_dancer[11] = 2 & nat_dancer[12] = 11 & nat_dancer[13] = -6 & nat_dancer[14] = 0
 nat_dancer[21] = 2 & nat_dancer[22] = 12 & nat_dancer[23] = -6 & nat_dancer[24] = 0
 
-!!Natrual Athlete; Provides a 10% reduction in xp required to level sports skills
+!!Natural Athlete; Provides a 10% reduction in xp required to level sports skills
 nat_athlete[1] = 2 & nat_athlete[2] = 17 & nat_athlete[3] = -6 & nat_athlete[4] = 0
 nat_athlete[11] = 2 & nat_athlete[12] = 18 & nat_athlete[13] = -6 & nat_athlete[14] = 0
 nat_athlete[21] = 2 & nat_athlete[22] = 19 & nat_athlete[23] = -6 & nat_athlete[24] = 0

+ 4 - 0
locations/stat_sklattrib_lvlset

@@ -168,6 +168,10 @@ heels[1] = 1 & heels[2] = 4 & heels[3] = 6 & heels[4] = -1
 pcs_pool = pool_lvl
 pool[1] = 3 & pool[2] = -1
 
+!! inhibition 
+pcs_inhib = inhib_lvl
+inhib[1] = 3 & inhib[2] = -1
+
 
 !!Skiing; Should be self-explanatory
 !!To add this skill, copy this "$skl_name[x] = 'skng'" to the end of the skils list above and replace the x with the next index number, then remove the comment and bracket marks on the next two lines and delete this line

+ 1 - 1
locations/street_event

@@ -574,7 +574,7 @@ if $ARGS[1] = 'main':
 						gs 'stat'
 						'You are at the sauna. The brutes drag you into a room and start to explain. "You''re going to live here and work until you have cleared your debt. Got it? Try to contact the authorities or escape, we''ll put a bullet in your head and bury you in the woods, understand?"'
 						'You become frightened as they''re convincing, so you just nod.'
-						act 'Look around':gt 'saunaroom'
+						act 'Look around':gt 'sauna', 'saunaroom'
 					end
 				end
 			end

+ 1 - 1
locations/succubus

@@ -252,7 +252,7 @@ if $ARGS[0] = 'tatianaask':
 	minut += 10
 	'<center><img <<$set_imgh>> src="images/pre/shared/karinpre.jpg"></center>'
 	if sucpcinfo >= 4 and ARGS[1] = 0:
-		'"You are a Succubus. Now, the succubae are not demons that impression is a byproduct of the masking spell; they are instead a type of Fae, like that Fairy you told me about, and they are native to this plain of existence. As Fae, Succubae have nothing to do with "souls", but they do feed on the energy released during sex. The most efficient means of getting this energy is semen taken internally, but a lot is gained by lesbian orgasm if the Succubus is in sexual contact with the woman as she cums."'
+		'"You are a Succubus. Now, the succubae are not demons that impression is a byproduct of the masking spell; they are instead a type of Fae, like that Fairy you told me about, and they are native to this plane of existence. As Fae, Succubae have nothing to do with "souls", but they do feed on the energy released during sex. The most efficient means of getting this energy is semen taken internally, but a lot is gained by lesbian orgasm if the Succubus is in sexual contact with the woman as she cums."'
 		if tatisucsex ! 0:
 			'She then gives you a coy smile and says, "I can tell you that sex with a willing Succubus is an <i>amazing experience</i>."'
 		else

+ 4 - 4
locations/talent_agency

@@ -148,7 +148,7 @@ if $ARGS[0] = 'SMTV':
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/down.jpg"></center>'
 							'"Move out?" you ask, trying to stay away from the windows as much as possible. "Where are we going?"'
 							'Mr. Yanovich starts the car and says to you, "This is not an ideal location to shoot. We have a particular street in mind so we''re going to go there."'
-							act'. . .':
+							act'Continue':
 								minut += 45
 								*clr
 								cla
@@ -236,7 +236,7 @@ if $ARGS[0] = 'SMTV':
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/down.jpg"></center>'
 							'"Move out?" you ask. "Where are we going?"'
 							'Mr. Yanovich starts the car and says to you, "This is not an ideal location to shoot. We have a particular street in mind so we''re going to go there."'
-							act'. . .':
+							act'Continue':
 								minut += 45
 								*clr
 								cla
@@ -334,7 +334,7 @@ if $ARGS[0] = 'SMTV':
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/down.jpg"></center>'
 						'"Move out?" you ask, trying to stay away from the windows as much as possible. "Where are we going?"'
 						'Mr. Yanovich starts the car and says to you, "This is not an ideal location to shoot. We have a particular street in mind so we''re going to go there."'
-						act'. . .':
+						act'Continue':
 							minut += 45
 							*clr
 							cla
@@ -422,7 +422,7 @@ if $ARGS[0] = 'SMTV':
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/down.jpg"></center>'
 						'"Move out?" you ask. "Where are we going?"'
 						'Mr. Yanovich starts the car and says to you, "This is not an ideal location to shoot. We have a particular street in mind so we''re going to go there."'
-						act'. . .':
+						act'Continue':
 							minut += 45
 							*clr
 							cla

+ 67 - 44
locations/telefon

@@ -180,9 +180,9 @@ if $ARGS[0] = 'callingTheLover' and loverGender[ARGS[1]] = 1:
 			gs 'telefon','telotkaz',$telsob
 		end
 	end
-	
+
 	act 'I think we should break up...':
-		cla 
+		cla
 		'She sounds hurt, but you insist it is for the best. You both say goodbye and part ways.'
 		gs 'lover', 'remove', lover_number
 
@@ -259,9 +259,9 @@ if $ARGS[0] = 'callingTheLover' and loverGender[ARGS[1]] = 0:
 			gs 'telefon','telotkaz',$loverdesc[lover_number]
 		end
 	end
-	
+
 	act 'I think we should break up...':
-		cla 
+		cla
 		'He sounds hurt, but you insist it is for the best. You both say goodbye and part ways.'
 		gs 'lover', 'remove', lover_number
 
@@ -400,9 +400,9 @@ if $ARGS[0] = 'lover' and loverGender[ARGS[1]] = 0:
 
 			act 'Hang up': gt 'telefon', 'fin'
 		end
-		
+
 		act 'I think we should break up...':
-			cla 
+			cla
 			'He sounds hurt, but you insist it is for the best. You both say goodbye and part ways.'
 			gs 'lover', 'remove', lover_number
 
@@ -471,9 +471,9 @@ if $ARGS[0] = 'lover' and loverGender[ARGS[1]] = 1:
 			if loverrelation[lover_number] > 0:'(<<$loverdesc[lover_number]>>) -  Okay, I''ll call tomorrow.'
 			act 'Hang up': gt 'telefon', 'fin'
 		end
-		
+
 		act 'I think we should break up...':
-			cla 
+			cla
 			'She sounds hurt, but you insist it is for the best. You both say goodbye and part ways.'
 			gs 'lover', 'remove', lover_number
 
@@ -555,9 +555,10 @@ if $ARGS[0] = 'Phone_megafon':
 	clr
 	pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
 	pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
-	pl'<center><font size=6>Bullhorn</font></center>'
-	pl'<center><img src="<<FUNC(''$phone_theme'')>>icon_megafon.png"><br></center>'
-	pl'<center><b>The balance in the account: </b><font size=5><i><font size=6><<balans>></font></i> <b>₽</b>.</center>.'
+	pl'<center><font size=6>MegaFon</font></center>'
+	pl'<center><img src="<<FUNC(''$phone_theme'')>>icon_megafon.png" height="80" width="80"><br></center>'
+	pl'<center><b>The balance in the account:</b>'
+	pl'<center><font size=5><<balans>> ₽.</font></center>'
 	pl'<center><a href="exec:gs ''telefon'', ''Phone_menu'' "><img src="images/system/icon/back.png"></a></center>'
 end &! --- Phone_megafon ---
 
@@ -567,7 +568,7 @@ if $ARGS[0] = 'Phone_contactlist':
 	pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
 	pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
 	pl '<center><font size=6>Contacts</font></center>'
-	pl '<center><img src="<<FUNC(''$phone_theme'')>>icon_call.png"><br></center>'
+	pl '<center><img src="<<FUNC(''$phone_theme'')>>icon_call.png" height="80" width="80"><br></center>'
 	if StoryLine = 1:pl'<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/phone/icons/icon_npc1.png"></TD><TD>Mum</TD><TD align="right"><a href="exec:gs ''telefon'', ''Phone_call'' "><b>Call</b></a></TD></TR></TABLE></center>'
 	if hour >= 8 and hour <= 19:
 		if telalla > 0:
@@ -605,7 +606,7 @@ if $ARGS[0] = 'Phone_contactlist':
 		if telkat > 0:
 			pl'<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/phone/icons/icon_kat.png"></TD><TD></TD><TD align="right"><a href="exec:$callerid = ''icon_kat'' & gs ''telefon'', ''phone_call_reject'' "><b>Call</b></a></TD></TR></TABLE></center>'
 		end
-		
+
 		!! iterating all lovers
 		lover_number = 0
 		:loverunavailableloop
@@ -623,7 +624,7 @@ if $ARGS[0] = 'Phone_contactlist':
 	dummyas = arrsize('$contact')
 :din_bad_as
 	dummyas -= 1
-	if dummyas >= 0: 
+	if dummyas >= 0:
 		pl '<<$contact[dummyas]>>'
 		jump 'din_bad_as'
 	end
@@ -639,7 +640,7 @@ if $ARGS[0] = 'Edit_Custom_list':
 	dummyas = arrsize('$contact')
 :din_bad_as1
 	dummyas -= 1
-	if dummyas >= 0: 
+	if dummyas >= 0:
 		$dummyedit = $contact[dummyas]
 		$dummyedit1 = dyneval('$result = ''</a><a href="exec:killvar ''''$contact'''',<<dummyas>> & gs ''''telefon'''', ''''Edit_Custom_list'''' "><b>Remove</b>'' ')
 		$dummyedit2 = $replace($dummyedit,'<b>Call</b>',$dummyedit1)
@@ -658,10 +659,15 @@ end &! --- Edit_Custom_list ---
 
 if $ARGS[0] = 'Phone_notebook':
 	clr
+	gs 'housing', 'rent'
+	pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
+	pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
 	pl'<center><font size=6>Planner</font></center>'
+	pl'<center><img src="<<FUNC(''$phone_theme'')>>icon_notebook.png" height="80" width="80"></center>'
 	pl'<center><<year>>-<<$month>>-<<day>>, <<$week[week]>><br></center>'
-	rent = -1
-	if BuyHous = 2 and ArendHouseSL > 0:rent = ArendHouseSL
+	rent1 = -1
+	if home_owned[1] > 0 and ArendHouseSL > 0:rent1 = ArendHouseSL
+	if home_owned[4] > 0 and ArendHouseSL4 > 0:rent4 = ArendHouseSL4
 	preg1 = pregtime
 	d1 = day
 	w1 = week
@@ -686,23 +692,23 @@ if $ARGS[0] = 'Phone_notebook':
 		if m1 = 6 and d1 = 12:$calendarday += $list + 'Russia Day'
 		if m1 = 6 and d1 = 13:$calendarday += $list + 'National holiday'
 		if m1 = 11 and d1 = 4:$calendarday += $list + 'Unity Day'
-		
+
 		if storyline = 1 and SchoolAtestat = 0:
 			if m1 = 1 and d1 = 1:$calendarday += $list + 'First day of Winter break.'
 			if m1 = 1 and d1 = 15:$calendarday += $list + 'Last day of Winter break.'
 			if m1 = 3 and d1 = 20:$calendarday += $list + 'First day of Spring break.'
 			if m1 = 3 and d1 = 26:$calendarday += $list + 'Last day of Spring break.'
-			if school_year = 2000 and y1 = 2017 and m1 = 5 and d1 = 25:$calendarday += $list + 'Graduation Day!'
-			if school_year = 2001 and y1 = 2018 and m1 = 6 and d1 = 1:$calendarday += $list + 'First day of Summer break.'
+			if school_year = 2003 and y1 = 2020 and m1 = 5 and d1 = 25:$calendarday += $list + 'Graduation Day!'
+			if school_year = 2004 and y1 = 2021 and m1 = 6 and d1 = 1:$calendarday += $list + 'First day of Summer break.'
 			if m1 = 8 and d1 = 31:$calendarday += $list + 'Last day of Summer break.'
 			if m1 = 11 and d1 = 4:$calendarday += $list + 'First day of Autumn break.'
 			if m1 = 11 and d1 = 11:$calendarday += $list + 'Last day of Autumn break.'
 		end
-		
+
 		if daynum >= lastmens+28 and daynum < lastmens+31:$calendarday += $list + '<font color=''red''><b>Menstruation!</b></font>'
 		if daynum >= lastmens+12 and daynum < lastmens+14:$calendarday += $list + '<font color=#336600><b>Ovulation!</b></font>'
 		if preg1 = 280:$calendarday += $list + '<font color=''red''><b>Birthing day!</b></font>'
-		
+
 		if w1 < 5 and (workSec >= 1 or PersSecWork = 1):$calendarday += $list + 'Working as a secretary. <i>(9:00 - 17:00)</i>'
 		if w1 < 5 and workFabrika = 1:
 			$calendarday += $list + 'Working as a seamstress. '
@@ -722,7 +728,8 @@ if $ARGS[0] = 'Phone_notebook':
 			end
 		end
 		if sisboyparty = 2 and sisboyparty_day+1 = daynum:$calendarday += $list + '<font color="orange">Party at Rex, gathering before 18:00 at Community Center</font>'
-		if rent = 0:$calendarday += $list + 'Rent on apartment expires!'
+		if rent1 = 0:$calendarday += $list + 'Rent on city apartment expires!'
+		if rent4 = 0:$calendarday += $list + 'Rent on Pushkin apartment expires!'
 		if birthday = d1 and birthmonth = m1:$calendarday += $list + 'My birthday!'
 		if kid > 0:
 			k1 = kid
@@ -730,26 +737,28 @@ if $ARGS[0] = 'Phone_notebook':
 				if daykid[k1] = d1 and monthkid[k1] = m1:$calendarday += $list + 'Birthday of my <<$polreb[k1]>> <<$kidname[k1]>>, my <<kid>>. baby!'
 			if k1 > 1:k1 -= 1 & jump 'kiddieloop'
 		end
-		
+
 		if $calendarday ! '':
 			p '<b><<$monthName[m1]>> <<d1>>, <<$week[w1]>>:</b>'
 			pl $calendarday
 		end
 	if i < 14:
 		preg1 += 1
-		rent -= 1
+		rent1 -= 1
+		rent4 -= 1
 		i += 1
 		w1 += 1
 		if w1 > 7:w1 = 1
 		d1 += 1
-		if monthsend[m1] < d1: 
+		if monthsend[m1] < d1:
 			m1 += 1 & d1 = 1
 			if m1 = 13: m1 = 1 & y1 += 1
 		end
 		jump 'pnotebook'
 	end
 	killvar 'calendarday'
-	killvar 'rent'
+	killvar 'rent1'
+	killvar 'rent4'
 	killvar 'preg1'
 	killvar 'd1'
 	killvar 'w1'
@@ -764,7 +773,7 @@ if $ARGS[0] = 'Phone_pictures':
 	pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
 	pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
 	pl'<center><font size=6>Gallery</font></center>'
-	pl'<center><img src="<<FUNC(''$phone_theme'')>>icon_pictures.png"><br></center>'
+	pl'<center><img src="<<FUNC(''$phone_theme'')>>icon_pictures.png" height="80" width="80"><br></center>'
 	if phone_selfie[1] = 1:pl'<a href="exec:view''images/system/phone/selfie/phone_selfie1.jpg''"><b>Selfie number1</b></a>'
 	if phone_selfie[2] = 1:pl'<a href="exec:view''images/system/phone/selfie/phone_selfie2.jpg''"><b>Selfie number2</b></a>'
 	if vanr_selfie[0] = 1:pl'<a href="exec:view''images/system/phone/selfie/bathroom/s (0).jpg''"><b>After shower selfie number1</b></a>'
@@ -839,20 +848,21 @@ if $ARGS[0] = 'Phone_camera':
 	pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
 	pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
 	pl'<center><font size=6>Camera</font></center>'
-	pl'<center><img src="<<FUNC(''$phone_theme'')>>icon_camera.png"><br></center>'
-	pl'<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''Phone_camera_selfie'' "><b>Take a selfie</b></a>' 
+	pl'<center><img src="<<FUNC(''$phone_theme'')>>icon_camera.png" height="80" width="80"><br></center>'
+	pl'<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''Phone_camera_selfie'' "><b>Take a selfie</b></a>'
 	pl'<center><a href="exec:gs ''telefon'', ''Phone_menu'' "><img src="images/system/icon/back.png"></a></center>'
 end &! --- Phone_camera ---
- 	 
 
-   
+
+
 if $ARGS[0] = 'Phone_wheather':
 	clr
 	pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
 	pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
 	pl'<center><font size=6>Weather</font></center>'
-	pl'<center><img src="<<FUNC(''$phone_theme'')>>icon_weather.png"><br></center>'
-	pl'<center><font size=6><b>Temperature: <<$temperature>>. <i><<$osadki>></i></b></font></center>'
+	pl'<center><img src="<<FUNC(''$phone_theme'')>>icon_weather.png" height="80" width="80"><br></center>'
+	pl'<center><b>Temperature:</b></center>'
+	pl'<center><<$temperature>>. <<$osadki>></center>'
 	pl'<center><a href="exec:gs ''telefon'', ''Phone_menu'' "><img src="images/system/icon/back.png"></a></center>'
 end &! --- Phone_wheather ---
 
@@ -861,27 +871,40 @@ if $ARGS[0] = 'Phone_calendar':
 	pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
 	pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
 	pl'<center><font size=6>Calendar</font></center>'
-	pl'<center><img src="<<FUNC(''$phone_theme'')>>icon_calendar.png"><br></center>'
-	pl'<center><B>Today: </B><font size=5><<$week[week]>>, <i><font size=6><<day>></font></i> <<$month>> <i><font size=6><<year>></font></i> year.</font></center>'
+	pl'<center><img src="<<FUNC(''$phone_theme'')>>icon_calendar.png" height="80" width="80"><br></center>'
+	pl'<center><B>Today:</B></center>'
+	pl'<center><<$week[week]>>, <<day>> <<$month>> <<year>></center>'
 	pl'<center><a href="exec:gs ''telefon'', ''Phone_menu'' "><img src="images/system/icon/back.png"></a></center>'
 end &! --- Phone_calendar ---
 
-if $ARGS[0] = 'Phone_noactive':
+if $ARGS[0] = 'Phone_media':
 	clr
 	pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
 	pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
-	pl'<center><font size=6>This option is not active</font></center>'
+	pl'<center><font size=6>Media</font></center>'
+	pl'<center><img src="<<FUNC(''$phone_theme'')>>icon_music.png" height="80" width="80"></center>'
+	pl'<center><b>This option is not active</b></center>'
 	pl'<center><a href="exec:gs ''telefon'', ''Phone_menu'' "><img src="images/system/icon/back.png"></a></center>'
-end &! --- Phone_noactive ---
+end &! --- Phone_media ---
+
+if $ARGS[0] = 'Phone_sms':
+	clr
+	pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
+	pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
+	pl'<center><font size=6>SMS</font></center>'
+	pl'<center><img src="<<FUNC(''$phone_theme'')>>icon_sms.png" height="80" width="80"></center>'
+	pl'<center><b>This option is not active</b></center>'
+	pl'<center><a href="exec:gs ''telefon'', ''Phone_menu'' "><img src="images/system/icon/back.png"></a></center>'
+end &! --- Phone_sms ---
 
 if $ARGS[0] = 'Phone_menu':
 	clr
 	pl'<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
 	pl'<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
-	pl'<center><a href="exec:gs ''telefon'', ''Phone_camera'' "><img src="<<FUNC(''$phone_theme'')>>icon_camera.png"></a><a href="exec:gs ''telefon'', ''Phone_calendar'' "><img src="<<FUNC(''$phone_theme'')>>icon_calendar.png"></a><a href="exec:gs ''telefon'', ''Phone_pictures'' "><img src="<<FUNC(''$phone_theme'')>>icon_pictures.png"></a></center>'
-	pl'<center><a href="exec:gs ''telefon'', ''Phone_noactive'' "><img src="<<FUNC(''$phone_theme'')>>icon_music.png"></a><a href="exec:gs ''Cheatmenu_din'' & Enable_settingmode = 1 & dynamic $cheatmenu[''display'']"><img src="<<FUNC(''$phone_theme'')>>icon_settings.png"></a><a href="exec:gs ''telefon'', ''Phone_wheather'' "><img src="<<FUNC(''$phone_theme'')>>icon_weather.png"></a></center>'
-	pl'<center><a href="exec:gs ''telefon'', ''Phone_contactlist'' "><img src="<<FUNC(''$phone_theme'')>>icon_call.png"></a><a href="exec:gs ''telefon'', ''Phone_noactive'' "><img src="<<FUNC(''$phone_theme'')>>icon_sms.png"></a><a href="exec:gs ''telefon'', ''Phone_megafon'' "><img src="<<FUNC(''$phone_theme'')>>icon_megafon.png"></a></center>'
-	pl'<center><a href="exec:gs ''telefon'', ''Phone_notebook'' "><img src="<<FUNC(''$phone_theme'')>>icon_notebook.png"></a></center>'
+	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>'
 end &! --- Phone_menu ---
 
@@ -924,7 +947,7 @@ if $ARGS[0] = 'setup':
 	$phonetheme_name[11] = 'Sports'
 	$phonetheme_name[12] = 'Succubus'
 	$phonetheme_name[13] = 'Woodshop'
-	
+
 	phonetheme[0] = 1
 end
 

+ 1 - 0
locations/version

@@ -5,6 +5,7 @@ act 'Return': gt 'start'
 
 
 '0.7.2'
+'- Mod plug in system, based on Provincial Girl system and adapted and reworked by illume'
 '- New options for knocking on Anushka''s door, and strapon events now open. - Blatte and nutluck'
 '- Dimka house was added with interaction with his mother and father and a slight rework of his story. So their is different ways to end up blackmailed by him. - Blatte and nutluck'
 '- Lay out changes in start and city from Akossi'

+ 1 - 1
locations/vokdin

@@ -4,7 +4,7 @@ $din_vokzalg_kabinet = {
 	cls
 	gs 'stat'
 	'When you walk past the station manager''s office, you notice a sign next to the door:'
-	'"Cleaner wanted! 2 hours per day at any time, salary 250 <b>₽</b>. Ask inside for more info."'
+	'"Cleaner wanted! 2 hours per day at any time, salary 130 <b>₽</b>. Ask inside for more info."'
 	'"Office opening hours : 08:00 - 17:00"'
 
 	act 'Return to the train station':minut += 1 & gt 'vokzalGin'

+ 3 - 16
locations/vokmantoiev

@@ -26,22 +26,9 @@ if $ARGS[0] = 'female':
 	'You open the door to the ladies'' room and go in.'
 
 	act 'Leave':minut += 1 & gt 'vokmantoiev', 'start'
-
-	act 'Look in the mirror':gt 'mirror', 'start'
-
-	if (cumloc[6] = 1 or cumloc[7] = 1):
-		act 'Wipe the cum off your clothes (0:10)':
-			cla
-			*clr
-			cumspclnt = 6
-			gs 'cum_cleanup'
-			minut += 10
-
-			'You wipe the cum off your clothes and thoroughly rinse out the stains with water.'
-
-			act 'Finish':gt 'vokmantoiev', 'female'
-		end
-	end
+	
+	act 'Look in the mirror': gt 'mirror', 'start'
+	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
 	dynamic $tampon
 	dynamic $quickwash

+ 3 - 17
locations/vokzaltoilet

@@ -25,26 +25,12 @@ end
 
 act 'Return to the station hall': minut += 1 & gt'vokzalholle'
 
-
-act 'Look in the mirror':gt 'mirror', 'start'
-
-if (cumloc[6] = 1 or cumloc[7] = 1):
-	act 'Wipe the cum off your clothes (0:10)':
-		cla
-		*clr
-		cumspclnt = 6
-		gs 'cum_cleanup'
-		minut += 10
-
-		'You wipe the cum off your clothes and thoroughly rinse out the stains with water.'
-
-		act 'Finish':gt 'vokzaltoilet'
-	end
-end
+act 'Look in the mirror': gt 'mirror', 'start'
+if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
 dynamic $tampon
 dynamic $quickwash
 dynamic $basin
-
+	
 --- vokzaltoilet ---------------------------------
 

+ 80 - 16
locations/wardrobe

@@ -122,19 +122,6 @@ if $ARGS[0] = 'default_entry_wear':
 	default_entry = ARGS[1]
 	
 	gs 'clothing_attributes', $defclothingtype[default_entry], defclothingnumber[default_entry]
-	if dyneval('RESULT = <<$defclothingtype[default_entry]>>[<<defclothingnumber[default_entry]>>]') = 0:
-		$defclothingtype[default_entry] = 'none' & defclothingnumber[default_entry] = 0
-	elseif dyneval('RESULT = <<$defclothingtype[default_entry]>>H[<<defclothingnumber[default_entry]>>]') <= 0 or CloExhibit > pcs_exhibition:
-		$defclothingtype[default_entry] = 'none' & defclothingnumber[default_entry] = 0
-	elseif $defclothingtype[default_entry] ! 'exercise' and $defclothingtype[default_entry] ! 'coat' and CloStyle ! 5:
-		!! if the hipsize is too far from your hipsize
-		dynamic 'RESULT = <<$defclothingtype[default_entry]>>B[<<defclothingnumber[default_entry]>>]'
-		if RESULT < pcs_hips - 8 or RESULT > pcs_hips + 8:
-			$defclothingtype[default_entry] = 'none' & defclothingnumber[default_entry] = 0
-		else
-			gs 'clothing', 'wear', $defclothingtype[default_entry], defclothingnumber[default_entry]
-		end
-	end
 	gs 'clothing', 'wear', $defclothingtype[default_entry], defclothingnumber[default_entry]
 
 	if dyneval('RESULT = <<$defbratype[default_entry]>>_bras[<<defbranumber[default_entry]>>]') = 0: $defbratype[default_entry] = 'none' & defbranumber[default_entry] = 0
@@ -161,9 +148,86 @@ if $ARGS[0] = 'default_entry_wear':
 
 	if dyneval('RESULT = coat[<<defcoat[default_entry]>>]') = 0: defcoat[default_entry] = 0
 	defaultcoat = defcoat[default_entry]
-
-	killvar 'default_entry'
-	gs 'stat'
+	
+	!! default school girl uniform is always allowed to be worn if still in school
+	if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and $defclothingtype[default_entry] = 'school' and defclothingnumber[default_entry] = 6:	
+		cls
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/dress.mp4"></video></center>'
+		'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
+		act 'Return to wardrobe':
+			killvar 'default_entry'
+			gs 'stat'
+			gt 'wardrobe', 'start'
+		end
+	!! do not own this clothing anymore
+	elseif dyneval('RESULT = <<$defclothingtype[default_entry]>>[<<defclothingnumber[default_entry]>>]') = 0:
+		cls
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/strip/strip2.jpg"></center>'
+		'As you go to pull your <<$def_clothing_name[default_entry]>> outfit out of your wardrobe you remember you don''t own that piece of clothing anymore. Maybe you should buy it again? Guess you will have to find something else to wear.'
+		act 'Return to wardrobe':
+			gs 'clothing', 'strip'
+			killvar 'default_entry'
+			gs 'stat'
+			gt 'wardrobe', 'start'
+		end
+	!! strength of clothing is less than or equal to 0
+	elseif dyneval('RESULT = <<$defclothingtype[default_entry]>>H[<<defclothingnumber[default_entry]>>]') <= 0:
+		cls
+		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/vicky/event/vika_game_strip16.mp4"></video></center>'
+		'Your <<$def_clothing_name[default_entry]>> outfit has worn out and can''t be used anymore. Guess you will have to find something else to wear.'
+		act 'Strip out of worn out clothing':
+			gs 'clothing', 'strip'
+			killvar 'default_entry'
+			gs 'stat'
+			gt 'wardrobe', 'start'
+		end
+	!! clothing exhibition is greater than player exhibition
+	elseif CloExhibit > pcs_exhibition:
+		cls
+		'<center><video autoplay loop src="images/locations/pavlovsk/trainstation/bimbo.strip6.mp4"></video></center>'
+		'You don''t feel daring enough to wear your <<$def_clothing_name[default_entry]>> outfit. Maybe you will be confident enough in the future? Guess you will have to find something else to wear.'
+		act 'Strip out of revealing clothing':
+			gs 'clothing', 'strip'
+			killvar 'default_entry'
+			gs 'stat'
+			gt 'wardrobe', 'start'
+		end
+	!! not exercise clothing, not coat, and not loose fitting
+	elseif $defclothingtype[default_entry] ! 'exercise' and $defclothingtype[default_entry] ! 'coat' and CloStyle ! 5:
+		!! check for if the hipsize is too far from your hipsize
+		dynamic 'RESULT = <<$defclothingtype[default_entry]>>B[<<defclothingnumber[default_entry]>>]'
+		if RESULT < pcs_hips - 8 or RESULT > pcs_hips + 8:
+			cls
+			iif(RESULT < pcs_hips - 8,'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>','<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/stripping1.mp4"></video></center>')
+			'As you put on your <<$def_clothing_name[default_entry]>> outfit you notice it doesn''t fit correctly anymore. It''s ' + iif(RESULT < pcs_hips - 8,'unbearably tight and uncomfortable to wear.','extremely loose and won''t stay in place no matter how hard you try.') + ' You must have ' + iif(RESULT < pcs_hips - 8,'gained','lost') + ' some weight since this was purchased or last tailored. You will have to get this clothing resized before you can wear it again.'
+			act 'Strip out of ill-fitting clothing':
+				gs 'clothing', 'strip'
+				killvar 'default_entry'
+				gs 'stat'
+				gt 'wardrobe', 'start'
+			end
+		!! clothing ok to wear after passing hip check
+		else
+			cls
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/dress.mp4"></video></center>'
+			'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
+			act 'Return to wardrobe':
+				killvar 'default_entry'
+				gs 'stat'
+				gt 'wardrobe', 'start'
+			end
+		end
+	!! clothing ok to wear without needing hip check and passing all other checks
+	else
+		cls
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/dress.mp4"></video></center>'
+		'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
+		act 'Return to wardrobe':
+			killvar 'default_entry'
+			gs 'stat'
+			gt 'wardrobe', 'start'
+		end
+	end
 end
 
 if $ARGS[0] = 'default_set':

+ 7 - 1
locations/young_shop

@@ -42,6 +42,8 @@ if $ARGS[0] = 'start':
 			young_shop_salary += 4
 			if hour < 16: minut += 60-minut
 			minut += 240
+			pcs_energy += 24
+			pcs_hydra += 48
 			gs 'stat'
 			'You spend 4 hours cleaning the department, folding and rehanging clothes and serving customers. The store now looks clean and pretty organized.'
 			gs 'young_shop', 'events'
@@ -53,17 +55,21 @@ if $ARGS[0] = 'start':
 			young_shop_salary += 6
 			if hour < 9: minut += 60-minut
 			minut += 360
+			pcs_energy += 40
+			pcs_hydra += 80
 			gs 'stat'
 			'You spend 6 hours cleaning the department, folding and rehanging clothes and serving customers. The store now looks clean and pretty organized.'
 			gs 'young_shop', 'events'
 		end
-!!	elseif ((hour = 9 and minut <= 5) or (hour = 8 and minut >= 30)) and young_shop_work1 = 1 and week > 6:
+!!	elseif ((hour = 9 and minut <= 5) or (hour = 8 and minut >= 30)) and young_shop_work2 = 1 and week > 6:
 !!		act '<b>Work</b>':
 !!			cla
 !!			inWorkYoungShop = 1
 !!			young_shop_salary += 6
 !!			if hour < 9: minut += 60-minut
 !!			minut += 360
+!!			pcs_energy += 40
+!!			pcs_hydra += 80
 !!			gs 'stat'
 !!			'You spend 6 hours cleaning the department, folding and rehanging clothes and serving customers. The store now looks clean and pretty organized.'
 !!			gs 'young_shop', 'events'

+ 2 - 16
locations/zaprF

@@ -109,28 +109,14 @@ if $ARGS[0] = 'toilet':
 	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/toilet.jpg"></center>'
 	'You are in a dirty gas station toilet. At least it provides some privacy.'
 
+	act 'Leave the restroom':gt 'zaprF', 'start'
+	
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
-	if (cumloc[6] = 1 or cumloc[7] = 1):
-		act 'Wipe the cum off your clothes (0:10)':
-			cla
-			*clr
-			cumspclnt = 6
-			gs 'cum_cleanup'
-			minut += 10
-			'<center><img <<$set_imgh>> src="images/shared/sex/cum/frotsp.jpg"></center>'
-			'You spend ten minutes wiping and rinsing the cum stains out of your clothes. In the end, all that remains of the stains are some damp spots that should dry up in a few minutes.'
-
-			act 'Continue':gt 'zaprF', 'toilet'
-		end
-	end
-
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-
-	act 'Leave the restroom':gt 'zaprF', 'start'
 end
 
 --- zaprF ---------------------------------

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