Browse Source

Merge branch 'master' of http://git.tfgamessite.com/KevinSmarts/girllife-ecv

Ekay 8 years ago
parent
commit
9b741400ee
100 changed files with 410 additions and 356 deletions
  1. 4 3
      glife.qproj
  2. 3 3
      locations/AlbFatherQW
  3. 1 1
      locations/AlbStarsEnd
  4. 1 1
      locations/BelSex
  5. 30 16
      locations/Cheatmenu_din
  6. 3 3
      locations/FedorEv
  7. 1 1
      locations/Gaddvor
  8. 1 1
      locations/Gadsarai
  9. 41 41
      locations/Gnpc2
  10. 1 1
      locations/Grinok
  11. 5 5
      locations/Gshveyfab
  12. 2 2
      locations/IgorEv
  13. 1 1
      locations/KatjaHome
  14. 1 1
      locations/KatjaHomeTalk
  15. 19 18
      locations/Komp
  16. 1 1
      locations/LBZhouse
  17. 1 1
      locations/LakeBoyZ
  18. 4 4
      locations/LariskaHome
  19. 2 2
      locations/LariskaStart
  20. 8 8
      locations/MHall
  21. 1 1
      locations/Meadow
  22. 1 1
      locations/MiroslavaHome
  23. 1 1
      locations/Nord
  24. 3 3
      locations/ParChurch
  25. 2 2
      locations/Prostitute
  26. 2 1
      locations/WorkHosp
  27. 2 2
      locations/albinahome
  28. 1 1
      locations/albinaporog
  29. 1 1
      locations/allea
  30. 1 1
      locations/altPRE
  31. 2 2
      locations/alterStart
  32. 5 3
      locations/andrey
  33. 1 1
      locations/annafrends
  34. 1 1
      locations/annafrends2
  35. 1 1
      locations/annafrendtoilet
  36. 6 6
      locations/artemEv
  37. 1 1
      locations/arturend
  38. 4 4
      locations/bank
  39. 2 2
      locations/barbershop
  40. 1 1
      locations/belgang
  41. 1 1
      locations/belpicknick
  42. 4 4
      locations/carF
  43. 3 1
      locations/clothing
  44. 13 13
      locations/clothing_QV
  45. 1 1
      locations/dachain
  46. 1 1
      locations/dachamy
  47. 1 1
      locations/dachaogr
  48. 1 1
      locations/dachaogr0
  49. 1 1
      locations/dachi
  50. 5 5
      locations/dibodi
  51. 4 4
      locations/dimaGoHome2
  52. 21 21
      locations/dimaHome
  53. 4 4
      locations/dimaRudeEv
  54. 1 1
      locations/din2
  55. 12 11
      locations/din_bad
  56. 1 1
      locations/din_pav
  57. 1 1
      locations/dinam
  58. 2 2
      locations/dom_gor
  59. 1 1
      locations/dort
  60. 1 1
      locations/down
  61. 1 1
      locations/dvor
  62. 1 1
      locations/dvorik
  63. 1 1
      locations/ender
  64. 3 3
      locations/etoexhib
  65. 1 1
      locations/fbDorm
  66. 1 1
      locations/fbDormD
  67. 1 1
      locations/fbHouse
  68. 2 2
      locations/furisex
  69. 1 1
      locations/gLakeNude
  70. 1 1
      locations/gadriver
  71. 1 1
      locations/gadukino
  72. 2 2
      locations/gaptek
  73. 2 2
      locations/garmassiv
  74. 2 2
      locations/gdk
  75. 44 25
      locations/gdksport
  76. 6 6
      locations/gevent
  77. 1 1
      locations/gkafe
  78. 4 4
      locations/glake
  79. 10 9
      locations/gopnik_house
  80. 2 2
      locations/gopskver
  81. 1 1
      locations/gpoli
  82. 2 2
      locations/graveyard
  83. 6 6
      locations/gschool
  84. 2 1
      locations/gschool2
  85. 6 6
      locations/gskver
  86. 8 0
      locations/indoors
  87. 14 14
      locations/katjaEv
  88. 7 7
      locations/katjaEvDin
  89. 1 1
      locations/katja_sex
  90. 4 4
      locations/korrPar
  91. 9 9
      locations/kotovSex
  92. 1 1
      locations/lake
  93. 1 1
      locations/lakecafe
  94. 1 1
      locations/liam
  95. 1 1
      locations/liamel
  96. 3 3
      locations/liames
  97. 5 2
      locations/loadg
  98. 1 1
      locations/locmansion
  99. 1 1
      locations/lug
  100. 1 1
      locations/luzhayka

+ 4 - 3
glife.qproj

@@ -63,7 +63,8 @@
       <Location name="din_van"/>
       <Location name="statBat"/>
       <Location name="statPRE"/>
-      <Location name="time"/>
+      <Location name="outdoors"/>
+      <Location name="indoors"/>
       <Location name="kid"/>
       <Location name="subkid"/>
       <Location name="din_pav"/>
@@ -357,8 +358,8 @@
       <Location name="zsoft_gopskverGorSlut"/>
     </Folder>
     <Folder name="Town">
-      <Location name="Pavresident"/>
-      <Location name="Pavcomercial"/>
+      <Location name="pavResidential"/>
+      <Location name="pavCommercial"/>
       <Location name="garmassiv"/>
       <Location name="gargazel"/>
       <Location name="garfather"/>

+ 3 - 3
locations/AlbFatherQW

@@ -14,7 +14,7 @@ $din_zajava_albfather = {
 			gs 'stat'
 			'You wrote and signed your statement to the captain. He then let you go without a fuss.'
 
-			act 'Escape.':gt 'Pavcomercial'
+			act 'Escape.':gt 'pavCommercial'
 		end
 	end
 }
@@ -35,7 +35,7 @@ $din_zajava_albfather_no2 = {
 			gs 'stat'
 			'You quickly dialed Albina''s number. In a harried tone you told her of the events that had just transpired. There was a short pause and Albina thanked you and hung up.'
 
-			act 'Escape':gt 'Pavcomercial'
+			act 'Escape':gt 'pavCommercial'
 		end
 	end
 }
@@ -64,7 +64,7 @@ $din_zajava_albfather_no = {
 }
 
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 'A car suddenly stops next to you. A man wearing a nice suit emerges from the vehicle. He introduces himself, "Captain Chernov. State Security Service," as he pulls out his liscence and badge. In surprise you blurt out, "Why are you here, what did I do, am I under arrest?" Captain Chernov asks you in a rhetorical manner, "You are <<$name>> <<$surname>>? Let''s step aside and have a friendly chitchat."'
 act 'Move with Chernov':
 	cls

+ 1 - 1
locations/AlbStarsEnd

@@ -8,7 +8,7 @@ Chernov = 10
 gs 'stat'
 'You walk down the street and see Albina Barlovskuyu. Near her, a van stops; people emerge from the vehicle running towards her. They restrain her face to the ground, hands behind her back before putting her in handcuffs. Albina is furious, but her face suddenly pales when she sees the warrant for her arrest and hears the accusations of running a brothel. After a thorough search she is put on her feet, shoved into a police car and whisked away.'
 
-act 'Leave':gt 'Pavresident'
+act 'Leave':gt 'pavResidential'
 
 --- AlbStarsEnd ---------------------------------
 

+ 1 - 1
locations/BelSex

@@ -145,7 +145,7 @@ if $ARGS[0] = '':
 				money += 500
 				gs'stat'
 				'<<$boy>> gives you 500 rubles and compliments you on a job well done. He then escorts you to the exit.'
-				act'Exit to the streets of Pavlovsky':gt'Pavresident'
+				act'Exit to the streets of Pavlovsky':gt'pavResidential'
 			end
 		end
 	end

+ 30 - 16
locations/Cheatmenu_din

@@ -100,6 +100,17 @@ $din_cheat_Health = {
 	end
 }
 
+$din_cheatPirate = {
+	if cheatPirate = 0:
+		cheatPirate = 1
+		dynamic $din_cheat_menu_permanent
+		exit
+	elseif cheatPirate = 1:
+		cheatPirate = 0
+		dynamic $din_cheat_menu_permanent
+	end
+}
+
 $din_cheat_age = {
 	age = input("How many years you are now?")
 	if age <= 15:age = 15
@@ -185,6 +196,8 @@ $din_cheat_menu_permanent = {
 	if cheatSlut = 1:$cheatSlut = '<b>YES</b>'
 	if cheatVib = 0:$cheatVib = 'NO'
 	if cheatVib = 1:$cheatVib = '<b>YES</b>'
+	if cheatpirate = 0:$cheatpirate = 'NO'
+	if cheatpirate = 1:$cheatpirate = '<b>YES</b>'
 
 	pl'<center><a href="exec:dynamic $objcheat_menu"><b>Cheat menu</b></a></center>'
 	pl''
@@ -204,6 +217,7 @@ $din_cheat_menu_permanent = {
 	pl'<a href="exec:alko = 7 & dynamic $din_cheat_menu_permanent">Strongly drunk</a>'
 	pl'<a href="exec:alko = 11 & dynamic $din_cheat_menu_permanent">Drunk in dyminu</a>'
 	pl'<a href="exec:dynamic $din_cheat_VibratorIn">Enable sleeping with vibrator inserted</a>: <<$cheatVib>>'
+	pl'<a href="exec:dynamic $din_cheatPirate">Pirate always horny</a>: <<$cheatpirate>>'
 	pl''
 	pl'<a href="exec:horny = 100 & dynamic $din_cheat_menu_permanent">Excite</a>'
 	pl'<a href="exec:horny = 0 & dynamic $din_cheat_menu_permanent">Soothe</a>'
@@ -836,7 +850,7 @@ $din_force_preg = {
 	preg = 1
 	cycle = 5
 	PregChem = 150
-	wombthfath = 'A sperm donor'
+	$wombthfath = 'A sperm donor'
 	babyembryo += 1
 	if fertegg = 0:
 		Nextbaby = arrsize('$ChildFath')
@@ -861,21 +875,21 @@ $din_force_preg = {
 
 $din_remove_preg = {
 	Nextbaby = arrsize('$ChildFath') - 1
-	killvar 'polkid[nextbaby]'
-	killvar '$kidname[nextbaby]'
-	killvar 'kidage[nextbaby]'
-	killvar 'daykid[nextbaby]'
-	killvar 'monthkid[nextbaby]'
-	killvar 'yearkid[nextbaby]'
-	killvar 'Babyptype[nextbaby]'
-	killvar '$ChildFath[nextbaby]'
-	killvar '$ChildThFath[nextbaby]'
-	killvar 'hairkid[nextbaby]'
-	killvar 'eyeskid[nextbaby]'
-	killvar 'ChildConType[nextbaby]'
-	killvar 'Babyptype[nextbaby]'
+	killvar 'polkid',nextbaby
+	killvar '$kidname',nextbaby
+	killvar 'kidage',nextbaby
+	killvar 'daykid',nextbaby
+	killvar 'monthkid',nextbaby
+	killvar 'yearkid',nextbaby
+	killvar 'Babyptype',nextbaby
+	killvar '$ChildFath',nextbaby
+	killvar '$ChildThFath',nextbaby
+	killvar 'hairkid',nextbaby
+	killvar 'eyeskid',nextbaby
+	killvar 'ChildConType',nextbaby
+	killvar 'Babyptype',nextbaby
 	if babyembryo > 0: babyembryo -= 1
-	if preg > 0 and babyembryo < 1
+	if preg > 0 and babyembryo < 1:
 	mesec = 48
 	FocH = 0
 	EggRH = 0
@@ -985,7 +999,7 @@ $objcheat_menu = {
 	nl
 	pl '<a href="exec:dynamic $din_cheat_dynamic">Dynamic Input Command</a>'
 	nl
-   	pl'<a href="exec:gt''Pavresident''">Teleport to Pavlovsky</a>'
+   	pl'<a href="exec:gt''pavResidential''">Teleport to Pavlovsky</a>'
    	pl'<a href="exec:gt''street''">Teleport to City</a>'
    	pl'<a href="exec:gt''gadukino''">Teleport to Gadukino</a>'
    	pl'<a href="exec:gt''dachi''">Teleport to Suburban Cooperative</a>'

+ 3 - 3
locations/FedorEv

@@ -44,7 +44,7 @@ if GorSlut = 0:
 				'Vitek nods: "Good plan. Set it up, will you?" He then turns to Fedor: "We''re settling this tomorrow, kid. You better be here after school, it''ll be ten times worse for you if you don''t."'
 				'He then waves for his friends to follow him: "Come on guys. Let''s go have some beers in the park, I need to relax. <<$name>>, if you want to join us, you know where we''ll be." Vitek and Dan leave Fedor on the ground and head for the schoolyard exit, but Vasily walks over to Fedor and kicks him in the ribs one more time, still laughing that signature jackal laugh of his. He then joins his friends, and moments later they''re gone.'
 
-				act 'Leave the school courtyard':gt 'Pavresident'
+				act 'Leave the school courtyard':gt 'pavResidential'
 			end
 		end
 
@@ -80,7 +80,7 @@ if GorSlut = 0:
 
 		'You kiss Fedor passionately, neither of you willing to break it off. Finally when you stop kissing, <<$ev_name>> suggests: <<$textEvent>>'
 
-		act 'Apologize, say you can''t and leave':gt 'Pavresident'
+		act 'Apologize, say you can''t and leave':gt 'pavResidential'
 
 		act 'Go with Fedor':
 			cls
@@ -93,7 +93,7 @@ elseif GorSlut > 0:
 	fedorKozlovQW = -1
 	'Fedor looks distraught: "<<$name>>, I trusted you with all my heart, and you turn out to be just another ordinary slut. I never should have trusted you... everything we had was a lie. Just stay away from me!" He turns around and walks away. Looks like he wants nothing to do with you any more.'
 
-	act 'Return to Pavlovsky':gt 'Pavresident'
+	act 'Return to Pavlovsky':gt 'pavResidential'
 end
 
 --- FedorEv ---------------------------------

+ 1 - 1
locations/Gaddvor

@@ -24,7 +24,7 @@ end
 
 clr
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 
 act 'Going into the house':minut += 5 & gt 'Gadhouse'
 act 'Go to the barn':minut += 5 & gt 'Gadsarai'

+ 1 - 1
locations/Gadsarai

@@ -244,7 +244,7 @@ else
 	'Old barn that holds tools. Sitting near the barn <a href="exec:gt ''pirat''">dog named Pirate</a>'
 	clr
 	gs 'stat'
-	gs 'time'
+	gs 'outdoors'
 
 	act 'Go outside':minut += 5 & gt 'Gaddvor'
 

+ 41 - 41
locations/Gnpc2

@@ -11,17 +11,17 @@ $din_gboy_end_to_disco = {
 			'<<$nameBoyfrend[numnpc]>> offered to go to his home.'
 			dynamic $din_gboy_go_to_boyhome
 
-			act 'And refuse to go home':otnBoyFrend[numnpc] -= 10 & gt 'Pavresident'
+			act 'And refuse to go home':otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
 		elseif gdeystboyrand = 1:
 			'<<$nameBoyfrend[numnpc]>> offered to accompany you home.'
 
-			act 'go home':gt 'Pavresident'
+			act 'go home':gt 'pavResidential'
 		end
 	elseif gnpcSex[numnpc] > 0:
 		'<<$nameBoyfrend[numnpc]>> offered to go to his home.'
 		dynamic $din_gboy_go_to_boyhome
 
-		act 'And refuse to go home':otnBoyFrend[numnpc] -= 10 & gt 'Pavresident'
+		act 'And refuse to go home':otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
 	end
 }
 
@@ -57,11 +57,11 @@ $din_gboy_go_to_disco = {
 
 						if tiprand <= 70:
 							'<<$nameBoyfrend[numnpc]>> managed to get out of the winner of the fight verbally, accusing Gopnik that he began to molest his girlfriend. But the evening was spoiled and finally <<$nameBoyfrend[numnpc]>> offered to leave the disco.'
-							act 'Go home':gt 'Pavresident'
+							act 'Go home':gt 'pavResidential'
 						elseif tiprand > 70 and tiprand < 90:
 							otnBoyFrend[numnpc] -= 20
 							'Gopnik quickly downloaded your guy and lit it on the headstock. <<$nameBoyfrend[numnpc]>> Gopnik gave all the money and apologized for a long time before them. whereupon <<$nameBoyfrend[numnpc]>> suggested that you spend.'
-							act 'Go home':gt 'Pavresident'
+							act 'Go home':gt 'pavResidential'
 						elseif tiprand >= 90:
 							'Discussions quickly escalated into a fight and three Gopnik began to beat your guy in the middle of the disco.'
 
@@ -70,7 +70,7 @@ $din_gboy_go_to_disco = {
 								otnBoyFrend[numnpc] -= 20
 								gs 'stat'
 								'<<$nameBoyfrend[numnpc]>> could oppose the three Gopnik nothing and soon fell under a barrage of punches. Gopari dragged him into the street where the seized money, took off his shoes, and threw him into the bushes. You helped her boyfriend to his feet and carried him home. His face was covered in blood and bruises began to swim.'
-								act 'Go home':gt 'Pavresident'
+								act 'Go home':gt 'pavResidential'
 							end
 
 							act 'separate fighting':
@@ -79,7 +79,7 @@ $din_gboy_go_to_disco = {
 
 								if stren < 90:
 									'You tried to push Gopnik, but someone pushed you and you will fly away from fighting a few meters from all force crashed to the floor. Gopari meanwhile pulled your guy beaten on the street where the money away, removed his shoes, and threw him into the bushes. You helped her boyfriend to his feet and carried him home. His face was covered in blood and bruises began to swim.'
-									act 'Go home':gt 'Pavresident'
+									act 'Go home':gt 'pavResidential'
 								elseif stren >= 90:
 									'You Gopnik pushed with all his strength, and he flew away from you. But the second Gopnik turned to you and you saw how he punches you in the face.'
 
@@ -87,7 +87,7 @@ $din_gboy_go_to_disco = {
 										zub += 1
 										gs 'stat'
 										'In my head rang and you realize that you are lying on the floor. Severe pain in the teeth and mouth full of salty liquid. You spit on the floor and saw that you knocked out a tooth. Gopari meanwhile pulled your guy beaten on the street where the money away, removed his shoes, and threw him into the bushes. You helped her boyfriend to his feet and carried him home. His face was covered in blood and bruises began to swim.'
-										act 'Go home':gt 'Pavresident'
+										act 'Go home':gt 'pavResidential'
 									elseif agil >= 90:
 										'You abruptly removed his head to the side and cut the air Gopnik fist near your head.'
 
@@ -99,10 +99,10 @@ $din_gboy_go_to_disco = {
 												zub += 1
 												gs 'stat'
 												'You hit Gopnik and hit him right on the nose. The guy yelled, "Oh, you bitch!" and lashed out at you. In my head rang and you realize that you are lying on the floor. Severe pain in the teeth and mouth full of salty liquid. You spit on the floor and saw that you knocked out a tooth. Gopari meanwhile pulled your guy beaten on the street where the money away, removed his shoes, and threw him into the bushes. You helped her boyfriend to his feet and carried him home. His face was covered in blood and bruises began to swim.'
-												act 'Go home':gt 'Pavresident'
+												act 'Go home':gt 'pavResidential'
 											elseif speed < 50:
 												'You tried to hit hooligan punched in the face, but your blow was too slow. Gopnik pushed you and you flew away from him for a few meters and with a sweep crashed on the floor. Gopari meanwhile pulled your guy beaten on the street where the money away, removed his shoes, and threw him into the bushes. You helped her boyfriend to his feet and carried him home. His face was covered in blood and bruises began to swim.'
-												act 'Go home':gt 'Pavresident'
+												act 'Go home':gt 'pavResidential'
 											end
 										end
 
@@ -118,11 +118,11 @@ $din_gboy_go_to_disco = {
 													gs 'stat'
 													GopWin[numnpc] += 1
 													'You nails clutching hooligan in the face and began to scratch his skin and ripping it. Gopnik does not break down and cry with unhooked from your guy. Your guy meanwhile rid of one of Gopnik manages to punch a second, then again and again. Gopnik fell on the floor like a sack. Gopnik with scarred muzzle pounced on your guy, but without success, blood flooded his eyes and your guy punched him in the face of what Gopnik flopped down on his ass. In the meantime, began to rise to his feet one of Gopnik. "Okay, motherfucker, piss with your bitch We''ll still find it!"'
-													act 'Go home':gt 'Pavresident'
+													act 'Go home':gt 'pavResidential'
 												end
 											elseif speed < 90:
 												'You tried to kick hooligan Jodan but he managed to push you before you even have time to do something. You flew away from him for a few meters and with a sweep crashed on the floor. Gopari meanwhile pulled your guy beaten on the street where the money away, removed his shoes, and threw him into the bushes. You helped her boyfriend to his feet and carried him home. His face was covered in blood and bruises began to swim.'
-												act 'Go home':gt 'Pavresident'
+												act 'Go home':gt 'pavResidential'
 											end
 										end
 
@@ -141,15 +141,15 @@ $din_gboy_go_to_disco = {
 														gs 'stat'
 														GopWin[numnpc] += 1
 														'You nails clutching hooligan in the face and began to scratch his skin and ripping it. Gopnik does not break down and cry with unhooked from your guy. Your guy meanwhile rid of one of Gopnik manages to punch a second, then again and again. Gopnik fell on the floor like a sack. Gopnik with scarred muzzle pounced on your guy, but without success, blood flooded his eyes and your guy punched him in the face of what Gopnik flopped down on his ass. In the meantime, began to rise to his feet one of Gopnik. "Okay, motherfucker, piss with your bitch We''ll still find it!"'
-														act 'Go home':gt 'Pavresident'
+														act 'Go home':gt 'pavResidential'
 													end
 												elseif bollrand = 1:
 													'You tried to kick hooligan between his legs but he ducked and shoved you. You flew away from him for a few meters and with a sweep crashed on the floor. Gopari meanwhile pulled your guy beaten on the street where the money away, removed his shoes, and threw him into the bushes. You helped her boyfriend to his feet and carried him home. His face was covered in blood and bruises began to swim.'
-													act 'Go home':gt 'Pavresident'
+													act 'Go home':gt 'pavResidential'
 												end
 											elseif speed < 70:
 												'You tried to kick hooligan between his legs but he ducked and shoved you. You flew away from him for a few meters and with a sweep crashed on the floor. Gopari meanwhile pulled your guy beaten on the street where the money away, removed his shoes, and threw him into the bushes. You helped her boyfriend to his feet and carried him home. His face was covered in blood and bruises began to swim.'
-												act 'Go home':gt 'Pavresident'
+												act 'Go home':gt 'pavResidential'
 											end
 										end
 									end
@@ -689,7 +689,7 @@ $din_gboy_tits = {
 					gs 'stat'
 					'Man you have cleaned your hands off my chest, and he lost his head, not knowing what to do.'
 
-					act 'Go home':gt 'Pavresident'
+					act 'Go home':gt 'pavResidential'
 				end
 			end
 
@@ -714,7 +714,7 @@ $din_gboy_tits = {
 						'<center><img src="images/qwest/alter/Ev/hj.jpg"></center>'
 						'You got him hard and hot cock out of his pants and took his hand. You started kissing a guy at the same time masturbate his penis. Finally the guy strangled groan and you''ll see how his cock off sperm.'
 
-						act 'Go home':gt 'Pavresident'
+						act 'Go home':gt 'pavResidential'
 					end
 				end
 
@@ -753,7 +753,7 @@ gs 'cum_manage'
 						gs 'stat'
 						'<center><img src="images/qwest/alter/Ev/cocksuckerSwallow.jpg"></center>'
 						dynamic $dinrandswallow
-						act 'Go home':gt 'Pavresident'
+						act 'Go home':gt 'pavResidential'
 					end
 
 					act 'Remove the mouth':
@@ -766,7 +766,7 @@ gs 'cum_manage'
 						gs 'stat'
 						'<center><img src="images/qwest/alter/Ev/cocksuckerFacial.jpg"></center>'
 						'You remove a member from the mouth and then hit you in the face a stream of hot sperm, then another and another and finally stopped the guy cum on your face.'
-						act 'Go home':gt 'Pavresident'
+						act 'Go home':gt 'pavResidential'
 					end
 
 					act 'Surrender':
@@ -794,7 +794,7 @@ gs 'cum_manage'
 						dynamic $sexstart
 						dynamic $sexstart2
 						dynamic $sexcum
-						act 'Go home':gt 'Pavresident'
+						act 'Go home':gt 'pavResidential'
 					end
 
 					if dom > 0 or anal > 0:
@@ -823,7 +823,7 @@ gs 'cum_manage'
 							dynamic $analsex
 							'Finally the guy dies and you feel like something warm fills your ass.'
 
-							act 'Leave.':gt 'Pavresident'
+							act 'Leave.':gt 'pavResidential'
 						end
 					end
 				end
@@ -847,7 +847,7 @@ gs 'cum_manage'
 						dom += 1
 						gs 'stat'
 						'You have removed themselves from male hands and he lost his head, not knowing what to do.'
-						act 'Go home':gt 'Pavresident'
+						act 'Go home':gt 'pavResidential'
 					end
 				end
 
@@ -886,7 +886,7 @@ gs 'cum_manage'
 						dynamic $sexstart2
 						dynamic $sexcum
 
-						act 'Go home':gt 'Pavresident'
+						act 'Go home':gt 'pavResidential'
 					end
 
 					if dom > 0 or anal > 0:
@@ -916,7 +916,7 @@ gs 'cum_manage'
 							dynamic $analsex
 							'Finally the guy dies and you feel like something warm fills your ass.'
 
-							act 'Leave.':gt 'Pavresident'
+							act 'Leave.':gt 'pavResidential'
 						end
 					end
 				end
@@ -933,7 +933,7 @@ gs 'cum_manage'
 			gs 'stat'
 			'Man you have cleaned your hands off my chest, and he lost his head, not knowing what to do.'
 
-			act 'Go home':gt 'Pavresident'
+			act 'Go home':gt 'pavResidential'
 		end
 	end
 }
@@ -963,7 +963,7 @@ $din_gboy_knee = {
 			gs 'stat'
 			'You removed the hand guy and he lost his head, not knowing what to do.'
 
-			act 'Go home':gt 'Pavresident'
+			act 'Go home':gt 'pavResidential'
 		end
 	end
 
@@ -985,7 +985,7 @@ $din_gboy_knee = {
 				gs 'stat'
 				'You removed the hand guy and he lost his head, not knowing what to do.'
 
-				act 'Go home':gt 'Pavresident'
+				act 'Go home':gt 'pavResidential'
 			end
 		end
 	end
@@ -1043,7 +1043,7 @@ $din_gboy_go_to_boyhome = {
 						otnBoyFrend[numnpc] -= 20
 						gs 'stat'
 						'You got up from the couch and a scandal guy claiming that you are not so and it from you only need one. <<$nameBoyfrend[numnpc]>> embarrassed and blushing began bubnet apology.'
-						act 'Go home':gt 'Pavresident'
+						act 'Go home':gt 'pavResidential'
 					end
 				elseif boyvideorand > 0:
 					'Started Hollywood thriller in which the protagonist smashed everything around him while he managed to not even scratched. In the film, killed his best friend, after which the hero on his knees beside the body screaming NO! in the rain. Finally got to the main hero and villain after a hard fight killed them, ended the film as expected explosion in the background from which the hero escaped.'
@@ -1062,12 +1062,12 @@ $din_gboy_go_to_boyhome = {
 								if horny < 75:dom += 5
 								gs 'stat'
 								'You removed the hand guy and he lost his head, not knowing what to do.'
-								act 'Go home':gt 'Pavresident'
+								act 'Go home':gt 'pavResidential'
 							end
 						end
 
 					else
-						act 'Go home':gt 'Pavresident'
+						act 'Go home':gt 'pavResidential'
 						if dom > 0 or horny >= 75:
 							act 'Man kiss':
 
@@ -1092,7 +1092,7 @@ $din_gboy_go_to_boyhome = {
 			dynamic $din_gboy_knee
 		end
 
-		!!act 'Go home':gt 'Pavresident'
+		!!act 'Go home':gt 'pavResidential'
 	end
 
 }
@@ -1114,38 +1114,38 @@ if otnBoyFrend[numnpc] >= 80:'You have a great relationship.'
 if hour < 20:
 	if otnBoyFrend[numnpc] < 80:
 		'<<$nameBoyfrend[numnpc]>> offered to take you home.'
-		act 'Go home':gt 'Pavresident'
+		act 'Go home':gt 'pavResidential'
 	elseif otnBoyFrend[numnpc] >= 80 and gnpcSex[numnpc] = 0:
 		gdeystboyrand = rand(0, 1)
 
 		if gdeystboyrand = 0:
 			'<<$nameBoyfrend[numnpc]>> offered to go to his home.'
 			dynamic $din_gboy_go_to_boyhome
-			act 'And refuse to go home':otnBoyFrend[numnpc] -= 10 & gt 'Pavresident'
+			act 'And refuse to go home':otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
 		elseif gdeystboyrand = 1:
 			'<<$nameBoyfrend[numnpc]>> offered to take you home.'
-			act 'Go home':gt 'Pavresident'
+			act 'Go home':gt 'pavResidential'
 		end
 	elseif otnBoyFrend[numnpc] >= 80 and gnpcSex[numnpc] > 0:
 		'<<$nameBoyfrend[numnpc]>> offered to go to his home.'
 		dynamic $din_gboy_go_to_boyhome
-		act 'And refuse to go home':otnBoyFrend[numnpc] -= 10 & gt 'Pavresident'
+		act 'And refuse to go home':otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
 	end
 elseif hour >= 20 and hour < 23:
 	if otnBoyFrend[numnpc] < 80:
 		'<<$nameBoyfrend[numnpc]>> offered to take you home.'
-		act 'Go home':gt 'Pavresident'
+		act 'Go home':gt 'pavResidential'
 	elseif otnBoyFrend[numnpc] >= 80 and gnpcSex[numnpc] = 0:
 		tipgbrand = rand(0, 1)
 
 		if tipgbrand = 0:
 			'<<$nameBoyfrend[numnpc]>> offered to go to the disco.'
 			dynamic $din_gboy_go_to_disco
-			act 'And refuse to go home':otnBoyFrend[numnpc] -= 10 & gt 'Pavresident'
+			act 'And refuse to go home':otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
 		elseif tipgbrand = 1:
 			'<<$nameBoyfrend[numnpc]>> offered to go to his home.'
 			dynamic $din_gboy_go_to_boyhome
-			act 'And refuse to go home':otnBoyFrend[numnpc] -= 10 & gt 'Pavresident'
+			act 'And refuse to go home':otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
 		end
 	elseif otnBoyFrend[numnpc] >= 80 and gnpcSex[numnpc] > 0:
 		gdeystboyrand = rand(0, 1)
@@ -1153,18 +1153,18 @@ elseif hour >= 20 and hour < 23:
 		if gdeystboyrand = 0:
 			'<<$nameBoyfrend[numnpc]>> offered to go to his home.'
 			dynamic $din_gboy_go_to_boyhome
-			act 'And refuse to go home':otnBoyFrend[numnpc] -= 10 & gt 'Pavresident'
+			act 'And refuse to go home':otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
 		elseif gdeystboyrand = 1:
 			'<<$nameBoyfrend[numnpc]>> offered to go to the disco.'
 			dynamic $din_gboy_go_to_disco
-			act 'And refuse to go home':otnBoyFrend[numnpc] -= 10 & gt 'Pavresident'
+			act 'And refuse to go home':otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
 		end
 
 	end
 elseif hour >= 23:
 	'<<$nameBoyfrend[numnpc]>> offered to take you home.'
 
-	act 'go home':gt 'Pavresident'
+	act 'go home':gt 'pavResidential'
 end
 
 --- Gnpc2 ---------------------------------

+ 1 - 1
locations/Grinok

@@ -20,7 +20,7 @@ end
 
 clr
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 '<center><h4>Market</h4></center>'
 '<center><img src="images/pic/Grinok.jpg"></center>'
 'This small market is location near the station.'

+ 5 - 5
locations/Gshveyfab

@@ -10,7 +10,7 @@ if $ARGS[0] = 'start':
 	
 	'<center><B>Garment factory named."Paris Commune"</B></center>'
 	'<center><img src="images/pic/Gshveyfab.jpg"></center>'
-	'Local garment factory, one of the few companies in Pavlovsk. It makes clothing for G & M stores and there is a branch opposite, which is open from 8:00-20:000 Monday - Friday.'
+	'Local garment factory, one of the few companies in Pavlovsk. It makes clothing for G & M stores and there is a branch opposite, which is open from 8:00-20:00 Monday - Friday.'
 	if hour => 8 and hour =< 20 and week => 1 and week <= 5:
 		'Near <a href="exec:minut += 15 & GT ''Gshveyfab'', ''enter''">the front door</a> is communicating factory which sits protection.'
 	elseif hour < 8 or hour > 20 or week > 5:
@@ -58,8 +58,8 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	act 'Go to the residential area':gt'Pavresident'
-	act 'Go to the high street':gt'Pavcomercial'
+	act 'Go to the residential area':gt'pavResidential'
+	act 'Go to the high street':gt'pavCommercial'
 end
 
 if $ARGS[0] = 'enter':
@@ -150,8 +150,8 @@ if $ARGS[0] = 'job':
 	''
 	'You practice his shift at the factory.'
 
-	act 'Go to the residential area':gt'Pavresident'
-	act 'Go to the high street':gt'Pavcomercial'
+	act 'Go to the residential area':gt'pavResidential'
+	act 'Go to the high street':gt'pavCommercial'
 end
 
 --- Gshveyfab ---------------------------------

+ 2 - 2
locations/IgorEv

@@ -26,13 +26,13 @@ if IgorLove > 0:
 			'Igor gets up on his knees in front of you, "Madam, I pray for a kiss!"'
 		end
 
-		act 'Leave':IgorLove -= 1 & gt 'Pavresident'
+		act 'Leave':IgorLove -= 1 & gt 'pavResidential'
 	end
 elseif IgorLove <= 0:
 	IgorLoverQW = -1
 	'Along the way, Igor began to chant "<<$name>>, I love you so much, but you do not know me, you know, I began to wonder if perhaps we should leave."'
 
-	act 'Leave':gt 'Pavresident'
+	act 'Leave':gt 'pavResidential'
 end
 
 --- IgorEv ---------------------------------

+ 1 - 1
locations/KatjaHome

@@ -13,7 +13,7 @@ else
 	if hour >= 9:'The door is opened by Katjas mum. "Oh, hello <<$name>>. Katja isn''t home right now."'
 	if hour < 9:'The door is opened by Katjas mum. "<<$name>>. Shouldn''t you be in bed? You shouldn''t come around before nine."'
 
-	act 'Say goodbye and go home':gt 'Pavresident'
+	act 'Say goodbye and go home':gt 'pavResidential'
 end
 
 --- KatjaHome ---------------------------------

+ 1 - 1
locations/KatjaHomeTalk

@@ -217,7 +217,7 @@ else
 	end
 end
 
-act 'Say goodbye and go home':gt 'Pavresident'
+act 'Say goodbye and go home':gt 'pavResidential'
 
 --- KatjaHomeTalk ---------------------------------
 

+ 19 - 18
locations/Komp

@@ -511,7 +511,7 @@ if $ARGS[0] = 'rabota':
 			if hour < 20 and hour > 7:act 'Search more':gt 'Komp', 'rabota'
 
 			act 'Finish':gt 'Komp', 'brows'
-		elseif komprabota > 4 and komprabota < 8 and StoryLine > 0 and Suspeh >= 90 and camwhore = 0:
+		elseif komprabota > 4 and komprabota < 8 and Intel >= 50 and camwhore = 0:
 			'You stumble across on the ad, which says that a website requires webcam models.'
 			act 'Interest':
 				cls
@@ -533,6 +533,7 @@ if $ARGS[0] = 'rabota':
 					gs 'stat'
 					'<center><img src="images/camwhore/camwhore2.jpg"></center>'
 					'You go to the website, and register yourself on it as a model. Ten minutes later, the questionnaire has already been approved and you can now earn money as a webcam girl.'
+					'It will be necessary for you to have a webcam and if you don''t have one, they are easy to find in local supermarkets.' 
 					act 'Finish':gt 'Komp','brows'
 				end
 				act 'Return':gt 'Komp','brows'
@@ -612,7 +613,18 @@ if $ARGS[0] = 'fin':
 end
 
 if $ARGS[0] = 'mfc':
-	if sisterHere = 0 or $loc ! 'bedrPar':
+	if mesec > 0:
+		cls
+		minut += 2
+		topmfc = 1
+		backmfc = 1
+		tokens = 0
+		camclients = 0
+		gs 'stat'
+		'<center><img src="images/camwhore/camwhore2.jpg"></center>'
+		'You time of the month, you are too unwell for the show  - sick, stomachache , dizzy, generally not the best time to earn money with your body...'
+		act 'Close tab':gt 'Komp','brows'
+	elseif sisterHere = 0 or $loc ! 'bedrPar':
 		act 'Go to your mfc homepage':
 			cls
 			minut += 2
@@ -643,17 +655,6 @@ if $ARGS[0] = 'mfc':
 		'<center><img src="images/camwhore/camwhore2.jpg"></center>'
 		'You are not alone in the room.'
 		act 'Close tab':gt 'Komp','brows'
-	elseif mesec > 0:
-		cls
-		minut += 2
-		topmfc = 1
-		backmfc = 1
-		tokens = 0
-		camclients = 0
-		gs 'stat'
-		'<center><img src="images/camwhore/camwhore2.jpg"></center>'
-		'You time of the month, you are too unwell for the show  - sick, stomachache , dizzy, generally not the best time to earn money with your body...'
-		act 'Close tab':gt 'Komp','brows'
 	end
 end
 
@@ -1499,15 +1500,15 @@ if $ARGS[0] = 'bank':
 	if karta + bankDebtLimit >= 10:
 		*pl
 		
-		'* You can buy internet access online through your bank account. 1 hour of internet for only 10 rubles! *'
+		'* You can buy internet access online through your bank account. 1 hour of internet for only 10 <b>₽</b>! *'
 		
 		*pl
 		
 		if karta >= 0:
-			'You have <<karta>> rubles in your account.'
+			'You have <<karta>> <b>₽</b> in your account.'
 			'You have an approved credit of <font color="blue"><<bankDebtLimit>></font>!'
 		else
-			'You hava a debt of <font color="red"><<-1 * karta>></font> rubles.'
+			'You hava a debt of <font color="red"><<-1 * karta>></font> <b>₽</b>.'
 			'You have an approved credit of <font color="blue"><<bankDebtLimit + karta>></font>!'
 		end
 		
@@ -1515,7 +1516,7 @@ if $ARGS[0] = 'bank':
 		
 		act 'Buy internet time':
 			cla
-			intinp = input ("How many hours of internet access do you wish to purchase? (1hr = 10 rubles)")
+			intinp = input ("How many hours of internet access do you wish to purchase? (1hr = 10 <b>₽</b>)")
 
 			if intinp <= 0 or intinp * 10 > karta + bankDebtLimit:
 				'Invalid amount.'
@@ -1523,7 +1524,7 @@ if $ARGS[0] = 'bank':
 				karta -= intinp * 10
 				internet += intinp
 				'You paid for <<intinp>> hours of Internet access, you have <<internet>> hours of the Internet access remaining.'
-				'<<intinp * 10>> rubles were removed from your account.'
+				'<<intinp * 10>> <b>₽</b> were removed from your account.'
 			end
 			act 'Move away': gt 'Komp', 'bank'
 		end

+ 1 - 1
locations/LBZhouse

@@ -92,7 +92,7 @@ $LBZH_end={
 			cls
 			gs'stat'
 			'<<$boy>> You pack off quickly from the apartment.'
-			act'Escape':gt'Pavresident'
+			act'Escape':gt'pavResidential'
 		end
 	end
 }

+ 1 - 1
locations/LakeBoyZ

@@ -71,7 +71,7 @@ $gL_boy_z = {
 							gs'stat'
 							'You quickly get changed into your regular clothes and go for a walk with a guy.'
 							'<<$bname>> invites you over to his house.'
-							act 'Call it a day and leave':gt'Pavresident'
+							act 'Call it a day and leave':gt'pavResidential'
 							act'Go with the guy':gt'LBZhouse'
 						end
 					end

+ 4 - 4
locations/LariskaHome

@@ -46,13 +46,13 @@ else
 		'"Yes, I''m <<$name>>." you reply tearing your eyes away from her nearly exposed breasts.'
 		'"Ah, <<$name>>, Larisochka has told me all about you. I''m Anna, Lariska''s mother. My bunny has been so joyous lately. I am glad that she has such a good friend! She needed someone to get her back on her feet. <<$text_home>>'
 		lariskaMotherKnown = 1
-		act 'Go back to town':gt'Pavresident'
+		act 'Go back to town':gt'pavResidential'
 		exit
 	end
 	if hour >= 9:'Lariska''s mother opened the door. "Hello, <<$name>>. I''m sorry, but Lariska isn''t home."'
 	if hour < 9:'Lariska''s mother opened the door. "Good morning , <<$name>>. I''m sorry but Lariska is still in bed. She doesn''t get up before nine."'
 
-	act 'Return to town':gt'Pavresident'
+	act 'Return to town':gt'pavResidential'
 end
 
 if $ARGS[0] = 'in':
@@ -87,7 +87,7 @@ if $ARGS[0] = 'in':
 		cla
 		'Larissa looked at her watch and said, "It''s time to go to the sports club.'
 		act 'Go with Lariska':lariskaTrain += 1 & minut += 20 & gt 'gdksport', 'start'
-		act 'Say goodbye and go home':gt'Pavresident'
+		act 'Say goodbye and go home':gt'pavResidential'
 		exit
 	end
 	if water <= 60:
@@ -155,7 +155,7 @@ if $ARGS[0] = 'in':
 		end
 	end
 
-	act 'Say goodbye and go home':gt'Pavresident'
+	act 'Say goodbye and go home':gt'pavResidential'
 end
 
 --- LariskaHome ---------------------------------

+ 2 - 2
locations/LariskaStart

@@ -399,7 +399,7 @@ gs 'cum_manage'
 												'<center><img src="images/qwest/alter/Lariska/Start/start_end.jpg"></center>'
 												'You woke up covered in semen and a bottle, sticking out of the pussy, and your entire body covered with writing obscene graffiti. The whole body hurts, and holes to whine like glowing rod shoved all night.'
 
-												act 'Escape':gt'Pavresident'
+												act 'Escape':gt'pavResidential'
 											end
 										end
 									end
@@ -410,7 +410,7 @@ gs 'cum_manage'
 				end
 			end
 		end
-		act 'Escape':gt'Pavresident'
+		act 'Escape':gt'pavResidential'
 	end
 end
 --- LariskaStart ---------------------------------

+ 8 - 8
locations/MHall

@@ -9,6 +9,14 @@ if $ARGS[0] = 'foyer':
 	'<center><img src="images/BDSM_Club/Hallways/foyer.jpg"></center>'
 	'You stand in the grand foyer, your eye is draw towards and up the dual staircases. To your left is the Dinning room, to your right the dressing room.'
 	'Descreetly to the sides of the staircases are two rest rooms.'
+	act 'Leave the club':
+		if $clothingworntype ! 'nude':
+			gt 'BDSM_Club', 'start'
+		else
+			msg'<b><font color = red>You need to get dressed.</font></b>'
+			gt'MHall','foyer'
+		end
+	end
 	if $BDSMrole = 's':
 		act 'Go to Dressing room': gt 'MDressing'
 		if ($clothingworntype ! 'uniform' or PCloStyle2 ! 1) and  $clothingworntype ! 'nude':exit
@@ -19,14 +27,6 @@ if $ARGS[0] = 'foyer':
 	act 'Go to the west wing hallway':gt 'MHall', 'west'
 	act 'Go to the east wing hallway':gt 'MHall', 'east'
 	act 'Go to the rest room': gt 'MBathrooms', 'restroom'
-	act 'Leave the club':
-		if $clothingworntype ! 'nude':
-			gt 'BDSM_Club', 'start'
-		else
-			msg'<b><font color = red>You need to get dressed.</font></b>'
-			gt'MHall','foyer'
-		end
-	end
 end
 
 if $ARGS[0] = 'west':

+ 1 - 1
locations/Meadow

@@ -6,7 +6,7 @@ if $ARGS[0] = 'start':
 
 	clr
 	gs 'stat'
-	gs 'time'
+	gs 'outdoors'
 
 	'<center><H4>Meadow</H4></center>'
 	'<center><img src="images/qwest/gadukino/meadow.jpg"></center>'

+ 1 - 1
locations/MiroslavaHome

@@ -5,7 +5,7 @@ $loc = $CURLOC
 clr
 minut += 5
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 
 '<center><H4>Yard Miroslava</H4></center>'
 

+ 1 - 1
locations/Nord

@@ -17,7 +17,7 @@ end
 gs 'dinam'
 clr
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 '<center><b>Northern region</b></center>'
 '<center><img src="images/etogame/nord.jpg"></center>'
 !call random events from [street_events], and display them before show location.

+ 3 - 3
locations/ParChurch

@@ -16,7 +16,7 @@ if $ARGS[0] = 'start':
 	$loc = $CURLOC
 	$metka = $ARGS[0]
 	gs 'stat'
-	gs 'time'
+	gs 'outdoors'
 	'<center><b><font color="maroon">Church of Saint Nikolas</font></b></center>'
 	'<center><img src="images/qwest/alter/Church/St-Nikolas.jpg" width="1000" height="422"></center>'
 	'Pavlovsk''s only church. The church of Saint Nikolas is the tallest building in town. It''s old, but well maintained by the worshippers of the parish.'
@@ -32,8 +32,8 @@ if $ARGS[0] = 'start':
 	else
 		act 'Enter the church': gt 'ParChurch' , 'Narthex'
 	end
-	act 'Go to residential area':gt 'Pavresident'
-	act 'Go to high street':gt 'Pavcomercial'
+	act 'Go to residential area':gt 'pavResidential'
+	act 'Go to high street':gt 'pavCommercial'
 end
 
 if $ARGS[0] = 'vigil':

+ 2 - 2
locations/Prostitute

@@ -7,7 +7,7 @@ if $ARGS[0] = 'start':
 	cls
 	minut += 5
 	gs 'stat'
-	gs 'time'
+	gs 'outdoors'
 	'<center><b><font color="maroon">Hooker</font></b></center>'
 	'<center><img src="images/etogame/park2.jpg"></center>'
 
@@ -328,7 +328,7 @@ if $ARGS[0] = 'work2':
 		clr
 		*clr
 		gs 'boy'
-		dynamic $CatName, 'street whore client'
+		dynamic $CatName, '"John"'
 		slutty += 1
 		minut += 1
 		guy += 1

+ 2 - 1
locations/WorkHosp

@@ -34,10 +34,10 @@ if $ARGS[0] = 'start':
 	act 'Relax in nursing':
 		cla
 		minut += 30
+		gs 'stat'
 		'You relax.'
 
 		act 'Masturbate (0:15)':
-			minut += 15
 			mastrrand = rand(0, 2)
 
 			if mastrrand = 0:
@@ -45,6 +45,7 @@ if $ARGS[0] = 'start':
 			else
 				cla
 				*clr
+				minut += 15
 				mastr += 1
 				horny = 0
 				orgasm += 1

+ 2 - 2
locations/albinahome

@@ -152,7 +152,7 @@ if hour < 20:
 												'Then an intense pleasure overtakes you, and you momentarily lose control of your body. Moaning loudly, you grab hold of Albina''s hair as an intense orgasm washes over you.'
 												'During your orgasm, you black out for a few seconds and when you regain your senses you find yourself sitting next Albina, who''s smiling prettily.'
 
-												act 'Say goodbye and go home':gt 'Pavresident'
+												act 'Say goodbye and go home':gt 'pavResidential'
 											end
 										end
 									end
@@ -304,7 +304,7 @@ if hour >= 20:
 	if money >= 25:act 'Go to the disco':money -= 25 & minut += 15 & gt 'gdkin'
 end
 
-act 'Say goodbye and go home':gt 'Pavresident'
+act 'Say goodbye and go home':gt 'pavResidential'
 
 --- albinahome ---------------------------------
 

+ 1 - 1
locations/albinaporog

@@ -10,7 +10,7 @@ else
 	if hour >= 9:'You push a button on the gates intercom and a guard walks up on the other side of the gate. You say that you''re here to visit Albina. He shakes his head and says, "Albina is currently not at home."'
 	if hour < 9:'You push a button on the gates intercom and a guard walks up on the other side of the gate, saying "Come no earlier than nine."'
 
-	act 'Say goodbye and go home':gt 'Pavresident'
+	act 'Say goodbye and go home':gt 'pavResidential'
 end
 
 --- albinaporog ---------------------------------

+ 1 - 1
locations/allea

@@ -1,6 +1,6 @@
 # allea
 gs'stat'
-gs'time'
+gs 'outdoors'
 '<center><img src="images/pic/allea.jpg" ></center>'
 'Wander through the <a href="exec:GT ''luzhayka'',''start''">park</a>.'
 

+ 1 - 1
locations/altPRE

@@ -116,7 +116,7 @@ if $ARGS[0] = 'scene2':
                                 *clr
                                 '<center><img src="images/etogame/gorodok.jpg"></center>'
                                 'You give Yuugo directions to your house and half an hour later he drops you off in front of your home.'
-                                act 'continue':gt 'Pavresident'
+                                act 'continue':gt 'pavResidential'
                             end
                         end
                     end

+ 2 - 2
locations/alterStart

@@ -311,7 +311,7 @@ $din_alter_start_ev15 = {
 	'When you finished 9th grade, you decided yo continue with your secondary education. The summer holiday ends soon and you''re getting ready to start 10th grade.'
 	!!'You weaned these two classes and you only have a few months before graduation.'
 
-	act 'Start at the end of August':
+	act 'Start at the end of August <B>(recommended for new players)</B>':
 		age=15
 		vidage=14
 		birthyear = year-age
@@ -370,7 +370,7 @@ $din_alter_start_ev = {
 	'After a quiet tenth grade you spent your summer in the town of Pavlovsky. Soon the holidays came to an end and you returned to school, where you will spend your last year of study.'
 	!'You weaned these two classes and you only have a few months before graduation.'
 
-	act 'Start at the end of August':
+	act 'Start at the end of August <B>(recommended for new players)</B>':
 		SHOWSTAT 1
 		SHOWOBJS 1
 		bikini=1

+ 5 - 3
locations/andrey

@@ -136,16 +136,18 @@ elseif young_shop_work = 1:
 			if young_shop_salary > 0 or young_shop_bonus > 0:
 				money += young_shop_salary * 800 + young_shop_bonus * 200
 
-				msg 'For working <b><<young_shop_salary>></b> days you get paid <b><<young_shop_salary * 800>></b>, with a bonus of <b><<young_shop_bonus * 200>></b> rubles. Total income is <b><<young_shop_salary * 800 + young_shop_bonus * 200>></b> rubles'
+				'For working <b><<young_shop_salary>></b> days you get paid <b><<young_shop_salary * 800>></b>, with a bonus of <b><<young_shop_bonus * 200>></b> rubles. Total income is <b><<young_shop_salary * 800 + young_shop_bonus * 200>></b> rubles'
 				'Andrew M. counts out <b><<young_shop_salary * 800 + young_shop_bonus * 200>></b> rubles.'
 
 				! reset money,young_shop_salary,young_shop_bonus to zero for a new week
 				young_shop_salary = 0
 				young_shop_bonus = 0
-			
-				gt 'young_shop'
 			end
 
+			act 'Leave':
+				minut += 2
+				gt 'young_shop'
+			end
 		end
 
 		act 'Beg to get not fired':

+ 1 - 1
locations/annafrends

@@ -1,6 +1,6 @@
 # annafrends
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 gs 'reks'
 
 'Your sister Anja and her friends Lena, Ira, Rex, and Roman are sitting outside the community center drinking beer.'

+ 1 - 1
locations/annafrends2

@@ -1,6 +1,6 @@
 # annafrends2
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 
 'The bottle of beer was quickly drained and the guys go to fetch a new bottle.'
 

+ 1 - 1
locations/annafrendtoilet

@@ -2,7 +2,7 @@
 cls
 minut += 5
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 
 if gennpc = 0:$annafrendname = 'Anja' & $annafrendname2 = 'Anja'
 if gennpc = 1:$annafrendname = 'Lena' & $annafrendname2 = 'Lena'

+ 6 - 6
locations/artemEv

@@ -350,7 +350,7 @@ if $ARGS[0] = 'learn':
 						'"I don''t know, Artem", you sigh. "I appreciate you helping me with my homework, and I could definitely use the money. But if word of this comes out... I''ll think about it, okay?"'
 						'He happily nods, and offers you the 1000 rubles as promised. After you put the money away you leave the garage, waving Artem goodbye.'
 
-						act 'Leave the garage':minut += 15 & gt'Pavresident'
+						act 'Leave the garage':minut += 15 & gt'pavResidential'
 					end
 				end
 			end
@@ -413,7 +413,7 @@ if $ARGS[0] = 'learn':
 						'The guys take a while to recover, and then give you 1000 rubles after you get dressed. You wink at them as you leave: "See you next time, boys!"'
 
 						artemAndPetja += 1
-						act 'Leave the garage':minut += 15 & gt'Pavresident'
+						act 'Leave the garage':minut += 15 & gt'pavResidential'
 					end
 				end
 			end
@@ -460,7 +460,7 @@ if $ARGS[0] = 'learn':
 				'Artem gives you 1,000 rubles after you get dressed. You wink at them as you leave: "See you next time, boys! Better get those tongues ready!"'
 
 				artemAndPetja = 12
-				act 'Leave the garage':minut += 15 & gt'Pavresident'
+				act 'Leave the garage':minut += 15 & gt'pavResidential'
 			end
 		elseif artemAndPetja = 12:
 			minut += 5
@@ -501,7 +501,7 @@ if $ARGS[0] = 'learn':
 				'He smiles shyly, and you get dressed again. You quickly gather your things and wave the boys goodbye as you get ready to leave the garage.'
 
 				artemAndPetja = 13
-				act 'Leave the garage':minut += 15 & gt'Pavresident'
+				act 'Leave the garage':minut += 15 & gt'pavResidential'
 			end
 		elseif artemAndPetja = 13:
 			cls
@@ -555,7 +555,7 @@ if $ARGS[0] = 'learn':
 					'The guys definitely liked today''s lesson, and Artem thanks you heartily when he gives you the 1000 rubles. The boys are staying around in the garage for a while, talking enthusiastically as they wave you goodbye. You hear your name a lot in their conversation, and you wonder what they could be talking about.'
 
 					artemAndPetja = 14
-					act 'Leave the garage':minut += 15 & gt 'Pavresident'
+					act 'Leave the garage':minut += 15 & gt 'pavResidential'
 				end
 			end
 		elseif artemAndPetja = 14:
@@ -617,7 +617,7 @@ if $ARGS[0] = 'learn':
 					artemAndPetja = 15
 					arthakQW = 10
 					artemblok = 1
-					act 'Leave the garage':minut += 15 & gt 'Pavresident'
+					act 'Leave the garage':minut += 15 & gt 'pavResidential'
 				end
 			end
 		end

+ 1 - 1
locations/arturend

@@ -37,7 +37,7 @@ act 'Brush up':
 		'He gave you a handbag.'
 	end
 
-	act 'Leave':gt 'Pavcomercial'
+	act 'Leave':gt 'pavCommercial'
 end
 
 --- arturend ---------------------------------

+ 4 - 4
locations/bank

@@ -15,10 +15,10 @@ if $ARGS[0] = 'start':
 		'Do you want to open your account?'
 	else
 		if karta >= 0:
-			'You have <<karta>> rubles in your account.'
+			'You have <<karta>> <b>₽</b> in your account.'
 			'You have an approved credit of <font color="blue"><<bankDebtLimit>></font>!'
 		else
-			'You hava a debt of <font color="red"><<-1 * karta>></font> rubles.'
+			'You hava a debt of <font color="red"><<-1 * karta>></font> <b>₽</b>.'
 			'You have an approved credit of <font color="blue"><<bankDebtLimit + karta>></font>!'
 		end
 	end
@@ -52,7 +52,7 @@ if $ARGS[0] = 'start':
 					bankDebtLimit = 5000
 				end
 				
-				'<br>You put on the account <<kartaIN>> rubles, now on your account <<karta>> rubles.'
+				'<br>You put on the account <<kartaIN>> <b>₽</b>, now you have <<karta>> <b>₽</b> on it.'
 			end
 
 			act 'Move away':gt 'bank', 'start'
@@ -70,7 +70,7 @@ if $ARGS[0] = 'start':
 			else
 				karta -= kartaOUT
 				money += kartaOUT
-				'<br>You debited <<kartaOUT>> rubles, now on your account <<karta>> rubles.'
+				'<br>You debited <<kartaOUT>> <b>₽</b>, now you have <<karta>> <b>₽</b> on it.'
 			end
 
 			act 'Move away':gt 'bank', 'start'

+ 2 - 2
locations/barbershop

@@ -427,12 +427,12 @@ if $ARGS[0] = 'start':
 		cls
 		'The barber shop is closed at the moment, you should probably come back, when Mr. Sherman''s in'
 
-		act 'Leave':minut += 2 & gt 'Pavcomercial'
+		act 'Leave':minut += 2 & gt 'pavCommercial'
 
 		exit
 	end
 
-	act 'Leave':minut += 2 & gt 'Pavcomercial'
+	act 'Leave':minut += 2 & gt 'pavCommercial'
 end
 
 if money >= 60:

+ 1 - 1
locations/belgang

@@ -5,7 +5,7 @@
 
 
 
-act'Return to Pavlovsky':gt'Pavcomercial'
+act'Return to Pavlovsky':gt'pavCommercial'
 gs'stat'
 --- belgang ---------------------------------
 

+ 1 - 1
locations/belpicknick

@@ -347,7 +347,7 @@ if belpicknickprogress = 1000:
 	if rand(1,100) <= 60:
 		minut += 60
 		'Vadim looks at you again, and sees how dirty you are: "I don''t want cum stains on my car seats. Still, we can''t just leave her here... put her in the trunk." Two of the guys push you in the trunk a bit more forcefully than is needed; it''s not like you have any energy left to resist after what happened here. After a bumpy ride the car pulls to a stop on the outskirts of Pavlovsky, and Tatar got out of the car to open the trunk. He pulls you out of the trunk, throws down your clothes next to you and gets back in before they race off, leaving you to fend for yourself. Your body feels exhausted as you slowly get dressed, and make your way to town.'
-		act'Return to Pavlovsky':gt'Pavresident'
+		act'Return to Pavlovsky':gt'pavResidential'
 	else
 		'Siple looks at your face in disgust. "That looks fucking disgusting... there''s no way you''re getting in our car. Find your own way home, slut!"'
 		'The guys get in the car and drive off, leaving you alone in the woods. You take a moment to clean yourself up at least a little and put your clothes back on, before you start wandering. You have no clue where you are. Luckily you hear a road in the distance, and decide to head in that direction... once you find the road, you can hopefully find your way home from there.'

+ 4 - 4
locations/carF

@@ -15,11 +15,11 @@ $enddrive = {
 	if cardrive = 13:gt 'dachi'	
 	if cardrive = 18:gt 'youplace'
 	if cardrive = 19:gt'vokzal'
-	if cardrive = 20:gt 'Pavresident'
+	if cardrive = 20:gt 'pavResidential'
 	if cardrive = 21:gt'zaprF','start'
 	if cardrive = 22:gt'road'
 	if cardrive = 23:gt'Gaddvor'
-	if cardrive = 24:gt'Pavcomercial'
+	if cardrive = 24:gt'pavCommercial'
 }
 
 if $ARGS[0] = 'start':
@@ -364,7 +364,7 @@ if $ARGS[0] = 'salon':
 			end
 
 			if cardrive ! 20:
-				act 'Go to Pavresident':
+				act 'Go to pavResidential':
 					cla
 					benz -= 1
 					teh -= rand(3, 6)
@@ -402,7 +402,7 @@ if $ARGS[0] = 'salon':
 			end
 
 			if cardrive ! 24:
-				act 'Go to Pavcomercial':
+				act 'Go to pavCommercial':
 					cla
 					benz -= 1
 					teh -= rand(3, 6)

+ 3 - 1
locations/clothing

@@ -54,7 +54,9 @@ $clothing_list_line = {
 	$RESULT += '<TD><a href="exec:gt ''clothing'', ''view_clothing_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">View</a>'
 
 	if $ARGS[0] ! 'sell':
-		if ($ARGS[1] ! 'coat' and $ARGS[1] ! 'swimwear') and dyneval('RESULT = <<$ARGS[1]>>H[<<ARGS[2]>>]') > 0:
+		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and ($clothingworntype ! 'school' or clothingwornnumber ! 6):
+			$RESULT += ' <a href="exec:gs ''clothing'', ''wear'', ''<<$ARGS[1]>>'', <<ARGS[2]>> & gt ''clothing'', ''view_clothing_list'', ''wardrobe''">Wear</a></TD>'
+		elseif ($ARGS[1] ! 'coat' and $ARGS[1] ! 'swimwear') and dyneval('RESULT = <<$ARGS[1]>>H[<<ARGS[2]>>]') > 0:
 			if $ARGS[1] ! 'exercise' and CloStyle ! 5 and (dyneval('RESULT = <<$ARGS[1]>>B[<<ARGS[2]>>]') < (bedra - 8) or dyneval('RESULT = <<$ARGS[1]>>B[<<ARGS[2]>>]') > (bedra + 8)):
 				$RESULT += '</TD>'
 			else

+ 13 - 13
locations/clothing_QV

@@ -12,9 +12,9 @@ if $ARGS[0] = 'list':
 	:loopcheap
 		gs 'clothing_attributes', 'cheap', i
 		if CloStyle ! 5:
-			if cheap[i] = 1 and cheapH[i] > 0 and cheapB[i] > (bedra - 8) and cheapB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''cheap'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/1cheap/Cheap<<i>>.jpg" 	height="250" /></div></a>'
+			if cheap[i] = 1 and cheapS[i] = 0 and cheapH[i] > 0 and cheapB[i] > (bedra - 8) and cheapB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''cheap'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/1cheap/Cheap<<i>>.jpg" 	height="250" /></div></a>'
 		else
-			if cheap[i] = 1 and cheapH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''cheap'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/1cheap/Cheap<<i>>.jpg" 	height="250" /></div></a>'
+			if cheap[i] = 1 and cheapS[i] = 0 and cheapH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''cheap'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/1cheap/Cheap<<i>>.jpg" 	height="250" /></div></a>'
 		end
 		i += 1
 	if i <= 85:jump 'loopcheap'
@@ -23,9 +23,9 @@ if $ARGS[0] = 'list':
 	:loopaverage
 		gs 'clothing_attributes', 'cheap', i
 		if CloStyle ! 5:
-			if average[i] = 1 and averageH[i] > 0 and averageB[i] > (bedra - 8) and averageB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''average'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/2average/Average<<i>>.jpg" 	height="250" /></div></a>'
+			if average[i] = 1 and averageS[i] = 0 and averageH[i] > 0 and averageB[i] > (bedra - 8) and averageB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''average'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/2average/Average<<i>>.jpg" 	height="250" /></div></a>'
 		else
-			if average[i] = 1 and averageH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''average'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/2average/Average<<i>>.jpg" 	height="250" /></div></a>'
+			if average[i] = 1 and averageS[i] = 0 and averageH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''average'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/2average/Average<<i>>.jpg" 	height="250" /></div></a>'
 		end
 		i += 1
 	if i <= 125:jump 'loopaverage'
@@ -34,53 +34,53 @@ if $ARGS[0] = 'list':
 	:loopexpensive
 		gs 'clothing_attributes', 'cheap', i
 		if CloStyle ! 5:
-			if expensive[i] = 1 and expensiveH[i] > 0 and expensiveB[i] > (bedra - 8) and expensiveB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''expensive'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/3expensive/Expensive<<i>>.jpg" 	height="250" /></div></a>'
+			if expensive[i] = 1 and expensiveS[i] = 0 and expensiveH[i] > 0 and expensiveB[i] > (bedra - 8) and expensiveB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''expensive'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/3expensive/Expensive<<i>>.jpg" 	height="250" /></div></a>'
 		else
-			if expensive[i] = 1 and expensiveH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''expensive'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/3expensive/Expensive<<i>>.jpg" 	height="250" /></div></a>'
+			if expensive[i] = 1 and expensiveS[i] = 0 and expensiveH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''expensive'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/3expensive/Expensive<<i>>.jpg" 	height="250" /></div></a>'
 		end
 		i += 1
 	if i <= 147:jump 'loopexpensive'
 
 	i = 1
 	:loopformal
-		if formal[i] = 1 and formalH[i] > 0 and formalB[i] > (bedra - 8) and formalB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''formal'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/4formal/Formal<<i>>.jpg" 	height="250" /></div></a>'
+		if formal[i] = 1 and formalS[i] = 0 and formalH[i] > 0 and formalB[i] > (bedra - 8) and formalB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''formal'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/4formal/Formal<<i>>.jpg" 	height="250" /></div></a>'
 		i += 1
 	if i <= 14:jump 'loopformal'
 
 	i = 1
 	:loopoffice
-		if office[i] = 1 and officeH[i] > 0 and officeB[i] > (bedra - 8) and officeB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''office'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/5office/Office<<i>>.jpg" 	height="250" /></div></a>'
+		if office[i] = 1 and officeS[i] = 0 and officeH[i] > 0 and officeB[i] > (bedra - 8) and officeB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''office'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/5office/Office<<i>>.jpg" 	height="250" /></div></a>'
 		i += 1
 	if i <= 30:jump 'loopoffice'
 
 	i = 1
 	:loopschool
-		if school[i] = 1 and schoolH[i] > 0 and schoolB[i] > (bedra - 8) and schoolB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''school'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/6school/School<<i>>.jpg" 	height="250" /></div></a>'
+		if school[i] = 1 and schoolS[i] = 0 and schoolH[i] > 0 and schoolB[i] > (bedra - 8) and schoolB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''school'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/6school/School<<i>>.jpg" 	height="250" /></div></a>'
 		i += 1
 		if i = 6: i = 7
 	if i <= 14:jump 'loopschool'
 
 	i = 1
 	:loopexercise
-		if exercise[i] = 1 and exerciseH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''exercise'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/7exercise/Exercise<<i>>.jpg" 	height="250" /></div></a>'
+		if exercise[i] = 1 and exerciseS[i] = 0 and exerciseH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''exercise'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/7exercise/Exercise<<i>>.jpg" 	height="250" /></div></a>'
 		i += 1
 	if i <= 26:jump 'loopexercise'
 
 	i = 1
 	:loopnaughty
-		if naughty[i] = 1 and naughtyH[i] > 0 and naughtyB[i] > (bedra - 8) and naughtyB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''naughty'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/8naughty/Naughty<<i>>.jpg" 	height="250" /></div></a>'
+		if naughty[i] = 1 and naughtyS[i] = 0 and naughtyH[i] > 0 and naughtyB[i] > (bedra - 8) and naughtyB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''naughty'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/8naughty/Naughty<<i>>.jpg" 	height="250" /></div></a>'
 		i += 1
 	if i <= 67:jump 'loopnaughty'
 
 	i = 1
 	:loopexhibit
-		if exhibit[i] = 1 and exhibitH[i] > 0 and exhibitB[i] > (bedra - 8) and exhibitB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''exhibit'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/9exhibit/Exhibit<<i>>.jpg" 	height="250" /></div></a>'
+		if exhibit[i] = 1 and exhibitS[i] = 0 and exhibitH[i] > 0 and exhibitB[i] > (bedra - 8) and exhibitB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''exhibit'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/9exhibit/Exhibit<<i>>.jpg" 	height="250" /></div></a>'
 		i += 1
 	if i <= 30:jump 'loopexhibit'
 
 	i = 1
 	:loopuniform
-		if uniform[i] = 1 and uniformH[i] > 0 and uniformB[i] > (bedra - 8) and uniformB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''uniform'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/10uniform/Uniform<<i>>.jpg" 	height="250" /></div></a>'
+		if uniform[i] = 1 and uniformS[i] = 0 and uniformH[i] > 0 and uniformB[i] > (bedra - 8) and uniformB[i] < (bedra + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''uniform'', <<i>>"><div style="width:100%; max-width:250px; max-height:250px;"><img src="images/Clothing/10uniform/Uniform<<i>>.jpg" 	height="250" /></div></a>'
 		i += 1
 	if i <= 24:jump 'loopuniform'
 end

+ 1 - 1
locations/dachain

@@ -1,7 +1,7 @@
 # dachain
 clr
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 fcolor = rgb(0, 0, 0)
 bcolor = rgb(255, 255, 255)
 lcolor = rgb(106, 90, 205)

+ 1 - 1
locations/dachamy

@@ -3,7 +3,7 @@ $metka = $ARGS[0]
 $loc = $CURLOC
 clr
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 '<center><h4>Cottage</h4></center>'
 '<center><img src="images/etogame/dachamy.jpg"></center>'
 'Your favorite summer residence.'

+ 1 - 1
locations/dachaogr

@@ -9,7 +9,7 @@ $metkaFight = $ARGS[0]
 $locFight = $CURLOC
 *clr
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 !'
 fcolor = rgb(0, 0, 0)
 bcolor = rgb(255, 255, 255)

+ 1 - 1
locations/dachaogr0

@@ -1,7 +1,7 @@
 # dachaogr0
 clr
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 fcolor = rgb(0, 0, 0)
 bcolor = rgb(255, 255, 255)
 lcolor = rgb(106, 90, 205)

+ 1 - 1
locations/dachi

@@ -3,7 +3,7 @@ $metka = $ARGS[0]
 $loc = $CURLOC
 clr
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 '<center><h4>Suburban Cooperative</h4></center>'
 '<center><img src="images/etogame/dachi.jpg"></center>'
 

+ 5 - 5
locations/dibodi

@@ -6,7 +6,7 @@ if $ARGS[0] = 'os1':
 	cls
 	cla
 	gs'stat'
-	gs'time'
+	gs 'outdoors'
 	gs'dinam'
     '<center><img src="images/lmps/downud1.jpg"></center>'
     'You will be amazed at her ability to keep people.'
@@ -25,7 +25,7 @@ $dinbodiartos = {
 	cls
 	cla
 	gs'stat'
-	gs'time'
+	gs 'outdoors'
 	set bodimodel = 1
 	'<center><img src="images/lmps/downud1.jpg"></center>'
     '"I`m so glad, that you agreed,nothing, I`m on you" - davushka said happily and continued response nedozhidayas - "Moses Kruzhinsky-artist, everyone calls simply Masya - She pointed at a man painting a girl busy."'
@@ -43,7 +43,7 @@ $sgtusa = {
 	cls
 	cla
 	gs'stat'
-	gs'time'
+	gs 'outdoors'
 	set tusa = 1
 	'<center><img src="images/lmps/photo.jpg"></center>'
     'You came to talking to girls and boys and greeted.'
@@ -55,7 +55,7 @@ $sotusa = {
     cls
 	cla
 	gs'stat'
-	gs'time'
+	gs 'outdoors'
 	
 	'<center><img src="images/lmps/photo.jpg"></center>'
 	if sttan = 0 and tanga = 0:
@@ -71,7 +71,7 @@ $sptusa = {
     cls
 	cla
 	gs'stat'
-	gs'time'
+	gs 'outdoors'
 	arts = 1
 	minut += 5
 	'<center><img src="images/lmps/gerladvr.jpg"></center>'

+ 4 - 4
locations/dimaGoHome2

@@ -5,10 +5,10 @@ gs 'stat'
 if week < 6:
 	if hour >= 20 or hour < 7:
 		'It is too late to be visiting, you decide it would be better to try at a more suitable time.'
-		act 'Leave':minut += 15 & gt'Pavresident'
+		act 'Leave':minut += 15 & gt'pavResidential'
 	elseif hour < 16 and hour >= 7 or dimaGohomeday = daystart:
 		'You go to a beautiful private home and rang the bell. You open the door to a pretty blonde of about forty years, apparently Dimas mother. She looked at you and smiles, "Dima is not at home."'
-		act 'Leave':minut += 15 & gt'Pavresident'
+		act 'Leave':minut += 15 & gt'pavResidential'
 	elseif hour >= 16 and hour < 20:
 		'You go to a beautiful private home and rang the bell. You open the door to a pretty blonde of about forty years, apparently Dimas mother. She looks at you and smile, "Looking for Dimka?" You nod and Dimas mother lets you in.'
 		act 'Go into the room Dimka':dimaGohomeday = daystart & gt 'dimaHome'
@@ -16,10 +16,10 @@ if week < 6:
 elseif week >= 6:
 	if hour >= 20 or hour < 5:
 		'It is too late to be visiting, you decide it would be better to try at a more suitable time.'
-		act 'Leave':minut += 15 & gt'Pavresident'
+		act 'Leave':minut += 15 & gt'pavResidential'
 	elseif hour >= 5 and hour < 10 or dimaGohomeday = daystart:
 		'You go to a beautiful private home and rang the bell. You open the door to a pretty blonde of about forty years, apparently Dimas mother. She looked at you and smiles, "Dima is not at home."'
-		act 'Leave':minut += 15 & gt'Pavresident'
+		act 'Leave':minut += 15 & gt'pavResidential'
 	elseif hour >= 10 and hour < 20:
 		'You go to a beautiful private home and rang the bell. You open the door to a pretty blonde of about forty years, apparently Dimas mother. She looks at you and smile, "Looking for Dimka?" You nod and Dimas mother lets you in.'
 		act 'Go into the room Dimka':dimaGohomeday = daystart & gt 'dimaHome'

+ 21 - 21
locations/dimaHome

@@ -43,7 +43,7 @@ if $ARGS[0] = '':
 				'<center><img src="images/qwest/alter/evdima/filming.jpg"></center>'
 				'Your head is swimming at first then you seem to be flying above the floor. Dimka smiles at you and unbuttons his pants, taking out his flaccid penis. "Crawl here!" he commands. You don''t know why but this seems very funny. You sit in front of Dimka and kiss his dick, then you start to lick it carefully with your tongue as it thickens. Finally, Dimka''s member is completely erect and glistens with your saliva. You take the head of Dimka''s cock between your lips and slowly let it slide into your mouth. When you look up, you see that Dimka is recording you with his camera. You giggle and make a silly face with his cock in your mouth. You begin to eroticly lick his cock and began to suck it in front of the camera, trying to act as sexily as you can, pretending to be a porn star. Dimka soon groans slightly and your mouth fills with spurting jets of sperm. You immediately start to swallow the hot thick liquid. Dimka turns off the camera and puts it aside. "That was awesome. You''re a great cocksucker."'
 
-				act 'Leave':gt 'Pavresident'
+				act 'Leave':gt 'pavResidential'
 			end
 		end
 
@@ -94,7 +94,7 @@ if $ARGS[0] = '':
 								gs 'stat'
 								'You open the door and run out of the bedroom, still frantically struggling into your clothes and head to the door of the house. Following you like a malevolent spirit you hear Dimka''s voice  "Go ahead, run like a squeeling little pig. Tomorrow everyone will know, you cocksucking bitch!."'
 
-								act 'Leave':gt 'Pavresident'
+								act 'Leave':gt 'pavResidential'
 							end
 						end
 
@@ -120,7 +120,7 @@ if $ARGS[0] = '':
 								'He licks his lips hungrily then grabs your panty clad as hard enough to leave bruises. "Yes, this ass belongs to me now."'
 								
 							end	
-							act 'Leave':gt 'Pavresident'
+							act 'Leave':gt 'pavResidential'
 						end
 					end
 				end
@@ -249,7 +249,7 @@ if $ARGS[0] = 'dimkaplays':
 						'<center><img src="images/qwest/alter/evdima/cum.jpg"></center>'
 						'Suddenly, Dimka''s cock spurts cum in your mouth and you continue sucking with your mouth full of sperm. Finally, Dimka ceases to ejaculate and you swallow his cum.'
 
-						act 'Leave':gt 'Pavresident'
+						act 'Leave':gt 'pavResidential'
 					end
 				elseif dimadalrand = 1:
 					act 'further':
@@ -265,7 +265,7 @@ if $ARGS[0] = 'dimkaplays':
 						'<center><img src="images/qwest/alter/evdima/face.jpg"></center>'
 						'Dimka suddenly pulls his dick out of your mouth and starts cumming on your face. Hot ropes of sperm land you on the cheek, nose and lips. Soon almost your entire face is covered with warm and sticky cumshot.'
 
-						act 'Leave':gt 'Pavresident'
+						act 'Leave':gt 'pavResidential'
 					end
 				elseif dimadalrand = 2:
 					act 'further':
@@ -288,7 +288,7 @@ if $ARGS[0] = 'dimkaplays':
 							'Dimka grabs you by the hair and pulls you onto his member. Hard cock enters your throat, you resist gagging but your eyes still start to water. Dimka pays no attention to you, he just fucks your mouth with his hard cock. Finally the torture ends and he fills your mouth with his hot slimy sperm that you immediately swallow.'
 						end
 
-						act 'Leave':gt 'Pavresident'
+						act 'Leave':gt 'pavResidential'
 					end
 				elseif dimadalrand = 3:
 					act 'further':
@@ -310,7 +310,7 @@ if $ARGS[0] = 'dimkaplays':
 							'<center><img src="images/qwest/alter/evdima/sitcum.jpg"></center>'
 							'Suddenly, Dimka''s cock begins to let fly jets of hot cum that splatter on your face, covering it in thick, viscous slime.'
 
-							act 'Leave':gt 'Pavresident'
+							act 'Leave':gt 'pavResidential'
 						end
 					end
 				elseif dimadalrand = 4:
@@ -331,7 +331,7 @@ if $ARGS[0] = 'dimkaplays':
 						dynamic $sexstart2
 						dynamic $sexcum
 
-						act 'Leave':gt 'Pavresident'
+						act 'Leave':gt 'pavResidential'
 					end
 				elseif dimadalrand = 5:
 					act 'further':
@@ -346,7 +346,7 @@ if $ARGS[0] = 'dimkaplays':
 						'Dimka puts you on the sofa with your ass in the air.'
 						dynamic $analsexrude
 
-						act 'Leave':gt 'Pavresident'
+						act 'Leave':gt 'pavResidential'
 					end
 				elseif dimadalrand = 6:
 					act 'further':
@@ -355,7 +355,7 @@ if $ARGS[0] = 'dimkaplays':
 						'<center><img src="images/qwest/alter/evdima/cum.jpg"></center>'
 						''
 
-						act 'Leave':gt 'Pavresident'
+						act 'Leave':gt 'pavResidential'
 					end
 				end
 			end
@@ -425,7 +425,7 @@ if $ARGS[0] = '0':
 			'<center><img src="images/qwest/alter/evdima/gagbj.jpg"></center>'
 			'Dimka''s cock enters your mouth through the ring and drives it to the entrance to your throat. The ring prevents you from doing anything to stop him except to try to use your tongue to force him out. The actions of your tongue on his cock only seem to excite him further. You gag as the head of his dick presses up against the soft palet at the back of your mouth. Dimka his cock back then with all his strength drives it deep into your throat. You choke and gag as drool flows from your mouth, mixing with your tears and snot on your face as you stuggle to breath through your nose. Dimka fiercely drives his penis in your mouth, f***ing your throat until it burns like fire. You almost faint from suffocation as you choke on the cock jammed deeply inside of you as it spews its slimy load down your thoat. To your relief, Dimka''s cock begins to soften and he pulls it out of you. He then takes the gag out of your mouth and your hands are untied.'
 
-			act 'Leave':gt 'Pavresident'
+			act 'Leave':gt 'pavResidential'
 		end
 	end
 end
@@ -451,7 +451,7 @@ if $ARGS[0] = '1':
 	'<center><img src="images/qwest/alter/evdima/ab.jpg"></center>'
 	'Dimka roughly pulls off your panties and puts them on your head. He inserts his penis into your mouth and begins to f*** you hard in the mouth. Your throat is burning with fire from the fact that his cock penterates you nearly to the balls on every thrust. Dimka growls at you "A cocksucker''s mouth is her second pussy, and what should be done with by a pussy? f*** it hard, right to the uterus!" Dimka slaps you on the cheek with his hand "Take it in your pussy!" The dick in your mouth starts to cum and fills your mouth with sperm, you swallow.'
 
-	act 'Leave':gt 'Pavresident'
+	act 'Leave':gt 'pavResidential'
 end
 
 if $ARGS[0] = '2':
@@ -473,7 +473,7 @@ if $ARGS[0] = '2':
 	'Dimka fucks you and, instead of moaning, you make funny clown sounds.'
 	dynamic $sexcum
 
-	act 'Leave':gt 'Pavresident'
+	act 'Leave':gt 'pavResidential'
 end
 
 if $ARGS[0] = '3':
@@ -492,7 +492,7 @@ if $ARGS[0] = '3':
 	'Dimka binds and ties you to your knees on a little cart with casters and he puts a clown horn in your mouth and tapes it in place.'
 	dynamic $analsexrude
 
-	act 'Leave':gt 'Pavresident'
+	act 'Leave':gt 'pavResidential'
 end
 
 if $ARGS[0] = '4':
@@ -510,7 +510,7 @@ if $ARGS[0] = '4':
 	'<center><img src="images/qwest/alter/evdima/nar.jpg"></center>'
 	'Dimka ties your hands tightly behind your back, then ties your legs so that they are fully folder under you. He puts a collar on you and drags you to a post to which a dildo has been taped. Dimka makes you take the dildo into your mouth then he ties the collar to the post so that you can not get the dildo out of your mouth. Just when you think Dimka has finished with you, he pulls the rope on your collar forcing the dildo down your throat. Dimka begins to enjoy the sight of your face reddened by suffocation, while streams of snot, saliva and tears run down your face. You choke with dildo in your throat and you can feel your body keep trying to vomit. You start to fear that this is how you will die, choked with a dildo down your throat. As you start to lose consciousness, Dimka finally frees you and you are able to finally breathe freely.'
 
-	act 'Leave':gt 'Pavresident'
+	act 'Leave':gt 'pavResidential'
 end
 
 if $ARGS[0] = '5':
@@ -527,7 +527,7 @@ if $ARGS[0] = '5':
 	'<center><img src="images/qwest/alter/evdima/spank.jpg"></center>'
 	'Dimka you ties to a pole and begins to whip your ass. Sharp flashes of pain burn through your drug induced euphoria and you begin screaming and moaning, begging Dimka to stop. Finally Dimka is satisfied and he releases you.'
 
-	act 'Leave':gt 'Pavresident'
+	act 'Leave':gt 'pavResidential'
 end
 
 if $ARGS[0] = '6':
@@ -547,7 +547,7 @@ if $ARGS[0] = '6':
 	if pirsF > 0:'When he tires Dimka pulls the needles out out of your nipples and sets you free.'
 	if pirsF = 0:pirsF = 1 & 'When he tires Dimka pierces your nipples with metal bars, then sets you free.'
 
-	act 'Leave':gt 'Pavresident'
+	act 'Leave':gt 'pavResidential'
 end
 
 if $ARGS[0] = '7':
@@ -566,7 +566,7 @@ if $ARGS[0] = '7':
 	if pirsA > 0:'When he tires Dimka pulls the needles out out of your tongue and sets you free.'
 	if pirsA = 0:pirsA = 1 & 'When he tires Dimka pulls out the needles, pierces your tongue with a metal bar, then sets you free'
 
-	act 'Leave':gt 'Pavresident'
+	act 'Leave':gt 'pavResidential'
 end
 
 if $ARGS[0] = '8':
@@ -585,7 +585,7 @@ if $ARGS[0] = '8':
 	if pirsG > 0:'When he tires Dimka takes the pins out out of your pussy and sets you free.'
 	if pirsG = 0:pirsG = 1 & 'When he tires Dimka takes the pins out out of your pussy, pierces your clitois, then sets you free'
 
-	act 'Leave':gt 'Pavresident'
+	act 'Leave':gt 'pavResidential'
 end
 
 if $ARGS[0] = '9':
@@ -594,7 +594,7 @@ if $ARGS[0] = '9':
 	'<center><img src="images/qwest/alter/evdima/cum.jpg"></center>'
 	''
 
-	act 'Leave':gt 'Pavresident'
+	act 'Leave':gt 'pavResidential'
 end
 
 if $ARGS[0] = '10':
@@ -603,7 +603,7 @@ if $ARGS[0] = '10':
 	'<center><img src="images/qwest/alter/evdima/cum.jpg"></center>'
 	''
 
-	act 'Leave':gt 'Pavresident'
+	act 'Leave':gt 'pavResidential'
 end
 
 --- dimaHome ---------------------------------

+ 4 - 4
locations/dimaRudeEv

@@ -32,7 +32,7 @@ if dimarudorient = 0:
 				GorSlut = 2
 				'Dimka said Fyodor seeing evil eye "And if I have proof that it cocksucker, what do you say then." Fedor was a little embarrassed but firmly said "That can not be!" Dimka smiled, "Can not? Look here." Dimka took the phone and turned on the video. You blushed as cancer, realizing that for the videos included Theodore Dimka. The video was clearly visible, as you ring is inserted into the mouth and hard cock enters your mouth getting into the throat. You drools and tears, but you do not resist, and willingly put your mouth. Fedor flushed and looked at you, "Oh, you two-faced bitch!" He turned away from you and walked away quickly. Dimka glared at you, "I decided to Quit cocksucker? Fuck you in the mouth, I''ll throw it. And today, everyone will know what you look like." Dimka laughed and walked away from you.'
 
-				act 'Leave':gt 'Pavresident'
+				act 'Leave':gt 'pavResidential'
 			elseif dimaFilm = 0:
 				'Dimka said, "Yes I had her in the bushes near a disco in the mouth fuck." Fedka even stronger scowled and walked right up to Dimka "Well ka again repeat what you said?" Dimka noticeably scared, "Yes it''s true, I have it near the disco sucked." Fyodor shoved Dimka, Dimka flew from him and began to inconsistent to say "Get away from me! Want to meet her, come on." Fyodor came to Dimka and grabbed him by the lapels "Once again I hear you about the light, all garbage talking about, sorry." Dimka fidgeted nervously trying to escape from the grip of steel Fedor "Come on, calm down, I knew." Fyodor Dimka pushed and pulled you aside.'
 
@@ -84,7 +84,7 @@ $dimarudorient2 = {
 			gs 'stat'
 			'You opened the door and went to the door of the house. Following Dimka heard the voice, "Go ahead, run a pig. Tomorrow all will know that you cocksucker."'
 
-			act 'Leave':gt 'Pavresident'
+			act 'Leave':gt 'pavResidential'
 		end
 	end
 
@@ -101,7 +101,7 @@ gs 'cum_manage'
 		'<center><img src="images/qwest/alter/evdima/filming.jpg"></center>'
 		'You sat before Dimka and started to suck his dick. Dimka concentrated shot you on your camera. His cock quickly became stronger and soon spurted semen in your mouth. You carefully swallowed it before the camera. Dimka turned off the camera and put it aside. "Cool.you''re A great cocksucker."'
 
-		act 'Leave':gt 'Pavresident'
+		act 'Leave':gt 'pavResidential'
 	end
 }
 
@@ -130,7 +130,7 @@ gs 'cum_manage'
 			'<center><img src="images/qwest/alter/evdima/gagbj.jpg"></center>'
 			'Member unopposed went through the ring in your mouth and ran into your throat. You''re a bit choked, Dimka took a member and with full force you drove him in the throat. Do you drool flowed, tears and snot on her face. Dimka furiously drives the his penis in your mouth, burning with fire your fucking throat. Finally he groaned and drove to the base member in your mouth began to cum in your throat. You almost fainted from suffocation and spasms in the throat of any member which is clamped even tighter inside you. Finally Dimka became a member to fall and he took it out of you. After that he took the gag out of your mouth and your hands untied.'
 			'"Come visit me anytime."'
-			act 'Leave':gt 'Pavresident'
+			act 'Leave':gt 'pavResidential'
 		end
 	end
 }

+ 1 - 1
locations/din2

@@ -194,7 +194,7 @@ $snarkozaka = {
 	SNarkTimes += 1
 	narkozakday=day
 	gs'stat'
-	gs'time'
+	gs 'outdoors'
 	'<center><B>Peron Pavlovsky</B></center>'
 	'<center><img src="images/pic/vokzalperG.jpg"></center>'
 	'You buy the drugs and without thinking twice you shoot up.'

+ 12 - 11
locations/din_bad

@@ -890,22 +890,23 @@ $d_cycreport_update = {
 			$cycreport_txt = 'It has been <<temp>> days since you last remember having a period.'
 		end
 	elseif cyccustom = 0:
-		if $cycreport_txt = 'In labour':
-			$cycreport_txt = 'In labour'
-		elseif thinkpreg = 1 or knowpreg = 1:
-			if knowpreg = 0: $temp = ' think you'
-			if $wombthfath = 'Unknown' or $wombthfath = '':
-				$cycreport_txt = 'You<<$temp>> are pregnant. You aren''t yet sure who the father is. Based on your last remembered period, your due date is probably around <<$pregduedate>>.'
-			else
-				$cycreport_txt = 'You<<$temp>> are pregnant with <<$wombthfath>>''s baby. Based on your last remembered period, your due date is probably around <<$pregduedate>>.'
+		if $cycreport_txt ! 'In labour':
+			if thinkpreg = 1 or knowpreg = 1:
+				if knowpreg = 0: $temp = ' think you'
+				if $wombthfath = 'Unknown' or $wombthfath = '':
+					$cycreport_txt = 'You<<$temp>> are pregnant. You aren''t yet sure who the father is. Based on your last remembered period, your due date is probably around <<$pregduedate>>.'
+				else
+					$cycreport_txt = 'You<<$temp>> are pregnant with <<$wombthfath>>''s baby. Based on your last remembered period, your due date is probably around <<$pregduedate>>.'
+				end
+			elseif $cycreport_txt ! 'You do not believe you have periods any more.':
+				temp = daystart-daylastperiod
+				$cycreport_txt = 'It has been <<temp>> days since you last remember having a period.'
 			end
-		elseif $cycreport_txt ! 'You do not believe you have periods any more.':
-			temp = daystart-daylastperiod
-			$cycreport_txt = 'It has been <<temp>> days since you last remember having a period.'
 		end
 	end
 }
 
+
 $d_cycreport_upduedate = {
 	temp = (280 + daylastperiod) - daystart
 	pregdueday = day

+ 1 - 1
locations/din_pav

@@ -3,7 +3,7 @@ $pavserjil = {
 	cls
 	cla
 	gs'stat'
-	gs'time'
+	gs 'outdoors'
 	set pavserhom = 1
 	'<center><img src="images/pic/pavserjil2.jpg" ></center>'
     'And it is not clear why you itself drew attention to him.'

+ 1 - 1
locations/dinam

@@ -82,7 +82,7 @@ $dinbodiartos1 = {
 	cls
 	cla
 	gs'stat'
-	gs'time'
+	gs 'outdoors'
 	gs'dinam'
 	bodimodel = 1
 	'<center><img src="images/lmps/downud1.jpg"></center>'

+ 2 - 2
locations/dom_gor

@@ -6,7 +6,7 @@ $metka = $ARGS[0]
 $loc = $CURLOC
 clr
 gs 'stat'
-gs 'time'
+gs 'indoors'
 fcolor = rgb(0, 0, 0)
 bcolor = rgb(255, 255, 255)
 lcolor = rgb(106, 90, 205)
@@ -179,7 +179,7 @@ act 'Go out onto the street':
 		'<b><font color="red">You are too ill to take to the streets.</font></b>'
 		xgt $curloc
 	else
-		xgt 'Pavcomercial'
+		xgt 'pavCommercial'
 	end
 
 end

+ 1 - 1
locations/dort

@@ -1,6 +1,6 @@
 # dort
 gs'stat'
-gs'time'
+gs 'outdoors'
 
 '<center><img src="images/pic/prigor1.jpg" ></center>'
 

+ 1 - 1
locations/down

@@ -23,7 +23,7 @@ houseob = 0
 borMir = 0
 gs 'dinam'
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 '<center><b>City center</b></center>'
 '<center><img src="images/etogame/down.JPG"></center>'
 

+ 1 - 1
locations/dvor

@@ -1,7 +1,7 @@
 # dvor
 set minut += 5
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 '<center><img src="images/pic/dvor1.jpg" ></center>'
 !'In the yards of the entrance to the <a href="exec:GT ''bordel''">brothel</a>'
 

+ 1 - 1
locations/dvorik

@@ -4,7 +4,7 @@ $locM = $CURLOC
 
 set minut += 15
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 '<center><img src="images/pic/dvor1.jpg" ></center>'
 
 

+ 1 - 1
locations/ender

@@ -104,7 +104,7 @@ if $ARGS[0] = 'loss':
 		sex = sex + 1
 		vagina = vagina + 1
 		guy = guy + 1
-		$boy = 'Rapist'
+		dynamic $CatName, 'Rapist'
 		cumprecheck = 1
 		gs 'cum_manage'
 		spafinloc = 1

+ 3 - 3
locations/etoexhib

@@ -574,7 +574,7 @@ if $ARGS[0] = 'pos17':
 		act 'Sign in here':money -= 25 & minut += 15 & gt 'etoexhib', 'pos18'
 	end
 
-	act 'Go back to the train station':gt 'Pavcomercial'
+	act 'Go back to the train station':gt 'pavCommercial'
 end
 
 if $ARGS[0] = 'pos18':
@@ -787,7 +787,7 @@ if $ARGS[0] = 'pos20':
 	if teachlevel > 0 and teachlevel < 10:workPTU = 2
 
 	act 'Enter the Lyceum':gt 'etoexhib', 'pos19'
-	act 'Leave':gt 'Pavcomercial'
+	act 'Leave':gt 'pavCommercial'
 end
 
 if $ARGS[0] = 'pos21':
@@ -1411,7 +1411,7 @@ if $ARGS[0] = 'pos40':
 	if gor_dorm = 2:act 'Search commandant':gt 'comendant', 'pos3'
 	if gor_dorm >= 3:act 'Inspect the barn':gt 'etoexhib', 'pos43'
 
-	act 'Get_Away':gt 'Pavcomercial'
+	act 'Get_Away':gt 'pavCommercial'
 end
 
 if $ARGS[0] = 'pos41':

+ 1 - 1
locations/fbDorm

@@ -14,7 +14,7 @@ act '"Ehmm... I changed my mind"':
 	if dom > 0:
 		'You make up your mind; you should not be doing this. You apologize to him: "Sorry <<$bname>>, but I don''t think this is such a good idea. I have to go... take care." Then you quickly kiss him on the cheek and leave, ignoring his pleas. Fortunately he doesn''t follow you.'
 
-		act 'Leave':gt 'Pavresident'
+		act 'Leave':gt 'pavResidential'
 	else
 		'Before you know it you nod, and he smiles as he takes you by the arm and guides you into the hostel. You''re still not sure about this, and somewhat question your decision while you let him show you to his room.'
 		dynamic $d_fbd_start

+ 1 - 1
locations/fbDormD

@@ -224,7 +224,7 @@ $d_fbd_end = {
 		'<center><img src="images/qwest/alter/Ev/fbhend.jpg"></center>'
 		'Once you''re finished, you quickly brush up and begin to put your clothes back on. <<$bname>> grins at you smugly, already dressed again in a clean fancy dress shirt and pants. He runs his hand through your hair and says: "Thanks for that, <<$nickname>>. My friend was right, you Pavlovsk girls are fun! My roommates can be back at any time, though... you should probably go? Unless you want to have another go with them too?"'
 
-		act 'Leave':gt 'Pavresident'
+		act 'Leave':gt 'pavResidential'
 	end
 }
 

+ 1 - 1
locations/fbHouse

@@ -72,7 +72,7 @@ act 'Kiss him':
 				'<center><img src="images/qwest/alter/Ev/fbhend.jpg"></center>'
 				'Once you''re finished, you quickly brush up and begin to put your clothes back on. <<$bname>> smiles at you, already dressed again in a clean fancy dress shirt and pants. You see him think for a few seconds, as if he''s not sure how to bring it up. Then he says: "Thanks <<$nickname>>, I really needed that! I''d love to spend more time with you, but I''m afraid I have to get back to work now. You should go."'
 
-				act 'Leave':gt 'Pavresident'
+				act 'Leave':gt 'pavResidential'
 			end
 		end
 	end

+ 2 - 2
locations/furisex

@@ -44,7 +44,7 @@ elseif furisex = 6:
 	act 'Leave':
 	furisex = 0
 
-	if nroad = 0:nroad = 20 & gt 'Pavcomercial'
+	if nroad = 0:nroad = 20 & gt 'pavCommercial'
 	if nroad = 20:nroad = 0 & gt 'nord'
 	end
 elseif furisex = 100:
@@ -67,7 +67,7 @@ elseif furisex = 101:
 	act 'Leave':
 	furisex = 0
 
-	if nroad = 0:nroad = 20 & gt 'Pavcomercial'
+	if nroad = 0:nroad = 20 & gt 'pavCommercial'
 	if nroad = 20:nroad = 0 & gt 'nord'
 	end
 end

+ 1 - 1
locations/gLakeNude

@@ -1,7 +1,7 @@
 # gLakeNude
 cls
 gs'stat'
-gs'time'
+gs 'outdoors'
 '<center><H4>Secluded beach</H4></center>'
 if month>=3 and month<=5:
 	if hour>=6 and hour<=17:

+ 1 - 1
locations/gadriver

@@ -6,7 +6,7 @@ if $ARGS[0] = 'start':
 
 	clr
 	gs 'stat'
-	gs 'time'
+	gs 'outdoors'
 
 	'<center><H4>River Slavka</H4></center>'
 

+ 1 - 1
locations/gadukino

@@ -15,7 +15,7 @@ if $ARGS[0] = '':
 	end
 	clr
 	gs 'stat'
-	gs 'time'
+	gs 'outdoors'
 	'<center><h4>village Gadyukino</h4></center>'
 
 	if month >= 5 and month <= 9:

+ 2 - 2
locations/gaptek

@@ -5,12 +5,12 @@ clr
 CLOSE ALL
 if sound = 0:PLAY 'sound/shop.mp3',30
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 
 '<center><B><font color="maroon">Pharmacy</font></B></center>'
 '<center><img src="images/etogame/aptek.JPG"></center>'
 
-act 'Leave the pharmacy':gt 'Pavcomercial'
+act 'Leave the pharmacy':gt 'pavCommercial'
 
 if hour < 8 or hour > 20:
 	'The pharmacy is currently closed. There''s a sign on the door, that says it''s open between 8:00 and 20:00 every day.'

+ 2 - 2
locations/garmassiv

@@ -3,14 +3,14 @@ $metka = $ARGS[0]
 $loc = $CURLOC
 clr
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 '<center><h4>Garage array</h4></center>'
 '<center><img src="images/pic/garmassiv.jpg"></center>'
 'A large area near the edge of Pavlovsk filled with garages. The weather in Pavlovsk can be brutal especially in the winter, so people who own a car often have a garage to put it away safely.'
 
 if StoryLine = 1:'Your <a href="exec:minut += 5 & gt ''gargazel''">stepfather''s garage</a> is around here somewhere.'
 
-act 'Go back to town':minut += 5 & gt 'Pavresident'
+act 'Go back to town':minut += 5 & gt 'pavResidential'
 
 --- garmassiv ---------------------------------
 

+ 2 - 2
locations/gdk

@@ -4,7 +4,7 @@ $metka = $ARGS[0]
 $loc = $CURLOC
 music_on = 0
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 '<center><b><font color="maroon">Community Centre</font></b></center>'
 
 if hour < 9:'<center><img src="images/etogame/dk_night.jpg"></center>'
@@ -33,7 +33,7 @@ if hour >= 12 and hour <= 20:
 	act 'Go upstairs to the hobby clubs':gt'gdkkru'
 end
 
-act 'Leave':gt 'Pavresident'
+act 'Leave':gt 'pavResidential'
 
 gs'family'
 

+ 44 - 25
locations/gdksport

@@ -485,7 +485,7 @@ if $ARGS[0] = 'starlets':
 								gs 'stat'
 								'You got in the car and soon, along with the rest of the troupe, you returned to town.'
 
-								act 'Leave':gt 'Pavresident'
+								act 'Leave':gt 'pavResidential'
 							end
 
 							act 'Agree':
@@ -518,7 +518,7 @@ if $ARGS[0] = 'starlets':
 					gs 'stat'
 					'You got in the car and soon, along with the rest of the troupe, you returned to town.'
 
-					act 'Leave':gt 'Pavresident'
+					act 'Leave':gt 'pavResidential'
 				end
 			end
 		end
@@ -537,7 +537,7 @@ if $ARGS[0] = 'cab_home':
 		'Along the way you wiped the sperm from your face.'
 	end
 
-	act 'Leave':gt 'Pavresident'
+	act 'Leave':gt 'pavResidential'
 end
 
 if $ARGS[0] = 'racing2':
@@ -966,26 +966,45 @@ if $ARGS[0] = 'ShowerWithIvan':
 					'Penetrating further and further into your mouth, then into your throat, you take his member to the root without any problems and without causing you discomfort, and bringing Ivan "heavenly delight", if his groans and moans were any indication. Feeling that your classmate would flood your throat with his seed at any moment, you pulled your mouth off of his cock and turned and bent over, presenting your ass to Ivan. You also wanted some satisfaction.'
 				end
 
-				act 'stand doggy-style':
-					cls
-					IvanShowerQW = 10
-					minut += 5
-					horny += 20
-					$boy = 'Ivan'
-					dick = 17
-					lubonus = 2
-					gs 'stat'
-					'<center><img src="images/qwest/alter/Ev/shover2.jpg"></center>'
-					'You bent over and felt Ivan''s hand stroking your ass and anus.'
-					dynamic $analsex
-					cumspclnt = 1
-					gs 'cum_cleanup'
-					if VoltrenerVoyeur = 3:gt 'VoltrenerSexShower', '3'
-					if VoltrenerVoyeur = 4:gt 'VoltrenerSexShower', '4'
-					if VoltrenerVoyeur = 5:gt 'VoltrenerSexShower', '5'				
-					'Ivan pulls his member out of your ass and you feel the warm splatter of sperm on your back and ass cheeks.'
-
-					act 'Get out of the shower':gt 'gdksport', 'start'
+				if agape > 0:
+					act 'Continue':
+						cls
+						minut += 5
+						horny += 10
+						$boy = 'Ivan'
+						dick = 17
+						if throat < dick:throat += 1
+						spafinloc = 12
+						gs 'cum_manage'
+						gs 'stat'
+						'<center><img src="images/qwest/alter/Ev/cocksuckerswallow.jpg"></center>'
+						'Ivan wants your ass, but when he removes his cock and moves to turn you around, you tell him your butt is too sore.'
+						'He is clearly not pleased, but you take his cock back into your mouth and work the shaft while you swirl your tongue against the head.'
+						'Ivan can only hold back briefly against such an onslaught and you draw back so he can watch himself cum in your mouth.'
+						act 'Get out of the shower':gt 'gdksport', 'start'
+					end
+				else
+					act 'Turn around and bend over':
+						cls
+						IvanShowerQW = 10
+						minut += 5
+						horny += 20
+						$boy = 'Ivan'
+						dick = 17
+						lubonus = 2
+						gs 'stat'
+						'<center><img src="images/qwest/alter/Ev/shover2.jpg"></center>'
+						'As you bend over, you feel Ivan''s hand stroking your ass and his finger starts to massage your anus.'
+						dynamic $analsex
+						cumspclnt = 1
+						gs 'cum_cleanup'
+						if VoltrenerVoyeur = 3:gt 'VoltrenerSexShower', '3'
+						if VoltrenerVoyeur = 4:gt 'VoltrenerSexShower', '4'
+						if VoltrenerVoyeur = 5:gt 'VoltrenerSexShower', '5'				
+						'Ivan pulls his member out of your ass and you feel the warm splatter of sperm on your back and ass cheeks.'
+
+						act 'Get out of the shower':gt 'gdksport', 'start'
+					end
 				end
 			end
 		end
@@ -1047,7 +1066,7 @@ if $ARGS[0] = 'fedor_date':
 				'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 				'You refused to go out with him and said you wanted to just stay friends. Fedor was visibly upset and silently walked you home.'
 
-				act 'Leave':gt 'Pavresident'
+				act 'Leave':gt 'pavResidential'
 			end
 
 			act 'Agree':
@@ -1059,7 +1078,7 @@ if $ARGS[0] = 'fedor_date':
 				'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 				'You have agreed to meet with Fedor. Fedor was visibly delighted and escort you to the house on the way you viewed fun discussing movies.'
 
-				act 'Leave':gt 'Pavresident'
+				act 'Leave':gt 'pavResidential'
 			end
 		end
 	end

+ 6 - 6
locations/gevent

@@ -163,7 +163,7 @@ if $ARGS[0] = '3':
 	'<center><img src="images/gevent/3.jpg"></center>'
 	'You go with the Armenian to his home nearby. In the apartment there are two more guys, also Armenians. They speak to each other in their own language, while drinking alot of alcohol. You don''t realise just how strong it is until you are completely wasted, then they strip and fuck you, taking turns in all of your holes, finishing inside and all over you, all the while they are filming with there phones. Finally, when they are spent and bored of you, they kicked you out of the apartment.'
 
-	act '...':gt 'Pavresident'
+	act '...':gt 'pavResidential'
 end
 
 if $ARGS[0] = '4':
@@ -185,7 +185,7 @@ if $ARGS[0] = '4':
 	'<center><img src="images/gevent/4.jpg"></center>'
 	'You accompany the guy to his house, where you enjoy a few beverages with him. A while later you find yourself on your back, getting pounded by this stranger. He rides you with his hairy body and pulls out right before he orgasms, draping his load all over your buttocks. Not bothering to clean it up, you simply get dressed. You sit back down and chat with him for a while, drinking some tea in an attempt to sober up before leaving. You still feel rather drunk when you close the door behind you, returning to the streets.'
 
-	act 'Return to Pavlovsk':gt 'Pavresident'
+	act 'Return to Pavlovsk':gt 'pavResidential'
 end
 
 if $ARGS[0] = '5':
@@ -204,7 +204,7 @@ if $ARGS[0] = '5':
 	'<center><img src="images/gevent/5.jpg"></center>'
 	'The guy quickly pulls you into the bushes, separated enough from the main roads to get a quick fuck in without being noticed. Not even bothering to undress you, he simply pulls your clothes to the side and thrusts his dick inside you. Within minutes, his breathing grows heavier and he growls as he shoots his load onto your ass cheeks. He pants: "Nice, babe... you''re definitely worth the money", as he hands you 100 rubles and leaves.'
 
-	act 'Straighten your clothes':gt 'Pavresident'
+	act 'Straighten your clothes':gt 'pavResidential'
 end
 
 if $ARGS[0] = '6':
@@ -250,7 +250,7 @@ if $ARGS[0] = '6':
 	guyondisco -= 1
 	if guyondisco > 0: jump 'geventgondloop'
 	gs 'stat'
-	gs 'time'
+	gs 'outdoors'
 
 	'<center><img src="images/gevent/6.1.jpg"></center>'
 	'You barely remember what happened. You were standing against the wall at the disco, quietly enjoying the admittedly rather outdated music when a guy approached you. He started groping you, but you were too drunk to stop him. It also felt kind of nice to be wanted, so you just went along with it.'
@@ -258,7 +258,7 @@ if $ARGS[0] = '6':
 	'Taking their turns fucking your mouth and pussy mercilessly, some even came back for seconds while one of them made sure to capture all of it on camera. The last thing you remember is him taking some close-ups of your cum-covered face, saying: "Man look at this whore, no inhibitions whatsoever! This video is going to be a huge hit on the internet!"'
 	'By the time you wake up again it''s the middle of the next day, and you are lying naked in a ditch somewhere just outside of town, covered in semen. Luckily they were decent enough to at least give you your clothes back, which you find in a pile next to you with your other belongings. As you quickly get dressed you silently pray they reconsidered and didn''t share the video, but at the same time know better. As you make your way back to Pavlovsk you realize this probably hurt your reputation in town as a result, since many people will have seen the video by now.'
 
-	act 'Return to the Pavlovsk streets':gt 'Pavresident'
+	act 'Return to the Pavlovsk streets':gt 'pavResidential'
 end
 
 if $ARGS[0] = '7':
@@ -286,7 +286,7 @@ if $ARGS[0] = '7':
 	'<center><img src="images/gevent/7.jpg"></center>'
 	'The guys bring you back to their apartment, where they swiftly strip you of your clothes and subsequently fuck you in all holes, taking turns spitroasting you. When they''re close to cumming, they force you down on your knees and they both release their loads onto your face. Before you even get a chance to wash up they kick you out, leaving you to get dressed on the streets. You desperately grab your clothes from the ground and quickly hide behind a car as you put them on, hoping no random passers-by spotted you. One of the guys is watching you through the window the whole time, and you can hear his laughter while you run away as quickly as you can.'
 
-	act 'Return to the Pavlovsk streets':gt 'Pavresident'
+	act 'Return to the Pavlovsk streets':gt 'pavResidential'
 end
 
 --- gevent ---------------------------------

+ 1 - 1
locations/gkafe

@@ -5,7 +5,7 @@ $loc = $CURLOC
 $metkaM = $ARGS[0]
 $locM = $CURLOC
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 fcolor = rgb(0, 0, 0)
 bcolor = rgb(255, 255, 255)
 lcolor = rgb(106, 90, 205)

+ 4 - 4
locations/glake

@@ -6,7 +6,7 @@ $metkaM = $ARGS[0]
 $locM = $CURLOC
 cls
 gs'stat'
-gs'time'
+gs 'outdoors'
 '<center><H4>Lake</H4></center>'
 if tanga = 0:
 	tangamemb = 0
@@ -133,7 +133,7 @@ if temper >= 20 and month>=5 and month<=9 and hour>=6 and hour<=20:
 		willpower += 5
 		manna += 5
 		gs'stat'
-		gs'time'
+		gs 'outdoors'
 		
 		if $clothingworntype = 'swimwear' and bedra<=90:
 			'<center><img src="images/nigma/gor/Lake/lake.walk.bikini0,'+rand(0,3)+'.JPG"></center>'
@@ -206,7 +206,7 @@ if temper >= 20 and month>=5 and month<=9 and hour>=6 and hour<=20:
 					sweat = sweat + 1
 					manna = manna + 5
 					gs'stat'
-					gs'time'
+					gs 'outdoors'
 					'<center><img src="images/pics/zagar.jpg"></center>'
 
 					if krem = 0:
@@ -418,7 +418,7 @@ act'Return to Pavlovsk':
 		'You need to get dressed in regular clothing first.'
 		act'Return':gt'glake'
 	elseif $clothingworntype ! 'nude':
-		gt'Pavresident'
+		gt'pavResidential'
 	else
 		cla
 		'You need to wear some clothes. It''s not decent to walk the streets naked.'

+ 10 - 9
locations/gopnik_house

@@ -22,20 +22,21 @@ if gophouse = 0:
 		gophouse = 1
 		minut += 5
 		silavag = 0
-		$boy = 'Gopnik'
+		$boy = $boy + ', a gopnik'
+		$boy1 = 'gopnik from the park'
 		guy += kol_man
-		ciklkm = kol_man
+		ciklkm = 1
 
 		gt $curloc
 	end
 elseif gophouse = 1:
 	'<center><img src="images/qwest/alter/placer/podval.jpg"></center>'
 	:markgophouserape
-	ciklkm -= 1
+	if ciklkm > 1:dynamic $CatName, $boy1
 	minut += 15
 	dick = rand(12, 20)
 	tiprand = rand(0, 2)
-
+	
 	if tiprand < 2:
 		dynamic $sexstart2
 		dynamic $sexcum
@@ -43,15 +44,15 @@ elseif gophouse = 1:
 		dynamic $analsexrude
 	end
 
-	if ciklkm > 0:'All of the guys want to fuck you at least once. You see one of them impatiently stroking his cock, keeping it erect while he is waiting for the Gopnik that is currently fucking you to finish. There might be more beyond your vision range though, you''re not quite sure. And frankly, you''re also too drunk to care.'
-	'Once the Gopnik finishes, his friend quickly takes his place between your legs.'
+	if ciklkm > 1 and ciklkm < kol_man:'All of the guys want to fuck you at least once. You see one of them impatiently stroking his cock, keeping it erect while he is waiting for the Gopnik that is currently fucking you to finish. There might be more beyond your vision range though, you''re not quite sure. And frankly, you''re also too drunk to care.'
+	if ciklkm < kol_man:'Once the Gopnik finishes, his friend quickly takes his place between your legs.'
 	gs 'stat'
 
-	if ciklkm > 0:jump 'markgophouserape'
+	if ciklkm < kol_man:ciklkm += 1 & jump 'markgophouserape'
 
 	if RAND (0,1) = 0:
 		'Finally the Gopniks are finished with you. They talk loudly about what a good fuck you were while they get dressed. When they realize you''re too drunk to get dressed, they help you pull your clothes back on and sloppily button them up, before they drag you outside. After you walk for a few minutes, <<$bname>> slaps your ass and tells you: "You should be able to find your way home from here. You were a good fuck, <<$name>>. Come look us up in the park again if you want more where that came from."'
-		act 'Find your way back to the main streets':podvalrape = 0 & dormrape = 0 & gt'Pavresident'
+		act 'Find your way back to the main streets':podvalrape = 0 & dormrape = 0 & gt'pavResidential'
 		
 	else
 		act 'Open your eyes':
@@ -64,7 +65,7 @@ elseif gophouse = 1:
 			
 			'<center><img src="images/qwest/alter/placer/podvalwrite'+rand(1,6)+'.jpg"></center>'
 			'You passed out at some point during their fuck session. When you come to your body aches, your head is throbbing, and some kid is mocking you. When you look down, you realize why: those bastards have written obscene words all over your face and body! You look like a public toilet, and quickly cover up their writing as good as you can while you get up.'
- 			act 'Find your way back to the main streets':podvalrape = 0 & dormrape = 0 & gt'Pavresident'
+ 			act 'Find your way back to the main streets':podvalrape = 0 & dormrape = 0 & gt'pavResidential'
 		end  	
 	end
 end

+ 2 - 2
locations/gopskver

@@ -132,7 +132,7 @@ $metka = $ARGS[0]
 $loc = $CURLOC
 cls
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 gs 'dinsexFX'
 '<center><img src="images/gevent/skver.jpg"></center>'
 ''
@@ -268,7 +268,7 @@ else
 				'A few seconds later, he pulls out and you feel several warm drops landing on your stomach. You lose consciousness again, and a little while later you wake up to find yourself getting fucked by Dan. He''s just about finished, and shoots his load onto your stomach as well. Vitek immediately replaces him, and roughly fucks you as if you''re little more than a few fuckholes to him. Then again, maybe that''s how they really see you.'
 				'He quickly adds his load to that of his friends, and you fade out of consciousness again with a soft groan. When you finally come to your senses you find yourself alone on the sofa, and just rest for a moment. The boys are sitting at the table in the room, drinking more beers. You should probably get going soon, before they decide they''re ready for another round.'
 
-				act 'Leave':gt 'Pavresident'
+				act 'Leave':gt 'pavResidential'
 			end
 		end
 	elseif hour < 20:

+ 1 - 1
locations/gpoli

@@ -12,7 +12,7 @@ if $ARGS[0] = '':
 	'<center><b><font color="maroon">Clinic</font></b></center>'
 	'<center><img src="images/etogame/poli.jpg"></center>'
 
-	act 'Leave':gt 'Pavcomercial'
+	act 'Leave':gt 'pavCommercial'
 
 	if hour >= 6 and hour <= 21:
 		if gpoliuborka = 0:

+ 2 - 2
locations/graveyard

@@ -3,7 +3,7 @@ $metka = $ARGS[0]
 $loc = $CURLOC
 clr
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 '<center><h4>Cemetery</h4></center>'
 '<center><img src="images/etogame/graveyard.jpg"></center>'
 'A very peaceful place immersed in the silence of circumferential philosophical thoughts about the impermanence of life.'
@@ -14,7 +14,7 @@ act 'Go to the crypt':
 	cls
 	minut += 15
 	gs 'stat'
-	gs 'time'
+	gs 'outdoors'
 	'<center><img src="images/etogame/graveyard2.jpg"></center>'
 	'Barred windows protect windows covered with dust all around the bushes.'
 

+ 6 - 6
locations/gschool

@@ -7,13 +7,13 @@ if $ARGS[0] = 'start':
 	$loc = $CURLOC
 	$metka = $ARGS[0]
 	gs 'stat'
-	gs 'time'
+	gs 'outdoors'
 	'<center><b><font color="maroon">School</font></b></center>'
 	'<center><img src="images/qwest/alter/gschool.jpg"></center>'
 	'Pavlovsk''s only school, all the local children go here for their education.'
 
 
-	act 'Return to town':gt 'Pavresident'
+	act 'Return to town':gt 'pavResidential'
 
 	if zverRageQW = 1:gt 'gschool', 'KristinaFight'
 
@@ -48,7 +48,7 @@ if $ARGS[0] = 'start':
 			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 'Pavresident'
+			act 'Return to town':gt 'pavResidential'
 
 			act 'Go to the prom party':
 				cls
@@ -139,7 +139,7 @@ end
 if $ARGS[0] = 'KristinaFight':
 	cls
 	gs 'stat'
-	gs 'time'
+	gs 'outdoors'
 	zverRageQW = 2
 	'As you cross the school yard after school, you are surprised by a powerful kick in your back. You fall to your hands and knees and rub your sore back for a second, before you turn around and see Christina Zvereva, her face contorted with rage. She yells at you, "You fucking bitch! How dare you spread shit about me like that? I''ll break your fucking face!"'
 	$boy = 'Christina'
@@ -245,7 +245,7 @@ if $ARGS[0] = 'SchoolRun2':
 
 		gs 'stat'
 
-		act 'Leave':gt 'Pavresident'
+		act 'Leave':gt 'pavResidential'
 	end
 end
 
@@ -305,7 +305,7 @@ if $ARGS[0] = 'SchoolRun':
 
 		gs 'stat'
 
-		act 'Return to town':gt 'Pavresident'
+		act 'Return to town':gt 'pavResidential'
 	end
 end
 

+ 2 - 1
locations/gschool2

@@ -5,6 +5,7 @@ if $ARGS[0] = 'start':
 	fcolor = rgb(0, 0, 0)
 	bcolor = rgb(255, 255, 255)
 	lcolor = rgb(106, 90, 205)
+	gs 'indoors'
 	gs 'stat'
 	'<center><b><font color="maroon">School</font></b></center>'
 	'<center><img src="images/qwest/alter/gschool2.jpg"></center>'
@@ -593,7 +594,7 @@ if $ARGS[0] = 'afternoon':
 		gs 'stat'
 		'<center><img src="images/qwest/alter/urok<<urand>>.jpg"></center>'
 		'You sit in the classroom and listen to the monotonous droning of your teacher, doing your best to not fall asleep.'
-		gt 'gschool3', 'rand_class'
+		act 'Continue':gt 'gschool3', 'rand_class'
 
 		!'Finally the bell rang and students began to go home.'
 

+ 6 - 6
locations/gskver

@@ -13,7 +13,7 @@ $metka = $ARGS[0]
 $loc = $CURLOC
 cls
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 
 if $clothingworntype = 'nude':willpower -= 15 & manna -= 15 & 'You notice passers-by in the park pointing at you as you walk, and overhear one older lady telling her friend: "Look at her... it''s that <<$surname>> girl. Youth these days, they have no shame at all!"'
 
@@ -91,7 +91,7 @@ if hour > 6 and hour < 23 and month >= 5 and month <= 10:
 	act 'Sit down on the bench and rest':
 		cla
        	*clr
-       	gs'time'
+       	gs 'outdoors'
        	gs'stat'
         '<center><img src="images/lmps/сидит.jpg"></center>'
 		waiting = input ("How long would you like to rest? (No more than 120 minutes)")
@@ -104,7 +104,7 @@ if hour > 6 and hour < 23 and month >= 5 and month <= 10:
 			InSleep = 1
 			cloth_vid = 0
 			if tanga = 1:tanga = 0
-			gs'time'
+			gs 'outdoors'
                 '<center><img src="images/lmps/спитл.jpg"></center>'
         
                 if mop > 1:mop = 0 & vidageday = vidageday - 1 & 'Your make-up ended up getting smeared all across your face. You realize this is probably very bad for your skin, you really shouldn''t sleep before cleaning your face.'
@@ -157,7 +157,7 @@ if hour >= 8 and hour < 22:
 		money += 50
 		manna -= 5
 		gs 'stat'
-		gs'time'
+		gs 'outdoors'
 		'<center><img src="images/etogame/flaer.jpg"></center>'
 		'You spend an hour handing out flyers to park visitors, advertising something or another. You get paid 50 rubles for your efforts.'
 
@@ -182,8 +182,8 @@ if $clothingworntype = 'exercise' and hour > 5 and hour < 22 and daybegskver ! d
 	end
 end
 
-act 'Go to the residential area':minut += 5 & gt 'Pavresident'
-act 'Go to the high street':minut += 5 & gt 'Pavcomercial'
+act 'Go to the residential area':minut += 5 & gt 'pavResidential'
+act 'Go to the high street':minut += 5 & gt 'pavCommercial'
 
 --- gskver ---------------------------------
 

+ 8 - 0
locations/indoors

@@ -0,0 +1,8 @@
+# indoors
+
+frost = 0
+Time15Minute = totminut
+bonusZ = 0
+
+--- indoors ---------------------------------
+

+ 14 - 14
locations/katjaEv

@@ -59,7 +59,7 @@ $din_katja_kiss = {
 							if dom < KatjaDom:
 								'Katja pushes your arms apart and pulls away, you understand that she doesn''t want more.'
 
-								act 'Say goodbye and go home':minut += 15 & gt 'Pavresident'
+								act 'Say goodbye and go home':minut += 15 & gt 'pavResidential'
 							else
 								'Katja freezes in your arms and you stroke her body and kiss her neck.'
 
@@ -127,7 +127,7 @@ $din_katja_kiss = {
 		else
 			'Katja turns and begins collecting books, pretending that nothing has happened.'
 
-			act 'Say goodbye and go home':gt 'Pavresident'
+			act 'Say goodbye and go home':gt 'pavResidential'
 		end
 	end
 }
@@ -147,7 +147,7 @@ if fedorKozlovQW >= 10:'You and Katja suitable into Fedor. "Hi girls, what you u
 'KatjaDom - <<KatjaDom>>'
 'KatjaMastr - <<KatjaMastr>>'
 
-act 'Say goodbye and go home':gt 'Pavresident'
+act 'Say goodbye and go home':gt 'pavResidential'
 
 act 'Go with Katja':
 	cls
@@ -226,7 +226,7 @@ act 'Go with Katja':
 							'<center><img src="images/qwest/alter/npc/14.jpg"></center>'
 							'You refuse to kiss Katja and she is mad at you.'
 
-							act 'Say goodbye and go home':minut += 15 & gt 'Pavresident'
+							act 'Say goodbye and go home':minut += 15 & gt 'pavResidential'
 						end
 					end
 
@@ -244,7 +244,7 @@ act 'Go with Katja':
 							gs 'stat'
 							'<center><img src="images/qwest/alter/npc/14.jpg"></center>'
 							'You refuse to kiss Katja and she is mad at you.'
-							act 'Say goodbye and go home':minut += 15 & gt 'Pavresident'
+							act 'Say goodbye and go home':minut += 15 & gt 'pavResidential'
 						end
 					end
 
@@ -255,7 +255,7 @@ act 'Go with Katja':
 					if katjaDeystRand = 0:
 						dynamic $d_katjahornykiss
 
-						act 'Say goodbye and go home':minut += 15 & KatjaHorny -= 5 & gt 'Pavresident'
+						act 'Say goodbye and go home':minut += 15 & KatjaHorny -= 5 & gt 'pavResidential'
 
 						exit
 					elseif katjaDeystRand = 1:
@@ -284,7 +284,7 @@ act 'Go with Katja':
 								gt 'placer'
 							end
 
-							act 'Refuse and go home':minut += 15 & KatjaHorny -= 5 & gt 'Pavresident'
+							act 'Refuse and go home':minut += 15 & KatjaHorny -= 5 & gt 'pavResidential'
 
 							exit
 						elseif npcSex[14] = 0:
@@ -292,7 +292,7 @@ act 'Go with Katja':
 							KatjaLust += 1
 							'Katja starts chatting about boys, cosmetics and school with you.'
 
-							act 'Say goodbye and go home':minut += 15 & gt 'Pavresident'
+							act 'Say goodbye and go home':minut += 15 & gt 'pavResidential'
 						end
 					elseif katjaDeystRand = 2 and sweat > 0:
 						'Katja wrinkled her nose "<<$name>>,you''re all sweaty. Do you want to use my shower?"'
@@ -327,7 +327,7 @@ act 'Go with Katja':
 										'<center><img src="images/qwest/alter/npc/14.jpg"></center>'
 										'You leave the shower and walk into the Katjas room. You chat with Katja, but she seems to have things to do.'
 
-										act 'Say goodbye and go home':minut += 15 & gt 'Pavresident'
+										act 'Say goodbye and go home':minut += 15 & gt 'pavResidential'
 									end
 								end
 
@@ -371,7 +371,7 @@ act 'Go with Katja':
 														'<center><img src="images/qwest/alter/npc/14.jpg"></center>'
 														'You leave the shower and walk into the Katjas room. You chat with Katja, but she seems to have things to do.'
 
-														act 'Say goodbye and go home':minut += 15 & gt 'Pavresident'
+														act 'Say goodbye and go home':minut += 15 & gt 'pavResidential'
 													end
 												end
 											end
@@ -400,7 +400,7 @@ act 'Go with Katja':
 														'<center><img src="images/qwest/alter/npc/14.jpg"></center>'
 														'You leave the shower and walk into the Katjas room. You chat with Katja, but she seems to have things to do.'
 
-														act 'Say goodbye and go home':minut += 15 & gt 'Pavresident'
+														act 'Say goodbye and go home':minut += 15 & gt 'pavResidential'
 													end
 												end
 											end
@@ -427,12 +427,12 @@ act 'Go with Katja':
 									gs 'stat'
 									'<center><img src="images/qwest/alter/npc/14.jpg"></center>'
 									'You leave the shower and walk into the Katjas room. You chat with Katja, but she seems to have things to do.'
-									act 'Say goodbye and go home':minut += 15 & gt 'Pavresident'
+									act 'Say goodbye and go home':minut += 15 & gt 'pavResidential'
 								end
 							end
 						end
 
-						act 'Refuse and go home':minut += 15 & KatjaHorny -= 5 & gt 'Pavresident'
+						act 'Refuse and go home':minut += 15 & KatjaHorny -= 5 & gt 'pavResidential'
 
 						exit
 					elseif katjaDeystRand = 2 and sweat <= 0:
@@ -442,7 +442,7 @@ act 'Go with Katja':
 				end
 			end
 
-			act 'Say goodbye and go home':minut += 15 & gt 'Pavresident'
+			act 'Say goodbye and go home':minut += 15 & gt 'pavResidential'
 		end
 	end
 end

+ 7 - 7
locations/katjaEvDin

@@ -24,7 +24,7 @@ $d_kat_strapon_main={
 
 	if KatjaHorny < 0:KatjaHorny = 0
 
-	act 'Say goodbye and go home':gt'Pavresident'
+	act 'Say goodbye and go home':gt'pavResidential'
 }
 
 $d_kat_strapon_bj={
@@ -192,7 +192,7 @@ $katja_shower_kiss = {
 		'You notice Katjas hand between her legs and get further turned on watching her pleasure herself while she pleasures you.'
 		'Suddenly you are hit by a powerful orgasm, you feel like you might lose consciousness, your whole body bends and convulses and a hot wave washes over you.'
 
-		act 'Say goodbye and go home':gt 'Pavresident'
+		act 'Say goodbye and go home':gt 'pavResidential'
 	end
 
 	act 'Remove her hands':
@@ -207,7 +207,7 @@ $katja_shower_kiss = {
 		'<center><img src="images/qwest/alter/npc/14.jpg"></center>'
 		'You remove her hands and smile at her. Then you dismiss Katja, who shyly looks to the floor and leaves the bathroom.'
 
-		act 'Say goodbye and go home':gt 'Pavresident'
+		act 'Say goodbye and go home':gt 'pavResidential'
 	end
 }
 
@@ -227,7 +227,7 @@ $d_katja_sex = {
 			KatjaLust += 1
 			'Katja is embarrassed and pulls away from you.'
 
-			act 'Say goodbye and go home':gt 'Pavresident'
+			act 'Say goodbye and go home':gt 'pavResidential'
 		end
 	end
 
@@ -254,7 +254,7 @@ $d_katja_sex = {
 				KatjaLust += 1
 				'Katja is embarrassed and removes your hand.'
 
-				act 'Say goodbye and go home':gt 'Pavresident'
+				act 'Say goodbye and go home':gt 'pavResidential'
 			end
 		end
 	end
@@ -290,7 +290,7 @@ $d_katja_kuni = {
 			'Katja smiles at you "That was great <<$name>>, spread your legs."'
 			dynamic $d_katja_kuni_p
 		else
-			act 'Say goodbye and go home':gt 'Pavresident'
+			act 'Say goodbye and go home':gt 'pavResidential'
 		end
 	end
 }
@@ -316,7 +316,7 @@ $d_katja_kuni_p = {
 			'Katja smiles at you "That was great <<$name>>, come on now, my turn."'
 			dynamic $d_katja_kuni
 		else
-			act 'Say goodbye and go home':gt 'Pavresident'
+			act 'Say goodbye and go home':gt 'pavResidential'
 		end
 	end
 }

+ 1 - 1
locations/katja_sex

@@ -106,7 +106,7 @@ if $ARGS[0] = 'park':
 						'- Detained not detained, I have five you have only two.'
 						'- Well then score one-one, I`m in school you won here. It is necessary to repeat.'
 						'- Good, for reasons of clarity, repeat agreed Kate, but tomorrow, - c these words she turned and went to the exit of the Park'
-						Act 'Escape': gt'Pavresident'
+						Act 'Escape': gt'pavResidential'
 					end
 				end
 			end

+ 4 - 4
locations/korrPar

@@ -11,7 +11,7 @@ clr
 popolaini = 0
 saunaYouRoom = 0
 boycherdaksex = 0
-frost = 0
+gs 'indoors'
 minut += 1
 bonusZ = 0
 gs 'stat'
@@ -50,10 +50,10 @@ act '<font color = maroon><b>Leave the apartment and go outside</b></font>':
 		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'Pavresident'
+			act '<font color=red>Yes, go outside</font>':gt'pavResidential'
 			act 'No, stay inside':gt 'korrPar'
 		else
-			gt'Pavresident'
+			gt'pavResidential'
 		end
 	else
 		msg'<b><font color = red>You need to get dressed.</font></b>'
@@ -206,7 +206,7 @@ if hour >= 16 and hour <= 20 and indorf = 0:
 			if $clothingworntype = 'school' and clothingwornnumber = 6:gs 'clothing', 'strip'
 			'As you enter the hallway, you find your mother there waiting for you. You have never seen her this furious. "<<$name>>? I just got off the phone with the school, they told me you didn''t show up yet again and expelled you. I''ve had it with you! I''ve warned you so many times! Go ahead, live your irresponsible life the way you want. You''re no longer welcome here." She already packed up all your things from your room before you got home, and roughly shoves the bag into your hands. After that, she pushes you out the door and slams it shut in your face.'
 
-			act 'Leave':gt 'Pavresident'
+			act 'Leave':gt 'pavResidential'
 
 			exit
 		elseif schoolPredupr = 1:

+ 9 - 9
locations/kotovSex

@@ -50,7 +50,7 @@ if grupNPC[9] <= 200:
 							'When you keep refusing, he pushes you away and shouts: "Fine, go to your mommy! Just leave me the fuck alone, we are done for! I''m so fucking done with this!"'
 							''
 							'Nothing you say can change his mind. Vitek feels like you''ve been leading him on for too long, and now he wants nothing to do with you.'
-							act 'Leave his apartment':gt'Pavresident'
+							act 'Leave his apartment':gt'pavResidential'
 						end
 					end
 				end
@@ -210,7 +210,7 @@ if $ARGS[0] = 'bj':
 				'You swallow the sperm as much as you can, when you feel it in your mouth. You didn''t get all of it, but obediently swallow most of his load and keep sucking his dick even when it begins to soften. Vitek groans and pulls away from you, saying: "Wow, it''s so sensitive! Please stop!"'
 				'You simply smile at him and say: "Just trying to make you feel good, babe..."'
 
-				act 'Say goodbye and leave his apartment':gt 'Pavresident'
+				act 'Say goodbye and leave his apartment':gt 'pavResidential'
 			end
 
 			if kotovBJtimes > 10:
@@ -228,7 +228,7 @@ if $ARGS[0] = 'bj':
 						'<center><img src="images/qwest/alter/Ev/gop8.jpg"></center>'
 						'You smile at him and quickly go to the bathroom, discretely spitting his load into the sink.'
 
-						act 'Say goodbye and leave his apartment':gt 'Pavresident'
+						act 'Say goodbye and leave his apartment':gt 'pavResidential'
 					end
 
 					if kotovBJtimes > 12 and kotovBJtimes <= 15:
@@ -241,7 +241,7 @@ if $ARGS[0] = 'bj':
 							'<center><img src="images/picKav/cum9.jpg"></center>'
 							'When he pulls out you show his load in your mouth before swallowing it, and opening your mouth again to show him that it''s gone. Vitek grins at you with an adoring look in this eyes... he loves it when you do that.'
 
-							act 'Say goodbye and leave his apartment':gt 'Pavresident'
+							act 'Say goodbye and leave his apartment':gt 'pavResidential'
 						end
 					elseif kotovBJtimes > 15:
 						act 'Play with his sperm':
@@ -253,7 +253,7 @@ if $ARGS[0] = 'bj':
 							'<center><img src="images/qwest/alter/Ev/kotovBJcum2.jpg"></center>'
 							'When he pulls out you show his load in your mouth and play with it, tossing it around with your tongue and blowing bubbles. Vitek grins at you with an adoring look in this eyes... he loves it when you act like a slut for him.'
 
-							act 'Say goodbye and leave his apartment':gt 'Pavresident'
+							act 'Say goodbye and leave his apartment':gt 'pavResidential'
 						end
 					end
 				end
@@ -279,7 +279,7 @@ if $ARGS[0] = 'bj':
 				'<center><img src="images/qwest/alter/Ev/kotovFacial.jpg"></center>'
 				'You point his cock at your face and smile at him, encouraging him: "You can cum all over my face, babe... no need to hold back."'
 				'Vitek groans, and you feel his warm sperm land on your cheeks almost immediately. When you don''t feel any more land on your face, you carefully open your eyes and look him at him with a wide grin on your face.'
-				act 'Say goodbye and leave his apartment':gt 'Pavresident'
+				act 'Say goodbye and leave his apartment':gt 'pavResidential'
 			end
 		end
 
@@ -290,7 +290,7 @@ if $ARGS[0] = 'bj':
 			'<center><img src="images/qwest/sosed/bossBJcum.jpg"></center>'
 			'You squeeze the head of his cock with every stroke, and before too long he shoots his load in your hand. You smile when you feel his warm sperm drip down your fingers slowly.'
 
-			act 'Say goodbye and leave his apartment':gt 'Pavresident'
+			act 'Say goodbye and leave his apartment':gt 'pavResidential'
 		end
 	end
 end
@@ -321,7 +321,7 @@ if $ARGS[0] = 'anal':
 			act 'Spread your legs for him':gt 'kotovSex', 'sex'
 		end
 	end
-	act 'Say goodbye and leave his apartment':dikos = 0 & gt'Pavresident'
+	act 'Say goodbye and leave his apartment':dikos = 0 & gt'pavResidential'
 end
 
 if $ARGS[0] = 'sex':
@@ -352,7 +352,7 @@ if $ARGS[0] = 'sex':
 		end
 	end
 
-	act 'Say goodbye and leave his apartment':dikos = 0 & gt'Pavresident'
+	act 'Say goodbye and leave his apartment':dikos = 0 & gt'pavResidential'
 end
 
 if $ARGS[0] = 'cumface7':

+ 1 - 1
locations/lake

@@ -19,7 +19,7 @@ if $ARGS[0] = 'start':
 	end
 
 	gs 'stat'
-	gs 'time'
+	gs 'outdoors'
 
 	'<center><b><font color="maroon">Lake</font></b></center>'
 	'<center><img src="images/etogame/lake2.jpg"></center>'

+ 1 - 1
locations/lakecafe

@@ -251,7 +251,7 @@ if $ARGS[0] = 'bandits':
 	if workDolgDay <= 0 and workDolg > 0:
 		cls
 		gs'stat'
-		gs'time'
+		gs 'outdoors'
 		workDisk = 0
 
 		'<center><img src="images/sauna/bug.jpg"></center>'

+ 1 - 1
locations/liam

@@ -15,7 +15,7 @@ CLOSE ALL
 clr
 
 gs'stat'
-gs'time'
+gs 'outdoors'
 set palMir=0
 set bordysh=0
 set housrA=0

+ 1 - 1
locations/liamel

@@ -9,7 +9,7 @@ CLOSE ALL
 clr
 
 gs'stat'
-gs'time'
+gs 'outdoors'
 set palMir=0
 set bordysh=0
 set housrA=0

+ 3 - 3
locations/liames

@@ -9,7 +9,7 @@ CLOSE ALL
 clr
 
 gs'stat'
-gs'time'
+gs 'outdoors'
 set palMir=0
 set bordysh=0
 set housrA=0
@@ -46,7 +46,7 @@ if hour >= 15 and hour <= 22 and tusa = 0:
 		cls
 		cla
 		gs'stat'
-		gs'time'
+		gs 'outdoors'
 		gs'dibodi'
 		minut += 20
 		tusa = 0
@@ -63,7 +63,7 @@ if hour >= 15 and hour <= 22 and tusa = 1 and tusnyakday ! day:
 		cls
 		cla
 		gs'stat'
-		gs'time'
+		gs 'outdoors'
 		gs'dibodi'
 		minut += 20
 		'<center><img src="images/lmps/photo.jpg"></center>'

+ 5 - 2
locations/loadg

@@ -22,8 +22,11 @@ if bankAccount = 0 and karta > 0:
 	if bankDebtLimit = 0: bankDebtLimit = 5000
 end
 
-temp[1] = daystart-daylastperiod
-$cycreport_txt = 'It has been <<temp[1]>> days since you last had a period.'
+if $cycreport_txt = '':
+	temp[1] = daystart-daylastperiod
+	$cycreport_txt = 'It has been <<temp[1]>> days since you last had a period.'
+end
+
 if menoage = 0:
 	menoage = rand(40,50)
 	temprand = rand(0,10)

+ 1 - 1
locations/locmansion

@@ -3,7 +3,7 @@ $metka = $ARGS[0]
 $loc = $CURLOC
 clr
 gs 'stat'
-gs 'time'
+gs 'outdoors'
 '<center><h4>cottage settlement</h4></center>'
 '<center><img src="images/etogame/locmansion.jpg"></center>'
 'Elite settlement where only the cream of society can afford to live.'

+ 1 - 1
locations/lug

@@ -2,7 +2,7 @@
 $metka = $ARGS[0]
 $loc = $CURLOC
 gs'stat'
-gs'time'
+gs 'outdoors'
 '<center><img src="images/pic/lug.jpg" ></center>'
 'Little, but well maintained meadow with evergreen grass to rest, picnic or just sunbath. Mothers with small children then regular visitors.'
 

+ 1 - 1
locations/luzhayka

@@ -1,6 +1,6 @@
 # luzhayka
 gs'stat'
-gs'time'
+gs 'outdoors'
 '<center><img src="images/pic/luzhayka.jpg" ></center>'
 
 

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